Ticket #2013: channel_zeros_prefix.patch

libs/libmythtv/tv_play.h

@@ -464 +464 @@
     mutable QString queuedChanNum;
     /// Queued ChanID (from EPG channel selector)
     uint            queuedChanID;
-    /// Used to strip unwanted characters from queuedChanNum
-    QRegExp         queuedChanNumExpr;
     /// Lock used so that input QStrings can be used across threads, and so
     /// that queuedChanNumExpr can be used safely in Qt 3.2 and earlier.
     mutable QMutex  queuedInputLock;

libs/libmythtv/tv_play.cpp

@@ -306 +306 @@
       asInputMode(false), asInputModeExpires(QTime::currentTime()),
       // Channel changing state variables
       queuedChanNum(""),
-      queuedChanNumExpr(QRegExp("([1-9]|\\w)")),
       muteTimer(new QTimer(this)),
       lockTimerOn(false),
       // previous channel functionality state variables
@@ -335 +334 @@
       // Window info (GUI is optional, transcoding, preview img, etc)
       myWindow(NULL), embedWinID(0), embedBounds(0,0,0,0)
 {
-    queuedChanNumExpr.setMinimal(true); // we don't need greedy matching
-
     for (uint i = 0; i < 2; i++)
     {
         pseudoLiveTVRec[i]   = NULL;
@@ -3896 +3893 @@
     if (!queuedChanNum.isEmpty())
     {
         // strip initial zeros.
-        int nzi = queuedChanNum.find(queuedChanNumExpr);
-        if (nzi > 0)
-            queuedChanNum = queuedChanNum.right(queuedChanNum.length() - nzi);
+        while (queuedChanNum.startsWith("0"))
+            queuedChanNum = queuedChanNum.right(queuedChanNum.length() - 1);
         queuedChanNum.stripWhiteSpace();
     }
 
@@ -4066 +4062 @@
              !pseudoLiveTVState[(activenvp == nvp) ? 0 : 1])
     {
         QString channum = GetQueuedChanNum();
-        QString chaninput = GetQueuedInput();
         if (browsemode)
         {
             commited = true;