Merge branch '2.7-rc'

Includes full code reformat.

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

1 files changed, 6 insertions, 10 deletions

diff --git a/include/aomusicplayer.h b/include/aomusicplayer.h
index 255cc45..5181630 100644
--- a/include/aomusicplayer.h
+++ b/include/aomusicplayer.h
@@ -9,15 +9,14 @@
 
 #include "aoapplication.h"
 
-#include <QWidget>
-#include <string.h>
 #include <QDebug>
-#include <QTimer>
 #include <QObject>
+#include <QTimer>
+#include <QWidget>
+#include <string.h>
 
 #if defined(BASSAUDIO)
-class AOMusicPlayer : public QObject
-{
+class AOMusicPlayer : public QObject {
   Q_OBJECT
 public:
   AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app);
@@ -38,11 +37,9 @@ private:
   QString f_path;
 
   HSTREAM m_stream;
-
 };
 #elif defined(QTAUDIO)
-class AOMusicPlayer : public QObject
-{
+class AOMusicPlayer : public QObject {
 public:
   AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app);
   ~AOMusicPlayer();
@@ -64,8 +61,7 @@ private:
   QString f_path;
 };
 #else
-class AOMusicPlayer : public QObject
-{
+class AOMusicPlayer : public QObject {
 public:
   AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app);
   ~AOMusicPlayer();