Merge branch '2.7-rc'

Includes full code reformat.

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

1 files changed, 4 insertions, 5 deletions

diff --git a/include/aopacket.h b/include/aopacket.h
index 21f6e0f..4097be8 100644
--- a/include/aopacket.h
+++ b/include/aopacket.h
@@ -1,19 +1,18 @@
 #ifndef AOPACKET_H
 #define AOPACKET_H
 
+#include <QDebug>
 #include <QString>
 #include <QStringList>
-#include <QDebug>
 
-class AOPacket
-{
+class AOPacket {
 public:
   AOPacket(QString p_packet_string);
   AOPacket(QString header, QStringList &p_contents);
   ~AOPacket();
 
-  QString get_header() {return m_header;}
-  QStringList &get_contents() {return m_contents;}
+  QString get_header() { return m_header; }
+  QStringList &get_contents() { return m_contents; }
   QString to_string();
 
   void encrypt_header(unsigned int p_key);