summaryrefslogtreecommitdiff
path: root/src/modules/clist/genmenu.cpp
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2012-10-07 11:42:28 +0000
committerGeorge Hazan <george.hazan@gmail.com>2012-10-07 11:42:28 +0000
commit197fe77f67654cf8c46c53376190fc321176c08b (patch)
tree1a161cf7fb7968e3781b1d11771195d9b5e4c26c /src/modules/clist/genmenu.cpp
parent4bcab3fc00696ca2daf1396bfc75bd49009644d6 (diff)
old database macros removed from m_database.h
git-svn-id: http://svn.miranda-ng.org/main/trunk@1796 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/modules/clist/genmenu.cpp')
-rw-r--r--src/modules/clist/genmenu.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/modules/clist/genmenu.cpp b/src/modules/clist/genmenu.cpp
index 1a42b7af57..e68463c781 100644
--- a/src/modules/clist/genmenu.cpp
+++ b/src/modules/clist/genmenu.cpp
@@ -236,7 +236,7 @@ INT_PTR MO_GetProtoRootMenu(WPARAM wParam, LPARAM lParam)
if (szProto == NULL)
return 0;
- if (DBGetContactSettingByte(NULL, "CList", "MoveProtoMenus", TRUE))
+ if (db_get_b(NULL, "CList", "MoveProtoMenus", TRUE))
return (INT_PTR)cli.pfnGetProtocolMenu(szProto);
int objidx = GetMenuObjbyId((int)hMainMenuObject);
@@ -912,11 +912,11 @@ HMENU BuildRecursiveMenu(HMENU hMenu, PMO_IntMenuItem pRootMenu, ListParam *para
// check if it visible
mir_snprintf(DBString, SIZEOF(DBString), "%s_visible", menuItemName);
- if (DBGetContactSettingByte(NULL, MenuNameItems, DBString, -1) == -1)
+ if (db_get_b(NULL, MenuNameItems, DBString, -1) == -1)
DBWriteContactSettingByte(NULL, MenuNameItems, DBString, 1);
pmi->OverrideShow = TRUE;
- if ( !DBGetContactSettingByte(NULL, MenuNameItems, DBString, 1)) {
+ if ( !db_get_b(NULL, MenuNameItems, DBString, 1)) {
pmi->OverrideShow = FALSE;
continue; // find out what value to return if not getting added
}
@@ -930,8 +930,8 @@ HMENU BuildRecursiveMenu(HMENU hMenu, PMO_IntMenuItem pRootMenu, ListParam *para
}
mir_snprintf(DBString, SIZEOF(DBString), "%s_pos", menuItemName);
- if ((pos = DBGetContactSettingDword(NULL, MenuNameItems, DBString, -1)) == -1) {
- DBWriteContactSettingDword(NULL, MenuNameItems, DBString, mi->position);
+ if ((pos = db_get_dw(NULL, MenuNameItems, DBString, -1)) == -1) {
+ db_set_dw(NULL, MenuNameItems, DBString, mi->position);
if (pmi->submenu.first)
mi->position = 0;
}
@@ -1180,7 +1180,7 @@ int InitGenMenu()
CreateServiceFunction(MO_SETOPTIONSMENUOBJECT, SRVMO_SetOptionsMenuObject);
CreateServiceFunction(MO_SETOPTIONSMENUITEM, SRVMO_SetOptionsMenuItem);
- bIconsDisabled = DBGetContactSettingByte(NULL, "CList", "DisableMenuIcons", 0) != 0;
+ bIconsDisabled = db_get_b(NULL, "CList", "DisableMenuIcons", 0) != 0;
bIsGenMenuInited = true;