Merge branch '2.7-rc'

Includes full code reformat.

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

1 files changed, 8 insertions, 6 deletions

diff --git a/include/chatlogpiece.h b/include/chatlogpiece.h
index 34c5926..0232666 100644
--- a/include/chatlogpiece.h
+++ b/include/chatlogpiece.h
@@ -1,22 +1,23 @@
 #ifndef CHATLOGPIECE_H
 #define CHATLOGPIECE_H
 
-#include <QString>
 #include <QDateTime>
+#include <QString>
 
-class chatlogpiece
-{
+class chatlogpiece {
 public:
   chatlogpiece();
-  chatlogpiece(QString p_name, QString p_showname, QString p_message, bool p_song);
-  chatlogpiece(QString p_name, QString p_showname, QString p_message, bool p_song, QDateTime p_datetime);
-
+  chatlogpiece(QString p_name, QString p_showname, QString p_message,
+               bool p_song, int color);
+  chatlogpiece(QString p_name, QString p_showname, QString p_message,
+               bool p_song, int color, QDateTime p_datetime);
   QString get_name();
   QString get_showname();
   QString get_message();
   bool get_is_song();
   QDateTime get_datetime();
   QString get_datetime_as_string();
+  int get_chat_color();
 
   QString get_full();
 
@@ -26,6 +27,7 @@ private:
   QString message;
   QDateTime datetime;
   bool is_song;
+  int color;
 };
 
 #endif // CHATLOGPIECE_H