Commit 848688e8 authored by David Faure's avatar David Faure
Browse files

More porting away from KPluginInfo. Remove leftover definition.

parent c6e72f07
......@@ -435,7 +435,7 @@ void MainWindow::unloadPlugins()
{
for (const KPluginInfo &pluginInfo : qAsConst(mPluginInfos)) {
if (!pluginInfo.isPluginEnabled()) {
removePlugin(pluginInfo);
removePlugin(pluginInfo.pluginName());
}
}
}
......@@ -453,12 +453,12 @@ void MainWindow::updateShortcuts()
factory()->plugActionList(this, QStringLiteral("navigator_actionlist"), mActionPlugins);
}
bool MainWindow::removePlugin(const KPluginInfo &info)
bool MainWindow::removePlugin(const QString &pluginName)
{
const PluginList::Iterator end = mPlugins.end();
for (PluginList::Iterator it = mPlugins.begin(); it != end; ++it) {
KontactInterface::Plugin *plugin = *it;
if ((*it)->identifier() == info.pluginName()) {
if ((*it)->identifier() == pluginName) {
QList<QAction *> actionList = plugin->newActions();
QList<QAction *>::const_iterator listIt;
QList<QAction *>::const_iterator listEnd(actionList.constEnd());
......
......@@ -91,12 +91,11 @@ private:
void loadSettings();
void saveSettings();
bool isPluginLoaded(const KPluginInfo &);
KontactInterface::Plugin *pluginFromName(const QString &identifier);
void loadPlugins();
void unloadPlugins();
void updateShortcuts();
bool removePlugin(const KPluginInfo &);
bool removePlugin(const QString &pluginName);
void addPlugin(KontactInterface::Plugin *plugin);
void partLoaded(KontactInterface::Plugin *plugin, KParts::Part *part) override;
void setupActions();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment