summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-10-11 19:54:48 (GMT)
committerMontel Laurent <montel@kde.org>2016-10-11 19:54:48 (GMT)
commit6e963afc8674f346c061204b151f89f77ee9daa8 (patch)
tree8fe7cfe3c73bd17d4f55b069f3f1d95275486a54
parent5d8633b4d3b57df2bcd1832efe2eec809e3e8632 (diff)
Clean up
-rw-r--r--CMakeLists.txt2
-rw-r--r--kaddressbookimportexport/src/CMakeLists.txt1
-rw-r--r--kaddressbookimportexport/src/kaddressbookcontactselectiondialog.h4
-rw-r--r--kaddressbookimportexport/src/kaddressbookcontactselectionwidget.h3
-rw-r--r--kaddressbookimportexport/src/kaddressbookimportexportplugininterface.cpp16
-rw-r--r--kaddressbookimportexport/src/kaddressbookimportexportplugininterface.h7
6 files changed, 14 insertions, 19 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ce35a53..f715026 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.52")
+set(PIM_VERSION "5.3.53")
set(KDEPIM_APPS_LIB_VERSION ${PIM_VERSION})
set(QT_REQUIRED_VERSION "5.6.0")
diff --git a/kaddressbookimportexport/src/CMakeLists.txt b/kaddressbookimportexport/src/CMakeLists.txt
index f3c3d0d..0e97d4d 100644
--- a/kaddressbookimportexport/src/CMakeLists.txt
+++ b/kaddressbookimportexport/src/CMakeLists.txt
@@ -54,6 +54,7 @@ ecm_generate_headers(KaddressbookImportExport_CamelCase_HEADERS
KAddressBookImportExportContactList
KAddressBookContactSelectionDialog
KAddressBookExportSelectionWidget
+ KAddressBookContactSelectionWidget
REQUIRED_HEADERS KaddressbookImportExport_HEADERS
PREFIX KAddressBookImportExport
)
diff --git a/kaddressbookimportexport/src/kaddressbookcontactselectiondialog.h b/kaddressbookimportexport/src/kaddressbookcontactselectiondialog.h
index 478acb9..3c0b1f8 100644
--- a/kaddressbookimportexport/src/kaddressbookcontactselectiondialog.h
+++ b/kaddressbookimportexport/src/kaddressbookcontactselectiondialog.h
@@ -18,8 +18,8 @@
02110-1301, USA.
*/
-#ifndef CONTACTEXPORTSELECTIONDIALOG_H
-#define CONTACTEXPORTSELECTIONDIALOG_H
+#ifndef KADDRESSBOOKIMPORTEXPORTCONTACTEXPORTSELECTIONDIALOG_H
+#define KADDRESSBOOKIMPORTEXPORTCONTACTEXPORTSELECTIONDIALOG_H
#include "kaddressbook_importexport_export.h"
#include <KContacts/Addressee>
diff --git a/kaddressbookimportexport/src/kaddressbookcontactselectionwidget.h b/kaddressbookimportexport/src/kaddressbookcontactselectionwidget.h
index c0f28c6..b07562b 100644
--- a/kaddressbookimportexport/src/kaddressbookcontactselectionwidget.h
+++ b/kaddressbookimportexport/src/kaddressbookcontactselectionwidget.h
@@ -23,6 +23,7 @@
#include <KContacts/Addressee>
#include <AkonadiCore/Item>
+#include "kaddressbook_importexport_export.h"
#include "KAddressBookImportExport/KAddressBookImportExportContactList"
#include <QWidget>
@@ -45,7 +46,7 @@ class CollectionComboBox;
*/
namespace KAddressBookImportExport
{
-class KAddressBookContactSelectionWidget : public QWidget
+class KADDRESSBOOK_IMPORTEXPORT_EXPORT KAddressBookContactSelectionWidget : public QWidget
{
Q_OBJECT
diff --git a/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.cpp b/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.cpp
index 8525690..1aa69c4 100644
--- a/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.cpp
+++ b/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.cpp
@@ -74,16 +74,6 @@ void KAddressBookImportExportPluginInterface::setDefaultCollection(const Akonadi
mDefaultCollection = defaultCollection;
}
-KAddressBookImportExport::KAddressBookImportExportContactList KAddressBookImportExportPluginInterface::addressBookImportExportList() const
-{
- return mAddressBookImportExportList;
-}
-
-void KAddressBookImportExportPluginInterface::setAddressBookImportExportList(const KAddressBookImportExport::KAddressBookImportExportContactList &addressBookImportExportList)
-{
- mAddressBookImportExportList = addressBookImportExportList;
-}
-
QItemSelectionModel *KAddressBookImportExportPluginInterface::itemSelectionModel() const
{
return mItemSelectionModel;
@@ -93,3 +83,9 @@ void KAddressBookImportExportPluginInterface::setItemSelectionModel(QItemSelecti
{
mItemSelectionModel = itemSelectionModel;
}
+
+bool KAddressBookImportExportPluginInterface::canImportFileType(const QUrl &url)
+{
+ Q_UNUSED(url);
+ return false;
+}
diff --git a/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.h b/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.h
index 8bbd9fd..0458031 100644
--- a/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.h
+++ b/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.h
@@ -24,7 +24,6 @@
#include <PimCommon/AbstractGenericPluginInterface>
#include <QList>
#include <AkonadiCore/Collection>
-#include <KAddressBookImportExport/KAddressBookImportExportContactList>
class QItemSelectionModel;
namespace KAddressBookImportExport
{
@@ -52,16 +51,14 @@ public:
Akonadi::Collection defaultCollection() const;
void setDefaultCollection(const Akonadi::Collection &defaultCollection);
- KAddressBookImportExport::KAddressBookImportExportContactList addressBookImportExportList() const;
- void setAddressBookImportExportList(const KAddressBookImportExport::KAddressBookImportExportContactList &addressBookImportExportList);
-
void setSelectionModel(QItemSelectionModel *model);
QItemSelectionModel *itemSelectionModel() const;
void setItemSelectionModel(QItemSelectionModel *itemSelectionModel);
+ virtual bool canImportFileType(const QUrl &url);
+
protected:
- KAddressBookImportExport::KAddressBookImportExportContactList mAddressBookImportExportList;
QList<QAction *> mImportActions;
QList<QAction *> mExportActions;
ImportExportAction mImportExportAction;