Moved includes out of the CPP files into the header files.

Reimplementation of `30a87d23c9c63bed072b3460e7482075dc530b2c` from the
old origin.

aoapplication.cpp

@@ -7,10 +7,6 @@
 
 #include "aooptionsdialog.h"
 
-#include <QDebug>
-#include <QRect>
-#include <QDesktopWidget>
-
 AOApplication::AOApplication(int &argc, char **argv) : QApplication(argc, argv)
 {
   // Create the QSettings class that points to the config.ini.

aoapplication.h

@@ -10,6 +10,19 @@
 #include <QFile>
 #include <QSettings>
 
+#include <QDebug>
+#include <QRect>
+#include <QDesktopWidget>
+
+#include <QCryptographicHash>
+
+#include <QDir>
+#include <QStandardPaths>
+
+#include <QTextStream>
+#include <QStringList>
+#include <QColor>
+
 class NetworkManager;
 class Lobby;
 class Courtroom;

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, bool is_taken) : 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
 {

aooptionsdialog.cpp

@@ -2,25 +2,6 @@
 #include "aoapplication.h"
 #include "bass.h"
 
-#include <QtCore/QVariant>
-#include <QtWidgets/QApplication>
-#include <QtWidgets/QCheckBox>
-#include <QtWidgets/QComboBox>
-#include <QtWidgets/QDialog>
-#include <QtWidgets/QDialogButtonBox>
-#include <QtWidgets/QFormLayout>
-#include <QtWidgets/QFrame>
-#include <QtWidgets/QLabel>
-#include <QtWidgets/QLineEdit>
-#include <QtWidgets/QPlainTextEdit>
-#include <QtWidgets/QSpinBox>
-#include <QtWidgets/QTabWidget>
-#include <QtWidgets/QVBoxLayout>
-#include <QtWidgets/QWidget>
-
-#include <QDirIterator>
-#include <QTextStream>
-
 AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) : QDialog(parent)
 {
     ao_app = p_ao_app;

aooptionsdialog.h

@@ -20,6 +20,9 @@
 #include <QtWidgets/QVBoxLayout>
 #include <QtWidgets/QWidget>
 
+#include <QDirIterator>
+#include <QTextStream>
+
 class AOOptionsDialog: public QDialog
 {
     Q_OBJECT

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

@@ -4,8 +4,6 @@
 
 #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
 {

charselect.cpp

@@ -5,8 +5,6 @@
 #include "debug_functions.h"
 #include "hardware_functions.h"
 
-#include <QDebug>
-
 void Courtroom::construct_char_select()
 {
   ui_char_select_background = new AOImage(this, ao_app);

courtroom.cpp

@@ -7,14 +7,6 @@
 #include "datatypes.h"
 #include "debug_functions.h"
 
-#include <QDebug>
-#include <QScrollBar>
-#include <QRegExp>
-#include <QBrush>
-#include <QTextCharFormat>
-#include <QFont>
-#include <QInputDialog>
-
 Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
 {
   ao_app = p_ao_app;

courtroom.h

@@ -33,6 +33,15 @@
 #include <QTextBrowser>
 #include <QSpinBox>
 
+#include <QDebug>
+#include <QScrollBar>
+#include <QRegExp>
+#include <QBrush>
+#include <QTextCharFormat>
+#include <QFont>
+#include <QInputDialog>
+#include <QFileDialog>
+
 #include <stack>
 
 class AOApplication;

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

@@ -4,6 +4,11 @@
 #include <string>
 #include <discord-rpc.h>
 
+#include <cstring>
+#include <ctime>
+
+#include <QDebug>
+
 namespace AttorneyOnline {
 
 class Discord

emotes.cpp

@@ -2,8 +2,6 @@
 
 #include "aoemotebutton.h"
 
-#include <QDebug>
-
 void Courtroom::construct_emotes()
 {
   ui_emotes = new QWidget(this);

encryption_functions.cpp

@@ -2,12 +2,6 @@
 
 #include "hex_functions.h"
 
-#include <cstddef>
-#include <stdlib.h>
-#include <sstream>
-#include <iomanip>
-#include <QVector>
-
 QString fanta_encrypt(QString temp_input, unsigned int p_key)
 {
   //using standard stdlib types is actually easier here because of implicit char<->int conversion

encryption_functions.h

@@ -3,6 +3,12 @@
 
 #include <QString>
 
+#include <cstddef>
+#include <stdlib.h>
+#include <sstream>
+#include <iomanip>
+#include <QVector>
+
 QString fanta_encrypt(QString p_input, unsigned int key);
 QString fanta_decrypt(QString p_input, unsigned int key);
 

evidence.cpp

@@ -1,8 +1,5 @@
 #include "courtroom.h"
 
-#include <QDebug>
-#include <QFileDialog>
-
 void Courtroom::construct_evidence()
 {
   ui_evidence = new AOImage(this, ao_app);

file_functions.cpp

@@ -1,6 +1,3 @@
-#include <QFileInfo>
-#include <QDir>
-
 #include "file_functions.h"
 
 bool file_exists(QString file_path)

file_functions.h

@@ -1,6 +1,8 @@
 #ifndef FILE_FUNCTIONS_H
 #define FILE_FUNCTIONS_H
 
+#include <QFileInfo>
+#include <QDir>
 #include <QString>
 
 bool file_exists(QString file_path);

lobby.cpp

@@ -5,9 +5,6 @@
 #include "networkmanager.h"
 #include "aosfxplayer.h"
 
-#include <QDebug>
-#include <QScrollBar>
-
 Lobby::Lobby(AOApplication *p_ao_app) : QMainWindow()
 {
   ao_app = p_ao_app;

lobby.h

@@ -14,6 +14,9 @@
 #include <QProgressBar>
 #include <QTextBrowser>
 
+#include <QDebug>
+#include <QScrollBar>
+
 class AOApplication;
 
 class Lobby : public QMainWindow

misc_functions.cpp

@@ -1,8 +1,5 @@
 #include "misc_functions.h"
 
-#include <QTime>
-#include <QCoreApplication>
-
 void delay(int p_milliseconds)
 {
   QTime dieTime = QTime::currentTime().addMSecs(p_milliseconds);

misc_functions.h

@@ -1,6 +1,9 @@
 #ifndef MISC_FUNCTIONS_H
 #define MISC_FUNCTIONS_H
 
+#include <QTime>
+#include <QCoreApplication>
+
 void delay(int p_milliseconds);
 
 #endif // MISC_FUNCTIONS_H

networkmanager.cpp

@@ -4,9 +4,6 @@
 #include "debug_functions.h"
 #include "lobby.h"
 
-#include <cstring>
-
-
 NetworkManager::NetworkManager(AOApplication *parent) : QObject(parent)
 {
   ao_app = parent;

networkmanager.h

@@ -21,6 +21,7 @@
 #include <QDnsLookup>
 #include <QTime>
 #include <QTimer>
+#include <cstring>
 
 class NetworkManager : public QObject
 {

packet_distribution.cpp

@@ -7,9 +7,6 @@
 #include "hardware_functions.h"
 #include "debug_functions.h"
 
-#include <QDebug>
-#include <QCryptographicHash>
-
 void AOApplication::ms_packet_received(AOPacket *p_packet)
 {
   p_packet->net_decode();

path_functions.cpp

@@ -1,9 +1,6 @@
 #include "aoapplication.h"
 #include "courtroom.h"
 #include "file_functions.h"
-#include <QDir>
-#include <QDebug>
-#include <QStandardPaths>
 
 #ifdef BASE_OVERRIDE
 #include "base_override.h"

text_file_functions.cpp

@@ -2,12 +2,6 @@
 
 #include "file_functions.h"
 
-#include <QTextStream>
-#include <QStringList>
-#include <QVector>
-#include <QDebug>
-#include <QColor>
-
 /*
  * This may no longer be necessary, if we use the QSettings class.
  *