refactor: some Application & style things (Chatterino#5561)

SevenTV · Aug 25, 2024 · 627c735 · 627c735
1 parent ac88730
commit 627c735
Show file tree

Hide file tree

Showing 41 changed files with 724 additions and 669 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -73,3 +73,6 @@ CheckOptions:
 
   - key: misc-const-correctness.AnalyzeValues
     value: false
+
+  - key: cppcoreguidelines-special-member-functions.AllowSoleDefaultDtor
+    value: true
diff --git a/mocks/include/mocks/BaseApplication.hpp b/mocks/include/mocks/BaseApplication.hpp
@@ -20,6 +20,7 @@ class BaseApplication : public EmptyApplication
 public:
     BaseApplication()
         : settings(this->args, this->settingsDir.path())
+        , updates(this->paths_, this->settings)
         , theme(this->paths_)
         , fonts(this->settings)
     {
@@ -28,11 +29,17 @@ class BaseApplication : public EmptyApplication
     explicit BaseApplication(const QString &settingsData)
         : EmptyApplication(settingsData)
         , settings(this->args, this->settingsDir.path())
+        , updates(this->paths_, this->settings)
         , theme(this->paths_)
         , fonts(this->settings)
     {
     }
 
+    Updates &getUpdates() override
+    {
+        return this->updates;
+    }
+
     IStreamerMode *getStreamerMode() override
     {
         return &this->streamerMode;
@@ -60,6 +67,7 @@ class BaseApplication : public EmptyApplication
 
     Args args;
     Settings settings;
+    Updates updates;
     DisabledStreamerMode streamerMode;
     Theme theme;
     Fonts fonts;

diff --git a/mocks/include/mocks/EmptyApplication.hpp b/mocks/include/mocks/EmptyApplication.hpp
@@ -12,13 +12,9 @@ namespace chatterino::mock {
 class EmptyApplication : public IApplication
 {
 public:
-    EmptyApplication()
-        : updates_(this->paths_)
-    {
-    }
+    EmptyApplication() = default;
 
     explicit EmptyApplication(const QString &settingsData)
-        : EmptyApplication()
     {
         QFile settingsFile(this->settingsDir.filePath("settings.json"));
         settingsFile.open(QIODevice::WriteOnly | QIODevice::Text);
@@ -212,11 +208,6 @@ class EmptyApplication : public IApplication
     }
 #endif
 
-    Updates &getUpdates() override
-    {
-        return this->updates_;
-    }
-
     BttvEmotes *getBttvEmotes() override
     {
         assert(false && "EmptyApplication::getBttvEmotes was called without "
@@ -269,7 +260,6 @@ class EmptyApplication : public IApplication
     QTemporaryDir settingsDir;
     Paths paths_;
     Args args_;
-    Updates updates_;
 };
 
 }  // namespace chatterino::mock