SVN commit 539333 by dfaure:

Another "a" -> 'a' patch by Christian Spiel.


 M  +8 -8      file/file.cc   [POSSIBLY UNSAFE: system]
 M  +2 -2      ftp/ftp.cc  
 M  +12 -12    http/http.cc  
 M  +5 -5      http/http_cache_cleaner.cpp  
 M  +1 -1      http/kcookiejar/kcookiejar.cpp  


--- trunk/KDE/kdelibs/kioslave/file/file.cc #539332:539333
@@ -1329,7 +1329,7 @@
       error( KIO::ERR_COULD_NOT_MOUNT, i18n("Could not find program \"mount\""));
       return;
     }
-    QByteArray buffer = mountProg + " ";
+    QByteArray buffer = mountProg + ' ';
 
     // Two steps, in case mount doesn't like it when we pass all options
     for ( int step = 0 ; step <= 1 ; step++ )
@@ -1344,14 +1344,14 @@
           else
             // mount giving device + mountpoint but no fstype
             if ( !_point.isEmpty() && !_dev.isEmpty() && fstype_empty )
-                buffer += readonly + " " + dev + " " + point;
+                buffer += readonly + ' ' + dev + ' ' + point;
             else
               // mount giving device + mountpoint + fstype
 #if defined(__svr4__) && defined(__sun__) // MARCO for Solaris 8 and I
                 // believe this is true for SVR4 in general
-                buffer += "-F " + fstype + " " + (_ro ? "-oro" : "") + " " + dev + " " + point;
+                buffer += "-F " + fstype + ' ' + (_ro ? "-oro" : "") + ' ' + dev + ' ' + point;
 #else
-                buffer += readonly + " -t " + fstype + " " + dev + " " + point;
+                buffer += readonly + " -t " + fstype + ' ' + dev + ' ' + point;
 #endif
         buffer += " 2>" + tmpFileName;
         kDebug(7101) << buffer << endl;
@@ -1499,7 +1499,7 @@
     QString epath = getenv("PATH");
     QString path = QLatin1String("/sbin:/bin");
     if (!epath.isEmpty())
-       path += ":" + epath;
+       path += ':' + epath;
     QByteArray umountProg = KGlobal::dirs()->findExe("umount", path).toLocal8Bit();
 
     if (umountProg.isEmpty()) {
@@ -1528,13 +1528,13 @@
     QString epath = getenv("PATH");
     QString path = QLatin1String("/sbin:/bin");
     if (!epath.isEmpty())
-        path += ":" + epath;
+        path += ':' + epath;
     QString pmountProg = KGlobal::dirs()->findExe("pmount", path);
 
     if (pmountProg.isEmpty())
         return false;
 
-    QByteArray buffer = QFile::encodeName(pmountProg) + " " +
+    QByteArray buffer = QFile::encodeName(pmountProg) + ' ' +
                         QFile::encodeName(KProcess::quote(dev));
 
     int res = system( buffer.constData() );
@@ -1568,7 +1568,7 @@
     QString epath = getenv("PATH");
     QString path = QLatin1String("/sbin:/bin");
     if (!epath.isEmpty())
-        path += ":" + epath;
+        path += ':' + epath;
     QString pumountProg = KGlobal::dirs()->findExe("pumount", path);
 
     if (pumountProg.isEmpty())
--- trunk/KDE/kdelibs/kioslave/ftp/ftp.cc #539332:539333
@@ -987,7 +987,7 @@
   QString errormessage;
 
   if ( !_path.isEmpty() ) {
-    tmp += " ";
+    tmp += ' ';
     tmp += remoteEncoding()->encode(_path);
   }
 
@@ -1135,7 +1135,7 @@
 
   // we need to do bit AND 777 to get permissions, in case
   // we were sent a full mode (unlikely)
-  QString cmd = QString::fromLatin1("SITE CHMOD ") + QString::number( permissions & 511, 8 /*octal*/ ) + " ";
+  QString cmd = QString::fromLatin1("SITE CHMOD ") + QString::number( permissions & 511, 8 /*octal*/ ) + ' ';
   cmd += path;
 
   ftpSendCmd(remoteEncoding()->encode(cmd));
--- trunk/KDE/kdelibs/kioslave/http/http.cc #539332:539333
@@ -1040,10 +1040,10 @@
         {
           if ( bracketsOpen )
           {
-            response += ")";
+            response += ')';
             bracketsOpen = false;
           }
-          response += " <" + metaData( QString("davLockURL%1").arg(i) ) + ">";
+          response += " <" + metaData( QString("davLockURL%1").arg(i) ) + '>';
         }
 
         if ( !bracketsOpen )
@@ -1053,13 +1053,13 @@
         }
         else
         {
-          response += " ";
+          response += ' ';
         }
 
         if ( hasMetaData( QString("davLockNot%1").arg(i) ) )
           response += "Not ";
 
-        response += "<" + metaData( QString("davLockToken%1").arg(i) ) + ">";
+        response += '<' + metaData( QString("davLockToken%1").arg(i) ) + '>';
       }
     }
 
@@ -1630,7 +1630,7 @@
   }
 
   // if ( kError != ERR_SLAVE_DEFINED )
-  //errorString += " (" + url + ")";
+  //errorString += " (" + url + ')';
 
   if ( callError )
     error( ERR_SLAVE_DEFINED, errorString );
@@ -1695,7 +1695,7 @@
   }
 
   // if ( kError != ERR_SLAVE_DEFINED )
-  //errorString += " (" + url + ")";
+  //errorString += " (" + url + ')';
 
   error( ERR_SLAVE_DEFINED, errorString );
 }
@@ -4552,7 +4552,7 @@
 
    QString dir = m_strCacheDir;
    if (dir[dir.length()-1] != '/')
-      dir += "/";
+      dir += '/';
 
    int l = host.length();
    for(int i = 0; i < l; i++)
@@ -4564,7 +4564,7 @@
       }
    }
    if (dir[dir.length()-1] == '/')
-      dir += "0";
+      dir += '0';
 
    unsigned long hash = 0x00000000;
    QByteArray u = m_request.url.url().toLatin1();
@@ -4578,7 +4578,7 @@
 
    CEF = CEF + hashString;
 
-   CEF = dir + "/" + CEF;
+   CEF = dir + '/' + CEF;
 
    m_request.cef = CEF;
 
@@ -4839,7 +4839,7 @@
    bool doClean = false;
    QString cleanFile = m_strCacheDir;
    if (cleanFile[cleanFile.length()-1] != '/')
-      cleanFile += "/";
+      cleanFile += '/';
    cleanFile += "cleaned";
 
    struct stat stat_buf;
@@ -5321,10 +5321,10 @@
   do {
     ret = gss_display_status(&new_status, major_status, GSS_C_GSS_CODE, GSS_C_NULL_OID, &msg_ctx, &major_string);
     errorstr += (const char *)major_string.value;
-    errorstr += " ";
+    errorstr += ' ';
     ret = gss_display_status(&new_status, minor_status, GSS_C_MECH_CODE, GSS_C_NULL_OID, &msg_ctx, &minor_string);
     errorstr += (const char *)minor_string.value;
-    errorstr += " ";
+    errorstr += ' ';
   } while (!GSS_ERROR(ret) && msg_ctx != 0);
 
   return errorstr;
--- trunk/KDE/kdelibs/kioslave/http/http_cache_cleaner.cpp #539332:539333
@@ -174,10 +174,10 @@
    foreach ( QFileInfo qFileInfo, newEntries ) {
        if (qFileInfo.isFile())
        {
-          FileInfo *fileInfo = readEntry( strDir + "/" + qFileInfo.fileName());
+          FileInfo *fileInfo = readEntry( strDir + '/' + qFileInfo.fileName());
           if (fileInfo)
           {
-             fileInfo->name = name + "/" + qFileInfo.fileName();
+             fileInfo->name = name + '/' + qFileInfo.fileName();
              fileInfo->size = (qFileInfo.size() + 1023) / 1024;
              fileEntries.append(fileInfo);
           }
@@ -237,7 +237,7 @@
    {
       if ((*it)[0] != '.')
       {
-         scanDirectory( cachedEntries, *it, strCacheDir + "/" + *it);
+         scanDirectory( cachedEntries, *it, strCacheDir + '/' + *it);
       }
    }
 
@@ -249,7 +249,7 @@
    {
       if (fileInfo->size > maxCachedSize)
       {
-         QByteArray filename = QFile::encodeName( strCacheDir + "/" + fileInfo->name);
+         QByteArray filename = QFile::encodeName( strCacheDir + '/' + fileInfo->name);
          unlink(filename.data());
 //         kDebug () << appName << ": Object too big, deleting '" << filename.data() << "' (" << result<< ")" << endl;
       }
@@ -261,7 +261,7 @@
    {
       if ((totalSize + fileInfo->size) > m_maxCacheSize)
       {
-         QByteArray filename = QFile::encodeName( strCacheDir + "/" + fileInfo->name);
+         QByteArray filename = QFile::encodeName( strCacheDir + '/' + fileInfo->name);
          unlink(filename.data());
 //         kDebug () << appName << ": Cache too big, deleting '" << filename.data() << "' (" << fileInfo->size << ")" << endl;
       }
--- trunk/KDE/kdelibs/kioslave/http/kcookiejar/kcookiejar.cpp #539332:539333
@@ -1003,7 +1003,7 @@
        if (!valid)
        {
           // Maybe it points to a sub-domain
-          if (cookiePtr->domain().endsWith("."+cookiePtr->host()))
+          if (cookiePtr->domain().endsWith('.'+cookiePtr->host()))
              valid = true;
        }