From bcb3efb3c648dfd114b18852fdf48627c18deb50 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 5 May 2021 16:33:31 +0200 Subject: [PATCH] Android: Use Utils::FilePaths instead of QStringList in JavaParser Change-Id: I50cce4bd32ed494f2b68a9a3b7f6cb9108b92f66 Reviewed-by: Christian Stenger --- src/plugins/android/androidbuildapkstep.cpp | 4 ++-- src/plugins/android/javaparser.cpp | 4 ++-- src/plugins/android/javaparser.h | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp index c9c0ab3f800..d2af119b18e 100644 --- a/src/plugins/android/androidbuildapkstep.cpp +++ b/src/plugins/android/androidbuildapkstep.cpp @@ -639,8 +639,8 @@ bool AndroidBuildApkStep::init() void AndroidBuildApkStep::setupOutputFormatter(OutputFormatter *formatter) { const auto parser = new JavaParser; - parser->setProjectFileList(Utils::transform(project()->files(ProjectExplorer::Project::AllFiles), - &Utils::FilePath::toString)); + parser->setProjectFileList(project()->files(Project::AllFiles)); + const QString buildKey = target()->activeBuildKey(); const ProjectNode *node = project()->findNodeForBuildKey(buildKey); QString sourceDirName; diff --git a/src/plugins/android/javaparser.cpp b/src/plugins/android/javaparser.cpp index 04b1b729adc..063ffb32f91 100644 --- a/src/plugins/android/javaparser.cpp +++ b/src/plugins/android/javaparser.cpp @@ -36,7 +36,7 @@ JavaParser::JavaParser() : m_javaRegExp(QLatin1String("^(.*\\[javac\\]\\s)(.*\\.java):(\\d+):(.*)$")) { } -void JavaParser::setProjectFileList(const QStringList &fileList) +void JavaParser::setProjectFileList(const Utils::FilePaths &fileList) { m_fileList = fileList; } @@ -71,7 +71,7 @@ Utils::OutputLineParser::Result JavaParser::handleLine(const QString &line, if (file.toFileInfo().isRelative()) { for (int i = 0; i < m_fileList.size(); i++) if (m_fileList[i].endsWith(file.toString())) { - file = Utils::FilePath::fromString(m_fileList[i]); + file = m_fileList[i]; break; } } diff --git a/src/plugins/android/javaparser.h b/src/plugins/android/javaparser.h index 839f51626be..ea8c0ec1586 100644 --- a/src/plugins/android/javaparser.h +++ b/src/plugins/android/javaparser.h @@ -39,16 +39,16 @@ class JavaParser : public ProjectExplorer::OutputTaskParser public: JavaParser(); - void setProjectFileList(const QStringList &fileList); + void setProjectFileList(const Utils::FilePaths &fileList); void setBuildDirectory(const Utils::FilePath &buildDirectory); void setSourceDirectory(const Utils::FilePath &sourceDirectory); private: Result handleLine(const QString &line, Utils::OutputFormat type) override; - QRegularExpression m_javaRegExp; - QStringList m_fileList; + const QRegularExpression m_javaRegExp; + Utils::FilePaths m_fileList; Utils::FilePath m_sourceDirectory; Utils::FilePath m_buildDirectory; };