tidy: Fix "avoid repeating the return type" warnings. (libs 2)

Avoid repeating the return type from the declaration; use a braced initializer list instead. These changes were all made by the clang-tidy program. https://clang.llvm.org/extra/clang-tidy/checks/modernize-return-braced-init-list.html
MythTV · Jun 20, 2022 · 2690447 · 2690447
1 parent 2a70c74
commit 2690447
Show file tree

Hide file tree

Showing 78 changed files with 186 additions and 186 deletions.
diff --git a/mythtv/libs/libmythtv/AirPlay/mythairplayserver.cpp b/mythtv/libs/libmythtv/AirPlay/mythairplayserver.cpp
@@ -266,7 +266,7 @@ class APHTTPRequest
     QByteArray GetLine(void)
     {
         int next = m_data.indexOf("\r\n", m_readPos);
-        if (next < 0) return QByteArray();
+        if (next < 0) return {};
         QByteArray line = m_data.mid(m_readPos, next - m_readPos);
         m_readPos = next + 2;
         return line;

diff --git a/mythtv/libs/libmythtv/Bluray/mythbdplayer.cpp b/mythtv/libs/libmythtv/Bluray/mythbdplayer.cpp
@@ -246,14 +246,14 @@ QString MythBDPlayer::GetTitleName(int Title) const
         QString name = QString("%1 (%2)").arg(Title+1).arg(timestr);
         return name;
     }
-    return QString();
+    return {};
 }
 
 QString MythBDPlayer::GetAngleName(int Angle) const
 {
     if (Angle >= 1 && Angle <= GetNumAngles())
         return tr("Angle %1").arg(Angle);
-    return QString();
+    return {};
 }
 
 bool MythBDPlayer::SwitchTitle(int Title)

diff --git a/mythtv/libs/libmythtv/DVD/mythdvdplayer.cpp b/mythtv/libs/libmythtv/DVD/mythdvdplayer.cpp
@@ -668,7 +668,7 @@ QString MythDVDPlayer::GetAngleName(int Angle) const
         QString name = tr("Angle %1").arg(Angle);
         return name;
     }
-    return QString();
+    return {};
 }
 
 bool MythDVDPlayer::SwitchAngle(int Angle)

diff --git a/mythtv/libs/libmythtv/HLS/httplivestream.cpp b/mythtv/libs/libmythtv/HLS/httplivestream.cpp
@@ -341,7 +341,7 @@ bool HTTPLiveStream::AddSegment(void)
 QString HTTPLiveStream::GetHTMLPageName(void) const
 {
     if (m_streamid == -1)
-        return QString();
+        return {};
 
     QString outFile = m_outDir + "/" + m_outBase + ".html";
     return outFile;
@@ -385,7 +385,7 @@ bool HTTPLiveStream::WriteHTML(void)
 QString HTTPLiveStream::GetMetaPlaylistName(void) const
 {
     if (m_streamid == -1)
-        return QString();
+        return {};
 
     QString outFile = m_outDir + "/" + m_outBase + ".m3u8";
     return outFile;
@@ -432,10 +432,10 @@ bool HTTPLiveStream::WriteMetaPlaylist(void)
 QString HTTPLiveStream::GetPlaylistName(bool audioOnly) const
 {
     if (m_streamid == -1)
-        return QString();
+        return {};
 
     if (audioOnly && m_audioOutFile.isEmpty())
-        return QString();
+        return {};
 
     QString base = audioOnly ? m_audioOutFile : m_outFile;
     QString outFile = m_outDir + "/" + base + ".m3u8";
@@ -667,17 +667,17 @@ bool HTTPLiveStream::UpdatePercentComplete(int percent)
 QString HTTPLiveStream::StatusToString(HTTPLiveStreamStatus status)
 {
     switch (status) {
-        case kHLSStatusUndefined : return QString("Undefined");
-        case kHLSStatusQueued    : return QString("Queued");
-        case kHLSStatusStarting  : return QString("Starting");
-        case kHLSStatusRunning   : return QString("Running");
-        case kHLSStatusCompleted : return QString("Completed");
-        case kHLSStatusErrored   : return QString("Errored");
-        case kHLSStatusStopping  : return QString("Stopping");
-        case kHLSStatusStopped   : return QString("Stopped");
+        case kHLSStatusUndefined : return {"Undefined"};
+        case kHLSStatusQueued    : return {"Queued"};
+        case kHLSStatusStarting  : return {"Starting"};
+        case kHLSStatusRunning   : return {"Running"};
+        case kHLSStatusCompleted : return {"Completed"};
+        case kHLSStatusErrored   : return {"Errored"};
+        case kHLSStatusStopping  : return {"Stopping"};
+        case kHLSStatusStopped   : return {"Stopped"};
     };
 
-    return QString("Unknown status value");
+    return {"Unknown status value"};
 }
 
 bool HTTPLiveStream::LoadFromDB(void)

diff --git a/mythtv/libs/libmythtv/HLS/httplivestreambuffer.cpp b/mythtv/libs/libmythtv/HLS/httplivestreambuffer.cpp
@@ -1747,7 +1747,7 @@ QString HLSRingBuffer::ParseAttributes(const QString &line, const char *attr)
 {
     int p = line.indexOf(QLatin1String(":"));
     if (p < 0)
-        return QString();
+        return {};
 
     QStringList list = line.mid(p+1).split(',');
     for (const auto& it : qAsConst(list))
@@ -1761,7 +1761,7 @@ QString HLSRingBuffer::ParseAttributes(const QString &line, const char *attr)
             return arg.mid(pos+1);
         }
     }
-    return QString();
+    return {};
 }
 
 /**

diff --git a/mythtv/libs/libmythtv/HLS/m3u.cpp b/mythtv/libs/libmythtv/HLS/m3u.cpp
@@ -28,7 +28,7 @@ namespace M3U
     {
         int p = line.indexOf(QLatin1String(":"));
         if (p < 0)
-            return QString();
+            return {};
 
         QStringList list = line.mid(p + 1).split(',');
         for (const auto & it : qAsConst(list))
@@ -42,7 +42,7 @@ namespace M3U
                 return arg.mid(pos+1);
             }
         }
-        return QString();
+        return {};
     }
 
     /**

diff --git a/mythtv/libs/libmythtv/captions/cc608decoder.cpp b/mythtv/libs/libmythtv/captions/cc608decoder.cpp
@@ -1100,7 +1100,7 @@ QString CC608Decoder::GetXDS(const QString &key) const
     if (key == "tsid")
         return QString::number(m_xdsTsid);
 
-    return QString();
+    return {};
 }
 
 static std::array<const int,16> b1_to_service

diff --git a/mythtv/libs/libmythtv/captions/subtitlereader.cpp b/mythtv/libs/libmythtv/captions/subtitlereader.cpp
@@ -112,7 +112,7 @@ QStringList SubtitleReader::GetRawTextSubtitles(std::chrono::milliseconds &durat
 {
     QMutexLocker lock(&m_rawTextSubtitles.m_lock);
     if (m_rawTextSubtitles.m_buffers.empty())
-        return QStringList();
+        return {};
 
     duration = m_rawTextSubtitles.m_duration;
     QStringList result = m_rawTextSubtitles.m_buffers;

diff --git a/mythtv/libs/libmythtv/cardutil.cpp b/mythtv/libs/libmythtv/cardutil.cpp
@@ -1230,7 +1230,7 @@ QString get_on_input(const QString &to_get, uint inputid)
     else if (query.next())
         return query.value(0).toString();
 
-    return QString();
+    return {};
 }
 
 bool set_on_input(const QString &to_set, uint inputid, const QString &value)
@@ -1798,7 +1798,7 @@ QString CardUtil::GetStartChannel(uint inputid)
 QString CardUtil::GetDisplayName(uint inputid)
 {
     if (!inputid)
-        return QString();
+        return {};
 
     MSqlQuery query(MSqlQuery::InitCon());
     query.prepare("SELECT displayname "
@@ -1814,7 +1814,7 @@ QString CardUtil::GetDisplayName(uint inputid)
         return result;
     }
 
-    return QString();
+    return {};
 }
 
 bool CardUtil::IsUniqueDisplayName(const QString &name, uint exclude_inputid)

diff --git a/mythtv/libs/libmythtv/channelinfo.cpp b/mythtv/libs/libmythtv/channelinfo.cpp
@@ -199,7 +199,7 @@ QString ChannelInfo::GetFormatted(ChannelFormat format) const
 
 
     if (tmp.isEmpty())
-        return QString();
+        return {};
 
     tmp.replace("<num>",  m_chanNum);
     tmp.replace("<sign>", m_callSign);
@@ -523,15 +523,15 @@ QString toRawString(ChannelVisibleType type)
     switch (type)
     {
         case kChannelAlwaysVisible:
-            return QString("Always Visible");
+            return {"Always Visible"};
         case kChannelVisible:
-            return QString("Visible");
+            return {"Visible"};
         case kChannelNotVisible:
-            return QString("Not Visible");
+            return {"Not Visible"};
         case kChannelNeverVisible:
-            return QString("Never Visible");
+            return {"Never Visible"};
         default:
-            return QString("Unknown");
+            return {"Unknown"};
     }
 }
 

diff --git a/mythtv/libs/libmythtv/channelsettings.cpp b/mythtv/libs/libmythtv/channelsettings.cpp
@@ -335,7 +335,7 @@ class ServiceID : public MythUISpinBoxSetting
     QString getValue(void) const override // StandardSetting
     {
         if (StandardSetting::getValue().toInt() == -1)
-            return QString();
+            return {};
         return StandardSetting::getValue();
     }
 };

diff --git a/mythtv/libs/libmythtv/channelutil.cpp b/mythtv/libs/libmythtv/channelutil.cpp
@@ -754,7 +754,7 @@ bool ChannelUtil::GetTuningParams(uint      mplexid,
 QString ChannelUtil::GetChannelStringField(int chan_id, const QString &field)
 {
     if (chan_id < 0)
-        return QString();
+        return {};
 
     MSqlQuery query(MSqlQuery::InitCon());
     query.prepare(QString("SELECT %1 FROM channel "
@@ -763,11 +763,11 @@ QString ChannelUtil::GetChannelStringField(int chan_id, const QString &field)
     if (!query.exec())
     {
         MythDB::DBError("Selecting channel/dtv_multiplex 1", query);
-        return QString();
+        return {};
     }
 
     if (!query.next())
-        return QString();
+        return {};
 
     return query.value(0).toString();
 }
@@ -1094,7 +1094,7 @@ QStringList ChannelUtil::GetValidRecorderList(
         return get_valid_recorder_list(chanid);
     if (!channum.isEmpty())
         return get_valid_recorder_list(channum);
-    return QStringList();
+    return {};
 }
 
 
@@ -1989,7 +1989,7 @@ IPTVTuningData ChannelUtil::GetIPTVTuningData(uint chanid)
     if (!query.exec())
     {
         MythDB::DBError("GetChannelData -- iptv", query);
-        return IPTVTuningData();
+        return {};
     }
 
     QString data_url;

diff --git a/mythtv/libs/libmythtv/decoders/avformatdecoder.cpp b/mythtv/libs/libmythtv/decoders/avformatdecoder.cpp
@@ -4191,7 +4191,7 @@ QByteArray AvFormatDecoder::GetSubHeader(uint TrackNo)
 {
     QMutexLocker locker(&m_trackLock);
     if (TrackNo >= m_tracks[kTrackTypeSubtitle].size())
-        return QByteArray();
+        return {};
 
     int index = m_tracks[kTrackTypeSubtitle][TrackNo].m_av_stream_index;
     AVCodecContext *ctx = m_codecMap.GetCodecContext(m_ic->streams[index]);
@@ -5187,7 +5187,7 @@ QString AvFormatDecoder::GetRawEncodingType(void)
 {
     int stream = m_selectedTrack[kTrackTypeVideo].m_av_stream_index;
     if (stream < 0 || !m_ic)
-        return QString();
+        return {};
     return ff_codec_id_string(m_ic->streams[stream]->codecpar->codec_id);
 }
 

diff --git a/mythtv/libs/libmythtv/decoders/decoderbase.h b/mythtv/libs/libmythtv/decoders/decoderbase.h
@@ -205,7 +205,7 @@ class DecoderBase
     void SetFramesPlayed(long long newValue) {m_framesPlayed = newValue;}
 
     virtual QString GetCodecDecoderName(void) const = 0;
-    virtual QString GetRawEncodingType(void) { return QString(); }
+    virtual QString GetRawEncodingType(void) { return {}; }
     virtual MythCodecID GetVideoCodecID(void) const = 0;
 
     virtual void ResetPosMap(void);
@@ -246,8 +246,8 @@ class DecoderBase
 
     virtual int  GetTeletextDecoderType(void) const { return -1; }
 
-    virtual QString GetXDS(const QString &/*key*/) const { return QString(); }
-    virtual QByteArray GetSubHeader(uint /*trackNo*/) { return QByteArray(); }
+    virtual QString GetXDS(const QString &/*key*/) const { return {}; }
+    virtual QByteArray GetSubHeader(uint /*trackNo*/) { return {}; }
     virtual void GetAttachmentData(uint /*trackNo*/, QByteArray &/*filename*/,
                                    QByteArray &/*data*/) {}
 

diff --git a/mythtv/libs/libmythtv/diseqc.cpp b/mythtv/libs/libmythtv/diseqc.cpp
@@ -95,7 +95,7 @@ QString DiSEqCDevDevice::TableToString(uint type, const TypeTableVec &table)
     for (const auto &item : table)
         if (type == item.value)
             return item.name;
-    return QString();
+    return {};
 }
 
 uint DiSEqCDevDevice::TableFromString(const QString   &type,

diff --git a/mythtv/libs/libmythtv/dtvconfparserhelpers.cpp b/mythtv/libs/libmythtv/dtvconfparserhelpers.cpp
@@ -25,7 +25,7 @@ QString DTVParamHelper::toString(const DTVParamStringVec &strings, int index)
         LOG(VB_GENERAL, LOG_ERR,
             "DTVParamHelper::toString() index out of bounds");
 
-        return QString();
+        return {};
     }
 
     return QString::fromStdString(strings[index]);

diff --git a/mythtv/libs/libmythtv/dtvconfparserhelpers.h b/mythtv/libs/libmythtv/dtvconfparserhelpers.h
@@ -207,7 +207,7 @@ class DTVInversion : public DTVParamHelper
         {
             if (toString().length() > 0)
                 return toString().at(0);
-            return QChar(0);
+            return {0};
         }
 
     static QString toString(int _value)
@@ -270,7 +270,7 @@ class DTVBandwidth : public DTVParamHelper
         {
             if (toString().length() > 0)
                 return toString().at(0);
-            return QChar(0);
+            return {0};
         }
 
     static QString toString(int _value)
@@ -477,7 +477,7 @@ class DTVTransmitMode : public DTVParamHelper
         {
             if (toString().length() > 0)
                 return toString().at(0);
-            return QChar(0);
+            return {0};
         }
 
     static QString toString(int _value)
@@ -595,7 +595,7 @@ class DTVHierarchy : public DTVParamHelper
         {
             if (toString().length() > 0)
                 return toString().at(0);
-            return QChar(0);
+            return {0};
         }
 
     static QString toString(int _value)
@@ -634,7 +634,7 @@ class DTVPolarity : public DTVParamHelper
         {
             if (toString().length() > 0)
                 return toString().at(0);
-            return QChar(0);
+            return {0};
         }
 
     static QString toString(int _value)

diff --git a/mythtv/libs/libmythtv/io/mythfilebuffer.cpp b/mythtv/libs/libmythtv/io/mythfilebuffer.cpp
@@ -169,7 +169,7 @@ static QString LocalSubtitleFilename(QFileInfo &FileInfo)
             return file.absoluteFilePath();
     }
 
-    return QString();
+    return {};
 }
 
 bool MythFileBuffer::OpenFile(const QString &Filename, std::chrono::milliseconds Retry)

diff --git a/mythtv/libs/libmythtv/iptvtuningdata.h b/mythtv/libs/libmythtv/iptvtuningdata.h
@@ -147,7 +147,7 @@ class MTV_PUBLIC IPTVTuningData
             return GetFECURL0();
         if (2 == i)
             return GetFECURL1();
-        return QUrl();
+        return {};
     }
     uint GetBitrate(uint i) const { return m_bitrate[i]; }
 
@@ -159,12 +159,12 @@ class MTV_PUBLIC IPTVTuningData
             return "data";
         switch (m_fecType)
         {
-            case kNone: return QString();
+            case kNone: return {};
             case kRFC2733: return QString("rfc2733-%1").arg(i);
             case kRFC5109: return QString("rfc5109-%1").arg(i);
             case kSMPTE2022: return QString("smpte2022-%1").arg(i);
         }
-        return QString();
+        return {};
     }
 
     static uint GetURLCount(void) { return 3; }

diff --git a/mythtv/libs/libmythtv/jobqueue.cpp b/mythtv/libs/libmythtv/jobqueue.cpp
@@ -1503,7 +1503,7 @@ QString JobQueue::GetJobArgs(int jobID)
         MythDB::DBError("Error in JobQueue::GetJobArgs()", query);
     }
 
-    return QString("");
+    return {""};
 }
 
 enum JobFlags JobQueue::GetJobFlags(int jobID)