summaryrefslogtreecommitdiffstats
path: root/examples/maildirresource/maildirresource.cpp
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2015-12-22 19:27:08 +0100
committerChristian Mollekopf <chrigi_1@fastmail.fm>2015-12-22 19:27:08 +0100
commit97c2e02697ba90d2339a905b7ad81aa883dca7a5 (patch)
tree30423e4f1ae6b52641e0135db41c4f4be64984b3 /examples/maildirresource/maildirresource.cpp
parentd11978620ea82d1795c9fdd65c4c79d3dd852440 (diff)
downloadsink-97c2e02697ba90d2339a905b7ad81aa883dca7a5.tar.gz
sink-97c2e02697ba90d2339a905b7ad81aa883dca7a5.zip
Avoid using QDir::separator
It really doesn't help us in assembling paths since qt deals with forward slashes just fine
Diffstat (limited to 'examples/maildirresource/maildirresource.cpp')
-rw-r--r--examples/maildirresource/maildirresource.cpp8
1 files changed, 4 insertions, 4 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
55 addType(ENTITY_TYPE_FOLDER, mFolderAdaptorFactory, 55 addType(ENTITY_TYPE_FOLDER, mFolderAdaptorFactory,
56 QVector<Akonadi2::Preprocessor*>() << new DefaultIndexUpdater<Akonadi2::ApplicationDomain::Folder>); 56 QVector<Akonadi2::Preprocessor*>() << new DefaultIndexUpdater<Akonadi2::ApplicationDomain::Folder>);
57 auto config = ResourceConfig::getConfiguration(instanceIdentifier); 57 auto config = ResourceConfig::getConfiguration(instanceIdentifier);
58 mMaildirPath = config.value("path").toString(); 58 mMaildirPath = QDir::cleanPath(QDir::fromNativeSeparators(config.value("path").toString()));
59 //Chop a trailing slash if necessary 59 //Chop a trailing slash if necessary
60 if (mMaildirPath.endsWith(QDir::separator())) { 60 if (mMaildirPath.endsWith("/")) {
61 mMaildirPath.chop(1); 61 mMaildirPath.chop(1);
62 } 62 }
63 Trace() << "Started maildir resource for maildir: " << mMaildirPath; 63 Trace() << "Started maildir resource for maildir: " << mMaildirPath;
@@ -95,7 +95,7 @@ static QStringList listRecursive( const QString &root, const KPIM::Maildir &dir
95 if (!md.isValid()) { 95 if (!md.isValid()) {
96 continue; 96 continue;
97 } 97 }
98 QString path = root + QDir::separator() + sub; 98 QString path = root + "/" + sub;
99 list << path; 99 list << path;
100 list += listRecursive(path, md ); 100 list += listRecursive(path, md );
101 } 101 }
@@ -287,7 +287,7 @@ void MaildirResource::synchronizeMails(Akonadi2::Storage::Transaction &transacti
287 const auto remoteId = fileName.toUtf8(); 287 const auto remoteId = fileName.toUtf8();
288 288
289 KMime::Message *msg = new KMime::Message; 289 KMime::Message *msg = new KMime::Message;
290 auto filepath = listingPath + QDir::separator() + fileName; 290 auto filepath = listingPath + "/" + fileName;
291 msg->setHead(KMime::CRLFtoLF(maildir.readEntryHeadersFromFile(filepath))); 291 msg->setHead(KMime::CRLFtoLF(maildir.readEntryHeadersFromFile(filepath)));
292 msg->parse(); 292 msg->parse();
293 293