diff options
| author | George Hazan <ghazan@miranda.im> | 2018-04-12 18:53:26 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-04-12 18:53:26 +0300 |
| commit | 376f5d4859ba96bff4a3c4d7c9622664b9e578d7 (patch) | |
| tree | 9acdeae557a62624cc8287534f5d6eafc7c6aefb | |
| parent | ba4509bbbac4a2db8ff44f3fc6059d2543d6aeae (diff) | |
db_get_current() also returns MDatabaseCommon*
| -rw-r--r-- | include/m_db_int.h | 2 | ||||
| -rw-r--r-- | plugins/FavContacts/src/favlist.h | 4 | ||||
| -rw-r--r-- | src/mir_core/src/db.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/m_db_int.h b/include/m_db_int.h index c3fc97eecd..036fc8446b 100644 --- a/include/m_db_int.h +++ b/include/m_db_int.h @@ -226,7 +226,7 @@ EXTERN_C MIR_CORE_DLL(DBCachedContact*) db_get_contact(MCONTACT); ///////////////////////////////////////////////////////////////////////////////
// Database list's functions
-EXTERN_C MIR_CORE_DLL(MIDatabase*) db_get_current(void);
+EXTERN_C MIR_CORE_DLL(MDatabaseCommon*) db_get_current(void);
// registers a database plugin
EXTERN_C MIR_APP_DLL(void) RegisterDatabasePlugin(DATABASELINK *pDescr);
diff --git a/plugins/FavContacts/src/favlist.h b/plugins/FavContacts/src/favlist.h index 58c5b5cc01..6581193ec9 100644 --- a/plugins/FavContacts/src/favlist.h +++ b/plugins/FavContacts/src/favlist.h @@ -67,11 +67,11 @@ class TFavContacts : public LIST < TContactInfo > private:
int nGroups;
wchar_t *prevGroup;
- MIDatabase *db;
+ MDatabaseCommon *db;
int addContact(MCONTACT hContact, bool bManual)
{
- DBCachedContact *cc = db->m_cache->GetCachedContact(hContact);
+ DBCachedContact *cc = db->getCache()->GetCachedContact(hContact);
if (cc == nullptr)
return 0;
diff --git a/src/mir_core/src/db.cpp b/src/mir_core/src/db.cpp index c4da5668d1..1f20b42098 100644 --- a/src/mir_core/src/db.cpp +++ b/src/mir_core/src/db.cpp @@ -40,7 +40,7 @@ MIR_CORE_DLL(int) db_get_contact_count(void) return (currDb) ? currDb->GetContactCount() : 0;
}
-MIR_CORE_DLL(MIDatabase*) db_get_current()
+MIR_CORE_DLL(MDatabaseCommon*) db_get_current()
{
return currDb;
}
|