forked from qt-creator/qt-creator
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>
This commit is contained in:
@@ -40,7 +40,7 @@
|
||||
#include <vcsbase/vcsbaseconstants.h>
|
||||
#include <vcsbase/vcsbaseeditor.h>
|
||||
#include <vcsbase/basevcssubmiteditorfactory.h>
|
||||
#include <vcsbase/vcsbaseoutputwindow.h>
|
||||
#include <vcsbase/vcsoutputwindow.h>
|
||||
#include <vcsbase/vcsbaseeditorparameterwidget.h>
|
||||
#include <utils/synchronousprocess.h>
|
||||
#include <utils/parameteraction.h>
|
||||
@@ -673,7 +673,7 @@ void CvsPlugin::startCommit(const QString &workingDir, const QString &file)
|
||||
if (raiseSubmitEditor())
|
||||
return;
|
||||
if (isCommitEditorOpen()) {
|
||||
VcsBaseOutputWindow::instance()->appendWarning(tr("Another commit is currently being executed."));
|
||||
VcsOutputWindow::appendWarning(tr("Another commit is currently being executed."));
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -696,7 +696,7 @@ void CvsPlugin::startCommit(const QString &workingDir, const QString &file)
|
||||
}
|
||||
}
|
||||
if (statusOutput.empty()) {
|
||||
VcsBaseOutputWindow::instance()->appendWarning(tr("There are no modified files."));
|
||||
VcsOutputWindow::appendWarning(tr("There are no modified files."));
|
||||
return;
|
||||
}
|
||||
m_commitRepository = workingDir;
|
||||
@@ -709,7 +709,7 @@ void CvsPlugin::startCommit(const QString &workingDir, const QString &file)
|
||||
// Create a submit
|
||||
saver.write(submitTemplate.toUtf8());
|
||||
if (!saver.finalize()) {
|
||||
VcsBaseOutputWindow::instance()->appendError(saver.errorString());
|
||||
VcsOutputWindow::appendError(saver.errorString());
|
||||
return;
|
||||
}
|
||||
m_commitMessageFileName = saver.fileName();
|
||||
@@ -983,7 +983,7 @@ void CvsPlugin::slotDescribe(const QString &source, const QString &changeNr)
|
||||
{
|
||||
QString errorMessage;
|
||||
if (!describe(source, changeNr, &errorMessage))
|
||||
VcsBaseOutputWindow::instance()->appendError(errorMessage);
|
||||
VcsOutputWindow::appendError(errorMessage);
|
||||
}
|
||||
|
||||
bool CvsPlugin::describe(const QString &file, const QString &changeNr, QString *errorMessage)
|
||||
|
Reference in New Issue
Block a user