Merge branch 'master' into apa-notification-on-live

src/Application.hpp

@@ -1,7 +1,6 @@
 #pragma once
 
 #include "common/Singleton.hpp"
-#include "singletons/Resources.hpp"
 
 #include <QApplication>
 #include <memory>
@@ -27,9 +26,10 @@ class AccountManager;
 class Emotes;
 class Settings;
 class Fonts;
-class Resources;
+class Resources2;
 class Toasts;
 
+
 class Application
 {
     std::vector<std::unique_ptr<Singleton>> singletons_;
@@ -49,8 +49,6 @@ public:
 
     friend void test();
 
-    Settings *const settings{};
-    Paths *const paths{};
     Resources2 *const resources;
 
     Theme *const themes{};