aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--launcher/minecraft/mod/tasks/LocalResourceParse.cpp3
-rw-r--r--launcher/ui/dialogs/ImportResourceDialog.h10
2 files changed, 5 insertions, 8 deletions
diff --git a/launcher/minecraft/mod/tasks/LocalResourceParse.cpp b/launcher/minecraft/mod/tasks/LocalResourceParse.cpp
index 63833832..4d760df2 100644
--- a/launcher/minecraft/mod/tasks/LocalResourceParse.cpp
+++ b/launcher/minecraft/mod/tasks/LocalResourceParse.cpp
@@ -76,6 +76,3 @@ QString getPackedTypeName(PackedResourceType type) {
}
}
-
-
-
diff --git a/launcher/ui/dialogs/ImportResourceDialog.h b/launcher/ui/dialogs/ImportResourceDialog.h
index c9e3f956..5f2f7a92 100644
--- a/launcher/ui/dialogs/ImportResourceDialog.h
+++ b/launcher/ui/dialogs/ImportResourceDialog.h
@@ -3,8 +3,8 @@
#include <QDialog>
#include <QItemSelection>
-#include "ui/instanceview/InstanceProxyModel.h"
#include "minecraft/mod/tasks/LocalResourceParse.h"
+#include "ui/instanceview/InstanceProxyModel.h"
namespace Ui {
class ImportResourceDialog;
@@ -14,15 +14,15 @@ class ImportResourceDialog : public QDialog {
Q_OBJECT
public:
- explicit ImportResourceDialog(QString file_path, PackedResourceType type, QWidget* parent = 0);
- ~ImportResourceDialog();
- InstanceProxyModel* proxyModel;
+ explicit ImportResourceDialog(QString file_path, PackedResourceType type, QWidget* parent = nullptr);
+ ~ImportResourceDialog() override;
QString selectedInstanceKey;
-
+
private:
Ui::ImportResourceDialog* ui;
PackedResourceType m_resource_type;
QString m_file_path;
+ InstanceProxyModel* proxyModel;
private slots:
void selectionChanged(QItemSelection, QItemSelection);