Merge branch '2.7-rc'

Includes full code reformat.

# Conflicts:
#	src/aomusicplayer.cpp
#	src/path_functions.cpp

1 files changed, 8 insertions, 7 deletions

diff --git a/include/aotextarea.h b/include/aotextarea.h
index d44596b..b816089 100644
--- a/include/aotextarea.h
+++ b/include/aotextarea.h
@@ -1,24 +1,25 @@
 #ifndef AOTEXTAREA_H
 #define AOTEXTAREA_H
 
-#include <QTextBrowser>
+#include <QDebug>
+#include <QRegExp>
 #include <QScrollBar>
+#include <QTextBrowser>
 #include <QTextCursor>
-#include <QRegExp>
-#include <QDebug>
 
-class AOTextArea : public QTextBrowser
-{
+class AOTextArea : public QTextBrowser {
 public:
   AOTextArea(QWidget *p_parent = nullptr);
 
-  void append_chatmessage(QString p_name, QString p_message, QString p_colour);
+  void append_chatmessage(QString p_name, QString p_message, QString p_colour,
+                          bool song);
   void append_error(QString p_message);
 
 private:
   const QRegExp omnis_dank_url_regex = QRegExp("\\b(https?://\\S+\\.\\S+)\\b");
 
-  void auto_scroll(QTextCursor old_cursor, int scrollbar_value, bool is_scrolled_down);
+  void auto_scroll(QTextCursor old_cursor, int scrollbar_value,
+                   bool is_scrolled_down);
 };
 
 #endif // AOTEXTAREA_H