removed not used headers

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

12 files changed, 8 insertions, 23 deletions

diff --git a/plugins/Weather/res/Version.rc b/plugins/Weather/res/Version.rc
index d741488c4f..5bfbab4754 100644
--- a/plugins/Weather/res/Version.rc
+++ b/plugins/Weather/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

diff --git a/plugins/Weather/res/info.ico b/plugins/Weather/res/info.ico
deleted file mode 100644
index b073e61af6..0000000000
--- a/plugins/Weather/res/info.ico
+++ /dev/null
diff --git a/plugins/Weather/res/infologo.ico b/plugins/Weather/res/infologo.ico
deleted file mode 100644
index b77b7a4b95..0000000000
--- a/plugins/Weather/res/infologo.ico
+++ /dev/null
diff --git a/plugins/Weather/res/reload.ico b/plugins/Weather/res/reload.ico
deleted file mode 100644
index 1755bf271e..0000000000
--- a/plugins/Weather/res/reload.ico
+++ /dev/null
diff --git a/plugins/Weather/res/resource.rc b/plugins/Weather/res/resource.rc
index 9c88773c3f..34690d8d71 100644
--- a/plugins/Weather/res/resource.rc
+++ b/plugins/Weather/res/resource.rc
@@ -7,7 +7,7 @@
 //

 // Generated from the TEXTINCLUDE 2 resource.

 //

-#include <windows.h>

+#include <winres.h>

 

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

 #undef APSTUDIO_READONLY_SYMBOLS

@@ -305,10 +305,6 @@ BEGIN
         RIGHTMARGIN, 308

     END

 

-    IDD_USERINFO, DIALOG

-    BEGIN

-    END

-

     IDD_SETUP, DIALOG

     BEGIN

         BOTTOMMARGIN, 136

@@ -402,7 +398,7 @@ END
 

 2 TEXTINCLUDE 

 BEGIN

-    "#include <windows.h>\r\n"

+    "#include <winres.h>\r\n"

     "\0"

 END

 

diff --git a/plugins/Weather/src/weather.cpp b/plugins/Weather/src/weather.cpp
index fd110987e6..1da5f8a6fb 100644
--- a/plugins/Weather/src/weather.cpp
+++ b/plugins/Weather/src/weather.cpp
@@ -70,7 +70,7 @@ static const PLUGININFOEX pluginInfoEx =
 	__COPYRIGHT,

 	__AUTHORWEB,

 	UNICODE_AWARE,

-	// {6B612A34-DCF2-4e32-85CF-B6FD006B745E}

+	// {6B612A34-DCF2-4E32-85CF-B6FD006B745E}

 	{0x6b612a34, 0xdcf2, 0x4e32, {0x85, 0xcf, 0xb6, 0xfd, 0x0, 0x6b, 0x74, 0x5e}}

 };

 

diff --git a/plugins/Weather/src/weather.h b/plugins/Weather/src/weather.h
index e44a2c4a9a..868440ad22 100644
--- a/plugins/Weather/src/weather.h
+++ b/plugins/Weather/src/weather.h
@@ -25,15 +25,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //============  THE INCLUDES  ===========

 

 #define _CRT_SECURE_NO_WARNINGS

-#include <m_stdhdr.h>

+

 #include <share.h>

 #include <time.h>

 #include <windows.h>

 #include <commctrl.h>

 #include <richedit.h>

+#include <malloc.h>

 

 #include <newpluginapi.h>

-#include <m_system_cpp.h>

 #include <m_protomod.h>

 #include <m_icolib.h>

 #include <m_options.h>

@@ -54,6 +54,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <m_cluiframes.h>

 #include <m_popup.h>

 #include <win2k.h>

+#include <m_acc.h>

 

 #include <m_weather.h>

 #include <m_toptoolbar.h>

@@ -363,6 +364,7 @@ extern HANDLE hWindowList;
 extern HANDLE hMwinMenu;

 extern HANDLE hTBButton;

 extern UINT_PTR timerId;

+extern HANDLE hUpdateMutex;

 

 // check if weather is currently updating

 extern BOOL ThreadRunning;

@@ -526,6 +528,7 @@ void removeWindow(HANDLE hContact);
 int UserInfoInit(WPARAM wParam, LPARAM lParam);

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

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

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

 

 #define WM_UPDATEDATA WM_USER + 2687

 

diff --git a/plugins/Weather/src/weather_mwin.cpp b/plugins/Weather/src/weather_mwin.cpp
index 3e6cfd7b9b..4061858a73 100644
--- a/plugins/Weather/src/weather_mwin.cpp
+++ b/plugins/Weather/src/weather_mwin.cpp
@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

 

 #include "weather.h"

-#include "m_acc.h"

 

 #define MS_TOOLTIP_SHOWTIP		"mToolTip/ShowTip"

 #define MS_TOOLTIP_HIDETIP		"mToolTip/HideTip"

diff --git a/plugins/Weather/src/weather_update.cpp b/plugins/Weather/src/weather_update.cpp
index 8029b13821..465abe5d74 100644
--- a/plugins/Weather/src/weather_update.cpp
+++ b/plugins/Weather/src/weather_update.cpp
@@ -29,7 +29,6 @@ menu items).
 UPDATELIST *UpdateListHead;

 UPDATELIST *UpdateListTail;

 

-extern HANDLE hUpdateMutex;

 

 //============  RETRIEVE NEW WEATHER  ============

 

diff --git a/plugins/Weather/src/weather_userinfo.cpp b/plugins/Weather/src/weather_userinfo.cpp
index 1d716a58ef..9ddce8d703 100644
--- a/plugins/Weather/src/weather_userinfo.cpp
+++ b/plugins/Weather/src/weather_userinfo.cpp
@@ -27,8 +27,6 @@ information
 

 #include "weather.h"

 

-extern INT_PTR CALLBACK DlgProcINIPage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

-

 //============  CONTACT INFORMATION  ============

 

 // initialize user info

diff --git a/plugins/Weather/weather_10.vcxproj.filters b/plugins/Weather/weather_10.vcxproj.filters
index 8ceac73614..eb4d71d1eb 100644
--- a/plugins/Weather/weather_10.vcxproj.filters
+++ b/plugins/Weather/weather_10.vcxproj.filters
@@ -9,9 +9,6 @@
       <UniqueIdentifier>{229b056a-ba07-4698-ad86-26548bd87e32}</UniqueIdentifier>

       <Extensions>h;hpp;hxx;hm;inl</Extensions>

     </Filter>

-    <Filter Include="Documentations">

-      <UniqueIdentifier>{3433a4a3-b1af-4761-ab98-0d4ada361b3a}</UniqueIdentifier>

-    </Filter>

     <Filter Include="Resource Files">

       <UniqueIdentifier>{4be16e1a-70ca-4330-b259-db32ec58dcc0}</UniqueIdentifier>

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

diff --git a/plugins/Weather/weather_11.vcxproj.filters b/plugins/Weather/weather_11.vcxproj.filters
index 8ceac73614..eb4d71d1eb 100644
--- a/plugins/Weather/weather_11.vcxproj.filters
+++ b/plugins/Weather/weather_11.vcxproj.filters
@@ -9,9 +9,6 @@
       <UniqueIdentifier>{229b056a-ba07-4698-ad86-26548bd87e32}</UniqueIdentifier>

       <Extensions>h;hpp;hxx;hm;inl</Extensions>

     </Filter>

-    <Filter Include="Documentations">

-      <UniqueIdentifier>{3433a4a3-b1af-4761-ab98-0d4ada361b3a}</UniqueIdentifier>

-    </Filter>

     <Filter Include="Resource Files">

       <UniqueIdentifier>{4be16e1a-70ca-4330-b259-db32ec58dcc0}</UniqueIdentifier>

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