removed not used headers

added version info

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

20 files changed, 68 insertions, 119 deletions

diff --git a/plugins/TipperYM/res/resource.rc b/plugins/TipperYM/res/resource.rc
index 8c7a166d71..9eedb29634 100644
--- a/plugins/TipperYM/res/resource.rc
+++ b/plugins/TipperYM/res/resource.rc
@@ -333,16 +333,7 @@ IDI_DOWN                ICON                    "arrow_down.ico"
 IDI_SEPARATOR           ICON                    "separator.ico"

 IDI_RELOAD              ICON                    "reload.ico"

 IDI_APPLY               ICON                    "apply.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

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

@@ -369,7 +360,7 @@ END
 

 #endif    // APSTUDIO_INVOKED

 

-#endif    // English (United States) resources

+#endif    // Czech (Czech Republic) resources

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

 

 

diff --git a/plugins/TipperYM/res/version.rc b/plugins/TipperYM/res/version.rc
index 724de5240a..5bfbab4754 100644
--- a/plugins/TipperYM/res/version.rc
+++ b/plugins/TipperYM/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", "Scott Ellis, yaho"

-			VALUE "CompanyName", "yaho"

-            VALUE "FileDescription", "Tool Tip notification windows"

-            VALUE "FileVersion", __VERSION_STRING

-            VALUE "InternalName", "Tipper YM"

-            VALUE "LegalCopyright", "(c) 2005-2007 Scott Ellis, 2007-2011 Jan Holub"

-			VALUE "OriginalFilename", "tipper.dll"

-            VALUE "ProductName", "Tipper 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/TipperYM/src/bitmap_func.cpp b/plugins/TipperYM/src/bitmap_func.cpp
index 4e747fb90a..a1001173ae 100644
--- a/plugins/TipperYM/src/bitmap_func.cpp
+++ b/plugins/TipperYM/src/bitmap_func.cpp
@@ -19,9 +19,6 @@ Boston, MA 02111-1307, USA.
 */

 

 #include "common.h"

-#include "options.h"

-#include "bitmap_func.h"

-#include "message_pump.h"

 

 TOOLTIPSKIN skin = {0};

 

diff --git a/plugins/TipperYM/src/common.h b/plugins/TipperYM/src/common.h
index bbecc49386..1224719520 100644
--- a/plugins/TipperYM/src/common.h
+++ b/plugins/TipperYM/src/common.h
@@ -38,12 +38,8 @@ Boston, MA 02111-1307, USA.
 #define _WIN32_IE 0x0600	// Change this to the appropriate value to target other versions of IE.

 #endif

 

-#define MIRANDA_VER		0x0A00

-

 #define _CRT_SECURE_NO_WARNINGS

 

-#include <m_stdhdr.h>

-

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

 // Windows Header Files:

 #include <windows.h>

@@ -52,6 +48,7 @@ Boston, MA 02111-1307, USA.
 #include <time.h>

 #include <windowsx.h>

 

+#include <m_stdhdr.h>

 #include <win2k.h>

 #include <newpluginapi.h>

 #include <statusmodes.h>

@@ -79,7 +76,6 @@ Boston, MA 02111-1307, USA.
 #include <m_xstatus.h>

 #include <m_icq.h>

 

-#include "resource.h"

 #include "m_tipper.h"

 #include "m_fingerprint.h"

 #include "m_flags.h"

@@ -87,7 +83,20 @@ Boston, MA 02111-1307, USA.
 #include "m_metacontacts.h"

 #include "m_variables.h"

 #include "m_smileyadd.h"

+#include "m_gender.h"

 

+#include "resource.h"

+#include "version.h"

+#include "message_pump.h"

+#include "mir_smileys.h"

+#include "popwin.h"

+#include "skin_parser.h"

+#include "bitmap_func.h"

+#include "options.h"

+#include "str_utils.h"

+#include "subst.h"

+#include "preset_items.h"

+#include "translations.h"

 

 #define MODULE					"Tipper"

 #define MODULE_ITEMS			"Tipper_Items"

@@ -101,4 +110,9 @@ extern COLORREF	colTitle, colLabels, colBg, colValues;
 extern int iCodePage;

 extern char szMetaModuleName[256];

 

-extern FI_INTERFACE *fii;
\ No newline at end of file
+extern FI_INTERFACE *fii;

+

+extern TOOLTIPSKIN skin;

+extern TCHAR SKIN_FOLDER[256];

+

+extern int ReloadFont(WPARAM wParam, LPARAM lParam);

diff --git a/plugins/TipperYM/src/message_pump.cpp b/plugins/TipperYM/src/message_pump.cpp
index db57fadf07..5980612f49 100644
--- a/plugins/TipperYM/src/message_pump.cpp
+++ b/plugins/TipperYM/src/message_pump.cpp
@@ -19,11 +19,6 @@ Boston, MA 02111-1307, USA.
 */

 

 #include "common.h"

-#include "message_pump.h"

-#include "popwin.h"

-#include "options.h"

-#include "str_utils.h"

-#include "subst.h"

 

 BOOL (WINAPI *MySetLayeredWindowAttributes)(HWND,COLORREF,BYTE,DWORD) = 0;

 BOOL (WINAPI *MyUpdateLayeredWindow)(HWND hwnd, HDC hdcDST, POINT *pptDst, SIZE *psize, HDC hdcSrc, POINT *pptSrc, COLORREF crKey, BLENDFUNCTION *pblend, DWORD dwFlags) = 0;

diff --git a/plugins/TipperYM/src/mir_smileys.cpp b/plugins/TipperYM/src/mir_smileys.cpp
index 1a26a370dd..c42af4a871 100644
--- a/plugins/TipperYM/src/mir_smileys.cpp
+++ b/plugins/TipperYM/src/mir_smileys.cpp
@@ -19,8 +19,6 @@ Boston, MA 02111-1307, USA.
 */

 

 #include "common.h"

-#include "options.h"

-#include "mir_smileys.h"

 

 int InitTipperSmileys()

 {

diff --git a/plugins/TipperYM/src/options.cpp b/plugins/TipperYM/src/options.cpp
index 0dfb831bc9..ed38a434ca 100644
--- a/plugins/TipperYM/src/options.cpp
+++ b/plugins/TipperYM/src/options.cpp
@@ -19,20 +19,10 @@ Boston, MA 02111-1307, USA.
 */

 

 #include "common.h"

-#include "options.h"

-#include "popwin.h"

-#include "str_utils.h"

-#include "message_pump.h"

-#include "preset_items.h"

-#include "skin_parser.h"

 

 OPTIONS opt;

 ICONSTATE exIcons[EXICONS_COUNT];

 

-extern TOOLTIPSKIN skin;

-extern int ReloadFont(WPARAM wParam, LPARAM lParam);

-

-

 extern int IsTrayProto(const TCHAR *swzProto, BOOL bExtendedTip)

 {

 	if (swzProto == NULL)

diff --git a/plugins/TipperYM/src/options.h b/plugins/TipperYM/src/options.h
index 52411110fb..86276ae026 100644
--- a/plugins/TipperYM/src/options.h
+++ b/plugins/TipperYM/src/options.h
@@ -21,11 +21,6 @@ Boston, MA 02111-1307, USA.
 #ifndef _OPTIONS_INC

 #define _OPTIONS_INC

 

-#include "translations.h"

-#include "popwin.h"

-#include "bitmap_func.h"

-#include "skin_parser.h"

-

 #define WMU_ENABLE_LIST_BUTTONS			(WM_USER + 0x030)

 #define WMU_ENABLE_MODULE_ENTRY			(WM_USER + 0x031)

 

diff --git a/plugins/TipperYM/src/popwin.cpp b/plugins/TipperYM/src/popwin.cpp
index 808f1a7698..c3ed182e2b 100644
--- a/plugins/TipperYM/src/popwin.cpp
+++ b/plugins/TipperYM/src/popwin.cpp
@@ -19,15 +19,6 @@ Boston, MA 02111-1307, USA.
 */

 

 #include "common.h"

-#include "subst.h"

-#include "popwin.h"

-#include "message_pump.h"

-#include "str_utils.h"

-#include "bitmap_func.h"

-#include "translations.h"

-#include "m_gender.h"

-

-extern TOOLTIPSKIN skin;

 

 __inline void AddRow(PopupWindowData *pwd, TCHAR *swzLabel, TCHAR *swzValue, char *szProto, bool bParseSmileys, bool bNewline, bool bLineAbove, bool bIsTitle = false, HICON hIcon = NULL) 

 {

diff --git a/plugins/TipperYM/src/popwin.h b/plugins/TipperYM/src/popwin.h
index b7ba674b08..81d36b0210 100644
--- a/plugins/TipperYM/src/popwin.h
+++ b/plugins/TipperYM/src/popwin.h
@@ -21,8 +21,6 @@ Boston, MA 02111-1307, USA.
 #ifndef _POPWIN_INC

 #define _POPWIN_INC

 

-#include "mir_smileys.h"

-

 #define POP_WIN_CLASS					_T(MODULE) _T("MimTTClass")

 

 #define PUM_GETHEIGHT					(WM_USER + 0x020)

diff --git a/plugins/TipperYM/src/preset_items.cpp b/plugins/TipperYM/src/preset_items.cpp
index 629a747a28..c9308cb141 100644
--- a/plugins/TipperYM/src/preset_items.cpp
+++ b/plugins/TipperYM/src/preset_items.cpp
@@ -19,7 +19,6 @@ Boston, MA 02111-1307, USA.
 */

 

 #include "common.h"

-#include "preset_items.h"

 

 PRESETITEM presetItems[] = 

 {

diff --git a/plugins/TipperYM/src/preset_items.h b/plugins/TipperYM/src/preset_items.h
index 5055db3dee..8b07f0069c 100644
--- a/plugins/TipperYM/src/preset_items.h
+++ b/plugins/TipperYM/src/preset_items.h
@@ -21,8 +21,6 @@ Boston, MA 02111-1307, USA.
 #ifndef _PRESETITEMS_INC

 #define _PRESETITEMS_INC

 

-#include "options.h"

-

 #define MAX_PRESET_SUBST_COUNT	3

 

 typedef struct {

diff --git a/plugins/TipperYM/src/skin_parser.cpp b/plugins/TipperYM/src/skin_parser.cpp
index 3c851e0039..439b1a2b44 100644
--- a/plugins/TipperYM/src/skin_parser.cpp
+++ b/plugins/TipperYM/src/skin_parser.cpp
@@ -19,10 +19,6 @@ Boston, MA 02111-1307, USA.
 */

 

 #include "common.h"

-#include "options.h"

-#include "str_utils.h"

-

-extern TCHAR SKIN_FOLDER[256];

 

 int RefreshSkinList(HWND hwndDlg)

 {

diff --git a/plugins/TipperYM/src/str_utils.cpp b/plugins/TipperYM/src/str_utils.cpp
index 112cc2678b..2189b34312 100644
--- a/plugins/TipperYM/src/str_utils.cpp
+++ b/plugins/TipperYM/src/str_utils.cpp
@@ -19,7 +19,6 @@ Boston, MA 02111-1307, USA.
 */

 

 #include "common.h"

-#include "str_utils.h"

 

 int iCodePage = CP_ACP;

 

diff --git a/plugins/TipperYM/src/subst.cpp b/plugins/TipperYM/src/subst.cpp
index 6d439f8bec..60f42074ad 100644
--- a/plugins/TipperYM/src/subst.cpp
+++ b/plugins/TipperYM/src/subst.cpp
@@ -19,10 +19,6 @@ Boston, MA 02111-1307, USA.
 */

 

 #include "common.h"

-#include "subst.h"

-#include "str_utils.h"

-#include "popwin.h"

-

 

 int ProtoServiceExists(const char *szModule, const char *szService)

 {

diff --git a/plugins/TipperYM/src/subst.h b/plugins/TipperYM/src/subst.h
index 41f66f871a..fdc0b73320 100644
--- a/plugins/TipperYM/src/subst.h
+++ b/plugins/TipperYM/src/subst.h
@@ -21,9 +21,6 @@ Boston, MA 02111-1307, USA.
 #ifndef _SUBST_INC

 #define _SUBST_INC

 

-#include "options.h"

-#include "translations.h"

-

 bool GetLabelText(HANDLE hContact, const DISPLAYITEM &di, TCHAR *buff, int iBufflen);

 bool GetValueText(HANDLE hContact, const DISPLAYITEM &di, TCHAR *buff, int iBufflen);

 

diff --git a/plugins/TipperYM/src/tipper.cpp b/plugins/TipperYM/src/tipper.cpp
index a661c24705..bd583e1cfb 100644
--- a/plugins/TipperYM/src/tipper.cpp
+++ b/plugins/TipperYM/src/tipper.cpp
@@ -19,12 +19,6 @@ Boston, MA 02111-1307, USA.
 */

 

 #include "common.h"

-#include "version.h"

-#include "message_pump.h"

-#include "options.h"

-#include "popwin.h"

-#include "skin_parser.h"

-#include "str_utils.h"

 

 HMODULE hInst;

 

@@ -50,19 +44,19 @@ int hLangpack;
 PLUGININFOEX pluginInfoEx =

 {

 	sizeof(PLUGININFOEX),

-	"Tipper",

-	__VERSION_DWORD,

-	"Tool Tip notification windows.",

-	"Scott Ellis, yaho",

-	"yaho@miranda-easy.net",

-	"© 2005-2007 Scott Ellis, 2007-2011 Jan Holub",

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

+	__PLUGIN_NAME,

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

+	__DESCRIPTION,

+	__AUTHOR,

+	__AUTHOREMAIL,

+	__COPYRIGHT,

+	__AUTHORWEB,

 	UNICODE_AWARE,

-	// {8392DF1D-9090-4f8e-9DF6-2FE058EDD800}

+	// {8392DF1D-9090-4F8E-9DF6-2FE058EDD800}

 	{0x8392df1d, 0x9090, 0x4f8e, {0x9d, 0xf6, 0x2f, 0xe0, 0x58, 0xed, 0xd8, 0x00}}

 };

 

-extern "C" bool WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)

+bool WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)

 {

 	hInst = hinstDLL;

     return TRUE;

diff --git a/plugins/TipperYM/src/translations.cpp b/plugins/TipperYM/src/translations.cpp
index df31e48e09..fcbe097981 100644
--- a/plugins/TipperYM/src/translations.cpp
+++ b/plugins/TipperYM/src/translations.cpp
@@ -19,9 +19,6 @@ Boston, MA 02111-1307, USA.
 */

 

 #include "common.h"

-#include "translations.h"

-#include "subst.h"

-#include "str_utils.h"

 

 int iTransFuncsCount = 0;

 DBVTranslation *translations = 0;

@@ -29,7 +26,6 @@ DBVTranslation *translations = 0;
 DWORD dwNextFuncId;

 HANDLE hServiceAdd;

 

-

 void AddTranslation(DBVTranslation *newTrans) 

 {

 	iTransFuncsCount++;

diff --git a/plugins/TipperYM/src/version.h b/plugins/TipperYM/src/version.h
index c71b187bc0..512bea4c5a 100644
--- a/plugins/TipperYM/src/version.h
+++ b/plugins/TipperYM/src/version.h
@@ -1,4 +1,14 @@
-#define __FILEVERSION_STRING        2,1,0,4

-#define __VERSION_STRING            "2.1.0.4"

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

+#define __MAJOR_VERSION				2

+#define __MINOR_VERSION				1

+#define __RELEASE_NUM				0

+#define __BUILD_NUM					4

 

+#define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

+

+#define __PLUGIN_NAME				"Tipper"

+#define __FILENAME					"Tipper.dll"

+#define __DESCRIPTION 				"Tool Tip notification windows."

+#define __AUTHOR					"Scott Ellis, yaho"

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

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

+#define __COPYRIGHT					"© 2005-2007 Scott Ellis, 2007-2011 Jan Holub"

diff --git a/plugins/TipperYM/tipper_ym_10.vcxproj.filters b/plugins/TipperYM/tipper_ym_10.vcxproj.filters
index 34451d4c41..48b9344f98 100644
--- a/plugins/TipperYM/tipper_ym_10.vcxproj.filters
+++ b/plugins/TipperYM/tipper_ym_10.vcxproj.filters
@@ -1,20 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>

 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <ItemGroup>

-    <Filter Include="Source Files">

-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>

-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>

-    </Filter>

-    <Filter Include="Header Files">

-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>

-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>

-    </Filter>

-    <Filter Include="Resource Files">

-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>

-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>

-    </Filter>

-  </ItemGroup>

-  <ItemGroup>

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

       <Filter>Source Files</Filter>

     </ClCompile>

@@ -36,6 +22,9 @@
     <ClCompile Include="src\skin_parser.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

       <Filter>Source Files</Filter>

     </ClCompile>

@@ -48,9 +37,6 @@
     <ClCompile Include="src\translations.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

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

-      <Filter>Source Files</Filter>

-    </ClCompile>

   </ItemGroup>

   <ItemGroup>

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

@@ -101,4 +87,15 @@
       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

+  <ItemGroup>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{94f2da18-200f-4b52-8388-eb3c164926f2}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{6e2f941c-7152-4aef-b18e-734688109f0c}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{803ab920-ce96-4a9c-8ae6-2b3821892971}</UniqueIdentifier>

+    </Filter>

+  </ItemGroup>

 </Project>
\ No newline at end of file