Revert "VCS: Open diff/blame editors in other split"

This change has lead to complaints about diff views opening
in apparently random places for users with several splits.

This reverts commit 02b3a79c5f.

Conflicts:
	src/plugins/diffeditor/diffeditorplugin.cpp
	src/plugins/subversion/subversionplugin.cpp

Change-Id: I2eab8ff2d88a9e12f4dc7ec3a9ca65455daf15e2
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

src/plugins/clearcase/clearcaseplugin.cpp

@@ -1522,9 +1522,7 @@ IEditor *ClearCasePlugin::showOutputInEditor(const QString& title, const QString
         qDebug() << "ClearCasePlugin::showOutputInEditor" << title << id.name()
                  <<  "Size= " << output.size() <<  " Type=" << editorType << debugCodec(codec);
     QString s = title;
-    IEditor *editor = EditorManager::openEditorWithContents(id, &s, output.toUtf8(),
+    IEditor *editor = EditorManager::openEditorWithContents(id, &s, output.toUtf8());
-                                                            (EditorManager::OpenInOtherSplit
-                                                             | EditorManager::NoNewSplits));
     connect(editor, SIGNAL(annotateRevisionRequested(QString,QString,QString,int)),
             this, SLOT(annotateVersion(QString,QString,QString,int)));
     ClearCaseEditor *e = qobject_cast<ClearCaseEditor*>(editor->widget());

src/plugins/cvs/cvsplugin.cpp

@@ -1170,9 +1170,7 @@ IEditor *CvsPlugin::showOutputInEditor(const QString& title, const QString &outp
         qDebug() << "CVSPlugin::showOutputInEditor" << title << id.name()
                  <<  "source=" << source << "Size= " << output.size() <<  " Type=" << editorType << debugCodec(codec);
     QString s = title;
-    IEditor *editor = EditorManager::openEditorWithContents(id, &s, output.toUtf8(),
+    IEditor *editor = EditorManager::openEditorWithContents(id, &s, output.toUtf8());
-                                                            (EditorManager::OpenInOtherSplit
-                                                             | EditorManager::NoNewSplits));
     connect(editor, SIGNAL(annotateRevisionRequested(QString,QString,QString,int)),
             this, SLOT(vcsAnnotate(QString,QString,QString,int)));
     CvsEditor *e = qobject_cast<CvsEditor*>(editor->widget());

src/plugins/diffeditor/diffeditormanager.cpp

@@ -100,9 +100,7 @@ DiffEditorDocument *DiffEditorManager::findOrCreate(const QString &documentId, c
     const QString msgWait = tr("Waiting for data...");
     DiffEditor *diffEditor = qobject_cast<DiffEditor *>(
                 Core::EditorManager::openEditorWithContents(Constants::DIFF_EDITOR_ID,
-                                                            0, msgWait.toUtf8(),
+                                                            0, msgWait.toUtf8()));
-                                                            (Core::EditorManager::OpenInOtherSplit
-                                                             | Core::EditorManager::NoNewSplits)));
     QTC_ASSERT(diffEditor, return 0);
 
     document = qobject_cast<DiffEditorDocument *>(diffEditor->document());

src/plugins/git/gitclient.cpp

@@ -915,10 +915,8 @@ VcsBase::VcsBaseEditorWidget *GitClient::createVcsEditor(
     QTC_CHECK(!findExistingVCSEditor(registerDynamicProperty, dynamicPropertyValue));
 
     // Create new, set wait message, set up with source and codec
-    Core::IEditor *outputEditor
+    Core::IEditor *outputEditor = Core::EditorManager::openEditorWithContents(id, &title,
-            = Core::EditorManager::openEditorWithContents(id, &title, m_msgWait.toUtf8(),
+                                                                              m_msgWait.toUtf8());
-                                                          (Core::EditorManager::OpenInOtherSplit
-                                                           | Core::EditorManager::NoNewSplits));
     outputEditor->document()->setProperty(registerDynamicProperty, dynamicPropertyValue);
     rc = VcsBase::VcsBaseEditorWidget::getVcsBaseEditor(outputEditor);
     connect(rc, SIGNAL(annotateRevisionRequested(QString,QString,QString,int)),

src/plugins/perforce/perforceplugin.cpp

@@ -1182,10 +1182,7 @@ Core::IEditor *PerforcePlugin::showOutputInEditor(const QString &title,
         qDebug() << "PerforcePlugin::showOutputInEditor" << title << id.name()
                  <<  "Size= " << output.size() <<  " Type=" << editorType << debugCodec(codec);
     QString s = title;
-    Core::IEditor *editor
+    Core::IEditor *editor = Core::EditorManager::openEditorWithContents(id, &s, output.toUtf8());
-            = Core::EditorManager::openEditorWithContents(id, &s, output.toUtf8(),
-                                                          (Core::EditorManager::OpenInOtherSplit
-                                                           | Core::EditorManager::NoNewSplits));
     connect(editor, SIGNAL(annotateRevisionRequested(QString,QString,QString,int)),
             this, SLOT(vcsAnnotate(QString,QString,QString,int)));
     PerforceEditor *e = qobject_cast<PerforceEditor*>(editor->widget());

src/plugins/subversion/subversionplugin.cpp

@@ -1032,9 +1032,7 @@ IEditor *SubversionPlugin::showOutputInEditor(const QString &title, const QStrin
         qDebug() << "SubversionPlugin::showOutputInEditor" << title << id.name()
                  <<  "Size= " << output.size() <<  " Type=" << editorType << debugCodec(codec);
     QString s = title;
-    IEditor *editor = EditorManager::openEditorWithContents(id, &s, output.toUtf8(),
+    IEditor *editor = EditorManager::openEditorWithContents(id, &s, output.toUtf8());
-                                                          (EditorManager::OpenInOtherSplit
-                                                           | EditorManager::NoNewSplits));
     connect(editor, SIGNAL(annotateRevisionRequested(QString,QString,QString,int)),
             this, SLOT(annotateVersion(QString,QString,QString,int)));
     SubversionEditor *e = qobject_cast<SubversionEditor*>(editor->widget());

src/plugins/vcsbase/vcsbaseclient.cpp

@@ -576,10 +576,7 @@ VcsBase::VcsBaseEditorWidget *VcsBaseClient::createVcsEditor(Core::Id kind, QStr
         QTC_ASSERT(baseEditor, return 0);
         Core::EditorManager::activateEditor(outputEditor);
     } else {
-        outputEditor
+        outputEditor = Core::EditorManager::openEditorWithContents(kind, &title, progressMsg.toUtf8());
-                = Core::EditorManager::openEditorWithContents(kind, &title, progressMsg.toUtf8(),
-                                                              (Core::EditorManager::OpenInOtherSplit
-                                                               | Core::EditorManager::NoNewSplits));
         outputEditor->document()->setProperty(registerDynamicProperty, dynamicPropertyValue);
         baseEditor = VcsBase::VcsBaseEditorWidget::getVcsBaseEditor(outputEditor);
         connect(baseEditor, SIGNAL(annotateRevisionRequested(QString,QString,QString,int)),