From 15f9937b99c862402fc9dc3ac5e66f40ccb996d5 Mon Sep 17 00:00:00 2001
From: dnk-88 <none@none>
Date: Tue, 8 Mar 2011 18:53:36 +0200
Subject: [PATCH] Changed: Update log plugin.

---
 .../src/plugins/log/log_plugin.cpp            | 50 +++++++------------
 .../src/plugins/log/log_plugin.h              |  7 ++-
 2 files changed, 22 insertions(+), 35 deletions(-)

diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_plugin.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_plugin.cpp
index 713be9e35..439cce7d9 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_plugin.cpp
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_plugin.cpp
@@ -36,7 +36,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <nel/misc/debug.h>
 
 // Project includes
-#include "../../extension_system/iplugin_spec.h"
+#include "../core/icore.h"
+#include "../core/core_constants.h"
+#include "../core/imenu_manager.h"
 #include "qt_displayer.h"
 
 using namespace Plugin;
@@ -53,6 +55,9 @@ CLogPlugin::CLogPlugin(QWidget *parent): QDockWidget(parent)
 
 CLogPlugin::~CLogPlugin() 
 {
+	_plugMan->removeObject(_logSettingsPage);
+	delete _logSettingsPage;
+
 	NLMISC::ErrorLog->removeDisplayer(_displayer);
 	NLMISC::WarningLog->removeDisplayer(_displayer);
 	NLMISC::DebugLog->removeDisplayer(_displayer);
@@ -65,31 +70,28 @@ bool CLogPlugin::initialize(ExtensionSystem::IPluginManager *pluginManager, QStr
 {
 	Q_UNUSED(errorString);
 	_plugMan = pluginManager;
-	QMainWindow *wnd = qobject_cast<QMainWindow *>(objectByName("CMainWindow"));
-	if (!wnd)
-	{
-		*errorString = tr("Not found QMainWindow Object Viewer Qt.");
-		return false;
-	}
-	_plugMan->addObject(new CLogSettingsPage(this));
+	_logSettingsPage = new CLogSettingsPage(this);
+	_plugMan->addObject(_logSettingsPage);
 	return true;
 }
 
 void CLogPlugin::extensionsInitialized()
 {
-	QMenu *helpMenu = qobject_cast<QMenu *>(objectByName("ovqt.Menu.View"));
-	helpMenu->addSeparator();
-
 	NLMISC::ErrorLog->addDisplayer(_displayer);
 	NLMISC::WarningLog->addDisplayer(_displayer);
 	NLMISC::DebugLog->addDisplayer(_displayer);
 	NLMISC::AssertLog->addDisplayer(_displayer);
 	NLMISC::InfoLog->addDisplayer(_displayer);
 
-	QMainWindow *wnd = qobject_cast<QMainWindow *>(objectByName("CMainWindow"));
+	Core::ICore *core = Core::ICore::instance();
+	Core::IMenuManager *menuManager = core->menuManager();
+	QMenu *viewMenu = menuManager->menu(Core::Constants::M_VIEW);
+
+	QMainWindow *wnd = Core::ICore::instance()->mainWindow();
 	wnd->addDockWidget(Qt::RightDockWidgetArea, this);
 	hide();
-	helpMenu->addAction(this->toggleViewAction());
+
+	viewMenu->addAction(this->toggleViewAction());
 }
 
 void CLogPlugin::setNelContext(NLMISC::INelContext *nelContext)
@@ -125,25 +127,11 @@ QString CLogPlugin::description() const
 	return "DockWidget to display all log messages from NeL.";
 }
 
-QList<QString> CLogPlugin::dependencies() const
+QStringList CLogPlugin::dependencies() const
 {
-	return QList<QString>();
-}
-
-QObject* CLogPlugin::objectByName(const QString &name) const
-{
-	Q_FOREACH (QObject *qobj, _plugMan->allObjects())
-		if (qobj->objectName() == name)
-			return qobj;
-	return 0;
-}
-
-ExtensionSystem::IPluginSpec *CLogPlugin::pluginByName(const QString &name) const
-{
-	Q_FOREACH (ExtensionSystem::IPluginSpec *spec, _plugMan->plugins())
-		if (spec->name() == name)
-			return spec;
-	return 0;
+	QStringList list;
+	list.append(Core::Constants::OVQT_CORE_PLUGIN);
+	return list;
 }
 
 Q_EXPORT_PLUGIN(CLogPlugin)
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_plugin.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_plugin.h
index 46ce9c28f..d07469541 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_plugin.h
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_plugin.h
@@ -47,6 +47,7 @@ namespace NLQT
 
 namespace Plugin 
 {
+	class CLogSettingsPage;
 
 	class CLogPlugin : public QDockWidget, public ExtensionSystem::IPlugin
 	{
@@ -66,16 +67,14 @@ namespace Plugin
 		QString version() const;
 		QString vendor() const;
 		QString description() const;
-		QList<QString> dependencies() const;
+		QStringList dependencies() const;
 
-		QObject *objectByName(const QString &name) const;
-		ExtensionSystem::IPluginSpec *pluginByName(const QString &name) const;
-
 	protected:
 		NLMISC::CLibraryContext *_LibContext;
 
 	private:
 		ExtensionSystem::IPluginManager *_plugMan;
+		CLogSettingsPage *_logSettingsPage;
 
 		Ui::CLogPlugin _ui;