Make more use of single pattern

This commit is contained in:
Rasmus Karlsson
2017-12-17 02:18:13 +01:00
parent d5f1c6acec
commit 70cbb9df7f
35 changed files with 146 additions and 249 deletions
+7 -7
View File
@@ -17,8 +17,6 @@
namespace chatterino {
class WindowManager;
struct EmoteData {
EmoteData()
{
@@ -36,10 +34,14 @@ typedef ConcurrentMap<QString, EmoteData> EmoteMap;
class EmoteManager
{
public:
explicit EmoteManager(WindowManager &_windowManager);
EmoteManager();
static EmoteManager *instance;
public:
static EmoteManager &getInstance()
{
static EmoteManager instance;
return instance;
}
void loadGlobalEmotes();
@@ -76,8 +78,6 @@ public:
ConcurrentMap<QString, messages::LazyLoadedImage *> miscImageCache;
private:
WindowManager &windowManager;
/// Emojis
QRegularExpression findShortCodesRegex;