Merge branch 'develop' into feat/acknowledge_release_type

Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>

1 files changed, 17 insertions, 23 deletions

diff --git a/launcher/java/JavaInstallList.h b/launcher/java/JavaInstallList.h
index 733dc7e1..1eebadf2 100644
--- a/launcher/java/JavaInstallList.h
+++ b/launcher/java/JavaInstallList.h
@@ -15,8 +15,8 @@
 
 #pragma once
 
-#include <QObject>
 #include <QAbstractListModel>
+#include <QObject>
 
 #include "BaseVersionList.h"
 #include "tasks/Task.h"
@@ -28,17 +28,12 @@
 
 class JavaListLoadTask;
 
-class JavaInstallList : public BaseVersionList
-{
+class JavaInstallList : public BaseVersionList {
     Q_OBJECT
-    enum class Status
-    {
-        NotDone,
-        InProgress,
-        Done
-    };
-public:
-    explicit JavaInstallList(QObject *parent = 0);
+    enum class Status { NotDone, InProgress, Done };
+
+   public:
+    explicit JavaInstallList(QObject* parent = 0);
 
     Task::Ptr getLoadTask() override;
     bool isLoaded() override;
@@ -46,36 +41,35 @@ public:
     int count() const override;
     void sortVersions() override;
 
-    QVariant data(const QModelIndex &index, int role) const override;
+    QVariant data(const QModelIndex& index, int role) const override;
     RoleList providesRoles() const override;
 
-public slots:
+   public slots:
     void updateListData(QList<BaseVersion::Ptr> versions) override;
 
-protected:
+   protected:
     void load();
     Task::Ptr getCurrentTask();
 
-protected:
+   protected:
     Status m_status = Status::NotDone;
     shared_qobject_ptr<JavaListLoadTask> m_loadTask;
     QList<BaseVersion::Ptr> m_vlist;
 };
 
-class JavaListLoadTask : public Task
-{
+class JavaListLoadTask : public Task {
     Q_OBJECT
 
-public:
-    explicit JavaListLoadTask(JavaInstallList *vlist);
+   public:
+    explicit JavaListLoadTask(JavaInstallList* vlist);
     virtual ~JavaListLoadTask();
 
     void executeTask() override;
-public slots:
+   public slots:
     void javaCheckerFinished();
 
-protected:
+   protected:
     shared_qobject_ptr<JavaCheckerJob> m_job;
-    JavaInstallList *m_list;
-    JavaInstall *m_currentRecommended;
+    JavaInstallList* m_list;
+    JavaInstall* m_currentRecommended;
 };