aboutsummaryrefslogtreecommitdiff
path: root/include/aotextarea.h
diff options
context:
space:
mode:
authoroldmud0 <oldmud0@users.noreply.github.com>2021-12-30 20:31:44 -0600
committeroldmud0 <oldmud0@users.noreply.github.com>2021-12-30 20:31:44 -0600
commitee76c2ce61f6996bfae3ef027eaee8485d455c95 (patch)
treec70e266cad00d0adf27be8fa51a07e13de9828db /include/aotextarea.h
parentecfb791e483234308b1edacb87e499860a63e510 (diff)
parent593bd54000be14c9a1455914285c1b2549b0fa51 (diff)
Merge branch 'master' into feature/http-ms
# Conflicts: # src/networkmanager.cpp
Diffstat (limited to 'include/aotextarea.h')
-rw-r--r--include/aotextarea.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/aotextarea.h b/include/aotextarea.h
index 453e965..d9a960d 100644
--- a/include/aotextarea.h
+++ b/include/aotextarea.h
@@ -12,7 +12,8 @@ public:
AOTextArea(QWidget *p_parent = nullptr);
void append_linked(QString p_message);
- void append_chatmessage(QString p_name, QString p_message, QString p_colur);
+ void append_chatmessage(QString p_name, QString p_message,
+ QString p_name_colour, QString p_color = QString());
void append_error(QString p_message);
private: