From 9cca190bc3022311915eb1e95b3cc3bb89aed328 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Sat, 25 Jan 2020 14:24:53 +0300
Subject: massive code cleaning:

- GCHOOK structure normalized (i.e. inlined SESSION_INFO fields replaced with a reference to SESSION_INFO);
- fake CMsgDialog declaration added to m_srmm_int.h, thus duplicated declarations in plugins aren't needed anymore
- other minor changes
---
 plugins/HistoryStats/src/stdafx.h    | 15 ---------------
 plugins/IEView/src/ieview_logger.cpp |  2 --
 plugins/IEView/src/stdafx.h          |  1 -
 plugins/KeyboardNotify/src/main.cpp  |  8 +++-----
 plugins/Toaster/src/stdafx.h         |  1 -
 5 files changed, 3 insertions(+), 24 deletions(-)

(limited to 'plugins')

diff --git a/plugins/HistoryStats/src/stdafx.h b/plugins/HistoryStats/src/stdafx.h
index 3b1764e595..146727511f 100644
--- a/plugins/HistoryStats/src/stdafx.h
+++ b/plugins/HistoryStats/src/stdafx.h
@@ -33,32 +33,17 @@
 
 #include <newpluginapi.h>
 
-#include <m_awaymsg.h>     // not used
-#include <m_button.h>      // not used
-#include <m_chat.h>        // not used
 #include <m_clc.h>
 #include <m_clist.h>
 #include <m_contacts.h>
 #include <m_database.h>
-#include <m_email.h>       // not used
-#include <m_file.h>        // not used
-#include <m_findadd.h>     // not used
-#include <m_fontservice.h> // not used
-#include <m_genmenu.h>     // not used
-#include <m_history.h>     // not used
 #include <m_icolib.h>
-#include <m_idle.h>        // not used
-#include <m_ignore.h>      // not used
 #include <m_langpack.h>
-#include <m_message.h>     // not used
-#include <m_netlib.h>      // not used
 #include <m_options.h>
-#include <m_popup.h>       // not used
 #include <m_protocols.h>
 #include <m_protosvc.h>
 #include <m_skin.h>
 #include <m_system.h>
-#include <m_userinfo.h>    // not used
 #include <m_utils.h>
 #include <m_imgsrvc.h>
 #include <m_timezones.h>
diff --git a/plugins/IEView/src/ieview_logger.cpp b/plugins/IEView/src/ieview_logger.cpp
index b9a8490011..2437b65bf9 100644
--- a/plugins/IEView/src/ieview_logger.cpp
+++ b/plugins/IEView/src/ieview_logger.cpp
@@ -24,8 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define EVENTTYPE_STATUSCHANGE 25368
 #define EVENTTYPE_ERRMSG 25366
 
-class CMsgDialog : public CSrmmBaseDialog {};
-
 /////////////////////////////////////////////////////////////////////////////////////////
 // CIeviewLogWindow class
 
diff --git a/plugins/IEView/src/stdafx.h b/plugins/IEView/src/stdafx.h
index 3e72669271..a91545c28f 100644
--- a/plugins/IEView/src/stdafx.h
+++ b/plugins/IEView/src/stdafx.h
@@ -47,7 +47,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_contacts.h>
 #include <win2k.h>
 #include <m_avatars.h>
-#include <m_chat.h>
 #include <m_icolib.h>
 #include <m_netlib.h>
 #include <m_srmm_int.h>
diff --git a/plugins/KeyboardNotify/src/main.cpp b/plugins/KeyboardNotify/src/main.cpp
index fcbb94a66a..d5c9e650ca 100644
--- a/plugins/KeyboardNotify/src/main.cpp
+++ b/plugins/KeyboardNotify/src/main.cpp
@@ -408,11 +408,9 @@ static int PluginMessageEventHook(WPARAM hContact, LPARAM hEvent)
 static int OnGcEvent(WPARAM, LPARAM lParam)
 {
 	GCHOOK *gc = (GCHOOK *)lParam;
-	if (gc->iType == GC_USER_MESSAGE && bFlashOnGC) {
-		if (SESSION_INFO *si = g_chatApi.SM_FindSession(gc->ptszID, gc->pszModule))
-			if (contactCheckProtocol(gc->pszModule, si->hContact, EVENTTYPE_MESSAGE) && checkNotifyOptions() && checkStatus(gc->pszModule))
-				SetEvent(hFlashEvent);
-	}
+	if (gc->iType == GC_USER_MESSAGE && bFlashOnGC)
+		if (contactCheckProtocol(gc->si->pszModule, gc->si->hContact, EVENTTYPE_MESSAGE) && checkNotifyOptions() && checkStatus(gc->si->pszModule))
+			SetEvent(hFlashEvent);
 
 	return 0;
 }
diff --git a/plugins/Toaster/src/stdafx.h b/plugins/Toaster/src/stdafx.h
index 7ce114f952..f56f0cfeec 100644
--- a/plugins/Toaster/src/stdafx.h
+++ b/plugins/Toaster/src/stdafx.h
@@ -19,7 +19,6 @@
 #include <m_protocols.h>
 #include <m_popup_int.h>
 #include <m_message.h>
-#include <m_chat.h>
 #include <m_skin.h>
 #include <m_imgsrvc.h>
 #include <m_xml.h>
-- 
cgit v1.2.3