From 1e06f69d9e0a33f2e92f4451fabae3393ec1d267 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 20 Nov 2014 22:39:21 +0100
Subject: [PATCH] Remove the "browse to existing installation" button, now
 replaced by the wizard

Clean up some debug spam
---
 apps/launcher/maindialog.cpp     | 28 ++--------------------------
 apps/launcher/settingspage.cpp   |  4 ----
 apps/wizard/inisettings.cpp      |  3 ---
 apps/wizard/installationpage.cpp |  2 --
 apps/wizard/mainwizard.cpp       |  2 --
 5 files changed, 2 insertions(+), 37 deletions(-)

diff --git a/apps/launcher/maindialog.cpp b/apps/launcher/maindialog.cpp
index 41a23e246..975958d7a 100644
--- a/apps/launcher/maindialog.cpp
+++ b/apps/launcher/maindialog.cpp
@@ -388,27 +388,14 @@ bool Launcher::MainDialog::setupGameSettings()
         msgBox.setIcon(QMessageBox::Warning);
         msgBox.setStandardButtons(QMessageBox::Cancel);
         msgBox.setText(tr("<br><b>Could not find the Data Files location</b><br><br> \
-                                   The directory containing the data files was not found.<br><br> \
-                                   Press \"Browse...\" to specify the location manually.<br>"));
-
-        QAbstractButton *browseButton =
-                msgBox.addButton(tr("Browse..."), QMessageBox::ActionRole);
+                                   The directory containing the data files was not found."));
 
         QAbstractButton *wizardButton =
                 msgBox.addButton(tr("Run &Installation Wizard..."), QMessageBox::ActionRole);
 
         msgBox.exec();
 
-        QString selectedFile;
-        if (msgBox.clickedButton() == browseButton)
-        {
-            selectedFile = QFileDialog::getOpenFileName(
-                        this,
-                        tr("Select master file"),
-                        QDir::currentPath(),
-                        tr("Morrowind master file (*.esm)"));
-        }
-        else if (msgBox.clickedButton() == wizardButton)
+        if (msgBox.clickedButton() == wizardButton)
         {
             if (!mWizardInvoker->startProcess(QLatin1String("openmw-wizard"), false)) {
                 return false;
@@ -416,15 +403,6 @@ bool Launcher::MainDialog::setupGameSettings()
                 return true;
             }
         }
-
-        if (selectedFile.isEmpty())
-            return false; // Cancel was clicked
-
-        QFileInfo info(selectedFile);
-
-        // Add the new dir to the settings file and to the data dir container
-        mGameSettings.setMultiValue(QString("data"), info.absolutePath());
-        mGameSettings.addDataDir(info.absolutePath());
     }
 
     return true;
@@ -610,14 +588,12 @@ bool Launcher::MainDialog::writeSettings()
 
 void Launcher::MainDialog::closeEvent(QCloseEvent *event)
 {
-    qDebug() << "close event!";
     writeSettings();
     event->accept();
 }
 
 void Launcher::MainDialog::wizardStarted()
 {
-    qDebug() << "wizard started!";
     hide();
 }
 
diff --git a/apps/launcher/settingspage.cpp b/apps/launcher/settingspage.cpp
index 45e0f72a4..5422e7957 100644
--- a/apps/launcher/settingspage.cpp
+++ b/apps/launcher/settingspage.cpp
@@ -174,13 +174,11 @@ void Launcher::SettingsPage::wizardStarted()
 {
     mMain->hide(); // Hide the launcher
 
-    qDebug() << "wizard started!";
     wizardButton->setEnabled(false);
 }
 
 void Launcher::SettingsPage::wizardFinished(int exitCode, QProcess::ExitStatus exitStatus)
 {
-    qDebug() << "wizard finished!";
     if (exitCode != 0 || exitStatus == QProcess::CrashExit)
         return qApp->quit();
 
@@ -192,13 +190,11 @@ void Launcher::SettingsPage::wizardFinished(int exitCode, QProcess::ExitStatus e
 
 void Launcher::SettingsPage::importerStarted()
 {
-    qDebug() << "importer started!";
     importerButton->setEnabled(false);
 }
 
 void Launcher::SettingsPage::importerFinished(int exitCode, QProcess::ExitStatus exitStatus)
 {
-    qDebug() << "importer finished!";
     if (exitCode != 0 || exitStatus == QProcess::CrashExit)
         return;
 
diff --git a/apps/wizard/inisettings.cpp b/apps/wizard/inisettings.cpp
index f67da0455..3711ba066 100644
--- a/apps/wizard/inisettings.cpp
+++ b/apps/wizard/inisettings.cpp
@@ -33,7 +33,6 @@ QStringList Wizard::IniSettings::findKeys(const QString &text)
 
 bool Wizard::IniSettings::readFile(QTextStream &stream)
 {
-    qDebug() << "readFile called!";
     // Look for a square bracket, "'\\["
     // that has one or more "not nothing" in it, "([^]]+)"
     // and is closed with a square bracket, "\\]"
@@ -66,7 +65,6 @@ bool Wizard::IniSettings::readFile(QTextStream &stream)
             if (!currentSection.isEmpty())
                 key = currentSection + QLatin1Char('/') + key;
 
-            //qDebug() << "adding: " << key << value;
             mSettings[key] = QVariant(value);
         }
     }
@@ -204,7 +202,6 @@ bool Wizard::IniSettings::parseInx(const QString &path)
             const QString key(array.mid(section.length() + 3, lenght));
 
             QString value(array.mid(section.length() + key.length() + 6));
-            //qDebug() << section << key << value;
 
             // Add the value
             setValue(section + QLatin1Char('/') + key, QVariant(value));
diff --git a/apps/wizard/installationpage.cpp b/apps/wizard/installationpage.cpp
index b76aeea22..09e577317 100644
--- a/apps/wizard/installationpage.cpp
+++ b/apps/wizard/installationpage.cpp
@@ -58,8 +58,6 @@ Wizard::InstallationPage::InstallationPage(QWidget *parent) :
 
 Wizard::InstallationPage::~InstallationPage()
 {
-    qDebug() << "stop!";
-
     if (mThread->isRunning()) {
         mUnshield->stopWorker();
         mThread->wait();
diff --git a/apps/wizard/mainwizard.cpp b/apps/wizard/mainwizard.cpp
index e587d77e5..d539793ec 100644
--- a/apps/wizard/mainwizard.cpp
+++ b/apps/wizard/mainwizard.cpp
@@ -331,12 +331,10 @@ void Wizard::MainWizard::setupPages()
 
 void Wizard::MainWizard::importerStarted()
 {
-    qDebug() << "importer started!";
 }
 
 void Wizard::MainWizard::importerFinished(int exitCode, QProcess::ExitStatus exitStatus)
 {
-    qDebug() << "importer finished!";
     if (exitCode != 0 || exitStatus == QProcess::CrashExit)
         return;