From 64e3214c2222543350f51b517a6b75b6b02b81cf Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Wed, 14 Nov 2018 18:23:04 +0300
Subject: unused MODULENAME macros removed

---
 plugins/BuddyExpectator/src/BuddyExpectator.cpp | 12 ++++++------
 plugins/BuddyExpectator/src/options.cpp         |  8 ++++----
 plugins/BuddyExpectator/src/stdafx.h            |  2 --
 3 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'plugins/BuddyExpectator')

diff --git a/plugins/BuddyExpectator/src/BuddyExpectator.cpp b/plugins/BuddyExpectator/src/BuddyExpectator.cpp
index 2760f7c387..9baeda0297 100644
--- a/plugins/BuddyExpectator/src/BuddyExpectator.cpp
+++ b/plugins/BuddyExpectator/src/BuddyExpectator.cpp
@@ -61,7 +61,7 @@ PLUGININFOEX pluginInfoEx = {
 };
 
 CMPlugin::CMPlugin() :
-	PLUGIN<CMPlugin>(MODULENAME, pluginInfoEx)
+	PLUGIN<CMPlugin>("BuddyExpectator", pluginInfoEx)
 {}
 
 /////////////////////////////////////////////////////////////////////////////////////////
@@ -106,7 +106,7 @@ LRESULT CALLBACK HidePopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM
 		break;
 
 	case WM_CONTEXTMENU:
-		db_set_b(PUGetContact(hWnd), MODULENAME, "NeverHide", 1);
+		g_plugin.setByte(PUGetContact(hWnd), "NeverHide", 1);
 		PUDeletePopup(hWnd);
 		break;
 
@@ -116,7 +116,7 @@ LRESULT CALLBACK HidePopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM
 			PUDeletePopup(hWnd);
 		}
 		if (wParam == 3) {
-			db_set_b(PUGetContact(hWnd), MODULENAME, "NeverHide", 1);
+			g_plugin.setByte(PUGetContact(hWnd), "NeverHide", 1);
 			PUDeletePopup(hWnd);
 		}
 		break;
@@ -133,8 +133,8 @@ LRESULT CALLBACK MissYouPopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPA
 	case WM_COMMAND:
 		if (HIWORD(wParam) == STN_CLICKED) {
 			CallServiceSync("BuddyExpectator/actionMissYou", (WPARAM)PUGetContact(hWnd), 0);
-			if (!db_get_b(PUGetContact(hWnd), MODULENAME, "MissYouNotifyAlways", 0)) {
-				db_set_b(PUGetContact(hWnd), MODULENAME, "MissYou", 0);
+			if (!g_plugin.getByte(PUGetContact(hWnd), "MissYouNotifyAlways", 0)) {
+				g_plugin.setByte(PUGetContact(hWnd), "MissYou", 0);
 				ExtraIcon_Clear(hExtraIcon, PUGetContact(hWnd));
 			}
 			PUDeletePopup(hWnd);
@@ -147,7 +147,7 @@ LRESULT CALLBACK MissYouPopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPA
 
 	case UM_POPUPACTION:
 		if (wParam == 1) {
-			db_set_b(PUGetContact(hWnd), MODULENAME, "MissYou", 0);
+			g_plugin.setByte(PUGetContact(hWnd), "MissYou", 0);
 			ExtraIcon_Clear(hExtraIcon, PUGetContact(hWnd));
 			PUDeletePopup(hWnd);
 		}
diff --git a/plugins/BuddyExpectator/src/options.cpp b/plugins/BuddyExpectator/src/options.cpp
index 4655dcfef6..6296fd7b34 100644
--- a/plugins/BuddyExpectator/src/options.cpp
+++ b/plugins/BuddyExpectator/src/options.cpp
@@ -475,7 +475,7 @@ INT_PTR CALLBACK UserinfoDlgProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lpar
 			SetDlgItemText(hdlg, IDC_EDIT_LASTINPUT, tmpBuf);
 		}
 
-		unsigned int AbsencePeriod = db_get_dw((MCONTACT)lparam, MODULENAME, "iAbsencePeriod", options.iAbsencePeriod);
+		unsigned int AbsencePeriod = g_plugin.getDword(lparam, "iAbsencePeriod", options.iAbsencePeriod);
 
 		SendDlgItemMessage(hdlg, IDC_SPINABSENCE, UDM_SETRANGE, 0, MAKELONG(999, 1));
 		SetDlgItemInt(hdlg, IDC_EDITABSENCE, AbsencePeriod, FALSE);
@@ -485,9 +485,9 @@ INT_PTR CALLBACK UserinfoDlgProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lpar
 		else
 			SetDlgItemText(hdlg, IDC_EDIT_WILLNOTICE, L"");
 
-		CheckDlgButton(hdlg, IDC_CHECK_MISSYOU, db_get_b((MCONTACT)lparam, MODULENAME, "MissYou", 0) ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hdlg, IDC_CHECK_NOTIFYALWAYS, db_get_b((MCONTACT)lparam, MODULENAME, "MissYouNotifyAlways", 0) ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hdlg, IDC_CHECK_NEVERHIDE, db_get_b((MCONTACT)lparam, MODULENAME, "NeverHide", 0) ? BST_CHECKED : BST_UNCHECKED);
+		CheckDlgButton(hdlg, IDC_CHECK_MISSYOU, g_plugin.getByte(lparam, "MissYou") ? BST_CHECKED : BST_UNCHECKED);
+		CheckDlgButton(hdlg, IDC_CHECK_NOTIFYALWAYS, g_plugin.getByte(lparam, "MissYouNotifyAlways") ? BST_CHECKED : BST_UNCHECKED);
+		CheckDlgButton(hdlg, IDC_CHECK_NEVERHIDE, g_plugin.getByte(lparam, "NeverHide") ? BST_CHECKED : BST_UNCHECKED);
 
 		TranslateDialogDefault(hdlg);
 		return TRUE;
diff --git a/plugins/BuddyExpectator/src/stdafx.h b/plugins/BuddyExpectator/src/stdafx.h
index 798492ec0c..4604eb43d1 100644
--- a/plugins/BuddyExpectator/src/stdafx.h
+++ b/plugins/BuddyExpectator/src/stdafx.h
@@ -45,8 +45,6 @@
 #include "options.h"
 #include "version.h"
 
-#define MODULENAME     "BuddyExpectator"
-
 struct CMPlugin : public PLUGIN<CMPlugin>
 {
 	CMPlugin();
-- 
cgit v1.2.3