added version info

removed not used headers

git-svn-id: http://svn.miranda-ng.org/main/trunk@3796 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

8 files changed, 28 insertions, 39 deletions

diff --git a/plugins/Import/src/import.cpp b/plugins/Import/src/import.cpp
index c0de7cc8e3..e77334dde8 100644
--- a/plugins/Import/src/import.cpp
+++ b/plugins/Import/src/import.cpp
@@ -21,7 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */

 

 #include "import.h"

-#include <m_db_int.h>

 

 time_t dwSinceDate = 0;

 

diff --git a/plugins/Import/src/import.h b/plugins/Import/src/import.h
index 5dbfd82cc7..f3fd07bd2f 100644
--- a/plugins/Import/src/import.h
+++ b/plugins/Import/src/import.h
@@ -20,40 +20,30 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-

-//#define _LOGGING   1

-

 #define _CRT_SECURE_NO_WARNINGS

 #define _CRT_NONSTDC_NO_DEPRECATE

 

-#define MIRANDA_VER 0x0A00

-

 #define WINVER 0x0501

 #define _WIN32_WINNT 0x0501

 #define _WIN32_IE 0x0501

 

-#include <m_stdhdr.h>

-

 #include <windows.h>

 #include <commctrl.h> // datetimepicker

-

-#include <stddef.h>

 #include <time.h>

-#include <io.h>

 

+#include <m_stdhdr.h>

 #include <win2k.h>

 #include <newpluginapi.h>

 #include <m_langpack.h>

-#include <m_system.h>

 #include <m_system_cpp.h>

 #include <m_database.h>

-#include <m_protocols.h>

-#include <m_protosvc.h>

 #include <m_protomod.h>

 #include <m_icolib.h>

-#include <m_utils.h>

-#include <m_findadd.h>

 #include <m_clist.h>

+#include <m_db_int.h>

+

+#include "version.h"

+#include "resource.h"

 

 // ** Global constants

 

diff --git a/plugins/Import/src/main.cpp b/plugins/Import/src/main.cpp
index 627c81a424..e4ac431248 100644
--- a/plugins/Import/src/main.cpp
+++ b/plugins/Import/src/main.cpp
@@ -21,8 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */

 

 #include "import.h"

-#include "version.h"

-#include "resource.h"

 

 int nImportOption;

 int nCustomOptions;

@@ -39,19 +37,19 @@ int hLangpack;
 PLUGININFOEX pluginInfo =

 {

 	sizeof(PLUGININFOEX),

-	"Import contacts and messages",

-	__VERSION_DWORD,

-	"Imports contacts and messages from another Miranda profile or from an external program.",

-	"Miranda team",

-	"info@miranda-im.org",

-	"© 2000-2010 Martin Öberg, Richard Hughes, Dmitry Kuzkin, George Hazan",

-	"http://miranda-ng.org/",

+	__PLUGIN_NAME,

+	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),

+	__DESCRIPTION,

+	__AUTHOR,

+	__AUTHOREMAIL,

+	__COPYRIGHT,

+	__AUTHORWEB,

 	UNICODE_AWARE,

 	//{2D77A746-00A6-4343-BFC5-F808CDD772EA}

-	{0x2d77a746, 0xa6, 0x4343, { 0xbf, 0xc5, 0xf8, 0x8, 0xcd, 0xd7, 0x72, 0xea }}

+	{0x2d77a746, 0xa6, 0x4343, {0xbf, 0xc5, 0xf8, 0x8, 0xcd, 0xd7, 0x72, 0xea}}

 };

 

-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/Import/src/miranda.cpp b/plugins/Import/src/miranda.cpp
index 33bd6964c1..71e149c0f4 100644
--- a/plugins/Import/src/miranda.cpp
+++ b/plugins/Import/src/miranda.cpp
@@ -21,7 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */

 

 #include "import.h"

-#include "resource.h"

 

 void MirandaImport(HWND hdlgProgress);

 

diff --git a/plugins/Import/src/progress.cpp b/plugins/Import/src/progress.cpp
index 8856fa837e..8769ba9bd2 100644
--- a/plugins/Import/src/progress.cpp
+++ b/plugins/Import/src/progress.cpp
@@ -20,12 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include <windows.h>

-#include <stdio.h>

-#include <commctrl.h>

-

 #include "import.h"

-#include "resource.h"

 

 #define PROGM_START   (WM_USER+100)

 

diff --git a/plugins/Import/src/utils.cpp b/plugins/Import/src/utils.cpp
index b06cf06881..1795b3b2c8 100644
--- a/plugins/Import/src/utils.cpp
+++ b/plugins/Import/src/utils.cpp
@@ -21,8 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */

 

 #include "import.h"

-#include "version.h"

-#include "resource.h"

 

 /////////////////////////////////////////////////////////////////////////////////////////

 

diff --git a/plugins/Import/src/version.h b/plugins/Import/src/version.h
index 0231d7a7ea..e10aab61b8 100644
--- a/plugins/Import/src/version.h
+++ b/plugins/Import/src/version.h
@@ -1,3 +1,14 @@
-#define __FILEVERSION_STRING        0,11,0,1

-#define __VERSION_STRING            "0.11.0.1"

-#define __VERSION_DWORD             PLUGIN_MAKE_VERSION(0, 11, 0, 1)

+#define __MAJOR_VERSION				0

+#define __MINOR_VERSION				11

+#define __RELEASE_NUM				0

+#define __BUILD_NUM					1

+

+#define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

+

+#define __PLUGIN_NAME				"Import contacts and messages"

+#define __FILENAME					"Import.dll"

+#define __DESCRIPTION 				"Imports contacts and messages from another Miranda profile or from an external program."

+#define __AUTHOR					"Miranda team"

+#define __AUTHOREMAIL				"info@miranda-im.org"

+#define __AUTHORWEB					"http://miranda-ng.org/"

+#define __COPYRIGHT					"© 2000-2010 Martin \xd6" "berg, Richard Hughes, Dmitry Kuzkin, George Hazan"

diff --git a/plugins/Import/src/wizard.cpp b/plugins/Import/src/wizard.cpp
index 92e411a145..8a4b71faf3 100644
--- a/plugins/Import/src/wizard.cpp
+++ b/plugins/Import/src/wizard.cpp
@@ -21,7 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */

 

 #include "import.h"

-#include "resource.h"

 

 INT_PTR CALLBACK WizardIntroPageProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)

 {