From c992cb2fdc11f1cac4bc5cbce26e8e2bb3b57da0 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 26 Jun 2012 16:50:14 +0000
Subject: - microkernel addded; - version bumped to 0.92.2

git-svn-id: http://svn.miranda-ng.org/main/trunk@641 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Db3x_mmap/dbsettings.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'plugins/Db3x_mmap/dbsettings.cpp')

diff --git a/plugins/Db3x_mmap/dbsettings.cpp b/plugins/Db3x_mmap/dbsettings.cpp
index 90dfecd727..7f7687ab4c 100644
--- a/plugins/Db3x_mmap/dbsettings.cpp
+++ b/plugins/Db3x_mmap/dbsettings.cpp
@@ -64,7 +64,7 @@ static char* InsertCachedSetting( const char* szName, size_t cbNameLen, int inde
 	char* newValue = (char*)HeapAlloc( hCacheHeap, 0, cbNameLen );
 	*newValue = 0;
 	strcpy(newValue+1,szName+1);
-	li.List_Insert(&lSettings,newValue,index);
+	List_Insert(&lSettings,newValue,index);
 	return newValue;
 }
 
@@ -81,7 +81,7 @@ static char* GetCachedSetting(const char *szModuleName,const char *szSettingName
 	if (lastsetting && strcmp(szFullName+1,lastsetting) == 0)
 		return lastsetting;
 
-	if (li.List_GetIndex(&lSettings,szFullName,&index))
+	if (List_GetIndex(&lSettings,szFullName,&index))
 		lastsetting = (char*)lSettings.items[index]+1;
 	else
 		lastsetting = InsertCachedSetting( szFullName, settingNameLen+moduleNameLen+3, index )+1;
@@ -129,11 +129,11 @@ static DBVARIANT* GetCachedValuePtr( HANDLE hContact, char* szSetting, int bAllo
 	if ( hContact == 0 ) {
 		DBCachedGlobalValue Vtemp, *V;
 		Vtemp.name = szSetting;
-		if ( li.List_GetIndex(&lGlobalSettings,&Vtemp,&index)) {
+		if ( List_GetIndex(&lGlobalSettings,&Vtemp,&index)) {
 			V = (DBCachedGlobalValue*)lGlobalSettings.items[index];
 			if ( bAllocate == -1 ) {
 				FreeCachedVariant( &V->value );
-				li.List_Remove(&lGlobalSettings,index);
+				List_Remove(&lGlobalSettings,index);
 				HeapFree(hCacheHeap,0,V);
 				return NULL;
 		}	}
@@ -143,7 +143,7 @@ static DBVARIANT* GetCachedValuePtr( HANDLE hContact, char* szSetting, int bAllo
 
 			V = (DBCachedGlobalValue*)HeapAlloc(hCacheHeap,HEAP_ZERO_MEMORY,sizeof(DBCachedGlobalValue));
 			V->name = szSetting;
-			li.List_Insert(&lGlobalSettings,V,index);
+			List_Insert(&lGlobalSettings,V,index);
 		}
 
 		return &V->value;
@@ -158,7 +158,7 @@ static DBVARIANT* GetCachedValuePtr( HANDLE hContact, char* szSetting, int bAllo
 		else {
 			VLtemp.hContact=hContact;
 
-			if ( !li.List_GetIndex(&lContacts,&VLtemp,&index))
+			if ( !List_GetIndex(&lContacts,&VLtemp,&index))
 			{
 				if ( bAllocate != 1 )
 					return NULL;
@@ -512,20 +512,20 @@ static INT_PTR SetSettingResident(WPARAM wParam,LPARAM lParam)
 		strcpy( szTemp+1, ( char* )lParam );
 
 		EnterCriticalSection(&csDbAccess);
-		if ( !li.List_GetIndex( &lSettings, szTemp, &idx ))
+		if ( !List_GetIndex( &lSettings, szTemp, &idx ))
 			szSetting = InsertCachedSetting( szTemp, cbSettingNameLen, idx );
 		else
 			szSetting = (char *)lSettings.items[idx];
 
 		*szSetting = (char)wParam;
 
-		if ( !li.List_GetIndex( &lResidentSettings, szSetting+1, &idx ))
+		if ( !List_GetIndex( &lResidentSettings, szSetting+1, &idx ))
 		{
 			if (wParam)
-				li.List_Insert(&lResidentSettings,szSetting+1,idx);
+				List_Insert(&lResidentSettings,szSetting+1,idx);
 		}
 		else if (!wParam)
-			li.List_Remove(&lResidentSettings,idx);
+			List_Remove(&lResidentSettings,idx);
 
 		LeaveCriticalSection(&csDbAccess);
 	}
@@ -1006,8 +1006,8 @@ int InitSettings(void)
 void UninitSettings(void)
 {
 	HeapDestroy(hCacheHeap);
-	li.List_Destroy(&lContacts);
-	li.List_Destroy(&lSettings);
-	li.List_Destroy(&lGlobalSettings);
-	li.List_Destroy(&lResidentSettings);
+	List_Destroy(&lContacts);
+	List_Destroy(&lSettings);
+	List_Destroy(&lGlobalSettings);
+	List_Destroy(&lResidentSettings);
 }
-- 
cgit v1.2.3