From 97c2e02697ba90d2339a905b7ad81aa883dca7a5 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Tue, 22 Dec 2015 19:27:08 +0100
Subject: Avoid using QDir::separator

It really doesn't help us in assembling paths since qt deals with
forward slashes just fine
---
 examples/maildirresource/maildirresource.cpp | 8 ++++----
 tests/maildirresourcetest.cpp                | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/maildirresource/maildirresource.cpp b/examples/maildirresource/maildirresource.cpp
index 68eb099..5a38b01 100644
--- a/examples/maildirresource/maildirresource.cpp
+++ b/examples/maildirresource/maildirresource.cpp
@@ -55,9 +55,9 @@ MaildirResource::MaildirResource(const QByteArray &instanceIdentifier, const QSh
     addType(ENTITY_TYPE_FOLDER, mFolderAdaptorFactory,
             QVector<Akonadi2::Preprocessor*>() << new DefaultIndexUpdater<Akonadi2::ApplicationDomain::Folder>);
     auto config = ResourceConfig::getConfiguration(instanceIdentifier);
-    mMaildirPath = config.value("path").toString();
+    mMaildirPath = QDir::cleanPath(QDir::fromNativeSeparators(config.value("path").toString()));
     //Chop a trailing slash if necessary
-    if (mMaildirPath.endsWith(QDir::separator())) {
+    if (mMaildirPath.endsWith("/")) {
         mMaildirPath.chop(1);
     }
     Trace() << "Started maildir resource for maildir: " << mMaildirPath;
@@ -95,7 +95,7 @@ static QStringList listRecursive( const QString &root, const KPIM::Maildir &dir
         if (!md.isValid()) {
             continue;
         }
-        QString path = root + QDir::separator() + sub;
+        QString path = root + "/" + sub;
         list << path;
         list += listRecursive(path, md );
     }
@@ -287,7 +287,7 @@ void MaildirResource::synchronizeMails(Akonadi2::Storage::Transaction &transacti
         const auto remoteId = fileName.toUtf8();
 
         KMime::Message *msg = new KMime::Message;
-        auto filepath = listingPath + QDir::separator() + fileName;
+        auto filepath = listingPath + "/" + fileName;
         msg->setHead(KMime::CRLFtoLF(maildir.readEntryHeadersFromFile(filepath)));
         msg->parse();
 
diff --git a/tests/maildirresourcetest.cpp b/tests/maildirresourcetest.cpp
index c415a54..b16f883 100644
--- a/tests/maildirresourcetest.cpp
+++ b/tests/maildirresourcetest.cpp
@@ -55,7 +55,7 @@ private Q_SLOTS:
     void initTestCase()
     {
         QVERIFY(tempDir.isValid());
-        auto targetPath = tempDir.path() + QDir::separator() + "maildir1/";
+        auto targetPath = tempDir.path() + "/maildir1/";
         copyRecursively(TESTDATAPATH "/maildir1", targetPath);
 
         Akonadi2::Log::setDebugOutputLevel(Akonadi2::Log::Trace);
@@ -181,7 +181,7 @@ private Q_SLOTS:
         //Ensure all local data is processed
         Akonadi2::Store::synchronize(query).exec().waitForFinished();
 
-        auto targetPath = tempDir.path() + QDir::separator() + "maildir1/";
+        auto targetPath = tempDir.path() + "/maildir1/";
         QDir dir(targetPath);
         QVERIFY(dir.rename("inbox", "newbox"));
 
-- 
cgit v1.2.3