summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-10-10 07:53:13 (GMT)
committerMontel Laurent <montel@kde.org>2016-10-10 07:53:13 (GMT)
commitc652b89cebb6139dcf107e9dae2b1ddc65cac799 (patch)
tree0066f2219f5dc399040c58d70368fbd7cce3e27f
parent57d21f7388bd9e4b370b8a4a466267f37b4598e4 (diff)
Define default collection
-rw-r--r--CMakeLists.txt2
-rw-r--r--kaddressbookimportexport/src/kaddressbookimportexportplugin.cpp1
-rw-r--r--kaddressbookimportexport/src/kaddressbookimportexportplugininterface.cpp10
-rw-r--r--kaddressbookimportexport/src/kaddressbookimportexportplugininterface.h5
4 files changed, 16 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b4bea47..54e839f 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.46")
+set(PIM_VERSION "5.3.47")
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 58001f6..ab207ba 100644
--- a/kaddressbookimportexport/src/kaddressbookimportexportplugin.cpp
+++ b/kaddressbookimportexport/src/kaddressbookimportexportplugin.cpp
@@ -31,4 +31,3 @@ KAddressBookImportExportPlugin::~KAddressBookImportExportPlugin()
{
}
-
diff --git a/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.cpp b/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.cpp
index 373edaf..06beebe 100644
--- a/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.cpp
+++ b/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.cpp
@@ -62,3 +62,13 @@ void KAddressBookImportExportPluginInterface::setImportExportAction(const Import
{
mImportExportAction = importExportAction;
}
+
+Akonadi::Collection KAddressBookImportExportPluginInterface::defaultCollection() const
+{
+ return mDefaultCollection;
+}
+
+void KAddressBookImportExportPluginInterface::setDefaultCollection(const Akonadi::Collection &defaultCollection)
+{
+ mDefaultCollection = defaultCollection;
+}
diff --git a/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.h b/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.h
index 0fddf89..6bae9df 100644
--- a/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.h
+++ b/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.h
@@ -23,6 +23,7 @@
#include "kaddressbook_importexport_export.h"
#include <PimCommon/AbstractGenericPluginInterface>
#include <QList>
+#include <AkonadiCore/Collection>
namespace KAddressBookImportExport
{
@@ -47,10 +48,14 @@ public:
ImportExportAction importExportAction() const;
void setImportExportAction(const ImportExportAction &importExportAction);
+ Akonadi::Collection defaultCollection() const;
+ void setDefaultCollection(const Akonadi::Collection &defaultCollection);
+
protected:
QList<QAction *> mImportActions;
QList<QAction *> mExportActions;
ImportExportAction mImportExportAction;
+ Akonadi::Collection mDefaultCollection;
};
}
#endif // KADDRESSBOOKIMPORTEXPORTPLUGININTERFACE_H