all plugins => CMPlugin virtual functions

3 files changed, 5 insertions, 46 deletions

diff --git a/plugins/Popup/src/defs.h b/plugins/Popup/src/defs.h
deleted file mode 100644
index 43959f9b86..0000000000
--- a/plugins/Popup/src/defs.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*

-Popup Plus plugin for Miranda IM

-

-Copyright	© 2002 Luca Santarelli,

-© 2004-2007 Victor Pavlychko

-© 2010 MPK

-© 2010 Merlin_de

-

-This program is free software; you can redistribute it and/or

-modify it under the terms of the GNU General Public License

-as published by the Free Software Foundation; either version 2

-of the License, or (at your option) any later version.

-

-This program is distributed in the hope that it will be useful,

-but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-GNU General Public License for more details.

-

-You should have received a copy of the GNU General Public License

-along with this program; if not, write to the Free Software

-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-*/

-

-#ifndef __defs_h__

-#define __defs_h__

-

-#ifdef __cplusplus

-// in C++ files we should define everything inside extren "C"

-#define EXTERNC			extern "C"

-#define BEGIN_EXTERNC	extern "C" {

-#define END_EXTERNC		};

-

-// in C++ all exported function must be extern "C"

-#define MIRAPI	extern "C" __declspec(dllexport)

-#else

-#define EXTERNC

-#define BEGIN_EXTERNC

-#define END_EXTERNC

-

-#define MIRAPI	__declspec(dllexport)

-#endif

-

-#endif
\ No newline at end of file
diff --git a/plugins/Popup/src/main.cpp b/plugins/Popup/src/main.cpp
index 51f7891dce..7517084fce 100644
--- a/plugins/Popup/src/main.cpp
+++ b/plugins/Popup/src/main.cpp
@@ -319,7 +319,7 @@ static int OnShutdown(WPARAM, LPARAM)
 	return 0;

 }

 

-MIRAPI int Load(void)

+int CMPlugin::Load()

 {

 	CreateServiceFunction(MS_POPUP_GETSTATUS, GetStatus);

 

@@ -404,7 +404,7 @@ MIRAPI int Load(void)
 // Prepare the plugin to stop

 // Called by Miranda when it will exit or when the plugin gets deselected

 

-MIRAPI int Unload(void)

+int CMPlugin::Unload()

 {

 	DeleteObject(fonts.title);

 	DeleteObject(fonts.clock);

diff --git a/plugins/Popup/src/stdafx.h b/plugins/Popup/src/stdafx.h
index 3ac1fe44e3..a63a558885 100644
--- a/plugins/Popup/src/stdafx.h
+++ b/plugins/Popup/src/stdafx.h
@@ -105,10 +105,12 @@ https://miranda-ng.org/distr/
 struct CMPlugin : public PLUGIN<CMPlugin>

 {

 	CMPlugin();

+

+	int Load() override;

+	int Unload() override;

 };

 

 #include "resource.h"

-#include "defs.h"

 #include "version.h"

 #include "config.h"

 #include "common.h"