Perform initial refactoring work

Things that were once singletons are no longer singletons, but are
instead stored in the "Application" singleton

Some singletons still remain, and some renaming/renamespacing is left
This commit is contained in:
Rasmus Karlsson
2018-04-27 22:11:19 +02:00
parent 32b6417a55
commit ae26b835b6
78 changed files with 850 additions and 773 deletions
+7 -13
View File
@@ -13,17 +13,20 @@ namespace singletons {
void _actuallyRegisterSetting(std::weak_ptr<pajlada::Settings::ISettingData> setting);
class SettingManager : public QObject
class SettingManager
{
Q_OBJECT
using BoolSetting = ChatterinoSetting<bool>;
using FloatSetting = ChatterinoSetting<float>;
using IntSetting = ChatterinoSetting<int>;
using StringSetting = ChatterinoSetting<std::string>;
using QStringSetting = ChatterinoSetting<QString>;
SettingManager();
friend class Application;
public:
~SettingManager() = delete;
messages::MessageElement::Flags getWordFlags();
bool isIgnoredEmote(const QString &emote);
@@ -112,11 +115,6 @@ public:
BoolSetting inlineWhispers = {"/whispers/enableInlineWhispers", true};
static SettingManager &getInstance()
{
static SettingManager instance;
return instance;
}
void updateWordTypeMask();
void saveSnapshot();
@@ -124,17 +122,13 @@ public:
std::vector<ModerationAction> getModerationActions() const;
const std::shared_ptr<std::vector<QString>> getIgnoredKeywords() const;
signals:
void wordFlagsChanged();
pajlada::Signals::NoArgSignal wordFlagsChanged;
private:
std::vector<ModerationAction> _moderationActions;
std::unique_ptr<rapidjson::Document> snapshot;
std::shared_ptr<std::vector<QString>> _ignoredKeywords;
SettingManager();
void updateModerationActions();
void updateIgnoredKeywords();