Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Nel3DWidget is no longer in the GUI Editor namespace.

Browse source
This commit is contained in:
dfighter1985 2014-06-15 19:52:04 +02:00
parent 4201f3cd29
commit f8004546db
3 changed files with 128 additions and 137 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
code/studio/src/plugins/gui_editor/nel3d_widget.cpp
View file

@ -27,10 +27,6 @@
#include <Windows.h> #include <Windows.h>
#endif #endif
namespace GUIEditor
{
Nel3DWidget::Nel3DWidget( QWidget *parent ) : Nel3DWidget::Nel3DWidget( QWidget *parent ) :
QWidget( parent ) QWidget( parent )
{ {
@ -173,6 +169,3 @@ namespace GUIEditor
} }
#endif #endif
}

12
code/studio/src/plugins/gui_editor/nel3d_widget.h
View file

@ -28,8 +28,6 @@ namespace NL3D
class UTextContext; class UTextContext;
} }
namespace GUIEditor
{
/// Nel 3D interface to Qt /// Nel 3D interface to Qt
class Nel3DWidget : public QWidget class Nel3DWidget : public QWidget
{ {
@ -38,7 +36,7 @@ namespace GUIEditor
Nel3DWidget( QWidget *parent = NULL ); Nel3DWidget( QWidget *parent = NULL );
virtual ~Nel3DWidget(); virtual ~Nel3DWidget();
virtual void init(); void init();
void createTextContext( std::string fontFile ); void createTextContext( std::string fontFile );
NL3D::UDriver* getDriver() const{ return driver; } NL3D::UDriver* getDriver() const{ return driver; }
@ -58,18 +56,18 @@ namespace GUIEditor
void showEvent( QShowEvent *evnt ); void showEvent( QShowEvent *evnt );
#if defined(NL_OS_WINDOWS) #if defined(NL_OS_WINDOWS)
virtual bool winEvent( MSG *message, long *result ); bool winEvent( MSG *message, long *result );
#elif defined(NL_OS_MAC) #elif defined(NL_OS_MAC)
virtual bool macEvent( EventHandlerCallRef caller, EventRef event ); bool macEvent( EventHandlerCallRef caller, EventRef event );
#elif defined(NL_OS_UNIX) #elif defined(NL_OS_UNIX)
virtual bool x11Event( XEvent *event ); bool x11Event( XEvent *event );
#endif #endif
private: private:
NL3D::UDriver *driver; NL3D::UDriver *driver;
NL3D::UTextContext *textContext; NL3D::UTextContext *textContext;
}; };
}
#endif #endif

2
code/studio/src/plugins/gui_editor/nelgui_ctrl.h
View file

@ -22,6 +22,7 @@
#include "project_files.h" #include "project_files.h"
class QWidget; class QWidget;
class Nel3DWidget;
namespace NLGUI namespace NLGUI
{ {
@ -31,7 +32,6 @@ namespace NLGUI
namespace GUIEditor namespace GUIEditor
{ {
class CEditorSelectionWatcher; class CEditorSelectionWatcher;
class Nel3DWidget;
/// Qt viewport controller for the Nel GUI library /// Qt viewport controller for the Nel GUI library
class NelGUICtrl : public QObject class NelGUICtrl : public QObject