From ef71add33f09f9328c795b0212a08ef5a76bfe5d Mon Sep 17 00:00:00 2001 From: dfighter Date: Wed, 8 Feb 2012 01:58:15 +0100 Subject: [PATCH] Moved xml_auto_ptr from game_share to nel misc. --- code/nel/include/nel/misc/xml_auto_ptr.h | 81 +++++++++++++++++++ code/nel/src/misc/stdmisc.h | 1 + code/ryzom/client/src/cdb_branch.cpp | 2 +- code/ryzom/client/src/cdb_leaf.cpp | 2 +- .../client/src/interface_v3/action_handler.h | 2 +- .../client/src/interface_v3/ctrl_base.cpp | 2 +- .../src/interface_v3/ctrl_base_button.cpp | 2 +- .../client/src/interface_v3/ctrl_button.cpp | 2 +- .../client/src/interface_v3/ctrl_col_pick.cpp | 2 +- .../client/src/interface_v3/ctrl_scroll.cpp | 2 +- .../src/interface_v3/ctrl_text_button.cpp | 2 +- .../client/src/interface_v3/ctrl_tooltip.cpp | 2 +- .../client/src/interface_v3/dbctrl_sheet.cpp | 2 +- .../src/interface_v3/dbgroup_combo_box.cpp | 2 +- .../interface_v3/dbgroup_list_sheet_text.cpp | 2 +- ...roup_list_sheet_text_brick_composition.cpp | 2 +- .../dbgroup_list_sheet_text_share.cpp | 2 +- .../interface_v3/dbgroup_list_sheet_trade.cpp | 2 +- .../client/src/interface_v3/dbview_bar.cpp | 2 +- .../client/src/interface_v3/dbview_bar3.cpp | 2 +- .../client/src/interface_v3/dbview_digit.cpp | 2 +- .../client/src/interface_v3/dbview_number.cpp | 2 +- .../src/interface_v3/dbview_quantity.cpp | 2 +- .../client/src/interface_v3/group_career.cpp | 2 +- .../client/src/interface_v3/group_compas.cpp | 2 +- .../src/interface_v3/group_container.cpp | 2 +- .../client/src/interface_v3/group_editbox.cpp | 2 +- .../client/src/interface_v3/group_frame.cpp | 2 +- .../client/src/interface_v3/group_html_cs.cpp | 2 +- .../src/interface_v3/group_html_forum.cpp | 2 +- .../src/interface_v3/group_html_mail.cpp | 2 +- .../src/interface_v3/group_html_qcm.cpp | 2 +- .../src/interface_v3/group_html_webig.cpp | 2 +- .../src/interface_v3/group_in_scene.cpp | 2 +- .../client/src/interface_v3/group_list.cpp | 2 +- .../client/src/interface_v3/group_map.cpp | 2 +- .../client/src/interface_v3/group_menu.cpp | 2 +- .../client/src/interface_v3/group_modal.cpp | 2 +- .../src/interface_v3/group_paragraph.cpp | 2 +- .../group_phrase_skill_filter.cpp | 2 +- .../src/interface_v3/group_quick_help.cpp | 2 +- .../client/src/interface_v3/group_skills.cpp | 2 +- .../client/src/interface_v3/group_tab.cpp | 2 +- .../client/src/interface_v3/group_table.cpp | 2 +- .../client/src/interface_v3/group_tree.cpp | 2 +- .../interface_v3/input_handler_manager.cpp | 2 +- .../src/interface_v3/interface_3d_scene.cpp | 2 +- .../src/interface_v3/interface_anim.cpp | 2 +- .../client/src/interface_v3/interface_ddx.cpp | 2 +- .../src/interface_v3/interface_element.cpp | 2 +- .../src/interface_v3/interface_group.cpp | 2 +- .../src/interface_v3/interface_observer.h | 2 +- .../src/interface_v3/interface_options.cpp | 2 +- .../src/interface_v3/interface_parser.cpp | 2 +- .../client/src/interface_v3/skill_manager.cpp | 2 +- .../client/src/interface_v3/view_bitmap.cpp | 2 +- .../src/interface_v3/view_bitmap_combo.cpp | 2 +- .../src/interface_v3/view_bitmap_faber_mp.cpp | 2 +- .../client/src/interface_v3/view_pointer.cpp | 2 +- .../client/src/interface_v3/view_radar.cpp | 2 +- .../client/src/interface_v3/view_text.cpp | 2 +- .../src/interface_v3/view_text_formated.cpp | 2 +- .../client/src/interface_v3/view_text_id.cpp | 2 +- .../interface_v3/view_text_id_formated.cpp | 2 +- .../src/game_share/generic_xml_msg_mngr.cpp | 2 +- .../common/src/game_share/ring_access.cpp | 2 +- .../player_manager/cdb_branch.cpp | 2 +- .../player_manager/cdb_leaf.cpp | 2 +- 68 files changed, 148 insertions(+), 66 deletions(-) create mode 100644 code/nel/include/nel/misc/xml_auto_ptr.h diff --git a/code/nel/include/nel/misc/xml_auto_ptr.h b/code/nel/include/nel/misc/xml_auto_ptr.h new file mode 100644 index 000000000..36e67331b --- /dev/null +++ b/code/nel/include/nel/misc/xml_auto_ptr.h @@ -0,0 +1,81 @@ +// Ryzom - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + + + +#ifndef XML_AUTO_PTR_H +#define XML_AUTO_PTR_H + +#include + +/** Simple auto pointer for xml pointers + */ +class CXMLAutoPtr +{ +public: + CXMLAutoPtr(const char *value = NULL) : _Value(value) {} + CXMLAutoPtr(const unsigned char *value) : _Value((const char *) value) {} + ~CXMLAutoPtr() { destroy(); } + operator const char *() const { return _Value; } + operator bool() const { return _Value != NULL; } + operator std::string() const { return std::string(_Value); } + bool operator ! () const { return _Value == NULL; } + operator const unsigned char *() const { return (const unsigned char *) _Value; } + char operator * () const { nlassert(_Value); return *_Value; } + /// NB : This remove previous owned pointer with xmlFree + CXMLAutoPtr &operator = (const char *other) + { + if (other == _Value) return *this; + destroy(); + _Value = other; + return *this; + } + + CXMLAutoPtr &operator = (const unsigned char *other) + { + *this = (const char *) other; + return *this; + } + char *getDatas() const { return const_cast(_Value); } +////////////////////////////////////////////////// +private: + const char *_Value; +private: + void destroy() + { + if (_Value) + { + xmlFree(const_cast(_Value)); + _Value = NULL; + } + } + + // We'd rather avoid problems + CXMLAutoPtr(const CXMLAutoPtr &/* other */) + { + nlassert(0); + } + CXMLAutoPtr&operator = (const CXMLAutoPtr &/* other */) + { + nlassert(0); + return *this; + } +}; + + +#endif + + diff --git a/code/nel/src/misc/stdmisc.h b/code/nel/src/misc/stdmisc.h index 572a90f1a..860983518 100644 --- a/code/nel/src/misc/stdmisc.h +++ b/code/nel/src/misc/stdmisc.h @@ -52,6 +52,7 @@ #include "nel/misc/stream.h" #include "nel/misc/path.h" #include "nel/misc/string_common.h" +//#include "nel/misc/xml_auto_ptr.h" #ifdef NL_OS_WINDOWS #define NOMINMAX diff --git a/code/ryzom/client/src/cdb_branch.cpp b/code/ryzom/client/src/cdb_branch.cpp index 60c6b63f4..d7e3f185f 100644 --- a/code/ryzom/client/src/cdb_branch.cpp +++ b/code/ryzom/client/src/cdb_branch.cpp @@ -30,7 +30,7 @@ ////////////// #include "cdb_branch.h" #include "cdb_leaf.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" //#include #include "interface_v3/interface_manager.h" diff --git a/code/ryzom/client/src/cdb_leaf.cpp b/code/ryzom/client/src/cdb_leaf.cpp index 9b3d26c89..b65f79c24 100644 --- a/code/ryzom/client/src/cdb_leaf.cpp +++ b/code/ryzom/client/src/cdb_leaf.cpp @@ -29,7 +29,7 @@ // Includes // ////////////// #include "cdb_leaf.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" //#include #include "interface_v3/interface_manager.h" diff --git a/code/ryzom/client/src/interface_v3/action_handler.h b/code/ryzom/client/src/interface_v3/action_handler.h index c8800da63..e578c4959 100644 --- a/code/ryzom/client/src/interface_v3/action_handler.h +++ b/code/ryzom/client/src/interface_v3/action_handler.h @@ -23,7 +23,7 @@ #include #include "nel/misc/types_nl.h" #include "nel/misc/debug.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" #include extern bool game_exit; diff --git a/code/ryzom/client/src/interface_v3/ctrl_base.cpp b/code/ryzom/client/src/interface_v3/ctrl_base.cpp index 151d2be6f..f3c7dbbec 100644 --- a/code/ryzom/client/src/interface_v3/ctrl_base.cpp +++ b/code/ryzom/client/src/interface_v3/ctrl_base.cpp @@ -19,7 +19,7 @@ #include "stdpch.h" #include "ctrl_base.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" #include "interface_manager.h" using namespace NLMISC; diff --git a/code/ryzom/client/src/interface_v3/ctrl_base_button.cpp b/code/ryzom/client/src/interface_v3/ctrl_base_button.cpp index b2f03b98b..12db635bf 100644 --- a/code/ryzom/client/src/interface_v3/ctrl_base_button.cpp +++ b/code/ryzom/client/src/interface_v3/ctrl_base_button.cpp @@ -20,7 +20,7 @@ #include "ctrl_base_button.h" #include "interface_manager.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" #include "../time_client.h" #include "lua_ihm.h" diff --git a/code/ryzom/client/src/interface_v3/ctrl_button.cpp b/code/ryzom/client/src/interface_v3/ctrl_button.cpp index fd1ba049b..b977c1c29 100644 --- a/code/ryzom/client/src/interface_v3/ctrl_button.cpp +++ b/code/ryzom/client/src/interface_v3/ctrl_button.cpp @@ -21,7 +21,7 @@ #include "ctrl_button.h" #include "interface_manager.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" // ---------------------------------------------------------------------------- using namespace std; diff --git a/code/ryzom/client/src/interface_v3/ctrl_col_pick.cpp b/code/ryzom/client/src/interface_v3/ctrl_col_pick.cpp index 31d64af31..ece811773 100644 --- a/code/ryzom/client/src/interface_v3/ctrl_col_pick.cpp +++ b/code/ryzom/client/src/interface_v3/ctrl_col_pick.cpp @@ -19,7 +19,7 @@ #include "stdpch.h" #include "interface_manager.h" #include "ctrl_col_pick.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" using namespace NLMISC; using namespace std; diff --git a/code/ryzom/client/src/interface_v3/ctrl_scroll.cpp b/code/ryzom/client/src/interface_v3/ctrl_scroll.cpp index 652bd5ed7..a95cda085 100644 --- a/code/ryzom/client/src/interface_v3/ctrl_scroll.cpp +++ b/code/ryzom/client/src/interface_v3/ctrl_scroll.cpp @@ -19,7 +19,7 @@ #include "stdpch.h" #include "interface_manager.h" #include "ctrl_scroll.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" #include "group_menu.h" #include "lua_ihm.h" diff --git a/code/ryzom/client/src/interface_v3/ctrl_text_button.cpp b/code/ryzom/client/src/interface_v3/ctrl_text_button.cpp index 1e8c7c07b..de302dbb1 100644 --- a/code/ryzom/client/src/interface_v3/ctrl_text_button.cpp +++ b/code/ryzom/client/src/interface_v3/ctrl_text_button.cpp @@ -22,7 +22,7 @@ #include "ctrl_text_button.h" #include "interface_manager.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" #include "view_text.h" #include "view_text_id.h" #include "group_container.h" diff --git a/code/ryzom/client/src/interface_v3/ctrl_tooltip.cpp b/code/ryzom/client/src/interface_v3/ctrl_tooltip.cpp index 71bd4ab8c..5e276d886 100644 --- a/code/ryzom/client/src/interface_v3/ctrl_tooltip.cpp +++ b/code/ryzom/client/src/interface_v3/ctrl_tooltip.cpp @@ -21,7 +21,7 @@ #include "ctrl_tooltip.h" #include "interface_manager.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" // ---------------------------------------------------------------------------- using namespace std; diff --git a/code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp b/code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp index ce551a0b7..6f4eb1391 100644 --- a/code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp +++ b/code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp @@ -43,7 +43,7 @@ #include "sbrick_manager.h" #include "sphrase_manager.h" #include "../client_sheets/sphrase_sheet.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" #include "lua_ihm.h" #include "../r2/editor.h" diff --git a/code/ryzom/client/src/interface_v3/dbgroup_combo_box.cpp b/code/ryzom/client/src/interface_v3/dbgroup_combo_box.cpp index 0834fd392..cbf6da945 100644 --- a/code/ryzom/client/src/interface_v3/dbgroup_combo_box.cpp +++ b/code/ryzom/client/src/interface_v3/dbgroup_combo_box.cpp @@ -19,7 +19,7 @@ #include "stdpch.h" #include "dbgroup_combo_box.h" #include "group_menu.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" #include "interface_manager.h" #include "ctrl_button.h" #include "action_handler.h" diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp index 40e62346f..8990abf42 100644 --- a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp +++ b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp @@ -20,7 +20,7 @@ #include "dbgroup_list_sheet_text.h" #include "group_container.h" #include "interface_manager.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" #include "../sheet_manager.h" #include "ctrl_button.h" #include "view_text.h" diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_brick_composition.cpp b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_brick_composition.cpp index 0ed457f43..bc205ba00 100644 --- a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_brick_composition.cpp +++ b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_brick_composition.cpp @@ -17,7 +17,7 @@ #include "stdpch.h" #include "dbgroup_list_sheet_text_brick_composition.h" #include "../client_sheets/sbrick_sheet.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" #include "../string_manager_client.h" #include "sbrick_manager.h" diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_share.cpp b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_share.cpp index e31d052cc..e4efa0f52 100644 --- a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_share.cpp +++ b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_share.cpp @@ -19,7 +19,7 @@ #include "stdpch.h" #include "dbgroup_list_sheet_text_share.h" #include "../client_sheets/sbrick_sheet.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" #include "interface_manager.h" #include "view_bitmap.h" #include "ctrl_text_button.h" diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp index 7511ee8ef..24235085e 100644 --- a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp +++ b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp @@ -20,7 +20,7 @@ #include "dbgroup_list_sheet_trade.h" #include "interface_manager.h" #include "inventory_manager.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" #include "../sheet_manager.h" #include "ctrl_button.h" #include "view_text.h" diff --git a/code/ryzom/client/src/interface_v3/dbview_bar.cpp b/code/ryzom/client/src/interface_v3/dbview_bar.cpp index 512ca8256..49f477923 100644 --- a/code/ryzom/client/src/interface_v3/dbview_bar.cpp +++ b/code/ryzom/client/src/interface_v3/dbview_bar.cpp @@ -21,7 +21,7 @@ #include "dbview_bar.h" #include "interface_manager.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" using namespace std; diff --git a/code/ryzom/client/src/interface_v3/dbview_bar3.cpp b/code/ryzom/client/src/interface_v3/dbview_bar3.cpp index da20ae57f..490952fb9 100644 --- a/code/ryzom/client/src/interface_v3/dbview_bar3.cpp +++ b/code/ryzom/client/src/interface_v3/dbview_bar3.cpp @@ -21,7 +21,7 @@ #include "dbview_bar3.h" #include "interface_manager.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" using namespace std; using namespace NL3D; diff --git a/code/ryzom/client/src/interface_v3/dbview_digit.cpp b/code/ryzom/client/src/interface_v3/dbview_digit.cpp index 19c424ac8..86e79783d 100644 --- a/code/ryzom/client/src/interface_v3/dbview_digit.cpp +++ b/code/ryzom/client/src/interface_v3/dbview_digit.cpp @@ -20,7 +20,7 @@ #include "dbview_digit.h" #include "interface_manager.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" using namespace std; using namespace NL3D; diff --git a/code/ryzom/client/src/interface_v3/dbview_number.cpp b/code/ryzom/client/src/interface_v3/dbview_number.cpp index 8ca6e7c94..1463fcc3f 100644 --- a/code/ryzom/client/src/interface_v3/dbview_number.cpp +++ b/code/ryzom/client/src/interface_v3/dbview_number.cpp @@ -20,7 +20,7 @@ #include "dbview_number.h" #include "interface_manager.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" using namespace std; using namespace NL3D; diff --git a/code/ryzom/client/src/interface_v3/dbview_quantity.cpp b/code/ryzom/client/src/interface_v3/dbview_quantity.cpp index 915fcebce..6f95ddbc9 100644 --- a/code/ryzom/client/src/interface_v3/dbview_quantity.cpp +++ b/code/ryzom/client/src/interface_v3/dbview_quantity.cpp @@ -21,7 +21,7 @@ #include "dbview_quantity.h" #include "interface_manager.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" using namespace std; using namespace NL3D; diff --git a/code/ryzom/client/src/interface_v3/group_career.cpp b/code/ryzom/client/src/interface_v3/group_career.cpp index f7dbe2cc9..04916f007 100644 --- a/code/ryzom/client/src/interface_v3/group_career.cpp +++ b/code/ryzom/client/src/interface_v3/group_career.cpp @@ -23,7 +23,7 @@ #include "interface_element.h" //#include "game_share/jobs.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" using namespace std; diff --git a/code/ryzom/client/src/interface_v3/group_compas.cpp b/code/ryzom/client/src/interface_v3/group_compas.cpp index 0fa2b30e7..c2589310b 100644 --- a/code/ryzom/client/src/interface_v3/group_compas.cpp +++ b/code/ryzom/client/src/interface_v3/group_compas.cpp @@ -18,7 +18,7 @@ #include "stdpch.h" // -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" // #include "group_compas.h" #include "interface_3d_scene.h" diff --git a/code/ryzom/client/src/interface_v3/group_container.cpp b/code/ryzom/client/src/interface_v3/group_container.cpp index eb98fb67a..e494af8f2 100644 --- a/code/ryzom/client/src/interface_v3/group_container.cpp +++ b/code/ryzom/client/src/interface_v3/group_container.cpp @@ -22,7 +22,7 @@ #include "group_container.h" #include "interface_manager.h" #include "interface_options.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" #include "action_handler.h" #include "../time_client.h" #include "group_editbox.h" diff --git a/code/ryzom/client/src/interface_v3/group_editbox.cpp b/code/ryzom/client/src/interface_v3/group_editbox.cpp index 5bc516f47..fe423a9de 100644 --- a/code/ryzom/client/src/interface_v3/group_editbox.cpp +++ b/code/ryzom/client/src/interface_v3/group_editbox.cpp @@ -23,7 +23,7 @@ #include "input_handler_manager.h" #include "nel/misc/command.h" #include "view_text.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" #include "interface_options.h" #include "dbctrl_sheet.h" #include "group_container.h" diff --git a/code/ryzom/client/src/interface_v3/group_frame.cpp b/code/ryzom/client/src/interface_v3/group_frame.cpp index 4b7e5cdcc..54b95476e 100644 --- a/code/ryzom/client/src/interface_v3/group_frame.cpp +++ b/code/ryzom/client/src/interface_v3/group_frame.cpp @@ -21,7 +21,7 @@ #include "group_frame.h" #include "interface_manager.h" #include "interface_element.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" using namespace std; using namespace NLMISC; diff --git a/code/ryzom/client/src/interface_v3/group_html_cs.cpp b/code/ryzom/client/src/interface_v3/group_html_cs.cpp index 66d884437..a02231132 100644 --- a/code/ryzom/client/src/interface_v3/group_html_cs.cpp +++ b/code/ryzom/client/src/interface_v3/group_html_cs.cpp @@ -22,7 +22,7 @@ #include "stdpch.h" #include "group_html_cs.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" #include "../client_cfg.h" // used for login cookie to be sent to the web server diff --git a/code/ryzom/client/src/interface_v3/group_html_forum.cpp b/code/ryzom/client/src/interface_v3/group_html_forum.cpp index b0fd96642..96e711500 100644 --- a/code/ryzom/client/src/interface_v3/group_html_forum.cpp +++ b/code/ryzom/client/src/interface_v3/group_html_forum.cpp @@ -22,7 +22,7 @@ #include "stdpch.h" #include "group_html_forum.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" #include "../client_cfg.h" #include "../user_entity.h" #include "guild_manager.h" diff --git a/code/ryzom/client/src/interface_v3/group_html_mail.cpp b/code/ryzom/client/src/interface_v3/group_html_mail.cpp index 2c0d9d225..ecc62367b 100644 --- a/code/ryzom/client/src/interface_v3/group_html_mail.cpp +++ b/code/ryzom/client/src/interface_v3/group_html_mail.cpp @@ -22,7 +22,7 @@ #include "stdpch.h" #include "group_html_mail.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" #include "../client_cfg.h" #include "../user_entity.h" #include "interface_manager.h" diff --git a/code/ryzom/client/src/interface_v3/group_html_qcm.cpp b/code/ryzom/client/src/interface_v3/group_html_qcm.cpp index 665a4ba9e..4414556b0 100644 --- a/code/ryzom/client/src/interface_v3/group_html_qcm.cpp +++ b/code/ryzom/client/src/interface_v3/group_html_qcm.cpp @@ -22,7 +22,7 @@ #include "stdpch.h" #include "group_html_qcm.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" #include "../client_cfg.h" #include "interface_manager.h" #include "../user_entity.h" diff --git a/code/ryzom/client/src/interface_v3/group_html_webig.cpp b/code/ryzom/client/src/interface_v3/group_html_webig.cpp index 4a13d9806..5c9a423f3 100644 --- a/code/ryzom/client/src/interface_v3/group_html_webig.cpp +++ b/code/ryzom/client/src/interface_v3/group_html_webig.cpp @@ -17,7 +17,7 @@ #include "stdpch.h" #include "group_html_webig.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" #include "../client_cfg.h" #include "../user_entity.h" #include "interface_manager.h" diff --git a/code/ryzom/client/src/interface_v3/group_in_scene.cpp b/code/ryzom/client/src/interface_v3/group_in_scene.cpp index b4e448458..9cc2a0871 100644 --- a/code/ryzom/client/src/interface_v3/group_in_scene.cpp +++ b/code/ryzom/client/src/interface_v3/group_in_scene.cpp @@ -24,7 +24,7 @@ #include "group_in_scene.h" #include "interface_manager.h" #include "view_renderer.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" using namespace std; using namespace NLMISC; diff --git a/code/ryzom/client/src/interface_v3/group_list.cpp b/code/ryzom/client/src/interface_v3/group_list.cpp index 7ccd5c51c..7a68be9d5 100644 --- a/code/ryzom/client/src/interface_v3/group_list.cpp +++ b/code/ryzom/client/src/interface_v3/group_list.cpp @@ -29,7 +29,7 @@ #include "lua_ihm.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" using namespace std; using namespace NLMISC; diff --git a/code/ryzom/client/src/interface_v3/group_map.cpp b/code/ryzom/client/src/interface_v3/group_map.cpp index 51d07bb88..e1d7b4ecd 100644 --- a/code/ryzom/client/src/interface_v3/group_map.cpp +++ b/code/ryzom/client/src/interface_v3/group_map.cpp @@ -38,7 +38,7 @@ #include "../global.h" #include "ctrl_quad.h" // -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" #include "game_share/mission_desc.h" #include "game_share/inventories.h" #include "game_share/animal_type.h" diff --git a/code/ryzom/client/src/interface_v3/group_menu.cpp b/code/ryzom/client/src/interface_v3/group_menu.cpp index 22ff2b07c..8a1051e52 100644 --- a/code/ryzom/client/src/interface_v3/group_menu.cpp +++ b/code/ryzom/client/src/interface_v3/group_menu.cpp @@ -21,7 +21,7 @@ #include "interface_manager.h" #include "interface_expr.h" #include "group_menu.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" #include "view_bitmap.h" #include "action_handler.h" // Just for getAllParams #include "lua_ihm.h" diff --git a/code/ryzom/client/src/interface_v3/group_modal.cpp b/code/ryzom/client/src/interface_v3/group_modal.cpp index 8055e66b2..bbd6a8015 100644 --- a/code/ryzom/client/src/interface_v3/group_modal.cpp +++ b/code/ryzom/client/src/interface_v3/group_modal.cpp @@ -21,7 +21,7 @@ #include "group_modal.h" #include "interface_manager.h" #include "interface_element.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" using namespace std; diff --git a/code/ryzom/client/src/interface_v3/group_paragraph.cpp b/code/ryzom/client/src/interface_v3/group_paragraph.cpp index aad604d24..42def29d6 100644 --- a/code/ryzom/client/src/interface_v3/group_paragraph.cpp +++ b/code/ryzom/client/src/interface_v3/group_paragraph.cpp @@ -30,7 +30,7 @@ #include "nel/misc/i_xml.h" #include "nel/misc/i18n.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" using namespace std; using namespace NLMISC; diff --git a/code/ryzom/client/src/interface_v3/group_phrase_skill_filter.cpp b/code/ryzom/client/src/interface_v3/group_phrase_skill_filter.cpp index beb88e2df..8494e7213 100644 --- a/code/ryzom/client/src/interface_v3/group_phrase_skill_filter.cpp +++ b/code/ryzom/client/src/interface_v3/group_phrase_skill_filter.cpp @@ -26,7 +26,7 @@ #include "game_share/skills.h" #include "game_share/brick_families.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" #include "skill_manager.h" #include "sbrick_manager.h" diff --git a/code/ryzom/client/src/interface_v3/group_quick_help.cpp b/code/ryzom/client/src/interface_v3/group_quick_help.cpp index 210c7110e..3f829c8ef 100644 --- a/code/ryzom/client/src/interface_v3/group_quick_help.cpp +++ b/code/ryzom/client/src/interface_v3/group_quick_help.cpp @@ -27,7 +27,7 @@ #include "../libwww.h" #include "interface_manager.h" #include "action_handler.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" #include "../client_cfg.h" diff --git a/code/ryzom/client/src/interface_v3/group_skills.cpp b/code/ryzom/client/src/interface_v3/group_skills.cpp index 611ecb738..645149b46 100644 --- a/code/ryzom/client/src/interface_v3/group_skills.cpp +++ b/code/ryzom/client/src/interface_v3/group_skills.cpp @@ -29,7 +29,7 @@ #include "dbview_bar.h" #include "game_share/skills.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" #include "skill_manager.h" #include "nel/misc/i_xml.h" diff --git a/code/ryzom/client/src/interface_v3/group_tab.cpp b/code/ryzom/client/src/interface_v3/group_tab.cpp index 27e6aa3a4..d42855464 100644 --- a/code/ryzom/client/src/interface_v3/group_tab.cpp +++ b/code/ryzom/client/src/interface_v3/group_tab.cpp @@ -19,7 +19,7 @@ #include "stdpch.h" #include "group_tab.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" #include "../time_client.h" #include "interface_manager.h" diff --git a/code/ryzom/client/src/interface_v3/group_table.cpp b/code/ryzom/client/src/interface_v3/group_table.cpp index 48ec926a4..f31d5c6ac 100644 --- a/code/ryzom/client/src/interface_v3/group_table.cpp +++ b/code/ryzom/client/src/interface_v3/group_table.cpp @@ -29,7 +29,7 @@ #include "nel/misc/i_xml.h" #include "nel/misc/i18n.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" using namespace std; using namespace NLMISC; diff --git a/code/ryzom/client/src/interface_v3/group_tree.cpp b/code/ryzom/client/src/interface_v3/group_tree.cpp index 3a09241b6..9eb02ad10 100644 --- a/code/ryzom/client/src/interface_v3/group_tree.cpp +++ b/code/ryzom/client/src/interface_v3/group_tree.cpp @@ -30,7 +30,7 @@ #include "nel/misc/i_xml.h" #include "nel/misc/i18n.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" using namespace std; using namespace NLMISC; diff --git a/code/ryzom/client/src/interface_v3/input_handler_manager.cpp b/code/ryzom/client/src/interface_v3/input_handler_manager.cpp index 3ece9f125..c57346655 100644 --- a/code/ryzom/client/src/interface_v3/input_handler_manager.cpp +++ b/code/ryzom/client/src/interface_v3/input_handler_manager.cpp @@ -22,7 +22,7 @@ #include "nel/misc/file.h" #include "nel/misc/game_device_events.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" #include "input_handler_manager.h" #include "interface_manager.h" diff --git a/code/ryzom/client/src/interface_v3/interface_3d_scene.cpp b/code/ryzom/client/src/interface_v3/interface_3d_scene.cpp index 324edf91a..90e4aebc9 100644 --- a/code/ryzom/client/src/interface_v3/interface_3d_scene.cpp +++ b/code/ryzom/client/src/interface_v3/interface_3d_scene.cpp @@ -29,7 +29,7 @@ #include "nel/3d/u_particle_system_instance.h" #include "nel/3d/u_animation_set.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" #include "action_handler.h" #include "lua_ihm.h" diff --git a/code/ryzom/client/src/interface_v3/interface_anim.cpp b/code/ryzom/client/src/interface_v3/interface_anim.cpp index 0594fe22b..18e3f9b08 100644 --- a/code/ryzom/client/src/interface_v3/interface_anim.cpp +++ b/code/ryzom/client/src/interface_v3/interface_anim.cpp @@ -22,7 +22,7 @@ #include "interface_anim.h" #include "interface_manager.h" #include "interface_expr.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" #include "action_handler.h" #include "../time_client.h" diff --git a/code/ryzom/client/src/interface_v3/interface_ddx.cpp b/code/ryzom/client/src/interface_v3/interface_ddx.cpp index b987f9cf9..3e363225c 100644 --- a/code/ryzom/client/src/interface_v3/interface_ddx.cpp +++ b/code/ryzom/client/src/interface_v3/interface_ddx.cpp @@ -25,7 +25,7 @@ #include "group_modal.h" #include "../client_cfg.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" // using namespace std; diff --git a/code/ryzom/client/src/interface_v3/interface_element.cpp b/code/ryzom/client/src/interface_v3/interface_element.cpp index 6db901b10..7edc093ae 100644 --- a/code/ryzom/client/src/interface_v3/interface_element.cpp +++ b/code/ryzom/client/src/interface_v3/interface_element.cpp @@ -24,7 +24,7 @@ #include "group_container.h" #include "../misc.h" #include "interface_link.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" #include "lua_ihm.h" #include "nel/misc/mem_stream.h" // diff --git a/code/ryzom/client/src/interface_v3/interface_group.cpp b/code/ryzom/client/src/interface_v3/interface_group.cpp index 91022dedb..a088b2c0c 100644 --- a/code/ryzom/client/src/interface_v3/interface_group.cpp +++ b/code/ryzom/client/src/interface_v3/interface_group.cpp @@ -20,7 +20,7 @@ #include "interface_group.h" #include "interface_manager.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" #include "group_container.h" #include "group_editbox.h" #include "group_scrolltext.h" diff --git a/code/ryzom/client/src/interface_v3/interface_observer.h b/code/ryzom/client/src/interface_v3/interface_observer.h index 645d8195c..b90c84f6b 100644 --- a/code/ryzom/client/src/interface_v3/interface_observer.h +++ b/code/ryzom/client/src/interface_v3/interface_observer.h @@ -21,7 +21,7 @@ #include "nel/misc/types_nl.h" #include "interface_manager.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" /** diff --git a/code/ryzom/client/src/interface_v3/interface_options.cpp b/code/ryzom/client/src/interface_v3/interface_options.cpp index 0a8135f71..3a06da8f5 100644 --- a/code/ryzom/client/src/interface_v3/interface_options.cpp +++ b/code/ryzom/client/src/interface_v3/interface_options.cpp @@ -22,7 +22,7 @@ #include "interface_options.h" #include "interface_manager.h" #include "group_menu.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" #include "../net_manager.h" #include "../sheet_manager.h" #include "../entity_animation_manager.h" diff --git a/code/ryzom/client/src/interface_v3/interface_parser.cpp b/code/ryzom/client/src/interface_v3/interface_parser.cpp index 56b95be88..b01c0e8d1 100644 --- a/code/ryzom/client/src/interface_v3/interface_parser.cpp +++ b/code/ryzom/client/src/interface_v3/interface_parser.cpp @@ -27,7 +27,7 @@ #include "nel/misc/factory.h" #include "nel/misc/big_file.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" #include "interface_parser.h" #include "interface_observer.h" diff --git a/code/ryzom/client/src/interface_v3/skill_manager.cpp b/code/ryzom/client/src/interface_v3/skill_manager.cpp index 9d59c5bcb..677084e5e 100644 --- a/code/ryzom/client/src/interface_v3/skill_manager.cpp +++ b/code/ryzom/client/src/interface_v3/skill_manager.cpp @@ -20,7 +20,7 @@ #include "skill_manager.h" #include "interface_manager.h" #include "game_share/skills.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" #include "game_share/character_title.h" #include "game_share/fame.h" #include "../sheet_manager.h" diff --git a/code/ryzom/client/src/interface_v3/view_bitmap.cpp b/code/ryzom/client/src/interface_v3/view_bitmap.cpp index dba18c194..3ec51b270 100644 --- a/code/ryzom/client/src/interface_v3/view_bitmap.cpp +++ b/code/ryzom/client/src/interface_v3/view_bitmap.cpp @@ -22,7 +22,7 @@ #include "view_bitmap.h" #include "interface_manager.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" #include "group_container.h" // ---------------------------------------------------------------------------- diff --git a/code/ryzom/client/src/interface_v3/view_bitmap_combo.cpp b/code/ryzom/client/src/interface_v3/view_bitmap_combo.cpp index 9085643a5..d9eb19957 100644 --- a/code/ryzom/client/src/interface_v3/view_bitmap_combo.cpp +++ b/code/ryzom/client/src/interface_v3/view_bitmap_combo.cpp @@ -20,7 +20,7 @@ #include "view_bitmap_combo.h" #include "interface_manager.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" using namespace NLMISC; diff --git a/code/ryzom/client/src/interface_v3/view_bitmap_faber_mp.cpp b/code/ryzom/client/src/interface_v3/view_bitmap_faber_mp.cpp index dca41c35c..ff7b0fa70 100644 --- a/code/ryzom/client/src/interface_v3/view_bitmap_faber_mp.cpp +++ b/code/ryzom/client/src/interface_v3/view_bitmap_faber_mp.cpp @@ -19,7 +19,7 @@ #include "view_bitmap_faber_mp.h" #include "interface_manager.h" #include "../sheet_manager.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" extern CSheetManager SheetMngr; diff --git a/code/ryzom/client/src/interface_v3/view_pointer.cpp b/code/ryzom/client/src/interface_v3/view_pointer.cpp index e6e6dcaa2..092054ee2 100644 --- a/code/ryzom/client/src/interface_v3/view_pointer.cpp +++ b/code/ryzom/client/src/interface_v3/view_pointer.cpp @@ -28,7 +28,7 @@ #include "group_html.h" #include "group_map.h" // -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" // #include "group_container.h" #include "interface_3d_scene.h" diff --git a/code/ryzom/client/src/interface_v3/view_radar.cpp b/code/ryzom/client/src/interface_v3/view_radar.cpp index f0f613587..7f3d222b4 100644 --- a/code/ryzom/client/src/interface_v3/view_radar.cpp +++ b/code/ryzom/client/src/interface_v3/view_radar.cpp @@ -22,7 +22,7 @@ #include "view_radar.h" #include "interface_manager.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" #include "group_container.h" #include "../npc_icon.h" #include "nel/misc/fast_floor.h" diff --git a/code/ryzom/client/src/interface_v3/view_text.cpp b/code/ryzom/client/src/interface_v3/view_text.cpp index 4714c8208..4bfd91a39 100644 --- a/code/ryzom/client/src/interface_v3/view_text.cpp +++ b/code/ryzom/client/src/interface_v3/view_text.cpp @@ -26,7 +26,7 @@ #include "group_container.h" // CCtrlResizer #include "ctrl_tooltip.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" #include "lua_ihm.h" #include "lua_ihm.h" diff --git a/code/ryzom/client/src/interface_v3/view_text_formated.cpp b/code/ryzom/client/src/interface_v3/view_text_formated.cpp index 5b2308f21..6d3513fce 100644 --- a/code/ryzom/client/src/interface_v3/view_text_formated.cpp +++ b/code/ryzom/client/src/interface_v3/view_text_formated.cpp @@ -23,7 +23,7 @@ #include "../string_manager_client.h" #include "action_handler_misc.h" // -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" // #include "nel/misc/i18n.h" diff --git a/code/ryzom/client/src/interface_v3/view_text_id.cpp b/code/ryzom/client/src/interface_v3/view_text_id.cpp index 2663e848d..326f67362 100644 --- a/code/ryzom/client/src/interface_v3/view_text_id.cpp +++ b/code/ryzom/client/src/interface_v3/view_text_id.cpp @@ -22,7 +22,7 @@ #include "interface_manager.h" #include "../string_manager_client.h" #include "view_text_id.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" #include "../client_cfg.h" #include "nel/misc/algo.h" diff --git a/code/ryzom/client/src/interface_v3/view_text_id_formated.cpp b/code/ryzom/client/src/interface_v3/view_text_id_formated.cpp index 29d360a4e..70bacaa98 100644 --- a/code/ryzom/client/src/interface_v3/view_text_id_formated.cpp +++ b/code/ryzom/client/src/interface_v3/view_text_id_formated.cpp @@ -22,7 +22,7 @@ #include "../string_manager_client.h" #include "../user_entity.h" #include "../entities.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" using namespace STRING_MANAGER; diff --git a/code/ryzom/common/src/game_share/generic_xml_msg_mngr.cpp b/code/ryzom/common/src/game_share/generic_xml_msg_mngr.cpp index 8328186a9..0b17474d7 100644 --- a/code/ryzom/common/src/game_share/generic_xml_msg_mngr.cpp +++ b/code/ryzom/common/src/game_share/generic_xml_msg_mngr.cpp @@ -20,7 +20,7 @@ #include "generic_xml_msg_mngr.h" #include "nel/misc/file.h" -#include "xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" using namespace std; using namespace NLMISC; diff --git a/code/ryzom/common/src/game_share/ring_access.cpp b/code/ryzom/common/src/game_share/ring_access.cpp index 9eda38010..3c04d0bb5 100644 --- a/code/ryzom/common/src/game_share/ring_access.cpp +++ b/code/ryzom/common/src/game_share/ring_access.cpp @@ -32,7 +32,7 @@ #include "nel/misc/o_xml.h" #include "nel/misc/i_xml.h" #include "nel/misc/algo.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" diff --git a/code/ryzom/server/src/entities_game_service/player_manager/cdb_branch.cpp b/code/ryzom/server/src/entities_game_service/player_manager/cdb_branch.cpp index f95777359..c622310e5 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/cdb_branch.cpp +++ b/code/ryzom/server/src/entities_game_service/player_manager/cdb_branch.cpp @@ -30,7 +30,7 @@ ////////////// #include "player_manager/cdb_branch.h" #include "player_manager/cdb_leaf.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" #include //////////////// diff --git a/code/ryzom/server/src/entities_game_service/player_manager/cdb_leaf.cpp b/code/ryzom/server/src/entities_game_service/player_manager/cdb_leaf.cpp index fc26bb83a..22b53b3b1 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/cdb_leaf.cpp +++ b/code/ryzom/server/src/entities_game_service/player_manager/cdb_leaf.cpp @@ -29,7 +29,7 @@ // Includes // ////////////// #include "player_manager/cdb_leaf.h" -#include "game_share/xml_auto_ptr.h" +#include "nel/misc/xml_auto_ptr.h" #include