From 38a38cd0ed68b350cef41353973db4ff79a884e6 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Sun, 14 Feb 2021 00:19:39 +0100 Subject: [PATCH] Utils: Fix output formatter "new searchDir found" signalling Change-Id: Id9bc5cb0641dbac902b7d5af8ee3d00e0308478e Reviewed-by: Christian Kandeler --- src/libs/utils/outputformatter.cpp | 2 +- src/libs/utils/outputformatter.h | 2 +- src/plugins/cmakeprojectmanager/cmakeparser.cpp | 2 +- .../project/outputparsers/mesonoutputparser.cpp | 2 +- .../mesonprojectmanager/project/outputparsers/ninjaparser.cpp | 2 +- src/plugins/projectexplorer/gnumakeparser.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libs/utils/outputformatter.cpp b/src/libs/utils/outputformatter.cpp index cf8e0210853..93111240fa0 100644 --- a/src/libs/utils/outputformatter.cpp +++ b/src/libs/utils/outputformatter.cpp @@ -264,7 +264,7 @@ void OutputFormatter::addLineParser(OutputLineParser *parser) void OutputFormatter::setupLineParser(OutputLineParser *parser) { parser->setFileFinder(&d->fileFinder); - connect(parser, &OutputLineParser::newSearchDir, this, &OutputFormatter::addSearchDir); + connect(parser, &OutputLineParser::newSearchDirFound, this, &OutputFormatter::addSearchDir); connect(parser, &OutputLineParser::searchDirExpired, this, &OutputFormatter::dropSearchDir); } diff --git a/src/libs/utils/outputformatter.h b/src/libs/utils/outputformatter.h index 89af3de113f..10ec2049f4c 100644 --- a/src/libs/utils/outputformatter.h +++ b/src/libs/utils/outputformatter.h @@ -114,7 +114,7 @@ protected: const QString &capName); signals: - void newSearchDir(const Utils::FilePath &dir); + void newSearchDirFound(const Utils::FilePath &dir); void searchDirExpired(const Utils::FilePath &dir); private: diff --git a/src/plugins/cmakeprojectmanager/cmakeparser.cpp b/src/plugins/cmakeprojectmanager/cmakeparser.cpp index e34e943383d..dfb18ac7ce6 100644 --- a/src/plugins/cmakeprojectmanager/cmakeparser.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeparser.cpp @@ -55,7 +55,7 @@ void CMakeParser::setSourceDirectory(const QString &sourceDir) if (m_sourceDirectory) emit searchDirExpired(FilePath::fromString(m_sourceDirectory.value().path())); m_sourceDirectory = QDir(sourceDir); - emit addSearchDir(FilePath::fromString(sourceDir)); + emit newSearchDirFound(FilePath::fromString(sourceDir)); } OutputLineParser::Result CMakeParser::handleLine(const QString &line, OutputFormat type) diff --git a/src/plugins/mesonprojectmanager/project/outputparsers/mesonoutputparser.cpp b/src/plugins/mesonprojectmanager/project/outputparsers/mesonoutputparser.cpp index f49ddd75e9a..53bb0f3e9e6 100644 --- a/src/plugins/mesonprojectmanager/project/outputparsers/mesonoutputparser.cpp +++ b/src/plugins/mesonprojectmanager/project/outputparsers/mesonoutputparser.cpp @@ -155,7 +155,7 @@ void MesonOutputParser::readStdo(const QByteArray &data) void MesonOutputParser::setSourceDirectory(const Utils::FilePath &sourceDir) { - emit addSearchDir(sourceDir); + emit newSearchDirFound(sourceDir); } } // namespace Internal diff --git a/src/plugins/mesonprojectmanager/project/outputparsers/ninjaparser.cpp b/src/plugins/mesonprojectmanager/project/outputparsers/ninjaparser.cpp index cc8f2c0a290..3c55b3bba7f 100644 --- a/src/plugins/mesonprojectmanager/project/outputparsers/ninjaparser.cpp +++ b/src/plugins/mesonprojectmanager/project/outputparsers/ninjaparser.cpp @@ -45,7 +45,7 @@ Utils::optional NinjaParser::extractProgress(const QString &line) void NinjaParser::setSourceDirectory(const Utils::FilePath &sourceDir) { - emit addSearchDir(sourceDir); + emit newSearchDirFound(sourceDir); } Utils::OutputLineParser::Result NinjaParser::handleLine(const QString &line, diff --git a/src/plugins/projectexplorer/gnumakeparser.cpp b/src/plugins/projectexplorer/gnumakeparser.cpp index 6bb7442e0ca..d51a3710600 100644 --- a/src/plugins/projectexplorer/gnumakeparser.cpp +++ b/src/plugins/projectexplorer/gnumakeparser.cpp @@ -112,7 +112,7 @@ OutputLineParser::Result GnuMakeParser::handleLine(const QString &line, OutputFo if (match.captured(6) == QLatin1String("Leaving")) emit searchDirExpired(FilePath::fromString(match.captured(7))); else - emit newSearchDir(FilePath::fromString(match.captured(7))); + emit newSearchDirFound(FilePath::fromString(match.captured(7))); return Status::Done; } return Status::NotHandled;