merge from default

--HG--
branch : gsoc2011-worldeditorqt

code/nel/tools/3d/object_viewer_qt/src/main.cpp

@@ -124,6 +124,7 @@ sint main(int argc, char **argv)
 
 		nlinfo("Welcome to NeL Object Viewer Qt!");
 	}
+	QApplication::setGraphicsSystem("raster");
 	QApplication app(argc, argv);
 	QSplashScreen *splash = new QSplashScreen();
 	splash->setPixmap(QPixmap(":/images/nel_ide_load.png"));

code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_plugin.cpp

@@ -68,7 +68,7 @@ namespace Plugin
 	{
 		Q_UNUSED(errorString);
 		m_plugMan = pluginManager;
-		m_logSettingsPage = new CLogSettingsPage(this);
+		m_logSettingsPage = new CLogSettingsPage(this, this);
 		addAutoReleasedObject(m_logSettingsPage);
 		return true;
 	}

code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_settings_page.cpp

@@ -38,8 +38,9 @@ namespace Plugin
 
 	class CLogPlugin;
 
-	CLogSettingsPage::CLogSettingsPage(QObject *parent)
+	CLogSettingsPage::CLogSettingsPage(CLogPlugin *logPlugin, QObject *parent)
 		: IOptionsPage(parent),
+		m_logPlugin(logPlugin),
 		m_currentPage(NULL),
 		m_error(true),
 		m_warning(true),
@@ -98,13 +99,7 @@ namespace Plugin
 		m_info = m_ui.infoCheck->isChecked();
 
 		writeSettings();
-		ExtensionSystem::IPluginManager *p = Core::ICore::instance()->pluginManager();
+		m_logPlugin->setDisplayers();
-		ExtensionSystem::IPlugin *plugin = p->pluginByName("LogPlugin")->plugin();
-		CLogPlugin* lp = dynamic_cast<CLogPlugin*>(plugin);
-		if (lp)
-		{
-			lp->setDisplayers();
-		}
 	}
 
 	void CLogSettingsPage::readSettings()

code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_settings_page.h

@@ -29,6 +29,8 @@ class QWidget;
 
 namespace Plugin
 {
+	class CLogPlugin;
+
 	/**
 	@class CLogSettingsPage
 	*/
@@ -36,7 +38,7 @@ namespace Plugin
 	{
 		Q_OBJECT
 	public:
-		CLogSettingsPage(QObject *parent = 0);
+		CLogSettingsPage(CLogPlugin *logPlugin, QObject *parent = 0);
 		virtual ~CLogSettingsPage() {}
 
 		virtual QString id() const;
@@ -53,6 +55,7 @@ namespace Plugin
 		void readSettings();
 		void writeSettings();
 
+		CLogPlugin *m_logPlugin;
 		QWidget             *m_currentPage;
 		Ui::CLogSettingsPage m_ui;