From 9a0784912d37f7f6d7413c585b7e2e039ba245b9 Mon Sep 17 00:00:00 2001
From: Kirill Volinsky <mataes2007@gmail.com>
Date: Fri, 1 Mar 2013 08:22:35 +0000
Subject: removed not used headers

git-svn-id: http://svn.miranda-ng.org/main/trunk@3814 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/MobileState/mobilestate_10.vcxproj         |  8 ++++----
 plugins/MobileState/mobilestate_11.vcxproj         |  9 +++++----
 plugins/MobileState/mobilestate_11.vcxproj.filters |  3 +++
 plugins/MobileState/res/mobilestate.rc             | 11 +----------
 plugins/MobileState/src/commonheaders.h            |  6 ++----
 plugins/MobileState/src/main.cpp                   |  5 ++---
 plugins/MobileState/src/version.h                  |  8 +-------
 7 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/plugins/MobileState/mobilestate_10.vcxproj b/plugins/MobileState/mobilestate_10.vcxproj
index eb9bdc55df..3f4f9f454f 100644
--- a/plugins/MobileState/mobilestate_10.vcxproj
+++ b/plugins/MobileState/mobilestate_10.vcxproj
@@ -72,7 +72,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -100,7 +100,7 @@
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>Commonheaders.h</PrecompiledHeaderFile>
@@ -127,7 +127,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -154,7 +154,7 @@
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>Commonheaders.h</PrecompiledHeaderFile>
diff --git a/plugins/MobileState/mobilestate_11.vcxproj b/plugins/MobileState/mobilestate_11.vcxproj
index 3650790c7d..1d8979f547 100644
--- a/plugins/MobileState/mobilestate_11.vcxproj
+++ b/plugins/MobileState/mobilestate_11.vcxproj
@@ -76,7 +76,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -104,7 +104,7 @@
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>Commonheaders.h</PrecompiledHeaderFile>
@@ -131,7 +131,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -158,7 +158,7 @@
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>Commonheaders.h</PrecompiledHeaderFile>
@@ -189,6 +189,7 @@
     <ClCompile Include="src\main.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="src\clients.h" />
     <ClInclude Include="src\commonheaders.h" />
     <ClInclude Include="src\resource.h" />
     <ClInclude Include="src\Version.h" />
diff --git a/plugins/MobileState/mobilestate_11.vcxproj.filters b/plugins/MobileState/mobilestate_11.vcxproj.filters
index 23cdf025c5..88024c1c1a 100644
--- a/plugins/MobileState/mobilestate_11.vcxproj.filters
+++ b/plugins/MobileState/mobilestate_11.vcxproj.filters
@@ -32,6 +32,9 @@
     <ClInclude Include="src\Version.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\clients.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="res\mobilestate.rc">
diff --git a/plugins/MobileState/res/mobilestate.rc b/plugins/MobileState/res/mobilestate.rc
index b7f5153d7d..1621f5aa25 100644
--- a/plugins/MobileState/res/mobilestate.rc
+++ b/plugins/MobileState/res/mobilestate.rc
@@ -27,16 +27,7 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
 IDI_MOBILE              ICON                    "mobile.ico"
-#endif    // Czech (Czech Republic) resources
-/////////////////////////////////////////////////////////////////////////////
-
 
-/////////////////////////////////////////////////////////////////////////////
-// English (United States) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
@@ -63,7 +54,7 @@ END
 
 #endif    // APSTUDIO_INVOKED
 
-#endif    // English (United States) resources
+#endif    // Czech (Czech Republic) resources
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/plugins/MobileState/src/commonheaders.h b/plugins/MobileState/src/commonheaders.h
index 2574df0c71..83af9bbdf9 100644
--- a/plugins/MobileState/src/commonheaders.h
+++ b/plugins/MobileState/src/commonheaders.h
@@ -19,8 +19,6 @@
 
 #pragma once
 
-#define MIRANDA_VER    0x0A00
-
 #include <windows.h>
 #include <malloc.h>
 
@@ -31,10 +29,10 @@
 #include <m_langpack.h>
 #include <m_icolib.h>
 #include <m_extraicons.h>
+#include <win2k.h>
 
 #include "resource.h"
 #include "Version.h"
+#include "clients.h"
 
 #define MODULENAME "MobileState"
-
-extern HINSTANCE g_hInst;
diff --git a/plugins/MobileState/src/main.cpp b/plugins/MobileState/src/main.cpp
index 739877cfa3..bb2d388704 100644
--- a/plugins/MobileState/src/main.cpp
+++ b/plugins/MobileState/src/main.cpp
@@ -18,7 +18,6 @@
 */
 
 #include "commonheaders.h"
-#include "clients.h"
 
 HINSTANCE g_hInst;
 int hLangpack;
@@ -35,7 +34,7 @@ PLUGININFOEX pluginInfo = {
 	__AUTHORWEB,
 	UNICODE_AWARE,
 	// {F0BA32D0-CD07-4A9C-926B-5A1FF21C3C10}
-	{0xf0ba32d0, 0xcd07, 0x4a9c, { 0x92, 0x6b, 0x5a, 0x1f, 0xf2, 0x1c, 0x3c, 0x10 }}
+	{0xf0ba32d0, 0xcd07, 0x4a9c, {0x92, 0x6b, 0x5a, 0x1f, 0xf2, 0x1c, 0x3c, 0x10}}
 };
 
 static IconItem icon = { LPGEN("Mobile State"), "mobile_icon", IDI_MOBILE };
@@ -60,7 +59,7 @@ bool hasMobileClient(HANDLE hContact, LPARAM lParam)
 		TCHAR *client = _tcslwr(NEWTSTR_ALLOCA(dbv.ptszVal));
 		db_free(&dbv);
 
-		for (size_t i=0; i<(sizeof(clients) / sizeof(TCHAR*)); i++)
+		for (size_t i = 0; i < SIZEOF(clients); i++)
 			if (_tcsstr(client, clients[i]))
 				return true;
 	}
diff --git a/plugins/MobileState/src/version.h b/plugins/MobileState/src/version.h
index dde83653b5..5f312a9de8 100644
--- a/plugins/MobileState/src/version.h
+++ b/plugins/MobileState/src/version.h
@@ -4,14 +4,8 @@
 #define __BUILD_NUM					1
 
 #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				"Mobile State"
-#define __INTERNAL_NAME				"MobileState"
+#define __PLUGIN_NAME				"Mobile state"
 #define __FILENAME					"MobileState.dll"
 #define __DESCRIPTION 				"Plugin shows mobile icon in contact list next to contacts which are using mobile client."
 #define __AUTHOR					"Robert P\xf6" "sel"
-- 
cgit v1.2.3