From 91beccb30429007771ed8e58c307311693185006 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20St=C3=B6neberg?= Date: Sat, 7 Mar 2020 11:33:08 +0100 Subject: [PATCH] fixed some clang-tidy warnings in gui code (#2565) --- gui/applicationlist.cpp | 2 +- gui/applicationlist.h | 2 +- gui/checkthread.cpp | 2 +- gui/common.cpp | 2 +- gui/librarydialog.cpp | 2 +- gui/librarydialog.h | 2 +- gui/mainwindow.cpp | 2 +- gui/mainwindow.h | 2 +- gui/projectfile.cpp | 12 ++++++------ gui/resultstree.cpp | 2 +- gui/resultstree.h | 2 +- gui/resultsview.cpp | 6 +++--- gui/resultsview.h | 4 ++-- gui/threadhandler.cpp | 4 ++-- gui/threadhandler.h | 2 +- 15 files changed, 24 insertions(+), 24 deletions(-) diff --git a/gui/applicationlist.cpp b/gui/applicationlist.cpp index 03e8e02fe..3676b5fd5 100644 --- a/gui/applicationlist.cpp +++ b/gui/applicationlist.cpp @@ -185,7 +185,7 @@ void ApplicationList::clear() mDefaultApplicationIndex = -1; } -bool ApplicationList::checkAndAddApplication(QString appPath, QString name, QString parameters) +bool ApplicationList::checkAndAddApplication(const QString& appPath, const QString& name, const QString& parameters) { if (QFileInfo(appPath).exists() && QFileInfo(appPath).isExecutable()) { Application app; diff --git a/gui/applicationlist.h b/gui/applicationlist.h index 019b7a53b..64036ef25 100644 --- a/gui/applicationlist.h +++ b/gui/applicationlist.h @@ -116,7 +116,7 @@ protected: private: - bool checkAndAddApplication(QString appPath, QString name, QString parameters); + bool checkAndAddApplication(const QString& appPath, const QString& name, const QString& parameters); /** * @brief List of applications diff --git a/gui/checkthread.cpp b/gui/checkthread.cpp index ff9b58b22..9dc7c6d21 100644 --- a/gui/checkthread.cpp +++ b/gui/checkthread.cpp @@ -70,7 +70,7 @@ void CheckThread::run() const std::string &buildDir = mCppcheck.settings().buildDir; if (!buildDir.empty()) { std::map files2; - for (QString file : mFiles) + for (const QString& file : mFiles) files2[file.toStdString()] = 0; mCppcheck.analyseWholeProgram(buildDir, files2); } diff --git a/gui/common.cpp b/gui/common.cpp index ccb95909f..05318f43b 100644 --- a/gui/common.cpp +++ b/gui/common.cpp @@ -60,7 +60,7 @@ QString toFilterString(const QMap& filters, bool addAllSupporte // We're using the description of the filters as the map keys, the file // name patterns are our values. The generated filter string list will // thus be sorted alphabetically over the descriptions. - for (auto k: filters.keys()) { + for (const auto& k: filters.keys()) { entries << QString("%1 (%2)").arg(k).arg(filters.value(k)); } diff --git a/gui/librarydialog.cpp b/gui/librarydialog.cpp index c2d971dd8..3fdcff551 100644 --- a/gui/librarydialog.cpp +++ b/gui/librarydialog.cpp @@ -271,7 +271,7 @@ void LibraryDialog::sortFunctions(bool sort) } } -void LibraryDialog::filterFunctions(QString filter) +void LibraryDialog::filterFunctions(const QString& filter) { QList allItems = mUi->functions->findItems(QString(), Qt::MatchContains); diff --git a/gui/librarydialog.h b/gui/librarydialog.h index ffb26b297..53146d247 100644 --- a/gui/librarydialog.h +++ b/gui/librarydialog.h @@ -47,7 +47,7 @@ private slots: void changeFunction(); void editArg(); void editFunctionName(QListWidgetItem*); - void filterFunctions(QString); + void filterFunctions(const QString&); void selectFunction(); void sortFunctions(bool); diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp index 819af903c..b6f609b37 100644 --- a/gui/mainwindow.cpp +++ b/gui/mainwindow.cpp @@ -762,7 +762,7 @@ Library::Error MainWindow::loadLibrary(Library *library, const QString &filename return ret; } -bool MainWindow::tryLoadLibrary(Library *library, QString filename) +bool MainWindow::tryLoadLibrary(Library *library, const QString& filename) { const Library::Error error = loadLibrary(library, filename); if (error.errorcode != Library::ErrorCode::OK) { diff --git a/gui/mainwindow.h b/gui/mainwindow.h index 6812b17c8..ab8d52bda 100644 --- a/gui/mainwindow.h +++ b/gui/mainwindow.h @@ -384,7 +384,7 @@ private: * @param filename filename (no path) * @return True if no error */ - bool tryLoadLibrary(Library *library, QString filename); + bool tryLoadLibrary(Library *library, const QString& filename); /** * @brief Update project MRU items in File-menu. diff --git a/gui/projectfile.cpp b/gui/projectfile.cpp index d4c2f9bc7..d1892fe52 100644 --- a/gui/projectfile.cpp +++ b/gui/projectfile.cpp @@ -241,7 +241,7 @@ void ProjectFile::readBuildDir(QXmlStreamReader &reader) case QXmlStreamReader::ProcessingInstruction: break; } - } while (1); + } while (true); } void ProjectFile::readImportProject(QXmlStreamReader &reader) @@ -266,7 +266,7 @@ void ProjectFile::readImportProject(QXmlStreamReader &reader) case QXmlStreamReader::ProcessingInstruction: break; } - } while (1); + } while (true); } bool ProjectFile::readBool(QXmlStreamReader &reader) @@ -291,7 +291,7 @@ bool ProjectFile::readBool(QXmlStreamReader &reader) case QXmlStreamReader::ProcessingInstruction: break; } - } while (1); + } while (true); } int ProjectFile::readInt(QXmlStreamReader &reader, int defaultValue) @@ -316,7 +316,7 @@ int ProjectFile::readInt(QXmlStreamReader &reader, int defaultValue) case QXmlStreamReader::ProcessingInstruction: break; } - } while (1); + } while (true); } void ProjectFile::readIncludeDirs(QXmlStreamReader &reader) @@ -537,7 +537,7 @@ void ProjectFile::readPlatform(QXmlStreamReader &reader) case QXmlStreamReader::ProcessingInstruction: break; } - } while (1); + } while (true); } @@ -912,7 +912,7 @@ void ProjectFile::SafeChecks::loadFromXml(QXmlStreamReader &xmlReader) case QXmlStreamReader::ProcessingInstruction: break; } - } while (1); + } while (true); } void ProjectFile::SafeChecks::saveToXml(QXmlStreamWriter &xmlWriter) const diff --git a/gui/resultstree.cpp b/gui/resultstree.cpp index e9c9e65df..4bccc4076 100644 --- a/gui/resultstree.cpp +++ b/gui/resultstree.cpp @@ -1243,7 +1243,7 @@ void ResultsTree::setCheckDirectory(const QString &dir) } -QString ResultsTree::getCheckDirectory(void) +QString ResultsTree::getCheckDirectory() { return mCheckPath; } diff --git a/gui/resultstree.h b/gui/resultstree.h index dfb4e92f9..bb9a1ee0e 100644 --- a/gui/resultstree.h +++ b/gui/resultstree.h @@ -128,7 +128,7 @@ public: * @return Directory containing source files */ - QString getCheckDirectory(void); + QString getCheckDirectory(); /** * @brief Check if there are any visible results in view. diff --git a/gui/resultsview.cpp b/gui/resultsview.cpp index 52a212fa3..a79d21480 100644 --- a/gui/resultsview.cpp +++ b/gui/resultsview.cpp @@ -251,7 +251,7 @@ void ResultsView::setCheckDirectory(const QString &dir) mUI.mTree->setCheckDirectory(dir); } -QString ResultsView::getCheckDirectory(void) +QString ResultsView::getCheckDirectory() { return mUI.mTree->getCheckDirectory(); } @@ -433,9 +433,9 @@ void ResultsView::debugError(const ErrorItem &item) mUI.mListLog->addItem(item.ToString()); } -void ResultsView::bughuntingReportLine(QString line) +void ResultsView::bughuntingReportLine(const QString& line) { - for (QString s: line.split("\n")) { + for (const QString& s: line.split("\n")) { if (s.isEmpty()) continue; if (s.startsWith("[function-report] ")) diff --git a/gui/resultsview.h b/gui/resultsview.h index 269cf7ff5..90aa63101 100644 --- a/gui/resultsview.h +++ b/gui/resultsview.h @@ -131,7 +131,7 @@ public: * @return Directory containing source files */ - QString getCheckDirectory(void); + QString getCheckDirectory(); /** * @brief Inform the view that checking has started @@ -326,7 +326,7 @@ public slots: /** * \brief bughunting report line */ - void bughuntingReportLine(QString line); + void bughuntingReportLine(const QString& line); /** * \brief Clear log messages diff --git a/gui/threadhandler.cpp b/gui/threadhandler.cpp index 2562d624b..2e7187af3 100644 --- a/gui/threadhandler.cpp +++ b/gui/threadhandler.cpp @@ -69,7 +69,7 @@ void ThreadHandler::setCheckFiles(bool all) } } -void ThreadHandler::setCheckFiles(QStringList files) +void ThreadHandler::setCheckFiles(const QStringList& files) { if (mRunningThreadCount == 0) { mResults.setFiles(files); @@ -287,5 +287,5 @@ QDateTime ThreadHandler::getCheckStartTime() const void ThreadHandler::setCheckStartTime(QDateTime checkStartTime) { - mCheckStartTime = checkStartTime; + mCheckStartTime = std::move(checkStartTime); } diff --git a/gui/threadhandler.h b/gui/threadhandler.h index ceb276f82..059b88d17 100644 --- a/gui/threadhandler.h +++ b/gui/threadhandler.h @@ -128,7 +128,7 @@ public: * * @param files list of files to be checked */ - void setCheckFiles(QStringList files); + void setCheckFiles(const QStringList& files); /** * @brief Is checking running?