Merge branch 'develop' into icon-indexing

Signed-off-by: Tayou <31988415+TayouVR@users.noreply.github.com>

1 files changed, 10 insertions, 11 deletions

diff --git a/launcher/ui/dialogs/SkinUploadDialog.h b/launcher/ui/dialogs/SkinUploadDialog.h
index 84d17dc6..81d6140c 100644
--- a/launcher/ui/dialogs/SkinUploadDialog.h
+++ b/launcher/ui/dialogs/SkinUploadDialog.h
@@ -1,29 +1,28 @@
 #pragma once
 
-#include <QDialog>
 #include <minecraft/auth/MinecraftAccount.h>
+#include <QDialog>
 
-namespace Ui
-{
-    class SkinUploadDialog;
+namespace Ui {
+class SkinUploadDialog;
 }
 
 class SkinUploadDialog : public QDialog {
     Q_OBJECT
-public:
-    explicit SkinUploadDialog(MinecraftAccountPtr acct, QWidget *parent = 0);
-    virtual ~SkinUploadDialog() {};
+   public:
+    explicit SkinUploadDialog(MinecraftAccountPtr acct, QWidget* parent = 0);
+    virtual ~SkinUploadDialog(){};
 
-public slots:
+   public slots:
     void on_buttonBox_accepted();
 
     void on_buttonBox_rejected();
 
     void on_skinBrowseBtn_clicked();
 
-protected:
+   protected:
     MinecraftAccountPtr m_acct;
 
-private:
-    Ui::SkinUploadDialog *ui;
+   private:
+    Ui::SkinUploadDialog* ui;
 };