Fixes for various minor cppcheck warnings.

This touches a some libmythbase interfaces so the plugins need recompiling.
MythTV · Jan 28, 2012 · b0b97b3 · b0b97b3
1 parent 1ed67c1
commit b0b97b3
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 16 deletions.
diff --git a/mythtv/libs/libmyth/audio/audiooutputbase.cpp b/mythtv/libs/libmyth/audio/audiooutputbase.cpp
@@ -112,8 +112,8 @@ AudioOutputBase::AudioOutputBase(const AudioSettings &settings) :
 {
     src_in = (float *)AOALIGN(src_in_buf);
     memset(&src_data,          0, sizeof(SRC_DATA));
-    memset(src_in,             0, sizeof(float) * kAudioSRCInputSize);
-    memset(audiobuffer,        0, sizeof(char)  * kAudioRingBufferSize);
+    memset(src_in_buf,         0, sizeof(src_in_buf));
+    memset(audiobuffer,        0, sizeof(audiobuffer));
 
     // Handle override of SRC quality settings
     if (gCoreContext->GetNumSetting("SRCQualityOverride", false))

diff --git a/mythtv/libs/libmyth/mythdialogs.cpp b/mythtv/libs/libmyth/mythdialogs.cpp
@@ -975,12 +975,12 @@ MythThemedDialog::MythThemedDialog(MythMainWindow *parent,
     }
 }
 
-MythThemedDialog::MythThemedDialog(MythMainWindow *parent, const char* name,
-                                   bool setsize)
-                : MythDialog(parent, name, setsize)
+MythThemedDialog::MythThemedDialog(
+    MythMainWindow *parent, const char* name, bool setsize) :
+    MythDialog(parent, name, setsize), widget_with_current_focus(NULL),
+    theme(NULL), context(-1)
 {
     setNoErase();
-    theme = NULL;
 }
 
 bool MythThemedDialog::loadThemedWindow(QString window_name,

diff --git a/mythtv/libs/libmyth/mythwidgets.cpp b/mythtv/libs/libmyth/mythwidgets.cpp
@@ -1344,7 +1344,7 @@ void MythListBox::setCurrentItem(const QString& matchText, bool caseSensitive,
 void MythListBox::HandleItemSelectionChanged(void)
 {
     QList<QListWidgetItem*> items = QListWidget::selectedItems();
-    int row = index(items);
+    int row = getIndex(items);
     if (row >= 0)
         emit highlighted(row);
 }
@@ -1520,7 +1520,7 @@ void MythListBox::changeItem(const QString &new_text, uint row)
         widget->setText(new_text);
 }
 
-int MythListBox::index(const QList<QListWidgetItem*> &list)
+int MythListBox::getIndex(const QList<QListWidgetItem*> &list)
 {
     return (list.empty()) ? -1 : row(list[0]);
 }

diff --git a/mythtv/libs/libmyth/mythwidgets.h b/mythtv/libs/libmyth/mythwidgets.h
@@ -394,7 +394,7 @@ class MPUBLIC MythListBox: public QListWidget
     void insertStringList(const QStringList&);
     void removeRow(uint row);
     void changeItem(const QString&, uint row);
-    int  index(const QList<QListWidgetItem*>&);
+    int  getIndex(const QList<QListWidgetItem*>&);
     QList<QListWidgetItem*> findItems(
         const QString &text, Qt::MatchFlags flags = Qt::MatchStartsWith) const
     {

diff --git a/mythtv/libs/libmythbase/lcddevice.cpp b/mythtv/libs/libmythbase/lcddevice.cpp
@@ -476,7 +476,7 @@ void LCD::setTunerLEDs(enum LCDTunerSet tuner, bool on)
     sendToServer(QString("UPDATE_LEDS %1").arg(lcd_ledmask));
 }
 
-void LCD::setChannelProgress(const QString time, float value)
+void LCD::setChannelProgress(const QString &time, float value)
 {
     if (!lcd_ready || !lcd_showchannel)
         return;

diff --git a/mythtv/libs/libmythbase/lcddevice.h b/mythtv/libs/libmythbase/lcddevice.h
@@ -234,7 +234,7 @@ class MBASE_PUBLIC LCD : public QObject, public MythSocketCBs
     // While watching Live/Recording/Pause Buffer, occasionaly describe how
     // much of the program has been seen (between 0.0 and 1.0)
     // (e.g. [current time - start time] / [end time - start time]  )
-    void setChannelProgress(const QString time, float percentViewed);
+    void setChannelProgress(const QString &time, float percentViewed);
 
     // Show the Menu
     // QPtrList is a pointer to a bunch of menu items

diff --git a/mythtv/libs/libmythbase/mythversion.h b/mythtv/libs/libmythbase/mythversion.h
@@ -12,7 +12,7 @@
 /// Update this whenever the plug-in API changes.
 /// Including changes in the libmythbase, libmyth, libmythtv, libmythav* and
 /// libmythui class methods used by plug-ins.
-#define MYTH_BINARY_VERSION "0.25.20120127-1"
+#define MYTH_BINARY_VERSION "0.25.20120128-1"
 
 /** \brief Increment this whenever the MythTV network protocol changes.
  *

diff --git a/mythtv/libs/libmythtv/cetonrtsp.cpp b/mythtv/libs/libmythtv/cetonrtsp.cpp
@@ -21,7 +21,8 @@ CetonRTSP::CetonRTSP(const QString &ip, uint tuner, ushort port) :
     _port(port),
     _tuner(tuner),
     _sequenceNumber(0),
-    _sessionNumber(0)
+    _sessionNumber(0),
+    _responseCode(-1)
 {
     _requestUrl = QString("rtsp://%1:%2/cetonmpeg%3")
         .arg(ip).arg(port).arg(tuner);

diff --git a/mythtv/libs/libmythtv/hdhrchannel.cpp b/mythtv/libs/libmythtv/hdhrchannel.cpp
@@ -147,7 +147,7 @@ static QString format_dvbc(const DTVMultiplex &tuning, const QString &mod)
 }
 
 static QString get_tune_spec(
-    const DTVTunerType tunerType, const DTVMultiplex &tuning)
+    const DTVTunerType &tunerType, const DTVMultiplex &tuning)
 {
     const QString mod = format_modulation(tuning);
 

diff --git a/mythtv/libs/libmythtv/mythraopconnection.cpp b/mythtv/libs/libmythtv/mythraopconnection.cpp
@@ -23,7 +23,8 @@ RSA* MythRAOPConnection::g_rsa = NULL;
 
 MythRAOPConnection::MythRAOPConnection(QObject *parent, QTcpSocket *socket,
                                        QByteArray id, int port)
-  : QObject(parent), m_watchdogTimer(NULL), m_socket(socket), m_hardwareId(id),
+  : QObject(parent), m_watchdogTimer(NULL), m_socket(socket),
+    m_textStream(NULL), m_hardwareId(id),
     m_dataPort(port), m_dataSocket(NULL),
     m_clientControlSocket(NULL), m_clientControlPort(0),
     m_audio(NULL), m_codec(NULL), m_codeccontext(NULL),

diff --git a/mythtv/libs/libmythtv/mythraopconnection.h b/mythtv/libs/libmythtv/mythraopconnection.h
@@ -84,7 +84,6 @@ class MythRAOPConnection : public QObject
     AVCodecContext *m_codeccontext;
     QList<int>      m_audioFormat;
     int             m_sampleRate;
-    int             m_framesPerPacket;
     QMap<uint64_t, int16_t*>  m_audioQueue;
     bool            m_allowVolumeControl;
     // audio/packet sync

diff --git a/mythtv/libs/libmythtv/recordingquality.cpp b/mythtv/libs/libmythtv/recordingquality.cpp
@@ -13,6 +13,7 @@ static double score_gaps(const ProgramInfo*, const RecordingGaps&);
 RecordingQuality::RecordingQuality(
     const ProgramInfo *pi, const RecordingGaps &rg,
     const QDateTime &first, const QDateTime &latest) :
+    m_continuity_error_count(0), m_packet_count(0),
     m_overall_score(1.0), m_recording_gaps(rg)
 {
     if (!pi)