Fix crash at exit by allocating QObjects on the heap

src/model/badgecontainer.cpp

@@ -1,14 +1,6 @@
 #include "badgecontainer.h"
 #include "settingsmanager.h"
 
-BadgeContainer *BadgeContainer::instance = 0;
-BadgeContainer *BadgeContainer::getInstance()
-{
-    if (!instance)
-        instance = new BadgeContainer();
-    return instance;
-}
-
 BadgeContainer::BadgeContainer() : netman(NetworkManager::getInstance())
 {
     connect(netman, &NetworkManager::getEmoteSetsOperationFinished, this, &BadgeContainer::onEmoteSetsUpdated);
@@ -23,6 +15,12 @@ BadgeContainer::BadgeContainer() : netman(NetworkManager::getInstance())
     connect(netman, &NetworkManager::getChannelBttvEmotesOperationFinished, this, &BadgeContainer::innerChannelBttvEmotesLoaded);
 }
 
+BadgeContainer *BadgeContainer::getInstance()
+{
+    static BadgeContainer *instance = new BadgeContainer();
+    return instance;
+}
+
 bool BadgeContainer::getChannelBadgeUrl(const QString channelId, const QString badgeName, const QString imageFormat, QString &outUrl) const {
     auto channelEntry = channelBadgeUrls.find(channelId);
     if (channelEntry != channelBadgeUrls.end()) {

src/model/channelmanager.cpp

@@ -15,8 +15,6 @@
 #include "channelmanager.h"
 #include <QCoreApplication>
 
-ChannelManager *ChannelManager::instance = 0;
-
 ChannelManager::ChannelManager() :
     netman(NetworkManager::getInstance()),
     settingsManager(SettingsManager::getInstance())
@@ -63,8 +61,7 @@ ChannelManager::ChannelManager() :
 }
 
 ChannelManager *ChannelManager::getInstance() {
-    if (!instance)
-        instance = new ChannelManager();
+    static ChannelManager *instance = new ChannelManager();
     return instance;
 }
 

src/model/channelmanager.h

@@ -56,7 +56,6 @@ class ChannelManager: public QObject
     ChannelListModel *createFollowedChannelsModel();
     bool isAccessTokenAvailable() { return settingsManager->hasAccessToken(); }
 
-    static ChannelManager *instance;
     ChannelManager();
 
 public:

src/model/imageprovider.cpp

@@ -26,7 +26,8 @@
 const int ImageProvider::MSEC_PER_DOWNLOAD = 16; // ~ 256kbit/sec for 2k images
 
 ImageProvider::ImageProvider(const QString imageProviderName, const QString extension, const QString cacheDirName) : QObject(),
-    _cacheProvider(this), _imageProviderName(imageProviderName), _extension(extension) {
+    _imageProviderName(imageProviderName), _extension(extension) {
+    _cacheProvider = new CachedImageProvider(this);
 
     activeDownloadCount = 0;
 
@@ -158,7 +159,7 @@ void ImageProvider::loadImageFile(QString emoteKey, QString filename) {
 }
 
 QQmlImageProviderBase * ImageProvider::getQMLImageProvider() {
-    return &_cacheProvider;
+    return _cacheProvider;
 }
 
 bool ImageProvider::downloadsInProgress() const {

src/model/imageprovider.h

@@ -100,7 +100,7 @@ protected slots:
     QNetworkAccessManager _manager;
 
     friend class CachedImageProvider;
-    CachedImageProvider _cacheProvider;
+    CachedImageProvider *_cacheProvider;
 
     QHash<QString, QImage> _imageTable;
     QString _imageProviderName;

src/model/settingsmanager.cpp

@@ -12,8 +12,8 @@ SettingsManager::SettingsManager(QObject *parent) :
 
 SettingsManager *SettingsManager::getInstance()
 {
-    static SettingsManager instance;
-    return &instance;
+    static SettingsManager *instance = new SettingsManager();
+    return instance;
 }
 
 void SettingsManager::load()

src/model/viewersmodel.cpp

@@ -1,12 +1,15 @@
 #include "viewersmodel.h"
 
-ViewersModel *ViewersModel::instance = 0;
-
 ViewersModel::ViewersModel(QObject *parent) : QObject(parent), netman(NetworkManager::getInstance())
 {
     connect(netman, &NetworkManager::chatterListLoadOperationFinished, this, &ViewersModel::processChatterList);
 }
 
+ViewersModel *ViewersModel::getInstance() {
+    static ViewersModel *instance = new ViewersModel();
+    return instance;
+}
+
 void ViewersModel::processChatterList(QMap<QString, QList<QString>> chatters)
 {
     QVariantMap out;

src/model/viewersmodel.h

@@ -16,11 +16,7 @@ class ViewersModel : public QObject
     explicit ViewersModel(QObject *parent = nullptr);
 
 public:
-    static ViewersModel *getInstance() {
-        if (!instance)
-            instance = new ViewersModel();
-        return instance;
-    }
+    static ViewersModel *getInstance();
 
 signals:
     void chatterListLoaded(QVariantMap chatters);

src/model/vodmanager.cpp

@@ -41,15 +41,11 @@ VodManager::VodManager(QObject *parent) :
     settings.endArray();
 
     emit modelChanged();
-
-    std::atexit([](){
-       VodManager::getInstance()->saveSettings();
-    });
 }
 
 VodManager *VodManager::getInstance() {
-    static VodManager instance;
-    return &instance;
+    static VodManager *instance = new VodManager();
+    return instance;
 }
 
 VodManager::~VodManager()

src/network/httpserver.cpp

@@ -1,15 +1,12 @@
 #include "httpserver.h"
 
-HttpServer *HttpServer::instance = 0;
-
 HttpServer::HttpServer(QObject *parent): QObject(parent)
 {
 
 }
 
 HttpServer *HttpServer::getInstance() {
-    if (!instance)
-        instance = new HttpServer();
+    static HttpServer *instance = new HttpServer();
     return instance;
 }
 

src/network/httpserver.h

@@ -19,8 +19,6 @@ class HttpServer: public QObject
     bool listenError = false;
     QString m_port;
 
-    static HttpServer *instance;
-
     explicit HttpServer(QObject *parent = 0);
 public:
     static HttpServer *getInstance();

src/power/power.cpp

@@ -31,8 +31,6 @@
 #include <QtAndroidExtras>
 #endif
 
-Power *Power::instance = 0;
-
 Power::Power() :
     cookie(0)
 {
@@ -41,8 +39,7 @@ Power::Power() :
 
 Power *Power::getInstance()
 {
-    if (!instance)
-        instance = new Power();
+    static Power *instance = new Power();
     return instance;
 }
 

src/power/power.h

@@ -14,7 +14,6 @@ class Power: public QObject
 
     Q_PROPERTY(bool screensaver WRITE setScreensaver)
 
-    static Power *instance;
     Power();
 
 public: