summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/FTPFileYM/src/mir_db.h21
-rw-r--r--plugins/NewEventNotify/src/popup.cpp2
2 files changed, 11 insertions, 12 deletions
diff --git a/plugins/FTPFileYM/src/mir_db.h b/plugins/FTPFileYM/src/mir_db.h
index bc92bd1e15..7293c145ff 100644
--- a/plugins/FTPFileYM/src/mir_db.h
+++ b/plugins/FTPFileYM/src/mir_db.h
@@ -20,19 +20,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "stdafx.h"
-class DB
+namespace DB
{
-public:
- static int setByteF(MCONTACT hContact, char *szModule, char *szSetting, int id, int iValue);
- static int setWordF(MCONTACT hContact, char *szModule, char *szSetting, int id, int iValue);
- static int setDwordF(MCONTACT hContact, char *szModule, char *szSetting, int id, int iValue);
+ int setByteF(MCONTACT hContact, char *szModule, char *szSetting, int id, int iValue);
+ int setWordF(MCONTACT hContact, char *szModule, char *szSetting, int id, int iValue);
+ int setDwordF(MCONTACT hContact, char *szModule, char *szSetting, int id, int iValue);
- static int setAStringF(MCONTACT hContact, char *szModule, char *szSetting, int id, char *szValue);
- static int setStringF(MCONTACT hContact, char *szModule, char *szSetting, int id, wchar_t *stzValue);
+ int setAStringF(MCONTACT hContact, char *szModule, char *szSetting, int id, char *szValue);
+ int setStringF(MCONTACT hContact, char *szModule, char *szSetting, int id, wchar_t *stzValue);
- static int getByteF(MCONTACT hContact, char *szModule, char *szSetting, int id, int iErrorValue = -1);
- static int getWordF(MCONTACT hContact, char *szModule, char *szSetting, int id, int iErrorValue = -1);
- static int getDwordF(MCONTACT hContact, char *szModule, char *szSetting, int id, int iErrorValue = -1);
+ int getByteF(MCONTACT hContact, char *szModule, char *szSetting, int id, int iErrorValue = -1);
+ int getWordF(MCONTACT hContact, char *szModule, char *szSetting, int id, int iErrorValue = -1);
+ int getDwordF(MCONTACT hContact, char *szModule, char *szSetting, int id, int iErrorValue = -1);
- static int deleteSettingF(MCONTACT hContact, char *szModule, char *szSetting, int id);
+ int deleteSettingF(MCONTACT hContact, char *szModule, char *szSetting, int id);
};
diff --git a/plugins/NewEventNotify/src/popup.cpp b/plugins/NewEventNotify/src/popup.cpp
index 0cc9bf7df2..07a074042e 100644
--- a/plugins/NewEventNotify/src/popup.cpp
+++ b/plugins/NewEventNotify/src/popup.cpp
@@ -272,7 +272,7 @@ static wchar_t* GetEventPreview(DBEVENTINFO *dbei)
case EVENTTYPE_AUTHREQUEST:
if (dbei->pBlob) {
- DB_AUTH_BLOB blob(dbei->pBlob);
+ DB::AUTH_BLOB blob(dbei->pBlob);
wchar_t *szNick = nullptr;
if (blob.get_nick())