removed not used headers

added version info

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

16 files changed, 110 insertions, 107 deletions

diff --git a/plugins/NewXstatusNotify/NewXstatusNotify_10.vcxproj b/plugins/NewXstatusNotify/NewXstatusNotify_10.vcxproj
index 3335d5c393..05b3692f94 100644
--- a/plugins/NewXstatusNotify/NewXstatusNotify_10.vcxproj
+++ b/plugins/NewXstatusNotify/NewXstatusNotify_10.vcxproj
@@ -82,6 +82,8 @@
       <WarningLevel>Level3</WarningLevel>

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

       <ExceptionHandling>false</ExceptionHandling>

+      <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

+      <PrecompiledHeader>Use</PrecompiledHeader>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -112,6 +114,8 @@
       <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <ExceptionHandling>false</ExceptionHandling>

+      <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

+      <PrecompiledHeader>Use</PrecompiledHeader>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -140,6 +144,8 @@
       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

       <ExceptionHandling>false</ExceptionHandling>

+      <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

+      <PrecompiledHeader>Use</PrecompiledHeader>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -164,6 +170,8 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <WarningLevel>Level3</WarningLevel>

       <ExceptionHandling>false</ExceptionHandling>

+      <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

+      <PrecompiledHeader>Use</PrecompiledHeader>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -183,6 +191,9 @@
     <ClCompile Include="src\main.cpp" />

     <ClCompile Include="src\options.cpp" />

     <ClCompile Include="src\popup.cpp" />

+    <ClCompile Include="src\stdafx.cpp">

+      <PrecompiledHeader>Create</PrecompiledHeader>

+    </ClCompile>

     <ClCompile Include="src\utils.cpp" />

     <ClCompile Include="src\xstatus.cpp" />

   </ItemGroup>

diff --git a/plugins/NewXstatusNotify/NewXstatusNotify_10.vcxproj.filters b/plugins/NewXstatusNotify/NewXstatusNotify_10.vcxproj.filters
index ad47ca9e61..d749cdba0e 100644
--- a/plugins/NewXstatusNotify/NewXstatusNotify_10.vcxproj.filters
+++ b/plugins/NewXstatusNotify/NewXstatusNotify_10.vcxproj.filters
@@ -33,6 +33,9 @@
     <ClCompile Include="src\xstatus.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

+    <ClCompile Include="src\stdafx.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

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

diff --git a/plugins/NewXstatusNotify/NewXstatusNotify_11.vcxproj b/plugins/NewXstatusNotify/NewXstatusNotify_11.vcxproj
index d5823750ba..30769c6526 100644
--- a/plugins/NewXstatusNotify/NewXstatusNotify_11.vcxproj
+++ b/plugins/NewXstatusNotify/NewXstatusNotify_11.vcxproj
@@ -86,6 +86,8 @@
       <WarningLevel>Level3</WarningLevel>

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

       <ExceptionHandling>false</ExceptionHandling>

+      <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

+      <PrecompiledHeader>Use</PrecompiledHeader>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -116,6 +118,8 @@
       <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <ExceptionHandling>false</ExceptionHandling>

+      <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

+      <PrecompiledHeader>Use</PrecompiledHeader>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -144,6 +148,8 @@
       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

       <ExceptionHandling>false</ExceptionHandling>

+      <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

+      <PrecompiledHeader>Use</PrecompiledHeader>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -168,6 +174,8 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <WarningLevel>Level3</WarningLevel>

       <ExceptionHandling>false</ExceptionHandling>

+      <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

+      <PrecompiledHeader>Use</PrecompiledHeader>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -187,6 +195,9 @@
     <ClCompile Include="src\main.cpp" />

     <ClCompile Include="src\options.cpp" />

     <ClCompile Include="src\popup.cpp" />

+    <ClCompile Include="src\stdafx.cpp">

+      <PrecompiledHeader>Create</PrecompiledHeader>

+    </ClCompile>

     <ClCompile Include="src\utils.cpp" />

     <ClCompile Include="src\xstatus.cpp" />

   </ItemGroup>

diff --git a/plugins/NewXstatusNotify/NewXstatusNotify_11.vcxproj.filters b/plugins/NewXstatusNotify/NewXstatusNotify_11.vcxproj.filters
index ad47ca9e61..d749cdba0e 100644
--- a/plugins/NewXstatusNotify/NewXstatusNotify_11.vcxproj.filters
+++ b/plugins/NewXstatusNotify/NewXstatusNotify_11.vcxproj.filters
@@ -33,6 +33,9 @@
     <ClCompile Include="src\xstatus.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

+    <ClCompile Include="src\stdafx.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

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

diff --git a/plugins/NewXstatusNotify/res/resource.rc b/plugins/NewXstatusNotify/res/resource.rc
index c8aa467764..5cf9c7d768 100644
--- a/plugins/NewXstatusNotify/res/resource.rc
+++ b/plugins/NewXstatusNotify/res/resource.rc
@@ -365,17 +365,8 @@ IDI_DISABLEALL          ICON                    "disable_all.ico"
 IDI_ENABLEALL           ICON                    "enable_all.ico"

 IDI_VARIABLES           ICON                    "variables.ico"

 IDI_STATUS_MESSAGE      ICON                    "status_message.ico"

-#endif    // Neutral resources

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

 

 

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

-// German (Germany) resources

-

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

-LANGUAGE LANG_GERMAN, SUBLANG_GERMAN

-#pragma code_page(1252)

-

 #ifdef APSTUDIO_INVOKED

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

 //

@@ -401,7 +392,7 @@ END
 

 #endif    // APSTUDIO_INVOKED

 

-#endif    // German (Germany) resources

+#endif    // Neutral resources

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

 

 

diff --git a/plugins/NewXstatusNotify/res/version.rc b/plugins/NewXstatusNotify/res/version.rc
index dfd163b5b2..5bfbab4754 100644
--- a/plugins/NewXstatusNotify/res/version.rc
+++ b/plugins/NewXstatusNotify/res/version.rc
@@ -1,36 +1,34 @@
+// Microsoft Visual C++ generated resource script.

+//

 #ifdef APSTUDIO_INVOKED

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

 #endif //APSTUDIO_INVOKED

 

-#include <windows.h>

+#include "afxres.h"

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

 

 VS_VERSION_INFO VERSIONINFO

  FILEVERSION __FILEVERSION_STRING

  PRODUCTVERSION __FILEVERSION_STRING

- FILEFLAGSMASK 0x3fL

+ FILEFLAGSMASK 0x17L

 #ifdef _DEBUG

  FILEFLAGS 0x1L

 #else

  FILEFLAGS 0x0L

 #endif

- FILEOS 0x40004L

- FILETYPE 0x1L

+ FILEOS 0x4L

+ FILETYPE 0x0L

  FILESUBTYPE 0x0L

 BEGIN

     BLOCK "StringFileInfo"

     BEGIN

         BLOCK "000004b0"

         BEGIN

-            VALUE "Author", "Luca Santarelli, Vasilich, yaho"

-			VALUE "CompanyName", "yaho"

-            VALUE "FileDescription", "Notifies you when a contact changes his/her (X)status"

-            VALUE "FileVersion", __VERSION_STRING

-            VALUE "InternalName", "NewXstatusNotify YM"

-            VALUE "LegalCopyright", "© 2001-2004 Luca Santarelli, 2005-2007 Vasilich, 2007-2011 yaho"

-			VALUE "OriginalFilename", "NewXstatusNotify.dll"

-            VALUE "ProductName", "NewXstatusNotify YM"

-            VALUE "ProductVersion", __VERSION_STRING

+            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/NewXstatusNotify/src/common.h b/plugins/NewXstatusNotify/src/common.h
index dd739eff71..473a51c1fc 100644
--- a/plugins/NewXstatusNotify/src/common.h
+++ b/plugins/NewXstatusNotify/src/common.h
@@ -30,50 +30,44 @@
 

 #define _WIN32_WINNT 0x0500

 #define WINVER 0x0600

-#define MIRANDA_VER 0x0A00

 

-//Standard Windows "libraries"

 #include <windows.h>

 #include <mmsystem.h>

 #include <commctrl.h>

 #include <commdlg.h>

 #include <shellapi.h>

 #include <time.h>

-#include <stdio.h>

-#include <stdlib.h>

-#include <tchar.h>

 #include <malloc.h>

 

 #include <newpluginapi.h>

-#include <m_system.h>

-#include <m_system_cpp.h>

-#include <statusmodes.h>

 #include <win2k.h>

+#include <m_button.h>

+#include <m_clc.h>

+#include <m_database.h>

+#include <m_genmenu.h>

+#include <m_history.h>

+#include <m_icolib.h>

+#include <m_ignore.h>

+#include <m_langpack.h>

+#include <m_message.h>

+#include <m_options.h>

+#include <m_popup.h>

+#include <m_protosvc.h>

+#include <m_skin.h>

+#include <m_userinfo.h>

+#include <m_xstatus.h>

+#include <m_extraicons.h>

+

+#include <m_metacontacts.h>

+#include <m_toptoolbar.h>

 

-#include "m_awaymsg.h"

-#include "m_button.h"

-#include "m_clc.h"

-#include "m_database.h"

-#include "m_genmenu.h"

-#include "m_history.h"

-#include "m_icolib.h"

-#include "m_ignore.h"

-#include "m_langpack.h"

-#include "m_message.h"

-#include "m_options.h"

-#include "m_popup.h"

-#include "m_protosvc.h"

-#include "m_skin.h"

-#include "m_system.h"

-#include "m_userinfo.h"

-#include "m_utils.h"

-#include "m_xstatus.h"

-#include "m_extraicons.h"

-

-#include "m_metacontacts.h"

-#include "m_toptoolbar.h"

 #include "resource.h"

-

+#include "indsnd.h"

+#include "options.h"

+#include "popup.h"

+#include "utils.h"

+#include "version.h"

+#include "xstatus.h"

 

 #define MODULE "NewStatusNotify"

 

@@ -151,4 +145,11 @@ Cast them to (int) if you need them that way.
 

 #define TMR_CONNECTIONTIMEOUT		10000

 

+extern OPTIONS opt;

+extern LIST<DBEVENT> eventList;

+extern TEMPLATES templates;

+extern HINSTANCE hInst;

+extern HANDLE hEnableDisableMenu;

+extern STATUS StatusList[STATUS_COUNT];

+

 #endif //COMMON_H

diff --git a/plugins/NewXstatusNotify/src/indsnd.cpp b/plugins/NewXstatusNotify/src/indsnd.cpp
index af4a2da89a..52f2456d10 100644
--- a/plugins/NewXstatusNotify/src/indsnd.cpp
+++ b/plugins/NewXstatusNotify/src/indsnd.cpp
@@ -20,13 +20,6 @@
 */

 

 #include "common.h"

-#include "options.h"

-#include "indsnd.h"

-#include "utils.h"

-

-extern STATUS StatusList[];

-extern OPTIONS opt;

-extern HINSTANCE hInst;

 

 void PreviewSound(HWND hList)

 {

diff --git a/plugins/NewXstatusNotify/src/main.cpp b/plugins/NewXstatusNotify/src/main.cpp
index d7418dbc1e..b45602279d 100644
--- a/plugins/NewXstatusNotify/src/main.cpp
+++ b/plugins/NewXstatusNotify/src/main.cpp
@@ -20,12 +20,6 @@
 */

 

 #include "common.h"

-#include "indsnd.h"

-#include "options.h"

-#include "popup.h"

-#include "utils.h"

-#include "version.h"

-#include "xstatus.h"

 

 HINSTANCE hInst;

 

@@ -39,17 +33,15 @@ STATUS StatusList[STATUS_COUNT];
 DWORD LoadTime = 0;

 int hLangpack;

 

-extern OPTIONS opt;

-

 PLUGININFOEX pluginInfoEx = {

 	sizeof(PLUGININFOEX),

-	"xStatus Notify",

-	__VERSION_DWORD,

-	"Notifies you when a contact changes his/her (X)status or status message.",

-	"Luca Santarelli, Vasilich, yaho",

-	"yaho@miranda-easy.net",

-	"© 2001-2004 Luca Santarelli, 2005-2007 Vasilich, 2007-2011 yaho",

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

+	__PLUGIN_NAME,

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

+	__DESCRIPTION,

+	__AUTHOR,

+	__AUTHOREMAIL,

+	__COPYRIGHT,

+	__AUTHORWEB,

 	UNICODE_AWARE,

 	// EBF19652-E434-4D79-9897-91A0FF226F51

 	{0xebf19652, 0xe434, 0x4d79, {0x98, 0x97, 0x91, 0xa0, 0xff, 0x22, 0x6f, 0x51}}

diff --git a/plugins/NewXstatusNotify/src/options.cpp b/plugins/NewXstatusNotify/src/options.cpp
index ce95154171..e58de111c7 100644
--- a/plugins/NewXstatusNotify/src/options.cpp
+++ b/plugins/NewXstatusNotify/src/options.cpp
@@ -20,11 +20,6 @@
 */

 

 #include "common.h"

-#include "indsnd.h"

-#include "options.h"

-#include "popup.h"

-#include "xstatus.h"

-#include "utils.h"

 

 OPTIONS opt = {0};

 TEMPLATES templates = {0};

@@ -32,10 +27,6 @@ BOOL UpdateListFlag = FALSE;
 LIST<PROTOTEMPLATE> ProtoTemplates(10);

 int LastItem = 0;

 

-extern HINSTANCE hInst;

-extern HANDLE hEnableDisableMenu;

-extern STATUS StatusList[STATUS_COUNT];

-

 INT_PTR CALLBACK DlgProcAutoDisableOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

 

 void LoadTemplates()

diff --git a/plugins/NewXstatusNotify/src/options.h b/plugins/NewXstatusNotify/src/options.h
index 7947401c31..6d3c018570 100644
--- a/plugins/NewXstatusNotify/src/options.h
+++ b/plugins/NewXstatusNotify/src/options.h
@@ -22,8 +22,6 @@
 #ifndef OPTIONS_H

 #define OPTIONS_H

 

-#include "common.h"

-

 #define DEFAULT_LOGFILE	"NewStatusNotify.log"

 

 typedef struct tagOPTIONS {

diff --git a/plugins/NewXstatusNotify/src/popup.cpp b/plugins/NewXstatusNotify/src/popup.cpp
index 1ddc5648e1..e082e59595 100644
--- a/plugins/NewXstatusNotify/src/popup.cpp
+++ b/plugins/NewXstatusNotify/src/popup.cpp
@@ -20,11 +20,6 @@
 */

 

 #include "common.h"

-#include "popup.h"

-#include "options.h"

-#include "utils.h"

-

-extern OPTIONS opt;

 

 void QueryAwayMessage(HWND hWnd, PLUGINDATA *pdp)

 {

diff --git a/plugins/NewXstatusNotify/src/stdafx.cpp b/plugins/NewXstatusNotify/src/stdafx.cpp
new file mode 100644
index 0000000000..1976d867da
--- /dev/null
+++ b/plugins/NewXstatusNotify/src/stdafx.cpp
@@ -0,0 +1,18 @@
+/*

+Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)

+

+This program is free software; you can redistribute it and/or

+modify it under the terms of the GNU General Public License

+as published by the Free Software Foundation version 2

+of the License.

+

+This program is distributed in the hope that it will be useful,

+but WITHOUT ANY WARRANTY; without even the implied warranty of

+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+GNU General Public License for more details.

+

+You should have received a copy of the GNU General Public License

+along with this program. If not, see <http://www.gnu.org/licenses/>.

+*/

+

+#include "common.h"
\ No newline at end of file
diff --git a/plugins/NewXstatusNotify/src/utils.cpp b/plugins/NewXstatusNotify/src/utils.cpp
index 67c955cffb..3e9d0f7f35 100644
--- a/plugins/NewXstatusNotify/src/utils.cpp
+++ b/plugins/NewXstatusNotify/src/utils.cpp
@@ -20,10 +20,6 @@
 */

 

 #include "common.h"

-#include "options.h"

-

-extern OPTIONS opt;

-extern STATUS StatusList[STATUS_COUNT];

 

 TCHAR *db2t(DBVARIANT *dbv)

 {

diff --git a/plugins/NewXstatusNotify/src/version.h b/plugins/NewXstatusNotify/src/version.h
index 10ac34a753..ffce1df914 100644
--- a/plugins/NewXstatusNotify/src/version.h
+++ b/plugins/NewXstatusNotify/src/version.h
@@ -1,4 +1,14 @@
-#define __FILEVERSION_STRING        1,4,0,9

-#define __VERSION_STRING            "1.4.0.9"

-#define __VERSION_DWORD             PLUGIN_MAKE_VERSION(1, 4, 0, 9)

+#define __MAJOR_VERSION				1

+#define __MINOR_VERSION				4

+#define __RELEASE_NUM				0

+#define __BUILD_NUM					9

 

+#define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

+

+#define __PLUGIN_NAME				"xStatus Notify"

+#define __FILENAME					"NewXstatusNotify.dll"

+#define __DESCRIPTION 				"Notifies you when a contact changes his/her (X)status or status message."

+#define __AUTHOR					"Luca Santarelli, Vasilich, yaho"

+#define __AUTHOREMAIL				"yaho@miranda-easy.net"

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

+#define __COPYRIGHT					"© 2001-2004 Luca Santarelli, 2005-2007 Vasilich, 2007-2011 yaho"

diff --git a/plugins/NewXstatusNotify/src/xstatus.cpp b/plugins/NewXstatusNotify/src/xstatus.cpp
index feb214f93a..8052a5526b 100644
--- a/plugins/NewXstatusNotify/src/xstatus.cpp
+++ b/plugins/NewXstatusNotify/src/xstatus.cpp
@@ -18,14 +18,6 @@
 */

 

 #include "common.h"

-#include "options.h"

-#include "popup.h"

-#include "utils.h"

-#include "xstatus.h"

-

-extern LIST<DBEVENT> eventList;

-extern OPTIONS opt;

-extern TEMPLATES templates;

 

 XSTATUSCHANGE *NewXSC(HANDLE hContact, char *szProto, int xstatusType, int action, TCHAR *stzTitle, TCHAR *stzText)

 {