mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-10-22 18:56:08 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #8585 from Chocobo1/lint

Browse source 
Fix compiler/clazy warnings
This commit is contained in:
Mike Tzou 2018-03-13 22:36:10 +08:00 committed by GitHub
commit e78b5202bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/base/bittorrent/session.cpp
View file

@ -123,8 +123,6 @@ namespace
QString convertIfaceNameToGuid(const QString &name);
#endif
inline SettingsStorage *settings() { return SettingsStorage::instance(); }
QStringMap map_cast(const QVariantMap &map)
{
QStringMap result;

2
src/base/rss/rss_autodownloader.cpp
View file

@ -275,7 +275,7 @@ void AutoDownloader::importRulesFromLegacyFormat(const QByteArray &data)
if (in.status() != QDataStream::Ok)
throw ParsingError(tr("Invalid data format"));
for (const QVariant &val : dict)
for (const QVariant &val : qAsConst(dict))
insertRule(AutoDownloadRule::fromLegacyDict(val.toHash()));
}

2
src/gui/downloadfromurldlg.h
View file

@ -107,7 +107,7 @@ class downloadFromURL : public QDialog, private Ui::downloadFromURL
}
}
}
if (!url_list_cleaned.size()) {
if (url_list_cleaned.isEmpty()) {
QMessageBox::warning(this, tr("No URL entered"), tr("Please type at least one URL."));
return;
}

8
src/gui/mainwindow.cpp
View file

@ -679,8 +679,8 @@ void MainWindow::displayRSSTab(bool enable)
if (!m_rssWidget) {
m_rssWidget = new RSSWidget(m_tabs);
connect(m_rssWidget.data(), &RSSWidget::unreadCountUpdated, this, &MainWindow::handleRSSUnreadCountUpdated);
int indexTab = m_tabs->addTab(m_rssWidget, tr("RSS (%1)").arg(RSS::Session::instance()->rootFolder()->unreadCount()));
#ifndef Q_OS_MAC
const int indexTab = m_tabs->addTab(m_rssWidget, tr("RSS (%1)").arg(RSS::Session::instance()->rootFolder()->unreadCount()));
m_tabs->setTabIcon(indexTab, GuiIconProvider::instance()->getIcon("application-rss+xml"));
#endif
}
@ -1388,7 +1388,9 @@ void MainWindow::loadPreferences(bool configureSession)
{
Logger::instance()->addMessage(tr("Options were saved successfully."));
const Preferences *const pref = Preferences::instance();
#ifndef Q_OS_MAC
#ifdef Q_OS_MAC
Q_UNUSED(configureSession);
#else
const bool newSystrayIntegration = pref->systrayIntegration();
m_ui->actionLock->setVisible(newSystrayIntegration);
if (newSystrayIntegration != (m_systrayIcon != 0)) {
@ -1877,8 +1879,8 @@ void MainWindow::on_actionExecutionLogs_triggered(bool checked)
if (checked) {
Q_ASSERT(!m_executionLog);
m_executionLog = new ExecutionLog(m_tabs, static_cast<Log::MsgType>(executionLogMsgTypes()));
int indexTab = m_tabs->addTab(m_executionLog, tr("Execution Log"));
#ifndef Q_OS_MAC
const int indexTab = m_tabs->addTab(m_executionLog, tr("Execution Log"));
m_tabs->setTabIcon(indexTab, GuiIconProvider::instance()->getIcon("view-calendar-journal"));
#endif
}

3
src/gui/properties/propertieswidget.cpp
View file

@ -579,6 +579,7 @@ void PropertiesWidget::openFolder(const QModelIndex &index, bool containingFolde
// Flush data
m_torrent->flushCache();
#ifdef Q_OS_MAC
Q_UNUSED(containingFolder);
MacUtils::openFiles(QSet<QString>{absolutePath});
#else
if (containingFolder)
@ -660,7 +661,7 @@ void PropertiesWidget::displayWebSeedListMenu(const QPoint &)
QAction *actCpy = nullptr;
QAction *actEdit = nullptr;
if (rows.size()) {
if (!rows.isEmpty()) {
actDel = seedMenu.addAction(GuiIconProvider::instance()->getIcon("list-remove"), tr("Remove Web seed"));
seedMenu.addSeparator();
actCpy = seedMenu.addAction(GuiIconProvider::instance()->getIcon("edit-copy"), tr("Copy Web seed URL"));

2
src/gui/properties/trackerlist.cpp
View file

@ -446,8 +446,6 @@ void TrackerList::editSelectedTracker()
BitTorrent::TorrentHandle *const torrent = m_properties->getCurrentTorrent();
if (!torrent) return;
QString hash = torrent->hash();
QList<QTreeWidgetItem *> selectedTrackerItems = getSelectedTrackerItems();
if (selectedTrackerItems.isEmpty()) return;

3
src/webui/api/torrentscontroller.cpp
View file

@ -43,6 +43,7 @@
#include "base/bittorrent/torrenthandle.h"
#include "base/bittorrent/torrentinfo.h"
#include "base/bittorrent/trackerentry.h"
#include "base/global.h"
#include "base/logger.h"
#include "base/net/downloadmanager.h"
#include "base/torrentfilter.h"
@ -493,7 +494,7 @@ void TorrentsController::addAction()
params.downloadLimit = (dlLimit > 0) ? dlLimit : -1;
bool partialSuccess = false;
for (QString url : urls.split('\n')) {
for (QString url : copyAsConst(urls.split('\n'))) {
url = url.trimmed();
if (!url.isEmpty()) {
Net::DownloadManager::instance()->setCookiesFromUrl(cookies, QUrl::fromEncoded(url.toUtf8()));