- 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

3 files changed, 7 insertions, 7 deletions

diff --git a/plugins/Watrack_MPD/src/init.cpp b/plugins/Watrack_MPD/src/init.cpp
index d83e142bed..9b33425cb7 100755
--- a/plugins/Watrack_MPD/src/init.cpp
+++ b/plugins/Watrack_MPD/src/init.cpp
@@ -50,7 +50,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda
 

 void InitVars()

 {

-	gbPort = DBGetContactSettingWord(NULL, szModuleName, "Port", 6600);

+	gbPort = db_get_w(NULL, szModuleName, "Port", 6600);

 	gbPassword = (TCHAR*)malloc(64*sizeof(TCHAR));

 	gbHost = (TCHAR*)malloc(128*sizeof(TCHAR));

 	gbHost = UniGetContactSettingUtf(NULL, szModuleName, "Server", _T("127.0.0.1"));

diff --git a/plugins/Watrack_MPD/src/options.cpp b/plugins/Watrack_MPD/src/options.cpp
index 770d5988b0..9d9d755f8c 100755
--- a/plugins/Watrack_MPD/src/options.cpp
+++ b/plugins/Watrack_MPD/src/options.cpp
@@ -23,7 +23,7 @@ static INT_PTR CALLBACK DlgProcWaMpdOpts(HWND hwndDlg, UINT msg, WPARAM wParam,
   case WM_INITDIALOG:
     {
 		TranslateDialogDefault(hwndDlg);
-		SetDlgItemInt(hwndDlg, IDC_PORT, DBGetContactSettingWord(NULL, szModuleName, "Port", 6600), FALSE);
+		SetDlgItemInt(hwndDlg, IDC_PORT, db_get_w(NULL, szModuleName, "Port", 6600), FALSE);
 		SetDlgItemText(hwndDlg, IDC_SERVER, UniGetContactSettingUtf(NULL, szModuleName, "Server", _T("127.0.0.1")));
 		SetDlgItemText(hwndDlg, IDC_PASSWORD, UniGetContactSettingUtf(NULL, szModuleName, "Password", _T("")));
       return TRUE;
@@ -44,13 +44,13 @@ static INT_PTR CALLBACK DlgProcWaMpdOpts(HWND hwndDlg, UINT msg, WPARAM wParam,
       case PSN_APPLY:
         {
 			TCHAR szText[128];
-			DBWriteContactSettingWord(NULL, szModuleName, "Port", (WORD)GetDlgItemInt(hwndDlg, IDC_PORT, NULL, FALSE));
+			db_set_w(NULL, szModuleName, "Port", (WORD)GetDlgItemInt(hwndDlg, IDC_PORT, NULL, FALSE));
 			gbPort = (WORD)GetDlgItemInt(hwndDlg, IDC_PORT, NULL, FALSE);
 			GetDlgItemText(hwndDlg, IDC_SERVER, szText, sizeof(szText));
-			DBWriteContactSettingTString(NULL, szModuleName, "Server", szText);
+			db_set_ts(NULL, szModuleName, "Server", szText);
 			_tcscpy(gbHost, szText);
 			GetDlgItemText(hwndDlg, IDC_PASSWORD, szText, sizeof(szText));
-			DBWriteContactSettingTString(NULL, szModuleName, "Password", szText);
+			db_set_ts(NULL, szModuleName, "Password", szText);
 			_tcscpy(gbPassword, szText);
           return TRUE;
         }
diff --git a/plugins/Watrack_MPD/src/utilities.cpp b/plugins/Watrack_MPD/src/utilities.cpp
index 4d63f1f7f4..fc5e621837 100755
--- a/plugins/Watrack_MPD/src/utilities.cpp
+++ b/plugins/Watrack_MPD/src/utilities.cpp
@@ -21,11 +21,11 @@ TCHAR* __stdcall UniGetContactSettingUtf(HANDLE hContact, const char *szModule,c
 {
   DBVARIANT dbv = {DBVT_DELETED};
   TCHAR* szRes;
-  if (DBGetContactSettingTString(hContact, szModule, szSetting, &dbv))
+  if (db_get_ts(hContact, szModule, szSetting, &dbv))
 	 return _tcsdup(szDef);
   if(dbv.pszVal)
 	  szRes = _tcsdup(dbv.ptszVal);
-  DBFreeVariant(&dbv);
+  db_free(&dbv);
   return szRes;
 }