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

List:       kde-commits
Subject:    [kdepim-addons/Applications/16.08] /: Fix api
From:       Montel Laurent <montel () kde ! org>
Date:       2016-08-01 5:05:24
Message-ID: E1bU5Po-0001bp-5x () code ! kde ! org
[Download RAW message or body]

Git commit b0279c48bcb0b246d19486e45041feeb66a6b4e3 by Montel Laurent.
Committed on 01/08/2016 at 05:05.
Pushed by mlaurent into branch 'Applications/16.08'.

Fix api

M  +1    -1    CMakeLists.txt
M  +3    -3    kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsconfigurewidget.cpp
 M  +1    -1    kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsconfigurewidget.h
 M  +3    -3    kmail/editorsendcheckplugins/confirm-address/confirmaddressconfigurewidget.cpp
 M  +1    -1    kmail/editorsendcheckplugins/confirm-address/confirmaddressconfigurewidget.h


http://commits.kde.org/kdepim-addons/b0279c48bcb0b246d19486e45041feeb66a6b4e3

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b5437e3..76e0448 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.94")
+set(MESSAGELIB_LIB_VERSION "5.2.95")
 set(AKONADICALENDAR_LIB_VERSION "5.2.90")
 set(CALENDAR_UTILS_VERSION "5.2.90")
 
diff --git a/kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsconfigurewidget.cpp \
b/kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsconfigurewidget.cpp
 index 5735b5b..7f6edeb 100644
--- a/kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsconfigurewidget.cpp
                
+++ b/kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsconfigurewidget.cpp
 @@ -29,13 +29,13 @@
 #include <KConfigGroup>
 #include <KSharedConfig>
 
-AutomaticAddContactsConfigureWidget::AutomaticAddContactsConfigureWidget(KIdentityManagement::IdentityManager \
                *identityManager, QWidget *parent)
-    : MessageComposer::PluginEditorCheckBeforeSendConfigureWidget(identityManager, \
parent) +AutomaticAddContactsConfigureWidget::AutomaticAddContactsConfigureWidget(KIdentityManagement::IdentityManager \
*im, QWidget *parent) +    : \
MessageComposer::PluginEditorCheckBeforeSendConfigureWidget(im, parent)  {
     QVBoxLayout *mainLayout = new QVBoxLayout(this);
     mainLayout->setObjectName(QStringLiteral("mainlayout"));
 
-    mConfigureTab = new AutomaticAddContactsConfigureTab(identityManagement(), \
this); +    mConfigureTab = new AutomaticAddContactsConfigureTab(identityManager(), \
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 3da59ef..8286ec4 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(KIdentityManagement::IdentityManager \
*identityManager, QWidget *parent = Q_NULLPTR); +    explicit \
AutomaticAddContactsConfigureWidget(KIdentityManagement::IdentityManager *im, QWidget \
*parent = Q_NULLPTR);  ~AutomaticAddContactsConfigureWidget();
 
     void loadSettings() Q_DECL_OVERRIDE;
diff --git a/kmail/editorsendcheckplugins/confirm-address/confirmaddressconfigurewidget.cpp \
b/kmail/editorsendcheckplugins/confirm-address/confirmaddressconfigurewidget.cpp \
                index 2b6d8be..4a227b9 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(KIdentityManagement::IdentityManager \
                *identityManager, QWidget *parent)
-    : MessageComposer::PluginEditorCheckBeforeSendConfigureWidget(identityManager, \
parent) +ConfirmAddressConfigureWidget::ConfirmAddressConfigureWidget(KIdentityManagement::IdentityManager \
*im, QWidget *parent) +    : \
MessageComposer::PluginEditorCheckBeforeSendConfigureWidget(im, parent)  {
     QVBoxLayout *vboxlayout = new QVBoxLayout;
     vboxlayout->setObjectName(QStringLiteral("mainlayout"));
@@ -37,7 +37,7 @@ ConfirmAddressConfigureWidget::ConfirmAddressConfigureWidget(KIdentityManagement
  vboxlayout->addWidget(mEnable);
     connect(mEnable, &QCheckBox::clicked, this, \
&ConfirmAddressConfigureWidget::slotEnableChanged);  
-    mConfirmAddressConfigureTab = new \
ConfirmAddressConfigureTab(identityManagement(), this); +    \
mConfirmAddressConfigureTab = new ConfirmAddressConfigureTab(identityManager(), \
                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 \
                d22dd16..6e76210 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(KIdentityManagement::IdentityManager \
*identityManager, QWidget *parent = Q_NULLPTR); +    explicit \
ConfirmAddressConfigureWidget(KIdentityManagement::IdentityManager *im, QWidget \
*parent = Q_NULLPTR);  ~ConfirmAddressConfigureWidget();
 
     void loadSettings() Q_DECL_OVERRIDE;


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