- PLUGININFO structure removed at all;

- Options_AddPage & UserInfo_AddPage replaced MS_OPT_ADDPAGE & MS_USERINFO_ADDPAGE services respectively
- total internal redesign of options' translation
- code reformatting

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

1 files changed, 107 insertions, 107 deletions

diff --git a/src/modules/database/dbutils.cpp b/src/modules/database/dbutils.cpp
index 6cad16035b..dede30691b 100644
--- a/src/modules/database/dbutils.cpp
+++ b/src/modules/database/dbutils.cpp
@@ -24,51 +24,51 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "..\..\core\commonheaders.h"

 #include "profilemanager.h"

 

-static int CompareEventTypes( const DBEVENTTYPEDESCR* p1, const DBEVENTTYPEDESCR* p2 )

+static int CompareEventTypes(const DBEVENTTYPEDESCR* p1, const DBEVENTTYPEDESCR* p2)

 {

-	int result = strcmp( p1->module, p2->module );

-	if ( result )

+	int result = strcmp(p1->module, p2->module);

+	if (result)

 		return result;

 

 	return p1->eventType - p2->eventType;

 }

 

-static LIST<DBEVENTTYPEDESCR> eventTypes( 10, CompareEventTypes );

+static LIST<DBEVENTTYPEDESCR> eventTypes(10, CompareEventTypes);

 

 static BOOL bModuleInitialized = FALSE;

 

 static INT_PTR DbEventTypeRegister(WPARAM, LPARAM lParam)

 {

-	DBEVENTTYPEDESCR* et = ( DBEVENTTYPEDESCR* )lParam;

-	if ( eventTypes.getIndex( et ) == -1 ) {

-		DBEVENTTYPEDESCR* p = ( DBEVENTTYPEDESCR* )mir_alloc( sizeof( DBEVENTTYPEDESCR ));

+	DBEVENTTYPEDESCR* et = (DBEVENTTYPEDESCR*)lParam;

+	if (eventTypes.getIndex(et) == -1) {

+		DBEVENTTYPEDESCR* p = (DBEVENTTYPEDESCR*)mir_alloc(sizeof(DBEVENTTYPEDESCR));

 		p->cbSize = DBEVENTTYPEDESCR_SIZE;

-		p->module = mir_strdup( et->module );

+		p->module = mir_strdup(et->module);

 		p->eventType = et->eventType; 

-		p->descr  = mir_strdup( et->descr  );

+		p->descr  = mir_strdup(et->descr);

 		p->textService = NULL;

 		p->iconService = NULL;

 		p->eventIcon = NULL;

 		p->flags = 0;

-		if ( et->cbSize == DBEVENTTYPEDESCR_SIZE ) {

-			if ( et->textService )

-				p->textService = mir_strdup( et->textService );

-			if ( et->iconService )

-				p->iconService = mir_strdup( et->iconService );

+		if (et->cbSize == DBEVENTTYPEDESCR_SIZE) {

+			if (et->textService)

+				p->textService = mir_strdup(et->textService);

+			if (et->iconService)

+				p->iconService = mir_strdup(et->iconService);

 			p->eventIcon = et->eventIcon;

 			p->flags = et->flags;

 		}

-		if ( !p->textService ) {

+		if ( !p->textService) {

 			char szServiceName[100];

-			mir_snprintf( szServiceName, sizeof(szServiceName), "%s/GetEventText%d", p->module, p->eventType );

-			p->textService = mir_strdup( szServiceName );

+			mir_snprintf(szServiceName, sizeof(szServiceName), "%s/GetEventText%d", p->module, p->eventType);

+			p->textService = mir_strdup(szServiceName);

 		}

-		if ( !p->iconService ) {

+		if ( !p->iconService) {

 			char szServiceName[100];

-			mir_snprintf( szServiceName, sizeof(szServiceName), "%s/GetEventIcon%d", p->module, p->eventType );

-			p->iconService = mir_strdup( szServiceName );

+			mir_snprintf(szServiceName, sizeof(szServiceName), "%s/GetEventIcon%d", p->module, p->eventType);

+			p->iconService = mir_strdup(szServiceName);

 		}

-		eventTypes.insert( p );

+		eventTypes.insert(p);

 	}

 

 	return 0;

@@ -79,12 +79,12 @@ static INT_PTR DbEventTypeGet(WPARAM wParam, LPARAM lParam)
 	DBEVENTTYPEDESCR tmp;

 	int idx;

 

-	tmp.module = ( char* )wParam;

+	tmp.module = (char*)wParam;

 	tmp.eventType = lParam;

-	if ( !List_GetIndex(( SortedList* )&eventTypes, &tmp, &idx ))

+	if ( !List_GetIndex((SortedList*)&eventTypes, &tmp, &idx))

 		return 0;

 

-	return ( INT_PTR )eventTypes[idx];

+	return (INT_PTR)eventTypes[idx];

 }

 

 static INT_PTR DbEventGetText(WPARAM wParam, LPARAM lParam)

@@ -93,147 +93,147 @@ static INT_PTR DbEventGetText(WPARAM wParam, LPARAM lParam)
 	BOOL bIsDenyUnicode = (egt->datatype & DBVTF_DENYUNICODE);

 

 	DBEVENTINFO* dbei = egt->dbei;

-	DBEVENTTYPEDESCR* et = ( DBEVENTTYPEDESCR* )DbEventTypeGet(( WPARAM )dbei->szModule, ( LPARAM )dbei->eventType );

+	DBEVENTTYPEDESCR* et = (DBEVENTTYPEDESCR*)DbEventTypeGet((WPARAM)dbei->szModule, (LPARAM)dbei->eventType);

 

-	if ( et && ServiceExists( et->textService ))

-		return CallService( et->textService, wParam, lParam );

+	if (et && ServiceExists(et->textService))

+		return CallService(et->textService, wParam, lParam);

 

-	if ( !dbei->pBlob ) return 0;

+	if ( !dbei->pBlob) return 0;

 

-	if ( dbei->eventType == EVENTTYPE_FILE ) {

+	if (dbei->eventType == EVENTTYPE_FILE) {

 		char* filename = ((char *)dbei->pBlob) + sizeof(DWORD);

-		char* descr = filename + lstrlenA( filename ) + 1;

+		char* descr = filename + lstrlenA(filename) + 1;

 		char* str = (*descr == 0) ? filename : descr;

-		switch ( egt->datatype ) {

+		switch (egt->datatype) {

 		case DBVT_WCHAR:

-			return ( INT_PTR )(( dbei->flags & DBEF_UTF ) ? 

-					Utf8DecodeT( str ) : mir_a2t( str ));

+			return (INT_PTR)((dbei->flags & DBEF_UTF) ? 

+					Utf8DecodeT(str) : mir_a2t(str));

 		case DBVT_ASCIIZ:

-			return ( INT_PTR )(( dbei->flags & DBEF_UTF ) ? Utf8Decode( mir_strdup( str ), NULL ) : mir_strdup( str ));

+			return (INT_PTR)((dbei->flags & DBEF_UTF) ? Utf8Decode(mir_strdup(str), NULL) : mir_strdup(str));

 		}

 		return 0;

 	}

 

 	// temporary fix for bug with event types conflict between jabber chat states notifications

 	// and srmm's status changes, must be commented out in future releases

-	if ( dbei->eventType == 25368 && dbei->cbBlob == 1 && dbei->pBlob[0] == 1 )

+	if (dbei->eventType == 25368 && dbei->cbBlob == 1 && dbei->pBlob[0] == 1)

 		return 0;

 

 	egt->datatype &= ~DBVTF_DENYUNICODE;

-	if ( egt->datatype == DBVT_WCHAR )

+	if (egt->datatype == DBVT_WCHAR)

 	{

 		WCHAR* msg = NULL;

-        if ( dbei->flags & DBEF_UTF ) {

+        if (dbei->flags & DBEF_UTF) {

             char* str = (char*)alloca(dbei->cbBlob + 1);

             if (str == NULL) return NULL;

             memcpy(str, dbei->pBlob, dbei->cbBlob);

             str[dbei->cbBlob] = 0;

-			Utf8DecodeCP( str, egt->codepage, &msg );

+			Utf8DecodeCP(str, egt->codepage, &msg);

         }

 		else {

-			size_t msglen = strlen(( char* )dbei->pBlob) + 1, msglenW = 0;

-			if ( msglen !=  dbei->cbBlob ) {

-				size_t i, count = (( dbei->cbBlob - msglen ) / sizeof( WCHAR ));

-				WCHAR* p = ( WCHAR* )&dbei->pBlob[ msglen ];

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

-					if ( p[i] == 0 ) {

+			size_t msglen = strlen((char*)dbei->pBlob) + 1, msglenW = 0;

+			if (msglen !=  dbei->cbBlob) {

+				size_t i, count = ((dbei->cbBlob - msglen) / sizeof(WCHAR));

+				WCHAR* p = (WCHAR*)&dbei->pBlob[ msglen ];

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

+					if (p[i] == 0) {

 						msglenW = i;

 						break;

 			}	}	}

 

-			if ( msglenW > 0 && msglenW < msglen && !bIsDenyUnicode )

-				msg = mir_wstrdup(( WCHAR* )&dbei->pBlob[ msglen ] );

+			if (msglenW > 0 && msglenW < msglen && !bIsDenyUnicode)

+				msg = mir_wstrdup((WCHAR*)&dbei->pBlob[ msglen ]);

 			else {

-				msg = ( WCHAR* )mir_alloc( sizeof(WCHAR) * msglen );

-				MultiByteToWideChar( egt->codepage, 0, (char *) dbei->pBlob, -1, msg, (int)msglen );

+				msg = (WCHAR*)mir_alloc(sizeof(WCHAR) * msglen);

+				MultiByteToWideChar(egt->codepage, 0, (char *) dbei->pBlob, -1, msg, (int)msglen);

 		}	}

-		return ( INT_PTR )msg;

+		return (INT_PTR)msg;

 	}

-	else if ( egt->datatype == DBVT_ASCIIZ ) {

-		char* msg = mir_strdup(( char* )dbei->pBlob );

+	else if (egt->datatype == DBVT_ASCIIZ) {

+		char* msg = mir_strdup((char*)dbei->pBlob);

 		if (dbei->flags & DBEF_UTF)

-			Utf8DecodeCP( msg, egt->codepage, NULL );

+			Utf8DecodeCP(msg, egt->codepage, NULL);

 

-      return ( INT_PTR )msg;

+      return (INT_PTR)msg;

 	}

 	return 0;

 }

 

-static INT_PTR DbEventGetIcon( WPARAM wParam, LPARAM lParam )

+static INT_PTR DbEventGetIcon(WPARAM wParam, LPARAM lParam)

 {

-	DBEVENTINFO* dbei = ( DBEVENTINFO* )lParam;

+	DBEVENTINFO* dbei = (DBEVENTINFO*)lParam;

 	HICON icon = NULL;

-	DBEVENTTYPEDESCR* et = ( DBEVENTTYPEDESCR* )DbEventTypeGet(( WPARAM )dbei->szModule, ( LPARAM )dbei->eventType );

+	DBEVENTTYPEDESCR* et = (DBEVENTTYPEDESCR*)DbEventTypeGet((WPARAM)dbei->szModule, (LPARAM)dbei->eventType);

 

-	if ( et && ServiceExists( et->iconService )) {

-		icon = ( HICON )CallService( et->iconService, wParam, lParam );

-		if ( icon )

-			return ( INT_PTR )icon;

+	if (et && ServiceExists(et->iconService)) {

+		icon = (HICON)CallService(et->iconService, wParam, lParam);

+		if (icon)

+			return (INT_PTR)icon;

 	}

-	if ( et && et->eventIcon )

-		icon = ( HICON )CallService( MS_SKIN2_GETICONBYHANDLE, 0, ( LPARAM )et->eventIcon );

-	if ( !icon ) {

+	if (et && et->eventIcon)

+		icon = (HICON)CallService(MS_SKIN2_GETICONBYHANDLE, 0, (LPARAM)et->eventIcon);

+	if ( !icon) {

 		char szName[100];

-		mir_snprintf( szName, sizeof( szName ), "eventicon_%s%d", dbei->szModule, dbei->eventType );

-		icon = ( HICON )CallService( MS_SKIN2_GETICON, 0, ( LPARAM )szName );

+		mir_snprintf(szName, sizeof(szName), "eventicon_%s%d", dbei->szModule, dbei->eventType);

+		icon = (HICON)CallService(MS_SKIN2_GETICON, 0, (LPARAM)szName);

 	}

 

-	if ( !icon )

+	if ( !icon)

 	{

-		switch( dbei->eventType ) {

+		switch(dbei->eventType) {

 		case EVENTTYPE_URL:

-			icon = LoadSkinIcon( SKINICON_EVENT_URL );

+			icon = LoadSkinIcon(SKINICON_EVENT_URL);

 			break;

 

 		case EVENTTYPE_FILE:

-			icon = LoadSkinIcon( SKINICON_EVENT_FILE );

+			icon = LoadSkinIcon(SKINICON_EVENT_FILE);

 			break;

 

 		default: // EVENTTYPE_MESSAGE and unknown types

-			icon = LoadSkinIcon( SKINICON_EVENT_MESSAGE );

+			icon = LoadSkinIcon(SKINICON_EVENT_MESSAGE);

 			break;

 		}

 	}

 

-  if ( wParam & LR_SHARED )

-    return ( INT_PTR )icon;

+  if (wParam & LR_SHARED)

+    return (INT_PTR)icon;

   else

-    return ( INT_PTR )CopyIcon( icon );

+    return (INT_PTR)CopyIcon(icon);

 }

 

-static INT_PTR DbEventGetStringT( WPARAM wParam, LPARAM lParam )

+static INT_PTR DbEventGetStringT(WPARAM wParam, LPARAM lParam)

 {

-	DBEVENTINFO* dbei = ( DBEVENTINFO* )wParam;

-	char* string = ( char* )lParam;

+	DBEVENTINFO* dbei = (DBEVENTINFO*)wParam;

+	char* string = (char*)lParam;

 

-	if ( dbei->flags & DBEF_UTF )

-		return ( INT_PTR )Utf8DecodeUcs2( string );

+	if (dbei->flags & DBEF_UTF)

+		return (INT_PTR)Utf8DecodeUcs2(string);

 

-	return ( INT_PTR )mir_a2t( string );

+	return (INT_PTR)mir_a2t(string);

 }

 

 /////////////////////////////////////////////////////////////////////////////////////////

 

-static int sttEnumVars( const char* szVarName, LPARAM lParam )

+static int sttEnumVars(const char* szVarName, LPARAM lParam)

 {

-	LIST<char>* vars = ( LIST<char>* )lParam;

-	vars->insert( mir_strdup( szVarName ));

+	LIST<char>* vars = (LIST<char>*)lParam;

+	vars->insert(mir_strdup(szVarName));

 	return 0;

 }

 

-static INT_PTR DbDeleteModule( WPARAM, LPARAM lParam )

+static INT_PTR DbDeleteModule(WPARAM, LPARAM lParam)

 {

-	LIST<char> vars( 20 );

+	LIST<char> vars(20);

 

 	DBCONTACTENUMSETTINGS dbces = { 0 };

 	dbces.pfnEnumProc = sttEnumVars;

-	dbces.lParam = ( LPARAM )&vars;

-	dbces.szModule = ( char* )lParam;

-	CallService( MS_DB_CONTACT_ENUMSETTINGS, NULL, (LPARAM)&dbces );

+	dbces.lParam = (LPARAM)&vars;

+	dbces.szModule = (char*)lParam;

+	CallService(MS_DB_CONTACT_ENUMSETTINGS, NULL, (LPARAM)&dbces);

 

-	for ( int i=vars.getCount()-1; i >= 0; i-- ) {

-		DBDeleteContactSetting( NULL, ( char* )lParam, vars[i] );

-		mir_free( vars[i] );

+	for (int i=vars.getCount()-1; i >= 0; i--) {

+		DBDeleteContactSetting(NULL, (char*)lParam, vars[i]);

+		mir_free(vars[i]);

 	}

 	vars.destroy();

 	return 0;

@@ -241,14 +241,14 @@ static INT_PTR DbDeleteModule( WPARAM, LPARAM lParam )
 

 static INT_PTR GetProfilePath(WPARAM wParam, LPARAM lParam)

 {

-	if (!wParam || !lParam)

+	if ( !wParam || !lParam)

 		return 1;

 

 	char* dst = (char*)lParam;

 

-	char* tmp = mir_t2a( g_profileDir );

-	strncpy( dst, tmp, wParam );

-	mir_free( tmp );

+	char* tmp = mir_t2a(g_profileDir);

+	strncpy(dst, tmp, wParam);

+	mir_free(tmp);

 	

 	if (wParam <= _tcslen(g_profileName))

 	{

@@ -260,14 +260,14 @@ static INT_PTR GetProfilePath(WPARAM wParam, LPARAM lParam)
 

 static INT_PTR GetProfileName(WPARAM wParam, LPARAM lParam)

 {

-	if (!wParam || !lParam)

+	if ( !wParam || !lParam)

 		return 1;

 

 	char* dst = (char*)lParam;

 

-	char* tmp = makeFileName( g_profileName );

-	strncpy( dst, tmp, wParam );

-	mir_free( tmp );

+	char* tmp = makeFileName(g_profileName);

+	strncpy(dst, tmp, wParam);

+	mir_free(tmp);

 	

 	if (wParam <= _tcslen(g_profileName))

 	{

@@ -279,7 +279,7 @@ static INT_PTR GetProfileName(WPARAM wParam, LPARAM lParam)
 

 static INT_PTR GetProfilePathW(WPARAM wParam, LPARAM lParam)

 {

-	if (!wParam || !lParam)

+	if ( !wParam || !lParam)

 		return 1;

 

 	wchar_t* dst = (wchar_t*)lParam;

@@ -295,7 +295,7 @@ static INT_PTR GetProfilePathW(WPARAM wParam, LPARAM lParam)
 static INT_PTR GetProfileNameW(WPARAM wParam, LPARAM lParam)

 {

 	wchar_t* dst = (wchar_t*)lParam;

-	wcsncpy(dst, g_profileName, wParam );

+	wcsncpy(dst, g_profileName, wParam);

 	if (wParam <= wcslen(g_profileName))

 	{

 		dst[wParam - 1] = 0;

@@ -329,15 +329,15 @@ void UnloadEventsModule()
 {

 	int i;

 

-	if ( !bModuleInitialized ) return;

+	if ( !bModuleInitialized) return;

 

-	for ( i=0; i < eventTypes.getCount(); i++ ) {

+	for (i=0; i < eventTypes.getCount(); i++) {

 		DBEVENTTYPEDESCR* p = eventTypes[i];

-		mir_free( p->module );

-		mir_free( p->descr );

-		mir_free( p->textService );

-		mir_free( p->iconService );

-		mir_free( p );

+		mir_free(p->module);

+		mir_free(p->descr);

+		mir_free(p->textService);

+		mir_free(p->iconService);

+		mir_free(p);

 	}

 

 	eventTypes.destroy();