minor code cleaning

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

16 files changed, 18 insertions, 18 deletions

diff --git a/plugins/Clist_modern/src/modern_clcopts.cpp b/plugins/Clist_modern/src/modern_clcopts.cpp
index 4a941f26c2..6e0c31486f 100644
--- a/plugins/Clist_modern/src/modern_clcopts.cpp
+++ b/plugins/Clist_modern/src/modern_clcopts.cpp
@@ -880,7 +880,7 @@ static INT_PTR CALLBACK DlgProcTrayOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L
 				db_set_b(NULL, "CLUI", "XStatusTray", xOptions);

 

 				int cursel = SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_GETCURSEL, 0, 0);

-				PROTOACCOUNT* pa = (PROTOACCOUNT*)SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_GETITEMDATA, cursel, 0);

+				PROTOACCOUNT *pa = (PROTOACCOUNT*)SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_GETITEMDATA, cursel, 0);

 				if (!pa)

 					db_unset(NULL, "CList", "PrimaryStatus");

 				else

diff --git a/plugins/Clist_mw/src/CLUIFrames/statusbar.cpp b/plugins/Clist_mw/src/CLUIFrames/statusbar.cpp
index 975664458d..53c7e66741 100644
--- a/plugins/Clist_mw/src/CLUIFrames/statusbar.cpp
+++ b/plugins/Clist_mw/src/CLUIFrames/statusbar.cpp
@@ -87,7 +87,7 @@ void DrawDataForStatusBar(LPDRAWITEMSTRUCT dis)
 	else x += 2;

 

 	if (showOpts & 2) {

-		PROTOACCOUNT* pa = ProtoGetAccount(szProto);

+		PROTOACCOUNT *pa = ProtoGetAccount(szProto);

 		TCHAR szName[64];

 		mir_sntprintf(szName, SIZEOF(szName), _T("%s%s"), pa->tszAccountName, showOpts&4 ? _T(" ") : _T(""));

 		GetTextExtentPoint32(dis->hDC, szName, (int)_tcslen(szName), &textSize);

diff --git a/plugins/Clist_mw/src/clistopts.cpp b/plugins/Clist_mw/src/clistopts.cpp
index 5166bf63af..256536acc6 100644
--- a/plugins/Clist_mw/src/clistopts.cpp
+++ b/plugins/Clist_mw/src/clistopts.cpp
@@ -218,7 +218,7 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 							db_set_b(NULL,"CList","NoIconBlink", (BYTE)IsDlgButtonChecked(hwndDlg,IDC_ICONBLINK));

 							{

 								int cursel = SendDlgItemMessage(hwndDlg,IDC_PRIMARYSTATUS,CB_GETCURSEL,0,0);

-								PROTOACCOUNT* pa = (PROTOACCOUNT*)SendDlgItemMessage(hwndDlg,IDC_PRIMARYSTATUS,CB_GETITEMDATA,cursel,0);

+								PROTOACCOUNT *pa = (PROTOACCOUNT*)SendDlgItemMessage(hwndDlg,IDC_PRIMARYSTATUS,CB_GETITEMDATA,cursel,0);

 								if ( pa == NULL )

 									db_unset(NULL, "CList","PrimaryStatus");

 								else

diff --git a/plugins/Clist_nicer/src/clistopts.cpp b/plugins/Clist_nicer/src/clistopts.cpp
index b6758f0fee..bf6ce21a9b 100644
--- a/plugins/Clist_nicer/src/clistopts.cpp
+++ b/plugins/Clist_nicer/src/clistopts.cpp
@@ -188,7 +188,7 @@ INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 				cfg::writeByte("CList", "NoTrayTips", (BYTE)cfg::dat.bNoTrayTips);

 				{

 					int cursel = SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_GETCURSEL, 0, 0);

-					PROTOACCOUNT* pa = (PROTOACCOUNT*)SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_GETITEMDATA, cursel, 0);

+					PROTOACCOUNT *pa = (PROTOACCOUNT*)SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_GETITEMDATA, cursel, 0);

 					if ( !pa )

 						db_unset(NULL, "CList", "PrimaryStatus");

 					else

diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp
index df05b2397d..25620c7c93 100644
--- a/plugins/Clist_nicer/src/clui.cpp
+++ b/plugins/Clist_nicer/src/clui.cpp
@@ -1723,7 +1723,7 @@ buttons_done:
 

 				if (showOpts & 2) {

 					TCHAR szName[64];

-					PROTOACCOUNT* pa = ProtoGetAccount( szProto );

+					PROTOACCOUNT *pa = ProtoGetAccount( szProto );

 					if ( pa ) {

 						lstrcpyn( szName, pa->tszAccountName, SIZEOF(szName));

 						szName[ SIZEOF(szName)-1 ] = 0;

diff --git a/plugins/Clist_nicer/src/cluiservices.cpp b/plugins/Clist_nicer/src/cluiservices.cpp
index 2dea0bfa67..e9140ed75b 100644
--- a/plugins/Clist_nicer/src/cluiservices.cpp
+++ b/plugins/Clist_nicer/src/cluiservices.cpp
@@ -122,7 +122,7 @@ void CluiProtocolStatusChanged( int parStatus, const char* szProto )
 		int x;

 		HFONT hofont;

 		TCHAR szName[32];

-		PROTOACCOUNT* pa;

+		PROTOACCOUNT *pa;

 

 		hdc=GetDC(NULL);

 		hofont = reinterpret_cast<HFONT>(SelectObject(hdc,(HFONT)SendMessage(pcli->hwndStatus,WM_GETFONT,0,0)));

diff --git a/plugins/Clist_nicer/src/contact.cpp b/plugins/Clist_nicer/src/contact.cpp
index 1fb7fb9b9a..5272152279 100644
--- a/plugins/Clist_nicer/src/contact.cpp
+++ b/plugins/Clist_nicer/src/contact.cpp
@@ -180,7 +180,7 @@ int __forceinline GetProtoIndex(char * szName)
 	if ( !szName )

 		return -1;

 

-	PROTOACCOUNT* pa = ProtoGetAccount( szName );

+	PROTOACCOUNT *pa = ProtoGetAccount( szName );

 	return ( pa == NULL ) ? -1 : pa->iOrder;

 }

 

diff --git a/plugins/NewXstatusNotify/src/options.cpp b/plugins/NewXstatusNotify/src/options.cpp
index be7ad11dbd..4b840f726b 100644
--- a/plugins/NewXstatusNotify/src/options.cpp
+++ b/plugins/NewXstatusNotify/src/options.cpp
@@ -693,7 +693,7 @@ INT_PTR CALLBACK DlgProcXPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 	return FALSE;

 }

 

-bool IsSuitableProto(PROTOACCOUNT* pa)

+bool IsSuitableProto(PROTOACCOUNT *pa)

 {

 	if ( pa == NULL )

 		return false;

diff --git a/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.h b/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.h
index 4e7ed9ba50..984069e6a3 100644
--- a/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.h
+++ b/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.h
@@ -55,7 +55,7 @@
 

 struct TAAAProtoSetting : public PROTOCOLSETTINGEX, public MZeroedObject

 {

-	TAAAProtoSetting(PROTOACCOUNT* pa);

+	TAAAProtoSetting(PROTOACCOUNT *pa);

 	~TAAAProtoSetting();

 

 	int originalStatusMode;

diff --git a/plugins/StatusPlugins/KeepStatus/keepstatus.cpp b/plugins/StatusPlugins/KeepStatus/keepstatus.cpp
index 13bf159ead..41dee6ec7c 100644
--- a/plugins/StatusPlugins/KeepStatus/keepstatus.cpp
+++ b/plugins/StatusPlugins/KeepStatus/keepstatus.cpp
@@ -91,7 +91,7 @@ static DWORD CALLBACK MessageWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 extern int OptionsInit(WPARAM wparam,LPARAM);

 extern int InitCommonStatus();

 

-TConnectionSettings::TConnectionSettings( PROTOACCOUNT* pa )

+TConnectionSettings::TConnectionSettings( PROTOACCOUNT *pa )

 {

 	cbSize = sizeof(PROTOCOLSETTINGEX);

 	szName = pa->szModuleName;

@@ -1169,7 +1169,7 @@ static DWORD CALLBACK MessageWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 

 int OnAccChanged(WPARAM wParam, LPARAM lParam)

 {

-	PROTOACCOUNT* pa = (PROTOACCOUNT*)lParam;

+	PROTOACCOUNT *pa = (PROTOACCOUNT*)lParam;

 	switch (wParam) {

 	case PRAC_ADDED:

 		connectionSettings.insert(new TConnectionSettings(pa));

diff --git a/plugins/StatusPlugins/KeepStatus/keepstatus.h b/plugins/StatusPlugins/KeepStatus/keepstatus.h
index 9df88b36bb..d52b7b218f 100644
--- a/plugins/StatusPlugins/KeepStatus/keepstatus.h
+++ b/plugins/StatusPlugins/KeepStatus/keepstatus.h
@@ -105,7 +105,7 @@
 

 struct TConnectionSettings : public PROTOCOLSETTINGEX

 {

-	TConnectionSettings( PROTOACCOUNT* pa );

+	TConnectionSettings( PROTOACCOUNT *pa );

 	~TConnectionSettings();

 

 	int lastStatusAckTime; // the time the last status ack was received

diff --git a/plugins/StatusPlugins/StartupStatus/startupstatus.cpp b/plugins/StatusPlugins/StartupStatus/startupstatus.cpp
index f43d556e3c..f00a0a49dc 100644
--- a/plugins/StatusPlugins/StartupStatus/startupstatus.cpp
+++ b/plugins/StatusPlugins/StartupStatus/startupstatus.cpp
@@ -37,7 +37,7 @@ TSSSetting::TSSSetting(PROTOACCOUNT *pa)
 	szMsg = NULL;

 }

 

-TSSSetting::TSSSetting(int profile, PROTOACCOUNT* pa)

+TSSSetting::TSSSetting(int profile, PROTOACCOUNT *pa)

 {

 	cbSize = sizeof(PROTOCOLSETTINGEX);

 

@@ -183,7 +183,7 @@ static void SetLastStatusMessages(TSettingsList &ps)
 

 int OnAccChanged(WPARAM wParam, LPARAM lParam)

 {

-	PROTOACCOUNT* pa = (PROTOACCOUNT*)lParam;

+	PROTOACCOUNT *pa = (PROTOACCOUNT*)lParam;

 	switch (wParam) {

 	case PRAC_ADDED:

 		startupSettings.insert(new TSSSetting(-1, pa));

diff --git a/plugins/StopSpamPlus/src/opt_proto.cpp b/plugins/StopSpamPlus/src/opt_proto.cpp
index 86ba136999..a3bedbe2ed 100644
--- a/plugins/StopSpamPlus/src/opt_proto.cpp
+++ b/plugins/StopSpamPlus/src/opt_proto.cpp
@@ -6,7 +6,7 @@ struct ProtocolData
 	int show,enabled;

 };

 

-int IsProtoIM(const PROTOACCOUNT* pa)

+int IsProtoIM(const PROTOACCOUNT *pa)

 {

 	return (CallProtoService(pa->szModuleName, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_IM);

 }

diff --git a/plugins/TrafficCounter/src/statistics.cpp b/plugins/TrafficCounter/src/statistics.cpp
index a55659b96e..f34f796bc8 100644
--- a/plugins/TrafficCounter/src/statistics.cpp
+++ b/plugins/TrafficCounter/src/statistics.cpp
@@ -330,7 +330,7 @@ void Stat_ReadFile(BYTE n)
 	if (Size.QuadPart != 0) // Если файл со статистикой существует и имеет ненулевой размер...

 	{

 		// ...то читаем статистику из файла

-		ProtoList[n].NumberOfRecords = Size.QuadPart/sizeof(HOURLYSTATS);

+		ProtoList[n].NumberOfRecords = DWORD(Size.QuadPart/sizeof(HOURLYSTATS));

 		ProtoList[n].AllStatistics = (HOURLYSTATS*)mir_alloc(sizeof(HOURLYSTATS)*ProtoList[n].NumberOfRecords);

 		ReadFile(ProtoList[n].hFile, &ProtoList[n].AllStatistics[0], sizeof(HOURLYSTATS)*ProtoList[n].NumberOfRecords, &BytesRead, NULL);

 		if (!BytesRead)

diff --git a/plugins/XSoundNotify/src/Common.h b/plugins/XSoundNotify/src/Common.h
index c87618ceae..d635ed6079 100644
--- a/plugins/XSoundNotify/src/Common.h
+++ b/plugins/XSoundNotify/src/Common.h
@@ -41,7 +41,7 @@ extern HINSTANCE hInst;
 extern HANDLE hChangeSoundDlgList;

 extern BYTE isIgnoreSound, isOwnSound;

 

-bool IsSuitableProto(PROTOACCOUNT* pa);

+bool IsSuitableProto(PROTOACCOUNT *pa);

 

 INT OptInit(WPARAM wParam, LPARAM lParam);

 

diff --git a/plugins/XSoundNotify/src/options.cpp b/plugins/XSoundNotify/src/options.cpp
index cd3bec8380..c862d9a6a8 100644
--- a/plugins/XSoundNotify/src/options.cpp
+++ b/plugins/XSoundNotify/src/options.cpp
@@ -9,7 +9,7 @@ There is no warranty.
 

 #include "Common.h"

 

-bool IsSuitableProto(PROTOACCOUNT* pa)

+bool IsSuitableProto(PROTOACCOUNT *pa)

 {

 	if (pa == NULL)

 		return false;