Commit a9d9d444 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh

VCS: Rename RegularCommandOutput to OtherContent

Change-Id: I37d47c79f0efaf51eb5afd1fe529aacfadff8ee1
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent 05ef32f2
......@@ -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: {
......
......@@ -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;
}
......
......@@ -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,
......
......@@ -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()));
......
......@@ -58,10 +58,10 @@ class BaseAnnotationHighlighter;
// Documentation inside
enum EditorContentType
{
RegularCommandOutput,
LogOutput,
AnnotateOutput,
DiffOutput
DiffOutput,
OtherContent
};
class VCSBASE_EXPORT VcsBaseEditorParameters
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment