started to refactor Application

src/controllers/accounts/AccountController.cpp

@@ -33,7 +33,7 @@ AccountController::AccountController()
     });
 }
 
-void AccountController::load()
+void AccountController::initialize(Application &app)
 {
     this->twitch.load();
 }

src/controllers/accounts/AccountController.hpp

@@ -1,5 +1,7 @@
 #pragma once
 
+#include "common/Singleton.hpp"
+
 #include <QObject>
 
 #include "common/SignalVector.hpp"
@@ -11,14 +13,14 @@ namespace chatterino {
 
 class AccountModel;
 
-class AccountController
+class AccountController : public Singleton
 {
 public:
     AccountController();
 
     AccountModel *createModel(QObject *parent);
 
-    void load();
+    virtual void initialize(Application &app) override;
 
     TwitchAccountManager twitch;
 

src/controllers/commands/CommandController.cpp

@@ -43,6 +43,11 @@ CommandController::CommandController()
     this->items.itemRemoved.connect(addFirstMatchToMap);
 }
 
+void CommandController::initialize(Application &app)
+{
+    this->load();
+}
+
 void CommandController::load()
 {
     auto app = getApp();

src/controllers/commands/CommandController.hpp

@@ -1,5 +1,7 @@
 #pragma once
 
+#include "common/Singleton.hpp"
+
 #include <QMap>
 #include <memory>
 #include <mutex>
@@ -12,7 +14,7 @@ class Channel;
 
 class CommandModel;
 
-class CommandController
+class CommandController : public Singleton
 {
 public:
     CommandController();
@@ -20,14 +22,16 @@ public:
     QString execCommand(const QString &text, std::shared_ptr<Channel> channel, bool dryRun);
     QStringList getDefaultTwitchCommandList();
 
-    void load();
-    void save();
+    virtual void initialize(Application &app) override;
+    virtual void save() override;
 
     CommandModel *createModel(QObject *parent);
 
     UnsortedSignalVector<Command> items;
 
 private:
+    void load();
+
     QMap<QString, Command> commandsMap_;
 
     std::mutex mutex_;

src/controllers/highlights/HighlightController.cpp

@@ -12,7 +12,7 @@ HighlightController::HighlightController()
 {
 }
 
-void HighlightController::initialize()
+void HighlightController::initialize(Application &app)
 {
     assert(!this->initialized_);
     this->initialized_ = true;

src/controllers/highlights/HighlightController.hpp

@@ -1,5 +1,7 @@
 #pragma once
 
+#include "common/Singleton.hpp"
+
 #include "common/SignalVector.hpp"
 #include "controllers/highlights/HighlightBlacklistUser.hpp"
 #include "controllers/highlights/HighlightPhrase.hpp"
@@ -12,12 +14,12 @@ class UserHighlightModel;
 class HighlightModel;
 class HighlightBlacklistModel;
 
-class HighlightController
+class HighlightController : public Singleton
 {
 public:
     HighlightController();
 
-    void initialize();
+    virtual void initialize(Application &app) override;
 
     UnsortedSignalVector<HighlightPhrase> phrases;
     UnsortedSignalVector<HighlightBlacklistUser> blacklistedUsers;

src/controllers/ignores/IgnoreController.cpp

@@ -7,7 +7,7 @@
 
 namespace chatterino {
 
-void IgnoreController::initialize()
+void IgnoreController::initialize(Application &)
 {
     assert(!this->initialized_);
     this->initialized_ = true;

src/controllers/ignores/IgnoreController.hpp

@@ -1,5 +1,7 @@
 #pragma once
 
+#include "common/Singleton.hpp"
+
 #include "common/SignalVector.hpp"
 #include "controllers/ignores/IgnorePhrase.hpp"
 #include "singletons/Settings.hpp"
@@ -8,10 +10,10 @@ namespace chatterino {
 
 class IgnoreModel;
 
-class IgnoreController
+class IgnoreController : public Singleton
 {
 public:
-    void initialize();
+    virtual void initialize(Application &app) override;
 
     UnsortedSignalVector<IgnorePhrase> phrases;
 

src/controllers/moderationactions/ModerationActions.cpp

@@ -12,7 +12,7 @@ ModerationActions::ModerationActions()
 {
 }
 
-void ModerationActions::initialize()
+void ModerationActions::initialize(Application &app)
 {
     assert(!this->initialized_);
     this->initialized_ = true;

src/controllers/moderationactions/ModerationActions.hpp

@@ -1,5 +1,7 @@
 #pragma once
 
+#include "common/Singleton.hpp"
+
 #include "common/ChatterinoSetting.hpp"
 #include "common/SignalVector.hpp"
 #include "controllers/moderationactions/ModerationAction.hpp"
@@ -8,12 +10,12 @@ namespace chatterino {
 
 class ModerationActionModel;
 
-class ModerationActions
+class ModerationActions final : public Singleton
 {
 public:
     ModerationActions();
 
-    void initialize();
+    virtual void initialize(Application &app) override;
 
     UnsortedSignalVector<ModerationAction> items;
 

src/controllers/taggedusers/TaggedUsersController.hpp

@@ -1,5 +1,7 @@
 #pragma once
 
+#include "common/Singleton.hpp"
+
 #include "common/SignalVector.hpp"
 #include "controllers/taggedusers/TaggedUser.hpp"
 
@@ -7,7 +9,7 @@ namespace chatterino {
 
 class TaggedUsersModel;
 
-class TaggedUsersController
+class TaggedUsersController : public Singleton
 {
 public:
     TaggedUsersController();