diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/callback.h b/code/ryzom/tools/leveldesign/georges_editor_qt/src/callback.h index eba33d564..822b1ee99 100644 --- a/code/ryzom/tools/leveldesign/georges_editor_qt/src/callback.h +++ b/code/ryzom/tools/leveldesign/georges_editor_qt/src/callback.h @@ -24,7 +24,13 @@ // STL includes // NeL includes -#include +#ifdef NL_COMP_GCC +// temporary fix for GCC 4.4 segmentation fault +# undef nlassert +# define nlassert(x) +#else +# include +#endif // NL_COMP_GCC // Project includes diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/formitem.h b/code/ryzom/tools/leveldesign/georges_editor_qt/src/formitem.h index b5d27687a..18a0ae23e 100644 --- a/code/ryzom/tools/leveldesign/georges_editor_qt/src/formitem.h +++ b/code/ryzom/tools/leveldesign/georges_editor_qt/src/formitem.h @@ -48,12 +48,12 @@ namespace NLQT int row() const; CFormItem *parent(); bool setData(int column, const QVariant &value); - NLGEORGES::UFormElm* getFormElm() {return formElm;}; - NLGEORGES::UFormElm::TWhereIsValue CFormItem::valueFrom() + NLGEORGES::UFormElm* getFormElm() {return formElm;} + NLGEORGES::UFormElm::TWhereIsValue valueFrom() { return whereV; } - NLGEORGES::UFormElm::TWhereIsNode CFormItem::nodeFrom() + NLGEORGES::UFormElm::TWhereIsNode nodeFrom() { return whereN; }