Ticket #5773: libs_libmythdb-krazy2-single-char-operations.patch

mythtv/libs/libmythdb/httpcomms.cpp

@@ -70 +70 @@
     QString path = url.path();
 
     if (url.hasQuery())
-        path += "?" + url.encodedQuery();
+        path += '?' + url.encodedQuery();
 
     QHttpRequestHeader header("GET", path);
     QString userAgent = "Mozilla/9.876 (X11; U; Linux 2.2.12-20 i686, en) "
@@ -240 +240 @@
             }
             else
             {
-                QString sUser(m_webCredentials.user + ":" + m_webCredentials.pass);
+                QString sUser(m_webCredentials.user + ':' + m_webCredentials.pass);
                 QByteArray auth = QCodecs::base64Encode(sUser.toLocal8Bit());
                 m_curRequest.setValue( "Authorization", QString( "Basic " ).append( auth ) );
             } 

mythtv/libs/libmythdb/lcddevice.cpp

@@ -226 +226 @@
         // Buffer this up in the hope that the connection will open soon
 
         send_buffer += someText;
-        send_buffer += "\n";
+        send_buffer += '\n';
     }
 }
 
@@ -272 +272 @@
         VERBOSE(VB_NETWORK|VB_EXTRA, QString(LOC + "Received from server: %1")
                 .arg(lineFromServer));
 
-    aList = lineFromServer.split(" ");
+    aList = lineFromServer.split(' ');
     if (aList[0] == "CONNECTED")
     {
         // We got "CONNECTED", which is a response to "HELLO"
@@ -413 +413 @@
         return;
 
     value = min(max(0.0f, value), 1.0f);
-    sendToServer("SET_MUSIC_PROGRESS " + quotedString(time) + " " + 
+    sendToServer("SET_MUSIC_PROGRESS " + quotedString(time) + ' ' + 
             QString().setNum(value));    
 }
 
@@ -485 +485 @@
 
     VERBOSE(VB_IMPORTANT|VB_EXTRA, LOC + "switchToMusic");
 
-    sendToServer("SWITCH_TO_MUSIC " + quotedString(artist) + " " 
-            + quotedString(album) + " " 
+    sendToServer("SWITCH_TO_MUSIC " + quotedString(artist) + ' ' 
+            + quotedString(album) + ' ' 
             + quotedString(track));
 }
 
@@ -497 +497 @@
 
     VERBOSE(VB_IMPORTANT|VB_EXTRA, LOC + "switchToChannel");
 
-    sendToServer("SWITCH_TO_CHANNEL " + quotedString(channum) + " " 
-            + quotedString(title) + " " 
+    sendToServer("SWITCH_TO_CHANNEL " + quotedString(channum) + ' ' 
+            + quotedString(title) + ' ' 
             + quotedString(subtitle));
 }
 
@@ -516 +516 @@
     QString s = "SWITCH_TO_MENU ";
 
     s += quotedString(app_name);
-    s += " " + QString(popMenu ? "TRUE" : "FALSE");
+    s += ' ' + QString(popMenu ? "TRUE" : "FALSE");
 
 
     QListIterator<LCDMenuItem> it(menuItems);
@@ -525 +525 @@
     while (it.hasNext())
     {
         curItem = &(it.next());
-        s += " " + quotedString(curItem->ItemName());
+        s += ' ' + quotedString(curItem->ItemName());
 
         if (curItem->isChecked() == CHECKED)
             s += " CHECKED";    
@@ -534 +534 @@
         else if (curItem->isChecked() == NOTCHECKABLE)
             s += " NOTCHECKABLE";
 
-        s += " " + QString(curItem->isSelected() ? "TRUE" : "FALSE");
-        s += " " + QString(curItem->Scroll() ? "TRUE" : "FALSE");
+        s += ' ' + QString(curItem->isSelected() ? "TRUE" : "FALSE");
+        s += ' ' + QString(curItem->Scroll() ? "TRUE" : "FALSE");
         QString sIndent;
         sIndent.setNum(curItem->getIndent());
-        s += " " + sIndent;
+        s += ' ' + sIndent;
     }
 
     sendToServer(s);
@@ -565 +565 @@
 
         QString sRow;
         sRow.setNum(curItem->getRow());
-        s += " " + sRow;
+        s += ' ' + sRow;
 
         if (curItem->getAlignment() == ALIGN_LEFT)
             s += " ALIGN_LEFT";    
@@ -574 +574 @@
         else if (curItem->getAlignment() == ALIGN_CENTERED)
             s += " ALIGN_CENTERED";
 
-        s += " " + quotedString(curItem->getText());
-        s += " " + quotedString(curItem->getScreen());
-        s += " " + QString(curItem->getScroll() ? "TRUE" : "FALSE");
+        s += ' ' + quotedString(curItem->getText());
+        s += ' ' + quotedString(curItem->getScreen());
+        s += ' ' + QString(curItem->getScroll() ? "TRUE" : "FALSE");
     }
 
     sendToServer(s);

mythtv/libs/libmythdb/mythdb.cpp

@@ -104 +104 @@
     QString str = QString("%1").arg("", indent);
     for (; it != bindings.end(); ++it)
     {
-        const QString curBinding = it.key() + "=" + (*it).toString() + ",";
+        const QString curBinding = it.key() + '=' + (*it).toString() + ',';
         if ((curColumn > indent) &&
             ((curBinding.length() + curColumn) > maxColumn))
         {
-            str += "\n";
+            str += '\n';
             str += QString("%1").arg("", indent);
             curColumn = indent;
         }
         if (curColumn > indent)
         {
-            str += " ";
+            str += ' ';
             curColumn++;
         }
         str += curBinding;
         curColumn += curBinding.length();
     }
     str = str.left(str.length() - 1); // remove trailing comma.
-    str += "\n";
+    str += '\n';
 
     return str;
 }
@@ -131 +131 @@
     QString str = QString("DB Error (%1):\n").arg(where);
 
     str += "Query was:\n";
-    str += query.executedQuery() + "\n";
+    str += query.executedQuery() + '\n';
     QString tmp = toCommaList(query.boundValues());
     if (!tmp.isEmpty())
     {
@@ -210 +210 @@
     if (d->ignoreDatabase)
     {
         ClearSettingsCache(key, newValue);
-        ClearSettingsCache(host + " " + key, newValue);
+        ClearSettingsCache(host + ' ' + key, newValue);
         return true;
     }
 
@@ -268 +268 @@
     }
 
     ClearSettingsCache(key, newValue);
-    ClearSettingsCache(host + " " + key, newValue);
+    ClearSettingsCache(host + ' ' + key, newValue);
 
     return success;
 }
@@ -373 +373 @@
 {
     bool found = false;
     QString value = defaultval;
-    QString myKey = host + " " + key;
+    QString myKey = host + ' ' + key;
 
     if (d->overriddenSettings.contains(myKey))
     {
@@ -430 +430 @@
     if (found && d->useSettingsCache)
     {
         d->settingsCacheLock.lock();
-        d->settingsCache[host + " " + key] = value;
+        d->settingsCache[host + ' ' + key] = value;
         d->settingsCacheLock.unlock();
     }
 

mythtv/libs/libmythdb/mythdbcon.cpp

@@ -290 +290 @@
     {
         db = *it;
         VERBOSE(VB_IMPORTANT,
-                "Closing DB connection named '" + db->m_name + "'");
+                "Closing DB connection named '" + db->m_name + '\'');
         db->m_db.close();
         ++it;
     }
@@ -420 +420 @@
         while (b.hasNext())
         {
             b.next();
-            str.replace(b.key(), "'" + b.value().toString() + "'");
+            str.replace(b.key(), '\'' + b.value().toString() + '\'');
         }
 
-        VERBOSE(VB_DATABASE, "MSqlQuery::exec() \"" + str + "\"");
+        VERBOSE(VB_DATABASE, "MSqlQuery::exec() \"" + str + '"');
     }
 
     return result;

mythtv/libs/libmythdb/mythdirs.cpp

@@ -60 +60 @@
         confdir = QDir::homePath() + "/.mythtv";
 
     sharedir = installprefix + "/share/mythtv/";
-    libdir = installprefix + "/" + QString(LIBDIRNAME) + "/mythtv/";
+    libdir = installprefix + '/' + QString(LIBDIRNAME) + "/mythtv/";
     themedir = sharedir + "themes/";
     pluginsdir = libdir + "plugins/";
     translationsdir = sharedir + "i18n/";
@@ -91 +91 @@
 
 QString GetPluginsNameFilter(void)
 {
-    return kPluginLibPrefix + "*" + kPluginLibSuffix;
+    return kPluginLibPrefix + '*' + kPluginLibSuffix;
 }
 
 QString FindPluginName(const QString &plugname)

mythtv/libs/libmythdb/mythstorage.cpp

@@ -9 +9 @@
     MSqlQuery query(MSqlQuery::InitCon());
     MSqlBindings bindings;
     query.prepare(
-        "SELECT " + GetColumnName() + " "
-        "FROM "   + GetTableName() + " " +
+        "SELECT " + GetColumnName() + ' ' +
+        "FROM "   + GetTableName() + ' ' +
         "WHERE "  + GetWhereClause(bindings));
     query.bindValues(bindings);
 
@@ -36 +36 @@
 
     MSqlBindings bindings;
     QString querystr = QString("SELECT * FROM " + _table + " WHERE "
-                               + GetWhereClause(bindings) + ";");
+                               + GetWhereClause(bindings) + ';');
 
     MSqlQuery query(MSqlQuery::InitCon());
     query.prepare(querystr);
@@ -55 +55 @@
         MSqlBindings bindings;
 
         querystr = QString("UPDATE " + _table + " SET " + GetSetClause(bindings) +
-                           " WHERE " + GetWhereClause(bindings) + ";");
+                           " WHERE " + GetWhereClause(bindings) + ';');
 
         query.prepare(querystr);
         query.bindValues(bindings);
@@ -69 +69 @@
         MSqlBindings bindings;
 
         querystr = QString("INSERT INTO " + _table + " SET "
-                           + GetSetClause(bindings) + ";");
+                           + GetSetClause(bindings) + ';');
 
         query.prepare(querystr);
         query.bindValues(bindings);

mythtv/libs/libmythdb/mythverbose.cpp

@@ -16 +16 @@
     QString option;
     bool reverseOption;
 
-    if (arg.startsWith("-"))
+    if (arg.startsWith('-'))
     {
         qDebug() << "Invalid or missing argument to -v/--verbose option\n";
         return GENERIC_EXIT_INVALID_CMDLINE;
@@ -40 +40 @@
             {
                 QString m_verbose = verboseString;
                 m_verbose.replace(QRegExp(" "), ",");
-                m_verbose.replace(QRegExp("^,"), "");
+                m_verbose.remove(QRegExp("^,"));
                 qDebug() <<
                   "Verbose debug levels.\n" <<
                   "Accepts any combination (separated by comma) of:\n\n" <<
@@ -82 +82 @@
                     if (ARG_ADDITIVE) \
                     { \
                         print_verbose_messages |= ARG_VALUE; \
-                        verboseString = verboseString + " " + ARG_STR; \
+                        verboseString = verboseString + ' ' + ARG_STR; \
                     } \
                     else \
                     { \

mythtv/libs/libmythdb/oldsettings.cpp

@@ -115 +115 @@
 {
     int result = ReadSettings(prefix + "/share/mythtv/" + filename);
     result += ReadSettings(prefix + "/etc/mythtv/" + filename);
-    result += ReadSettings(confdir + "/" + filename);
+    result += ReadSettings(confdir + '/' + filename);
     result += ReadSettings("./" + filename);
     return result;
 }
@@ -159 +159 @@
 
                 (*m_pSettings)[strKey] = strVal;
 
-                VERBOSE(VB_FILE, LOC + "'" + strKey + "' = '" + strVal + "'.");
+                VERBOSE(VB_FILE, LOC + '\'' + strKey + "' = '" + strVal + "'.");
             }
         }
     } // wend