simplified message.cpp

src/messages/layouts/messagelayout.cpp

@@ -22,7 +22,7 @@ MessageLayout::MessageLayout(MessagePtr _message)
     : message(_message)
     , buffer(nullptr)
 {
-    if (_message->hasFlags(Message::Collapsed)) {
+    if (_message->flags & Message::Collapsed) {
         this->addFlags(MessageLayout::Collapsed);
     }
 }
@@ -167,7 +167,7 @@ void MessageLayout::paint(QPainter &painter, int y, int messageIndex, Selection
     painter.drawPixmap(0, y, this->container.width, this->container.getHeight(), *pixmap);
 
     // draw disabled
-    if (this->message->hasFlags(Message::Disabled)) {
+    if (this->message->flags & Message::Disabled) {
         painter.fillRect(0, y, pixmap->width(), pixmap->height(), themeManager.messages.disabled);
     }
 
@@ -186,7 +186,7 @@ void MessageLayout::updateBuffer(QPixmap *buffer, int messageIndex, Selection &s
     painter.setRenderHint(QPainter::SmoothPixmapTransform);
 
     // draw background
-    painter.fillRect(buffer->rect(), this->message->hasFlags(Message::Highlighted)
+    painter.fillRect(buffer->rect(), this->message->flags & Message::Highlighted
                                          ? themeManager.messages.backgrounds.highlighted
                                          : themeManager.messages.backgrounds.regular);
 

src/messages/layouts/messagelayout.hpp

@@ -15,11 +15,11 @@ namespace chatterino {
 namespace messages {
 namespace layouts {
 
-class MessageLayout;
+struct MessageLayout;
 typedef std::shared_ptr<MessageLayout> MessageLayoutPtr;
 typedef uint8_t MessageLayoutFlagsType;
 
-class MessageLayout : boost::noncopyable
+struct MessageLayout : boost::noncopyable
 {
 public:
     enum Flags : MessageLayoutFlagsType { Collapsed, RequiresBufferUpdate, RequiresLayout };

src/messages/layouts/messagelayoutcontainer.hpp

@@ -14,7 +14,7 @@ namespace chatterino {
 namespace messages {
 
 namespace layouts {
-class MessageLayoutElement;
+struct MessageLayoutElement;
 
 struct Margin {
     int top;
@@ -41,7 +41,7 @@ struct Margin {
     }
 };
 
-class MessageLayoutContainer
+struct MessageLayoutContainer
 {
 public:
     MessageLayoutContainer();

src/messages/layouts/messagelayoutelement.hpp

@@ -15,12 +15,12 @@ class QPainter;
 
 namespace chatterino {
 namespace messages {
-class MessageElement;
+struct MessageElement;
 class Image;
 
 namespace layouts {
 
-class MessageLayoutElement : boost::noncopyable
+struct MessageLayoutElement : boost::noncopyable
 {
 public:
     MessageLayoutElement(MessageElement &creator, const QSize &size);