From faac191f0b9e99b82614ed3959ec5c67f56a1fc3 Mon Sep 17 00:00:00 2001 From: oldmud0 Date: Fri, 17 Apr 2020 21:48:34 -0500 Subject: Mega-merge of CR fork CR likely stands for "CentsRaidensnake." Like the Case Cafe mega-merge before it, this was not a clean merge, and it had to be split up into two parts: the actual changes, and the attempt it made to reformat the entire code via clang-format. This branch had a complicated set of changes that would be difficult to describe in this commit message. It would be better described in a proper changelog. --- include/aotextarea.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include/aotextarea.h') diff --git a/include/aotextarea.h b/include/aotextarea.h index d44596b..ae28564 100644 --- a/include/aotextarea.h +++ b/include/aotextarea.h @@ -12,7 +12,8 @@ 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: -- cgit From 13942345c6a3e7e1625c6c26cc2f2f368a3bff23 Mon Sep 17 00:00:00 2001 From: oldmud0 Date: Fri, 17 Apr 2020 21:57:16 -0500 Subject: Run clang-format on entire project Indentation fixed to 2 spaces per tab. Braces set to Stroustrup style. Lines reflow at 80 characters. One-line method bodies are on the same line as the signature. Space always after `//`. No indentation on preprocessor macros. Includes are sorted lexicographically. If you don't want to see this commit on blames, use the hidden whitespace option on GitHub, or use `-w` in git-blame. --- include/aotextarea.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'include/aotextarea.h') diff --git a/include/aotextarea.h b/include/aotextarea.h index ae28564..b816089 100644 --- a/include/aotextarea.h +++ b/include/aotextarea.h @@ -1,14 +1,13 @@ #ifndef AOTEXTAREA_H #define AOTEXTAREA_H -#include +#include +#include #include +#include #include -#include -#include -class AOTextArea : public QTextBrowser -{ +class AOTextArea : public QTextBrowser { public: AOTextArea(QWidget *p_parent = nullptr); @@ -19,7 +18,8 @@ public: 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 -- cgit