From 29dd41bae794c4b40573e966afce96ed87615f02 Mon Sep 17 00:00:00 2001
From: Kirill Volinsky <mataes2007@gmail.com>
Date: Sat, 20 Oct 2012 16:46:49 +0000
Subject: version info standartization

git-svn-id: http://svn.miranda-ng.org/main/trunk@1999 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/BuddyExpectator/src/BuddyExpectator.cpp | 25 ++++++++++---------------
 plugins/BuddyExpectator/src/Version.h           | 20 ++++++++++++++++++++
 plugins/BuddyExpectator/src/common.h            | 11 ++++++++---
 3 files changed, 38 insertions(+), 18 deletions(-)
 create mode 100644 plugins/BuddyExpectator/src/Version.h

(limited to 'plugins/BuddyExpectator/src')

diff --git a/plugins/BuddyExpectator/src/BuddyExpectator.cpp b/plugins/BuddyExpectator/src/BuddyExpectator.cpp
index 8a5093564f..1c0646c628 100644
--- a/plugins/BuddyExpectator/src/BuddyExpectator.cpp
+++ b/plugins/BuddyExpectator/src/BuddyExpectator.cpp
@@ -25,7 +25,6 @@
 */
 
 #include "common.h"
-#include "options.h"
 
 HINSTANCE hInst;
 int hLangpack;
@@ -62,23 +61,19 @@ extern int UserinfoInit(WPARAM wparam, LPARAM lparam);
 
 PLUGININFOEX pluginInfo = {
 	sizeof(PLUGININFOEX),
-	"Buddy Expectator+",
-	PLUGIN_MAKE_VERSION(0,1,2,3),
-	"Reacts to the return of contacts, or the the extended absence of contacts, with notifications and other actions",
-	"Anar Ibragimoff, sje, Thief",
-	"thief@miranda.im",
-	"© 2005 Anar Ibragimoff, © 2006 Scott Ellis, © 2007-2009 Alexander Turyak",
-	"http://miranda-ng.org/",
+	__PLUGIN_NAME,
+	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
+	__DESCRIPTION,
+	__AUTHOR,
+	__AUTHOREMAIL,
+	__COPYRIGHT,
+	__AUTHORWEB,
 	UNICODE_AWARE,
-	{0xddf8aec9, 0x7d37, 0x49af, {0x9d, 0x22, 0xbb, 0xbc, 0x92, 0x0e, 0x6f, 0x05}} //{DDF8AEC9-7D37-49AF-9D22-BBBC920E6F05}
+	//{DDF8AEC9-7D37-49AF-9D22-BBBC920E6F05}
+	{0xddf8aec9, 0x7d37, 0x49af, {0x9d, 0x22, 0xbb, 0xbc, 0x92, 0x0e, 0x6f, 0x05}}
 };
 
-/* 2D84F403-91F3-4E60-BF02-16C2F1716D86 */
-#define MIID_BUDDYEXPECTATOR {0x2d84f403, 0x91f3, 0x4e60, {0xbf, 0x02, 0x16, 0xc2, 0xf1, 0x71, 0x6d, 0x86}}
-
-extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_BUDDYEXPECTATOR, MIID_LAST};
-
-extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
 	hInst = hinstDLL;
 	return TRUE;
diff --git a/plugins/BuddyExpectator/src/Version.h b/plugins/BuddyExpectator/src/Version.h
new file mode 100644
index 0000000000..4737d5a014
--- /dev/null
+++ b/plugins/BuddyExpectator/src/Version.h
@@ -0,0 +1,20 @@
+#define __MAJOR_VERSION				0
+#define __MINOR_VERSION				1
+#define __RELEASE_NUM				2
+#define __BUILD_NUM					3
+
+#define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
+#define __FILEVERSION_DOTS			__MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM
+
+#define __STRINGIFY_IMPL(x)			#x
+#define __STRINGIFY(x)				__STRINGIFY_IMPL(x)
+#define __VERSION_STRING			__STRINGIFY(__FILEVERSION_DOTS)
+
+#define __PLUGIN_NAME				"Buddy Expectator+"
+#define __INTERNAL_NAME				"Buddy Expectator+"
+#define __FILENAME					"BuddyExpectator.dll"
+#define __DESCRIPTION 				"Reacts to the return of contacts, or the the extended absence of contacts, with notifications and other actions."
+#define __AUTHOR					"Anar Ibragimoff, sje, Thief"
+#define __AUTHOREMAIL				"thief@miranda.im"
+#define __AUTHORWEB					"http://miranda-ng.org/"
+#define __COPYRIGHT					"© 2005 Anar Ibragimoff, 2006 Scott Ellis, 2007-2009 Alexander Turyak"
diff --git a/plugins/BuddyExpectator/src/common.h b/plugins/BuddyExpectator/src/common.h
index 18d33040eb..c2d4d80303 100644
--- a/plugins/BuddyExpectator/src/common.h
+++ b/plugins/BuddyExpectator/src/common.h
@@ -35,7 +35,7 @@
 #include <time.h>
 #include <stdio.h>
 #include <locale.h>
-#include "resource.h"
+
 #include <newpluginapi.h>
 #include <m_skin.h>
 #include <m_clist.h>
@@ -50,9 +50,14 @@
 #include <m_message.h>
 #include <m_userinfo.h>
 #include <m_icolib.h>
-#include "m_popup.h"
+#include <m_popup.h>
+#include <m_cluiframes.h>
+
 #include "m_popup2.h"
-#include "m_cluiframes.h"
+
+#include "resource.h"
+#include "options.h"
+#include "version.h"
 
 #define MODULE_NAME     "BuddyExpectator"
 
-- 
cgit v1.2.3