summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-09-07 11:21:36 (GMT)
committerMontel Laurent <montel@kde.org>2016-09-07 11:21:36 (GMT)
commitf48c6cb2fcb5c674cbf82a398f6e91f2c57a5c66 (patch)
tree3406cab6c0dd7beaf867f6ceb23ea342b6b2d2b0
parent3ffb32a5a0b6eb1290508b390c4cea8fd3ed65b5 (diff)
Use pluginId it's better than name
-rw-r--r--CMakeLists.txt2
-rw-r--r--messagecomposer/src/plugineditor/plugineditormanager.cpp1
-rw-r--r--messagecomposer/src/plugineditor/plugineditormanager.h1
-rw-r--r--messageviewer/src/viewerplugins/viewerpluginmanager.cpp5
-rw-r--r--messageviewer/src/viewerplugins/viewerpluginmanager.h1
5 files changed, 7 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a817f6f..2c5a68a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(ECMQtDeclareLoggingCategory)
include(ECMAddTests)
-set(PIM_VERSION "5.3.50")
+set(PIM_VERSION "5.3.51")
set(MESSAGELIB_LIB_VERSION ${PIM_VERSION})
set(AKONADIMIME_LIB_VERSION "5.3.40")
diff --git a/messagecomposer/src/plugineditor/plugineditormanager.cpp b/messagecomposer/src/plugineditor/plugineditormanager.cpp
index 67738d6..7b53911 100644
--- a/messagecomposer/src/plugineditor/plugineditormanager.cpp
+++ b/messagecomposer/src/plugineditor/plugineditormanager.cpp
@@ -105,6 +105,7 @@ bool PluginEditorManagerPrivate::initializePlugins()
MessageComposer::PluginEditorManager::PluginEditorData pluginData;
pluginData.mDescription = info.metaData.description();
pluginData.mName = info.metaData.name();
+ pluginData.mIdentifier = info.metaData.pluginId();
pluginData.mEnableByDefault = info.metaData.isEnabledByDefault();
mPluginDataList.append(pluginData);
diff --git a/messagecomposer/src/plugineditor/plugineditormanager.h b/messagecomposer/src/plugineditor/plugineditormanager.h
index 820d57a..5953329 100644
--- a/messagecomposer/src/plugineditor/plugineditormanager.h
+++ b/messagecomposer/src/plugineditor/plugineditormanager.h
@@ -39,6 +39,7 @@ public:
}
QString mDescription;
+ QString mIdentifier;
QString mName;
bool mEnableByDefault;
};
diff --git a/messageviewer/src/viewerplugins/viewerpluginmanager.cpp b/messageviewer/src/viewerplugins/viewerpluginmanager.cpp
index 3ed9155..ebc770d 100644
--- a/messageviewer/src/viewerplugins/viewerpluginmanager.cpp
+++ b/messageviewer/src/viewerplugins/viewerpluginmanager.cpp
@@ -134,11 +134,12 @@ bool ViewerPluginManagerPrivate::initializePluginList()
MessageViewer::ViewerPluginManager::ViewerPluginData pluginData;
pluginData.mDescription = info.metaData.description();
pluginData.mName = info.metaData.name();
+ pluginData.mIdentifier = info.metaData.pluginId();
pluginData.mEnableByDefault = info.metaData.isEnabledByDefault();
mPluginDataList.append(pluginData);
- const bool pluginEnabledByUser = enabledPlugins.contains(info.metaData.name());
- const bool pluginDisabledByUser = disabledPlugins.contains(info.metaData.name());
+ const bool pluginEnabledByUser = enabledPlugins.contains(info.metaData.pluginId());
+ const bool pluginDisabledByUser = disabledPlugins.contains(info.metaData.pluginId());
if ((info.metaData.isEnabledByDefault() && !pluginDisabledByUser)
|| (!info.metaData.isEnabledByDefault() && pluginEnabledByUser)) {
const QString version = info.metaData.version();
diff --git a/messageviewer/src/viewerplugins/viewerpluginmanager.h b/messageviewer/src/viewerplugins/viewerpluginmanager.h
index 78876ea..0d3350c 100644
--- a/messageviewer/src/viewerplugins/viewerpluginmanager.h
+++ b/messageviewer/src/viewerplugins/viewerpluginmanager.h
@@ -41,6 +41,7 @@ public:
}
QString mDescription;
QString mName;
+ QString mIdentifier;
bool mEnableByDefault;
};