diff --git a/src/plugins/cvs/cvseditor.cpp b/src/plugins/cvs/cvseditor.cpp index b0eccfe596258f2d84c821c9d5e316f2946a566a..f5a35394409d04ac2ad5e894cb2e6254f98ab9d2 100644 --- a/src/plugins/cvs/cvseditor.cpp +++ b/src/plugins/cvs/cvseditor.cpp @@ -101,7 +101,7 @@ QString CvsEditor::changeUnderCursor(const QTextCursor &c) const // Check if we are at the beginning of a line within a reasonable offset. // 2) Log: check for lines like "revision 1.1", cursor past "revision" switch (contentType()) { - case VcsBase::RegularCommandOutput: + case VcsBase::OtherContent: case VcsBase::DiffOutput: break; case VcsBase::AnnotateOutput: { diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp index e36f26473ef7a6a3ba6812fbf51bdb731406efc0..00454c6089f3a78f424ad555fabd49af0686b097 100644 --- a/src/plugins/cvs/cvsplugin.cpp +++ b/src/plugins/cvs/cvsplugin.cpp @@ -116,7 +116,7 @@ static const char CMD_ID_REPOSITORYUPDATE[] = "CVS.RepositoryUpdate"; static const VcsBaseEditorParameters editorParameters[] = { { - RegularCommandOutput, + OtherContent, "CVS Command Log Editor", // id QT_TRANSLATE_NOOP("VCS", "CVS Command Log Editor"), // display name "CVS Command Log Editor", // context @@ -1022,7 +1022,7 @@ bool CvsPlugin::status(const QString &topLevel, const QStringList &files, const runCvs(topLevel, args, m_settings.timeOutMS(), 0); const bool ok = response.result == CvsResponse::Ok; if (ok) - showOutputInEditor(title, response.stdOut, RegularCommandOutput, topLevel, 0); + showOutputInEditor(title, response.stdOut, OtherContent, topLevel, 0); return ok; } diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index c0bfc9de76247312543aa991502527d42cd2141a..610a060a7b5f134a5b236976bc904a59b4ed86a2 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -84,7 +84,7 @@ static const unsigned minimumRequiredVersion = 0x010702; static const VcsBase::VcsBaseEditorParameters editorParameters[] = { { - VcsBase::RegularCommandOutput, + VcsBase::OtherContent, Git::Constants::GIT_COMMAND_LOG_EDITOR_ID, Git::Constants::GIT_COMMAND_LOG_EDITOR_DISPLAY_NAME, Git::Constants::C_GIT_COMMAND_LOG_EDITOR, diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp index d1cebdce972ef916ef293c27c9551b11e9b8f22f..105daaceaf4ed2f6f173cb0b3b825d0e0fa63ac7 100644 --- a/src/plugins/vcsbase/vcsbaseeditor.cpp +++ b/src/plugins/vcsbase/vcsbaseeditor.cpp @@ -669,7 +669,8 @@ void VcsBaseEditorWidget::init() { d->m_editor = editor(); switch (d->m_parameters->type) { - case RegularCommandOutput: + case OtherContent: + break; case LogOutput: connect(d->entriesComboBox(), SIGNAL(activated(int)), this, SLOT(slotJumpToEntry(int))); connect(this, SIGNAL(textChanged()), this, SLOT(slotPopulateLogBrowser())); diff --git a/src/plugins/vcsbase/vcsbaseeditor.h b/src/plugins/vcsbase/vcsbaseeditor.h index 73af1354dfae1d8c56c1f551aee631ebc8caf465..5228d16846c6ca5fe822ff291f6cec4b632238a3 100644 --- a/src/plugins/vcsbase/vcsbaseeditor.h +++ b/src/plugins/vcsbase/vcsbaseeditor.h @@ -58,10 +58,10 @@ class BaseAnnotationHighlighter; // Documentation inside enum EditorContentType { - RegularCommandOutput, LogOutput, AnnotateOutput, - DiffOutput + DiffOutput, + OtherContent }; class VCSBASE_EXPORT VcsBaseEditorParameters