walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

ported GUI code from QRegExp to QRegularExpression (#3785)

This commit is contained in:
Oliver Stöneberg 2022-03-23 18:16:22 +01:00 committed by GitHub
parent 0d2af9a5b7
commit a0bab85bf9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 264 additions and 253 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gui/checkthread.cpp
View File

@ -27,7 +27,7 @@
#include <QDir> #include <QDir>
#include <QFile> #include <QFile>
#include <QProcess> #include <QProcess>
#include <QRegExp> #include <QRegularExpression>
#include <QSettings> #include <QSettings>
static bool executeCommand(std::string exe, std::vector<std::string> args, std::string redirect, std::string *output) static bool executeCommand(std::string exe, std::vector<std::string> args, std::string redirect, std::string *output)
@ -307,8 +307,8 @@ void CheckThread::parseClangErrors(const QString &tool, const QString &file0, QS
{ {
QList<ErrorItem> errorItems; QList<ErrorItem> errorItems;
ErrorItem errorItem; ErrorItem errorItem;
QRegExp r1("(.+):([0-9]+):([0-9]+): (note|warning|error|fatal error): (.*)"); const QRegularExpression r1("^(.+):([0-9]+):([0-9]+): (note|warning|error|fatal error): (.*)$");
QRegExp r2("(.*)\\[([a-zA-Z0-9\\-_\\.]+)\\]"); const QRegularExpression r2("^(.*)\\[([a-zA-Z0-9\\-_\\.]+)\\]$");
QTextStream in(&err, QIODevice::ReadOnly); QTextStream in(&err, QIODevice::ReadOnly);
while (!in.atEnd()) { while (!in.atEnd()) {
QString line = in.readLine(); QString line = in.readLine();
@ -327,31 +327,33 @@ void CheckThread::parseClangErrors(const QString &tool, const QString &file0, QS
continue; continue;
} }
if (!r1.exactMatch(line)) const QRegularExpressionMatch r1MatchRes = r1.match(line);
if (!r1MatchRes.hasMatch())
continue; continue;
if (r1.cap(4) != "note") { if (r1MatchRes.captured(4) != "note") {
errorItems.append(errorItem); errorItems.append(errorItem);
errorItem = ErrorItem(); errorItem = ErrorItem();
errorItem.file0 = r1.cap(1); errorItem.file0 = r1MatchRes.captured(1);
} }
errorItem.errorPath.append(QErrorPathItem()); errorItem.errorPath.append(QErrorPathItem());
errorItem.errorPath.last().file = r1.cap(1); errorItem.errorPath.last().file = r1MatchRes.captured(1);
errorItem.errorPath.last().line = r1.cap(2).toInt(); errorItem.errorPath.last().line = r1MatchRes.captured(2).toInt();
errorItem.errorPath.last().column = r1.cap(3).toInt(); errorItem.errorPath.last().column = r1MatchRes.captured(3).toInt();
if (r1.cap(4) == "warning") if (r1MatchRes.captured(4) == "warning")
errorItem.severity = Severity::SeverityType::warning; errorItem.severity = Severity::SeverityType::warning;
else if (r1.cap(4) == "error" || r1.cap(4) == "fatal error") else if (r1MatchRes.captured(4) == "error" || r1MatchRes.captured(4) == "fatal error")
errorItem.severity = Severity::SeverityType::error; errorItem.severity = Severity::SeverityType::error;
QString message,id; QString message,id;
if (r2.exactMatch(r1.cap(5))) { const QRegularExpressionMatch r2MatchRes = r2.match(r1MatchRes.captured(5));
message = r2.cap(1); if (r2MatchRes.hasMatch()) {
const QString id1(r2.cap(2)); message = r2MatchRes.captured(1);
const QString id1(r2MatchRes.captured(2));
if (id1.startsWith("clang")) if (id1.startsWith("clang"))
id = id1; id = id1;
else else
id = tool + '-' + r2.cap(2); id = tool + '-' + r2MatchRes.captured(2);
if (tool == CLANG_TIDY) { if (tool == CLANG_TIDY) {
if (id1.startsWith("performance")) if (id1.startsWith("performance"))
errorItem.severity = Severity::SeverityType::performance; errorItem.severity = Severity::SeverityType::performance;
@ -363,7 +365,7 @@ void CheckThread::parseClangErrors(const QString &tool, const QString &file0, QS
errorItem.severity = Severity::SeverityType::style; errorItem.severity = Severity::SeverityType::style;
} }
} else { } else {
message = r1.cap(5); message = r1MatchRes.captured(5);
id = CLANG_ANALYZER; id = CLANG_ANALYZER;
} }

34
gui/cppcheck_de.ts
View File

@ -1723,82 +1723,82 @@ Options:
<context> <context>
<name>ProjectFileDialog</name> <name>ProjectFileDialog</name>
<message> <message>
<location filename="projectfiledialog.cpp" line="85"/> <location filename="projectfiledialog.cpp" line="86"/>
<source>Project file: %1</source> <source>Project file: %1</source>
<translation>Projektdatei: %1</translation> <translation>Projektdatei: %1</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="460"/> <location filename="projectfiledialog.cpp" line="461"/>
<source>Select Cppcheck build dir</source> <source>Select Cppcheck build dir</source>
<translation>Wähle Cppcheck-Erstellungsverzeichnis</translation> <translation>Wähle Cppcheck-Erstellungsverzeichnis</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="756"/> <location filename="projectfiledialog.cpp" line="757"/>
<source>Select include directory</source> <source>Select include directory</source>
<translation>Wähle Include-Verzeichnisse</translation> <translation>Wähle Include-Verzeichnisse</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="736"/> <location filename="projectfiledialog.cpp" line="737"/>
<source>Select a directory to check</source> <source>Select a directory to check</source>
<translation>Wähle zu prüfendes Verzeichnis</translation> <translation>Wähle zu prüfendes Verzeichnis</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="347"/> <location filename="projectfiledialog.cpp" line="348"/>
<source>(no rule texts file)</source> <source>(no rule texts file)</source>
<translation>(keine Regeltexte)</translation> <translation>(keine Regeltexte)</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="353"/> <location filename="projectfiledialog.cpp" line="354"/>
<source>Clang-tidy (not found)</source> <source>Clang-tidy (not found)</source>
<translation>Clang-tidy (nicht gefunden)</translation> <translation>Clang-tidy (nicht gefunden)</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="500"/> <location filename="projectfiledialog.cpp" line="501"/>
<source>Visual Studio</source> <source>Visual Studio</source>
<translation>Visual Studio</translation> <translation>Visual Studio</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="501"/> <location filename="projectfiledialog.cpp" line="502"/>
<source>Compile database</source> <source>Compile database</source>
<translation>Compilerdatenbank</translation> <translation>Compilerdatenbank</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="502"/> <location filename="projectfiledialog.cpp" line="503"/>
<source>Borland C++ Builder 6</source> <source>Borland C++ Builder 6</source>
<translation>Borland C++-Builder 6</translation> <translation>Borland C++-Builder 6</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="503"/> <location filename="projectfiledialog.cpp" line="504"/>
<source>Import Project</source> <source>Import Project</source>
<translation>Projekt importieren</translation> <translation>Projekt importieren</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="776"/> <location filename="projectfiledialog.cpp" line="777"/>
<source>Select directory to ignore</source> <source>Select directory to ignore</source>
<translation>Wähle zu ignorierendes Verzeichnis</translation> <translation>Wähle zu ignorierendes Verzeichnis</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="784"/> <location filename="projectfiledialog.cpp" line="785"/>
<source>Source files</source> <source>Source files</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="785"/> <location filename="projectfiledialog.cpp" line="786"/>
<source>All files</source> <source>All files</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="786"/> <location filename="projectfiledialog.cpp" line="787"/>
<source>Exclude file</source> <source>Exclude file</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="870"/> <location filename="projectfiledialog.cpp" line="871"/>
<source>Select MISRA rule texts file</source> <source>Select MISRA rule texts file</source>
<translation>Wähle MISRA-Regeltext-Datei</translation> <translation>Wähle MISRA-Regeltext-Datei</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="872"/> <location filename="projectfiledialog.cpp" line="873"/>
<source>MISRA rule texts file (%1)</source> <source>MISRA rule texts file (%1)</source>
<translation>MISRA-Regeltext-Datei</translation> <translation>MISRA-Regeltext-Datei</translation>
</message> </message>
@ -1850,7 +1850,7 @@ Options:
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="242"/> <location filename="projectfiledialog.cpp" line="243"/>
<source> (Not found)</source> <source> (Not found)</source>
<translation> (nicht gefunden)</translation> <translation> (nicht gefunden)</translation>
</message> </message>

34
gui/cppcheck_es.ts
View File

@ -1849,72 +1849,72 @@ Options:
<context> <context>
<name>ProjectFileDialog</name> <name>ProjectFileDialog</name>
<message> <message>
<location filename="projectfiledialog.cpp" line="85"/> <location filename="projectfiledialog.cpp" line="86"/>
<source>Project file: %1</source> <source>Project file: %1</source>
<translation>Archivo de proyecto: %1</translation> <translation>Archivo de proyecto: %1</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="460"/> <location filename="projectfiledialog.cpp" line="461"/>
<source>Select Cppcheck build dir</source> <source>Select Cppcheck build dir</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="756"/> <location filename="projectfiledialog.cpp" line="757"/>
<source>Select include directory</source> <source>Select include directory</source>
<translation>Selecciona una carpeta para incluir</translation> <translation>Selecciona una carpeta para incluir</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="736"/> <location filename="projectfiledialog.cpp" line="737"/>
<source>Select a directory to check</source> <source>Select a directory to check</source>
<translation>Selecciona la carpeta a comprobar</translation> <translation>Selecciona la carpeta a comprobar</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="347"/> <location filename="projectfiledialog.cpp" line="348"/>
<source>(no rule texts file)</source> <source>(no rule texts file)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="353"/> <location filename="projectfiledialog.cpp" line="354"/>
<source>Clang-tidy (not found)</source> <source>Clang-tidy (not found)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="500"/> <location filename="projectfiledialog.cpp" line="501"/>
<source>Visual Studio</source> <source>Visual Studio</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="501"/> <location filename="projectfiledialog.cpp" line="502"/>
<source>Compile database</source> <source>Compile database</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="502"/> <location filename="projectfiledialog.cpp" line="503"/>
<source>Borland C++ Builder 6</source> <source>Borland C++ Builder 6</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="503"/> <location filename="projectfiledialog.cpp" line="504"/>
<source>Import Project</source> <source>Import Project</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="776"/> <location filename="projectfiledialog.cpp" line="777"/>
<source>Select directory to ignore</source> <source>Select directory to ignore</source>
<translation>Selecciona la carpeta a ignorar</translation> <translation>Selecciona la carpeta a ignorar</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="784"/> <location filename="projectfiledialog.cpp" line="785"/>
<source>Source files</source> <source>Source files</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="785"/> <location filename="projectfiledialog.cpp" line="786"/>
<source>All files</source> <source>All files</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="786"/> <location filename="projectfiledialog.cpp" line="787"/>
<source>Exclude file</source> <source>Exclude file</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -1923,12 +1923,12 @@ Options:
<translation type="obsolete">Añadir supresión</translation> <translation type="obsolete">Añadir supresión</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="870"/> <location filename="projectfiledialog.cpp" line="871"/>
<source>Select MISRA rule texts file</source> <source>Select MISRA rule texts file</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="872"/> <location filename="projectfiledialog.cpp" line="873"/>
<source>MISRA rule texts file (%1)</source> <source>MISRA rule texts file (%1)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -1980,7 +1980,7 @@ Options:
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="242"/> <location filename="projectfiledialog.cpp" line="243"/>
<source> (Not found)</source> <source> (Not found)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

34
gui/cppcheck_fi.ts
View File

@ -1695,82 +1695,82 @@ Options:
<context> <context>
<name>ProjectFileDialog</name> <name>ProjectFileDialog</name>
<message> <message>
<location filename="projectfiledialog.cpp" line="85"/> <location filename="projectfiledialog.cpp" line="86"/>
<source>Project file: %1</source> <source>Project file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="460"/> <location filename="projectfiledialog.cpp" line="461"/>
<source>Select Cppcheck build dir</source> <source>Select Cppcheck build dir</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="756"/> <location filename="projectfiledialog.cpp" line="757"/>
<source>Select include directory</source> <source>Select include directory</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="736"/> <location filename="projectfiledialog.cpp" line="737"/>
<source>Select a directory to check</source> <source>Select a directory to check</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="347"/> <location filename="projectfiledialog.cpp" line="348"/>
<source>(no rule texts file)</source> <source>(no rule texts file)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="353"/> <location filename="projectfiledialog.cpp" line="354"/>
<source>Clang-tidy (not found)</source> <source>Clang-tidy (not found)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="500"/> <location filename="projectfiledialog.cpp" line="501"/>
<source>Visual Studio</source> <source>Visual Studio</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="501"/> <location filename="projectfiledialog.cpp" line="502"/>
<source>Compile database</source> <source>Compile database</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="502"/> <location filename="projectfiledialog.cpp" line="503"/>
<source>Borland C++ Builder 6</source> <source>Borland C++ Builder 6</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="503"/> <location filename="projectfiledialog.cpp" line="504"/>
<source>Import Project</source> <source>Import Project</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="776"/> <location filename="projectfiledialog.cpp" line="777"/>
<source>Select directory to ignore</source> <source>Select directory to ignore</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="784"/> <location filename="projectfiledialog.cpp" line="785"/>
<source>Source files</source> <source>Source files</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="785"/> <location filename="projectfiledialog.cpp" line="786"/>
<source>All files</source> <source>All files</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="786"/> <location filename="projectfiledialog.cpp" line="787"/>
<source>Exclude file</source> <source>Exclude file</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="870"/> <location filename="projectfiledialog.cpp" line="871"/>
<source>Select MISRA rule texts file</source> <source>Select MISRA rule texts file</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="872"/> <location filename="projectfiledialog.cpp" line="873"/>
<source>MISRA rule texts file (%1)</source> <source>MISRA rule texts file (%1)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -1805,7 +1805,7 @@ Options:
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="242"/> <location filename="projectfiledialog.cpp" line="243"/>
<source> (Not found)</source> <source> (Not found)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

34
gui/cppcheck_fr.ts
View File

@ -1760,82 +1760,82 @@ Do you want to proceed?</source>
<context> <context>
<name>ProjectFileDialog</name> <name>ProjectFileDialog</name>
<message> <message>
<location filename="projectfiledialog.cpp" line="85"/> <location filename="projectfiledialog.cpp" line="86"/>
<source>Project file: %1</source> <source>Project file: %1</source>
<translation>Fichier projet : %1</translation> <translation>Fichier projet : %1</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="756"/> <location filename="projectfiledialog.cpp" line="757"/>
<source>Select include directory</source> <source>Select include directory</source>
<translation>Selectionner un répertoire à inclure</translation> <translation>Selectionner un répertoire à inclure</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="776"/> <location filename="projectfiledialog.cpp" line="777"/>
<source>Select directory to ignore</source> <source>Select directory to ignore</source>
<translation>Selectionner un répertoire à ignorer</translation> <translation>Selectionner un répertoire à ignorer</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="736"/> <location filename="projectfiledialog.cpp" line="737"/>
<source>Select a directory to check</source> <source>Select a directory to check</source>
<translation>Selectionner un répertoire à vérifier</translation> <translation>Selectionner un répertoire à vérifier</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="460"/> <location filename="projectfiledialog.cpp" line="461"/>
<source>Select Cppcheck build dir</source> <source>Select Cppcheck build dir</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="503"/> <location filename="projectfiledialog.cpp" line="504"/>
<source>Import Project</source> <source>Import Project</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="353"/> <location filename="projectfiledialog.cpp" line="354"/>
<source>Clang-tidy (not found)</source> <source>Clang-tidy (not found)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="347"/> <location filename="projectfiledialog.cpp" line="348"/>
<source>(no rule texts file)</source> <source>(no rule texts file)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="784"/> <location filename="projectfiledialog.cpp" line="785"/>
<source>Source files</source> <source>Source files</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="785"/> <location filename="projectfiledialog.cpp" line="786"/>
<source>All files</source> <source>All files</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="786"/> <location filename="projectfiledialog.cpp" line="787"/>
<source>Exclude file</source> <source>Exclude file</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="870"/> <location filename="projectfiledialog.cpp" line="871"/>
<source>Select MISRA rule texts file</source> <source>Select MISRA rule texts file</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="872"/> <location filename="projectfiledialog.cpp" line="873"/>
<source>MISRA rule texts file (%1)</source> <source>MISRA rule texts file (%1)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="500"/> <location filename="projectfiledialog.cpp" line="501"/>
<source>Visual Studio</source> <source>Visual Studio</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="501"/> <location filename="projectfiledialog.cpp" line="502"/>
<source>Compile database</source> <source>Compile database</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="502"/> <location filename="projectfiledialog.cpp" line="503"/>
<source>Borland C++ Builder 6</source> <source>Borland C++ Builder 6</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -1887,7 +1887,7 @@ Do you want to proceed?</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="242"/> <location filename="projectfiledialog.cpp" line="243"/>
<source> (Not found)</source> <source> (Not found)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

34
gui/cppcheck_it.ts
View File

@ -1862,82 +1862,82 @@ Options:
<context> <context>
<name>ProjectFileDialog</name> <name>ProjectFileDialog</name>
<message> <message>
<location filename="projectfiledialog.cpp" line="85"/> <location filename="projectfiledialog.cpp" line="86"/>
<source>Project file: %1</source> <source>Project file: %1</source>
<translation>File di progetto: %1</translation> <translation>File di progetto: %1</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="460"/> <location filename="projectfiledialog.cpp" line="461"/>
<source>Select Cppcheck build dir</source> <source>Select Cppcheck build dir</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="756"/> <location filename="projectfiledialog.cpp" line="757"/>
<source>Select include directory</source> <source>Select include directory</source>
<translation>Seleziona la cartella da includere</translation> <translation>Seleziona la cartella da includere</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="736"/> <location filename="projectfiledialog.cpp" line="737"/>
<source>Select a directory to check</source> <source>Select a directory to check</source>
<translation>Seleziona una cartella da scansionare</translation> <translation>Seleziona una cartella da scansionare</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="347"/> <location filename="projectfiledialog.cpp" line="348"/>
<source>(no rule texts file)</source> <source>(no rule texts file)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="353"/> <location filename="projectfiledialog.cpp" line="354"/>
<source>Clang-tidy (not found)</source> <source>Clang-tidy (not found)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="500"/> <location filename="projectfiledialog.cpp" line="501"/>
<source>Visual Studio</source> <source>Visual Studio</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="501"/> <location filename="projectfiledialog.cpp" line="502"/>
<source>Compile database</source> <source>Compile database</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="502"/> <location filename="projectfiledialog.cpp" line="503"/>
<source>Borland C++ Builder 6</source> <source>Borland C++ Builder 6</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="503"/> <location filename="projectfiledialog.cpp" line="504"/>
<source>Import Project</source> <source>Import Project</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="776"/> <location filename="projectfiledialog.cpp" line="777"/>
<source>Select directory to ignore</source> <source>Select directory to ignore</source>
<translation>Seleziona la cartella da ignorare</translation> <translation>Seleziona la cartella da ignorare</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="784"/> <location filename="projectfiledialog.cpp" line="785"/>
<source>Source files</source> <source>Source files</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="785"/> <location filename="projectfiledialog.cpp" line="786"/>
<source>All files</source> <source>All files</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="786"/> <location filename="projectfiledialog.cpp" line="787"/>
<source>Exclude file</source> <source>Exclude file</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="870"/> <location filename="projectfiledialog.cpp" line="871"/>
<source>Select MISRA rule texts file</source> <source>Select MISRA rule texts file</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="872"/> <location filename="projectfiledialog.cpp" line="873"/>
<source>MISRA rule texts file (%1)</source> <source>MISRA rule texts file (%1)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -1977,7 +1977,7 @@ Options:
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="242"/> <location filename="projectfiledialog.cpp" line="243"/>
<source> (Not found)</source> <source> (Not found)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

34
gui/cppcheck_ja.ts
View File

@ -1963,12 +1963,12 @@ Options:
<context> <context>
<name>ProjectFileDialog</name> <name>ProjectFileDialog</name>
<message> <message>
<location filename="projectfiledialog.cpp" line="85"/> <location filename="projectfiledialog.cpp" line="86"/>
<source>Project file: %1</source> <source>Project file: %1</source>
<translation>プロジェクトファイル:%1</translation> <translation>プロジェクトファイル:%1</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="460"/> <location filename="projectfiledialog.cpp" line="461"/>
<source>Select Cppcheck build dir</source> <source>Select Cppcheck build dir</source>
<translation>Cppcheckビルドディレクトリ</translation> <translation>Cppcheckビルドディレクトリ</translation>
</message> </message>
@ -1977,62 +1977,62 @@ Options:
<translation type="obsolete">Visual Studio (*.sln *.vcxproj);;コンパイルデータベース (compile_commands.json)</translation> <translation type="obsolete">Visual Studio (*.sln *.vcxproj);;コンパイルデータベース (compile_commands.json)</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="756"/> <location filename="projectfiledialog.cpp" line="757"/>
<source>Select include directory</source> <source>Select include directory</source>
<translation>includeディレクトリを選択</translation> <translation>includeディレクトリを選択</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="736"/> <location filename="projectfiledialog.cpp" line="737"/>
<source>Select a directory to check</source> <source>Select a directory to check</source>
<translation>チェックするディレクトリを選択してください</translation> <translation>チェックするディレクトリを選択してください</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="347"/> <location filename="projectfiledialog.cpp" line="348"/>
<source>(no rule texts file)</source> <source>(no rule texts file)</source>
<translation>(ルールテキストファイルがない)</translation> <translation>(ルールテキストファイルがない)</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="353"/> <location filename="projectfiledialog.cpp" line="354"/>
<source>Clang-tidy (not found)</source> <source>Clang-tidy (not found)</source>
<translation>Clang-tidy (みつかりません)</translation> <translation>Clang-tidy (みつかりません)</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="500"/> <location filename="projectfiledialog.cpp" line="501"/>
<source>Visual Studio</source> <source>Visual Studio</source>
<translation>Visual Studio</translation> <translation>Visual Studio</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="501"/> <location filename="projectfiledialog.cpp" line="502"/>
<source>Compile database</source> <source>Compile database</source>
<translation>コンパイルデータベース</translation> <translation>コンパイルデータベース</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="502"/> <location filename="projectfiledialog.cpp" line="503"/>
<source>Borland C++ Builder 6</source> <source>Borland C++ Builder 6</source>
<translation>Borland C++ Builder 6</translation> <translation>Borland C++ Builder 6</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="503"/> <location filename="projectfiledialog.cpp" line="504"/>
<source>Import Project</source> <source>Import Project</source>
<translation>プロジェクトのインポート</translation> <translation>プロジェクトのインポート</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="776"/> <location filename="projectfiledialog.cpp" line="777"/>
<source>Select directory to ignore</source> <source>Select directory to ignore</source>
<translation>除外するディレクトリを選択してください</translation> <translation>除外するディレクトリを選択してください</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="784"/> <location filename="projectfiledialog.cpp" line="785"/>
<source>Source files</source> <source>Source files</source>
<translation>ソースファイル</translation> <translation>ソースファイル</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="785"/> <location filename="projectfiledialog.cpp" line="786"/>
<source>All files</source> <source>All files</source>
<translation>全ファイル</translation> <translation>全ファイル</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="786"/> <location filename="projectfiledialog.cpp" line="787"/>
<source>Exclude file</source> <source>Exclude file</source>
<translation>除外ファイル</translation> <translation>除外ファイル</translation>
</message> </message>
@ -2045,12 +2045,12 @@ Options:
<translation type="obsolete">抑制するエラーID(error id)を選択してください</translation> <translation type="obsolete">抑制するエラーID(error id)を選択してください</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="870"/> <location filename="projectfiledialog.cpp" line="871"/>
<source>Select MISRA rule texts file</source> <source>Select MISRA rule texts file</source>
<translation>MISRAルールテキストファイルを選択</translation> <translation>MISRAルールテキストファイルを選択</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="872"/> <location filename="projectfiledialog.cpp" line="873"/>
<source>MISRA rule texts file (%1)</source> <source>MISRA rule texts file (%1)</source>
<translation>MISRAルールテキストファイル (%1)</translation> <translation>MISRAルールテキストファイル (%1)</translation>
</message> </message>
@ -2102,7 +2102,7 @@ Options:
<translation>行 %1: 必須の属性 &apos;%2&apos; が &apos;%3&apos;にない</translation> <translation>行 %1: 必須の属性 &apos;%2&apos; が &apos;%3&apos;にない</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="242"/> <location filename="projectfiledialog.cpp" line="243"/>
<source> (Not found)</source> <source> (Not found)</source>
<translation> (見つかりません)</translation> <translation> (見つかりません)</translation>
</message> </message>

34
gui/cppcheck_ko.ts
View File

@ -1843,82 +1843,82 @@ Do you want to proceed?</source>
<context> <context>
<name>ProjectFileDialog</name> <name>ProjectFileDialog</name>
<message> <message>
<location filename="projectfiledialog.cpp" line="85"/> <location filename="projectfiledialog.cpp" line="86"/>
<source>Project file: %1</source> <source>Project file: %1</source>
<translation>프로젝트 파일: %1</translation> <translation>프로젝트 파일: %1</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="756"/> <location filename="projectfiledialog.cpp" line="757"/>
<source>Select include directory</source> <source>Select include directory</source>
<translation>Include 디렉토리 선택</translation> <translation>Include 디렉토리 선택</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="736"/> <location filename="projectfiledialog.cpp" line="737"/>
<source>Select a directory to check</source> <source>Select a directory to check</source>
<translation>검사할 디렉토리 선택</translation> <translation>검사할 디렉토리 선택</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="776"/> <location filename="projectfiledialog.cpp" line="777"/>
<source>Select directory to ignore</source> <source>Select directory to ignore</source>
<translation>무시할 디렉토리 선택</translation> <translation>무시할 디렉토리 선택</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="460"/> <location filename="projectfiledialog.cpp" line="461"/>
<source>Select Cppcheck build dir</source> <source>Select Cppcheck build dir</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="503"/> <location filename="projectfiledialog.cpp" line="504"/>
<source>Import Project</source> <source>Import Project</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="353"/> <location filename="projectfiledialog.cpp" line="354"/>
<source>Clang-tidy (not found)</source> <source>Clang-tidy (not found)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="347"/> <location filename="projectfiledialog.cpp" line="348"/>
<source>(no rule texts file)</source> <source>(no rule texts file)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="784"/> <location filename="projectfiledialog.cpp" line="785"/>
<source>Source files</source> <source>Source files</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="785"/> <location filename="projectfiledialog.cpp" line="786"/>
<source>All files</source> <source>All files</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="786"/> <location filename="projectfiledialog.cpp" line="787"/>
<source>Exclude file</source> <source>Exclude file</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="870"/> <location filename="projectfiledialog.cpp" line="871"/>
<source>Select MISRA rule texts file</source> <source>Select MISRA rule texts file</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="872"/> <location filename="projectfiledialog.cpp" line="873"/>
<source>MISRA rule texts file (%1)</source> <source>MISRA rule texts file (%1)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="500"/> <location filename="projectfiledialog.cpp" line="501"/>
<source>Visual Studio</source> <source>Visual Studio</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="501"/> <location filename="projectfiledialog.cpp" line="502"/>
<source>Compile database</source> <source>Compile database</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="502"/> <location filename="projectfiledialog.cpp" line="503"/>
<source>Borland C++ Builder 6</source> <source>Borland C++ Builder 6</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -1958,7 +1958,7 @@ Do you want to proceed?</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="242"/> <location filename="projectfiledialog.cpp" line="243"/>
<source> (Not found)</source> <source> (Not found)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

34
gui/cppcheck_nl.ts
View File

@ -1844,82 +1844,82 @@ Options:
<context> <context>
<name>ProjectFileDialog</name> <name>ProjectFileDialog</name>
<message> <message>
<location filename="projectfiledialog.cpp" line="85"/> <location filename="projectfiledialog.cpp" line="86"/>
<source>Project file: %1</source> <source>Project file: %1</source>
<translation>Project Bestand %1</translation> <translation>Project Bestand %1</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="460"/> <location filename="projectfiledialog.cpp" line="461"/>
<source>Select Cppcheck build dir</source> <source>Select Cppcheck build dir</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="756"/> <location filename="projectfiledialog.cpp" line="757"/>
<source>Select include directory</source> <source>Select include directory</source>
<translation>Selecteer include map</translation> <translation>Selecteer include map</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="736"/> <location filename="projectfiledialog.cpp" line="737"/>
<source>Select a directory to check</source> <source>Select a directory to check</source>
<translation>Selecteer een map om te controleren</translation> <translation>Selecteer een map om te controleren</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="347"/> <location filename="projectfiledialog.cpp" line="348"/>
<source>(no rule texts file)</source> <source>(no rule texts file)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="353"/> <location filename="projectfiledialog.cpp" line="354"/>
<source>Clang-tidy (not found)</source> <source>Clang-tidy (not found)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="500"/> <location filename="projectfiledialog.cpp" line="501"/>
<source>Visual Studio</source> <source>Visual Studio</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="501"/> <location filename="projectfiledialog.cpp" line="502"/>
<source>Compile database</source> <source>Compile database</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="502"/> <location filename="projectfiledialog.cpp" line="503"/>
<source>Borland C++ Builder 6</source> <source>Borland C++ Builder 6</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="503"/> <location filename="projectfiledialog.cpp" line="504"/>
<source>Import Project</source> <source>Import Project</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="776"/> <location filename="projectfiledialog.cpp" line="777"/>
<source>Select directory to ignore</source> <source>Select directory to ignore</source>
<translation>Selecteer een map om te negeren</translation> <translation>Selecteer een map om te negeren</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="784"/> <location filename="projectfiledialog.cpp" line="785"/>
<source>Source files</source> <source>Source files</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="785"/> <location filename="projectfiledialog.cpp" line="786"/>
<source>All files</source> <source>All files</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="786"/> <location filename="projectfiledialog.cpp" line="787"/>
<source>Exclude file</source> <source>Exclude file</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="870"/> <location filename="projectfiledialog.cpp" line="871"/>
<source>Select MISRA rule texts file</source> <source>Select MISRA rule texts file</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="872"/> <location filename="projectfiledialog.cpp" line="873"/>
<source>MISRA rule texts file (%1)</source> <source>MISRA rule texts file (%1)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -1969,7 +1969,7 @@ Options:
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="242"/> <location filename="projectfiledialog.cpp" line="243"/>
<source> (Not found)</source> <source> (Not found)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

34
gui/cppcheck_ru.ts
View File

@ -1962,82 +1962,82 @@ Options:
<context> <context>
<name>ProjectFileDialog</name> <name>ProjectFileDialog</name>
<message> <message>
<location filename="projectfiledialog.cpp" line="85"/> <location filename="projectfiledialog.cpp" line="86"/>
<source>Project file: %1</source> <source>Project file: %1</source>
<translation>Файл проекта: %1</translation> <translation>Файл проекта: %1</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="460"/> <location filename="projectfiledialog.cpp" line="461"/>
<source>Select Cppcheck build dir</source> <source>Select Cppcheck build dir</source>
<translation>Выбрать директорию сборки Cppcheck</translation> <translation>Выбрать директорию сборки Cppcheck</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="756"/> <location filename="projectfiledialog.cpp" line="757"/>
<source>Select include directory</source> <source>Select include directory</source>
<translation>Выберите директорию для поиска заголовочных файлов</translation> <translation>Выберите директорию для поиска заголовочных файлов</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="736"/> <location filename="projectfiledialog.cpp" line="737"/>
<source>Select a directory to check</source> <source>Select a directory to check</source>
<translation>Выберите директорию для проверки</translation> <translation>Выберите директорию для проверки</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="347"/> <location filename="projectfiledialog.cpp" line="348"/>
<source>(no rule texts file)</source> <source>(no rule texts file)</source>
<translation>(файл с текстами правил недоступен)</translation> <translation>(файл с текстами правил недоступен)</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="353"/> <location filename="projectfiledialog.cpp" line="354"/>
<source>Clang-tidy (not found)</source> <source>Clang-tidy (not found)</source>
<translation>Clang-tidy (не найден)</translation> <translation>Clang-tidy (не найден)</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="500"/> <location filename="projectfiledialog.cpp" line="501"/>
<source>Visual Studio</source> <source>Visual Studio</source>
<translation>Visual Studio</translation> <translation>Visual Studio</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="501"/> <location filename="projectfiledialog.cpp" line="502"/>
<source>Compile database</source> <source>Compile database</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="502"/> <location filename="projectfiledialog.cpp" line="503"/>
<source>Borland C++ Builder 6</source> <source>Borland C++ Builder 6</source>
<translation>Borland C++ Builder 6</translation> <translation>Borland C++ Builder 6</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="503"/> <location filename="projectfiledialog.cpp" line="504"/>
<source>Import Project</source> <source>Import Project</source>
<translation>Импорт проекта</translation> <translation>Импорт проекта</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="776"/> <location filename="projectfiledialog.cpp" line="777"/>
<source>Select directory to ignore</source> <source>Select directory to ignore</source>
<translation>Выберите директорию, которую надо проигнорировать</translation> <translation>Выберите директорию, которую надо проигнорировать</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="784"/> <location filename="projectfiledialog.cpp" line="785"/>
<source>Source files</source> <source>Source files</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="785"/> <location filename="projectfiledialog.cpp" line="786"/>
<source>All files</source> <source>All files</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="786"/> <location filename="projectfiledialog.cpp" line="787"/>
<source>Exclude file</source> <source>Exclude file</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="870"/> <location filename="projectfiledialog.cpp" line="871"/>
<source>Select MISRA rule texts file</source> <source>Select MISRA rule texts file</source>
<translation>Выбрать файл текстов правил MISRA</translation> <translation>Выбрать файл текстов правил MISRA</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="872"/> <location filename="projectfiledialog.cpp" line="873"/>
<source>MISRA rule texts file (%1)</source> <source>MISRA rule texts file (%1)</source>
<translation>Файл текстов правил MISRA (%1)</translation> <translation>Файл текстов правил MISRA (%1)</translation>
</message> </message>
@ -2091,7 +2091,7 @@ Options:
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="242"/> <location filename="projectfiledialog.cpp" line="243"/>
<source> (Not found)</source> <source> (Not found)</source>
<translation> (Недоступно)</translation> <translation> (Недоступно)</translation>
</message> </message>

34
gui/cppcheck_sr.ts
View File

@ -1720,82 +1720,82 @@ Options:
<context> <context>
<name>ProjectFileDialog</name> <name>ProjectFileDialog</name>
<message> <message>
<location filename="projectfiledialog.cpp" line="85"/> <location filename="projectfiledialog.cpp" line="86"/>
<source>Project file: %1</source> <source>Project file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="460"/> <location filename="projectfiledialog.cpp" line="461"/>
<source>Select Cppcheck build dir</source> <source>Select Cppcheck build dir</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="756"/> <location filename="projectfiledialog.cpp" line="757"/>
<source>Select include directory</source> <source>Select include directory</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="736"/> <location filename="projectfiledialog.cpp" line="737"/>
<source>Select a directory to check</source> <source>Select a directory to check</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="347"/> <location filename="projectfiledialog.cpp" line="348"/>
<source>(no rule texts file)</source> <source>(no rule texts file)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="353"/> <location filename="projectfiledialog.cpp" line="354"/>
<source>Clang-tidy (not found)</source> <source>Clang-tidy (not found)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="500"/> <location filename="projectfiledialog.cpp" line="501"/>
<source>Visual Studio</source> <source>Visual Studio</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="501"/> <location filename="projectfiledialog.cpp" line="502"/>
<source>Compile database</source> <source>Compile database</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="502"/> <location filename="projectfiledialog.cpp" line="503"/>
<source>Borland C++ Builder 6</source> <source>Borland C++ Builder 6</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="503"/> <location filename="projectfiledialog.cpp" line="504"/>
<source>Import Project</source> <source>Import Project</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="776"/> <location filename="projectfiledialog.cpp" line="777"/>
<source>Select directory to ignore</source> <source>Select directory to ignore</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="784"/> <location filename="projectfiledialog.cpp" line="785"/>
<source>Source files</source> <source>Source files</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="785"/> <location filename="projectfiledialog.cpp" line="786"/>
<source>All files</source> <source>All files</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="786"/> <location filename="projectfiledialog.cpp" line="787"/>
<source>Exclude file</source> <source>Exclude file</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="870"/> <location filename="projectfiledialog.cpp" line="871"/>
<source>Select MISRA rule texts file</source> <source>Select MISRA rule texts file</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="872"/> <location filename="projectfiledialog.cpp" line="873"/>
<source>MISRA rule texts file (%1)</source> <source>MISRA rule texts file (%1)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -1828,7 +1828,7 @@ Options:
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="242"/> <location filename="projectfiledialog.cpp" line="243"/>
<source> (Not found)</source> <source> (Not found)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

34
gui/cppcheck_sv.ts
View File

@ -2006,22 +2006,22 @@ Sökvägar och defines importeras.</translation>
<context> <context>
<name>ProjectFileDialog</name> <name>ProjectFileDialog</name>
<message> <message>
<location filename="projectfiledialog.cpp" line="85"/> <location filename="projectfiledialog.cpp" line="86"/>
<source>Project file: %1</source> <source>Project file: %1</source>
<translation>Projektfil: %1</translation> <translation>Projektfil: %1</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="347"/> <location filename="projectfiledialog.cpp" line="348"/>
<source>(no rule texts file)</source> <source>(no rule texts file)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="353"/> <location filename="projectfiledialog.cpp" line="354"/>
<source>Clang-tidy (not found)</source> <source>Clang-tidy (not found)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="460"/> <location filename="projectfiledialog.cpp" line="461"/>
<source>Select Cppcheck build dir</source> <source>Select Cppcheck build dir</source>
<translation>Välj Cppcheck build dir</translation> <translation>Välj Cppcheck build dir</translation>
</message> </message>
@ -2030,57 +2030,57 @@ Sökvägar och defines importeras.</translation>
<translation type="obsolete">Visual Studio (*.sln *.vcxproj);;Compile database (compile_commands.json)</translation> <translation type="obsolete">Visual Studio (*.sln *.vcxproj);;Compile database (compile_commands.json)</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="756"/> <location filename="projectfiledialog.cpp" line="757"/>
<source>Select include directory</source> <source>Select include directory</source>
<translation>Välj include sökväg</translation> <translation>Välj include sökväg</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="784"/> <location filename="projectfiledialog.cpp" line="785"/>
<source>Source files</source> <source>Source files</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="785"/> <location filename="projectfiledialog.cpp" line="786"/>
<source>All files</source> <source>All files</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="786"/> <location filename="projectfiledialog.cpp" line="787"/>
<source>Exclude file</source> <source>Exclude file</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="870"/> <location filename="projectfiledialog.cpp" line="871"/>
<source>Select MISRA rule texts file</source> <source>Select MISRA rule texts file</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="872"/> <location filename="projectfiledialog.cpp" line="873"/>
<source>MISRA rule texts file (%1)</source> <source>MISRA rule texts file (%1)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="736"/> <location filename="projectfiledialog.cpp" line="737"/>
<source>Select a directory to check</source> <source>Select a directory to check</source>
<translation>Välj mapp att analysera</translation> <translation>Välj mapp att analysera</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="500"/> <location filename="projectfiledialog.cpp" line="501"/>
<source>Visual Studio</source> <source>Visual Studio</source>
<translation type="unfinished">Visual Studio</translation> <translation type="unfinished">Visual Studio</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="501"/> <location filename="projectfiledialog.cpp" line="502"/>
<source>Compile database</source> <source>Compile database</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="502"/> <location filename="projectfiledialog.cpp" line="503"/>
<source>Borland C++ Builder 6</source> <source>Borland C++ Builder 6</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="503"/> <location filename="projectfiledialog.cpp" line="504"/>
<source>Import Project</source> <source>Import Project</source>
<translation>Importera Projekt</translation> <translation>Importera Projekt</translation>
</message> </message>
@ -2089,7 +2089,7 @@ Sökvägar och defines importeras.</translation>
<translation type="obsolete">Visual Studio (*.sln *.vcxproj);;Compile database (compile_database.json)</translation> <translation type="obsolete">Visual Studio (*.sln *.vcxproj);;Compile database (compile_database.json)</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="776"/> <location filename="projectfiledialog.cpp" line="777"/>
<source>Select directory to ignore</source> <source>Select directory to ignore</source>
<translation>Välj sökväg att ignorera</translation> <translation>Välj sökväg att ignorera</translation>
</message> </message>
@ -2151,7 +2151,7 @@ Sökvägar och defines importeras.</translation>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="242"/> <location filename="projectfiledialog.cpp" line="243"/>
<source> (Not found)</source> <source> (Not found)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

34
gui/cppcheck_zh_CN.ts
View File

@ -1898,82 +1898,82 @@ Options:
<context> <context>
<name>ProjectFileDialog</name> <name>ProjectFileDialog</name>
<message> <message>
<location filename="projectfiledialog.cpp" line="85"/> <location filename="projectfiledialog.cpp" line="86"/>
<source>Project file: %1</source> <source>Project file: %1</source>
<translation>项目文件: %1</translation> <translation>项目文件: %1</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="460"/> <location filename="projectfiledialog.cpp" line="461"/>
<source>Select Cppcheck build dir</source> <source>Select Cppcheck build dir</source>
<translation>选择 Cppcheck 构建目录</translation> <translation>选择 Cppcheck 构建目录</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="756"/> <location filename="projectfiledialog.cpp" line="757"/>
<source>Select include directory</source> <source>Select include directory</source>
<translation>选择 Include 目录</translation> <translation>选择 Include 目录</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="736"/> <location filename="projectfiledialog.cpp" line="737"/>
<source>Select a directory to check</source> <source>Select a directory to check</source>
<translation>选择一个检查目录</translation> <translation>选择一个检查目录</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="347"/> <location filename="projectfiledialog.cpp" line="348"/>
<source>(no rule texts file)</source> <source>(no rule texts file)</source>
<translation>(无规则文本文件)</translation> <translation>(无规则文本文件)</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="353"/> <location filename="projectfiledialog.cpp" line="354"/>
<source>Clang-tidy (not found)</source> <source>Clang-tidy (not found)</source>
<translation>Clang-tidy (未找到)</translation> <translation>Clang-tidy (未找到)</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="500"/> <location filename="projectfiledialog.cpp" line="501"/>
<source>Visual Studio</source> <source>Visual Studio</source>
<translation>Visual Studio</translation> <translation>Visual Studio</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="501"/> <location filename="projectfiledialog.cpp" line="502"/>
<source>Compile database</source> <source>Compile database</source>
<translation>Compile database</translation> <translation>Compile database</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="502"/> <location filename="projectfiledialog.cpp" line="503"/>
<source>Borland C++ Builder 6</source> <source>Borland C++ Builder 6</source>
<translation>Borland C++ Builder 6</translation> <translation>Borland C++ Builder 6</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="503"/> <location filename="projectfiledialog.cpp" line="504"/>
<source>Import Project</source> <source>Import Project</source>
<translation>导入项目</translation> <translation>导入项目</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="776"/> <location filename="projectfiledialog.cpp" line="777"/>
<source>Select directory to ignore</source> <source>Select directory to ignore</source>
<translation>选择忽略的目录</translation> <translation>选择忽略的目录</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="784"/> <location filename="projectfiledialog.cpp" line="785"/>
<source>Source files</source> <source>Source files</source>
<translation>源文件</translation> <translation>源文件</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="785"/> <location filename="projectfiledialog.cpp" line="786"/>
<source>All files</source> <source>All files</source>
<translation>全部文件</translation> <translation>全部文件</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="786"/> <location filename="projectfiledialog.cpp" line="787"/>
<source>Exclude file</source> <source>Exclude file</source>
<translation>排除文件</translation> <translation>排除文件</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="870"/> <location filename="projectfiledialog.cpp" line="871"/>
<source>Select MISRA rule texts file</source> <source>Select MISRA rule texts file</source>
<translation>选择 MISRA 规则文本文件</translation> <translation>选择 MISRA 规则文本文件</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="872"/> <location filename="projectfiledialog.cpp" line="873"/>
<source>MISRA rule texts file (%1)</source> <source>MISRA rule texts file (%1)</source>
<translation>MISRA 规则文本文件 (%1)</translation> <translation>MISRA 规则文本文件 (%1)</translation>
</message> </message>
@ -2013,7 +2013,7 @@ Options:
<translation>第%1行：在 &quot;%3&quot; 中缺失的必选属性 &quot;%2&quot;</translation> <translation>第%1行：在 &quot;%3&quot; 中缺失的必选属性 &quot;%2&quot;</translation>
</message> </message>
<message> <message>
<location filename="projectfiledialog.cpp" line="242"/> <location filename="projectfiledialog.cpp" line="243"/>
<source> (Not found)</source> <source> (Not found)</source>
<translation> (未找到)</translation> <translation> (未找到)</translation>
</message> </message>

7
gui/libraryaddfunctiondialog.cpp
View File

@ -20,15 +20,16 @@
#include "ui_libraryaddfunctiondialog.h" #include "ui_libraryaddfunctiondialog.h"
#include <QRegExp> #include <QRegularExpression>
#include <QRegularExpressionValidator>
LibraryAddFunctionDialog::LibraryAddFunctionDialog(QWidget *parent) : LibraryAddFunctionDialog::LibraryAddFunctionDialog(QWidget *parent) :
QDialog(parent), QDialog(parent),
mUi(new Ui::LibraryAddFunctionDialog) mUi(new Ui::LibraryAddFunctionDialog)
{ {
mUi->setupUi(this); mUi->setupUi(this);
QRegExp rx(NAMES); const QRegularExpression rx(NAMES);
QValidator *validator = new QRegExpValidator(rx, this); QValidator *validator = new QRegularExpressionValidator(rx, this);
mUi->functionName->setValidator(validator); mUi->functionName->setValidator(validator);
} }

5
gui/librarydialog.cpp
View File

@ -28,7 +28,7 @@
#include <QFile> #include <QFile>
#include <QFileDialog> #include <QFileDialog>
#include <QMessageBox> #include <QMessageBox>
#include <QRegExp> #include <QRegularExpression>
#include <QTextStream> #include <QTextStream>
// TODO: get/compare functions from header // TODO: get/compare functions from header
@ -198,7 +198,8 @@ void LibraryDialog::editFunctionName(QListWidgetItem* item)
QString functionName = item->text(); QString functionName = item->text();
CppcheckLibraryData::Function * const function = dynamic_cast<FunctionListItem*>(item)->function; CppcheckLibraryData::Function * const function = dynamic_cast<FunctionListItem*>(item)->function;
if (functionName != function->name) { if (functionName != function->name) {
if (QRegExp(NAMES).exactMatch(functionName)) { const QRegularExpressionMatch matchRes = QRegularExpression("^" NAMES "$").match(functionName);
if (matchRes.hasMatch()) {
function->name = functionName; function->name = functionName;
mUi->buttonSave->setEnabled(true); mUi->buttonSave->setEnabled(true);
} else { } else {

8
gui/mainwindow.cpp
View File

@ -51,7 +51,7 @@
#include <QFileInfo> #include <QFileInfo>
#include <QInputDialog> #include <QInputDialog>
#include <QMessageBox> #include <QMessageBox>
#include <QRegExp> #include <QRegularExpression>
#include <QSettings> #include <QSettings>
#include <QTimer> #include <QTimer>
@ -262,9 +262,9 @@ void MainWindow::handleCLIParams(const QStringList &params)
} else { } else {
loadResults(logFile); loadResults(logFile);
} }
} else if ((index = params.indexOf(QRegExp(".*\\.cppcheck$", Qt::CaseInsensitive), 0)) >= 0 && index < params.length() && QFile(params[index]).exists()) { } else if ((index = params.indexOf(QRegularExpression(".*\\.cppcheck$", QRegularExpression::CaseInsensitiveOption), 0)) >= 0 && index < params.length() && QFile(params[index]).exists()) {
loadProjectFile(params[index]); loadProjectFile(params[index]);
} else if ((index = params.indexOf(QRegExp(".*\\.xml$", Qt::CaseInsensitive), 0)) >= 0 && index < params.length() && QFile(params[index]).exists()) { } else if ((index = params.indexOf(QRegularExpression(".*\\.xml$", QRegularExpression::CaseInsensitiveOption), 0)) >= 0 && index < params.length() && QFile(params[index]).exists()) {
loadResults(params[index],QDir::currentPath()); loadResults(params[index],QDir::currentPath());
} else } else
doAnalyzeFiles(params); doAnalyzeFiles(params);
@ -1179,7 +1179,7 @@ void MainWindow::clearResults()
if (mProjectFile && !mProjectFile->getBuildDir().isEmpty()) { if (mProjectFile && !mProjectFile->getBuildDir().isEmpty()) {
QDir dir(QFileInfo(mProjectFile->getFilename()).absolutePath() + '/' + mProjectFile->getBuildDir()); QDir dir(QFileInfo(mProjectFile->getFilename()).absolutePath() + '/' + mProjectFile->getBuildDir());
for (const QString& f: dir.entryList(QDir::Files)) { for (const QString& f: dir.entryList(QDir::Files)) {
if (!f.endsWith("files.txt") && !QRegExp(".*.s[0-9]+$").exactMatch(f)) if (!f.endsWith("files.txt") && !QRegularExpression("^.*.s[0-9]+$").match(f).hasMatch())
dir.remove(f); dir.remove(f);
} }
} }

17
gui/projectfiledialog.cpp
View File

@ -31,7 +31,8 @@
#include <QDir> #include <QDir>
#include <QFileDialog> #include <QFileDialog>
#include <QFileInfo> #include <QFileInfo>
#include <QRegExp> #include <QRegularExpression>
#include <QRegularExpressionValidator>
#include <QSettings> #include <QSettings>
/** Return paths from QListWidget */ /** Return paths from QListWidget */
@ -183,10 +184,10 @@ ProjectFileDialog::ProjectFileDialog(ProjectFile *projectFile, QWidget *parent)
platformFiles.sort(); platformFiles.sort();
mUI->mComboBoxPlatform->addItems(platformFiles); mUI->mComboBoxPlatform->addItems(platformFiles);
mUI->mEditTags->setValidator(new QRegExpValidator(QRegExp("[a-zA-Z0-9 ;]*"),this)); mUI->mEditTags->setValidator(new QRegularExpressionValidator(QRegularExpression("[a-zA-Z0-9 ;]*"),this));
const QRegExp undefRegExp("\\s*([a-zA-Z_][a-zA-Z0-9_]*[; ]*)*"); const QRegularExpression undefRegExp("\\s*([a-zA-Z_][a-zA-Z0-9_]*[; ]*)*");
mUI->mEditUndefines->setValidator(new QRegExpValidator(undefRegExp, this)); mUI->mEditUndefines->setValidator(new QRegularExpressionValidator(undefRegExp, this));
connect(mUI->mButtons, &QDialogButtonBox::accepted, this, &ProjectFileDialog::ok); connect(mUI->mButtons, &QDialogButtonBox::accepted, this, &ProjectFileDialog::ok);
connect(mUI->mBtnBrowseBuildDir, &QPushButton::clicked, this, &ProjectFileDialog::browseBuildDir); connect(mUI->mBtnBrowseBuildDir, &QPushButton::clicked, this, &ProjectFileDialog::browseBuildDir);
@ -595,9 +596,9 @@ QStringList ProjectFileDialog::getIncludePaths() const
QStringList ProjectFileDialog::getDefines() const QStringList ProjectFileDialog::getDefines() const
{ {
#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)) #if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
return mUI->mEditDefines->text().trimmed().split(QRegExp("\\s*;\\s*"), Qt::SkipEmptyParts); return mUI->mEditDefines->text().trimmed().split(QRegularExpression("\\s*;\\s*"), Qt::SkipEmptyParts);
#else #else
return mUI->mEditDefines->text().trimmed().split(QRegExp("\\s*;\\s*"), QString::SkipEmptyParts); return mUI->mEditDefines->text().trimmed().split(QRegularExpression("\\s*;\\s*"), QString::SkipEmptyParts);
#endif #endif
} }
@ -605,9 +606,9 @@ QStringList ProjectFileDialog::getUndefines() const
{ {
const QString undefine = mUI->mEditUndefines->text().trimmed(); const QString undefine = mUI->mEditUndefines->text().trimmed();
#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)) #if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
QStringList undefines = undefine.split(QRegExp("\\s*;\\s*"), Qt::SkipEmptyParts); QStringList undefines = undefine.split(QRegularExpression("\\s*;\\s*"), Qt::SkipEmptyParts);
#else #else
QStringList undefines = undefine.split(QRegExp("\\s*;\\s*"), QString::SkipEmptyParts); QStringList undefines = undefine.split(QRegularExpression("\\s*;\\s*"), QString::SkipEmptyParts);
#endif #endif
undefines.removeDuplicates(); undefines.removeDuplicates();
return undefines; return undefines;

13
gui/statsdialog.cpp
View File

@ -30,7 +30,7 @@
#include <QFileInfo> #include <QFileInfo>
#include <QMimeData> #include <QMimeData>
#include <QPrinter> #include <QPrinter>
#include <QRegExp> #include <QRegularExpression>
#include <QTextDocument> #include <QTextDocument>
#include <QWidget> #include <QWidget>
@ -406,11 +406,12 @@ QLineSeries *StatsDialog::numberOfReports(const QString &fileName, const QString
QTextStream in(&f); QTextStream in(&f);
while (!in.atEnd()) { while (!in.atEnd()) {
QString line = in.readLine(); QString line = in.readLine();
QRegExp rxdate("\\[(\\d\\d)\\.(\\d\\d)\\.(\\d\\d\\d\\d)\\]"); const QRegularExpression rxdate("^\\[(\\d\\d)\\.(\\d\\d)\\.(\\d\\d\\d\\d)\\]$");
if (rxdate.exactMatch(line)) { const QRegularExpressionMatch matchRes = rxdate.match(line);
int y = rxdate.cap(3).toInt(); if (matchRes.hasMatch()) {
int m = rxdate.cap(2).toInt(); int y = matchRes.captured(3).toInt();
int d = rxdate.cap(1).toInt(); int m = matchRes.captured(2).toInt();
int d = matchRes.captured(1).toInt();
QDateTime dt; QDateTime dt;
dt.setDate(QDate(y,m,d)); dt.setDate(QDate(y,m,d));
if (t == dt.toMSecsSinceEpoch()) if (t == dt.toMSecsSinceEpoch())

7
gui/variablecontractsdialog.cpp
View File

@ -20,7 +20,8 @@
#include "ui_variablecontractsdialog.h" #include "ui_variablecontractsdialog.h"
#include <QRegExpValidator> #include <QRegularExpression>
#include <QRegularExpressionValidator>
VariableContractsDialog::VariableContractsDialog(QWidget *parent, QString var) : VariableContractsDialog::VariableContractsDialog(QWidget *parent, QString var) :
QDialog(parent), QDialog(parent),
@ -45,8 +46,8 @@ VariableContractsDialog::VariableContractsDialog(QWidget *parent, QString var) :
mUI->mMinValue->setText(getMinMax(var, "min")); mUI->mMinValue->setText(getMinMax(var, "min"));
mUI->mMaxValue->setText(getMinMax(var, "max")); mUI->mMaxValue->setText(getMinMax(var, "max"));
mUI->mMinValue->setValidator(new QRegExpValidator(QRegExp("-?[0-9]*"))); mUI->mMinValue->setValidator(new QRegularExpressionValidator(QRegularExpression("-?[0-9]*")));
mUI->mMaxValue->setValidator(new QRegExpValidator(QRegExp("-?[0-9]*"))); mUI->mMaxValue->setValidator(new QRegularExpressionValidator(QRegularExpression("-?[0-9]*")));
} }
VariableContractsDialog::~VariableContractsDialog() VariableContractsDialog::~VariableContractsDialog()

15
tools/triage/mainwindow.cpp
View File

@ -32,6 +32,7 @@
#include <QMimeDatabase> #include <QMimeDatabase>
#include <QProcess> #include <QProcess>
#include <QProgressDialog> #include <QProgressDialog>
#include <QRegularExpression>
#include <QTextStream> #include <QTextStream>
const QString WORK_FOLDER(QDir::homePath() + "/triage"); const QString WORK_FOLDER(QDir::homePath() + "/triage");
@ -42,7 +43,7 @@ const int MAX_ERRORS = 100;
MainWindow::MainWindow(QWidget *parent) : MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent), QMainWindow(parent),
ui(new Ui::MainWindow), ui(new Ui::MainWindow),
mVersionRe("^(master|main|your|head|[12].[0-9][0-9]?) (.*)"), mVersionRe("^(master|main|your|head|[12].[0-9][0-9]?) (.*)$"),
hFiles{"*.hpp", "*.h", "*.hxx", "*.hh", "*.tpp", "*.txx", "*.ipp", "*.ixx"}, hFiles{"*.hpp", "*.h", "*.hxx", "*.hh", "*.tpp", "*.txx", "*.ipp", "*.ixx"},
srcFiles{"*.cpp", "*.cxx", "*.cc", "*.c++", "*.C", "*.c", "*.cl"} srcFiles{"*.cpp", "*.cxx", "*.cc", "*.c++", "*.C", "*.c", "*.cl"}
{ {
@ -110,9 +111,10 @@ void MainWindow::load(QTextStream &textStream)
if (!errorMessage.isEmpty()) if (!errorMessage.isEmpty())
mAllErrors << errorMessage; mAllErrors << errorMessage;
errorMessage.clear(); errorMessage.clear();
} else if (!url.isEmpty() && QRegExp(".*: (error|warning|style|note):.*").exactMatch(line)) { } else if (!url.isEmpty() && QRegularExpression("^.*: (error|warning|style|note):.*$").match(line).hasMatch()) {
if (mVersionRe.exactMatch(line)) { const QRegularExpressionMatch matchRes = mVersionRe.match(line);
const QString version = mVersionRe.cap(1); if (matchRes.hasMatch()) {
const QString version = matchRes.captured(1);
if (versions.indexOf(version) < 0) if (versions.indexOf(version) < 0)
versions << version; versions << version;
} }
@ -260,8 +262,9 @@ void MainWindow::showResult(QListWidgetItem *item)
return; return;
const QString url = lines[0]; const QString url = lines[0];
QString msg = lines[1]; QString msg = lines[1];
if (mVersionRe.exactMatch(msg)) const QRegularExpressionMatch matchRes = mVersionRe.match(msg);
msg = mVersionRe.cap(2); if (matchRes.hasMatch())
msg = matchRes.captured(2);
const QString archiveName = url.mid(url.lastIndexOf("/") + 1); const QString archiveName = url.mid(url.lastIndexOf("/") + 1);
const int pos1 = msg.indexOf(":"); const int pos1 = msg.indexOf(":");
const int pos2 = msg.indexOf(":", pos1+1); const int pos2 = msg.indexOf(":", pos1+1);

3
tools/triage/mainwindow.h
View File

@ -21,6 +21,7 @@
#include <QFileSystemModel> #include <QFileSystemModel>
#include <QMainWindow> #include <QMainWindow>
#include <QRegularExpression>
#include <QString> #include <QString>
class QListWidgetItem; class QListWidgetItem;
@ -61,7 +62,7 @@ private:
QStringList mAllErrors; QStringList mAllErrors;
QFileSystemModel mFSmodel; QFileSystemModel mFSmodel;
const QRegExp mVersionRe; const QRegularExpression mVersionRe;
const QStringList hFiles; const QStringList hFiles;
const QStringList srcFiles; const QStringList srcFiles;