removed functions from SettingsManager that shouldn't be there

src/singletons/helper/ChatterinoSetting.hpp

@@ -1,5 +1,8 @@
 #pragma once
 
+#include <QString>
+#include <pajlada/settings.hpp>
+
 namespace chatterino {
 
 void _registerSetting(std::weak_ptr<pajlada::Settings::ISettingData> setting);
@@ -41,4 +44,10 @@ public:
     using pajlada::Settings::Setting<Type>::operator const Type;
 };
 
+using BoolSetting = ChatterinoSetting<bool>;
+using FloatSetting = ChatterinoSetting<float>;
+using IntSetting = ChatterinoSetting<int>;
+using StringSetting = ChatterinoSetting<std::string>;
+using QStringSetting = ChatterinoSetting<QString>;
+
 }  // namespace chatterino

src/singletons/helper/LoggingChannel.cpp

@@ -77,7 +77,7 @@ void LoggingChannel::openLogFile()
     this->appendLine(this->generateOpeningString(now));
 }
 
-void LoggingChannel::addMessage(std::shared_ptr<chatterino::Message> message)
+void LoggingChannel::addMessage(std::shared_ptr<Message> message)
 {
     QDateTime now = QDateTime::currentDateTime();
 

src/singletons/helper/LoggingChannel.hpp

@@ -17,7 +17,7 @@ class LoggingChannel : boost::noncopyable
 
 public:
     ~LoggingChannel();
-    void addMessage(std::shared_ptr<chatterino::Message> message);
+    void addMessage(std::shared_ptr<Message> message);
 
 private:
     void openLogFile();

src/singletons/helper/ModerationAction.cpp

@@ -1,49 +0,0 @@
-#include "ModerationAction.hpp"
-
-#include "singletons/ResourceManager.hpp"
-
-namespace chatterino {
-
-ModerationAction::ModerationAction(chatterino::Image *_image, const QString &_action)
-    : _isImage(true)
-    , image(_image)
-    , action(_action)
-{
-}
-
-ModerationAction::ModerationAction(const QString &_line1, const QString &_line2,
-                                   const QString &_action)
-    : _isImage(false)
-    , image(nullptr)
-    , line1(_line1)
-    , line2(_line2)
-    , action(_action)
-{
-}
-
-bool ModerationAction::isImage() const
-{
-    return this->_isImage;
-}
-
-chatterino::Image *ModerationAction::getImage() const
-{
-    return this->image;
-}
-
-const QString &ModerationAction::getLine1() const
-{
-    return this->line1;
-}
-
-const QString &ModerationAction::getLine2() const
-{
-    return this->line2;
-}
-
-const QString &ModerationAction::getAction() const
-{
-    return this->action;
-}
-
-}  // namespace chatterino

src/singletons/helper/ModerationAction.hpp

@@ -1,29 +0,0 @@
-#pragma once
-
-#include <QString>
-
-namespace chatterino {
-
-class Image;
-
-class ModerationAction
-{
-public:
-    ModerationAction(chatterino::Image *image, const QString &action);
-    ModerationAction(const QString &line1, const QString &line2, const QString &action);
-
-    bool isImage() const;
-    chatterino::Image *getImage() const;
-    const QString &getLine1() const;
-    const QString &getLine2() const;
-    const QString &getAction() const;
-
-private:
-    bool _isImage;
-    chatterino::Image *image;
-    QString line1;
-    QString line2;
-    QString action;
-};
-
-}  // namespace chatterino