[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [messagelib] messagecomposer/src/plugineditorcheckbeforesend: Allow to use kidentitymanager
From:       Montel Laurent <montel () kde ! org>
Date:       2016-07-31 19:56:10
Message-ID: E1bTwqI-00073P-92 () code ! kde ! org
[Download RAW message or body]

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/plugineditorcheckbeforesend.cpp
 M  +6    -1    messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbeforesend.h
 M  +2    -2    messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbeforesendconfigurewidget.cpp
 M  +1    -1    messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbeforesendconfigurewidget.h


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

diff --git a/messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbeforesend.cpp \
b/messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbeforesend.cpp \
                index b3c5267..60735f9 100644
--- a/messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbeforesend.cpp
+++ b/messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbeforesend.cpp
@@ -47,8 +47,9 @@ bool PluginEditorCheckBeforeSend::hasConfigureSupport() const
     return false;
 }
 
-PluginEditorCheckBeforeSendConfigureWidgetSetting \
PluginEditorCheckBeforeSend::createConfigureWidget(QWidget *parent) const \
+PluginEditorCheckBeforeSendConfigureWidgetSetting \
PluginEditorCheckBeforeSend::createConfigureWidget(KIdentityManagement::IdentityManager \
*identityManager, QWidget *parent) const  {
+    Q_UNUSED(identityManager)
     Q_UNUSED(parent);
     return {};
 }
diff --git a/messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbeforesend.h \
b/messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbeforesend.h index \
                b3e60af..cf41d79 100644
--- a/messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbeforesend.h
+++ b/messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbeforesend.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 \
createConfigureWidget(QWidget *parent) const; +    virtual \
PluginEditorCheckBeforeSendConfigureWidgetSetting \
createConfigureWidget(KIdentityManagement::IdentityManager *identityManager, QWidget \
*parent) const;  
     void emitConfigChanged();
 
diff --git a/messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbeforesendconfigurewidget.cpp \
b/messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbeforesendconfigurewidget.cpp
 index 39ee937..f88effe 100644
--- a/messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbeforesendconfigurewidget.cpp
                
+++ b/messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbeforesendconfigurewidget.cpp
 @@ -21,9 +21,9 @@
 
 using namespace MessageComposer;
 
-PluginEditorCheckBeforeSendConfigureWidget::PluginEditorCheckBeforeSendConfigureWidget(QWidget \
*parent) +PluginEditorCheckBeforeSendConfigureWidget::PluginEditorCheckBeforeSendConfigureWidget(KIdentityManagement::IdentityManager \
*identityManager, QWidget *parent)  : QWidget(parent),
-      mIdentityManagement(Q_NULLPTR)
+      mIdentityManagement(identityManager)
 {
 
 }
diff --git a/messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbeforesendconfigurewidget.h \
b/messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbeforesendconfigurewidget.h
 index d1f1172..4633085 100644
--- a/messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbeforesendconfigurewidget.h
                
+++ b/messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbeforesendconfigurewidget.h
 @@ -34,7 +34,7 @@ class MESSAGECOMPOSER_EXPORT \
PluginEditorCheckBeforeSendConfigureWidget : public  {
     Q_OBJECT
 public:
-    explicit PluginEditorCheckBeforeSendConfigureWidget(QWidget *parent = \
Q_NULLPTR); +    explicit \
PluginEditorCheckBeforeSendConfigureWidget(KIdentityManagement::IdentityManager \
*identityManager, QWidget *parent = Q_NULLPTR);  \
~PluginEditorCheckBeforeSendConfigureWidget();  
     virtual void loadSettings() = 0;


[prev in list] [next in list] [prev in thread] [next in thread]