Android: Clean up JavaParser a bit

Change-Id: I8d5113c7916f816d34a1eacc0b978645d710b2be
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>

src/plugins/android/androiddeployqtstep.cpp

@@ -42,6 +42,7 @@
 #include <QLoggingCategory>
 #include <QMessageBox>
 #include <QPushButton>
+#include <QRegularExpression>
 #include <QVBoxLayout>
 
 using namespace ProjectExplorer;

src/plugins/android/javaparser.cpp

@@ -5,35 +5,38 @@
 
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/task.h>
-#include <QFileInfo>
 
-using namespace Android::Internal;
+#include <QRegularExpression>
+
 using namespace ProjectExplorer;
+using namespace Utils;
 
-JavaParser::JavaParser() :
+namespace Android::Internal {
-  m_javaRegExp(QLatin1String("^(.*\\[javac\\]\\s)(.*\\.java):(\\d+):(.*)$"))
+
+JavaParser::JavaParser()
 { }
 
-void JavaParser::setProjectFileList(const Utils::FilePaths &fileList)
+void JavaParser::setProjectFileList(const FilePaths &fileList)
 {
     m_fileList = fileList;
 }
 
-void JavaParser::setBuildDirectory(const Utils::FilePath &buildDirectory)
+void JavaParser::setBuildDirectory(const FilePath &buildDirectory)
 {
     m_buildDirectory = buildDirectory;
 }
 
-void JavaParser::setSourceDirectory(const Utils::FilePath &sourceDirectory)
+void JavaParser::setSourceDirectory(const FilePath &sourceDirectory)
 {
     m_sourceDirectory = sourceDirectory;
 }
 
-Utils::OutputLineParser::Result JavaParser::handleLine(const QString &line,
+OutputLineParser::Result JavaParser::handleLine(const QString &line, OutputFormat type)
-                                                       Utils::OutputFormat type)
 {
     Q_UNUSED(type);
-    const QRegularExpressionMatch match = m_javaRegExp.match(line);
+    static const QRegularExpression javaRegExp("^(.*\\[javac\\]\\s)(.*\\.java):(\\d+):(.*)$");
+
+    const QRegularExpressionMatch match = javaRegExp.match(line);
     if (!match.hasMatch())
         return Status::NotHandled;
 
@@ -41,9 +44,9 @@ Utils::OutputLineParser::Result JavaParser::handleLine(const QString &line,
     int lineno = match.captured(3).toInt(&ok);
     if (!ok)
         lineno = -1;
-    Utils::FilePath file = Utils::FilePath::fromUserInput(match.captured(2));
+    FilePath file = FilePath::fromUserInput(match.captured(2));
     if (file.isChildOf(m_buildDirectory)) {
-        Utils::FilePath relativePath = file.relativeChildPath(m_buildDirectory);
+        FilePath relativePath = file.relativeChildPath(m_buildDirectory);
         file = m_sourceDirectory.pathAppended(relativePath.toString());
     }
     if (file.toFileInfo().isRelative()) {
@@ -63,3 +66,5 @@ Utils::OutputLineParser::Result JavaParser::handleLine(const QString &line,
     scheduleTask(task, 1);
     return {Status::Done, linkSpecs};
 }
+
+} // Android::Internal

src/plugins/android/javaparser.h

@@ -4,17 +4,13 @@
 #pragma once
 
 #include <projectexplorer/ioutputparser.h>
-#include <utils/fileutils.h>
 
-#include <QRegularExpression>
+#include <utils/filepath.h>
 
-namespace Android {
+namespace Android::Internal {
-namespace Internal {
 
 class JavaParser : public ProjectExplorer::OutputTaskParser
 {
-    Q_OBJECT
-
 public:
     JavaParser();
 
@@ -23,13 +19,11 @@ public:
     void setSourceDirectory(const Utils::FilePath &sourceDirectory);
 
 private:
-    Result handleLine(const QString &line, Utils::OutputFormat type) override;
+    Result handleLine(const QString &line, Utils::OutputFormat type) final;
 
-    const QRegularExpression m_javaRegExp;
     Utils::FilePaths m_fileList;
     Utils::FilePath m_sourceDirectory;
     Utils::FilePath m_buildDirectory;
 };
 
-} // namespace Internal
+} // Android::Internal
-} // namespace Android