From 007b4c7301f0d26a72f89f74e9929f42e24eb3e6 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 5 Apr 2013 22:27:16 +0000 Subject: - 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 --- plugins/VersionInfo/src/CVersionInfo.cpp | 16 ++--- plugins/VersionInfo/src/dlgHandlers.cpp | 106 +++++++++++++++---------------- plugins/VersionInfo/src/services.cpp | 2 +- plugins/VersionInfo/src/utils.cpp | 2 +- 4 files changed, 63 insertions(+), 63 deletions(-) (limited to 'plugins/VersionInfo/src') diff --git a/plugins/VersionInfo/src/CVersionInfo.cpp b/plugins/VersionInfo/src/CVersionInfo.cpp index c67099874f..a477ae1258 100644 --- a/plugins/VersionInfo/src/CVersionInfo.cpp +++ b/plugins/VersionInfo/src/CVersionInfo.cpp @@ -532,7 +532,7 @@ bool CVersionInfo::GetOSLanguages() lpzOSLanguages += _T("/"); lpzOSLanguages += GetLanguageName(LOCALE_SYSTEM_DEFAULT); - if (DBGetContactSettingByte(NULL, ModuleName, "ShowInstalledLanguages", 0)) { + if (db_get_b(NULL, ModuleName, "ShowInstalledLanguages", 0)) { szSystemLocales[0] = '\0'; lpzOSLanguages += _T(" ["); EnumSystemLocales(EnumSystemLocalesProc, LCID_INSTALLED); @@ -701,7 +701,7 @@ bool CVersionInfo::GetPluginLists() int bUnknownError = 1; //assume plugin didn't load because of unknown error //Some error messages. //get the dlls the plugin statically links to - if (DBGetContactSettingByte(NULL, ModuleName, "CheckForDependencies", TRUE)) + if (db_get_b(NULL, ModuleName, "CheckForDependencies", TRUE)) { std::tstring linkedModules; @@ -890,7 +890,7 @@ std::tstring CVersionInfo::GetListAsString(std::list &aList, DWORD flag TCHAR szHeader[32] = {0}; TCHAR szFooter[32] = {0}; - if ((((flags & VISF_FORUMSTYLE) == VISF_FORUMSTYLE) || beautify) && (DBGetContactSettingByte(NULL, ModuleName, "BoldVersionNumber", TRUE))) { + if ((((flags & VISF_FORUMSTYLE) == VISF_FORUMSTYLE) || beautify) && (db_get_b(NULL, ModuleName, "BoldVersionNumber", TRUE))) { GetStringFromDatabase("BoldBegin", _T("[b]"), szHeader, SIZEOF(szHeader)); GetStringFromDatabase("BoldEnd", _T("[/b]"), szFooter, SIZEOF(szFooter)); } @@ -1034,10 +1034,10 @@ static void AddSectionAndCount(std::list list, LPCTSTR listText, std::t std::tstring CVersionInfo::GetInformationsAsString(int bDisableForumStyle) { //Begin of report std::tstring out; - int forumStyle = (bDisableForumStyle) ? 0 : DBGetContactSettingByte(NULL, ModuleName, "ForumStyle", TRUE); - int showUUID = DBGetContactSettingByte(NULL, ModuleName, "ShowUUIDs", FALSE); - int beautify = DBGetContactSettingByte(NULL, ModuleName, "Beautify", 0) & (!forumStyle); - int suppressHeader = DBGetContactSettingByte(NULL, ModuleName, "SuppressHeader", TRUE); + int forumStyle = (bDisableForumStyle) ? 0 : db_get_b(NULL, ModuleName, "ForumStyle", TRUE); + int showUUID = db_get_b(NULL, ModuleName, "ShowUUIDs", FALSE); + int beautify = db_get_b(NULL, ModuleName, "Beautify", 0) & (!forumStyle); + int suppressHeader = db_get_b(NULL, ModuleName, "SuppressHeader", TRUE); DWORD flags = (forumStyle) | (showUUID << 1); @@ -1073,7 +1073,7 @@ std::tstring CVersionInfo::GetInformationsAsString(int bDisableForumStyle) { GetStringFromDatabase("BeautifyPluginsEnd", _T(""), normalPluginsEnd, SIZEOF(normalPluginsEnd)); BeautifyReport(beautify, normalPluginsEnd, _T(""), out); //Plugins: list of inactive (disabled) plugins. - if ((!forumStyle) && ((DBGetContactSettingByte(NULL, ModuleName, "ShowInactive", TRUE)) || (bServiceMode))) { + if ((!forumStyle) && ((db_get_b(NULL, ModuleName, "ShowInactive", TRUE)) || (bServiceMode))) { BeautifyReport(beautify, horizLine, _T("\r\n"), out); GetStringFromDatabase("BeautifyInactiveHeaderBegin", _T(""), buffer, SIZEOF(buffer)); BeautifyReport(beautify, buffer, headerHighlightStart, out); diff --git a/plugins/VersionInfo/src/dlgHandlers.cpp b/plugins/VersionInfo/src/dlgHandlers.cpp index 3fb436b04e..6ffb2cf332 100644 --- a/plugins/VersionInfo/src/dlgHandlers.cpp +++ b/plugins/VersionInfo/src/dlgHandlers.cpp @@ -65,7 +65,7 @@ INT_PTR CALLBACK AskDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) TranslateDialogDefault(hWnd); - oldFSFValue = DBGetContactSettingByte(NULL, ModuleName, "ForumStyle", 1); + oldFSFValue = db_get_b(NULL, ModuleName, "ForumStyle", 1); AddInfoToComboboxes(hWnd, IDC_ASK_QUOTECOMBOBOX, IDC_ASK_SIZECOMBOBOX, IDC_ASK_BOLDCOMBOBOX); @@ -122,17 +122,17 @@ INT_PTR CALLBACK AskDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) int newFSFValue = IsDlgButtonChecked(hWnd, IDC_ASK_FORUMSTYLE); if (newFSFValue != oldFSFValue) - DBWriteContactSettingByte(NULL, ModuleName, "ForumStyle", newFSFValue); //temporary store the new value + db_set_b(NULL, ModuleName, "ForumStyle", newFSFValue); //temporary store the new value if (newFSFValue) { - DBWriteContactSettingTString(NULL, ModuleName, "QuoteBegin", quoteBegin); - DBWriteContactSettingTString(NULL, ModuleName, "QuoteEnd", quoteEnd); + db_set_ts(NULL, ModuleName, "QuoteBegin", quoteBegin); + db_set_ts(NULL, ModuleName, "QuoteEnd", quoteEnd); - DBWriteContactSettingTString(NULL, ModuleName, "SizeBegin", sizeBegin); - DBWriteContactSettingTString(NULL, ModuleName, "SizeEnd", sizeEnd); + db_set_ts(NULL, ModuleName, "SizeBegin", sizeBegin); + db_set_ts(NULL, ModuleName, "SizeEnd", sizeEnd); - DBWriteContactSettingTString(NULL, ModuleName, "BoldBegin", boldBegin); - DBWriteContactSettingTString(NULL, ModuleName, "BoldEnd", boldEnd); + db_set_ts(NULL, ModuleName, "BoldBegin", boldBegin); + db_set_ts(NULL, ModuleName, "BoldEnd", boldEnd); } int debugTo = TO_DIALOGBOX; //just to be safe @@ -152,17 +152,17 @@ INT_PTR CALLBACK AskDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) DoDebugTo(debugTo); if (newFSFValue != oldFSFValue) - DBWriteContactSettingByte(NULL, ModuleName, "ForumStyle", oldFSFValue); + db_set_b(NULL, ModuleName, "ForumStyle", oldFSFValue); if (newFSFValue) { - DBWriteContactSettingTString(NULL, ModuleName, "QuoteBegin", oldQuoteBegin); - DBWriteContactSettingTString(NULL, ModuleName, "QuoteEnd", oldQuoteEnd); + db_set_ts(NULL, ModuleName, "QuoteBegin", oldQuoteBegin); + db_set_ts(NULL, ModuleName, "QuoteEnd", oldQuoteEnd); - DBWriteContactSettingTString(NULL, ModuleName, "SizeBegin", oldSizeBegin); - DBWriteContactSettingTString(NULL, ModuleName, "SizeEnd", oldSizeEnd); + db_set_ts(NULL, ModuleName, "SizeBegin", oldSizeBegin); + db_set_ts(NULL, ModuleName, "SizeEnd", oldSizeEnd); - DBWriteContactSettingTString(NULL, ModuleName, "BoldBegin", oldBoldBegin); - DBWriteContactSettingTString(NULL, ModuleName, "BoldEnd", oldBoldEnd); + db_set_ts(NULL, ModuleName, "BoldBegin", oldBoldBegin); + db_set_ts(NULL, ModuleName, "BoldEnd", oldBoldEnd); } DestroyWindow(hWnd); @@ -215,7 +215,7 @@ int DoDebugTo(int debugTo) break; } - if ((debugTo != TO_CLIPBOARD) && (DBGetContactSettingByte(NULL, ModuleName, "ClipboardAlways", FALSE))) + if ((debugTo != TO_CLIPBOARD) && (db_get_b(NULL, ModuleName, "ClipboardAlways", FALSE))) myInfo.PrintInformationsToClipboard(false); if ((bServiceMode) && (debugTo != TO_DIALOGBOX) && (debugTo != TO_ASK)) //close miranda if in service mode and no dialog was shown @@ -241,16 +241,16 @@ INT_PTR CALLBACK DlgProcOpts(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) TranslateDialogDefault(hWnd); AddInfoToComboboxes(hWnd, IDC_QUOTECOMBOBOX, IDC_SIZECOMBOBOX, IDC_BOLDCOMBOBOX); - CheckDlgButton(hWnd, IDC_FORUMSTYLE, (BOOL) DBGetContactSettingByte(NULL, ModuleName, "ForumStyle", TRUE) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hWnd, IDC_DISABLEDTOO, (BOOL) DBGetContactSettingByte(NULL, ModuleName, "ShowInactive", TRUE) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hWnd, IDC_SHOWUUIDS, (BOOL) DBGetContactSettingByte(NULL, ModuleName, "ShowUUIDs", FALSE) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hWnd, IDC_SHOWINSTALLEDLANGUAGES, (BOOL) DBGetContactSettingByte(NULL, ModuleName, "ShowInstalledLanguages", FALSE) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hWnd, IDC_SUPPRESSHEADER, (BOOL) DBGetContactSettingByte(NULL, ModuleName, "SuppressHeader", TRUE) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hWnd, IDC_FORUMSTYLE, (BOOL) db_get_b(NULL, ModuleName, "ForumStyle", TRUE) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hWnd, IDC_DISABLEDTOO, (BOOL) db_get_b(NULL, ModuleName, "ShowInactive", TRUE) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hWnd, IDC_SHOWUUIDS, (BOOL) db_get_b(NULL, ModuleName, "ShowUUIDs", FALSE) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hWnd, IDC_SHOWINSTALLEDLANGUAGES, (BOOL) db_get_b(NULL, ModuleName, "ShowInstalledLanguages", FALSE) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hWnd, IDC_SUPPRESSHEADER, (BOOL) db_get_b(NULL, ModuleName, "SuppressHeader", TRUE) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hWnd, IDC_SHOWINTASKBAR, (BOOL) DBGetContactSettingByte(NULL, ModuleName, "ShowInTaskbar", TRUE) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hWnd, IDC_CLIPBOARDALSO, (BOOL) DBGetContactSettingByte(NULL, ModuleName, "ClipboardAlways", FALSE) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hWnd, IDC_BOLDVERSION, (BOOL) DBGetContactSettingByte(NULL, ModuleName, "BoldVersionNumber", TRUE) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hWnd, IDC_CHECKUNLOADABLE, (BOOL) DBGetContactSettingByte(NULL, ModuleName, "CheckForDependencies", TRUE) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hWnd, IDC_SHOWINTASKBAR, (BOOL) db_get_b(NULL, ModuleName, "ShowInTaskbar", TRUE) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hWnd, IDC_CLIPBOARDALSO, (BOOL) db_get_b(NULL, ModuleName, "ClipboardAlways", FALSE) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hWnd, IDC_BOLDVERSION, (BOOL) db_get_b(NULL, ModuleName, "BoldVersionNumber", TRUE) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hWnd, IDC_CHECKUNLOADABLE, (BOOL) db_get_b(NULL, ModuleName, "CheckForDependencies", TRUE) ? BST_CHECKED : BST_UNCHECKED); SetFocus(GetDlgItem(hWnd, IDC_FORUMSTYLE)); { DBVARIANT dbv = { 0 }; @@ -258,7 +258,7 @@ INT_PTR CALLBACK DlgProcOpts(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) TCHAR buffer[1024]; TCHAR notFound[1024]; - if (DBGetContactSettingTString(NULL, ModuleName, "OutputFile", &dbv) == 0) + if (db_get_ts(NULL, ModuleName, "OutputFile", &dbv) == 0) RelativePathToAbsolute(dbv.ptszVal, notFound, SIZEOF(notFound)); else RelativePathToAbsolute( _T("VersionInfo.txt"), notFound, SIZEOF(notFound)); @@ -291,7 +291,7 @@ INT_PTR CALLBACK DlgProcOpts(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) GetStringFromDatabase("UploadServer", _T("vi.cass.cz"), buffer, SIZEOF(buffer)); SetWindowText(GetDlgItem(hWnd, IDC_UPLOAD_SERVER), buffer); - int port = DBGetContactSettingWord(NULL, ModuleName, "UploadPort", DEFAULT_UPLOAD_PORT); + int port = db_get_w(NULL, ModuleName, "UploadPort", DEFAULT_UPLOAD_PORT); _itot(port, buffer, 10); SetWindowText(GetDlgItem(hWnd, IDC_UPLOAD_PORT), buffer); @@ -303,7 +303,7 @@ INT_PTR CALLBACK DlgProcOpts(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) SetWindowText(GetDlgItem(hWnd, IDC_UPLOAD_PASSWORD), buffer); } - switch(DBGetContactSettingByte(NULL, ModuleName, "DebugTo", TO_DIALOGBOX)) { + switch(db_get_b(NULL, ModuleName, "DebugTo", TO_DIALOGBOX)) { case TO_FILE: CheckDlgButton(hWnd, IDC_TOFILE, BST_CHECKED); break; @@ -440,53 +440,53 @@ INT_PTR CALLBACK DlgProcOpts(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) TCHAR start[256], end[256]; SendDlgItemMessage(hWnd, IDC_QUOTECOMBOBOX, WM_GETTEXT, SIZEOF(buffer), (LPARAM) buffer); SplitStringInfo(buffer, start, end); - DBWriteContactSettingTString(NULL, ModuleName, "QuoteBegin", start); - DBWriteContactSettingTString(NULL, ModuleName, "QuoteEnd", end); + db_set_ts(NULL, ModuleName, "QuoteBegin", start); + db_set_ts(NULL, ModuleName, "QuoteEnd", end); SendDlgItemMessage(hWnd, IDC_SIZECOMBOBOX, WM_GETTEXT, SIZEOF(buffer), (LPARAM) buffer); SplitStringInfo(buffer, start, end); - DBWriteContactSettingTString(NULL, ModuleName, "SizeBegin", start); - DBWriteContactSettingTString(NULL, ModuleName, "SizeEnd", end); + db_set_ts(NULL, ModuleName, "SizeBegin", start); + db_set_ts(NULL, ModuleName, "SizeEnd", end); SendDlgItemMessage(hWnd, IDC_BOLDCOMBOBOX, WM_GETTEXT, SIZEOF(buffer), (LPARAM) buffer); SplitStringInfo(buffer, start, end); - DBWriteContactSettingTString(NULL, ModuleName, "BoldBegin", start); - DBWriteContactSettingTString(NULL, ModuleName, "BoldEnd", end); + db_set_ts(NULL, ModuleName, "BoldBegin", start); + db_set_ts(NULL, ModuleName, "BoldEnd", end); } - DBWriteContactSettingByte(NULL, ModuleName, "CheckForDependencies", IsDlgButtonChecked(hWnd, IDC_CHECKUNLOADABLE) ? TRUE : FALSE); - DBWriteContactSettingByte(NULL, ModuleName, "BoldVersionNumber", IsDlgButtonChecked(hWnd, IDC_BOLDVERSION) ? TRUE : FALSE); - DBWriteContactSettingByte(NULL, ModuleName, "ForumStyle", IsDlgButtonChecked(hWnd, IDC_FORUMSTYLE) ? TRUE : FALSE); - DBWriteContactSettingByte(NULL, ModuleName, "ClipboardAlways", IsDlgButtonChecked(hWnd, IDC_CLIPBOARDALSO) ? TRUE : FALSE); - DBWriteContactSettingByte(NULL, ModuleName, "SuppressHeader", IsDlgButtonChecked(hWnd, IDC_SUPPRESSHEADER) ? TRUE : FALSE); - DBWriteContactSettingByte(NULL, ModuleName, "ShowUUIDs", IsDlgButtonChecked(hWnd, IDC_SHOWUUIDS) ? TRUE : FALSE); - DBWriteContactSettingByte(NULL, ModuleName, "ShowInstalledLanguages", IsDlgButtonChecked(hWnd, IDC_SHOWINSTALLEDLANGUAGES) ? TRUE : FALSE); + db_set_b(NULL, ModuleName, "CheckForDependencies", IsDlgButtonChecked(hWnd, IDC_CHECKUNLOADABLE) ? TRUE : FALSE); + db_set_b(NULL, ModuleName, "BoldVersionNumber", IsDlgButtonChecked(hWnd, IDC_BOLDVERSION) ? TRUE : FALSE); + db_set_b(NULL, ModuleName, "ForumStyle", IsDlgButtonChecked(hWnd, IDC_FORUMSTYLE) ? TRUE : FALSE); + db_set_b(NULL, ModuleName, "ClipboardAlways", IsDlgButtonChecked(hWnd, IDC_CLIPBOARDALSO) ? TRUE : FALSE); + db_set_b(NULL, ModuleName, "SuppressHeader", IsDlgButtonChecked(hWnd, IDC_SUPPRESSHEADER) ? TRUE : FALSE); + db_set_b(NULL, ModuleName, "ShowUUIDs", IsDlgButtonChecked(hWnd, IDC_SHOWUUIDS) ? TRUE : FALSE); + db_set_b(NULL, ModuleName, "ShowInstalledLanguages", IsDlgButtonChecked(hWnd, IDC_SHOWINSTALLEDLANGUAGES) ? TRUE : FALSE); if (!hOutputLocation) { TCHAR filePath[MAX_PATH], fileName[MAX_PATH]; GetDlgItemText(hWnd, IDC_FILENAME, fileName, MAX_PATH); AbsolutePathToRelative(fileName, filePath, SIZEOF(filePath)); - DBWriteContactSettingTString(NULL, ModuleName, "OutputFile", filePath); //store relative path + db_set_ts(NULL, ModuleName, "OutputFile", filePath); //store relative path } - DBWriteContactSettingByte(NULL, ModuleName, "ShowInTaskbar", IsDlgButtonChecked(hWnd, IDC_SHOWINTASKBAR) ? TRUE : FALSE); + db_set_b(NULL, ModuleName, "ShowInTaskbar", IsDlgButtonChecked(hWnd, IDC_SHOWINTASKBAR) ? TRUE : FALSE); //Debug to: if (IsDlgButtonChecked(hWnd, IDC_TOFILE)) - DBWriteContactSettingByte(NULL, ModuleName, "DebugTo", TO_FILE); + db_set_b(NULL, ModuleName, "DebugTo", TO_FILE); else if (IsDlgButtonChecked(hWnd, IDC_TOMESSAGEBOX)) - DBWriteContactSettingByte(NULL, ModuleName, "DebugTo", TO_MESSAGEBOX); + db_set_b(NULL, ModuleName, "DebugTo", TO_MESSAGEBOX); else if (IsDlgButtonChecked(hWnd, IDC_TODIALOGBOX)) - DBWriteContactSettingByte(NULL, ModuleName, "DebugTo", TO_DIALOGBOX); + db_set_b(NULL, ModuleName, "DebugTo", TO_DIALOGBOX); else if (IsDlgButtonChecked(hWnd, IDC_TODEBUGSTRING)) - DBWriteContactSettingByte(NULL, ModuleName, "DebugTo", TO_DEBUGSTRING); + db_set_b(NULL, ModuleName, "DebugTo", TO_DEBUGSTRING); else if (IsDlgButtonChecked(hWnd, IDC_TOCLIPBOARD)) - DBWriteContactSettingByte(NULL, ModuleName, "DebugTo", TO_CLIPBOARD); + db_set_b(NULL, ModuleName, "DebugTo", TO_CLIPBOARD); else if (IsDlgButtonChecked(hWnd, IDC_TOUPLOAD)) - DBWriteContactSettingByte(NULL, ModuleName, "DebugTo", TO_UPLOAD); + db_set_b(NULL, ModuleName, "DebugTo", TO_UPLOAD); else if (IsDlgButtonChecked(hWnd, IDC_ASKEVERYTIME)) - DBWriteContactSettingByte(NULL, ModuleName, "DebugTo", TO_ASK); + db_set_b(NULL, ModuleName, "DebugTo", TO_ASK); EnableWindow(GetDlgItem(hWnd, IDC_GETINFONOW), TRUE); //Disabled plugins too? - DBWriteContactSettingByte(NULL, ModuleName, "ShowInactive", IsDlgButtonChecked(hWnd, IDC_DISABLEDTOO)?TRUE:FALSE); + db_set_b(NULL, ModuleName, "ShowInactive", IsDlgButtonChecked(hWnd, IDC_DISABLEDTOO)?TRUE:FALSE); GetStringFromDatabase("UUIDCharMark", _T(DEF_UUID_CHARMARK), PLUGIN_UUID_MARK, cPLUGIN_UUID_MARK); } } @@ -504,7 +504,7 @@ INT_PTR CALLBACK DialogBoxProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam SendMessage(hWnd, WM_SETICON, ICON_BIG, (LPARAM) hiVIIcon); myInfo = (CVersionInfo *) lParam; - if (DBGetContactSettingByte(NULL, ModuleName, "ShowInTaskbar", TRUE)) { + if (db_get_b(NULL, ModuleName, "ShowInTaskbar", TRUE)) { DWORD ws; ws = GetWindowLongPtr(hWnd, GWL_EXSTYLE); SetWindowLongPtr(hWnd, GWL_EXSTYLE, ws | WS_EX_APPWINDOW); @@ -517,7 +517,7 @@ INT_PTR CALLBACK DialogBoxProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam LOGFONT lf = { 0 }; dbv.type = DBVT_BLOB; - if (DBGetContactSetting(NULL, "OptionFont", "Font", &dbv) == 0) + if (db_get(NULL, "OptionFont", "Font", &dbv) == 0) lf=*(LOGFONT*)dbv.pbVal; else { HFONT hFont = (HFONT)SendDlgItemMessage(hWnd,IDC_CLOSE,WM_GETFONT,0,0); diff --git a/plugins/VersionInfo/src/services.cpp b/plugins/VersionInfo/src/services.cpp index 2f7ad03534..3953af590a 100644 --- a/plugins/VersionInfo/src/services.cpp +++ b/plugins/VersionInfo/src/services.cpp @@ -32,7 +32,7 @@ int InitServices() INT_PTR PluginMenuCommand(WPARAM wParam, LPARAM lParam) { - int debugTo = DBGetContactSettingByte(NULL, ModuleName, "DebugTo", TO_DIALOGBOX); + int debugTo = db_get_b(NULL, ModuleName, "DebugTo", TO_DIALOGBOX); DoDebugTo(debugTo); if (verbose) PUShowMessage("I have printed the information.", SM_NOTIFY); /* char *data; diff --git a/plugins/VersionInfo/src/utils.cpp b/plugins/VersionInfo/src/utils.cpp index 1822880a3f..1573d3260c 100644 --- a/plugins/VersionInfo/src/utils.cpp +++ b/plugins/VersionInfo/src/utils.cpp @@ -63,7 +63,7 @@ int GetStringFromDatabase(char *szSettingName, TCHAR *szError, TCHAR *szResult, DBVARIANT dbv = {0}; int res = 1; size_t len; - if ( DBGetContactSettingTString(NULL, ModuleName, szSettingName, &dbv) == 0) { + if ( db_get_ts(NULL, ModuleName, szSettingName, &dbv) == 0) { res = 0; size_t tmp = _tcslen(dbv.ptszVal); len = (tmp < size - 1) ? tmp : size - 1; -- cgit v1.2.3