Merge branch '2.7-rc'

Includes full code reformat.

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

1 files changed, 5 insertions, 5 deletions

diff --git a/include/aoevidencebutton.h b/include/aoevidencebutton.h
index 80b747c..b56bfb1 100644
--- a/include/aoevidencebutton.h
+++ b/include/aoevidencebutton.h
@@ -4,21 +4,21 @@
 #include "aoapplication.h"
 #include "aoimage.h"
 
+#include <QDebug>
 #include <QPushButton>
 #include <QString>
-#include <QDebug>
 
-class AOEvidenceButton : public QPushButton
-{
+class AOEvidenceButton : public QPushButton {
   Q_OBJECT
 
 public:
-  AOEvidenceButton(QWidget *p_parent, AOApplication *p_ao_app, int p_x, int p_y);
+  AOEvidenceButton(QWidget *p_parent, AOApplication *p_ao_app, int p_x,
+                   int p_y);
 
   void reset();
   void set_image(QString p_image);
   void set_theme_image(QString p_image);
-  void set_id(int p_id) {m_id = p_id;}
+  void set_id(int p_id) { m_id = p_id; }
 
   void set_selected(bool p_selected);