summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2015-11-12 13:45:00 +0100
committerMontel Laurent <[email protected]>2015-11-12 13:45:00 +0100
commit1655cd34384556e0aee0bd072d13f6b570431500 (patch)
tree6c641b1b2ad4f7b7b9fa1cabcb6b9da84077bf70
parentcab056d5246978cfac23f86078a9163fe1427ed1 (diff)
Make it virtual
-rw-r--r--pimsettingexporter/core/abstractimportexportjob.cpp6
-rw-r--r--pimsettingexporter/core/abstractimportexportjob.h1
-rw-r--r--pimsettingexporter/core/addressbook/importaddressbookjob.h2
-rw-r--r--pimsettingexporter/core/alarm/importalarmjob.h2
-rw-r--r--pimsettingexporter/core/calendar/importcalendarjob.h2
5 files changed, 10 insertions, 3 deletions
diff --git a/pimsettingexporter/core/abstractimportexportjob.cpp b/pimsettingexporter/core/abstractimportexportjob.cpp
index ba67ee1..1ebaa08 100644
--- a/pimsettingexporter/core/abstractimportexportjob.cpp
+++ b/pimsettingexporter/core/abstractimportexportjob.cpp
@@ -166,6 +166,12 @@ void AbstractImportExportJob::overwriteDirectory(const QString &path, const KArc
}
}
+bool AbstractImportExportJob::isAConfigFile(const QString &name) const
+{
+ //Redefine in subclass
+ return true;
+}
+
bool AbstractImportExportJob::overwriteDirectoryMessageBox(const QString &directory) const
{
return mImportExportProgressIndicator->overwriteDirectoryMessageBox(directory);
diff --git a/pimsettingexporter/core/abstractimportexportjob.h b/pimsettingexporter/core/abstractimportexportjob.h
index 1847d11..c79fafa 100644
--- a/pimsettingexporter/core/abstractimportexportjob.h
+++ b/pimsettingexporter/core/abstractimportexportjob.h
@@ -103,6 +103,7 @@ protected:
void restoreConfigFile(const QString &configNameStr);
bool overwriteDirectoryMessageBox(const QString &directory) const;
void overwriteDirectory(const QString &path, const KArchiveEntry *entry);
+ virtual bool isAConfigFile(const QString &name) const;
KZip *archive() const;
diff --git a/pimsettingexporter/core/addressbook/importaddressbookjob.h b/pimsettingexporter/core/addressbook/importaddressbookjob.h
index 641921a..b2f15f3 100644
--- a/pimsettingexporter/core/addressbook/importaddressbookjob.h
+++ b/pimsettingexporter/core/addressbook/importaddressbookjob.h
@@ -36,7 +36,7 @@ protected Q_SLOTS:
void slotNextStep() Q_DECL_OVERRIDE;
private:
- bool isAConfigFile(const QString &name) const;
+ bool isAConfigFile(const QString &name) const Q_DECL_OVERRIDE;
void searchAllFiles(const KArchiveDirectory *dir, const QString &prefix);
void storeAddressBookArchiveResource(const KArchiveDirectory *dir, const QString &prefix);
void importkaddressBookConfig(const KArchiveFile *file, const QString &config, const QString &filename, const QString &prefix);
diff --git a/pimsettingexporter/core/alarm/importalarmjob.h b/pimsettingexporter/core/alarm/importalarmjob.h
index a23152b..60d68df 100644
--- a/pimsettingexporter/core/alarm/importalarmjob.h
+++ b/pimsettingexporter/core/alarm/importalarmjob.h
@@ -35,7 +35,7 @@ protected Q_SLOTS:
void slotNextStep() Q_DECL_OVERRIDE;
private:
- bool isAConfigFile(const QString &name) const;
+ bool isAConfigFile(const QString &name) const Q_DECL_OVERRIDE;
void storeAlarmArchiveResource(const KArchiveDirectory *dir, const QString &prefix);
void searchAllFiles(const KArchiveDirectory *dir, const QString &prefix);
void importkalarmConfig(const KArchiveFile *kalarmFile, const QString &kalarmrc, const QString &filename, const QString &prefix);
diff --git a/pimsettingexporter/core/calendar/importcalendarjob.h b/pimsettingexporter/core/calendar/importcalendarjob.h
index a0546b7..c8e30b3 100644
--- a/pimsettingexporter/core/calendar/importcalendarjob.h
+++ b/pimsettingexporter/core/calendar/importcalendarjob.h
@@ -36,7 +36,7 @@ protected Q_SLOTS:
void slotNextStep() Q_DECL_OVERRIDE;
private:
- bool isAConfigFile(const QString &name) const;
+ bool isAConfigFile(const QString &name) const Q_DECL_OVERRIDE;
void searchAllFiles(const KArchiveDirectory *dir, const QString &prefix, const QString &searchEntryName);
void storeArchiveInfoResources(const KArchiveDirectory *dir, const QString &prefix);
void importkorganizerConfig(const KArchiveFile *file, const QString &config, const QString &filename, const QString &prefix);