- rest of menus cleared;

- old database macroses wiped out from all plugins (left in m_database.h for compatibility)

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

8 files changed, 36 insertions, 36 deletions

diff --git a/plugins/TabSRMM/src/chat/clist.cpp b/plugins/TabSRMM/src/chat/clist.cpp
index 18172a2e01..fd0f232573 100644
--- a/plugins/TabSRMM/src/chat/clist.cpp
+++ b/plugins/TabSRMM/src/chat/clist.cpp
@@ -50,7 +50,7 @@ static HANDLE Clist_GroupExists(TCHAR *tszGroup)
 		result = M->GetTString(0, "CListGroups", str, &dbv);

 		if (!result) {

 			match = (!_tcscmp(tszGroup, &dbv.ptszVal[1]) && (lstrlen(tszGroup) == lstrlen(&dbv.ptszVal[1])));

-			DBFreeVariant(&dbv);

+			db_free(&dbv);

 			if (match)

 				return((HANDLE)(i + 1));

 		}

@@ -70,7 +70,7 @@ HANDLE CList_AddRoom(const char* pszModule, const TCHAR* pszRoom, const TCHAR* p
 	if (!M->GetTString(NULL, "Chat", "AddToGroup", &dbv)) {

 		if (lstrlen(dbv.ptszVal) > 0)

 			lstrcpyn(pszGroup, dbv.ptszVal, 50);

-		DBFreeVariant(&dbv);

+		db_free(&dbv);

 	} else

 		lstrcpyn(pszGroup, _T("Chat rooms"), 50);

 

@@ -94,7 +94,7 @@ HANDLE CList_AddRoom(const char* pszModule, const TCHAR* pszRoom, const TCHAR* p
 	M->WriteTString(hContact, pszModule, "Nick", pszDisplayName);

 	M->WriteTString(hContact, pszModule, "ChatRoomID", pszRoom);

 	M->WriteByte(hContact, pszModule, "ChatRoom", (BYTE)iType);

-	DBWriteContactSettingWord(hContact, pszModule, "Status", ID_STATUS_OFFLINE);

+	db_set_w(hContact, pszModule, "Status", ID_STATUS_OFFLINE);

 	return hContact;

 }

 

@@ -106,8 +106,8 @@ BOOL CList_SetOffline(HANDLE hContact, BOOL bHide)
 			return FALSE;

 

 		int i = M->GetByte(hContact, szProto, "ChatRoom", 0);

-		DBWriteContactSettingWord(hContact, szProto, "ApparentMode", (LPARAM)0);

-		DBWriteContactSettingWord(hContact, szProto, "Status", ID_STATUS_OFFLINE);

+		db_set_w(hContact, szProto, "ApparentMode", (LPARAM)0);

+		db_set_w(hContact, szProto, "Status", ID_STATUS_OFFLINE);

 		return TRUE;

 	}

 	return FALSE;

@@ -125,8 +125,8 @@ BOOL CList_SetAllOffline(BOOL bHide, const char *pszModule)
 			if (!pszModule || (pszModule && !strcmp(pszModule, szProto))) {

 				int i = M->GetByte(hContact, szProto, "ChatRoom", 0);

 				if (i != 0) {

-					DBWriteContactSettingWord(hContact, szProto, "ApparentMode", (LPARAM)(WORD) 0);

-					DBWriteContactSettingWord(hContact, szProto, "Status", ID_STATUS_OFFLINE);

+					db_set_w(hContact, szProto, "ApparentMode", (LPARAM)(WORD) 0);

+					db_set_w(hContact, szProto, "Status", ID_STATUS_OFFLINE);

 				}

 			}

 		}

@@ -162,7 +162,7 @@ int CList_RoomDoubleclicked(WPARAM wParam, LPARAM lParam)
 						&& IsWindowVisible(si->hWnd)

 						&& !IsIconic(si->pContainer->hwnd)) {

 					PostMessage(si->hWnd, GC_CLOSEWINDOW, 0, 0);

-					DBFreeVariant(&dbv);

+					db_free(&dbv);

 					return 1;

 				}

 				else

@@ -175,7 +175,7 @@ int CList_RoomDoubleclicked(WPARAM wParam, LPARAM lParam)
 						SetForegroundWindow(si->dat->pContainer->hwnd);

 				}

 			}

-			DBFreeVariant(&dbv);

+			db_free(&dbv);

 			return 1;

 		}

 	}

@@ -305,10 +305,10 @@ HANDLE CList_FindRoom(const char* pszModule, const TCHAR* pszRoom)
 				DBVARIANT dbv;

 				if (!M->GetTString(hContact, szProto, "ChatRoomID", &dbv)) {

 					if (!lstrcmpi(dbv.ptszVal, pszRoom)) {

-						DBFreeVariant(&dbv);

+						db_free(&dbv);

 						return hContact;

 					}

-					DBFreeVariant(&dbv);

+					db_free(&dbv);

 				}

 			}

 		}

diff --git a/plugins/TabSRMM/src/chat/main.cpp b/plugins/TabSRMM/src/chat/main.cpp
index 1e8919e8c0..c3ffc5e0e9 100644
--- a/plugins/TabSRMM/src/chat/main.cpp
+++ b/plugins/TabSRMM/src/chat/main.cpp
@@ -76,8 +76,8 @@ int Chat_Unload(void)
 	if (!PluginConfig.m_chat_enabled)

 		return 0;

 

-	DBWriteContactSettingWord(NULL, "Chat", "SplitterX", (WORD)g_Settings.iSplitterX);

-	DBWriteContactSettingWord(NULL, "Chat", "splitY", (WORD)g_Settings.iSplitterY);

+	db_set_w(NULL, "Chat", "SplitterX", (WORD)g_Settings.iSplitterX);

+	db_set_w(NULL, "Chat", "splitY", (WORD)g_Settings.iSplitterY);

 

 	CList_SetAllOffline(TRUE, NULL);

 

diff --git a/plugins/TabSRMM/src/chat/manager.cpp b/plugins/TabSRMM/src/chat/manager.cpp
index 2649cb2a24..4b706059d9 100644
--- a/plugins/TabSRMM/src/chat/manager.cpp
+++ b/plugins/TabSRMM/src/chat/manager.cpp
@@ -121,10 +121,10 @@ int SM_RemoveSession(const TCHAR* pszID, const char* pszModule, bool removeConta
 			if (pTemp->hContact) {

 				CList_SetOffline(pTemp->hContact, pTemp->iType == GCW_CHATROOM ? TRUE : FALSE);

 				//if (pTemp->iType != GCW_SERVER)

-				//DBWriteContactSettingByte(pTemp->hContact, "CList", "Hidden", 1);

+				//db_set_b(pTemp->hContact, "CList", "Hidden", 1);

 			}

-			DBWriteContactSettingString(pTemp->hContact, pTemp->pszModule , "Topic", "");

-			DBWriteContactSettingString(pTemp->hContact, pTemp->pszModule, "StatusBar", "");

+			db_set_s(pTemp->hContact, pTemp->pszModule , "Topic", "");

+			db_set_s(pTemp->hContact, pTemp->pszModule, "StatusBar", "");

 			db_unset(pTemp->hContact, "CList", "StatusMsg");

 

 			if (removeContact)

@@ -610,7 +610,7 @@ BOOL SM_SetStatus(const TCHAR* pszID, const char* pszModule, int wStatus)
 				if (pTemp->iType != GCW_SERVER && wStatus != ID_STATUS_OFFLINE)

 					db_unset(pTemp->hContact, "CList", "Hidden");

 

-				DBWriteContactSettingWord(pTemp->hContact, pTemp->pszModule, "Status", (WORD)wStatus);

+				db_set_w(pTemp->hContact, pTemp->pszModule, "Status", (WORD)wStatus);

 			}

 

 			if (pszID)

@@ -702,9 +702,9 @@ BOOL SM_RemoveAll(void)
 		DoEventHook(m_WndList->ptszID, m_WndList->pszModule, GC_SESSION_TERMINATE, NULL, NULL, (DWORD)m_WndList->dwItemData);

 		if (m_WndList->hContact)

 			CList_SetOffline(m_WndList->hContact, m_WndList->iType == GCW_CHATROOM ? TRUE : FALSE);

-		DBWriteContactSettingString(m_WndList->hContact, m_WndList->pszModule , "Topic", "");

+		db_set_s(m_WndList->hContact, m_WndList->pszModule , "Topic", "");

 		db_unset(m_WndList->hContact, "CList", "StatusMsg");

-		DBWriteContactSettingString(m_WndList->hContact, m_WndList->pszModule, "StatusBar", "");

+		db_set_s(m_WndList->hContact, m_WndList->pszModule, "StatusBar", "");

 

 		UM_RemoveAll(&m_WndList->pUsers);

 		TM_RemoveAll(&m_WndList->pStatuses);

diff --git a/plugins/TabSRMM/src/chat/muchighlight.cpp b/plugins/TabSRMM/src/chat/muchighlight.cpp
index 935d2e38d4..79752fa472 100644
--- a/plugins/TabSRMM/src/chat/muchighlight.cpp
+++ b/plugins/TabSRMM/src/chat/muchighlight.cpp
@@ -269,12 +269,12 @@ INT_PTR CALLBACK CMUCHighlight::dlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, L
 			DBVARIANT dbv = {0};

 			if ( !M->GetTString(0, "Chat", "HighlightWords", &dbv)) {

 				::SetDlgItemText(hwndDlg, IDC_HIGHLIGHTTEXTPATTERN, dbv.ptszVal);

-				::DBFreeVariant(&dbv);

+				::db_free(&dbv);

 			}

 

 			if ( !M->GetTString(0, "Chat", "HighlightNames", &dbv)) {

 				::SetDlgItemText(hwndDlg, IDC_HIGHLIGHTNICKPATTERN, dbv.ptszVal);

-				::DBFreeVariant(&dbv);

+				::db_free(&dbv);

 			}

 

 			DWORD dwFlags = M->GetByte("Chat", "HighlightEnabled", MATCH_TEXT);

diff --git a/plugins/TabSRMM/src/chat/options.cpp b/plugins/TabSRMM/src/chat/options.cpp
index 0590070abf..6011d8a194 100644
--- a/plugins/TabSRMM/src/chat/options.cpp
+++ b/plugins/TabSRMM/src/chat/options.cpp
@@ -1050,7 +1050,7 @@ INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 				SM_InvalidateLogDirectories();

 

 				iLen = SendDlgItemMessage(hwndDlg, IDC_CHAT_SPIN4, UDM_GETPOS, 0, 0);

-				DBWriteContactSettingWord(NULL, "Chat", "LoggingLimit", (WORD)iLen);

+				db_set_w(NULL, "Chat", "LoggingLimit", (WORD)iLen);

 

 				iLen = SendDlgItemMessage(hwndDlg, IDC_CHAT_SPIN3, UDM_GETPOS, 0, 0);

 				if (iLen > 0)

@@ -1062,32 +1062,32 @@ INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 				if (iLen > 0) {

 					pszText = (char *)realloc(pszText, iLen + 1);

 					GetDlgItemTextA(hwndDlg, IDC_LOGTIMESTAMP, pszText, iLen + 1);

-					DBWriteContactSettingString(NULL, "Chat", "LogTimestamp", pszText);

+					db_set_s(NULL, "Chat", "LogTimestamp", pszText);

 				} else db_unset(NULL, "Chat", "LogTimestamp");

 

 				iLen = GetWindowTextLength(GetDlgItem(hwndDlg, IDC_TIMESTAMP));

 				if (iLen > 0) {

 					pszText = (char *)realloc(pszText, iLen + 1);

 					GetDlgItemTextA(hwndDlg, IDC_TIMESTAMP, pszText, iLen + 1);

-					DBWriteContactSettingString(NULL, "Chat", "HeaderTime", pszText);

+					db_set_s(NULL, "Chat", "HeaderTime", pszText);

 				} else db_unset(NULL, "Chat", "HeaderTime");

 

 				iLen = GetWindowTextLength(GetDlgItem(hwndDlg, IDC_INSTAMP));

 				if (iLen > 0) {

 					pszText = (char *)realloc(pszText, iLen + 1);

 					GetDlgItemTextA(hwndDlg, IDC_INSTAMP, pszText, iLen + 1);

-					DBWriteContactSettingString(NULL, "Chat", "HeaderIncoming", pszText);

+					db_set_s(NULL, "Chat", "HeaderIncoming", pszText);

 				} else db_unset(NULL, "Chat", "HeaderIncoming");

 

 				iLen = GetWindowTextLength(GetDlgItem(hwndDlg, IDC_OUTSTAMP));

 				if (iLen > 0) {

 					pszText = (char *)realloc(pszText, iLen + 1);

 					GetDlgItemTextA(hwndDlg, IDC_OUTSTAMP, pszText, iLen + 1);

-					DBWriteContactSettingString(NULL, "Chat", "HeaderOutgoing", pszText);

+					db_set_s(NULL, "Chat", "HeaderOutgoing", pszText);

 				} else db_unset(NULL, "Chat", "HeaderOutgoing");

 

 				iLen = SendDlgItemMessage(hwndDlg, IDC_CHAT_SPIN2, UDM_GETPOS, 0, 0);

-				DBWriteContactSettingWord(NULL, "Chat", "LogLimit", (WORD)iLen);

+				db_set_w(NULL, "Chat", "LogLimit", (WORD)iLen);

 			}

 

 			if (pszText != NULL)

diff --git a/plugins/TabSRMM/src/chat/services.cpp b/plugins/TabSRMM/src/chat/services.cpp
index bcd2cc9452..59d4cd646f 100644
--- a/plugins/TabSRMM/src/chat/services.cpp
+++ b/plugins/TabSRMM/src/chat/services.cpp
@@ -246,12 +246,12 @@ INT_PTR Service_NewChat(WPARAM wParam, LPARAM lParam)
 			else

 				mir_sntprintf(szTemp, SIZEOF(szTemp), _T("%s"), si->ptszName);

 			si->hContact = CList_AddRoom(gcw->pszModule, ptszID, szTemp, si->iType);

-			DBWriteContactSettingString(si->hContact, si->pszModule , "Topic", "");

+			db_set_s(si->hContact, si->pszModule , "Topic", "");

 			db_unset(si->hContact, "CList", "StatusMsg");

 			if (si->ptszStatusbarText)

 				M->WriteTString(si->hContact, si->pszModule, "StatusBar", si->ptszStatusbarText);

 			else

-				DBWriteContactSettingString(si->hContact, si->pszModule, "StatusBar", "");

+				db_set_s(si->hContact, si->pszModule, "StatusBar", "");

 			if (si->hContact)

 				Chat_SetFilters(si);

 		}

@@ -371,7 +371,7 @@ static int DoControl(GCEVENT * gce, WPARAM wp)
 			if (si->ptszStatusbarText)

 				M->WriteTString(si->hContact, si->pszModule, "StatusBar", si->ptszStatusbarText);

 			else

-				DBWriteContactSettingString(si->hContact, si->pszModule, "StatusBar", "");

+				db_set_s(si->hContact, si->pszModule, "StatusBar", "");

 			if (si->hWnd)

 				SendMessage(si->hWnd, GC_UPDATESTATUSBAR, 0, 0);

 		}

diff --git a/plugins/TabSRMM/src/chat/tools.cpp b/plugins/TabSRMM/src/chat/tools.cpp
index 5e0b679f07..85167448e8 100644
--- a/plugins/TabSRMM/src/chat/tools.cpp
+++ b/plugins/TabSRMM/src/chat/tools.cpp
@@ -607,7 +607,7 @@ BOOL DoSoundsFlashPopupTrayStuff(SESSION_INFO* si, GCEVENT * gce, BOOL bHighligh
 				params->sound = "ChatMessage";

 				if (params->bInactive && !(si->wState&STATE_TALK)) {

 					si->wState |= STATE_TALK;

-					DBWriteContactSettingWord(si->hContact, si->pszModule, "ApparentMode", (LPARAM)(WORD) 40071);

+					db_set_w(si->hContact, si->pszModule, "ApparentMode", (LPARAM)(WORD) 40071);

 				}

 				break;

 			case GC_EVENT_ACTION:

diff --git a/plugins/TabSRMM/src/chat/window.cpp b/plugins/TabSRMM/src/chat/window.cpp
index d424e03f78..46e761e8cf 100644
--- a/plugins/TabSRMM/src/chat/window.cpp
+++ b/plugins/TabSRMM/src/chat/window.cpp
@@ -288,7 +288,7 @@ static void Chat_UpdateWindowState(TWindowData *dat, UINT msg)
 

 	if (dat->iTabID >= 0) {

 		if (db_get_w(si->hContact, si->pszModule , "ApparentMode", 0) != 0)

-			DBWriteContactSettingWord(si->hContact, si->pszModule , "ApparentMode", (LPARAM)0);

+			db_set_w(si->hContact, si->pszModule , "ApparentMode", (LPARAM)0);

 		if (CallService(MS_CLIST_GETEVENT, (WPARAM)si->hContact, 0))

 			CallService(MS_CLIST_REMOVEEVENT, (WPARAM)si->hContact, (LPARAM)szChatIconString);

 

@@ -2484,7 +2484,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 

 					si->wState &= ~STATE_TALK;

 					dat->bWasDeleted = 1;

-					DBWriteContactSettingWord(si->hContact, si->pszModule , "ApparentMode", (LPARAM)0);

+					db_set_w(si->hContact, si->pszModule , "ApparentMode", (LPARAM)0);

 					SendMessage(hwndDlg, GC_CLOSEWINDOW, 0, lParam == 2 ? lParam : 1);

 					return TRUE;

 

@@ -3453,7 +3453,7 @@ LABEL_SHOWWINDOW:
 				if (iSelection - IDM_CONTAINERMENU >= 0) {

 					if (!M->GetTString(NULL, szKey, szIndex, &dbv)) {

 						SendMessage(hwndDlg, DM_CONTAINERSELECTED, 0, (LPARAM)dbv.ptszVal);

-						DBFreeVariant(&dbv);

+						db_free(&dbv);

 					}

 				}

 

@@ -3735,10 +3735,10 @@ LABEL_SHOWWINDOW:
 			TABSRMM_FireEvent(dat->hContact, hwndDlg, MSG_WINDOW_EVT_CLOSING, 0);

 

 			if (!dat->fIsAutosizingInput)

-				DBWriteContactSettingWord(NULL, "Chat", "SplitterX", (WORD)g_Settings.iSplitterX);

+				db_set_w(NULL, "Chat", "SplitterX", (WORD)g_Settings.iSplitterX);

 

 			if (dat->pContainer->settings->fPrivate && !IsAutoSplitEnabled(dat))

-				DBWriteContactSettingWord(NULL, "Chat", "splitY", (WORD)g_Settings.iSplitterY);

+				db_set_w(NULL, "Chat", "splitY", (WORD)g_Settings.iSplitterY);

 

 			DM_FreeTheme(dat);