Merge branch '2.7-rc'

Includes full code reformat.

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

1 files changed, 8 insertions, 10 deletions

diff --git a/src/aoemotebutton.cpp b/src/aoemotebutton.cpp
index 9c1d388..29329c9 100644
--- a/src/aoemotebutton.cpp
+++ b/src/aoemotebutton.cpp
@@ -2,7 +2,9 @@
 
 #include "file_functions.h"
 
-AOEmoteButton::AOEmoteButton(QWidget *p_parent, AOApplication *p_ao_app, int p_x, int p_y) : QPushButton(p_parent)
+AOEmoteButton::AOEmoteButton(QWidget *p_parent, AOApplication *p_ao_app,
+                             int p_x, int p_y)
+    : QPushButton(p_parent)
 {
   parent = p_parent;
   ao_app = p_ao_app;
@@ -16,21 +18,17 @@ AOEmoteButton::AOEmoteButton(QWidget *p_parent, AOApplication *p_ao_app, int p_x
 void AOEmoteButton::set_image(QString p_char, int p_emote, QString suffix)
 {
   QString emotion_number = QString::number(p_emote + 1);
-  QString image_path = ao_app->get_character_path(p_char, "emotions/button" + emotion_number + suffix);
+  QString image_path = ao_app->get_character_path(
+      p_char, "emotions/button" + emotion_number + suffix);
 
-  if (file_exists(image_path))
-  {
+  if (file_exists(image_path)) {
     this->setText("");
     this->setStyleSheet("border-image:url(\"" + image_path + "\")");
   }
-  else
-  {
+  else {
     this->setText(ao_app->get_emote_comment(p_char, p_emote));
     this->setStyleSheet("border-image:url(\"\")");
   }
 }
 
-void AOEmoteButton::on_clicked()
-{
-  emote_clicked(m_id);
-}
+void AOEmoteButton::on_clicked() { emote_clicked(m_id); }