From c7603d7c60dfff425e9f291bcc9c72ee84d77723 Mon Sep 17 00:00:00 2001
From: dnk-88 <devnull@localhost>
Date: Tue, 18 Jan 2011 12:03:29 +0200
Subject: [PATCH] Changed: #1206 Update core plugin.

---
 .../src/plugins/core/CMakeLists.txt           |  2 --
 .../src/plugins/core/ioptions_page.h          |  1 +
 .../plugins/core/search_paths_settings_page.h | 20 +++++++++----------
 .../core/search_paths_settings_page.ui        |  3 +++
 .../src/plugins/core/settings_dialog.cpp      |  1 -
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/CMakeLists.txt b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/CMakeLists.txt
index 98c5a1a4f..19632cee8 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/CMakeLists.txt
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/CMakeLists.txt
@@ -9,9 +9,7 @@ SET(OVQT_EXT_SYS_SRC	${CMAKE_CURRENT_SOURCE_DIR}/../../extension_system/iplugin.
 			${CMAKE_CURRENT_SOURCE_DIR}/../../extension_system/iplugin_spec.h)
 
 SET(OVQT_CORE_PLUGIN_HDR
-				ioptions_page.h
 				core_plugin.h
-				core_constants.h
 				main_window.h
 				settings_dialog.h
 				qnel_widget.h
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/ioptions_page.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/ioptions_page.h
index b0ec43ea2..912adc1de 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/ioptions_page.h
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/ioptions_page.h
@@ -34,6 +34,7 @@ namespace Core
 class IOptionsPage 
 {
 public:
+	virtual ~IOptionsPage() {}
 
 	/// id() is a unique identifier for referencing this page
 	virtual QString id() const = 0;
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/search_paths_settings_page.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/search_paths_settings_page.h
index 07e3c4f6e..72d2a2e40 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/search_paths_settings_page.h
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/search_paths_settings_page.h
@@ -32,22 +32,22 @@ namespace Core
 /**
 @class CSearchPathsSettingsPage
 */
-class CSearchPathsSettingsPage : public QObject, public IOptionsPage
+	class CSearchPathsSettingsPage : public QObject, public Core::IOptionsPage
 {
 	Q_OBJECT
-	Q_INTERFACES(IOptionsPage)
+	Q_INTERFACES(Core::IOptionsPage)
 public:
 	CSearchPathsSettingsPage(QObject *parent = 0);
-	virtual ~CSearchPathsSettingsPage() {}
+	~CSearchPathsSettingsPage() {}
 
-	virtual QString id() const;
-	virtual QString trName() const;
-	virtual QString category() const;
-	virtual QString trCategory() const;
-	virtual QWidget *createPage(QWidget *parent);
+	QString id() const;
+	QString trName() const;
+	QString category() const;
+	QString trCategory() const;
+	QWidget *createPage(QWidget *parent);
 
-	virtual void apply();
-	virtual void finish() {}
+	void apply();
+	void finish() {}
 
 private:
 	QWidget *_currentPage;
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/search_paths_settings_page.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/search_paths_settings_page.ui
index 4a034ba25..469846d02 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/search_paths_settings_page.ui
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/search_paths_settings_page.ui
@@ -14,6 +14,9 @@
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <property name="margin">
+    <number>9</number>
+   </property>
    <item row="0" column="0">
     <widget class="QGroupBox" name="searchPathsGroupBox">
      <property name="title">
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/settings_dialog.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/settings_dialog.cpp
index 41ac34988..acb8ca856 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/settings_dialog.cpp
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/settings_dialog.cpp
@@ -18,7 +18,6 @@
 
 #include "settings_dialog.h"
 
-#include "nel/misc/debug.h"
 // Qt includes
 #include <QtGui/QHeaderView>
 #include <QtGui/QPushButton>