Use QTemporaryDir instead of our homemade solution.

Change-Id: Ia584a9b2f954df5c29a2f0aa5f12b201b2bfbcc4
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>

1 files changed, 10 insertions, 8 deletions

diff --git a/src/libs/installer/metadatajob.cpp b/src/libs/installer/metadatajob.cpp
index 79c7c7b05..e119db1c5 100644
--- a/src/libs/installer/metadatajob.cpp
+++ b/src/libs/installer/metadatajob.cpp
@@ -39,14 +39,14 @@
 **
 **************************************************************************/
 #include "metadatajob.h"
-#include "errors.h"
-#include "messageboxhandler.h"
+
 #include "metadatajob_p.h"
 #include "packagemanagercore.h"
 #include "productkeycheck.h"
-#include "qinstallerglobal.h"
 #include "settings.h"
 
+#include <QTemporaryDir>
+
 namespace QInstaller {
 
 MetadataJob::MetadataJob(QObject *parent)
@@ -241,14 +241,16 @@ MetadataJob::Status MetadataJob::parseUpdatesXml(const QList<FileTaskResult> &re
             return XmlDownloadFailure;
 
         Metadata metadata;
-        try {
-            metadata.directory = createTemporaryDirectory(QLatin1String("remoterepo-"));
-            m_tempDirDeleter.add(metadata.directory);
-        } catch (const QInstaller::Error &error) {
-            qDebug() << error.message();
+        QTemporaryDir tmp(QDir::tempPath() + QLatin1String("/remoterepo-XXXXXX"));
+        if (!tmp.isValid()) {
+            qDebug() << "Could not create unique temporary directory.";
             return XmlDownloadFailure;
         }
 
+        tmp.setAutoRemove(false);
+        metadata.directory = tmp.path();
+        m_tempDirDeleter.add(metadata.directory);
+
         QFile file(result.target());
         if (!file.rename(metadata.directory + QLatin1String("/Updates.xml"))) {
             qDebug() << "Could not rename target to Updates.xml. Error:" << file.errorString();