summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-09-22 11:28:56 (GMT)
committerMontel Laurent <montel@kde.org>2016-09-22 11:59:00 (GMT)
commitec20a9cf7e3dbfee26a70da0fa9a529d507f3db1 (patch)
treeb6243e2df33086d3d9cc89d780e3e16578be468d
parentb1580ca8c87807eb153d48fa7c03f14b5b3130aa (diff)
Adapt to new api
-rw-r--r--CMakeLists.txt2
-rw-r--r--kaddressbook/plugins/checkgravatar/checkgravatarplugin.cpp5
-rw-r--r--kaddressbook/plugins/checkgravatar/checkgravatarplugin.h2
-rw-r--r--kaddressbook/plugins/mergecontacts/mergecontactsplugin.cpp5
-rw-r--r--kaddressbook/plugins/mergecontacts/mergecontactsplugin.h2
-rw-r--r--kaddressbook/plugins/searchduplicates/searchduplicatesplugin.cpp5
-rw-r--r--kaddressbook/plugins/searchduplicates/searchduplicatesplugin.h2
-rw-r--r--kaddressbook/plugins/sendmail/sendmailplugin.cpp5
-rw-r--r--kaddressbook/plugins/sendmail/sendmailplugin.h2
-rw-r--r--kaddressbook/plugins/sendvcards/sendvcardsplugin.cpp5
-rw-r--r--kaddressbook/plugins/sendvcards/sendvcardsplugin.h2
-rw-r--r--kmail/plugins/antispamplugin/antispamplugin.cpp5
-rw-r--r--kmail/plugins/antispamplugin/antispamplugin.h2
-rw-r--r--kmail/plugins/antivirusplugin/antivirusplugin.cpp5
-rw-r--r--kmail/plugins/antivirusplugin/antivirusplugin.h2
15 files changed, 22 insertions, 29 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2eba27b..16abd6b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,7 +58,7 @@ find_package(KF5Declarative ${KF5_VERSION} CONFIG REQUIRED)
set(MAILCOMMON_LIB_VERSION "5.3.40")
set(GRAVATAR_LIB_VERSION "5.3.40")
-set(PIMCOMMON_LIB_VERSION "5.3.52")
+set(PIMCOMMON_LIB_VERSION "5.3.53")
set(GRANTLEETHEME_LIB_VERSION "5.3.40")
set(CALENDARSUPPORT_LIB_VERSION "5.3.40")
set(EVENTVIEW_LIB_VERSION "5.3.40")
diff --git a/kaddressbook/plugins/checkgravatar/checkgravatarplugin.cpp b/kaddressbook/plugins/checkgravatar/checkgravatarplugin.cpp
index 66f41b3..7b61d51 100644
--- a/kaddressbook/plugins/checkgravatar/checkgravatarplugin.cpp
+++ b/kaddressbook/plugins/checkgravatar/checkgravatarplugin.cpp
@@ -33,10 +33,9 @@ CheckGravatarPlugin::~CheckGravatarPlugin()
{
}
-PimCommon::GenericPluginInterface *CheckGravatarPlugin::createInterface(KActionCollection *ac, QWidget *parent)
+PimCommon::GenericPluginInterface *CheckGravatarPlugin::createInterface(KActionCollection *ac, QObject *parent)
{
- CheckGravatarPluginInterface *interface = new CheckGravatarPluginInterface(this);
- interface->setParentWidget(parent);
+ CheckGravatarPluginInterface *interface = new CheckGravatarPluginInterface(parent);
interface->createAction(ac);
return interface;
}
diff --git a/kaddressbook/plugins/checkgravatar/checkgravatarplugin.h b/kaddressbook/plugins/checkgravatar/checkgravatarplugin.h
index 3b57624..ce404df 100644
--- a/kaddressbook/plugins/checkgravatar/checkgravatarplugin.h
+++ b/kaddressbook/plugins/checkgravatar/checkgravatarplugin.h
@@ -33,7 +33,7 @@ public:
explicit CheckGravatarPlugin(QObject *parent = Q_NULLPTR, const QList<QVariant> & = QList<QVariant>());
~CheckGravatarPlugin();
- PimCommon::GenericPluginInterface *createInterface(KActionCollection *ac, QWidget *parent) Q_DECL_OVERRIDE;
+ PimCommon::GenericPluginInterface *createInterface(KActionCollection *ac, QObject *parent = Q_NULLPTR) Q_DECL_OVERRIDE;
bool hasPopupMenuSupport() const Q_DECL_OVERRIDE;
diff --git a/kaddressbook/plugins/mergecontacts/mergecontactsplugin.cpp b/kaddressbook/plugins/mergecontacts/mergecontactsplugin.cpp
index df2cd98..4ffbbb8 100644
--- a/kaddressbook/plugins/mergecontacts/mergecontactsplugin.cpp
+++ b/kaddressbook/plugins/mergecontacts/mergecontactsplugin.cpp
@@ -33,10 +33,9 @@ MergeContactsPlugin::~MergeContactsPlugin()
{
}
-PimCommon::GenericPluginInterface *MergeContactsPlugin::createInterface(KActionCollection *ac, QWidget *parent)
+PimCommon::GenericPluginInterface *MergeContactsPlugin::createInterface(KActionCollection *ac, QObject *parent)
{
- MergeContactsPluginInterface *interface = new MergeContactsPluginInterface(this);
- interface->setParentWidget(parent);
+ MergeContactsPluginInterface *interface = new MergeContactsPluginInterface(parent);
interface->createAction(ac);
return interface;
}
diff --git a/kaddressbook/plugins/mergecontacts/mergecontactsplugin.h b/kaddressbook/plugins/mergecontacts/mergecontactsplugin.h
index 65122ea..219f907 100644
--- a/kaddressbook/plugins/mergecontacts/mergecontactsplugin.h
+++ b/kaddressbook/plugins/mergecontacts/mergecontactsplugin.h
@@ -33,7 +33,7 @@ public:
explicit MergeContactsPlugin(QObject *parent = Q_NULLPTR, const QList<QVariant> & = QList<QVariant>());
~MergeContactsPlugin();
- PimCommon::GenericPluginInterface *createInterface(KActionCollection *ac, QWidget *parent) Q_DECL_OVERRIDE;
+ PimCommon::GenericPluginInterface *createInterface(KActionCollection *ac, QObject *parent = Q_NULLPTR) Q_DECL_OVERRIDE;
};
#endif // MERGECONTACTSPLUGIN_H
diff --git a/kaddressbook/plugins/searchduplicates/searchduplicatesplugin.cpp b/kaddressbook/plugins/searchduplicates/searchduplicatesplugin.cpp
index 1049bd0..5010fcd 100644
--- a/kaddressbook/plugins/searchduplicates/searchduplicatesplugin.cpp
+++ b/kaddressbook/plugins/searchduplicates/searchduplicatesplugin.cpp
@@ -33,10 +33,9 @@ SearchDuplicatesPlugin::~SearchDuplicatesPlugin()
{
}
-PimCommon::GenericPluginInterface *SearchDuplicatesPlugin::createInterface(KActionCollection *ac, QWidget *parent)
+PimCommon::GenericPluginInterface *SearchDuplicatesPlugin::createInterface(KActionCollection *ac, QObject *parent)
{
- SearchDuplicatesPluginInterface *interface = new SearchDuplicatesPluginInterface(this);
- interface->setParentWidget(parent);
+ SearchDuplicatesPluginInterface *interface = new SearchDuplicatesPluginInterface(parent);
interface->createAction(ac);
return interface;
}
diff --git a/kaddressbook/plugins/searchduplicates/searchduplicatesplugin.h b/kaddressbook/plugins/searchduplicates/searchduplicatesplugin.h
index e3b2d20..54b6bfe 100644
--- a/kaddressbook/plugins/searchduplicates/searchduplicatesplugin.h
+++ b/kaddressbook/plugins/searchduplicates/searchduplicatesplugin.h
@@ -33,7 +33,7 @@ public:
explicit SearchDuplicatesPlugin(QObject *parent = Q_NULLPTR, const QList<QVariant> & = QList<QVariant>());
~SearchDuplicatesPlugin();
- PimCommon::GenericPluginInterface *createInterface(KActionCollection *ac, QWidget *parent) Q_DECL_OVERRIDE;
+ PimCommon::GenericPluginInterface *createInterface(KActionCollection *ac, QObject *parent = Q_NULLPTR) Q_DECL_OVERRIDE;
};
#endif // SEARCHDUPLICATESPLUGIN_H
diff --git a/kaddressbook/plugins/sendmail/sendmailplugin.cpp b/kaddressbook/plugins/sendmail/sendmailplugin.cpp
index 22fccfa..78408ca 100644
--- a/kaddressbook/plugins/sendmail/sendmailplugin.cpp
+++ b/kaddressbook/plugins/sendmail/sendmailplugin.cpp
@@ -33,10 +33,9 @@ SendMailPlugin::~SendMailPlugin()
{
}
-PimCommon::GenericPluginInterface *SendMailPlugin::createInterface(KActionCollection *ac, QWidget *parent)
+PimCommon::GenericPluginInterface *SendMailPlugin::createInterface(KActionCollection *ac, QObject *parent)
{
- SendMailPluginInterface *interface = new SendMailPluginInterface(this);
- interface->setParentWidget(parent);
+ SendMailPluginInterface *interface = new SendMailPluginInterface(parent);
interface->createAction(ac);
return interface;
}
diff --git a/kaddressbook/plugins/sendmail/sendmailplugin.h b/kaddressbook/plugins/sendmail/sendmailplugin.h
index bd8c1d3..f3a948a 100644
--- a/kaddressbook/plugins/sendmail/sendmailplugin.h
+++ b/kaddressbook/plugins/sendmail/sendmailplugin.h
@@ -33,7 +33,7 @@ public:
explicit SendMailPlugin(QObject *parent = Q_NULLPTR, const QList<QVariant> & = QList<QVariant>());
~SendMailPlugin();
- PimCommon::GenericPluginInterface *createInterface(KActionCollection *ac, QWidget *parent) Q_DECL_OVERRIDE;
+ PimCommon::GenericPluginInterface *createInterface(KActionCollection *ac, QObject *parent = Q_NULLPTR) Q_DECL_OVERRIDE;
bool hasPopupMenuSupport() const Q_DECL_OVERRIDE;
};
diff --git a/kaddressbook/plugins/sendvcards/sendvcardsplugin.cpp b/kaddressbook/plugins/sendvcards/sendvcardsplugin.cpp
index 6aadcad..c332e12 100644
--- a/kaddressbook/plugins/sendvcards/sendvcardsplugin.cpp
+++ b/kaddressbook/plugins/sendvcards/sendvcardsplugin.cpp
@@ -33,10 +33,9 @@ SendVcardsPlugin::~SendVcardsPlugin()
{
}
-PimCommon::GenericPluginInterface *SendVcardsPlugin::createInterface(KActionCollection *ac, QWidget *parent)
+PimCommon::GenericPluginInterface *SendVcardsPlugin::createInterface(KActionCollection *ac, QObject *parent)
{
- SendVcardsPluginInterface *interface = new SendVcardsPluginInterface(this);
- interface->setParentWidget(parent);
+ SendVcardsPluginInterface *interface = new SendVcardsPluginInterface(parent);
interface->createAction(ac);
return interface;
}
diff --git a/kaddressbook/plugins/sendvcards/sendvcardsplugin.h b/kaddressbook/plugins/sendvcards/sendvcardsplugin.h
index c18f7fd..36fa588 100644
--- a/kaddressbook/plugins/sendvcards/sendvcardsplugin.h
+++ b/kaddressbook/plugins/sendvcards/sendvcardsplugin.h
@@ -33,7 +33,7 @@ public:
explicit SendVcardsPlugin(QObject *parent = Q_NULLPTR, const QList<QVariant> & = QList<QVariant>());
~SendVcardsPlugin();
- PimCommon::GenericPluginInterface *createInterface(KActionCollection *ac, QWidget *parent) Q_DECL_OVERRIDE;
+ PimCommon::GenericPluginInterface *createInterface(KActionCollection *ac, QObject *parent = Q_NULLPTR) Q_DECL_OVERRIDE;
bool hasPopupMenuSupport() const Q_DECL_OVERRIDE;
};
diff --git a/kmail/plugins/antispamplugin/antispamplugin.cpp b/kmail/plugins/antispamplugin/antispamplugin.cpp
index 8a64ba5..9397124 100644
--- a/kmail/plugins/antispamplugin/antispamplugin.cpp
+++ b/kmail/plugins/antispamplugin/antispamplugin.cpp
@@ -33,10 +33,9 @@ AntiSpamPlugin::~AntiSpamPlugin()
}
-PimCommon::GenericPluginInterface *AntiSpamPlugin::createInterface(KActionCollection *ac, QWidget *parent)
+PimCommon::GenericPluginInterface *AntiSpamPlugin::createInterface(KActionCollection *ac, QObject *parent)
{
- AntiSpamPluginInterface *interface = new AntiSpamPluginInterface(this);
- interface->setParentWidget(parent);
+ AntiSpamPluginInterface *interface = new AntiSpamPluginInterface(parent);
interface->createAction(ac);
return interface;
}
diff --git a/kmail/plugins/antispamplugin/antispamplugin.h b/kmail/plugins/antispamplugin/antispamplugin.h
index c12f6c5..58eae31 100644
--- a/kmail/plugins/antispamplugin/antispamplugin.h
+++ b/kmail/plugins/antispamplugin/antispamplugin.h
@@ -33,7 +33,7 @@ public:
explicit AntiSpamPlugin(QObject *parent = Q_NULLPTR, const QList<QVariant> & = QList<QVariant>());
~AntiSpamPlugin();
- PimCommon::GenericPluginInterface *createInterface(KActionCollection *ac, QWidget *parent) Q_DECL_OVERRIDE;
+ PimCommon::GenericPluginInterface *createInterface(KActionCollection *ac, QObject *parent = Q_NULLPTR) Q_DECL_OVERRIDE;
};
#endif // ANTISPAMPLUGIN_H
diff --git a/kmail/plugins/antivirusplugin/antivirusplugin.cpp b/kmail/plugins/antivirusplugin/antivirusplugin.cpp
index c8687ab..61e5aaa 100644
--- a/kmail/plugins/antivirusplugin/antivirusplugin.cpp
+++ b/kmail/plugins/antivirusplugin/antivirusplugin.cpp
@@ -34,10 +34,9 @@ AntiVirusPlugin::~AntiVirusPlugin()
}
-PimCommon::GenericPluginInterface *AntiVirusPlugin::createInterface(KActionCollection *ac, QWidget *parent)
+PimCommon::GenericPluginInterface *AntiVirusPlugin::createInterface(KActionCollection *ac, QObject *parent)
{
- AntiVirusPluginInterface *interface = new AntiVirusPluginInterface(this);
- interface->setParentWidget(parent);
+ AntiVirusPluginInterface *interface = new AntiVirusPluginInterface(parent);
interface->createAction(ac);
return interface;
}
diff --git a/kmail/plugins/antivirusplugin/antivirusplugin.h b/kmail/plugins/antivirusplugin/antivirusplugin.h
index 200a553..71bbf29 100644
--- a/kmail/plugins/antivirusplugin/antivirusplugin.h
+++ b/kmail/plugins/antivirusplugin/antivirusplugin.h
@@ -33,7 +33,7 @@ public:
explicit AntiVirusPlugin(QObject *parent = Q_NULLPTR, const QList<QVariant> & = QList<QVariant>());
~AntiVirusPlugin();
- PimCommon::GenericPluginInterface *createInterface(KActionCollection *ac, QWidget *parent) Q_DECL_OVERRIDE;
+ PimCommon::GenericPluginInterface *createInterface(KActionCollection *ac, QObject *parent = Q_NULLPTR) Q_DECL_OVERRIDE;
};
#endif // ANTIVIRUSPLUGIN_H