From ca591dbd230bf49abad63bb13a30d04cc4725ff8 Mon Sep 17 00:00:00 2001
From: Tom Tanner <thosrtanner2@users.sourceforge.net>
Date: Tue, 23 Jun 2015 20:27:38 +0100
Subject: and now I find out I don't need to do it at all

---
 src/settings.cpp      |  4 +--
 src/settings.h        |  4 +--
 src/settingsdialog.ui | 80 ---------------------------------------------------
 3 files changed, 4 insertions(+), 84 deletions(-)

(limited to 'src')

diff --git a/src/settings.cpp b/src/settings.cpp
index ade3f033..4c2a34c8 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -330,12 +330,12 @@ void Settings::setupLoadMechanism()
 }
 
 
-bool Settings::useProxy()
+bool Settings::useProxy() const
 {
   return m_Settings.value("Settings/use_proxy", false).toBool();
 }
 
-bool Settings::displayForeign()
+bool Settings::displayForeign() const
 {
   return m_Settings.value("Settings/display_foreign", true).toBool();
 }
diff --git a/src/settings.h b/src/settings.h
index 7d6fe229..def1dc5c 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -202,12 +202,12 @@ public:
   /**
    * @return true if the user configured the use of a network proxy
    */
-  bool useProxy();
+  bool useProxy() const;
 
   /**
    * @return true if the user wants to see non-official plugins installed outside MO in his mod list
    */
-  bool displayForeign();
+  bool displayForeign() const;
 
   /**
    * @brief sets the new motd hash
diff --git a/src/settingsdialog.ui b/src/settingsdialog.ui
index a7543a00..b88885dc 100644
--- a/src/settingsdialog.ui
+++ b/src/settingsdialog.ui
@@ -884,86 +884,6 @@ For the other games this is not a sufficient replacement for AI!</string>
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="overwriteTab">
-      <attribute name="title">
-       <string>Overwrite</string>
-      </attribute>
-      <layout class="QGridLayout" name="gridLayout_2">
-       <item row="4" column="0">
-        <widget class="QCheckBox" name="ignoreLogFileBox">
-         <property name="statusTip">
-          <string/>
-         </property>
-         <property name="text">
-          <string>Ignore .log files (implies ignore empty directories)</string>
-         </property>
-        </widget>
-       </item>
-       <item row="6" column="0">
-        <spacer name="verticalSpacer_6">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="0" column="0">
-        <spacer name="verticalSpacer_8">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="5" column="0">
-        <spacer name="verticalSpacer_9">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="2" column="0">
-        <widget class="QLabel" name="label_23">
-         <property name="text">
-          <string/>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="label_22">
-         <property name="text">
-          <string>The tab controls various customisations of the overwrite directory</string>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="0">
-        <widget class="QCheckBox" name="ignoreEmptyDirBox">
-         <property name="toolTip">
-          <string/>
-         </property>
-         <property name="text">
-          <string>Ignore empty directories</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
     </widget>
    </item>
    <item>
-- 
cgit v1.3.1