removed not used headers

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

16 files changed, 37 insertions, 90 deletions

diff --git a/plugins/SeenPlugin/res/resource.rc b/plugins/SeenPlugin/res/resource.rc
index 9bcb40df6b..93f0da9146 100644
--- a/plugins/SeenPlugin/res/resource.rc
+++ b/plugins/SeenPlugin/res/resource.rc
@@ -7,7 +7,7 @@
 //

 // Generated from the TEXTINCLUDE 2 resource.

 //

-#include <windows.h>

+#include <winres.h>

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

 #undef APSTUDIO_READONLY_SYMBOLS

 

@@ -26,17 +26,17 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
 // TEXTINCLUDE

 //

 

-1 TEXTINCLUDE DISCARDABLE

+1 TEXTINCLUDE

 BEGIN

     "..\\src\\resource.h\0"

 END

 

-2 TEXTINCLUDE DISCARDABLE

+2 TEXTINCLUDE

 BEGIN

-    "#include <windows.h>\0"

+    "#include <winres.h>\0"

 END

 

-3 TEXTINCLUDE DISCARDABLE

+3 TEXTINCLUDE

 BEGIN

     "\r\n"

     "\0"

@@ -179,7 +179,7 @@ END
 //

 

 #ifdef APSTUDIO_INVOKED

-GUIDELINES DESIGNINFO DISCARDABLE

+GUIDELINES DESIGNINFO

 BEGIN

     IDD_OPTIONS, DIALOG

     BEGIN

diff --git a/plugins/SeenPlugin/res/version.rc b/plugins/SeenPlugin/res/version.rc
index b8fb57b0de..5bfbab4754 100644
--- a/plugins/SeenPlugin/res/version.rc
+++ b/plugins/SeenPlugin/res/version.rc
@@ -1,14 +1,12 @@
+// Microsoft Visual C++ generated resource script.

+//

 #ifdef APSTUDIO_INVOKED

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

 #endif //APSTUDIO_INVOKED

 

+#include "afxres.h"

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

 

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

-//

-// Version

-//

-

 VS_VERSION_INFO VERSIONINFO

  FILEVERSION __FILEVERSION_STRING

  PRODUCTVERSION __FILEVERSION_STRING

diff --git a/plugins/SeenPlugin/seenplugin_10.vcxproj b/plugins/SeenPlugin/seenplugin_10.vcxproj
index 400a512f0e..4e887d8c29 100644
--- a/plugins/SeenPlugin/seenplugin_10.vcxproj
+++ b/plugins/SeenPlugin/seenplugin_10.vcxproj
@@ -201,6 +201,7 @@
   <ItemGroup>

     <ClInclude Include="src\resource.h" />

     <ClInclude Include="src\seen.h" />

+    <ClInclude Include="src\version.h" />

   </ItemGroup>

   <ItemGroup>

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

diff --git a/plugins/SeenPlugin/seenplugin_10.vcxproj.filters b/plugins/SeenPlugin/seenplugin_10.vcxproj.filters
index cd2baa5aba..2ed0201869 100644
--- a/plugins/SeenPlugin/seenplugin_10.vcxproj.filters
+++ b/plugins/SeenPlugin/seenplugin_10.vcxproj.filters
@@ -50,6 +50,9 @@
     <ClInclude Include="src\seen.h">

       <Filter>Header Files</Filter>

     </ClInclude>

+    <ClInclude Include="src\version.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="res\resource.rc">

diff --git a/plugins/SeenPlugin/seenplugin_11.vcxproj b/plugins/SeenPlugin/seenplugin_11.vcxproj
index bce64aa197..f3d6cfa184 100644
--- a/plugins/SeenPlugin/seenplugin_11.vcxproj
+++ b/plugins/SeenPlugin/seenplugin_11.vcxproj
@@ -205,6 +205,7 @@
   <ItemGroup>

     <ClInclude Include="src\resource.h" />

     <ClInclude Include="src\seen.h" />

+    <ClInclude Include="src\version.h" />

   </ItemGroup>

   <ItemGroup>

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

diff --git a/plugins/SeenPlugin/seenplugin_11.vcxproj.filters b/plugins/SeenPlugin/seenplugin_11.vcxproj.filters
index cd2baa5aba..2ed0201869 100644
--- a/plugins/SeenPlugin/seenplugin_11.vcxproj.filters
+++ b/plugins/SeenPlugin/seenplugin_11.vcxproj.filters
@@ -50,6 +50,9 @@
     <ClInclude Include="src\seen.h">

       <Filter>Header Files</Filter>

     </ClInclude>

+    <ClInclude Include="src\version.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="res\resource.rc">

diff --git a/plugins/SeenPlugin/src/file.cpp b/plugins/SeenPlugin/src/file.cpp
index 357ae08b7b..0c9fbf5372 100644
--- a/plugins/SeenPlugin/src/file.cpp
+++ b/plugins/SeenPlugin/src/file.cpp
@@ -16,11 +16,6 @@ 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, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-

-File name      : $URL: http://svn.berlios.de/svnroot/repos/mgoodies/trunk/lastseen-mod/file.c $

-Revision       : $Rev: 1570 $

-Last change on : $Date: 2007-12-30 01:30:07 +0300 (Вс, 30 дек 2007) $

-Last change by : $Author: y_b $

 */

 

 #include "seen.h"

diff --git a/plugins/SeenPlugin/src/history.cpp b/plugins/SeenPlugin/src/history.cpp
index ffb26a26c2..60d08bc89e 100644
--- a/plugins/SeenPlugin/src/history.cpp
+++ b/plugins/SeenPlugin/src/history.cpp
@@ -16,15 +16,9 @@ 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, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-

-File name      : $URL: http://svn.berlios.de/svnroot/repos/mgoodies/trunk/lastseen-mod/history.c $

-Revision       : $Rev: 1056 $

-Last change on : $Date: 2006-10-30 06:22:07 +0300 (Пн, 30 окт 2006) $

-Last change by : $Author: y_b $

 */

-#include "seen.h"

 

-extern HINSTANCE hInstance;

+#include "seen.h"

 

 static HANDLE hWindowList;

 

diff --git a/plugins/SeenPlugin/src/main.cpp b/plugins/SeenPlugin/src/main.cpp
index 9dea392cfd..101681cb66 100644
--- a/plugins/SeenPlugin/src/main.cpp
+++ b/plugins/SeenPlugin/src/main.cpp
@@ -16,14 +16,9 @@ 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, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-

-File name      : $URL: http://svn.berlios.de/svnroot/repos/mgoodies/trunk/lastseen-mod/main.c $

-Revision       : $Rev: 1571 $

-Last change on : $Date: 2007-12-30 04:55:51 +0300 (Вс, 30 дек 2007) $

-Last change by : $Author: y_b $

 */

+

 #include "seen.h"

-#include "version.h"

 

 HINSTANCE hInstance;

 HANDLE ehmissed = NULL, ehuserinfo = NULL, ehmissed_proto = NULL;

@@ -40,7 +35,8 @@ PLUGININFOEX pluginInfo={
 	__COPYRIGHT,

 	__AUTHORWEB,

 	UNICODE_AWARE,

-	{ 0x2d506d46,0xc94e,0x4ef8,{0x85, 0x37, 0xf1, 0x12, 0x33, 0xa8, 0x03, 0x81}}/* 2d506d46-c94e-4ef8-8537-f11233a80381 */

+	// {2D506D46-C94E-4EF8-8537-F11233A80381}

+	{0x2d506d46, 0xc94e, 0x4ef8, {0x85, 0x37, 0xf1, 0x12, 0x33, 0xa8, 0x03, 0x81}}

 };

 

 #define TRANSNUMBER 2

diff --git a/plugins/SeenPlugin/src/menu.cpp b/plugins/SeenPlugin/src/menu.cpp
index 473917ce49..00afddde37 100644
--- a/plugins/SeenPlugin/src/menu.cpp
+++ b/plugins/SeenPlugin/src/menu.cpp
@@ -16,12 +16,8 @@ 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, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-

-File name      : $URL: http://svn.berlios.de/svnroot/repos/mgoodies/trunk/lastseen-mod/menu.c $

-Revision       : $Rev: 1570 $

-Last change on : $Date: 2007-12-30 01:30:07 +0300 (Вс, 30 дек 2007) $

-Last change by : $Author: y_b $

 */

+

 #include "seen.h"

 

 HANDLE hmenuitem=NULL, hLSUserDet = NULL, hBuildMenu = NULL;

diff --git a/plugins/SeenPlugin/src/missed.cpp b/plugins/SeenPlugin/src/missed.cpp
index 4735fae6d3..9098d3d0e1 100644
--- a/plugins/SeenPlugin/src/missed.cpp
+++ b/plugins/SeenPlugin/src/missed.cpp
@@ -16,17 +16,11 @@ 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, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-

-File name      : $URL: http://svn.berlios.de/svnroot/repos/mgoodies/trunk/lastseen-mod/missed.c $

-Revision       : $Rev: 1570 $

-Last change on : $Date: 2007-12-30 01:30:07 +0300 (Вс, 30 дек 2007) $

-Last change by : $Author: y_b $

 */

+

 #include "seen.h"

 

 MISSEDCONTACTS mcs;

-extern HANDLE ehmissed;

-extern HINSTANCE hInstance;

 

 WPARAM IsUserMissed(WPARAM contact)

 {

diff --git a/plugins/SeenPlugin/src/options.cpp b/plugins/SeenPlugin/src/options.cpp
index c2482036fc..6036bd0a2f 100644
--- a/plugins/SeenPlugin/src/options.cpp
+++ b/plugins/SeenPlugin/src/options.cpp
@@ -16,17 +16,10 @@ 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, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-

-File name      : $URL: http://svn.berlios.de/svnroot/repos/mgoodies/trunk/lastseen-mod/options.c $

-Revision       : $Rev: 1570 $

-Last change on : $Date: 2007-12-30 01:30:07 +0300 (Вс, 30 дек 2007) $

-Last change by : $Author: y_b $

 */

 

 #include "seen.h"

 

-extern HINSTANCE hInstance;

-extern HANDLE ehuserinfo,hmenuitem,ehmissed_proto;

 void BuildInfo(char *,char *,char *);

 int BuildContactMenu(WPARAM,LPARAM);

 int UserinfoInit(WPARAM,LPARAM);

diff --git a/plugins/SeenPlugin/src/seen.h b/plugins/SeenPlugin/src/seen.h
index a7a196cd91..9c2e1adc55 100644
--- a/plugins/SeenPlugin/src/seen.h
+++ b/plugins/SeenPlugin/src/seen.h
@@ -25,47 +25,37 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define ETDT_USETABTEXTURE  0x00000004

 #define ETDT_ENABLETAB      (ETDT_ENABLE  | ETDT_USETABTEXTURE)

 

-#define MIRANDA_VER    0x0A00

 #define _CRT_SECURE_NO_WARNINGS

 #define _CRT_NON_CONFORMING_SWPRINTFS

 

 #include <windows.h>

-#include <win2k.h>

 #include <commctrl.h>

 #include <malloc.h>

-#include <stdio.h>

-#include <string.h>

 #include <time.h>

 

-#include "resource.h"

-

+#include <win2k.h>

 #include <newpluginapi.h>

 #include <m_database.h>

 #include <m_langpack.h>

-#include <m_system.h>

 #include <m_skin.h>

-#include <m_utils.h>

-#include <m_options.h>

 #include <m_userinfo.h>

 #include <m_clist.h>

 #include <m_contacts.h>

 #include <m_message.h>

 #include <m_protosvc.h>

-#include <m_protocols.h>

 #include <m_popup.h>

 #include <m_ignore.h>

 #include <m_button.h>

 

-#include "m_tipper.h"

+#include <m_tipper.h>

+

+#include "resource.h"

+#include "version.h"

 

 WCHAR *any_to_IdleNotidleUnknown(HANDLE hContact, const char *module_name, const char *setting_name, WCHAR *buff, int bufflen);

 WCHAR *any_to_Idle(HANDLE hContact, const char *module_name, const char *setting_name, WCHAR *buff, int bufflen);

 

-#ifdef __GNUC__

-#define NUM100NANOSEC  116444736000000000ULL

-#else

 #define NUM100NANOSEC  116444736000000000

-#endif

 

 #define S_MOD "SeenModule"

 

@@ -97,10 +87,6 @@ WCHAR *any_to_Idle(HANDLE hContact, const char *module_name, const char *setting
 

 #define VARIABLE_LIST "%s \n%%Y: \t %s \n%%y: \t %s \n%%m: \t %s \n%%E: \t %s \n%%e: \t %s \n%%d: \t %s \n%%W: \t %s \n%%w: \t %s \n\n%s \n%%H: \t %s \n%%h: \t %s \n%%p: \t %s \n%%M: \t %s \n%%S: \t %s \n\n%s \n%%n: \t %s \n%%N: \t %s \n%%u: \t %s \n%%G: \t %s \n%%s: \t %s \n%%T: \t %s \n%%o: \t %s \n%%i: \t %s \n%%r: \t %s \n%%C: \t %s \n%%P: \t %s \n\n%s \n%%t: \t %s \n%%b: \t %s\n\n%s\t%s \"#\" %s\n\t%s %s", Translate("-- Date --"), Translate("year (4 digits)"), Translate("year (2 digits)"), Translate("month"), Translate("name of month"), Translate("short name of month"), Translate("day"), Translate("weekday (full)"), Translate("weekday (abbreviated)"), Translate("-- Time --"), Translate("hours (24)"), Translate("hours (12)"), Translate("AM/PM"), Translate("minutes"), Translate("seconds"), Translate("-- User --"), Translate("username"), Translate("nick"), Translate("UIN/handle"), Translate("Group"), Translate("Status"), Translate("Status message"), Translate("Old status"), Translate("external IP"), Translate("internal IP"),Translate("Client info"),Translate("Protocol"), Translate("-- Format --"), Translate("tabulator"), Translate("line break"), Translate("Note:"),Translate("Use"),Translate("for empty string"),Translate("instead of"),Translate("<unknown>")

 

-#ifndef LPCOLORREF

-typedef DWORD   *LPCOLORREF;

-#endif

-

 typedef struct{

 	int count;

 	WPARAM wpcontact[1024];

@@ -109,7 +95,6 @@ typedef struct{
 

 int IsWatchedProtocol(const char* szProto);

 TCHAR *ParseString(TCHAR*, HANDLE, BYTE);

-extern DWORD StatusColors15bits[];

 void GetColorsFromDWord(LPCOLORREF First, LPCOLORREF Second, DWORD colDword);

 DWORD GetDWordFromColors(COLORREF First, COLORREF Second);

 int OptionsInit(WPARAM,LPARAM);

@@ -124,7 +109,6 @@ int CheckIfOnline(void);
 void UninitMenuitem();

 void ShowHistory(HANDLE hContact, BYTE isAlert);

 

-extern BOOL includeIdle;

 typedef struct logthread_info {

   char sProtoName[MAXMODULELABELLENGTH];

   HANDLE hContact;

@@ -132,6 +116,12 @@ typedef struct logthread_info {
   int queueIndex;

 } logthread_info;

 

+extern HINSTANCE hInstance;

 extern logthread_info **contactQueue;

 extern int contactQueueSize;

+extern DWORD StatusColors15bits[];

+extern BOOL includeIdle;

+extern HANDLE ehmissed;

+extern HANDLE ehuserinfo, hmenuitem, ehmissed_proto;

+extern DWORD dwmirver;

 

diff --git a/plugins/SeenPlugin/src/userinfo.cpp b/plugins/SeenPlugin/src/userinfo.cpp
index c407cb1445..1bc7f1c805 100644
--- a/plugins/SeenPlugin/src/userinfo.cpp
+++ b/plugins/SeenPlugin/src/userinfo.cpp
@@ -16,16 +16,9 @@ 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, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-

-File name      : $URL: http://svn.berlios.de/svnroot/repos/mgoodies/trunk/lastseen-mod/userinfo.c $

-Revision       : $Rev: 1570 $

-Last change on : $Date: 2007-12-30 01:30:07 +0300 (Вс, 30 дек 2007) $

-Last change by : $Author: y_b $

 */

-#include "seen.h"

 

-extern HINSTANCE hInstance;

-extern DWORD dwmirver;

+#include "seen.h"

 

 LRESULT CALLBACK EditProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam)

 {

diff --git a/plugins/SeenPlugin/src/utils.cpp b/plugins/SeenPlugin/src/utils.cpp
index 8758b3acd3..5783d1f53b 100644
--- a/plugins/SeenPlugin/src/utils.cpp
+++ b/plugins/SeenPlugin/src/utils.cpp
@@ -16,12 +16,8 @@ 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, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-

-File name      : $URL: http://svn.berlios.de/svnroot/repos/mgoodies/trunk/lastseen-mod/utils.c $

-Revision       : $Rev: 1570 $

-Last change on : $Date: 2007-12-30 01:30:07 +0300 (Вс, 30 дек 2007) $

-Last change by : $Author: y_b $

 */

+

 #include "seen.h"

 

 void FileWrite(HANDLE);

diff --git a/plugins/SeenPlugin/src/version.h b/plugins/SeenPlugin/src/version.h
index 03f23e4753..3160733a93 100644
--- a/plugins/SeenPlugin/src/version.h
+++ b/plugins/SeenPlugin/src/version.h
@@ -25,14 +25,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define __BUILD_NUM					7

 

 #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				"Last Seen Mod"

-#define __INTERNAL_NAME				"Last Seen"

+#define __PLUGIN_NAME				"Last seen"

 #define __FILENAME					"SeenPlugin.dll"

 #define __DESCRIPTION 				"Logs when a user was last seen online and which users were online while you were away."

 #define __AUTHOR					"Heiko Schillinger, YB"