Editor: Refactor Open Link in Next Split.

Cleanup code and added shortcuts and menu entries for
- open header/source in next split
- follow symbol under cursor in next split
- open declaration/definition in next split

Change-Id: I2c4347749d26669d88b7c2968f30f60710f442b1
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>

1 files changed, 1 insertions, 12 deletions

diff --git a/src/plugins/texteditor/displaysettingspage.cpp b/src/plugins/texteditor/displaysettingspage.cpp
index ed3904db258..dddd5e2535c 100644
--- a/src/plugins/texteditor/displaysettingspage.cpp
+++ b/src/plugins/texteditor/displaysettingspage.cpp
@@ -74,7 +74,6 @@ QWidget *DisplaySettingsPage::createPage(QWidget *parent)
     QWidget *w = new QWidget(parent);
     d->m_page = new Internal::Ui::DisplaySettingsPage;
     d->m_page->setupUi(w);
-    connect(d->m_page->openLinksInNextSplit, SIGNAL(toggled(bool)), this, SLOT(updateForceOpenLinksInNextSplit(bool)));
     settingsToUI();
     if (d->m_searchKeywords.isEmpty()) {
         QTextStream(&d->m_searchKeywords) << d->m_page->displayLineNumbers->text()
@@ -87,8 +86,7 @@ QWidget *DisplaySettingsPage::createPage(QWidget *parent)
           << ' ' << d->m_page->enableTextWrapping->text()
           << ' ' << d->m_page->autoFoldFirstComment->text()
           << ' ' << d->m_page->centerOnScroll->text()
-          << ' ' << d->m_page->openLinksInNextSplit->text()
-          << ' ' << d->m_page->forceOpenLinksInNextSplit->text();
+          << ' ' << d->m_page->openLinksInNextSplit->text();
         d->m_searchKeywords.remove(QLatin1Char('&'));
     }
     return w;
@@ -112,13 +110,6 @@ void DisplaySettingsPage::finish()
     d->m_page = 0;
 }
 
-void DisplaySettingsPage::updateForceOpenLinksInNextSplit(bool openLinksInNextSplitChecked)
-{
-    d->m_page->forceOpenLinksInNextSplit->setEnabled(openLinksInNextSplitChecked);
-    if (!openLinksInNextSplitChecked)
-        d->m_page->forceOpenLinksInNextSplit->setChecked(openLinksInNextSplitChecked);
-}
-
 void DisplaySettingsPage::settingsFromUI(DisplaySettings &displaySettings) const
 {
     displaySettings.m_displayLineNumbers = d->m_page->displayLineNumbers->isChecked();
@@ -135,7 +126,6 @@ void DisplaySettingsPage::settingsFromUI(DisplaySettings &displaySettings) const
     displaySettings.m_autoFoldFirstComment = d->m_page->autoFoldFirstComment->isChecked();
     displaySettings.m_centerCursorOnScroll = d->m_page->centerOnScroll->isChecked();
     displaySettings.m_openLinksInNextSplit = d->m_page->openLinksInNextSplit->isChecked();
-    displaySettings.m_forceOpenLinksInNextSplit = d->m_page->forceOpenLinksInNextSplit->isChecked();
 }
 
 void DisplaySettingsPage::settingsToUI()
@@ -155,7 +145,6 @@ void DisplaySettingsPage::settingsToUI()
     d->m_page->autoFoldFirstComment->setChecked(displaySettings.m_autoFoldFirstComment);
     d->m_page->centerOnScroll->setChecked(displaySettings.m_centerCursorOnScroll);
     d->m_page->openLinksInNextSplit->setChecked(displaySettings.m_openLinksInNextSplit);
-    d->m_page->forceOpenLinksInNextSplit->setChecked(displaySettings.m_forceOpenLinksInNextSplit);
 }
 
 const DisplaySettings &DisplaySettingsPage::displaySettings() const