Merge branch '2.7-rc'

Includes full code reformat.

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

1 files changed, 6 insertions, 7 deletions

diff --git a/include/aoemotebutton.h b/include/aoemotebutton.h
index c99a73b..acf0b48 100644
--- a/include/aoemotebutton.h
+++ b/include/aoemotebutton.h
@@ -3,22 +3,21 @@
 
 #include "aoapplication.h"
 
-#include <QPushButton>
 #include <QDebug>
+#include <QPushButton>
 
-class AOEmoteButton : public QPushButton
-{
+class AOEmoteButton : public QPushButton {
   Q_OBJECT
 
 public:
   AOEmoteButton(QWidget *p_parent, AOApplication *p_ao_app, int p_x, int p_y);
 
-  //void set_on(QString p_char, int p_emote);
-  //void set_off(QString p_char, int p_emote);
+  // void set_on(QString p_char, int p_emote);
+  // void set_off(QString p_char, int p_emote);
   void set_image(QString p_char, int p_emote, QString suffix);
 
-  void set_id(int p_id) {m_id = p_id;}
-  int get_id() {return m_id;}
+  void set_id(int p_id) { m_id = p_id; }
+  int get_id() { return m_id; }
 
 private:
   QWidget *parent;