Skip to content

Commit ae9d140

Browse files
linuxdude42linuxdude42
committed
clazy: Prevent Qt containers from detaching in range-loops.
Mark the container as constant to prevent it from detaching (and possibly performing a deep copy). Previously the suggestion was to add qAsConst(), but Qt is now recommending std::as_const() with C++17 code.
1 parent efb962a commit ae9d140

File tree

21 files changed

+28
-28
lines changed

21 files changed

+28
-28
lines changed

‎mythplugins/mythweather/mythweather/sourceManager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ void SourceManager::recurseDirs( QDir dir )
357357
QDir::NoDotAndDotDot);
358358
QFileInfoList files = dir.entryInfoList();
359359

360-
for (const auto & file : files)
360+
for (const auto & file : std::as_const(files))
361361
{
362362
QCoreApplication::processEvents();
363363
if (file.isDir())

‎mythtv/libs/libmyth/mythmediamonitor.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ MythMediaDevice * MediaMonitor::selectDrivePopup(const QString &label,
213213
}
214214

215215
// Add button for each drive
216-
for (auto *drive : drives)
216+
for (auto *drive : std::as_const(drives))
217217
dlg->AddButton(DevName(drive));
218218

219219
dlg->AddButton(tr("Cancel"));

‎mythtv/libs/libmythbase/http/mythhttpcommon.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ MythSocketProtocol MythHTTPWS::ProtocolFromString(const QString &Protocols)
7070
auto protocols = Protocols.trimmed().toLower().split(",", Qt::SkipEmptyParts);
7171
#endif
7272

73-
for (const auto & protocol : protocols)
73+
for (const auto & protocol : std::as_const(protocols))
7474
if (auto valid = ParseProtocol(protocol); valid != ProtFrame)
7575
return valid;
7676

‎mythtv/libs/libmythbase/http/mythhttpencoding.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ QStringList MythHTTPEncoding::GetMimeTypes(const QString &Accept)
3737
#endif
3838

3939
std::vector<MimePair> weightings;
40-
for (const auto & type : types)
40+
for (const auto & type : std::as_const(types))
4141
{
4242
QString mime = type.trimmed();
4343
auto quality = 1.0F;

‎mythtv/libs/libmythbase/http/mythhttpserver.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ void MythHTTPServer::BuildOrigins()
523523
QStringList extras = gCoreContext->GetSetting("AllowedOriginsList", QString(
524524
"https://chromecast.mythtv.org"
525525
)).split(",");
526-
for (const auto & extra : extras)
526+
for (const auto & extra : std::as_const(extras))
527527
{
528528
QString clean = extra.trimmed();
529529
if (clean.startsWith("http://") || clean.startsWith("https://"))
@@ -560,7 +560,7 @@ void MythHTTPServer::ResolveMaster(QHostInfo Info)
560560
auto addresses = BuildAddressList(Info);
561561

562562
// Add status and SSL addressed for each
563-
for (const auto & address : addresses)
563+
for (const auto & address : std::as_const(addresses))
564564
{
565565
m_config.m_allowedOrigins.append(QString("http://%1").arg(address));
566566
m_config.m_allowedOrigins.append(QString("http://%1:%2").arg(address).arg(m_masterStatusPort));
@@ -592,7 +592,7 @@ void MythHTTPServer::DebugOrigins()
592592
void MythHTTPServer::ResolveHost(QHostInfo Info)
593593
{
594594
auto addresses = BuildAddressList(Info);
595-
for (const auto & address : addresses)
595+
for (const auto & address : std::as_const(addresses))
596596
{
597597
// The port is optional - so just add both to our list to simplify the
598598
// checks when a request is received

‎mythtv/libs/libmythbase/programinfo.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1481,7 +1481,7 @@ uint propsValueFromString (const QString& name, QMap<T,QString> propNames,
14811481
uint result = 0;
14821482

14831483
QStringList names = props.split('|');
1484-
for ( const auto& n : names )
1484+
for ( const auto& n : std::as_const(names) )
14851485
{
14861486
uint bit = propNames.key(n, 0);
14871487
if (bit == 0)

‎mythtv/libs/libmythmetadata/test/test_lyrics/test_lyrics.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ void TestLyrics::initTestCase()
2727
void TestLyrics::dump(const LyricsLineMap* lyrics)
2828
{
2929
auto keys = lyrics->keys();
30-
for (auto key : keys)
30+
for (auto key : std::as_const(keys))
3131
{
3232
auto *value = lyrics->value(key);
3333
QString valuestr = QString("%1:%2").arg(value->m_time.count()).arg(value->m_lyric);

‎mythtv/libs/libmythtv/Bluray/mythbdbuffer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1288,7 +1288,7 @@ bool MythBDBuffer::RestoreBDStateSnapshot(const QString& State)
12881288
#endif
12891289
QHash<QString, uint64_t> settings;
12901290

1291-
for (const QString& state : states)
1291+
for (const QString& state : std::as_const(states))
12921292
{
12931293
#if QT_VERSION < QT_VERSION_CHECK(5,14,0)
12941294
QStringList keyvalue = state.split(":", QString::SkipEmptyParts);

‎mythtv/libs/libmythtv/recorders/satiputils.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ QStringList SatIP::doUPNPsearch(bool loginfo)
100100
{
101101
QStringList caps = attrib.m_sValue.split(",");
102102

103-
for (const auto& cap : caps)
103+
for (const auto& cap : std::as_const(caps))
104104
{
105105
QStringList tuner = cap.split("-");
106106

@@ -153,7 +153,7 @@ QString SatIP::findDeviceIP(const QString& deviceuuid)
153153
{
154154
QStringList devs = SatIP::findServers();
155155

156-
for (const auto& dev : devs)
156+
for (const auto& dev : std::as_const(devs))
157157
{
158158
QStringList devinfo = dev.split(" ");
159159
const QString& id = devinfo.at(0);

‎mythtv/libs/libmythtv/videosource.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -4127,7 +4127,7 @@ void SatIPConfigurationGroup::FillDeviceList(void)
41274127
// Now find configured devices
41284128
// Returns each devices as "deviceid friendlyname ip tunerno tunertype"
41294129
QStringList db = CardUtil::GetVideoDevices("SATIP");
4130-
for (const auto& dev : db)
4130+
for (const auto& dev : std::as_const(db))
41314131
{
41324132
auto dit = m_deviceList.find(dev);
41334133
if (dit != m_deviceList.end())

‎mythtv/libs/libmythui/mythuibuttonlist.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3869,7 +3869,7 @@ void MythUIButtonListItem::SetToRealButton(MythUIStateType *button, bool selecte
38693869
buttonstate->Reset();
38703870

38713871
QList<MythUIType *> descendants = buttonstate->GetAllDescendants();
3872-
for (MythUIType *obj : descendants)
3872+
for (MythUIType *obj : std::as_const(descendants))
38733873
{
38743874
QString name = obj->objectName();
38753875
if (name == "buttontext")

‎mythtv/libs/libmythui/mythuithemecache.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ void MythUIThemeCache::RemoveFromCacheByFile(const QString& File)
527527
QDir dir(GetThemeCacheDir());
528528
QFileInfoList list = dir.entryInfoList();
529529

530-
for (const auto & fileInfo : list)
530+
for (const auto & fileInfo : std::as_const(list))
531531
{
532532
if (fileInfo.fileName().contains(partialKey))
533533
{

‎mythtv/libs/libmythui/vulkan/mythrendervulkan.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -243,16 +243,16 @@ void MythRenderVulkan::DebugVulkan(void)
243243
if (VERBOSE_LEVEL_CHECK(VB_GENERAL, LOG_DEBUG))
244244
{
245245
LOG(VB_GENERAL, LOG_INFO, QString("%1 device extensions supported:").arg(devextensions.size()));
246-
for (const auto& extension : devextensions)
246+
for (const auto& extension : std::as_const(devextensions))
247247
LOG(VB_GENERAL, LOG_INFO, LOC + QString("%1 Version: %2").arg(extension.name.constData()).arg(extension.version));
248248

249249
LOG(VB_GENERAL, LOG_INFO, QString("%1 instance extensions supported:").arg(instextensions.size()));
250-
for (const auto& extension : instextensions)
250+
for (const auto& extension : std::as_const(instextensions))
251251
LOG(VB_GENERAL, LOG_INFO, LOC + QString("%1 Version: %2").arg(extension.name.constData()).arg(extension.version));
252252

253253
auto layers = m_window->vulkanInstance()->supportedLayers();
254254
LOG(VB_GENERAL, LOG_INFO, QString("%1 layer types supported:").arg(layers.size()));
255-
for (const auto& layer : layers)
255+
for (const auto& layer : std::as_const(layers))
256256
LOG(VB_GENERAL, LOG_INFO, QString("%1 Version: %2").arg(layer.name.constData()).arg(layer.version));
257257
}
258258
}

‎mythtv/libs/libmythupnp/httprequest.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ QString HTTPRequest::BuildResponseHeader( long long nSize )
275275
}
276276

277277
auto values = m_mapHeaders.values("origin");
278-
for (const auto & value : values)
278+
for (const auto & value : std::as_const(values))
279279
AddCORSHeaders(value);
280280

281281
if (qEnvironmentVariableIsSet("HTTPREQUEST_DEBUG"))

‎mythtv/programs/mythbackend/services/dvr.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -908,7 +908,7 @@ bool Dvr::SetRecordedMarkup (int RecordedId, const QJsonObject &jsonObj)
908908
QJsonObject markuplist = jsonObj["MarkupList"].toObject();
909909

910910
QJsonArray marks = markuplist["Mark"].toArray();
911-
for (const auto & m : marks)
911+
for (const auto & m : std::as_const(marks))
912912
{
913913
QJsonObject markup = m.toObject();
914914
ProgramInfo::MarkupEntry entry;
@@ -925,7 +925,7 @@ bool Dvr::SetRecordedMarkup (int RecordedId, const QJsonObject &jsonObj)
925925
}
926926

927927
QJsonArray seeks = markuplist["Seek"].toArray();
928-
for (const auto & m : seeks)
928+
for (const auto & m : std::as_const(seeks))
929929
{
930930
QJsonObject markup = m.toObject();
931931
ProgramInfo::MarkupEntry entry;

‎mythtv/programs/mythbackend/services/myth.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1137,7 +1137,7 @@ bool Myth::ManageUrlProtection( const QString &sServices,
11371137
}
11381138
else
11391139
{
1140-
for (const QString& service : serviceList)
1140+
for (const QString& service : std::as_const(serviceList))
11411141
{
11421142
if (KnownServices.contains(service))
11431143
protectedURLs << '/' + service;

‎mythtv/programs/mythbackend/services/serviceUtil.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -775,7 +775,7 @@ DBCredits * jsonCastToCredits(const QJsonObject &cast)
775775
auto* credits = new DBCredits;
776776

777777
QJsonArray members = cast["CastMembers"].toArray();
778-
for (const auto & m : members)
778+
for (const auto & m : std::as_const(members))
779779
{
780780
QJsonObject actor = m.toObject();
781781
QString name = actor.value("Name").toString("");

‎mythtv/programs/mythbackend/servicesv2/v2dvr.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1085,7 +1085,7 @@ bool V2Dvr::SetRecordedMarkup(int RecordedId, const QString &MarkupList)
10851085
QJsonObject markuplist = doc.object();
10861086

10871087
QJsonArray marks = markuplist["Mark"].toArray();
1088-
for (const auto & m : marks)
1088+
for (const auto & m : std::as_const(marks))
10891089
{
10901090
QJsonObject markup = m.toObject();
10911091
ProgramInfo::MarkupEntry entry;
@@ -1103,7 +1103,7 @@ bool V2Dvr::SetRecordedMarkup(int RecordedId, const QString &MarkupList)
11031103
}
11041104

11051105
QJsonArray seeks = markuplist["Seek"].toArray();
1106-
for (const auto & m : seeks)
1106+
for (const auto & m : std::as_const(seeks))
11071107
{
11081108
QJsonObject markup = m.toObject();
11091109
ProgramInfo::MarkupEntry entry;

‎mythtv/programs/mythbackend/servicesv2/v2myth.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1226,7 +1226,7 @@ bool V2Myth::ManageUrlProtection( const QString &sServices,
12261226
}
12271227
else
12281228
{
1229-
for (const QString& service : serviceList)
1229+
for (const QString& service : std::as_const(serviceList))
12301230
{
12311231
if (KnownServicesV2.contains(service))
12321232
protectedURLs << '/' + service;

‎mythtv/programs/mythbackend/servicesv2/v2serviceUtil.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -889,7 +889,7 @@ DBCredits * V2jsonCastToCredits(const QJsonObject &cast)
889889
auto* credits = new DBCredits;
890890

891891
QJsonArray members = cast["CastMembers"].toArray();
892-
for (const auto & m : members)
892+
for (const auto & m : std::as_const(members))
893893
{
894894
QJsonObject actor = m.toObject();
895895
QString name = actor.value("Name").toString("");

‎mythtv/programs/mythbackend/servicesv2/v2video.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ V2VideoMetadataInfoList* V2Video::GetVideoList( const QString &Folder,
239239
QStringList sortList = Sort.toLower().split(',',Qt::SkipEmptyParts);
240240
#endif
241241
bool next = false;
242-
for (const auto & item : sortList)
242+
for (const auto & item : std::as_const(sortList))
243243
{
244244
#if QT_VERSION < QT_VERSION_CHECK(5,14,0)
245245
QStringList partList = item.split(' ',QString::SkipEmptyParts);

0 commit comments

Comments
 (0)