removed not used headers

added version info git-svn-id: http://svn.miranda-ng.org/main/trunk@4079 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
author: Kirill Volinsky <mataes2007@gmail.com> 2013-03-17 16:35:15 +0000
committer: Kirill Volinsky <mataes2007@gmail.com> 2013-03-17 16:35:15 +0000
commit: 6c43253da0dd38a409146f7acb90ae6cc1ef8069 (patch)
tree: 6da7874de2057cde0dd14167153950d03ea6d22f /plugins/UserInfoEx/src
parent: 82ae452fff08430d514f762f49e78fec90f88625 (diff)
64 files changed, 1871 insertions, 2427 deletions
diff --git a/plugins/UserInfoEx/src/Flags/svc_countrylistext.cpp b/plugins/UserInfoEx/src/Flags/svc_countrylistext.cpp
index 68cdd31529..9f0819419a 100644
--- a/plugins/UserInfoEx/src/Flags/svc_countrylistext.cpp
+++ b/plugins/UserInfoEx/src/Flags/svc_countrylistext.cpp
@@ -23,270 +23,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
 #include "..\commonheaders.h"
-#include "svc_countrylistext.h"
 
 /************************* Services *******************************/
 
-static struct CountryListEntry countries[]={
-	{0   ,"Unspecified"},
-	{9999,"Other"},
-	{0xFFFF,"Unknown"},
-	{93  ,"Afghanistan"},
-	{355 ,"Albania"},
-	{213 ,"Algeria"},
-	{376 ,"Andorra"},
-	{244 ,"Angola"},
-	{1264,"Anguilla"},						/* change county code to NANP (from 101) */
-	{1268,"Antigua and Barbuda"},			/* change county code to NANP (from 1021) */
-//	{5902,"Antilles"},						/* removed: it is not a country, it's a group of islands from diffrent countries (all are included in the list)*/
-	{54  ,"Argentina"},
-	{374 ,"Armenia"},
-	{297 ,"Aruba"},
-	{61   ,"Australia"},
-	{6720 ,"Australia, Antarctic Territory"},		/* added country code 672(0)*/
-	{614  ,"Australia, Christmas Island"},			/* rename (from Christmas Island) and change to official county code 61(4) (from 672) */
-	{61891,"Australia, Cocos (Keeling) Islands"},	/* rename and change to official county code 61(891) (from 6102) */
-	{6723 ,"Australia, Norfolk Island"},			/* rename (from Norfolk Island) and change to official county code 672(3) (from 6722) */
-	{43  ,"Austria"},
-	{994 ,"Azerbaijan"},
-	{1242,"Bahamas"},						/* change county code to NANP (from 103) */
-	{973 ,"Bahrain"},
-	{880 ,"Bangladesh"},
-	{1246,"Barbados"},						/* change county code to NANP (from 103) */
-//	{120 ,"Barbuda"},						/* removed: it is not a country and no special island, see Antigua and Barbuda*/
-	{375 ,"Belarus"},
-	{32  ,"Belgium"},
-	{501 ,"Belize"},
-	{229 ,"Benin"},
-	{1441,"Bermuda"},						/* change county code to NANP (from 105) */
-	{975 ,"Bhutan"},
-	{591 ,"Bolivia"},
-	{387 ,"Bosnia and Herzegovina"},
-	{267 ,"Botswana"},
-	{55  ,"Brazil"},
-	{673 ,"Brunei"},
-	{359 ,"Bulgaria"},
-	{226 ,"Burkina Faso"},
-	{257 ,"Burundi"},
-	{855 ,"Cambodia"},
-	{237 ,"Cameroon"},
-	{1002,"Canada"},						/* change county code to NANP (from 107 to virtual 1(002) -> reflect NANP*/
-	{238 ,"Cape Verde Islands"},
-	{1345,"Cayman Islands"},				/* change county code to NANP (from 108) */
-	{236 ,"Central African Republic"},
-	{235 ,"Chad"},
-	{56  ,"Chile, Republic of"},
-	{86  ,"China"},
-//	{6101,"Cocos-Keeling Islands"},			/* removed (double): see Australia, Cocos (Keeling) Islands */
-	{57  ,"Colombia"},
-	{269 ,"Comoros"},						/* change county code (from 2691) */
-	{243 ,"Congo, Democratic Republic of (Zaire)"},
-	{242 ,"Congo, Republic of the"},
-	{682 ,"Cook Islands"},
-	{506 ,"Costa Rica"},
-	{225 ,"Cote d'Ivoire (Ivory Coast)"},
-	{385 ,"Croatia"},
-	{53  ,"Cuba"},
-	{357 ,"Greek, Republic of South Cyprus"},	/* rename coz Turkey, Republic of Northern Cyprus */
-	{420 ,"Czech Republic"},
-	{45  ,"Denmark"},
-	{246 ,"Diego Garcia"},
-	{253 ,"Djibouti"},
-	{1767,"Dominica"},						/* change county code to NANP (from 109) */
-	{1809,"Dominican Republic"},			/* change county code to NANP 809, 829, 849 (from 110) */
-	{593 ,"Ecuador"},
-	{20  ,"Egypt"},
-	{503 ,"El Salvador"},
-	{240 ,"Equatorial Guinea"},
-	{291 ,"Eritrea"},
-	{372 ,"Estonia"},
-	{251 ,"Ethiopia"},
-	{3883,"Europe"},						/* add county code  +388 3 official European Telephony Numbering Space*/
-	{298 ,"Faeroe Islands"},
-	{500 ,"Falkland Islands"},
-	{679 ,"Fiji"},
-	{358 ,"Finland"},
-	{33  ,"France"},
-	{5901,"French Antilles"},
-	{594 ,"French Guiana"},
-	{689 ,"French Polynesia"},
-	{241 ,"Gabon"},
-	{220 ,"Gambia"},
-	{995 ,"Georgia"},
-	{49  ,"Germany"},
-	{233 ,"Ghana"},
-	{350 ,"Gibraltar"},
-	{30  ,"Greece"},
-	{299 ,"Greenland"},
-	{1473,"Grenada"},						/* change county code to NANP (from 111) */
-	{590 ,"Guadeloupe"},
-	{1671,"Guam, US Territory of"},			/* change county code to NANP (from 671) */
-	{502 ,"Guatemala"},
-	{224 ,"Guinea"},
-	{245 ,"Guinea-Bissau"},
-	{592 ,"Guyana"},
-	{509 ,"Haiti"},
-	{504 ,"Honduras"},
-	{852 ,"Hong Kong"},
-	{36  ,"Hungary"},
-	{354 ,"Iceland"},
-	{91  ,"India"},
-	{62  ,"Indonesia"},
-	{98  ,"Iran (Islamic Republic of)"},
-	{964 ,"Iraq"},
-	{353 ,"Ireland"},
-	{972 ,"Israel"},
-	{39  ,"Italy"},
-	{1876,"Jamaica"},						/* change county code to NANP (from 112) */
-	{81  ,"Japan"},
-	{962 ,"Jordan"},
-	{705 ,"Kazakhstan"},
-	{254 ,"Kenya"},
-	{686 ,"Kiribati"},
-	{850 ,"Korea, North"},
-	{82  ,"Korea, South"},
-	{965 ,"Kuwait"},
-	{996 ,"Kyrgyzstan"},					/* change county code (from 706) */
-	{856 ,"Laos"},
-	{371 ,"Latvia"},
-	{961 ,"Lebanon"},
-	{266 ,"Lesotho"},
-	{231 ,"Liberia"},
-	{218 ,"Libyan Arab Jamahiriya"},
-	{423 ,"Liechtenstein"},					/* change county code (from 4101) */
-	{370 ,"Lithuania"},
-	{352 ,"Luxembourg"},
-	{853 ,"Macau"},
-	{389 ,"Macedonia, Republic of"},		/* rename coz war */
-	{261 ,"Madagascar"},
-	{265 ,"Malawi"},
-	{60  ,"Malaysia"},
-	{960 ,"Maldives"},
-	{223 ,"Mali"},
-	{356 ,"Malta"},
-	{692 ,"Marshall Islands"},
-	{596 ,"Martinique"},
-	{222 ,"Mauritania"},
-	{230 ,"Mauritius"},
-	{262 ,"Mayotte Island"},				/* change county code coz bug (from 269) */
-	{52  ,"Mexico"},
-	{691 ,"Micronesia, Federated States of"},
-	{373 ,"Moldova, Republic of"},
-	{377 ,"Monaco"},
-	{976 ,"Mongolia"},
-	{1664,"Montserrat"},					/* change county code to NANP (from 113) */
-	{212 ,"Morocco"},
-	{258 ,"Mozambique"},
-	{95  ,"Myanmar"},
-	{264 ,"Namibia"},
-	{674 ,"Nauru"},
-	{977 ,"Nepal"},
-	{31  ,"Netherlands"},
-	{599  ,"Netherlands Antilles"},			/* dissolved 2010 */
-	{5995 ,"St. Maarten"},					/* add new country in 2010 (from Netherlands Antilles) */
-	{5999 ,"Curacao"},						/* add new country in 2010 (from Netherlands Antilles) */
-	{5997 ,"Netherlands (Bonaire Island)"},	/* add new Part of Netherlands in 2010 (from Netherlands Antilles) */
-	{59946,"Netherlands (Saba Island)"},	/* add new Part of Netherlands in 2010 (from Netherlands Antilles) */
-	{59938,"Netherlands (St. Eustatius Island)"},	/* add new Part of Netherlands in 2010 (from Netherlands Antilles) */
-	//	{114 ,"Nevis"},						/* removed: it is not a country, it's part of Saint Kitts and Nevis*/
-	{687 ,"New Caledonia"},
-	{64  ,"New Zealand"},
-	{505 ,"Nicaragua"},
-	{227 ,"Niger"},
-	{234 ,"Nigeria"},
-	{683 ,"Niue"},
-	{1670,"Northern Mariana Islands, US Territory of"},	/* added NANP */
-	{47  ,"Norway"},
-	{968 ,"Oman"},
-	{92  ,"Pakistan"},
-	{680 ,"Palau"},
-	{507 ,"Panama"},
-	{675 ,"Papua New Guinea"},
-	{595 ,"Paraguay"},
-	{51  ,"Peru"},
-	{63  ,"Philippines"},
-	{48  ,"Poland"},
-	{351 ,"Portugal"},
-	{1939,"Puerto Rico"},				/* change county code to NANP 939, 787 (from 121) */
-	{974 ,"Qatar"},
-	{262 ,"Reunion Island"},
-	{40  ,"Romania"},
-//	{6701,"Rota Island"},				/* removed: it is not a country it is part of Northern Mariana Islands, US Territory of */
-	{7   ,"Russia"},
-	{250 ,"Rwanda"},
-	{1684,"Samoa (USA)"},				/* rename (from American Samoa) change county code to NANP (from 684) */
-	{685 ,"Samoa, Western"},			/* rename (from Western Samoa) */
-	{290 ,"Saint Helena"},				/* UK (St. Helena, Ascension and Tristan da Cunha) */
-	{247 ,"Ascension Island"},			/* UK (St. Helena, Ascension and Tristan da Cunha) */
-	{2897,"Tristan da Cunha"},			/* UK (St. Helena, Ascension and Tristan da Cunha) */
-//	{115 ,"Saint Kitts"},				/* removed: it is not a country it is part of Saint Kitts and Nevis*/
-	{1869,"Saint Kitts and Nevis"},		/* change county code to NANP (from 1141) */
-	{1758,"Saint Lucia"},				/* change county code to NANP (from 122) */
-	{508 ,"Saint Pierre and Miquelon"},
-	{1784,"Saint Vincent and the Grenadines"},	/* change county code to NANP (from 116) */
-//	{670 ,"Saipan Island"},				/* removed: it is not a country it is part of Northern Mariana Islands, US Territory of */
-	{378 ,"San Marino"},
-	{239 ,"Sao Tome and Principe"},
-	{966 ,"Saudi Arabia"},
-	{442 ,"Scotland"},
-	{221 ,"Senegal"},
-	{248 ,"Seychelles"},
-	{232 ,"Sierra Leone"},
-	{65  ,"Singapore"},
-	{421 ,"Slovakia"},
-	{386 ,"Slovenia"},
-	{677 ,"Solomon Islands"},
-	{252 ,"Somalia"},
-	{27  ,"South Africa"},
-	{34  ,"Spain"},
-	{3492,"Spain, Canary Islands"},		/*rename and change county code to 34(92) spain + canary code*/
-	{94  ,"Sri Lanka"},
-	{249 ,"Sudan"},
-	{597 ,"Suriname"},
-	{268 ,"Swaziland"},
-	{46  ,"Sweden"},
-	{41  ,"Switzerland"},
-	{963 ,"Syrian Arab Republic"},
-	{886 ,"Taiwan"},
-	{992 ,"Tajikistan"},				/* change county code (from 708) */
-	{255 ,"Tanzania"},
-	{66  ,"Thailand"},
-//	{6702,"Tinian Island"},				/* removed: it is not a country it is part of Northern Mariana Islands, US Territory of */
-	{670 ,"Timor, East"},				/* added (is part off Northern Mariana Islands but not US Territory*/
-	{228 ,"Togo"},
-	{690 ,"Tokelau"},
-	{676 ,"Tonga"},
-	{1868,"Trinidad and Tobago"},		/* change county code to NANP (from 1141) */
-	{216 ,"Tunisia"},
-	{90   ,"Turkey"},
-	{90392,"Turkey, Republic of Northern Cyprus"},	/* added (is diffrent from Greek part)*/
-	{993 ,"Turkmenistan"},				/* change county code (from 709) */
-	{1649,"Turks and Caicos Islands"},	/* change county code to NANP (from 118) */
-	{688 ,"Tuvalu"},
-	{256 ,"Uganda"},
-	{380 ,"Ukraine"},
-	{971 ,"United Arab Emirates"},
-	{44  ,"United Kingdom"},
-	{598 ,"Uruguay"},
-	{1   ,"USA"},
-	{998 ,"Uzbekistan"},				/* change county code (from 711) */
-	{678 ,"Vanuatu"},
-	{379 ,"Vatican City"},
-	{58  ,"Venezuela"},
-	{84  ,"Vietnam"},
-	{1284,"Virgin Islands (UK)"},		/* change county code to NANP (from 105) - rename coz Virgin Islands (USA) */
-	{1340,"Virgin Islands (USA)"},		/* change county code to NANP (from 123) */
-	{441 ,"Wales"},
-	{681 ,"Wallis and Futuna Islands"},
-	{967 ,"Yemen"},
-	{38  ,"Yugoslavia"},				/* added for old values like birth-country */
-	{381 ,"Serbia, Republic of"},		/* rename need (from Yugoslavia)*/
-	{383 ,"Kosovo, Republic of"},		/*change country code (from 3811),  rename need (from Yugoslavia - Serbia) */
-	{382 ,"Montenegro, Republic of"},	/* rename need (from Yugoslavia - Montenegro) */
-	{260 ,"Zambia"},
-	{263 ,"Zimbabwe"},
-};
-
 INT_PTR ServiceGetCountryByNumber(WPARAM wParam,LPARAM lParam)
 {
 	int i;
diff --git a/plugins/UserInfoEx/src/Flags/svc_flags.cpp b/plugins/UserInfoEx/src/Flags/svc_flags.cpp
index 3319032f2c..751d6cfbf9 100644
--- a/plugins/UserInfoEx/src/Flags/svc_flags.cpp
+++ b/plugins/UserInfoEx/src/Flags/svc_flags.cpp
@@ -23,9 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
 #include "..\commonheaders.h"
-#include "svc_flags.h"
-#include "svc_flagsicons.h"
-#include "svc_countrylistext.h"
 
 #define M_ENABLE_SUBCTLS			(WM_APP+1)
 
diff --git a/plugins/UserInfoEx/src/Flags/svc_flags.h b/plugins/UserInfoEx/src/Flags/svc_flags.h
index f8acacd449..bf4f9a12d6 100644
--- a/plugins/UserInfoEx/src/Flags/svc_flags.h
+++ b/plugins/UserInfoEx/src/Flags/svc_flags.h
@@ -35,8 +35,6 @@ typedef struct _FLAGSOPTIONS
 	BYTE	bShowStatusIconFlag;
 } FLAGSOPTIONS, *LPFLAGSOPTIONS;
 
-extern int nCountriesCount;
-extern struct CountryListEntry *countries;
 extern FLAGSOPTIONS	gFlagsOpts;
 
 class MsgWndData {
diff --git a/plugins/UserInfoEx/src/Flags/svc_flagsicons.cpp b/plugins/UserInfoEx/src/Flags/svc_flagsicons.cpp
index bb9949cee5..3e08ee1232 100644
--- a/plugins/UserInfoEx/src/Flags/svc_flagsicons.cpp
+++ b/plugins/UserInfoEx/src/Flags/svc_flagsicons.cpp
@@ -23,8 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
 #include "..\commonheaders.h"
-#include "svc_flags.h"
-#include "svc_flagsicons.h"
 
 /************************* Bitmap Access **************************/
 
diff --git a/plugins/UserInfoEx/src/classMAnnivDate.cpp b/plugins/UserInfoEx/src/classMAnnivDate.cpp
index b012a1673a..00d580d55f 100644
--- a/plugins/UserInfoEx/src/classMAnnivDate.cpp
+++ b/plugins/UserInfoEx/src/classMAnnivDate.cpp
@@ -23,7 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * System Includes:
  **/
 #include "commonheaders.h"
-#include "svc_Reminder.h"
 
 /**
  * name:	MAnnivDate
diff --git a/plugins/UserInfoEx/src/classMTime.cpp b/plugins/UserInfoEx/src/classMTime.cpp
index 3dbc1f7ff2..27a1f53305 100644
--- a/plugins/UserInfoEx/src/classMTime.cpp
+++ b/plugins/UserInfoEx/src/classMTime.cpp
@@ -23,7 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * System Includes:
  **/
 #include "commonheaders.h"
-#include "svc_Timezone.h"
 
 /******************************************************************************************
  * class MTime
diff --git a/plugins/UserInfoEx/src/classPsTree.cpp b/plugins/UserInfoEx/src/classPsTree.cpp
index d21e7cc19e..17a4b8da78 100644
--- a/plugins/UserInfoEx/src/classPsTree.cpp
+++ b/plugins/UserInfoEx/src/classPsTree.cpp
@@ -20,7 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
 #include "commonheaders.h"
-#include "dlg_propsheet.h"
 
 /***********************************************************************************************************
  * construction and destruction
diff --git a/plugins/UserInfoEx/src/classPsTreeItem.cpp b/plugins/UserInfoEx/src/classPsTreeItem.cpp
index 75581f3fd7..6ed8311520 100644
--- a/plugins/UserInfoEx/src/classPsTreeItem.cpp
+++ b/plugins/UserInfoEx/src/classPsTreeItem.cpp
@@ -20,8 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
 #include "commonheaders.h"
-#include "dlg_propsheet.h"
-#include "m_skin.h"
 
 /**
  * name:	BoldGroupTitlesEnumChildren()
diff --git a/plugins/UserInfoEx/src/commonheaders.h b/plugins/UserInfoEx/src/commonheaders.h
index f43f5b191a..3a4316bb35 100644
--- a/plugins/UserInfoEx/src/commonheaders.h
+++ b/plugins/UserInfoEx/src/commonheaders.h
@@ -31,9 +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
-
-#pragma warning(disable:4995)		// disable warning about strcpy, ... is old in VC2005
-#pragma warning(disable:4996)		// disable warning about strcpy, ... is old in VC2005
+#define _CRT_SECURE_NO_WARNINGS
 
 /***********************************************************************************************************
  * standard windows includes
@@ -41,18 +39,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 #include <windows.h>
 #include <windowsx.h>
-#include <winnt.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <commctrl.h>
 #include <commdlg.h>
-#include <shellapi.h>
-#include <shlobj.h>
 #include <shlwapi.h>
-#include <malloc.h>
-#include <string>
-#include <list>
 #include <Richedit.h>
+#include <dlgs.h>
+#include <assert.h>
+#include <string>
 
 using namespace std;
 
@@ -60,28 +52,17 @@ using namespace std;
  * Miranda NG SDK includes and macros
  ***********************************************************************************************************/
 
-#define MIRANDA_VER 0x0A00
-
-#include <newpluginapi.h>	// This must be included first
-#include <m_stdhdr.h>
+#include <newpluginapi.h>
 #include <m_button.h>
 #include <m_clui.h>
-#include <m_clist.h>
 #include <m_clistint.h>
-#include <m_cluiframes.h>
 #include <m_database.h>
-#include <m_genmenu.h>
 #include <m_hotkeys.h>
 #include <m_langpack.h>
 #include <m_protomod.h>
-#include <m_protosvc.h>
 #include <m_options.h>
-#include <m_contacts.h>
-#include <m_utils.h>
-#include <m_system.h>		// memory interface
-#include <m_system_cpp.h>	// list template
-#include <m_xml.h>			// XML API
-#include <m_timezones.h>	// timezone interface
+#include <m_xml.h>
+#include <m_timezones.h>
 #include <m_imgsrvc.h>
 #include <m_message.h>
 #include <m_userinfo.h>
@@ -90,20 +71,24 @@ using namespace std;
 #include <win2k.h>
 #include <msapi/vsstyle.h>
 #include <msapi/vssym32.h>
+#include <m_skin.h>
+#include <m_extraicons.h>
+#include <m_avatars.h>
+#include <m_contacts.h>
+#include <m_db3xSA.h>
+#include <m_icolib.h>
+#include <m_popup.h>
 
 /***********************************************************************************************************
  * Used Plugins SDK includes and macros
  ***********************************************************************************************************/
 
-#include <m_popup.h>
-#include "m_popup2.h"
-#include "m_flags.h"
-#include "m_metacontacts.h"
-#include "m_magneticwindows.h"
-#include "m_toptoolbar.h"
-#include "m_userinfoex.h"
-
-#include <m_extraicons.h>	//change this to match extraicons header location
+#include <m_popup2.h>
+#include <m_flags.h>
+#include <m_metacontacts.h>
+#include <m_magneticwindows.h>
+#include <m_toptoolbar.h>
+#include <m_userinfoex.h>
 
 /***********************************************************************************************************
  * UserInfoEx plugin includes and macros
@@ -128,19 +113,59 @@ using namespace std;
 #define GetUserData(p)		GetWindowLongPtr((p), GWLP_USERDATA)
 #define SetUserData(p, l)	SetWindowLongPtr((p), GWLP_USERDATA, (LONG_PTR) (l))
 
+unsigned int hashSetting_M2(const wchar_t * key);	//new Murma2 hash
+unsigned int hashSetting_M2(const char * key);		//new Murma2 hash
+unsigned int hashSettingW_M2(const char * key);		//new Murma2 hash
+
 #include "resource.h"
+#include "version.h"
 #include "../IconPacks/default/src/icons.h"
 #include "../IconPacks/ice/src/icons.h"
-
 #include "svc_constants.h"
-
+#include "svc_avatar.h"
+#include "svc_contactinfo.h"
+#include "svc_email.h"
+#include "svc_gender.h"
+#include "svc_homepage.h"
+#include "svc_phone.h"
+#include "svc_refreshci.h"
+#include "svc_reminder.h"
+#include "svc_timezone.h"
+#include "svc_timezone_old.h"
 #include "mir_contactqueue.h"
 #include "mir_db.h"
 #include "mir_string.h"
 #include "mir_icolib.h"
-#include "dlg_msgbox.h"
+#include "mir_menuitems.h"
 #include "classMTime.h"
 #include "classMAnnivDate.h"
+#include "ctrl_base.h"
+#include "ctrl_button.h"
+#include "ctrl_contact.h"
+#include "ctrl_annivedit.h"
+#include "ctrl_combo.h"
+#include "ctrl_edit.h"
+#include "ctrl_tzcombo.h"
+#include "dlg_msgbox.h"
+#include "dlg_propsheet.h"
+#include "dlg_anniversarylist.h"
+#include "psp_base.h"
+#include "psp_options.h"
+#include "ex_import\svc_ExImport.h"
+#include "ex_import\tinystr.h"
+#include "ex_import\tinyxml.h"
+#include "ex_import\mir_rfcCodecs.h"
+#include "ex_import\classExImContactBase.h"
+#include "ex_import\dlg_ExImProgress.h"
+#include "ex_import\svc_ExImXML.h"
+#include "ex_import\classExImContactXML.h"
+#include "ex_import\dlg_ExImModules.h"
+#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"
 
 /***********************************************************************************************************
  * UserInfoEx global variables
@@ -163,6 +188,8 @@ typedef struct _MGLOBAL
 extern HINSTANCE		ghInst;
 extern MGLOBAL			myGlobals;
 extern FI_INTERFACE* FIP;
+extern int nCountriesCount;
+extern struct CountryListEntry *countries;
 
 /***********************************************************************************************************
  * MIRANDA_CPP_PLUGIN_API
@@ -197,10 +224,6 @@ extern FI_INTERFACE* FIP;
 
 DWORD	hashSetting(LPCSTR szStr);					//old miranda hash
 
-unsigned int hashSetting_M2(const wchar_t * key);	//new Murma2 hash
-unsigned int hashSetting_M2(const char * key);		//new Murma2 hash
-unsigned int hashSettingW_M2(const char * key);		//new Murma2 hash
-
 INT_PTR	myDestroyServiceFunction(const char * key);
 
 static FORCEINLINE BOOL IsProtoOnline(LPSTR pszProto)
diff --git a/plugins/UserInfoEx/src/ctrl_annivedit.cpp b/plugins/UserInfoEx/src/ctrl_annivedit.cpp
index 49079eed48..2787757363 100644
--- a/plugins/UserInfoEx/src/ctrl_annivedit.cpp
+++ b/plugins/UserInfoEx/src/ctrl_annivedit.cpp
@@ -20,9 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
 #include "commonheaders.h"
-#include "ctrl_annivedit.h"
-#include "svc_Reminder.h"
-#include "psp_base.h"
 
 CBaseCtrl* CAnnivEditCtrl::CreateObj(HWND hDlg, WORD idCtrl, LPCSTR pszSetting)
 {
diff --git a/plugins/UserInfoEx/src/ctrl_annivedit.h b/plugins/UserInfoEx/src/ctrl_annivedit.h
index 08a5c5bce5..b01278ef2c 100644
--- a/plugins/UserInfoEx/src/ctrl_annivedit.h
+++ b/plugins/UserInfoEx/src/ctrl_annivedit.h
@@ -22,8 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #ifndef _UINFOEX_CTRLANNIVEDIT_H_
 #define _UINFOEX_CTRLANNIVEDIT_H_
 
-#include "ctrl_base.h"
-
 #define MAX_DESC	50
 
 class CAnnivEditCtrl : public CBaseCtrl
diff --git a/plugins/UserInfoEx/src/ctrl_base.cpp b/plugins/UserInfoEx/src/ctrl_base.cpp
index b267808490..e6a9a9347b 100644
--- a/plugins/UserInfoEx/src/ctrl_base.cpp
+++ b/plugins/UserInfoEx/src/ctrl_base.cpp
@@ -20,7 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
 #include "commonheaders.h"
-#include "ctrl_base.h"
 
 /***********************************************************************************************************
  * Old methods for setting text color of dialog controls
diff --git a/plugins/UserInfoEx/src/ctrl_combo.cpp b/plugins/UserInfoEx/src/ctrl_combo.cpp
index b59f73e03f..ba9fd4acea 100644
--- a/plugins/UserInfoEx/src/ctrl_combo.cpp
+++ b/plugins/UserInfoEx/src/ctrl_combo.cpp
@@ -20,7 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
 #include "commonheaders.h"
-#include "ctrl_combo.h"
 
 /**
  * This static method creates an object for the CCombo class and returns its pointer.
diff --git a/plugins/UserInfoEx/src/ctrl_combo.h b/plugins/UserInfoEx/src/ctrl_combo.h
index 1d564b262a..3d6accf853 100644
--- a/plugins/UserInfoEx/src/ctrl_combo.h
+++ b/plugins/UserInfoEx/src/ctrl_combo.h
@@ -22,8 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #ifndef _UI_CTRL_COMBO_INCLUDE_
 #define _UI_CTRL_COMBO_INCLUDE_
 
-#include "ctrl_base.h"
-
 /**
  *
  **/
diff --git a/plugins/UserInfoEx/src/ctrl_contact.cpp b/plugins/UserInfoEx/src/ctrl_contact.cpp
index 436453b415..cfac895629 100644
--- a/plugins/UserInfoEx/src/ctrl_contact.cpp
+++ b/plugins/UserInfoEx/src/ctrl_contact.cpp
@@ -20,8 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
 #include "commonheaders.h"
-#include "ctrl_base.h"
-#include "ctrl_contact.h"
 
 #define MAX_CAT			64
 
diff --git a/plugins/UserInfoEx/src/ctrl_edit.cpp b/plugins/UserInfoEx/src/ctrl_edit.cpp
index 377e929f23..7bd5491c1c 100644
--- a/plugins/UserInfoEx/src/ctrl_edit.cpp
+++ b/plugins/UserInfoEx/src/ctrl_edit.cpp
@@ -20,7 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
 #include "commonheaders.h"
-#include "ctrl_edit.h"
 
 /**
  * This function creates a CEditCtrl object. 
diff --git a/plugins/UserInfoEx/src/ctrl_edit.h b/plugins/UserInfoEx/src/ctrl_edit.h
index 8e08ee9406..0e4281d4b7 100644
--- a/plugins/UserInfoEx/src/ctrl_edit.h
+++ b/plugins/UserInfoEx/src/ctrl_edit.h
@@ -22,8 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #ifndef _UI_CTRL_EDIT_INCLUDE_
 #define _UI_CTRL_EDIT_INCLUDE_
 
-#include "ctrl_base.h"
-
 /**
  *
  **/
diff --git a/plugins/UserInfoEx/src/ctrl_tzcombo.cpp b/plugins/UserInfoEx/src/ctrl_tzcombo.cpp
index dadac750f9..5de03e19d5 100644
--- a/plugins/UserInfoEx/src/ctrl_tzcombo.cpp
+++ b/plugins/UserInfoEx/src/ctrl_tzcombo.cpp
@@ -20,9 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
 #include "commonheaders.h"
-#include "svc_timezone.h"
-#include "ctrl_tzcombo.h"
-
 
 static INT_PTR EnumNamesProc(CTimeZone *pTimeZone, INT index, LPARAM lParam)
 {
diff --git a/plugins/UserInfoEx/src/ctrl_tzcombo.h b/plugins/UserInfoEx/src/ctrl_tzcombo.h
index 0ff73203d6..f3c279f681 100644
--- a/plugins/UserInfoEx/src/ctrl_tzcombo.h
+++ b/plugins/UserInfoEx/src/ctrl_tzcombo.h
@@ -22,10 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #ifndef _UI_CTRL_TZ_COMBO_INCLUDE_
 #define _UI_CTRL_TZ_COMBO_INCLUDE_
 
-#include "ctrl_base.h"
-#include "svc_timezone.h"
-#include "svc_timezone_old.h"
-
 /**
  *
  **/
diff --git a/plugins/UserInfoEx/src/dlg_propsheet.cpp b/plugins/UserInfoEx/src/dlg_propsheet.cpp
index 0e964e1775..60ffb52cbb 100644
--- a/plugins/UserInfoEx/src/dlg_propsheet.cpp
+++ b/plugins/UserInfoEx/src/dlg_propsheet.cpp
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #include "commonheaders.h"
 #include "dlg_propsheet.h"
 #include "psp_base.h"
-#include "svc_ExImport.h"
+#include "ex_import\svc_ExImport.h"
 #include "svc_reminder.h"
 
 #define OPTIONPAGE_OLD_SIZE  (offsetof(OPTIONSDIALOGPAGE, hLangpack))
diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp
index 73b0ce92cf..a03ae1b855 100644
--- a/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp
+++ b/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp
@@ -20,9 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
 #include "..\commonheaders.h"
-#include "..\svc_contactinfo.h"
-#include "classExImContactBase.h"
-#include "mir_rfcCodecs.h"
 
 HANDLE CListFindGroup(LPCSTR pszGroup)
 {
diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactBase.h b/plugins/UserInfoEx/src/ex_import/classExImContactBase.h
index 09b456d806..c93f7c838b 100644
--- a/plugins/UserInfoEx/src/ex_import/classExImContactBase.h
+++ b/plugins/UserInfoEx/src/ex_import/classExImContactBase.h
@@ -21,9 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 #pragma once
 
-#include "tinyxml.h"
-#include "..\svc_gender.h"
-
 HANDLE CListFindGroup(LPCSTR pszGroup);
 
 class CExImContactBase {
diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
index e26d636b6c..5b3fea4967 100644
--- a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
+++ b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
@@ -20,9 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
 #include "..\commonheaders.h"
-#include "classExImContactXML.h"
-#include "svc_ExImXML.h"
-#include "mir_rfcCodecs.h"
 
 /***********************************************************************************************************
  * common stuff
diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactXML.h b/plugins/UserInfoEx/src/ex_import/classExImContactXML.h
index 4a5d0ee407..512ab9b08e 100644
--- a/plugins/UserInfoEx/src/ex_import/classExImContactXML.h
+++ b/plugins/UserInfoEx/src/ex_import/classExImContactXML.h
@@ -22,11 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #ifndef _CLASS_EXIM_CONTACT_XML_INCLUDED_
 #define _CLASS_EXIM_CONTACT_XML_INCLUDED_ 1
 
-#include "svc_ExImport.h"
-#include "classExImContactBase.h"
-#include "svc_ExImXML.h"
-#include "dlg_ExImProgress.h"
-
 #define XKEY_MOD		"MOD"
 #define XKEY_SET		"SET"
 #define XKEY_EVT		"evt"
diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp
index b1cc872f42..81c15c9e8a 100644
--- a/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp
+++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp
@@ -20,8 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
 #include "..\commonheaders.h"
-//#include "svc_ExImport.h"
-#include "dlg_ExImModules.h"
 
 /***********************************************************************************************************
  * typedefs
diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.h b/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.h
index b9ea6285c4..5b2ce8b2a7 100644
--- a/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.h
+++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.h
@@ -22,9 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #ifndef _DLG_EXIMMODULES_H_
 #define _DLG_EXIMMODULES_H_
 
-#pragma once
-#include "svc_ExImport.h"
-
 INT DlgExImModules_SelectModulesToExport(lpExImParam ExImContact, DB::CEnumList* pModules, HWND hParent);
 
 #endif /* _DLG_EXIMMODULES_H_ */
diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp
index 90f59753d9..2621e83e9c 100644
--- a/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp
+++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp
@@ -21,11 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 #include "..\commonheaders.h"
 
-#include <dlgs.h>
-
-#include "m_db3xSA.h"
-#include "dlg_ExImOpenSaveFile.h"
-
 #define HKEY_MIRANDA_PLACESBAR	_T("Software\\Miranda NG\\PlacesBar")
 #define HKEY_WINPOL_PLACESBAR	_T("Software\\Microsoft\\Windows\\CurrentVersion\\Policies\\ComDlg32\\PlacesBar")
 
diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp
index f6856b9051..4a73d11182 100644
--- a/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp
+++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp
@@ -20,7 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
 #include "..\commonheaders.h"
-#include "dlg_ExImProgress.h"
 
 /***********************************************************************************************************
  * windows procedure
diff --git a/plugins/UserInfoEx/src/ex_import/mir_rfcCodecs.h b/plugins/UserInfoEx/src/ex_import/mir_rfcCodecs.h
index 72edde8172..17934e4131 100644
--- a/plugins/UserInfoEx/src/ex_import/mir_rfcCodecs.h
+++ b/plugins/UserInfoEx/src/ex_import/mir_rfcCodecs.h
@@ -19,8 +19,6 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include <stdlib.h>
-
 //Not including CRLFs
 //NOTE: For BASE64 and UUENCODE, this actually
 //represents the amount of unencoded characters
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp
index 41eeb485ce..efa977f9e4 100644
--- a/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp
@@ -22,12 +22,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 /**
  * system & local includes:
  **/
-#include "..\commonheaders.h"
-#include "classExImContactBase.h"
-#include "dlg_ExImModules.h"
-#include "svc_ExImport.h"
-#include "svc_ExImINI.h"
 
+#include "..\commonheaders.h"
 
 /***********************************************************************************************************
  * exporting stuff
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp
index 5b8d139d3d..c419a0e34c 100644
--- a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp
@@ -22,12 +22,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 /**
  * system & local includes:
  **/
-#include "../commonheaders.h"
-#include "../svc_reminder.h"
-#include "svc_ExImport.h"
-#include "svc_ExImVCF.h"
 
-#include <m_protosvc.h>
+#include "../commonheaders.h"
 
 #define BLOCKSIZE 260
 
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp
index c074412635..a5f5dcc4e2 100644
--- a/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp
@@ -23,13 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 #define XMLCARD_VERSION	"1.1"
 
-/**
- * system & local includes:
- **/
-#include "dlg_ExImModules.h"
-#include "classExImContactXML.h"
-#include "svc_ExImport.h"
-
 INT_PTR CALLBACK DlgProc_DataHistory(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	switch (msg) 
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImXML.h b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.h
index 7268744378..6fd12366f5 100644
--- a/plugins/UserInfoEx/src/ex_import/svc_ExImXML.h
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.h
@@ -22,10 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #ifndef _SVC_FILEXML_INCLUDED_
 #define _SVC_FILEXML_INCLUDED_ 1
 
-#include "svc_ExImport.h"
-#include "classExImContactBase.h"
-#include "dlg_ExImProgress.h"
-
 #define EXPORT_DATA		1
 #define EXPORT_HISTORY	2
 #define EXPORT_ALL		(EXPORT_DATA|EXPORT_HISTORY)
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp
index 8b5dc46c39..e51bde3e9c 100644
--- a/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp
@@ -20,16 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
 #include "..\commonheaders.h"
-#include "classExImContactBase.h"
-#include "dlg_ExImModules.h"
-#include "dlg_ExImOpenSaveFile.h"
-#include "svc_ExImport.h"
-#include "svc_ExImINI.h"
-#include "svc_ExImVCF.h"
-#include "svc_ExImXML.h"
-
-#include <m_clui.h>
-#include <m_clc.h>
 
 /***********************************************************************************************************
  * internal functions
diff --git a/plugins/UserInfoEx/src/ex_import/tinystr.cpp b/plugins/UserInfoEx/src/ex_import/tinystr.cpp
index 2b57b61b22..dcab417a21 100644
--- a/plugins/UserInfoEx/src/ex_import/tinystr.cpp
+++ b/plugins/UserInfoEx/src/ex_import/tinystr.cpp
@@ -1,137 +1,131 @@
-/*
-www.sourceforge.net/projects/tinyxml
-Original file by Yves Berquin.
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any
-damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any
-purpose, including commercial applications, and to alter it and
-redistribute it freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must
-not claim that you wrote the original software. If you use this
-software in a product, an acknowledgment in the product documentation
-would be appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and
-must not be misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source
-distribution.
-*/
-
-/*
- * THIS FILE WAS ALTERED BY Tyge Lovset, 7. April 2005.
- *
- * - completely rewritten. compact, clean, and fast implementation.
- * - sizeof(TiXmlString) = pointer size (4 bytes on 32-bit systems)
- * - fixed reserve() to work as per specification.
- * - fixed buggy compares operator==(), operator<(), and operator>()
- * - fixed operator+=() to take a const ref argument, following spec.
- * - added "copy" constructor with length, and most compare operators.
- * - added swap(), clear(), size(), capacity(), operator+().
-
-===============================================================================
-
-UserinfoEx plugin for Miranda IM
-
-Copyright:
-� 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
-===============================================================================
- */
-
-#ifndef TIXML_USE_STL
-
-#ifdef USE_MMGR
-#include <assert.h>
-#include <string.h>
-
-#include "mmgr.h"
-#endif
-
-#include "tinystr.h"
-
-// Error value for find primitive
-const TiXmlString::size_type TiXmlString::npos = static_cast< size_type >(-1);
-
-// Null rep.
-TiXmlString::Rep TiXmlString::nullrep_ = { 0, 0, '\0' };
-
-
-void TiXmlString::reserve (size_type cap)
-{
-	if (cap > capacity())
-	{
-		TiXmlString tmp;
-		tmp.init(length(), cap);
-		memcpy(tmp.start(), data(), length());
-		swap(tmp);
-	}
-}
-
-
-TiXmlString& TiXmlString::assign(const char* str, size_type len)
-{
-	size_type cap = capacity();
-	if (len > cap || cap > 3*(len + 8))
-	{
-		TiXmlString tmp;
-		tmp.init(len);
-		memcpy(tmp.start(), str, len);
-		swap(tmp);
-	}
-	else
-	{
-		memmove(start(), str, len);
-		set_size(len);
-	}
-	return *this;
-}
-
-
-TiXmlString& TiXmlString::append(const char* str, size_type len)
-{
-	size_type newsize = length() + len;
-	if (newsize > capacity())
-	{
-		reserve (newsize + capacity());
-	}
-	memmove(finish(), str, len);
-	set_size(newsize);
-	return *this;
-}
-
-
-TiXmlString operator + (const TiXmlString & a, const TiXmlString & b)
-{
-	TiXmlString tmp;
-	tmp.reserve(a.length() + b.length());
-	tmp += a;
-	tmp += b;
-	return tmp;
-}
-
-TiXmlString operator + (const TiXmlString & a, const char* b)
-{
-	TiXmlString tmp;
-	TiXmlString::size_type b_len = static_cast<TiXmlString::size_type>(strlen(b));
-	tmp.reserve(a.length() + b_len);
-	tmp += a;
-	tmp.append(b, b_len);
-	return tmp;
-}
-
-TiXmlString operator + (const char* a, const TiXmlString & b)
-{
-	TiXmlString tmp;
-	TiXmlString::size_type a_len = static_cast<TiXmlString::size_type>(strlen(a));
-	tmp.reserve(a_len + b.length());
-	tmp.append(a, a_len);
-	tmp += b;
-	return tmp;
-}
-
-
-#endif	// TIXML_USE_STL
+/*
+www.sourceforge.net/projects/tinyxml
+Original file by Yves Berquin.
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any
+damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any
+purpose, including commercial applications, and to alter it and
+redistribute it freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must
+not claim that you wrote the original software. If you use this
+software in a product, an acknowledgment in the product documentation
+would be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and
+must not be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+distribution.
+*/
+
+/*
+ * THIS FILE WAS ALTERED BY Tyge Lovset, 7. April 2005.
+ *
+ * - completely rewritten. compact, clean, and fast implementation.
+ * - sizeof(TiXmlString) = pointer size (4 bytes on 32-bit systems)
+ * - fixed reserve() to work as per specification.
+ * - fixed buggy compares operator==(), operator<(), and operator>()
+ * - fixed operator+=() to take a const ref argument, following spec.
+ * - added "copy" constructor with length, and most compare operators.
+ * - added swap(), clear(), size(), capacity(), operator+().
+
+===============================================================================
+
+UserinfoEx plugin for Miranda IM
+
+Copyright:
+� 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+===============================================================================
+ */
+
+#include "..\commonheaders.h"
+
+#ifndef TIXML_USE_STL
+
+
+// Error value for find primitive
+const TiXmlString::size_type TiXmlString::npos = static_cast< size_type >(-1);
+
+// Null rep.
+TiXmlString::Rep TiXmlString::nullrep_ = { 0, 0, '\0' };
+
+
+void TiXmlString::reserve (size_type cap)
+{
+	if (cap > capacity())
+	{
+		TiXmlString tmp;
+		tmp.init(length(), cap);
+		memcpy(tmp.start(), data(), length());
+		swap(tmp);
+	}
+}
+
+
+TiXmlString& TiXmlString::assign(const char* str, size_type len)
+{
+	size_type cap = capacity();
+	if (len > cap || cap > 3*(len + 8))
+	{
+		TiXmlString tmp;
+		tmp.init(len);
+		memcpy(tmp.start(), str, len);
+		swap(tmp);
+	}
+	else
+	{
+		memmove(start(), str, len);
+		set_size(len);
+	}
+	return *this;
+}
+
+
+TiXmlString& TiXmlString::append(const char* str, size_type len)
+{
+	size_type newsize = length() + len;
+	if (newsize > capacity())
+	{
+		reserve (newsize + capacity());
+	}
+	memmove(finish(), str, len);
+	set_size(newsize);
+	return *this;
+}
+
+
+TiXmlString operator + (const TiXmlString & a, const TiXmlString & b)
+{
+	TiXmlString tmp;
+	tmp.reserve(a.length() + b.length());
+	tmp += a;
+	tmp += b;
+	return tmp;
+}
+
+TiXmlString operator + (const TiXmlString & a, const char* b)
+{
+	TiXmlString tmp;
+	TiXmlString::size_type b_len = static_cast<TiXmlString::size_type>(strlen(b));
+	tmp.reserve(a.length() + b_len);
+	tmp += a;
+	tmp.append(b, b_len);
+	return tmp;
+}
+
+TiXmlString operator + (const char* a, const TiXmlString & b)
+{
+	TiXmlString tmp;
+	TiXmlString::size_type a_len = static_cast<TiXmlString::size_type>(strlen(a));
+	tmp.reserve(a_len + b.length());
+	tmp.append(a, a_len);
+	tmp += b;
+	return tmp;
+}
+
+
+#endif	// TIXML_USE_STL
diff --git a/plugins/UserInfoEx/src/ex_import/tinystr.h b/plugins/UserInfoEx/src/ex_import/tinystr.h
index ca2c63b1ce..bc854c8ac5 100644
--- a/plugins/UserInfoEx/src/ex_import/tinystr.h
+++ b/plugins/UserInfoEx/src/ex_import/tinystr.h
@@ -47,25 +47,8 @@ Copyright:
 #ifndef TIXML_STRING_INCLUDED
 #define TIXML_STRING_INCLUDED
 
-#ifndef USE_MMGR
-#include <assert.h>
-#include <string.h>
-#endif
-
-/*	The support for explicit isn't that universal, and it isn't really
-	required - it is used to check that the TiXmlString class isn't incorrectly
-	used. Be nice to old compilers and macro it here:
-*/
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-	// Microsoft visual studio, version 6 and higher.
-	#define TIXML_EXPLICIT explicit
-#elif defined(__GNUC__) && (__GNUC__ >= 3)
-	// GCC version 3 and higher.s
-	#define TIXML_EXPLICIT explicit
-#else
-	#define TIXML_EXPLICIT
-#endif
 
+#define TIXML_EXPLICIT explicit
 
 /*
 	 TiXmlString is an emulation of a subset of the std::string template.
diff --git a/plugins/UserInfoEx/src/ex_import/tinyxml.cpp b/plugins/UserInfoEx/src/ex_import/tinyxml.cpp
index 540969c4cb..b9d491b53e 100644
--- a/plugins/UserInfoEx/src/ex_import/tinyxml.cpp
+++ b/plugins/UserInfoEx/src/ex_import/tinyxml.cpp
@@ -29,25 +29,8 @@ Copyright:
 � 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
 ===============================================================================
  */
-#include "tinyxml.h"
-
-#include <ctype.h>
-
-#ifdef TIXML_USE_STL
-#include <sstream>
-#include <iostream>
-#endif
-
-#ifdef USE_MMGR
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
-#include "mmgr.h"
-#endif
 
+#include "..\commonheaders.h"
 
 bool TiXmlBase::condenseWhiteSpace = true;
 
diff --git a/plugins/UserInfoEx/src/ex_import/tinyxml.h b/plugins/UserInfoEx/src/ex_import/tinyxml.h
index eaea98d65c..98d1784dac 100644
--- a/plugins/UserInfoEx/src/ex_import/tinyxml.h
+++ b/plugins/UserInfoEx/src/ex_import/tinyxml.h
@@ -34,22 +34,6 @@ Copyright:
 #ifndef TINYXML_INCLUDED
 #define TINYXML_INCLUDED
 
-#define _CRT_SECURE_NO_WARNINGS
-
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4530)
-#pragma warning(disable : 4786)
-#endif
-
-#ifndef USE_MMGR
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#endif
-
 // Help out windows:
 #if defined(_DEBUG) && !defined(DEBUG)
 #define DEBUG
@@ -70,7 +54,6 @@ Copyright:
 	#define TIXML_OSTREAM	std::ostream
 	#define TIXML_ENDL		std::endl
 #else
-	#include "tinystr.h"
 	#define TIXML_STRING	TiXmlString
 	#define TIXML_OSTREAM	TiXmlOutStream
 	#define TIXML_ENDL		"\n"
@@ -1585,9 +1568,5 @@ private:
 	TiXmlNode* node;
 };
 
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
 #endif
 
diff --git a/plugins/UserInfoEx/src/ex_import/tinyxmlerror.cpp b/plugins/UserInfoEx/src/ex_import/tinyxmlerror.cpp
index a9eeb8035c..f227011d67 100644
--- a/plugins/UserInfoEx/src/ex_import/tinyxmlerror.cpp
+++ b/plugins/UserInfoEx/src/ex_import/tinyxmlerror.cpp
@@ -1,70 +1,61 @@
-/*
-www.sourceforge.net/projects/tinyxml
-Original code (2.0 and earlier)copyright (c) 2000-2002 Lee Thomason (www.grinninglizard.com)
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any
-damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any
-purpose, including commercial applications, and to alter it and
-redistribute it freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must
-not claim that you wrote the original software. If you use this
-software in a product, an acknowledgment in the product documentation
-would be appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and
-must not be misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source
-distribution.
-
-===============================================================================
-
-UserinfoEx plugin for Miranda IM
-
-Copyright:
-� 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
-===============================================================================
-*/
-
-#ifdef USE_MMGR
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include "mmgr.h"
-#endif
-
-#include "tinyxml.h"
-
-// The goal of the seperate error file is to make the first
-// step towards localization. tinyxml (currently) only supports
-// english error messages, but the could now be translated.
-//
-// It also cleans up the code a bit.
-//
-
-const char* TiXmlBase::errorString[ TIXML_ERROR_STRING_COUNT ] =
-{
-	"No error",
-	"Error",
-	"Failed to open file",
-	"Memory allocation failed.",
-	"Error parsing Element.",
-	"Failed to read Element name",
-	"Error reading Element value.",
-	"Error reading Attributes.",
-	"Error: empty tag.",
-	"Error reading end tag.",
-	"Error parsing Unknown.",
-	"Error parsing Comment.",
-	"Error parsing Declaration.",
-	"Error document empty.",
-	"Error null (0) or unexpected EOF found in input stream.",
-	"Error parsing CDATA.",
-	"Error when TiXmlDocument added to document, because TiXmlDocument can only be at the root.",
-};
+/*
+www.sourceforge.net/projects/tinyxml
+Original code (2.0 and earlier)copyright (c) 2000-2002 Lee Thomason (www.grinninglizard.com)
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any
+damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any
+purpose, including commercial applications, and to alter it and
+redistribute it freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must
+not claim that you wrote the original software. If you use this
+software in a product, an acknowledgment in the product documentation
+would be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and
+must not be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+distribution.
+
+===============================================================================
+
+UserinfoEx plugin for Miranda IM
+
+Copyright:
+� 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+===============================================================================
+*/
+
+#include "..\commonheaders.h"
+
+// The goal of the seperate error file is to make the first
+// step towards localization. tinyxml (currently) only supports
+// english error messages, but the could now be translated.
+//
+// It also cleans up the code a bit.
+//
+
+const char* TiXmlBase::errorString[ TIXML_ERROR_STRING_COUNT ] =
+{
+	"No error",
+	"Error",
+	"Failed to open file",
+	"Memory allocation failed.",
+	"Error parsing Element.",
+	"Failed to read Element name",
+	"Error reading Element value.",
+	"Error reading Attributes.",
+	"Error: empty tag.",
+	"Error reading end tag.",
+	"Error parsing Unknown.",
+	"Error parsing Comment.",
+	"Error parsing Declaration.",
+	"Error document empty.",
+	"Error null (0) or unexpected EOF found in input stream.",
+	"Error parsing CDATA.",
+	"Error when TiXmlDocument added to document, because TiXmlDocument can only be at the root.",
+};
diff --git a/plugins/UserInfoEx/src/ex_import/tinyxmlparser.cpp b/plugins/UserInfoEx/src/ex_import/tinyxmlparser.cpp
index 7b9f4e5626..04203f2f7a 100644
--- a/plugins/UserInfoEx/src/ex_import/tinyxmlparser.cpp
+++ b/plugins/UserInfoEx/src/ex_import/tinyxmlparser.cpp
@@ -1,1607 +1,1587 @@
-/*
-www.sourceforge.net/projects/tinyxml
-Original code (2.0 and earlier)copyright (c) 2000-2002 Lee Thomason (www.grinninglizard.com)
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any
-damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any
-purpose, including commercial applications, and to alter it and
-redistribute it freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must
-not claim that you wrote the original software. If you use this
-software in a product, an acknowledgment in the product documentation
-would be appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and
-must not be misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source
-distribution.
-
-===============================================================================
-
-UserinfoEx plugin for Miranda IM
-
-Copyright:
-� 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
-===============================================================================
-*/
-
-#include <ctype.h>
-#include <stddef.h>
-
-#ifdef USE_MMGR
-#include <string.h>
-#include <assert.h>
-#include <stdio.h>
-#include "mmgr.h"
-#endif
-
-#include "tinyxml.h"
-
-//#define DEBUG_PARSER
-#if defined(DEBUG_PARSER)
-#	if defined(DEBUG) && defined(_MSC_VER)
-#		include <windows.h>
-#		define TIXML_LOG OutputDebugString
-#	else
-#		define TIXML_LOG printf
-#	endif
-#endif
-
-// Note tha "PutString" hardcodes the same list. This
-// is less flexible than it appears. Changing the entries
-// or order will break putstring.	
-TiXmlBase::Entity TiXmlBase::entity[ NUM_ENTITY ] = 
-{
-	{ "&amp;",	5, '&' },
-	{ "&lt;",	 4, '<' },
-	{ "&gt;",	 4, '>' },
-	{ "&quot;", 6, '\"' },
-	{ "&apos;", 6, '\'' }
-};
-
-// Bunch of unicode info at:
-//		http://www.unicode.org/faq/utf_bom.html
-// Including the basic of this table, which determines the #bytes in the
-// sequence from the lead byte. 1 placed for invalid sequences --
-// although the result will be junk, pass it through as much as possible.
-// Beware of the non-characters in UTF-8:	
-//				ef bb bf (Microsoft "lead bytes")
-//				ef bf be
-//				ef bf bf 
-
-const unsigned char TIXML_UTF_LEAD_0 = 0xefU;
-const unsigned char TIXML_UTF_LEAD_1 = 0xbbU;
-const unsigned char TIXML_UTF_LEAD_2 = 0xbfU;
-
-const int TiXmlBase::utf8ByteTable[256] = 
-{
-	//	0	1	2	3	4	5	6	7	8	9	a	b	c	d	e	f
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x00
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x10
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x20
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x30
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x40
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x50
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x60
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x70	End of ASCII range
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x80 0x80 to 0xc1 invalid
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x90 
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0xa0 
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0xb0 
-		1,	1,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	// 0xc0 0xc2 to 0xdf 2 byte
-		2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	// 0xd0
-		3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	// 0xe0 0xe0 to 0xef 3 byte
-		4,	4,	4,	4,	4,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1	// 0xf0 0xf0 to 0xf4 4 byte, 0xf5 and higher invalid
-};
-
-
-void TiXmlBase::ConvertUTF32ToUTF8(unsigned long input, char* output, int* length)
-{
-	const unsigned long BYTE_MASK = 0xBF;
-	const unsigned long BYTE_MARK = 0x80;
-	const unsigned long FIRST_BYTE_MARK[7] = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC };
-
-	if (input < 0x80) 
-		*length = 1;
-	else if (input < 0x800)
-		*length = 2;
-	else if (input < 0x10000)
-		*length = 3;
-	else if (input < 0x200000)
-		*length = 4;
-	else
-		{ *length = 0; return; }	// This code won't covert this correctly anyway.
-
-	output += *length;
-
-	// Scary scary fall throughs.
-	switch (*length) 
-	{
-		case 4:
-			--output; 
-			*output = (char)((input | BYTE_MARK) & BYTE_MASK); 
-			input >>= 6;
-		case 3:
-			--output; 
-			*output = (char)((input | BYTE_MARK) & BYTE_MASK); 
-			input >>= 6;
-		case 2:
-			--output; 
-			*output = (char)((input | BYTE_MARK) & BYTE_MASK); 
-			input >>= 6;
-		case 1:
-			--output; 
-			*output = (char)(input | FIRST_BYTE_MARK[*length]);
-	}
-}
-
-
-/*static*/ int TiXmlBase::IsAlpha(unsigned char anyByte, TiXmlEncoding /*encoding*/)
-{
-	// This will only work for low-ascii, everything else is assumed to be a valid
-	// letter. I'm not sure this is the best approach, but it is quite tricky trying
-	// to figure out alhabetical vs. not across encoding. So take a very 
-	// conservative approach.
-
-//	if (encoding == TIXML_ENCODING_UTF8)
-//	{
-		if (anyByte < 127)
-			return isalpha(anyByte);
-		else
-			return 1;	// What else to do? The unicode set is huge...get the english ones right.
-//	}
-//	else
-//	{
-//		return isalpha(anyByte);
-//	}
-}
-
-
-/*static*/ int TiXmlBase::IsAlphaNum(unsigned char anyByte, TiXmlEncoding /*encoding*/)
-{
-	// This will only work for low-ascii, everything else is assumed to be a valid
-	// letter. I'm not sure this is the best approach, but it is quite tricky trying
-	// to figure out alhabetical vs. not across encoding. So take a very 
-	// conservative approach.
-
-//	if (encoding == TIXML_ENCODING_UTF8)
-//	{
-		if (anyByte < 127)
-			return isalnum(anyByte);
-		else
-			return 1;	// What else to do? The unicode set is huge...get the english ones right.
-//	}
-//	else
-//	{
-//		return isalnum(anyByte);
-//	}
-}
-
-
-class TiXmlParsingData
-{
-	friend class TiXmlDocument;
-	public:
-	void Stamp(const char* now, TiXmlEncoding encoding);
-
-	const TiXmlCursor& Cursor()	{ return cursor; }
-
-	private:
-	// Only used by the document!
-	TiXmlParsingData(const char* start, int _tabsize, int row, int col)
-	{
-		assert(start);
-		stamp = start;
-		tabsize = _tabsize;
-		cursor.row = row;
-		cursor.col = col;
-	}
-
-	TiXmlCursor		cursor;
-	const char*		stamp;
-	int				tabsize;
-};
-
-
-void TiXmlParsingData::Stamp(const char* now, TiXmlEncoding encoding)
-{
-	assert(now);
-
-	// Do nothing if the tabsize is 0.
-	if (tabsize < 1)
-	{
-		return;
-	}
-
-	// Get the current row, column.
-	int row = cursor.row;
-	int col = cursor.col;
-	const char* p = stamp;
-	assert(p);
-
-	while (p < now)
-	{
-		// Treat p as unsigned, so we have a happy compiler.
-		const unsigned char* pU = (const unsigned char*)p;
-
-		// Code contributed by Fletcher Dunn: (modified by lee)
-		switch (*pU) {
-			case 0:
-				// We *should* never get here, but in case we do, don't
-				// advance past the terminating null character, ever
-				return;
-
-			case '\r':
-				// bump down to the next line
-				++row;
-				col = 0;				
-				// Eat the character
-				++p;
-
-				// Check for \r\n sequence, and treat this as a single character
-				if (*p == '\n') {
-					++p;
-				}
-				break;
-
-			case '\n':
-				// bump down to the next line
-				++row;
-				col = 0;
-
-				// Eat the character
-				++p;
-
-				// Check for \n\r sequence, and treat this as a single
-				// character.	(Yes, this bizarre thing does occur still
-				// on some arcane platforms...)
-				if (*p == '\r') {
-					++p;
-				}
-				break;
-
-			case '\t':
-				// Eat the character
-				++p;
-
-				// Skip to next tab stop
-				col = (col / tabsize + 1) * tabsize;
-				break;
-
-			case TIXML_UTF_LEAD_0:
-				if (encoding == TIXML_ENCODING_UTF8)
-				{
-					if (*(p+1) && *(p+2))
-					{
-						// In these cases, don't advance the column. These are
-						// 0-width spaces.
-						if (*(pU+1)==TIXML_UTF_LEAD_1 && *(pU+2)==TIXML_UTF_LEAD_2)
-							p += 3;	
-						else if (*(pU+1)==0xbfU && *(pU+2)==0xbeU)
-							p += 3;	
-						else if (*(pU+1)==0xbfU && *(pU+2)==0xbfU)
-							p += 3;	
-						else
-							{ p +=3; ++col; }	// A normal character.
-					}
-				}
-				else
-				{
-					++p;
-					++col;
-				}
-				break;
-
-			default:
-				if (encoding == TIXML_ENCODING_UTF8)
-				{
-					// Eat the 1 to 4 byte utf8 character.
-					int step = TiXmlBase::utf8ByteTable[*((unsigned char*)p)];
-					if (step == 0)
-						step = 1;		// Error case from bad encoding, but handle gracefully.
-					p += step;
-
-					// Just advance one column, of course.
-					++col;
-				}
-				else
-				{
-					++p;
-					++col;
-				}
-				break;
-		}
-	}
-	cursor.row = row;
-	cursor.col = col;
-	assert(cursor.row >= -1);
-	assert(cursor.col >= -1);
-	stamp = p;
-	assert(stamp);
-}
-
-
-const char* TiXmlBase::SkipWhiteSpace(const char* p, TiXmlEncoding encoding)
-{
-	if (!p || !*p)
-	{
-		return 0;
-	}
-	if (encoding == TIXML_ENCODING_UTF8)
-	{
-		while (*p)
-		{
-			const unsigned char* pU = (const unsigned char*)p;
-			
-			// Skip the stupid Microsoft UTF-8 Byte order marks
-			if (	*(pU+0)==TIXML_UTF_LEAD_0
-				 && *(pU+1)==TIXML_UTF_LEAD_1 
-				 && *(pU+2)==TIXML_UTF_LEAD_2)
-			{
-				p += 3;
-				continue;
-			}
-			else if (*(pU+0)==TIXML_UTF_LEAD_0
-				 && *(pU+1)==0xbfU
-				 && *(pU+2)==0xbeU)
-			{
-				p += 3;
-				continue;
-			}
-			else if (*(pU+0)==TIXML_UTF_LEAD_0
-				 && *(pU+1)==0xbfU
-				 && *(pU+2)==0xbfU)
-			{
-				p += 3;
-				continue;
-			}
-
-			if (IsWhiteSpace(*p) || *p == '\n' || *p =='\r')		// Still using old rules for white space.
-				++p;
-			else
-				break;
-		}
-	}
-	else
-	{
-		while (*p && IsWhiteSpace(*p) || *p == '\n' || *p =='\r')
-			++p;
-	}
-
-	return p;
-}
-
-#ifdef TIXML_USE_STL
-/*static*/ bool TiXmlBase::StreamWhiteSpace(TIXML_ISTREAM * in, TIXML_STRING * tag)
-{
-	for (;;)
-	{
-		if (!in->good()) return false;
-
-		int c = in->peek();
-		// At this scope, we can't get to a document. So fail silently.
-		if (!IsWhiteSpace(c) || c <= 0)
-			return true;
-
-		*tag += (char) in->get();
-	}
-}
-
-/*static*/ bool TiXmlBase::StreamTo(TIXML_ISTREAM * in, int character, TIXML_STRING * tag)
-{
-	//assert(character > 0 && character < 128);	// else it won't work in utf-8
-	while (in->good())
-	{
-		int c = in->peek();
-		if (c == character)
-			return true;
-		if (c <= 0)		// Silent failure: can't get document at this scope
-			return false;
-
-		in->get();
-		*tag += (char) c;
-	}
-	return false;
-}
-#endif
-
-const char* TiXmlBase::ReadName(const char* p, TIXML_STRING * name, TiXmlEncoding encoding)
-{
-	*name = "";
-	assert(p);
-
-	// Names start with letters or underscores.
-	// Of course, in unicode, tinyxml has no idea what a letter *is*. The
-	// algorithm is generous.
-	//
-	// After that, they can be letters, underscores, numbers,
-	// hyphens, or colons. (Colons are valid ony for namespaces,
-	// but tinyxml can't tell namespaces from names.)
-	if (	 p && *p 
-		 && (IsAlpha((unsigned char) *p, encoding) || *p == '_'))
-	{
-		while (		p && *p
-				&&	(		IsAlphaNum((unsigned char) *p, encoding) 
-						 || *p == '_'
-						 || *p == '-'
-						 || *p == '.'
-						 || *p == ':'))
-		{
-			(*name) += *p;
-			++p;
-		}
-		return p;
-	}
-	return 0;
-}
-
-const char* TiXmlBase::GetEntity(const char* p, char* value, int* length, TiXmlEncoding encoding)
-{
-	// Presume an entity, and pull it out.
-		TIXML_STRING ent;
-	int i;
-	*length = 0;
-
-	if (*(p+1) && *(p+1) == '#' && *(p+2))
-	{
-		unsigned long ucs = 0;
-		ptrdiff_t delta = 0;
-		unsigned mult = 1;
-
-		if (*(p+2) == 'x')
-		{
-			// Hexadecimal.
-			if (!*(p+3)) return 0;
-
-			const char* q = p+3;
-			q = strchr(q, ';');
-
-			if (!q || !*q) return 0;
-
-			delta = q-p;
-			--q;
-
-			while (*q != 'x')
-			{
-				if (*q >= '0' && *q <= '9')
-					ucs += mult * (*q - '0');
-				else if (*q >= 'a' && *q <= 'f')
-					ucs += mult * (*q - 'a' + 10);
-				else if (*q >= 'A' && *q <= 'F')
-					ucs += mult * (*q - 'A' + 10);
-				else 
-					return 0;
-				mult *= 16;
-				--q;
-			}
-		}
-		else
-		{
-			// Decimal.
-			if (!*(p+2)) return 0;
-
-			const char* q = p+2;
-			q = strchr(q, ';');
-
-			if (!q || !*q) return 0;
-
-			delta = q-p;
-			--q;
-
-			while (*q != '#')
-			{
-				if (*q >= '0' && *q <= '9')
-					ucs += mult * (*q - '0');
-				else 
-					return 0;
-				mult *= 10;
-				--q;
-			}
-		}
-		if (encoding == TIXML_ENCODING_UTF8)
-		{
-			// convert the UCS to UTF-8
-			ConvertUTF32ToUTF8(ucs, value, length);
-		}
-		else
-		{
-			*value = (char)ucs;
-			*length = 1;
-		}
-		return p + delta + 1;
-	}
-
-	// Now try to match it.
-	for (i=0; i<NUM_ENTITY; ++i)
-	{
-		if (strncmp(entity[i].str, p, entity[i].strLength) == 0)
-		{
-			assert(strlen(entity[i].str) == entity[i].strLength);
-			*value = entity[i].chr;
-			*length = 1;
-			return (p + entity[i].strLength);
-		}
-	}
-
-	// So it wasn't an entity, its unrecognized, or something like that.
-	*value = *p;	// Don't put back the last one, since we return it!
-	//*length = 1;	// Leave unrecognized entities - this doesn't really work.
-					// Just writes strange XML.
-	return p+1;
-}
-
-
-bool TiXmlBase::StringEqual(const char* p,
-							 const char* tag,
-							 bool ignoreCase,
-							 TiXmlEncoding encoding)
-{
-	assert(p);
-	assert(tag);
-	if (!p || !*p)
-	{
-		assert(0);
-		return false;
-	}
-
-	const char* q = p;
-
-	if (ignoreCase)
-	{
-		while (*q && *tag && ToLower(*q, encoding) == ToLower(*tag, encoding))
-		{
-			++q;
-			++tag;
-		}
-
-		if (*tag == 0)
-			return true;
-	}
-	else
-	{
-		while (*q && *tag && *q == *tag)
-		{
-			++q;
-			++tag;
-		}
-
-		if (*tag == 0)		// Have we found the end of the tag, and everything equal?
-			return true;
-	}
-	return false;
-}
-
-const char* TiXmlBase::ReadText(	const char* p, 
-									TIXML_STRING * text, 
-									bool trimWhiteSpace, 
-									const char* endTag, 
-									bool caseInsensitive,
-									TiXmlEncoding encoding)
-{
-		*text = "";
-	if (	 !trimWhiteSpace			// certain tags always keep whitespace
-		 || !condenseWhiteSpace)	// if true, whitespace is always kept
-	{
-		// Keep all the white space.
-		while (		 p && *p
-				&& !StringEqual(p, endTag, caseInsensitive, encoding)
-			 )
-		{
-			int len;
-			char cArr[4] = { 0, 0, 0, 0 };
-			p = GetChar(p, cArr, &len, encoding);
-			text->append(cArr, len);
-		}
-	}
-	else
-	{
-		bool whitespace = false;
-
-		// Remove leading white space:
-		p = SkipWhiteSpace(p, encoding);
-		while (		 p && *p
-				&& !StringEqual(p, endTag, caseInsensitive, encoding))
-		{
-			if (*p == '\r' || *p == '\n')
-			{
-				whitespace = true;
-				++p;
-			}
-			else if (IsWhiteSpace(*p))
-			{
-				whitespace = true;
-				++p;
-			}
-			else
-			{
-				// If we've found whitespace, add it before the
-				// new character. Any whitespace just becomes a space.
-				if (whitespace)
-				{
-					(*text) += ' ';
-					whitespace = false;
-				}
-				int len;
-				char cArr[4] = { 0, 0, 0, 0 };
-				p = GetChar(p, cArr, &len, encoding);
-				if (len == 1)
-					(*text) += cArr[0];	// more efficient
-				else
-					text->append(cArr, len);
-			}
-		}
-	}
-	return p + strlen(endTag);
-}
-
-#ifdef TIXML_USE_STL
-
-void TiXmlDocument::StreamIn(TIXML_ISTREAM * in, TIXML_STRING * tag)
-{
-	// The basic issue with a document is that we don't know what we're
-	// streaming. Read something presumed to be a tag (and hope), then
-	// identify it, and call the appropriate stream method on the tag.
-	//
-	// This "pre-streaming" will never read the closing ">" so the
-	// sub-tag can orient itself.
-
-	if (!StreamTo(in, '<', tag)) 
-	{
-		SetError(TIXML_ERROR_PARSING_EMPTY, 0, 0, TIXML_ENCODING_UNKNOWN);
-		return;
-	}
-
-	while (in->good())
-	{
-		int tagIndex = (int) tag->length();
-		while (in->good() && in->peek() != '>')
-		{
-			int c = in->get();
-			if (c <= 0)
-			{
-				SetError(TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN);
-				break;
-			}
-			(*tag) += (char) c;
-		}
-
-		if (in->good())
-		{
-			// We now have something we presume to be a node of 
-			// some sort. Identify it, and call the node to
-			// continue streaming.
-			TiXmlNode* node = Identify(tag->c_str() + tagIndex, TIXML_DEFAULT_ENCODING);
-
-			if (node)
-			{
-				node->StreamIn(in, tag);
-				bool isElement = node->ToElement() != 0;
-				delete node;
-				node = 0;
-
-				// If this is the root element, we're done. Parsing will be
-				// done by the >> operator.
-				if (isElement)
-				{
-					return;
-				}
-			}
-			else
-			{
-				SetError(TIXML_ERROR, 0, 0, TIXML_ENCODING_UNKNOWN);
-				return;
-			}
-		}
-	}
-	// We should have returned sooner.
-	SetError(TIXML_ERROR, 0, 0, TIXML_ENCODING_UNKNOWN);
-}
-
-#endif
-
-const char* TiXmlDocument::Parse(const char* p, TiXmlParsingData* prevData, TiXmlEncoding encoding)
-{
-	ClearError();
-
-	// Parse away, at the document level. Since a document
-	// contains nothing but other tags, most of what happens
-	// here is skipping white space.
-	if (!p || !*p)
-	{
-		SetError(TIXML_ERROR_DOCUMENT_EMPTY, 0, 0, TIXML_ENCODING_UNKNOWN);
-		return 0;
-	}
-
-	// Note that, for a document, this needs to come
-	// before the while space skip, so that parsing
-	// starts from the pointer we are given.
-	location.Clear();
-	if (prevData)
-	{
-		location.row = prevData->cursor.row;
-		location.col = prevData->cursor.col;
-	}
-	else
-	{
-		location.row = 0;
-		location.col = 0;
-	}
-	TiXmlParsingData data(p, TabSize(), location.row, location.col);
-	location = data.Cursor();
-
-	if (encoding == TIXML_ENCODING_UNKNOWN)
-	{
-		// Check for the Microsoft UTF-8 lead bytes.
-		const unsigned char* pU = (const unsigned char*)p;
-		if (	*(pU+0) && *(pU+0) == TIXML_UTF_LEAD_0
-			 && *(pU+1) && *(pU+1) == TIXML_UTF_LEAD_1
-			 && *(pU+2) && *(pU+2) == TIXML_UTF_LEAD_2)
-		{
-			encoding = TIXML_ENCODING_UTF8;
-			useMicrosoftBOM = true;
-		}
-	}
-
-		p = SkipWhiteSpace(p, encoding);
-	if (!p)
-	{
-		SetError(TIXML_ERROR_DOCUMENT_EMPTY, 0, 0, TIXML_ENCODING_UNKNOWN);
-		return 0;
-	}
-
-	while (p && *p)
-	{
-		TiXmlNode* node = Identify(p, encoding);
-		if (node)
-		{
-			p = node->Parse(p, &data, encoding);
-			LinkEndChild(node);
-		}
-		else
-		{
-			break;
-		}
-
-		// Did we get encoding info?
-		if (	 encoding == TIXML_ENCODING_UNKNOWN
-			 && node->ToDeclaration())
-		{
-			TiXmlDeclaration* dec = node->ToDeclaration();
-			const char* enc = dec->Encoding();
-			assert(enc);
-
-			if (*enc == 0)
-				encoding = TIXML_ENCODING_UTF8;
-			else if (StringEqual(enc, "UTF-8", true, TIXML_ENCODING_UNKNOWN))
-				encoding = TIXML_ENCODING_UTF8;
-			else if (StringEqual(enc, "UTF8", true, TIXML_ENCODING_UNKNOWN))
-				encoding = TIXML_ENCODING_UTF8;	// incorrect, but be nice
-			else 
-				encoding = TIXML_ENCODING_LEGACY;
-		}
-
-		p = SkipWhiteSpace(p, encoding);
-	}
-
-	// Was this empty?
-	if (!firstChild) {
-		SetError(TIXML_ERROR_DOCUMENT_EMPTY, 0, 0, encoding);
-		return 0;
-	}
-
-	// All is well.
-	return p;
-}
-
-void TiXmlDocument::SetError(int err, const char* pError, TiXmlParsingData* data, TiXmlEncoding encoding)
-{	
-	// The first error in a chain is more accurate - don't set again!
-	if (error)
-		return;
-
-	assert(err > 0 && err < TIXML_ERROR_STRING_COUNT);
-	error	 = true;
-	errorId = err;
-	errorDesc = errorString[ errorId ];
-
-	errorLocation.Clear();
-	if (pError && data)
-	{
-		data->Stamp(pError, encoding);
-		errorLocation = data->Cursor();
-	}
-}
-
-
-TiXmlNode* TiXmlNode::Identify(const char* p, TiXmlEncoding encoding)
-{
-	TiXmlNode* returnNode = 0;
-
-	p = SkipWhiteSpace(p, encoding);
-	if (!p || !*p || *p != '<')
-	{
-		return 0;
-	}
-
-	TiXmlDocument* doc = GetDocument();
-	p = SkipWhiteSpace(p, encoding);
-
-	if (!p || !*p)
-	{
-		return 0;
-	}
-
-	// What is this thing? 
-	// - Elements start with a letter or underscore, but xml is reserved.
-	// - Comments: <!--
-	// - Decleration: <?xml
-	// - Everthing else is unknown to tinyxml.
-	//
-
-	const char* xmlHeader = { "<?xml" };
-	const char* commentHeader = { "<!--" };
-	const char* dtdHeader = { "<!" };
-	const char* cdataHeader = { "<![CDATA[" };
-
-	if (StringEqual(p, xmlHeader, true, encoding))
-	{
-		#ifdef DEBUG_PARSER
-			TIXML_LOG("XML parsing Declaration\n");
-		#endif
-		returnNode = new TiXmlDeclaration();
-	}
-	else if (StringEqual(p, commentHeader, false, encoding))
-	{
-		#ifdef DEBUG_PARSER
-			TIXML_LOG("XML parsing Comment\n");
-		#endif
-		returnNode = new TiXmlComment();
-	}
-	else if (StringEqual(p, cdataHeader, false, encoding))
-	{
-		#ifdef DEBUG_PARSER
-			TIXML_LOG("XML parsing CDATA\n");
-		#endif
-		TiXmlText* text = new TiXmlText("");
-		text->SetCDATA(true);
-		returnNode = text;
-	}
-	else if (StringEqual(p, dtdHeader, false, encoding))
-	{
-		#ifdef DEBUG_PARSER
-			TIXML_LOG("XML parsing Unknown(1)\n");
-		#endif
-		returnNode = new TiXmlUnknown();
-	}
-	else if (	 IsAlpha(*(p+1), encoding)
-				|| *(p+1) == '_')
-	{
-		#ifdef DEBUG_PARSER
-			TIXML_LOG("XML parsing Element\n");
-		#endif
-		returnNode = new TiXmlElement("");
-	}
-	else
-	{
-		#ifdef DEBUG_PARSER
-			TIXML_LOG("XML parsing Unknown(2)\n");
-		#endif
-		returnNode = new TiXmlUnknown();
-	}
-
-	if (returnNode)
-	{
-		// Set the parent, so it can report errors
-		returnNode->parent = this;
-	}
-	else
-	{
-		if (doc)
-			doc->SetError(TIXML_ERROR_OUT_OF_MEMORY, 0, 0, TIXML_ENCODING_UNKNOWN);
-	}
-	return returnNode;
-}
-
-#ifdef TIXML_USE_STL
-
-void TiXmlElement::StreamIn (TIXML_ISTREAM * in, TIXML_STRING * tag)
-{
-	// We're called with some amount of pre-parsing. That is, some of "this"
-	// element is in "tag". Go ahead and stream to the closing ">"
-	while (in->good())
-	{
-		int c = in->get();
-		if (c <= 0)
-		{
-			TiXmlDocument* document = GetDocument();
-			if (document)
-				document->SetError(TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN);
-			return;
-		}
-		(*tag) += (char) c ;
-		
-		if (c == '>')
-			break;
-	}
-
-	if (tag->length() < 3) return;
-
-	// Okay...if we are a "/>" tag, then we're done. We've read a complete tag.
-	// If not, identify and stream.
-
-	if (	 tag->at(tag->length() - 1) == '>' 
-		 && tag->at(tag->length() - 2) == '/')
-	{
-		// All good!
-		return;
-	}
-	else if (tag->at(tag->length() - 1) == '>')
-	{
-		// There is more. Could be:
-		//		text
-		//		closing tag
-		//		another node.
-		for (;;)
-		{
-			StreamWhiteSpace(in, tag);
-
-			// Do we have text?
-			if (in->good() && in->peek() != '<') 
-			{
-				// Yep, text.
-				TiXmlText text("");
-				text.StreamIn(in, tag);
-
-				// What follows text is a closing tag or another node.
-				// Go around again and figure it out.
-				continue;
-			}
-
-			// We now have either a closing tag...or another node.
-			// We should be at a "<", regardless.
-			if (!in->good()) return;
-			assert(in->peek() == '<');
-			int tagIndex = (int) tag->length();
-
-			bool closingTag = false;
-			bool firstCharFound = false;
-
-			for (;;)
-			{
-				if (!in->good())
-					return;
-
-				int c = in->peek();
-				if (c <= 0)
-				{
-					TiXmlDocument* document = GetDocument();
-					if (document)
-						document->SetError(TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN);
-					return;
-				}
-				
-				if (c == '>')
-					break;
-
-				*tag += (char) c;
-				in->get();
-
-				if (!firstCharFound && c != '<' && !IsWhiteSpace(c))
-				{
-					firstCharFound = true;
-					if (c == '/')
-						closingTag = true;
-				}
-			}
-			// If it was a closing tag, then read in the closing '>' to clean up the input stream.
-			// If it was not, the streaming will be done by the tag.
-			if (closingTag)
-			{
-				if (!in->good())
-					return;
-
-				int c = in->get();
-				if (c <= 0)
-				{
-					TiXmlDocument* document = GetDocument();
-					if (document)
-						document->SetError(TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN);
-					return;
-				}
-				assert(c == '>');
-				*tag += (char) c;
-
-				// We are done, once we've found our closing tag.
-				return;
-			}
-			else
-			{
-				// If not a closing tag, id it, and stream.
-				const char* tagloc = tag->c_str() + tagIndex;
-				TiXmlNode* node = Identify(tagloc, TIXML_DEFAULT_ENCODING);
-				if (!node)
-					return;
-				node->StreamIn(in, tag);
-				delete node;
-				node = 0;
-
-				// No return: go around from the beginning: text, closing tag, or node.
-			}
-		}
-	}
-}
-#endif
-
-const char* TiXmlElement::Parse(const char* p, TiXmlParsingData* data, TiXmlEncoding encoding)
-{
-	p = SkipWhiteSpace(p, encoding);
-	TiXmlDocument* document = GetDocument();
-
-	if (!p || !*p)
-	{
-		if (document) document->SetError(TIXML_ERROR_PARSING_ELEMENT, 0, 0, encoding);
-		return 0;
-	}
-
-	if (data)
-	{
-		data->Stamp(p, encoding);
-		location = data->Cursor();
-	}
-
-	if (*p != '<')
-	{
-		if (document) document->SetError(TIXML_ERROR_PARSING_ELEMENT, p, data, encoding);
-		return 0;
-	}
-
-	p = SkipWhiteSpace(p+1, encoding);
-
-	// Read the name.
-	const char* pErr = p;
-
-		p = ReadName(p, &value, encoding);
-	if (!p || !*p)
-	{
-		if (document)	document->SetError(TIXML_ERROR_FAILED_TO_READ_ELEMENT_NAME, pErr, data, encoding);
-		return 0;
-	}
-
-		TIXML_STRING endTag ("</");
-	endTag += value;
-	endTag += ">";
-
-	// Check for and read attributes. Also look for an empty
-	// tag or an end tag.
-	while (p && *p)
-	{
-		pErr = p;
-		p = SkipWhiteSpace(p, encoding);
-		if (!p || !*p)
-		{
-			if (document) document->SetError(TIXML_ERROR_READING_ATTRIBUTES, pErr, data, encoding);
-			return 0;
-		}
-		if (*p == '/')
-		{
-			++p;
-			// Empty tag.
-			if (*p	!= '>')
-			{
-				if (document) document->SetError(TIXML_ERROR_PARSING_EMPTY, p, data, encoding);		
-				return 0;
-			}
-			return (p+1);
-		}
-		else if (*p == '>')
-		{
-			// Done with attributes (if there were any.)
-			// Read the value -- which can include other
-			// elements -- read the end tag, and return.
-			++p;
-			p = ReadValue(p, data, encoding);		// Note this is an Element method, and will set the error if one happens.
-			if (!p || !*p)
-				return 0;
-
-			// We should find the end tag now
-			if (StringEqual(p, endTag.c_str(), false, encoding))
-			{
-				p += endTag.length();
-				return p;
-			}
-			else
-			{
-				if (document) document->SetError(TIXML_ERROR_READING_END_TAG, p, data, encoding);
-				return 0;
-			}
-		}
-		else
-		{
-			// Try to read an attribute:
-			TiXmlAttribute* attrib = new TiXmlAttribute();
-			if (!attrib)
-			{
-				if (document) document->SetError(TIXML_ERROR_OUT_OF_MEMORY, pErr, data, encoding);
-				return 0;
-			}
-
-			attrib->SetDocument(document);
-			const char* pErr = p;
-			p = attrib->Parse(p, data, encoding);
-
-			if (!p || !*p)
-			{
-				if (document) document->SetError(TIXML_ERROR_PARSING_ELEMENT, pErr, data, encoding);
-				delete attrib;
-				return 0;
-			}
-
-			// Handle the strange case of double attributes:
-			TiXmlAttribute* node = attributeSet.Find(attrib->NameTStr());
-			if (node)
-			{
-				node->SetValue(attrib->Value());
-				delete attrib;
-				return 0;
-			}
-
-			attributeSet.Add(attrib);
-		}
-	}
-	return p;
-}
-
-
-const char* TiXmlElement::ReadValue(const char* p, TiXmlParsingData* data, TiXmlEncoding encoding)
-{
-	TiXmlDocument* document = GetDocument();
-
-	// Read in text and elements in any order.
-	const char* pWithWhiteSpace = p;
-	p = SkipWhiteSpace(p, encoding);
-
-	while (p && *p)
-	{
-		if (*p != '<')
-		{
-			// Take what we have, make a text element.
-			TiXmlText* textNode = new TiXmlText("");
-
-			if (!textNode)
-			{
-				if (document) document->SetError(TIXML_ERROR_OUT_OF_MEMORY, 0, 0, encoding);
-						return 0;
-			}
-
-			if (TiXmlBase::IsWhiteSpaceCondensed())
-			{
-				p = textNode->Parse(p, data, encoding);
-			}
-			else
-			{
-				// Special case: we want to keep the white space
-				// so that leading spaces aren't removed.
-				p = textNode->Parse(pWithWhiteSpace, data, encoding);
-			}
-
-			if (!textNode->Blank())
-				LinkEndChild(textNode);
-			else
-				delete textNode;
-		} 
-		else 
-		{
-			// We hit a '<'
-			// Have we hit a new element or an end tag? This could also be
-			// a TiXmlText in the "CDATA" style.
-			if (StringEqual(p, "</", false, encoding))
-			{
-				return p;
-			}
-			else
-			{
-				TiXmlNode* node = Identify(p, encoding);
-				if (node)
-				{
-					p = node->Parse(p, data, encoding);
-					LinkEndChild(node);
-				}				
-				else
-				{
-					return 0;
-				}
-			}
-		}
-		pWithWhiteSpace = p;
-		p = SkipWhiteSpace(p, encoding);
-	}
-
-	if (!p)
-	{
-		if (document) document->SetError(TIXML_ERROR_READING_ELEMENT_VALUE, 0, 0, encoding);
-	}	
-	return p;
-}
-
-
-#ifdef TIXML_USE_STL
-void TiXmlUnknown::StreamIn(TIXML_ISTREAM * in, TIXML_STRING * tag)
-{
-	while (in->good())
-	{
-		int c = in->get();	
-		if (c <= 0)
-		{
-			TiXmlDocument* document = GetDocument();
-			if (document)
-				document->SetError(TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN);
-			return;
-		}
-		(*tag) += (char) c;
-
-		if (c == '>')
-		{
-			// All is well.
-			return;		
-		}
-	}
-}
-#endif
-
-
-const char* TiXmlUnknown::Parse(const char* p, TiXmlParsingData* data, TiXmlEncoding encoding)
-{
-	TiXmlDocument* document = GetDocument();
-	p = SkipWhiteSpace(p, encoding);
-
-	if (data)
-	{
-		data->Stamp(p, encoding);
-		location = data->Cursor();
-	}
-	if (!p || !*p || *p != '<')
-	{
-		if (document) document->SetError(TIXML_ERROR_PARSING_UNKNOWN, p, data, encoding);
-		return 0;
-	}
-	++p;
-		value = "";
-
-	while (p && *p && *p != '>')
-	{
-		value += *p;
-		++p;
-	}
-
-	if (!p)
-	{
-		if (document)	document->SetError(TIXML_ERROR_PARSING_UNKNOWN, 0, 0, encoding);
-	}
-	if (*p == '>')
-		return p+1;
-	return p;
-}
-
-#ifdef TIXML_USE_STL
-void TiXmlComment::StreamIn(TIXML_ISTREAM * in, TIXML_STRING * tag)
-{
-	while (in->good())
-	{
-		int c = in->get();	
-		if (c <= 0)
-		{
-			TiXmlDocument* document = GetDocument();
-			if (document)
-				document->SetError(TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN);
-			return;
-		}
-
-		(*tag) += (char) c;
-
-		if (c == '>' 
-			 && tag->at(tag->length() - 2) == '-'
-			 && tag->at(tag->length() - 3) == '-')
-		{
-			// All is well.
-			return;		
-		}
-	}
-}
-#endif
-
-
-const char* TiXmlComment::Parse(const char* p, TiXmlParsingData* data, TiXmlEncoding encoding)
-{
-	TiXmlDocument* document = GetDocument();
-	value = "";
-
-	p = SkipWhiteSpace(p, encoding);
-
-	if (data)
-	{
-		data->Stamp(p, encoding);
-		location = data->Cursor();
-	}
-	const char* startTag = "<!--";
-	const char* endTag	 = "-->";
-
-	if (!StringEqual(p, startTag, false, encoding))
-	{
-		document->SetError(TIXML_ERROR_PARSING_COMMENT, p, data, encoding);
-		return 0;
-	}
-	p += strlen(startTag);
-	p = ReadText(p, &value, false, endTag, false, encoding);
-	return p;
-}
-
-
-const char* TiXmlAttribute::Parse(const char* p, TiXmlParsingData* data, TiXmlEncoding encoding)
-{
-	p = SkipWhiteSpace(p, encoding);
-	if (!p || !*p) return 0;
-
-//	int tabsize = 4;
-//	if (document)
-//		tabsize = document->TabSize();
-
-	if (data)
-	{
-		data->Stamp(p, encoding);
-		location = data->Cursor();
-	}
-	// Read the name, the '=' and the value.
-	const char* pErr = p;
-	p = ReadName(p, &name, encoding);
-	if (!p || !*p)
-	{
-		if (document) document->SetError(TIXML_ERROR_READING_ATTRIBUTES, pErr, data, encoding);
-		return 0;
-	}
-	p = SkipWhiteSpace(p, encoding);
-	if (!p || !*p || *p != '=')
-	{
-		if (document) document->SetError(TIXML_ERROR_READING_ATTRIBUTES, p, data, encoding);
-		return 0;
-	}
-
-	++p;	// skip '='
-	p = SkipWhiteSpace(p, encoding);
-	if (!p || !*p)
-	{
-		if (document) document->SetError(TIXML_ERROR_READING_ATTRIBUTES, p, data, encoding);
-		return 0;
-	}
-	
-	const char* end;
-	const char SINGLE_QUOTE = '\'';
-	const char DOUBLE_QUOTE = '\"';
-
-	if (*p == SINGLE_QUOTE)
-	{
-		++p;
-		end = "\'";		// single quote in string
-		p = ReadText(p, &value, false, end, false, encoding);
-	}
-	else if (*p == DOUBLE_QUOTE)
-	{
-		++p;
-		end = "\"";		// double quote in string
-		p = ReadText(p, &value, false, end, false, encoding);
-	}
-	else
-	{
-		// All attribute values should be in single or double quotes.
-		// But this is such a common error that the parser will try
-		// its best, even without them.
-		value = "";
-		while (	 p && *p											// existence
-				&& !IsWhiteSpace(*p) && *p != '\n' && *p != '\r'	// whitespace
-				&& *p != '/' && *p != '>')							// tag end
-		{
-			if (*p == SINGLE_QUOTE || *p == DOUBLE_QUOTE) {
-				// [ 1451649 ] Attribute values with trailing quotes not handled correctly
-				// We did not have an opening quote but seem to have a 
-				// closing one. Give up and throw an error.
-				if (document) document->SetError(TIXML_ERROR_READING_ATTRIBUTES, p, data, encoding);
-				return 0;
-			}
-			value += *p;
-			++p;
-		}
-	}
-	return p;
-}
-
-#ifdef TIXML_USE_STL
-void TiXmlText::StreamIn(TIXML_ISTREAM * in, TIXML_STRING * tag)
-{
-	if (cdata)
-	{
-		int c = in->get();	
-		if (c <= 0)
-		{
-			TiXmlDocument* document = GetDocument();
-			if (document)
-				document->SetError(TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN);
-			return;
-		}
-
-		(*tag) += (char) c;
-
-		if (c == '>' 
-			 && tag->at(tag->length() - 2) == ']'
-			 && tag->at(tag->length() - 3) == ']')
-		{
-			// All is well.
-			return;		
-		}
-	}
-	else
-	{
-		while (in->good())
-		{
-			int c = in->peek();	
-			if (c == '<')
-				return;
-			if (c <= 0)
-			{
-				TiXmlDocument* document = GetDocument();
-				if (document)
-					document->SetError(TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN);
-				return;
-			}
-
-			(*tag) += (char) c;
-			in->get();
-		}
-	}
-}
-#endif
-
-const char* TiXmlText::Parse(const char* p, TiXmlParsingData* data, TiXmlEncoding encoding)
-{
-	value = "";
-	TiXmlDocument* document = GetDocument();
-
-	if (data)
-	{
-		data->Stamp(p, encoding);
-		location = data->Cursor();
-	}
-
-	const char* const startTag = "<![CDATA[";
-	const char* const endTag	 = "]]>";
-
-	if (cdata || StringEqual(p, startTag, false, encoding))
-	{
-		cdata = true;
-
-		if (!StringEqual(p, startTag, false, encoding))
-		{
-			document->SetError(TIXML_ERROR_PARSING_CDATA, p, data, encoding);
-			return 0;
-		}
-		p += strlen(startTag);
-
-		// Keep all the white space, ignore the encoding, etc.
-		while (		 p && *p
-				&& !StringEqual(p, endTag, false, encoding)
-			 )
-		{
-			value += *p;
-			++p;
-		}
-
-		TIXML_STRING dummy; 
-		p = ReadText(p, &dummy, false, endTag, false, encoding);
-		return p;
-	}
-	else
-	{
-		bool ignoreWhite = true;
-
-		const char* end = "<";
-		p = ReadText(p, &value, ignoreWhite, end, false, encoding);
-		if (p)
-			return p-1;	// don't truncate the '<'
-		return 0;
-	}
-}
-
-#ifdef TIXML_USE_STL
-void TiXmlDeclaration::StreamIn(TIXML_ISTREAM * in, TIXML_STRING * tag)
-{
-	while (in->good())
-	{
-		int c = in->get();
-		if (c <= 0)
-		{
-			TiXmlDocument* document = GetDocument();
-			if (document)
-				document->SetError(TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN);
-			return;
-		}
-		(*tag) += (char) c;
-
-		if (c == '>')
-		{
-			// All is well.
-			return;
-		}
-	}
-}
-#endif
-
-const char* TiXmlDeclaration::Parse(const char* p, TiXmlParsingData* data, TiXmlEncoding _encoding)
-{
-	p = SkipWhiteSpace(p, _encoding);
-	// Find the beginning, find the end, and look for
-	// the stuff in-between.
-	TiXmlDocument* document = GetDocument();
-	if (!p || !*p || !StringEqual(p, "<?xml", true, _encoding))
-	{
-		if (document) document->SetError(TIXML_ERROR_PARSING_DECLARATION, 0, 0, _encoding);
-		return 0;
-	}
-	if (data)
-	{
-		data->Stamp(p, _encoding);
-		location = data->Cursor();
-	}
-	p += 5;
-
-	version = "";
-	encoding = "";
-	standalone = "";
-
-	while (p && *p)
-	{
-		if (*p == '>')
-		{
-			++p;
-			return p;
-		}
-
-		p = SkipWhiteSpace(p, _encoding);
-		if (StringEqual(p, "version", true, _encoding))
-		{
-			TiXmlAttribute attrib;
-			p = attrib.Parse(p, data, _encoding);		
-			version = attrib.Value();
-		}
-		else if (StringEqual(p, "encoding", true, _encoding))
-		{
-			TiXmlAttribute attrib;
-			p = attrib.Parse(p, data, _encoding);		
-			encoding = attrib.Value();
-		}
-		else if (StringEqual(p, "standalone", true, _encoding))
-		{
-			TiXmlAttribute attrib;
-			p = attrib.Parse(p, data, _encoding);		
-			standalone = attrib.Value();
-		}
-		else
-		{
-			// Read over whatever it is.
-			while (p && *p && *p != '>' && !IsWhiteSpace(*p))
-				++p;
-		}
-	}
-	return 0;
-}
-
-bool TiXmlText::Blank() const
-{
-	for (unsigned i=0; i<value.length(); i++)
-		if (!IsWhiteSpace(value[i]))
-			return false;
-	return true;
-}
-
+/*
+www.sourceforge.net/projects/tinyxml
+Original code (2.0 and earlier)copyright (c) 2000-2002 Lee Thomason (www.grinninglizard.com)
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any
+damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any
+purpose, including commercial applications, and to alter it and
+redistribute it freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must
+not claim that you wrote the original software. If you use this
+software in a product, an acknowledgment in the product documentation
+would be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and
+must not be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+distribution.
+
+===============================================================================
+
+UserinfoEx plugin for Miranda IM
+
+Copyright:
+� 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+===============================================================================
+*/
+
+#include "..\commonheaders.h"
+
+// Note tha "PutString" hardcodes the same list. This
+// is less flexible than it appears. Changing the entries
+// or order will break putstring.	
+TiXmlBase::Entity TiXmlBase::entity[ NUM_ENTITY ] = 
+{
+	{ "&amp;",	5, '&' },
+	{ "&lt;",	 4, '<' },
+	{ "&gt;",	 4, '>' },
+	{ "&quot;", 6, '\"' },
+	{ "&apos;", 6, '\'' }
+};
+
+// Bunch of unicode info at:
+//		http://www.unicode.org/faq/utf_bom.html
+// Including the basic of this table, which determines the #bytes in the
+// sequence from the lead byte. 1 placed for invalid sequences --
+// although the result will be junk, pass it through as much as possible.
+// Beware of the non-characters in UTF-8:	
+//				ef bb bf (Microsoft "lead bytes")
+//				ef bf be
+//				ef bf bf 
+
+const unsigned char TIXML_UTF_LEAD_0 = 0xefU;
+const unsigned char TIXML_UTF_LEAD_1 = 0xbbU;
+const unsigned char TIXML_UTF_LEAD_2 = 0xbfU;
+
+const int TiXmlBase::utf8ByteTable[256] = 
+{
+	//	0	1	2	3	4	5	6	7	8	9	a	b	c	d	e	f
+		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x00
+		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x10
+		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x20
+		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x30
+		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x40
+		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x50
+		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x60
+		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x70	End of ASCII range
+		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x80 0x80 to 0xc1 invalid
+		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x90 
+		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0xa0 
+		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0xb0 
+		1,	1,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	// 0xc0 0xc2 to 0xdf 2 byte
+		2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	// 0xd0
+		3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	// 0xe0 0xe0 to 0xef 3 byte
+		4,	4,	4,	4,	4,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1	// 0xf0 0xf0 to 0xf4 4 byte, 0xf5 and higher invalid
+};
+
+
+void TiXmlBase::ConvertUTF32ToUTF8(unsigned long input, char* output, int* length)
+{
+	const unsigned long BYTE_MASK = 0xBF;
+	const unsigned long BYTE_MARK = 0x80;
+	const unsigned long FIRST_BYTE_MARK[7] = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC };
+
+	if (input < 0x80) 
+		*length = 1;
+	else if (input < 0x800)
+		*length = 2;
+	else if (input < 0x10000)
+		*length = 3;
+	else if (input < 0x200000)
+		*length = 4;
+	else
+		{ *length = 0; return; }	// This code won't covert this correctly anyway.
+
+	output += *length;
+
+	// Scary scary fall throughs.
+	switch (*length) 
+	{
+		case 4:
+			--output; 
+			*output = (char)((input | BYTE_MARK) & BYTE_MASK); 
+			input >>= 6;
+		case 3:
+			--output; 
+			*output = (char)((input | BYTE_MARK) & BYTE_MASK); 
+			input >>= 6;
+		case 2:
+			--output; 
+			*output = (char)((input | BYTE_MARK) & BYTE_MASK); 
+			input >>= 6;
+		case 1:
+			--output; 
+			*output = (char)(input | FIRST_BYTE_MARK[*length]);
+	}
+}
+
+
+/*static*/ int TiXmlBase::IsAlpha(unsigned char anyByte, TiXmlEncoding /*encoding*/)
+{
+	// This will only work for low-ascii, everything else is assumed to be a valid
+	// letter. I'm not sure this is the best approach, but it is quite tricky trying
+	// to figure out alhabetical vs. not across encoding. So take a very 
+	// conservative approach.
+
+//	if (encoding == TIXML_ENCODING_UTF8)
+//	{
+		if (anyByte < 127)
+			return isalpha(anyByte);
+		else
+			return 1;	// What else to do? The unicode set is huge...get the english ones right.
+//	}
+//	else
+//	{
+//		return isalpha(anyByte);
+//	}
+}
+
+
+/*static*/ int TiXmlBase::IsAlphaNum(unsigned char anyByte, TiXmlEncoding /*encoding*/)
+{
+	// This will only work for low-ascii, everything else is assumed to be a valid
+	// letter. I'm not sure this is the best approach, but it is quite tricky trying
+	// to figure out alhabetical vs. not across encoding. So take a very 
+	// conservative approach.
+
+//	if (encoding == TIXML_ENCODING_UTF8)
+//	{
+		if (anyByte < 127)
+			return isalnum(anyByte);
+		else
+			return 1;	// What else to do? The unicode set is huge...get the english ones right.
+//	}
+//	else
+//	{
+//		return isalnum(anyByte);
+//	}
+}
+
+
+class TiXmlParsingData
+{
+	friend class TiXmlDocument;
+	public:
+	void Stamp(const char* now, TiXmlEncoding encoding);
+
+	const TiXmlCursor& Cursor()	{ return cursor; }
+
+	private:
+	// Only used by the document!
+	TiXmlParsingData(const char* start, int _tabsize, int row, int col)
+	{
+		assert(start);
+		stamp = start;
+		tabsize = _tabsize;
+		cursor.row = row;
+		cursor.col = col;
+	}
+
+	TiXmlCursor		cursor;
+	const char*		stamp;
+	int				tabsize;
+};
+
+
+void TiXmlParsingData::Stamp(const char* now, TiXmlEncoding encoding)
+{
+	assert(now);
+
+	// Do nothing if the tabsize is 0.
+	if (tabsize < 1)
+	{
+		return;
+	}
+
+	// Get the current row, column.
+	int row = cursor.row;
+	int col = cursor.col;
+	const char* p = stamp;
+	assert(p);
+
+	while (p < now)
+	{
+		// Treat p as unsigned, so we have a happy compiler.
+		const unsigned char* pU = (const unsigned char*)p;
+
+		// Code contributed by Fletcher Dunn: (modified by lee)
+		switch (*pU) {
+			case 0:
+				// We *should* never get here, but in case we do, don't
+				// advance past the terminating null character, ever
+				return;
+
+			case '\r':
+				// bump down to the next line
+				++row;
+				col = 0;				
+				// Eat the character
+				++p;
+
+				// Check for \r\n sequence, and treat this as a single character
+				if (*p == '\n') {
+					++p;
+				}
+				break;
+
+			case '\n':
+				// bump down to the next line
+				++row;
+				col = 0;
+
+				// Eat the character
+				++p;
+
+				// Check for \n\r sequence, and treat this as a single
+				// character.	(Yes, this bizarre thing does occur still
+				// on some arcane platforms...)
+				if (*p == '\r') {
+					++p;
+				}
+				break;
+
+			case '\t':
+				// Eat the character
+				++p;
+
+				// Skip to next tab stop
+				col = (col / tabsize + 1) * tabsize;
+				break;
+
+			case TIXML_UTF_LEAD_0:
+				if (encoding == TIXML_ENCODING_UTF8)
+				{
+					if (*(p+1) && *(p+2))
+					{
+						// In these cases, don't advance the column. These are
+						// 0-width spaces.
+						if (*(pU+1)==TIXML_UTF_LEAD_1 && *(pU+2)==TIXML_UTF_LEAD_2)
+							p += 3;	
+						else if (*(pU+1)==0xbfU && *(pU+2)==0xbeU)
+							p += 3;	
+						else if (*(pU+1)==0xbfU && *(pU+2)==0xbfU)
+							p += 3;	
+						else
+							{ p +=3; ++col; }	// A normal character.
+					}
+				}
+				else
+				{
+					++p;
+					++col;
+				}
+				break;
+
+			default:
+				if (encoding == TIXML_ENCODING_UTF8)
+				{
+					// Eat the 1 to 4 byte utf8 character.
+					int step = TiXmlBase::utf8ByteTable[*((unsigned char*)p)];
+					if (step == 0)
+						step = 1;		// Error case from bad encoding, but handle gracefully.
+					p += step;
+
+					// Just advance one column, of course.
+					++col;
+				}
+				else
+				{
+					++p;
+					++col;
+				}
+				break;
+		}
+	}
+	cursor.row = row;
+	cursor.col = col;
+	assert(cursor.row >= -1);
+	assert(cursor.col >= -1);
+	stamp = p;
+	assert(stamp);
+}
+
+
+const char* TiXmlBase::SkipWhiteSpace(const char* p, TiXmlEncoding encoding)
+{
+	if (!p || !*p)
+	{
+		return 0;
+	}
+	if (encoding == TIXML_ENCODING_UTF8)
+	{
+		while (*p)
+		{
+			const unsigned char* pU = (const unsigned char*)p;
+			
+			// Skip the stupid Microsoft UTF-8 Byte order marks
+			if (	*(pU+0)==TIXML_UTF_LEAD_0
+				 && *(pU+1)==TIXML_UTF_LEAD_1 
+				 && *(pU+2)==TIXML_UTF_LEAD_2)
+			{
+				p += 3;
+				continue;
+			}
+			else if (*(pU+0)==TIXML_UTF_LEAD_0
+				 && *(pU+1)==0xbfU
+				 && *(pU+2)==0xbeU)
+			{
+				p += 3;
+				continue;
+			}
+			else if (*(pU+0)==TIXML_UTF_LEAD_0
+				 && *(pU+1)==0xbfU
+				 && *(pU+2)==0xbfU)
+			{
+				p += 3;
+				continue;
+			}
+
+			if (IsWhiteSpace(*p) || *p == '\n' || *p =='\r')		// Still using old rules for white space.
+				++p;
+			else
+				break;
+		}
+	}
+	else
+	{
+		while (*p && IsWhiteSpace(*p) || *p == '\n' || *p =='\r')
+			++p;
+	}
+
+	return p;
+}
+
+#ifdef TIXML_USE_STL
+/*static*/ bool TiXmlBase::StreamWhiteSpace(TIXML_ISTREAM * in, TIXML_STRING * tag)
+{
+	for (;;)
+	{
+		if (!in->good()) return false;
+
+		int c = in->peek();
+		// At this scope, we can't get to a document. So fail silently.
+		if (!IsWhiteSpace(c) || c <= 0)
+			return true;
+
+		*tag += (char) in->get();
+	}
+}
+
+/*static*/ bool TiXmlBase::StreamTo(TIXML_ISTREAM * in, int character, TIXML_STRING * tag)
+{
+	//assert(character > 0 && character < 128);	// else it won't work in utf-8
+	while (in->good())
+	{
+		int c = in->peek();
+		if (c == character)
+			return true;
+		if (c <= 0)		// Silent failure: can't get document at this scope
+			return false;
+
+		in->get();
+		*tag += (char) c;
+	}
+	return false;
+}
+#endif
+
+const char* TiXmlBase::ReadName(const char* p, TIXML_STRING * name, TiXmlEncoding encoding)
+{
+	*name = "";
+	assert(p);
+
+	// Names start with letters or underscores.
+	// Of course, in unicode, tinyxml has no idea what a letter *is*. The
+	// algorithm is generous.
+	//
+	// After that, they can be letters, underscores, numbers,
+	// hyphens, or colons. (Colons are valid ony for namespaces,
+	// but tinyxml can't tell namespaces from names.)
+	if (	 p && *p 
+		 && (IsAlpha((unsigned char) *p, encoding) || *p == '_'))
+	{
+		while (		p && *p
+				&&	(		IsAlphaNum((unsigned char) *p, encoding) 
+						 || *p == '_'
+						 || *p == '-'
+						 || *p == '.'
+						 || *p == ':'))
+		{
+			(*name) += *p;
+			++p;
+		}
+		return p;
+	}
+	return 0;
+}
+
+const char* TiXmlBase::GetEntity(const char* p, char* value, int* length, TiXmlEncoding encoding)
+{
+	// Presume an entity, and pull it out.
+		TIXML_STRING ent;
+	int i;
+	*length = 0;
+
+	if (*(p+1) && *(p+1) == '#' && *(p+2))
+	{
+		unsigned long ucs = 0;
+		ptrdiff_t delta = 0;
+		unsigned mult = 1;
+
+		if (*(p+2) == 'x')
+		{
+			// Hexadecimal.
+			if (!*(p+3)) return 0;
+
+			const char* q = p+3;
+			q = strchr(q, ';');
+
+			if (!q || !*q) return 0;
+
+			delta = q-p;
+			--q;
+
+			while (*q != 'x')
+			{
+				if (*q >= '0' && *q <= '9')
+					ucs += mult * (*q - '0');
+				else if (*q >= 'a' && *q <= 'f')
+					ucs += mult * (*q - 'a' + 10);
+				else if (*q >= 'A' && *q <= 'F')
+					ucs += mult * (*q - 'A' + 10);
+				else 
+					return 0;
+				mult *= 16;
+				--q;
+			}
+		}
+		else
+		{
+			// Decimal.
+			if (!*(p+2)) return 0;
+
+			const char* q = p+2;
+			q = strchr(q, ';');
+
+			if (!q || !*q) return 0;
+
+			delta = q-p;
+			--q;
+
+			while (*q != '#')
+			{
+				if (*q >= '0' && *q <= '9')
+					ucs += mult * (*q - '0');
+				else 
+					return 0;
+				mult *= 10;
+				--q;
+			}
+		}
+		if (encoding == TIXML_ENCODING_UTF8)
+		{
+			// convert the UCS to UTF-8
+			ConvertUTF32ToUTF8(ucs, value, length);
+		}
+		else
+		{
+			*value = (char)ucs;
+			*length = 1;
+		}
+		return p + delta + 1;
+	}
+
+	// Now try to match it.
+	for (i=0; i<NUM_ENTITY; ++i)
+	{
+		if (strncmp(entity[i].str, p, entity[i].strLength) == 0)
+		{
+			assert(strlen(entity[i].str) == entity[i].strLength);
+			*value = entity[i].chr;
+			*length = 1;
+			return (p + entity[i].strLength);
+		}
+	}
+
+	// So it wasn't an entity, its unrecognized, or something like that.
+	*value = *p;	// Don't put back the last one, since we return it!
+	//*length = 1;	// Leave unrecognized entities - this doesn't really work.
+					// Just writes strange XML.
+	return p+1;
+}
+
+
+bool TiXmlBase::StringEqual(const char* p,
+							 const char* tag,
+							 bool ignoreCase,
+							 TiXmlEncoding encoding)
+{
+	assert(p);
+	assert(tag);
+	if (!p || !*p)
+	{
+		assert(0);
+		return false;
+	}
+
+	const char* q = p;
+
+	if (ignoreCase)
+	{
+		while (*q && *tag && ToLower(*q, encoding) == ToLower(*tag, encoding))
+		{
+			++q;
+			++tag;
+		}
+
+		if (*tag == 0)
+			return true;
+	}
+	else
+	{
+		while (*q && *tag && *q == *tag)
+		{
+			++q;
+			++tag;
+		}
+
+		if (*tag == 0)		// Have we found the end of the tag, and everything equal?
+			return true;
+	}
+	return false;
+}
+
+const char* TiXmlBase::ReadText(	const char* p, 
+									TIXML_STRING * text, 
+									bool trimWhiteSpace, 
+									const char* endTag, 
+									bool caseInsensitive,
+									TiXmlEncoding encoding)
+{
+		*text = "";
+	if (	 !trimWhiteSpace			// certain tags always keep whitespace
+		 || !condenseWhiteSpace)	// if true, whitespace is always kept
+	{
+		// Keep all the white space.
+		while (		 p && *p
+				&& !StringEqual(p, endTag, caseInsensitive, encoding)
+			 )
+		{
+			int len;
+			char cArr[4] = { 0, 0, 0, 0 };
+			p = GetChar(p, cArr, &len, encoding);
+			text->append(cArr, len);
+		}
+	}
+	else
+	{
+		bool whitespace = false;
+
+		// Remove leading white space:
+		p = SkipWhiteSpace(p, encoding);
+		while (		 p && *p
+				&& !StringEqual(p, endTag, caseInsensitive, encoding))
+		{
+			if (*p == '\r' || *p == '\n')
+			{
+				whitespace = true;
+				++p;
+			}
+			else if (IsWhiteSpace(*p))
+			{
+				whitespace = true;
+				++p;
+			}
+			else
+			{
+				// If we've found whitespace, add it before the
+				// new character. Any whitespace just becomes a space.
+				if (whitespace)
+				{
+					(*text) += ' ';
+					whitespace = false;
+				}
+				int len;
+				char cArr[4] = { 0, 0, 0, 0 };
+				p = GetChar(p, cArr, &len, encoding);
+				if (len == 1)
+					(*text) += cArr[0];	// more efficient
+				else
+					text->append(cArr, len);
+			}
+		}
+	}
+	return p + strlen(endTag);
+}
+
+#ifdef TIXML_USE_STL
+
+void TiXmlDocument::StreamIn(TIXML_ISTREAM * in, TIXML_STRING * tag)
+{
+	// The basic issue with a document is that we don't know what we're
+	// streaming. Read something presumed to be a tag (and hope), then
+	// identify it, and call the appropriate stream method on the tag.
+	//
+	// This "pre-streaming" will never read the closing ">" so the
+	// sub-tag can orient itself.
+
+	if (!StreamTo(in, '<', tag)) 
+	{
+		SetError(TIXML_ERROR_PARSING_EMPTY, 0, 0, TIXML_ENCODING_UNKNOWN);
+		return;
+	}
+
+	while (in->good())
+	{
+		int tagIndex = (int) tag->length();
+		while (in->good() && in->peek() != '>')
+		{
+			int c = in->get();
+			if (c <= 0)
+			{
+				SetError(TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN);
+				break;
+			}
+			(*tag) += (char) c;
+		}
+
+		if (in->good())
+		{
+			// We now have something we presume to be a node of 
+			// some sort. Identify it, and call the node to
+			// continue streaming.
+			TiXmlNode* node = Identify(tag->c_str() + tagIndex, TIXML_DEFAULT_ENCODING);
+
+			if (node)
+			{
+				node->StreamIn(in, tag);
+				bool isElement = node->ToElement() != 0;
+				delete node;
+				node = 0;
+
+				// If this is the root element, we're done. Parsing will be
+				// done by the >> operator.
+				if (isElement)
+				{
+					return;
+				}
+			}
+			else
+			{
+				SetError(TIXML_ERROR, 0, 0, TIXML_ENCODING_UNKNOWN);
+				return;
+			}
+		}
+	}
+	// We should have returned sooner.
+	SetError(TIXML_ERROR, 0, 0, TIXML_ENCODING_UNKNOWN);
+}
+
+#endif
+
+const char* TiXmlDocument::Parse(const char* p, TiXmlParsingData* prevData, TiXmlEncoding encoding)
+{
+	ClearError();
+
+	// Parse away, at the document level. Since a document
+	// contains nothing but other tags, most of what happens
+	// here is skipping white space.
+	if (!p || !*p)
+	{
+		SetError(TIXML_ERROR_DOCUMENT_EMPTY, 0, 0, TIXML_ENCODING_UNKNOWN);
+		return 0;
+	}
+
+	// Note that, for a document, this needs to come
+	// before the while space skip, so that parsing
+	// starts from the pointer we are given.
+	location.Clear();
+	if (prevData)
+	{
+		location.row = prevData->cursor.row;
+		location.col = prevData->cursor.col;
+	}
+	else
+	{
+		location.row = 0;
+		location.col = 0;
+	}
+	TiXmlParsingData data(p, TabSize(), location.row, location.col);
+	location = data.Cursor();
+
+	if (encoding == TIXML_ENCODING_UNKNOWN)
+	{
+		// Check for the Microsoft UTF-8 lead bytes.
+		const unsigned char* pU = (const unsigned char*)p;
+		if (	*(pU+0) && *(pU+0) == TIXML_UTF_LEAD_0
+			 && *(pU+1) && *(pU+1) == TIXML_UTF_LEAD_1
+			 && *(pU+2) && *(pU+2) == TIXML_UTF_LEAD_2)
+		{
+			encoding = TIXML_ENCODING_UTF8;
+			useMicrosoftBOM = true;
+		}
+	}
+
+		p = SkipWhiteSpace(p, encoding);
+	if (!p)
+	{
+		SetError(TIXML_ERROR_DOCUMENT_EMPTY, 0, 0, TIXML_ENCODING_UNKNOWN);
+		return 0;
+	}
+
+	while (p && *p)
+	{
+		TiXmlNode* node = Identify(p, encoding);
+		if (node)
+		{
+			p = node->Parse(p, &data, encoding);
+			LinkEndChild(node);
+		}
+		else
+		{
+			break;
+		}
+
+		// Did we get encoding info?
+		if (	 encoding == TIXML_ENCODING_UNKNOWN
+			 && node->ToDeclaration())
+		{
+			TiXmlDeclaration* dec = node->ToDeclaration();
+			const char* enc = dec->Encoding();
+			assert(enc);
+
+			if (*enc == 0)
+				encoding = TIXML_ENCODING_UTF8;
+			else if (StringEqual(enc, "UTF-8", true, TIXML_ENCODING_UNKNOWN))
+				encoding = TIXML_ENCODING_UTF8;
+			else if (StringEqual(enc, "UTF8", true, TIXML_ENCODING_UNKNOWN))
+				encoding = TIXML_ENCODING_UTF8;	// incorrect, but be nice
+			else 
+				encoding = TIXML_ENCODING_LEGACY;
+		}
+
+		p = SkipWhiteSpace(p, encoding);
+	}
+
+	// Was this empty?
+	if (!firstChild) {
+		SetError(TIXML_ERROR_DOCUMENT_EMPTY, 0, 0, encoding);
+		return 0;
+	}
+
+	// All is well.
+	return p;
+}
+
+void TiXmlDocument::SetError(int err, const char* pError, TiXmlParsingData* data, TiXmlEncoding encoding)
+{	
+	// The first error in a chain is more accurate - don't set again!
+	if (error)
+		return;
+
+	assert(err > 0 && err < TIXML_ERROR_STRING_COUNT);
+	error	 = true;
+	errorId = err;
+	errorDesc = errorString[ errorId ];
+
+	errorLocation.Clear();
+	if (pError && data)
+	{
+		data->Stamp(pError, encoding);
+		errorLocation = data->Cursor();
+	}
+}
+
+
+TiXmlNode* TiXmlNode::Identify(const char* p, TiXmlEncoding encoding)
+{
+	TiXmlNode* returnNode = 0;
+
+	p = SkipWhiteSpace(p, encoding);
+	if (!p || !*p || *p != '<')
+	{
+		return 0;
+	}
+
+	TiXmlDocument* doc = GetDocument();
+	p = SkipWhiteSpace(p, encoding);
+
+	if (!p || !*p)
+	{
+		return 0;
+	}
+
+	// What is this thing? 
+	// - Elements start with a letter or underscore, but xml is reserved.
+	// - Comments: <!--
+	// - Decleration: <?xml
+	// - Everthing else is unknown to tinyxml.
+	//
+
+	const char* xmlHeader = { "<?xml" };
+	const char* commentHeader = { "<!--" };
+	const char* dtdHeader = { "<!" };
+	const char* cdataHeader = { "<![CDATA[" };
+
+	if (StringEqual(p, xmlHeader, true, encoding))
+	{
+		#ifdef DEBUG_PARSER
+			TIXML_LOG("XML parsing Declaration\n");
+		#endif
+		returnNode = new TiXmlDeclaration();
+	}
+	else if (StringEqual(p, commentHeader, false, encoding))
+	{
+		#ifdef DEBUG_PARSER
+			TIXML_LOG("XML parsing Comment\n");
+		#endif
+		returnNode = new TiXmlComment();
+	}
+	else if (StringEqual(p, cdataHeader, false, encoding))
+	{
+		#ifdef DEBUG_PARSER
+			TIXML_LOG("XML parsing CDATA\n");
+		#endif
+		TiXmlText* text = new TiXmlText("");
+		text->SetCDATA(true);
+		returnNode = text;
+	}
+	else if (StringEqual(p, dtdHeader, false, encoding))
+	{
+		#ifdef DEBUG_PARSER
+			TIXML_LOG("XML parsing Unknown(1)\n");
+		#endif
+		returnNode = new TiXmlUnknown();
+	}
+	else if (	 IsAlpha(*(p+1), encoding)
+				|| *(p+1) == '_')
+	{
+		#ifdef DEBUG_PARSER
+			TIXML_LOG("XML parsing Element\n");
+		#endif
+		returnNode = new TiXmlElement("");
+	}
+	else
+	{
+		#ifdef DEBUG_PARSER
+			TIXML_LOG("XML parsing Unknown(2)\n");
+		#endif
+		returnNode = new TiXmlUnknown();
+	}
+
+	if (returnNode)
+	{
+		// Set the parent, so it can report errors
+		returnNode->parent = this;
+	}
+	else
+	{
+		if (doc)
+			doc->SetError(TIXML_ERROR_OUT_OF_MEMORY, 0, 0, TIXML_ENCODING_UNKNOWN);
+	}
+	return returnNode;
+}
+
+#ifdef TIXML_USE_STL
+
+void TiXmlElement::StreamIn (TIXML_ISTREAM * in, TIXML_STRING * tag)
+{
+	// We're called with some amount of pre-parsing. That is, some of "this"
+	// element is in "tag". Go ahead and stream to the closing ">"
+	while (in->good())
+	{
+		int c = in->get();
+		if (c <= 0)
+		{
+			TiXmlDocument* document = GetDocument();
+			if (document)
+				document->SetError(TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN);
+			return;
+		}
+		(*tag) += (char) c ;
+		
+		if (c == '>')
+			break;
+	}
+
+	if (tag->length() < 3) return;
+
+	// Okay...if we are a "/>" tag, then we're done. We've read a complete tag.
+	// If not, identify and stream.
+
+	if (	 tag->at(tag->length() - 1) == '>' 
+		 && tag->at(tag->length() - 2) == '/')
+	{
+		// All good!
+		return;
+	}
+	else if (tag->at(tag->length() - 1) == '>')
+	{
+		// There is more. Could be:
+		//		text
+		//		closing tag
+		//		another node.
+		for (;;)
+		{
+			StreamWhiteSpace(in, tag);
+
+			// Do we have text?
+			if (in->good() && in->peek() != '<') 
+			{
+				// Yep, text.
+				TiXmlText text("");
+				text.StreamIn(in, tag);
+
+				// What follows text is a closing tag or another node.
+				// Go around again and figure it out.
+				continue;
+			}
+
+			// We now have either a closing tag...or another node.
+			// We should be at a "<", regardless.
+			if (!in->good()) return;
+			assert(in->peek() == '<');
+			int tagIndex = (int) tag->length();
+
+			bool closingTag = false;
+			bool firstCharFound = false;
+
+			for (;;)
+			{
+				if (!in->good())
+					return;
+
+				int c = in->peek();
+				if (c <= 0)
+				{
+					TiXmlDocument* document = GetDocument();
+					if (document)
+						document->SetError(TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN);
+					return;
+				}
+				
+				if (c == '>')
+					break;
+
+				*tag += (char) c;
+				in->get();
+
+				if (!firstCharFound && c != '<' && !IsWhiteSpace(c))
+				{
+					firstCharFound = true;
+					if (c == '/')
+						closingTag = true;
+				}
+			}
+			// If it was a closing tag, then read in the closing '>' to clean up the input stream.
+			// If it was not, the streaming will be done by the tag.
+			if (closingTag)
+			{
+				if (!in->good())
+					return;
+
+				int c = in->get();
+				if (c <= 0)
+				{
+					TiXmlDocument* document = GetDocument();
+					if (document)
+						document->SetError(TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN);
+					return;
+				}
+				assert(c == '>');
+				*tag += (char) c;
+
+				// We are done, once we've found our closing tag.
+				return;
+			}
+			else
+			{
+				// If not a closing tag, id it, and stream.
+				const char* tagloc = tag->c_str() + tagIndex;
+				TiXmlNode* node = Identify(tagloc, TIXML_DEFAULT_ENCODING);
+				if (!node)
+					return;
+				node->StreamIn(in, tag);
+				delete node;
+				node = 0;
+
+				// No return: go around from the beginning: text, closing tag, or node.
+			}
+		}
+	}
+}
+#endif
+
+const char* TiXmlElement::Parse(const char* p, TiXmlParsingData* data, TiXmlEncoding encoding)
+{
+	p = SkipWhiteSpace(p, encoding);
+	TiXmlDocument* document = GetDocument();
+
+	if (!p || !*p)
+	{
+		if (document) document->SetError(TIXML_ERROR_PARSING_ELEMENT, 0, 0, encoding);
+		return 0;
+	}
+
+	if (data)
+	{
+		data->Stamp(p, encoding);
+		location = data->Cursor();
+	}
+
+	if (*p != '<')
+	{
+		if (document) document->SetError(TIXML_ERROR_PARSING_ELEMENT, p, data, encoding);
+		return 0;
+	}
+
+	p = SkipWhiteSpace(p+1, encoding);
+
+	// Read the name.
+	const char* pErr = p;
+
+		p = ReadName(p, &value, encoding);
+	if (!p || !*p)
+	{
+		if (document)	document->SetError(TIXML_ERROR_FAILED_TO_READ_ELEMENT_NAME, pErr, data, encoding);
+		return 0;
+	}
+
+		TIXML_STRING endTag ("</");
+	endTag += value;
+	endTag += ">";
+
+	// Check for and read attributes. Also look for an empty
+	// tag or an end tag.
+	while (p && *p)
+	{
+		pErr = p;
+		p = SkipWhiteSpace(p, encoding);
+		if (!p || !*p)
+		{
+			if (document) document->SetError(TIXML_ERROR_READING_ATTRIBUTES, pErr, data, encoding);
+			return 0;
+		}
+		if (*p == '/')
+		{
+			++p;
+			// Empty tag.
+			if (*p	!= '>')
+			{
+				if (document) document->SetError(TIXML_ERROR_PARSING_EMPTY, p, data, encoding);		
+				return 0;
+			}
+			return (p+1);
+		}
+		else if (*p == '>')
+		{
+			// Done with attributes (if there were any.)
+			// Read the value -- which can include other
+			// elements -- read the end tag, and return.
+			++p;
+			p = ReadValue(p, data, encoding);		// Note this is an Element method, and will set the error if one happens.
+			if (!p || !*p)
+				return 0;
+
+			// We should find the end tag now
+			if (StringEqual(p, endTag.c_str(), false, encoding))
+			{
+				p += endTag.length();
+				return p;
+			}
+			else
+			{
+				if (document) document->SetError(TIXML_ERROR_READING_END_TAG, p, data, encoding);
+				return 0;
+			}
+		}
+		else
+		{
+			// Try to read an attribute:
+			TiXmlAttribute* attrib = new TiXmlAttribute();
+			if (!attrib)
+			{
+				if (document) document->SetError(TIXML_ERROR_OUT_OF_MEMORY, pErr, data, encoding);
+				return 0;
+			}
+
+			attrib->SetDocument(document);
+			const char* pErr = p;
+			p = attrib->Parse(p, data, encoding);
+
+			if (!p || !*p)
+			{
+				if (document) document->SetError(TIXML_ERROR_PARSING_ELEMENT, pErr, data, encoding);
+				delete attrib;
+				return 0;
+			}
+
+			// Handle the strange case of double attributes:
+			TiXmlAttribute* node = attributeSet.Find(attrib->NameTStr());
+			if (node)
+			{
+				node->SetValue(attrib->Value());
+				delete attrib;
+				return 0;
+			}
+
+			attributeSet.Add(attrib);
+		}
+	}
+	return p;
+}
+
+
+const char* TiXmlElement::ReadValue(const char* p, TiXmlParsingData* data, TiXmlEncoding encoding)
+{
+	TiXmlDocument* document = GetDocument();
+
+	// Read in text and elements in any order.
+	const char* pWithWhiteSpace = p;
+	p = SkipWhiteSpace(p, encoding);
+
+	while (p && *p)
+	{
+		if (*p != '<')
+		{
+			// Take what we have, make a text element.
+			TiXmlText* textNode = new TiXmlText("");
+
+			if (!textNode)
+			{
+				if (document) document->SetError(TIXML_ERROR_OUT_OF_MEMORY, 0, 0, encoding);
+						return 0;
+			}
+
+			if (TiXmlBase::IsWhiteSpaceCondensed())
+			{
+				p = textNode->Parse(p, data, encoding);
+			}
+			else
+			{
+				// Special case: we want to keep the white space
+				// so that leading spaces aren't removed.
+				p = textNode->Parse(pWithWhiteSpace, data, encoding);
+			}
+
+			if (!textNode->Blank())
+				LinkEndChild(textNode);
+			else
+				delete textNode;
+		} 
+		else 
+		{
+			// We hit a '<'
+			// Have we hit a new element or an end tag? This could also be
+			// a TiXmlText in the "CDATA" style.
+			if (StringEqual(p, "</", false, encoding))
+			{
+				return p;
+			}
+			else
+			{
+				TiXmlNode* node = Identify(p, encoding);
+				if (node)
+				{
+					p = node->Parse(p, data, encoding);
+					LinkEndChild(node);
+				}				
+				else
+				{
+					return 0;
+				}
+			}
+		}
+		pWithWhiteSpace = p;
+		p = SkipWhiteSpace(p, encoding);
+	}
+
+	if (!p)
+	{
+		if (document) document->SetError(TIXML_ERROR_READING_ELEMENT_VALUE, 0, 0, encoding);
+	}	
+	return p;
+}
+
+
+#ifdef TIXML_USE_STL
+void TiXmlUnknown::StreamIn(TIXML_ISTREAM * in, TIXML_STRING * tag)
+{
+	while (in->good())
+	{
+		int c = in->get();	
+		if (c <= 0)
+		{
+			TiXmlDocument* document = GetDocument();
+			if (document)
+				document->SetError(TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN);
+			return;
+		}
+		(*tag) += (char) c;
+
+		if (c == '>')
+		{
+			// All is well.
+			return;		
+		}
+	}
+}
+#endif
+
+
+const char* TiXmlUnknown::Parse(const char* p, TiXmlParsingData* data, TiXmlEncoding encoding)
+{
+	TiXmlDocument* document = GetDocument();
+	p = SkipWhiteSpace(p, encoding);
+
+	if (data)
+	{
+		data->Stamp(p, encoding);
+		location = data->Cursor();
+	}
+	if (!p || !*p || *p != '<')
+	{
+		if (document) document->SetError(TIXML_ERROR_PARSING_UNKNOWN, p, data, encoding);
+		return 0;
+	}
+	++p;
+		value = "";
+
+	while (p && *p && *p != '>')
+	{
+		value += *p;
+		++p;
+	}
+
+	if (!p)
+	{
+		if (document)	document->SetError(TIXML_ERROR_PARSING_UNKNOWN, 0, 0, encoding);
+	}
+	if (*p == '>')
+		return p+1;
+	return p;
+}
+
+#ifdef TIXML_USE_STL
+void TiXmlComment::StreamIn(TIXML_ISTREAM * in, TIXML_STRING * tag)
+{
+	while (in->good())
+	{
+		int c = in->get();	
+		if (c <= 0)
+		{
+			TiXmlDocument* document = GetDocument();
+			if (document)
+				document->SetError(TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN);
+			return;
+		}
+
+		(*tag) += (char) c;
+
+		if (c == '>' 
+			 && tag->at(tag->length() - 2) == '-'
+			 && tag->at(tag->length() - 3) == '-')
+		{
+			// All is well.
+			return;		
+		}
+	}
+}
+#endif
+
+
+const char* TiXmlComment::Parse(const char* p, TiXmlParsingData* data, TiXmlEncoding encoding)
+{
+	TiXmlDocument* document = GetDocument();
+	value = "";
+
+	p = SkipWhiteSpace(p, encoding);
+
+	if (data)
+	{
+		data->Stamp(p, encoding);
+		location = data->Cursor();
+	}
+	const char* startTag = "<!--";
+	const char* endTag	 = "-->";
+
+	if (!StringEqual(p, startTag, false, encoding))
+	{
+		document->SetError(TIXML_ERROR_PARSING_COMMENT, p, data, encoding);
+		return 0;
+	}
+	p += strlen(startTag);
+	p = ReadText(p, &value, false, endTag, false, encoding);
+	return p;
+}
+
+
+const char* TiXmlAttribute::Parse(const char* p, TiXmlParsingData* data, TiXmlEncoding encoding)
+{
+	p = SkipWhiteSpace(p, encoding);
+	if (!p || !*p) return 0;
+
+//	int tabsize = 4;
+//	if (document)
+//		tabsize = document->TabSize();
+
+	if (data)
+	{
+		data->Stamp(p, encoding);
+		location = data->Cursor();
+	}
+	// Read the name, the '=' and the value.
+	const char* pErr = p;
+	p = ReadName(p, &name, encoding);
+	if (!p || !*p)
+	{
+		if (document) document->SetError(TIXML_ERROR_READING_ATTRIBUTES, pErr, data, encoding);
+		return 0;
+	}
+	p = SkipWhiteSpace(p, encoding);
+	if (!p || !*p || *p != '=')
+	{
+		if (document) document->SetError(TIXML_ERROR_READING_ATTRIBUTES, p, data, encoding);
+		return 0;
+	}
+
+	++p;	// skip '='
+	p = SkipWhiteSpace(p, encoding);
+	if (!p || !*p)
+	{
+		if (document) document->SetError(TIXML_ERROR_READING_ATTRIBUTES, p, data, encoding);
+		return 0;
+	}
+	
+	const char* end;
+	const char SINGLE_QUOTE = '\'';
+	const char DOUBLE_QUOTE = '\"';
+
+	if (*p == SINGLE_QUOTE)
+	{
+		++p;
+		end = "\'";		// single quote in string
+		p = ReadText(p, &value, false, end, false, encoding);
+	}
+	else if (*p == DOUBLE_QUOTE)
+	{
+		++p;
+		end = "\"";		// double quote in string
+		p = ReadText(p, &value, false, end, false, encoding);
+	}
+	else
+	{
+		// All attribute values should be in single or double quotes.
+		// But this is such a common error that the parser will try
+		// its best, even without them.
+		value = "";
+		while (	 p && *p											// existence
+				&& !IsWhiteSpace(*p) && *p != '\n' && *p != '\r'	// whitespace
+				&& *p != '/' && *p != '>')							// tag end
+		{
+			if (*p == SINGLE_QUOTE || *p == DOUBLE_QUOTE) {
+				// [ 1451649 ] Attribute values with trailing quotes not handled correctly
+				// We did not have an opening quote but seem to have a 
+				// closing one. Give up and throw an error.
+				if (document) document->SetError(TIXML_ERROR_READING_ATTRIBUTES, p, data, encoding);
+				return 0;
+			}
+			value += *p;
+			++p;
+		}
+	}
+	return p;
+}
+
+#ifdef TIXML_USE_STL
+void TiXmlText::StreamIn(TIXML_ISTREAM * in, TIXML_STRING * tag)
+{
+	if (cdata)
+	{
+		int c = in->get();	
+		if (c <= 0)
+		{
+			TiXmlDocument* document = GetDocument();
+			if (document)
+				document->SetError(TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN);
+			return;
+		}
+
+		(*tag) += (char) c;
+
+		if (c == '>' 
+			 && tag->at(tag->length() - 2) == ']'
+			 && tag->at(tag->length() - 3) == ']')
+		{
+			// All is well.
+			return;		
+		}
+	}
+	else
+	{
+		while (in->good())
+		{
+			int c = in->peek();	
+			if (c == '<')
+				return;
+			if (c <= 0)
+			{
+				TiXmlDocument* document = GetDocument();
+				if (document)
+					document->SetError(TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN);
+				return;
+			}
+
+			(*tag) += (char) c;
+			in->get();
+		}
+	}
+}
+#endif
+
+const char* TiXmlText::Parse(const char* p, TiXmlParsingData* data, TiXmlEncoding encoding)
+{
+	value = "";
+	TiXmlDocument* document = GetDocument();
+
+	if (data)
+	{
+		data->Stamp(p, encoding);
+		location = data->Cursor();
+	}
+
+	const char* const startTag = "<![CDATA[";
+	const char* const endTag	 = "]]>";
+
+	if (cdata || StringEqual(p, startTag, false, encoding))
+	{
+		cdata = true;
+
+		if (!StringEqual(p, startTag, false, encoding))
+		{
+			document->SetError(TIXML_ERROR_PARSING_CDATA, p, data, encoding);
+			return 0;
+		}
+		p += strlen(startTag);
+
+		// Keep all the white space, ignore the encoding, etc.
+		while (		 p && *p
+				&& !StringEqual(p, endTag, false, encoding)
+			 )
+		{
+			value += *p;
+			++p;
+		}
+
+		TIXML_STRING dummy; 
+		p = ReadText(p, &dummy, false, endTag, false, encoding);
+		return p;
+	}
+	else
+	{
+		bool ignoreWhite = true;
+
+		const char* end = "<";
+		p = ReadText(p, &value, ignoreWhite, end, false, encoding);
+		if (p)
+			return p-1;	// don't truncate the '<'
+		return 0;
+	}
+}
+
+#ifdef TIXML_USE_STL
+void TiXmlDeclaration::StreamIn(TIXML_ISTREAM * in, TIXML_STRING * tag)
+{
+	while (in->good())
+	{
+		int c = in->get();
+		if (c <= 0)
+		{
+			TiXmlDocument* document = GetDocument();
+			if (document)
+				document->SetError(TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN);
+			return;
+		}
+		(*tag) += (char) c;
+
+		if (c == '>')
+		{
+			// All is well.
+			return;
+		}
+	}
+}
+#endif
+
+const char* TiXmlDeclaration::Parse(const char* p, TiXmlParsingData* data, TiXmlEncoding _encoding)
+{
+	p = SkipWhiteSpace(p, _encoding);
+	// Find the beginning, find the end, and look for
+	// the stuff in-between.
+	TiXmlDocument* document = GetDocument();
+	if (!p || !*p || !StringEqual(p, "<?xml", true, _encoding))
+	{
+		if (document) document->SetError(TIXML_ERROR_PARSING_DECLARATION, 0, 0, _encoding);
+		return 0;
+	}
+	if (data)
+	{
+		data->Stamp(p, _encoding);
+		location = data->Cursor();
+	}
+	p += 5;
+
+	version = "";
+	encoding = "";
+	standalone = "";
+
+	while (p && *p)
+	{
+		if (*p == '>')
+		{
+			++p;
+			return p;
+		}
+
+		p = SkipWhiteSpace(p, _encoding);
+		if (StringEqual(p, "version", true, _encoding))
+		{
+			TiXmlAttribute attrib;
+			p = attrib.Parse(p, data, _encoding);		
+			version = attrib.Value();
+		}
+		else if (StringEqual(p, "encoding", true, _encoding))
+		{
+			TiXmlAttribute attrib;
+			p = attrib.Parse(p, data, _encoding);		
+			encoding = attrib.Value();
+		}
+		else if (StringEqual(p, "standalone", true, _encoding))
+		{
+			TiXmlAttribute attrib;
+			p = attrib.Parse(p, data, _encoding);		
+			standalone = attrib.Value();
+		}
+		else
+		{
+			// Read over whatever it is.
+			while (p && *p && *p != '>' && !IsWhiteSpace(*p))
+				++p;
+		}
+	}
+	return 0;
+}
+
+bool TiXmlText::Blank() const
+{
+	for (unsigned i=0; i<value.length(); i++)
+		if (!IsWhiteSpace(value[i]))
+			return false;
+	return true;
+}
+
diff --git a/plugins/UserInfoEx/src/init.cpp b/plugins/UserInfoEx/src/init.cpp
index 879d7df5b5..b8c35eae33 100644
--- a/plugins/UserInfoEx/src/init.cpp
+++ b/plugins/UserInfoEx/src/init.cpp
@@ -20,40 +20,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
 #include "commonheaders.h"
-#include "version.h"
-
-#include "mir_menuitems.h"
-#include "ctrl_base.h"
-#include "ctrl_button.h"
-#include "ctrl_contact.h"
-#include "dlg_propsheet.h"
-#include "dlg_anniversarylist.h"
-#include "psp_options.h"
-#include "ex_import/svc_ExImport.h"
-//#include "ex_import/svc_ExImVCF.h"
-#include "svc_avatar.h"
-#include "svc_contactinfo.h"
-#include "svc_email.h"
-#include "svc_gender.h"
-#include "svc_homepage.h"
-#include "svc_phone.h"
-#include "svc_refreshci.h"
-#include "svc_reminder.h"
-#include "svc_timezone.h"
-#include "svc_timezone_old.h"
-#include "flags/svc_flags.h"
 
 static PLUGININFOEX pluginInfo = {
 	sizeof(PLUGININFOEX),
-	__PLUGIN_DISPLAY_NAME,
-	__VERSION_DWORD,
-	__DESC,
+	__PLUGIN_NAME,
+	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
+	__DESCRIPTION,
 	__AUTHOR,
 	__AUTHOREMAIL,
 	__COPYRIGHT,
 	__AUTHORWEB,
 	UNICODE_AWARE,
-	// {9C23A24B-E6AA-43c6-B0B8-D6C36D2F7B57}
+	// {9C23A24B-E6AA-43C6-B0B8-D6C36D2F7B57}
 	{0x9c23a24b, 0xe6aa, 0x43c6, {0xb0, 0xb8, 0xd6, 0xc3, 0x6d, 0x2f, 0x7b, 0x57}}
 };
 
diff --git a/plugins/UserInfoEx/src/mir_contactqueue.cpp b/plugins/UserInfoEx/src/mir_contactqueue.cpp
index f8f276dc11..859ef24ef3 100644
--- a/plugins/UserInfoEx/src/mir_contactqueue.cpp
+++ b/plugins/UserInfoEx/src/mir_contactqueue.cpp
@@ -19,8 +19,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
 #include "commonheaders.h"
-#include "mir_contactqueue.h"
-#include <process.h>
 
 /**
  * This static helper function is used to sort the queue items by time
diff --git a/plugins/UserInfoEx/src/mir_contactqueue.h b/plugins/UserInfoEx/src/mir_contactqueue.h
index 4323c22282..ae583b5f60 100644
--- a/plugins/UserInfoEx/src/mir_contactqueue.h
+++ b/plugins/UserInfoEx/src/mir_contactqueue.h
@@ -22,14 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #ifndef __CONTACTASYNCQUEUE_H__
 #define __CONTACTASYNCQUEUE_H__
 
-#ifndef MIRANDA_VER
-#define MIRANDA_VER 0x0A00
-#endif
-
-#include <windows.h>
-#include <newpluginapi.h>
-#include <m_system_cpp.h>
-
 /**
  *
  *
diff --git a/plugins/UserInfoEx/src/mir_db.cpp b/plugins/UserInfoEx/src/mir_db.cpp
index 8f8c39ace9..c95bb40eb3 100644
--- a/plugins/UserInfoEx/src/mir_db.cpp
+++ b/plugins/UserInfoEx/src/mir_db.cpp
@@ -20,9 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
 #include "commonheaders.h"
-#include "ctrl_base.h"
-#include "mir_string.h"
-#include "mir_db.h"
 
 namespace DB {
 
diff --git a/plugins/UserInfoEx/src/mir_db.h b/plugins/UserInfoEx/src/mir_db.h
index b0e23668c1..5efc0c0853 100644
--- a/plugins/UserInfoEx/src/mir_db.h
+++ b/plugins/UserInfoEx/src/mir_db.h
@@ -21,10 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 #pragma once
 
-#include <m_system.h>
-#include <m_system_cpp.h>
-#include <m_database.h>
-
 namespace DB {
 
 namespace MetaContact{
diff --git a/plugins/UserInfoEx/src/mir_icolib.h b/plugins/UserInfoEx/src/mir_icolib.h
index 5ec7278b6b..1d2cb2ab68 100644
--- a/plugins/UserInfoEx/src/mir_icolib.h
+++ b/plugins/UserInfoEx/src/mir_icolib.h
@@ -22,8 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #ifndef _UINFOEX_ICONS_H_INCLUDED_
 #define _UINFOEX_ICONS_H_INCLUDED_ 1
 
-#include "m_icolib.h"
-
 // sections
 #define SECT_COMMON				LPGEN("UserInfoEx")
 #define SECT_ZODIAC				"UserInfoEx/Zodiacs"
diff --git a/plugins/UserInfoEx/src/mir_menuitems.cpp b/plugins/UserInfoEx/src/mir_menuitems.cpp
index ccbc6e6942..ead806d70d 100644
--- a/plugins/UserInfoEx/src/mir_menuitems.cpp
+++ b/plugins/UserInfoEx/src/mir_menuitems.cpp
@@ -20,11 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
 #include "commonheaders.h"
-#include "svc_Reminder.h"
-
-#include "svc_email.h"
-#include "svc_homepage.h"
-#include ".\ex_import\svc_ExImport.h"
 
 enum ECascadeType {
 	MCAS_DISABLED	= 2,
diff --git a/plugins/UserInfoEx/src/psp_about.cpp b/plugins/UserInfoEx/src/psp_about.cpp
index 43bfd91647..7963c6fc8d 100644
--- a/plugins/UserInfoEx/src/psp_about.cpp
+++ b/plugins/UserInfoEx/src/psp_about.cpp
@@ -20,8 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
 #include "commonheaders.h"
-#include "ctrl_edit.h"
-#include "psp_base.h"
 
 /**
  * Dialog procedure for the about/nodes information propertysheetpage
diff --git a/plugins/UserInfoEx/src/psp_anniversary.cpp b/plugins/UserInfoEx/src/psp_anniversary.cpp
index 6f3ecff855..de41f30f57 100644
--- a/plugins/UserInfoEx/src/psp_anniversary.cpp
+++ b/plugins/UserInfoEx/src/psp_anniversary.cpp
@@ -20,9 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
 #include "commonheaders.h"
-#include "ctrl_annivedit.h"
-#include "ctrl_edit.h"
-#include "psp_base.h"
 
 /**
  * Dialog procedure for the anniversary add/edit dialog
diff --git a/plugins/UserInfoEx/src/psp_base.cpp b/plugins/UserInfoEx/src/psp_base.cpp
index 6e92da1dd9..2e0ea911d0 100644
--- a/plugins/UserInfoEx/src/psp_base.cpp
+++ b/plugins/UserInfoEx/src/psp_base.cpp
@@ -20,7 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
 #include "commonheaders.h"
-#include "ctrl_base.h"
 
 VOID UpDate_CountryIcon(HWND hCtrl, int countryID) {
 	HICON hIcon = LoadFlagIcon(countryID);
diff --git a/plugins/UserInfoEx/src/psp_company.cpp b/plugins/UserInfoEx/src/psp_company.cpp
index 80fc8ed49c..eebe42ceda 100644
--- a/plugins/UserInfoEx/src/psp_company.cpp
+++ b/plugins/UserInfoEx/src/psp_company.cpp
@@ -20,9 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
 #include "commonheaders.h"
-#include "ctrl_combo.h"
-#include "ctrl_edit.h"
-#include "psp_base.h"
 
 /**
  * Dialog procedure for the company contact information propertysheetpage
diff --git a/plugins/UserInfoEx/src/psp_contact.cpp b/plugins/UserInfoEx/src/psp_contact.cpp
index 06860f25d7..912134281e 100644
--- a/plugins/UserInfoEx/src/psp_contact.cpp
+++ b/plugins/UserInfoEx/src/psp_contact.cpp
@@ -20,10 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
 #include "commonheaders.h"
-#include "ctrl_combo.h"
-#include "ctrl_contact.h"
-#include "ctrl_edit.h"
-#include "psp_base.h"
 
 /**
  * Dialog procedure for the home contact information propertysheetpage
diff --git a/plugins/UserInfoEx/src/psp_general.cpp b/plugins/UserInfoEx/src/psp_general.cpp
index 2712684e3b..746e41cc08 100644
--- a/plugins/UserInfoEx/src/psp_general.cpp
+++ b/plugins/UserInfoEx/src/psp_general.cpp
@@ -20,11 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
 #include "commonheaders.h"
-#include "ctrl_combo.h"
-#include "ctrl_edit.h"
-#include "ctrl_tzcombo.h"
-#include "psp_base.h"
-#include "svc_reminder.h"
 
 /**
  * Dialog procedure for the contact information propertysheetpage
diff --git a/plugins/UserInfoEx/src/psp_options.cpp b/plugins/UserInfoEx/src/psp_options.cpp
index 2a2af80bd3..a1b7de2531 100644
--- a/plugins/UserInfoEx/src/psp_options.cpp
+++ b/plugins/UserInfoEx/src/psp_options.cpp
@@ -20,21 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
 #include "commonheaders.h"
-#include "dlg_propsheet.h"
-#include "mir_menuitems.h"
-
-#include "svc_Contactinfo.h"
-#include "svc_Avatar.h"
-#include "svc_Email.h"
-#include "svc_Gender.h"
-#include "svc_Homepage.h"
-#include "svc_Phone.h"
-#include "svc_Refreshci.h"
-#include "svc_Reminder.h"
-#include "svc_Timezone.h"
-#include "svc_Timezone_old.h"
-#include "flags\svc_flags.h"
-#include "psp_options.h"
 
 #define		PSM_ENABLE_TABITEM	(WM_USER+106)
 
diff --git a/plugins/UserInfoEx/src/psp_origin.cpp b/plugins/UserInfoEx/src/psp_origin.cpp
index 6fe995ce7f..d822eab505 100644
--- a/plugins/UserInfoEx/src/psp_origin.cpp
+++ b/plugins/UserInfoEx/src/psp_origin.cpp
@@ -23,11 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * System Includes:
  **/
 #include "commonheaders.h"
-#include "ctrl_combo.h"
-#include "ctrl_edit.h"
-#include "ctrl_tzcombo.h"
-#include "psp_base.h"
-#include "svc_reminder.h"
 
 /**
  * This is the dialog procedure for the advanced contact information propertysheetpage.
diff --git a/plugins/UserInfoEx/src/psp_profile.cpp b/plugins/UserInfoEx/src/psp_profile.cpp
index f86d9c81b7..b5b148f009 100644
--- a/plugins/UserInfoEx/src/psp_profile.cpp
+++ b/plugins/UserInfoEx/src/psp_profile.cpp
@@ -22,8 +22,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 /**
  * system & local includes
  **/
+
 #include "commonheaders.h"
-#include "ctrl_base.h"
 
 #define LVF_EDITLABEL	8
 
diff --git a/plugins/UserInfoEx/src/svc_avatar.cpp b/plugins/UserInfoEx/src/svc_avatar.cpp
index 129fc95084..c68a705d97 100644
--- a/plugins/UserInfoEx/src/svc_avatar.cpp
+++ b/plugins/UserInfoEx/src/svc_avatar.cpp
@@ -20,9 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
 #include "commonheaders.h"
-#include "m_protocols.h"
-#include "m_png.h"
-#include "m_avatars.h"
 
 namespace NServices
 {
diff --git a/plugins/UserInfoEx/src/svc_contactinfo.cpp b/plugins/UserInfoEx/src/svc_contactinfo.cpp
index 01f931251f..b076f09d22 100644
--- a/plugins/UserInfoEx/src/svc_contactinfo.cpp
+++ b/plugins/UserInfoEx/src/svc_contactinfo.cpp
@@ -22,13 +22,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 /**
  * System Includes:
  **/
+
 #include "commonheaders.h"
-#include "m_contacts.h"
-#include "svc_timezone.h"
-#include "svc_timezone_old.h"
-#include "svc_contactinfo.h"
-#include "svc_gender.h"
-#include "Flags\svc_countrylistext.h"
 
 #define	CI_TCHAR(ci)	(((ci)->dwFlag & CNF_UNICODE) ? DBVT_WCHAR : DBVT_ASCIIZ)
 
diff --git a/plugins/UserInfoEx/src/svc_refreshci.cpp b/plugins/UserInfoEx/src/svc_refreshci.cpp
index dfddc39fad..92aa202b65 100644
--- a/plugins/UserInfoEx/src/svc_refreshci.cpp
+++ b/plugins/UserInfoEx/src/svc_refreshci.cpp
@@ -20,9 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
 #include "commonheaders.h"
-#include "mir_contactqueue.h"
-#include "mir_menuitems.h"
-#include "svc_refreshci.h"
 
 #define HM_PROTOACK	(WM_USER+100)
 
diff --git a/plugins/UserInfoEx/src/svc_reminder.cpp b/plugins/UserInfoEx/src/svc_reminder.cpp
index c5112d2a54..bbe32ac5b5 100644
--- a/plugins/UserInfoEx/src/svc_reminder.cpp
+++ b/plugins/UserInfoEx/src/svc_reminder.cpp
@@ -22,13 +22,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 /**
  * System Includes:
  **/
-#include "commonheaders.h"
-#include "m_skin.h"
-#include "m_clui.h"
 
-#include "svc_Gender.h"
-#include "svc_Reminder.h"
-#include "dlg_anniversarylist.h"
+#include "commonheaders.h"
 
 /**
  * The CEvent structure describes the next anniversary to remind of.
diff --git a/plugins/UserInfoEx/src/svc_timezone.cpp b/plugins/UserInfoEx/src/svc_timezone.cpp
index 3694e55301..b29b640599 100644
--- a/plugins/UserInfoEx/src/svc_timezone.cpp
+++ b/plugins/UserInfoEx/src/svc_timezone.cpp
@@ -18,8 +18,8 @@ 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"
-#include "svc_timezone.h"
 
 /***********************************************************************************************************
  * services
diff --git a/plugins/UserInfoEx/src/svc_timezone_old.cpp b/plugins/UserInfoEx/src/svc_timezone_old.cpp
index 5446efe861..c3fbeea121 100644
--- a/plugins/UserInfoEx/src/svc_timezone_old.cpp
+++ b/plugins/UserInfoEx/src/svc_timezone_old.cpp
@@ -20,7 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
 #include "commonheaders.h"
-#include "svc_timezone_old.h"
 
 #define TZREG		"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones"
 #define TZREG_9X	"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Time Zones"
diff --git a/plugins/UserInfoEx/src/svc_timezone_old.h b/plugins/UserInfoEx/src/svc_timezone_old.h
index 1fbe580e33..b3dc66a18f 100644
--- a/plugins/UserInfoEx/src/svc_timezone_old.h
+++ b/plugins/UserInfoEx/src/svc_timezone_old.h
@@ -22,7 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #ifndef _SVC_TIMEZONE_H_OLD
 #define _SVC_TIMEZONE_H_OLD
 
-#include "svc_timezone.h"
 #define TZINDEX_UNSPECIFIED	 -100
 
 /**
diff --git a/plugins/UserInfoEx/src/version.h b/plugins/UserInfoEx/src/version.h
index 47ba1487b6..67d2542227 100644
--- a/plugins/UserInfoEx/src/version.h
+++ b/plugins/UserInfoEx/src/version.h
@@ -1,51 +1,14 @@
-/*
-
-Miranda IM: the free IM client for Microsoft* Windows*
-
-Copyright 2000-2009 Miranda ICQ/IM project, 
-all portions of this codebase are copyrighted to the people 
-listed in contributors.txt.
-
-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.
-
-*/
-
-#define __MAJOR_VERSION   0
-#define __MINOR_VERSION   8
-#define __RELEASE_NUM     4	// due to beta builders
-#define __BUILD_NUM       2	// due to beta builders
-
-#define __STRINGIFY_(x) #x
-#define __STRINGIFY(x)  __STRINGIFY_(x)
-
-#define __FILEVERSION_STRING      __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
-#define __FILEVERSION_STRING_DOTS __MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM
-
-#define __VERSION_STRING  __STRINGIFY(__FILEVERSION_STRING_DOTS)
-#define __VERSION_DWORD   PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM)
-
-#define __SHORT_DESC  "Extended UserInfo module for Miranda-IM. Provides interface to edit all contact information."
-#define __DESC        "Gives extended ability to edit information about your contacts locally. "\
-                      "It does not matter what information your contact gives about himself. "\
-                      "If you know more you can add more."
-#define __AUTHOR      "DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol"
-#define __AUTHOREMAIL "deathaxe@web.de"
-#define __COPYRIGHT   "� 2006-2009 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol"
-#define __AUTHORWEB   "http://miranda-ng.org/" __STRINGIFY(__UPDATER_DOWNLOAD_ID)
-
-#define __UPDATER_DOWNLOAD_ID 2537
-#define __PLUGIN_DISPLAY_NAME	"UserInfoEx"
-#define __PLUGIN_FILENAME		"uinfoex.dll"
- 
-\ No newline at end of file
+#define __MAJOR_VERSION				0
+#define __MINOR_VERSION				8
+#define __RELEASE_NUM				4
+#define __BUILD_NUM					2
+
+#define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
+
+#define __PLUGIN_NAME				"User info ext"
+#define __FILENAME					"UInfoEx.dll"
+#define __DESCRIPTION 				"Extended UserInfo module for Miranda NG. Provides interface to edit all contact information."
+#define __AUTHOR					"DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol"
+#define __AUTHOREMAIL				"deathaxe@web.de"
+#define __AUTHORWEB					"http://miranda-ng.org/"
+#define __COPYRIGHT					"� 2006-2009 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol"
author	Kirill Volinsky <mataes2007@gmail.com>	2013-03-17 16:35:15 +0000
committer	Kirill Volinsky <mataes2007@gmail.com>	2013-03-17 16:35:15 +0000
commit	6c43253da0dd38a409146f7acb90ae6cc1ef8069 (patch)
tree	6da7874de2057cde0dd14167153950d03ea6d22f /plugins/UserInfoEx/src
parent	82ae452fff08430d514f762f49e78fec90f88625 (diff)