From 197fe77f67654cf8c46c53376190fc321176c08b Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 7 Oct 2012 11:42:28 +0000 Subject: old database macros removed from m_database.h git-svn-id: http://svn.miranda-ng.org/main/trunk@1796 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/skin/hotkeys.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/modules/skin/hotkeys.cpp') diff --git a/src/modules/skin/hotkeys.cpp b/src/modules/skin/hotkeys.cpp index b72a3ad3e2..1e72b380a1 100644 --- a/src/modules/skin/hotkeys.cpp +++ b/src/modules/skin/hotkeys.cpp @@ -166,14 +166,14 @@ static INT_PTR svcHotkeyRegister(WPARAM wParam, LPARAM lParam) } else { item->pszName = mir_strdup(desc->pszName); - item->Enabled = !DBGetContactSettingByte(NULL, DBMODULENAME "Off", item->pszName, 0); + item->Enabled = !db_get_b(NULL, DBMODULENAME "Off", item->pszName, 0); } item->pszService = desc->pszService ? mir_strdup(desc->pszService) : 0; item->DefHotkey = desc->DefHotKey & ~HKF_MIRANDA_LOCAL; item->Hotkey = DBGetContactSettingWord(NULL, DBMODULENAME, item->pszName, item->DefHotkey); item->type = item->pszService ? - (THotkeyType)DBGetContactSettingByte(NULL, DBMODULENAME "Types", item->pszName, + (THotkeyType)db_get_b(NULL, DBMODULENAME "Types", item->pszName, (desc->DefHotKey & HKF_MIRANDA_LOCAL) ? HKT_LOCAL : HKT_GLOBAL) : HKT_MANUAL; item->lParam = desc->lParam; @@ -193,7 +193,7 @@ static INT_PTR svcHotkeyRegister(WPARAM wParam, LPARAM lParam) /* try to load alternatives from db */ int count, i; mir_snprintf(buf, SIZEOF(buf), "%s$count", item->pszName); - count = (int)DBGetContactSettingDword(NULL, DBMODULENAME, buf, -1); + count = (int)db_get_dw(NULL, DBMODULENAME, buf, -1); for (i=0; i < count; i++) { mir_snprintf(buf, SIZEOF(buf), "%s$%d", item->pszName, i); if ( !DBGetContactSettingWord(NULL, DBMODULENAME, buf, 0)) @@ -380,7 +380,7 @@ int LoadSkinHotkeys(void) } mir_snprintf(szSetting, SIZEOF(szSetting), "HKEn%s", oldSettings[i]); - if ((key = DBGetContactSettingByte(NULL, "Clist", szSetting, 0))) { + if ((key = db_get_b(NULL, "Clist", szSetting, 0))) { DBDeleteContactSetting(NULL, "Clist", szSetting); DBWriteContactSettingByte(NULL, DBMODULENAME "Off", newSettings[i], (BYTE)(key == 0)); } -- cgit v1.2.3