Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Making master Dnk happy.

Browse source
This commit is contained in:
dfighter1985 2014-06-18 02:51:53 +02:00
parent 470896d85a
commit 625dc4cc3e
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/studio/src/extension_system/iplugin_manager.h
View file

@ -55,7 +55,7 @@ public:
virtual void setPluginPaths(const QStringList &paths) = 0; virtual void setPluginPaths(const QStringList &paths) = 0;
virtual QList<ExtensionSystem::IPluginSpec *> plugins() const = 0; virtual QList<ExtensionSystem::IPluginSpec *> plugins() const = 0;
virtual bool loadPlugin( const char *plugin ) = 0; virtual bool loadPlugin( const QString &plugin ) = 0;
virtual bool unloadPlugin( ExtensionSystem::IPluginSpec *plugin ) = 0; virtual bool unloadPlugin( ExtensionSystem::IPluginSpec *plugin ) = 0;
// Settings // Settings

10
code/studio/src/extension_system/plugin_manager.cpp
View file

@ -114,15 +114,15 @@ void PluginManager::loadPlugins()
Q_EMIT pluginsChanged(); 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; PluginSpec *spec = new PluginSpec;
spec->m_pluginManager = this; spec->m_pluginManager = this;
if( !spec->setSpecFileName( plugin ) ) if( !spec->setSpecFileName( plugin ) )
{ {
nlinfo( "Error loading plugin spec %s", plugin ); nlinfo( "Error loading plugin spec %s", plugin.toUtf8().data() );
return false; return false;
} }
@ -132,7 +132,7 @@ bool PluginManager::loadPluginSpec( const char *plugin )
return true; return true;
} }
bool PluginManager::loadPlugin( const char *plugin ) bool PluginManager::loadPlugin( const QString &plugin )
{ {
if( !loadPluginSpec( plugin ) ) if( !loadPluginSpec( plugin ) )
return false; return false;
@ -141,7 +141,7 @@ bool PluginManager::loadPlugin( const char *plugin )
if( !spec->resolveDependencies( m_pluginSpecs ) ) 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; return false;
} }

4
code/studio/src/extension_system/plugin_manager.h
View file

@ -51,8 +51,8 @@ public:
virtual QList<IPluginSpec *> plugins() const; virtual QList<IPluginSpec *> plugins() const;
QList<PluginSpec *> loadQueue(); QList<PluginSpec *> loadQueue();
bool loadPluginSpec( const char *plugin ); bool loadPluginSpec( const QString &plugin );
bool loadPlugin( const char *plugin ); bool loadPlugin( const QString &plugin );
bool unloadPlugin( ExtensionSystem::IPluginSpec *plugin ); bool unloadPlugin( ExtensionSystem::IPluginSpec *plugin );
void removePlugin( ExtensionSystem::IPluginSpec *plugin ); void removePlugin( ExtensionSystem::IPluginSpec *plugin );

2
code/studio/src/plugins/core/plugin_view_dialog.cpp
View file

@ -156,7 +156,7 @@ void PluginView::onLoadClicked()
} }
QApplication::setOverrideCursor( Qt::WaitCursor ); QApplication::setOverrideCursor( Qt::WaitCursor );
bool success = m_pluginManager->loadPlugin( f.toAscii().data() ); bool success = m_pluginManager->loadPlugin( f );
QApplication::setOverrideCursor( Qt::ArrowCursor ); QApplication::setOverrideCursor( Qt::ArrowCursor );
if( !success ) if( !success )