Weather moved to C++

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

16 files changed, 27 insertions, 27 deletions

diff --git a/protocols/weather/weather.c b/protocols/weather/weather.cpp
index f2ac4a8e7d..e4e5ee88d6 100644
--- a/protocols/weather/weather.c
+++ b/protocols/weather/weather.cpp
@@ -84,7 +84,7 @@ static const PLUGININFOEX pluginInfoEx =
 	MIID_WEATHER

 };

 

-__declspec(dllexport) const PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) 

+extern "C" __declspec(dllexport) const PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) 

 {

 	if (mirandaVersion < PLUGIN_MAKE_VERSION(0,8,0,0)) {

 		MessageBox(NULL, "Weather Protocol requires Miranda 0.8.0.0 or later to run.", "Weather Protocol", MB_OK|MB_ICONERROR|MB_APPLMODAL);

@@ -97,7 +97,7 @@ __declspec(dllexport) const PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersi
 

 // MirandaPluginInterfaces - returns the protocol interface to the core

 static const MUUID interfaces[] = {MIID_PROTOCOL, MIID_LAST};

-__declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)

+extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)

 {

 	return interfaces;

 }

@@ -199,7 +199,7 @@ void InitVar()
 }

 

 // unload function

-int __declspec(dllexport) Unload(void) 

+extern "C" int __declspec(dllexport) Unload(void) 

 {

 	unsigned i;

 

@@ -226,7 +226,7 @@ int __declspec(dllexport) Unload(void)
 	return 0;

 }

 

-int __declspec(dllexport) Load(PLUGINLINK *link) 

+extern "C" int __declspec(dllexport) Load(PLUGINLINK *link) 

 {

 	PROTOCOLDESCRIPTOR pd = {0};

 	char SvcFunc[100];

diff --git a/protocols/weather/weather_10.vcxproj b/protocols/weather/weather_10.vcxproj
index 64ea807e1a..7f2bd633b3 100644
--- a/protocols/weather/weather_10.vcxproj
+++ b/protocols/weather/weather_10.vcxproj
@@ -200,21 +200,21 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClCompile Include="weather.c" />

-    <ClCompile Include="weather_addstn.c" />

-    <ClCompile Include="weather_contacts.c" />

-    <ClCompile Include="weather_conv.c" />

-    <ClCompile Include="weather_data.c" />

-    <ClCompile Include="weather_http.c" />

-    <ClCompile Include="weather_icons.c" />

-    <ClCompile Include="weather_info.c" />

-    <ClCompile Include="weather_ini.c" />

-    <ClCompile Include="weather_mwin.c" />

-    <ClCompile Include="weather_opt.c" />

-    <ClCompile Include="weather_popup.c" />

-    <ClCompile Include="weather_svcs.c" />

-    <ClCompile Include="weather_update.c" />

-    <ClCompile Include="weather_userinfo.c" />

+    <ClCompile Include="weather.cpp" />

+    <ClCompile Include="weather_addstn.cpp" />

+    <ClCompile Include="weather_contacts.cpp" />

+    <ClCompile Include="weather_conv.cpp" />

+    <ClCompile Include="weather_data.cpp" />

+    <ClCompile Include="weather_http.cpp" />

+    <ClCompile Include="weather_icons.cpp" />

+    <ClCompile Include="weather_info.cpp" />

+    <ClCompile Include="weather_ini.cpp" />

+    <ClCompile Include="weather_mwin.cpp" />

+    <ClCompile Include="weather_opt.cpp" />

+    <ClCompile Include="weather_popup.cpp" />

+    <ClCompile Include="weather_svcs.cpp" />

+    <ClCompile Include="weather_update.cpp" />

+    <ClCompile Include="weather_userinfo.cpp" />

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="m_weather.h" />

diff --git a/protocols/weather/weather_addstn.c b/protocols/weather/weather_addstn.cpp
index 24b965ce19..24b965ce19 100644
--- a/protocols/weather/weather_addstn.c
+++ b/protocols/weather/weather_addstn.cpp
diff --git a/protocols/weather/weather_contacts.c b/protocols/weather/weather_contacts.cpp
index da876963b0..94aae312fd 100644
--- a/protocols/weather/weather_contacts.c
+++ b/protocols/weather/weather_contacts.cpp
@@ -149,7 +149,7 @@ INT_PTR CALLBACK DlgProcChange(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 	case WM_INITDIALOG:

 		TranslateDialogDefault(hwndDlg);

 

-		wndData = mir_alloc(sizeof(CntSetWndDataType));

+		wndData = ( CntSetWndDataType* )mir_alloc(sizeof(CntSetWndDataType));

 		wndData->hContact = hContact = (HANDLE)lParam;

 		wndData->hRename = LoadSkinnedIcon(SKINICON_OTHER_RENAME);

 		wndData->hUserDetail = LoadSkinnedIcon(SKINICON_OTHER_USERDETAILS);

diff --git a/protocols/weather/weather_conv.c b/protocols/weather/weather_conv.cpp
index 23554d4d5f..7679a6c440 100644
--- a/protocols/weather/weather_conv.c
+++ b/protocols/weather/weather_conv.cpp
@@ -692,7 +692,7 @@ char *GetError(int code)
 LPWSTR ConvToUnicode(LPCSTR str2)

 {

 	const size_t nLength = MultiByteToWideChar(lpcp, 0, str2, -1, NULL, 0);

-	LPWSTR res = mir_alloc(sizeof(WCHAR)*nLength);

+	LPWSTR res = ( LPWSTR )mir_alloc(sizeof(WCHAR)*nLength);

 	MultiByteToWideChar(lpcp, 0, str2, -1, res, (int)nLength);

 	return res;

 }

@@ -739,7 +739,7 @@ UINT GetDlgItemTextWth(HWND hDlg, int nIDDlgItem, LPSTR lpString, int nMaxCount)
 

 	if (lpcp != CP_ACP && f_GetDlgItemTextW != NULL)

 	{

-		LPWSTR m_psz = mir_alloc(sizeof(WCHAR) * nMaxCount);

+		LPWSTR m_psz = ( LPWSTR )mir_alloc(sizeof(WCHAR) * nMaxCount);

 		res = f_GetDlgItemTextW(hDlg, nIDDlgItem, m_psz, nMaxCount);

 		WideCharToMultiByte( lpcp, 0, m_psz, -1, lpString, nMaxCount, NULL, NULL );

 		mir_free(m_psz);

diff --git a/protocols/weather/weather_data.c b/protocols/weather/weather_data.cpp
index 86f051199f..86f051199f 100644
--- a/protocols/weather/weather_data.c
+++ b/protocols/weather/weather_data.cpp
diff --git a/protocols/weather/weather_http.c b/protocols/weather/weather_http.cpp
index eb69dd4ca7..eb69dd4ca7 100644
--- a/protocols/weather/weather_http.c
+++ b/protocols/weather/weather_http.cpp
diff --git a/protocols/weather/weather_icons.c b/protocols/weather/weather_icons.cpp
index e1b95c4405..e1b95c4405 100644
--- a/protocols/weather/weather_icons.c
+++ b/protocols/weather/weather_icons.cpp
diff --git a/protocols/weather/weather_info.c b/protocols/weather/weather_info.cpp
index b5997feb6c..b5997feb6c 100644
--- a/protocols/weather/weather_info.c
+++ b/protocols/weather/weather_info.cpp
diff --git a/protocols/weather/weather_ini.c b/protocols/weather/weather_ini.cpp
index eba127bdaf..363f2d364f 100644
--- a/protocols/weather/weather_ini.c
+++ b/protocols/weather/weather_ini.cpp
@@ -101,7 +101,7 @@ void WIItemListAdd(WIDATAITEM *DataItem, WIDATA *Data)
 void ResetDataItem(WIDATAITEM *Item, const char *name)

 {

 	char str[] = "ID Search - Station Name";

-	Item->Name = mir_alloc(sizeof(str));

+	Item->Name = ( char* )mir_alloc(sizeof(str));

 	strcpy(Item->Name, str);

 	Item->Start = "";

 	Item->End = "";

@@ -477,7 +477,7 @@ void LoadStationData(char *pszFile, char *pszShortFile, WIDATA *Data)
 						char *nm = Data->UpdateDataTail->Item.Name;

 						size_t len = strlen(nm) + 1;

 

-						Data->UpdateDataTail->Item.Name = nm = mir_realloc(nm, len + 3);

+						Data->UpdateDataTail->Item.Name = nm = ( char* )mir_realloc(nm, len + 3);

 						memmove(nm + 1, nm, len);

 						*nm = '#';

 					}

diff --git a/protocols/weather/weather_mwin.c b/protocols/weather/weather_mwin.cpp
index 0f534fdf19..8f40fde594 100644
--- a/protocols/weather/weather_mwin.c
+++ b/protocols/weather/weather_mwin.cpp
@@ -229,7 +229,7 @@ static LRESULT CALLBACK wndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
 

 				{

 					HFONT hfnt = CreateFontIndirect(&lfnt1);

-					HFONT hfntold = SelectObject(hdc, hfnt);

+					HFONT hfntold = ( HFONT )SelectObject(hdc, hfnt);

 					SIZE fontSize;

 

 					char *nick = (char*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)data->hContact, 0);

@@ -251,7 +251,7 @@ static LRESULT CALLBACK wndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
 				if (dbv.pszVal) 

 				{

 					HFONT hfnt = CreateFontIndirect(&lfnt);

-					HFONT hfntold = SelectObject(hdc, hfnt);

+					HFONT hfntold = ( HFONT )SelectObject(hdc, hfnt);

 

 					SetTextColor(hdc, fntc);

 					DrawText(hdc, dbv.pszVal, -1, &rc, DT_LEFT | DT_EXPANDTABS);

diff --git a/protocols/weather/weather_opt.c b/protocols/weather/weather_opt.cpp
index 59419edf1b..59419edf1b 100644
--- a/protocols/weather/weather_opt.c
+++ b/protocols/weather/weather_opt.cpp
diff --git a/protocols/weather/weather_popup.c b/protocols/weather/weather_popup.cpp
index 270f989c73..270f989c73 100644
--- a/protocols/weather/weather_popup.c
+++ b/protocols/weather/weather_popup.cpp
diff --git a/protocols/weather/weather_svcs.c b/protocols/weather/weather_svcs.cpp
index 89c58c2d6e..89c58c2d6e 100644
--- a/protocols/weather/weather_svcs.c
+++ b/protocols/weather/weather_svcs.cpp
diff --git a/protocols/weather/weather_update.c b/protocols/weather/weather_update.cpp
index 9b81b023f5..9b81b023f5 100644
--- a/protocols/weather/weather_update.c
+++ b/protocols/weather/weather_update.cpp
diff --git a/protocols/weather/weather_userinfo.c b/protocols/weather/weather_userinfo.cpp
index 2addea14da..f608978c12 100644
--- a/protocols/weather/weather_userinfo.c
+++ b/protocols/weather/weather_userinfo.cpp
@@ -324,7 +324,7 @@ INT_PTR CALLBACK DlgProcMoreData(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 				{

 				case WM_LBUTTONUP:

 					tr.chrg = enlink->chrg;

-					tr.lpstrText = mir_alloc(tr.chrg.cpMax - tr.chrg.cpMin + 8);

+					tr.lpstrText = ( LPSTR )mir_alloc(tr.chrg.cpMax - tr.chrg.cpMin + 8);

 					SendMessage(pNmhdr->hwndFrom, EM_GETTEXTRANGE, 0, (LPARAM)&tr);

 					CallService(MS_UTILS_OPENURL, 1, (LPARAM) tr.lpstrText);

 					mir_free(tr.lpstrText);