summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-09-14 10:05:44 (GMT)
committerMontel Laurent <montel@kde.org>2016-09-14 10:06:20 (GMT)
commita31bf6f0c6690c697e42771c531ceb8fb1bac29b (patch)
treeb0cff9add58ad053e19b1b662b2228003128f233
parentac3b686ef1ff9a393b0c68edeec2c86f4b3a2280 (diff)
Use new PimCommon::PluginUtil::createPluginMetaData
-rw-r--r--CMakeLists.txt2
-rw-r--r--messagecomposer/src/plugineditor/plugineditormanager.cpp6
-rw-r--r--messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbeforesendmanager.cpp6
-rw-r--r--messageviewer/src/header/headerstylepluginmanager.cpp6
-rw-r--r--webengineviewer/src/urlinterceptor/networkurlinterceptorpluginmanager.cpp6
5 files changed, 5 insertions, 21 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c6f9f34..881bc35 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,7 +39,7 @@ set(KMIME_LIB_VERSION "5.3.40")
set(KPIMTEXTEDIT_LIB_VERSION "5.3.43")
set(LIBKDEPIM_LIB_VERSION "5.3.42")
set(LIBKLEO_LIB_VERSION "5.3.40")
-set(PIMCOMMON_LIB_VERSION "5.3.46")
+set(PIMCOMMON_LIB_VERSION "5.3.50")
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test Network PrintSupport WebEngine WebEngineWidgets WebKitWidgets)
diff --git a/messagecomposer/src/plugineditor/plugineditormanager.cpp b/messagecomposer/src/plugineditor/plugineditormanager.cpp
index 00e23dd..5144fea 100644
--- a/messagecomposer/src/plugineditor/plugineditormanager.cpp
+++ b/messagecomposer/src/plugineditor/plugineditormanager.cpp
@@ -107,11 +107,7 @@ bool PluginEditorManagerPrivate::initializePlugins()
info.metaData = i.previous();
//Store plugin info
- PimCommon::PluginUtilData pluginData;
- pluginData.mDescription = info.metaData.description();
- pluginData.mName = info.metaData.name();
- pluginData.mIdentifier = info.metaData.pluginId();
- pluginData.mEnableByDefault = info.metaData.isEnabledByDefault();
+ PimCommon::PluginUtilData pluginData = PimCommon::PluginUtil::createPluginMetaData(info.metaData);
mPluginDataList.append(pluginData);
const bool isPluginActivated = PimCommon::PluginUtil::isPluginActivated(pair.first, pair.second, pluginData.mEnableByDefault, pluginData.mIdentifier);
diff --git a/messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbeforesendmanager.cpp b/messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbeforesendmanager.cpp
index 5a618a7..15b388b 100644
--- a/messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbeforesendmanager.cpp
+++ b/messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbeforesendmanager.cpp
@@ -118,11 +118,7 @@ bool PluginEditorCheckBeforeSendManagerPrivate::initializePlugins()
info.metaData = i.previous();
//Store plugin info
- PimCommon::PluginUtilData pluginData;
- pluginData.mDescription = info.metaData.description();
- pluginData.mName = info.metaData.name();
- pluginData.mIdentifier = info.metaData.pluginId();
- pluginData.mEnableByDefault = info.metaData.isEnabledByDefault();
+ PimCommon::PluginUtilData pluginData = PimCommon::PluginUtil::createPluginMetaData(info.metaData);
mPluginDataList.append(pluginData);
const bool isPluginActivated = PimCommon::PluginUtil::isPluginActivated(pair.first, pair.second, pluginData.mEnableByDefault, pluginData.mIdentifier);
diff --git a/messageviewer/src/header/headerstylepluginmanager.cpp b/messageviewer/src/header/headerstylepluginmanager.cpp
index 0215b07..718dc3a 100644
--- a/messageviewer/src/header/headerstylepluginmanager.cpp
+++ b/messageviewer/src/header/headerstylepluginmanager.cpp
@@ -124,11 +124,7 @@ void HeaderStylePluginManagerPrivate::initializePluginList()
HeaderStylePluginInfo info;
info.metaData = i.previous();
- PimCommon::PluginUtilData pluginData;
- pluginData.mDescription = info.metaData.description();
- pluginData.mName = info.metaData.name();
- pluginData.mIdentifier = info.metaData.pluginId();
- pluginData.mEnableByDefault = info.metaData.isEnabledByDefault();
+ PimCommon::PluginUtilData pluginData = PimCommon::PluginUtil::createPluginMetaData(info.metaData);
mPluginDataList.append(pluginData);
const bool isPluginActivated = PimCommon::PluginUtil::isPluginActivated(pair.first, pair.second, pluginData.mEnableByDefault, pluginData.mIdentifier);
diff --git a/webengineviewer/src/urlinterceptor/networkurlinterceptorpluginmanager.cpp b/webengineviewer/src/urlinterceptor/networkurlinterceptorpluginmanager.cpp
index e1db553..8bb5368 100644
--- a/webengineviewer/src/urlinterceptor/networkurlinterceptorpluginmanager.cpp
+++ b/webengineviewer/src/urlinterceptor/networkurlinterceptorpluginmanager.cpp
@@ -126,11 +126,7 @@ void NetworkUrlInterceptorPluginManagerPrivate::initializePluginList()
MailNetworkUrlInterceptorPluginInfo info;
info.metaData = i.previous();
- PimCommon::PluginUtilData pluginData;
- pluginData.mDescription = info.metaData.description();
- pluginData.mName = info.metaData.name();
- pluginData.mIdentifier = info.metaData.pluginId();
- pluginData.mEnableByDefault = info.metaData.isEnabledByDefault();
+ PimCommon::PluginUtilData pluginData = PimCommon::PluginUtil::createPluginMetaData(info.metaData);
mPluginDataList.append(pluginData);
const bool isPluginActivated = PimCommon::PluginUtil::isPluginActivated(pair.first, pair.second, pluginData.mEnableByDefault, pluginData.mIdentifier);