diff options
author | George Hazan <george.hazan@gmail.com> | 2013-06-29 18:16:23 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2013-06-29 18:16:23 +0000 |
commit | de5dce707cc60ace5b92d2ac61914c590cb9680b (patch) | |
tree | 64f2ee6639edeefcc9a32425d10cd56463dab6a4 /src | |
parent | 13952bddf4931ed75338460754860a81d3710678 (diff) |
rest of unused databases services removed
git-svn-id: http://svn.miranda-ng.org/main/trunk@5181 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src')
-rw-r--r-- | src/modules/clist/clistmod.cpp | 5 | ||||
-rw-r--r-- | src/modules/database/dbintf.cpp | 112 |
2 files changed, 0 insertions, 117 deletions
diff --git a/src/modules/clist/clistmod.cpp b/src/modules/clist/clistmod.cpp index 6108a31fe2..9fa264df86 100644 --- a/src/modules/clist/clistmod.cpp +++ b/src/modules/clist/clistmod.cpp @@ -216,11 +216,6 @@ static void RemoveProtoIconIndex(PROTOACCOUNT* pa) static int ContactListModulesLoaded(WPARAM, LPARAM)
{
- if ( !ServiceExists(MS_DB_CONTACT_GETSETTING_STR)) {
- MessageBox(NULL, TranslateT("This plugin requires db3x plugin version 0.5.1.0 or later"), _T("CList"), MB_ICONERROR | MB_OK);
- return 1;
- }
-
RebuildMenuOrder();
for (int i=0; i < accounts.getCount(); i++)
AddProtoIconIndex(accounts[i]);
diff --git a/src/modules/database/dbintf.cpp b/src/modules/database/dbintf.cpp index c1c69cece8..78102a8e80 100644 --- a/src/modules/database/dbintf.cpp +++ b/src/modules/database/dbintf.cpp @@ -45,16 +45,6 @@ static INT_PTR srvGetContactCount(WPARAM, LPARAM) ///////////////////////////////////////////////////////////////////////////////
// Contacts
-static INT_PTR srvFindFirstContact(WPARAM, LPARAM lParam)
-{
- return (currDb) ? (INT_PTR)currDb->FindFirstContact((LPCSTR)lParam) : 0;
-}
-
-static INT_PTR srvFindNextContact(WPARAM wParam, LPARAM lParam)
-{
- return (currDb) ? (INT_PTR)currDb->FindNextContact((HANDLE)wParam, (LPCSTR)lParam) : 0;
-}
-
static INT_PTR srvDeleteContact(WPARAM wParam, LPARAM)
{
return (currDb) ? currDb->DeleteContact((HANDLE)wParam) : 0;
@@ -71,69 +61,6 @@ static INT_PTR srvIsDbContact(WPARAM wParam, LPARAM) }
///////////////////////////////////////////////////////////////////////////////
-// Events
-
-static INT_PTR srvGetEventCount(WPARAM wParam, LPARAM lParam)
-{
- return (currDb) ? currDb->GetEventCount((HANDLE)wParam) : 0;
-}
-
-static INT_PTR srvAddEvent(WPARAM wParam, LPARAM lParam)
-{
- return (currDb) ? (INT_PTR)currDb->AddEvent((HANDLE)wParam, (DBEVENTINFO*)lParam) : 0;
-}
-
-static INT_PTR srvDeleteEvent(WPARAM wParam, LPARAM lParam)
-{
- return (currDb) ? currDb->DeleteEvent((HANDLE)wParam, (HANDLE)lParam) : 0;
-}
-
-static INT_PTR srvGetBlobSize(WPARAM wParam, LPARAM lParam)
-{
- return (currDb) ? currDb->GetBlobSize((HANDLE)wParam) : 0;
-}
-
-static INT_PTR srvGetEvent(WPARAM wParam, LPARAM lParam)
-{
- return (currDb) ? (INT_PTR)currDb->GetEvent((HANDLE)wParam, (DBEVENTINFO*)lParam) : 0;
-}
-
-static INT_PTR srvMarkEventRead(WPARAM wParam, LPARAM lParam)
-{
- return (currDb) ? currDb->MarkEventRead((HANDLE)wParam, (HANDLE)lParam) : 0;
-}
-
-static INT_PTR srvGetEventContact(WPARAM wParam, LPARAM lParam)
-{
- return (currDb) ? (INT_PTR)currDb->GetEventContact((HANDLE)wParam) : 0;
-}
-
-static INT_PTR srvFindFirstEvent(WPARAM wParam, LPARAM lParam)
-{
- return (currDb) ? (INT_PTR)currDb->FindFirstEvent((HANDLE)wParam) : 0;
-}
-
-static INT_PTR srvFindFirstUnreadEvent(WPARAM wParam, LPARAM lParam)
-{
- return (currDb) ? (INT_PTR)currDb->FindFirstUnreadEvent((HANDLE)wParam) : 0;
-}
-
-static INT_PTR srvFindLastEvent(WPARAM wParam, LPARAM lParam)
-{
- return (currDb) ? (INT_PTR)currDb->FindLastEvent((HANDLE)wParam) : 0;
-}
-
-static INT_PTR srvFindNextEvent(WPARAM wParam, LPARAM lParam)
-{
- return (currDb) ? (INT_PTR)currDb->FindNextEvent((HANDLE)wParam) : 0;
-}
-
-static INT_PTR srvFindPrevEvent(WPARAM wParam, LPARAM lParam)
-{
- return (currDb) ? (INT_PTR)currDb->FindPrevEvent((HANDLE)wParam) : 0;
-}
-
-///////////////////////////////////////////////////////////////////////////////
// Module chain
static INT_PTR srvEnumModuleNames(WPARAM wParam,LPARAM lParam)
@@ -144,36 +71,16 @@ static INT_PTR srvEnumModuleNames(WPARAM wParam,LPARAM lParam) ///////////////////////////////////////////////////////////////////////////////
// Settings
-static INT_PTR srvGetContactSetting(WPARAM wParam,LPARAM lParam)
-{
- return (currDb) ? (INT_PTR)currDb->GetContactSetting((HANDLE)wParam, (DBCONTACTGETSETTING*)lParam) : 0;
-}
-
-static INT_PTR srvGetContactSettingStr(WPARAM wParam,LPARAM lParam)
-{
- return (currDb) ? (INT_PTR)currDb->GetContactSettingStr((HANDLE)wParam, (DBCONTACTGETSETTING*)lParam) : 0;
-}
-
static INT_PTR srvGetContactSettingStatic(WPARAM wParam,LPARAM lParam)
{
return (currDb) ? (INT_PTR)currDb->GetContactSettingStatic((HANDLE)wParam, (DBCONTACTGETSETTING*)lParam) : 0;
}
-static INT_PTR srvFreeVariant(WPARAM wParam,LPARAM lParam)
-{
- return (currDb) ? (INT_PTR)currDb->FreeVariant((DBVARIANT*)lParam) : 0;
-}
-
static INT_PTR srvWriteContactSetting(WPARAM wParam,LPARAM lParam)
{
return (currDb) ? (INT_PTR)currDb->WriteContactSetting((HANDLE)wParam, (DBCONTACTWRITESETTING*)lParam) : 0;
}
-static INT_PTR srvDeleteContactSetting(WPARAM wParam,LPARAM lParam)
-{
- return (currDb) ? (INT_PTR)currDb->DeleteContactSetting((HANDLE)wParam, (DBCONTACTGETSETTING*)lParam) : 0;
-}
-
static INT_PTR srvEnumContactSettings(WPARAM wParam,LPARAM lParam)
{
return (currDb) ? (INT_PTR)currDb->EnumContactSettings((HANDLE)wParam, (DBCONTACTENUMSETTINGS*)lParam) : 0;
@@ -241,33 +148,14 @@ int LoadDbintfModule() CreateServiceFunction(MS_DB_SETSAFETYMODE, srvSetSafetyMode);
CreateServiceFunction(MS_DB_CONTACT_GETCOUNT, srvGetContactCount);
- CreateServiceFunction(MS_DB_CONTACT_FINDFIRST, srvFindFirstContact);
- CreateServiceFunction(MS_DB_CONTACT_FINDNEXT, srvFindNextContact);
CreateServiceFunction(MS_DB_CONTACT_DELETE, srvDeleteContact);
CreateServiceFunction(MS_DB_CONTACT_ADD, srvAddContact);
CreateServiceFunction(MS_DB_CONTACT_IS, srvIsDbContact);
- CreateServiceFunction(MS_DB_EVENT_GETCOUNT, srvGetEventCount);
- CreateServiceFunction(MS_DB_EVENT_ADD, srvAddEvent);
- CreateServiceFunction(MS_DB_EVENT_DELETE, srvDeleteEvent);
- CreateServiceFunction(MS_DB_EVENT_GETBLOBSIZE, srvGetBlobSize);
- CreateServiceFunction(MS_DB_EVENT_GET, srvGetEvent);
- CreateServiceFunction(MS_DB_EVENT_MARKREAD, srvMarkEventRead);
- CreateServiceFunction(MS_DB_EVENT_GETCONTACT, srvGetEventContact);
- CreateServiceFunction(MS_DB_EVENT_FINDFIRST, srvFindFirstEvent);
- CreateServiceFunction(MS_DB_EVENT_FINDFIRSTUNREAD, srvFindFirstUnreadEvent);
- CreateServiceFunction(MS_DB_EVENT_FINDLAST, srvFindLastEvent);
- CreateServiceFunction(MS_DB_EVENT_FINDNEXT, srvFindNextEvent);
- CreateServiceFunction(MS_DB_EVENT_FINDPREV, srvFindPrevEvent);
-
CreateServiceFunction(MS_DB_MODULES_ENUM, srvEnumModuleNames);
- CreateServiceFunction(MS_DB_CONTACT_GETSETTING, srvGetContactSetting);
- CreateServiceFunction(MS_DB_CONTACT_GETSETTING_STR, srvGetContactSettingStr);
CreateServiceFunction(MS_DB_CONTACT_GETSETTINGSTATIC, srvGetContactSettingStatic);
- CreateServiceFunction(MS_DB_CONTACT_FREEVARIANT, srvFreeVariant);
CreateServiceFunction(MS_DB_CONTACT_WRITESETTING, srvWriteContactSetting);
- CreateServiceFunction(MS_DB_CONTACT_DELETESETTING, srvDeleteContactSetting);
CreateServiceFunction(MS_DB_CONTACT_ENUMSETTINGS, srvEnumContactSettings);
CreateServiceFunction("DB/ResidentSettings/Enum", srvEnumResidentSettings);
|