From 78c41a686c483076e6987c18266236c0b17652a1 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Sun, 5 Mar 2017 22:13:25 +0300
Subject: unused type declaration removed

---
 plugins/TabSRMM/src/chat/chat.h     | 49 ++++++++++++++++---------------------
 plugins/TabSRMM/src/chat/window.cpp |  6 ++---
 2 files changed, 24 insertions(+), 31 deletions(-)

(limited to 'plugins/TabSRMM')

diff --git a/plugins/TabSRMM/src/chat/chat.h b/plugins/TabSRMM/src/chat/chat.h
index c116165cbd..de0f4cc330 100644
--- a/plugins/TabSRMM/src/chat/chat.h
+++ b/plugins/TabSRMM/src/chat/chat.h
@@ -37,28 +37,21 @@ enum TChatStatusEx
 	CHAT_STATUS_MAX
 };
 
-// special service for tweaking performance
-#define MS_GC_GETEVENTPTR  "GChat/GetNewEventPtr"
-typedef INT_PTR(*GETEVENTFUNC)(WPARAM wParam, LPARAM lParam);
-typedef struct  {
-	GETEVENTFUNC pfnAddEvent;
-}GCPTRS;
-
 class CMUCHighlight;
 
 // structs
 
 struct MODULEINFO : public GCModuleInfoBase
 {
-	DWORD          idleTimeStamp;
-	DWORD          lastIdleCheck;
-	wchar_t          tszIdleMsg[60];
+	DWORD idleTimeStamp;
+	DWORD lastIdleCheck;
+	wchar_t tszIdleMsg[60];
 };
 
 struct SESSION_INFO : public GCSessionInfoBase
 {
-	CChatRoomDlg   *dat;
-	int             iLogTrayFlags, iLogPopupFlags, iDiskLogFlags;
+	CChatRoomDlg *dat;
+	int iLogTrayFlags, iLogPopupFlags, iDiskLogFlags;
 };
 
 struct LOGSTREAMDATA : public GCLogStreamDataBase
@@ -69,22 +62,22 @@ struct LOGSTREAMDATA : public GCLogStreamDataBase
 
 struct TMUCSettings : public GlobalLogSettingsBase
 {
-	HICON       hIconOverlay;
-	DWORD       dwIconFlags;
-	LONG        iNickListFontHeight;
-	int         iEventLimitThreshold;
-
-	HFONT       UserListFonts[CHAT_STATUS_MAX];
-	COLORREF    UserListColors[CHAT_STATUS_MAX];
-
-	COLORREF    nickColors[8];
-	HBRUSH      SelectionBGBrush;
-	bool        bOpenInDefault, bBBCodeInPopups;
-	bool        bDoubleClick4Privat, bShowContactStatus, bContactStatusFirst;
-
-	bool        bLogClassicIndicators, bAlternativeSorting, bAnnoyingHighlight, bCreateWindowOnHighlight;
-	bool        bLogSymbols, bClassicIndicators, bClickableNicks, bColorizeNicks, bColorizeNicksInLog;
-	bool        bScaleIcons, bUseCommaAsColon, bNewLineAfterNames;
+	HICON    hIconOverlay;
+	DWORD    dwIconFlags;
+	LONG     iNickListFontHeight;
+	int      iEventLimitThreshold;
+
+	HFONT    UserListFonts[CHAT_STATUS_MAX];
+	COLORREF UserListColors[CHAT_STATUS_MAX];
+
+	COLORREF nickColors[8];
+	HBRUSH   SelectionBGBrush;
+	bool     bOpenInDefault, bBBCodeInPopups;
+	bool     bDoubleClick4Privat, bShowContactStatus, bContactStatusFirst;
+
+	bool     bLogClassicIndicators, bAlternativeSorting, bAnnoyingHighlight, bCreateWindowOnHighlight;
+	bool     bLogSymbols, bClassicIndicators, bClickableNicks, bColorizeNicks, bColorizeNicksInLog;
+	bool     bScaleIcons, bUseCommaAsColon, bNewLineAfterNames;
 
 	CMUCHighlight* Highlight;
 };
diff --git a/plugins/TabSRMM/src/chat/window.cpp b/plugins/TabSRMM/src/chat/window.cpp
index f91592807e..152c958ae8 100644
--- a/plugins/TabSRMM/src/chat/window.cpp
+++ b/plugins/TabSRMM/src/chat/window.cpp
@@ -464,7 +464,7 @@ LBL_SkipEnd:
 static LRESULT CALLBACK MessageSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	HWND hwndParent = GetParent(hwnd);
-	CTabBaseDlg *mwdat = (CChatRoomDlg*)GetWindowLongPtr(hwndParent, GWLP_USERDATA);
+	CChatRoomDlg *mwdat = (CChatRoomDlg*)GetWindowLongPtr(hwndParent, GWLP_USERDATA);
 	MESSAGESUBDATA *dat = (MESSAGESUBDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA);
 
 	if (mwdat != nullptr)
@@ -1104,7 +1104,7 @@ static LRESULT CALLBACK ButtonSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, L
 static LRESULT CALLBACK LogSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	HWND hwndParent = GetParent(hwnd);
-	CSrmmWindow *mwdat = (CSrmmWindow*)GetWindowLongPtr(hwndParent, GWLP_USERDATA);
+	CChatRoomDlg *mwdat = (CChatRoomDlg*)GetWindowLongPtr(hwndParent, GWLP_USERDATA);
 
 	switch (msg) {
 	case WM_NCCALCSIZE:
@@ -1747,7 +1747,7 @@ void CChatRoomDlg::OnClick_OK(CCtrlButton*)
 	if (ptszText.IsEmpty())
 		return;
 
-	si->dat->DoRtfToTags(ptszText, mi->nColorCount, mi->crColors);
+	DoRtfToTags(ptszText, mi->nColorCount, mi->crColors);
 	ptszText.Trim();
 	ptszText.Replace(L"%", L"%%");
 
-- 
cgit v1.2.3