Merge branch 'develop' into chore/add-compiler-warnings

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

1 files changed, 12 insertions, 13 deletions

diff --git a/launcher/ui/dialogs/ExportInstanceDialog.h b/launcher/ui/dialogs/ExportInstanceDialog.h
index 5e801875..02f38f63 100644
--- a/launcher/ui/dialogs/ExportInstanceDialog.h
+++ b/launcher/ui/dialogs/ExportInstanceDialog.h
@@ -2,6 +2,7 @@
 /*
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -38,39 +39,37 @@
 #include <QDialog>
 #include <QModelIndex>
 #include <memory>
-#include "FileIgnoreProxy.h"
 #include "FastFileIconProvider.h"
+#include "FileIgnoreProxy.h"
 
 class BaseInstance;
 typedef std::shared_ptr<BaseInstance> InstancePtr;
 
-namespace Ui
-{
+namespace Ui {
 class ExportInstanceDialog;
 }
 
-class ExportInstanceDialog : public QDialog
-{
+class ExportInstanceDialog : public QDialog {
     Q_OBJECT
 
-public:
-    explicit ExportInstanceDialog(InstancePtr instance, QWidget *parent = 0);
+   public:
+    explicit ExportInstanceDialog(InstancePtr instance, QWidget* parent = 0);
     ~ExportInstanceDialog();
 
     virtual void done(int result);
 
-private:
-    bool doExport();
+   private:
+    void doExport();
     void loadPackIgnore();
     void savePackIgnore();
     QString ignoreFileName();
 
-private:
-    Ui::ExportInstanceDialog *ui;
+   private:
+    Ui::ExportInstanceDialog* ui;
     InstancePtr m_instance;
-    FileIgnoreProxy * proxyModel;
+    FileIgnoreProxy* proxyModel;
     FastFileIconProvider icons;
 
-private slots:
+   private slots:
     void rowsInserted(QModelIndex parent, int top, int bottom);
 };