From 4f5aa5fab438566475194d2ea2ffa55dd4637c1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=BCgler?= <sebas@kde.org>
Date: Tue, 15 Oct 2013 02:58:15 +0200
Subject: [PATCH] Disable debug output in hot path, more QString ctor
 improvements

---
 src/plasmaquick/packageurlinterceptor.cpp             |  6 +++---
 src/plasmaquick/packageurlinterceptor.h               |  2 +-
 src/plasmaquick/private/packageaccessmanager.cpp      | 10 +++++-----
 src/plasmaquick/private/packageaccessmanagerfactory.h |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/plasmaquick/packageurlinterceptor.cpp b/src/plasmaquick/packageurlinterceptor.cpp
index 1a2ae5966..211e983a2 100644
--- a/src/plasmaquick/packageurlinterceptor.cpp
+++ b/src/plasmaquick/packageurlinterceptor.cpp
@@ -84,17 +84,17 @@ QUrl PackageUrlInterceptor::intercept(const QUrl &path, QQmlAbstractUrlIntercept
                 //it's from an import, good
                 //TODO: implement imports whitelist?
                 if (path.path().startsWith(import)) {
-                    qDebug() << "Found import, access granted" << path;
+                    //qDebug() << "Found import, access granted" << path;
 
                     //check if there is a platform specific file that overrides this import
                     foreach (const QString &platform, KDeclarative::runtimePlatform()) {
-                        qDebug() << "Trying" << platform;
+                        //qDebug() << "Trying" << platform;
 
                         //search for a platformqml/ path sibling of this import path
                         const QString &platformPath = import+QStringLiteral("/../platformqml/")+platform+path.path().mid(import.length());
                         const QFile f(platformPath);
 
-                        qDebug() << "Found a platform specific file:" << QUrl::fromLocalFile(platformPath)<<f.exists();
+                        //qDebug() << "Found a platform specific file:" << QUrl::fromLocalFile(platformPath)<<f.exists();
                         if (f.exists()) {
                             return QUrl::fromLocalFile(platformPath);
                         }
diff --git a/src/plasmaquick/packageurlinterceptor.h b/src/plasmaquick/packageurlinterceptor.h
index 12ed950f2..8e477b2a9 100644
--- a/src/plasmaquick/packageurlinterceptor.h
+++ b/src/plasmaquick/packageurlinterceptor.h
@@ -52,7 +52,7 @@ public:
         }
 
         //failed by type, let's try by extension
-        const QString extension = fileName.mid(fileName.lastIndexOf(QLatin1Char('.')) + 1).toLower();
+        const QString &extension = fileName.mid(fileName.lastIndexOf(QLatin1Char('.')) + 1).toLower();
 
         if (extension == QStringLiteral("svg") || extension == QStringLiteral("svgz") ||
             extension == QStringLiteral("png") || extension == QStringLiteral("gif") ||
diff --git a/src/plasmaquick/private/packageaccessmanager.cpp b/src/plasmaquick/private/packageaccessmanager.cpp
index a99f999a6..1b24d4221 100644
--- a/src/plasmaquick/private/packageaccessmanager.cpp
+++ b/src/plasmaquick/private/packageaccessmanager.cpp
@@ -27,7 +27,7 @@ public:
     ErrorReply(QNetworkAccessManager::Operation op, const QNetworkRequest &req)
         : QNetworkReply()
     {
-        setError(QNetworkReply::ContentOperationNotPermittedError, "The plasmoid has not been authorized to load remote content");
+        setError(QNetworkReply::ContentOperationNotPermittedError, QStringLiteral("The plasmoid has not been authorized to load remote content"));
         setOperation(op);
         setRequest(req);
         setUrl(req.url());
@@ -60,14 +60,14 @@ QNetworkReply *PackageAccessManager::createRequest(QNetworkAccessManager::Operat
 {
     QUrl reqUrl(req.url());
 
-    if (reqUrl.scheme() == "plasmapackage") {
+    if (reqUrl.scheme() == QStringLiteral("plasmapackage")) {
         QNetworkRequest request = req;
-        reqUrl.setScheme("file");
+        reqUrl.setScheme(QStringLiteral("file"));
         reqUrl.setPath(m_package.filePath(0, reqUrl.path()));
         request.setUrl(reqUrl);
         return QNetworkAccessManager::createRequest(op, request, outgoingData);
-    } else if ((reqUrl.scheme() == "http") ||
-               ((reqUrl.scheme() == "file" || reqUrl.scheme() == "desktop"))) {
+    } else if ((reqUrl.scheme() == QStringLiteral("http")) ||
+               ((reqUrl.scheme() == QStringLiteral("file") || reqUrl.scheme() == QStringLiteral("desktop")))) {
         return new ErrorReply(op, req);
     } else {
 #ifndef PLASMA_NO_KIO
diff --git a/src/plasmaquick/private/packageaccessmanagerfactory.h b/src/plasmaquick/private/packageaccessmanagerfactory.h
index b632a57f9..2622bb820 100644
--- a/src/plasmaquick/private/packageaccessmanagerfactory.h
+++ b/src/plasmaquick/private/packageaccessmanagerfactory.h
@@ -28,7 +28,7 @@
 
 class AppletAuthorization;
 
-class PLASMAQUICK_EXPORT PackageAccessManagerFactory : public QQmlNetworkAccessManagerFactory
+class PackageAccessManagerFactory : public QQmlNetworkAccessManagerFactory
 {
 public:
     PackageAccessManagerFactory(const Plasma::Package &package);