normalize include paths

components/channels.cpp

@@ -2,9 +2,9 @@
 #include <algorithm>
 #include <map>
 #include <unordered_map>
-#include "../abaddon.hpp"
-#include "../imgmanager.hpp"
-#include "../util.hpp"
+#include "abaddon.hpp"
+#include "imgmanager.hpp"
+#include "util.hpp"
 #include "statusindicator.hpp"
 
 ChannelList::ChannelList()

components/chatinputindicator.cpp

@@ -1,7 +1,7 @@
 #include <filesystem>
 #include "chatinputindicator.hpp"
-#include "../abaddon.hpp"
-#include "../util.hpp"
+#include "abaddon.hpp"
+#include "util.hpp"
 
 constexpr static const int MaxUsersInIndicator = 4;
 

components/chatinputindicator.hpp

@@ -1,8 +1,8 @@
 #pragma once
 #include <gtkmm.h>
 #include <unordered_map>
-#include "../discord/message.hpp"
-#include "../discord/user.hpp"
+#include "discord/message.hpp"
+#include "discord/user.hpp"
 
 class ChatInputIndicator : public Gtk::Box {
 public:

components/chatmessage.cpp

@@ -1,6 +1,6 @@
 #include "chatmessage.hpp"
-#include "../abaddon.hpp"
-#include "../util.hpp"
+#include "abaddon.hpp"
+#include "util.hpp"
 #include "lazyimage.hpp"
 #include <unordered_map>
 

components/chatmessage.hpp

@@ -1,6 +1,6 @@
 #pragma once
 #include <gtkmm.h>
-#include "../discord/discord.hpp"
+#include "discord/discord.hpp"
 
 class ChatMessageItemContainer : public Gtk::Box {
 public:

components/completer.cpp

@@ -1,7 +1,7 @@
 #include <unordered_set>
 #include "completer.hpp"
-#include "../abaddon.hpp"
-#include "../util.hpp"
+#include "abaddon.hpp"
+#include "util.hpp"
 
 constexpr const int CompleterHeight = 150;
 constexpr const int MaxCompleterEntries = 30;

components/completer.hpp

@@ -2,7 +2,7 @@
 #include <gtkmm.h>
 #include <functional>
 #include "lazyimage.hpp"
-#include "../discord/snowflake.hpp"
+#include "discord/snowflake.hpp"
 
 constexpr static int CompleterImageSize = 24;
 

components/friendslist.cpp

@@ -1,5 +1,5 @@
 #include "friendslist.hpp"
-#include "../abaddon.hpp"
+#include "abaddon.hpp"
 #include "lazyimage.hpp"
 
 using namespace std::string_literals;

components/friendslist.hpp

@@ -1,6 +1,6 @@
 #pragma once
 #include <gtkmm.h>
-#include "../discord/objects.hpp"
+#include "discord/objects.hpp"
 
 class FriendsListAddComponent : public Gtk::Box {
 public:

components/lazyimage.cpp

@@ -1,5 +1,5 @@
 #include "lazyimage.hpp"
-#include "../abaddon.hpp"
+#include "abaddon.hpp"
 
 LazyImage::LazyImage(int w, int h, bool use_placeholder)
     : m_width(w)

components/memberlist.cpp

@@ -1,6 +1,6 @@
 #include "memberlist.hpp"
-#include "../abaddon.hpp"
-#include "../util.hpp"
+#include "abaddon.hpp"
+#include "util.hpp"
 #include "lazyimage.hpp"
 #include "statusindicator.hpp"
 

components/memberlist.hpp

@@ -3,7 +3,7 @@
 #include <mutex>
 #include <unordered_map>
 #include <optional>
-#include "../discord/discord.hpp"
+#include "discord/discord.hpp"
 
 class LazyImage;
 class StatusIndicator;

components/ratelimitindicator.cpp

@@ -1,5 +1,5 @@
 #include "ratelimitindicator.hpp"
-#include "../abaddon.hpp"
+#include "abaddon.hpp"
 #include <filesystem>
 
 RateLimitIndicator::RateLimitIndicator()

components/ratelimitindicator.hpp

@@ -2,7 +2,7 @@
 #include <gtkmm.h>
 #include <unordered_map>
 #include <chrono>
-#include "../discord/message.hpp"
+#include "discord/message.hpp"
 
 class RateLimitIndicator : public Gtk::Box {
 public:

components/statusindicator.cpp

@@ -1,5 +1,5 @@
 #include "statusindicator.hpp"
-#include "../abaddon.hpp"
+#include "abaddon.hpp"
 
 static const constexpr int Diameter = 8;
 static const auto OnlineColor = Gdk::RGBA("#43B581");

components/statusindicator.hpp

@@ -1,7 +1,7 @@
 #pragma once
 #include <gtkmm.h>
-#include "../discord/snowflake.hpp"
-#include "../discord/activity.hpp"
+#include "discord/snowflake.hpp"
+#include "discord/activity.hpp"
 
 class StatusIndicator : public Gtk::Widget {
 public:

dialogs/friendpicker.cpp

@@ -1,5 +1,5 @@
 #include "friendpicker.hpp"
-#include "../abaddon.hpp"
+#include "abaddon.hpp"
 
 FriendPickerDialog::FriendPickerDialog(Gtk::Window &parent)
     : Gtk::Dialog("Pick a friend", parent, true)

dialogs/friendpicker.hpp

@@ -1,6 +1,6 @@
 #pragma once
 #include <gtkmm.h>
-#include "../discord/snowflake.hpp"
+#include "discord/snowflake.hpp"
 
 class FriendPickerDialog : public Gtk::Dialog {
 public:

dialogs/joinguild.cpp

@@ -1,5 +1,5 @@
 #include "joinguild.hpp"
-#include "../abaddon.hpp"
+#include "abaddon.hpp"
 #include <nlohmann/json.hpp>
 #include <regex>
 

dialogs/setstatus.hpp

@@ -1,6 +1,6 @@
 #pragma once
 #include <gtkmm.h>
-#include "../discord/objects.hpp"
+#include "discord/objects.hpp"
 
 class SetStatusDialog : public Gtk::Dialog {
 public:

dialogs/verificationgate.cpp

@@ -1,5 +1,5 @@
 #include "verificationgate.hpp"
-#include "../abaddon.hpp"
+#include "abaddon.hpp"
 
 VerificationGateDialog::VerificationGateDialog(Gtk::Window &parent, Snowflake guild_id)
     : Gtk::Dialog("Verification Required", parent, true)

dialogs/verificationgate.hpp

@@ -1,7 +1,7 @@
 #pragma once
 #include <gtkmm.h>
 #include <optional>
-#include "../discord/objects.hpp"
+#include "discord/objects.hpp"
 
 class VerificationGateDialog : public Gtk::Dialog {
 public:

discord/activity.hpp

@@ -1,7 +1,7 @@
 #pragma once
 #include <string>
 #include <optional>
-#include "../util.hpp"
+#include "util.hpp"
 #include "json.hpp"
 #include "snowflake.hpp"
 

discord/channel.cpp

@@ -1,4 +1,4 @@
-#include "../abaddon.hpp"
+#include "abaddon.hpp"
 #include "channel.hpp"
 
 void from_json(const nlohmann::json &j, ThreadMetadataData &m) {

discord/discord.cpp

@@ -1,8 +1,8 @@
 #include "discord.hpp"
 #include <cassert>
 #include <cinttypes>
-#include "../util.hpp"
-#include "../abaddon.hpp"
+#include "util.hpp"
+#include "abaddon.hpp"
 
 DiscordClient::DiscordClient(bool mem_store)
     : m_decompress_buf(InflateChunkSize)

discord/guild.cpp

@@ -1,5 +1,5 @@
 #include "guild.hpp"
-#include "../abaddon.hpp"
+#include "abaddon.hpp"
 
 void from_json(const nlohmann::json &j, GuildData &m) {
     JS_D("id", m.ID);

discord/httpclient.hpp

@@ -7,7 +7,7 @@
 #include <mutex>
 #include <queue>
 #include <glibmm.h>
-#include "../http.hpp"
+#include "http.hpp"
 
 class HTTPClient {
 public:

discord/interactions.cpp

@@ -1,6 +1,6 @@
 #include "interactions.hpp"
 #include "json.hpp"
-#include "../abaddon.hpp"
+#include "abaddon.hpp"
 
 void from_json(const nlohmann::json &j, MessageInteractionData &m) {
     JS_D("id", m.ID);

discord/json.hpp

@@ -1,7 +1,7 @@
 #pragma once
 #include <nlohmann/json.hpp>
 #include <optional>
-#include "../util.hpp"
+#include "util.hpp"
 
 namespace detail { // more or less because idk what to name this stuff
 template<typename T>

discord/member.cpp

@@ -1,5 +1,5 @@
 #include "member.hpp"
-#include "../abaddon.hpp"
+#include "abaddon.hpp"
 
 void from_json(const nlohmann::json &j, GuildMember &m) {
     JS_O("user", m.User);

discord/permissions.hpp

@@ -2,7 +2,7 @@
 #include <cstdint>
 #include "snowflake.hpp"
 #include "json.hpp"
-#include "../util.hpp"
+#include "util.hpp"
 
 constexpr static uint64_t PERMISSION_MAX_BIT = 36;
 enum class Permission : uint64_t {

discord/store.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "../util.hpp"
+#include "util.hpp"
 #include "objects.hpp"
 #include <unordered_map>
 #include <unordered_set>

discord/user.cpp

@@ -1,5 +1,5 @@
 #include "user.hpp"
-#include "../abaddon.hpp"
+#include "abaddon.hpp"
 
 bool UserData::IsDeleted() const {
     return Discriminator == "0000";

windows/guildsettings/banspane.cpp

@@ -1,5 +1,5 @@
 #include "banspane.hpp"
-#include "../../abaddon.hpp"
+#include "abaddon.hpp"
 
 // gtk_list_store_set_value: assertion 'column >= 0 && column < priv->n_columns' failed
 // dont care to figure out why this happens cuz it doesnt seem to break anything

windows/guildsettings/banspane.hpp

@@ -1,7 +1,7 @@
 #pragma once
 #include <gtkmm.h>
-#include "../../discord/snowflake.hpp"
-#include "../../discord/ban.hpp"
+#include "discord/snowflake.hpp"
+#include "discord/ban.hpp"
 
 class GuildSettingsBansPane : public Gtk::Box {
 public:

windows/guildsettings/emojispane.cpp

@@ -1,6 +1,6 @@
 #include "emojispane.hpp"
-#include "../../abaddon.hpp"
-#include "../../components/cellrendererpixbufanimation.hpp"
+#include "abaddon.hpp"
+#include "components/cellrendererpixbufanimation.hpp"
 
 GuildSettingsEmojisPane::GuildSettingsEmojisPane(Snowflake guild_id)
     : Gtk::Box(Gtk::ORIENTATION_VERTICAL)

windows/guildsettings/emojispane.hpp

@@ -1,6 +1,6 @@
 #pragma once
 #include <gtkmm.h>
-#include "../../discord/emoji.hpp"
+#include "discord/emoji.hpp"
 
 class GuildSettingsEmojisPane : public Gtk::Box {
 public:

windows/guildsettings/infopane.cpp

@@ -1,5 +1,5 @@
 #include "infopane.hpp"
-#include "../../abaddon.hpp"
+#include "abaddon.hpp"
 #include <filesystem>
 
 GuildSettingsInfoPane::GuildSettingsInfoPane(Snowflake id)

windows/guildsettings/infopane.hpp

@@ -1,6 +1,6 @@
 #pragma once
 #include <gtkmm.h>
-#include "../../discord/guild.hpp"
+#include "discord/guild.hpp"
 
 class GuildSettingsInfoPane : public Gtk::Grid {
 public:

windows/guildsettings/invitespane.cpp

@@ -1,5 +1,5 @@
 #include "invitespane.hpp"
-#include "../../abaddon.hpp"
+#include "abaddon.hpp"
 
 GuildSettingsInvitesPane::GuildSettingsInvitesPane(Snowflake id)
     : GuildID(id)

windows/guildsettings/invitespane.hpp

@@ -1,6 +1,6 @@
 #pragma once
 #include <gtkmm.h>
-#include "../../discord/objects.hpp"
+#include "discord/objects.hpp"
 
 class GuildSettingsInvitesPane : public Gtk::ScrolledWindow {
 public:

windows/guildsettings/memberspane.cpp

@@ -1,5 +1,5 @@
 #include "memberspane.hpp"
-#include "../../abaddon.hpp"
+#include "abaddon.hpp"
 
 GuildSettingsMembersPane::GuildSettingsMembersPane(Snowflake id)
     : Gtk::Box(Gtk::ORIENTATION_VERTICAL)

windows/guildsettings/memberspane.hpp

@@ -1,9 +1,9 @@
 #pragma once
 #include <unordered_set>
 #include <gtkmm.h>
-#include "../../discord/member.hpp"
-#include "../../discord/guild.hpp"
-#include "../../components/lazyimage.hpp"
+#include "discord/member.hpp"
+#include "discord/guild.hpp"
+#include "components/lazyimage.hpp"
 
 class GuildSettingsMembersPaneRolesItem : public Gtk::ListBoxRow {
 public:

windows/guildsettings/rolespane.cpp

@@ -1,5 +1,5 @@
 #include "rolespane.hpp"
-#include "../../abaddon.hpp"
+#include "abaddon.hpp"
 
 GuildSettingsRolesPane::GuildSettingsRolesPane(Snowflake id)
     : Gtk::Box(Gtk::ORIENTATION_HORIZONTAL)

windows/guildsettings/rolespane.hpp

@@ -1,8 +1,8 @@
 #pragma once
 #include <gtkmm.h>
 #include <unordered_map>
-#include "../../discord/guild.hpp"
-#include "../../components/draglistbox.hpp"
+#include "discord/guild.hpp"
+#include "components/draglistbox.hpp"
 
 class GuildSettingsRolesPaneRolesListItem : public Gtk::ListBoxRow {
 public:

windows/guildsettingswindow.cpp

@@ -1,5 +1,5 @@
 #include "guildsettingswindow.hpp"
-#include "../abaddon.hpp"
+#include "abaddon.hpp"
 
 GuildSettingsWindow::GuildSettingsWindow(Snowflake id)
     : m_main(Gtk::ORIENTATION_VERTICAL)

windows/guildsettingswindow.hpp

@@ -1,6 +1,6 @@
 #pragma once
 #include <gtkmm.h>
-#include "../discord/snowflake.hpp"
+#include "discord/snowflake.hpp"
 #include "guildsettings/infopane.hpp"
 #include "guildsettings/banspane.hpp"
 #include "guildsettings/invitespane.hpp"

windows/mainwindow.cpp

@@ -1,5 +1,5 @@
 #include "mainwindow.hpp"
-#include "../abaddon.hpp"
+#include "abaddon.hpp"
 
 MainWindow::MainWindow()
     : m_main_box(Gtk::ORIENTATION_VERTICAL)

windows/mainwindow.hpp

@@ -1,8 +1,8 @@
 #pragma once
-#include "../components/channels.hpp"
-#include "../components/chatwindow.hpp"
-#include "../components/memberlist.hpp"
-#include "../components/friendslist.hpp"
+#include "components/channels.hpp"
+#include "components/chatwindow.hpp"
+#include "components/memberlist.hpp"
+#include "components/friendslist.hpp"
 #include <gtkmm.h>
 
 class MainWindow : public Gtk::Window {

windows/pinnedwindow.cpp

@@ -1,5 +1,5 @@
 #include "pinnedwindow.hpp"
-#include "../abaddon.hpp"
+#include "abaddon.hpp"
 
 PinnedWindow::PinnedWindow(const ChannelData &data)
     : ChannelID(data.ID) {

windows/pinnedwindow.hpp

@@ -1,9 +1,9 @@
 #pragma once
 #include <gtkmm.h>
-#include "../discord/errors.hpp"
-#include "../discord/channel.hpp"
-#include "../discord/message.hpp"
-#include "../components/chatlist.hpp"
+#include "discord/errors.hpp"
+#include "discord/channel.hpp"
+#include "discord/message.hpp"
+#include "components/chatlist.hpp"
 
 class PinnedWindow : public Gtk::Window {
 public:

windows/profile/mutualfriendspane.cpp

@@ -1,5 +1,5 @@
 #include "mutualfriendspane.hpp"
-#include "../../abaddon.hpp"
+#include "abaddon.hpp"
 
 MutualFriendItem::MutualFriendItem(const UserData &user)
     : Gtk::Box(Gtk::ORIENTATION_HORIZONTAL) {

windows/profile/mutualfriendspane.hpp

@@ -1,6 +1,6 @@
 #pragma once
 #include <gtkmm.h>
-#include "../../discord/objects.hpp"
+#include "discord/objects.hpp"
 
 class MutualFriendItem : public Gtk::Box {
 public:

windows/profile/mutualguildspane.cpp

@@ -1,5 +1,5 @@
 #include "mutualguildspane.hpp"
-#include "../../abaddon.hpp"
+#include "abaddon.hpp"
 
 MutualGuildItem::MutualGuildItem(const MutualGuildData &guild)
     : Gtk::Box(Gtk::ORIENTATION_HORIZONTAL)

windows/profile/mutualguildspane.hpp

@@ -1,6 +1,6 @@
 #pragma once
 #include <gtkmm.h>
-#include "../../discord/objects.hpp"
+#include "discord/objects.hpp"
 
 class MutualGuildItem : public Gtk::Box {
 public:

windows/profile/userinfopane.cpp

@@ -1,6 +1,6 @@
 #include "userinfopane.hpp"
 #include <unordered_set>
-#include "../../abaddon.hpp"
+#include "abaddon.hpp"
 
 ConnectionItem::ConnectionItem(const ConnectionData &conn)
     : m_box(Gtk::ORIENTATION_HORIZONTAL)

windows/profile/userinfopane.hpp

@@ -1,6 +1,6 @@
 #pragma once
 #include <gtkmm.h>
-#include "../../discord/objects.hpp"
+#include "discord/objects.hpp"
 
 class ConnectionItem : public Gtk::EventBox {
 public:

windows/profilewindow.cpp

@@ -1,5 +1,5 @@
 #include "profilewindow.hpp"
-#include "../abaddon.hpp"
+#include "abaddon.hpp"
 
 ProfileWindow::ProfileWindow(Snowflake user_id)
     : ID(user_id)

windows/profilewindow.hpp

@@ -1,6 +1,6 @@
 #pragma once
 #include <gtkmm.h>
-#include "../discord/snowflake.hpp"
+#include "discord/snowflake.hpp"
 #include "profile/userinfopane.hpp"
 #include "profile/mutualguildspane.hpp"
 #include "profile/mutualfriendspane.hpp"

windows/threadswindow.cpp

@@ -1,5 +1,5 @@
 #include "threadswindow.hpp"
-#include "../abaddon.hpp"
+#include "abaddon.hpp"
 
 ThreadsWindow::ThreadsWindow(const ChannelData &channel)
     : m_channel_id(channel.ID)

windows/threadswindow.hpp

@@ -1,6 +1,6 @@
 #pragma once
 #include <gtkmm.h>
-#include "../discord/objects.hpp"
+#include "discord/objects.hpp"
 
 class ActiveThreadsList : public Gtk::ScrolledWindow {
 public: