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

ConflictHandler: Use cleanedStdOut() and cleanedStdErr()

Browse Source 
Instead of connecting to stdOutText() and stdErrText() signals.

Change-Id: I3a90fe2a6b17eb804dbd67691a4685e236232456
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2022-09-19 09:41:49 +02:00
parent 66eca4cb4b
commit d78ccc30cb
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/git/gitclient.cpp
View File

@@ -731,8 +731,10 @@ public:
handler->setParent(command); // delete when command goes out of scope handler->setParent(command); // delete when command goes out of scope
command->addFlags(VcsCommand::ExpectRepoChanges); command->addFlags(VcsCommand::ExpectRepoChanges);
connect(command, &VcsCommand::stdOutText, handler, &ConflictHandler::readStdOut); connect(command, &VcsCommand::finished, handler, [handler, command] {
connect(command, &VcsCommand::stdErrText, handler, &ConflictHandler::readStdErr); handler->readStdOut(command->cleanedStdOut());
handler->readStdErr(command->cleanedStdErr());
});
} }
static void handleResponse(const VcsBase::CommandResult &result, static void handleResponse(const VcsBase::CommandResult &result,