Ticket #11536: startsendswith.patch

mythplugins/mytharchive/mytharchivehelper/main.cpp

@@ -1728 +1728 @@
                 {
                     // work out what format to save to
                     QString saveFormat = "JPEG";
-                    if (outFile.right(4) == ".png")
+                    if (outFile.endsWith(".png"))
                         saveFormat = "PNG";
 
                     int count = 0;

mythplugins/mythgame/mythgame/gamehandler.cpp

@@ -337 +337 @@
                         pos = (RomName.length() - extlength) - 1;
                         basename = RomName.left(pos);
 
-                        if (basename.right(1) == ".")
+                        if (basename.endsWith("."))
                             basename = RomName.left(pos - 1);
                     }
                     else

mythplugins/mythmusic/mythmusic/cddecoder.cpp

@@ -767 +767 @@
         }
     }
 
-    if (compilation_artist.toLower().left(7) == "various")
+    if (compilation_artist.startsWith("various", Qt::CaseInsensitive))
         compilation_artist = QObject::tr("Various Artists");
 
     if (artist.isEmpty())

mythplugins/mythmusic/mythmusic/musicplayer.cpp

@@ -576 +576 @@
         if (!me)
             return;
 
-        if (me->Message().left(14) == "PLAYBACK_START")
+        if (me->Message().startsWith("PLAYBACK_START"))
         {
             m_wasPlaying = m_isPlaying;
             QString hostname = me->Message().mid(15);
@@ -588 +588 @@
                 stop(true);
             }
         }
-        else if (me->Message().left(12) == "PLAYBACK_END")
+        else if (me->Message().startsWith("PLAYBACK_END"))
         {
             if (m_wasPlaying)
             {
@@ -605 +605 @@
                 m_wasPlaying = false;
             }
         }
-        else if (me->Message().left(13) == "MUSIC_COMMAND")
+        else if (me->Message().startsWith("MUSIC_COMMAND"))
         {
             QStringList list = me->Message().simplified().split(' ');
 

mythplugins/mythmusic/mythmusic/shoutcast.cpp

@@ -186 +186 @@
     QString getGenre(void) { return getString("icy-genre"); }
     QString getName(void) { return getString("icy-name"); }
     int getStatus(void) { return getInt("status"); }
-    bool isICY(void) { return QString(m_data["protocol"]).left(3) == "ICY"; }
+    bool isICY(void) { return QString(m_data["protocol"]).startsWith("ICY"); }
     QString getContent(void) { return getString("content-type"); }
     QString getLocation(void) { return getString("location"); }
 
@@ -215 +215 @@
             break;
 
         // Extract the line
-        QByteArray snip(d.data(), pos + 1);
+        QString snip(QByteArray(d.data(), pos + 1));
         d.remove(0, pos + 2);
         result += pos + 2;
 
-        if (snip.left(4) == "ICY ")
+        if (snip.startsWith("ICY "))
         {
             int space = snip.indexOf(' ');
             m_data["protocol"] = "ICY";
@@ -230 +230 @@
             else
                 m_data["status"] = tmp;
         }
-        else if (snip.left(7) == "HTTP/1.")
+        else if (snip.startsWith("HTTP/1."))
         {
             int space = snip.indexOf(' ');
             m_data["protocol"] = snip.left(space);
@@ -241 +241 @@
             else
                 m_data["status"] = tmp;
         } 
-        else if (snip.left(9).toLower() == "location:")
+        else if (snip.startsWith("location:", Qt::CaseInsensitive))
         {
             m_data["location"] = snip.mid(9).trimmed();
         } 
-        else if (snip.left(13).toLower() == "content-type:")
+        else if (snip.startsWith("content-type:", Qt::CaseInsensitive))
         {
             m_data["content-type"] = snip.mid(13).trimmed();
         }
-        else if (snip.left(4) == "icy-")
+        else if (snip.startsWith("icy-"))
         {
             int pos = snip.indexOf(':');
             QString key = snip.left(pos);

mythplugins/mythmusic/mythmusic/smartplaylist.cpp

@@ -254 +254 @@
         Field = lookupField(fieldName.left(fieldName.length() - 4));
         if (Field)
         {
-            if (fieldName.right(3) == "(D)")
+            if (fieldName.endsWith("(D)"))
                 order = " DESC";
             else
                 order = " ASC";
@@ -2030 +2030 @@
         m_deleteButton->SetEnabled(true);
         m_moveUpButton->SetEnabled((m_fieldList->GetCurrentPos() != 0));
         m_moveDownButton->SetEnabled((m_fieldList->GetCurrentPos() != m_fieldList->GetCount() - 1) );
-        m_ascendingButton->SetEnabled((m_fieldList->GetValue().right(3) == "(D)") );
-        m_descendingButton->SetEnabled((m_fieldList->GetValue().right(3) == "(A)"));
+        m_ascendingButton->SetEnabled((m_fieldList->GetValue().endsWith("(D)")) );
+        m_descendingButton->SetEnabled((m_fieldList->GetValue().endsWith("(A)")));
     }
     else
     {

mythplugins/mythzoneminder/mythzoneminder/zmconsole.cpp

@@ -206 +206 @@
     {
         zm->getServerStatus(m_daemonStatus, m_cpuStat, m_diskStat);
 
-        if (m_daemonStatus.left(7) == "running")
+        if (m_daemonStatus.startsWith("running"))
         {
             m_status_text->SetFontState("running");
             m_status_text->SetText(tr("Running"));

mythtv/libs/libmyth/programinfo.cpp

@@ -866 +866 @@
 
     QString pn = _pathname;
     if ((!_pathname.startsWith("myth://")) &&
-        (_pathname.right(4).toLower() == ".iso" ||
-         _pathname.right(4).toLower() == ".img" ||
+        (_pathname.endsWith(".iso", Qt::CaseInsensitive) ||
+         _pathname.endsWith(".img", Qt::CaseInsensitive) ||
          QDir(_pathname + "/VIDEO_TS").exists()))
     {
         pn = QString("dvd:%1").arg(_pathname);
@@ -1676 +1676 @@
         progMap["yearstars"] = "";
 
     if (!originalAirDate.isValid() ||
-        (!programid.isEmpty() && (programid.left(2) == "MV")))
+        (!programid.isEmpty() && programid.startsWith("MV")))
     {
         progMap["originalairdate"] = "";
         progMap["shortoriginalairdate"] = "";
@@ -2176 +2176 @@
         if (fn_lower.startsWith("dvd:") ||
             fn_lower.endsWith(".iso") ||
             fn_lower.endsWith(".img") ||
-            ((pathname.left(1) == "/") &&
+            ((pathname.startsWith("/")) &&
              QDir(pathname + "/VIDEO_TS").exists()))
         {
             pit = kProgramInfoTypeVideoDVD;
         }
         else if (fn_lower.startsWith("bd:") ||
-                 ((pathname.left(1) == "/") &&
+                 ((pathname.startsWith("/")) &&
                   QDir(pathname + "/BDMV").exists()))
         {
             pit = kProgramInfoTypeVideoBD;
@@ -4107 +4107 @@
             return "";
 
         QString path = GetPlaybackURL(false, true);
-        if (path.left(1) == "/")
+        if (path.startsWith("/"))
         {
             QFileInfo testFile(path);
             return testFile.path();
@@ -4508 +4508 @@
 void ProgramInfo::SubstituteMatches(QString &str)
 {
     QString pburl = GetPlaybackURL(false, true);
-    if (pburl.left(7) == "myth://")
+    if (pburl.startsWith("myth://"))
     {
         str.replace(QString("%DIR%"), pburl);
     }

mythtv/libs/libmyth/programinfo.h

@@ -320 +320 @@
         { return GetProgramInfoType() == kProgramInfoTypeVideoDVD; }
     bool IsVideoBD(void) const
         { return GetProgramInfoType() == kProgramInfoTypeVideoBD; }
-    bool IsLocal(void) const { return pathname.left(1) == "/"
+    bool IsLocal(void) const { return pathname.startsWith("/")
 #ifdef _WIN32
         || pathname.at(1) == ':'
 #endif
             ; }
-    bool IsMythStream(void) const { return pathname.left(7) == "myth://"; }
+    bool IsMythStream(void) const { return pathname.startsWith("myth://"); }
     bool IsPathSet(void) const { return GetBasename() != pathname; }
     bool HasPathname(void) const { return !GetPathname().isEmpty(); }
     bool IsFileReadable(void) const;

mythtv/libs/libmyth/schemawizard.cpp

@@ -425 +425 @@
     if (m_expertMode)
     {
         resp = getResponse("Would you like to use the existing schema?", "yes");
-        if (resp.isEmpty() || resp.left(1).toLower() == "y")
+        if (resp.isEmpty() || resp.startsWith("y", Qt::CaseInsensitive))
             return MYTH_SCHEMA_USE_EXISTING;
     }
 
     resp = getResponse("\nShall I upgrade this database?", "yes");
-    if (!resp.isEmpty() && resp.left(1).toLower() != "y")
+    if (!resp.isEmpty() && !resp.startsWith("y", Qt::CaseInsensitive))
         return MYTH_SCHEMA_EXIT;
 
     if (connections)
@@ -441 +441 @@
     {
         resp = getResponse("\nA database backup might be a good idea"
                            "\nAre you sure you want to upgrade?", "no");
-        if (resp.isEmpty() || resp.left(1).toLower() == "n")
+        if (resp.isEmpty() || resp.startsWith("n", Qt::CaseInsensitive))
             return MYTH_SCHEMA_EXIT;
     }
 

mythtv/libs/libmyth/settings.h

@@ -441 +441 @@
     virtual void setValue(const QString &newValue)
     {
         setValue((newValue=="1" ||
-                  newValue.toLower().left(1)=="y" ||
-                  newValue.toLower().left(1)=="t"));
+                  newValue.toLower().startsWith("y") ||
+                  newValue.toLower().startsWith("t")));
     }
 
   signals:

mythtv/libs/libmyth/storagegroupeditor.cpp

@@ -96 +96 @@
         if (name.isEmpty())
             return;
 
-        if (name.right(1) != "/")
+        if (!name.endsWith("/"))
             name.append("/");
 
         MSqlQuery query(MSqlQuery::InitCon());
@@ -118 +118 @@
         if (result == SGPopup_CANCEL)
             return;
 
-        if (name.right(1) != "/")
+        if (!name.endsWith("/"))
             name.append("/");
 
         MSqlQuery query(MSqlQuery::InitCon());
@@ -257 +257 @@
 {
     lastValue = name;
 
-    if (name.left(28) == "__CREATE_NEW_STORAGE_GROUP__")
+    if (name.startsWith("__CREATE_NEW_STORAGE_GROUP__"))
     {
         if (name.length() > 28)
         {
@@ -286 +286 @@
 void StorageGroupListEditor::doDelete(void) 
 {
     QString name = listbox->getValue();
-    if (name.left(28) == "__CREATE_NEW_STORAGE_GROUP__")
+    if (name.startsWith("__CREATE_NEW_STORAGE_GROUP__"))
         return;
 
     bool is_master_host = gCoreContext->IsMasterHost();

mythtv/libs/libmythbase/logging.cpp

@@ -1120 +1120 @@
         option = (*it).toLower();
         bool reverseOption = false;
 
-        if (option != "none" && option.left(2) == "no")
+        if (option != "none" && option.startsWith("no"))
         {
             reverseOption = true;
             option = option.right(option.length() - 2);

mythtv/libs/libmythbase/mythmiscutil.cpp

@@ -959 +959 @@
         QString left   = string.left(width);
         bool inserted  = false;
 
-        while( !inserted && left.right(1) != " " )
+        while( !inserted && !left.endsWith(" " ))
         {
             if( string.mid(left.size(), 1) == " " )
             {

mythtv/libs/libmythbase/plist.cpp

@@ -233 +233 @@
         .arg(size).arg(data.left(8).data()));
 
     // check plist type & version
-    if ((data.left(6) != MAGIC) ||
+    if ((!data.startsWith(MAGIC)) ||
         (data.mid(MAGIC_SIZE, VERSION_SIZE) != VERSION))
     {
         LOG(VB_GENERAL, LOG_ERR, LOC + "Unrecognised start sequence. Corrupt?");

mythtv/libs/libmythbase/remotefile.cpp

@@ -268 +268 @@
     QString filename = qurl.path();
     QString sgroup   = qurl.userName();
 
-    if (!qurl.fragment().isEmpty() || url.right(1) == "#")
+    if (!qurl.fragment().isEmpty() || url.endsWith("#"))
         filename = filename + "#" + qurl.fragment();
 
-    if (filename.left(1) == "/")
+    if (filename.startsWith("/"))
         filename = filename.right(filename.length()-1);
 
     if (filename.isEmpty() || sgroup.isEmpty())
@@ -301 +301 @@
     QString filename = qurl.path();
     QString sgroup   = qurl.userName();
 
-    if (!qurl.fragment().isEmpty() || url.right(1) == "#")
+    if (!qurl.fragment().isEmpty() || url.endsWith("#"))
         filename = filename + "#" + qurl.fragment();
 
-    if (filename.left(1) == "/")
+    if (filename.startsWith("/"))
         filename = filename.right(filename.length()-1);
 
     if (filename.isEmpty())
@@ -356 +356 @@
     QString hostname = qurl.host();
     QString sgroup   = qurl.userName();
 
-    if (!qurl.fragment().isEmpty() || url.right(1) == "#")
+    if (!qurl.fragment().isEmpty() || url.endsWith("#"))
         filename = filename + "#" + qurl.fragment();
 
-    if (filename.left(1) == "/")
+    if (filename.startsWith("/"))
         filename = filename.right(filename.length()-1);
 
     if (filename.isEmpty() || sgroup.isEmpty())
@@ -651 +651 @@
     QString filename = qurl.path();
     QString sgroup   = qurl.userName();
 
-    if (!qurl.fragment().isEmpty() || url.right(1) == "#")
+    if (!qurl.fragment().isEmpty() || url.endsWith("#"))
         filename = filename + "#" + qurl.fragment();
 
-    if (filename.left(1) == "/")
+    if (filename.startsWith("/"))
         filename = filename.right(filename.length()-1);
 
     if (filename.isEmpty() || sgroup.isEmpty())

mythtv/libs/libmythbase/storagegroup.cpp

@@ -549 +549 @@
                                         .toByteArray().constData());
             dirname.replace(QRegExp("^\\s*"), "");
             dirname.replace(QRegExp("\\s*$"), "");
-            if (dirname.right(1) == "/")
+            if (dirname.endsWith("/"))
                 dirname.remove(dirname.length() - 1, 1);
 
             if (dirlist)

mythtv/libs/libmythprotoserver/requesthandler/fileserverhandler.cpp

@@ -90 +90 @@
         lpath = lpath.section('/', -1);
 
         QString fpath = lpath;
-        if (fpath.right(4) == ".png")
+        if (fpath.endsWith(".png"))
             fpath = fpath.left(fpath.length() - 4);
 
         ProgramInfo pginfo(fpath);
         if (pginfo.GetChanID())
         {
             QString pburl = GetPlaybackURL(&pginfo);
-            if (pburl.left(1) == "/")
+            if (pburl.startsWith("/"))
             {
                 lpath = pburl.section('/', 0, -2) + "/" + lpath;
                 LOG(VB_FILE, LOG_INFO,
@@ -517 +517 @@
                                            .toByteArray().constData());
             disk.setPath(currentDir);
 
-            if (currentDir.right(1) == "/")
+            if (currentDir.endsWith("/"))
                 currentDir.remove(currentDir.length() - 1, 1);
 
             checkDir.setPath(currentDir);

mythtv/libs/libmythprotoserver/requesthandler/fileserverutil.cpp

@@ -58 +58 @@
     else
     {
         result = pginfo->GetPlaybackURL(false, true);
-        if (storePath && result.left(1) == "/")
+        if (storePath && result.startsWith("/"))
             recordingPathCache[cacheKey] = result;
     }
 

mythtv/libs/libmythtv/DVD/dvdringbuffer.cpp

@@ -38 +38 @@
 {
     LOG(VB_PLAYBACK, LOG_INFO, QString("DVDInfo: Trying %1").arg(filename));
     QString name = filename;
-    if (name.left(6) == "dvd://")
+    if (name.startsWith("dvd://"))
         name.remove(0,5);
-    else if (name.left(5) == "dvd:/")
+    else if (name.startsWith("dvd:/"))
         name.remove(0,4);
-    else if (name.left(4) == "dvd:")
+    else if (name.startsWith("dvd:"))
         name.remove(0,4);
 
     QByteArray fname = name.toLocal8Bit();

mythtv/libs/libmythtv/cc608decoder.cpp

@@ -376 +376 @@
                                 len = NewRowCC(mode, len);
 
                             if (len == 0 ||
-                                ccbuf[mode].left(1) == "\b")
+                                ccbuf[mode].startsWith("\b"))
                             {
                                 ccbuf[mode] += (char)'\b';
                                 len++;
@@ -1122 +1122 @@
 
     if (key == "ratings")
         return QString::number(GetRatingSystems(false));
-    else if (key.left(11) == "has_rating_")
+    else if (key.startsWith("has_rating_"))
         return ((1<<key.right(1).toUInt()) & GetRatingSystems(false))?"1":"0";
-    else if (key.left(7) == "rating_")
+    else if (key.startsWith("rating_"))
         return GetRatingString(key.right(1).toUInt(), false);
 
     else if (key == "future_ratings")
         return QString::number(GetRatingSystems(true));
-    else if (key.left(11) == "has_future_rating_")
+    else if (key.startsWith("has_future_rating_"))
         return ((1<<key.right(1).toUInt()) & GetRatingSystems(true))?"1":"0";
-    else if (key.left(14) == "future_rating_")
+    else if (key.startsWith("future_rating_"))
         return GetRatingString(key.right(1).toUInt(), true);
 
     else if (key == "programname")

mythtv/libs/libmythtv/channelscan/channelscanner.cpp

@@ -140 +140 @@
 
         // HACK HACK HACK -- begin
         // if using QAM we may need additional time... (at least with HD-3000)
-        if ((mod.left(3).toLower() == "qam") &&
+        if ((mod.startsWith("qam", Qt::CaseInsensitive)) &&
             (sigmonScanner->GetSignalTimeout() < 1000))
         {
             sigmonScanner->SetSignalTimeout(1000);

mythtv/libs/libmythtv/channelscan/iptvchannelfetcher.cpp

@@ -210 +210 @@
 QString IPTVChannelFetcher::DownloadPlaylist(const QString &url,
                                              bool inQtThread)
 {
-    if (url.left(4).toLower() == "file")
+    if (url.startsWith("file", Qt::CaseInsensitive))
     {
         QString ret = "";
         QUrl qurl(url);

mythtv/libs/libmythtv/decoderbase.cpp

@@ -1145 +1145 @@
 {
     int ret = -1;
 
-    if (str.left(5) == "AUDIO")
+    if (str.startsWith("AUDIO"))
         ret = kTrackTypeAudio;
-    else if (str.left(5) == "VIDEO")
+    else if (str.startsWith("VIDEO"))
         ret = kTrackTypeVideo;
-    else if (str.left(8) == "SUBTITLE")
+    else if (str.startsWith("SUBTITLE"))
         ret = kTrackTypeSubtitle;
-    else if (str.left(5) == "CC608")
+    else if (str.startsWith("CC608"))
         ret = kTrackTypeCC608;
-    else if (str.left(5) == "CC708")
+    else if (str.startsWith("CC708"))
         ret = kTrackTypeCC708;
-    else if (str.left(3) == "TTC")
+    else if (str.startsWith("TTC"))
         ret = kTrackTypeTeletextCaptions;
-    else if (str.left(3) == "TTM")
+    else if (str.startsWith("TTM"))
         ret = kTrackTypeTeletextMenu;
-    else if (str.left(3) == "TFL")
+    else if (str.startsWith("TFL"))
         ret = kTrackTypeTextSubtitle;
-    else if (str.left(7) == "RAWTEXT")
+    else if (str.startsWith("RAWTEXT"))
         ret = kTrackTypeRawText;
     return ret;
 }

mythtv/libs/libmythtv/fileringbuffer.cpp

@@ -200 +200 @@
     }
 
     bool is_local = 
-        (filename.left(4) != "/dev") &&
-        ((filename.left(1) == "/") || QFile::exists(filename));
+        (!filename.startsWith("/dev")) &&
+        ((filename.startsWith("/")) || QFile::exists(filename));
 
     if (is_local)
     {

mythtv/libs/libmythtv/jobqueue.cpp

@@ -91 +91 @@
         MythEvent *me = (MythEvent *)e;
         QString message = me->Message();
 
-        if (message.left(9) == "LOCAL_JOB")
+        if (message.startsWith("LOCAL_JOB"))
         {
             // LOCAL_JOB action ID jobID
             // LOCAL_JOB action type chanid recstartts hostname

mythtv/libs/libmythtv/mythplayer.cpp

@@ -1046 +1046 @@
         }
         else
         {
-            if ((filters.length() > 1) && (filters.right(1) != ","))
+            if ((filters.length() > 1) && (!filters.endsWith(",")))
                 filters += ",";
             filters += videoFiltersForProgram.mid(1);
         }

mythtv/libs/libmythtv/playercontext.cpp

@@ -747 +747 @@
         }
         else
         {
-            if (!filters.isEmpty() && (filters.right(1) != ","))
+            if (!filters.isEmpty() && (!filters.endsWith(",")))
                 filters += ",";
 
             filters += chanFilters.mid(1);

mythtv/libs/libmythtv/previewgenerator.cpp

@@ -722 +722 @@
 {
     QString tmppathname = pathname;
 
-    if (tmppathname.left(4) == "dvd:")
+    if (tmppathname.startsWith("dvd:"))
         tmppathname = tmppathname.section(":", 1, 1);
 
     if (!QFileInfo(tmppathname).isReadable())
@@ -779 +779 @@
     }
 
     // pre-test local files for existence and size. 500 ms speed-up...
-    if (filename.left(1)=="/")
+    if (filename.startsWith("/"))
     {
         QFileInfo info(filename);
         bool invalid = (!info.exists() || !info.isReadable() ||

mythtv/libs/libmythtv/previewgeneratorqueue.cpp

@@ -273 +273 @@
     if (!is_special)
     {
         QDateTime previewLastModified;
-        bool streaming = filename.left(1) != "/";
+        bool streaming = !filename.startsWith("/");
         bool locally_accessible = false;
         bool bookmark_updated = false;
 

mythtv/libs/libmythtv/recorders/channelbase.cpp

@@ -1173 +1173 @@
     else if ((genOpt.cardtype == "IMPORT") ||
              (genOpt.cardtype == "DEMO") ||
              (genOpt.cardtype == "MPEG" &&
-              genOpt.videodev.toLower().left(5) == "file:"))
+              genOpt.videodev.toLower().startsWith("file:")))
     {
         channel = new DummyChannel(tvrec);
     }

mythtv/libs/libmythtv/recorders/firewiredevice.cpp

@@ -230 +230 @@
 
     // the PACE is obviously not a Motorola channel changer, but the
     // same commands work for it as the Motorola.
-    bool is_mot = ((panel_model.toUpper().left(4) == "DCT-") ||
-                   (panel_model.toUpper().left(4) == "DCH-") ||
-                   (panel_model.toUpper().left(4) == "DCX-") ||
-                   (panel_model.toUpper().left(4) == "QIP-") ||
-                   (panel_model.toUpper().left(4) == "MOTO") ||
-                   (panel_model.toUpper().left(5) == "PACE-"));
+    bool is_mot = ((panel_model.toUpper().startsWith("DCT-")) ||
+                   (panel_model.toUpper().startsWith("DCH-")) ||
+                   (panel_model.toUpper().startsWith("DCX-")) ||
+                   (panel_model.toUpper().startsWith("QIP-")) ||
+                   (panel_model.toUpper().startsWith("MOTO")) ||
+                   (panel_model.toUpper().startsWith("PACE-")));
 
     if (is_mot && !alt_method)
     {

mythtv/libs/libmythtv/recorders/mpegrecorder.cpp

@@ -185 +185 @@
     }
     else if (opt == "mpeg2audvolume")
         audvolume = value;
-    else if (opt.right(16) == "_mpeg4avgbitrate")
+    else if (opt.endsWith("_mpeg4avgbitrate"))
     {
-        if (opt.left(3) == "low")
+        if (opt.startsWith("low"))
             low_mpeg4avgbitrate = value;
-        else if (opt.left(6) == "medium")
+        else if (opt.startsWith("medium"))
             medium_mpeg4avgbitrate = value;
-        else if (opt.left(4) == "high")
+        else if (opt.startsWith("high"))
             high_mpeg4avgbitrate = value;
         else
             V4LRecorder::SetOption(opt, value);
     }
-    else if (opt.right(17) == "_mpeg4peakbitrate")
+    else if (opt.endsWith("_mpeg4peakbitrate"))
     {
-        if (opt.left(3) == "low")
+        if (opt.startsWith("low"))
             low_mpeg4peakbitrate = value;
-        else if (opt.left(6) == "medium")
+        else if (opt.startsWith("medium"))
             medium_mpeg4peakbitrate = value;
-        else if (opt.left(4) == "high")
+        else if (opt.startsWith("high"))
             high_mpeg4peakbitrate = value;
         else
             V4LRecorder::SetOption(opt, value);
@@ -296 +296 @@
     (void)audiodev;
     (void)vbidev;
 
-    if (videodev.toLower().left(5) == "file:")
+    if (videodev.toLower().startsWith("file:"))
     {
         deviceIsMpegFile = true;
         bufferSize = 64000;
@@ -755 +755 @@
     // Set controls
     if (driver != "hdpvr")
     {
-        if (driver.left(7) != "saa7164")
+        if (!driver.startsWith("saa7164"))
         {
             add_ext_ctrl(ext_ctrls, V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ,
                          GetFilteredAudioSampleRate());
@@ -783 +783 @@
     }
     maxbitrate = std::max(maxbitrate, bitrate);
 
-    if (driver == "hdpvr" || driver.left(7) == "saa7164")
+    if (driver == "hdpvr" || driver.startsWith("saa7164"))
     {
         add_ext_ctrl(ext_ctrls, V4L2_CID_MPEG_VIDEO_BITRATE_MODE,
                      (maxbitrate == bitrate) ?

mythtv/libs/libmythtv/recorders/v4lchannel.cpp

@@ -158 +158 @@
     else if (fmt == "NTSC-JP")
         return V4L2_STD_NTSC_M_JP;
         // generics...
-    else if (fmt.left(4) == "NTSC")
+    else if (fmt.startsWith("NTSC"))
         return V4L2_STD_NTSC;
-    else if (fmt.left(4) == "ATSC")
+    else if (fmt.startsWith("ATSC"))
         return V4L2_STD_NTSC; // We've dropped V4L ATSC support...
-    else if (fmt.left(3) == "PAL")
+    else if (fmt.startsWith("PAL"))
         return V4L2_STD_PAL;
     return V4L2_STD_NTSC;
 }

mythtv/libs/libmythtv/recordingprofile.cpp

@@ -1114 +1114 @@
         setLabel(labelName);
 
         QSize defaultsize(768, 576), maxsize(768, 576);
-        bool transcoding = profName.left(11) == "Transcoders";
-        bool ivtv = profName.left(20) == "IVTV MPEG-2 Encoders";
+        bool transcoding = profName.startsWith("Transcoders");
+        bool ivtv = profName.startsWith("IVTV MPEG-2 Encoders");
 
         if (transcoding)
         {
@@ -1125 +1125 @@
             else
                 defaultsize = QSize(480, 576);
         }
-        else if (tvFormat.toLower().left(4) == "ntsc")
+        else if (tvFormat.toLower().startsWith("ntsc"))
         {
             maxsize     = QSize(720, 480);
             defaultsize = (ivtv) ? QSize(720, 480) : QSize(480, 480);
@@ -1211 +1211 @@
 
     if (!profName.isEmpty())
     {
-        if (profName.left(11) == "Transcoders")
+        if (profName.startsWith("Transcoders"))
         {
             tr_filters = new TranscodeFilters(*this);
             tr_lossless = new TranscodeLossless(*this);
@@ -1401 +1401 @@
         audioSettings = new AudioCompressionSettings(*this, profileName);
         addChild(audioSettings);
 
-        if (!profileName.isEmpty() && profileName.left(11) == "Transcoders")
+        if (!profileName.isEmpty() && profileName.startsWith("Transcoders"))
         {
             connect(tr_resize,   SIGNAL(valueChanged   (bool)),
                     this,        SLOT(  ResizeTranscode(bool)));

mythtv/libs/libmythtv/ringbuffer.cpp

@@ -150 +150 @@
 
     if (!stream_only && (dvdurl || dvddir || dvdext))
     {
-        if (lfilename.left(4) == "dvd:")        // URI "dvd:" + path
+        if (lfilename.startsWith("dvd:"))        // URI "dvd:" + path
             lfilename.remove(0,4);              // e.g. "dvd:/dev/dvd"
 
         if (!(mythurl || QFile::exists(lfilename)))
@@ -161 +161 @@
     }
     else if (!stream_only && (bdurl || bddir))
     {
-        if (lfilename.left(3) == "bd:")        // URI "bd:" + path
+        if (lfilename.startsWith("bd:"))        // URI "bd:" + path
             lfilename.remove(0,3);             // e.g. "bd:/videos/ET"
 
         if (!(mythurl || QFile::exists(lfilename)))

mythtv/libs/libmythtv/sourceutil.cpp

@@ -80 +80 @@
         {
             const QString channum = query.value(0).toString();
             const int where = channum.indexOf(sepExpr);
-            if (channum.right(2).left(1) == "0")
+            if (channum.right(2).startsWith("0"))
                 counts["0"]++;
             else
                 counts[(where < 0) ? "" : QString(channum.at(where))]++;
@@ -190 +190 @@
 /// BEGIN HACK HACK HACK -- return correct card type for child cards
             QString cardtype = query.value(0).toString().toUpper();
             QString inputname = query.value(1).toString().toUpper();
-            cardtype = ((cardtype == "DVB") && (inputname.left(3) != "DVB")) ?
+            cardtype = ((cardtype == "DVB") && (!inputname.startsWith("DVB"))) ?
                 "V4L" : cardtype;
 /// END  HACK HACK HACK
             list += cardtype;

mythtv/libs/libmythtv/transporteditor.cpp

@@ -66 +66 @@
 
 static QString pp_modulation(QString mod)
 {
-    if (mod.right(3) == "vsb")
+    if (mod.endsWith("vsb"))
         return mod.left(mod.length() - 3) + "-VSB";
 
-    if (mod.left(4) == "qam_")
+    if (mod.startsWith("qam_"))
         return "QAM-" + mod.mid(4, mod.length());
 
     if (mod == "analog")

mythtv/libs/libmythtv/tv_play.cpp

@@ -3649 +3649 @@
             ctx->player->ToggleCaptions();
         }
     }
-    else if (action.left(6) == "TOGGLE")
+    else if (action.startsWith("TOGGLE"))
     {
         int type = to_track_type(action.mid(6));
         if (type == kTrackTypeTeletextMenu)
@@ -3659 +3659 @@
         else
             handled = false;
     }
-    else if (action.left(6) == "SELECT")
+    else if (action.startsWith("SELECT"))
     {
         int type = to_track_type(action.mid(6));
         int num = action.section("_", -1).toInt();
@@ -3668 +3668 @@
         else
             handled = false;
     }
-    else if (action.left(4) == "NEXT" || action.left(4) == "PREV")
+    else if (action.startsWith("NEXT") || action.startsWith("PREV"))
     {
-        int dir = (action.left(4) == "NEXT") ? +1 : -1;
+        int dir = (action.startsWith("NEXT")) ? +1 : -1;
         int type = to_track_type(action.mid(4));
         if (type >= kTrackTypeAudio)
             ctx->player->ChangeTrack(type, dir);
-        else if (action.right(2) == "CC")
+        else if (action.endsWith("CC"))
             ctx->player->ChangeCaptionTrack(dir);
         else
             handled = false;
@@ -9297 +9297 @@
     {
         GetStatus();
     }
-    else if (message.left(14) == "DONE_RECORDING")
+    else if (message.startsWith("DONE_RECORDING"))
     {
         int seconds = 0;
         //long long frames = 0;
@@ -9358 +9358 @@
         ReturnPlayerLock(mctx);
     }
 
-    if (message.left(14) == "ASK_RECORDING ")
+    if (message.startsWith("ASK_RECORDING "))
     {
         int timeuntil = 0, hasrec = 0, haslater = 0;
         if (tokens.size() >= 5)
@@ -9395 +9395 @@
         ReturnPlayerLock(mctx);
     }
 
-    if (message.left(11) == "QUIT_LIVETV")
+    if (message.startsWith("QUIT_LIVETV"))
     {
         cardnum = (tokens.size() >= 2) ? tokens[1].toUInt() : 0;
 
@@ -9434 +9434 @@
         ReturnPlayerLock(mctx);
     }
 
-    if (message.left(12) == "LIVETV_WATCH")
+    if (message.startsWith("LIVETV_WATCH"))
     {
         int watch = 0;
         if (tokens.size() >= 3)
@@ -9475 +9475 @@
         ReturnPlayerLock(mctx);
     }
 
-    if (message.left(12) == "LIVETV_CHAIN")
+    if (message.startsWith("LIVETV_CHAIN"))
     {
         QString id = QString::null;
         if ((tokens.size() >= 2) && tokens[1] == "UPDATE")
@@ -9495 +9495 @@
         ReturnPlayerLock(mctx);
     }
 
-    if (message.left(12) == "EXIT_TO_MENU")
+    if (message.startsWith("EXIT_TO_MENU"))
     {
         PlayerContext *mctx = GetPlayerReadLock(0, __FILE__, __LINE__);
         for (uint i = 0; mctx && (i < player.size()); i++)
@@ -9510 +9510 @@
         ReturnPlayerLock(mctx);
     }
 
-    if (message.left(6) == "SIGNAL")
+    if (message.startsWith("SIGNAL"))
     {
         cardnum = (tokens.size() >= 2) ? tokens[1].toUInt() : 0;
         QStringList signalList = me->ExtraDataList();
@@ -9534 +9534 @@
         ReturnPlayerLock(mctx);
     }
 
-    if (message.left(15) == "NETWORK_CONTROL")
+    if (message.startsWith("NETWORK_CONTROL"))
     {
         if ((tokens.size() >= 2) &&
             (tokens[1] != "ANSWER") && (tokens[1] != "RESPONSE"))
@@ -9552 +9552 @@
         }
     }
 
-    if (message.left(9) == "START_EPG")
+    if (message.startsWith("START_EPG"))
     {
         int editType = tokens[1].toInt();
         DoEditSchedule(editType);
     }
 
-    if (message.left(11) == "EPG_EXITING" ||
-        message.left(18) == "PROGFINDER_EXITING" ||
-        message.left(21) == "VIEWSCHEDULED_EXITING" ||
-        message.left(19)   == "PLAYBACKBOX_EXITING" ||
-        message.left(22) == "SCHEDULEEDITOR_EXITING")
+    if (message.startsWith("EPG_EXITING") ||
+        message.startsWith("PROGFINDER_EXITING") ||
+        message.startsWith("VIEWSCHEDULED_EXITING") ||
+        message.startsWith("PLAYBACKBOX_EXITING") ||
+        message.startsWith("SCHEDULEEDITOR_EXITING"))
     {
         // Resize the window back to the MythTV Player size
         PlayerContext *actx = GetPlayerReadLock(-1, __FILE__, __LINE__);
@@ -9604 +9604 @@
         isEmbedded = false;
         ignoreKeyPresses = false;
 
-        if (message.left(19) == "PLAYBACKBOX_EXITING")
+        if (message.startsWith("PLAYBACKBOX_EXITING"))
         {
             ProgramInfo pginfo(me->ExtraDataList());
             if (pginfo.HasPathname() || pginfo.GetChanID())
@@ -9615 +9615 @@
 
     }
 
-    if (message.left(14) == "COMMFLAG_START" && (tokens.size() >= 2))
+    if (message.startsWith("COMMFLAG_START") && (tokens.size() >= 2))
     {
         uint evchanid = 0;
         QDateTime evrecstartts;
@@ -9642 +9642 @@
         ReturnPlayerLock(mctx);
     }
 
-    if (message.left(15) == "COMMFLAG_UPDATE" && (tokens.size() >= 3))
+    if (message.startsWith("COMMFLAG_UPDATE") && (tokens.size() >= 3))
     {
         uint evchanid = 0;
         QDateTime evrecstartts;
@@ -10683 +10683 @@
         EnableUpmix(actx, true);
     else if (action == ACTION_DISABLEUPMIX)
         EnableUpmix(actx, false);
-    else if (action.left(13) == "ADJUSTSTRETCH")
+    else if (action.startsWith("ADJUSTSTRETCH"))
     {
         bool floatRead;
         float stretch = action.right(action.length() - 13).toFloat(&floatRead);
@@ -10701 +10701 @@
 
         ChangeTimeStretch(actx, 0, !floatRead);   // just display
     }
-    else if (action.left(11) == "SELECTSCAN_")
+    else if (action.startsWith("SELECTSCAN_"))
     {
         QString msg = QString::null;
         actx->LockDeletePlayer(__FILE__, __LINE__);
@@ -10712 +10712 @@
         if (!msg.isEmpty())
             SetOSDMessage(actx, msg);
     }
-    else if (action.left(15) == ACTION_TOGGELAUDIOSYNC)
+    else if (action.startsWith(ACTION_TOGGELAUDIOSYNC))
         ChangeAudioSync(actx, 0);
     else if (action == ACTION_TOGGLESUBTITLEZOOM)
         ChangeSubtitleZoom(actx, 0);
@@ -10724 +10724 @@
         EnableVisualisation(actx, true);
     else if (action == ACTION_DISABLEVISUALISATION)
         EnableVisualisation(actx, false);
-    else if (action.left(11) == ACTION_TOGGLESLEEP)
+    else if (action.startsWith(ACTION_TOGGLESLEEP))
     {
         ToggleSleepTimer(actx, action.left(13));
     }
-    else if (action.left(17) == "TOGGLEPICCONTROLS")
+    else if (action.startsWith("TOGGLEPICCONTROLS"))
     {
         adjustingPictureAttribute = (PictureAttribute)
             (action.right(1).toInt() - 1);
         DoTogglePictureAttribute(actx, kAdjustingPicture_Playback);
     }
-    else if (action.left(18) == ACTION_TOGGLESTUDIOLEVELS)
+    else if (action.startsWith(ACTION_TOGGLESTUDIOLEVELS))
     {
         DoToggleStudioLevels(actx);
     }
@@ -10742 +10742 @@
     {
         DoToggleNightMode(actx);
     }
-    else if (action.left(12) == "TOGGLEASPECT")
+    else if (action.startsWith("TOGGLEASPECT"))
     {
         ToggleAspectOverride(actx,
                              (AspectOverrideMode) action.right(1).toInt());
     }
-    else if (action.left(10) == "TOGGLEFILL")
+    else if (action.startsWith("TOGGLEFILL"))
     {
         ToggleAdjustFill(actx, (AdjustFillMode) action.right(1).toInt());
     }
@@ -10757 +10757 @@
     }
     else if (action == ACTION_GUIDE)
         EditSchedule(actx, kScheduleProgramGuide);
-    else if (action.left(10) == "CHANGROUP_" && db_use_channel_groups)
+    else if (action.startsWith("CHANGROUP_") && db_use_channel_groups)
     {
         if (action == "CHANGROUP_ALL_CHANNELS")
         {
@@ -10846 +10846 @@
             browsehelper->BrowseStart(actx);
         else if (action == "PREVCHAN")
             PopPreviousChannel(actx, true);
-        else if (action.left(14) == "SWITCHTOINPUT_")
+        else if (action.startsWith("SWITCHTOINPUT_"))
         {
             switchToInputId = action.mid(14).toUInt();
             QMutexLocker locker(&timerIdLock);
@@ -10884 +10884 @@
                 actx->player->GoToMenu(menu);
             actx->UnlockDeletePlayer(__FILE__, __LINE__);
         }
-        else if (action.left(13) == ACTION_JUMPCHAPTER)
+        else if (action.startsWith(ACTION_JUMPCHAPTER))
         {
             int chapter = action.right(3).toInt();
             DoJumpChapter(actx, chapter);
         }
-        else if (action.left(11) == ACTION_SWITCHTITLE)
+        else if (action.startsWith(ACTION_SWITCHTITLE))
         {
             int title = action.right(3).toInt();
             DoSwitchTitle(actx, title);
         }
-        else if (action.left(13) == ACTION_SWITCHANGLE)
+        else if (action.startsWith(ACTION_SWITCHANGLE))
         {
             int angle = action.right(3).toInt();
             DoSwitchAngle(actx, angle);
@@ -10906 +10906 @@
         }
         else if (action == "TOGGLEAUTOEXPIRE")
             ToggleAutoExpire(actx);
-        else if (action.left(14) == "TOGGLECOMMSKIP")
+        else if (action.startsWith("TOGGLECOMMSKIP"))
             SetAutoCommercialSkip(
                 actx, (CommSkipMode)(action.right(1).toInt()));
         else if (action == "QUEUETRANSCODE")
@@ -12282 +12282 @@
     QStringList::const_iterator it = actions.begin();
     for (; it != actions.end(); ++it)
     {
-        if ((*it).left(8) != "JUMPPROG")
+        if (!(*it).startsWith("JUMPPROG"))
             continue;
 
         const QString &action = *it;

mythtv/libs/libmythtv/videoout_xv.cpp

@@ -845 +845 @@
     }
 
     // Create video buffers
-    bool use_xv     = (renderer.left(2) == "xv");
+    bool use_xv     = (renderer.startsWith("xv"));
     bool use_shm    = (renderer == "xshm");
     bool ok = InitVideoBuffers(use_xv, use_shm);
 

mythtv/libs/libmythtv/videooutbase.cpp

@@ -1871 +1871 @@
     {
         hue_adj = 50;
     }
-    else if (adaptor_name.left(4) == "NV17") /* nVidia */
+    else if (adaptor_name.startsWith("NV17")) /* nVidia */
     {
         hue_adj = 0;
     }

mythtv/libs/libmythtv/videosource.cpp

@@ -1464 +1464 @@
     QString sel = man_addr;
     devs.push_back(sel);
 
-    if (3 == devs.size() && current.left(8).toUpper() == "FFFFFFFF")
+    if (3 == devs.size() && current.startsWith("FFFFFFFF", Qt::CaseInsensitive))
     {
-        current = sel = (current.right(1) == "0") ?
+        current = sel = (current.endsWith("0")) ?
             *(devs.begin()) : *(++devs.begin());
     }
     else
@@ -3538 +3538 @@
 {
     // Trim off some of the chaff.
     QString short_name = name;
-    if (short_name.left(14) == "LG Electronics")
+    if (short_name.startsWith("LG Electronics"))
         short_name = short_name.right(short_name.length() - 15);
-    if (short_name.left(4) == "Oren")
+    if (short_name.startsWith("Oren"))
         short_name = short_name.right(short_name.length() - 5);
-    if (short_name.left(8) == "Nextwave")
+    if (short_name.startsWith("Nextwave"))
         short_name = short_name.right(short_name.length() - 9);
-    if (short_name.right(8).toLower() == "frontend")
+    if (short_name.startsWith("frontend", Qt::CaseInsensitive))
         short_name = short_name.left(short_name.length() - 9);
-    if (short_name.right(7) == "VSB/QAM")
+    if (short_name.endsWith("VSB/QAM"))
         short_name = short_name.left(short_name.length() - 8);
-    if (short_name.right(3) == "VSB")
+    if (short_name.endsWith("VSB"))
         short_name = short_name.left(short_name.length() - 4);
-    if (short_name.right(5) == "DVB-T")
+    if (short_name.endsWith("DVB-T"))
         short_name = short_name.left(short_name.length() - 6);
 
     // It would be infinitely better if DVB allowed us to query
@@ -3558 +3558 @@
     // demodulator name. This means cards like the Air2PC HD5000
     // and DViCO Fusion HDTV cards are not identified correctly.
     short_name = short_name.simplified();
-    if (short_name.left(7).toLower() == "or51211")
+    if (short_name.startsWith("or51211", Qt::CaseInsensitive))
         short_name = "pcHDTV HD-2000";
-    else if (short_name.left(7).toLower() == "or51132")
+    else if (short_name.startsWith("or51132", Qt::CaseInsensitive))
         short_name = "pcHDTV HD-3000";
-    else if (short_name.left(7).toLower() == "bcm3510")
+    else if (short_name.startsWith("bcm3510", Qt::CaseInsensitive))
         short_name = "Air2PC v1";
-    else if (short_name.left(7).toLower() == "nxt2002")
+    else if (short_name.startsWith("nxt2002", Qt::CaseInsensitive))
         short_name = "Air2PC v2";
-    else if (short_name.left(7).toLower() == "nxt200x")
+    else if (short_name.startsWith("nxt200x", Qt::CaseInsensitive))
         short_name = "Air2PC v2";
-    else if (short_name.left(8).toLower() == "lgdt3302")
+    else if (short_name.startsWith("lgdt3302", Qt::CaseInsensitive))
         short_name = "DViCO HDTV3";
-    else if (short_name.left(8).toLower() == "lgdt3303")
+    else if (short_name.startsWith("lgdt3303", Qt::CaseInsensitive))
         short_name = "DViCO v2 or Air2PC v3 or pcHDTV HD-5500";
 
     return short_name;
@@ -3655 +3655 @@
 #if 0 // frontends on hybrid DVB-T/Analog cards
             QString short_name = remove_chaff(frontend_name);
             buttonAnalog->setVisible(
-                short_name.left(15).toLower() == "zarlink zl10353" ||
-                short_name.toLower() == "wintv hvr 900 m/r: 65008/a1c0" ||
-                short_name.left(17).toLower() == "philips tda10046h");
+                short_name.startsWith("zarlink zl10353",
+                                      Qt::CaseInsensitive) ||
+                short_name.startsWith("wintv hvr 900 m/r: 65008/a1c0",
+                                      Qt::CaseInsensitive) ||
+                short_name.startsWith("philips tda10046h",
+                                      Qt::CaseInsensitive));
 #endif
         }
         break;
@@ -3681 +3684 @@
             if (frontend_name.toLower().indexOf("usb") < 0)
             {
                 buttonAnalog->setVisible(
-                    short_name.left(6).toLower() == "pchdtv" ||
-                    short_name.left(5).toLower() == "dvico" ||
-                    short_name.left(8).toLower() == "nextwave");
+                    short_name.startsWith("pchdtv", Qt::CaseInsensitive) ||
+                    short_name.startsWith("dvico", Qt::CaseInsensitive) ||
+                    short_name.startsWith("nextwave", Qt::CaseInsensitive));
             }
 #endif
         }

mythtv/libs/libmythui/myththemedmenu.cpp

@@ -762 +762 @@
     if (!password.isEmpty() && !checkPinCode(password))
         return true;
 
-    if (action.left(5) == "EXEC ")
+    if (action.startsWith("EXEC "))
     {
         QString rest = action.right(action.length() - 5);
         if (cbs && cbs->exec_program)
@@ -770 +770 @@
 
         return false;
     }
-    else if (action.left(7) == "EXECTV ")
+    else if (action.startsWith("EXECTV "))
     {
         QString rest = action.right(action.length() - 7).trimmed();
         if (cbs && cbs->exec_program_tv)
             cbs->exec_program_tv(rest);
     }
-    else if (action.left(5) == "MENU ")
+    else if (action.startsWith("MENU "))
     {
         QString menu = action.right(action.length() - 5);
 
@@ -789 +789 @@
         else
             delete newmenu;
     }
-    else if (action.left(6) == "UPMENU")
+    else if (action.startsWith("UPMENU"))
     {
         m_wantpop = true;
     }
-    else if (action.left(12) == "CONFIGPLUGIN")
+    else if (action.startsWith("CONFIGPLUGIN"))
     {
         QString rest = action.right(action.length() - 13);
         if (cbs && cbs->configplugin)
             cbs->configplugin(rest);
     }
-    else if (action.left(6) == "PLUGIN")
+    else if (action.startsWith("PLUGIN"))
     {
         QString rest = action.right(action.length() - 7);
         if (cbs && cbs->plugin)
             cbs->plugin(rest);
     }
-    else if (action.left(8) == "SHUTDOWN")
+    else if (action.startsWith("SHUTDOWN"))
     {
         if (m_allocedstate)
         {
             m_wantpop = true;
         }
     }
-    else if (action.left(5) == "EJECT")
+    else if (action.startsWith("EJECT"))
     {
         if (cbs && cbs->eject)
             cbs->eject();
     }
-    else if (action.left(5) == "JUMP ")
+    else if (action.startsWith("JUMP "))
     {
         QString rest = action.right(action.length() - 5);
         GetMythMainWindow()->JumpTo(rest, false);
     }
-    else if (action.left(6) == "MEDIA ")
+    else if (action.startsWith("MEDIA "))
     {
         // the format is MEDIA HANDLER URL
         // TODO: allow spaces in the url

mythtv/libs/libmythui/mythuiwebbrowser.cpp

@@ -244 +244 @@
         MythEvent *me = (MythEvent *)e;
         QString message = me->Message();
 
-        if (message.left(13) != "MUSIC_CONTROL")
+        if (!message.startsWith("MUSIC_CONTROL"))
             return;
 
         QStringList tokens = message.simplified().split(" ");

mythtv/libs/libmythupnp/upnpdevice.cpp

@@ -856 +856 @@
     }
 
     // remove trailing newline
-    if (ret.right(1)=="\n")
+    if (ret.endsWith("\n"))
         ret = ret.left(ret.length()-1);
 
     // add any padding as necessary

mythtv/programs/mythbackend/autoexpire.cpp

@@ -571 +571 @@
                         // Wasn't found so check locally
                         QString file = GetPlaybackURL(p);
 
-                        if (file.left(1) == "/")
+                        if (file.startsWith("/"))
                         {
                             p->SetPathname(file);
                             p->SetHostname(myHostName);

mythtv/programs/mythbackend/backendutil.cpp

@@ -36 +36 @@
         locker.unlock();
         result = pginfo->GetPlaybackURL(false, true);
         locker.relock();
-        if (storePath && result.left(1) == "/")
+        if (storePath && result.startsWith("/"))
             recordingPathCache[cacheKey] = result;
     }
 

mythtv/programs/mythbackend/httpconfig.cpp

@@ -72 +72 @@
         }
 
         // FIXME, this is always false, what's it for
-        if (request->m_sBaseUrl.right(7) == "config" &&
+        // JMS "fixed" by using endsWith()
+        if (request->m_sBaseUrl.endsWith("config") &&
             !database_settings.empty())
         {
             QString checkResult;

mythtv/programs/mythbackend/mainserver.cpp

@@ -717 +717 @@
     }
     else if (command == "MESSAGE")
     {
-        if ((listline.size() >= 2) && (listline[1].left(11) == "SET_VERBOSE"))
+        if ((listline.size() >= 2) && (listline[1].startsWith("SET_VERBOSE")))
             HandleSetVerbose(listline, pbs);
         else if ((listline.size() >= 2) &&
-                 (listline[1].left(13) == "SET_LOG_LEVEL"))
+                 (listline[1].startsWith("SET_LOG_LEVEL")))
             HandleSetLogLevel(listline, pbs);
         else
             HandleMessage(listline, pbs);
@@ -1001 +1001 @@
             broadcast += extra;
         }
 
-        if (me->Message().left(11) == "AUTO_EXPIRE")
+        if (me->Message().startsWith("AUTO_EXPIRE"))
         {
             QStringList tokens = me->Message()
                 .split(" ", QString::SkipEmptyParts);
@@ -1041 +1041 @@
             return;
         }
 
-        if (me->Message().left(21) == "QUERY_NEXT_LIVETV_DIR" && m_sched)
+        if (me->Message().startsWith("QUERY_NEXT_LIVETV_DIR") && m_sched)
         {
             QStringList tokens = me->Message()
                 .split(" ", QString::SkipEmptyParts);
@@ -1057 +1057 @@
             return;
         }
 
-        if ((me->Message().left(16) == "DELETE_RECORDING") ||
-            (me->Message().left(22) == "FORCE_DELETE_RECORDING"))
+        if ((me->Message().startsWith("DELETE_RECORDING")) ||
+            (me->Message().startsWith("FORCE_DELETE_RECORDING")))
         {
             QStringList tokens = me->Message()
                 .split(" ", QString::SkipEmptyParts);
@@ -1090 +1090 @@
             return;
         }
 
-        if (me->Message().left(21) == "RESCHEDULE_RECORDINGS" && m_sched)
+        if (me->Message().startsWith("RESCHEDULE_RECORDINGS") && m_sched)
         {
             QStringList request = me->ExtraDataList();
             m_sched->Reschedule(request);
             return;
         }
 
-        if (me->Message().left(23) == "SCHEDULER_ADD_RECORDING" && m_sched)
+        if (me->Message().startsWith("SCHEDULER_ADD_RECORDING") && m_sched)
         {
             ProgramInfo pi(me->ExtraDataList());
             if (!pi.GetChanID())
@@ -1110 +1110 @@
             return;
         }
 
-        if (me->Message().left(23) == "UPDATE_RECORDING_STATUS" && m_sched)
+        if (me->Message().startsWith("UPDATE_RECORDING_STATUS") && m_sched)
         {
             QStringList tokens = me->Message()
                 .split(" ", QString::SkipEmptyParts);
@@ -1131 +1131 @@
             return;
         }
 
-        if (me->Message().left(13) == "LIVETV_EXITED")
+        if (me->Message().startsWith("LIVETV_EXITED"))
         {
             QString chainid = me->ExtraData();
             LiveTVChain *chain = GetExistingChain(chainid);
@@ -1144 +1144 @@
         if (me->Message() == "CLEAR_SETTINGS_CACHE")
             gCoreContext->ClearSettingsCache();
 
-        if (me->Message().left(14) == "RESET_IDLETIME" && m_sched)
+        if (me->Message().startsWith("RESET_IDLETIME") && m_sched)
             m_sched->ResetIdleTime();
 
         if (me->Message() == "LOCAL_RECONNECT_TO_MASTER")
@@ -1153 +1153 @@
         if (me->Message() == "LOCAL_SLAVE_BACKEND_ENCODERS_OFFLINE")
             HandleSlaveDisconnectedEvent(*me);
 
-        if (me->Message().left(6) == "LOCAL_")
+        if (me->Message().startsWith("LOCAL_"))
             return;
 
         MythEvent mod_me("");
-        if (me->Message().left(23) == "MASTER_UPDATE_PROG_INFO")
+        if (me->Message().startsWith("MASTER_UPDATE_PROG_INFO"))
         {
             QStringList tokens = me->Message().simplified().split(" ");
             uint chanid = 0;
@@ -1188 +1188 @@
             }
         }
 
-        if (me->Message().left(13) == "DOWNLOAD_FILE")
+        if (me->Message().startsWith("DOWNLOAD_FILE"))
         {
             QStringList extraDataList = me->ExtraDataList();
             QString localFile = extraDataList[1];
@@ -1230 +1230 @@
         sockListLock.unlock();
 
         bool sendGlobal = false;
-        if (ismaster && broadcast[1].left(7) == "GLOBAL_")
+        if (ismaster && broadcast[1].startsWith("GLOBAL_"))
         {
             broadcast[1].replace("GLOBAL_", "LOCAL_");
             MythEvent me(broadcast[1], broadcast[2]);
@@ -4483 +4483 @@
              * value using QString::fromUtf8() to prevent corruption. */
             currentDir = QString::fromUtf8(query.value(1)
                                            .toByteArray().constData());
-            if (currentDir.right(1) == "/")
+            if (currentDir.endsWith("/"))
                 currentDir.remove(currentDir.length() - 1, 1);
 
             checkDir.setPath(currentDir);
@@ -6130 +6130 @@
         lpath = lpath.section('/', -1);
 
         QString fpath = lpath;
-        if (fpath.right(4) == ".png")
+        if (fpath.endsWith(".png"))
             fpath = fpath.left(fpath.length() - 4);
 
         ProgramInfo pginfo(fpath);
         if (pginfo.GetChanID())
         {
             QString pburl = GetPlaybackURL(&pginfo);
-            if (pburl.left(1) == "/")
+            if (pburl.startsWith("/"))
             {
                 lpath = pburl.section('/', 0, -2) + "/" + lpath;
                 LOG(VB_FILE, LOG_INFO,

mythtv/programs/mythbackend/services/content.cpp

@@ -493 +493 @@
         // ------------------------------------------------------------------
         // Must generate Preview Image, Generate Image and save.
         // ------------------------------------------------------------------
-        if (!pginfo.IsLocal() && sFileName.left(1) == "/")
+        if (!pginfo.IsLocal() && sFileName.startsWith("/"))
             pginfo.SetPathname(sFileName);
 
         if (!pginfo.IsLocal())

mythtv/programs/mythcommflag/CommDetector2.cpp

@@ -223 +223 @@
         return "";
 
     QString pburl = pginfo.GetPlaybackURL(true);
-    if (pburl.left(1) != "/")
+    if (!pburl.startsWith("/"))
         return "";
 
     QString basename(query.value(0).toString());

mythtv/programs/mythfilldatabase/xmltvparser.cpp

@@ -85 +85 @@
                 {
                     QString base = baseUrl.toString(QUrl::StripTrailingSlash);
                     chaninfo->icon = base +
-                        ((path.left(1) == "/") ? path : QString("/") + path);
+                        ((path.startsWith("/")) ? path : QString("/") + path);
                 }
                 else if (!path.isEmpty())
                 {

mythtv/programs/mythfrontend/globalsettings.cpp

@@ -920 +920 @@
 
 void PlaybackProfileConfig::pressed(QString cmd)
 {
-    if (cmd.left(4) == "edit")
+    if (cmd.startsWith("edit"))
     {
         uint i = cmd.mid(4).toUInt();
         PlaybackProfileItemConfig itemcfg(items[i]);
@@ -931 +931 @@
         InitLabel(i);
         needs_save = true;
     }
-    else if (cmd.left(3) == "del")
+    else if (cmd.startsWith("del"))
     {
         uint i = cmd.mid(3).toUInt();
         del_items.push_back(items[i]);

mythtv/programs/mythfrontend/idlescreen.cpp

@@ -142 +142 @@
     {
         MythEvent *me = static_cast<MythEvent *>(event);
 
-        if (me->Message().left(18) == "SHUTDOWN_COUNTDOWN")
+        if (me->Message().startsWith("SHUTDOWN_COUNTDOWN"))
         {
             QString secs = me->Message().mid(19);
             m_secondsToShutdown = secs.toInt();
             UpdateStatus();
         }
-        else if (me->Message().left(12) == "SHUTDOWN_NOW")
+        else if (me->Message().startsWith("SHUTDOWN_NOW"))
         {
             if (gCoreContext->IsFrontendOnly())
             {

mythtv/programs/mythfrontend/main.cpp

@@ -775 +775 @@
     (void)data;
     QString sel = selection.toLower();
 
-    if (sel.left(9) == "settings ")
+    if (sel.startsWith("settings "))
     {
         GetMythUI()->AddCurrentLocation("Setup");
         gCoreContext->ActivateSettingsCache(false);
@@ -786 +786 @@
         startTVNormal();
     else if (sel == "tv_watch_live_epg")
         startTVInGuide();
-    else if (sel.left(18) == "tv_watch_recording")
+    else if (sel.startsWith("tv_watch_recording"))
     {
         // use selection here because its case is untouched
         if ((selection.length() > 19) && (selection.mid(18, 1) == " "))
@@ -1000 +1000 @@
     else
         LOG(VB_GENERAL, LOG_ERR, "Unknown menu action: " + selection);
 
-    if (sel.left(9) == "settings " || sel == "video_settings_general")
+    if (sel.startsWith("settings ") || sel == "video_settings_general")
     {
         GetMythUI()->RemoveCurrentLocation();
 

mythtv/programs/mythfrontend/networkcontrol.cpp

@@ -1257 +1257 @@
         MythEvent *me = (MythEvent *)e;
         QString message = me->Message();
 
-        if (message.left(13) == "MUSIC_CONTROL")
+        if (message.startsWith("MUSIC_CONTROL"))
         {
             QStringList tokens = message.simplified().split(" ");
             if ((tokens.size() >= 4) &&
@@ -1271 +1271 @@
             } 
 
         }
-        else if (message.left(15) == "NETWORK_CONTROL")
+        else if (message.startsWith("NETWORK_CONTROL"))
         {
             QStringList tokens = message.simplified().split(" ");
             if ((tokens.size() >= 3) &&

mythtv/programs/mythfrontend/playbackbox.cpp

@@ -3884 +3884 @@
         MythEvent *me = (MythEvent *)event;
         QString message = me->Message();
 
-        if (message.left(21) == "RECORDING_LIST_CHANGE")
+        if (message.startsWith("RECORDING_LIST_CHANGE"))
         {
             QStringList tokens = message.simplified().split(" ");
             uint chanid = 0;
@@ -3920 +3920 @@
                 m_programInfoCache.ScheduleLoad();
             }
         }
-        else if (message.left(15) == "NETWORK_CONTROL")
+        else if (message.startsWith("NETWORK_CONTROL"))
         {
             QStringList tokens = message.simplified().split(" ");
             if ((tokens[1] != "ANSWER") && (tokens[1] != "RESPONSE"))
@@ -3948 +3948 @@
                                             keyevent);
             }
         }
-        else if (message.left(16) == "UPDATE_FILE_SIZE")
+        else if (message.startsWith("UPDATE_FILE_SIZE"))
         {
             QStringList tokens = message.simplified().split(" ");
             bool ok = false;

mythtv/programs/mythfrontend/progfind.cpp

@@ -670 +670 @@
 
     if (searchChar == "T")
     {
-        if (data.left(4) != "The " && data.left(2) != "A ")
+        if (!data.startsWith("The ") && !data.startsWith("A "))
         {
              // nothing, use as is
         }
-        else if (data.left(5) == "The T")
+        else if (data.startsWith("The T"))
             data = data.mid(4) + ", The";
-        else if (data.left(3) == "A T")
+        else if (data.startsWith("A T"))
             data = data.mid(2) + ", A";
         else
         {
@@ -686 +686 @@
     }
     else if (searchChar == "A")
     {
-        if (data.left(4) != "The " && data.left(2) != "A ")
+        if (!data.startsWith("The ") && !data.startsWith("A "))
         {
              // nothing, use as is
         }
-        else if (data.left(5) == "The A")
+        else if (data.startsWith("The A"))
             data = data.mid(4) + ", The";
-        else if (data.left(3) == "A A")
+        else if (data.startsWith("A A"))
              data = data.mid(2) + ", A";
-        else if (data.left(4) == "An A")
+        else if (data.startsWith("An A"))
              data = data.mid(3) + ", An";
         else
         {
@@ -704 +704 @@
     }
     else
     {
-        if (data.left(4) == "The ")
+        if (data.startsWith("The "))
             data = data.mid(4) + ", The";
-        else if (data.left(2) == "A ")
+        else if (data.startsWith("A "))
             data = data.mid(2) + ", A";
-        else if (data.left(3) == "An ")
+        else if (data.startsWith("An "))
             data = data.mid(3) + ", An";
     }
 
@@ -721 +721 @@
 
     if (charNum == 29 || charNum == 10)
     {
-        if (data.left(5) == "The T" && charNum == 29)
+        if (data.startsWith("The T") && charNum == 29)
             data = data.mid(4) + ", The";
-        else if (data.left(5) == "The A" && charNum == 10)
+        else if (data.startsWith("The A") && charNum == 10)
             data = data.mid(4) + ", The";
-        else if (data.left(3) == "A T" && charNum == 29)
+        else if (data.startsWith("A T") && charNum == 29)
             data = data.mid(2) + ", A";
-        else if (data.left(3) == "A A" && charNum == 10)
+        else if (data.startsWith("A A") && charNum == 10)
             data = data.mid(2) + ", A";
-        else if (data.left(4) == "An A" && charNum == 10)
+        else if (data.startsWith("An A") && charNum == 10)
              data = data.mid(3) + ", An";
-        else if (data.left(4) != "The " && data.left(2) != "A ")
+        else if (!data.startsWith("The ") && !data.startsWith("A "))
         {
             // use as is
         }
@@ -743 +743 @@
     }
     else
     {
-        if (data.left(4) == "The ")
+        if (data.startsWith("The "))
             data = data.mid(4) + ", The";
-        if (data.left(2) == "A ")
+        if (data.startsWith("A "))
             data = data.mid(2) + ", A";
-        if (data.left(3) == "An ")
+        if (data.startsWith("An "))
             data = data.mid(3) + ", An";
     }
 
@@ -756 +756 @@
 
 void ProgFinder::restoreSelectedData(QString &data)
 {
-    if (data.right(5) == ", The")
+    if (data.endsWith(", The"))
         data = "The " + data.left(data.length() - 5);
-    if (data.right(3) == ", A")
+    if (data.endsWith(", A"))
         data = "A " + data.left(data.length() - 3);
 }
 

mythtv/programs/mythfrontend/upnpscanner.cpp

@@ -1275 +1275 @@
                                QUrl::RemoveQuery);
 
     // strip leading slashes off the controlURL
-    while (!controlURL.isEmpty() && controlURL.left(1) == "/")
+    while (!controlURL.isEmpty() && controlURL.startsWith("/"))
         controlURL = controlURL.mid(1);
 
     // strip leading slashes off the eventURL
-    //while (!eventURL.isEmpty() && eventURL.left(1) == "/")
+    //while (!eventURL.isEmpty() && eventURL.startsWith("/"))
     //    eventURL = eventURL.mid(1);
 
     // strip trailing slashes off URLBase
-    while (!URLBase.isEmpty() && URLBase.right(1) == "/")
+    while (!URLBase.isEmpty() && URLBase.endsWith("/"))
         URLBase = URLBase.mid(0, URLBase.size() - 1);
 
     controlURL = URLBase + "/" + controlURL;

mythtv/programs/mythfrontend/videolist.cpp

@@ -211 +211 @@
 {
     QString ret;
     int slashLoc = path.lastIndexOf('/', -2) + 1;
-    if (path.right(1) == "/")
+    if (path.endsWith("/"))
         ret = path.mid(slashLoc, path.length() - slashLoc - 1);
     else
         ret = path.mid(slashLoc);

mythtv/programs/mythlcdserver/lcdprocclient.cpp

@@ -2438 +2438 @@
     {
         MythEvent *me = (MythEvent *) e;
 
-        if (me->Message().left(21) == "RECORDING_LIST_CHANGE" ||
+        if (me->Message().startsWith("RECORDING_LIST_CHANGE") ||
             me->Message() == "UPDATE_PROG_INFO")
         {
             if (lcd_showrecstatus && !updateRecInfoTimer->isActive())

mythtv/programs/mythtranscode/main.cpp

@@ -541 +541 @@
         return QueueTranscodeJob(pginfo, profilename, hostname, useCutlist);
     }
 
-    if (infile.left(7) == "myth://" && (outfile.isEmpty() || outfile != "-") &&
+    if (infile.startsWith("myth://") && (outfile.isEmpty() || outfile != "-") &&
         fifodir.isEmpty() && !cmdline.toBool("hls") && !cmdline.toBool("avf"))
     {
         LOG(VB_GENERAL, LOG_ERR,

mythtv/programs/mythtranscode/transcode.cpp

@@ -644 +644 @@
                 }
             }
 
-            if (encodingType.left(4).toLower() == "mpeg")
+            if (encodingType.startsWith("mpeg", Qt::CaseInsensitive))
             {
                 // make sure dimensions are valid for MPEG codecs
                 newHeight = (newHeight + 15) & ~0xF;

mythtv/programs/mythwelcome/welcomedialog.cpp

@@ -149 +149 @@
     {
         MythEvent *me = (MythEvent *) e;
 
-        if (me->Message().left(21) == "RECORDING_LIST_CHANGE" ||
+        if (me->Message().startsWith("RECORDING_LIST_CHANGE") ||
             me->Message() == "UPDATE_PROG_INFO")
         {
             LOG(VB_GENERAL, LOG_NOTICE,
@@ -169 +169 @@
                 setPendingRecListUpdate(true);
             }
         }
-        else if (me->Message().left(15) == "SCHEDULE_CHANGE")
+        else if (me->Message().startsWith("SCHEDULE_CHANGE"))
         {
             LOG(VB_GENERAL, LOG_NOTICE,
                 "MythWelcome received a SCHEDULE_CHANGE event");
@@ -187 +187 @@
                 setPendingSchedUpdate(true);
             }
         }
-        else if (me->Message().left(18) == "SHUTDOWN_COUNTDOWN")
+        else if (me->Message().startsWith("SHUTDOWN_COUNTDOWN"))
         {
 #if 0
             LOG(VB_GENERAL, LOG_NOTICE,
@@ -198 +198 @@
             updateStatusMessage();
             updateScreen();
         }
-        else if (me->Message().left(12) == "SHUTDOWN_NOW")
+        else if (me->Message().startsWith("SHUTDOWN_NOW"))
         {
             LOG(VB_GENERAL, LOG_NOTICE,
                 "MythWelcome received a SHUTDOWN_NOW event");