From kde-commits  Sun Jul 31 19:56:10 2016
From: Montel Laurent <montel () kde ! org>
Date: Sun, 31 Jul 2016 19:56:10 +0000
To: kde-commits
Subject: [messagelib] messagecomposer/src/plugineditorcheckbeforesend: Allow to use kidentitymanager
Message-Id: <E1bTwqI-00073P-92 () code ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=146999497829068

Git commit 9f26a5d448ede4660e821b9e4932e17275d829fc by Montel Laurent.
Committed on 31/07/2016 at 19:56.
Pushed by mlaurent into branch 'master'.

Allow to use kidentitymanager

M  +2    -1    messagecomposer/src/plugineditorcheckbeforesend/plugineditor=
checkbeforesend.cpp
M  +6    -1    messagecomposer/src/plugineditorcheckbeforesend/plugineditor=
checkbeforesend.h
M  +2    -2    messagecomposer/src/plugineditorcheckbeforesend/plugineditor=
checkbeforesendconfigurewidget.cpp
M  +1    -1    messagecomposer/src/plugineditorcheckbeforesend/plugineditor=
checkbeforesendconfigurewidget.h

http://commits.kde.org/messagelib/9f26a5d448ede4660e821b9e4932e17275d829fc

diff --git a/messagecomposer/src/plugineditorcheckbeforesend/plugineditorch=
eckbeforesend.cpp b/messagecomposer/src/plugineditorcheckbeforesend/plugine=
ditorcheckbeforesend.cpp
index b3c5267..60735f9 100644
--- a/messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbefo=
resend.cpp
+++ b/messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbefo=
resend.cpp
@@ -47,8 +47,9 @@ bool PluginEditorCheckBeforeSend::hasConfigureSupport() c=
onst
     return false;
 }
 =

-PluginEditorCheckBeforeSendConfigureWidgetSetting PluginEditorCheckBeforeS=
end::createConfigureWidget(QWidget *parent) const
+PluginEditorCheckBeforeSendConfigureWidgetSetting PluginEditorCheckBeforeS=
end::createConfigureWidget(KIdentityManagement::IdentityManager *identityMa=
nager, QWidget *parent) const
 {
+    Q_UNUSED(identityManager)
     Q_UNUSED(parent);
     return {};
 }
diff --git a/messagecomposer/src/plugineditorcheckbeforesend/plugineditorch=
eckbeforesend.h b/messagecomposer/src/plugineditorcheckbeforesend/pluginedi=
torcheckbeforesend.h
index b3e60af..cf41d79 100644
--- a/messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbefo=
resend.h
+++ b/messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbefo=
resend.h
@@ -22,6 +22,11 @@
 =

 #include <QObject>
 #include "messagecomposer_export.h"
+namespace KIdentityManagement
+{
+class IdentityManager;
+}
+
 namespace MessageComposer
 {
 class PluginEditorCheckBeforeSendPrivate;
@@ -57,7 +62,7 @@ public:
 =

     virtual bool hasConfigureSupport() const;
 =

-    virtual PluginEditorCheckBeforeSendConfigureWidgetSetting createConfig=
ureWidget(QWidget *parent) const;
+    virtual PluginEditorCheckBeforeSendConfigureWidgetSetting createConfig=
ureWidget(KIdentityManagement::IdentityManager *identityManager, QWidget *p=
arent) const;
 =

     void emitConfigChanged();
 =

diff --git a/messagecomposer/src/plugineditorcheckbeforesend/plugineditorch=
eckbeforesendconfigurewidget.cpp b/messagecomposer/src/plugineditorcheckbef=
oresend/plugineditorcheckbeforesendconfigurewidget.cpp
index 39ee937..f88effe 100644
--- a/messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbefo=
resendconfigurewidget.cpp
+++ b/messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbefo=
resendconfigurewidget.cpp
@@ -21,9 +21,9 @@
 =

 using namespace MessageComposer;
 =

-PluginEditorCheckBeforeSendConfigureWidget::PluginEditorCheckBeforeSendCon=
figureWidget(QWidget *parent)
+PluginEditorCheckBeforeSendConfigureWidget::PluginEditorCheckBeforeSendCon=
figureWidget(KIdentityManagement::IdentityManager *identityManager, QWidget=
 *parent)
     : QWidget(parent),
-      mIdentityManagement(Q_NULLPTR)
+      mIdentityManagement(identityManager)
 {
 =

 }
diff --git a/messagecomposer/src/plugineditorcheckbeforesend/plugineditorch=
eckbeforesendconfigurewidget.h b/messagecomposer/src/plugineditorcheckbefor=
esend/plugineditorcheckbeforesendconfigurewidget.h
index d1f1172..4633085 100644
--- a/messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbefo=
resendconfigurewidget.h
+++ b/messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbefo=
resendconfigurewidget.h
@@ -34,7 +34,7 @@ class MESSAGECOMPOSER_EXPORT PluginEditorCheckBeforeSendC=
onfigureWidget : public
 {
     Q_OBJECT
 public:
-    explicit PluginEditorCheckBeforeSendConfigureWidget(QWidget *parent =
=3D Q_NULLPTR);
+    explicit PluginEditorCheckBeforeSendConfigureWidget(KIdentityManagemen=
t::IdentityManager *identityManager, QWidget *parent =3D Q_NULLPTR);
     ~PluginEditorCheckBeforeSendConfigureWidget();
 =

     virtual void loadSettings() =3D 0;