Nel3DWidget is no longer in the GUI Editor namespace.

--HG--
branch : gsoc2014-dfighter

code/studio/src/plugins/gui_editor/nel3d_widget.cpp

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

code/studio/src/plugins/gui_editor/nel3d_widget.h

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

code/studio/src/plugins/gui_editor/nelgui_ctrl.h

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