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

Utils: Fix output formatter "new searchDir found" signalling

Browse Source 
Change-Id: Id9bc5cb0641dbac902b7d5af8ee3d00e0308478e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Alessandro Portale
2021-02-14 00:19:39 +01:00
parent 5cbf323014
commit 38a38cd0ed
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/utils/outputformatter.cpp
View File

@@ -264,7 +264,7 @@ void OutputFormatter::addLineParser(OutputLineParser *parser)
void OutputFormatter::setupLineParser(OutputLineParser *parser) void OutputFormatter::setupLineParser(OutputLineParser *parser)
{ {
parser->setFileFinder(&d->fileFinder); 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); connect(parser, &OutputLineParser::searchDirExpired, this, &OutputFormatter::dropSearchDir);
} }

2
src/libs/utils/outputformatter.h
View File

@@ -114,7 +114,7 @@ protected:
const QString &capName); const QString &capName);
signals: signals:
void newSearchDir(const Utils::FilePath &dir); void newSearchDirFound(const Utils::FilePath &dir);
void searchDirExpired(const Utils::FilePath &dir); void searchDirExpired(const Utils::FilePath &dir);
private: private:

2
src/plugins/cmakeprojectmanager/cmakeparser.cpp
View File

@@ -55,7 +55,7 @@ void CMakeParser::setSourceDirectory(const QString &sourceDir)
if (m_sourceDirectory) if (m_sourceDirectory)
emit searchDirExpired(FilePath::fromString(m_sourceDirectory.value().path())); emit searchDirExpired(FilePath::fromString(m_sourceDirectory.value().path()));
m_sourceDirectory = QDir(sourceDir); m_sourceDirectory = QDir(sourceDir);
emit addSearchDir(FilePath::fromString(sourceDir)); emit newSearchDirFound(FilePath::fromString(sourceDir));
} }
OutputLineParser::Result CMakeParser::handleLine(const QString &line, OutputFormat type) OutputLineParser::Result CMakeParser::handleLine(const QString &line, OutputFormat type)

2
src/plugins/mesonprojectmanager/project/outputparsers/mesonoutputparser.cpp
View File

@@ -155,7 +155,7 @@ void MesonOutputParser::readStdo(const QByteArray &data)
void MesonOutputParser::setSourceDirectory(const Utils::FilePath &sourceDir) void MesonOutputParser::setSourceDirectory(const Utils::FilePath &sourceDir)
{ {
emit addSearchDir(sourceDir); emit newSearchDirFound(sourceDir);
} }
} // namespace Internal } // namespace Internal

2
src/plugins/mesonprojectmanager/project/outputparsers/ninjaparser.cpp
View File

@@ -45,7 +45,7 @@ Utils::optional<int> NinjaParser::extractProgress(const QString &line)
void NinjaParser::setSourceDirectory(const Utils::FilePath &sourceDir) void NinjaParser::setSourceDirectory(const Utils::FilePath &sourceDir)
{ {
emit addSearchDir(sourceDir); emit newSearchDirFound(sourceDir);
} }
Utils::OutputLineParser::Result NinjaParser::handleLine(const QString &line, Utils::OutputLineParser::Result NinjaParser::handleLine(const QString &line,

2
src/plugins/projectexplorer/gnumakeparser.cpp
View File

@@ -112,7 +112,7 @@ OutputLineParser::Result GnuMakeParser::handleLine(const QString &line, OutputFo
if (match.captured(6) == QLatin1String("Leaving")) if (match.captured(6) == QLatin1String("Leaving"))
emit searchDirExpired(FilePath::fromString(match.captured(7))); emit searchDirExpired(FilePath::fromString(match.captured(7)));
else else
emit newSearchDir(FilePath::fromString(match.captured(7))); emit newSearchDirFound(FilePath::fromString(match.captured(7)));
return Status::Done; return Status::Done;
} }
return Status::NotHandled; return Status::NotHandled;