From 0500a5426013e97b80cae1de0b19a117cc1bbaa7 Mon Sep 17 00:00:00 2001
From: TrickyLeifa <date.epoch@gmail.com>
Date: Fri, 17 May 2024 20:36:36 +0200
Subject: [PATCH] Changed include definitions to reflect third-party stature

---
 src/aoapplication.cpp           |  4 ++--
 src/aoapplication.h             | 25 ++++++++++---------------
 src/aoblipplayer.h              |  7 ++++---
 src/aosfxplayer.h               |  6 +++---
 src/widgets/aooptionsdialog.cpp |  3 ++-
 5 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/src/aoapplication.cpp b/src/aoapplication.cpp
index b0b90e2..a3ed6b9 100644
--- a/src/aoapplication.cpp
+++ b/src/aoapplication.cpp
@@ -1,14 +1,14 @@
 #include "aoapplication.h"
 
-#include "bassmidi.h"
 #include "courtroom.h"
 #include "debug_functions.h"
 #include "lobby.h"
 #include "networkmanager.h"
 #include "options.h"
-
 #include "widgets/aooptionsdialog.h"
 
+#include <bassmidi.h>
+
 static QtMessageHandler original_message_handler;
 static AOApplication *message_handler_context;
 void message_handler(QtMsgType type, const QMessageLogContext &context, const QString &msg)
diff --git a/src/aoapplication.h b/src/aoapplication.h
index cd9265b..c2a0191 100644
--- a/src/aoapplication.h
+++ b/src/aoapplication.h
@@ -7,28 +7,23 @@
 #include "serverdata.h"
 #include "widgets/aooptionsdialog.h"
 
-#include "bass.h"
+#include <bass.h>
 
 #include <QApplication>
-#include <QFile>
-#include <QSettings>
-#include <QVector>
-
-#include <QDebug>
-#include <QRect>
-
-#include <QCryptographicHash>
-
-#include <QDir>
-#include <QStandardPaths>
-
 #include <QColor>
+#include <QCryptographicHash>
+#include <QDebug>
+#include <QDir>
+#include <QElapsedTimer>
+#include <QFile>
+#include <QRect>
 #include <QScreen>
+#include <QSettings>
+#include <QStandardPaths>
 #include <QStringList>
 #include <QTextStream>
 #include <QTime>
-
-#include <QElapsedTimer>
+#include <QVector>
 
 class NetworkManager;
 class Lobby;
diff --git a/src/aoblipplayer.h b/src/aoblipplayer.h
index c33e08b..92b43d2 100644
--- a/src/aoblipplayer.h
+++ b/src/aoblipplayer.h
@@ -1,13 +1,14 @@
 #pragma once
 
-#include "bass.h"
-#include "bassopus.h"
-
 #include "aoapplication.h"
 
+#include <bass.h>
+#include <bassopus.h>
+
 #include <QDebug>
 #include <QElapsedTimer>
 #include <QWidget>
+
 #include <string.h>
 
 class AOBlipPlayer
diff --git a/src/aosfxplayer.h b/src/aosfxplayer.h
index 5996956..7669f0d 100644
--- a/src/aosfxplayer.h
+++ b/src/aosfxplayer.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "bass.h"
-#include "bassopus.h"
-
 #include "aoapplication.h"
 
+#include <bass.h>
+#include <bassopus.h>
+
 #include <QDebug>
 #include <QWidget>
 
diff --git a/src/widgets/aooptionsdialog.cpp b/src/widgets/aooptionsdialog.cpp
index a25bde3..beb7e55 100644
--- a/src/widgets/aooptionsdialog.cpp
+++ b/src/widgets/aooptionsdialog.cpp
@@ -2,12 +2,13 @@
 
 #include "QDesktopServices"
 #include "aoapplication.h"
-#include "bass.h"
 #include "file_functions.h"
 #include "gui_utils.h"
 #include "networkmanager.h"
 #include "options.h"
 
+#include <bass.h>
+
 #include <QCollator>
 #include <QGroupBox>
 #include <QResource>