From e3483c62ca83499b54486590eaca9e48f6234f37 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sat, 17 Aug 2019 15:23:18 +0800 Subject: [PATCH] Remove explicit conversion to QVariant --- src/app/application.cpp | 2 +- src/gui/search/pluginselectdialog.cpp | 4 +-- src/gui/search/searchwidget.cpp | 12 +++---- src/gui/transferlistfilterswidget.cpp | 48 +++++++++++++-------------- 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/app/application.cpp b/src/app/application.cpp index 19b8823d2..3f7c177b9 100644 --- a/src/app/application.cpp +++ b/src/app/application.cpp @@ -203,7 +203,7 @@ void Application::setFileLoggerEnabled(const bool value) QString Application::fileLoggerPath() const { return settings()->loadValue(KEY_FILELOGGER_PATH, - QVariant(specialFolderLocation(SpecialFolder::Data) + LOG_FOLDER)).toString(); + {specialFolderLocation(SpecialFolder::Data) + LOG_FOLDER}).toString(); } void Application::setFileLoggerPath(const QString &path) diff --git a/src/gui/search/pluginselectdialog.cpp b/src/gui/search/pluginselectdialog.cpp index 7bfa2a6d3..f8c2a16d8 100644 --- a/src/gui/search/pluginselectdialog.cpp +++ b/src/gui/search/pluginselectdialog.cpp @@ -234,7 +234,7 @@ void PluginSelectDialog::setRowColor(const int row, const QString &color) { QTreeWidgetItem *item = m_ui->pluginsTree->topLevelItem(row); for (int i = 0; i < m_ui->pluginsTree->columnCount(); ++i) { - item->setData(i, Qt::ForegroundRole, QVariant(QColor(color))); + item->setData(i, Qt::ForegroundRole, QColor(color)); } } @@ -289,7 +289,7 @@ void PluginSelectDialog::addNewPlugin(const QString &pluginName) // Handle icon if (QFile::exists(plugin->iconPath)) { // Good, we already have the icon - item->setData(PLUGIN_NAME, Qt::DecorationRole, QVariant(QIcon(plugin->iconPath))); + item->setData(PLUGIN_NAME, Qt::DecorationRole, QIcon(plugin->iconPath)); } else { // Icon is missing, we must download it diff --git a/src/gui/search/searchwidget.cpp b/src/gui/search/searchwidget.cpp index c731f997e..7cef57390 100644 --- a/src/gui/search/searchwidget.cpp +++ b/src/gui/search/searchwidget.cpp @@ -144,7 +144,7 @@ SearchWidget::SearchWidget(MainWindow *mainWindow) void SearchWidget::fillCatCombobox() { m_ui->comboCategory->clear(); - m_ui->comboCategory->addItem(SearchPluginManager::categoryFullName("all"), QVariant("all")); + m_ui->comboCategory->addItem(SearchPluginManager::categoryFullName("all"), "all"); using QStrPair = QPair; QVector tmpList; @@ -154,7 +154,7 @@ void SearchWidget::fillCatCombobox() for (const QStrPair &p : asConst(tmpList)) { qDebug("Supported category: %s", qUtf8Printable(p.second)); - m_ui->comboCategory->addItem(p.first, QVariant(p.second)); + m_ui->comboCategory->addItem(p.first, p.second); } if (m_ui->comboCategory->count() > 1) @@ -164,9 +164,9 @@ void SearchWidget::fillCatCombobox() void SearchWidget::fillPluginComboBox() { m_ui->selectPlugin->clear(); - m_ui->selectPlugin->addItem(tr("Only enabled"), QVariant("enabled")); - m_ui->selectPlugin->addItem(tr("All plugins"), QVariant("all")); - m_ui->selectPlugin->addItem(tr("Select..."), QVariant("multi")); + m_ui->selectPlugin->addItem(tr("Only enabled"), "enabled"); + m_ui->selectPlugin->addItem(tr("All plugins"), "all"); + m_ui->selectPlugin->addItem(tr("Select..."), "multi"); using QStrPair = QPair; QVector tmpList; @@ -175,7 +175,7 @@ void SearchWidget::fillPluginComboBox() std::sort(tmpList.begin(), tmpList.end(), [](const QStrPair &l, const QStrPair &r) { return (l.first < r.first); } ); for (const QStrPair &p : asConst(tmpList)) - m_ui->selectPlugin->addItem(p.first, QVariant(p.second)); + m_ui->selectPlugin->addItem(p.first, p.second); if (m_ui->selectPlugin->count() > 3) m_ui->selectPlugin->insertSeparator(3); diff --git a/src/gui/transferlistfilterswidget.cpp b/src/gui/transferlistfilterswidget.cpp index 5e17ba8f6..36f556a2f 100644 --- a/src/gui/transferlistfilterswidget.cpp +++ b/src/gui/transferlistfilterswidget.cpp @@ -151,31 +151,31 @@ StatusFilterWidget::StatusFilterWidget(QWidget *parent, TransferListWidget *tran // Add status filters auto *all = new QListWidgetItem(this); - all->setData(Qt::DisplayRole, QVariant(tr("All (0)", "this is for the status filter"))); + all->setData(Qt::DisplayRole, tr("All (0)", "this is for the status filter")); all->setData(Qt::DecorationRole, QIcon(":/icons/skin/filterall.svg")); auto *downloading = new QListWidgetItem(this); - downloading->setData(Qt::DisplayRole, QVariant(tr("Downloading (0)"))); + downloading->setData(Qt::DisplayRole, tr("Downloading (0)")); downloading->setData(Qt::DecorationRole, QIcon(":/icons/skin/downloading.svg")); auto *seeding = new QListWidgetItem(this); - seeding->setData(Qt::DisplayRole, QVariant(tr("Seeding (0)"))); + seeding->setData(Qt::DisplayRole, tr("Seeding (0)")); seeding->setData(Qt::DecorationRole, QIcon(":/icons/skin/uploading.svg")); auto *completed = new QListWidgetItem(this); - completed->setData(Qt::DisplayRole, QVariant(tr("Completed (0)"))); + completed->setData(Qt::DisplayRole, tr("Completed (0)")); completed->setData(Qt::DecorationRole, QIcon(":/icons/skin/completed.svg")); auto *resumed = new QListWidgetItem(this); - resumed->setData(Qt::DisplayRole, QVariant(tr("Resumed (0)"))); + resumed->setData(Qt::DisplayRole, tr("Resumed (0)")); resumed->setData(Qt::DecorationRole, QIcon(":/icons/skin/resumed.svg")); auto *paused = new QListWidgetItem(this); - paused->setData(Qt::DisplayRole, QVariant(tr("Paused (0)"))); + paused->setData(Qt::DisplayRole, tr("Paused (0)")); paused->setData(Qt::DecorationRole, QIcon(":/icons/skin/paused.svg")); auto *active = new QListWidgetItem(this); - active->setData(Qt::DisplayRole, QVariant(tr("Active (0)"))); + active->setData(Qt::DisplayRole, tr("Active (0)")); active->setData(Qt::DecorationRole, QIcon(":/icons/skin/filteractive.svg")); auto *inactive = new QListWidgetItem(this); - inactive->setData(Qt::DisplayRole, QVariant(tr("Inactive (0)"))); + inactive->setData(Qt::DisplayRole, tr("Inactive (0)")); inactive->setData(Qt::DecorationRole, QIcon(":/icons/skin/filterinactive.svg")); auto *errored = new QListWidgetItem(this); - errored->setData(Qt::DisplayRole, QVariant(tr("Errored (0)"))); + errored->setData(Qt::DisplayRole, tr("Errored (0)")); errored->setData(Qt::DecorationRole, QIcon(":/icons/skin/error.svg")); const Preferences *const pref = Preferences::instance(); @@ -190,17 +190,17 @@ StatusFilterWidget::~StatusFilterWidget() void StatusFilterWidget::updateTorrentNumbers() { - auto report = BitTorrent::Session::instance()->torrentStatusReport(); + const BitTorrent::TorrentStatusReport report = BitTorrent::Session::instance()->torrentStatusReport(); - item(TorrentFilter::All)->setData(Qt::DisplayRole, QVariant(tr("All (%1)").arg(report.nbActive + report.nbInactive))); - item(TorrentFilter::Downloading)->setData(Qt::DisplayRole, QVariant(tr("Downloading (%1)").arg(report.nbDownloading))); - item(TorrentFilter::Seeding)->setData(Qt::DisplayRole, QVariant(tr("Seeding (%1)").arg(report.nbSeeding))); - item(TorrentFilter::Completed)->setData(Qt::DisplayRole, QVariant(tr("Completed (%1)").arg(report.nbCompleted))); - item(TorrentFilter::Paused)->setData(Qt::DisplayRole, QVariant(tr("Paused (%1)").arg(report.nbPaused))); - item(TorrentFilter::Resumed)->setData(Qt::DisplayRole, QVariant(tr("Resumed (%1)").arg(report.nbResumed))); - item(TorrentFilter::Active)->setData(Qt::DisplayRole, QVariant(tr("Active (%1)").arg(report.nbActive))); - item(TorrentFilter::Inactive)->setData(Qt::DisplayRole, QVariant(tr("Inactive (%1)").arg(report.nbInactive))); - item(TorrentFilter::Errored)->setData(Qt::DisplayRole, QVariant(tr("Errored (%1)").arg(report.nbErrored))); + item(TorrentFilter::All)->setData(Qt::DisplayRole, tr("All (%1)").arg(report.nbActive + report.nbInactive)); + item(TorrentFilter::Downloading)->setData(Qt::DisplayRole, tr("Downloading (%1)").arg(report.nbDownloading)); + item(TorrentFilter::Seeding)->setData(Qt::DisplayRole, tr("Seeding (%1)").arg(report.nbSeeding)); + item(TorrentFilter::Completed)->setData(Qt::DisplayRole, tr("Completed (%1)").arg(report.nbCompleted)); + item(TorrentFilter::Paused)->setData(Qt::DisplayRole, tr("Paused (%1)").arg(report.nbPaused)); + item(TorrentFilter::Resumed)->setData(Qt::DisplayRole, tr("Resumed (%1)").arg(report.nbResumed)); + item(TorrentFilter::Active)->setData(Qt::DisplayRole, tr("Active (%1)").arg(report.nbActive)); + item(TorrentFilter::Inactive)->setData(Qt::DisplayRole, tr("Inactive (%1)").arg(report.nbInactive)); + item(TorrentFilter::Errored)->setData(Qt::DisplayRole, tr("Errored (%1)").arg(report.nbErrored)); } void StatusFilterWidget::showMenu(const QPoint &) {} @@ -220,16 +220,16 @@ TrackerFiltersList::TrackerFiltersList(QWidget *parent, TransferListWidget *tran , m_downloadTrackerFavicon(downloadFavicon) { auto *allTrackers = new QListWidgetItem(this); - allTrackers->setData(Qt::DisplayRole, QVariant(tr("All (0)", "this is for the tracker filter"))); + allTrackers->setData(Qt::DisplayRole, tr("All (0)", "this is for the tracker filter")); allTrackers->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon("network-server")); auto *noTracker = new QListWidgetItem(this); - noTracker->setData(Qt::DisplayRole, QVariant(tr("Trackerless (0)"))); + noTracker->setData(Qt::DisplayRole, tr("Trackerless (0)")); noTracker->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon("network-server")); auto *errorTracker = new QListWidgetItem(this); - errorTracker->setData(Qt::DisplayRole, QVariant(tr("Error (0)"))); + errorTracker->setData(Qt::DisplayRole, tr("Error (0)")); errorTracker->setData(Qt::DecorationRole, style()->standardIcon(QStyle::SP_MessageBoxCritical)); auto *warningTracker = new QListWidgetItem(this); - warningTracker->setData(Qt::DisplayRole, QVariant(tr("Warning (0)"))); + warningTracker->setData(Qt::DisplayRole, tr("Warning (0)")); warningTracker->setData(Qt::DecorationRole, style()->standardIcon(QStyle::SP_MessageBoxWarning)); m_trackers.insert("", QStringList()); @@ -460,7 +460,7 @@ void TrackerFiltersList::handleFavicoDownloadFinished(const Net::DownloadResult Utils::Fs::forceRemove(result.filePath); } else { - trackerItem->setData(Qt::DecorationRole, QVariant(QIcon(result.filePath))); + trackerItem->setData(Qt::DecorationRole, QIcon(result.filePath)); m_iconPaths.append(result.filePath); } }