From 227868d98a6cd4cd79a2017b1050a105b33ce6b4 Mon Sep 17 00:00:00 2001 From: dfighter1985 Date: Wed, 23 May 2012 04:13:58 +0200 Subject: [PATCH] CHANGED: #1471 Moved the previously refactored code to the NELGUI library. --- .../interface_v3 => nel/include/nel/gui}/lua_ihm.h | 1 + .../include/nel/gui}/lua_manager.h | 0 .../include/nel/gui}/lua_object.h | 0 .../interface_v3 => nel/include/nel/gui}/reflect.h | 2 +- .../src/interface_v3 => nel/src/gui}/lua_ihm.cpp | 14 ++++++++++---- .../interface_v3 => nel/src/gui}/lua_manager.cpp | 2 +- .../interface_v3 => nel/src/gui}/lua_object.cpp | 4 ++-- .../src/interface_v3 => nel/src/gui}/reflect.cpp | 4 ++-- code/ryzom/client/src/commands.cpp | 6 +++--- code/ryzom/client/src/debug_client.cpp | 2 +- code/ryzom/client/src/decal_anim.cpp | 4 ++-- code/ryzom/client/src/init_main_loop.cpp | 2 +- .../client/src/interface_v3/ctrl_base_button.cpp | 2 +- code/ryzom/client/src/interface_v3/ctrl_scroll.cpp | 2 +- .../client/src/interface_v3/ctrl_text_button.cpp | 2 +- .../ryzom/client/src/interface_v3/dbctrl_sheet.cpp | 4 ++-- code/ryzom/client/src/interface_v3/dbctrl_sheet.h | 2 +- .../client/src/interface_v3/dbgroup_combo_box.cpp | 4 ++-- .../client/src/interface_v3/group_container.cpp | 2 +- .../client/src/interface_v3/group_editbox.cpp | 2 +- .../ryzom/client/src/interface_v3/group_header.cpp | 2 +- code/ryzom/client/src/interface_v3/group_html.cpp | 2 +- code/ryzom/client/src/interface_v3/group_list.cpp | 2 +- code/ryzom/client/src/interface_v3/group_menu.cpp | 2 +- code/ryzom/client/src/interface_v3/group_tab.cpp | 2 +- code/ryzom/client/src/interface_v3/group_tree.cpp | 2 +- .../client/src/interface_v3/interface_3d_scene.cpp | 2 +- .../client/src/interface_v3/interface_element.cpp | 2 +- .../client/src/interface_v3/interface_element.h | 2 +- .../client/src/interface_v3/interface_group.cpp | 4 ++-- .../client/src/interface_v3/interface_link.cpp | 2 +- .../client/src/interface_v3/interface_manager.cpp | 2 +- .../client/src/interface_v3/interface_parser.cpp | 4 ++-- .../client/src/interface_v3/lua_ihm_ryzom.cpp | 12 ++++++------ code/ryzom/client/src/interface_v3/lua_ihm_ryzom.h | 2 +- .../interface_v3/register_interface_elements.cpp | 2 +- .../client/src/interface_v3/sphrase_manager.cpp | 2 +- code/ryzom/client/src/interface_v3/view_text.cpp | 2 +- code/ryzom/client/src/main_loop.cpp | 4 ++-- code/ryzom/client/src/r2/config_var.h | 2 +- code/ryzom/client/src/r2/displayer_base.cpp | 2 +- code/ryzom/client/src/r2/displayer_lua.cpp | 2 +- code/ryzom/client/src/r2/displayer_lua.h | 2 +- code/ryzom/client/src/r2/displayer_visual.cpp | 2 +- .../client/src/r2/displayer_visual_entity.cpp | 2 +- code/ryzom/client/src/r2/displayer_visual_entity.h | 2 +- code/ryzom/client/src/r2/dmc/action_historic.cpp | 2 +- code/ryzom/client/src/r2/dmc/com_lua_module.cpp | 4 ++-- code/ryzom/client/src/r2/editor.cpp | 8 ++++---- code/ryzom/client/src/r2/editor.h | 2 +- .../client/src/r2/entity_custom_select_box.cpp | 2 +- .../ryzom/client/src/r2/entity_custom_select_box.h | 2 +- code/ryzom/client/src/r2/instance.cpp | 2 +- code/ryzom/client/src/r2/instance.h | 2 +- code/ryzom/client/src/r2/lua_event_forwarder.cpp | 2 +- code/ryzom/client/src/r2/object_factory_client.cpp | 2 +- code/ryzom/client/src/r2/object_factory_client.h | 2 +- code/ryzom/client/src/r2/palette_node.h | 2 +- code/ryzom/client/src/r2/tool.cpp | 2 +- code/ryzom/client/src/r2/tool_choose_pos_lua.h | 2 +- code/ryzom/client/src/r2/tool_create_entity.cpp | 2 +- code/ryzom/client/src/r2/tool_pick.cpp | 2 +- code/ryzom/client/src/release.cpp | 2 +- code/ryzom/client/src/session_browser_impl.cpp | 4 ++-- 64 files changed, 91 insertions(+), 84 deletions(-) rename code/{ryzom/client/src/interface_v3 => nel/include/nel/gui}/lua_ihm.h (97%) rename code/{ryzom/client/src/interface_v3 => nel/include/nel/gui}/lua_manager.h (100%) rename code/{ryzom/client/src/interface_v3 => nel/include/nel/gui}/lua_object.h (100%) rename code/{ryzom/client/src/interface_v3 => nel/include/nel/gui}/reflect.h (97%) rename code/{ryzom/client/src/interface_v3 => nel/src/gui}/lua_ihm.cpp (95%) rename code/{ryzom/client/src/interface_v3 => nel/src/gui}/lua_manager.cpp (93%) rename code/{ryzom/client/src/interface_v3 => nel/src/gui}/lua_object.cpp (96%) rename code/{ryzom/client/src/interface_v3 => nel/src/gui}/reflect.cpp (96%) diff --git a/code/ryzom/client/src/interface_v3/lua_ihm.h b/code/nel/include/nel/gui/lua_ihm.h similarity index 97% rename from code/ryzom/client/src/interface_v3/lua_ihm.h rename to code/nel/include/nel/gui/lua_ihm.h index 557e984eb..8eecb2da5 100644 --- a/code/ryzom/client/src/interface_v3/lua_ihm.h +++ b/code/nel/include/nel/gui/lua_ihm.h @@ -26,6 +26,7 @@ namespace NLMISC { class CPolygon2D; class CVector2f; + class CRGBA; } class CReflectable; diff --git a/code/ryzom/client/src/interface_v3/lua_manager.h b/code/nel/include/nel/gui/lua_manager.h similarity index 100% rename from code/ryzom/client/src/interface_v3/lua_manager.h rename to code/nel/include/nel/gui/lua_manager.h diff --git a/code/ryzom/client/src/interface_v3/lua_object.h b/code/nel/include/nel/gui/lua_object.h similarity index 100% rename from code/ryzom/client/src/interface_v3/lua_object.h rename to code/nel/include/nel/gui/lua_object.h diff --git a/code/ryzom/client/src/interface_v3/reflect.h b/code/nel/include/nel/gui/reflect.h similarity index 97% rename from code/ryzom/client/src/interface_v3/reflect.h rename to code/nel/include/nel/gui/reflect.h index 6fbb8097f..64dbb5e2e 100644 --- a/code/ryzom/client/src/interface_v3/reflect.h +++ b/code/nel/include/nel/gui/reflect.h @@ -21,7 +21,7 @@ #define CL_REFLECT_H #include "nel/misc/rgba.h" -#include "lua_object.h" +#include "nel/gui/lua_object.h" // #include diff --git a/code/ryzom/client/src/interface_v3/lua_ihm.cpp b/code/nel/src/gui/lua_ihm.cpp similarity index 95% rename from code/ryzom/client/src/interface_v3/lua_ihm.cpp rename to code/nel/src/gui/lua_ihm.cpp index 5ee00ba4d..7ec02ee8a 100644 --- a/code/ryzom/client/src/interface_v3/lua_ihm.cpp +++ b/code/nel/src/gui/lua_ihm.cpp @@ -26,6 +26,10 @@ using namespace NLGUI; #undef assert #endif +#ifdef NL_OS_WINDOWS +#include +#endif + // Warning: cannot use namespace std, when using luabind #ifdef NL_OS_WINDOWS # ifndef NL_EXTENDED_FOR_SCOPE @@ -59,15 +63,17 @@ using namespace NLGUI; #endif -#include "lua_ihm.h" -#include "reflect.h" +#include "nel/gui/lua_ihm.h" +#include "nel/gui/reflect.h" #include "nel/misc/algo.h" #include "nel/misc/file.h" #include "nel/misc/i18n.h" #include "nel/misc/time_nl.h" -#include "lua_object.h" +#include "nel/misc/path.h" +#include "nel/misc/sstring.h" +#include "nel/gui/lua_object.h" #include "nel/misc/polygon.h" -#include "lua_manager.h" +#include "nel/gui/lua_manager.h" // *************************************************************************** diff --git a/code/ryzom/client/src/interface_v3/lua_manager.cpp b/code/nel/src/gui/lua_manager.cpp similarity index 93% rename from code/ryzom/client/src/interface_v3/lua_manager.cpp rename to code/nel/src/gui/lua_manager.cpp index ccfeb147a..f7606ec2b 100644 --- a/code/ryzom/client/src/interface_v3/lua_manager.cpp +++ b/code/nel/src/gui/lua_manager.cpp @@ -15,7 +15,7 @@ // along with this program. If not, see . -#include "lua_manager.h" +#include "nel/gui/lua_manager.h" #include "nel/gui/lua_helper.h" bool CLuaManager::debugLua = false; diff --git a/code/ryzom/client/src/interface_v3/lua_object.cpp b/code/nel/src/gui/lua_object.cpp similarity index 96% rename from code/ryzom/client/src/interface_v3/lua_object.cpp rename to code/nel/src/gui/lua_object.cpp index 109fce0a2..432e3c607 100644 --- a/code/ryzom/client/src/interface_v3/lua_object.cpp +++ b/code/nel/src/gui/lua_object.cpp @@ -15,8 +15,8 @@ // along with this program. If not, see . //#include "stdpch.h" -#include "lua_object.h" -#include "lua_ihm.h" +#include "nel/gui/lua_object.h" +#include "nel/gui/lua_ihm.h" //#include "lua_ihm_ryzom.h" #include "nel/gui/lua_helper.h" using namespace NLGUI; diff --git a/code/ryzom/client/src/interface_v3/reflect.cpp b/code/nel/src/gui/reflect.cpp similarity index 96% rename from code/ryzom/client/src/interface_v3/reflect.cpp rename to code/nel/src/gui/reflect.cpp index a99d26243..078fa3ef6 100644 --- a/code/ryzom/client/src/interface_v3/reflect.cpp +++ b/code/nel/src/gui/reflect.cpp @@ -15,7 +15,7 @@ // along with this program. If not, see . -#include "reflect.h" +#include "nel/gui/reflect.h" // Yoyo: Act like a singleton, else registerClass may crash. CReflectSystem::TClassMap *CReflectSystem::_ClassMap= NULL; @@ -129,7 +129,7 @@ const CReflectedProperty *CReflectable::getReflectedProperty(const std::string & } -#include "lua_manager.h" +#include "nel/gui/lua_manager.h" CReflectableRefPtrTarget::~CReflectableRefPtrTarget() { diff --git a/code/ryzom/client/src/commands.cpp b/code/ryzom/client/src/commands.cpp index 3f0855f87..a97b3e33c 100644 --- a/code/ryzom/client/src/commands.cpp +++ b/code/ryzom/client/src/commands.cpp @@ -92,14 +92,14 @@ #include "weather.h" #include "forage_source_cl.h" #include "connection.h" -#include "interface_v3/lua_object.h" -#include "interface_v3/lua_ihm.h" +#include "nel/gui/lua_object.h" +#include "nel/gui/lua_ihm.h" #include "interface_v3/lua_ihm_ryzom.h" #include "init.h" #include "interface_v3/people_interraction.h" #include "far_tp.h" #include "zone_util.h" -#include "interface_v3/lua_manager.h" +#include "nel/gui/lua_manager.h" // diff --git a/code/ryzom/client/src/debug_client.cpp b/code/ryzom/client/src/debug_client.cpp index c989a09f5..ff05c57cc 100644 --- a/code/ryzom/client/src/debug_client.cpp +++ b/code/ryzom/client/src/debug_client.cpp @@ -45,7 +45,7 @@ using namespace NLGUI; #include "character_cl.h" #include "r2/editor.h" #include "r2/dmc/client_edition_module.h" -#include "interface_v3/lua_manager.h" +#include "nel/gui/lua_manager.h" /////////// // USING // diff --git a/code/ryzom/client/src/decal_anim.cpp b/code/ryzom/client/src/decal_anim.cpp index 3e3b43172..3cafb48a7 100644 --- a/code/ryzom/client/src/decal_anim.cpp +++ b/code/ryzom/client/src/decal_anim.cpp @@ -18,8 +18,8 @@ // #include "decal_anim.h" #include "decal.h" -#include "interface_v3/lua_ihm.h" -#include "interface_v3/lua_object.h" +#include "nel/gui/lua_ihm.h" +#include "nel/gui/lua_object.h" // #include "nel/misc/vector_2f.h" #include "nel/misc/algo.h" diff --git a/code/ryzom/client/src/init_main_loop.cpp b/code/ryzom/client/src/init_main_loop.cpp index fafb7ef34..9b85367c3 100644 --- a/code/ryzom/client/src/init_main_loop.cpp +++ b/code/ryzom/client/src/init_main_loop.cpp @@ -104,7 +104,7 @@ #include "landscape_poly_drawer.h" #include "session_browser_impl.h" -#include "interface_v3/lua_manager.h" +#include "nel/gui/lua_manager.h" // ProgressBar steps in init main loop 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 045e9cf5c..233f362ae 100644 --- a/code/ryzom/client/src/interface_v3/ctrl_base_button.cpp +++ b/code/ryzom/client/src/interface_v3/ctrl_base_button.cpp @@ -23,7 +23,7 @@ #include "nel/misc/xml_auto_ptr.h" #include "../time_client.h" -#include "lua_ihm.h" +#include "nel/gui/lua_ihm.h" 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 f9abe1f3a..9b313ef75 100644 --- a/code/ryzom/client/src/interface_v3/ctrl_scroll.cpp +++ b/code/ryzom/client/src/interface_v3/ctrl_scroll.cpp @@ -22,7 +22,7 @@ #include "nel/misc/xml_auto_ptr.h" #include "group_menu.h" -#include "lua_ihm.h" +#include "nel/gui/lua_ihm.h" #include "lua_ihm_ryzom.h" using namespace NLMISC; 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 17e713992..9014ebdc8 100644 --- a/code/ryzom/client/src/interface_v3/ctrl_text_button.cpp +++ b/code/ryzom/client/src/interface_v3/ctrl_text_button.cpp @@ -26,7 +26,7 @@ #include "view_text.h" #include "view_text_id.h" #include "group_container.h" -#include "lua_ihm.h" +#include "nel/gui/lua_ihm.h" #include "lua_ihm_ryzom.h" diff --git a/code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp b/code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp index 06f16e379..e48178f77 100644 --- a/code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp +++ b/code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp @@ -44,13 +44,13 @@ #include "sphrase_manager.h" #include "../client_sheets/sphrase_sheet.h" #include "nel/misc/xml_auto_ptr.h" -#include "lua_ihm.h" +#include "nel/gui/lua_ihm.h" #include "lua_ihm_ryzom.h" #include "game_share/bot_chat_types.h" #include "../r2/editor.h" -#include "lua_manager.h" +#include "nel/gui/lua_manager.h" extern CSheetManager SheetMngr; diff --git a/code/ryzom/client/src/interface_v3/dbctrl_sheet.h b/code/ryzom/client/src/interface_v3/dbctrl_sheet.h index f904e34a8..7b6021415 100644 --- a/code/ryzom/client/src/interface_v3/dbctrl_sheet.h +++ b/code/ryzom/client/src/interface_v3/dbctrl_sheet.h @@ -23,7 +23,7 @@ #include "nel/misc/types_nl.h" #include "nel/misc/smart_ptr.h" // client -#include "reflect.h" +#include "nel/gui/reflect.h" #include "ctrl_base.h" #include "interface_expr.h" #include "action_handler.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 cbf6da945..3ccc65b7c 100644 --- a/code/ryzom/client/src/interface_v3/dbgroup_combo_box.cpp +++ b/code/ryzom/client/src/interface_v3/dbgroup_combo_box.cpp @@ -23,9 +23,9 @@ #include "interface_manager.h" #include "ctrl_button.h" #include "action_handler.h" -#include "lua_ihm.h" +#include "nel/gui/lua_ihm.h" -#include "lua_ihm.h" +#include "nel/gui/lua_ihm.h" using namespace std; using namespace NLMISC; diff --git a/code/ryzom/client/src/interface_v3/group_container.cpp b/code/ryzom/client/src/interface_v3/group_container.cpp index 3d76b1c80..8ea72a0df 100644 --- a/code/ryzom/client/src/interface_v3/group_container.cpp +++ b/code/ryzom/client/src/interface_v3/group_container.cpp @@ -28,7 +28,7 @@ #include "group_editbox.h" #include "view_text_formated.h" #include "view_text_id.h" -#include "lua_ihm.h" +#include "nel/gui/lua_ihm.h" #include "group_list.h" #include "ctrl_button.h" diff --git a/code/ryzom/client/src/interface_v3/group_editbox.cpp b/code/ryzom/client/src/interface_v3/group_editbox.cpp index 373eccb1c..a493e3abe 100644 --- a/code/ryzom/client/src/interface_v3/group_editbox.cpp +++ b/code/ryzom/client/src/interface_v3/group_editbox.cpp @@ -28,7 +28,7 @@ #include "dbctrl_sheet.h" #include "group_container.h" #include "../time_client.h" -#include "lua_ihm.h" +#include "nel/gui/lua_ihm.h" using namespace std; using namespace NLMISC; diff --git a/code/ryzom/client/src/interface_v3/group_header.cpp b/code/ryzom/client/src/interface_v3/group_header.cpp index eb8121ac3..93f418a65 100644 --- a/code/ryzom/client/src/interface_v3/group_header.cpp +++ b/code/ryzom/client/src/interface_v3/group_header.cpp @@ -21,7 +21,7 @@ #include "interface_manager.h" #include "group_container.h" #include "group_header.h" -#include "lua_ihm.h" +#include "nel/gui/lua_ihm.h" using namespace NLMISC; diff --git a/code/ryzom/client/src/interface_v3/group_html.cpp b/code/ryzom/client/src/interface_v3/group_html.cpp index c8a54f602..82a8d3828 100644 --- a/code/ryzom/client/src/interface_v3/group_html.cpp +++ b/code/ryzom/client/src/interface_v3/group_html.cpp @@ -43,7 +43,7 @@ extern "C" #include "view_bitmap.h" #include "../actions.h" #include "dbgroup_combo_box.h" -#include "lua_ihm.h" +#include "nel/gui/lua_ihm.h" #include "../time_client.h" #include "nel/misc/i18n.h" diff --git a/code/ryzom/client/src/interface_v3/group_list.cpp b/code/ryzom/client/src/interface_v3/group_list.cpp index 792958295..91c245851 100644 --- a/code/ryzom/client/src/interface_v3/group_list.cpp +++ b/code/ryzom/client/src/interface_v3/group_list.cpp @@ -25,7 +25,7 @@ #include "view_bitmap.h" #include "view_text_id.h" #include "group_container.h" -#include "lua_ihm.h" +#include "nel/gui/lua_ihm.h" #include "lua_ihm_ryzom.h" #include "nel/misc/xml_auto_ptr.h" diff --git a/code/ryzom/client/src/interface_v3/group_menu.cpp b/code/ryzom/client/src/interface_v3/group_menu.cpp index 782c1f943..2aaac86c6 100644 --- a/code/ryzom/client/src/interface_v3/group_menu.cpp +++ b/code/ryzom/client/src/interface_v3/group_menu.cpp @@ -24,7 +24,7 @@ #include "nel/misc/xml_auto_ptr.h" #include "view_bitmap.h" #include "action_handler.h" // Just for getAllParams -#include "lua_ihm.h" +#include "nel/gui/lua_ihm.h" #include "lua_ihm_ryzom.h" #include "nel/misc/i18n.h" diff --git a/code/ryzom/client/src/interface_v3/group_tab.cpp b/code/ryzom/client/src/interface_v3/group_tab.cpp index dd408b445..38a971890 100644 --- a/code/ryzom/client/src/interface_v3/group_tab.cpp +++ b/code/ryzom/client/src/interface_v3/group_tab.cpp @@ -23,7 +23,7 @@ #include "../time_client.h" #include "interface_manager.h" -#include "lua_ihm.h" +#include "nel/gui/lua_ihm.h" #include "lua_ihm_ryzom.h" diff --git a/code/ryzom/client/src/interface_v3/group_tree.cpp b/code/ryzom/client/src/interface_v3/group_tree.cpp index 9fe98e9c6..6eb9159e3 100644 --- a/code/ryzom/client/src/interface_v3/group_tree.cpp +++ b/code/ryzom/client/src/interface_v3/group_tree.cpp @@ -25,7 +25,7 @@ #include "view_text.h" #include "group_container.h" #include "action_handler.h" -#include "lua_ihm.h" +#include "nel/gui/lua_ihm.h" #include "lua_ihm_ryzom.h" #include "nel/misc/i_xml.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 2d654a7ba..52186b823 100644 --- a/code/ryzom/client/src/interface_v3/interface_3d_scene.cpp +++ b/code/ryzom/client/src/interface_v3/interface_3d_scene.cpp @@ -32,7 +32,7 @@ #include "nel/misc/xml_auto_ptr.h" #include "action_handler.h" -#include "lua_ihm.h" +#include "nel/gui/lua_ihm.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 85bc0ba0f..47a11c3c3 100644 --- a/code/ryzom/client/src/interface_v3/interface_element.cpp +++ b/code/ryzom/client/src/interface_v3/interface_element.cpp @@ -25,7 +25,7 @@ #include "../misc.h" #include "interface_link.h" #include "nel/misc/xml_auto_ptr.h" -#include "lua_ihm.h" +#include "nel/gui/lua_ihm.h" #include "lua_ihm_ryzom.h" #include "nel/misc/mem_stream.h" // diff --git a/code/ryzom/client/src/interface_v3/interface_element.h b/code/ryzom/client/src/interface_v3/interface_element.h index 963cbb050..27d6e4656 100644 --- a/code/ryzom/client/src/interface_v3/interface_element.h +++ b/code/ryzom/client/src/interface_v3/interface_element.h @@ -23,7 +23,7 @@ #include "nel/misc/string_mapper.h" #include "nel/misc/smart_ptr.h" #include "interface_property.h" -#include "reflect.h" +#include "nel/gui/reflect.h" // ---------------------------------------------------------------------------- class CInterfaceGroup; diff --git a/code/ryzom/client/src/interface_v3/interface_group.cpp b/code/ryzom/client/src/interface_v3/interface_group.cpp index f1db4917d..24fd256f3 100644 --- a/code/ryzom/client/src/interface_v3/interface_group.cpp +++ b/code/ryzom/client/src/interface_v3/interface_group.cpp @@ -24,12 +24,12 @@ #include "group_container.h" #include "group_editbox.h" #include "group_scrolltext.h" -#include "lua_ihm.h" +#include "nel/gui/lua_ihm.h" #include "lua_ihm_ryzom.h" #include "nel/misc/stream.h" -#include "lua_manager.h" +#include "nel/gui/lua_manager.h" using namespace std; using namespace NL3D; diff --git a/code/ryzom/client/src/interface_v3/interface_link.cpp b/code/ryzom/client/src/interface_v3/interface_link.cpp index e8c2db540..582736412 100644 --- a/code/ryzom/client/src/interface_v3/interface_link.cpp +++ b/code/ryzom/client/src/interface_v3/interface_link.cpp @@ -23,7 +23,7 @@ #include "interface_element.h" #include "interface_manager.h" #include "interface_expr_node.h" -#include "reflect.h" +#include "nel/gui/reflect.h" #include "nel/misc/cdb_branch.h" using namespace std; diff --git a/code/ryzom/client/src/interface_v3/interface_manager.cpp b/code/ryzom/client/src/interface_v3/interface_manager.cpp index d92d59354..1ad33bdb4 100644 --- a/code/ryzom/client/src/interface_v3/interface_manager.cpp +++ b/code/ryzom/client/src/interface_v3/interface_manager.cpp @@ -112,7 +112,7 @@ namespace NLGUI extern void luaDebuggerMainLoop(); } using namespace NLGUI; -#include "lua_ihm.h" +#include "nel/gui/lua_ihm.h" #include "lua_ihm_ryzom.h" #include "add_on_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 bdf2c7050..f2534eaab 100644 --- a/code/ryzom/client/src/interface_v3/interface_parser.cpp +++ b/code/ryzom/client/src/interface_v3/interface_parser.cpp @@ -107,10 +107,10 @@ #include "../commands.h" #include "nel/gui/lua_helper.h" using namespace NLGUI; -#include "lua_ihm.h" +#include "nel/gui/lua_ihm.h" #include "lua_ihm_ryzom.h" #include "../r2/editor.h" -#include "lua_manager.h" +#include "nel/gui/lua_manager.h" #ifdef LUA_NEVRAX_VERSION #include "lua_ide_dll_nevrax/include/lua_ide_dll/ide_interface.h" // external debugger diff --git a/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp b/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp index b96bcb72d..73ae6a813 100644 --- a/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp +++ b/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp @@ -41,10 +41,10 @@ #include "lua_ihm_ryzom.h" #include "interface_manager.h" #include "nel/gui/lua_helper.h" -#include "lua_object.h" +#include "nel/gui/lua_object.h" -#include "lua_ihm.h" -#include "reflect.h" +#include "nel/gui/lua_ihm.h" +#include "nel/gui/reflect.h" #include "action_handler.h" #include "action_handler_tools.h" #include "interface_manager.h" @@ -67,7 +67,7 @@ #include "guild_manager.h" #include "../client_cfg.h" #include "../sheet_manager.h" -#include "lua_object.h" +#include "nel/gui/lua_object.h" #include "game_share/emote_list_parser.h" #include "game_share/pvp_clan.h" #include "../weather.h" @@ -84,7 +84,7 @@ #include "../net_manager.h" // for emotes #include "../client_chat_manager.h" // for emotes #include "../login.h" -#include "lua_object.h" +#include "nel/gui/lua_object.h" #include "../actions.h" #include "../bg_downloader_access.h" #include "../connection.h" @@ -100,7 +100,7 @@ #include "game_share/bg_downloader_msg.h" #include "game_share/constants.h" #include "game_share/visual_slot_manager.h" -#include "lua_manager.h" +#include "nel/gui/lua_manager.h" #ifdef LUA_NEVRAX_VERSION #include "lua_ide_dll_nevrax/include/lua_ide_dll/ide_interface.h" // external debugger diff --git a/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.h b/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.h index 3c046a38d..ba9089186 100644 --- a/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.h +++ b/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.h @@ -1,7 +1,7 @@ #ifndef LUA_IHM_RYZOM_H #define LUA_IHM_RYZOM_H -#include "lua_ihm.h" +#include "nel/gui/lua_ihm.h" class CLuaIHMRyzom { diff --git a/code/ryzom/client/src/interface_v3/register_interface_elements.cpp b/code/ryzom/client/src/interface_v3/register_interface_elements.cpp index d7134f5b5..e763f40ee 100644 --- a/code/ryzom/client/src/interface_v3/register_interface_elements.cpp +++ b/code/ryzom/client/src/interface_v3/register_interface_elements.cpp @@ -38,7 +38,7 @@ #include "dbgroup_list_sheet.h" #include "group_editbox.h" #include "group_tree.h" -#include "reflect.h" +#include "nel/gui/reflect.h" #include "dbview_bar.h" #include "dbview_bar3.h" #include "group_list.h" diff --git a/code/ryzom/client/src/interface_v3/sphrase_manager.cpp b/code/ryzom/client/src/interface_v3/sphrase_manager.cpp index dc12a391f..5fb3244d8 100644 --- a/code/ryzom/client/src/interface_v3/sphrase_manager.cpp +++ b/code/ryzom/client/src/interface_v3/sphrase_manager.cpp @@ -35,7 +35,7 @@ #include "macrocmd_manager.h" #include "game_share/rolemaster_flags.h" #include "game_share/people.h" -#include "lua_ihm.h" +#include "nel/gui/lua_ihm.h" #include "../time_client.h" diff --git a/code/ryzom/client/src/interface_v3/view_text.cpp b/code/ryzom/client/src/interface_v3/view_text.cpp index e05349985..969691ac1 100644 --- a/code/ryzom/client/src/interface_v3/view_text.cpp +++ b/code/ryzom/client/src/interface_v3/view_text.cpp @@ -27,7 +27,7 @@ #include "ctrl_tooltip.h" #include "nel/misc/xml_auto_ptr.h" -#include "lua_ihm.h" +#include "nel/gui/lua_ihm.h" #include "lua_ihm_ryzom.h" using namespace std; diff --git a/code/ryzom/client/src/main_loop.cpp b/code/ryzom/client/src/main_loop.cpp index 6ec4b99f4..d3c8023a4 100644 --- a/code/ryzom/client/src/main_loop.cpp +++ b/code/ryzom/client/src/main_loop.cpp @@ -111,7 +111,7 @@ #include "camera_recorder.h" #include "connection.h" #include "landscape_poly_drawer.h" -#include "interface_v3/lua_ihm.h" +#include "nel/gui/lua_ihm.h" #include "interface_v3/lua_ihm_ryzom.h" #include "far_tp.h" #include "session_browser_impl.h" @@ -145,7 +145,7 @@ #include "interface_v3/bot_chat_manager.h" #include "string_manager_client.h" -#include "interface_v3/lua_manager.h" +#include "nel/gui/lua_manager.h" /////////// diff --git a/code/ryzom/client/src/r2/config_var.h b/code/ryzom/client/src/r2/config_var.h index 674c38816..a93f9bc27 100644 --- a/code/ryzom/client/src/r2/config_var.h +++ b/code/ryzom/client/src/r2/config_var.h @@ -17,7 +17,7 @@ #ifndef R2_CONFIG_VAR_H #define R2_CONFIG_VAR_H -#include "../interface_v3/lua_object.h" +#include "nel/gui/lua_object.h" #include "editor.h" namespace R2 diff --git a/code/ryzom/client/src/r2/displayer_base.cpp b/code/ryzom/client/src/r2/displayer_base.cpp index a149972de..941081169 100644 --- a/code/ryzom/client/src/r2/displayer_base.cpp +++ b/code/ryzom/client/src/r2/displayer_base.cpp @@ -20,7 +20,7 @@ // #include "game_share/object.h" // -#include "../interface_v3/lua_ihm.h" +#include "nel/gui/lua_ihm.h" #include "../interface_v3/interface_element.h" namespace R2 diff --git a/code/ryzom/client/src/r2/displayer_lua.cpp b/code/ryzom/client/src/r2/displayer_lua.cpp index f73960f3a..1fa9c639a 100644 --- a/code/ryzom/client/src/r2/displayer_lua.cpp +++ b/code/ryzom/client/src/r2/displayer_lua.cpp @@ -16,7 +16,7 @@ #include "stdpch.h" #include "displayer_lua.h" -#include "../interface_v3/lua_ihm.h" +#include "nel/gui/lua_ihm.h" #include "../interface_v3/lua_ihm_ryzom.h" #include "editor.h" diff --git a/code/ryzom/client/src/r2/displayer_lua.h b/code/ryzom/client/src/r2/displayer_lua.h index 6cfb2ac64..55b276afe 100644 --- a/code/ryzom/client/src/r2/displayer_lua.h +++ b/code/ryzom/client/src/r2/displayer_lua.h @@ -18,7 +18,7 @@ #define R2_DISPLAYER_LUA_H #include "displayer_base.h" -#include "../interface_v3/lua_object.h" +#include "nel/gui/lua_object.h" #include "lua_event_forwarder.h" namespace R2 diff --git a/code/ryzom/client/src/r2/displayer_visual.cpp b/code/ryzom/client/src/r2/displayer_visual.cpp index d0f2a0d21..d46607f55 100644 --- a/code/ryzom/client/src/r2/displayer_visual.cpp +++ b/code/ryzom/client/src/r2/displayer_visual.cpp @@ -25,7 +25,7 @@ #include "nel/misc/vector_2f.h" // #include "../time_client.h" -#include "../interface_v3/lua_ihm.h" +#include "nel/gui/lua_ihm.h" #include "../global.h" // #include "../interface_v3/interface_manager.h" diff --git a/code/ryzom/client/src/r2/displayer_visual_entity.cpp b/code/ryzom/client/src/r2/displayer_visual_entity.cpp index 7a27f1c11..63a0d029b 100644 --- a/code/ryzom/client/src/r2/displayer_visual_entity.cpp +++ b/code/ryzom/client/src/r2/displayer_visual_entity.cpp @@ -50,7 +50,7 @@ #include "../interface_v3/interface_3d_scene.h" #include "../interface_v3/character_3d.h" -#include "../interface_v3/lua_ihm.h" +#include "nel/gui/lua_ihm.h" #include "../pacs_client.h" #include "../time_client.h" // diff --git a/code/ryzom/client/src/r2/displayer_visual_entity.h b/code/ryzom/client/src/r2/displayer_visual_entity.h index 4a9fe164e..26f475184 100644 --- a/code/ryzom/client/src/r2/displayer_visual_entity.h +++ b/code/ryzom/client/src/r2/displayer_visual_entity.h @@ -20,7 +20,7 @@ #include "displayer_visual.h" #include "instance.h" #include "../decal.h" -#include "../interface_v3/lua_object.h" +#include "nel/gui/lua_object.h" #include "instance_map_deco.h" class CEntityCL; diff --git a/code/ryzom/client/src/r2/dmc/action_historic.cpp b/code/ryzom/client/src/r2/dmc/action_historic.cpp index 05ed9fdd4..16d85c2d7 100644 --- a/code/ryzom/client/src/r2/dmc/action_historic.cpp +++ b/code/ryzom/client/src/r2/dmc/action_historic.cpp @@ -19,7 +19,7 @@ #include "property_accessor.h" #include "../object_factory_client.h" #include "../editor.h" -#include "../../interface_v3/lua_ihm.h" +#include "nel/gui/lua_ihm.h" namespace R2 { diff --git a/code/ryzom/client/src/r2/dmc/com_lua_module.cpp b/code/ryzom/client/src/r2/dmc/com_lua_module.cpp index 7c94d7560..e64d4a8db 100644 --- a/code/ryzom/client/src/r2/dmc/com_lua_module.cpp +++ b/code/ryzom/client/src/r2/dmc/com_lua_module.cpp @@ -36,7 +36,7 @@ #include "../object_factory_client.h" #include "../editor.h" #include "../../net_manager.h" -#include "../../interface_v3/lua_ihm.h" +#include "nel/gui/lua_ihm.h" #include "../../interface_v3/lua_ihm_ryzom.h" #include "game_share/object.h" @@ -51,7 +51,7 @@ #include "nel/gui/lua_helper.h" using namespace NLGUI; -#include "../../interface_v3/lua_ihm.h" +#include "nel/gui/lua_ihm.h" #include "../../entities.h" diff --git a/code/ryzom/client/src/r2/editor.cpp b/code/ryzom/client/src/r2/editor.cpp index f6c43b2f7..5dc606010 100644 --- a/code/ryzom/client/src/r2/editor.cpp +++ b/code/ryzom/client/src/r2/editor.cpp @@ -58,16 +58,16 @@ using namespace NLGUI; #include "nel/gui/event_descriptor.h" #include "../interface_v3/group_tree.h" #include "../client_cfg.h" -#include "../interface_v3/lua_ihm.h" +#include "nel/gui/lua_ihm.h" #include "../interface_v3/lua_ihm_ryzom.h" -#include "../interface_v3/lua_object.h" +#include "nel/gui/lua_object.h" #include "../global.h" #include "../connection.h" #include "../main_loop.h" #include "../interface_v3/people_interraction.h" #include "../time_client.h" #include "../pacs_client.h" -#include "../interface_v3/lua_ihm.h" +#include "nel/gui/lua_ihm.h" #include "../actions.h" #include "../actions_client.h" #include "object_factory_client.h" @@ -113,7 +113,7 @@ using namespace NLGUI; #include "../session_browser_impl.h" #include "../far_tp.h" -#include "../interface_v3/lua_manager.h" +#include "nel/gui/lua_manager.h" using namespace NLMISC; diff --git a/code/ryzom/client/src/r2/editor.h b/code/ryzom/client/src/r2/editor.h index 1c793b3d5..6219715b2 100644 --- a/code/ryzom/client/src/r2/editor.h +++ b/code/ryzom/client/src/r2/editor.h @@ -17,7 +17,7 @@ #ifndef R2_EDITOR_H #define R2_EDITOR_H -#include "../interface_v3/lua_object.h" +#include "nel/gui/lua_object.h" #include "instance.h" #include "tool.h" #include "../decal.h" diff --git a/code/ryzom/client/src/r2/entity_custom_select_box.cpp b/code/ryzom/client/src/r2/entity_custom_select_box.cpp index ea2bd21f8..3c70120d7 100644 --- a/code/ryzom/client/src/r2/entity_custom_select_box.cpp +++ b/code/ryzom/client/src/r2/entity_custom_select_box.cpp @@ -17,7 +17,7 @@ #include "stdpch.h" // #include "entity_custom_select_box.h" -#include "../interface_v3/lua_object.h" +#include "nel/gui/lua_object.h" // #include "nel/misc/vector.h" diff --git a/code/ryzom/client/src/r2/entity_custom_select_box.h b/code/ryzom/client/src/r2/entity_custom_select_box.h index 0ff3357c3..f16d6f5f8 100644 --- a/code/ryzom/client/src/r2/entity_custom_select_box.h +++ b/code/ryzom/client/src/r2/entity_custom_select_box.h @@ -18,7 +18,7 @@ #define R2_ENTITY_CUSTOM_SELECT_BOX_H #include "nel/misc/aabbox.h" -#include "../interface_v3/lua_object.h" +#include "nel/gui/lua_object.h" #include class CLuaObject; diff --git a/code/ryzom/client/src/r2/instance.cpp b/code/ryzom/client/src/r2/instance.cpp index 00d32e750..af4b2a58e 100644 --- a/code/ryzom/client/src/r2/instance.cpp +++ b/code/ryzom/client/src/r2/instance.cpp @@ -25,7 +25,7 @@ // #include "../entities.h" #include "../interface_v3/interface_manager.h" -#include "../interface_v3/lua_ihm.h" +#include "nel/gui/lua_ihm.h" #include "../interface_v3/lua_ihm_ryzom.h" // #include "displayer_visual_entity.h" diff --git a/code/ryzom/client/src/r2/instance.h b/code/ryzom/client/src/r2/instance.h index 8825c6946..cc71b28ae 100644 --- a/code/ryzom/client/src/r2/instance.h +++ b/code/ryzom/client/src/r2/instance.h @@ -19,7 +19,7 @@ #include "nel/misc/smart_ptr.h" // -#include "../interface_v3/lua_object.h" +#include "nel/gui/lua_object.h" // #include "game_share/object.h" #include "displayer_base.h" diff --git a/code/ryzom/client/src/r2/lua_event_forwarder.cpp b/code/ryzom/client/src/r2/lua_event_forwarder.cpp index 004ea9430..7f9b06d1a 100644 --- a/code/ryzom/client/src/r2/lua_event_forwarder.cpp +++ b/code/ryzom/client/src/r2/lua_event_forwarder.cpp @@ -16,7 +16,7 @@ #include "stdpch.h" #include "lua_event_forwarder.h" -#include "../interface_v3/lua_object.h" +#include "nel/gui/lua_object.h" namespace R2 diff --git a/code/ryzom/client/src/r2/object_factory_client.cpp b/code/ryzom/client/src/r2/object_factory_client.cpp index 81d4c085d..4a63796de 100644 --- a/code/ryzom/client/src/r2/object_factory_client.cpp +++ b/code/ryzom/client/src/r2/object_factory_client.cpp @@ -18,7 +18,7 @@ #include "object_factory_client.h" #include "editor.h" #include "instance.h" -#include "../interface_v3/lua_ihm.h" +#include "nel/gui/lua_ihm.h" #include "../interface_v3/lua_ihm_ryzom.h" namespace R2 diff --git a/code/ryzom/client/src/r2/object_factory_client.h b/code/ryzom/client/src/r2/object_factory_client.h index eee5635b7..e5ac9989d 100644 --- a/code/ryzom/client/src/r2/object_factory_client.h +++ b/code/ryzom/client/src/r2/object_factory_client.h @@ -19,7 +19,7 @@ #include "game_share/object.h" #include "editor.h" -#include "../interface_v3/lua_object.h" +#include "nel/gui/lua_object.h" namespace R2 { diff --git a/code/ryzom/client/src/r2/palette_node.h b/code/ryzom/client/src/r2/palette_node.h index 772797469..c4e41fb2e 100644 --- a/code/ryzom/client/src/r2/palette_node.h +++ b/code/ryzom/client/src/r2/palette_node.h @@ -21,7 +21,7 @@ #if 0 //#include "interface_user_data.h" #include "group_tree.h" -#include "lua_object.h" +#include "nel/gui/lua_object.h" // #include "nel/misc/smart_ptr.h" diff --git a/code/ryzom/client/src/r2/tool.cpp b/code/ryzom/client/src/r2/tool.cpp index a97296590..ead70db66 100644 --- a/code/ryzom/client/src/r2/tool.cpp +++ b/code/ryzom/client/src/r2/tool.cpp @@ -30,7 +30,7 @@ #include "../time_client.h" #include "displayer_visual.h" #include "../interface_v3/group_map.h" -#include "../interface_v3/lua_ihm.h" +#include "nel/gui/lua_ihm.h" // #include "nel/pacs/u_global_position.h" #include "nel/pacs/u_global_retriever.h" diff --git a/code/ryzom/client/src/r2/tool_choose_pos_lua.h b/code/ryzom/client/src/r2/tool_choose_pos_lua.h index 8e21c716e..697eb34e6 100644 --- a/code/ryzom/client/src/r2/tool_choose_pos_lua.h +++ b/code/ryzom/client/src/r2/tool_choose_pos_lua.h @@ -19,7 +19,7 @@ #include "tool_choose_pos.h" #include "nel/misc/vector.h" -#include "../interface_v3/lua_object.h" +#include "nel/gui/lua_object.h" class CEntity; class CLuaObject; diff --git a/code/ryzom/client/src/r2/tool_create_entity.cpp b/code/ryzom/client/src/r2/tool_create_entity.cpp index 73b55a0d7..44f79d0fe 100644 --- a/code/ryzom/client/src/r2/tool_create_entity.cpp +++ b/code/ryzom/client/src/r2/tool_create_entity.cpp @@ -27,7 +27,7 @@ #include "../entity_cl.h" #include "../player_r2_cl.h" #include "../sheet_manager.h" -#include "../interface_v3/lua_ihm.h" +#include "nel/gui/lua_ihm.h" #include "nel/misc/cdb_leaf.h" #include "../interface_v3/interface_manager.h" #include "dmc/palette.h" diff --git a/code/ryzom/client/src/r2/tool_pick.cpp b/code/ryzom/client/src/r2/tool_pick.cpp index 3f81fc672..d629b6b9a 100644 --- a/code/ryzom/client/src/r2/tool_pick.cpp +++ b/code/ryzom/client/src/r2/tool_pick.cpp @@ -19,7 +19,7 @@ #include "tool_pick.h" #include "instance.h" // -#include "../interface_v3/lua_ihm.h" +#include "nel/gui/lua_ihm.h" using namespace NLMISC; diff --git a/code/ryzom/client/src/release.cpp b/code/ryzom/client/src/release.cpp index e63dfa260..018cc964a 100644 --- a/code/ryzom/client/src/release.cpp +++ b/code/ryzom/client/src/release.cpp @@ -90,7 +90,7 @@ #include "faction_war_manager.h" #include "interface_v3/interface_ddx.h" #include "bg_downloader_access.h" -#include "interface_v3/lua_manager.h" +#include "nel/gui/lua_manager.h" /////////// diff --git a/code/ryzom/client/src/session_browser_impl.cpp b/code/ryzom/client/src/session_browser_impl.cpp index c5ddb8f47..7828ed52a 100644 --- a/code/ryzom/client/src/session_browser_impl.cpp +++ b/code/ryzom/client/src/session_browser_impl.cpp @@ -17,8 +17,8 @@ #include "stdpch.h" #include "session_browser_impl.h" -#include "interface_v3/lua_object.h" -#include "interface_v3/lua_ihm.h" +#include "nel/gui/lua_object.h" +#include "nel/gui/lua_ihm.h" #include "connection.h" #include "net_manager.h" #include "interface_v3/interface_manager.h"