removed not used headers

added version info

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

13 files changed, 103 insertions, 100 deletions

diff --git a/plugins/MyDetails/mydetails_10.vcxproj b/plugins/MyDetails/mydetails_10.vcxproj
index c520541fa1..71172a9485 100644
--- a/plugins/MyDetails/mydetails_10.vcxproj
+++ b/plugins/MyDetails/mydetails_10.vcxproj
@@ -206,16 +206,18 @@
   </ItemGroup>

   <ItemGroup>

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

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

   </ItemGroup>

   <ItemGroup>

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

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

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

     <ClInclude Include="..\utils\mir_dblists.h" />

-    <ClInclude Include="..\utils\mir_memory.h" />

     <ClInclude Include="..\utils\mir_options.h" />

     <ClInclude Include="..\utils\mir_smileys.h" />

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

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

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

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/MyDetails/mydetails_10.vcxproj.filters b/plugins/MyDetails/mydetails_10.vcxproj.filters
index 0187ba07a1..d14434912e 100644
--- a/plugins/MyDetails/mydetails_10.vcxproj.filters
+++ b/plugins/MyDetails/mydetails_10.vcxproj.filters
@@ -44,6 +44,9 @@
     <ResourceCompile Include="res\resource.rc">

       <Filter>Resource Files</Filter>

     </ResourceCompile>

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

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

   </ItemGroup>

   <ItemGroup>

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

@@ -58,9 +61,6 @@
     <ClInclude Include="..\utils\mir_dblists.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="..\utils\mir_memory.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="..\utils\mir_options.h">

       <Filter>Header Files</Filter>

     </ClInclude>

@@ -70,5 +70,11 @@
     <ClInclude Include="src\options.h">

       <Filter>Header Files</Filter>

     </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

   </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/plugins/MyDetails/mydetails_11.vcxproj b/plugins/MyDetails/mydetails_11.vcxproj
index 5212aa96ce..d262e47bc4 100644
--- a/plugins/MyDetails/mydetails_11.vcxproj
+++ b/plugins/MyDetails/mydetails_11.vcxproj
@@ -210,16 +210,18 @@
   </ItemGroup>

   <ItemGroup>

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

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

   </ItemGroup>

   <ItemGroup>

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

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

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

     <ClInclude Include="..\utils\mir_dblists.h" />

-    <ClInclude Include="..\utils\mir_memory.h" />

     <ClInclude Include="..\utils\mir_options.h" />

     <ClInclude Include="..\utils\mir_smileys.h" />

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

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

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

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/MyDetails/mydetails_11.vcxproj.filters b/plugins/MyDetails/mydetails_11.vcxproj.filters
index 0187ba07a1..d14434912e 100644
--- a/plugins/MyDetails/mydetails_11.vcxproj.filters
+++ b/plugins/MyDetails/mydetails_11.vcxproj.filters
@@ -44,6 +44,9 @@
     <ResourceCompile Include="res\resource.rc">

       <Filter>Resource Files</Filter>

     </ResourceCompile>

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

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

   </ItemGroup>

   <ItemGroup>

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

@@ -58,9 +61,6 @@
     <ClInclude Include="..\utils\mir_dblists.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="..\utils\mir_memory.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="..\utils\mir_options.h">

       <Filter>Header Files</Filter>

     </ClInclude>

@@ -70,5 +70,11 @@
     <ClInclude Include="src\options.h">

       <Filter>Header Files</Filter>

     </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

   </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/plugins/MyDetails/res/Version.rc b/plugins/MyDetails/res/Version.rc
new file mode 100644
index 0000000000..5bfbab4754
--- /dev/null
+++ b/plugins/MyDetails/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/MyDetails/res/resource.rc b/plugins/MyDetails/res/resource.rc
index 8b6f758d81..d3393b3aef 100644
--- a/plugins/MyDetails/res/resource.rc
+++ b/plugins/MyDetails/res/resource.rc
@@ -22,44 +22,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 

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

 //

-// Version

-//

-

-VS_VERSION_INFO VERSIONINFO

- FILEVERSION 0,0,1,11

- PRODUCTVERSION 0,0,1,11

- FILEFLAGSMASK 0x3fL

-#ifdef _DEBUG

- FILEFLAGS 0x1L

-#else

- FILEFLAGS 0x0L

-#endif

- FILEOS 0x40004L

- FILETYPE 0x2L

- FILESUBTYPE 0x0L

-BEGIN

-    BLOCK "StringFileInfo"

-    BEGIN

-        BLOCK "080004b0"

-        BEGIN

-            VALUE "CompanyName", " "

-            VALUE "FileDescription", "MyDetails Miranda Plugin"

-            VALUE "FileVersion", "0, 0, 1, 11"

-            VALUE "InternalName", "mydetails"

-            VALUE "LegalCopyright", "Copyright © 2005-2008 Ricardo Pescuma Domenecci, Drugwash"

-            VALUE "OriginalFilename", "mydetails.dll"

-            VALUE "ProductVersion", "0, 0, 1, 11"

-        END

-    END

-    BLOCK "VarFileInfo"

-    BEGIN

-        VALUE "Translation", 0x800, 1200

-    END

-END

-

-

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

-//

 // Dialog

 //

 

@@ -191,17 +153,8 @@ END
 IDI_LISTENINGTO         ICON                    "listening_to.ico"

 IDI_RIGHT_ARROW         ICON                    "rightarrow.ico"

 IDI_LEFT_ARROW          ICON                    "leftarrow.ico"

-#endif    // English (United States) resources

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

 

 

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

-// Portuguese (Brazil) resources

-

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

-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN

-#pragma code_page(1252)

-

 #ifdef APSTUDIO_INVOKED

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

 //

@@ -285,7 +238,7 @@ BEGIN
     END

 END

 

-#endif    // Portuguese (Brazil) resources

+#endif    // English (United States) resources

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

 

 

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

+#define __MINOR_VERSION				0

+#define __RELEASE_NUM				1

+#define __BUILD_NUM					11

+

+#define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

+

+#define __PLUGIN_NAME				"My details"

+#define __FILENAME					"MyDetails.dll"

+#define __DESCRIPTION 				"Shows and allows you to edit your details for all protocols."

+#define __AUTHOR					"Ricardo Pescuma Domenecci, Drugwash"

+#define __AUTHOREMAIL				""

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

+#define __COPYRIGHT					"© 2005-2008 Ricardo Pescuma Domenecci, Drugwash"

diff --git a/plugins/MyDetails/src/commons.h b/plugins/MyDetails/src/commons.h
index e80845995d..0b841a2206 100644
--- a/plugins/MyDetails/src/commons.h
+++ b/plugins/MyDetails/src/commons.h
@@ -24,44 +24,41 @@ Boston, MA 02111-1307, USA.
 #define _CRT_SECURE_NO_WARNINGS

 

 #define _WIN32_WINNT 0x0501

+

 #include <windows.h>

-#include <win2k.h>

 #include <commctrl.h>

-#include <stdio.h>

 

 #include <newpluginapi.h>

-#include <m_clist.h>

 #include <m_skin.h>

-#include <m_system.h>

-#include <m_system_cpp.h>

-#include <m_protocols.h>

 #include <m_protosvc.h>

 #include <m_database.h>

-#include <m_utils.h>

 #include <m_langpack.h>

-#include <m_awaymsg.h>

 #include <m_contacts.h>

 #include <m_options.h>

 #include <m_clui.h>

-#include <m_clc.h>

-#include <m_proto_listeningto.h>

-#include <m_listeningto.h>

-

 #include <m_fontservice.h>

-#include <m_variables.h>

 #include <m_avatars.h>

-#include <m_statusplugins.h>

 #include <m_xstatus.h>

 #include <m_icolib.h>

-#include "m_cluiframes.h"

-#include "m_simpleaway.h"

+#include <m_cluiframes.h>

+#include <win2k.h>

 

-#include <richedit.h>

+#include <m_proto_listeningto.h>

+#include <m_listeningto.h>

+#include <m_statusplugins.h>

+#include <m_simpleaway.h>

 #include <m_smileyadd.h>

+#include <m_mydetails.h>

+#include <m_skin_eng.h>

 

-#include <io.h>

+#include "../utils/mir_smileys.h"

+#include "../utils/mir_options.h"

 

 #include "resource.h"

+#include "Version.h"

+#include "data.h"

+#include "options.h"

+#include "frame.h"

 

 #define MODULE_NAME "MyDetails"

 

@@ -69,22 +66,11 @@ Boston, MA 02111-1307, USA.
 #define SETTING_DEFAULT_NICK "DefaultNick"

 

 extern HINSTANCE hInst;

-

 extern long nickname_dialog_open;

 extern long status_msg_dialog_open;

-

 extern bool g_bFramesExist;

 

-#include "m_mydetails.h"

-#include "data.h"

-#include "options.h"

-#include "frame.h"

-#include "../utils/mir_smileys.h"

-#include "../utils/mir_memory.h"

-#include "../utils/mir_options.h"

-

 #define PS_GETMYAVATARMAXSIZE "/GetMyAvatarMaxSize"

-

 #define PS_GETMYNICKNAMEMAXLENGTH "/GetMyNicknameMaxLength"

 

 // See if a protocol service exists

diff --git a/plugins/MyDetails/src/data.cpp b/plugins/MyDetails/src/data.cpp
index 5bfa0fa797..fa9ebf2ae9 100644
--- a/plugins/MyDetails/src/data.cpp
+++ b/plugins/MyDetails/src/data.cpp
@@ -19,7 +19,6 @@ Boston, MA 02111-1307, USA.
 

 

 #include "commons.h"

-#include "data.h"

 

 static char *StatusModeToDbSetting(int status,const char *suffix);

 

diff --git a/plugins/MyDetails/src/frame.cpp b/plugins/MyDetails/src/frame.cpp
index b741c2fb4d..61a4f9d0c6 100644
--- a/plugins/MyDetails/src/frame.cpp
+++ b/plugins/MyDetails/src/frame.cpp
@@ -19,8 +19,6 @@ Boston, MA 02111-1307, USA.
 

 #include "commons.h"

 

-#include <m_skin_eng.h>

-

 // Prototypes /////////////////////////////////////////////////////////////////////////////////////

 

 #define WINDOW_NAME_PREFIX "mydetails_window"

diff --git a/plugins/MyDetails/src/mydetails.cpp b/plugins/MyDetails/src/mydetails.cpp
index ac98f0d3fc..513f9c40ef 100644
--- a/plugins/MyDetails/src/mydetails.cpp
+++ b/plugins/MyDetails/src/mydetails.cpp
@@ -27,13 +27,13 @@ int hLangpack = 0;
 

 PLUGININFOEX pluginInfo={

 	sizeof(PLUGININFOEX),

-	"My Details",

-	PLUGIN_MAKE_VERSION(0,0,1,11),

-	"Shows and allows you to edit your details for all protocols.",

-	"Ricardo Pescuma Domenecci, Drugwash",

-	"",

-	"© 2005-2008 Ricardo Pescuma Domenecci, Drugwash",

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

+	__PLUGIN_NAME,

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

+	__DESCRIPTION,

+	__AUTHOR,

+	__AUTHOREMAIL,

+	__COPYRIGHT,

+	__AUTHORWEB,

 	UNICODE_AWARE,

 	// {A82BAEB3-A33C-4036-B837-7803A5B6C2AB}

 	{0xa82baeb3, 0xa33c, 0x4036, {0xb8, 0x37, 0x78, 0x3, 0xa5, 0xb6, 0xc2, 0xab}}

diff --git a/plugins/MyDetails/src/options.cpp b/plugins/MyDetails/src/options.cpp
index fb293223a7..fad38ed23c 100644
--- a/plugins/MyDetails/src/options.cpp
+++ b/plugins/MyDetails/src/options.cpp
@@ -19,7 +19,6 @@ Boston, MA 02111-1307, USA.
 

 

 #include "commons.h"

-#include "options.h"

 

 // Prototypes /////////////////////////////////////////////////////////////////////////////////////

 

diff --git a/plugins/mTextControl/mtextcontrol_10.vcxproj b/plugins/mTextControl/mtextcontrol_10.vcxproj
index eb4f92efaf..bd39ca45a2 100644
--- a/plugins/mTextControl/mtextcontrol_10.vcxproj
+++ b/plugins/mTextControl/mtextcontrol_10.vcxproj
@@ -73,7 +73,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MTEXTCONTROL_EXPORTS;MTEXT_NOHELPERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MTEXT_NOHELPERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -101,7 +101,7 @@
       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MTEXTCONTROL_EXPORTS;MTEXT_NOHELPERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MTEXT_NOHELPERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <PrecompiledHeader>Use</PrecompiledHeader>

@@ -130,7 +130,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;MTEXTCONTROL_EXPORTS;MTEXT_NOHELPERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;MTEXT_NOHELPERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -157,7 +157,7 @@
       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;MTEXTCONTROL_EXPORTS;MTEXT_NOHELPERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;MTEXT_NOHELPERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <PrecompiledHeader>Use</PrecompiledHeader>