d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-11 15:27:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6766 from Chocobo1/fix

Browse Source 
Cleanups
This commit is contained in:
Mike Tzou 2017-05-10 21:03:54 +08:00 committed by GitHub
commit c44efbd965
18 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/application.cpp
View File

@ -178,11 +178,11 @@ QString Application::fileLoggerPath() const
QVariant(specialFolderLocation(SpecialFolder::Data) + LOG_FOLDER)).toString();
}
void Application::setFileLoggerPath(const QString &value)
void Application::setFileLoggerPath(const QString &path)
{
if (m_fileLogger)
m_fileLogger->changePath(value);
settings()->storeValue(KEY_FILELOGGER_PATH, value);
m_fileLogger->changePath(path);
settings()->storeValue(KEY_FILELOGGER_PATH, path);
}
bool Application::isFileLoggerBackup() const

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

@ -180,7 +180,7 @@ namespace
{
}
T operator()(T val)
T operator()(T val) const
{
return val <= m_limit ? m_ret : val;
}

2
src/base/bittorrent/session.h
View File

@ -316,7 +316,7 @@ namespace BitTorrent
bool isTrackerFilteringEnabled() const;
void setTrackerFilteringEnabled(bool enabled);
QStringList bannedIPs() const;
void setBannedIPs(const QStringList &list);
void setBannedIPs(const QStringList &newList);
void startUpTorrents();
TorrentHandle *findTorrent(const InfoHash &hash) const;

3
src/base/bittorrent/torrenthandle.cpp
View File

@ -74,6 +74,7 @@ AddTorrentData::AddTorrentData()
: resumed(false)
, disableTempPath(false)
, sequential(false)
, firstLastPiecePriority(false)
, hasSeedStatus(false)
, skipChecking(false)
, hasRootFolder(true)
@ -1655,7 +1656,7 @@ void TorrentHandle::handleMetadataReceivedAlert(libt::metadata_received_alert *p
m_speedMonitor.reset();
m_session->handleTorrentPaused(this);
}
// If first/last piece priority was specified when adding this torrent, we can set it
// now that we have metadata:
if (m_needsToSetFirstLastPiecePriority) {

2
src/base/bittorrent/trackerentry.cpp
View File

@ -84,7 +84,7 @@ TrackerEntry &TrackerEntry::operator=(const TrackerEntry &other)
return *this;
}
bool TrackerEntry::operator==(const TrackerEntry &other)
bool TrackerEntry::operator==(const TrackerEntry &other) const
{
return (QUrl(url()) == QUrl(other.url()));
}

2
src/base/bittorrent/trackerentry.h
View File

@ -60,7 +60,7 @@ namespace BitTorrent
void setTier(int value);
TrackerEntry &operator=(const TrackerEntry &other);
bool operator==(const TrackerEntry &other);
bool operator==(const TrackerEntry &other) const;
libtorrent::announce_entry nativeEntry() const;

2
src/base/net/smtp.h
View File

@ -62,7 +62,7 @@ namespace Net
Smtp(QObject *parent = 0);
~Smtp();
void sendMail(const QString &m_from, const QString &to, const QString &subject, const QString &body);
void sendMail(const QString &from, const QString &to, const QString &subject, const QString &body);
private slots:
void readyRead();

4
src/base/rss/rss_autodownloadrule.cpp
View File

@ -430,9 +430,9 @@ QStringList AutoDownloadRule::feedURLs() const
return m_dataPtr->feedURLs;
}
void AutoDownloadRule::setFeedURLs(const QStringList &rssFeeds)
void AutoDownloadRule::setFeedURLs(const QStringList &urls)
{
m_dataPtr->feedURLs = rssFeeds;
m_dataPtr->feedURLs = urls;
}
QString AutoDownloadRule::name() const

4
src/base/rss/rss_autodownloadrule.h
View File

@ -59,7 +59,7 @@ namespace RSS
QString mustNotContain() const;
void setMustNotContain(const QString &tokens);
QStringList feedURLs() const;
void setFeedURLs(const QStringList &feedURLs);
void setFeedURLs(const QStringList &urls);
int ignoreDays() const;
void setIgnoreDays(int d);
QDateTime lastMatch() const;
@ -74,7 +74,7 @@ namespace RSS
TriStateBool addPaused() const;
void setAddPaused(const TriStateBool &addPaused);
QString assignedCategory() const;
void setCategory(const QString &assignedCategory);
void setCategory(const QString &category);
bool matches(const QString &articleTitle) const;

4
src/base/torrentfilter.cpp
View File

@ -49,14 +49,14 @@ TorrentFilter::TorrentFilter()
{
}
TorrentFilter::TorrentFilter(Type type, QStringSet hashSet, QString category)
TorrentFilter::TorrentFilter(const Type type, const QStringSet &hashSet, const QString &category)
: m_type(type)
, m_category(category)
, m_hashSet(hashSet)
{
}
TorrentFilter::TorrentFilter(QString filter, QStringSet hashSet, QString category)
TorrentFilter::TorrentFilter(const QString &filter, const QStringSet &hashSet, const QString &category)
: m_type(All)
, m_category(category)
, m_hashSet(hashSet)

4
src/base/torrentfilter.h
View File

@ -72,8 +72,8 @@ public:
TorrentFilter();
// category: pass empty string for "no category" or null string (QString()) for "any category"
TorrentFilter(Type type, QStringSet hashSet = AnyHash, QString category = AnyCategory);
TorrentFilter(QString filter, QStringSet hashSet = AnyHash, QString category = AnyCategory);
TorrentFilter(const Type type, const QStringSet &hashSet = AnyHash, const QString &category = AnyCategory);
TorrentFilter(const QString &filter, const QStringSet &hashSet = AnyHash, const QString &category = AnyCategory);
bool setType(Type type);
bool setTypeByName(const QString &filter);

11
src/gui/addnewtorrentdialog.cpp
View File

@ -78,8 +78,8 @@ namespace
AddNewTorrentDialog::AddNewTorrentDialog(const BitTorrent::AddTorrentParams &inParams, QWidget *parent)
: QDialog(parent)
, ui(new Ui::AddNewTorrentDialog)
, m_contentModel(0)
, m_contentDelegate(0)
, m_contentModel(nullptr)
, m_contentDelegate(nullptr)
, m_hasMetadata(false)
, m_oldIndex(0)
, m_torrentParams(inParams)
@ -138,7 +138,7 @@ AddNewTorrentDialog::AddNewTorrentDialog(const BitTorrent::AddTorrentParams &inP
// Signal / slots
connect(ui->adv_button, SIGNAL(clicked(bool)), SLOT(showAdvancedSettings(bool)));
connect(ui->doNotDeleteTorrentCheckBox, SIGNAL(clicked(bool)), SLOT(doNotDeleteTorrentClicked(bool)));
editHotkey = new QShortcut(Qt::Key_F2, ui->contentTreeView, 0, 0, Qt::WidgetShortcut);
QShortcut *editHotkey = new QShortcut(Qt::Key_F2, ui->contentTreeView, 0, 0, Qt::WidgetShortcut);
connect(editHotkey, SIGNAL(activated()), SLOT(renameSelectedFile()));
connect(ui->contentTreeView, SIGNAL(doubleClicked(QModelIndex)), SLOT(renameSelectedFile()));
@ -148,10 +148,9 @@ AddNewTorrentDialog::AddNewTorrentDialog(const BitTorrent::AddTorrentParams &inP
AddNewTorrentDialog::~AddNewTorrentDialog()
{
saveState();
delete m_contentDelegate;
delete ui;
if (m_contentModel)
delete m_contentModel;
delete editHotkey;
}
bool AddNewTorrentDialog::isEnabled()

1
src/gui/addnewtorrentdialog.h
View File

@ -110,7 +110,6 @@ private:
QString m_filePath;
BitTorrent::InfoHash m_hash;
BitTorrent::TorrentInfo m_torrentInfo;
QShortcut *editHotkey;
QByteArray m_headerState;
int m_oldIndex;
QScopedPointer<TorrentFileGuard> m_torrentGuard;

2
src/gui/ico.h
View File

@ -41,7 +41,7 @@ public:
ICOHandler();
bool canRead() const;
bool read(QImage *image);
bool read(QImage *outImage);
bool write(const QImage &image);
QByteArray name() const;

2
src/gui/mainwindow.h
View File

@ -199,7 +199,7 @@ private:
void dragEnterEvent(QDragEnterEvent *event) override;
void closeEvent(QCloseEvent *) override;
void showEvent(QShowEvent *) override;
bool event(QEvent *event) override;
bool event(QEvent *e) override;
void displayRSSTab(bool enable);
void displaySearchTab(bool enable);

4
src/gui/optionsdlg.h
View File

@ -82,7 +82,7 @@ public slots:
void showConnectionTab();
private slots:
void enableProxy(int comboIndex);
void enableProxy(int index);
void on_buttonBox_accepted();
void closeEvent(QCloseEvent *e);
void on_buttonBox_rejected();
@ -107,7 +107,7 @@ private slots:
void on_btnWebUiCrt_clicked();
void on_btnWebUiKey_clicked();
void on_registerDNSBtn_clicked();
void setLocale(const QString &locale);
void setLocale(const QString &localeStr);
private:
// Methods

4
src/gui/search/searchsortmodel.cpp
View File

@ -40,9 +40,9 @@ SearchSortModel::SearchSortModel(QObject *parent)
{
}
void SearchSortModel::enableNameFilter(bool enable)
void SearchSortModel::enableNameFilter(bool enabled)
{
m_isNameFilterEnabled = enable;
m_isNameFilterEnabled = enabled;
}
void SearchSortModel::setNameFilter(const QString &searchTerm)

2
src/gui/transferlistfilterswidget.h
View File

@ -111,7 +111,7 @@ public slots:
private slots:
void handleFavicoDownload(const QString &url, const QString &filePath);
void handleFavicoFailure(const QString &url, const QString &reason);
void handleFavicoFailure(const QString &url, const QString &error);
private:
// These 4 methods are virtual slots in the base class.