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

List:       kde-commits
Subject:    branches/KDE/4.4/kdelibs/kio/kio
From:       Dawit Alemayehu <adawit () kde ! org>
Date:       2010-02-09 15:54:24
Message-ID: 1265730864.559842.3005.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1087802 by adawit:

Wrap literal meta-data text with QLatin1String

 M  +9 -7      accessmanager.cpp  


--- branches/KDE/4.4/kdelibs/kio/kio/accessmanager.cpp #1087801:1087802
@@ -37,7 +37,9 @@
 #include <QtDBus/QDBusConnection>
 #include <QtDBus/QDBusReply>
 
+#define QL1S(x)     QLatin1String(x)
 
+
 namespace KIO {
 
 class AccessManager::AccessManagerPrivate
@@ -96,7 +98,7 @@
     KIO::Integration::CookieJar *jar = qobject_cast<KIO::Integration::CookieJar *> \
(cookieJar());  if (jar) {
         jar->setWindowId(id);
-        d->sessionMetaData.insert(QLatin1String("window-id"), \
QString::number((qlonglong)id)); +        \
d->sessionMetaData.insert(QL1S("window-id"), QString::number((qlonglong)id));  }
 }
 
@@ -164,11 +166,11 @@
     if ( op == PostOperation && !kioJob->metaData().contains("content-type"))  {
         QVariant header = req.header(QNetworkRequest::ContentTypeHeader);
         if (header.isValid())
-          kioJob->addMetaData(QLatin1String("content-type"),
+          kioJob->addMetaData(QL1S("content-type"),
                               QString::fromLatin1("Content-Type: \
%1").arg(header.toString()));  else
-          kioJob->addMetaData(QLatin1String("content-type"),
-                              QLatin1String("Content-Type: \
application/x-www-form-urlencoded")); +          \
kioJob->addMetaData(QL1S("content-type"), +                              \
QL1S("Content-Type: application/x-www-form-urlencoded"));  }
 
     return reply;
@@ -197,12 +199,12 @@
     }
 
     if (request.hasRawHeader("Referer")) {
-        metaData.insert("referrer", request.rawHeader("Referer"));
+        metaData.insert(QL1S("referrer"), request.rawHeader("Referer"));
         request.setRawHeader("Referer", QByteArray());
     }
 
     if (request.hasRawHeader("Content-Type")) {
-        metaData.insert("content-type", request.rawHeader("Content-Type"));
+        metaData.insert(QL1S("content-type"), request.rawHeader("Content-Type"));
         request.setRawHeader("Content-Type", QByteArray());
     }
 
@@ -239,7 +241,7 @@
 {
     const QString scheme (url.scheme());
 
-    return (externalContentAllowed || scheme == QLatin1String("file")  || scheme == \
QLatin1String("data")); +    return (externalContentAllowed || scheme == QL1S("file") \
|| scheme == QL1S("data"));  }
 
 


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