From 65c6790a7463df68854d14917de26b101d35553f Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 27 Feb 2014 13:51:27 +0000
Subject: minor code cleaning

git-svn-id: http://svn.miranda-ng.org/main/trunk@8294 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/core/miranda.h                    | 12 ++++++------
 src/core/modules.cpp                  |  8 ++++++--
 src/core/stdclist/src/clistopts.cpp   |  2 +-
 src/core/stduseronline/useronline.cpp |  4 ++--
 4 files changed, 15 insertions(+), 11 deletions(-)

(limited to 'src/core')

diff --git a/src/core/miranda.h b/src/core/miranda.h
index 29ef7d8509..83af987c5a 100644
--- a/src/core/miranda.h
+++ b/src/core/miranda.h
@@ -147,17 +147,17 @@ PROTOACCOUNT* __fastcall Proto_GetAccount(const char* accName);
 PROTOACCOUNT* __fastcall Proto_GetAccount(MCONTACT hContact);
 PROTOCOLDESCRIPTOR* __fastcall Proto_IsProtocolLoaded(const char* szProtoName);
 
-bool __fastcall Proto_IsAccountEnabled(PROTOACCOUNT* pa);
-bool __fastcall Proto_IsAccountLocked(PROTOACCOUNT* pa);
+bool __fastcall Proto_IsAccountEnabled(PROTOACCOUNT *pa);
+bool __fastcall Proto_IsAccountLocked(PROTOACCOUNT *pa);
 
 PROTO_INTERFACE* AddDefaultAccount(const char* szProtoName);
 int  FreeDefaultAccount(PROTO_INTERFACE* ppi);
 
-BOOL ActivateAccount(PROTOACCOUNT* pa);
+BOOL ActivateAccount(PROTOACCOUNT *pa);
 void EraseAccount(const char *pszProtoName);
-void DeactivateAccount(PROTOACCOUNT* pa, bool bIsDynamic, bool bErase);
-void UnloadAccount(PROTOACCOUNT* pa, bool bIsDynamic, bool bErase);
-void OpenAccountOptions(PROTOACCOUNT* pa);
+void DeactivateAccount(PROTOACCOUNT *pa, bool bIsDynamic, bool bErase);
+void UnloadAccount(PROTOACCOUNT *pa, bool bIsDynamic, bool bErase);
+void OpenAccountOptions(PROTOACCOUNT *pa);
 
 void LoadDbAccounts(void);
 void WriteDbAccounts(void);
diff --git a/src/core/modules.cpp b/src/core/modules.cpp
index b38bf3bad6..3111bc9e7d 100644
--- a/src/core/modules.cpp
+++ b/src/core/modules.cpp
@@ -150,7 +150,9 @@ int LoadDefaultModules(void)
 	if (LoadContactsModule()) return 1;
 	if (LoadContactListModule()) return 1;   // prepare contact list interface
 	if (LoadAddContactModule()) return 1;
-	// if (LoadMetacontacts()) return 1;
+	#ifdef _DEBUG
+		if (LoadMetacontacts()) return 1;
+	#endif
 	if (LoadNewPluginsModule()) return 1;    // will call Load(void) on everything, clist will load first
 
 	Langpack_SortDuplicates();
@@ -169,7 +171,9 @@ void UnloadDefaultModules(void)
 {
 	UnloadChatModule();
 	UnloadAccountsModule();
-	// UnloadMetacontacts();
+	#ifdef _DEBUG
+		UnloadMetacontacts();
+	#endif
 	UnloadNewPlugins();
 	UnloadProtocolsModule();
 	UnloadSkinSounds();
diff --git a/src/core/stdclist/src/clistopts.cpp b/src/core/stdclist/src/clistopts.cpp
index 65a3b8cb61..4bff8fb660 100644
--- a/src/core/stdclist/src/clistopts.cpp
+++ b/src/core/stdclist/src/clistopts.cpp
@@ -213,7 +213,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 cur = SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_GETCURSEL, 0, 0);
-					PROTOACCOUNT* pa = ( PROTOACCOUNT* )SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_GETITEMDATA, cur, 0 );
+					PROTOACCOUNT *pa = ( PROTOACCOUNT* )SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_GETITEMDATA, cur, 0 );
 					if ( pa == NULL )
 						db_unset(NULL, "CList", "PrimaryStatus");
 					else
diff --git a/src/core/stduseronline/useronline.cpp b/src/core/stduseronline/useronline.cpp
index 2f896fe3af..6c81c97084 100644
--- a/src/core/stduseronline/useronline.cpp
+++ b/src/core/stduseronline/useronline.cpp
@@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 static int uniqueEventId = 0;
 
-static bool Proto_IsAccountEnabled(PROTOACCOUNT* pa)
+static bool Proto_IsAccountEnabled(PROTOACCOUNT *pa)
 {
 	return pa && ((pa->bIsEnabled && !pa->bDynDisabled) || pa->bOldProto);
 }
@@ -105,7 +105,7 @@ static int UserOnlineModulesLoaded(WPARAM, LPARAM)
 
 static int UserOnlineAccountsChanged(WPARAM eventCode, LPARAM lParam)
 {
-	PROTOACCOUNT* pa = (PROTOACCOUNT*)lParam;
+	PROTOACCOUNT *pa = (PROTOACCOUNT*)lParam;
 
 	switch(eventCode) {
 	case PRAC_ADDED:
-- 
cgit v1.2.3