From 42c17ea5ce14292dab2562229b0fcae06234f701 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Tue, 9 May 2017 13:55:24 +0800 Subject: [PATCH] Fix argument name differ in definition & declaration --- src/app/application.cpp | 6 +++--- src/base/bittorrent/session.h | 2 +- src/base/net/smtp.h | 2 +- src/base/rss/rss_autodownloadrule.cpp | 4 ++-- src/base/rss/rss_autodownloadrule.h | 4 ++-- src/gui/ico.h | 2 +- src/gui/mainwindow.h | 2 +- src/gui/optionsdlg.h | 4 ++-- src/gui/search/searchsortmodel.cpp | 4 ++-- src/gui/transferlistfilterswidget.h | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/app/application.cpp b/src/app/application.cpp index a289c8e36..7052051ff 100644 --- a/src/app/application.cpp +++ b/src/app/application.cpp @@ -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 diff --git a/src/base/bittorrent/session.h b/src/base/bittorrent/session.h index dc7d6cfcd..34724a75a 100644 --- a/src/base/bittorrent/session.h +++ b/src/base/bittorrent/session.h @@ -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; diff --git a/src/base/net/smtp.h b/src/base/net/smtp.h index b6a37749f..6c1b9b9ee 100644 --- a/src/base/net/smtp.h +++ b/src/base/net/smtp.h @@ -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(); diff --git a/src/base/rss/rss_autodownloadrule.cpp b/src/base/rss/rss_autodownloadrule.cpp index e32bfa584..48c194621 100644 --- a/src/base/rss/rss_autodownloadrule.cpp +++ b/src/base/rss/rss_autodownloadrule.cpp @@ -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 diff --git a/src/base/rss/rss_autodownloadrule.h b/src/base/rss/rss_autodownloadrule.h index d02d67b89..6b79fe3a5 100644 --- a/src/base/rss/rss_autodownloadrule.h +++ b/src/base/rss/rss_autodownloadrule.h @@ -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; diff --git a/src/gui/ico.h b/src/gui/ico.h index a9cf548b8..414afb7ef 100644 --- a/src/gui/ico.h +++ b/src/gui/ico.h @@ -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; diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h index c94f8be7d..80966c20b 100644 --- a/src/gui/mainwindow.h +++ b/src/gui/mainwindow.h @@ -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); diff --git a/src/gui/optionsdlg.h b/src/gui/optionsdlg.h index ee874ba20..294a3c90c 100644 --- a/src/gui/optionsdlg.h +++ b/src/gui/optionsdlg.h @@ -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 diff --git a/src/gui/search/searchsortmodel.cpp b/src/gui/search/searchsortmodel.cpp index 4ef87af69..f5d24ff45 100644 --- a/src/gui/search/searchsortmodel.cpp +++ b/src/gui/search/searchsortmodel.cpp @@ -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) diff --git a/src/gui/transferlistfilterswidget.h b/src/gui/transferlistfilterswidget.h index b2b7ad0f5..2a661a7a1 100644 --- a/src/gui/transferlistfilterswidget.h +++ b/src/gui/transferlistfilterswidget.h @@ -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.