From 4a9b921ccf8800d422c6f57cb83bca5e1f80bbd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= Date: Wed, 27 Dec 2023 10:36:18 +0100 Subject: [PATCH] Fix two types of Clazy warnings (#5807) Chained QString::arg, replace inclusion of QtCore --- gui/codeeditor.cpp | 17 ++++--- gui/common.cpp | 2 +- gui/compliancereportdialog.cpp | 4 +- gui/cppchecklibrarydata.cpp | 4 +- gui/csvreport.cpp | 4 +- gui/librarydialog.cpp | 2 +- gui/main.cpp | 1 - gui/mainwindow.cpp | 12 ++--- gui/printablereport.cpp | 2 +- gui/projectfiledialog.cpp | 1 - gui/resultstree.cpp | 2 +- gui/resultsview.cpp | 2 +- gui/statsdialog.cpp | 86 +++++++++++++++++----------------- 13 files changed, 68 insertions(+), 71 deletions(-) diff --git a/gui/codeeditor.cpp b/gui/codeeditor.cpp index b48b3a9bc..a407bcdb5 100644 --- a/gui/codeeditor.cpp +++ b/gui/codeeditor.cpp @@ -22,6 +22,7 @@ #include #include +#include #include #include #include @@ -37,7 +38,6 @@ #include #include #include -#include class QTextDocument; @@ -448,15 +448,14 @@ void CodeEditor::lineNumberAreaPaintEvent(const QPaintEvent *event) QString CodeEditor::generateStyleString() { QString bgcolor = QString("background:rgb(%1,%2,%3);") - .arg(mWidgetStyle->widgetBGColor.red()) - .arg(mWidgetStyle->widgetBGColor.green()) - .arg(mWidgetStyle->widgetBGColor.blue()); + .arg(mWidgetStyle->widgetBGColor.red(), + mWidgetStyle->widgetBGColor.green(), + mWidgetStyle->widgetBGColor.blue()); QString fgcolor = QString("color:rgb(%1,%2,%3);") - .arg(mWidgetStyle->widgetFGColor.red()) - .arg(mWidgetStyle->widgetFGColor.green()) - .arg(mWidgetStyle->widgetFGColor.blue()); + .arg(mWidgetStyle->widgetFGColor.red(), + mWidgetStyle->widgetFGColor.green(), + mWidgetStyle->widgetFGColor.blue()); QString style = QString("%1 %2") - .arg(bgcolor) - .arg(fgcolor); + .arg(bgcolor, fgcolor); return style; } diff --git a/gui/common.cpp b/gui/common.cpp index a1547538d..c0a5541d8 100644 --- a/gui/common.cpp +++ b/gui/common.cpp @@ -66,7 +66,7 @@ QString toFilterString(const QMap& filters, bool addAllSupporte // name patterns are our values. The generated filter string list will // thus be sorted alphabetically over the descriptions. for (const auto& k: filters.keys()) { - entries << QString("%1 (%2)").arg(k).arg(filters.value(k)); + entries << QString("%1 (%2)").arg(k, filters.value(k)); } return entries.join(";;"); diff --git a/gui/compliancereportdialog.cpp b/gui/compliancereportdialog.cpp index adcb25b4d..316a71e40 100644 --- a/gui/compliancereportdialog.cpp +++ b/gui/compliancereportdialog.cpp @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -52,7 +53,6 @@ #include #include #include -#include static void addHeaders(const QString& file1, QSet &allFiles) { if (allFiles.contains(file1)) @@ -170,7 +170,7 @@ void ComplianceReportDialog::save() } catch (InternalError &e) { QMessageBox msg(QMessageBox::Critical, tr("Save compliance report"), - tr("Failed to import '%1' (%2), can not show files in compliance report").arg(prjfile).arg(QString::fromStdString(e.errorMessage)), + tr("Failed to import '%1' (%2), can not show files in compliance report").arg(prjfile, QString::fromStdString(e.errorMessage)), QMessageBox::Ok, this); msg.exec(); diff --git a/gui/cppchecklibrarydata.cpp b/gui/cppchecklibrarydata.cpp index 58caadf03..6840a2cb7 100644 --- a/gui/cppchecklibrarydata.cpp +++ b/gui/cppchecklibrarydata.cpp @@ -46,8 +46,8 @@ static std::string mandatoryAttibuteMissing(const QXmlStreamReader &xmlReader, c { throw std::runtime_error(QObject::tr("line %1: Mandatory attribute '%2' missing in '%3'") .arg(xmlReader.lineNumber()) - .arg(attributeName) - .arg(xmlReader.name().toString()).toStdString()); + .arg(attributeName, xmlReader.name().toString()) + .toStdString()); } static CppcheckLibraryData::Container loadContainer(QXmlStreamReader &xmlReader) diff --git a/gui/csvreport.cpp b/gui/csvreport.cpp index 740651cf0..eb12eea37 100644 --- a/gui/csvreport.cpp +++ b/gui/csvreport.cpp @@ -62,8 +62,8 @@ void CsvReport::writeError(const ErrorItem &error) */ const QString file = QDir::toNativeSeparators(error.errorPath.back().file); - QString line = QString("%1,%2,").arg(file).arg(error.errorPath.back().line); - line += QString("%1,%2,%3").arg(GuiSeverity::toString(error.severity)).arg(error.errorId).arg(error.summary); + QString line = QString("%1,%2,").arg(file, error.errorPath.back().line); + line += QString("%1,%2,%3").arg(GuiSeverity::toString(error.severity), error.errorId, error.summary); #if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)) mTxtWriter << line << Qt::endl; #else diff --git a/gui/librarydialog.cpp b/gui/librarydialog.cpp index b881ea12e..e42417cbb 100644 --- a/gui/librarydialog.cpp +++ b/gui/librarydialog.cpp @@ -121,7 +121,7 @@ void LibraryDialog::openCfg() if (!errmsg.isNull()) { QMessageBox msg(QMessageBox::Critical, tr("Cppcheck"), - tr("Failed to load %1. %2.").arg(selectedFile).arg(errmsg), + tr("Failed to load %1. %2.").arg(selectedFile, errmsg), QMessageBox::Ok, this); msg.exec(); diff --git a/gui/main.cpp b/gui/main.cpp index 4ea7c331b..989e85a55 100644 --- a/gui/main.cpp +++ b/gui/main.cpp @@ -39,7 +39,6 @@ #include #include #include -#include static void ShowUsage(); diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp index b454ee395..584b177ef 100644 --- a/gui/mainwindow.cpp +++ b/gui/mainwindow.cpp @@ -861,7 +861,7 @@ bool MainWindow::tryLoadLibrary(Library *library, const QString& filename) const Library::Error error = loadLibrary(library, filename); if (error.errorcode != Library::ErrorCode::OK) { if (error.errorcode == Library::ErrorCode::UNKNOWN_ELEMENT) { - QMessageBox::information(this, tr("Information"), tr("The library '%1' contains unknown elements:\n%2").arg(filename).arg(error.reason.c_str())); + QMessageBox::information(this, tr("Information"), tr("The library '%1' contains unknown elements:\n%2").arg(filename, error.reason.c_str())); return true; } @@ -899,7 +899,7 @@ bool MainWindow::tryLoadLibrary(Library *library, const QString& filename) } if (!error.reason.empty()) errmsg += " '" + QString::fromStdString(error.reason) + "'"; - QMessageBox::information(this, tr("Information"), tr("Failed to load the selected library '%1'.\n%2").arg(filename).arg(errmsg)); + QMessageBox::information(this, tr("Information"), tr("Failed to load the selected library '%1'.\n%2").arg(filename, errmsg)); return false; } return true; @@ -958,7 +958,7 @@ Settings MainWindow::getCppcheckSettings() { const QString cfgErr = QString::fromStdString(result.loadCppcheckCfg()); if (!cfgErr.isEmpty()) - QMessageBox::critical(this, tr("Error"), tr("Failed to load %1 - %2").arg("cppcheck.cfg").arg(cfgErr)); + QMessageBox::critical(this, tr("Error"), tr("Failed to load %1 - %2").arg("cppcheck.cfg", cfgErr)); const auto cfgAddons = result.addons; result.addons.clear(); @@ -1787,7 +1787,7 @@ void MainWindow::analyzeProject(const ProjectFile *projectFile, const bool check if (!errorMessage.isEmpty()) { QMessageBox msg(QMessageBox::Critical, tr("Cppcheck"), - tr("Failed to import '%1': %2\n\nAnalysis is stopped.").arg(prjfile).arg(errorMessage), + tr("Failed to import '%1': %2\n\nAnalysis is stopped.").arg(prjfile, errorMessage), QMessageBox::Ok, this); msg.exec(); @@ -1796,7 +1796,7 @@ void MainWindow::analyzeProject(const ProjectFile *projectFile, const bool check } catch (InternalError &e) { QMessageBox msg(QMessageBox::Critical, tr("Cppcheck"), - tr("Failed to import '%1' (%2), analysis is stopped").arg(prjfile).arg(QString::fromStdString(e.errorMessage)), + tr("Failed to import '%1' (%2), analysis is stopped").arg(prjfile, QString::fromStdString(e.errorMessage)), QMessageBox::Ok, this); msg.exec(); @@ -2100,7 +2100,7 @@ void MainWindow::replyFinished(QNetworkReply *reply) { } mUI->mButtonHideInformation->setVisible(true); mUI->mLabelInformation->setVisible(true); - mUI->mLabelInformation->setText(tr("New version available: %1. %2").arg(str.trimmed()).arg(install)); + mUI->mLabelInformation->setText(tr("New version available: %1. %2").arg(str.trimmed(), install)); } } } diff --git a/gui/printablereport.cpp b/gui/printablereport.cpp index d9272632f..b95f9acd5 100644 --- a/gui/printablereport.cpp +++ b/gui/printablereport.cpp @@ -46,7 +46,7 @@ void PrintableReport::writeError(const ErrorItem &error) { const QString file = QDir::toNativeSeparators(error.errorPath.back().file); QString line = QString("%1,%2,").arg(file).arg(error.errorPath.back().line); - line += QString("%1,%2").arg(GuiSeverity::toString(error.severity)).arg(error.summary); + line += QString("%1,%2").arg(GuiSeverity::toString(error.severity), error.summary); mFormattedReport += line; mFormattedReport += "\n"; diff --git a/gui/projectfiledialog.cpp b/gui/projectfiledialog.cpp index 89eaf3d1e..ecf2d3408 100644 --- a/gui/projectfiledialog.cpp +++ b/gui/projectfiledialog.cpp @@ -55,7 +55,6 @@ #include #include #include -#include static constexpr char ADDON_MISRA[] = "misra"; static constexpr char CODING_STANDARD_MISRA_C_2023[] = "misra-c-2023"; diff --git a/gui/resultstree.cpp b/gui/resultstree.cpp index 16dbbc628..ec1777ad5 100644 --- a/gui/resultstree.cpp +++ b/gui/resultstree.cpp @@ -816,7 +816,7 @@ void ResultsTree::startApplication(const QStandardItem *target, int application) } #endif // Q_OS_WIN - const QString cmdLine = QString("%1 %2").arg(program).arg(params); + const QString cmdLine = QString("%1 %2").arg(program, params); // this is reported as deprecated in Qt 5.15.2 but no longer in Qt 6 #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) diff --git a/gui/resultsview.cpp b/gui/resultsview.cpp index b073b6625..489d6d3aa 100644 --- a/gui/resultsview.cpp +++ b/gui/resultsview.cpp @@ -463,7 +463,7 @@ void ResultsView::updateDetails(const QModelIndex &index) const QString file0 = data["file0"].toString(); if (!file0.isEmpty() && Path::isHeader(data["file"].toString().toStdString())) - formattedMsg += QString("\n\n%1: %2").arg(tr("First included by")).arg(QDir::toNativeSeparators(file0)); + formattedMsg += QString("\n\n%1: %2").arg(tr("First included by"), QDir::toNativeSeparators(file0)); if (data["cwe"].toInt() > 0) formattedMsg.prepend("CWE: " + QString::number(data["cwe"].toInt()) + "\n"); diff --git a/gui/statsdialog.cpp b/gui/statsdialog.cpp index 1b40ca431..4d21a0338 100644 --- a/gui/statsdialog.cpp +++ b/gui/statsdialog.cpp @@ -182,9 +182,9 @@ void StatsDialog::pdfExport() "

%9 : %10

\n" "

%11 : %12

\n" "

%13 : %14

\n") - .arg(tr("Statistics")) - .arg(QDate::currentDate().toString("dd.MM.yyyy")) - .arg(tr("Errors")) + .arg(tr("Statistics"), + QDate::currentDate().toString("dd.MM.yyyy"), + tr("Errors")) .arg(mStatistics->getCount(CPPCHECK,ShowTypes::ShowErrors)) .arg(tr("Warnings")) .arg(mStatistics->getCount(CPPCHECK,ShowTypes::ShowWarnings)) @@ -246,17 +246,17 @@ void StatsDialog::copyToClipboard() "\t%8:\t%9\n" "\t%10:\t%11\n" ) - .arg(projSettings) - .arg(project) - .arg(mUI->mProject->text()) - .arg(paths) - .arg(mUI->mPaths->text()) - .arg(incPaths) - .arg(mUI->mIncludePaths->text()) - .arg(defines) - .arg(mUI->mDefines->text()) - .arg(undefines) - .arg(mUI->mUndefines->text()); + .arg(projSettings, + project, + mUI->mProject->text(), + paths, + mUI->mPaths->text(), + incPaths, + mUI->mIncludePaths->text(), + defines) + .arg(mUI->mDefines->text(), + undefines, + mUI->mUndefines->text()); const QString previous = QString( "%1\n" @@ -264,13 +264,13 @@ void StatsDialog::copyToClipboard() "\t%4:\t%5\n" "\t%6:\t%7\n" ) - .arg(prevScan) - .arg(selPath) - .arg(mUI->mPath->text()) - .arg(numFiles) - .arg(mUI->mNumberOfFilesScanned->text()) - .arg(duration) - .arg(mUI->mScanDuration->text()); + .arg(prevScan, + selPath, + mUI->mPath->text(), + numFiles, + mUI->mNumberOfFilesScanned->text(), + duration, + mUI->mScanDuration->text()); const QString statistics = QString( "%1\n" @@ -281,8 +281,8 @@ void StatsDialog::copyToClipboard() "\t%10:\t%11\n" "\t%12:\t%13\n" ) - .arg(stats) - .arg(errors) + .arg(stats, + errors) .arg(mStatistics->getCount(CPPCHECK,ShowTypes::ShowErrors)) .arg(warnings) .arg(mStatistics->getCount(CPPCHECK,ShowTypes::ShowWarnings)) @@ -308,17 +308,17 @@ void StatsDialog::copyToClipboard() " %10:%11\n" "\n" ) - .arg(projSettings) - .arg(project) - .arg(mUI->mProject->text()) - .arg(paths) - .arg(mUI->mPaths->text()) - .arg(incPaths) - .arg(mUI->mIncludePaths->text()) - .arg(defines) - .arg(mUI->mDefines->text()) - .arg(undefines) - .arg(mUI->mUndefines->text()); + .arg(projSettings, + project, + mUI->mProject->text(), + paths, + mUI->mPaths->text(), + incPaths, + mUI->mIncludePaths->text(), + defines) + .arg(mUI->mDefines->text(), + undefines, + mUI->mUndefines->text()); const QString htmlPrevious = QString( "

%1

\n" @@ -328,13 +328,13 @@ void StatsDialog::copyToClipboard() " %6:%7\n" "\n" ) - .arg(prevScan) - .arg(selPath) - .arg(mUI->mPath->text()) - .arg(numFiles) - .arg(mUI->mNumberOfFilesScanned->text()) - .arg(duration) - .arg(mUI->mScanDuration->text()); + .arg(prevScan, + selPath, + mUI->mPath->text(), + numFiles, + mUI->mNumberOfFilesScanned->text(), + duration, + mUI->mScanDuration->text()); const QString htmlStatistics = QString( "

%1

\n" @@ -346,8 +346,8 @@ void StatsDialog::copyToClipboard() " %12:%13\n" "\n" ) - .arg(stats) - .arg(errors) + .arg(stats, + errors) .arg(mStatistics->getCount(CPPCHECK,ShowTypes::ShowErrors)) .arg(warnings) .arg(mStatistics->getCount(CPPCHECK,ShowTypes::ShowWarnings))