From 97c2e02697ba90d2339a905b7ad81aa883dca7a5 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf 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 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'examples/maildirresource') 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() << new DefaultIndexUpdater); 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(); -- cgit v1.2.3