From d162445e6868f5e3d5c6a31d9c51d7143c4747cc Mon Sep 17 00:00:00 2001
From: Pieter van der Kloet <pvdkloet@gmail.com>
Date: Wed, 20 Jun 2012 13:35:05 +0200
Subject: [PATCH] Got rid of some unwanted warnings and did some cleanup on the
 launcher

---
 apps/launcher/datafilespage.cpp |  7 ++++---
 apps/launcher/filedialog.cpp    |  2 +-
 apps/launcher/filedialog.hpp    | 22 ----------------------
 3 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp
index 3128c7b75..f3c5962ca 100644
--- a/apps/launcher/datafilespage.cpp
+++ b/apps/launcher/datafilespage.cpp
@@ -1072,7 +1072,8 @@ void DataFilesPage::writeConfig(QString profile)
             msgBox.setWindowTitle("Error creating OpenMW configuration directory");
             msgBox.setIcon(QMessageBox::Critical);
             msgBox.setStandardButtons(QMessageBox::Ok);
-            msgBox.setText(tr("<br><b>Could not create %0</b><br><br> \Please make sure you have the right permissions and try again.<br>").arg(pathStr));
+            msgBox.setText(tr("<br><b>Could not create %0</b><br><br> \
+                              Please make sure you have the right permissions and try again.<br>").arg(pathStr));
             msgBox.exec();
 
             qApp->exit(1);
@@ -1089,7 +1090,7 @@ void DataFilesPage::writeConfig(QString profile)
         msgBox.setIcon(QMessageBox::Critical);
         msgBox.setStandardButtons(QMessageBox::Ok);
         msgBox.setText(tr("<br><b>Could not open or create %0</b><br><br> \
-        Please make sure you have the right permissions and try again.<br>").arg(file.fileName()));
+                          Please make sure you have the right permissions and try again.<br>").arg(file.fileName()));
         msgBox.exec();
 
         qApp->exit(1);
@@ -1120,7 +1121,7 @@ void DataFilesPage::writeConfig(QString profile)
         msgBox.setIcon(QMessageBox::Critical);
         msgBox.setStandardButtons(QMessageBox::Ok);
         msgBox.setText(tr("<br><b>Could not write to %0</b><br><br> \
-        Please make sure you have the right permissions and try again.<br>").arg(file.fileName()));
+                          Please make sure you have the right permissions and try again.<br>").arg(file.fileName()));
         msgBox.exec();
 
         qApp->exit(1);
diff --git a/apps/launcher/filedialog.cpp b/apps/launcher/filedialog.cpp
index ead1cbc55..595501b91 100644
--- a/apps/launcher/filedialog.cpp
+++ b/apps/launcher/filedialog.cpp
@@ -28,7 +28,7 @@ QString FileDialog::getExistingDirectory(QWidget *parent,
     // create a non-native file dialog
     FileDialog dialog;
     dialog.setFileMode(DirectoryOnly);
-    dialog.setOptions(options & DontUseNativeDialog | ShowDirsOnly);
+    dialog.setOptions(options & (DontUseNativeDialog | ShowDirsOnly));
 
     if (!caption.isEmpty())
         dialog.setWindowTitle(caption);
diff --git a/apps/launcher/filedialog.hpp b/apps/launcher/filedialog.hpp
index ededcbf39..7a161ecb9 100644
--- a/apps/launcher/filedialog.hpp
+++ b/apps/launcher/filedialog.hpp
@@ -5,45 +5,23 @@
 
 class QPushButton;
 
-struct FileDialogArgs
-{
-    FileDialogArgs() : parent(0), mode(QFileDialog::AnyFile) {}
-    QWidget *parent;
-    QString caption;
-    QString directory;
-    QString selection;
-    QString filter;
-    QFileDialog::FileMode mode;
-    QFileDialog::Options options;
-
-};
-
 class FileDialog : public QFileDialog
 {
     Q_OBJECT
 
 public:
     FileDialog(QWidget *parent = 0);
-//    FileDialog(QWidget *parent, Qt::WindowFlags f);
 
-    //QString getExistingDirectory();
     static QString getExistingDirectory(QWidget *parent = 0,
                                             const QString &caption = QString(),
                                             const QString &dir = QString(),
                                             Options options = ShowDirsOnly);
-    //FileDialog mDirectoryDialog;
-
-    bool initialized;
-protected:
 
 private slots:
-//    void updateOkButton(const QString &text);
     void updateChooseButton(const QString &directory);
-    //void
 
 private:
     QPushButton *mChooseButton;
-    //QFileDialog *mDirectoryDialog;
 };