Skip to content

Commit

Permalink
tidy: Replace x.size() in a boolean context with !x.empty(). (libs)
Browse files Browse the repository at this point in the history 
It is not guaranteed that size() is a constant-time function, and it
is generally more efficient and also shows clearer intent to use
empty().

Changes made by the clang-tidy program.

https://clang.llvm.org/extra/clang-tidy/checks/readability-container-size-empty.html
  • Loading branch information
@linuxdude42
linuxdude42 committed Mar 19, 2019
1 parent e10c055 commit edf9237
Show file tree
Hide file tree
Showing 29 changed files with 77 additions and 77 deletions.
6 changes: 3 additions & 3 deletions mythtv/libs/libmyth/programinfo.cpp
View file
Expand Up @@ -2491,12 +2491,12 @@ QString ProgramInfo::GetPlaybackURL(
QString path = url.path();
QString host = url.toString(QUrl::RemovePath).mid(7);
QStringList list = host.split(":", QString::SkipEmptyParts);
if (list.size())
if (!list.empty())
{
host = list[0];
list = host.split("@", QString::SkipEmptyParts);
QString group;
if (list.size() > 0 && list.size() < 3)
if (!list.empty() && list.size() < 3)
{
host = list.size() == 1 ? list[0] : list[1];
group = list.size() == 1 ? QString() : list[0];
Expand Down Expand Up @@ -5621,7 +5621,7 @@ ProgramInfo* LoadProgramFromProgram(const uint chanid,

LoadFromProgram( progList, sSQL, bindings, schedList );

if (progList.size() == 0)
if (progList.empty())
return progInfo;

// progList is an Auto-delete deque, the object will be deleted with the
Expand Down
28 changes: 14 additions & 14 deletions mythtv/libs/libmyth/rssparse.cpp
View file
Expand Up @@ -381,7 +381,7 @@ class MRSSParser
{
QList<QDomNode> elems = GetDirectChildrenNS(element, Parse::s_MediaRSS,
"player");
if (!elems.size())
if (elems.empty())
return QString();

return elems.at(0).toElement().attribute("url");
Expand All @@ -392,7 +392,7 @@ class MRSSParser
QList<QDomNode> elems = GetDirectChildrenNS(element, Parse::s_MediaRSS,
"title");

if (!elems.size())
if (elems.empty())
return QString();

QDomElement telem = elems.at(0).toElement();
Expand All @@ -404,7 +404,7 @@ class MRSSParser
QList<QDomNode> elems = GetDirectChildrenNS(element, Parse::s_MediaRSS,
"description");

if (!elems.size())
if (elems.empty())
return QString();

QDomElement telem = elems.at(0).toElement();
Expand All @@ -416,7 +416,7 @@ class MRSSParser
QList<QDomNode> elems = GetDirectChildrenNS(element, Parse::s_MediaRSS,
"keywords");

if (!elems.size())
if (elems.empty())
return QString();

QDomElement telem = elems.at(0).toElement();
Expand Down Expand Up @@ -486,7 +486,7 @@ class MRSSParser
QList<QDomNode> commParents = GetDirectChildrenNS(element, Parse::s_MediaRSS,
"comments");

if (commParents.size())
if (!commParents.empty())
{
QDomNodeList comments = commParents.at(0).toElement()
.elementsByTagNameNS(Parse::s_MediaRSS,
Expand All @@ -505,7 +505,7 @@ class MRSSParser
QList<QDomNode> respParents = GetDirectChildrenNS(element, Parse::s_MediaRSS,
"responses");

if (respParents.size())
if (!respParents.empty())
{
QDomNodeList responses = respParents.at(0).toElement()
.elementsByTagNameNS(Parse::s_MediaRSS,
Expand All @@ -524,7 +524,7 @@ class MRSSParser
QList<QDomNode> backParents = GetDirectChildrenNS(element, Parse::s_MediaRSS,
"backLinks");

if (backParents.size())
if (!backParents.empty())
{
QDomNodeList backlinks = backParents.at(0).toElement()
.elementsByTagNameNS(Parse::s_MediaRSS,
Expand Down Expand Up @@ -567,7 +567,7 @@ class MRSSParser
QList<QDomNode> scenesNode = GetDirectChildrenNS(element, Parse::s_MediaRSS,
"scenes");

if (scenesNode.size())
if (!scenesNode.empty())
{
QDomNodeList scenesNodes = scenesNode.at(0).toElement()
.elementsByTagNameNS(Parse::s_MediaRSS, "scene");
Expand Down Expand Up @@ -597,7 +597,7 @@ class MRSSParser
QList<QDomNode> elems = GetDirectChildrenNS(element, Parse::s_MediaRSS,
"rating");

if (elems.size())
if (!elems.empty())
{
QDomElement relem = elems.at(0).toElement();
rating = relem.text();
Expand All @@ -614,7 +614,7 @@ class MRSSParser
QList<QDomNode> elems = GetDirectChildrenNS(element, Parse::s_MediaRSS,
"copyright");

if (elems.size())
if (!elems.empty())
{
QDomElement celem = elems.at(0).toElement();
ctext = celem.text();
Expand All @@ -633,7 +633,7 @@ class MRSSParser
{
QList<QDomNode> comms = GetDirectChildrenNS(element, Parse::s_MediaRSS,
"community");
if (comms.size())
if (!comms.empty())
{
QDomElement comm = comms.at(0).toElement();
QDomNodeList stars = comm.elementsByTagNameNS(Parse::s_MediaRSS,
Expand Down Expand Up @@ -884,12 +884,12 @@ ResultItem* Parse::ParseItem(const QDomElement& item) const

QList<MRSSEntry> enclosures = GetMediaRSS(item);

if (enclosures.size())
if (!enclosures.empty())
{
MRSSEntry media = enclosures.takeAt(0);

QList<MRSSThumbnail> thumbs = media.Thumbnails;
if (thumbs.size())
if (!thumbs.empty())
{
MRSSThumbnail thumb = thumbs.takeAt(0);
thumbnail = thumb.URL;
Expand All @@ -914,7 +914,7 @@ ResultItem* Parse::ParseItem(const QDomElement& item) const
{
QList<Enclosure> stdEnc = GetEnclosures(item);

if (stdEnc.size())
if (!stdEnc.empty())
{
Enclosure e = stdEnc.takeAt(0);

Expand Down
6 changes: 3 additions & 3 deletions mythtv/libs/libmyth/standardsettings.cpp
View file
Expand Up @@ -139,15 +139,15 @@ void StandardSetting::clearTargetedSettings(const QString &value)
QList<StandardSetting *> *StandardSetting::getSubSettings()
{
if (m_targets.contains(m_settingValue) &&
m_targets[m_settingValue].size() > 0)
!m_targets[m_settingValue].empty())
return &m_targets[m_settingValue];
return &m_children;
}

bool StandardSetting::haveSubSettings()
{
QList<StandardSetting *> *subSettings = getSubSettings();
return subSettings && subSettings->size() > 0;
return subSettings && !subSettings->empty();
}

void StandardSetting::clearSettings()
Expand Down Expand Up @@ -537,7 +537,7 @@ void MythUIComboBoxSetting::edit(MythScreenType * screen)
QString("NEWENTRY"),
false,
m_settingValue == "");
for (int i = 0; i < m_labels.size() && m_values.size(); ++i)
for (int i = 0; i < m_labels.size() && !m_values.empty(); ++i)
{
QString value = m_values.at(i);
menuPopup->AddButton(m_labels.at(i),
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythbase/dbutil.cpp
View file
Expand Up @@ -484,7 +484,7 @@ QString DBUtil::GetBackupDirectory()
QString directory;
StorageGroup sgroup("DB Backups", gCoreContext->GetHostName());
QStringList dirList = sgroup.GetDirList();
if (dirList.size())
if (!dirList.empty())
{
directory = sgroup.FindNextDirMostFree();

Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythbase/mythcommandlineparser.cpp
View file
Expand Up @@ -2622,7 +2622,7 @@ void MythCommandLineParser::ApplySettingsOverride(void)
cerr << "Applying settings override" << endl;

QMap<QString, QString> override = GetSettingsOverride();
if (override.size())
if (!override.empty())
{
QMap<QString, QString>::iterator it;
for (it = override.begin(); it != override.end(); ++it)
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythbase/remotefile.cpp
View file
Expand Up @@ -1366,7 +1366,7 @@ QStringList RemoteFile::FindFileList(const QString& filename, const QString& hos

if (gCoreContext->SendReceiveStringList(strList))
{
if (strList.size() > 0 && !strList[0].isEmpty() &&
if (!strList.empty() && !strList[0].isEmpty() &&
strList[0] != "NOT FOUND" && !strList[0].startsWith("ERROR: "))
return strList;
}
Expand Down
6 changes: 3 additions & 3 deletions mythtv/libs/libmythbase/serverpool.cpp
View file
Expand Up @@ -456,7 +456,7 @@ bool ServerPool::listen(QList<QHostAddress> addrs, quint16 port,
}
}

if (m_tcpServers.size() == 0)
if (m_tcpServers.empty())
return false;

m_listening = true;
Expand Down Expand Up @@ -562,7 +562,7 @@ bool ServerPool::bind(QList<QHostAddress> addrs, quint16 port,
}
}

if (m_udpSockets.size() == 0)
if (m_udpSockets.empty())
return false;

m_listening = true;
Expand All @@ -586,7 +586,7 @@ bool ServerPool::bind(quint16 port, bool requireall)
qint64 ServerPool::writeDatagram(const char * data, qint64 size,
const QHostAddress &addr, quint16 port)
{
if (!m_listening || m_udpSockets.size() == 0)
if (!m_listening || m_udpSockets.empty())
{
LOG(VB_GENERAL, LOG_ERR, "Trying to write datagram to disconnected "
"ServerPool instance.");
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythbase/storagegroup.cpp
View file
Expand Up @@ -164,7 +164,7 @@ void StorageGroup::Init(const QString &group, const QString &hostname,
}
}

if (allowFallback && !m_dirlist.size())
if (allowFallback && m_dirlist.empty())
{
QString msg = "Unable to find any Storage Group Directories. ";
QString tmpDir = gCoreContext->GetSetting("RecordFilePrefix");
Expand Down Expand Up @@ -686,7 +686,7 @@ QString StorageGroup::FindNextDirMostFree(void)
if (m_allowFallback)
nextDir = kDefaultStorageDir;

if (m_dirlist.size())
if (!m_dirlist.empty())
nextDir = m_dirlist[0];

QDir checkDir("");
Expand Down
6 changes: 3 additions & 3 deletions mythtv/libs/libmythmetadata/metadatacommon.cpp
View file
Expand Up @@ -820,11 +820,11 @@ void CreateMetadataXMLItem(MetadataLookup *lookup,

if (lookup->GetCertification().size())
AddCertifications(lookup, item, docroot);
if (lookup->GetCategories().size())
if (!lookup->GetCategories().empty())
AddCategories(lookup, item, docroot);
if (lookup->GetStudios().size())
if (!lookup->GetStudios().empty())
AddStudios(lookup, item, docroot);
if (lookup->GetCountries().size())
if (!lookup->GetCountries().empty())
AddCountries(lookup, item, docroot);
}

Expand Down
12 changes: 6 additions & 6 deletions mythtv/libs/libmythmetadata/metadatadownload.cpp
View file
Expand Up @@ -224,9 +224,9 @@ unsigned int MetadataDownload::findExactMatchCount(MetadataLookupList list,
{
// In lookup by name, the television database tends to only include Banner artwork.
// In lookup by name, the movie database tends to include only Fan and Cover artwork.
if ((((*i)->GetArtwork(kArtworkFanart)).size() != 0) ||
(((*i)->GetArtwork(kArtworkCoverart)).size() != 0) ||
(((*i)->GetArtwork(kArtworkBanner)).size() != 0))
if ((!((*i)->GetArtwork(kArtworkFanart)).empty()) ||
(!((*i)->GetArtwork(kArtworkCoverart)).empty()) ||
(!((*i)->GetArtwork(kArtworkBanner)).empty()))
{
exactMatchesWithArt++;
}
Expand Down Expand Up @@ -262,9 +262,9 @@ MetadataLookup* MetadataDownload::findBestMatch(MetadataLookupList list,
// Consider exact title matches (ignoring case), which have some artwork available.
if (QString::compare(title, originaltitle, Qt::CaseInsensitive) == 0)
{
bool hasArtwork = ((((*i)->GetArtwork(kArtworkFanart)).size() != 0) ||
(((*i)->GetArtwork(kArtworkCoverart)).size() != 0) ||
(((*i)->GetArtwork(kArtworkBanner)).size() != 0));
bool hasArtwork = ((!((*i)->GetArtwork(kArtworkFanart)).empty()) ||
(!((*i)->GetArtwork(kArtworkCoverart)).empty()) ||
(!((*i)->GetArtwork(kArtworkBanner)).empty()));

LOG(VB_GENERAL, LOG_INFO, QString("'%1', popularity = %2, ReleaseDate = %3")
.arg(title)
Expand Down
10 changes: 5 additions & 5 deletions mythtv/libs/libmythmetadata/metadatafactory.cpp
View file
Expand Up @@ -286,15 +286,15 @@ void MetadataFactory::OnSingleResult(MetadataLookup *lookup)
DownloadMap map;

ArtworkList coverartlist = lookup->GetArtwork(kArtworkCoverart);
if (coverartlist.size())
if (!coverartlist.empty())
{
ArtworkInfo info;
info.url = coverartlist.takeFirst().url;
map.insert(kArtworkCoverart, info);
}

ArtworkList fanartlist = lookup->GetArtwork(kArtworkFanart);
if (fanartlist.size())
if (!fanartlist.empty())
{
ArtworkInfo info;
int index = 0;
Expand All @@ -306,7 +306,7 @@ void MetadataFactory::OnSingleResult(MetadataLookup *lookup)
}

ArtworkList bannerlist = lookup->GetArtwork(kArtworkBanner);
if (bannerlist.size())
if (!bannerlist.empty())
{
ArtworkInfo info;
info.url = bannerlist.takeFirst().url;
Expand All @@ -316,7 +316,7 @@ void MetadataFactory::OnSingleResult(MetadataLookup *lookup)
if (lookup->GetType() != kMetadataRecording)
{
ArtworkList screenshotlist = lookup->GetArtwork(kArtworkScreenshot);
if (screenshotlist.size())
if (!screenshotlist.empty())
{
ArtworkInfo info;
info.url = screenshotlist.takeFirst().url;
Expand Down Expand Up @@ -542,7 +542,7 @@ void MetadataFactory::customEvent(QEvent *levent)
m_returnList = MetadataLookupList();
m_sync = false;
}
if (lul.size())
if (!lul.empty())
{
OnNoResult(lul[0]);
}
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythmetadata/parentalcontrols.cpp
View file
Expand Up @@ -290,15 +290,15 @@ class ParentalLevelChangeCheckerPrivate : public QObject
// If there isn't a password for this level or higher levels, treat
// the next lower password as valid. This is only done so people
// cannot lock themselves out of the setup.
if (!m_validPasswords.size())
if (m_validPasswords.empty())
{
QString pw = m_pm.FirstAtOrBelow(which_level.GetLevel());
if (pw.length())
m_validPasswords.push_back(pw);
}

// There are no suitable passwords.
if (!m_validPasswords.size())
if (m_validPasswords.empty())
return true;

// If we got here, there is a password, and there's no backing down.
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythmetadata/videometadata.cpp
View file
Expand Up @@ -410,7 +410,7 @@ bool VideoMetadataImp::removeDir(const QString &dirName)

d.setFilter(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot);
QFileInfoList contents = d.entryInfoList();
if (!contents.size())
if (contents.empty())
{
return d.rmdir(dirName);
}
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythmetadata/videometadatalistmanager.cpp
View file
Expand Up @@ -436,7 +436,7 @@ meta_data_list::const_iterator meta_dir_node::entries_end() const
// have entries. TODO: cache this value
bool meta_dir_node::has_entries() const
{
bool ret = m_entries.size();
bool ret = !m_entries.empty();

if (!ret)
{
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythmetadata/videoscan.cpp
View file
Expand Up @@ -474,7 +474,7 @@ void VideoScanner::doScanAll()
void VideoScanner::finishedScan()
{
QStringList failedHosts = m_scanThread->GetOfflineSGHosts();
if (failedHosts.size() > 0)
if (!failedHosts.empty())
{
QString hosts = failedHosts.join(" ");
QString msg = tr("Failed to Scan SG Video Hosts:\n\n%1\n\n"
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythprotoserver/requesthandler/fileserverhandler.cpp
View file
Expand Up @@ -334,7 +334,7 @@ bool FileServerHandler::HandleAnnounce(MythSocket *socket,
<< QString::number(socket->GetSocketDescriptor())
<< QString::number(ft->GetFileSize());

if (checkfiles.size())
if (!checkfiles.empty())
{
QFileInfo fi(filename);
QDir dir = fi.absoluteDir();
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythui/DisplayResScreen.cpp
View file
Expand Up @@ -135,7 +135,7 @@ int DisplayResScreen::FindBestMatch(const DisplayResVector& dsr,
if (dsr[i].Width()==d.Width() && dsr[i].Height()==d.Height())
{
const std::vector<double>& rates = dsr[i].RefreshRates();
if (rates.size() && videorate != 0)
if (!rates.empty() && videorate != 0)
{
while (!end)
{
Expand Down

0 comments on commit edf9237

Please sign in to comment.