removed not used headers

added version info

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

13 files changed, 126 insertions, 130 deletions

diff --git a/plugins/Nudge/nudge_10.vcxproj b/plugins/Nudge/nudge_10.vcxproj
index 6392655646..91e30b0a7a 100644
--- a/plugins/Nudge/nudge_10.vcxproj
+++ b/plugins/Nudge/nudge_10.vcxproj
@@ -193,14 +193,15 @@
   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="src\headers.h" />

-    <ClInclude Include="src\main.h" />

     <ClInclude Include="src\nudge.h" />

     <ClInclude Include="src\options.h" />

     <ClInclude Include="src\resource.h" />

     <ClInclude Include="src\shake.h" />

+    <ClInclude Include="src\Version.h" />

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="res\resource.rc" />

+    <ResourceCompile Include="res\Version.rc" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/Nudge/nudge_10.vcxproj.filters b/plugins/Nudge/nudge_10.vcxproj.filters
index 3d4bf3c005..ef11e6e178 100644
--- a/plugins/Nudge/nudge_10.vcxproj.filters
+++ b/plugins/Nudge/nudge_10.vcxproj.filters
@@ -32,9 +32,6 @@
     <ClInclude Include="src\headers.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="src\main.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="src\nudge.h">

       <Filter>Header Files</Filter>

     </ClInclude>

@@ -47,10 +44,16 @@
     <ClInclude Include="src\shake.h">

       <Filter>Header Files</Filter>

     </ClInclude>

+    <ClInclude Include="src\Version.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="res\resource.rc">

       <Filter>Resource Files</Filter>

     </ResourceCompile>

+    <ResourceCompile Include="res\Version.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

   </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/plugins/Nudge/nudge_11.vcxproj b/plugins/Nudge/nudge_11.vcxproj
index b4cee7fd5a..3de8be1c26 100644
--- a/plugins/Nudge/nudge_11.vcxproj
+++ b/plugins/Nudge/nudge_11.vcxproj
@@ -197,14 +197,15 @@
   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="src\headers.h" />

-    <ClInclude Include="src\main.h" />

     <ClInclude Include="src\nudge.h" />

     <ClInclude Include="src\options.h" />

     <ClInclude Include="src\resource.h" />

     <ClInclude Include="src\shake.h" />

+    <ClInclude Include="src\Version.h" />

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="res\resource.rc" />

+    <ResourceCompile Include="res\Version.rc" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/Nudge/nudge_11.vcxproj.filters b/plugins/Nudge/nudge_11.vcxproj.filters
index 3d4bf3c005..ef11e6e178 100644
--- a/plugins/Nudge/nudge_11.vcxproj.filters
+++ b/plugins/Nudge/nudge_11.vcxproj.filters
@@ -32,9 +32,6 @@
     <ClInclude Include="src\headers.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="src\main.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="src\nudge.h">

       <Filter>Header Files</Filter>

     </ClInclude>

@@ -47,10 +44,16 @@
     <ClInclude Include="src\shake.h">

       <Filter>Header Files</Filter>

     </ClInclude>

+    <ClInclude Include="src\Version.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="res\resource.rc">

       <Filter>Resource Files</Filter>

     </ResourceCompile>

+    <ResourceCompile Include="res\Version.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

   </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/plugins/Nudge/res/Version.rc b/plugins/Nudge/res/Version.rc
new file mode 100644
index 0000000000..5bfbab4754
--- /dev/null
+++ b/plugins/Nudge/res/Version.rc
@@ -0,0 +1,38 @@
+// Microsoft Visual C++ generated resource script.

+//

+#ifdef APSTUDIO_INVOKED

+#error this file is not editable by Microsoft Visual C++

+#endif //APSTUDIO_INVOKED

+

+#include "afxres.h"

+#include "..\src\version.h"

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION __FILEVERSION_STRING

+ PRODUCTVERSION __FILEVERSION_STRING

+ FILEFLAGSMASK 0x17L

+#ifdef _DEBUG

+ FILEFLAGS 0x1L

+#else

+ FILEFLAGS 0x0L

+#endif

+ FILEOS 0x4L

+ FILETYPE 0x0L

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "000004b0"

+        BEGIN

+            VALUE "FileDescription", __DESCRIPTION

+            VALUE "InternalName", __PLUGIN_NAME

+            VALUE "LegalCopyright", __COPYRIGHT

+            VALUE "OriginalFilename", __FILENAME

+            VALUE "ProductName", __PLUGIN_NAME

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x0, 1200

+    END

+END

diff --git a/plugins/Nudge/res/resource.rc b/plugins/Nudge/res/resource.rc
index 4bdb574ccd..bdd45af76e 100644
--- a/plugins/Nudge/res/resource.rc
+++ b/plugins/Nudge/res/resource.rc
@@ -13,11 +13,11 @@
 #undef APSTUDIO_READONLY_SYMBOLS

 

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

-// Bulgarian (Bulgaria) resources

+// Neutral resources

 

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_BGR)

-LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT

-#pragma code_page(1251)

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)

+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

+#pragma code_page(1252)

 

 #ifdef APSTUDIO_INVOKED

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

@@ -44,16 +44,6 @@ END
 

 #endif    // APSTUDIO_INVOKED

 

-#endif    // Bulgarian (Bulgaria) resources

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

-

-

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

-// Neutral resources

-

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)

-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

-#pragma code_page(1252)

 

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

 //

@@ -217,46 +207,6 @@ END
 

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

 //

-// Version

-//

-

-VS_VERSION_INFO VERSIONINFO

- FILEVERSION 0,0,2,0

- PRODUCTVERSION 0,0,2,0

- FILEFLAGSMASK 0x3fL

-#ifdef _DEBUG

- FILEFLAGS 0x1L

-#else

- FILEFLAGS 0x0L

-#endif

- FILEOS 0x40004L

- FILETYPE 0x2L

- FILESUBTYPE 0x0L

-BEGIN

-    BLOCK "StringFileInfo"

-    BEGIN

-        BLOCK "000004b0"

-        BEGIN

-            VALUE "Comments", "Plugin that render nudge events from different protocols"

-            VALUE "CompanyName", "Miranda community"

-            VALUE "FileDescription", "Nudge plugin for Miranda-IM"

-            VALUE "FileVersion", "0, 0, 2, 0"

-            VALUE "InternalName", "Nudge"

-            VALUE "LegalCopyright", "Copyright © 2006-2011"

-            VALUE "OriginalFilename", "nudge.dll"

-            VALUE "ProductName", "nudge"

-            VALUE "ProductVersion", "0, 0, 2, 0"

-        END

-    END

-    BLOCK "VarFileInfo"

-    BEGIN

-        VALUE "Translation", 0x0, 1200

-    END

-END

-

-

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

-//

 // Icon

 //

 

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

+#define __MINOR_VERSION				0

+#define __RELEASE_NUM				2

+#define __BUILD_NUM					0

+

+#define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

+

+#define __PLUGIN_NAME				"Nudge"

+#define __FILENAME					"Nudge.dll"

+#define __DESCRIPTION 				"Plugin to shake the clist and chat window."

+#define __AUTHOR					"Tweety/GouZ, FREAK_THEMIGHTY"

+#define __AUTHOREMAIL				"francois.mean@skynet.be, Sylvain.gougouzian@gmail.com, wishmaster51@googlemail.com"

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

+#define __COPYRIGHT					"© the miranda community"

diff --git a/plugins/Nudge/src/headers.h b/plugins/Nudge/src/headers.h
index eb931c6da8..1cea468c1f 100644
--- a/plugins/Nudge/src/headers.h
+++ b/plugins/Nudge/src/headers.h
@@ -5,8 +5,6 @@
 

 #define _CRT_SECURE_NO_WARNINGS

 

-#pragma once

-

 // Modify the following defines if you have to target a platform prior to the ones specified below.

 // Refer to MSDN for the latest info on corresponding values for different platforms.

 #ifndef WINVER				// Allow use of features specific to Windows XP or later.

@@ -26,33 +24,35 @@
 #endif

 

 #define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers

-// Windows Header Files:

 

 #include <windows.h>

 #include <commctrl.h>

 #include <time.h>

 

-#define MIRANDA_VER 0x0A00

-#include <newpluginapi.h>	//CallService,UnHookEvent

+#include <newpluginapi.h>

 #include <m_clist.h>			

 #include <m_langpack.h>	

-#include <m_system.h>	

 #include <m_popup.h>	

 #include <m_clui.h>

 #include <m_message.h>

-#include <m_protocols.h>

 #include <m_ignore.h>

 #include <m_options.h>

 #include <m_skin.h>

 #include <m_database.h>

 #include <m_protosvc.h>

-#include <m_trigger.h>

-#include <m_metacontacts.h>

 #include <m_icolib.h>	

 #include <win2k.h>

-#include "resource.h"

-#include "m_nudge.h"

 

+#include <m_trigger.h>

+#include <m_metacontacts.h>

+#include <m_nudge.h>

+#include <m_msg_buttonsbar.h>

+

+#include "resource.h"

+#include "shake.h"

+#include "Version.h"

+#include "nudge.h"

+#include "options.h"

 

 /*

 *

@@ -67,4 +67,36 @@ int Preview();
 /*

 *

 ****************************/

-HANDLE Nudge_GethContact(HANDLE);
\ No newline at end of file
+HANDLE Nudge_GethContact(HANDLE);

+

+/*

+*

+****************************/

+void Nudge_ShowPopup(CNudgeElement, HANDLE, TCHAR *);

+

+/*

+*

+****************************/

+void Nudge_ShowStatus(CNudgeElement, HANDLE, DWORD timestamp);

+

+/*

+*

+****************************/

+void Nudge_SentStatus(CNudgeElement, HANDLE);

+

+/*

+*

+****************************/

+void Nudge_AddAccount(PROTOACCOUNT *proto);

+

+/*

+*

+****************************/

+void LoadPopupClass();

+

+/*

+*

+****************************/

+void AutoResendNudge(void *wParam) ;

+

+extern CShake shake;

diff --git a/plugins/Nudge/src/main.cpp b/plugins/Nudge/src/main.cpp
index 8d0f495101..d65f708f7f 100644
--- a/plugins/Nudge/src/main.cpp
+++ b/plugins/Nudge/src/main.cpp
@@ -1,8 +1,4 @@
 #include "headers.h"

-#include "main.h"

-#include "shake.h"

-#include "m_msg_buttonsbar.h"

-

 

 int nProtocol = 0;

 static HANDLE g_hEventModulesLoaded = NULL, hEventOptionsInitialize = NULL, g_hEventDbWindowEvent = NULL, g_hEventToolbarLoaded = NULL, g_hEventButtonPressed = NULL, g_hEventAccountsChanged = NULL;

@@ -13,25 +9,23 @@ CNudgeElement DefaultNudge;
 CShake shake;

 CNudge GlobalNudge;

 

-

-

 int hLangpack = 0;

 

-

 //========================

 //  MirandaPluginInfo

 //========================

 PLUGININFOEX pluginInfo={

 	sizeof(PLUGININFOEX),

-	"Nudge",

-	 PLUGIN_MAKE_VERSION(0,0,2,0),

-	"Plugin to shake the clist and chat window.",

-	"Tweety/GouZ, FREAK_THEMIGHTY",

-	"francois.mean@skynet.be, Sylvain.gougouzian@gmail.com, wishmaster51@googlemail.com",

-	"copyright to the miranda community",

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

-	UNICODE_AWARE,		//doesn't replace anything built-in

-	{ 0xe47cc215, 0xd28, 0x462d, { 0xa0, 0xf6, 0x3a, 0xe4, 0x44, 0x3d, 0x29, 0x26 } } // {E47CC215-0D28-462D-A0F6-3AE4443D2926}

+	__PLUGIN_NAME,

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

+	__DESCRIPTION,

+	__AUTHOR,

+	__AUTHOREMAIL,

+	__COPYRIGHT,

+	__AUTHORWEB,

+	UNICODE_AWARE,

+	// {E47CC215-0D28-462D-A0F6-3AE4443D2926}

+	{0xe47cc215, 0xd28, 0x462d, {0xa0, 0xf6, 0x3a, 0xe4, 0x44, 0x3d, 0x29, 0x26}}

 };

 

 INT_PTR NudgeShowMenu(WPARAM wParam,LPARAM lParam)

diff --git a/plugins/Nudge/src/main.h b/plugins/Nudge/src/main.h
deleted file mode 100644
index 556ee0070b..0000000000
--- a/plugins/Nudge/src/main.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "nudge.h"

-

-/*

-*

-****************************/

-void Nudge_ShowPopup(CNudgeElement, HANDLE, TCHAR *);

-

-/*

-*

-****************************/

-void Nudge_ShowStatus(CNudgeElement, HANDLE, DWORD timestamp);

-

-/*

-*

-****************************/

-void Nudge_SentStatus(CNudgeElement, HANDLE);

-

-/*

-*

-****************************/

-void Nudge_AddAccount(PROTOACCOUNT *proto);

-

-/*

-*

-****************************/

-void LoadPopupClass();

-

-/*

-*

-****************************/

-void AutoResendNudge(void *wParam) ;

diff --git a/plugins/Nudge/src/nudge.cpp b/plugins/Nudge/src/nudge.cpp
index 301827debb..9fb9d377e4 100644
--- a/plugins/Nudge/src/nudge.cpp
+++ b/plugins/Nudge/src/nudge.cpp
@@ -1,5 +1,4 @@
 #include "headers.h"

-#include "nudge.h"

 

 void CNudge::Save(void)

 {

diff --git a/plugins/Nudge/src/options.cpp b/plugins/Nudge/src/options.cpp
index 306e79e6f1..197a5006db 100644
--- a/plugins/Nudge/src/options.cpp
+++ b/plugins/Nudge/src/options.cpp
@@ -1,12 +1,7 @@
 #include "headers.h"

-#include "main.h"

-#include "shake.h"

-#include "options.h"

 

 CNudgeElement* ActualNudge = NULL;

 

-

-

 int NudgeOptInit(WPARAM wParam,LPARAM lParam)

 {

 	OPTIONSDIALOGPAGE odp = { 0 };

diff --git a/plugins/Nudge/src/shake.cpp b/plugins/Nudge/src/shake.cpp
index f396c4f535..649646589f 100644
--- a/plugins/Nudge/src/shake.cpp
+++ b/plugins/Nudge/src/shake.cpp
@@ -1,7 +1,4 @@
 #include "headers.h"

-#include "shake.h"

-

-extern CShake shake;

 

 void CShake::Load(void)

 {