Merge pull request #621 from GriffinRichards/file-dialogs

Correctly restore window focus for file dialogs

include/ui/customscriptseditor.h

@@ -31,7 +31,6 @@ private:
     Ui::CustomScriptsEditor *ui;
 
     bool hasUnsavedChanges = false;
-    QString fileDialogDir;
     const QString baseDir;
 
     void displayScript(const QString &filepath, bool enabled);

include/ui/regionmappropertiesdialog.h

@@ -4,7 +4,6 @@
 #include "orderedjson.h"
 
 #include <QDialog>
-#include <QFileDialog>
 
 class Project;
 
@@ -33,7 +32,7 @@ private:
 
     void hideMessages();
 
-    QString browse(QString filter, QFileDialog::FileMode mode);
+    QString browse(QString filter);
 
 private slots:
     void on_browse_tilesetImagePath_clicked();