Merge branch 'develop' into icon-indexing

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

1 files changed, 11 insertions, 20 deletions

diff --git a/launcher/settings/Setting.h b/launcher/settings/Setting.h
index 86007c13..44b35037 100644
--- a/launcher/settings/Setting.h
+++ b/launcher/settings/Setting.h
@@ -16,8 +16,8 @@
 #pragma once
 
 #include <QObject>
-#include <QVariant>
 #include <QStringList>
+#include <QVariant>
 #include <memory>
 
 class SettingsObject;
@@ -25,10 +25,9 @@ class SettingsObject;
 /*!
  *
  */
-class Setting : public QObject
-{
+class Setting : public QObject {
     Q_OBJECT
-public:
+   public:
     /**
      * Construct a Setting
      *
@@ -47,10 +46,7 @@ public:
      * undefined behavior.
      * \return The ID of the setting.
      */
-    virtual QString id() const
-    {
-        return m_synonyms.first();
-    }
+    virtual QString id() const { return m_synonyms.first(); }
 
     /*!
      * \brief Gets this setting's config file key.
@@ -58,10 +54,7 @@ public:
      * the same as the setting's ID, but it can be different.
      * \return The setting's config file key.
      */
-    virtual QStringList configKeys() const
-    {
-        return m_synonyms;
-    }
+    virtual QStringList configKeys() const { return m_synonyms; }
 
     /*!
      * \brief Gets this setting's value as a QVariant.
@@ -78,22 +71,21 @@ public:
      */
     virtual QVariant defValue() const;
 
-signals:
+   signals:
     /*!
      * \brief Signal emitted when this Setting object's value changes.
      * \param setting A reference to the Setting that changed.
      * \param value This Setting object's new value.
      */
-    void SettingChanged(const Setting &setting, QVariant value);
+    void SettingChanged(const Setting& setting, QVariant value);
 
     /*!
      * \brief Signal emitted when this Setting object's value resets to default.
      * \param setting A reference to the Setting that changed.
      */
-    void settingReset(const Setting &setting);
+    void settingReset(const Setting& setting);
 
-public
-slots:
+   public slots:
     /*!
      * \brief Changes the setting's value.
      * This is done by emitting the SettingChanged() signal which will then be
@@ -109,10 +101,9 @@ slots:
      */
     virtual void reset();
 
-protected:
+   protected:
     friend class SettingsObject;
-    SettingsObject * m_storage;
+    SettingsObject* m_storage;
     QStringList m_synonyms;
     QVariant m_defVal;
 };
-