[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kcalcore] src: Port away from KTemporaryFile
From:       Sergio Martins <iamsergio () gmail ! com>
Date:       2015-03-01 0:12:13
Message-ID: E1YRrUT-0003uf-3o () scm ! kde ! org
[Download RAW message or body]

Git commit 664ec782bcb1dbc9c9acc0a2aae9de228a61116d by Sergio Martins.
Committed on 01/03/2015 at 00:06.
Pushed by smartins into branch 'master'.

Port away from KTemporaryFile

M  +9    -10   src/incidence.cpp

http://commits.kde.org/kcalcore/664ec782bcb1dbc9c9acc0a2aae9de228a61116d

diff --git a/src/incidence.cpp b/src/incidence.cpp
index a1d1649..176dbf8 100644
--- a/src/incidence.cpp
+++ b/src/incidence.cpp
@@ -35,8 +35,7 @@
 #include "incidence.h"
 #include "calformat.h"
 
-#include <KTemporaryFile>
-
+#include <QTemporaryFile>
 #include <QMimeDatabase>
 #include <QTextDocument> // for .toHtmlEscaped() and Qt::mightBeRichText()
 #include <QStringList>
@@ -754,21 +753,21 @@ QString Incidence::writeAttachmentToTempFile(const Attachment::Ptr &attachment)
     if (d->mTempFiles.contains(attachment)) {
         return d->mTempFiles.value(attachment);
     }
-    KTemporaryFile *file = new KTemporaryFile();
+    QTemporaryFile file;
 
     QMimeDatabase mimeDb;
     QStringList patterns = mimeDb.mimeTypeForName(attachment->mimeType()).globPatterns();
 
     if (!patterns.empty()) {
-        file->setSuffix(QString(patterns.first()).remove(QLatin1Char('*')));
+        file.setFileTemplate(file.fileTemplate() + QString(patterns.first()).remove(QLatin1Char('*')));
     }
-    file->setAutoRemove(true);
-    file->open();
+    file.setAutoRemove(false);
+    file.open();
     // read-only not to give the idea that it could be written to
-    file->setPermissions(QFile::ReadUser);
-    file->write(QByteArray::fromBase64(attachment->data()));
-    d->mTempFiles.insert(attachment, file->fileName());
-    file->close();
+    file.setPermissions(QFile::ReadUser);
+    file.write(QByteArray::fromBase64(attachment->data()));
+    d->mTempFiles.insert(attachment, file.fileName());
+    file.close();
     return d->mTempFiles.value(attachment);
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]