summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2015-05-06 07:22:24 +0200
committerPetr Mrázek <peterix@gmail.com>2015-05-06 07:22:24 +0200
commit9598f80335ae4136e229cd4c5209dcede284e2b0 (patch)
tree654bb353776fe9fb1367cda66fee36a85e868382
parent34a5e59007db39ca92e88a7b6e0ebf1b24681267 (diff)
downloadMultiMC-9598f80335ae4136e229cd4c5209dcede284e2b0.tar
MultiMC-9598f80335ae4136e229cd4c5209dcede284e2b0.tar.gz
MultiMC-9598f80335ae4136e229cd4c5209dcede284e2b0.tar.lz
MultiMC-9598f80335ae4136e229cd4c5209dcede284e2b0.tar.xz
MultiMC-9598f80335ae4136e229cd4c5209dcede284e2b0.zip
NOISSUE do not show file browse dialog twice
-rw-r--r--application/GuiUtil.cpp2
-rw-r--r--application/MainWindow.cpp1
-rw-r--r--application/pages/LegacyJarModPage.cpp1
-rw-r--r--application/pages/ModFolderPage.cpp1
-rw-r--r--application/pages/OtherLogsPage.cpp1
-rw-r--r--application/pages/VersionPage.cpp1
-rw-r--r--application/pages/global/MinecraftPage.cpp1
7 files changed, 1 insertions, 7 deletions
diff --git a/application/GuiUtil.cpp b/application/GuiUtil.cpp
index 7ce00115..922d38fa 100644
--- a/application/GuiUtil.cpp
+++ b/application/GuiUtil.cpp
@@ -94,7 +94,7 @@ QStringList GuiUtil::BrowseForMods(QString context, QString caption, QString fil
if (w.exec())
{
savedPaths[context] = w.directory().absolutePath();
- return w.getOpenFileNames();
+ return w.selectedFiles();
}
savedPaths[context] = w.directory().absolutePath();
return {};
diff --git a/application/MainWindow.cpp b/application/MainWindow.cpp
index fff15cdf..02052392 100644
--- a/application/MainWindow.cpp
+++ b/application/MainWindow.cpp
@@ -321,7 +321,6 @@ namespace Ui {
#include <QWidgetAction>
#include <QProgressDialog>
#include <QShortcut>
-#include <QFileDialog>
#include <MMCZip.h>
diff --git a/application/pages/LegacyJarModPage.cpp b/application/pages/LegacyJarModPage.cpp
index 60f1057a..92977de9 100644
--- a/application/pages/LegacyJarModPage.cpp
+++ b/application/pages/LegacyJarModPage.cpp
@@ -17,7 +17,6 @@
#include "ui_LegacyJarModPage.h"
#include <QKeyEvent>
-#include <QFileDialog>
#include <QKeyEvent>
#include <pathutils.h>
diff --git a/application/pages/ModFolderPage.cpp b/application/pages/ModFolderPage.cpp
index dbedbc25..f070098f 100644
--- a/application/pages/ModFolderPage.cpp
+++ b/application/pages/ModFolderPage.cpp
@@ -16,7 +16,6 @@
#include "ModFolderPage.h"
#include "ui_ModFolderPage.h"
-#include <QFileDialog>
#include <QMessageBox>
#include <QEvent>
#include <QKeyEvent>
diff --git a/application/pages/OtherLogsPage.cpp b/application/pages/OtherLogsPage.cpp
index b037a6c7..2f9a800c 100644
--- a/application/pages/OtherLogsPage.cpp
+++ b/application/pages/OtherLogsPage.cpp
@@ -16,7 +16,6 @@
#include "OtherLogsPage.h"
#include "ui_OtherLogsPage.h"
-#include <QFileDialog>
#include <QMessageBox>
#include "GuiUtil.h"
diff --git a/application/pages/VersionPage.cpp b/application/pages/VersionPage.cpp
index 2fb50f0b..ab4aecf6 100644
--- a/application/pages/VersionPage.cpp
+++ b/application/pages/VersionPage.cpp
@@ -16,7 +16,6 @@
#include "MultiMC.h"
#include <pathutils.h>
-#include <QFileDialog>
#include <QMessageBox>
#include <QEvent>
#include <QKeyEvent>
diff --git a/application/pages/global/MinecraftPage.cpp b/application/pages/global/MinecraftPage.cpp
index d1f1fb08..57f40ae6 100644
--- a/application/pages/global/MinecraftPage.cpp
+++ b/application/pages/global/MinecraftPage.cpp
@@ -16,7 +16,6 @@
#include "MinecraftPage.h"
#include "ui_MinecraftPage.h"
-#include <QFileDialog>
#include <QMessageBox>
#include <QDir>