feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Use Utils::FilePaths instead of QStringList in JavaParser

Browse Source 
Change-Id: I50cce4bd32ed494f2b68a9a3b7f6cb9108b92f66
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-05-05 16:33:31 +02:00
parent d71c725453
commit bcb3efb3c6
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/android/androidbuildapkstep.cpp
View File

@@ -639,8 +639,8 @@ bool AndroidBuildApkStep::init()
void AndroidBuildApkStep::setupOutputFormatter(OutputFormatter *formatter) void AndroidBuildApkStep::setupOutputFormatter(OutputFormatter *formatter)
{ {
const auto parser = new JavaParser; const auto parser = new JavaParser;
parser->setProjectFileList(Utils::transform(project()->files(ProjectExplorer::Project::AllFiles), parser->setProjectFileList(project()->files(Project::AllFiles));
&Utils::FilePath::toString));
const QString buildKey = target()->activeBuildKey(); const QString buildKey = target()->activeBuildKey();
const ProjectNode *node = project()->findNodeForBuildKey(buildKey); const ProjectNode *node = project()->findNodeForBuildKey(buildKey);
QString sourceDirName; QString sourceDirName;

4
src/plugins/android/javaparser.cpp
View File

@@ -36,7 +36,7 @@ JavaParser::JavaParser() :
m_javaRegExp(QLatin1String("^(.*\\[javac\\]\\s)(.*\\.java):(\\d+):(.*)$")) m_javaRegExp(QLatin1String("^(.*\\[javac\\]\\s)(.*\\.java):(\\d+):(.*)$"))
{ } { }
void JavaParser::setProjectFileList(const QStringList &fileList) void JavaParser::setProjectFileList(const Utils::FilePaths &fileList)
{ {
m_fileList = fileList; m_fileList = fileList;
} }
@@ -71,7 +71,7 @@ Utils::OutputLineParser::Result JavaParser::handleLine(const QString &line,
if (file.toFileInfo().isRelative()) { if (file.toFileInfo().isRelative()) {
for (int i = 0; i < m_fileList.size(); i++) for (int i = 0; i < m_fileList.size(); i++)
if (m_fileList[i].endsWith(file.toString())) { if (m_fileList[i].endsWith(file.toString())) {
file = Utils::FilePath::fromString(m_fileList[i]); file = m_fileList[i];
break; break;
} }
} }

6
src/plugins/android/javaparser.h
View File

@@ -39,16 +39,16 @@ class JavaParser : public ProjectExplorer::OutputTaskParser
public: public:
JavaParser(); JavaParser();
void setProjectFileList(const QStringList &fileList);
void setProjectFileList(const Utils::FilePaths &fileList);
void setBuildDirectory(const Utils::FilePath &buildDirectory); void setBuildDirectory(const Utils::FilePath &buildDirectory);
void setSourceDirectory(const Utils::FilePath &sourceDirectory); void setSourceDirectory(const Utils::FilePath &sourceDirectory);
private: private:
Result handleLine(const QString &line, Utils::OutputFormat type) override; Result handleLine(const QString &line, Utils::OutputFormat type) override;
QRegularExpression m_javaRegExp; const QRegularExpression m_javaRegExp;
QStringList m_fileList; Utils::FilePaths m_fileList;
Utils::FilePath m_sourceDirectory; Utils::FilePath m_sourceDirectory;
Utils::FilePath m_buildDirectory; Utils::FilePath m_buildDirectory;
}; };