- microkernel addded;

- version bumped to 0.92.2

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

3 files changed, 13 insertions, 13 deletions

diff --git a/plugins/SRMM/cmdlist.cpp b/plugins/SRMM/cmdlist.cpp
index 1034b57949..91d082fc74 100644
--- a/plugins/SRMM/cmdlist.cpp
+++ b/plugins/SRMM/cmdlist.cpp
@@ -31,13 +31,13 @@ int tcmdlist_append(SortedList *list, TCHAR *data)
 		TCmdList* n = (TCmdList*)list->items[0];

 		mir_free(n->szCmd);

 		mir_free(n);

-		li.List_Remove(list, 0);

+		List_Remove(list, 0);

 	}

 

 	new_list = (TCmdList*)mir_alloc(sizeof(TCmdList));

 	new_list->szCmd = mir_tstrdup(data);

 

-	li.List_InsertPtr(list, new_list);

+	List_InsertPtr(list, new_list);

 

 	return list->realCount - 1;

 }

@@ -52,7 +52,7 @@ void tcmdlist_free(SortedList *list)
 		mir_free(n[i]->szCmd);

 		mir_free(n[i]);

 	}

-	li.List_Destroy(list);

+	List_Destroy(list);

 	mir_free(list);

 }

 

@@ -78,7 +78,7 @@ static VOID CALLBACK MsgTimer(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTi
 				tmlst = (TMsgQueue**)alloca((msgQueue.realCount - i) * sizeof(TMsgQueue*));

 			tmlst[ntl++] = item;

 

-			li.List_Remove(&msgQueue, i--);

+			List_Remove(&msgQueue, i--);

 		}

 	}

 	LeaveCriticalSection(&csMsgQueue);

@@ -99,7 +99,7 @@ void msgQueue_add(HANDLE hContact, HANDLE id, const TCHAR* szMsg, HANDLE hDbEven
 	EnterCriticalSection(&csMsgQueue);

 	if (!msgQueue.realCount && !timerId)

 		timerId = SetTimer(NULL, 0, 5000, MsgTimer);

-	li.List_InsertPtr(&msgQueue, item);

+	List_InsertPtr(&msgQueue, item);

 	LeaveCriticalSection(&csMsgQueue);

 

 }

@@ -116,7 +116,7 @@ void msgQueue_processack(HANDLE hContact, HANDLE id, BOOL success, const char* s
 		item = (TMsgQueue*)msgQueue.items[i];

 		if (item->hContact == hContact && item->id == id)

 		{

-			li.List_Remove(&msgQueue, i);

+			List_Remove(&msgQueue, i);

 

 			if (!msgQueue.realCount && timerId)

 			{

@@ -158,7 +158,7 @@ void msgQueue_destroy(void)
 		mir_free(item->szMsg);

 		mir_free(item);

 	}

-	li.List_Destroy(&msgQueue);

+	List_Destroy(&msgQueue);

 

 	LeaveCriticalSection(&csMsgQueue);

 

diff --git a/plugins/SRMM/msgdialog.cpp b/plugins/SRMM/msgdialog.cpp
index 6726dc4258..df25b409e0 100644
--- a/plugins/SRMM/msgdialog.cpp
+++ b/plugins/SRMM/msgdialog.cpp
@@ -784,7 +784,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 				dat->wStatus = ID_STATUS_OFFLINE;

 			dat->wOldStatus = dat->wStatus;

 			dat->splitterPos = (int) DBGetContactSettingDword(DBGetContactSettingByte(NULL, SRMMMOD, SRMSGSET_SAVEPERCONTACT, SRMSGDEFSET_SAVEPERCONTACT)?dat->hContact:NULL, SRMMMOD, "splitterPos", (DWORD) - 1);

-			dat->cmdList = li.List_Create(0, 20);

+			dat->cmdList = List_Create(0, 20);

 			dat->cmdListInd = -1;

 			dat->nTypeMode = PROTOTYPE_SELFTYPING_OFF;

 			SetTimer(hwndDlg, TIMERID_TYPE, 1000, NULL);

diff --git a/plugins/SRMM/richutil.cpp b/plugins/SRMM/richutil.cpp
index 92065ca0c8..7f77c98fa8 100644
--- a/plugins/SRMM/richutil.cpp
+++ b/plugins/SRMM/richutil.cpp
@@ -94,7 +94,7 @@ void RichUtil_Load(void)
 

 void RichUtil_Unload(void) 

 {

-	li.List_Destroy(&sListInt);

+	List_Destroy(&sListInt);

 	DeleteCriticalSection(&csRich);

 	if (mTheme)

 		FreeLibrary(mTheme);

@@ -112,8 +112,8 @@ int RichUtil_SubClass(HWND hwndEdit)
 		ru->hasUglyBorder = 0;

 

 		EnterCriticalSection(&csRich);

-		if (!li.List_GetIndex(&sListInt, ru, &idx))

-			li.List_Insert(&sListInt, ru, idx);

+		if (!List_GetIndex(&sListInt, ru, &idx))

+			List_Insert(&sListInt, ru, idx);

 		LeaveCriticalSection(&csRich);

 

 		ru->origProc = (WNDPROC)SetWindowLongPtr(ru->hwnd, GWLP_WNDPROC, (LONG_PTR)&RichUtil_Proc);

@@ -128,7 +128,7 @@ static LRESULT CALLBACK RichUtil_Proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 	TRichUtil *ru;

 

 	EnterCriticalSection(&csRich);

-	ru = (TRichUtil *)li.List_Find(&sListInt, (TRichUtil*)&hwnd);

+	ru = (TRichUtil *)List_Find(&sListInt, (TRichUtil*)&hwnd);

 	LeaveCriticalSection(&csRich);

 

 	if (ru == NULL) return 0;

@@ -246,7 +246,7 @@ static LRESULT CALLBACK RichUtil_Proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 			}

 

 			EnterCriticalSection(&csRich);

-			li.List_RemovePtr(&sListInt, ru);

+			List_RemovePtr(&sListInt, ru);

 			LeaveCriticalSection(&csRich);

 

 			mir_free(ru);