diff --git a/src/messages/messagecolor.cpp b/src/messages/messagecolor.cpp index 20fb96fd8..8a0708342 100644 --- a/src/messages/messagecolor.cpp +++ b/src/messages/messagecolor.cpp @@ -2,10 +2,9 @@ namespace chatterino { namespace messages { - MessageColor::MessageColor(const QColor &_color) : type(Type::Custom) - , color(_color) + , customColor(_color) { } @@ -14,16 +13,11 @@ MessageColor::MessageColor(Type _type) { } -MessageColor::Type MessageColor::getType() const -{ - return this->type; -} - const QColor &MessageColor::getColor(singletons::ThemeManager &themeManager) const { switch (this->type) { case Type::Custom: - return this->color; + return this->customColor; case Type::Text: return themeManager.messages.textColors.regular; case Type::System: @@ -35,6 +29,5 @@ const QColor &MessageColor::getColor(singletons::ThemeManager &themeManager) con static QColor _default; return _default; } - } // namespace messages } // namespace chatterino diff --git a/src/messages/messagecolor.hpp b/src/messages/messagecolor.hpp index 6919e201c..00e59a029 100644 --- a/src/messages/messagecolor.hpp +++ b/src/messages/messagecolor.hpp @@ -6,20 +6,17 @@ namespace chatterino { namespace messages { - struct MessageColor { enum Type { Custom, Text, Link, System }; MessageColor(const QColor &color); MessageColor(Type type = Text); - Type getType() const; const QColor &getColor(singletons::ThemeManager &themeManager) const; private: Type type; - QColor color; + QColor customColor; }; - } // namespace messages } // namespace chatterino