diff options
| author | hjk <hjk121@nokiamail.com> | 2014-08-26 00:02:47 +0200 |
|---|---|---|
| committer | hjk <hjk121@nokiamail.com> | 2014-08-27 12:12:15 +0200 |
| commit | 4d082cee74e9faf88213e234e9a022008ec501b8 (patch) | |
| tree | 44d526e9ffc3b2ccb52d6a9f95ef22f7558fe9d3 /src/plugins/vcsbase/command.cpp | |
| parent | aa6495a261bf6a958ba5bbe4fb7b334f62748156 (diff) | |
| download | qt-creator-4d082cee74e9faf88213e234e9a022008ec501b8.tar.gz | |
VcsBase: Use static pattern for VcsBaseOutputWindow
Also rename to VcsOutputWindow.
Change-Id: I79547b1154603a8c7b3604eadc5b460930c6109c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
Diffstat (limited to 'src/plugins/vcsbase/command.cpp')
| -rw-r--r-- | src/plugins/vcsbase/command.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/plugins/vcsbase/command.cpp b/src/plugins/vcsbase/command.cpp index 39161a2baf..bf9bb3b469 100644 --- a/src/plugins/vcsbase/command.cpp +++ b/src/plugins/vcsbase/command.cpp @@ -33,7 +33,7 @@ #include <coreplugin/progressmanager/progressmanager.h> #include <coreplugin/vcsmanager.h> #include <coreplugin/icore.h> -#include <vcsbase/vcsbaseoutputwindow.h> +#include <vcsbase/vcsoutputwindow.h> #include <utils/synchronousprocess.h> #include <utils/runextensions.h> #include <utils/qtcassert.h> @@ -100,7 +100,6 @@ public: QTextCodec *m_codec; const QString m_sshPasswordPrompt; ProgressParser *m_progressParser; - VcsBase::VcsBaseOutputWindow *m_outputWindow; bool m_progressiveOutput; bool m_hadOutput; bool m_preventRepositoryChanged; @@ -124,7 +123,6 @@ CommandPrivate::CommandPrivate(const Utils::FileName &binary, m_codec(0), m_sshPasswordPrompt(VcsBasePlugin::sshPrompt()), m_progressParser(0), - m_outputWindow(VcsBase::VcsBaseOutputWindow::instance()), m_progressiveOutput(false), m_hadOutput(false), m_preventRepositoryChanged(false), @@ -315,7 +313,7 @@ public: { // Users of this class can either be in the GUI thread or in other threads. // Use Qt::AutoConnection to always append in the GUI thread (directly or queued) - VcsBase::VcsBaseOutputWindow *outputWindow = VcsBase::VcsBaseOutputWindow::instance(); + VcsOutputWindow *outputWindow = VcsOutputWindow::instance(); connect(this, SIGNAL(append(QString)), outputWindow, SLOT(append(QString))); connect(this, SIGNAL(appendSilently(QString)), outputWindow, SLOT(appendSilently(QString))); connect(this, SIGNAL(appendError(QString)), outputWindow, SLOT(appendError(QString))); @@ -561,7 +559,7 @@ void Command::bufferedOutput(const QString &text) if (d->m_progressParser) d->m_progressParser->parseProgress(text); if (d->m_flags & VcsBasePlugin::ShowStdOutInLogWindow) - d->m_outputWindow->append(text); + VcsOutputWindow::append(text); if (d->m_progressiveOutput) { emit output(text); d->m_hadOutput = true; @@ -571,7 +569,7 @@ void Command::bufferedOutput(const QString &text) void Command::bufferedError(const QString &text) { if (!(d->m_flags & VcsBasePlugin::SuppressStdErrInLogWindow)) - d->m_outputWindow->appendError(text); + VcsOutputWindow::appendError(text); if (d->m_progressiveOutput) emit errorText(text); } |