Merge branch 'headers'

aoapplication.cpp

@@ -5,10 +5,6 @@
 #include "networkmanager.h"
 #include "debug_functions.h"
 
-#include <QDebug>
-#include <QRect>
-#include <QDesktopWidget>
-
 AOApplication::AOApplication(int &argc, char **argv) : QApplication(argc, argv)
 {
   net_manager = new NetworkManager(this);

aoapplication.h

@@ -8,6 +8,9 @@
 #include <QApplication>
 #include <QVector>
 #include <QFile>
+#include <QDebug>
+#include <QRect>
+#include <QDesktopWidget>
 
 class NetworkManager;
 class Lobby;

aoblipplayer.cpp

@@ -1,9 +1,5 @@
 #include "aoblipplayer.h"
 
-#include <string.h>
-
-#include <QDebug>
-
 AOBlipPlayer::AOBlipPlayer(QWidget *parent, AOApplication *p_ao_app)
 {
   m_parent = parent;

aoblipplayer.h

@@ -5,6 +5,8 @@
 #include "aoapplication.h"
 
 #include <QWidget>
+#include <string.h>
+#include <QDebug>
 
 class AOBlipPlayer
 {

aobutton.cpp

@@ -3,8 +3,6 @@
 #include "debug_functions.h"
 #include "file_functions.h"
 
-#include <QDebug>
-
 AOButton::AOButton(QWidget *parent, AOApplication *p_ao_app) : QPushButton(parent)
 {
   ao_app = p_ao_app;

aobutton.h

@@ -4,6 +4,7 @@
 #include "aoapplication.h"
 
 #include <QPushButton>
+#include <QDebug>
 
 class AOButton : public QPushButton
 {

aocharbutton.cpp

@@ -2,8 +2,6 @@
 
 #include "file_functions.h"
 
-#include <QFile>
-
 AOCharButton::AOCharButton(QWidget *parent, AOApplication *p_ao_app, int x_pos, int y_pos) : QPushButton(parent)
 {
   m_parent = parent;

aocharbutton.h

@@ -2,11 +2,12 @@
 #define AOCHARBUTTON_H
 
 #include "aoapplication.h"
+#include "aoimage.h"
 
 #include <QPushButton>
 #include <QString>
 #include <QWidget>
-#include "aoimage.h"
+#include <QFile>
 
 class AOCharButton : public QPushButton
 {

aocharmovie.cpp

@@ -4,9 +4,6 @@
 #include "file_functions.h"
 #include "aoapplication.h"
 
-#include <QDebug>
-#include <QImageReader>
-
 AOCharMovie::AOCharMovie(QWidget *p_parent, AOApplication *p_ao_app) : QLabel(p_parent)
 {
   ao_app = p_ao_app;

aocharmovie.h

@@ -4,6 +4,8 @@
 #include <QMovie>
 #include <QLabel>
 #include <QTimer>
+#include <QDebug>
+#include <QImageReader>
 
 class AOApplication;
 

aoemotebutton.cpp

@@ -1,7 +1,6 @@
 #include "aoemotebutton.h"
 
 #include "file_functions.h"
-#include <QDebug>
 
 AOEmoteButton::AOEmoteButton(QWidget *p_parent, AOApplication *p_ao_app, int p_x, int p_y) : QPushButton(p_parent)
 {

aoemotebutton.h

@@ -1,10 +1,11 @@
 #ifndef AOEMOTEBUTTON_H
 #define AOEMOTEBUTTON_H
 
-#include <QPushButton>
-
 #include "aoapplication.h"
 
+#include <QPushButton>
+#include <QDebug>
+
 class AOEmoteButton : public QPushButton
 {
   Q_OBJECT

aoevidencebutton.cpp

@@ -2,8 +2,6 @@
 
 #include "file_functions.h"
 
-#include <QDebug>
-
 AOEvidenceButton::AOEvidenceButton(QWidget *p_parent, AOApplication *p_ao_app, int p_x, int p_y) : QPushButton(p_parent)
 {
   ao_app = p_ao_app;

aoevidencebutton.h

@@ -6,6 +6,7 @@
 
 #include <QPushButton>
 #include <QString>
+#include <QDebug>
 
 class AOEvidenceButton : public QPushButton
 {

aoevidencedisplay.cpp

@@ -1,5 +1,3 @@
-#include <QDebug>
-
 #include "aoevidencedisplay.h"
 
 #include "file_functions.h"

aoevidencedisplay.h

@@ -1,12 +1,13 @@
 #ifndef AOEVIDENCEDISPLAY_H
 #define AOEVIDENCEDISPLAY_H
 
-#include <QLabel>
-#include <QMovie>
-
 #include "aoapplication.h"
 #include "aosfxplayer.h"
 
+#include <QLabel>
+#include <QMovie>
+#include <QDebug>
+
 class AOEvidenceDisplay : public QLabel
 {
   Q_OBJECT

aoimage.cpp

@@ -2,8 +2,6 @@
 
 #include "aoimage.h"
 
-#include <QDebug>
-
 AOImage::AOImage(QWidget *parent, AOApplication *p_ao_app) : QLabel(parent)
 {
   m_parent = parent;

aoimage.h

@@ -6,6 +6,7 @@
 #include "aoapplication.h"
 
 #include <QLabel>
+#include <QDebug>
 
 class AOImage : public QLabel
 {

aomusicplayer.cpp

@@ -1,9 +1,5 @@
 #include "aomusicplayer.h"
 
-#include <string.h>
-
-#include <QDebug>
-
 AOMusicPlayer::AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app)
 {
   m_parent = parent;

aomusicplayer.h

@@ -5,6 +5,8 @@
 #include "aoapplication.h"
 
 #include <QWidget>
+#include <string.h>
+#include <QDebug>
 
 class AOMusicPlayer
 {

aopacket.cpp

@@ -2,8 +2,6 @@
 
 #include "encryption_functions.h"
 
-#include <QDebug>
-
 AOPacket::AOPacket(QString p_packet_string)
 {
   QStringList packet_contents = p_packet_string.split("#");

aopacket.h

@@ -3,6 +3,7 @@
 
 #include <QString>
 #include <QStringList>
+#include <QDebug>
 
 class AOPacket
 {

aoscene.cpp

@@ -1,11 +1,7 @@
 #include "aoscene.h"
-
 #include "courtroom.h"
-
 #include "file_functions.h"
 
-#include <QDebug>
-
 AOScene::AOScene(QWidget *parent, AOApplication *p_ao_app) : QLabel(parent)
 {
   m_parent = parent;

aoscene.h

@@ -2,6 +2,7 @@
 #define AOSCENE_H
 
 #include <QLabel>
+#include <QDebug>
 
 class Courtroom;
 class AOApplication;

aosfxplayer.cpp

@@ -1,9 +1,5 @@
 #include "aosfxplayer.h"
 
-#include <string.h>
-
-#include <QDebug>
-
 AOSfxPlayer::AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app)
 {
   m_parent = parent;

aosfxplayer.h

@@ -5,6 +5,8 @@
 #include "aoapplication.h"
 
 #include <QWidget>
+#include <string.h>
+#include <QDebug>
 
 class AOSfxPlayer
 {

aotextarea.cpp

@@ -1,10 +1,5 @@
 #include "aotextarea.h"
 
-#include <QScrollBar>
-#include <QTextCursor>
-#include <QRegExp>
-#include <QDebug>
-
 AOTextArea::AOTextArea(QWidget *p_parent) : QTextBrowser(p_parent)
 {
 

aotextarea.h

@@ -2,6 +2,10 @@
 #define AOTEXTAREA_H
 
 #include <QTextBrowser>
+#include <QScrollBar>
+#include <QTextCursor>
+#include <QRegExp>
+#include <QDebug>
 
 class AOTextArea : public QTextBrowser
 {

courtroom.cpp

@@ -1,19 +1,5 @@
 #include "courtroom.h"
 
-#include "aoapplication.h"
-#include "lobby.h"
-#include "hardware_functions.h"
-#include "file_functions.h"
-#include "datatypes.h"
-#include "debug_functions.h"
-
-#include <QDebug>
-#include <QScrollBar>
-#include <QRegExp>
-#include <QBrush>
-#include <QTextCharFormat>
-#include <QFont>
-
 Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
 {
   ao_app = p_ao_app;

courtroom.h

@@ -18,7 +18,19 @@
 #include "aotextedit.h"
 #include "aoevidencedisplay.h"
 #include "datatypes.h"
+#include "aoapplication.h"
+#include "lobby.h"
+#include "hardware_functions.h"
+#include "file_functions.h"
+#include "datatypes.h"
+#include "debug_functions.h"
 
+#include <QDebug>
+#include <QScrollBar>
+#include <QRegExp>
+#include <QBrush>
+#include <QTextCharFormat>
+#include <QFont>
 #include <QMainWindow>
 #include <QLineEdit>
 #include <QPlainTextEdit>

debug_functions.cpp

@@ -1,5 +1,3 @@
-#include <QMessageBox>
-
 #include "debug_functions.h"
 
 void call_error(QString p_message)

debug_functions.h

@@ -2,6 +2,7 @@
 #define DEBUG_FUNCTIONS_H
 
 #include <QString>
+#include <QMessageBox>
 
 void call_error(QString message);
 void call_notice(QString message);

discord_rich_presence.cpp

@@ -1,10 +1,5 @@
 #include "discord_rich_presence.h"
 
-#include <cstring>
-#include <ctime>
-
-#include <QDebug>
-
 namespace AttorneyOnline {
 
 Discord::Discord()

discord_rich_presence.h

@@ -1,6 +1,9 @@
 #ifndef DISCORD_RICH_PRESENCE_H
 #define DISCORD_RICH_PRESENCE_H
 
+#include <cstring>
+#include <ctime>
+#include <QDebug>
 #include <string>
 #include <discord-rpc.h>