From 007b4c7301f0d26a72f89f74e9929f42e24eb3e6 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 5 Apr 2013 22:27:16 +0000
Subject: - rest of menus cleared; - old database macroses wiped out from all
plugins (left in m_database.h for compatibility)
git-svn-id: http://svn.miranda-ng.org/main/trunk@4324 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
plugins/StopSpamMod/src/stopspam.cpp | 2 +-
plugins/StopSpamMod/src/utilities.cpp | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
(limited to 'plugins/StopSpamMod')
diff --git a/plugins/StopSpamMod/src/stopspam.cpp b/plugins/StopSpamMod/src/stopspam.cpp
index 7de3bc5c96..cd8fd9b75e 100755
--- a/plugins/StopSpamMod/src/stopspam.cpp
+++ b/plugins/StopSpamMod/src/stopspam.cpp
@@ -155,7 +155,7 @@ MIRANDA_HOOK_EVENT(ME_DB_EVENT_FILTER_ADD, w, l)
if(boost::algorithm::all(message, boost::is_digit()))
{
int msg = _ttoi(message.c_str());
- int math_answer = DBGetContactSettingDword(hContact, pluginName, "MathAnswer", 0);
+ int math_answer = db_get_dw(hContact, pluginName, "MathAnswer", 0);
if(msg && math_answer)
answered = (msg == math_answer);
}
diff --git a/plugins/StopSpamMod/src/utilities.cpp b/plugins/StopSpamMod/src/utilities.cpp
index 0ce304e59f..efef2f9e02 100755
--- a/plugins/StopSpamMod/src/utilities.cpp
+++ b/plugins/StopSpamMod/src/utilities.cpp
@@ -21,24 +21,24 @@
tstring DBGetContactSettingStringPAN(HANDLE hContact, char const * szModule, char const * szSetting, tstring errorValue)
{
DBVARIANT dbv;
- //if(DBGetContactSetting(hContact, szModule, szSetting, &dbv))
+ //if(db_get(hContact, szModule, szSetting, &dbv))
if(db_get_ts(hContact, szModule, szSetting, &dbv))
return errorValue;
// if(DBVT_TCHAR == dbv.type )
errorValue = dbv.ptszVal;
- DBFreeVariant(&dbv);
+ db_free(&dbv);
return errorValue;
}
std::string DBGetContactSettingStringPAN_A(HANDLE hContact, char const * szModule, char const * szSetting, std::string errorValue)
{
DBVARIANT dbv;
- //if(DBGetContactSetting(hContact, szModule, szSetting, &dbv))
+ //if(db_get(hContact, szModule, szSetting, &dbv))
if(db_get_s(hContact, szModule, szSetting, &dbv))
return errorValue;
// if(DBVT_ASCIIZ == dbv.type )
errorValue = dbv.pszVal;
- DBFreeVariant(&dbv);
+ db_free(&dbv);
return errorValue;
}
@@ -119,7 +119,7 @@ void RemoveExcludedUsers()
if(hContact)
{
do{
- if(DBGetContactSettingByte(hContact, "CList", "NotOnList", 0) && DBGetContactSettingByte(hContact, pluginName, "Excluded", 0))
+ if(db_get_b(hContact, "CList", "NotOnList", 0) && db_get_b(hContact, pluginName, "Excluded", 0))
{
plist->hContact = hContact;
plist->next = new hContact_entry;
@@ -136,7 +136,7 @@ void RemoveExcludedUsers()
if(status>= ID_STATUS_CONNECTING && status <= ID_STATUS_OFFLINE){
LogSpamToFile(plist->hContact, _T("Mark for delete"));
- DBWriteContactSettingByte(plist->hContact,"CList","Delete", 1);
+ db_set_b(plist->hContact,"CList","Delete", 1);
}else{
LogSpamToFile(plist->hContact, _T("Deleted"));
CallService(MS_DB_CONTACT_DELETE, (WPARAM)plist->hContact, 0);
@@ -160,7 +160,7 @@ void RemoveTemporaryUsers()
if(hContact)
{
do{
- if(DBGetContactSettingByte(hContact, "CList", "NotOnList", 0)||
+ if(db_get_b(hContact, "CList", "NotOnList", 0)||
(_T("Not In List")== DBGetContactSettingStringPAN(hContact,"CList","Group",_T("")))
)
{
@@ -179,7 +179,7 @@ void RemoveTemporaryUsers()
if(status>= ID_STATUS_CONNECTING && status <= ID_STATUS_OFFLINE){
LogSpamToFile(plist->hContact, _T("Mark for delete"));
- DBWriteContactSettingByte(plist->hContact,"CList","Delete", 1);
+ db_set_b(plist->hContact,"CList","Delete", 1);
}else{
LogSpamToFile(plist->hContact, _T("Deleted"));
CallService(MS_DB_CONTACT_DELETE, (WPARAM)plist->hContact, 0);
--
cgit v1.2.3