Fix several cppcheck warnings.

MythTV · Jan 30, 2013 · a8591ad · a8591ad
1 parent 031c724
commit a8591ad
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 18 deletions.
diff --git a/mythtv/libs/libmythbase/dbutil.cpp b/mythtv/libs/libmythbase/dbutil.cpp
@@ -531,7 +531,6 @@ bool DBUtil::CreateTemporaryDBConf(
     filename = createTempFile("/tmp/mythtv_db_backup_conf_XXXXXX");
     const QByteArray     tmpfile     = filename.toLocal8Bit();
     const DatabaseParams dbParams    = gCoreContext->GetDatabaseParams();
-    const QString        dbSchemaVer = gCoreContext->GetSetting("DBSchemaVer");
 
     FILE *fp = fopen(tmpfile.constData(), "w");
     if (!fp)

diff --git a/mythtv/libs/libmythbase/mythdbcon.cpp b/mythtv/libs/libmythbase/mythdbcon.cpp
@@ -938,7 +938,6 @@ void MSqlEscapeAsAQuery(QString &query, MSqlBindings &bindings)
         i += rx.matchedLength();
     }
 
-    q = query;
     QVariant val;
     QString holder;
 

diff --git a/mythtv/libs/libmythtv/cc708window.cpp b/mythtv/libs/libmythtv/cc708window.cpp
@@ -552,9 +552,8 @@ void CC708Pen::SetPenStyle(uint style)
 }
 
 CC708Character::CC708Character(const CC708Window &win)
+    : attr(win.pen.attr), character(' ')
 {
-    attr = win.pen.attr;
-    character = ' ';
 }
 
 bool CC708CharacterAttribute::operator==(

diff --git a/mythtv/libs/libmythtv/subtitlescreen.cpp b/mythtv/libs/libmythtv/subtitlescreen.cpp
@@ -871,10 +871,10 @@ void SubtitleScreen::DisplayAVSubtitles(void)
                 if (lh > 0)
                 {
                     bbox = QRect(0, uh, rect->w, lh);
-                    lh = DisplayScaledAVSubtitles(rect, bbox, false, display,
-                                                  subtitle.forced,
-                                                  QString("avsub%1b").arg(i),
-                                                  displayuntil, late);
+                    DisplayScaledAVSubtitles(rect, bbox, false, display,
+                                             subtitle.forced,
+                                             QString("avsub%1b").arg(i),
+                                             displayuntil, late);
                 }
             }
 #ifdef USING_LIBASS

diff --git a/mythtv/libs/libmythtv/tv_play.cpp b/mythtv/libs/libmythtv/tv_play.cpp
@@ -12653,7 +12653,6 @@ void TV::ShowOSDStopWatchingRecording(PlayerContext *ctx)
 
     QString message;
     QString videotype = QString::null;
-    QStringList options;
 
     if (StateIsLiveTV(GetState(ctx)))
         videotype = tr("Live TV");

diff --git a/mythtv/libs/libmythtv/videobuffers.cpp b/mythtv/libs/libmythtv/videobuffers.cpp
@@ -353,7 +353,7 @@ void VideoBuffers::DoneDisplayingFrame(VideoFrame *frame)
     QMutexLocker locker(&global_lock);
 
     if(used.contains(frame))
-        remove(kVideoBuffer_used, frame);
+        Remove(kVideoBuffer_used, frame);
 
     enqueue(kVideoBuffer_finished, frame);
 
@@ -364,7 +364,7 @@ void VideoBuffers::DoneDisplayingFrame(VideoFrame *frame)
     {
         if (!decode.contains(*it))
         {
-            remove(kVideoBuffer_finished, *it);
+            Remove(kVideoBuffer_finished, *it);
             enqueue(kVideoBuffer_avail, *it);
         }
     }
@@ -488,7 +488,7 @@ void VideoBuffers::enqueue(BufferType type, VideoFrame *frame)
     return;
 }
 
-void VideoBuffers::remove(BufferType type, VideoFrame *frame)
+void VideoBuffers::Remove(BufferType type, VideoFrame *frame)
 {
     if (!frame)
         return;
@@ -531,7 +531,7 @@ void VideoBuffers::safeEnqueue(BufferType dst, VideoFrame* frame)
 
     QMutexLocker locker(&global_lock);
 
-    remove(kVideoBuffer_all, frame);
+    Remove(kVideoBuffer_all, frame);
     enqueue(dst, frame);
 }
 
@@ -663,7 +663,7 @@ void VideoBuffers::DiscardFrames(bool next_frame_keyframe)
     // Make sure frames used by decoder are last...
     // This is for libmpeg2 which still uses the frames after a reset.
     for (it = decode.begin(); it != decode.end(); ++it)
-        remove(kVideoBuffer_all, *it);
+        Remove(kVideoBuffer_all, *it);
     for (it = decode.begin(); it != decode.end(); ++it)
         available.enqueue(*it);
     decode.clear();

diff --git a/mythtv/libs/libmythtv/videobuffers.h b/mythtv/libs/libmythtv/videobuffers.h
@@ -94,7 +94,7 @@ class VideoBuffers
     void requeue(BufferType dst, BufferType src, int num = 1);
     void enqueue(BufferType, VideoFrame*);
     void safeEnqueue(BufferType, VideoFrame* frame);
-    void remove(BufferType, VideoFrame *); // multiple buffer types ok
+    void Remove(BufferType, VideoFrame *); // multiple buffer types ok
     frame_queue_t::iterator begin_lock(BufferType); // this locks VideoBuffer
     frame_queue_t::iterator end(BufferType);
     void end_lock() { global_lock.unlock(); } // this unlocks VideoBuffer

diff --git a/mythtv/libs/libmythtv/videosource.cpp b/mythtv/libs/libmythtv/videosource.cpp
@@ -2406,7 +2406,7 @@ void CaptureCard::Save(void)
         init_cardid = cardid;
 
     // Delete old clone cards as required.
-    for (uint i = cardids.size() - 1; (i > cloneCount) && cardids.size(); i--)
+    for (uint i = cardids.size() - 1; (i > cloneCount) && !cardids.empty(); i--)
     {
         CardUtil::DeleteCard(cardids.back());
         cardids.pop_back();
@@ -2773,7 +2773,7 @@ void StartingChannel::SetSourceID(const QString &sourceid)
     // (selecting the old start channel if it is there).
     QString order = gCoreContext->GetSetting("ChannelOrdering", "channum");
     ChannelUtil::SortChannels(channels, order);
-    bool has_visible = false, found_existing = false;
+    bool has_visible = false;
     for (uint i = 0; i < channels.size() && !has_visible; i++)
         has_visible |= channels[i].visible;
 
@@ -2784,7 +2784,6 @@ void StartingChannel::SetSourceID(const QString &sourceid)
         if (!has_visible || channels[i].visible || sel)
         {
             addSelection(channum, channum, sel);
-            found_existing |= sel;
         }
     }
 }