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

VCS: Un-data functions that accept QString

Browse Source 
Change-Id: Iffa82f4ab06162ab57e77301e77fb37ed7230bd5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-07-30 20:16:56 +03:00
committed by Orgad Shaneh
parent 706d0a821e
commit 6b8c93637b
9 changed files with 32 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/vcsbase/vcsbaseclient.cpp
View File

@@ -436,7 +436,7 @@ void VcsBaseClient::emitParsedStatus(const QString &repository, const QStringLis
QStringList args(vcsCommandString(StatusCommand));
args << extraOptions;
Command *cmd = createCommand(repository);
connect(cmd, SIGNAL(outputData(QString)), this, SLOT(statusParser(QString)));
connect(cmd, SIGNAL(output(QString)), this, SLOT(statusParser(QString)));
enqueueJob(cmd, args);
}
@@ -598,15 +598,14 @@ Command *VcsBaseClient::createCommand(const QString &workingDirectory,
d->bindCommandToEditor(cmd, editor);
if (mode == VcsWindowOutputBind) {
if (editor) { // assume that the commands output is the important thing
connect(cmd, SIGNAL(outputData(QString)),
connect(cmd, SIGNAL(output(QString)),
::vcsOutputWindow(), SLOT(appendSilently(QString)));
} else {
connect(cmd, SIGNAL(outputData(QString)),
connect(cmd, SIGNAL(output(QString)),
::vcsOutputWindow(), SLOT(append(QString)));
}
} else if (editor) {
connect(cmd, SIGNAL(outputData(QString)),
editor, SLOT(setPlainTextData(QString)));
connect(cmd, SIGNAL(output(QString)), editor, SLOT(setPlainText(QString)));
}
if (::vcsOutputWindow())