From 7bdb598e26e7e98788933af43090d34027166969 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 14 Sep 2016 18:01:49 +0000 Subject: second major wipeout of database services & structures: - DBCONTACTENUMSETTINGS removed; - all helpers moved to mir_core.dll git-svn-id: http://svn.miranda-ng.org/main/trunk@17296 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/IRCG/src/clist.cpp | 2 +- protocols/IRCG/src/ircproto.cpp | 6 +----- protocols/IRCG/src/options.cpp | 7 ++----- 3 files changed, 4 insertions(+), 11 deletions(-) (limited to 'protocols/IRCG/src') diff --git a/protocols/IRCG/src/clist.cpp b/protocols/IRCG/src/clist.cpp index 8ef7cab404..a0406973c6 100644 --- a/protocols/IRCG/src/clist.cpp +++ b/protocols/IRCG/src/clist.cpp @@ -97,7 +97,7 @@ MCONTACT CIrcProto::CList_AddContact(CONTACT *user, bool InList, bool SetOnline) } // here we create a new one since no one is to be found - hContact = (MCONTACT)CallService(MS_DB_CONTACT_ADD, 0, 0); + hContact = db_add_contact(); if (hContact) { Proto_AddToContact(hContact, m_szModuleName); diff --git a/protocols/IRCG/src/ircproto.cpp b/protocols/IRCG/src/ircproto.cpp index 50ac719935..a7befd3419 100644 --- a/protocols/IRCG/src/ircproto.cpp +++ b/protocols/IRCG/src/ircproto.cpp @@ -246,11 +246,7 @@ int CIrcProto::OnModulesLoaded(WPARAM, LPARAM) if (!getByte("PerformConversionDone", 0)) { OBJLIST performToConvert(10); - DBCONTACTENUMSETTINGS dbces = { 0 }; - dbces.pfnEnumProc = sttCheckPerform; - dbces.lParam = (LPARAM)&performToConvert; - dbces.szModule = m_szModuleName; - CallService(MS_DB_CONTACT_ENUMSETTINGS, NULL, (LPARAM)&dbces); + db_enum_settings(NULL, sttCheckPerform, m_szModuleName, &performToConvert); for (int i = 0; i < performToConvert.getCount(); i++) { CMStringA s = performToConvert[i]; diff --git a/protocols/IRCG/src/options.cpp b/protocols/IRCG/src/options.cpp index 1a249a3fc3..20a7899faf 100644 --- a/protocols/IRCG/src/options.cpp +++ b/protocols/IRCG/src/options.cpp @@ -165,10 +165,7 @@ void RereadServers() { g_servers.destroy(); - DBCONTACTENUMSETTINGS dbces = { 0 }; - dbces.pfnEnumProc = sttServerEnum; - dbces.szModule = SERVERSMODULE; - CallService(MS_DB_CONTACT_ENUMSETTINGS, NULL, (LPARAM)&dbces); + db_enum_settings(NULL, sttServerEnum, SERVERSMODULE); } ///////////////////////////////////////////////////////////////////////////////////////// @@ -747,7 +744,7 @@ void CConnectPrefsDlg::OnApply() if (m_serverlistModified) { m_serverlistModified = false; - DbModule_Delete(0, SERVERSMODULE); + db_delete_module(0, SERVERSMODULE); int j = m_serverCombo.GetCount(); if (j != CB_ERR && j != 0) { -- cgit v1.2.3