cppcheck: Fix local variables shadowing outer variables.

MythTV · Apr 4, 2019 · 5b6dd66 · 5b6dd66
1 parent f293620
commit 5b6dd66
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/mythtv/libs/libmyth/audio/audiooutput.cpp b/mythtv/libs/libmyth/audio/audiooutput.cpp
@@ -529,10 +529,10 @@ AudioOutput::ADCVect* AudioOutput::GetOutputList(void)
             for (QMap<int, QString>::const_iterator i = dxdevs->begin();
                  i != dxdevs->end(); ++i)
             {
-                QString desc = i.value();
-                QString devname = QString("DirectX:%1").arg(desc);
+                QString devdesc = i.value();
+                QString devname = QString("DirectX:%1").arg(devdesc);
 
-                adc = GetAudioDeviceConfig(devname, desc);
+                adc = GetAudioDeviceConfig(devname, devdesc);
                 if (!adc)
                     continue;
                 list->append(*adc);

diff --git a/mythtv/libs/libmythtv/cardutil.cpp b/mythtv/libs/libmythtv/cardutil.cpp
@@ -2030,9 +2030,9 @@ bool CardUtil::GetV4LInfo(
 #ifdef USING_V4L1
     else // Fallback to V4L1 query
     {
-        struct video_capability capability;
-        if (ioctl(videofd, VIDIOCGCAP, &capability) >= 0)
-            input = QString::fromLatin1((const char*)capability.name);
+        struct video_capability capability2;
+        if (ioctl(videofd, VIDIOCGCAP, &capability2) >= 0)
+            input = QString::fromLatin1((const char*)capability2.name);
     }
 #endif // USING_V4L1
 #endif // USING_V4L2

diff --git a/mythtv/libs/libmythtv/privatedecoder_vda.cpp b/mythtv/libs/libmythtv/privatedecoder_vda.cpp
@@ -749,8 +749,8 @@ void PrivateDecoderVDA::VDADecoderCallback(void *decompressionOutputRefCon,
         int i = 0;
         for (; i < decoder->m_decoded_frames.size(); i++)
         {
-            int64_t pts = decoder->m_decoded_frames[i].pts;
-            if (pts != (int64_t)AV_NOPTS_VALUE && time > pts)
+            int64_t pts2 = decoder->m_decoded_frames[i].pts;
+            if (pts2 != (int64_t)AV_NOPTS_VALUE && time > pts2)
             {
                 found = true;
                 break;

diff --git a/mythtv/programs/mythbackend/services/channelicon.cpp b/mythtv/programs/mythbackend/services/channelicon.cpp
@@ -51,8 +51,8 @@ DTC::ChannelIconList* ChannelIcon::LookupChannelIcon ( const QString    &Query,
 
     // query http://services.mythtv.org/channel-icon/lookup
     QByteArray data;
-    QString url = QString("http://services.mythtv.org/channel-icon/lookup?%1=%2").arg(FieldName).arg(Query);
-    if (!GetMythDownloadManager()->download(url, &data))
+    QString lookupUrl = QString("http://services.mythtv.org/channel-icon/lookup?%1=%2").arg(FieldName).arg(Query);
+    if (!GetMythDownloadManager()->download(lookupUrl, &data))
     {
         //throw( QString("Download from services.mythtv.org failed."));
         return pChannelIcons;
@@ -97,8 +97,8 @@ DTC::ChannelIconList* ChannelIcon::SearchChannelIcon ( const QString &Query )
 
     // query http://services.mythtv.org/channel-icon/search
     QByteArray data;
-    QString url = QString("http://services.mythtv.org/channel-icon/search?s=%1").arg(Query);
-    if (!GetMythDownloadManager()->download(url, &data))
+    QString searchUrl = QString("http://services.mythtv.org/channel-icon/search?s=%1").arg(Query);
+    if (!GetMythDownloadManager()->download(searchUrl, &data))
         return pChannelIcons;
 
     // ----------------------------------------------------------------------