From 85c0b6a96f366bdf0ca334ee7cb1877fb3f2288c Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 16 Jan 2015 17:49:54 +0000
Subject: MEVENT - the strict type for events, they are not HANDLE anymore

git-svn-id: http://svn.miranda-ng.org/main/trunk@11866 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/WinterSpeak/src/EventInformation.cpp | 2 +-
 plugins/WinterSpeak/src/EventInformation.h   | 4 ++--
 plugins/WinterSpeak/src/SpeakAnnounce.cpp    | 2 +-
 plugins/WinterSpeak/src/SpeakAnnounce.h      | 2 +-
 plugins/WinterSpeak/src/main.cpp             | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'plugins/WinterSpeak')

diff --git a/plugins/WinterSpeak/src/EventInformation.cpp b/plugins/WinterSpeak/src/EventInformation.cpp
index 21c90a7b85..f79c03eb0e 100644
--- a/plugins/WinterSpeak/src/EventInformation.cpp
+++ b/plugins/WinterSpeak/src/EventInformation.cpp
@@ -23,7 +23,7 @@ EventInformation::~EventInformation()
 }
 
 //------------------------------------------------------------------------------
-bool EventInformation::isValidEvent(HANDLE event)
+bool EventInformation::isValidEvent(MEVENT event)
 {
 	// clean up the old event
 	if (m_event_info.pBlob)
diff --git a/plugins/WinterSpeak/src/EventInformation.h b/plugins/WinterSpeak/src/EventInformation.h
index 42169d21e9..7ef1d698af 100644
--- a/plugins/WinterSpeak/src/EventInformation.h
+++ b/plugins/WinterSpeak/src/EventInformation.h
@@ -13,7 +13,7 @@ class EventInformation
 	// Description : is the event valid?
 	// Return      : true = the event is valid
 	//--------------------------------------------------------------------------
-	bool isValidEvent(HANDLE event);
+	bool isValidEvent(MEVENT event);
 
 	//--------------------------------------------------------------------------
 	// Description : get the last event received
@@ -49,5 +49,5 @@ class EventInformation
   private:
 	std::map<unsigned short, std::wstring> m_event_strings;
 
-	DBEVENTINFO                           m_event_info;
+	DBEVENTINFO m_event_info;
 };
diff --git a/plugins/WinterSpeak/src/SpeakAnnounce.cpp b/plugins/WinterSpeak/src/SpeakAnnounce.cpp
index c7f87b26e8..29407e6fb2 100644
--- a/plugins/WinterSpeak/src/SpeakAnnounce.cpp
+++ b/plugins/WinterSpeak/src/SpeakAnnounce.cpp
@@ -66,7 +66,7 @@ void SpeakAnnounce::statusChange(DBCONTACTWRITESETTING *write_setting, MCONTACT
 }
 
 //------------------------------------------------------------------------------
-void SpeakAnnounce::incomingEvent(MCONTACT user, HANDLE event)
+void SpeakAnnounce::incomingEvent(MCONTACT user, MEVENT event)
 {
 	if (!m_event_info.isValidEvent(event))
 		return;
diff --git a/plugins/WinterSpeak/src/SpeakAnnounce.h b/plugins/WinterSpeak/src/SpeakAnnounce.h
index c49223b86a..763f36cce8 100644
--- a/plugins/WinterSpeak/src/SpeakAnnounce.h
+++ b/plugins/WinterSpeak/src/SpeakAnnounce.h
@@ -17,7 +17,7 @@ public:
 	//--------------------------------------------------------------------------
 	// Description : handle an event
 	//--------------------------------------------------------------------------
-	void incomingEvent(MCONTACT user, HANDLE event);
+	void incomingEvent(MCONTACT user, MEVENT event);
 
 	//--------------------------------------------------------------------------
 	// Description : handle a protocol state change
diff --git a/plugins/WinterSpeak/src/main.cpp b/plugins/WinterSpeak/src/main.cpp
index d6c7d9bbcc..47a432fdc5 100644
--- a/plugins/WinterSpeak/src/main.cpp
+++ b/plugins/WinterSpeak/src/main.cpp
@@ -53,7 +53,7 @@ int eventStatusChange(WPARAM wParam, LPARAM lParam)
 //-----------------------------------------------------------------------------
 int eventMessageAdded(WPARAM wParam, LPARAM lParam)
 {
-	g_speak_announce->incomingEvent(MCONTACT(wParam), reinterpret_cast<HANDLE>(lParam));
+	g_speak_announce->incomingEvent(wParam, lParam);
 	return 0;
 }
 
-- 
cgit v1.2.3