From 634318a21b011812aea46082e2ecce0e4a5599ab Mon Sep 17 00:00:00 2001
From: Ritt Konstantin <ritt.ks@gmail.com>
Date: Fri, 21 Aug 2009 15:27:00 +0200
Subject: QFSFileEngine: micro-optimization

- save QString copy constructors
- make QFSFileEngine::tempPath more robust on Windows

Merge-request: 1217
Reviewed-by: Joerg Bornemann <joerg.bornemann@trolltech.com>
---
 src/corelib/io/qfsfileengine_unix.cpp |  6 +++---
 src/corelib/io/qfsfileengine_win.cpp  | 33 ++++++++++++++++++---------------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/corelib/io/qfsfileengine_unix.cpp b/src/corelib/io/qfsfileengine_unix.cpp
index 96ea96e..2ebf691 100644
--- a/src/corelib/io/qfsfileengine_unix.cpp
+++ b/src/corelib/io/qfsfileengine_unix.cpp
@@ -514,21 +514,21 @@ QString QFSFileEngine::homePath()
 
 QString QFSFileEngine::rootPath()
 {
-    return QString::fromLatin1("/");
+    return QLatin1String("/");
 }
 
 QString QFSFileEngine::tempPath()
 {
     QString temp = QFile::decodeName(qgetenv("TMPDIR"));
     if (temp.isEmpty())
-        temp = QString::fromLatin1("/tmp/");
+        temp = QLatin1String("/tmp/");
     return temp;
 }
 
 QFileInfoList QFSFileEngine::drives()
 {
     QFileInfoList ret;
-    ret.append(rootPath());
+    ret.append(QFileInfo(rootPath()));
     return ret;
 }
 
diff --git a/src/corelib/io/qfsfileengine_win.cpp b/src/corelib/io/qfsfileengine_win.cpp
index 0a5c90e..bac0569 100644
--- a/src/corelib/io/qfsfileengine_win.cpp
+++ b/src/corelib/io/qfsfileengine_win.cpp
@@ -1061,7 +1061,7 @@ QString QFSFileEngine::homePath()
                 ret = QString::fromLocal8Bit(qgetenv("HOME").constData());
                 if(ret.isEmpty() || !QFile::exists(ret)) {
 #if defined(Q_OS_WINCE)
-                    ret = QString::fromLatin1("\\My Documents");
+                    ret = QLatin1String("\\My Documents");
                     if (!QFile::exists(ret))
 #endif
                     ret = rootPath();
@@ -1075,7 +1075,7 @@ QString QFSFileEngine::homePath()
 QString QFSFileEngine::rootPath()
 {
 #if defined(Q_OS_WINCE)
-    QString ret = QString::fromLatin1("/");
+    QString ret = QLatin1String("/");
 #elif defined(Q_FS_FAT)
     QString ret = QString::fromLatin1(qgetenv("SystemDrive").constData());
     if(ret.isEmpty())
@@ -1091,20 +1091,23 @@ QString QFSFileEngine::rootPath()
 
 QString QFSFileEngine::tempPath()
 {
-    wchar_t tempPath[MAX_PATH];
-    int success = GetTempPath(MAX_PATH, tempPath);
-    QString ret = QString::fromWCharArray(tempPath);
-
-    if (ret.isEmpty() || !success) {
+    QString ret;
+    {
+        wchar_t tempPath[MAX_PATH];
+        if (GetTempPath(MAX_PATH, tempPath))
+            ret = QString::fromWCharArray(tempPath);
+        if (!ret.isEmpty()) {
+            while (ret.endsWith(QLatin1Char('\\')))
+                ret.chop(1);
+            ret = QDir::fromNativeSeparators(ret);
+        }
+    }
+    if (ret.isEmpty()) {
 #if !defined(Q_OS_WINCE)
-        ret = QString::fromLatin1("c:/tmp");
+        ret = QLatin1String("c:/tmp");
 #else
-        ret = QString::fromLatin1("\\Temp");
+        ret = QLatin1String("/Temp");
 #endif
-    } else {
-        ret = QDir::fromNativeSeparators(ret);
-        while (ret.at(ret.length()-1) == QLatin1Char('/'))
-            ret = ret.left(ret.length()-1);
     }
     return ret;
 }
@@ -1125,13 +1128,13 @@ QFileInfoList QFSFileEngine::drives()
 
     while(driveBits) {
         if(driveBits & 1)
-            ret.append(QString::fromLatin1(driveName));
+            ret.append(QFileInfo(QLatin1String(driveName)));
         driveName[0]++;
         driveBits = driveBits >> 1;
     }
     return ret;
 #else
-    ret.append(QString::fromLatin1("/"));
+    ret.append(QFileInfo(QLatin1String("/")));
     return ret;
 #endif
 }
-- 
cgit v0.12