From 097c52ad9a2928422084bf76cebee58958341574 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 7 Apr 2013 19:47:13 +0000 Subject: end of the old database macroses git-svn-id: http://svn.miranda-ng.org/main/trunk@4373 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Omegle/src/communication.cpp | 4 ++-- protocols/Omegle/src/db.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'protocols/Omegle') diff --git a/protocols/Omegle/src/communication.cpp b/protocols/Omegle/src/communication.cpp index ea4604b167..fa34f586b8 100644 --- a/protocols/Omegle/src/communication.cpp +++ b/protocols/Omegle/src/communication.cpp @@ -333,7 +333,7 @@ bool Omegle_client::start() else if ( db_get_b(NULL, parent->m_szModuleName, OMEGLE_KEY_MEET_COMMON, 0)) { DBVARIANT dbv; - if (!DBGetContactSettingUTF8String(NULL, parent->m_szModuleName, OMEGLE_KEY_INTERESTS, &dbv)) + if (!db_get_utf(NULL, parent->m_szModuleName, OMEGLE_KEY_INTERESTS, &dbv)) { std::string topics = dbv.pszVal; std::string topic; @@ -672,7 +672,7 @@ bool Omegle_client::events( ) // We got new stranger in this event, lets say him "Hi message" if enabled if ( db_get_b( NULL, parent->m_szModuleName, OMEGLE_KEY_HI_ENABLED, 0 )) { DBVARIANT dbv; - if ( !DBGetContactSettingUTF8String( NULL, parent->m_szModuleName, OMEGLE_KEY_HI, &dbv )) { + if ( !db_get_utf( NULL, parent->m_szModuleName, OMEGLE_KEY_HI, &dbv )) { std::string *message = new std::string(dbv.pszVal); db_free(&dbv); diff --git a/protocols/Omegle/src/db.h b/protocols/Omegle/src/db.h index 6543b9f2d8..355c0061ab 100644 --- a/protocols/Omegle/src/db.h +++ b/protocols/Omegle/src/db.h @@ -33,8 +33,8 @@ along with this program. If not, see . #define setString( setting, value ) db_set_s( NULL, m_szModuleName, setting, value ) #define getTString( setting, dest ) db_get_ts( NULL, m_szModuleName, setting, dest ) #define setTString( setting, value ) db_set_ts( NULL, m_szModuleName, setting, value ) -#define getU8String( setting, dest ) DBGetContactSettingUTF8String( NULL, m_szModuleName, setting, dest ) -#define setU8String( setting, value ) DBWriteContactSettingUTF8String( NULL, m_szModuleName, setting, value ) +#define getU8String( setting, dest ) db_get_utf( NULL, m_szModuleName, setting, dest ) +#define setU8String( setting, value ) db_set_utf( NULL, m_szModuleName, setting, value ) #define deleteSetting( setting ) db_unset( NULL, m_szModuleName, setting ) // DB settings -- cgit v1.2.3