[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepim-addons/Applications/16.08] /: Avoid to create temporary identitymanager (use kmail instance
From: Montel Laurent <montel () kde ! org>
Date: 2016-07-31 19:58:42
Message-ID: E1bTwsk-00079q-51 () code ! kde ! org
[Download RAW message or body]
Git commit d726853d46acb75daf68865d03b639020404556f by Montel Laurent.
Committed on 31/07/2016 at 19:58.
Pushed by mlaurent into branch 'Applications/16.08'.
Avoid to create temporary identitymanager (use kmail instance => don't create twice \
identitymanager)
M +1 -1 CMakeLists.txt
M +14 -6 kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsconfiguretab.cpp
M +8 -4 kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsconfiguretab.h
M +3 -3 kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsconfigurewidget.cpp
M +1 -1 kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsconfigurewidget.h
M +2 -2 kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsplugin.cpp
M +1 -1 kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsplugin.h
M +1 -1 kmail/editorsendcheckplugins/automaticaddcontacts/autotests/automaticaddcontactsconfiguretabtest.cpp
M +1 -1 kmail/editorsendcheckplugins/automaticaddcontacts/autotests/automaticaddcontactsconfigurewidgettest.cpp
M +1 -1 kmail/editorsendcheckplugins/automaticaddcontacts/autotests/automaticaddcontactsplugintest.cpp
M +2 -2 kmail/editorsendcheckplugins/checkbeforesend/autotests/checkbeforesendconfigurewidgettest.cpp
M +1 -1 kmail/editorsendcheckplugins/checkbeforesend/autotests/checkbeforesendplugintest.cpp
M +2 -2 kmail/editorsendcheckplugins/checkbeforesend/checkbeforesendplugin.cpp
M +1 -1 kmail/editorsendcheckplugins/checkbeforesend/checkbeforesendplugin.h
M +2 -2 kmail/editorsendcheckplugins/checkbeforesend/configurewidget/checkbeforesendconfigurewidget.cpp
M +1 -1 kmail/editorsendcheckplugins/checkbeforesend/configurewidget/checkbeforesendconfigurewidget.h
M +1 -1 kmail/editorsendcheckplugins/confirm-address/autotests/confirmaddressconfiguretabtest.cpp
M +1 -1 kmail/editorsendcheckplugins/confirm-address/autotests/confirmaddressconfigurewidgettest.cpp
M +1 -1 kmail/editorsendcheckplugins/confirm-address/autotests/confirmaddressplugintest.cpp
M +15 -6 kmail/editorsendcheckplugins/confirm-address/confirmaddressconfiguretab.cpp
M +7 -2 kmail/editorsendcheckplugins/confirm-address/confirmaddressconfiguretab.h
M +3 -3 kmail/editorsendcheckplugins/confirm-address/confirmaddressconfigurewidget.cpp
M +1 -1 kmail/editorsendcheckplugins/confirm-address/confirmaddressconfigurewidget.h
M +2 -2 kmail/editorsendcheckplugins/confirm-address/confirmaddressplugin.cpp
M +1 -1 kmail/editorsendcheckplugins/confirm-address/confirmaddressplugin.h
http://commits.kde.org/kdepim-addons/d726853d46acb75daf68865d03b639020404556f
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ebd3f4..b5437e3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,7 +68,7 @@ set(LIBKLEO_LIB_VERSION "5.2.90")
set(AKONADI_LIB_VERSION "5.2.90")
set(INCIDENCEEDITOR_LIB_VERSION "5.2.90")
set(KTNEF_LIB_VERSION "5.2.90")
-set(MESSAGELIB_LIB_VERSION "5.2.93")
+set(MESSAGELIB_LIB_VERSION "5.2.94")
set(AKONADICALENDAR_LIB_VERSION "5.2.90")
set(CALENDAR_UTILS_VERSION "5.2.90")
diff --git a/kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsconfiguretab.cpp \
b/kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsconfiguretab.cpp
index 168391e..a2c0b81 100644
--- a/kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsconfiguretab.cpp
+++ b/kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsconfiguretab.cpp
@@ -27,7 +27,7 @@
#include <KIdentityManagement/IdentityManager>
#include <KIdentityManagement/Identity>
-AutomaticAddContactsConfigureTab::AutomaticAddContactsConfigureTab(QWidget *parent)
+AutomaticAddContactsConfigureTab::AutomaticAddContactsConfigureTab(KIdentityManagement::IdentityManager \
*identityManagement, QWidget *parent) : QWidget(parent)
{
QHBoxLayout *mainLayout = new QHBoxLayout(this);
@@ -36,7 +36,7 @@ AutomaticAddContactsConfigureTab::AutomaticAddContactsConfigureTab(QWidget \
*pare mTabWidget = new QTabWidget(this);
mTabWidget->setObjectName(QStringLiteral("tabwidget"));
mainLayout->addWidget(mTabWidget);
- initTab();
+ initTab(identityManagement);
}
AutomaticAddContactsConfigureTab::~AutomaticAddContactsConfigureTab()
@@ -44,17 +44,25 @@ AutomaticAddContactsConfigureTab::~AutomaticAddContactsConfigureTab()
}
-void AutomaticAddContactsConfigureTab::initTab()
+void AutomaticAddContactsConfigureTab::initTab(KIdentityManagement::IdentityManager \
*identityManager) {
- KIdentityManagement::IdentityManager manager(true);
- KIdentityManagement::IdentityManager::ConstIterator end = manager.end();
- for (KIdentityManagement::IdentityManager::ConstIterator it = manager.begin(); \
it != end; ++it) { + bool needToDeleteIdentity = false;
+ if (!identityManager) {
+ needToDeleteIdentity = true;
+ identityManager = new KIdentityManagement::IdentityManager(true);
+ }
+ KIdentityManagement::IdentityManager::ConstIterator end = \
identityManager->end(); + for (KIdentityManagement::IdentityManager::ConstIterator \
it = identityManager->begin(); it != end; ++it) {
AutomaticAddContactsTabWidget *w = new AutomaticAddContactsTabWidget(this);
connect(w, &AutomaticAddContactsTabWidget::configureChanged, this, \
&AutomaticAddContactsConfigureTab::configureChanged); mTabWidget->addTab(w, \
(*it).identityName()); w->setIdentity((*it).uoid());
mListTabWidget.append(w);
}
+ if (needToDeleteIdentity) {
+ delete identityManager;
+ identityManager = Q_NULLPTR;
+ }
}
void AutomaticAddContactsConfigureTab::loadSettings()
diff --git a/kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsconfiguretab.h \
b/kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsconfiguretab.h
index ebf7196..dd8d5e2 100644
--- a/kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsconfiguretab.h
+++ b/kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsconfiguretab.h
@@ -22,14 +22,19 @@
#include <QWidget>
class QTabWidget;
-class QTabWidget;
class KConfigGroup;
class AutomaticAddContactsTabWidget;
+
+namespace KIdentityManagement
+{
+class IdentityManager;
+}
+
class AutomaticAddContactsConfigureTab : public QWidget
{
Q_OBJECT
public:
- explicit AutomaticAddContactsConfigureTab(QWidget *parent = Q_NULLPTR);
+ explicit AutomaticAddContactsConfigureTab(KIdentityManagement::IdentityManager \
*identityManagement, QWidget *parent = Q_NULLPTR); \
~AutomaticAddContactsConfigureTab();
void loadSettings();
@@ -40,10 +45,9 @@ Q_SIGNALS:
void configureChanged();
private:
- void initTab();
+ void initTab(KIdentityManagement::IdentityManager *identityManager);
QTabWidget *mTabWidget;
QList<AutomaticAddContactsTabWidget *> mListTabWidget;
-
};
#endif // AUTOMATICADDCONTACTSCONFIGURETAB_H
diff --git a/kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsconfigurewidget.cpp \
b/kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsconfigurewidget.cpp
index 9a9f2f5..5735b5b 100644
--- a/kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsconfigurewidget.cpp
+++ b/kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsconfigurewidget.cpp
@@ -29,13 +29,13 @@
#include <KConfigGroup>
#include <KSharedConfig>
-AutomaticAddContactsConfigureWidget::AutomaticAddContactsConfigureWidget(QWidget \
*parent)
- : MessageComposer::PluginEditorCheckBeforeSendConfigureWidget(parent)
+AutomaticAddContactsConfigureWidget::AutomaticAddContactsConfigureWidget(KIdentityManagement::IdentityManager \
*identityManager, QWidget *parent) + : \
MessageComposer::PluginEditorCheckBeforeSendConfigureWidget(identityManager, parent) \
{ QVBoxLayout *mainLayout = new QVBoxLayout(this);
mainLayout->setObjectName(QStringLiteral("mainlayout"));
- mConfigureTab = new AutomaticAddContactsConfigureTab(this);
+ mConfigureTab = new AutomaticAddContactsConfigureTab(identityManagement(), \
this); mConfigureTab->setObjectName(QStringLiteral("configuretab"));
mainLayout->addWidget(mConfigureTab);
connect(mConfigureTab, &AutomaticAddContactsConfigureTab::configureChanged, \
this, &AutomaticAddContactsConfigureWidget::configureChanged);
diff --git a/kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsconfigurewidget.h \
b/kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsconfigurewidget.h
index 443af88..3da59ef 100644
--- a/kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsconfigurewidget.h
+++ b/kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsconfigurewidget.h
@@ -27,7 +27,7 @@ class AutomaticAddContactsConfigureWidget : public \
MessageComposer::PluginEditor {
Q_OBJECT
public:
- explicit AutomaticAddContactsConfigureWidget(QWidget *parent = Q_NULLPTR);
+ explicit AutomaticAddContactsConfigureWidget(KIdentityManagement::IdentityManager \
*identityManager, QWidget *parent = Q_NULLPTR); \
~AutomaticAddContactsConfigureWidget();
void loadSettings() Q_DECL_OVERRIDE;
diff --git a/kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsplugin.cpp \
b/kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsplugin.cpp \
index c6db4c6..c49115f 100644
--- a/kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsplugin.cpp
+++ b/kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsplugin.cpp
@@ -49,9 +49,9 @@ bool AutomaticAddContactsPlugin::hasConfigureSupport() const
return true;
}
-MessageComposer::PluginEditorCheckBeforeSendConfigureWidgetSetting \
AutomaticAddContactsPlugin::createConfigureWidget(QWidget *parent) const \
+MessageComposer::PluginEditorCheckBeforeSendConfigureWidgetSetting \
AutomaticAddContactsPlugin::createConfigureWidget(KIdentityManagement::IdentityManager \
*identityManager, QWidget *parent) const {
- AutomaticAddContactsConfigureWidget *w = new \
AutomaticAddContactsConfigureWidget(parent); + AutomaticAddContactsConfigureWidget \
*w = new AutomaticAddContactsConfigureWidget(identityManager, \
parent);
MessageComposer::PluginEditorCheckBeforeSendConfigureWidgetSetting settings(w, \
i18n("Add Automatically Contacts")); return settings;
}
diff --git a/kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsplugin.h \
b/kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsplugin.h \
index cb1d779..81df0ee 100644
--- a/kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsplugin.h
+++ b/kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsplugin.h
@@ -31,7 +31,7 @@ public:
MessageComposer::PluginEditorCheckBeforeSendInterface *createInterface(QObject \
*parent) Q_DECL_OVERRIDE; bool hasConfigureSupport() const Q_DECL_OVERRIDE;
- MessageComposer::PluginEditorCheckBeforeSendConfigureWidgetSetting \
createConfigureWidget(QWidget *parent) const Q_DECL_OVERRIDE; + \
MessageComposer::PluginEditorCheckBeforeSendConfigureWidgetSetting \
createConfigureWidget(KIdentityManagement::IdentityManager *identityManager, QWidget \
*parent) const Q_DECL_OVERRIDE; };
#endif // AUTOMATICADDCONTACTSPLUGIN_H
diff --git a/kmail/editorsendcheckplugins/automaticaddcontacts/autotests/automaticaddcontactsconfiguretabtest.cpp \
b/kmail/editorsendcheckplugins/automaticaddcontacts/autotests/automaticaddcontactsconfiguretabtest.cpp
index 8486265..9d91744 100644
--- a/kmail/editorsendcheckplugins/automaticaddcontacts/autotests/automaticaddcontactsconfiguretabtest.cpp
+++ b/kmail/editorsendcheckplugins/automaticaddcontacts/autotests/automaticaddcontactsconfiguretabtest.cpp
@@ -37,7 +37,7 @@ AutomaticAddContactsConfigureTabTest::~AutomaticAddContactsConfigureTabTest()
void AutomaticAddContactsConfigureTabTest::shouldHaveDefaultValue()
{
- AutomaticAddContactsConfigureTab w;
+ AutomaticAddContactsConfigureTab w(Q_NULLPTR);
QHBoxLayout *vboxlayout = w.findChild<QHBoxLayout \
*>(QStringLiteral("mainlayout")); QVERIFY(vboxlayout);
QCOMPARE(vboxlayout->margin(), 0);
diff --git a/kmail/editorsendcheckplugins/automaticaddcontacts/autotests/automaticaddcontactsconfigurewidgettest.cpp \
b/kmail/editorsendcheckplugins/automaticaddcontacts/autotests/automaticaddcontactsconfigurewidgettest.cpp
index ededc17..2c8130d 100644
--- a/kmail/editorsendcheckplugins/automaticaddcontacts/autotests/automaticaddcontactsconfigurewidgettest.cpp
+++ b/kmail/editorsendcheckplugins/automaticaddcontacts/autotests/automaticaddcontactsconfigurewidgettest.cpp
@@ -38,7 +38,7 @@ AutomaticAddContactsConfigureWidgetTest::~AutomaticAddContactsConfigureWidgetTes
void AutomaticAddContactsConfigureWidgetTest::shouldHaveDefaultValue()
{
- AutomaticAddContactsConfigureWidget w;
+ AutomaticAddContactsConfigureWidget w(Q_NULLPTR);
QVBoxLayout *mainLayout = w.findChild<QVBoxLayout \
*>(QStringLiteral("mainlayout")); QVERIFY(mainLayout);
diff --git a/kmail/editorsendcheckplugins/automaticaddcontacts/autotests/automaticaddcontactsplugintest.cpp \
b/kmail/editorsendcheckplugins/automaticaddcontacts/autotests/automaticaddcontactsplugintest.cpp
index 3ebd734..11e8cca 100644
--- a/kmail/editorsendcheckplugins/automaticaddcontacts/autotests/automaticaddcontactsplugintest.cpp
+++ b/kmail/editorsendcheckplugins/automaticaddcontacts/autotests/automaticaddcontactsplugintest.cpp
@@ -37,7 +37,7 @@ void AutomaticAddContactsPluginTest::shouldHaveDefaultValue()
AutomaticAddContactsPlugin plugin;
QVERIFY(plugin.hasConfigureSupport());
QVERIFY(plugin.createInterface(this));
- QVERIFY(plugin.createConfigureWidget(new QWidget()).configureWidget);
+ QVERIFY(plugin.createConfigureWidget(Q_NULLPTR, new QWidget()).configureWidget);
}
QTEST_MAIN(AutomaticAddContactsPluginTest)
diff --git a/kmail/editorsendcheckplugins/checkbeforesend/autotests/checkbeforesendconfigurewidgettest.cpp \
b/kmail/editorsendcheckplugins/checkbeforesend/autotests/checkbeforesendconfigurewidgettest.cpp
index 559be93..869277c 100644
--- a/kmail/editorsendcheckplugins/checkbeforesend/autotests/checkbeforesendconfigurewidgettest.cpp
+++ b/kmail/editorsendcheckplugins/checkbeforesend/autotests/checkbeforesendconfigurewidgettest.cpp
@@ -37,7 +37,7 @@ CheckBeforeSendConfigureWidgetTest::~CheckBeforeSendConfigureWidgetTest()
void CheckBeforeSendConfigureWidgetTest::shouldHaveDefaultValue()
{
- CheckBeforeSendConfigureWidget w;
+ CheckBeforeSendConfigureWidget w(Q_NULLPTR);
QVBoxLayout *vboxlayout = w.findChild<QVBoxLayout \
*>(QStringLiteral("mainlayout")); QVERIFY(vboxlayout);
@@ -64,7 +64,7 @@ void CheckBeforeSendConfigureWidgetTest::shouldHaveDefaultValue()
void CheckBeforeSendConfigureWidgetTest::shouldResetValue()
{
- CheckBeforeSendConfigureWidget w;
+ CheckBeforeSendConfigureWidget w(Q_NULLPTR);
QCheckBox *mCheckPlainTextMail = w.findChild<QCheckBox \
*>(QStringLiteral("checkplaintext"));
QCheckBox *mCheckMailTransport = w.findChild<QCheckBox \
*>(QStringLiteral("smtpdefinedinidentity"));
diff --git a/kmail/editorsendcheckplugins/checkbeforesend/autotests/checkbeforesendplugintest.cpp \
b/kmail/editorsendcheckplugins/checkbeforesend/autotests/checkbeforesendplugintest.cpp
index 3cedf2e..2af6d94 100644
--- a/kmail/editorsendcheckplugins/checkbeforesend/autotests/checkbeforesendplugintest.cpp
+++ b/kmail/editorsendcheckplugins/checkbeforesend/autotests/checkbeforesendplugintest.cpp
@@ -37,7 +37,7 @@ void CheckBeforeSendPluginTest::shouldHaveDefaultValue()
CheckBeforeSendPlugin plugin;
QVERIFY(plugin.hasConfigureSupport());
QVERIFY(plugin.createInterface(this));
- QVERIFY(plugin.createConfigureWidget(new QWidget()).configureWidget);
+ QVERIFY(plugin.createConfigureWidget(Q_NULLPTR, new QWidget()).configureWidget);
}
QTEST_MAIN(CheckBeforeSendPluginTest)
diff --git a/kmail/editorsendcheckplugins/checkbeforesend/checkbeforesendplugin.cpp \
b/kmail/editorsendcheckplugins/checkbeforesend/checkbeforesendplugin.cpp index \
4d9d462..dc862b2 100644
--- a/kmail/editorsendcheckplugins/checkbeforesend/checkbeforesendplugin.cpp
+++ b/kmail/editorsendcheckplugins/checkbeforesend/checkbeforesendplugin.cpp
@@ -49,9 +49,9 @@ bool CheckBeforeSendPlugin::hasConfigureSupport() const
return true;
}
-MessageComposer::PluginEditorCheckBeforeSendConfigureWidgetSetting \
CheckBeforeSendPlugin::createConfigureWidget(QWidget *parent) const \
+MessageComposer::PluginEditorCheckBeforeSendConfigureWidgetSetting \
CheckBeforeSendPlugin::createConfigureWidget(KIdentityManagement::IdentityManager \
*identityManager, QWidget *parent) const {
- CheckBeforeSendConfigureWidget *w = new CheckBeforeSendConfigureWidget(parent);
+ CheckBeforeSendConfigureWidget *w = new \
CheckBeforeSendConfigureWidget(identityManager, parent);
MessageComposer::PluginEditorCheckBeforeSendConfigureWidgetSetting settings(w, \
i18n("Check Before Send Email")); return settings;
}
diff --git a/kmail/editorsendcheckplugins/checkbeforesend/checkbeforesendplugin.h \
b/kmail/editorsendcheckplugins/checkbeforesend/checkbeforesendplugin.h index \
3b1b6b7..3624acd 100644
--- a/kmail/editorsendcheckplugins/checkbeforesend/checkbeforesendplugin.h
+++ b/kmail/editorsendcheckplugins/checkbeforesend/checkbeforesendplugin.h
@@ -31,7 +31,7 @@ public:
MessageComposer::PluginEditorCheckBeforeSendInterface *createInterface(QObject \
*parent) Q_DECL_OVERRIDE; bool hasConfigureSupport() const Q_DECL_OVERRIDE;
- MessageComposer::PluginEditorCheckBeforeSendConfigureWidgetSetting \
createConfigureWidget(QWidget *parent) const Q_DECL_OVERRIDE; + \
MessageComposer::PluginEditorCheckBeforeSendConfigureWidgetSetting \
createConfigureWidget(KIdentityManagement::IdentityManager *identityManager, QWidget \
*parent) const Q_DECL_OVERRIDE; };
#endif // CHECKBEFORESENDPLUGIN_H
diff --git a/kmail/editorsendcheckplugins/checkbeforesend/configurewidget/checkbeforesendconfigurewidget.cpp \
b/kmail/editorsendcheckplugins/checkbeforesend/configurewidget/checkbeforesendconfigurewidget.cpp
index 760905c..ea9ff64 100644
--- a/kmail/editorsendcheckplugins/checkbeforesend/configurewidget/checkbeforesendconfigurewidget.cpp
+++ b/kmail/editorsendcheckplugins/checkbeforesend/configurewidget/checkbeforesendconfigurewidget.cpp
@@ -24,8 +24,8 @@
#include <KConfigGroup>
#include <KSharedConfig>
-CheckBeforeSendConfigureWidget::CheckBeforeSendConfigureWidget(QWidget *parent)
- : MessageComposer::PluginEditorCheckBeforeSendConfigureWidget(parent)
+CheckBeforeSendConfigureWidget::CheckBeforeSendConfigureWidget(KIdentityManagement::IdentityManager \
*identityManager, QWidget *parent) + : \
MessageComposer::PluginEditorCheckBeforeSendConfigureWidget(identityManager, parent) \
{ QVBoxLayout *mainLayout = new QVBoxLayout(this);
mainLayout->setObjectName(QStringLiteral("mainlayout"));
diff --git a/kmail/editorsendcheckplugins/checkbeforesend/configurewidget/checkbeforesendconfigurewidget.h \
b/kmail/editorsendcheckplugins/checkbeforesend/configurewidget/checkbeforesendconfigurewidget.h
index 596162c..4c9e50d 100644
--- a/kmail/editorsendcheckplugins/checkbeforesend/configurewidget/checkbeforesendconfigurewidget.h
+++ b/kmail/editorsendcheckplugins/checkbeforesend/configurewidget/checkbeforesendconfigurewidget.h
@@ -28,7 +28,7 @@ class CheckBeforeSendConfigureWidget : public \
MessageComposer::PluginEditorCheck {
Q_OBJECT
public:
- explicit CheckBeforeSendConfigureWidget(QWidget *parent = Q_NULLPTR);
+ explicit CheckBeforeSendConfigureWidget(KIdentityManagement::IdentityManager \
*identityManager, QWidget *parent = Q_NULLPTR); ~CheckBeforeSendConfigureWidget();
void loadSettings() Q_DECL_OVERRIDE;
diff --git a/kmail/editorsendcheckplugins/confirm-address/autotests/confirmaddressconfiguretabtest.cpp \
b/kmail/editorsendcheckplugins/confirm-address/autotests/confirmaddressconfiguretabtest.cpp
index ad5ebce..a3e7553 100644
--- a/kmail/editorsendcheckplugins/confirm-address/autotests/confirmaddressconfiguretabtest.cpp
+++ b/kmail/editorsendcheckplugins/confirm-address/autotests/confirmaddressconfiguretabtest.cpp
@@ -37,7 +37,7 @@ ConfirmAddressConfigureTabTest::~ConfirmAddressConfigureTabTest()
void ConfirmAddressConfigureTabTest::shouldHaveDefaultValue()
{
- ConfirmAddressConfigureTab w;
+ ConfirmAddressConfigureTab w(Q_NULLPTR);
QVBoxLayout *vboxlayout = w.findChild<QVBoxLayout \
*>(QStringLiteral("mainlayout")); QVERIFY(vboxlayout);
QCOMPARE(vboxlayout->margin(), 0);
diff --git a/kmail/editorsendcheckplugins/confirm-address/autotests/confirmaddressconfigurewidgettest.cpp \
b/kmail/editorsendcheckplugins/confirm-address/autotests/confirmaddressconfigurewidgettest.cpp
index e24c28b..a8b7a52 100644
--- a/kmail/editorsendcheckplugins/confirm-address/autotests/confirmaddressconfigurewidgettest.cpp
+++ b/kmail/editorsendcheckplugins/confirm-address/autotests/confirmaddressconfigurewidgettest.cpp
@@ -38,7 +38,7 @@ ConfirmAddressConfigureWidgetTest::~ConfirmAddressConfigureWidgetTest()
void ConfirmAddressConfigureWidgetTest::shouldHaveDefaultValue()
{
- ConfirmAddressConfigureWidget w;
+ ConfirmAddressConfigureWidget w(Q_NULLPTR);
QVBoxLayout *vboxlayout = w.findChild<QVBoxLayout \
*>(QStringLiteral("mainlayout")); QVERIFY(vboxlayout);
diff --git a/kmail/editorsendcheckplugins/confirm-address/autotests/confirmaddressplugintest.cpp \
b/kmail/editorsendcheckplugins/confirm-address/autotests/confirmaddressplugintest.cpp \
index f2f009d..8540176 100644
--- a/kmail/editorsendcheckplugins/confirm-address/autotests/confirmaddressplugintest.cpp
+++ b/kmail/editorsendcheckplugins/confirm-address/autotests/confirmaddressplugintest.cpp
@@ -36,7 +36,7 @@ void ConfirmAddressPluginTest::shouldHaveDefaultValue()
{
ConfirmAddressPlugin plugin;
QVERIFY(plugin.hasConfigureSupport());
- QVERIFY(plugin.createConfigureWidget(new QWidget()).configureWidget);
+ QVERIFY(plugin.createConfigureWidget(Q_NULLPTR, new QWidget()).configureWidget);
QVERIFY(plugin.createInterface(this));
}
diff --git a/kmail/editorsendcheckplugins/confirm-address/confirmaddressconfiguretab.cpp \
b/kmail/editorsendcheckplugins/confirm-address/confirmaddressconfiguretab.cpp index \
523f703..2e69df9 100644
--- a/kmail/editorsendcheckplugins/confirm-address/confirmaddressconfiguretab.cpp
+++ b/kmail/editorsendcheckplugins/confirm-address/confirmaddressconfiguretab.cpp
@@ -24,7 +24,7 @@
#include <KIdentityManagement/IdentityManager>
#include <KIdentityManagement/Identity>
-ConfirmAddressConfigureTab::ConfirmAddressConfigureTab(QWidget *parent)
+ConfirmAddressConfigureTab::ConfirmAddressConfigureTab(KIdentityManagement::IdentityManager \
*identityManagement, QWidget *parent) : QWidget(parent)
{
QVBoxLayout *mainLayout = new QVBoxLayout(this);
@@ -35,7 +35,7 @@ ConfirmAddressConfigureTab::ConfirmAddressConfigureTab(QWidget \
*parent) mTabWidget->setObjectName(QStringLiteral("tabwidget"));
mainLayout->addWidget(mTabWidget);
- initTab();
+ initTab(identityManagement);
}
ConfirmAddressConfigureTab::~ConfirmAddressConfigureTab()
@@ -64,15 +64,24 @@ void ConfirmAddressConfigureTab::resetSettings()
}
}
-void ConfirmAddressConfigureTab::initTab()
+void ConfirmAddressConfigureTab::initTab(KIdentityManagement::IdentityManager \
*identityManager) {
- KIdentityManagement::IdentityManager manager(true);
- KIdentityManagement::IdentityManager::ConstIterator end = manager.end();
- for (KIdentityManagement::IdentityManager::ConstIterator it = manager.begin(); \
it != end; ++it) { + bool needToDeleteIdentity = false;
+ if (!identityManager) {
+ needToDeleteIdentity = true;
+ identityManager = new KIdentityManagement::IdentityManager(true);
+ }
+ KIdentityManagement::IdentityManager::ConstIterator end = \
identityManager->end(); + for (KIdentityManagement::IdentityManager::ConstIterator \
it = identityManager->begin(); it != end; ++it) {
ConfirmAddressConfigureTabWidget *w = new \
ConfirmAddressConfigureTabWidget(this);
connect(w, &ConfirmAddressConfigureTabWidget::configureChanged, this, \
&ConfirmAddressConfigureTab::configureChanged); mTabWidget->addTab(w, \
(*it).identityName()); w->setIdentity((*it).uoid());
mListTabWidget.append(w);
}
+ if (needToDeleteIdentity) {
+ delete identityManager;
+ identityManager = Q_NULLPTR;
+ }
}
+
diff --git a/kmail/editorsendcheckplugins/confirm-address/confirmaddressconfiguretab.h \
b/kmail/editorsendcheckplugins/confirm-address/confirmaddressconfiguretab.h index \
7b9cb1a..a4d1581 100644
--- a/kmail/editorsendcheckplugins/confirm-address/confirmaddressconfiguretab.h
+++ b/kmail/editorsendcheckplugins/confirm-address/confirmaddressconfiguretab.h
@@ -24,11 +24,16 @@
class QTabWidget;
class KConfigGroup;
class ConfirmAddressConfigureTabWidget;
+namespace KIdentityManagement
+{
+class IdentityManager;
+}
+
class ConfirmAddressConfigureTab : public QWidget
{
Q_OBJECT
public:
- explicit ConfirmAddressConfigureTab(QWidget *parent = Q_NULLPTR);
+ explicit ConfirmAddressConfigureTab(KIdentityManagement::IdentityManager \
*identityManagement, QWidget *parent = Q_NULLPTR); ~ConfirmAddressConfigureTab();
void loadSettings(const KConfigGroup &grp);
@@ -39,7 +44,7 @@ Q_SIGNALS:
void configureChanged();
private:
- void initTab();
+ void initTab(KIdentityManagement::IdentityManager *identityManager);
QTabWidget *mTabWidget;
QList<ConfirmAddressConfigureTabWidget *> mListTabWidget;
};
diff --git a/kmail/editorsendcheckplugins/confirm-address/confirmaddressconfigurewidget.cpp \
b/kmail/editorsendcheckplugins/confirm-address/confirmaddressconfigurewidget.cpp \
index a17ba2b..2b6d8be 100644
--- a/kmail/editorsendcheckplugins/confirm-address/confirmaddressconfigurewidget.cpp
+++ b/kmail/editorsendcheckplugins/confirm-address/confirmaddressconfigurewidget.cpp
@@ -26,8 +26,8 @@
#include <KSharedConfig>
#include <QRegularExpression>
-ConfirmAddressConfigureWidget::ConfirmAddressConfigureWidget(QWidget *parent)
- : MessageComposer::PluginEditorCheckBeforeSendConfigureWidget(parent)
+ConfirmAddressConfigureWidget::ConfirmAddressConfigureWidget(KIdentityManagement::IdentityManager \
*identityManager, QWidget *parent) + : \
MessageComposer::PluginEditorCheckBeforeSendConfigureWidget(identityManager, parent) \
{ QVBoxLayout *vboxlayout = new QVBoxLayout;
vboxlayout->setObjectName(QStringLiteral("mainlayout"));
@@ -37,7 +37,7 @@ ConfirmAddressConfigureWidget::ConfirmAddressConfigureWidget(QWidget \
*parent) vboxlayout->addWidget(mEnable);
connect(mEnable, &QCheckBox::clicked, this, \
&ConfirmAddressConfigureWidget::slotEnableChanged);
- mConfirmAddressConfigureTab = new ConfirmAddressConfigureTab(this);
+ mConfirmAddressConfigureTab = new \
ConfirmAddressConfigureTab(identityManagement(), this);
mConfirmAddressConfigureTab->setObjectName(QStringLiteral("confirmaddresstab"));
connect(mConfirmAddressConfigureTab, \
&ConfirmAddressConfigureTab::configureChanged, this, \
&ConfirmAddressConfigureWidget::configureChanged); \
vboxlayout->addWidget(mConfirmAddressConfigureTab);
diff --git a/kmail/editorsendcheckplugins/confirm-address/confirmaddressconfigurewidget.h \
b/kmail/editorsendcheckplugins/confirm-address/confirmaddressconfigurewidget.h index \
3df521a..d22dd16 100644
--- a/kmail/editorsendcheckplugins/confirm-address/confirmaddressconfigurewidget.h
+++ b/kmail/editorsendcheckplugins/confirm-address/confirmaddressconfigurewidget.h
@@ -28,7 +28,7 @@ class ConfirmAddressConfigureWidget : public \
MessageComposer::PluginEditorCheckB {
Q_OBJECT
public:
- explicit ConfirmAddressConfigureWidget(QWidget *parent = Q_NULLPTR);
+ explicit ConfirmAddressConfigureWidget(KIdentityManagement::IdentityManager \
*identityManager, QWidget *parent = Q_NULLPTR); ~ConfirmAddressConfigureWidget();
void loadSettings() Q_DECL_OVERRIDE;
diff --git a/kmail/editorsendcheckplugins/confirm-address/confirmaddressplugin.cpp \
b/kmail/editorsendcheckplugins/confirm-address/confirmaddressplugin.cpp index \
64dedb7..90cee0b 100644
--- a/kmail/editorsendcheckplugins/confirm-address/confirmaddressplugin.cpp
+++ b/kmail/editorsendcheckplugins/confirm-address/confirmaddressplugin.cpp
@@ -50,9 +50,9 @@ bool ConfirmAddressPlugin::hasConfigureSupport() const
return true;
}
-MessageComposer::PluginEditorCheckBeforeSendConfigureWidgetSetting \
ConfirmAddressPlugin::createConfigureWidget(QWidget *parent) const \
+MessageComposer::PluginEditorCheckBeforeSendConfigureWidgetSetting \
ConfirmAddressPlugin::createConfigureWidget(KIdentityManagement::IdentityManager \
*identityManager, QWidget *parent) const {
- ConfirmAddressConfigureWidget *w = new ConfirmAddressConfigureWidget(parent);
+ ConfirmAddressConfigureWidget *w = new \
ConfirmAddressConfigureWidget(identityManager, parent);
MessageComposer::PluginEditorCheckBeforeSendConfigureWidgetSetting settings(w, \
i18n("Confirm Addresses")); return settings;
}
diff --git a/kmail/editorsendcheckplugins/confirm-address/confirmaddressplugin.h \
b/kmail/editorsendcheckplugins/confirm-address/confirmaddressplugin.h index \
45d8e41..2a27b7a 100644
--- a/kmail/editorsendcheckplugins/confirm-address/confirmaddressplugin.h
+++ b/kmail/editorsendcheckplugins/confirm-address/confirmaddressplugin.h
@@ -33,7 +33,7 @@ public:
MessageComposer::PluginEditorCheckBeforeSendInterface *createInterface(QObject \
*parent) Q_DECL_OVERRIDE; bool hasConfigureSupport() const Q_DECL_OVERRIDE;
- MessageComposer::PluginEditorCheckBeforeSendConfigureWidgetSetting \
createConfigureWidget(QWidget *parent) const Q_DECL_OVERRIDE; + \
MessageComposer::PluginEditorCheckBeforeSendConfigureWidgetSetting \
createConfigureWidget(KIdentityManagement::IdentityManager *identityManager, QWidget \
*parent) const Q_DECL_OVERRIDE; };
#endif // CONFIRMADDRESSPLUGIN_H
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic