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

List:       kde-commits
Subject:    [kde-baseapps/frameworks] konqueror/src: KTemporaryFile -> QTemporaryFile, using convert-ktemporaryf
From:       David Faure <faure () kde ! org>
Date:       2016-04-30 18:34:49
Message-ID: E1awZj7-0007LT-DM () scm ! kde ! org
[Download RAW message or body]

Git commit c27f614f3938df19bc6c2964419983241c82bcba by David Faure.
Committed on 30/04/2016 at 10:25.
Pushed by dfaure into branch 'frameworks'.

KTemporaryFile -> QTemporaryFile, using convert-ktemporaryfile.pl

+ ported one misuse of KTemporaryFile for dirs to QTemporaryDir.

M  +1    -1    konqueror/src/konqmain.cpp
M  +15   -19   konqueror/src/konqmainwindow.cpp
M  +4    -4    konqueror/src/konqviewmanager.cpp
M  +3    -3    konqueror/src/tests/konqhtmltest.cpp

http://commits.kde.org/kde-baseapps/c27f614f3938df19bc6c2964419983241c82bcba

diff --git a/konqueror/src/konqmain.cpp b/konqueror/src/konqmain.cpp
index 1ef8d67..e43c08e 100644
--- a/konqueror/src/konqmain.cpp
+++ b/konqueror/src/konqmain.cpp
@@ -25,11 +25,11 @@
 #include "konqview.h"
 #include "konqsettingsxt.h"
 
-#include <ktemporaryfile.h>
 #include <KLocalizedString>
 #include <kstandarddirs.h>
 #include <QDebug>
 #include <kcmdlineargs.h>
+#include <kglobal.h>
 #include <QtCore/QFile>
 
 #include <config-konqueror.h>
diff --git a/konqueror/src/konqmainwindow.cpp b/konqueror/src/konqmainwindow.cpp
index 7979eb3..ceffe76 100644
--- a/konqueror/src/konqmainwindow.cpp
+++ b/konqueror/src/konqmainwindow.cpp
@@ -112,7 +112,7 @@
 #include <kstandardaction.h>
 #include <kstandarddirs.h>
 #include <ksycoca.h>
-#include <ktemporaryfile.h>
+#include <QTemporaryFile>
 #include <ktogglefullscreenaction.h>
 #include <ktoolbarpopupaction.h>
 #include <kurlcompletion.h>
@@ -1541,24 +1541,23 @@ void KonqMainWindow::slotSendFile()
         }
         if ((*it).isLocalFile() && QFileInfo((*it).toLocalFile()).isDir()) {
             // Create a temp dir, so that we can put the ZIP file in it with a proper name
-            QString zipFileName;
-            {
-                //TODO This should use KTempDir
-                KTemporaryFile zipFile;
-                zipFile.open();
-                zipFileName = zipFile.fileName();
+            // Problem: when to delete it?
+            QTemporaryDir tempDir;
+            tempDir.setAutoRemove(false);
+            if (!tempDir.isValid()) {
+                qWarning() << "Could not create temporary dir";
+                continue;
             }
-
-            QDir().mkdir(zipFileName);
-            zipFileName = zipFileName + '/' + (*it).fileName() + ".zip";
+            const QString zipFileName = tempDir.path() + '/' + (*it).fileName() + ".zip";
             KZip zip(zipFileName);
             if (!zip.open(QIODevice::WriteOnly)) {
-                continue;    // TODO error message
+                qWarning() << "Could not open" << zipFileName << "for writing";
+                continue;
             }
             zip.addLocalDirectory((*it).path(), QString());
             zip.close();
             fileNameList += (*it).fileName() + ".zip";
-            urls.append(zipFileName);
+            urls.append(QUrl::fromLocalFile(zipFileName).url());
         } else {
             fileNameList += (*it).fileName();
             urls.append((*it).url());
@@ -5171,17 +5170,14 @@ void KonqMainWindow::closeEvent(QCloseEvent *e)
                 ) {
                 case KMessageBox::Yes :
                     break;
-                case KMessageBox::No : {
+                case KMessageBox::No :
                     e->ignore();
                     slotRemoveTab();
                     return;
-                }
-                break;
-                case KMessageBox::Cancel : {
+                case KMessageBox::Cancel :
                     e->ignore();
                     return;
                 }
-                }
             }
         }
 
@@ -5396,8 +5392,8 @@ void KonqMainWindow::slotAddWebSideBar(const QUrl &url, const QString &name)
 
 void KonqMainWindow::addBookmarksIntoCompletion(const KBookmarkGroup &group)
 {
-    static const QString &http = KGlobal::staticQString("http");
-    static const QString &ftp = KGlobal::staticQString("ftp");
+    const QString http = QStringLiteral("http");
+    const QString ftp = QStringLiteral("ftp");
 
     if (group.isNull()) {
         return;
diff --git a/konqueror/src/konqviewmanager.cpp b/konqueror/src/konqviewmanager.cpp
index cf24e6f..7d46132 100644
--- a/konqueror/src/konqviewmanager.cpp
+++ b/konqueror/src/konqviewmanager.cpp
@@ -44,7 +44,7 @@
 #include <QDebug>
 #include <kapplication.h>
 #include <kglobalsettings.h>
-#include <ktemporaryfile.h>
+#include <QTemporaryFile>
 #include <KLocalizedString>
 #include <kmessagebox.h>
 #include <kmenu.h>
@@ -292,7 +292,7 @@ void KonqViewManager::duplicateTab(int tabIndex, bool openAfterCurrentPage)
     printFullHierarchy();
 #endif
 
-    KTemporaryFile tempFile;
+    QTemporaryFile tempFile;
     tempFile.open();
     KConfig config(tempFile.fileName());
     KConfigGroup profileGroup(&config, "Profile");
@@ -326,7 +326,7 @@ KonqMainWindow *KonqViewManager::breakOffTab(int tab, const QSize &windowSize)
     printFullHierarchy();
 #endif
 
-    KTemporaryFile tempFile;
+    QTemporaryFile tempFile;
     tempFile.open();
     KSharedConfigPtr config = KSharedConfig::openConfig(tempFile.fileName());
     KConfigGroup profileGroup(config, "Profile");
@@ -1650,7 +1650,7 @@ void KonqViewManager::applyConfiguration()
 
 KonqMainWindow *KonqViewManager::duplicateWindow()
 {
-    KTemporaryFile tempFile;
+    QTemporaryFile tempFile;
     tempFile.open();
     KConfig config(tempFile.fileName());
     KConfigGroup profileGroup(&config, "Profile");
diff --git a/konqueror/src/tests/konqhtmltest.cpp b/konqueror/src/tests/konqhtmltest.cpp
index 881c426..2c3a321 100644
--- a/konqueror/src/tests/konqhtmltest.cpp
+++ b/konqueror/src/tests/konqhtmltest.cpp
@@ -18,7 +18,7 @@
 #include <konqmisc.h>
 #include <khtml_part.h>
 #include <khtmlview.h>
-#include <ktemporaryfile.h>
+#include <QTemporaryFile>
 #include <kstandarddirs.h>
 #include <ktoolbar.h>
 #include <kdebug.h>
@@ -117,11 +117,11 @@ private Q_SLOTS:
 
         // We have to use the same protocol for both the orig and dest urls.
         // KAuthorized would forbid a data: URL to redirect to a file: URL for instance.
-        KTemporaryFile tempFile;
+        QTemporaryFile tempFile;
         QVERIFY(tempFile.open());
         tempFile.write("<script>document.write(\"Opener=\" + window.opener);</script>");
 
-        KTemporaryFile origTempFile;
+        QTemporaryFile origTempFile;
         QVERIFY(origTempFile.open());
         origTempFile.write(
             "<html><script>"

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