From d90a9d04b3b6e2beaa31b311fd38b886a46bab72 Mon Sep 17 00:00:00 2001
From: Kirill Volinsky <mataes2007@gmail.com>
Date: Mon, 18 Mar 2013 07:50:51 +0000
Subject: own country list removed at all

git-svn-id: http://svn.miranda-ng.org/main/trunk@4084 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/UserInfoEx/UInfoEx_10.vcxproj              |  4 --
 plugins/UserInfoEx/UInfoEx_10.vcxproj.filters      |  6 ---
 plugins/UserInfoEx/UInfoEx_11.vcxproj              |  4 --
 plugins/UserInfoEx/UInfoEx_11.vcxproj.filters      |  6 ---
 .../UserInfoEx/src/Flags/svc_countrylistext.cpp    | 56 ----------------------
 plugins/UserInfoEx/src/Flags/svc_countrylistext.h  | 31 ------------
 plugins/UserInfoEx/src/Flags/svc_flags.cpp         |  1 -
 plugins/UserInfoEx/src/commonheaders.h             |  5 +-
 plugins/UserInfoEx/src/svc_contactinfo.cpp         |  3 +-
 9 files changed, 3 insertions(+), 113 deletions(-)
 delete mode 100644 plugins/UserInfoEx/src/Flags/svc_countrylistext.cpp
 delete mode 100644 plugins/UserInfoEx/src/Flags/svc_countrylistext.h

(limited to 'plugins')

diff --git a/plugins/UserInfoEx/UInfoEx_10.vcxproj b/plugins/UserInfoEx/UInfoEx_10.vcxproj
index 88026b4b17..08266f178b 100644
--- a/plugins/UserInfoEx/UInfoEx_10.vcxproj
+++ b/plugins/UserInfoEx/UInfoEx_10.vcxproj
@@ -244,9 +244,6 @@
     <ClCompile Include="src\ex_import\tinyxmlparser.cpp">
       <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
     </ClCompile>
-    <ClCompile Include="src\Flags\svc_countrylistext.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
     <ClCompile Include="src\Flags\svc_flags.cpp">
       <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
     </ClCompile>
@@ -305,7 +302,6 @@
     <ClInclude Include="src\ex_import\svc_ExImXML.h" />
     <ClInclude Include="src\ex_import\tinystr.h" />
     <ClInclude Include="src\ex_import\tinyxml.h" />
-    <ClInclude Include="src\Flags\svc_countrylistext.h" />
     <ClInclude Include="src\Flags\svc_flags.h" />
     <ClInclude Include="src\Flags\svc_flagsicons.h" />
     <ClInclude Include="src\dlg_anniversarylist.h" />
diff --git a/plugins/UserInfoEx/UInfoEx_10.vcxproj.filters b/plugins/UserInfoEx/UInfoEx_10.vcxproj.filters
index 741da74f21..ab87a3a61d 100644
--- a/plugins/UserInfoEx/UInfoEx_10.vcxproj.filters
+++ b/plugins/UserInfoEx/UInfoEx_10.vcxproj.filters
@@ -155,9 +155,6 @@
     <ClCompile Include="src\ex_import\tinyxmlparser.cpp">
       <Filter>Source Files\Services\Ex/Import</Filter>
     </ClCompile>
-    <ClCompile Include="src\Flags\svc_countrylistext.cpp">
-      <Filter>Source Files\Services\flags</Filter>
-    </ClCompile>
     <ClCompile Include="src\Flags\svc_flags.cpp">
       <Filter>Source Files\Services\flags</Filter>
     </ClCompile>
@@ -352,9 +349,6 @@
     <ClInclude Include="src\ex_import\tinyxml.h">
       <Filter>Header Files\Services\Ex/Import</Filter>
     </ClInclude>
-    <ClInclude Include="src\Flags\svc_countrylistext.h">
-      <Filter>Header Files\Services\flags</Filter>
-    </ClInclude>
     <ClInclude Include="src\Flags\svc_flags.h">
       <Filter>Header Files\Services\flags</Filter>
     </ClInclude>
diff --git a/plugins/UserInfoEx/UInfoEx_11.vcxproj b/plugins/UserInfoEx/UInfoEx_11.vcxproj
index 7718ea9b51..3acc27650b 100644
--- a/plugins/UserInfoEx/UInfoEx_11.vcxproj
+++ b/plugins/UserInfoEx/UInfoEx_11.vcxproj
@@ -248,9 +248,6 @@
     <ClCompile Include="src\ex_import\tinyxmlparser.cpp">
       <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
     </ClCompile>
-    <ClCompile Include="src\Flags\svc_countrylistext.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
     <ClCompile Include="src\Flags\svc_flags.cpp">
       <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
     </ClCompile>
@@ -309,7 +306,6 @@
     <ClInclude Include="src\ex_import\svc_ExImXML.h" />
     <ClInclude Include="src\ex_import\tinystr.h" />
     <ClInclude Include="src\ex_import\tinyxml.h" />
-    <ClInclude Include="src\Flags\svc_countrylistext.h" />
     <ClInclude Include="src\Flags\svc_flags.h" />
     <ClInclude Include="src\Flags\svc_flagsicons.h" />
     <ClInclude Include="src\dlg_anniversarylist.h" />
diff --git a/plugins/UserInfoEx/UInfoEx_11.vcxproj.filters b/plugins/UserInfoEx/UInfoEx_11.vcxproj.filters
index 741da74f21..ab87a3a61d 100644
--- a/plugins/UserInfoEx/UInfoEx_11.vcxproj.filters
+++ b/plugins/UserInfoEx/UInfoEx_11.vcxproj.filters
@@ -155,9 +155,6 @@
     <ClCompile Include="src\ex_import\tinyxmlparser.cpp">
       <Filter>Source Files\Services\Ex/Import</Filter>
     </ClCompile>
-    <ClCompile Include="src\Flags\svc_countrylistext.cpp">
-      <Filter>Source Files\Services\flags</Filter>
-    </ClCompile>
     <ClCompile Include="src\Flags\svc_flags.cpp">
       <Filter>Source Files\Services\flags</Filter>
     </ClCompile>
@@ -352,9 +349,6 @@
     <ClInclude Include="src\ex_import\tinyxml.h">
       <Filter>Header Files\Services\Ex/Import</Filter>
     </ClInclude>
-    <ClInclude Include="src\Flags\svc_countrylistext.h">
-      <Filter>Header Files\Services\flags</Filter>
-    </ClInclude>
     <ClInclude Include="src\Flags\svc_flags.h">
       <Filter>Header Files\Services\flags</Filter>
     </ClInclude>
diff --git a/plugins/UserInfoEx/src/Flags/svc_countrylistext.cpp b/plugins/UserInfoEx/src/Flags/svc_countrylistext.cpp
deleted file mode 100644
index 9f0819419a..0000000000
--- a/plugins/UserInfoEx/src/Flags/svc_countrylistext.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-UserinfoEx plugin for Miranda IM
-
-Copyright:
-© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
-
-part of this code based on:
-Miranda IM Country Flags Plugin Copyright ©2006-2007 H. Herkenrath
-
-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; either version 2
-of the License, or (at your option) any later version.
-
-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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-#include "..\commonheaders.h"
-
-/************************* Services *******************************/
-
-INT_PTR ServiceGetCountryByNumber(WPARAM wParam,LPARAM lParam)
-{
-	int i;
-	UNREFERENCED_PARAMETER(lParam);
-	for(i=0; i<SIZEOF(countries); ++i)
-		if ((int)wParam==countries[i].id)
-			return (INT_PTR)countries[i].szName;
-	return NULL;
-}
-
-INT_PTR ServiceGetCountryList(WPARAM wParam,LPARAM lParam)
-{
-	if ((int*)wParam==NULL || (void*)lParam==NULL) return 1;
-	*(int*)wParam=SIZEOF(countries);
-	*(struct CountryListEntry**)lParam=countries;
-	return 0;
-}
-
-/************************* Misc ***********************************/
-
-VOID InitCountryListExt()
-{
-	/* hack to replace built-in country list */
-	if (!myDestroyServiceFunction(MS_UTILS_GETCOUNTRYLIST))
-		CreateServiceFunction(MS_UTILS_GETCOUNTRYLIST,ServiceGetCountryList);
-	if (!myDestroyServiceFunction(MS_UTILS_GETCOUNTRYBYNUMBER))
-		CreateServiceFunction(MS_UTILS_GETCOUNTRYBYNUMBER,ServiceGetCountryByNumber);
-}
diff --git a/plugins/UserInfoEx/src/Flags/svc_countrylistext.h b/plugins/UserInfoEx/src/Flags/svc_countrylistext.h
deleted file mode 100644
index 5a93b836f9..0000000000
--- a/plugins/UserInfoEx/src/Flags/svc_countrylistext.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-UserinfoEx plugin for Miranda IM
-
-Copyright:
-© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
-
-part of this code based on:
-Miranda IM Country Flags Plugin Copyright ©2006-2007 H. Herkenrath
-
-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; either version 2
-of the License, or (at your option) any later version.
-
-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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-#ifndef  _UINFOEX_COUNTRYLIST_H_INCLUDED_
-#define  _UINFOEX_COUNTRYLIST_H_INCLUDED_
-
-VOID		InitCountryListExt();
-INT_PTR		ServiceGetCountryByNumber(WPARAM wParam,LPARAM lParam);
-
-#endif /* _UINFOEX_COUNTRYLIST_H_INCLUDED_ */
\ No newline at end of file
diff --git a/plugins/UserInfoEx/src/Flags/svc_flags.cpp b/plugins/UserInfoEx/src/Flags/svc_flags.cpp
index 751d6cfbf9..559141a0c0 100644
--- a/plugins/UserInfoEx/src/Flags/svc_flags.cpp
+++ b/plugins/UserInfoEx/src/Flags/svc_flags.cpp
@@ -538,7 +538,6 @@ static int OnContactSettingChanged(WPARAM wParam,LPARAM lParam) {
 void SvcFlagsLoadModule()
 {
 	PrepareBufferedFunctions();
-	InitCountryListExt();	/* hack to replace core country list */
 	if(CallService(MS_UTILS_GETCOUNTRYLIST,(WPARAM)&nCountriesCount,(LPARAM)&countries))
 		nCountriesCount=0;
 	InitIcons();			/* load in iconlib */
diff --git a/plugins/UserInfoEx/src/commonheaders.h b/plugins/UserInfoEx/src/commonheaders.h
index 3a4316bb35..123d45ebfb 100644
--- a/plugins/UserInfoEx/src/commonheaders.h
+++ b/plugins/UserInfoEx/src/commonheaders.h
@@ -31,7 +31,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 #define _CRT_SECURE_NO_DEPRECATE 1
 #define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES 0
-#define _CRT_SECURE_NO_WARNINGS
+#define _CRT_SECURE_NO_WARNINGS
 
 /***********************************************************************************************************
  * standard windows includes
@@ -43,7 +43,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #include <shlwapi.h>
 #include <Richedit.h>
 #include <dlgs.h>
-#include <assert.h>
+#include <assert.h>
 #include <string>
 
 using namespace std;
@@ -163,7 +163,6 @@ unsigned int hashSettingW_M2(const char * key);		//new Murma2 hash
 #include "ex_import\dlg_ExImOpenSaveFile.h"
 #include "ex_import\svc_ExImINI.h"
 #include "ex_import\svc_ExImVCF.h"
-#include "Flags\svc_countrylistext.h"
 #include "flags\svc_flags.h"
 #include "Flags\svc_flagsicons.h"
 
diff --git a/plugins/UserInfoEx/src/svc_contactinfo.cpp b/plugins/UserInfoEx/src/svc_contactinfo.cpp
index b076f09d22..04dbd4c5ed 100644
--- a/plugins/UserInfoEx/src/svc_contactinfo.cpp
+++ b/plugins/UserInfoEx/src/svc_contactinfo.cpp
@@ -330,8 +330,7 @@ static FORCEINLINE INT_PTR GCICountry(CONTACTINFO *ci, LPCSTR pszSetting)
 				default:			return 1;
 			}
 
-//			LPSTR szCountry = res ? (LPSTR)CallService(MS_UTILS_GETCOUNTRYBYNUMBER, res, 0) : NULL;
-			LPSTR szCountry = res ? (LPSTR)ServiceGetCountryByNumber(res, 0) : NULL;
+			LPSTR szCountry = res ? (LPSTR)CallService(MS_UTILS_GETCOUNTRYBYNUMBER, res, 0) : NULL;
 			if (szCountry) {
 				ci->pszVal = (ci->dwFlag & CNF_UNICODE) 
 							 ? (LPTSTR) mir_a2u(szCountry) 
-- 
cgit v1.2.3