fix: replace defines with constexpr/const and use more absolute paths for includes (#5527)

bye bye nuuls

src/messages/Emote.cpp

@@ -1,4 +1,4 @@
-#include "Emote.hpp"
+#include "messages/Emote.hpp"
 
 #include <unordered_map>
 

src/messages/MessageBuilder.cpp

@@ -1,4 +1,4 @@
-#include "MessageBuilder.hpp"
+#include "messages/MessageBuilder.hpp"
 
 #include "Application.hpp"
 #include "common/IrcColors.hpp"

src/messages/MessageColor.cpp

@@ -1,4 +1,4 @@
-#include "MessageColor.hpp"
+#include "messages/MessageColor.hpp"
 
 #include "singletons/Theme.hpp"
 

src/messages/layouts/MessageLayout.cpp

@@ -19,12 +19,6 @@
 #include <QtGlobal>
 #include <QThread>
 
-#define MARGIN_LEFT (int)(8 * this->scale)
-#define MARGIN_RIGHT (int)(8 * this->scale)
-#define MARGIN_TOP (int)(4 * this->scale)
-#define MARGIN_BOTTOM (int)(4 * this->scale)
-#define COMPACT_EMOTES_OFFSET 6
-
 namespace chatterino {
 
 namespace {

src/messages/layouts/MessageLayoutContainer.cpp

@@ -18,13 +18,17 @@
 
 #include <optional>
 
-#define COMPACT_EMOTES_OFFSET 4
-#define MAX_UNCOLLAPSED_LINES \
-    (getSettings()->collpseMessagesMinLines.getValue())
-
 namespace {
 
-constexpr const QMargins MARGIN{8, 4, 8, 4};
+using namespace chatterino;
+
+constexpr QMargins MARGIN{8, 4, 8, 4};
+constexpr int COMPACT_EMOTES_OFFSET = 4;
+
+int maxUncollapsedLines()
+{
+    return getSettings()->collpseMessagesMinLines.getValue();
+}
 
 }  // namespace
 
@@ -208,7 +212,7 @@ void MessageLayoutContainer::breakLine()
     this->lineStart_ = this->elements_.size();
     //    this->currentX = (int)(this->scale * 8);
 
-    if (this->canCollapse() && this->line_ + 1 >= MAX_UNCOLLAPSED_LINES)
+    if (this->canCollapse() && this->line_ + 1 >= maxUncollapsedLines())
     {
         this->canAddMessages_ = false;
         return;
@@ -568,8 +572,9 @@ int MessageLayoutContainer::remainingWidth() const
 {
     return (this->width_ - int(MARGIN.left() * this->scale_) -
             int(MARGIN.right() * this->scale_) -
-            (this->line_ + 1 == MAX_UNCOLLAPSED_LINES ? this->dotdotdotWidth_
-                                                      : 0)) -
+            (static_cast<int>(this->line_ + 1) == maxUncollapsedLines()
+                 ? this->dotdotdotWidth_
+                 : 0)) -
            this->currentX_;
 }
 

src/messages/search/RegexPredicate.cpp

@@ -1,4 +1,4 @@
-#include "RegexPredicate.hpp"
+#include "messages/search/RegexPredicate.hpp"
 
 #include "messages/Message.hpp"
 

src/messages/search/RegexPredicate.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
 #include "messages/search/MessagePredicate.hpp"
-#include "QRegularExpression"
 
+#include <QRegularExpression>
 #include <QString>
 
 namespace chatterino {