removed not used headers

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

8 files changed, 17 insertions, 79 deletions

diff --git a/plugins/IgnoreState/ignore_10.vcxproj b/plugins/IgnoreState/ignore_10.vcxproj
index 135202e7f1..39211c68ac 100644
--- a/plugins/IgnoreState/ignore_10.vcxproj
+++ b/plugins/IgnoreState/ignore_10.vcxproj
@@ -194,10 +194,6 @@
     <ResourceCompile Include="res\ignore.rc" />

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

   </ItemGroup>

-  <ItemGroup>

-    <None Include="docs\ignore_state.txt" />

-    <None Include="docs\IgnoreState-readme.txt" />

-  </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

   </ImportGroup>

diff --git a/plugins/IgnoreState/ignore_10.vcxproj.filters b/plugins/IgnoreState/ignore_10.vcxproj.filters
index 4d5052657b..2030ffb0eb 100644
--- a/plugins/IgnoreState/ignore_10.vcxproj.filters
+++ b/plugins/IgnoreState/ignore_10.vcxproj.filters
@@ -13,9 +13,6 @@
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>

       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>

     </Filter>

-    <Filter Include="Docs">

-      <UniqueIdentifier>{ff5fe82d-72b5-4a1c-b4a0-8741f7b22c5a}</UniqueIdentifier>

-    </Filter>

   </ItemGroup>

   <ItemGroup>

     <ClCompile Include="src\main.cpp">

@@ -47,12 +44,4 @@
       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

-  <ItemGroup>

-    <None Include="docs\ignore_state.txt">

-      <Filter>Docs</Filter>

-    </None>

-    <None Include="docs\IgnoreState-readme.txt">

-      <Filter>Docs</Filter>

-    </None>

-  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/plugins/IgnoreState/ignore_11.vcxproj b/plugins/IgnoreState/ignore_11.vcxproj
index 588b123bf5..296becbd22 100644
--- a/plugins/IgnoreState/ignore_11.vcxproj
+++ b/plugins/IgnoreState/ignore_11.vcxproj
@@ -198,10 +198,6 @@
     <ResourceCompile Include="res\ignore.rc" />

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

   </ItemGroup>

-  <ItemGroup>

-    <None Include="docs\ignore_state.txt" />

-    <None Include="docs\IgnoreState-readme.txt" />

-  </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

   </ImportGroup>

diff --git a/plugins/IgnoreState/ignore_11.vcxproj.filters b/plugins/IgnoreState/ignore_11.vcxproj.filters
index 4d5052657b..2030ffb0eb 100644
--- a/plugins/IgnoreState/ignore_11.vcxproj.filters
+++ b/plugins/IgnoreState/ignore_11.vcxproj.filters
@@ -13,9 +13,6 @@
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>

       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>

     </Filter>

-    <Filter Include="Docs">

-      <UniqueIdentifier>{ff5fe82d-72b5-4a1c-b4a0-8741f7b22c5a}</UniqueIdentifier>

-    </Filter>

   </ItemGroup>

   <ItemGroup>

     <ClCompile Include="src\main.cpp">

@@ -47,12 +44,4 @@
       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

-  <ItemGroup>

-    <None Include="docs\ignore_state.txt">

-      <Filter>Docs</Filter>

-    </None>

-    <None Include="docs\IgnoreState-readme.txt">

-      <Filter>Docs</Filter>

-    </None>

-  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/plugins/IgnoreState/res/Version.rc b/plugins/IgnoreState/res/Version.rc
index 770f6ff8f2..5bfbab4754 100644
--- a/plugins/IgnoreState/res/Version.rc
+++ b/plugins/IgnoreState/res/Version.rc
@@ -7,10 +7,6 @@
 #include "afxres.h"

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

 

-#ifdef _WIN32

-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

-#endif //_WIN32

-

 VS_VERSION_INFO VERSIONINFO

  FILEVERSION __FILEVERSION_STRING

  PRODUCTVERSION __FILEVERSION_STRING

@@ -29,12 +25,10 @@ BEGIN
         BLOCK "000004b0"

         BEGIN

             VALUE "FileDescription", __DESCRIPTION

-            VALUE "FileVersion", __FILEVERSION_DOTS

             VALUE "InternalName", __PLUGIN_NAME

             VALUE "LegalCopyright", __COPYRIGHT

             VALUE "OriginalFilename", __FILENAME

             VALUE "ProductName", __PLUGIN_NAME

-            VALUE "ProductVersion", __FILEVERSION_DOTS

         END

     END

     BLOCK "VarFileInfo"

diff --git a/plugins/IgnoreState/src/Version.h b/plugins/IgnoreState/src/Version.h
index 144d1878f5..752ae468b9 100644
--- a/plugins/IgnoreState/src/Version.h
+++ b/plugins/IgnoreState/src/Version.h
@@ -4,14 +4,8 @@
 #define __BUILD_NUM					0

 

 #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				"Ignore State"

-#define __INTERNAL_NAME				"IgnoreState"

+#define __PLUGIN_NAME				"Ignore state"

 #define __FILENAME					"IgnoreState.dll"

 #define __DESCRIPTION 				"Shows ignore state of contact in contacts list."

 #define __AUTHOR					"Kildor"

diff --git a/plugins/IgnoreState/src/commonheaders.h b/plugins/IgnoreState/src/commonheaders.h
index b7e495d570..8b019ab20d 100644
--- a/plugins/IgnoreState/src/commonheaders.h
+++ b/plugins/IgnoreState/src/commonheaders.h
@@ -21,9 +21,6 @@
 #ifndef COMMHEADERS_H

 #define COMMHEADERS_H

 

-#define MIRANDA_VER    0x0A00

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

-

 #define _CRT_SECURE_NO_WARNINGS

 #define _WIN32_WINNT 0x0501

 

@@ -31,40 +28,23 @@
 #define _WIN32_IE 0x0501

 #endif

 

-

-//needed by m_utils.h

-#include <stdio.h>

-

-// needed by m_icolib.h > r9256

-#include <stddef.h>

-

-

-//Miranda API headers

 #include <windows.h>

-#include <win2k.h>

 #include <commctrl.h>

+

+#include <win2k.h>

 #include <newpluginapi.h>

 #include <m_database.h>

-#include <m_system.h>

-//#include <m_protocols.h>

-#include <m_utils.h>

 #include <m_ignore.h>

-#include <m_clist.h>

 #include <m_skin.h>

 #include <m_options.h>

 #include <m_langpack.h>

-#include <m_icolib.h>

+#include <m_extraicons.h>

+

 #include "resource.h"

 #include "Version.h"

 

-//external SDK headers

-#include <m_extraicons.h>

-

 #define MODULENAME "IgnoreState"

 

-/* 3f6acec5-df0e-4d33-a272-e3630addb6c8 */

-#define MIID_IGNORESRATE {0x3f6acec5, 0xdf0e, 0x4d33, {0xa2, 0x72, 0xe3, 0x63, 0x0a, 0xdd, 0xb6, 0xc8}}

-

 struct IGNOREITEMS

 {

 	TCHAR* name;

diff --git a/plugins/IgnoreState/src/main.cpp b/plugins/IgnoreState/src/main.cpp
index 1ce767badf..f25fbd35db 100644
--- a/plugins/IgnoreState/src/main.cpp
+++ b/plugins/IgnoreState/src/main.cpp
@@ -57,7 +57,7 @@ PLUGININFOEX pluginInfo={
 	__COPYRIGHT,

 	__AUTHORWEB,

 	UNICODE_AWARE,

-	// a6872bcd-f2a1-41b8-b2f1-dd7cec055734

+	// A6872BCD-F2A1-41B8-B2F1-DD7CEC055734

 	{0xa6872bcd, 0xf2a1, 0x41b8, {0xb2, 0xf1, 0xdd, 0x7c, 0xec, 0x05, 0x57, 0x34}}

 };

 

@@ -131,17 +131,17 @@ VOID fill_filter(void)
 

 int onModulesLoaded(WPARAM wParam,LPARAM lParam)

 {

-	HookEvent(ME_OPT_INITIALISE, onOptInitialise);
-
-	//IcoLib support
-	Icon_Register(g_hInst, LPGEN("Ignore State"), iconList, SIZEOF(iconList));
-
-	fill_filter();
-
-	hExtraIcon = ExtraIcon_Register("ignore", LPGEN("Ignore State"), "ignore_full");
-
-	// Set initial value for all contacts
-	HANDLE hContact = db_find_first();
+	HookEvent(ME_OPT_INITIALISE, onOptInitialise);

+

+	//IcoLib support

+	Icon_Register(g_hInst, LPGEN("Ignore State"), iconList, SIZEOF(iconList));

+

+	fill_filter();

+

+	hExtraIcon = ExtraIcon_Register("ignore", LPGEN("Ignore State"), "ignore_full");

+

+	// Set initial value for all contacts

+	HANDLE hContact = db_find_first();

 	while (hContact != NULL) {

 		applyExtraImage(hContact);

 		hContact = db_find_next(hContact);