this commit is too big

This commit is contained in:
fourtf
2018-08-02 14:23:27 +02:00
parent 3b3c5d8d75
commit c2e2dfb577
186 changed files with 3626 additions and 2656 deletions
+6 -5
View File
@@ -1,5 +1,7 @@
#pragma once
#include "Paths.hpp"
#include "common/ChatterinoSetting.hpp"
#include "controllers/highlights/HighlightPhrase.hpp"
#include "controllers/moderationactions/ModerationAction.hpp"
@@ -14,13 +16,12 @@ void _actuallyRegisterSetting(std::weak_ptr<pajlada::Settings::ISettingData> set
class Settings
{
Settings();
static Settings *instance;
public:
static Settings &getInstance();
Settings(Paths &paths);
void initialize();
void load();
static Settings &getInstance();
/// Appearance
BoolSetting showTimestamps = {"/appearance/messages/showTimestamps", true};
@@ -131,6 +132,6 @@ private:
std::unique_ptr<rapidjson::Document> snapshot_;
};
Settings *getSettings();
[[deprecated]] Settings *getSettings();
} // namespace chatterino