Merge pull request #1561 from Scrumplex/nix-miscs

4 files changed, 10 insertions, 37 deletions

diff --git a/launcher/Version.h b/launcher/Version.h
index 92bff9ba..9c043b01 100644
--- a/launcher/Version.h
+++ b/launcher/Version.h
@@ -103,14 +103,8 @@ class Version {
 
         QString m_fullString;
 
-        [[nodiscard]] inline bool isAppendix() const
-        {
-            return m_stringPart.startsWith('+');
-        }
-        [[nodiscard]] inline bool isPreRelease() const
-        {
-            return m_stringPart.startsWith('-') && m_stringPart.length() > 1;
-        }
+        [[nodiscard]] inline bool isAppendix() const { return m_stringPart.startsWith('+'); }
+        [[nodiscard]] inline bool isPreRelease() const { return m_stringPart.startsWith('-') && m_stringPart.length() > 1; }
 
         inline bool operator==(const Section& other) const
         {
@@ -156,14 +150,8 @@ class Version {
             return m_fullString < other.m_fullString;
         }
 
-        inline bool operator!=(const Section& other) const
-        {
-            return !(*this == other);
-        }
-        inline bool operator>(const Section& other) const
-        {
-            return !(*this < other || *this == other);
-        }
+        inline bool operator!=(const Section& other) const { return !(*this == other); }
+        inline bool operator>(const Section& other) const { return !(*this < other || *this == other); }
     };
 
    private:
diff --git a/launcher/launch/LogModel.h b/launcher/launch/LogModel.h
index ba2e4054..18e51d7e 100644
--- a/launcher/launch/LogModel.h
+++ b/launcher/launch/LogModel.h
@@ -30,7 +30,7 @@ class LogModel : public QAbstractListModel {
 
     enum Roles { LevelRole = Qt::UserRole };
 
-    private /* types */:
+   private /* types */:
     struct entry {
         MessageLevel::Enum level;
         QString line;
diff --git a/launcher/ui/MainWindow.h b/launcher/ui/MainWindow.h
index b6f45da2..0b614452 100644
--- a/launcher/ui/MainWindow.h
+++ b/launcher/ui/MainWindow.h
@@ -151,10 +151,7 @@ class MainWindow : public QMainWindow {
     void deleteGroup();
     void undoTrashInstance();
 
-    inline void on_actionExportInstance_triggered()
-    {
-        on_actionExportInstanceZip_triggered();
-    }
+    inline void on_actionExportInstance_triggered() { on_actionExportInstanceZip_triggered(); }
     void on_actionExportInstanceZip_triggered();
     void on_actionExportInstanceMrPack_triggered();
     void on_actionExportInstanceFlamePack_triggered();
diff --git a/launcher/ui/pages/instance/ServersPage.cpp b/launcher/ui/pages/instance/ServersPage.cpp
index 6bf802e6..2142e6c9 100644
--- a/launcher/ui/pages/instance/ServersPage.cpp
+++ b/launcher/ui/pages/instance/ServersPage.cpp
@@ -354,14 +354,8 @@ class ServersModel : public QAbstractListModel {
         }
     }
 
-    virtual int rowCount(const QModelIndex& parent = QModelIndex()) const override
-    {
-        return parent.isValid() ? 0 : m_servers.size();
-    }
-    int columnCount(const QModelIndex& parent) const override
-    {
-        return parent.isValid() ? 0 : COLUMN_COUNT;
-    }
+    virtual int rowCount(const QModelIndex& parent = QModelIndex()) const override { return parent.isValid() ? 0 : m_servers.size(); }
+    int columnCount(const QModelIndex& parent) const override { return parent.isValid() ? 0 : COLUMN_COUNT; }
 
     Server* at(int index)
     {
@@ -445,10 +439,7 @@ class ServersModel : public QAbstractListModel {
         qDebug() << "Changed:" << path;
         load();
     }
-    void fileChanged(const QString& path)
-    {
-        qDebug() << "Changed:" << path;
-    }
+    void fileChanged(const QString& path) { qDebug() << "Changed:" << path; }
 
    private slots:
     void save_internal()
@@ -492,10 +483,7 @@ class ServersModel : public QAbstractListModel {
         m_saveTimer.stop();
     }
 
-    bool saveIsScheduled() const
-    {
-        return m_dirty;
-    }
+    bool saveIsScheduled() const { return m_dirty; }
 
     void updateFSObserver()
     {