Debugger: Remove "Change language automatically"

src/plugins/debugger/commonoptionspage.ui

@@ -6,30 +6,11 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>338</width>
+    <width>356</width>
     <height>357</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QGroupBox" name="groupBox_2">
-     <property name="title">
-      <string>Language</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0">
-       <widget class="QCheckBox" name="checkBoxChangeLanguageAutomatically">
-        <property name="toolTip">
-         <string>Changes the debugger language according to the currently opened file.</string>
-        </property>
-        <property name="text">
-         <string>Change debugger language automatically</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">

src/plugins/debugger/debuggeractions.cpp

@@ -490,15 +490,6 @@ DebuggerSettings *DebuggerSettings::instance()
     item->setDefaultValue(20);
     instance->insertItem(GdbWatchdogTimeout, item);
 
-    // Language switching
-    item = new Utils::SavedAction(instance);
-    item->setSettingsKey(debugModeGroup, QLatin1String("ChangeLanguageAutomatically"));
-    item->setText(tr("Change debugger language automatically"));
-    item->setToolTip(tr("Changes the debugger language according to the currently opened file."));
-    item->setCheckable(true);
-    item->setDefaultValue(true);
-    instance->insertItem(SwitchLanguageAutomatically, item);
-
     return instance;
 }
 

src/plugins/debugger/debuggeractions.h

@@ -141,10 +141,7 @@ enum DebuggerActionCode
     SelectedPluginBreakpointsPattern,
     UsePreciseBreakpoints,
     BreakOnThrow,
-    BreakOnCatch,
+    BreakOnCatch
-
-    // UI/Language switching
-    SwitchLanguageAutomatically
 };
 
 // singleton access

src/plugins/debugger/debuggerengine.cpp

@@ -112,8 +112,8 @@ DebuggerStartParameters::DebuggerStartParameters()
   , qmlServerAddress("127.0.0.1")
   , qmlServerPort(0)
   , toolChainType(ToolChain::UNKNOWN)
-  , executableUid(0)
   , startMode(NoStartMode)
+  , executableUid(0)
 {}
 
 void DebuggerStartParameters::clear()

src/plugins/debugger/debuggerplugin.cpp

@@ -516,9 +516,6 @@ QWidget *CommonOptionsPage::createPage(QWidget *parent)
     m_ui.setupUi(w);
     m_group.clear();
 
-    m_group.insert(theDebuggerAction(SwitchLanguageAutomatically),
-        m_ui.checkBoxChangeLanguageAutomatically);
-
     m_group.insert(theDebuggerAction(ListSourceFiles),
         m_ui.checkBoxListSourceFiles);
     m_group.insert(theDebuggerAction(UseAlternatingRowColors),
@@ -549,7 +546,6 @@ QWidget *CommonOptionsPage::createPage(QWidget *parent)
 
     if (m_searchKeywords.isEmpty()) {
         QTextStream(&m_searchKeywords) << ' '
-                << m_ui.checkBoxChangeLanguageAutomatically->text()
                 << m_ui.checkBoxListSourceFiles->text()
                 << ' ' << m_ui.checkBoxUseAlternatingRowColors->text()
                 << ' ' << m_ui.checkBoxUseToolTipsInMainEditor->text()
@@ -1222,7 +1218,6 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments, QString *er
     // Cpp/Qml ui setup
     m_uiSwitcher = new DebuggerUISwitcher(m_debugMode, this);
     ExtensionSystem::PluginManager::instance()->addObject(m_uiSwitcher);
-    theDebuggerAction(SwitchLanguageAutomatically)->setChecked(true);
     m_uiSwitcher->addLanguage(Lang_Cpp, tr("C++"), cppDebuggercontext);
 
     // Dock widgets