From 13ff5e8e9ff54af333a2d11d439122515addb0b5 Mon Sep 17 00:00:00 2001
From: Kirill Volinsky <mataes2007@gmail.com>
Date: Sat, 20 Oct 2012 17:37:53 +0000
Subject: version info standartization

git-svn-id: http://svn.miranda-ng.org/main/trunk@2001 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 .../ClientChangeNotify/ClientChangeNotify.vcxproj  | 11 ++++-----
 .../ClientChangeNotify.vcxproj.filters             | 18 ++------------
 plugins/ClientChangeNotify/res/Version.rc          | 16 +++++--------
 .../ClientChangeNotify/src/ClientChangeNotify.cpp  | 28 +++++-----------------
 plugins/ClientChangeNotify/src/Common.h            | 21 +++++++++++-----
 plugins/ClientChangeNotify/src/OptDlg.cpp          |  2 --
 plugins/ClientChangeNotify/src/Version.h           | 20 ++++++++++++++++
 plugins/ClientChangeNotify/src/VersionNo.h         | 11 ---------
 8 files changed, 54 insertions(+), 73 deletions(-)
 create mode 100644 plugins/ClientChangeNotify/src/Version.h
 delete mode 100644 plugins/ClientChangeNotify/src/VersionNo.h

(limited to 'plugins/ClientChangeNotify')

diff --git a/plugins/ClientChangeNotify/ClientChangeNotify.vcxproj b/plugins/ClientChangeNotify/ClientChangeNotify.vcxproj
index 7a8e9fa053..7ae3d2cf64 100644
--- a/plugins/ClientChangeNotify/ClientChangeNotify.vcxproj
+++ b/plugins/ClientChangeNotify/ClientChangeNotify.vcxproj
@@ -85,6 +85,7 @@
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>
+      <AdditionalDependencies>Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -107,6 +108,7 @@
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>
+      <AdditionalDependencies>Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -136,6 +138,7 @@
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>
       <AdditionalOptions>/PDBALTPATH:%_PDB%</AdditionalOptions>
+      <AdditionalDependencies>Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -165,6 +168,7 @@
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>
       <AdditionalOptions>/PDBALTPATH:%_PDB%</AdditionalOptions>
+      <AdditionalDependencies>Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -189,17 +193,12 @@
     <ClInclude Include="..\CommonLibs\pcre_main.h" />
     <ClInclude Include="src\resource.h" />
     <ClInclude Include="..\CommonLibs\TMyArray.h" />
-    <ClInclude Include="src\VersionNo.h" />
+    <ClInclude Include="src\Version.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="res\Resources.rc" />
     <ResourceCompile Include="res\version.rc" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="docs\ccn_readme.txt" />
-    <None Include="docs\ccn_translation.txt" />
-    <None Include="docs\copying.txt" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/plugins/ClientChangeNotify/ClientChangeNotify.vcxproj.filters b/plugins/ClientChangeNotify/ClientChangeNotify.vcxproj.filters
index 149877b45a..a9792f238d 100644
--- a/plugins/ClientChangeNotify/ClientChangeNotify.vcxproj.filters
+++ b/plugins/ClientChangeNotify/ClientChangeNotify.vcxproj.filters
@@ -13,9 +13,6 @@
       <UniqueIdentifier>{3887cace-f8eb-45a3-854b-f32b02819763}</UniqueIdentifier>
       <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
     </Filter>
-    <Filter Include="Documentation">
-      <UniqueIdentifier>{b95423d3-105d-4742-a96e-d7c2d0ecc514}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\ClientChangeNotify.cpp">
@@ -59,7 +56,7 @@
     <ClInclude Include="..\CommonLibs\TMyArray.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\VersionNo.h">
+    <ClInclude Include="src\Version.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
@@ -68,18 +65,7 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
     <ResourceCompile Include="res\version.rc">
-      <Filter>Source Files</Filter>
+      <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="docs\ccn_readme.txt">
-      <Filter>Documentation</Filter>
-    </None>
-    <None Include="docs\ccn_translation.txt">
-      <Filter>Documentation</Filter>
-    </None>
-    <None Include="docs\copying.txt">
-      <Filter>Documentation</Filter>
-    </None>
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/plugins/ClientChangeNotify/res/Version.rc b/plugins/ClientChangeNotify/res/Version.rc
index 05d9aabc5a..5bfbab4754 100644
--- a/plugins/ClientChangeNotify/res/Version.rc
+++ b/plugins/ClientChangeNotify/res/Version.rc
@@ -5,11 +5,7 @@
 #endif //APSTUDIO_INVOKED
 
 #include "afxres.h"
-#include "..\src\VersionNo.h"
-
-#ifdef _WIN32
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-#endif //_WIN32
+#include "..\src\version.h"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION __FILEVERSION_STRING
@@ -28,11 +24,11 @@ BEGIN
     BEGIN
         BLOCK "000004b0"
         BEGIN
-            VALUE "FileDescription", "ClientChangeNotify plugin for Miranda NG."
-            VALUE "InternalName", "ClientChangeNotify"
-            VALUE "LegalCopyright", "© 2006-2008 Chervov Dmitry"
-            VALUE "OriginalFilename", "ClientChangeNotify.dll"
-            VALUE "ProductName", "ClientChangeNotify"
+            VALUE "FileDescription", __DESCRIPTION
+            VALUE "InternalName", __PLUGIN_NAME
+            VALUE "LegalCopyright", __COPYRIGHT
+            VALUE "OriginalFilename", __FILENAME
+            VALUE "ProductName", __PLUGIN_NAME
         END
     END
     BLOCK "VarFileInfo"
diff --git a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp
index e376ef2d17..23d19e31c5 100644
--- a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp
+++ b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp
@@ -18,17 +18,6 @@
 */
 
 #include "Common.h"
-#include "Misc.h"
-#include "VersionNo.h"
-#include "m_message.h"
-#include "m_userinfo.h"
-#include "m_history.h"
-#include "m_protocols.h"
-#include "m_protosvc.h"
-#include "m_metacontacts.h"
-#include "m_icolib.h"
-#include "m_genmenu.h"
-#include "m_ContactSettings.h"
 
 HINSTANCE g_hInstance;
 HANDLE g_hMainThread;
@@ -39,13 +28,13 @@ COptPage *g_PreviewOptPage; // we need to show popup even for the NULL contact i
 
 PLUGININFOEX pluginInfo = {
 	sizeof(PLUGININFOEX),
-	"ClientChangeNotify",
+	__PLUGIN_NAME,
 	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
-	"ClientChangeNotify plugin for Miranda IM.",
-	"Deathdemon",
-	"dchervov@yahoo.com",
-	"© 2006-2008 Chervov Dmitry",
-	"http://miranda-ng.org/",
+	__DESCRIPTION,
+	__AUTHOR,
+	__AUTHOREMAIL,
+	__COPYRIGHT,
+	__AUTHORWEB,
 	UNICODE_AWARE,
 	// {B68A8906-748B-435d-930E-21CC6E8F3B3F}
 	{0xb68a8906, 0x748b, 0x435d, {0x93, 0xe, 0x21, 0xcc, 0x6e, 0x8f, 0x3b, 0x3f}}
@@ -57,11 +46,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 	return TRUE;
 }
 
-#define MIID_CLIENTCHANGENOTIFY {0xe9d1f0d4, 0xd65d, 0x4840, {0x87, 0xbd, 0x59, 0xd7, 0xb4, 0x70, 0x2c, 0x47}}
-// {E9D1F0D4-D65D-4840-87BD-59D7B4702C47}
-
-extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_CLIENTCHANGENOTIFY, MIID_LAST};
-
 extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD mirandaVersion)
 {
 	return &pluginInfo;
diff --git a/plugins/ClientChangeNotify/src/Common.h b/plugins/ClientChangeNotify/src/Common.h
index 62d41732a7..478c982bbf 100644
--- a/plugins/ClientChangeNotify/src/Common.h
+++ b/plugins/ClientChangeNotify/src/Common.h
@@ -31,7 +31,6 @@
 #include <shellapi.h>
 #include <commdlg.h>
 
-#include "resource.h"
 #include "newpluginapi.h"
 #include "statusmodes.h"
 #include "m_popup.h"
@@ -41,17 +40,27 @@
 #include "m_clist.h"
 #include "m_LogService.h"
 #include "m_system.h"
+#include "m_message.h"
+#include "m_userinfo.h"
+#include "m_history.h"
+#include "m_protocols.h"
+#include "m_protosvc.h"
+#include "m_icolib.h"
+#include "m_genmenu.h"
+#include "win2k.h"
+
 #include "m_fingerprint.h"
+#include "m_metacontacts.h"
+#include "m_ContactSettings.h"
+
 #include "..\CommonLibs\TMyArray.h"
 #include "..\CommonLibs\Options.h"
 #include "..\CommonLibs\CString.h"
 #include "..\CommonLibs\pcre.h"
 
-#pragma comment(lib,"comctl32.lib")
-
-#ifndef lengthof
-#define lengthof(s) (sizeof(s) / sizeof((s)[0]))
-#endif
+#include "resource.h"
+#include "Misc.h"
+#include "Version.h"
 
 // Actions on popup click
 #define PCA_OPENMESSAGEWND	0	// open message window
diff --git a/plugins/ClientChangeNotify/src/OptDlg.cpp b/plugins/ClientChangeNotify/src/OptDlg.cpp
index 164e51e795..ac196f72c7 100644
--- a/plugins/ClientChangeNotify/src/OptDlg.cpp
+++ b/plugins/ClientChangeNotify/src/OptDlg.cpp
@@ -18,8 +18,6 @@
 */
 
 #include "Common.h"
-#include "Misc.h"
-
 
 // ================================================ Popup options ================================================
 
diff --git a/plugins/ClientChangeNotify/src/Version.h b/plugins/ClientChangeNotify/src/Version.h
new file mode 100644
index 0000000000..5e8d556bcb
--- /dev/null
+++ b/plugins/ClientChangeNotify/src/Version.h
@@ -0,0 +1,20 @@
+#define __MAJOR_VERSION				0
+#define __MINOR_VERSION				1
+#define __RELEASE_NUM				1
+#define __BUILD_NUM					3
+
+#define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
+#define __FILEVERSION_DOTS			__MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM
+
+#define __STRINGIFY_IMPL(x)			#x
+#define __STRINGIFY(x)				__STRINGIFY_IMPL(x)
+#define __VERSION_STRING			__STRINGIFY(__FILEVERSION_DOTS)
+
+#define __PLUGIN_NAME				"Client Change Notify"
+#define __INTERNAL_NAME				"ClientChangeNotify"
+#define __FILENAME					"ClientChangeNotify.dll"
+#define __DESCRIPTION 				"ClientChangeNotify plugin for Miranda NG."
+#define __AUTHOR					"Deathdemon"
+#define __AUTHOREMAIL				"dchervov@yahoo.com"
+#define __AUTHORWEB					"http://miranda-ng.org/"
+#define __COPYRIGHT					"© 2006-2008 Chervov Dmitry"
diff --git a/plugins/ClientChangeNotify/src/VersionNo.h b/plugins/ClientChangeNotify/src/VersionNo.h
deleted file mode 100644
index 13ba7afb9f..0000000000
--- a/plugins/ClientChangeNotify/src/VersionNo.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#define __MAJOR_VERSION				0
-#define __MINOR_VERSION				1
-#define __RELEASE_NUM				1
-#define __BUILD_NUM					3
-
-#define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
-#define __FILEVERSION_DOTS			__MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM
-
-#define __STRINGIFY_IMPL(x)			#x
-#define __STRINGIFY(x)				__STRINGIFY_IMPL(x)
-#define __VERSION_STRING			__STRINGIFY(__FILEVERSION_DOTS)
-- 
cgit v1.2.3