From d3b7cf44d391ba9624f28070e68784352e6f514d Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Sun, 7 Jun 2015 13:29:45 +1000
Subject: [PATCH] Remove user preference setting option.

---
 apps/launcher/maindialog.cpp   | 22 +++-------------------
 apps/launcher/settingspage.cpp |  8 --------
 files/ui/settingspage.ui       | 10 ----------
 3 files changed, 3 insertions(+), 37 deletions(-)

diff --git a/apps/launcher/maindialog.cpp b/apps/launcher/maindialog.cpp
index 27d37dbf0..2f7a9db33 100644
--- a/apps/launcher/maindialog.cpp
+++ b/apps/launcher/maindialog.cpp
@@ -490,16 +490,7 @@ bool Launcher::MainDialog::writeSettings()
     // Game settings
     QFile file(userPath + QString("openmw.cfg"));
 
-    QIODevice::OpenMode mode(0);
-    bool keepComments = mLauncherSettings.value(QString("Settings/keep-comments"), QString("true"))
-                        == QLatin1String("true");
-
-    if (keepComments)
-        mode = QIODevice::ReadWrite | QIODevice::Text;
-    else
-        mode = QIODevice::ReadWrite | QIODevice::Text | QIODevice::Truncate;
-
-    if (!file.open(mode)) {
+    if (!file.open(QIODevice::ReadWrite | QIODevice::Text)) {
         // File cannot be opened or created
         QMessageBox msgBox;
         msgBox.setWindowTitle(tr("Error writing OpenMW configuration file"));
@@ -512,16 +503,8 @@ bool Launcher::MainDialog::writeSettings()
                        return false;
     }
 
-    QTextStream stream(&file);
-
-    if (keepComments)
-        mGameSettings.writeFileWithComments(file);
-    else
-    {
-        stream.setCodec(QTextCodec::codecForName("UTF-8"));
-        mGameSettings.writeFile(stream);
-    }
 
+    mGameSettings.writeFileWithComments(file);
     file.close();
 
     // Graphics settings
@@ -540,6 +523,7 @@ bool Launcher::MainDialog::writeSettings()
                        return false;
     }
 
+    QTextStream stream(&file);
     stream.setDevice(&file);
     stream.setCodec(QTextCodec::codecForName("UTF-8"));
 
diff --git a/apps/launcher/settingspage.cpp b/apps/launcher/settingspage.cpp
index bc8ffe618..843b51391 100644
--- a/apps/launcher/settingspage.cpp
+++ b/apps/launcher/settingspage.cpp
@@ -260,10 +260,6 @@ void Launcher::SettingsPage::saveSettings()
     }  else {
         mGameSettings.setValue(QLatin1String("encoding"), QLatin1String("win1252"));
     }
-
-    QString keepComments(saveCommentsCheckBox->isChecked() ? "true" : "false");
-
-    mLauncherSettings.setValue(QLatin1String("Settings/keep-comments"), keepComments);
 }
 
 bool Launcher::SettingsPage::loadSettings()
@@ -275,9 +271,5 @@ bool Launcher::SettingsPage::loadSettings()
     if (index != -1)
         languageComboBox->setCurrentIndex(index);
 
-    QString keepComments(mLauncherSettings.value(QLatin1String("Settings/keep-comments")));
-
-    saveCommentsCheckBox->setChecked(keepComments == "true");
-
     return true;
 }
diff --git a/files/ui/settingspage.ui b/files/ui/settingspage.ui
index f38ba764c..7f5e4a7de 100644
--- a/files/ui/settingspage.ui
+++ b/files/ui/settingspage.ui
@@ -40,16 +40,6 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="0">
-       <widget class="QCheckBox" name="saveCommentsCheckBox">
-        <property name="text">
-         <string>Keep comments in openmw.cfg</string>
-        </property>
-        <property name="checked">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>