cppcheck: Fix a few style warnings

(cherry picked from commit 1ea7756)
MythTV · Mar 8, 2020 · e4c80f1 · e4c80f1
1 parent 1ea9726
commit e4c80f1
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/mythtv/libs/libmythbase/mythsystemlegacy.h b/mythtv/libs/libmythbase/mythsystemlegacy.h
@@ -139,14 +139,14 @@ class MBASE_PUBLIC MythSystemLegacy : public QObject
     QString& GetCommand(void)        { return m_command; }
     // FIXME: Eliminate. We should not allow setting the command
     //        after construcion.
-    void SetCommand(QString &cmd)    { m_command = cmd; }
+    void SetCommand(const QString &cmd)    { m_command = cmd; }
 
     // FIXME: We should not return a reference here
     // FIXME: Rename "GetArguments"
     QStringList &GetArgs(void)       { return m_args; }
     // FIXME: Eliminate. We should not allow setting the arguements
     //        after construcion.
-    void SetArgs(QStringList &args)  { m_args = args; }
+    void SetArgs(const QStringList &args)  { m_args = args; }
 
     int GetNice(void)                { return m_nice; }
     int GetIOPrio(void)              { return m_ioprio; }

diff --git a/mythtv/libs/libmythtv/mheg/dsmcccache.cpp b/mythtv/libs/libmythtv/mheg/dsmcccache.cpp
@@ -237,7 +237,7 @@ void DSMCCCache::AddDirInfo(DSMCCCacheDir *pDir, const BiopBinding *pBB)
 }
 
 // Find File, Directory or Gateway by reference.
-DSMCCCacheFile *DSMCCCache::FindFileData(DSMCCCacheReference &ref)
+DSMCCCacheFile *DSMCCCache::FindFileData(const DSMCCCacheReference &ref)
 {
     // Find a file.
     QMap<DSMCCCacheReference, DSMCCCacheFile*>::Iterator fil =
@@ -249,7 +249,7 @@ DSMCCCacheFile *DSMCCCache::FindFileData(DSMCCCacheReference &ref)
     return *fil;
 }
 
-DSMCCCacheDir *DSMCCCache::FindDir(DSMCCCacheReference &ref)
+DSMCCCacheDir *DSMCCCache::FindDir(const DSMCCCacheReference &ref)
 {
     // Find a directory.
     QMap<DSMCCCacheReference, DSMCCCacheDir*>::Iterator dir =
@@ -261,7 +261,7 @@ DSMCCCacheDir *DSMCCCache::FindDir(DSMCCCacheReference &ref)
     return *dir;
 }
 
-DSMCCCacheDir *DSMCCCache::FindGateway(DSMCCCacheReference &ref)
+DSMCCCacheDir *DSMCCCache::FindGateway(const DSMCCCacheReference &ref)
 {
     // Find a gateway.
     QMap<DSMCCCacheReference, DSMCCCacheDir*>::Iterator dir =

diff --git a/mythtv/libs/libmythtv/mheg/dsmcccache.h b/mythtv/libs/libmythtv/mheg/dsmcccache.h
@@ -109,9 +109,9 @@ class DSMCCCache
 
   protected:
     // Find File, Directory or Gateway by reference.
-    DSMCCCacheFile *FindFileData(DSMCCCacheReference &ref);
-    DSMCCCacheDir *FindDir(DSMCCCacheReference &ref);
-    DSMCCCacheDir *FindGateway(DSMCCCacheReference &ref);
+    DSMCCCacheFile *FindFileData(const DSMCCCacheReference &ref);
+    DSMCCCacheDir *FindDir(const DSMCCCacheReference &ref);
+    DSMCCCacheDir *FindGateway(const DSMCCCacheReference &ref);
 
     DSMCCCacheReference m_GatewayRef; // Reference to the gateway
 

diff --git a/mythtv/libs/libmythtv/recorders/HLS/HLSStream.h b/mythtv/libs/libmythtv/recorders/HLS/HLSStream.h
@@ -1,5 +1,5 @@
-#ifndef _HLS_Stream_h_
-#define _HLS_Stream_h_
+#ifndef HLS_STREAM_
+#define HLS_STREAM_
 
 #ifdef USING_LIBCRYPTO
 // encryption related stuff
@@ -33,7 +33,7 @@ class HLSRecStream
     void SetVersion(int x)          { m_version = x; }
     int TargetDuration(void) const  { return m_targetDuration; }
     void SetTargetDuration(int x)   { m_targetDuration = x; }
-    uint64_t AverageBandwidth(void) { return m_bandwidth; }
+    uint64_t AverageBandwidth(void) { return static_cast<uint64_t>(m_bandwidth); }
     uint64_t Bitrate(void) const    { return m_bitrate; }
     void SetBitrate(uint64_t bitrate) { m_bitrate = bitrate; }
     uint64_t CurrentByteRate(void) const { return m_curByteRate; }
@@ -44,7 +44,7 @@ class HLSRecStream
     void SetLive(bool x)            { m_live = x; }
     QString M3U8Url(void) const     { return m_m3u8Url; }
     QString SegmentBaseUrl(void) const { return m_segmentBaseUrl; }
-    void SetSegmentBaseUrl(QString &n) { m_segmentBaseUrl = n; }
+    void SetSegmentBaseUrl(const QString &n) { m_segmentBaseUrl = n; }
 
     uint Duration(void) const;
     uint NumCachedSegments(void) const;