From a781184281f8e75f69754380bce1cf832ea476cf Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Wed, 18 Sep 2019 20:08:27 +0300
Subject: tabSRMM: own set of H++ constants removed

---
 plugins/TabSRMM/src/msgdlgutils.cpp |  2 +-
 plugins/TabSRMM/src/msgoptions.cpp  |  2 +-
 plugins/TabSRMM/src/msgs.h          | 14 ++++----------
 plugins/TabSRMM/src/stdafx.h        |  1 +
 plugins/TabSRMM/src/userprefs.cpp   |  2 +-
 5 files changed, 8 insertions(+), 13 deletions(-)

(limited to 'plugins')

diff --git a/plugins/TabSRMM/src/msgdlgutils.cpp b/plugins/TabSRMM/src/msgdlgutils.cpp
index 91c0b3840f..147250a16d 100644
--- a/plugins/TabSRMM/src/msgdlgutils.cpp
+++ b/plugins/TabSRMM/src/msgdlgutils.cpp
@@ -333,7 +333,7 @@ UINT TSAPI GetIEViewMode(MCONTACT hContact)
 		g_IEViewAvail = ServiceExists(MS_IEVIEW_WINDOW);
 
 	if (g_HPPAvail == -1)
-		g_HPPAvail = ServiceExists("History++/ExtGrid/NewWindow");
+		g_HPPAvail = ServiceExists(MS_HPP_GETVERSION);
 
 	PluginConfig.g_WantIEView = g_IEViewAvail && M.GetByte("default_ieview", 0);
 	PluginConfig.g_WantHPP = g_HPPAvail && M.GetByte("default_hpp", 0);
diff --git a/plugins/TabSRMM/src/msgoptions.cpp b/plugins/TabSRMM/src/msgoptions.cpp
index 5ee5585133..ab2cb125fa 100644
--- a/plugins/TabSRMM/src/msgoptions.cpp
+++ b/plugins/TabSRMM/src/msgoptions.cpp
@@ -651,7 +651,7 @@ public:
 		chkLoadTime.OnChange = chkLoadCount.OnChange = chkLoadUnread.OnChange = Callback(this, &COptLogDlg::onChange_Load);
 
 		have_ieview = ServiceExists(MS_IEVIEW_WINDOW) != 0;
-		have_hpp = ServiceExists("History++/ExtGrid/NewWindow") != 0;
+		have_hpp = ServiceExists(MS_HPP_GETVERSION) != 0;
 	}
 
 	bool OnInitDialog() override
diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h
index 8ef3641d43..e09f552bce 100644
--- a/plugins/TabSRMM/src/msgs.h
+++ b/plugins/TabSRMM/src/msgs.h
@@ -989,16 +989,10 @@ struct SIDEBARITEM
 // custom tabSRMM events
 #define tabMSG_WINDOW_EVT_CUSTOM_BEFORESEND 1
 
-// temporary HPP API for emulating message log 
-#define MS_HPP_EG_WINDOW "History++/ExtGrid/NewWindow"
-#define MS_HPP_EG_EVENT  "History++/ExtGrid/Event"
-#define MS_HPP_EG_UTILS  "History++/ExtGrid/Utils"
-#define MS_HPP_EG_OPTIONSCHANGED "History++/ExtGrid/OptionsChanged"
-#define MS_HPP_EG_NOTIFICATION   "History++/ExtGrid/Notification"
-
-#define SB_CHAR_WIDTH			45					// default width for status bar panel #2
-#define DEFAULT_CONTAINER_POS 	0x00400040			// default container position and size
-#define DEFAULT_CONTAINER_SIZE 	0x019001f4
+#define SB_CHAR_WIDTH                45               // default width for status bar panel #2
+
+#define DEFAULT_CONTAINER_POS        0x00400040       // default container position and size
+#define DEFAULT_CONTAINER_SIZE       0x019001f4
 
 // core hotkey service ids
 #define TABSRMM_HK_LASTUNREAD        2
diff --git a/plugins/TabSRMM/src/stdafx.h b/plugins/TabSRMM/src/stdafx.h
index 8aef3fe071..97cd4a1989 100644
--- a/plugins/TabSRMM/src/stdafx.h
+++ b/plugins/TabSRMM/src/stdafx.h
@@ -84,6 +84,7 @@
 #include <m_nudge.h>
 #include <m_folders.h>
 #include <m_smileyadd.h>
+#include <m_hpp.h>
 
 #define TSAPI __stdcall
 #define FASTCALL __fastcall
diff --git a/plugins/TabSRMM/src/userprefs.cpp b/plugins/TabSRMM/src/userprefs.cpp
index 51c79192d0..7c259f6cff 100644
--- a/plugins/TabSRMM/src/userprefs.cpp
+++ b/plugins/TabSRMM/src/userprefs.cpp
@@ -55,7 +55,7 @@ static INT_PTR CALLBACK DlgProcUserPrefs(HWND hwndDlg, UINT msg, WPARAM wParam,
 			BYTE bAvatarVisible = M.GetByte(hContact, "hideavatar", -1);
 
 			have_ieview = ServiceExists(MS_IEVIEW_WINDOW);
-			have_hpp = ServiceExists("History++/ExtGrid/NewWindow");
+			have_hpp = ServiceExists(MS_HPP_GETVERSION);
 
 			SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)lParam);
 
-- 
cgit v1.2.3