SKINICONDESC initialization - end of story

git-svn-id: http://svn.miranda-ng.org/main/trunk@2598 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

11 files changed, 18 insertions, 34 deletions

diff --git a/protocols/AimOscar/src/theme.cpp b/protocols/AimOscar/src/theme.cpp
index c496c2482e..69fbe08a0f 100644
--- a/protocols/AimOscar/src/theme.cpp
+++ b/protocols/AimOscar/src/theme.cpp
@@ -75,8 +75,7 @@ void InitIcons(void)
 	char szSettingName[100];

 	char szSectionName[100];

 

-	SKINICONDESC sid = {0};

-	sid.cbSize = sizeof(SKINICONDESC);

+	SKINICONDESC sid = { sizeof(sid) };

 	sid.ptszDefaultFile = szFile;

 	sid.pszName = szSettingName;

 	sid.pszSection = szSectionName;

diff --git a/protocols/FacebookRM/src/theme.cpp b/protocols/FacebookRM/src/theme.cpp
index 021e8a6fcc..78e21a18f1 100644
--- a/protocols/FacebookRM/src/theme.cpp
+++ b/protocols/FacebookRM/src/theme.cpp
@@ -55,8 +55,7 @@ void InitIcons(void)
 	char setting_name[100];

 	char section_name[100];

 

-	SKINICONDESC sid = {0};

-	sid.cbSize = sizeof(SKINICONDESC);

+	SKINICONDESC sid = { sizeof(sid) };

 	sid.ptszDefaultFile = szFile;

 	sid.cx = sid.cy = 16;

 	sid.pszName = setting_name;

diff --git a/protocols/Gadu-Gadu/src/icolib.cpp b/protocols/Gadu-Gadu/src/icolib.cpp
index bc83381e6a..e353dcdb17 100644
--- a/protocols/Gadu-Gadu/src/icolib.cpp
+++ b/protocols/Gadu-Gadu/src/icolib.cpp
@@ -57,8 +57,7 @@ void gg_icolib_init()
 	char szSectionName[100];

 	mir_snprintf(szSectionName, sizeof( szSectionName ), "%s/%s", LPGEN("Protocols"), LPGEN(GGDEF_PROTO));

 

-	SKINICONDESC sid = {0};

-	sid.cbSize = sizeof(SKINICONDESC);

+	SKINICONDESC sid = { sizeof(sid) };

 	sid.ptszDefaultFile = szFile;

 	sid.pszSection = szSectionName;

 	sid.flags = SIDF_PATH_TCHAR;

diff --git a/protocols/IRCG/src/options.cpp b/protocols/IRCG/src/options.cpp
index 1bde54a395..d7ed8753cc 100644
--- a/protocols/IRCG/src/options.cpp
+++ b/protocols/IRCG/src/options.cpp
@@ -223,8 +223,7 @@ void AddIcons(void)
 	TCHAR szFile[MAX_PATH];

 	GetModuleFileName(hInst, szFile, MAX_PATH);

 

-	SKINICONDESC sid = {0};

-	sid.cbSize = sizeof(SKINICONDESC);

+	SKINICONDESC sid = { sizeof(sid) };

 	sid.pszSection = "Protocols/IRC";

 	sid.ptszDefaultFile = szFile;

 	sid.flags = SIDF_PATH_TCHAR;

diff --git a/protocols/JabberG/src/jabber_icolib.cpp b/protocols/JabberG/src/jabber_icolib.cpp
index 3abf457b1b..490a8b1377 100644
--- a/protocols/JabberG/src/jabber_icolib.cpp
+++ b/protocols/JabberG/src/jabber_icolib.cpp
@@ -196,11 +196,10 @@ void CJabberProto::IconsInit(void)
 	for (i = 0; i < SIZEOF(TransportProtoTable); ++i)

 		m_transportProtoTableStartIndex[i] = -1;

 

-	SKINICONDESC sid = {0};

 	char szFile[MAX_PATH];

 	GetModuleFileNameA(hInst, szFile, MAX_PATH);

 

-	sid.cbSize = sizeof(SKINICONDESC);

+	SKINICONDESC sid = { sizeof(sid) };

 	sid.pszDefaultFile = szFile;

 	sid.flags = SIDF_TCHAR;

 

@@ -612,8 +611,7 @@ static void sttProcessIcons(int iAmount)
 	TCHAR szFile[MAX_PATH];

 	GetModuleFileName(hInst, szFile, MAX_PATH);

 

-	SKINICONDESC sid = {0};

-	sid.cbSize = sizeof(SKINICONDESC);

+	SKINICONDESC sid = { sizeof(sid) };

 	sid.ptszDefaultFile = szFile;

 	sid.flags = SIDF_PATH_TCHAR;

 

diff --git a/protocols/MSN/src/msn_opts.cpp b/protocols/MSN/src/msn_opts.cpp
index 7eed67a3ce..bac6553e8f 100644
--- a/protocols/MSN/src/msn_opts.cpp
+++ b/protocols/MSN/src/msn_opts.cpp
@@ -60,8 +60,7 @@ void MsnInitIcons(void)
 	char szSectionName[100];

 	mir_snprintf(szSectionName, sizeof(szSectionName), "%s/%s", LPGEN("Protocols"), LPGEN("MSN"));

 

-	SKINICONDESC sid = {0};

-	sid.cbSize = sizeof(SKINICONDESC);

+	SKINICONDESC sid = { sizeof(sid) };

 	sid.ptszDefaultFile = szFile;

 	sid.pszSection = szSectionName;

 	sid.flags = SIDF_PATH_TCHAR;

diff --git a/protocols/Omegle/src/theme.cpp b/protocols/Omegle/src/theme.cpp
index 4ed027ed0c..04ab200f66 100644
--- a/protocols/Omegle/src/theme.cpp
+++ b/protocols/Omegle/src/theme.cpp
@@ -48,22 +48,18 @@ void InitIcons(void)
 	char setting_name[100];

 	char section_name[100];

 

-	SKINICONDESC sid = {0};

-	sid.cbSize = sizeof(SKINICONDESC);

+	SKINICONDESC sid = { sizeof(sid) };

 	sid.ptszDefaultFile = szFile;

 	sid.cx = sid.cy = 16;

 	sid.pszName = setting_name;

 	sid.pszSection = section_name;

-    sid.flags = SIDF_PATH_TCHAR;

+	sid.flags = SIDF_PATH_TCHAR;

 

-	for (int i=0; i<SIZEOF(icons); i++) 

-	{

-		if(icons[i].defIconID)

-		{

+	for (int i=0; i<SIZEOF(icons); i++) {

+		if(icons[i].defIconID) {

 			mir_snprintf(setting_name,sizeof(setting_name),"%s_%s","Omegle",icons[i].name);

 

-			if (icons[i].section)

-			{

+			if (icons[i].section) {

 				mir_snprintf(section_name,sizeof(section_name),"%s/%s/%s",LPGEN("Protocols"),

 					LPGEN("Omegle"), icons[i].section);

 			} else {

diff --git a/protocols/Tlen/src/tlen.cpp b/protocols/Tlen/src/tlen.cpp
index 05c76957f5..8d6e8a5b0d 100644
--- a/protocols/Tlen/src/tlen.cpp
+++ b/protocols/Tlen/src/tlen.cpp
@@ -130,13 +130,11 @@ static int TlenIconsChanged(void *ptr, WPARAM wParam, LPARAM lParam)
 

 static void TlenRegisterIcons()

 {

-	SKINICONDESC sid = { 0 };

-	TCHAR path[MAX_PATH];

-	TCHAR szSectionName[100];

+	TCHAR path[MAX_PATH], szSectionName[100];

 	mir_sntprintf(szSectionName, SIZEOF( szSectionName ), _T("%s/%s"), _T("Protocols"), _T("Tlen"));

-

 	GetModuleFileName(hInst, path, MAX_PATH);

-	sid.cbSize = sizeof(SKINICONDESC);

+

+	SKINICONDESC sid = { sizeof(sid) };

 	sid.cx = sid.cy = 16;

 	sid.ptszSection = szSectionName;

 	sid.ptszDefaultFile = path;

diff --git a/protocols/Twitter/src/theme.cpp b/protocols/Twitter/src/theme.cpp
index 18cc7ce7f8..3014c4523b 100644
--- a/protocols/Twitter/src/theme.cpp
+++ b/protocols/Twitter/src/theme.cpp
@@ -47,8 +47,7 @@ void InitIcons(void)
 	char setting_name[100];

 	char section_name[100];

 

-	SKINICONDESC sid = {0};

-	sid.cbSize = sizeof(SKINICONDESC);

+	SKINICONDESC sid = { sizeof(sid) };

 	sid.ptszDefaultFile = szFile;

 	sid.cx = sid.cy = 16;

 	sid.pszName = setting_name;

diff --git a/protocols/Xfire/src/main.cpp b/protocols/Xfire/src/main.cpp
index 2add029050..8bb1fe3397 100644
--- a/protocols/Xfire/src/main.cpp
+++ b/protocols/Xfire/src/main.cpp
@@ -1364,8 +1364,7 @@ extern "C" __declspec(dllexport) int  Load(void)
 	char szFile[MAX_PATH];

 	GetModuleFileNameA(hinstance, szFile, MAX_PATH);

 

-	SKINICONDESC sid = {0};

-	sid.cbSize = sizeof(SKINICONDESC);

+	SKINICONDESC sid = { sizeof(sid) };

 	sid.pszDefaultFile = szFile;

 	sid.cx = sid.cy = 16;

 	sid.ptszSection = LPGENT( "Protocols/XFire" );

diff --git a/protocols/Yahoo/src/icolib.cpp b/protocols/Yahoo/src/icolib.cpp
index 40c7cb9421..40ca82da25 100644
--- a/protocols/Yahoo/src/icolib.cpp
+++ b/protocols/Yahoo/src/icolib.cpp
@@ -43,8 +43,7 @@ void CYahooProto::IconsInit( void )
 	char szSectionName[100];

 	mir_snprintf(szSectionName, sizeof(szSectionName), "%s/%s", LPGEN("Protocols"), LPGEN("YAHOO"));

 

-	SKINICONDESC sid = {0};

-	sid.cbSize = sizeof(SKINICONDESC);

+	SKINICONDESC sid = { sizeof(sid) };

 	sid.ptszDefaultFile = szFile;

 	sid.pszSection = szSectionName;

 	sid.flags = SIDF_PATH_TCHAR;