From 625dc4cc3ea2eff591e2040d79c81a475e2054bd Mon Sep 17 00:00:00 2001 From: dfighter1985 Date: Wed, 18 Jun 2014 02:51:53 +0200 Subject: [PATCH] Making master Dnk happy. --- code/studio/src/extension_system/iplugin_manager.h | 2 +- code/studio/src/extension_system/plugin_manager.cpp | 10 +++++----- code/studio/src/extension_system/plugin_manager.h | 4 ++-- code/studio/src/plugins/core/plugin_view_dialog.cpp | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/code/studio/src/extension_system/iplugin_manager.h b/code/studio/src/extension_system/iplugin_manager.h index efbf5ee2f..f60f45890 100644 --- a/code/studio/src/extension_system/iplugin_manager.h +++ b/code/studio/src/extension_system/iplugin_manager.h @@ -55,7 +55,7 @@ public: virtual void setPluginPaths(const QStringList &paths) = 0; virtual QList plugins() const = 0; - virtual bool loadPlugin( const char *plugin ) = 0; + virtual bool loadPlugin( const QString &plugin ) = 0; virtual bool unloadPlugin( ExtensionSystem::IPluginSpec *plugin ) = 0; // Settings diff --git a/code/studio/src/extension_system/plugin_manager.cpp b/code/studio/src/extension_system/plugin_manager.cpp index 508a4b81b..37cd85237 100644 --- a/code/studio/src/extension_system/plugin_manager.cpp +++ b/code/studio/src/extension_system/plugin_manager.cpp @@ -114,15 +114,15 @@ void PluginManager::loadPlugins() Q_EMIT pluginsChanged(); } -bool PluginManager::loadPluginSpec( const char *plugin ) +bool PluginManager::loadPluginSpec( const QString &plugin ) { - nlinfo( "Loading plugin spec %s", plugin ); + nlinfo( "Loading plugin spec %s", plugin.toUtf8().data() ); PluginSpec *spec = new PluginSpec; spec->m_pluginManager = this; if( !spec->setSpecFileName( plugin ) ) { - nlinfo( "Error loading plugin spec %s", plugin ); + nlinfo( "Error loading plugin spec %s", plugin.toUtf8().data() ); return false; } @@ -132,7 +132,7 @@ bool PluginManager::loadPluginSpec( const char *plugin ) return true; } -bool PluginManager::loadPlugin( const char *plugin ) +bool PluginManager::loadPlugin( const QString &plugin ) { if( !loadPluginSpec( plugin ) ) return false; @@ -141,7 +141,7 @@ bool PluginManager::loadPlugin( const char *plugin ) if( !spec->resolveDependencies( m_pluginSpecs ) ) { - nlinfo( "Error resolving dependencies for plugin spec %s", plugin ); + nlinfo( "Error resolving dependencies for plugin spec %s", plugin.toUtf8().data() ); return false; } diff --git a/code/studio/src/extension_system/plugin_manager.h b/code/studio/src/extension_system/plugin_manager.h index 9b0d7a0dc..654c48c18 100644 --- a/code/studio/src/extension_system/plugin_manager.h +++ b/code/studio/src/extension_system/plugin_manager.h @@ -51,8 +51,8 @@ public: virtual QList plugins() const; QList loadQueue(); - bool loadPluginSpec( const char *plugin ); - bool loadPlugin( const char *plugin ); + bool loadPluginSpec( const QString &plugin ); + bool loadPlugin( const QString &plugin ); bool unloadPlugin( ExtensionSystem::IPluginSpec *plugin ); void removePlugin( ExtensionSystem::IPluginSpec *plugin ); diff --git a/code/studio/src/plugins/core/plugin_view_dialog.cpp b/code/studio/src/plugins/core/plugin_view_dialog.cpp index c47a1c75d..cccc98509 100644 --- a/code/studio/src/plugins/core/plugin_view_dialog.cpp +++ b/code/studio/src/plugins/core/plugin_view_dialog.cpp @@ -156,7 +156,7 @@ void PluginView::onLoadClicked() } QApplication::setOverrideCursor( Qt::WaitCursor ); - bool success = m_pluginManager->loadPlugin( f.toAscii().data() ); + bool success = m_pluginManager->loadPlugin( f ); QApplication::setOverrideCursor( Qt::ArrowCursor ); if( !success )