Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-14 02:52:12 +01:00
Code Releases Activity

Fix compile issue with plugins on msvc.

Browse Source
This commit is contained in:
K0r5hun 2014-03-19 14:38:16 +04:00 committed by korwru
parent f042ba9b88
commit 8e0d849e01
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lib/plugins/plugins.cpp
View File

@ -206,26 +206,26 @@ void Plugins::loadAvailablePlugins()
} }
} }
PluginInterface* Plugins::initPlugin(PluginInterface::InitState state, PluginInterface* interface, QPluginLoader* loader) PluginInterface* Plugins::initPlugin(PluginInterface::InitState state, PluginInterface* pluginInterface, QPluginLoader* loader)
{ {
if (!interface) { if (!pluginInterface) {
return 0; return 0;
} }
interface->init(state, DataPaths::currentProfilePath() + "/extensions/"); pluginInterface->init(state, DataPaths::currentProfilePath() + "/extensions/");
if (!interface->testPlugin()) { if (!pluginInterface->testPlugin()) {
interface->unload(); pluginInterface->unload();
loader->unload(); loader->unload();
emit pluginUnloaded(interface); emit pluginUnloaded(pluginInterface);
return 0; return 0;
} }
qApp->installTranslator(interface->getTranslator(mApp->currentLanguageFile())); qApp->installTranslator(pluginInterface->getTranslator(mApp->currentLanguageFile()));
return interface; return pluginInterface;
} }
void Plugins::refreshLoadedPlugins() void Plugins::refreshLoadedPlugins()

2
src/lib/plugins/plugins.h
View File

@ -91,7 +91,7 @@ signals:
private: private:
bool alreadySpecInAvailable(const PluginSpec &spec); bool alreadySpecInAvailable(const PluginSpec &spec);
PluginInterface* initPlugin(PluginInterface::InitState state , PluginInterface* interface, QPluginLoader* loader); PluginInterface* initPlugin(PluginInterface::InitState state , PluginInterface* pluginInterface, QPluginLoader* loader);
void refreshLoadedPlugins(); void refreshLoadedPlugins();
void loadAvailablePlugins(); void loadAvailablePlugins();