summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-09-22 05:59:19 (GMT)
committerMontel Laurent <montel@kde.org>2016-09-22 05:59:19 (GMT)
commitb4d27019657478381dbb735982f6f976a257afab (patch)
tree54d3df4ac334e124e3814b91df86d416f8f128ab
parent9b8ccc61861492b6ce2181ca6cfdab0482189274 (diff)
Adapt against new api
-rw-r--r--CMakeLists.txt2
-rw-r--r--kaddressbook/plugins/checkgravatar/checkgravatarplugin.cpp5
-rw-r--r--kaddressbook/plugins/checkgravatar/checkgravatarplugin.h3
-rw-r--r--kaddressbook/plugins/checkgravatar/checkgravatarplugininterface.cpp4
-rw-r--r--kaddressbook/plugins/checkgravatar/checkgravatarplugininterface.h1
-rw-r--r--kaddressbook/plugins/sendmail/sendmailplugin.cpp5
-rw-r--r--kaddressbook/plugins/sendmail/sendmailplugin.h1
-rw-r--r--kaddressbook/plugins/sendmail/sendmailplugininterface.cpp5
-rw-r--r--kaddressbook/plugins/sendmail/sendmailplugininterface.h1
-rw-r--r--kaddressbook/plugins/sendvcards/sendvcardsplugin.cpp5
-rw-r--r--kaddressbook/plugins/sendvcards/sendvcardsplugin.h1
-rw-r--r--kaddressbook/plugins/sendvcards/sendvcardsplugininterface.cpp5
-rw-r--r--kaddressbook/plugins/sendvcards/sendvcardsplugininterface.h1
13 files changed, 21 insertions, 18 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ba6d9a1..6b57d58 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.41")
+set(PIMCOMMON_LIB_VERSION "5.3.52")
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 c5eaf96..66f41b3 100644
--- a/kaddressbook/plugins/checkgravatar/checkgravatarplugin.cpp
+++ b/kaddressbook/plugins/checkgravatar/checkgravatarplugin.cpp
@@ -41,4 +41,9 @@ PimCommon::GenericPluginInterface *CheckGravatarPlugin::createInterface(KActionC
return interface;
}
+bool CheckGravatarPlugin::hasPopupMenuSupport() const
+{
+ return true;
+}
+
#include "checkgravatarplugin.moc"
diff --git a/kaddressbook/plugins/checkgravatar/checkgravatarplugin.h b/kaddressbook/plugins/checkgravatar/checkgravatarplugin.h
index 5af9659..3b57624 100644
--- a/kaddressbook/plugins/checkgravatar/checkgravatarplugin.h
+++ b/kaddressbook/plugins/checkgravatar/checkgravatarplugin.h
@@ -34,6 +34,9 @@ public:
~CheckGravatarPlugin();
PimCommon::GenericPluginInterface *createInterface(KActionCollection *ac, QWidget *parent) Q_DECL_OVERRIDE;
+
+ bool hasPopupMenuSupport() const Q_DECL_OVERRIDE;
+
};
#endif // CHECKGRAVATARPLUGIN_H
diff --git a/kaddressbook/plugins/checkgravatar/checkgravatarplugininterface.cpp b/kaddressbook/plugins/checkgravatar/checkgravatarplugininterface.cpp
index fa458f9..730ea0e 100644
--- a/kaddressbook/plugins/checkgravatar/checkgravatarplugininterface.cpp
+++ b/kaddressbook/plugins/checkgravatar/checkgravatarplugininterface.cpp
@@ -138,7 +138,3 @@ void CheckGravatarPluginInterface::slotModifyContactFinished(KJob *job)
}
}
-bool CheckGravatarPluginInterface::hasPopupMenuSupport() const
-{
- return true;
-}
diff --git a/kaddressbook/plugins/checkgravatar/checkgravatarplugininterface.h b/kaddressbook/plugins/checkgravatar/checkgravatarplugininterface.h
index 9618594..f5fc0b0 100644
--- a/kaddressbook/plugins/checkgravatar/checkgravatarplugininterface.h
+++ b/kaddressbook/plugins/checkgravatar/checkgravatarplugininterface.h
@@ -32,7 +32,6 @@ public:
void createAction(KActionCollection *ac) Q_DECL_OVERRIDE;
void setCurrentItems(const Akonadi::Item::List &items) Q_DECL_OVERRIDE;
PimCommon::GenericPluginInterface::RequireTypes requires() const Q_DECL_OVERRIDE;
- bool hasPopupMenuSupport() const Q_DECL_OVERRIDE;
void updateActions(int numberOfSelectedItems, int numberOfSelectedCollections) Q_DECL_OVERRIDE;
private:
diff --git a/kaddressbook/plugins/sendmail/sendmailplugin.cpp b/kaddressbook/plugins/sendmail/sendmailplugin.cpp
index 934a8a2..22fccfa 100644
--- a/kaddressbook/plugins/sendmail/sendmailplugin.cpp
+++ b/kaddressbook/plugins/sendmail/sendmailplugin.cpp
@@ -41,4 +41,9 @@ PimCommon::GenericPluginInterface *SendMailPlugin::createInterface(KActionCollec
return interface;
}
+bool SendMailPlugin::hasPopupMenuSupport() const
+{
+ return true;
+}
+
#include "sendmailplugin.moc"
diff --git a/kaddressbook/plugins/sendmail/sendmailplugin.h b/kaddressbook/plugins/sendmail/sendmailplugin.h
index 361bfc0..bd8c1d3 100644
--- a/kaddressbook/plugins/sendmail/sendmailplugin.h
+++ b/kaddressbook/plugins/sendmail/sendmailplugin.h
@@ -34,6 +34,7 @@ public:
~SendMailPlugin();
PimCommon::GenericPluginInterface *createInterface(KActionCollection *ac, QWidget *parent) Q_DECL_OVERRIDE;
+ bool hasPopupMenuSupport() const Q_DECL_OVERRIDE;
};
#endif // SENDMAILPLUGIN_H
diff --git a/kaddressbook/plugins/sendmail/sendmailplugininterface.cpp b/kaddressbook/plugins/sendmail/sendmailplugininterface.cpp
index 019e2a2..9a872a4 100644
--- a/kaddressbook/plugins/sendmail/sendmailplugininterface.cpp
+++ b/kaddressbook/plugins/sendmail/sendmailplugininterface.cpp
@@ -97,8 +97,3 @@ void SendMailPluginInterface::slotSendMails(const QStringList &emails)
QDesktopServices::openUrl(url);
}
}
-
-bool SendMailPluginInterface::hasPopupMenuSupport() const
-{
- return true;
-}
diff --git a/kaddressbook/plugins/sendmail/sendmailplugininterface.h b/kaddressbook/plugins/sendmail/sendmailplugininterface.h
index 4213a25..9e9cf3b 100644
--- a/kaddressbook/plugins/sendmail/sendmailplugininterface.h
+++ b/kaddressbook/plugins/sendmail/sendmailplugininterface.h
@@ -32,7 +32,6 @@ public:
void createAction(KActionCollection *ac) Q_DECL_OVERRIDE;
void setCurrentItems(const Akonadi::Item::List &items) Q_DECL_OVERRIDE;
PimCommon::GenericPluginInterface::RequireTypes requires() const Q_DECL_OVERRIDE;
- bool hasPopupMenuSupport() const Q_DECL_OVERRIDE;
void updateActions(int numberOfSelectedItems, int numberOfSelectedCollections) Q_DECL_OVERRIDE;
private:
diff --git a/kaddressbook/plugins/sendvcards/sendvcardsplugin.cpp b/kaddressbook/plugins/sendvcards/sendvcardsplugin.cpp
index 1785ccc..6aadcad 100644
--- a/kaddressbook/plugins/sendvcards/sendvcardsplugin.cpp
+++ b/kaddressbook/plugins/sendvcards/sendvcardsplugin.cpp
@@ -41,4 +41,9 @@ PimCommon::GenericPluginInterface *SendVcardsPlugin::createInterface(KActionColl
return interface;
}
+bool SendVcardsPlugin::hasPopupMenuSupport() const
+{
+ return true;
+}
+
#include "sendvcardsplugin.moc"
diff --git a/kaddressbook/plugins/sendvcards/sendvcardsplugin.h b/kaddressbook/plugins/sendvcards/sendvcardsplugin.h
index f8a26c3..c18f7fd 100644
--- a/kaddressbook/plugins/sendvcards/sendvcardsplugin.h
+++ b/kaddressbook/plugins/sendvcards/sendvcardsplugin.h
@@ -34,6 +34,7 @@ public:
~SendVcardsPlugin();
PimCommon::GenericPluginInterface *createInterface(KActionCollection *ac, QWidget *parent) Q_DECL_OVERRIDE;
+ bool hasPopupMenuSupport() const Q_DECL_OVERRIDE;
};
#endif // SENDVCARDSPLUGIN_H
diff --git a/kaddressbook/plugins/sendvcards/sendvcardsplugininterface.cpp b/kaddressbook/plugins/sendvcards/sendvcardsplugininterface.cpp
index 5f8f8af..de4b5b5 100644
--- a/kaddressbook/plugins/sendvcards/sendvcardsplugininterface.cpp
+++ b/kaddressbook/plugins/sendvcards/sendvcardsplugininterface.cpp
@@ -37,11 +37,6 @@ SendVcardsPluginInterface::~SendVcardsPluginInterface()
}
-bool SendVcardsPluginInterface::hasPopupMenuSupport() const
-{
- return true;
-}
-
void SendVcardsPluginInterface::updateActions(int numberOfSelectedItems, int numberOfSelectedCollections)
{
Q_UNUSED(numberOfSelectedCollections);
diff --git a/kaddressbook/plugins/sendvcards/sendvcardsplugininterface.h b/kaddressbook/plugins/sendvcards/sendvcardsplugininterface.h
index d485bba..b5cbfe9 100644
--- a/kaddressbook/plugins/sendvcards/sendvcardsplugininterface.h
+++ b/kaddressbook/plugins/sendvcards/sendvcardsplugininterface.h
@@ -32,7 +32,6 @@ public:
void createAction(KActionCollection *ac) Q_DECL_OVERRIDE;
void setCurrentItems(const Akonadi::Item::List &items) Q_DECL_OVERRIDE;
PimCommon::GenericPluginInterface::RequireTypes requires() const Q_DECL_OVERRIDE;
- bool hasPopupMenuSupport() const Q_DECL_OVERRIDE;
void updateActions(int numberOfSelectedItems, int numberOfSelectedCollections) Q_DECL_OVERRIDE;
private: