summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2015-11-10 07:07:33 +0100
committerMontel Laurent <[email protected]>2015-11-10 07:07:33 +0100
commitd63322ff6a90b8cdbefa4c0bff9281795f175f85 (patch)
tree6f5c4013548e6d8eae4f814cac36a120d4051606
parent912f65fb3dc841df147915e0d06b4c47f0d2a15e (diff)
Fix rename method
-rw-r--r--pimsettingexporter/core/mail/importmailjob.cpp6
-rw-r--r--pimsettingexporter/core/mail/importmailjob.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/pimsettingexporter/core/mail/importmailjob.cpp b/pimsettingexporter/core/mail/importmailjob.cpp
index 5f357fd..d00b5c9 100644
--- a/pimsettingexporter/core/mail/importmailjob.cpp
+++ b/pimsettingexporter/core/mail/importmailjob.cpp
@@ -816,8 +816,8 @@ void ImportMailJob::restoreConfig()
restoreConfigFile(filename);
}
- importDirectory(QStringLiteral("/autocorrect/"));
- importDirectory(QStringLiteral("/gravatar/"));
+ importSimpleFilesInDirectory(QStringLiteral("/autocorrect/"));
+ importSimpleFilesInDirectory(QStringLiteral("/gravatar/"));
const KArchiveEntry *kmail2Entry = mArchiveDirectory->entry(Utils::dataPath() + QLatin1String("kmail2/adblockrules_local"));
if (kmail2Entry && kmail2Entry->isFile()) {
const KArchiveFile *entry = static_cast<const KArchiveFile *>(kmail2Entry);
@@ -854,7 +854,7 @@ void ImportMailJob::restoreConfig()
QTimer::singleShot(0, this, &ImportMailJob::slotNextStep);
}
-void ImportMailJob::importDirectory(const QString &relativePath)
+void ImportMailJob::importSimpleFilesInDirectory(const QString &relativePath)
{
const KArchiveEntry *autocorrectionEntry = mArchiveDirectory->entry(Utils::dataPath() + relativePath);
if (autocorrectionEntry && autocorrectionEntry->isDirectory()) {
diff --git a/pimsettingexporter/core/mail/importmailjob.h b/pimsettingexporter/core/mail/importmailjob.h
index c48ad10..57f6982 100644
--- a/pimsettingexporter/core/mail/importmailjob.h
+++ b/pimsettingexporter/core/mail/importmailjob.h
@@ -59,7 +59,7 @@ private:
void mergeArchiveMailAgentConfig(const KArchiveFile *archivefile, const QString &filename, const QString &prefix);
void copyArchiveMailAgentConfigGroup(KSharedConfig::Ptr archiveConfigOrigin, KSharedConfig::Ptr archiveConfigDestination);
void mergeSieveTemplate(const KArchiveFile *archivefile, const QString &filename, const QString &prefix);
- void importDirectory(const QString &relativePath);
+ void importSimpleFilesInDirectory(const QString &relativePath);
QString uniqueIdentityName(const QString &name);
QHash<uint, uint> mHashIdentity;