diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-10-07 11:42:28 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-10-07 11:42:28 +0000 |
| commit | 197fe77f67654cf8c46c53376190fc321176c08b (patch) | |
| tree | 1a161cf7fb7968e3781b1d11771195d9b5e4c26c /src/modules/clist/contact.cpp | |
| parent | 4bcab3fc00696ca2daf1396bfc75bd49009644d6 (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/contact.cpp')
| -rw-r--r-- | src/modules/clist/contact.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/modules/clist/contact.cpp b/src/modules/clist/contact.cpp index a523c3b262..932efb03fc 100644 --- a/src/modules/clist/contact.cpp +++ b/src/modules/clist/contact.cpp @@ -78,16 +78,16 @@ void fnLoadContactTree(void) CallService(MS_CLUI_GROUPADDED, i, 0);
}
- hideOffline = DBGetContactSettingByte(NULL, "CList", "HideOffline", SETTING_HIDEOFFLINE_DEFAULT);
+ hideOffline = db_get_b(NULL, "CList", "HideOffline", SETTING_HIDEOFFLINE_DEFAULT);
hContact = (HANDLE) CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);
while (hContact != NULL) {
status = GetContactStatus(hContact);
- if (( !hideOffline || status != ID_STATUS_OFFLINE) && !DBGetContactSettingByte(hContact, "CList", "Hidden", 0))
+ if (( !hideOffline || status != ID_STATUS_OFFLINE) && !db_get_b(hContact, "CList", "Hidden", 0))
cli.pfnChangeContactIcon(hContact, cli.pfnIconFromStatusMode((char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0), status, hContact), 1);
hContact = (HANDLE) CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM) hContact, 0);
}
- sortByStatus = DBGetContactSettingByte(NULL, "CList", "SortByStatus", SETTING_SORTBYSTATUS_DEFAULT);
- sortByProto = DBGetContactSettingByte(NULL, "CList", "SortByProto", SETTING_SORTBYPROTO_DEFAULT);
+ sortByStatus = db_get_b(NULL, "CList", "SortByStatus", SETTING_SORTBYSTATUS_DEFAULT);
+ sortByProto = db_get_b(NULL, "CList", "SortByProto", SETTING_SORTBYPROTO_DEFAULT);
CallService(MS_CLUI_SORTLIST, 0, 0);
CallService(MS_CLUI_LISTENDREBUILD, 0, 0);
}
@@ -148,8 +148,8 @@ static VOID CALLBACK SortContactsTimer(HWND, UINT, UINT_PTR, DWORD) void fnSortContacts(void)
{
//avoid doing lots of resorts in quick succession
- sortByStatus = DBGetContactSettingByte(NULL, "CList", "SortByStatus", SETTING_SORTBYSTATUS_DEFAULT);
- sortByProto = DBGetContactSettingByte(NULL, "CList", "SortByProto", SETTING_SORTBYPROTO_DEFAULT);
+ sortByStatus = db_get_b(NULL, "CList", "SortByStatus", SETTING_SORTBYSTATUS_DEFAULT);
+ sortByProto = db_get_b(NULL, "CList", "SortByProto", SETTING_SORTBYPROTO_DEFAULT);
if (resortTimerId)
KillTimer(NULL, resortTimerId);
// setting this to a higher delay causes shutdown waits.
@@ -185,7 +185,7 @@ int fnSetHideOffline(WPARAM wParam, LPARAM) break;
case -1:
DBWriteContactSettingByte(NULL, "CList", "HideOffline",
- (BYTE) ! DBGetContactSettingByte(NULL, "CList", "HideOffline", SETTING_HIDEOFFLINE_DEFAULT));
+ (BYTE) ! db_get_b(NULL, "CList", "HideOffline", SETTING_HIDEOFFLINE_DEFAULT));
break;
}
cli.pfnLoadContactTree();
|