summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-10-12 06:11:18 (GMT)
committerMontel Laurent <montel@kde.org>2016-10-12 06:11:18 (GMT)
commitc395476a34b45e3475ee1726abc234e05ad19307 (patch)
treec14fb7dd1e5aa90895ecf8b046d2559aedc2d1e8
parent5cda489eb9e3091fe73eb5656accf9353dae554e (diff)
Add support for importFile
-rw-r--r--CMakeLists.txt2
-rw-r--r--kaddressbook/importexportplugins/csv/csvimportexportplugininterface.cpp6
-rw-r--r--kaddressbook/importexportplugins/csv/csvimportexportplugininterface.h2
-rw-r--r--kaddressbook/importexportplugins/ldif/ldifimportexportplugininterface.cpp5
-rw-r--r--kaddressbook/importexportplugins/ldif/ldifimportexportplugininterface.h2
5 files changed, 16 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 393face..9327969 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,7 +63,7 @@ set(GRANTLEETHEME_LIB_VERSION "5.3.40")
set(CALENDARSUPPORT_LIB_VERSION "5.3.40")
set(EVENTVIEW_LIB_VERSION "5.3.40")
set(LIBKDEPIM_LIB_VERSION "5.3.40")
-set(KDEPIM_APPS_LIB_VERSION "5.3.51")
+set(KDEPIM_APPS_LIB_VERSION "5.3.54")
set(LIBKLEO_LIB_VERSION "5.3.40")
set(AKONADI_LIB_VERSION "5.3.45")
set(INCIDENCEEDITOR_LIB_VERSION "5.3.40")
diff --git a/kaddressbook/importexportplugins/csv/csvimportexportplugininterface.cpp b/kaddressbook/importexportplugins/csv/csvimportexportplugininterface.cpp
index 0b24568..bf7d9bd 100644
--- a/kaddressbook/importexportplugins/csv/csvimportexportplugininterface.cpp
+++ b/kaddressbook/importexportplugins/csv/csvimportexportplugininterface.cpp
@@ -231,3 +231,9 @@ bool CSVImportExportPluginInterface::canImportFileType(const QUrl &url)
{
return url.path().endsWith(QStringLiteral(".csv"));
}
+
+
+void CSVImportExportPluginInterface::importFile(const QUrl &url)
+{
+ //TODO
+}
diff --git a/kaddressbook/importexportplugins/csv/csvimportexportplugininterface.h b/kaddressbook/importexportplugins/csv/csvimportexportplugininterface.h
index e53d4e5..4f2be22 100644
--- a/kaddressbook/importexportplugins/csv/csvimportexportplugininterface.h
+++ b/kaddressbook/importexportplugins/csv/csvimportexportplugininterface.h
@@ -34,6 +34,7 @@ public:
void exec() Q_DECL_OVERRIDE;
bool canImportFileType(const QUrl &url) Q_DECL_OVERRIDE;
+ void importFile(const QUrl &url) Q_DECL_OVERRIDE;
private:
void slotFinished();
@@ -43,6 +44,7 @@ private:
void exportToFile(QFile *file, const KContacts::Addressee::List &contacts) const;
void importCSV();
+
};
#endif // CSVIMPORTEXPORTPLUGININTERFACE_H
diff --git a/kaddressbook/importexportplugins/ldif/ldifimportexportplugininterface.cpp b/kaddressbook/importexportplugins/ldif/ldifimportexportplugininterface.cpp
index 26b15e2..db48fd2 100644
--- a/kaddressbook/importexportplugins/ldif/ldifimportexportplugininterface.cpp
+++ b/kaddressbook/importexportplugins/ldif/ldifimportexportplugininterface.cpp
@@ -211,3 +211,8 @@ bool LDifImportExportPluginInterface::canImportFileType(const QUrl &url)
{
return url.path().endsWith(QStringLiteral(".ldif"));
}
+
+void LDifImportExportPluginInterface::importFile(const QUrl &url)
+{
+ //TODO
+}
diff --git a/kaddressbook/importexportplugins/ldif/ldifimportexportplugininterface.h b/kaddressbook/importexportplugins/ldif/ldifimportexportplugininterface.h
index 07525c3..863d874 100644
--- a/kaddressbook/importexportplugins/ldif/ldifimportexportplugininterface.h
+++ b/kaddressbook/importexportplugins/ldif/ldifimportexportplugininterface.h
@@ -31,11 +31,13 @@ public:
void createAction(KActionCollection *ac) Q_DECL_OVERRIDE;
void exec() Q_DECL_OVERRIDE;
bool canImportFileType(const QUrl &url) Q_DECL_OVERRIDE;
+ void importFile(const QUrl &url) Q_DECL_OVERRIDE;
private:
void slotImportLdif();
void slotExportLdif();
void importLdif();
void exportLdif();
+
};
#endif // LDIFIMPORTEXPORTPLUGININTERFACE_H