minor code cleaning

1 files changed, 175 insertions, 184 deletions

diff --git a/plugins/UserInfoEx/src/Flags/svc_flagsicons.cpp b/plugins/UserInfoEx/src/Flags/svc_flagsicons.cpp
index 405f2a6f07..25679f7c29 100644
--- a/plugins/UserInfoEx/src/Flags/svc_flagsicons.cpp
+++ b/plugins/UserInfoEx/src/Flags/svc_flagsicons.cpp
@@ -30,93 +30,83 @@ static int CountryNumberToBitmapIndex(int countryNumber)
 {

 	/* country number indices (same order as in flags.bmp) */

 	const int BitmapIndexMap[239]={

-		0,	1,	7,	20,	27,	30,	31,	32,	33,	34,

-		36,	38,	39,	40,	41,	43,	44,	45,	46,	47,

-		48,	49,	51,	52,	53,	54,	55,	56,	57,	58,

-		60,	61,	62,	63,	64,	65,	66,	81,	82,	84,

-		86,	90,	91,	92,	93,	94,	95,	98,	212,	213,

-		216,	218,	220,	221,	222,	223,	224,	225,	226,	227,

-		228,	229,	230,	231,	232,	233,	234,	235,	236,	237,

-		238,	239,	240,	241,	242,	243,	244,	245,	246,	247,

-		248,	249,	250,	251,	252,	253,	254,	255,	256,	257,

-		258,	260,	261,	263,	264,	265,	266,	267,	268,	269,

-		290,	291,	297,	298,	299,	350,	351,	352,	353,	354,

-		355,	356,	357,	358,	359,	370,	371,	372,	373,	374,

-		375,	376,	377,	378,	379,	380,	381,	382,	383,	385,

-		386,	387,	389,	420,	421,	423,	441,	442,	500,	501,

-		502,	503,	504,	505,	506,	507,	508,	509,	591,	592,

-		593,	595,	597,	598,	599,	614,	670,	673,	674,	675,

-		676,	677,	678,	679,	680,	681,	682,	683,	685,	686,

-		688,	689,	690,	691,	692,	705,	850,	852,	853,	855,

-		856,	880,	886,	960,	961,	962,	963,	964,	965,	966,

-		967,	968,	971,	972,	973,	974,	975,	976,	977,	992,

-		993,	994,	995,	996,	998,	1002,	1242,	1246,	1264,	1268,

-		1284,	1340,	1345,	1441,	1473,	1649,	1664,	1670,	1671,	1684,

-		1758,	1767,	1784,	1809,	1868,	1869,	1876,	1939,	2897,	3492,

-		3883,	5995,	5999,	6720,	6723,	9999,	61891,	65535,	90392

+	      0,     1,     7,    20,    27,    30,    31,    32,    33,    34,

+	     36,    38,    39,    40,    41,    43,    44,    45,    46,    47,

+	     48,    49,    51,    52,    53,    54,    55,    56,    57,    58,

+	     60,    61,    62,    63,    64,    65,    66,    81,    82,    84,

+	     86,    90,    91,    92,    93,    94,    95,    98,   212,   213,

+	    216,   218,   220,   221,   222,   223,   224,   225,   226,   227,

+	    228,   229,   230,   231,   232,   233,   234,   235,   236,   237,

+	    238,   239,   240,   241,   242,   243,   244,   245,   246,   247,

+	    248,   249,   250,   251,   252,   253,   254,   255,   256,   257,

+	    258,   260,   261,   263,   264,   265,   266,   267,   268,   269,

+	    290,   291,   297,   298,   299,   350,   351,   352,   353,   354,

+	    355,   356,   357,   358,   359,   370,   371,   372,   373,   374,

+	    375,   376,   377,   378,   379,   380,   381,   382,   383,   385,

+	    386,   387,   389,   420,   421,   423,   441,   442,   500,   501,

+	    502,   503,   504,   505,   506,   507,   508,   509,   591,   592,

+	    593,   595,   597,   598,   599,   614,   670,   673,   674,   675,

+	    676,   677,   678,   679,   680,   681,   682,   683,   685,   686,

+	    688,   689,   690,   691,   692,   705,   850,   852,   853,   855,

+	    856,   880,   886,   960,   961,   962,   963,   964,   965,   966,

+	    967,   968,   971,   972,   973,   974,   975,   976,   977,   992,

+	    993,   994,   995,   996,   998,  1002,  1242,  1246,  1264,  1268,

+	   1284,  1340,  1345,  1441,  1473,  1649,  1664,  1670,  1671,  1684,

+		1758,  1767,  1784,  1809,  1868,  1869,  1876,  1939,  2897,  3492,

+		3883,  5995,  5999,  6720,  6723,  9999, 61891, 65535, 90392

 	};

+	

 	/* shared flags by multiple countries */

-	switch(countryNumber) {

-		case 9999:              /* Other */

-		case 65535:             /* 0xFFFF,"Unknown" */

-			countryNumber=0;    /* Unspecified */

-			break;

-		case 262:               /* Reunion Island */

-		case 594:               /* French Guiana */

-		case 5901:              /* remove French Antilles */

-			countryNumber=33;   /* France */

-			break;

-		case 120:               /* remove Barbuda */

-			countryNumber=1268; /* Antigua and Barbuda */

-			break;

-		case 6702:              /* removed Tinian Island */

-		case 6701:              /* removed Rota Island */

-		case 670:               /* removed Saipan Island */

-			countryNumber=1670;	/* Northern Mariana Islands, US Territory of*/

-			break;

-		case 115:               /* removed Saint Kitts */

-		case 114:               /* removed Nevis */

-			countryNumber=1869; /* Saint Kitts and Nevis */

-			break;

-		case 247:               /* Ascension Island */

-			countryNumber=44;   /* United Kingdom */

-			break;

-		case 6720:              /* Australian Antarctic Territory */

-			countryNumber=61;   /* Australia */

-			break;

-		case 5997:              /* Netherlands (Bonaire Island)*/

-		case 59946:             /* Netherlands (Saba Island) */

-		case 59938:             /* Netherlands (St. Eustatius Island) */

-			countryNumber=599;  /* Netherlands Antilles (dissolved 2010) */

-			//countryNumber=31;   /* Netherlands */

-			break;

-		case 5995:              /* St. Maarten (new country in 2010 (from Netherlands Antilles) new country in 2010 (from Netherlands Antilles)) */

-			countryNumber=599;  /* Netherlands Antilles (dissolved 2010) */

-			break;

-		case 5999:              /* Curacao (new country in 2010 (from Netherlands Antilles) new country in 2010 (from Netherlands Antilles)) */

-			countryNumber=599;  /* Netherlands Antilles (dissolved 2010) */

-			break;

-		case 5399:              /* missing Guantanamo Bay */

-			countryNumber=1;    /* USA */

+	switch (countryNumber) {

+	case 9999:               /* Other */

+	case 65535:              /* 0xFFFF,"Unknown" */

+		countryNumber = 0;    /* Unspecified */

+		break;				   

+	case 262:                /* Reunion Island */

+	case 594:                /* French Guiana */

+	case 5901:               /* remove French Antilles */

+		countryNumber = 33;   /* France */

+		break;

+	case 120:                /* remove Barbuda */

+		countryNumber = 1268; /* Antigua and Barbuda */

+		break;

+	case 6702:               /* removed Tinian Island */

+	case 6701:               /* removed Rota Island */

+	case 670:                /* removed Saipan Island */

+		countryNumber = 1670; /* Northern Mariana Islands, US Territory of*/

+		break;

+	case 115:                /* removed Saint Kitts */

+	case 114:                /* removed Nevis */

+		countryNumber = 1869; /* Saint Kitts and Nevis */

+		break;

+	case 247:                /* Ascension Island */

+		countryNumber = 44;   /* United Kingdom */

+		break;

+	case 6720:               /* Australian Antarctic Territory */

+		countryNumber = 61;   /* Australia */

+		break;

+	case 5997:               /* Netherlands (Bonaire Island)*/

+	case 59946:              /* Netherlands (Saba Island) */

+	case 59938:              /* Netherlands (St. Eustatius Island) */

+		countryNumber = 599;  /* Netherlands Antilles (dissolved 2010) */

+		//countryNumber=31;   /* Netherlands */

+		break;

+	case 5995:               /* St. Maarten (new country in 2010 (from Netherlands Antilles) new country in 2010 (from Netherlands Antilles)) */

+		countryNumber = 599;  /* Netherlands Antilles (dissolved 2010) */

+		break;

+	case 5999:               /* Curacao (new country in 2010 (from Netherlands Antilles) new country in 2010 (from Netherlands Antilles)) */

+		countryNumber = 599;  /* Netherlands Antilles (dissolved 2010) */

+		break;

+	case 5399:               /* missing Guantanamo Bay */

+		countryNumber = 1;    /* USA */

 	}

+

 	/* binary search in index array */

-	if (countryNumber > 0) {

-		int i,high/*,low=0*/;

-		high=_countof(BitmapIndexMap);

-		/*old code need sortet BitmapIndexMap*/

-		/*if (countryNumber<=BitmapIndexMap[high])

-			while(low<=high) {

-				i=low+((high-low)/2);

-				// never happens

-				if (i<0 || i>=_countof(BitmapIndexMap)) DebugBreak();

-				if (BitmapIndexMap[i]==countryNumber) return i;

-				if (countryNumber>BitmapIndexMap[i]) low=i+1;      

-				else high=i-1;

-			}*/

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

-			if (BitmapIndexMap[i]==countryNumber) return i;

-		}

-	}

+	if (countryNumber > 0)

+		for (int i = 0; i < _countof(BitmapIndexMap); i++)

+			if (BitmapIndexMap[i] == countryNumber)

+				return i;

+

 	/* Other,Unknown,Unspecified */

 	return 0;

 }

@@ -128,9 +118,9 @@ static HANDLE *phIconHandles = nullptr;
 HICON LoadFlag(int countryNumber)

 {

 	/* create identifier */

-	char *szCountry = (char*)CallService(MS_UTILS_GETCOUNTRYBYNUMBER,countryNumber,0);

+	char *szCountry = (char *)CallService(MS_UTILS_GETCOUNTRYBYNUMBER, countryNumber, 0);

 	if (szCountry == nullptr)

-		szCountry = (char*)CallService(MS_UTILS_GETCOUNTRYBYNUMBER,countryNumber=0xFFFF,0);

+		szCountry = (char *)CallService(MS_UTILS_GETCOUNTRYBYNUMBER, countryNumber = 0xFFFF, 0);

 

 	char szId[20];

 	mir_snprintf(szId, (countryNumber == 0xFFFF) ? "%s_0x%X" : "%s_%i", "flags", countryNumber); /* buffer safe */

@@ -141,65 +131,64 @@ HANDLE LoadFlagHandle(int countryNumber)
 {

 	if (phIconHandles == nullptr)

 		return nullptr;

-		

-	return phIconHandles[ CountryNumberToIndex(countryNumber) ];

+

+	return phIconHandles[CountryNumberToIndex(countryNumber)];

 }

 

 int CountryNumberToIndex(int countryNumber)

 {

 	int nf = 0;

-	for(int i=0; i < nCountriesCount; i++) {

+	for (int i = 0; i < nCountriesCount; i++) {

 		if (countries[i].id == countryNumber) return i;

-		if (countries[i].id == 0xFFFF) nf=i;

+		if (countries[i].id == 0xFFFF) nf = i;

 	}

 	return nf; /* Unknown */

 }

 

-FIBITMAP* ConvertTo(FIBITMAP* dib, UINT destBits, bool greyscale)

+FIBITMAP *ConvertTo(FIBITMAP *dib, UINT destBits, bool greyscale)

 {

-	FIBITMAP* dib_res = nullptr;

+	FIBITMAP *dib_res = nullptr;

 	switch (destBits) {

-		case 8:

-			// convert to 8Bits

-			if (greyscale) {

-				dib_res = FreeImage_ConvertTo8Bits(dib);

+	case 8:

+		// convert to 8Bits

+		if (greyscale) {

+			dib_res = FreeImage_ConvertTo8Bits(dib);

+		}

+		else {

+			FIBITMAP *dib_tmp = FreeImage_ConvertTo24Bits(dib);

+			if (dib_tmp) {

+				dib_res = FreeImage_ColorQuantize(dib_tmp, FIQ_WUQUANT/*FIQ_NNQUANT*/);

+				FreeImage_Unload(dib_tmp);

 			}

-			else {

-				FIBITMAP* dib_tmp = FreeImage_ConvertTo24Bits(dib);

-				if (dib_tmp) {

-					dib_res = FreeImage_ColorQuantize(dib_tmp, FIQ_WUQUANT/*FIQ_NNQUANT*/);

-					FreeImage_Unload(dib_tmp);

-				}

-			} break;

-		case 16:

-			// convert to 16Bits

-			dib_res = FreeImage_ConvertTo16Bits555(dib);

-			break;

-		case 24:

-			// convert to 24Bits

-			dib_res = FreeImage_ConvertTo24Bits(dib);

-			break;

-		case 32:

-			// convert to 32Bits

-			dib_res = FreeImage_ConvertTo32Bits(dib);

-			break;

-		default:

-			break;

+		} break;

+	case 16:

+		// convert to 16Bits

+		dib_res = FreeImage_ConvertTo16Bits555(dib);

+		break;

+	case 24:

+		// convert to 24Bits

+		dib_res = FreeImage_ConvertTo24Bits(dib);

+		break;

+	case 32:

+		// convert to 32Bits

+		dib_res = FreeImage_ConvertTo32Bits(dib);

+		break;

+	default:

+		break;

 	}

 	FreeImage_Unload(dib);

 	return dib_res;

 }

 

-FIBITMAP* LoadResource(UINT ID, LPTSTR lpType)

+FIBITMAP *LoadResource(UINT ID, LPTSTR lpType)

 {

-	FIBITMAP *dib      = nullptr;

+	FIBITMAP *dib = nullptr;

 	if (lpType) {

-		HRSRC	hResInfo	= FindResource(g_plugin.getInst(),MAKEINTRESOURCE(ID),lpType);

-		DWORD	ResSize		= SizeofResource(g_plugin.getInst(),hResInfo);

-		HGLOBAL	hRes		= LoadResource(g_plugin.getInst(),hResInfo);

-		BYTE*	buffer		= (BYTE*)LockResource(hRes);

-		if (buffer)

-		{

+		HRSRC	hResInfo = FindResource(g_plugin.getInst(), MAKEINTRESOURCE(ID), lpType);

+		DWORD	ResSize = SizeofResource(g_plugin.getInst(), hResInfo);

+		HGLOBAL	hRes = LoadResource(g_plugin.getInst(), hResInfo);

+		BYTE *buffer = (BYTE *)LockResource(hRes);

+		if (buffer) {

 			// attach the binary data to a memory stream

 			FIMEMORY *hmem = FreeImage_OpenMemory(buffer, ResSize);

 			// get the file type

@@ -214,7 +203,7 @@ FIBITMAP* LoadResource(UINT ID, LPTSTR lpType)
 		FreeResource(hRes);

 	}

 	else {

-		HBITMAP hScrBM = (HBITMAP)LoadImage(g_plugin.getInst(),MAKEINTRESOURCE(ID), IMAGE_BITMAP, 0, 0,LR_SHARED);

+		HBITMAP hScrBM = (HBITMAP)LoadImage(g_plugin.getInst(), MAKEINTRESOURCE(ID), IMAGE_BITMAP, 0, 0, LR_SHARED);

 		if (hScrBM == nullptr)

 			return dib;

 		dib = FreeImage_CreateDIBFromHBITMAP(hScrBM);

@@ -225,57 +214,58 @@ FIBITMAP* LoadResource(UINT ID, LPTSTR lpType)
 

 /************************* Services *******************************/

 

-static INT_PTR ServiceLoadFlagIcon(WPARAM wParam,LPARAM lParam)

+static INT_PTR ServiceLoadFlagIcon(WPARAM wParam, LPARAM lParam)

 {

 	/* return handle */

 	if ((BOOL)lParam) {

-		if (phIconHandles==nullptr) return NULL;

+		if (phIconHandles == nullptr) return NULL;

 		return (INT_PTR)phIconHandles[CountryNumberToIndex((int)wParam)];

 	}

 	/* return icon */

 	return (INT_PTR)LoadFlag(wParam);

 }

 

-static INT_PTR ServiceCreateMergedFlagIcon(WPARAM wParam,LPARAM lParam)

+static INT_PTR ServiceCreateMergedFlagIcon(WPARAM wParam, LPARAM lParam)

 {

-	//TODO: use freeimage to create merget icon and add RGB(A) support

-	ICONINFO icoi;

-	BITMAP bm;

-	HICON hIcon=nullptr;

 	/* load both icons */

-	HICON hLowerIcon=(HICON)ServiceLoadFlagIcon((WPARAM)lParam,0);

-	if (hLowerIcon == nullptr) return NULL;

-	HICON hUpperIcon=(HICON)ServiceLoadFlagIcon(wParam,0);

+	HICON hLowerIcon = (HICON)ServiceLoadFlagIcon((WPARAM)lParam, 0);

+	if (hLowerIcon == nullptr)

+		return NULL;

+	

+	HICON hUpperIcon = (HICON)ServiceLoadFlagIcon(wParam, 0);

 	/* merge them */

-	if (GetIconInfo(hLowerIcon,&icoi)) {

-		if (hUpperIcon!=nullptr && GetObject(icoi.hbmColor,sizeof(bm),&bm)) {

-			HDC hdc=CreateCompatibleDC(nullptr);

-			if (hdc!=nullptr) {

-				POINT aptTriangle[3];

-				memset(&aptTriangle, 0, sizeof(aptTriangle));

-				aptTriangle[1].y=bm.bmHeight-1;

-				aptTriangle[2].x=bm.bmWidth-1;

-				HRGN hrgn=CreatePolygonRgn(aptTriangle,_countof(aptTriangle),WINDING);

-				if (hrgn!=nullptr) {

-					SelectClipRgn(hdc,hrgn);

-					HBITMAP hbmPrev=(HBITMAP)SelectObject(hdc,icoi.hbmColor);

-					if (hbmPrev!=nullptr) {  /* error on select? */

-						if (DrawIconEx(hdc,0,0,hUpperIcon,bm.bmWidth,bm.bmHeight,0,nullptr,DI_NOMIRROR|DI_IMAGE)) {

-							if (SelectObject(hdc,icoi.hbmMask)!=nullptr) /* error on select? */

-								DrawIconEx(hdc,0,0,hUpperIcon,bm.bmWidth,bm.bmHeight,0,nullptr,DI_NOMIRROR|DI_MASK);

-						}

-						SelectObject(hdc,hbmPrev);

+	ICONINFO icoi;

+	if (!GetIconInfo(hLowerIcon, &icoi))

+		return NULL;

+

+	BITMAP bm;

+	if (hUpperIcon != nullptr && GetObject(icoi.hbmColor, sizeof(bm), &bm)) {

+		HDC hdc = CreateCompatibleDC(nullptr);

+		if (hdc != nullptr) {

+			POINT aptTriangle[3];

+			memset(&aptTriangle, 0, sizeof(aptTriangle));

+			aptTriangle[1].y = bm.bmHeight - 1;

+			aptTriangle[2].x = bm.bmWidth - 1;

+			HRGN hrgn = CreatePolygonRgn(aptTriangle, _countof(aptTriangle), WINDING);

+			if (hrgn != nullptr) {

+				SelectClipRgn(hdc, hrgn);

+				HBITMAP hbmPrev = (HBITMAP)SelectObject(hdc, icoi.hbmColor);

+				if (hbmPrev != nullptr) {  /* error on select? */

+					if (DrawIconEx(hdc, 0, 0, hUpperIcon, bm.bmWidth, bm.bmHeight, 0, nullptr, DI_NOMIRROR | DI_IMAGE)) {

+						if (SelectObject(hdc, icoi.hbmMask) != nullptr) /* error on select? */

+							DrawIconEx(hdc, 0, 0, hUpperIcon, bm.bmWidth, bm.bmHeight, 0, nullptr, DI_NOMIRROR | DI_MASK);

 					}

-					DeleteObject(hrgn);

+					SelectObject(hdc, hbmPrev);

 				}

-				DeleteDC(hdc);

+				DeleteObject(hrgn);

 			}

+			DeleteDC(hdc);

 		}

-		/* create icon */

-		hIcon=CreateIconIndirect(&icoi);

-		DeleteObject(icoi.hbmColor);

-		DeleteObject(icoi.hbmMask);

 	}

+	/* create icon */

+	HICON hIcon = CreateIconIndirect(&icoi);

+	DeleteObject(icoi.hbmColor);

+	DeleteObject(icoi.hbmMask);

 	return (INT_PTR)hIcon;

 }

 

@@ -305,26 +295,25 @@ void InitIcons()
 	UINT b = t + FreeImage_GetHeight(dib);

 

 	// copy dib to new dib_ico (centered)

-	if (FreeImage_Paste(dib_ico, dib, 0, t - 1, 255 + 1)) {

-		FreeImage_Unload(dib);	dib = nullptr;

-

-		// Calculate the number of bytes per pixel (3 for 24-bit or 4 for 32-bit)

-		int bytespp = FreeImage_GetLine(dib_ico) / w;

-		// set alpha schannel

-		for (unsigned y = 0; y < h; y++) {

-			BYTE *bits = FreeImage_GetScanLine(dib_ico, y);

-			for (unsigned x = 0; x < w; x++) {

-				bits[FI_RGBA_ALPHA] = (y < t || y >= b) ? 0 : 255;

-				// jump to next pixel

-				bits += bytespp;

-			}

-		}

-	}

-	else {

+	if (!FreeImage_Paste(dib_ico, dib, 0, t - 1, 255 + 1)) {

 		FreeImage_Unload(dib);

 		FreeImage_Unload(dib_ico);

 		return;

 	}

+	

+	FreeImage_Unload(dib);	dib = nullptr;

+

+	// Calculate the number of bytes per pixel (3 for 24-bit or 4 for 32-bit)

+	int bytespp = FreeImage_GetLine(dib_ico) / w;

+	// set alpha schannel

+	for (unsigned y = 0; y < h; y++) {

+		BYTE *bits = FreeImage_GetScanLine(dib_ico, y);

+		for (unsigned x = 0; x < w; x++) {

+			bits[FI_RGBA_ALPHA] = (y < t || y >= b) ? 0 : 255;

+			// jump to next pixel

+			bits += bytespp;

+		}

+	}

 

 	HBITMAP hScrBM = FreeImage_CreateHBITMAPFromDIB(dib_ico);

 	FreeImage_Unload(dib_ico);

@@ -338,40 +327,42 @@ void InitIcons()
 	hScrBM = nullptr;

 

 	if (himl != nullptr) {

-		phIconHandles = (HANDLE*)mir_alloc(nCountriesCount*sizeof(HANDLE));

+		phIconHandles = (HANDLE *)mir_alloc(nCountriesCount * sizeof(HANDLE));

 		if (phIconHandles != nullptr) {

-			char szId[20];

+			char szId[100];

 			SKINICONDESC sid = {};

 			sid.section.w = LPGENW("Country flags");

 			sid.pszName = szId; // name to refer to icon when playing and in db

 			sid.flags = SIDF_SORTED | SIDF_UNICODE;

 

-			for (int i=0; i < nCountriesCount; i++) {

+			for (int i = 0; i < nCountriesCount; i++) {

 				sid.description.w = mir_a2u(LPGEN(countries[i].szName));

 				/* create identifier */

 				mir_snprintf(szId, (countries[i].id == 0xFFFF) ? "%s0x%X" : "%s%i", "flags_", countries[i].id); /* buffer safe */

-				int index = CountryNumberToBitmapIndex(countries[i].id);

+

 				/* create icon */

+				int index = CountryNumberToBitmapIndex(countries[i].id);

 				sid.hDefaultIcon = ImageList_ExtractIcon(NULL, himl, index);

-				index = CountryNumberToIndex(countries[i].id);

 

+				index = CountryNumberToIndex(countries[i].id);

 				phIconHandles[index] = g_plugin.addIcon(&sid);

+

 				if (sid.hDefaultIcon != nullptr)

 					DestroyIcon(sid.hDefaultIcon);

-				mir_free(sid.description.w); sid.description.w = nullptr;

+				mir_free(sid.description.w);

 			}

 		}

 		ImageList_Destroy(himl);

 	}

 

 	// create services

-	CreateServiceFunction(MS_FLAGS_LOADFLAGICON,ServiceLoadFlagIcon);

-	CreateServiceFunction(MS_FLAGS_CREATEMERGEDFLAGICON,ServiceCreateMergedFlagIcon);

+	CreateServiceFunction(MS_FLAGS_LOADFLAGICON, ServiceLoadFlagIcon);

+	CreateServiceFunction(MS_FLAGS_CREATEMERGEDFLAGICON, ServiceCreateMergedFlagIcon);

 }

 

 void UninitIcons()

 {

-	for(int i=0;i<nCountriesCount;++i) {

+	for (int i = 0; i < nCountriesCount; ++i) {

 		// create identifier

 		char szId[20];

 		mir_snprintf(szId, (countries[i].id == 0xFFFF) ? "%s0x%X" : "%s%i", "flags_", countries[i].id); /* buffer safe */