code cleanup

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

5 files changed, 17 insertions, 36 deletions

diff --git a/plugins/BasicHistory/src/BasicHistory.cpp b/plugins/BasicHistory/src/BasicHistory.cpp
index 1934c7d81d..fe7c4d9f68 100644
--- a/plugins/BasicHistory/src/BasicHistory.cpp
+++ b/plugins/BasicHistory/src/BasicHistory.cpp
@@ -17,13 +17,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 

 #include "stdafx.h"

-#include "version.h"

-#include "HistoryWindow.h"

-#include "resource.h"

-#include "Options.h"

 

-// {E25367A2-51AE-4044-BE28-131BC18B71A4}

-#define	MIID_BASICHISTORY { 0xe25367a2, 0x51ae, 0x4044, { 0xbe, 0x28, 0x13, 0x1b, 0xc1, 0x8b, 0x71, 0xa4 } }

+HINSTANCE hInst;

 

 #define MS_HISTORY_DELETEALLCONTACTHISTORY       "BasicHistory/DeleteAllContactHistory"

 #define MS_HISTORY_EXECUTE_TASK       "BasicHistory/ExecuteTask"

@@ -48,8 +43,7 @@ const IID IID_ITextDocument={0x8CC497C0, 0xA1DF, 0x11ce, {0x80, 0x98, 0x00, 0xAA
 

 #define MODULE "BasicHistory"

 

-PLUGININFOEX pluginInfo = 

-{

+PLUGININFOEX pluginInfo = {

 	sizeof(PLUGININFOEX),

 	__PLUGIN_NAME,

 	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),

@@ -59,9 +53,16 @@ PLUGININFOEX pluginInfo =
 	__COPYRIGHT,

 	__AUTHORWEB,

 	UNICODE_AWARE,

-	MIID_BASICHISTORY

+	// {E25367A2-51AE-4044-BE28-131BC18B71A4}

+	{0xe25367a2, 0x51ae, 0x4044, {0xbe, 0x28, 0x13, 0x1b, 0xc1, 0x8b, 0x71, 0xa4}}

 };

 

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

+{

+	hInst = hinstDLL;

+	return TRUE;

+}

+

 TIME_API tmi = {0};

 int hLangpack = 0;

 

diff --git a/plugins/BasicHistory/src/dllmain.cpp b/plugins/BasicHistory/src/dllmain.cpp
deleted file mode 100644
index ad89773ec8..0000000000
--- a/plugins/BasicHistory/src/dllmain.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-// dllmain.cpp : Defines the entry point for the DLL application.

-#include "stdafx.h"

-

-HINSTANCE hInst;

-

-BOOL APIENTRY DllMain( HMODULE hModule,

-                       DWORD  ul_reason_for_call,

-                       LPVOID lpReserved

-					 )

-{

-	hInst = hModule;

-	return TRUE;

-}

-

diff --git a/plugins/BasicHistory/src/stdafx.h b/plugins/BasicHistory/src/stdafx.h
index d0d32d0d35..1be1d46674 100644
--- a/plugins/BasicHistory/src/stdafx.h
+++ b/plugins/BasicHistory/src/stdafx.h
@@ -5,8 +5,6 @@
 

 #pragma once

 

-#include "targetver.h"

-

 #ifndef _WIN64

 #define _USE_32BIT_TIME_T

 #endif

@@ -33,8 +31,7 @@
 #include <string>

 #include <fstream>

 

-#define MIRANDA_VER		0x0900

-#define MIRANDA_CUSTOM_LP

+#define MIRANDA_VER		0x0A00

 

 #include <newpluginapi.h>

 #include <m_langpack.h>

@@ -64,6 +61,11 @@
 #include "m_smileyadd.h"

 #include "m_metacontacts.h"

 

+#include "version.h"

+#include "HistoryWindow.h"

+#include "resource.h"

+#include "Options.h"

+

 #define HISTORY_HK_FIND 100

 #define HISTORY_HK_FINDNEXT 101

 #define HISTORY_HK_FINDPREV 102

diff --git a/plugins/BasicHistory/src/targetver.h b/plugins/BasicHistory/src/targetver.h
deleted file mode 100644
index 90e767bfce..0000000000
--- a/plugins/BasicHistory/src/targetver.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once

-

-// Including SDKDDKVer.h defines the highest available Windows platform.

-

-// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and

-// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.

-

-#include <SDKDDKVer.h>

diff --git a/plugins/BasicHistory/src/version.h b/plugins/BasicHistory/src/version.h
index 21da8d9963..d2d290a8c5 100644
--- a/plugins/BasicHistory/src/version.h
+++ b/plugins/BasicHistory/src/version.h
@@ -17,4 +17,4 @@
 #define __AUTHOR					"Krzysztof Kral"

 #define __AUTHOREMAIL				"krzysztof.kral@gmail.com"

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

-#define __COPYRIGHT					"Copyright (c) 2011-2012 Krzysztof Kral"

+#define __COPYRIGHT					"© 2011-2012 Krzysztof Kral"