From af45008a5ecf2936582a2da990e79bbd9b2ffc1f Mon Sep 17 00:00:00 2001
From: Bernd Hahnebach <bernd@bimstatik.org>
Date: Sat, 13 Jan 2018 13:15:57 +0100
Subject: [PATCH] FEM: pref, delete depreciated ccx solver switch because every
 solver has its own command

---
 src/Mod/Fem/Gui/DlgSettingsFemCcx.ui     | 77 ------------------------
 src/Mod/Fem/Gui/DlgSettingsFemCcxImp.cpp |  4 --
 2 files changed, 81 deletions(-)

diff --git a/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui b/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui
index cfb90ede56..fefefa39ac 100644
--- a/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui
+++ b/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui
@@ -16,78 +16,6 @@
   <layout class="QGridLayout" name="gridLayout_4">
    <item row="0" column="0">
     <layout class="QVBoxLayout" name="verticalLayout">
-     <item>
-      <widget class="QGroupBox" name="gb_gmsh_param">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="layoutDirection">
-        <enum>Qt::LeftToRight</enum>
-       </property>
-       <property name="title">
-        <string>CalculiX solver base</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-       </property>
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <property name="sizeConstraint">
-         <enum>QLayout::SetNoConstraint</enum>
-        </property>
-        <item>
-         <layout class="QGridLayout" name="gl_01">
-          <item row="0" column="0">
-           <widget class="Gui::PrefRadioButton" name="rb_ccx_solver_old">
-            <property name="font">
-             <font>
-              <weight>75</weight>
-              <bold>true</bold>
-             </font>
-            </property>
-            <property name="accessibleDescription">
-             <string>sdfsdfsdfds</string>
-            </property>
-            <property name="text">
-             <string>CCX Tools (well tested)</string>
-            </property>
-            <property name="checked">
-             <bool>true</bool>
-            </property>
-            <property name="prefPath" stdset="0">
-             <cstring>Mod/Fem/Ccx</cstring>
-            </property>
-            <property name="prefEntry" stdset="0">
-             <cstring>useOldSolverFrameWork</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="2">
-           <widget class="Gui::PrefRadioButton" name="rb_ccx_solver_new">
-            <property name="font">
-             <font>
-              <weight>75</weight>
-              <bold>true</bold>
-             </font>
-            </property>
-            <property name="text">
-             <string>General FEM solver framework (new)</string>
-            </property>
-            <property name="prefPath" stdset="0">
-             <cstring>Mod/Fem/Ccx</cstring>
-            </property>
-            <property name="prefEntry" stdset="0">
-             <cstring>useNewSolverFrameWork</cstring>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-       </layout>
-      </widget>
-     </item>
      <item>
       <widget class="QGroupBox" name="gb_01_ccx_param">
        <property name="sizePolicy">
@@ -754,11 +682,6 @@
    <extends>Gui::FileChooser</extends>
    <header>Gui/PrefWidgets.h</header>
   </customwidget>
-  <customwidget>
-   <class>Gui::PrefRadioButton</class>
-   <extends>QRadioButton</extends>
-   <header>Gui/PrefWidgets.h</header>
-  </customwidget>
   <customwidget>
    <class>Gui::PrefSpinBox</class>
    <extends>QSpinBox</extends>
diff --git a/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.cpp b/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.cpp
index f76dcf96db..c274c28221 100644
--- a/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.cpp
+++ b/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.cpp
@@ -71,8 +71,6 @@ void DlgSettingsFemCcxImp::saveSettings()
     cb_ccx_binary_std->onSave();
     fc_ccx_binary_path->onSave();
     cb_split_inp_writer->onSave();
-    rb_ccx_solver_old->onSave();
-    rb_ccx_solver_new->onSave();
 }
 
 void DlgSettingsFemCcxImp::loadSettings()
@@ -98,8 +96,6 @@ void DlgSettingsFemCcxImp::loadSettings()
     cb_ccx_binary_std->onRestore();
     fc_ccx_binary_path->onRestore();
     cb_split_inp_writer->onRestore();
-    rb_ccx_solver_old->onRestore();
-    rb_ccx_solver_new->onRestore();
 
     ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath
         ("User parameter:BaseApp/Preferences/Mod/Fem/Ccx");