From 400792d18e806c1d42fa6c51e53d46eee97b55d1 Mon Sep 17 00:00:00 2001 From: thalieht Date: Wed, 13 Feb 2019 17:51:07 +0200 Subject: [PATCH] Use isEmpty() instead of size() for emptiness --- src/gui/cookiesmodel.cpp | 2 +- src/gui/previewselectdialog.cpp | 2 +- src/gui/rss/rsswidget.cpp | 2 +- src/gui/tagfiltermodel.cpp | 2 +- src/gui/transferlistfilterswidget.cpp | 4 ++-- src/gui/transferlistwidget.cpp | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gui/cookiesmodel.cpp b/src/gui/cookiesmodel.cpp index 810274d4e..950c71abd 100644 --- a/src/gui/cookiesmodel.cpp +++ b/src/gui/cookiesmodel.cpp @@ -157,7 +157,7 @@ bool CookiesModel::insertRows(int row, int count, const QModelIndex &parent) bool CookiesModel::removeRows(int row, int count, const QModelIndex &parent) { - if ((m_cookies.size() == 0) + if ((m_cookies.isEmpty()) || (row >= m_cookies.size()) || ((row + count) > m_cookies.size())) return false; diff --git a/src/gui/previewselectdialog.cpp b/src/gui/previewselectdialog.cpp index 07da7aec2..153c579c2 100644 --- a/src/gui/previewselectdialog.cpp +++ b/src/gui/previewselectdialog.cpp @@ -124,7 +124,7 @@ PreviewSelectDialog::~PreviewSelectDialog() void PreviewSelectDialog::previewButtonClicked() { QModelIndexList selectedIndexes = previewList->selectionModel()->selectedRows(FILE_INDEX); - if (selectedIndexes.size() == 0) return; + if (selectedIndexes.isEmpty()) return; // Flush data m_torrent->flushCache(); diff --git a/src/gui/rss/rsswidget.cpp b/src/gui/rss/rsswidget.cpp index b0a0d4a6a..6525cc7e6 100644 --- a/src/gui/rss/rsswidget.cpp +++ b/src/gui/rss/rsswidget.cpp @@ -150,7 +150,7 @@ void RSSWidget::displayRSSListMenu(const QPoint &pos) m_feedListWidget->clearSelection(); QMenu myRSSListMenu(this); QList selectedItems = m_feedListWidget->selectedItems(); - if (selectedItems.size() > 0) { + if (!selectedItems.isEmpty()) { myRSSListMenu.addAction(m_ui->actionUpdate); myRSSListMenu.addAction(m_ui->actionMarkItemsRead); myRSSListMenu.addSeparator(); diff --git a/src/gui/tagfiltermodel.cpp b/src/gui/tagfiltermodel.cpp index 02ab1c92f..f370c0760 100644 --- a/src/gui/tagfiltermodel.cpp +++ b/src/gui/tagfiltermodel.cpp @@ -326,7 +326,7 @@ QVector TagFilterModel::findItems(const QSet &tags) TagModelItem *TagFilterModel::allTagsItem() { - Q_ASSERT(m_tagItems.size() > 0); + Q_ASSERT(!m_tagItems.isEmpty()); return &m_tagItems[0]; } diff --git a/src/gui/transferlistfilterswidget.cpp b/src/gui/transferlistfilterswidget.cpp index 5f32cb3f6..64f65d118 100644 --- a/src/gui/transferlistfilterswidget.cpp +++ b/src/gui/transferlistfilterswidget.cpp @@ -485,7 +485,7 @@ void TrackerFiltersList::handleNewTorrent(BitTorrent::TorrentHandle *const torre addItem(tracker.url(), hash); //Check for trackerless torrent - if (trackers.size() == 0) + if (trackers.isEmpty()) addItem("", hash); item(0)->setText(tr("All (%1)", "this is for the tracker filter").arg(++m_totalTorrents)); @@ -499,7 +499,7 @@ void TrackerFiltersList::torrentAboutToBeDeleted(BitTorrent::TorrentHandle *cons removeItem(tracker.url(), hash); //Check for trackerless torrent - if (trackers.size() == 0) + if (trackers.isEmpty()) removeItem("", hash); item(0)->setText(tr("All (%1)", "this is for the tracker filter").arg(--m_totalTorrents)); diff --git a/src/gui/transferlistwidget.cpp b/src/gui/transferlistwidget.cpp index 2afbf8ea7..662f17097 100644 --- a/src/gui/transferlistwidget.cpp +++ b/src/gui/transferlistwidget.cpp @@ -878,7 +878,7 @@ void TransferListWidget::clearSelectionTags() void TransferListWidget::displayListMenu(const QPoint&) { const QModelIndexList selectedIndexes = selectionModel()->selectedRows(); - if (selectedIndexes.size() == 0) return; + if (selectedIndexes.isEmpty()) return; // Create actions QAction actionStart(GuiIconProvider::instance()->getIcon("media-playback-start"), tr("Resume", "Resume/start the torrent"), nullptr);