summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-10-07 18:57:16 (GMT)
committerMontel Laurent <montel@kde.org>2016-10-07 18:57:16 (GMT)
commit29a78f0734b78553212dffded360031ae42bb0a6 (patch)
treea112b31a8b984984fdcdcf2976824ba7b225a816
parent3c858520876eee4735a7d35aecb8ad675c5f66ab (diff)
Fix api, we store QList<QAction *> in interfacd
-rw-r--r--CMakeLists.txt2
-rw-r--r--kaddressbookimportexport/src/kaddressbookimportexportplugin.cpp19
-rw-r--r--kaddressbookimportexport/src/kaddressbookimportexportplugin.h9
-rw-r--r--kaddressbookimportexport/src/kaddressbookimportexportplugininterface.cpp20
-rw-r--r--kaddressbookimportexport/src/kaddressbookimportexportplugininterface.h11
5 files changed, 32 insertions, 29 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 118eb97..7fade07 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,7 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(ECMQtDeclareLoggingCategory)
include(ECMAddTests)
-set(PIM_VERSION "5.3.44")
+set(PIM_VERSION "5.3.45")
set(KDEPIM_APPS_LIB_VERSION ${PIM_VERSION})
set(QT_REQUIRED_VERSION "5.6.0")
diff --git a/kaddressbookimportexport/src/kaddressbookimportexportplugin.cpp b/kaddressbookimportexport/src/kaddressbookimportexportplugin.cpp
index 5482497..58001f6 100644
--- a/kaddressbookimportexport/src/kaddressbookimportexportplugin.cpp
+++ b/kaddressbookimportexport/src/kaddressbookimportexportplugin.cpp
@@ -32,22 +32,3 @@ KAddressBookImportExportPlugin::~KAddressBookImportExportPlugin()
}
-QList<QAction *> KAddressBookImportExportPlugin::importActions() const
-{
- return mImportActions;
-}
-
-void KAddressBookImportExportPlugin::setImportActions(const QList<QAction *> &importAction)
-{
- mImportActions = importAction;
-}
-
-QList<QAction *> KAddressBookImportExportPlugin::exportActions() const
-{
- return mExportActions;
-}
-
-void KAddressBookImportExportPlugin::setExportActions(const QList<QAction *> &exportAction)
-{
- mExportActions = exportAction;
-}
diff --git a/kaddressbookimportexport/src/kaddressbookimportexportplugin.h b/kaddressbookimportexport/src/kaddressbookimportexportplugin.h
index db30c6d..603293c 100644
--- a/kaddressbookimportexport/src/kaddressbookimportexportplugin.h
+++ b/kaddressbookimportexport/src/kaddressbookimportexportplugin.h
@@ -33,15 +33,6 @@ class KADDRESSBOOK_IMPORTEXPORT_EXPORT KAddressBookImportExportPlugin : public P
public:
explicit KAddressBookImportExportPlugin(QObject *parent = Q_NULLPTR);
~KAddressBookImportExportPlugin();
- QList<QAction *> importActions() const;
- void setImportActions(const QList<QAction *> &importAction);
-
- QList<QAction *> exportActions() const;
- void setExportActions(const QList<QAction *> &exportAction);
-
-protected:
- QList<QAction *> mImportActions;
- QList<QAction *> mExportActions;
};
}
#endif // KADDRESSBOOKIMPORTEXPORTPLUGIN_H
diff --git a/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.cpp b/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.cpp
index a168625..39eb1d9 100644
--- a/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.cpp
+++ b/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.cpp
@@ -31,3 +31,23 @@ KAddressBookImportExportPluginInterface::~KAddressBookImportExportPluginInterfac
{
}
+
+QList<QAction *> KAddressBookImportExportPluginInterface::importActions() const
+{
+ return mImportActions;
+}
+
+void KAddressBookImportExportPluginInterface::setImportActions(const QList<QAction *> &importAction)
+{
+ mImportActions = importAction;
+}
+
+QList<QAction *> KAddressBookImportExportPluginInterface::exportActions() const
+{
+ return mExportActions;
+}
+
+void KAddressBookImportExportPluginInterface::setExportActions(const QList<QAction *> &exportAction)
+{
+ mExportActions = exportAction;
+}
diff --git a/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.h b/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.h
index d7c0b26..5c08eb5 100644
--- a/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.h
+++ b/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.h
@@ -22,6 +22,7 @@
#include "kaddressbook_importexport_export.h"
#include <PimCommon/AbstractGenericPluginInterface>
+#include <QList>
namespace KAddressBookImportExport
{
@@ -31,6 +32,16 @@ class KADDRESSBOOK_IMPORTEXPORT_EXPORT KAddressBookImportExportPluginInterface :
public:
explicit KAddressBookImportExportPluginInterface(QObject *parent = Q_NULLPTR);
~KAddressBookImportExportPluginInterface();
+
+ QList<QAction *> importActions() const;
+ void setImportActions(const QList<QAction *> &importAction);
+
+ QList<QAction *> exportActions() const;
+ void setExportActions(const QList<QAction *> &exportAction);
+
+protected:
+ QList<QAction *> mImportActions;
+ QList<QAction *> mExportActions;
};
}
#endif // KADDRESSBOOKIMPORTEXPORTPLUGININTERFACE_H