summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-10-07 05:57:59 (GMT)
committerMontel Laurent <montel@kde.org>2016-10-07 05:57:59 (GMT)
commitbe2939c4050ccf436c3d1002c20e74d03749ebd2 (patch)
treebcbe59e1404cd7ac58f122a13c1607d67f73db47
parenta3dbc4588bac722342edd5cc1cda23465753dbc1 (diff)
Fix plugin info
-rw-r--r--kaddressbookimportexport/src/kaddressbookimportexportpluginmanager.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/kaddressbookimportexport/src/kaddressbookimportexportpluginmanager.cpp b/kaddressbookimportexport/src/kaddressbookimportexportpluginmanager.cpp
index 0b9feaa..458dbd0 100644
--- a/kaddressbookimportexport/src/kaddressbookimportexportpluginmanager.cpp
+++ b/kaddressbookimportexport/src/kaddressbookimportexportpluginmanager.cpp
@@ -96,8 +96,8 @@ private:
bool KAddressBookImportExportPrivate::initializePlugins()
{
- const QVector<KPluginMetaData> plugins = KPluginLoader::findPlugins(QStringLiteral("kmail"), [](const KPluginMetaData & md) {
- return md.serviceTypes().contains(QStringLiteral("KMailEditor/Plugin"));
+ const QVector<KPluginMetaData> plugins = KPluginLoader::findPlugins(QStringLiteral("kaddressbook"), [](const KPluginMetaData & md) {
+ return md.serviceTypes().contains(QStringLiteral("KAddressBook/ImportExportPlugin"));
});
const QPair<QStringList, QStringList> pair = PimCommon::PluginUtil::loadPluginSetting(configGroupName(), configPrefixSettingKey());
@@ -116,7 +116,6 @@ bool KAddressBookImportExportPrivate::initializePlugins()
info.isEnabled = isPluginActivated;
info.metaDataFileNameBaseName = QFileInfo(data.fileName()).baseName();
info.metaDataFileName = data.fileName();
- const QVariant p = data.rawData().value(QStringLiteral("X-KDE-KMailEditor-Order")).toVariant();
if (pluginVersion() == data.version()) {
// only load plugins once, even if found multiple times!
if (unique.contains(info.metaDataFileNameBaseName)) {
@@ -166,12 +165,12 @@ QVector<PimCommon::PluginUtilData> KAddressBookImportExportPrivate::pluginDataLi
QString KAddressBookImportExportPrivate::configGroupName() const
{
- return QStringLiteral("KMailPluginEditor");
+ return QStringLiteral("KAddressBookPluginImportExport");
}
QString KAddressBookImportExportPrivate::configPrefixSettingKey() const
{
- return QStringLiteral("KMailEditorPlugin");
+ return QStringLiteral("KAddressBookImportExportPlugin");
}
KAddressBookImportExportPlugin *KAddressBookImportExportPrivate::pluginFromIdentifier(const QString &id)