From cf33c220d65919da16d2ccc4f25e7cc3f63404c6 Mon Sep 17 00:00:00 2001 From: dfighter1985 Date: Wed, 20 Feb 2013 22:05:09 +0100 Subject: [PATCH] GUI Editor no longer depends on RTTI typename, instead it uses GetClassName() string provided by DECLARE_UI_CLASS(). --- code/nel/include/nel/gui/ctrl_button.h | 1 + code/nel/include/nel/gui/ctrl_col_pick.h | 1 + code/nel/include/nel/gui/ctrl_polygon.h | 3 ++- code/nel/include/nel/gui/ctrl_quad.h | 4 +++- code/nel/include/nel/gui/ctrl_sheet_selection.h | 2 +- code/nel/include/nel/gui/ctrl_text_button.h | 1 + code/nel/include/nel/gui/dbgroup_combo_box.h | 1 + code/nel/include/nel/gui/dbgroup_select_number.h | 1 + code/nel/include/nel/gui/dbview_bar.h | 1 + code/nel/include/nel/gui/dbview_bar3.h | 1 + code/nel/include/nel/gui/dbview_digit.h | 1 + code/nel/include/nel/gui/dbview_number.h | 1 + code/nel/include/nel/gui/dbview_quantity.h | 1 + code/nel/include/nel/gui/group_container.h | 5 ++++- code/nel/include/nel/gui/group_editbox.h | 2 +- code/nel/include/nel/gui/group_frame.h | 1 + code/nel/include/nel/gui/group_header.h | 4 ++++ code/nel/include/nel/gui/group_html.h | 4 ++++ code/nel/include/nel/gui/group_list.h | 2 ++ code/nel/include/nel/gui/group_menu.h | 3 +++ code/nel/include/nel/gui/group_modal.h | 2 ++ code/nel/include/nel/gui/group_paragraph.h | 4 ++++ code/nel/include/nel/gui/group_scrolltext.h | 2 ++ code/nel/include/nel/gui/group_tab.h | 2 ++ code/nel/include/nel/gui/group_table.h | 3 +++ code/nel/include/nel/gui/group_tree.h | 1 + code/nel/include/nel/gui/group_wheel.h | 2 ++ code/nel/include/nel/gui/view_bitmap_combo.h | 2 ++ code/nel/include/nel/gui/view_link.h | 1 + code/nel/include/nel/gui/view_polygon.h | 4 +++- code/nel/include/nel/gui/view_quad.h | 4 +++- code/nel/include/nel/gui/view_text_formated.h | 1 + code/nel/include/nel/gui/view_text_id.h | 1 + code/nel/include/nel/gui/view_text_id_formated.h | 2 ++ code/nel/src/gui/ctrl_polygon.cpp | 2 +- code/nel/src/gui/ctrl_quad.cpp | 2 +- code/nel/src/gui/view_polygon.cpp | 2 +- code/nel/src/gui/view_quad.cpp | 2 +- .../src/plugins/gui_editor/property_browser_ctrl.cpp | 10 +++------- 39 files changed, 71 insertions(+), 18 deletions(-) diff --git a/code/nel/include/nel/gui/ctrl_button.h b/code/nel/include/nel/gui/ctrl_button.h index cfd842ded..02b827329 100644 --- a/code/nel/include/nel/gui/ctrl_button.h +++ b/code/nel/include/nel/gui/ctrl_button.h @@ -35,6 +35,7 @@ namespace NLGUI class CCtrlButton : public CCtrlBaseButton { public: + DECLARE_UI_CLASS( CCtrlButton ) /// Constructor CCtrlButton(const TCtorParam ¶m) : CCtrlBaseButton(param) diff --git a/code/nel/include/nel/gui/ctrl_col_pick.h b/code/nel/include/nel/gui/ctrl_col_pick.h index 62ac8522f..dd779e837 100644 --- a/code/nel/include/nel/gui/ctrl_col_pick.h +++ b/code/nel/include/nel/gui/ctrl_col_pick.h @@ -36,6 +36,7 @@ namespace NLGUI { public: + DECLARE_UI_CLASS( CCtrlColPick ) CCtrlColPick(const TCtorParam ¶m); ~CCtrlColPick(); diff --git a/code/nel/include/nel/gui/ctrl_polygon.h b/code/nel/include/nel/gui/ctrl_polygon.h index 8fa3768b7..cef57dd3c 100644 --- a/code/nel/include/nel/gui/ctrl_polygon.h +++ b/code/nel/include/nel/gui/ctrl_polygon.h @@ -43,7 +43,8 @@ namespace NLGUI class CCtrlPolygon : public CCtrlBase { public: - CCtrlPolygon(); + DECLARE_UI_CLASS( CCtrlPolygon ) + CCtrlPolygon( const TCtorParam ¶m ); virtual uint32 getMemory() { return (uint32)(sizeof(*this)+_Id.size()); } virtual void updateCoords(); virtual void draw(); diff --git a/code/nel/include/nel/gui/ctrl_quad.h b/code/nel/include/nel/gui/ctrl_quad.h index 9a246cdb2..08c89675e 100644 --- a/code/nel/include/nel/gui/ctrl_quad.h +++ b/code/nel/include/nel/gui/ctrl_quad.h @@ -38,10 +38,12 @@ namespace NLGUI class CCtrlQuad : public CCtrlBase { public: + DECLARE_UI_CLASS( CCtrlQuad ) + enum TWrapMode { Repeat = 0, Clamp, CustomUVs, WrapModeCount }; - CCtrlQuad(); + CCtrlQuad( const TCtorParam ¶m ); // from CInterfaceElement bool parse(xmlNodePtr cur,CInterfaceGroup *parentGroup); diff --git a/code/nel/include/nel/gui/ctrl_sheet_selection.h b/code/nel/include/nel/gui/ctrl_sheet_selection.h index 95960d979..36d1c8336 100644 --- a/code/nel/include/nel/gui/ctrl_sheet_selection.h +++ b/code/nel/include/nel/gui/ctrl_sheet_selection.h @@ -54,7 +54,7 @@ namespace NLGUI */ class CCtrlSheetSelection { - public: + public: // Add a group, and returns its index, or -1 if already created. sint addGroup(const std::string &name); // Get a group by its name (must exist) diff --git a/code/nel/include/nel/gui/ctrl_text_button.h b/code/nel/include/nel/gui/ctrl_text_button.h index 43fa16b89..2df1dee5d 100644 --- a/code/nel/include/nel/gui/ctrl_text_button.h +++ b/code/nel/include/nel/gui/ctrl_text_button.h @@ -38,6 +38,7 @@ namespace NLGUI class CCtrlTextButton : public CCtrlBaseButton { public: + DECLARE_UI_CLASS( CCtrlTextButton ) /// Constructor CCtrlTextButton(const TCtorParam ¶m); diff --git a/code/nel/include/nel/gui/dbgroup_combo_box.h b/code/nel/include/nel/gui/dbgroup_combo_box.h index 357a4af40..75208b1e3 100644 --- a/code/nel/include/nel/gui/dbgroup_combo_box.h +++ b/code/nel/include/nel/gui/dbgroup_combo_box.h @@ -39,6 +39,7 @@ namespace NLGUI class CDBGroupComboBox : public CInterfaceGroup { public: + DECLARE_UI_CLASS( CDBGroupComboBox ) /// Constructor CDBGroupComboBox(const TCtorParam ¶m); diff --git a/code/nel/include/nel/gui/dbgroup_select_number.h b/code/nel/include/nel/gui/dbgroup_select_number.h index 900fc5081..a5ef692ff 100644 --- a/code/nel/include/nel/gui/dbgroup_select_number.h +++ b/code/nel/include/nel/gui/dbgroup_select_number.h @@ -39,6 +39,7 @@ namespace NLGUI class CDBGroupSelectNumber : public CInterfaceGroup { public: + DECLARE_UI_CLASS( CDBGroupSelectNumber ) /// Constructor CDBGroupSelectNumber(const TCtorParam ¶m); diff --git a/code/nel/include/nel/gui/dbview_bar.h b/code/nel/include/nel/gui/dbview_bar.h index af97c87e7..d4a3de340 100644 --- a/code/nel/include/nel/gui/dbview_bar.h +++ b/code/nel/include/nel/gui/dbview_bar.h @@ -37,6 +37,7 @@ namespace NLGUI public: enum TViewBar { ViewBar_UltraMini, ViewBar_Mini, ViewBar_Normal, ViewBar_MiniThick }; public: + DECLARE_UI_CLASS( CDBViewBar ) /// Constructor CDBViewBar(const TCtorParam ¶m) diff --git a/code/nel/include/nel/gui/dbview_bar3.h b/code/nel/include/nel/gui/dbview_bar3.h index 5ad165008..785cb165b 100644 --- a/code/nel/include/nel/gui/dbview_bar3.h +++ b/code/nel/include/nel/gui/dbview_bar3.h @@ -34,6 +34,7 @@ namespace NLGUI class CDBViewBar3 : public CViewBitmap { public: + DECLARE_UI_CLASS( CDBViewBar3 ) /// Constructor CDBViewBar3(const TCtorParam ¶m); diff --git a/code/nel/include/nel/gui/dbview_digit.h b/code/nel/include/nel/gui/dbview_digit.h index d4196cb8d..33446b2de 100644 --- a/code/nel/include/nel/gui/dbview_digit.h +++ b/code/nel/include/nel/gui/dbview_digit.h @@ -34,6 +34,7 @@ namespace NLGUI class CDBViewDigit : public CViewBase { public: + DECLARE_UI_CLASS( CDBViewDigit ) /// Constructor CDBViewDigit(const TCtorParam ¶m); diff --git a/code/nel/include/nel/gui/dbview_number.h b/code/nel/include/nel/gui/dbview_number.h index 6f2bd2f07..2c76a255d 100644 --- a/code/nel/include/nel/gui/dbview_number.h +++ b/code/nel/include/nel/gui/dbview_number.h @@ -35,6 +35,7 @@ namespace NLGUI class CDBViewNumber : public CViewText { public: + DECLARE_UI_CLASS( CDBViewNumber ) /// Constructor CDBViewNumber(const TCtorParam ¶m); diff --git a/code/nel/include/nel/gui/dbview_quantity.h b/code/nel/include/nel/gui/dbview_quantity.h index 7899a7558..67c4e57ba 100644 --- a/code/nel/include/nel/gui/dbview_quantity.h +++ b/code/nel/include/nel/gui/dbview_quantity.h @@ -35,6 +35,7 @@ namespace NLGUI class CDBViewQuantity : public CViewText { public: + DECLARE_UI_CLASS( CDBViewQuantity ) /// Constructor CDBViewQuantity(const TCtorParam ¶m); diff --git a/code/nel/include/nel/gui/group_container.h b/code/nel/include/nel/gui/group_container.h index fc2729d46..452674aa1 100644 --- a/code/nel/include/nel/gui/group_container.h +++ b/code/nel/include/nel/gui/group_container.h @@ -48,6 +48,7 @@ namespace NLGUI { public: + DECLARE_UI_CLASS( CCtrlResizer ) CCtrlResizer(const TCtorParam ¶m); virtual void draw (); @@ -98,8 +99,9 @@ namespace NLGUI class CCtrlMover : public CCtrlBase { public: + DECLARE_UI_CLASS( CCtrlMover ) - CCtrlMover(const TCtorParam ¶m, bool canMove, bool canOpen); + CCtrlMover(const TCtorParam ¶m, bool canMove = true, bool canOpen = true ); ~CCtrlMover(); virtual void draw (); virtual bool handleEvent (const NLGUI::CEventDescriptor &event); @@ -163,6 +165,7 @@ namespace NLGUI virtual void childrenMoved(uint srcIndex, uint destIndex, CGroupContainer *children) = 0; }; public: + DECLARE_UI_CLASS( CGroupContainer ) CGroupContainer(const TCtorParam ¶m); ~CGroupContainer(); diff --git a/code/nel/include/nel/gui/group_editbox.h b/code/nel/include/nel/gui/group_editbox.h index b93f157c5..7ea2ab529 100644 --- a/code/nel/include/nel/gui/group_editbox.h +++ b/code/nel/include/nel/gui/group_editbox.h @@ -32,6 +32,7 @@ namespace NLGUI class CGroupEditBox : public CGroupEditBoxBase { public: + DECLARE_UI_CLASS( CGroupEditBox ) class IComboKeyHandler { @@ -42,7 +43,6 @@ namespace NLGUI enum TEntryType { Text, Integer, PositiveInteger, Float, PositiveFloat, Alpha, AlphaNum, AlphaNumSpace, Password, Filename, PlayerName }; // the type of entry this edit bot can deal with - DECLARE_UI_CLASS( CGroupEditBox ) /// Constructor CGroupEditBox(const TCtorParam ¶m); /// Dtor diff --git a/code/nel/include/nel/gui/group_frame.h b/code/nel/include/nel/gui/group_frame.h index 47c98a476..3d350b4d5 100644 --- a/code/nel/include/nel/gui/group_frame.h +++ b/code/nel/include/nel/gui/group_frame.h @@ -36,6 +36,7 @@ namespace NLGUI class CGroupFrame : public CInterfaceGroup { public: + DECLARE_UI_CLASS( CGroupFrame ) /// Constructor CGroupFrame(const TCtorParam ¶m); diff --git a/code/nel/include/nel/gui/group_header.h b/code/nel/include/nel/gui/group_header.h index 9fd2a1a5b..ab6c94c35 100644 --- a/code/nel/include/nel/gui/group_header.h +++ b/code/nel/include/nel/gui/group_header.h @@ -35,6 +35,8 @@ namespace NLGUI class CGroupHeader : public CGroupList { public: + DECLARE_UI_CLASS( CGroupHeader ) + REFLECT_EXPORT_START(CGroupHeader, CGroupList) REFLECT_LUA_METHOD("enlargeColumns", luaEnlargeColumns); REFLECT_LUA_METHOD("resizeColumnsAndContainer", luaResizeColumnsAndContainer); @@ -67,6 +69,8 @@ namespace NLGUI class CGroupHeaderEntry : public CInterfaceGroup { public: + DECLARE_UI_CLASS( CGroupHeaderEntry ) + CGroupHeaderEntry(const TCtorParam ¶m); xmlNodePtr serialize( xmlNodePtr parentNode, const char *type ) const; // from CInterfaceGroup diff --git a/code/nel/include/nel/gui/group_html.h b/code/nel/include/nel/gui/group_html.h index 14f1ded84..3f5526197 100644 --- a/code/nel/include/nel/gui/group_html.h +++ b/code/nel/include/nel/gui/group_html.h @@ -54,6 +54,8 @@ namespace NLGUI class CGroupHTML : public CGroupScrollText { public: + DECLARE_UI_CLASS( CGroupHTML ) + friend void TextAdd (struct _HText *me, const char * buf, int len); friend void TextBeginElement (_HText *me, int element_number, const BOOL *present, const char ** value); friend void TextEndElement (_HText *me, int element_number); @@ -658,6 +660,8 @@ namespace NLGUI class CGroupHTMLInputOffset : public CInterfaceGroup { public: + DECLARE_UI_CLASS( CGroupHTMLInputOffset ) + sint32 Offset; CGroupHTMLInputOffset(const TCtorParam ¶m); xmlNodePtr serialize( xmlNodePtr parentNode, const char *type ) const; diff --git a/code/nel/include/nel/gui/group_list.h b/code/nel/include/nel/gui/group_list.h index 709ae78e1..a86950d3e 100644 --- a/code/nel/include/nel/gui/group_list.h +++ b/code/nel/include/nel/gui/group_list.h @@ -30,6 +30,8 @@ namespace NLGUI class CGroupList : public CInterfaceGroup { public: + DECLARE_UI_CLASS( CGroupList ) + enum EAlign { Bottom = 0, diff --git a/code/nel/include/nel/gui/group_menu.h b/code/nel/include/nel/gui/group_menu.h index 65c408d1d..56b9fb0e3 100644 --- a/code/nel/include/nel/gui/group_menu.h +++ b/code/nel/include/nel/gui/group_menu.h @@ -42,6 +42,7 @@ namespace NLGUI class CViewTextMenu : public CViewText { public: + DECLARE_UI_CLASS( CViewTextMenu ) CViewTextMenu(const TCtorParam ¶m) : CViewText(param) { @@ -97,6 +98,7 @@ namespace NLGUI class CGroupSubMenu : public CGroupSubMenuBase { public: + DECLARE_UI_CLASS( CGroupSubMenu ) CGroupSubMenu(const TCtorParam ¶m); virtual ~CGroupSubMenu(); @@ -290,6 +292,7 @@ namespace NLGUI { public: + DECLARE_UI_CLASS( CGroupMenu ) CGroupMenu(const TCtorParam ¶m); virtual ~CGroupMenu(); diff --git a/code/nel/include/nel/gui/group_modal.h b/code/nel/include/nel/gui/group_modal.h index a3398fbc4..c177d6f0c 100644 --- a/code/nel/include/nel/gui/group_modal.h +++ b/code/nel/include/nel/gui/group_modal.h @@ -35,6 +35,8 @@ namespace NLGUI class CGroupModal : public CGroupFrame { public: + DECLARE_UI_CLASS( CGroupModal ) + bool SpawnOnMousePos : 1; bool ExitClickOut : 1; bool ExitClickL : 1; diff --git a/code/nel/include/nel/gui/group_paragraph.h b/code/nel/include/nel/gui/group_paragraph.h index 62e47cba8..b8792ece1 100644 --- a/code/nel/include/nel/gui/group_paragraph.h +++ b/code/nel/include/nel/gui/group_paragraph.h @@ -31,6 +31,8 @@ namespace NLGUI class CCtrlLink : public CCtrlButton { public: + DECLARE_UI_CLASS( CCtrlLink ) + CCtrlLink (const TCtorParam ¶m) : CCtrlButton(param) {} }; @@ -39,6 +41,8 @@ namespace NLGUI class CGroupParagraph : public CInterfaceGroup { public: + DECLARE_UI_CLASS( CGroupParagraph ) + enum EAlign { Bottom = 0, diff --git a/code/nel/include/nel/gui/group_scrolltext.h b/code/nel/include/nel/gui/group_scrolltext.h index 2a6a6eca4..7c5c58f22 100644 --- a/code/nel/include/nel/gui/group_scrolltext.h +++ b/code/nel/include/nel/gui/group_scrolltext.h @@ -39,6 +39,8 @@ namespace NLGUI class CGroupScrollText : public CInterfaceGroup { public: + DECLARE_UI_CLASS( CGroupScrollText ) + /// Constructor CGroupScrollText(const TCtorParam ¶m); ~CGroupScrollText(); diff --git a/code/nel/include/nel/gui/group_tab.h b/code/nel/include/nel/gui/group_tab.h index 44772656e..ee68acbc8 100644 --- a/code/nel/include/nel/gui/group_tab.h +++ b/code/nel/include/nel/gui/group_tab.h @@ -43,6 +43,7 @@ namespace NLGUI class CGroupTab : public CInterfaceGroup { public: + DECLARE_UI_CLASS( CGroupTab ) /// Constructor CGroupTab(const TCtorParam ¶m); @@ -153,6 +154,7 @@ namespace NLGUI class CCtrlTabButton : public CCtrlTextButton { public: + DECLARE_UI_CLASS( CCtrlTabButton ) CCtrlTabButton(const TCtorParam ¶m); diff --git a/code/nel/include/nel/gui/group_table.h b/code/nel/include/nel/gui/group_table.h index 63e58283f..60d3d9e63 100644 --- a/code/nel/include/nel/gui/group_table.h +++ b/code/nel/include/nel/gui/group_table.h @@ -36,6 +36,8 @@ namespace NLGUI { friend class CGroupTable; public: + DECLARE_UI_CLASS( CGroupCell ) + CGroupCell(const TCtorParam ¶m); enum TAlign @@ -121,6 +123,7 @@ namespace NLGUI class CGroupTable : public CInterfaceGroup { public: + DECLARE_UI_CLASS( CGroupTable ) ///constructor CGroupTable(const TCtorParam ¶m); diff --git a/code/nel/include/nel/gui/group_tree.h b/code/nel/include/nel/gui/group_tree.h index d5f2f1a43..1b64122f3 100644 --- a/code/nel/include/nel/gui/group_tree.h +++ b/code/nel/include/nel/gui/group_tree.h @@ -33,6 +33,7 @@ namespace NLGUI { public: + DECLARE_UI_CLASS( CGroupTree ) struct SNode; // optional callback that is called when a node has been added diff --git a/code/nel/include/nel/gui/group_wheel.h b/code/nel/include/nel/gui/group_wheel.h index 7778a2753..c61b92dfd 100644 --- a/code/nel/include/nel/gui/group_wheel.h +++ b/code/nel/include/nel/gui/group_wheel.h @@ -28,6 +28,8 @@ namespace NLGUI class CInterfaceGroupWheel : public CInterfaceGroup { public: + DECLARE_UI_CLASS( CInterfaceGroupWheel ) + /// Constructor CInterfaceGroupWheel(const TCtorParam ¶m); diff --git a/code/nel/include/nel/gui/view_bitmap_combo.h b/code/nel/include/nel/gui/view_bitmap_combo.h index edfc8528b..f8329303f 100644 --- a/code/nel/include/nel/gui/view_bitmap_combo.h +++ b/code/nel/include/nel/gui/view_bitmap_combo.h @@ -99,6 +99,8 @@ namespace NLGUI class CViewBitmapCombo : public CViewBase, public NLMISC::ICDBNode::IPropertyObserver { public: + DECLARE_UI_CLASS( CViewBitmapCombo ) + typedef std::vector TIdArray; typedef std::vector TStringArray; typedef std::vector TColorArray; diff --git a/code/nel/include/nel/gui/view_link.h b/code/nel/include/nel/gui/view_link.h index 50dbb42c9..1cc40a883 100644 --- a/code/nel/include/nel/gui/view_link.h +++ b/code/nel/include/nel/gui/view_link.h @@ -36,6 +36,7 @@ namespace NLGUI class CViewLink : public CViewText { public: + DECLARE_UI_CLASS( CViewLink ) // Default constructor CViewLink (const TCtorParam ¶m); diff --git a/code/nel/include/nel/gui/view_polygon.h b/code/nel/include/nel/gui/view_polygon.h index d995254af..f45bcf305 100644 --- a/code/nel/include/nel/gui/view_polygon.h +++ b/code/nel/include/nel/gui/view_polygon.h @@ -36,7 +36,9 @@ namespace NLGUI class CViewPolygon : public CViewBase { public: - CViewPolygon(); + DECLARE_UI_CLASS( CViewPolygon ) + + CViewPolygon( const TCtorParam ¶m ); virtual uint32 getMemory() { return (uint32)(sizeof(*this)+_Id.size()); } virtual void updateCoords(); virtual void draw(); diff --git a/code/nel/include/nel/gui/view_quad.h b/code/nel/include/nel/gui/view_quad.h index 254e6d272..5c9ea7485 100644 --- a/code/nel/include/nel/gui/view_quad.h +++ b/code/nel/include/nel/gui/view_quad.h @@ -36,10 +36,12 @@ namespace NLGUI class CViewQuad : public CViewBase { public: + DECLARE_UI_CLASS( CViewQuad ) + enum TWrapMode { Repeat = 0, Clamp, WrapModeCount }; - CViewQuad(); + CViewQuad( const TCtorParam ¶m ); // from CInterfaceElement bool parse(xmlNodePtr cur,CInterfaceGroup *parentGroup); diff --git a/code/nel/include/nel/gui/view_text_formated.h b/code/nel/include/nel/gui/view_text_formated.h index 245a2359d..d2271599d 100644 --- a/code/nel/include/nel/gui/view_text_formated.h +++ b/code/nel/include/nel/gui/view_text_formated.h @@ -35,6 +35,7 @@ namespace NLGUI class CViewTextFormated : public CViewText { public: + DECLARE_UI_CLASS( CViewTextFormated ) /// Interface for classes which can format the text for this view. class IViewTextFormatter diff --git a/code/nel/include/nel/gui/view_text_id.h b/code/nel/include/nel/gui/view_text_id.h index 43ce3b6e0..ac0477254 100644 --- a/code/nel/include/nel/gui/view_text_id.h +++ b/code/nel/include/nel/gui/view_text_id.h @@ -48,6 +48,7 @@ namespace NLGUI class CViewTextID : public CViewText { public: + DECLARE_UI_CLASS( CViewTextID ) /// Interface for classes which can provide text to CViewTextId class IViewTextProvider diff --git a/code/nel/include/nel/gui/view_text_id_formated.h b/code/nel/include/nel/gui/view_text_id_formated.h index 4b0532bd6..278c33338 100644 --- a/code/nel/include/nel/gui/view_text_id_formated.h +++ b/code/nel/include/nel/gui/view_text_id_formated.h @@ -36,6 +36,8 @@ namespace NLGUI class CViewTextIDFormated : public CViewTextID { public: + DECLARE_UI_CLASS( CViewTextIDFormated ) + CViewTextIDFormated(const TCtorParam ¶m) : CViewTextID(param) {} diff --git a/code/nel/src/gui/ctrl_polygon.cpp b/code/nel/src/gui/ctrl_polygon.cpp index b55bf7ddf..94615de75 100644 --- a/code/nel/src/gui/ctrl_polygon.cpp +++ b/code/nel/src/gui/ctrl_polygon.cpp @@ -25,7 +25,7 @@ namespace NLGUI { // ********************************************************************************* - CCtrlPolygon::CCtrlPolygon() : CCtrlBase(TCtorParam()) + CCtrlPolygon::CCtrlPolygon( const TCtorParam ¶m ) : CCtrlBase( param ) { // Construct _Color = CRGBA::White; diff --git a/code/nel/src/gui/ctrl_quad.cpp b/code/nel/src/gui/ctrl_quad.cpp index 7310c4138..26829b19e 100644 --- a/code/nel/src/gui/ctrl_quad.cpp +++ b/code/nel/src/gui/ctrl_quad.cpp @@ -25,7 +25,7 @@ namespace NLGUI { // ********************************************************************************* - CCtrlQuad::CCtrlQuad() : CCtrlBase(TCtorParam()), _Color(CRGBA::White), + CCtrlQuad::CCtrlQuad( const TCtorParam ¶m ) : CCtrlBase( param ), _Color(CRGBA::White), _Additif(false), _Filtered(true), _UMin(0.f), diff --git a/code/nel/src/gui/view_polygon.cpp b/code/nel/src/gui/view_polygon.cpp index 9c6d9764f..573c542fd 100644 --- a/code/nel/src/gui/view_polygon.cpp +++ b/code/nel/src/gui/view_polygon.cpp @@ -25,7 +25,7 @@ namespace NLGUI { // ********************************************************************************* - CViewPolygon::CViewPolygon() : CViewBase(TCtorParam()) + CViewPolygon::CViewPolygon( const TCtorParam ¶m ) : CViewBase( param ) { // Construct _Color = CRGBA::White; diff --git a/code/nel/src/gui/view_quad.cpp b/code/nel/src/gui/view_quad.cpp index 0def5c4dc..3551ad689 100644 --- a/code/nel/src/gui/view_quad.cpp +++ b/code/nel/src/gui/view_quad.cpp @@ -24,7 +24,7 @@ namespace NLGUI { // ********************************************************************************* - CViewQuad::CViewQuad() : CViewBase(TCtorParam()), _Color(CRGBA::White), + CViewQuad::CViewQuad( const TCtorParam ¶m ) : CViewBase( param ), _Color(CRGBA::White), _Additif(false), _UMin(0.f), _UMax(1.f), diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/property_browser_ctrl.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/property_browser_ctrl.cpp index 078c9da23..1612ea803 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/property_browser_ctrl.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/property_browser_ctrl.cpp @@ -82,13 +82,9 @@ namespace GUIEditor currentElement = id; - std::string n; - n = typeid( *e ).name(); - std::string::size_type i = n.find_last_of( ':' ); - if( i != std::string::npos ) - n = n.substr( i + 1, n.size() - 1 ); + std::string n = e->getClassName(); - setupProperties( n, e ); + setupProperties( n, e ); connect( propertyMgr, SIGNAL( propertyChanged( QtProperty* ) ), this, SLOT( onPropertyChanged( QtProperty* ) ) ); } @@ -163,4 +159,4 @@ namespace GUIEditor p->setValue( v ); browser->addProperty( p ); } -} \ No newline at end of file +}