forked from qt-creator/qt-creator
Utils: Introduce a FilePath constructor from char arrays
Similar to QT_RESTRICTED_CAST_FROM_ASCII to avoid the need for decorations in user code. At the same time, drop some convenience constructors and functions in CommandLine and Icon essentially serving the same purpose. Change-Id: Ida4e5ac19c2da0a4298a97b2a8e1511d56bbb79d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
@@ -66,7 +66,7 @@ static QString runExecutable(const Utils::CommandLine &commandLine, QueryFailMod
|
||||
return cpp.stdOut();
|
||||
}
|
||||
|
||||
static QStringList queryClangTidyChecks(const QString &executable,
|
||||
static QStringList queryClangTidyChecks(const FilePath &executable,
|
||||
const QString &checksArgument)
|
||||
{
|
||||
QStringList arguments = QStringList("-list-checks");
|
||||
@@ -100,7 +100,7 @@ static QStringList queryClangTidyChecks(const QString &executable,
|
||||
return checks;
|
||||
}
|
||||
|
||||
static ClazyChecks querySupportedClazyChecks(const QString &executablePath)
|
||||
static ClazyChecks querySupportedClazyChecks(const FilePath &executablePath)
|
||||
{
|
||||
static const QString queryFlag = "-supported-checks-json";
|
||||
QString jsonOutput = runExecutable(CommandLine(executablePath, {queryFlag}),
|
||||
@@ -159,15 +159,15 @@ static ClazyChecks querySupportedClazyChecks(const QString &executablePath)
|
||||
}
|
||||
|
||||
ClangTidyInfo::ClangTidyInfo(const QString &executablePath)
|
||||
: defaultChecks(queryClangTidyChecks(executablePath, {}))
|
||||
, supportedChecks(queryClangTidyChecks(executablePath, "-checks=*"))
|
||||
: defaultChecks(queryClangTidyChecks(FilePath::fromString(executablePath), {}))
|
||||
, supportedChecks(queryClangTidyChecks(FilePath::fromString(executablePath), "-checks=*"))
|
||||
{}
|
||||
|
||||
ClazyStandaloneInfo::ClazyStandaloneInfo(const QString &executablePath)
|
||||
: defaultChecks(queryClangTidyChecks(executablePath, {})) // Yup, behaves as clang-tidy.
|
||||
, supportedChecks(querySupportedClazyChecks(executablePath))
|
||||
: defaultChecks(queryClangTidyChecks(FilePath::fromString(executablePath), {})) // Yup, behaves as clang-tidy.
|
||||
, supportedChecks(querySupportedClazyChecks(FilePath::fromString(executablePath)))
|
||||
{
|
||||
QString output = runExecutable(CommandLine(executablePath, {"--version"}),
|
||||
QString output = runExecutable(CommandLine(FilePath::fromString(executablePath), {"--version"}),
|
||||
QueryFailMode::Silent);
|
||||
QTextStream stream(&output);
|
||||
while (!stream.atEnd()) {
|
||||
|
||||
Reference in New Issue
Block a user