- fix for mishmash in "Add contact" button's tooltip

- code cleaning

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

1 files changed, 14 insertions, 14 deletions

diff --git a/plugins/TabSRMM/src/themeio.cpp b/plugins/TabSRMM/src/themeio.cpp
index 4e1edde78e..b54801461e 100644
--- a/plugins/TabSRMM/src/themeio.cpp
+++ b/plugins/TabSRMM/src/themeio.cpp
@@ -198,7 +198,7 @@ void TSAPI WriteThemeToINI(const TCHAR *szIniFilenameT, struct TWindowData *dat)
 		int firstIndex = fontBlocks[n].iFirst;

 		char *szModule = fontBlocks[n].szModule;

 		WritePrivateProfileStringA(fontBlocks[n].szBLockname, "Valid", "1", szIniFilename);

-		for (i = 0; i < fontBlocks[n].iCount; i++) {

+		for (i=0; i < fontBlocks[n].iCount; i++) {

 			sprintf(szTemp, "Font%d", firstIndex + i);

 			sprintf(szAppname, fontBlocks[n].szIniTemp, firstIndex + i);

 			if (!DBGetContactSettingString(NULL, szModule, szTemp, &dbv)) {

@@ -218,12 +218,12 @@ void TSAPI WriteThemeToINI(const TCHAR *szIniFilenameT, struct TWindowData *dat)
 	}

 	def = SRMSGDEFSET_BKGCOLOUR;

 

-	for (i = 0; i < safe_sizeof(_extSettings); i++) {

+	for (i=0; i < safe_sizeof(_extSettings); i++) {

 		WritePrivateProfileStringA(_extSettings[i].szIniSection, _extSettings[i].szIniName, 

 			_itoa(M->GetDword(_extSettings[i].szDbModule, _extSettings[i].szDbSetting, _extSettings[i].dwDef), szBuf, 10), szIniFilename);

 	}

 

-	for (i = 0; i < safe_sizeof(_extSettings_v5); i++) {

+	for (i=0; i < safe_sizeof(_extSettings_v5); i++) {

 		WritePrivateProfileStringA(_extSettings_v5[i].szIniSection, _extSettings_v5[i].szIniName,

 			_itoa(M->GetDword(_extSettings_v5[i].szDbModule, _extSettings_v5[i].szDbSetting, _extSettings_v5[i].dwDef), szBuf, 10), szIniFilename);

 	}

@@ -231,7 +231,7 @@ void TSAPI WriteThemeToINI(const TCHAR *szIniFilenameT, struct TWindowData *dat)
 	WritePrivateProfileStringA("Message Log", "VGrid", _itoa(M->GetByte("wantvgrid", 0), szBuf, 10), szIniFilename);

 	WritePrivateProfileStringA("Message Log", "ExtraMicroLF", _itoa(M->GetByte("extramicrolf", 0), szBuf, 10), szIniFilename);

 

-	for (i = 0; i <= TMPL_ERRMSG; i++) {

+	for (i=0; i <= TMPL_ERRMSG; i++) {

 		char *encoded;

 		if (dat == 0)

 			encoded = mir_utf8encodeT(LTR_Active.szTemplates[i]);

@@ -246,14 +246,14 @@ void TSAPI WriteThemeToINI(const TCHAR *szIniFilenameT, struct TWindowData *dat)
 		WritePrivateProfileStringA("RTLTemplates", TemplateNames[i], encoded, szIniFilename);

 		mir_free(encoded);

 	}

-	for (i = 0; i < CUSTOM_COLORS; i++) {

+	for (i=0; i < CUSTOM_COLORS; i++) {

 		sprintf(szTemp, "cc%d", i + 1);

 		if (dat == 0)

 			WritePrivateProfileStringA("Custom Colors", szTemp, _itoa(M->GetDword(szTemp, 0), szBuf, 10), szIniFilename);

 		else

 			WritePrivateProfileStringA("Custom Colors", szTemp, _itoa(dat->pContainer->theme.custom_colors[i], szBuf, 10), szIniFilename);

 	}

-	for (i = 0; i <= 7; i++)

+	for (i=0; i <= 7; i++)

 		WritePrivateProfileStringA("Nick Colors", _itoa(i, szBuf, 10), _itoa(g_Settings.nickColors[i], szTemp, 10), szIniFilename);

 

 	mir_free(szIniFilename);

@@ -289,7 +289,7 @@ void TSAPI ReadThemeFromINI(const TCHAR *szIniFilenameT, TContainerData *dat, in
 				n++;

 				continue;

 			}

-			for (i = 0; i < fontBlocks[n].iCount; i++) {

+			for (i=0; i < fontBlocks[n].iCount; i++) {

 				sprintf(szTemp, "Font%d", firstIndex + i);

 				sprintf(szAppname, fontBlocks[n].szIniTemp, firstIndex + i);

 				if (GetPrivateProfileStringA(szAppname, "Face", "Verdana", szBuf, sizeof(szBuf), szIniFilename) != 0) {

@@ -324,13 +324,13 @@ void TSAPI ReadThemeFromINI(const TCHAR *szIniFilenameT, TContainerData *dat, in
 		if (dwFlags & THEME_READ_FONTS) {

 			COLORREF defclr;

 

-			for (i = 0; i < safe_sizeof(_extSettings); i++) {

+			for (i=0; i < safe_sizeof(_extSettings); i++) {

 				M->WriteDword(_extSettings[i].szDbModule, _extSettings[i].szDbSetting, 

 					GetPrivateProfileIntA(_extSettings[i].szIniSection, _extSettings[i].szIniName, _extSettings[i].dwDef, szIniFilename));

 			}

 

 			if (version >= 5) {

-				for (i = 0; i < safe_sizeof(_extSettings_v5); i++) {

+				for (i=0; i < safe_sizeof(_extSettings_v5); i++) {

 					M->WriteDword(_extSettings_v5[i].szDbModule, _extSettings_v5[i].szDbSetting,

 						GetPrivateProfileIntA(_extSettings_v5[i].szIniSection, _extSettings_v5[i].szIniName, _extSettings_v5[i].dwDef, szIniFilename));

 				}

@@ -339,14 +339,14 @@ void TSAPI ReadThemeFromINI(const TCHAR *szIniFilenameT, TContainerData *dat, in
 			M->WriteByte(SRMSGMOD_T, "wantvgrid", (BYTE)(GetPrivateProfileIntA("Message Log", "VGrid", 0, szIniFilename)));

 			M->WriteByte(SRMSGMOD_T, "extramicrolf", (BYTE)(GetPrivateProfileIntA("Message Log", "ExtraMicroLF", 0, szIniFilename)));

 

-			for (i = 0; i < CUSTOM_COLORS; i++) {

+			for (i=0; i < CUSTOM_COLORS; i++) {

 				sprintf(szTemp, "cc%d", i + 1);

 				if (dat == 0)

 					M->WriteDword(SRMSGMOD_T, szTemp, GetPrivateProfileIntA("Custom Colors", szTemp, RGB(224, 224, 224), szIniFilename));

 				else

 					dat->theme.custom_colors[i] = GetPrivateProfileIntA("Custom Colors", szTemp, RGB(224, 224, 224), szIniFilename);

 			}

-			for (i = 0; i <= 7; i++) {

+			for (i=0; i <= 7; i++) {

 				if (i == 5)

 					defclr = GetSysColor(COLOR_HIGHLIGHT);

 				else if (i == 6)

@@ -363,7 +363,7 @@ void TSAPI ReadThemeFromINI(const TCHAR *szIniFilenameT, TContainerData *dat, in
 		int SY = GetDeviceCaps(hdc, LOGPIXELSY);

 		ReleaseDC(NULL, hdc);

 		if (!noAdvanced) {

-			for (i = 0; i < MSGDLGFONTCOUNT; i++) {

+			for (i=0; i < MSGDLGFONTCOUNT; i++) {

 				_snprintf(szTemp, 20, "Font%d", i);

 				LoadLogfontFromINI(i, szTemp, &dat->theme.logFonts[i], &dat->theme.fontColors[i], szIniFilename);

 				wsprintfA(dat->theme.rtfFonts + (i * RTFCACHELINESIZE), "\\f%u\\cf%u\\b%d\\i%d\\ul%d\\fs%u", i, i, dat->theme.logFonts[i].lfWeight >= FW_BOLD ? 1 : 0, dat->theme.logFonts[i].lfItalic, dat->theme.logFonts[i].lfUnderline, 2 * abs(dat->theme.logFonts[i].lfHeight) * 74 / SY);

@@ -387,7 +387,7 @@ void TSAPI ReadThemeFromINI(const TCHAR *szIniFilenameT, TContainerData *dat, in
 		dat->theme.left_indent = GetPrivateProfileIntA("Message Log", "LeftIndent", 0, szIniFilename);

 		dat->theme.right_indent = GetPrivateProfileIntA("Message Log", "RightIndent", 0, szIniFilename);

 

-		for (i = 0; i < CUSTOM_COLORS; i++) {

+		for (i=0; i < CUSTOM_COLORS; i++) {

 			sprintf(szTemp, "cc%d", i + 1);

 			if (dat == 0)

 				M->WriteDword(SRMSGMOD_T, szTemp, GetPrivateProfileIntA("Custom Colors", szTemp, RGB(224, 224, 224), szIniFilename));

@@ -398,7 +398,7 @@ void TSAPI ReadThemeFromINI(const TCHAR *szIniFilenameT, TContainerData *dat, in
 

 	if (version >= 3) {

 		if (!noAdvanced && dwFlags & THEME_READ_TEMPLATES) {

-			for (i = 0; i <= TMPL_ERRMSG; i++) {

+			for (i=0; i <= TMPL_ERRMSG; i++) {

 				wchar_t *decoded = 0;

 

 				GetPrivateProfileStringA("Templates", TemplateNames[i], "[undef]", szTemplateBuffer, TEMPLATE_LENGTH * 3, szIniFilename);