removed not used headers

added version info

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

6 files changed, 29 insertions, 59 deletions

diff --git a/plugins/NoHistory/src/Version.h b/plugins/NoHistory/src/Version.h
new file mode 100644
index 0000000000..880fcd526d
--- /dev/null
+++ b/plugins/NoHistory/src/Version.h
@@ -0,0 +1,14 @@
+#define __MAJOR_VERSION				0

+#define __MINOR_VERSION				2

+#define __RELEASE_NUM				3

+#define __BUILD_NUM					0

+

+#define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

+

+#define __PLUGIN_NAME				"NoHistory"

+#define __FILENAME					"NoHistory.dll"

+#define __DESCRIPTION 				"Prevent miranda from storing any history."

+#define __AUTHOR					"Scott Ellis, NightFox"

+#define __AUTHOREMAIL				"mail@scottellis.com.au; nightfox@myied.org"

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

+#define __COPYRIGHT					"© 2005 Scott Ellis, 2010 NightFox"

diff --git a/plugins/NoHistory/src/common.h b/plugins/NoHistory/src/common.h
index 123dd68f46..d00d444593 100644
--- a/plugins/NoHistory/src/common.h
+++ b/plugins/NoHistory/src/common.h
@@ -1,19 +1,14 @@
-#define MIRANDA_VER 0x800

-

 #ifndef _COMMON_INC

 #define _COMMON_INC

 

 #define _WIN32_WINNT 0x0501

 #define _WIN32_IE 0x0500

 

-#include <stdio.h>

-

 #include <windows.h>

 #include <commctrl.h>

 

 #include <win2k.h>

 #include <newpluginapi.h>

-#include <m_system.h>

 #include <m_database.h>

 #include <m_clist.h>

 #include <m_clc.h>

@@ -24,17 +19,16 @@
 #include <m_icolib.h>

 #include <m_extraicons.h>

 

-#include <m_utils.h>

+#include "resource.h"

+#include "icons.h"

+#include "options.h"

+#include "Version.h"

 

 #define MODULE						"NoHistory"

 #define DBSETTING_REMOVE			"RemoveHistory"

 

 extern HINSTANCE hInst;

 

-#ifndef MIID_NOHISTORY

-#define MIID_NOHISTORY	{0xe9ba130e, 0x9927, 0x4469, { 0xb6, 0x19, 0x95, 0x61, 0xa8, 0xc0, 0x57, 0xa7}}

-#endif

-

 #endif

 

 

diff --git a/plugins/NoHistory/src/dllmain.cpp b/plugins/NoHistory/src/dllmain.cpp
index 013767b46f..dfa1b2c124 100644
--- a/plugins/NoHistory/src/dllmain.cpp
+++ b/plugins/NoHistory/src/dllmain.cpp
@@ -1,15 +1,5 @@
-/* Replace "dll.h" with the name of your header */

 #include "common.h"

-#include "private.h"

-#include "resource.h"

-#include "icons.h"

-#include "options.h"

 

-#include <time.h>

-

-///////////////////////////////////////////////

-// Common Plugin Stuff

-///////////////////////////////////////////////

 HINSTANCE hInst;

 int hLangpack = 0;

 

@@ -39,18 +29,19 @@ EventListNode *event_list = 0;
 PLUGININFOEX pluginInfo =

 {

 	sizeof(PLUGININFOEX),

-	MODULE,

-	PLUGIN_MAKE_VERSION(VER_MAJOR, VER_MINOR, VER_RELEASE, VER_BUILD),

-	DESC_STRING,

-	"Scott Ellis, NightFox",

-	"mail@scottellis.com.au; nightfox@myied.org",

-	"© 2005 Scott Ellis; NightFox 2010",

-	"http://www.scottellis.com.au/",

-	UNICODE_AWARE,		//not transient

-	{ 0xb25e8c7b, 0x292b, 0x495a, { 0x9f, 0xb8, 0xa4, 0xc3, 0xd4, 0xee, 0xb0, 0x4b } } // {B25E8C7B-292B-495a-9FB8-A4C3D4EEB04B}

+	__PLUGIN_NAME,

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

+	__DESCRIPTION,

+	__AUTHOR,

+	__AUTHOREMAIL,

+	__COPYRIGHT,

+	__AUTHORWEB,

+	UNICODE_AWARE,

+	// {B25E8C7B-292B-495A-9FB8-A4C3D4EEB04B}

+	{0xb25e8c7b, 0x292b, 0x495a, {0x9f, 0xb8, 0xa4, 0xc3, 0xd4, 0xee, 0xb0, 0x4b}}

 };

 

-extern "C" BOOL APIENTRY DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)

+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)

 {

 	hInst = hinstDLL;

 	return TRUE;

diff --git a/plugins/NoHistory/src/icons.cpp b/plugins/NoHistory/src/icons.cpp
index f823517f11..1caba1122e 100644
--- a/plugins/NoHistory/src/icons.cpp
+++ b/plugins/NoHistory/src/icons.cpp
@@ -1,6 +1,4 @@
 #include "common.h"

-#include "icons.h"

-#include "resource.h"

 

 HICON hIconRemove, hIconKeep, hIconClear;

 

diff --git a/plugins/NoHistory/src/options.cpp b/plugins/NoHistory/src/options.cpp
index 6f5f043f17..5f9c256492 100644
--- a/plugins/NoHistory/src/options.cpp
+++ b/plugins/NoHistory/src/options.cpp
@@ -1,7 +1,4 @@
 #include "common.h"

-#include "options.h"

-#include "resource.h"

-#include "icons.h"

 

 static void SetListGroupIcons(HWND hwndList,HANDLE hFirstItem,HANDLE hParentItem,int *groupChildCount)

 {

diff --git a/plugins/NoHistory/src/private.h b/plugins/NoHistory/src/private.h
deleted file mode 100644
index 535dd34c5f..0000000000
--- a/plugins/NoHistory/src/private.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef _PRIVATE_H

-#define _PRIVATE_H

-

-/* VERSION DEFINITIONS */

-#define VER_MAJOR				0

-#define VER_MINOR				2

-#define VER_RELEASE				3

-#define VER_BUILD				0

-

-#define __STRINGIZE(x)			#x

-#define VER_STRING				__STRINGIZE( VER_MAJOR.VER_MINOR.VER_RELEASE.VER_BUILD )

-

-#define DESC_STRING 			"Prevent miranda from storing any history"

-#define COMPANY_NAME			""

-#define FILE_VERSION			VER_STRING

-#define FILE_DESCRIPTION		DESC_STRING

-#define INTERNAL_NAME			""

-#define LEGAL_COPYRIGHT			"© Scott Ellis 2005; NightFox 2010"

-#define LEGAL_TRADEMARKS		""

-#define ORIGINAL_FILENAME		"no_history.dll"

-#define PRODUCT_NAME			DESC_STRING

-#define PRODUCT_VERSION			VER_STRING

-

-#endif /*OTR_PRIVATE_H*/