Tidy up includes

leonhard-s · Apr 26, 2024 · d434ef7 · d434ef7
1 parent 1952340
commit d434ef7
Show file tree

Hide file tree

Showing 33 changed files with 129 additions and 161 deletions.
diff --git a/app/appdata/assets.cpp b/app/appdata/assets.cpp
@@ -1,10 +1,10 @@
 // Copyright 2022 Leonhard S.
 
-#include "appdata/assets.hpp"
+#include "assets.hpp"
 
 #include <string>
 
-#include "ps2.hpp"
+#include <ps2.hpp>
 
 namespace assets {
 int imageKeyFromClass(ps2::Class class_, std::string* image_key) {

diff --git a/app/appdata/assets.hpp b/app/appdata/assets.hpp
@@ -4,7 +4,7 @@
 
 #include <string>
 
-#include "ps2.hpp"
+#include <ps2.hpp>
 
 namespace assets {
 

diff --git a/app/core.cpp b/app/core.cpp
@@ -2,17 +2,16 @@
 
 #include "core.hpp"
 
-#include <QtCore/QDateTime>
-#include <QtCore/QDebug>
-#include <QtCore/QObject>
-#include <QtCore/QString>
-#include <QtCore/QTimer>
-#include <QJsonObject>
-
 #include <algorithm>
 
-#include "arx.hpp"
-#include "discord-game-sdk/discord.h"
+#include <QDateTime>
+#include <QDebug>
+#include <QJsonObject>
+#include <QObject>
+#include <QString>
+#include <QTimer>
+#include <arx.hpp>
+#include <discord-game-sdk/discord.h>
 #include <moc_macros.h>
 
 #include "game/character-info.hpp"

diff --git a/app/core.hpp b/app/core.hpp
@@ -4,13 +4,13 @@
 
 #include <memory>
 
-#include <QtCore/QDateTime>
-#include <QtCore/QList>
-#include <QtCore/QObject>
-#include <QtCore/QString>
-#include <QtCore/QTimer>
+#include <QDateTime>
+#include <QList>
+#include <QObject>
+#include <QString>
+#include <QTimer>
+#include <arx.hpp>
 
-#include "arx.hpp"
 #include "game/character-info.hpp"
 #include "presence/factory.hpp"
 #include "presence/handler.hpp"

diff --git a/app/game/character-info.cpp b/app/game/character-info.cpp
@@ -1,19 +1,16 @@
 // Copyright 2022 Leonhard S.
 
-#include "game/character-info.hpp"
+#include "character-info.hpp"
 
 #include <string>
 #include <utility>
 
-#include <QtCore/QDebug>
-#include <QtCore/QJsonObject>
-#include <QtCore/QObject>
-#include <QtCore/QScopedPointer>
-#include <QtCore/QString>
-
-#include "api/rest_client.h"
-#include "arx.hpp"
-#include "ps2.hpp"
+#include <QDebug>
+#include <QObject>
+#include <QString>
+#include <api/rest_client.h>
+#include <arx.hpp>
+#include <ps2.hpp>
 #include <adopt_pointer.h>
 #include <moc_macros.h>
 

diff --git a/app/game/character-info.hpp b/app/game/character-info.hpp
@@ -4,13 +4,13 @@
 
 #include <memory>
 
-#include <QtCore/QDebug>
-#include <QtCore/QMetaType>
-#include <QtCore/QObject>
-#include <QtCore/QString>
+#include <QDebug>
+#include <QMetaType>
+#include <QObject>
+#include <QString>
 
-#include "arx.hpp"
-#include "ps2.hpp"
+#include <arx.hpp>
+#include <ps2.hpp>
 
 namespace PresenceApp {
 

diff --git a/app/game/state.cpp b/app/game/state.cpp
@@ -1,8 +1,8 @@
 // Copyright 2022 Leonhard S.
 
-#include "game/state.hpp"
+#include "state.hpp"
 
-#include "ps2.hpp"
+#include <ps2.hpp>
 
 namespace PresenceApp {
 

diff --git a/app/game/state.hpp b/app/game/state.hpp
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "ps2.hpp"
+#include <ps2.hpp>
 
 namespace PresenceApp {
 

diff --git a/app/gui/character-manager.cpp b/app/gui/character-manager.cpp
@@ -1,27 +1,21 @@
 // Copyright 2022 Leonhard S.
 
-#include "gui/character-manager.hpp"
-
-#include <QtCore/QJsonDocument>
-#include <QtCore/QRegularExpression>
-#include <QtCore/QString>
-#include <QtCore/QUrl>
-#include <QtCore/QUrlQuery>
-#include <QtGui/QRegularExpressionValidator>
-#include <QtWidgets/QCheckBox>
-#include <QtWidgets/QDialog>
-#include <QtWidgets/QGridLayout>
-#include <QtWidgets/QInputDialog>
-#include <QtWidgets/QLabel>
-#include <QtWidgets/QListWidget>
-#include <QtWidgets/QMessageBox>
-#include <QtWidgets/QPushButton>
-#include <QtWidgets/QVBoxLayout>
+#include "character-manager.hpp"
 
 #include <string>
 
-#include "arx.hpp"
-#include "ps2.hpp"
+#include <QDialog>
+#include <QJsonDocument>
+#include <QLabel>
+#include <QListWidget>
+#include <QMessageBox>
+#include <QPushButton>
+#include <QRegularExpression>
+#include <QRegularExpressionValidator>
+#include <QString>
+#include <QVBoxLayout>
+#include <arx.hpp>
+#include <ps2.hpp>
 #include <adopt_pointer.h>
 #include <moc_macros.h>
 

diff --git a/app/gui/character-manager.hpp b/app/gui/character-manager.hpp
@@ -4,14 +4,12 @@
 
 #include <memory>
 
-#include <QtCore/QObject>
-#include <QtCore/QString>
-#include <QtCore/QUrl>
-#include <QtWidgets/QDialog>
-#include <QtWidgets/QListWidget>
-#include <QtWidgets/QPushButton>
-
-#include "arx.hpp"
+#include <QDialog>
+#include <QListWidget>
+#include <QObject>
+#include <QPushButton>
+#include <QString>
+#include <arx.hpp>
 
 #include "game/character-info.hpp"
 

diff --git a/app/gui/main-window.cpp b/app/gui/main-window.cpp
@@ -4,22 +4,21 @@
 
 #include <numeric>
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDateTime>
-#include <QtCore/QDebug>
-#include <QtCore/QList>
-#include <QtCore/QObject>
-#include <QtCore/QVariantList>
-#include <QtCore/QVariantMap>
-#include <QtWidgets/QComboBox>
-#include <QtWidgets/QGridLayout>
-#include <QtWidgets/QGroupBox>
-#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QLabel>
-#include <QtWidgets/QPushButton>
-#include <QtWidgets/QSpacerItem>
-#include <QtWidgets/QVBoxLayout>
-
+#include <QComboBox>
+#include <QCoreApplication>
+#include <QDateTime>
+#include <QDebug>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QList>
+#include <QObject>
+#include <QPushButton>
+#include <QSpacerItem>
+#include <QVariantList>
+#include <QVariantMap>
+#include <QVBoxLayout>
 #include <adopt_pointer.h>
 #include <moc_macros.h>
 

diff --git a/app/gui/main-window.hpp b/app/gui/main-window.hpp
@@ -4,14 +4,14 @@
 
 #include <memory>
 
-#include <QtCore/QList>
-#include <QtCore/QObject>
-#include <QtCore/QTimer>
-#include <QtWidgets/QCheckBox>
-#include <QtWidgets/QComboBox>
-#include <QtWidgets/QLabel>
-#include <QtWidgets/QPushButton>
-#include <QtWidgets/QWidget>
+#include <QCheckBox>
+#include <QComboBox>
+#include <QLabel>
+#include <QList>
+#include <QObject>
+#include <QPushButton>
+#include <QTimer>
+#include <QWidget>
 
 #include "game/character-info.hpp"
 #include "core.hpp"

diff --git a/app/gui/timeago.hpp b/app/gui/timeago.hpp
@@ -2,9 +2,8 @@
 
 #pragma once
 
-#include <QtCore/QDateTime>
-#include <QtCore/QObject>
-#include <QtCore/QString>
+#include <QDateTime>
+#include <QString>
 
 namespace PresenceApp {
 

diff --git a/app/persistence.cpp b/app/persistence.cpp
@@ -2,16 +2,15 @@
 
 #include "persistence.hpp"
 
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-#include <QtCore/QJsonArray>
-#include <QtCore/QJsonDocument>
-#include <QtCore/QJsonObject>
-#include <QtCore/QStandardPaths>
-#include <QtCore/QString>
-
-#include "arx.hpp"
-#include "ps2.hpp"
+#include <QDir>
+#include <QFile>
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QStandardPaths>
+#include <QString>
+#include <arx.hpp>
+#include <ps2.hpp>
 
 #include "game/character-info.hpp"
 

diff --git a/app/persistence.hpp b/app/persistence.hpp
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QtCore/QVariantMap>
+#include <QVariantMap>
 
 #include "game/character-info.hpp"
 

diff --git a/app/presence/factory.cpp b/app/presence/factory.cpp
@@ -1,12 +1,12 @@
 // Copyright 2022 Leonhard S.
 
-#include "presence/factory.hpp"
+#include "factory.hpp"
 
-#include <QtCore/QObject>
 #include <string>
 
-#include "discord-game-sdk/discord.h"
-#include "ps2.hpp"
+#include <QObject>
+#include <discord-game-sdk/discord.h>
+#include <ps2.hpp>
 #include <moc_macros.h>
 
 #include "appdata/assets.hpp"

diff --git a/app/presence/factory.hpp b/app/presence/factory.hpp
@@ -2,10 +2,8 @@
 
 #pragma once
 
-#include <QtCore/QObject>
-#include <QtCore/QString>
-
-#include "discord-game-sdk/discord.h"
+#include <QObject>
+#include <discord-game-sdk/discord.h>
 
 #include "game/state.hpp"
 

diff --git a/app/presence/handler.cpp b/app/presence/handler.cpp
@@ -1,13 +1,11 @@
 // Copyright 2022 Leonhard S.
 
-#include "presence/handler.hpp"
+#include "handler.hpp"
 
-#include <QtCore/QDebug>
-#include <QtCore/QObject>
-#include <QtCore/QString>
-#include <QtCore/QTimer>
-
-#include "discord-game-sdk/discord.h"
+#include <QDebug>
+#include <QObject>
+#include <QTimer>
+#include <discord-game-sdk/discord.h>
 #include <adopt_pointer.h>
 #include <moc_macros.h>
 

diff --git a/app/presence/handler.hpp b/app/presence/handler.hpp
@@ -4,10 +4,9 @@
 
 #include <memory>
 
-#include <QtCore/QObject>
-#include <QtCore/QTimer>
-
-#include "discord-game-sdk/discord.h"
+#include <QObject>
+#include <QTimer>
+#include <discord-game-sdk/discord.h>
 
 namespace PresenceApp {
 

diff --git a/app/tracker.cpp b/app/tracker.cpp
@@ -2,17 +2,11 @@
 
 #include "tracker.hpp"
 
-#include <QtCore/QDebug>
-#include <QtCore/QList>
-#include <QtCore/QObject>
-#include <QtCore/QString>
-#include <QtCore/QUrl>
-#include <QtCore/QUrlQuery>
-
-#include <QJsonDocument>
-
-#include "arx.hpp"
-#include "arx/ess.hpp"
+#include <QDebug>
+#include <QList>
+#include <QObject>
+#include <QString>
+#include <arx.hpp>
 #include <api/ess_client.h>
 #include <api/subscriptions.h>
 #include <moc_macros.h>
@@ -49,7 +43,7 @@ ActivityTracker::ActivityTracker(
     std::for_each(subs.begin(), subs.end(),
         [this](const QJsonObject& sub) { ess_client_->subscribe(sub); });
     ess_client_->connect();
-    QObject::connect(ess_client_.get(), &PresenceLib::EssClient::payloadReceived,
+    QObject::connect(aress_client_.get(), &PresenceLib::EssClient::payloadReceived,
         this, &ActivityTracker::onPayloadReceived);
 }