From c71d734d0897a45e82d58ef3d85902a7ac65840f Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@digia.com>
Date: Tue, 2 Apr 2013 15:17:55 +0200
Subject: [PATCH] Android: Fix Javaparser
Make sure to send output down the right channel in case some
parser is appended.
Change-Id: Ibb6810acf7498c07d5169b6133d8d04ce21ce993
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
---
src/plugins/android/javaparser.cpp | 22 ++++++++++++++--------
src/plugins/android/javaparser.h | 2 ++
2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/plugins/android/javaparser.cpp b/src/plugins/android/javaparser.cpp
index 23f4c0c62fa..8ef58a936cd 100644
--- a/src/plugins/android/javaparser.cpp
+++ b/src/plugins/android/javaparser.cpp
@@ -37,15 +37,26 @@ using namespace ProjectExplorer;
JavaParser::JavaParser() :
m_javaRegExp(QLatin1String("^(.*\\[javac\\]\\s)(.*\\.java):(\\d+):(.*)$"))
-{
-}
+{ }
void JavaParser::stdOutput(const QString &line)
{
- stdError(line);
+ parse(line);
+ IOutputParser::stdOutput(line);
}
void JavaParser::stdError(const QString &line)
+{
+ parse(line);
+ IOutputParser::stdError(line);
+}
+
+void JavaParser::setProjectFileList(const QStringList &fileList)
+{
+ m_fileList = fileList;
+}
+
+void JavaParser::parse(const QString &line)
{
if (m_javaRegExp.indexIn(line) > -1) {
bool ok;
@@ -67,10 +78,5 @@ void JavaParser::stdError(const QString &line)
emit addTask(task);
return;
}
- IOutputParser::stdError(line);
-}
-void JavaParser::setProjectFileList(const QStringList &fileList)
-{
- m_fileList = fileList;
}
diff --git a/src/plugins/android/javaparser.h b/src/plugins/android/javaparser.h
index 0c3e8263ec7..c28a5a2418d 100644
--- a/src/plugins/android/javaparser.h
+++ b/src/plugins/android/javaparser.h
@@ -46,6 +46,8 @@ public:
void setProjectFileList(const QStringList &fileList);
private:
+ void parse(const QString &line);
+
QRegExp m_javaRegExp;
QStringList m_fileList;
};
--
GitLab