mirror of
https://github.com/Chatterino/chatterino2.git
synced 2024-11-21 22:24:07 +01:00
Make runnable again (#40)
* Compile before push DansGame * Initialize them when they are needed, not on startup. This is THREAD-SAFE since C++11 * Changed user to account
This commit is contained in:
parent
38062cb3c5
commit
b6d0776917
6 changed files with 4 additions and 8 deletions
|
@ -2,8 +2,6 @@
|
|||
|
||||
namespace chatterino {
|
||||
|
||||
AccountManager AccountManager::instance;
|
||||
|
||||
AccountManager::AccountManager()
|
||||
: _twitchAnon("justinfan64537", "", "")
|
||||
, _twitchUsers()
|
||||
|
|
|
@ -13,6 +13,7 @@ class AccountManager
|
|||
public:
|
||||
static AccountManager &getInstance()
|
||||
{
|
||||
static AccountManager instance;
|
||||
return instance;
|
||||
}
|
||||
|
||||
|
@ -23,7 +24,6 @@ public:
|
|||
void addTwitchUser(const twitch::TwitchUser &user);
|
||||
|
||||
private:
|
||||
static AccountManager instance;
|
||||
|
||||
AccountManager();
|
||||
|
||||
|
|
|
@ -9,8 +9,6 @@ using namespace chatterino::messages;
|
|||
|
||||
namespace chatterino {
|
||||
|
||||
SettingsManager SettingsManager::instance;
|
||||
|
||||
SettingsManager::SettingsManager()
|
||||
: _settings(Path::getAppdataPath() + "settings.ini", QSettings::IniFormat)
|
||||
, _wordTypeMask(Word::Default)
|
||||
|
|
|
@ -72,11 +72,11 @@ private:
|
|||
public:
|
||||
static SettingsManager &getInstance()
|
||||
{
|
||||
static SettingsManager instance;
|
||||
return instance;
|
||||
}
|
||||
|
||||
private:
|
||||
static SettingsManager instance;
|
||||
};
|
||||
|
||||
} // namespace chatterino
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#include "widgets/accountpopup.h"
|
||||
#include "channel.h"
|
||||
#include "ui_userpopup.h"
|
||||
#include "ui_accountpopupform.h"
|
||||
|
||||
#include <QDebug>
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#include "messages/message.h"
|
||||
#include "messages/wordpart.h"
|
||||
#include "settingsmanager.h"
|
||||
#include "ui_userpopup.h"
|
||||
#include "ui_accountpopupform.h"
|
||||
#include "widgets/chatwidget.h"
|
||||
|
||||
#include <math.h>
|
||||
|
|
Loading…
Reference in a new issue