From 30b901b4df7344021ca79af4bccf95f6e799a37c Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Thu, 18 Jan 2024 20:30:54 -0500 Subject: [PATCH] add a bajillion headers back in to compile if pch is off --- src/abaddon.cpp | 3 +++ src/components/cellrenderermemberlist.cpp | 1 + src/components/cellrenderermemberlist.hpp | 2 ++ src/components/cellrendererpixbufanimation.cpp | 2 ++ src/components/cellrendererpixbufanimation.hpp | 3 +++ src/components/channels.cpp | 2 ++ src/components/channelscellrenderer.cpp | 2 ++ src/components/channelscellrenderer.hpp | 5 ++++- src/components/channeltabswitcherhandy.cpp | 7 ++++++- src/components/channeltabswitcherhandy.hpp | 14 ++++++++++---- src/components/chatinput.cpp | 6 +++++- src/components/chatinput.hpp | 9 +++++++++ src/components/chatinputindicator.cpp | 5 ++++- src/components/chatinputindicator.hpp | 3 +++ src/components/chatlist.cpp | 1 + src/components/chatlist.hpp | 4 ++++ src/components/chatmessage.cpp | 5 ++++- src/components/chatmessage.hpp | 6 ++++++ src/components/chatwindow.cpp | 1 + src/components/chatwindow.hpp | 1 + src/components/completer.cpp | 2 ++ src/components/completer.hpp | 7 +++++++ src/components/draglistbox.cpp | 2 ++ src/components/draglistbox.hpp | 1 + src/components/friendslist.cpp | 4 ++++ src/components/friendslist.hpp | 9 +++++++++ src/components/lazyimage.cpp | 2 ++ src/components/lazyimage.hpp | 1 + src/components/memberlist.cpp | 3 +++ src/components/memberlist.hpp | 6 ++++-- src/components/progressbar.cpp | 2 ++ src/components/progressbar.hpp | 1 + src/components/ratelimitindicator.cpp | 4 ++++ src/components/ratelimitindicator.hpp | 5 +++++ src/components/voiceinfobox.cpp | 10 +++++++--- src/components/voiceinfobox.hpp | 12 ++++++++---- src/dialogs/confirm.hpp | 3 +++ src/dialogs/friendpicker.cpp | 2 ++ src/dialogs/friendpicker.hpp | 7 +++++++ src/dialogs/setstatus.cpp | 2 ++ src/dialogs/setstatus.hpp | 5 +++++ src/dialogs/textinput.hpp | 4 ++++ src/dialogs/token.hpp | 4 +++- src/dialogs/verificationgate.cpp | 2 ++ src/dialogs/verificationgate.hpp | 7 +++++++ src/discord/activity.hpp | 1 + src/discord/channel.cpp | 2 ++ src/discord/discord.cpp | 6 +++++- src/discord/discord.hpp | 2 +- src/discord/member.cpp | 2 ++ src/discord/message.cpp | 2 ++ src/discord/role.cpp | 2 ++ src/discord/snowflake.cpp | 3 +++ src/discord/user.cpp | 2 ++ src/discord/voicestateflags.hpp | 1 + src/discord/websocket.cpp | 6 +++++- src/emojis.cpp | 3 +++ src/emojis.hpp | 4 ++++ src/filecache.cpp | 2 ++ src/filecache.hpp | 1 + src/imgmanager.cpp | 5 +++++ src/imgmanager.hpp | 10 ++++++++-- src/misc/chatutil.cpp | 3 +++ src/misc/events.hpp | 2 +- src/notifications/notifications.cpp | 4 +++- src/notifications/notifications.hpp | 5 ++++- src/notifications/notifier_fallback.cpp | 2 ++ src/notifications/notifier_gio.cpp | 3 +++ src/remoteauth/remoteauthclient.cpp | 6 +++++- src/remoteauth/remoteauthclient.hpp | 7 ++++++- src/remoteauth/remoteauthdialog.cpp | 4 ++++ src/remoteauth/remoteauthdialog.hpp | 3 +++ src/settings.cpp | 3 +++ src/startup.cpp | 3 +++ src/startup.hpp | 5 ++++- src/util.cpp | 4 ++++ src/windows/guildsettings/auditlogpane.cpp | 5 +++++ src/windows/guildsettings/auditlogpane.hpp | 4 ++++ src/windows/guildsettings/banspane.cpp | 5 +++-- src/windows/guildsettings/banspane.hpp | 7 +++++++ src/windows/guildsettings/emojispane.cpp | 6 ++++++ src/windows/guildsettings/emojispane.hpp | 9 +++++++++ src/windows/guildsettings/infopane.cpp | 8 ++++++++ src/windows/guildsettings/infopane.hpp | 8 ++++++++ src/windows/guildsettings/invitespane.cpp | 5 +++++ src/windows/guildsettings/invitespane.hpp | 6 ++++++ src/windows/guildsettings/memberspane.cpp | 3 +++ src/windows/guildsettings/memberspane.hpp | 10 ++++++++++ src/windows/guildsettings/rolespane.cpp | 5 +++++ src/windows/guildsettings/rolespane.hpp | 11 +++++++++++ src/windows/guildsettingswindow.cpp | 2 ++ src/windows/guildsettingswindow.hpp | 5 +++++ src/windows/mainwindow.cpp | 3 +++ src/windows/pinnedwindow.cpp | 2 ++ src/windows/pinnedwindow.hpp | 3 +++ src/windows/profile/mutualfriendspane.cpp | 2 ++ src/windows/profile/mutualfriendspane.hpp | 7 +++++++ src/windows/profile/mutualguildspane.cpp | 2 ++ src/windows/profile/mutualguildspane.hpp | 7 +++++++ src/windows/profile/userinfopane.cpp | 6 ++++++ src/windows/profile/userinfopane.hpp | 9 +++++++++ src/windows/profilewindow.cpp | 3 +++ src/windows/profilewindow.hpp | 5 +++++ src/windows/threadswindow.cpp | 2 ++ src/windows/threadswindow.hpp | 12 ++++++++++++ src/windows/voicesettingswindow.cpp | 5 +++-- src/windows/voicesettingswindow.hpp | 1 + src/windows/voicewindow.cpp | 5 +++-- src/windows/voicewindow.hpp | 2 +- 109 files changed, 435 insertions(+), 37 deletions(-) diff --git a/src/abaddon.cpp b/src/abaddon.cpp index 8b8a0b2..443fa4e 100644 --- a/src/abaddon.cpp +++ b/src/abaddon.cpp @@ -1,9 +1,11 @@ +#include "abaddon.hpp" #include #include #include #include #include #include +#include #include "platform.hpp" #include "audio/manager.hpp" #include "discord/discord.hpp" @@ -21,6 +23,7 @@ #include "startup.hpp" #include "notifications/notifications.hpp" #include "remoteauth/remoteauthdialog.hpp" +#include "util.hpp" #ifdef WITH_LIBHANDY #include diff --git a/src/components/cellrenderermemberlist.cpp b/src/components/cellrenderermemberlist.cpp index ee1ea3e..0265447 100644 --- a/src/components/cellrenderermemberlist.cpp +++ b/src/components/cellrenderermemberlist.cpp @@ -1,4 +1,5 @@ #include "cellrenderermemberlist.hpp" +#include CellRendererMemberList::CellRendererMemberList() : Glib::ObjectBase(typeid(CellRendererMemberList)) diff --git a/src/components/cellrenderermemberlist.hpp b/src/components/cellrenderermemberlist.hpp index 79d32e3..1ecbcb8 100644 --- a/src/components/cellrenderermemberlist.hpp +++ b/src/components/cellrenderermemberlist.hpp @@ -1,5 +1,7 @@ #pragma once +#include #include +#include #include "discord/activity.hpp" enum class MemberListRenderType : uint8_t { diff --git a/src/components/cellrendererpixbufanimation.cpp b/src/components/cellrendererpixbufanimation.cpp index d6f1f01..7983e0a 100644 --- a/src/components/cellrendererpixbufanimation.cpp +++ b/src/components/cellrendererpixbufanimation.cpp @@ -1,4 +1,6 @@ #include "cellrendererpixbufanimation.hpp" +#include +#include CellRendererPixbufAnimation::CellRendererPixbufAnimation() : Glib::ObjectBase(typeid(CellRendererPixbufAnimation)) diff --git a/src/components/cellrendererpixbufanimation.hpp b/src/components/cellrendererpixbufanimation.hpp index e7949c8..a9186bd 100644 --- a/src/components/cellrendererpixbufanimation.hpp +++ b/src/components/cellrendererpixbufanimation.hpp @@ -1,5 +1,8 @@ #pragma once #include +#include +#include +#include // handles both static and animated class CellRendererPixbufAnimation : public Gtk::CellRenderer { diff --git a/src/components/channels.cpp b/src/components/channels.cpp index 6ed3ca4..cafb8e0 100644 --- a/src/components/channels.cpp +++ b/src/components/channels.cpp @@ -3,6 +3,8 @@ #include #include #include +#include "abaddon.hpp" +#include "util.hpp" ChannelList::ChannelList() : Glib::ObjectBase(typeid(ChannelList)) diff --git a/src/components/channelscellrenderer.cpp b/src/components/channelscellrenderer.cpp index bf84a9b..35494ab 100644 --- a/src/components/channelscellrenderer.cpp +++ b/src/components/channelscellrenderer.cpp @@ -1,4 +1,6 @@ #include "channelscellrenderer.hpp" +#include +#include "abaddon.hpp" constexpr static int MentionsRightPad = 7; #ifndef M_PI diff --git a/src/components/channelscellrenderer.hpp b/src/components/channelscellrenderer.hpp index 934ce5b..e142b2a 100644 --- a/src/components/channelscellrenderer.hpp +++ b/src/components/channelscellrenderer.hpp @@ -1,7 +1,10 @@ #pragma once +#include +#include #include #include -#include +#include +#include #include "discord/snowflake.hpp" #include "discord/voicestateflags.hpp" #include "misc/bitwise.hpp" diff --git a/src/components/channeltabswitcherhandy.cpp b/src/components/channeltabswitcherhandy.cpp index 14c5c49..fa4fccc 100644 --- a/src/components/channeltabswitcherhandy.cpp +++ b/src/components/channeltabswitcherhandy.cpp @@ -1,6 +1,11 @@ #ifdef WITH_LIBHANDY - #include "channeltabswitcherhandy.hpp" +// clang-format off + +#include "channeltabswitcherhandy.hpp" +#include "abaddon.hpp" + +// clang-format on void selected_page_notify_cb(HdyTabView *view, GParamSpec *pspec, ChannelTabSwitcherHandy *switcher) { auto *page = hdy_tab_view_get_selected_page(view); diff --git a/src/components/channeltabswitcherhandy.hpp b/src/components/channeltabswitcherhandy.hpp index f5a31fa..86d1e73 100644 --- a/src/components/channeltabswitcherhandy.hpp +++ b/src/components/channeltabswitcherhandy.hpp @@ -1,10 +1,16 @@ #pragma once // perhaps this should be conditionally included within cmakelists? #ifdef WITH_LIBHANDY - #include - #include - #include "discord/snowflake.hpp" - #include "state.hpp" + +// clang-format off + +#include +#include +#include +#include "discord/snowflake.hpp" +#include "state.hpp" + +// clang-format off class ChannelData; diff --git a/src/components/chatinput.cpp b/src/components/chatinput.cpp index 1db03ed..1fcf628 100644 --- a/src/components/chatinput.cpp +++ b/src/components/chatinput.cpp @@ -1,7 +1,11 @@ #include "chatinput.hpp" +#include +#include +#include +#include "abaddon.hpp" #include "constants.hpp" #include "misc/events.hpp" -#include +#include "util.hpp" ChatInputText::ChatInputText() { get_style_context()->add_class("message-input"); diff --git a/src/components/chatinput.hpp b/src/components/chatinput.hpp index 231d67c..e5555fc 100644 --- a/src/components/chatinput.hpp +++ b/src/components/chatinput.hpp @@ -1,5 +1,14 @@ #pragma once +#include +#include +#include +#include +#include +#include +#include +#include #include "discord/chatsubmitparams.hpp" +#include "discord/message.hpp" #include "discord/permissions.hpp" class ChatInputAttachmentItem : public Gtk::EventBox { diff --git a/src/components/chatinputindicator.cpp b/src/components/chatinputindicator.cpp index 0611e71..51d2142 100644 --- a/src/components/chatinputindicator.cpp +++ b/src/components/chatinputindicator.cpp @@ -1,5 +1,8 @@ -#include #include "chatinputindicator.hpp" +#include +#include +#include "abaddon.hpp" +#include "util.hpp" constexpr static const int MaxUsersInIndicator = 4; diff --git a/src/components/chatinputindicator.hpp b/src/components/chatinputindicator.hpp index 5688393..0c070b2 100644 --- a/src/components/chatinputindicator.hpp +++ b/src/components/chatinputindicator.hpp @@ -1,5 +1,8 @@ #pragma once #include +#include +#include +#include #include "discord/message.hpp" #include "discord/user.hpp" diff --git a/src/components/chatlist.cpp b/src/components/chatlist.cpp index a656a43..3e22d72 100644 --- a/src/components/chatlist.cpp +++ b/src/components/chatlist.cpp @@ -1,4 +1,5 @@ #include "chatlist.hpp" +#include "abaddon.hpp" #include "chatmessage.hpp" #include "constants.hpp" diff --git a/src/components/chatlist.hpp b/src/components/chatlist.hpp index 9f12df9..21ead4c 100644 --- a/src/components/chatlist.hpp +++ b/src/components/chatlist.hpp @@ -1,6 +1,10 @@ #pragma once #include #include +#include +#include +#include +#include #include "discord/message.hpp" #include "discord/snowflake.hpp" diff --git a/src/components/chatmessage.cpp b/src/components/chatmessage.cpp index 05954da..8f2f519 100644 --- a/src/components/chatmessage.cpp +++ b/src/components/chatmessage.cpp @@ -1,8 +1,11 @@ #include "chatmessage.hpp" +#include +#include +#include "abaddon.hpp" #include "constants.hpp" #include "lazyimage.hpp" #include "misc/chatutil.hpp" -#include +#include "util.hpp" ChatMessageItemContainer::ChatMessageItemContainer() : m_main(Gtk::ORIENTATION_VERTICAL) { diff --git a/src/components/chatmessage.hpp b/src/components/chatmessage.hpp index 99fc872..8deea73 100644 --- a/src/components/chatmessage.hpp +++ b/src/components/chatmessage.hpp @@ -1,4 +1,10 @@ #pragma once +#include +#include +#include +#include +#include +#include #include "discord/discord.hpp" class ChatMessageItemContainer : public Gtk::EventBox { diff --git a/src/components/chatwindow.cpp b/src/components/chatwindow.cpp index 9a2493d..6a44d84 100644 --- a/src/components/chatwindow.cpp +++ b/src/components/chatwindow.cpp @@ -1,4 +1,5 @@ #include "chatwindow.hpp" +#include "abaddon.hpp" #include "chatinputindicator.hpp" #include "ratelimitindicator.hpp" #include "chatinput.hpp" diff --git a/src/components/chatwindow.hpp b/src/components/chatwindow.hpp index b3c9d41..f7493cd 100644 --- a/src/components/chatwindow.hpp +++ b/src/components/chatwindow.hpp @@ -1,6 +1,7 @@ #pragma once #include #include +#include #include "discord/discord.hpp" #include "discord/chatsubmitparams.hpp" #include "completer.hpp" diff --git a/src/components/completer.cpp b/src/components/completer.cpp index f6f0906..b858b5e 100644 --- a/src/components/completer.cpp +++ b/src/components/completer.cpp @@ -1,6 +1,8 @@ #include #include #include "completer.hpp" +#include "abaddon.hpp" +#include "util.hpp" constexpr const int CompleterHeight = 150; constexpr const int MaxCompleterEntries = 30; diff --git a/src/components/completer.hpp b/src/components/completer.hpp index d1b1d5f..ef801a2 100644 --- a/src/components/completer.hpp +++ b/src/components/completer.hpp @@ -1,5 +1,12 @@ #pragma once #include +#include +#include +#include +#include +#include +#include +#include #include "lazyimage.hpp" #include "discord/snowflake.hpp" diff --git a/src/components/draglistbox.cpp b/src/components/draglistbox.cpp index 50bb5b0..208b5de 100644 --- a/src/components/draglistbox.cpp +++ b/src/components/draglistbox.cpp @@ -1,4 +1,6 @@ #include "draglistbox.hpp" +#include +#include DragListBox::DragListBox() { drag_dest_set(m_entries, Gtk::DEST_DEFAULT_MOTION | Gtk::DEST_DEFAULT_DROP, Gdk::ACTION_MOVE); diff --git a/src/components/draglistbox.hpp b/src/components/draglistbox.hpp index 8890792..dc9e9f3 100644 --- a/src/components/draglistbox.hpp +++ b/src/components/draglistbox.hpp @@ -1,4 +1,5 @@ #pragma once +#include class DragListBox : public Gtk::ListBox { public: diff --git a/src/components/friendslist.cpp b/src/components/friendslist.cpp index 99fbafa..a1fab8d 100644 --- a/src/components/friendslist.cpp +++ b/src/components/friendslist.cpp @@ -1,5 +1,9 @@ #include "friendslist.hpp" +#include +#include +#include "abaddon.hpp" #include "lazyimage.hpp" +#include "util.hpp" using namespace std::string_literals; diff --git a/src/components/friendslist.hpp b/src/components/friendslist.hpp index c4056f0..9f2c025 100644 --- a/src/components/friendslist.hpp +++ b/src/components/friendslist.hpp @@ -1,4 +1,13 @@ #pragma once +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "discord/objects.hpp" class FriendsListAddComponent : public Gtk::Box { diff --git a/src/components/lazyimage.cpp b/src/components/lazyimage.cpp index 90b8f28..e1e873c 100644 --- a/src/components/lazyimage.cpp +++ b/src/components/lazyimage.cpp @@ -1,6 +1,8 @@ #include "lazyimage.hpp" #include +#include "abaddon.hpp" +#include "util.hpp" LazyImage::LazyImage(int w, int h, bool use_placeholder) : m_width(w) diff --git a/src/components/lazyimage.hpp b/src/components/lazyimage.hpp index 50db425..abf0120 100644 --- a/src/components/lazyimage.hpp +++ b/src/components/lazyimage.hpp @@ -1,4 +1,5 @@ #pragma once +#include // loads an image only when the widget is drawn for the first time class LazyImage : public Gtk::Image { diff --git a/src/components/memberlist.cpp b/src/components/memberlist.cpp index 7046b52..18048f5 100644 --- a/src/components/memberlist.cpp +++ b/src/components/memberlist.cpp @@ -1,5 +1,8 @@ #include "memberlist.hpp" +#include "abaddon.hpp" +#include "util.hpp" + constexpr static int MemberListUserLimit = 200; MemberList::MemberList() diff --git a/src/components/memberlist.hpp b/src/components/memberlist.hpp index 1c4aaf4..b134699 100644 --- a/src/components/memberlist.hpp +++ b/src/components/memberlist.hpp @@ -1,12 +1,14 @@ #pragma once +#include + #include +#include #include #include #include -#include - #include "cellrenderermemberlist.hpp" +#include "discord/user.hpp" #include "discord/snowflake.hpp" class MemberList { diff --git a/src/components/progressbar.cpp b/src/components/progressbar.cpp index 65abfae..d6e28c4 100644 --- a/src/components/progressbar.cpp +++ b/src/components/progressbar.cpp @@ -1,5 +1,7 @@ #include "progressbar.hpp" +#include "abaddon.hpp" + MessageUploadProgressBar::MessageUploadProgressBar() { get_style_context()->add_class("message-progress"); auto &discord = Abaddon::Get().GetDiscordClient(); diff --git a/src/components/progressbar.hpp b/src/components/progressbar.hpp index 8efb87a..a9f8099 100644 --- a/src/components/progressbar.hpp +++ b/src/components/progressbar.hpp @@ -1,5 +1,6 @@ #pragma once #include +#include class MessageUploadProgressBar : public Gtk::ProgressBar { public: diff --git a/src/components/ratelimitindicator.cpp b/src/components/ratelimitindicator.cpp index 426f18e..1eff305 100644 --- a/src/components/ratelimitindicator.cpp +++ b/src/components/ratelimitindicator.cpp @@ -1,6 +1,10 @@ #include "ratelimitindicator.hpp" + #include +#include "abaddon.hpp" +#include "util.hpp" + RateLimitIndicator::RateLimitIndicator() : Gtk::Box(Gtk::ORIENTATION_HORIZONTAL) { m_label.set_text(""); diff --git a/src/components/ratelimitindicator.hpp b/src/components/ratelimitindicator.hpp index c9b6d6e..9993317 100644 --- a/src/components/ratelimitindicator.hpp +++ b/src/components/ratelimitindicator.hpp @@ -1,6 +1,11 @@ #pragma once #include #include + +#include +#include +#include + #include "discord/message.hpp" class RateLimitIndicator : public Gtk::Box { diff --git a/src/components/voiceinfobox.cpp b/src/components/voiceinfobox.cpp index cecaa7d..b514cdc 100644 --- a/src/components/voiceinfobox.cpp +++ b/src/components/voiceinfobox.cpp @@ -1,8 +1,12 @@ #ifdef WITH_VOICE - #include "voiceinfobox.hpp" - #include "abaddon.hpp" - #include "util.hpp" +// clang-format off + +#include "voiceinfobox.hpp" +#include "abaddon.hpp" +#include "util.hpp" + +// clang-format on VoiceInfoBox::VoiceInfoBox() : Gtk::Box(Gtk::ORIENTATION_HORIZONTAL) diff --git a/src/components/voiceinfobox.hpp b/src/components/voiceinfobox.hpp index 9988c63..feeada7 100644 --- a/src/components/voiceinfobox.hpp +++ b/src/components/voiceinfobox.hpp @@ -2,10 +2,14 @@ #ifdef WITH_VOICE - #include - #include - #include - #include +// clang-format off + +#include +#include +#include +#include + +// clang-format on class VoiceInfoBox : public Gtk::Box { public: diff --git a/src/dialogs/confirm.hpp b/src/dialogs/confirm.hpp index 86feee7..7dba065 100644 --- a/src/dialogs/confirm.hpp +++ b/src/dialogs/confirm.hpp @@ -1,5 +1,8 @@ #pragma once +#include +#include + class ConfirmDialog : public Gtk::Dialog { public: ConfirmDialog(Gtk::Window &parent); diff --git a/src/dialogs/friendpicker.cpp b/src/dialogs/friendpicker.cpp index fe52b77..be59794 100644 --- a/src/dialogs/friendpicker.cpp +++ b/src/dialogs/friendpicker.cpp @@ -1,5 +1,7 @@ #include "friendpicker.hpp" +#include "abaddon.hpp" + FriendPickerDialog::FriendPickerDialog(Gtk::Window &parent) : Gtk::Dialog("Pick a friend", parent, true) , m_bbox(Gtk::ORIENTATION_HORIZONTAL) { diff --git a/src/dialogs/friendpicker.hpp b/src/dialogs/friendpicker.hpp index 9749dfa..a7a1476 100644 --- a/src/dialogs/friendpicker.hpp +++ b/src/dialogs/friendpicker.hpp @@ -1,4 +1,11 @@ #pragma once + +#include +#include +#include +#include +#include + #include "discord/snowflake.hpp" class FriendPickerDialog : public Gtk::Dialog { diff --git a/src/dialogs/setstatus.cpp b/src/dialogs/setstatus.cpp index 24f0b29..8ca8ccf 100644 --- a/src/dialogs/setstatus.cpp +++ b/src/dialogs/setstatus.cpp @@ -1,5 +1,7 @@ #include "setstatus.hpp" +#include "abaddon.hpp" + static const std::array feelings = { "wonderful", "splendiferous", diff --git a/src/dialogs/setstatus.hpp b/src/dialogs/setstatus.hpp index d4a015d..4bbb088 100644 --- a/src/dialogs/setstatus.hpp +++ b/src/dialogs/setstatus.hpp @@ -1,4 +1,9 @@ #pragma once + +#include +#include +#include + #include "discord/objects.hpp" class SetStatusDialog : public Gtk::Dialog { diff --git a/src/dialogs/textinput.hpp b/src/dialogs/textinput.hpp index 765240a..168fc42 100644 --- a/src/dialogs/textinput.hpp +++ b/src/dialogs/textinput.hpp @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + class TextInputDialog : public Gtk::Dialog { public: TextInputDialog(const Glib::ustring &prompt, const Glib::ustring &title, const Glib::ustring &placeholder, Gtk::Window &parent); diff --git a/src/dialogs/token.hpp b/src/dialogs/token.hpp index 9e691c9..1c11125 100644 --- a/src/dialogs/token.hpp +++ b/src/dialogs/token.hpp @@ -1,5 +1,7 @@ #pragma once -#include + +#include +#include class TokenDialog : public Gtk::Dialog { public: diff --git a/src/dialogs/verificationgate.cpp b/src/dialogs/verificationgate.cpp index 660ae30..9c9bcf9 100644 --- a/src/dialogs/verificationgate.cpp +++ b/src/dialogs/verificationgate.cpp @@ -1,5 +1,7 @@ #include "verificationgate.hpp" +#include "abaddon.hpp" + VerificationGateDialog::VerificationGateDialog(Gtk::Window &parent, Snowflake guild_id) : Gtk::Dialog("Verification Required", parent, true) , m_bbox(Gtk::ORIENTATION_HORIZONTAL) { diff --git a/src/dialogs/verificationgate.hpp b/src/dialogs/verificationgate.hpp index 537de3c..dead82f 100644 --- a/src/dialogs/verificationgate.hpp +++ b/src/dialogs/verificationgate.hpp @@ -1,5 +1,12 @@ #pragma once + #include + +#include +#include +#include +#include + #include "discord/objects.hpp" class VerificationGateDialog : public Gtk::Dialog { diff --git a/src/discord/activity.hpp b/src/discord/activity.hpp index 5b2c3ce..378354a 100644 --- a/src/discord/activity.hpp +++ b/src/discord/activity.hpp @@ -3,6 +3,7 @@ #include #include "json.hpp" #include "snowflake.hpp" +#include "misc/bitwise.hpp" enum class PresenceStatus : uint8_t { Online, diff --git a/src/discord/channel.cpp b/src/discord/channel.cpp index a7102ad..8b3ee19 100644 --- a/src/discord/channel.cpp +++ b/src/discord/channel.cpp @@ -1,5 +1,7 @@ #include "channel.hpp" +#include "abaddon.hpp" + void from_json(const nlohmann::json &j, ThreadMetadataData &m) { JS_D("archived", m.IsArchived); JS_D("auto_archive_duration", m.AutoArchiveDuration); diff --git a/src/discord/discord.cpp b/src/discord/discord.cpp index b69daea..385d6b7 100644 --- a/src/discord/discord.cpp +++ b/src/discord/discord.cpp @@ -1,8 +1,12 @@ #include "discord.hpp" -#include + #include #include +#include + +#include "abaddon.hpp" + using namespace std::string_literals; DiscordClient::DiscordClient(bool mem_store) diff --git a/src/discord/discord.hpp b/src/discord/discord.hpp index cb14a52..21eaa82 100644 --- a/src/discord/discord.hpp +++ b/src/discord/discord.hpp @@ -7,6 +7,7 @@ #include "voiceclient.hpp" #include "voicestateflags.hpp" #include "websocket.hpp" +#include #include #include #include @@ -21,7 +22,6 @@ #undef GetMessage #endif -class Abaddon; class DiscordClient { friend class Abaddon; diff --git a/src/discord/member.cpp b/src/discord/member.cpp index 2a8ae24..1a1aad8 100644 --- a/src/discord/member.cpp +++ b/src/discord/member.cpp @@ -1,5 +1,7 @@ #include "member.hpp" +#include "abaddon.hpp" + void from_json(const nlohmann::json &j, GuildMember &m) { JS_O("user", m.User); JS_ON("nick", m.Nickname); diff --git a/src/discord/message.cpp b/src/discord/message.cpp index 8a0e271..11335df 100644 --- a/src/discord/message.cpp +++ b/src/discord/message.cpp @@ -1,5 +1,7 @@ #include "message.hpp" +#include "abaddon.hpp" + void to_json(nlohmann::json &j, const EmbedFooterData &m) { j["text"] = m.Text; JS_IF("icon_url", m.IconURL); diff --git a/src/discord/role.cpp b/src/discord/role.cpp index 8a9ed50..456df95 100644 --- a/src/discord/role.cpp +++ b/src/discord/role.cpp @@ -1,5 +1,7 @@ #include "role.hpp" +#include + void from_json(const nlohmann::json &j, RoleData &m) { JS_D("id", m.ID); JS_D("name", m.Name); diff --git a/src/discord/snowflake.cpp b/src/discord/snowflake.cpp index 680d4da..43fe91e 100644 --- a/src/discord/snowflake.cpp +++ b/src/discord/snowflake.cpp @@ -1,8 +1,11 @@ #include "snowflake.hpp" + #include #include #include +#include "util.hpp" + constexpr static uint64_t DiscordEpochSeconds = 1420070400; const Snowflake Snowflake::Invalid = -1ULL; diff --git a/src/discord/user.cpp b/src/discord/user.cpp index 45d70e8..8129273 100644 --- a/src/discord/user.cpp +++ b/src/discord/user.cpp @@ -1,5 +1,7 @@ #include "user.hpp" +#include "abaddon.hpp" + bool UserData::IsPomelo() const noexcept { return Discriminator.size() == 1 && Discriminator[0] == '0'; } diff --git a/src/discord/voicestateflags.hpp b/src/discord/voicestateflags.hpp index e369001..01fb762 100644 --- a/src/discord/voicestateflags.hpp +++ b/src/discord/voicestateflags.hpp @@ -1,5 +1,6 @@ #pragma once #include +#include "misc/bitwise.hpp" enum class VoiceStateFlags : uint8_t { Clear = 0, diff --git a/src/discord/websocket.cpp b/src/discord/websocket.cpp index 0c79f25..565c94c 100644 --- a/src/discord/websocket.cpp +++ b/src/discord/websocket.cpp @@ -1,7 +1,11 @@ #include "websocket.hpp" -#include + #include +#include +#include + + Websocket::Websocket(const std::string &id) : m_close_info { 1000, "Normal", false } { if (m_log = spdlog::get(id); !m_log) { diff --git a/src/emojis.cpp b/src/emojis.cpp index 1952a7f..7e33949 100644 --- a/src/emojis.cpp +++ b/src/emojis.cpp @@ -1,7 +1,10 @@ #include "emojis.hpp" + #include #include +#include + #ifdef ABADDON_IS_BIG_ENDIAN /* Allows processing emojis.bin correctly on big-endian systems. */ int emojis_int32_correct_endian(int little_endian_in) { diff --git a/src/emojis.hpp b/src/emojis.hpp index 6ba590c..a41b8ac 100644 --- a/src/emojis.hpp +++ b/src/emojis.hpp @@ -1,9 +1,13 @@ #pragma once + #include #include #include #include +#include +#include + // shoutout to gtk for only supporting .svg's sometimes class EmojiResource { diff --git a/src/filecache.cpp b/src/filecache.cpp index b31b31a..a107714 100644 --- a/src/filecache.cpp +++ b/src/filecache.cpp @@ -1,6 +1,8 @@ #include "filecache.hpp" #include + +#include "abaddon.hpp" #include "MurmurHash3.h" std::string GetCachedName(const std::string &str) { diff --git a/src/filecache.hpp b/src/filecache.hpp index 52d1f42..6b6532f 100644 --- a/src/filecache.hpp +++ b/src/filecache.hpp @@ -8,6 +8,7 @@ #include #include #include +#include #include "http.hpp" class FileCacheWorkerThread { diff --git a/src/imgmanager.cpp b/src/imgmanager.cpp index 43793c0..013a591 100644 --- a/src/imgmanager.cpp +++ b/src/imgmanager.cpp @@ -2,6 +2,11 @@ #include +#include + +#include "abaddon.hpp" +#include "util.hpp" + ImageManager::ImageManager() { m_cb_dispatcher.connect(sigc::mem_fun(*this, &ImageManager::RunCallbacks)); } diff --git a/src/imgmanager.hpp b/src/imgmanager.hpp index 2eeb756..d0c57a6 100644 --- a/src/imgmanager.hpp +++ b/src/imgmanager.hpp @@ -1,8 +1,14 @@ #pragma once -#include -#include + #include #include +#include +#include + +#include +#include +#include + #include "filecache.hpp" class ImageManager { diff --git a/src/misc/chatutil.cpp b/src/misc/chatutil.cpp index e61d32b..f943f37 100644 --- a/src/misc/chatutil.cpp +++ b/src/misc/chatutil.cpp @@ -1,5 +1,8 @@ #include "chatutil.hpp" + +#include "abaddon.hpp" #include "constants.hpp" +#include "util.hpp" namespace ChatUtil { Glib::ustring GetText(const Glib::RefPtr &buf) { diff --git a/src/misc/events.hpp b/src/misc/events.hpp index d677eaa..e130c40 100644 --- a/src/misc/events.hpp +++ b/src/misc/events.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include // idk it wont let me forward declare namespace EventsUtil { diff --git a/src/notifications/notifications.cpp b/src/notifications/notifications.cpp index e95c1c0..1ab52a9 100644 --- a/src/notifications/notifications.cpp +++ b/src/notifications/notifications.cpp @@ -1,6 +1,8 @@ #include "notifications.hpp" -#include "misc/chatutil.hpp" + +#include "abaddon.hpp" #include "discord/message.hpp" +#include "misc/chatutil.hpp" Notifications::Notifications() { } diff --git a/src/notifications/notifications.hpp b/src/notifications/notifications.hpp index b4ea584..8de2c6e 100644 --- a/src/notifications/notifications.hpp +++ b/src/notifications/notifications.hpp @@ -1,8 +1,11 @@ #pragma once -#include "notifier.hpp" + #include #include +#include "discord/snowflake.hpp" +#include "notifier.hpp" + class Message; class Notifications { diff --git a/src/notifications/notifier_fallback.cpp b/src/notifications/notifier_fallback.cpp index 00e9d4a..8478fc7 100644 --- a/src/notifications/notifier_fallback.cpp +++ b/src/notifications/notifier_fallback.cpp @@ -1,5 +1,7 @@ #include "notifier.hpp" +#include "abaddon.hpp" + /* no actual notifications, just sounds GNotification has no win32 backend, and WinToast uses headers msys2 doesnt provide maybe it can be LoadLibrary'd in :s diff --git a/src/notifications/notifier_gio.cpp b/src/notifications/notifier_gio.cpp index 128167f..2708407 100644 --- a/src/notifications/notifier_gio.cpp +++ b/src/notifications/notifier_gio.cpp @@ -1,6 +1,9 @@ #include "notifier.hpp" + #include +#include "abaddon.hpp" + Notifier::Notifier() { #ifdef ENABLE_NOTIFICATION_SOUNDS if (ma_engine_init(nullptr, &m_engine) != MA_SUCCESS) { diff --git a/src/remoteauth/remoteauthclient.cpp b/src/remoteauth/remoteauthclient.cpp index 5103c8d..fb68888 100644 --- a/src/remoteauth/remoteauthclient.cpp +++ b/src/remoteauth/remoteauthclient.cpp @@ -3,10 +3,14 @@ // clang-format off #include "remoteauthclient.hpp" -#include "http.hpp" + #include #include +#include "abaddon.hpp" +#include "http.hpp" + + // clang-format on RemoteAuthClient::RemoteAuthClient() diff --git a/src/remoteauth/remoteauthclient.hpp b/src/remoteauth/remoteauthclient.hpp index 6ab6dbb..d911474 100644 --- a/src/remoteauth/remoteauthclient.hpp +++ b/src/remoteauth/remoteauthclient.hpp @@ -4,12 +4,17 @@ // clang-format off +#include #include #include + #include -#include "ssl.hpp" + +#include "discord/errors.hpp" +#include "discord/snowflake.hpp" #include "discord/waiter.hpp" #include "discord/websocket.hpp" +#include "ssl.hpp" // clang-format on diff --git a/src/remoteauth/remoteauthdialog.cpp b/src/remoteauth/remoteauthdialog.cpp index 7975b4e..aa0cf38 100644 --- a/src/remoteauth/remoteauthdialog.cpp +++ b/src/remoteauth/remoteauthdialog.cpp @@ -3,8 +3,12 @@ // clang-format off #include "remoteauthdialog.hpp" + +#include #include +#include "abaddon.hpp" + // clang-format on RemoteAuthDialog::RemoteAuthDialog(Gtk::Window &parent) diff --git a/src/remoteauth/remoteauthdialog.hpp b/src/remoteauth/remoteauthdialog.hpp index 465a188..b889b58 100644 --- a/src/remoteauth/remoteauthdialog.hpp +++ b/src/remoteauth/remoteauthdialog.hpp @@ -5,6 +5,9 @@ // clang-format off #include +#include +#include + #include "remoteauthclient.hpp" // clang-format on diff --git a/src/settings.cpp b/src/settings.cpp index 85464a5..0a08c8b 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -1,7 +1,10 @@ #include "settings.hpp" + #include #include + #include +#include #ifdef WITH_KEYCHAIN #include diff --git a/src/startup.cpp b/src/startup.cpp index b6d09a3..78c3b26 100644 --- a/src/startup.cpp +++ b/src/startup.cpp @@ -1,7 +1,10 @@ #include "startup.hpp" + #include #include +#include "abaddon.hpp" + DiscordStartupDialog::DiscordStartupDialog(Gtk::Window &window) : Gtk::MessageDialog(window, "", false, Gtk::MESSAGE_INFO, Gtk::BUTTONS_NONE, true) { m_dispatcher.connect(sigc::mem_fun(*this, &DiscordStartupDialog::DispatchCallback)); diff --git a/src/startup.hpp b/src/startup.hpp index 7c6830f..a0123e4 100644 --- a/src/startup.hpp +++ b/src/startup.hpp @@ -1,7 +1,10 @@ #pragma once -#include + #include +#include +#include + // fetch cookies, build number async class DiscordStartupDialog : public Gtk::MessageDialog { diff --git a/src/util.cpp b/src/util.cpp index ae948ea..09bb368 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -1,7 +1,11 @@ +#include "util.hpp" + #include #include #include +#include + void LaunchBrowser(const Glib::ustring &url) { GError *err = nullptr; if (!gtk_show_uri_on_window(nullptr, url.c_str(), GDK_CURRENT_TIME, &err)) diff --git a/src/windows/guildsettings/auditlogpane.cpp b/src/windows/guildsettings/auditlogpane.cpp index f2f4a17..42e817e 100644 --- a/src/windows/guildsettings/auditlogpane.cpp +++ b/src/windows/guildsettings/auditlogpane.cpp @@ -1,5 +1,10 @@ #include "auditlogpane.hpp" +#include + +#include "abaddon.hpp" +#include "util.hpp" + using namespace std::string_literals; GuildSettingsAuditLogPane::GuildSettingsAuditLogPane(Snowflake id) diff --git a/src/windows/guildsettings/auditlogpane.hpp b/src/windows/guildsettings/auditlogpane.hpp index dc44d8f..a3f2051 100644 --- a/src/windows/guildsettings/auditlogpane.hpp +++ b/src/windows/guildsettings/auditlogpane.hpp @@ -1,4 +1,8 @@ #pragma once + +#include +#include + #include "discord/objects.hpp" class GuildSettingsAuditLogPane : public Gtk::ScrolledWindow { diff --git a/src/windows/guildsettings/banspane.cpp b/src/windows/guildsettings/banspane.cpp index 68a232d..550114d 100644 --- a/src/windows/guildsettings/banspane.cpp +++ b/src/windows/guildsettings/banspane.cpp @@ -1,7 +1,8 @@ #include "banspane.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 +#include + +#include "abaddon.hpp" GuildSettingsBansPane::GuildSettingsBansPane(Snowflake id) : Gtk::Box(Gtk::ORIENTATION_VERTICAL) diff --git a/src/windows/guildsettings/banspane.hpp b/src/windows/guildsettings/banspane.hpp index d50b372..c0934b6 100644 --- a/src/windows/guildsettings/banspane.hpp +++ b/src/windows/guildsettings/banspane.hpp @@ -1,4 +1,11 @@ #pragma once + +#include +#include +#include +#include +#include + #include "discord/snowflake.hpp" #include "discord/ban.hpp" diff --git a/src/windows/guildsettings/emojispane.cpp b/src/windows/guildsettings/emojispane.cpp index fd0abd5..00f39ea 100644 --- a/src/windows/guildsettings/emojispane.cpp +++ b/src/windows/guildsettings/emojispane.cpp @@ -1,5 +1,11 @@ #include "emojispane.hpp" + +#include +#include + +#include "abaddon.hpp" #include "components/cellrendererpixbufanimation.hpp" +#include "util.hpp" GuildSettingsEmojisPane::GuildSettingsEmojisPane(Snowflake guild_id) : Gtk::Box(Gtk::ORIENTATION_VERTICAL) diff --git a/src/windows/guildsettings/emojispane.hpp b/src/windows/guildsettings/emojispane.hpp index 43676c2..3890ffb 100644 --- a/src/windows/guildsettings/emojispane.hpp +++ b/src/windows/guildsettings/emojispane.hpp @@ -1,4 +1,13 @@ #pragma once + +#include +#include +#include +#include +#include +#include +#include + #include "discord/emoji.hpp" class GuildSettingsEmojisPane : public Gtk::Box { diff --git a/src/windows/guildsettings/infopane.cpp b/src/windows/guildsettings/infopane.cpp index e52e27d..45a87a4 100644 --- a/src/windows/guildsettings/infopane.cpp +++ b/src/windows/guildsettings/infopane.cpp @@ -1,6 +1,14 @@ #include "infopane.hpp" + #include +#include +#include +#include + +#include "abaddon.hpp" +#include "util.hpp" + GuildSettingsInfoPane::GuildSettingsInfoPane(Snowflake id) : m_guild_name_label("Guild name") , GuildID(id) { diff --git a/src/windows/guildsettings/infopane.hpp b/src/windows/guildsettings/infopane.hpp index 4d4e87e..e531e8d 100644 --- a/src/windows/guildsettings/infopane.hpp +++ b/src/windows/guildsettings/infopane.hpp @@ -1,4 +1,12 @@ #pragma once + +#include +#include +#include +#include +#include +#include + #include "discord/guild.hpp" class GuildSettingsInfoPane : public Gtk::Grid { diff --git a/src/windows/guildsettings/invitespane.cpp b/src/windows/guildsettings/invitespane.cpp index a76b3f2..157f913 100644 --- a/src/windows/guildsettings/invitespane.cpp +++ b/src/windows/guildsettings/invitespane.cpp @@ -1,5 +1,10 @@ #include "invitespane.hpp" +#include + +#include "abaddon.hpp" +#include "util.hpp" + GuildSettingsInvitesPane::GuildSettingsInvitesPane(Snowflake id) : GuildID(id) , m_model(Gtk::ListStore::create(m_columns)) diff --git a/src/windows/guildsettings/invitespane.hpp b/src/windows/guildsettings/invitespane.hpp index 24086ca..ce05c31 100644 --- a/src/windows/guildsettings/invitespane.hpp +++ b/src/windows/guildsettings/invitespane.hpp @@ -1,4 +1,10 @@ #pragma once + +#include +#include +#include +#include + #include "discord/objects.hpp" class GuildSettingsInvitesPane : public Gtk::ScrolledWindow { diff --git a/src/windows/guildsettings/memberspane.cpp b/src/windows/guildsettings/memberspane.cpp index 8c613d0..a4acba1 100644 --- a/src/windows/guildsettings/memberspane.cpp +++ b/src/windows/guildsettings/memberspane.cpp @@ -1,5 +1,8 @@ #include "memberspane.hpp" +#include "abaddon.hpp" +#include "util.hpp" + GuildSettingsMembersPane::GuildSettingsMembersPane(Snowflake id) : Gtk::Box(Gtk::ORIENTATION_VERTICAL) , GuildID(id) diff --git a/src/windows/guildsettings/memberspane.hpp b/src/windows/guildsettings/memberspane.hpp index 3aa558a..72039e8 100644 --- a/src/windows/guildsettings/memberspane.hpp +++ b/src/windows/guildsettings/memberspane.hpp @@ -1,5 +1,15 @@ #pragma once + #include + +#include +#include +#include +#include +#include +#include +#include + #include "discord/member.hpp" #include "discord/guild.hpp" #include "components/lazyimage.hpp" diff --git a/src/windows/guildsettings/rolespane.cpp b/src/windows/guildsettings/rolespane.cpp index 25088d7..fcb34bd 100644 --- a/src/windows/guildsettings/rolespane.cpp +++ b/src/windows/guildsettings/rolespane.cpp @@ -1,5 +1,10 @@ #include "rolespane.hpp" +#include + +#include "abaddon.hpp" +#include "util.hpp" + GuildSettingsRolesPane::GuildSettingsRolesPane(Snowflake id) : Gtk::Box(Gtk::ORIENTATION_HORIZONTAL) , GuildID(id) diff --git a/src/windows/guildsettings/rolespane.hpp b/src/windows/guildsettings/rolespane.hpp index 82594d4..b374cc7 100644 --- a/src/windows/guildsettings/rolespane.hpp +++ b/src/windows/guildsettings/rolespane.hpp @@ -1,5 +1,16 @@ #pragma once + #include + +#include +#include +#include +#include +#include +#include +#include +#include + #include "discord/guild.hpp" #include "components/draglistbox.hpp" diff --git a/src/windows/guildsettingswindow.cpp b/src/windows/guildsettingswindow.cpp index 3f19100..ce390e0 100644 --- a/src/windows/guildsettingswindow.cpp +++ b/src/windows/guildsettingswindow.cpp @@ -1,5 +1,7 @@ #include "guildsettingswindow.hpp" +#include "abaddon.hpp" + GuildSettingsWindow::GuildSettingsWindow(Snowflake id) : m_main(Gtk::ORIENTATION_VERTICAL) , m_pane_info(id) diff --git a/src/windows/guildsettingswindow.hpp b/src/windows/guildsettingswindow.hpp index 0b1ab97..8d14a3b 100644 --- a/src/windows/guildsettingswindow.hpp +++ b/src/windows/guildsettingswindow.hpp @@ -1,4 +1,9 @@ #pragma once + +#include +#include +#include + #include "discord/snowflake.hpp" #include "guildsettings/infopane.hpp" #include "guildsettings/banspane.hpp" diff --git a/src/windows/mainwindow.cpp b/src/windows/mainwindow.cpp index 8e030ed..b0f22e3 100644 --- a/src/windows/mainwindow.cpp +++ b/src/windows/mainwindow.cpp @@ -1,5 +1,8 @@ #include "mainwindow.hpp" +#include "abaddon.hpp" +#include "util.hpp" + MainWindow::MainWindow() : m_main_box(Gtk::ORIENTATION_VERTICAL) , m_content_box(Gtk::ORIENTATION_HORIZONTAL) diff --git a/src/windows/pinnedwindow.cpp b/src/windows/pinnedwindow.cpp index 467c2e3..05435cb 100644 --- a/src/windows/pinnedwindow.cpp +++ b/src/windows/pinnedwindow.cpp @@ -1,5 +1,7 @@ #include "pinnedwindow.hpp" +#include "abaddon.hpp" + PinnedWindow::PinnedWindow(const ChannelData &data) : ChannelID(data.ID) { if (data.GuildID.has_value()) diff --git a/src/windows/pinnedwindow.hpp b/src/windows/pinnedwindow.hpp index dd90a77..69fdbe0 100644 --- a/src/windows/pinnedwindow.hpp +++ b/src/windows/pinnedwindow.hpp @@ -1,4 +1,7 @@ #pragma once + +#include + #include "discord/errors.hpp" #include "discord/channel.hpp" #include "discord/message.hpp" diff --git a/src/windows/profile/mutualfriendspane.cpp b/src/windows/profile/mutualfriendspane.cpp index 75fb4a6..612966f 100644 --- a/src/windows/profile/mutualfriendspane.cpp +++ b/src/windows/profile/mutualfriendspane.cpp @@ -1,5 +1,7 @@ #include "mutualfriendspane.hpp" +#include "abaddon.hpp" + MutualFriendItem::MutualFriendItem(const UserData &user) : Gtk::Box(Gtk::ORIENTATION_HORIZONTAL) { get_style_context()->add_class("mutual-friend-item"); diff --git a/src/windows/profile/mutualfriendspane.hpp b/src/windows/profile/mutualfriendspane.hpp index 5f2c964..3cd2fcb 100644 --- a/src/windows/profile/mutualfriendspane.hpp +++ b/src/windows/profile/mutualfriendspane.hpp @@ -1,4 +1,11 @@ #pragma once + +#include +#include +#include +#include +#include + #include "discord/objects.hpp" class MutualFriendItem : public Gtk::Box { diff --git a/src/windows/profile/mutualguildspane.cpp b/src/windows/profile/mutualguildspane.cpp index ff3f0c1..86d6619 100644 --- a/src/windows/profile/mutualguildspane.cpp +++ b/src/windows/profile/mutualguildspane.cpp @@ -1,5 +1,7 @@ #include "mutualguildspane.hpp" +#include "abaddon.hpp" + MutualGuildItem::MutualGuildItem(const MutualGuildData &guild) : Gtk::Box(Gtk::ORIENTATION_HORIZONTAL) , m_box(Gtk::ORIENTATION_VERTICAL) { diff --git a/src/windows/profile/mutualguildspane.hpp b/src/windows/profile/mutualguildspane.hpp index 33a4af9..0cd005b 100644 --- a/src/windows/profile/mutualguildspane.hpp +++ b/src/windows/profile/mutualguildspane.hpp @@ -1,4 +1,11 @@ #pragma once + +#include +#include +#include +#include +#include + #include "discord/objects.hpp" class MutualGuildItem : public Gtk::Box { diff --git a/src/windows/profile/userinfopane.cpp b/src/windows/profile/userinfopane.cpp index ab4f50f..dc96e0f 100644 --- a/src/windows/profile/userinfopane.cpp +++ b/src/windows/profile/userinfopane.cpp @@ -1,6 +1,12 @@ #include "userinfopane.hpp" + #include +#include + +#include "abaddon.hpp" +#include "util.hpp" + static std::string GetConnectionURL(const ConnectionData &conn) { if (conn.Type == "github") { return "https://github.com/" + conn.Name; diff --git a/src/windows/profile/userinfopane.hpp b/src/windows/profile/userinfopane.hpp index d83557b..7ac4c2b 100644 --- a/src/windows/profile/userinfopane.hpp +++ b/src/windows/profile/userinfopane.hpp @@ -1,4 +1,13 @@ #pragma once + +#include +#include +#include +#include +#include +#include +#include + #include "discord/objects.hpp" class ConnectionItem : public Gtk::EventBox { diff --git a/src/windows/profilewindow.cpp b/src/windows/profilewindow.cpp index 72996aa..8c4b67f 100644 --- a/src/windows/profilewindow.cpp +++ b/src/windows/profilewindow.cpp @@ -1,5 +1,8 @@ #include "profilewindow.hpp" +#include "abaddon.hpp" +#include "util.hpp" + ProfileWindow::ProfileWindow(Snowflake user_id) : ID(user_id) , m_main(Gtk::ORIENTATION_VERTICAL) diff --git a/src/windows/profilewindow.hpp b/src/windows/profilewindow.hpp index fbc30e0..4d71392 100644 --- a/src/windows/profilewindow.hpp +++ b/src/windows/profilewindow.hpp @@ -1,4 +1,9 @@ #pragma once + +#include +#include +#include + #include "discord/snowflake.hpp" #include "profile/userinfopane.hpp" #include "profile/mutualguildspane.hpp" diff --git a/src/windows/threadswindow.cpp b/src/windows/threadswindow.cpp index 247edf6..81046d2 100644 --- a/src/windows/threadswindow.cpp +++ b/src/windows/threadswindow.cpp @@ -1,5 +1,7 @@ #include "threadswindow.hpp" +#include "abaddon.hpp" + ThreadsWindow::ThreadsWindow(const ChannelData &channel) : m_channel_id(channel.ID) , m_filter_public(m_group, "Public") diff --git a/src/windows/threadswindow.hpp b/src/windows/threadswindow.hpp index f644e35..3ef01fc 100644 --- a/src/windows/threadswindow.hpp +++ b/src/windows/threadswindow.hpp @@ -1,4 +1,16 @@ #pragma once + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include "discord/objects.hpp" class ActiveThreadsList : public Gtk::ScrolledWindow { diff --git a/src/windows/voicesettingswindow.cpp b/src/windows/voicesettingswindow.cpp index c114c04..90d0717 100644 --- a/src/windows/voicesettingswindow.cpp +++ b/src/windows/voicesettingswindow.cpp @@ -2,10 +2,11 @@ // clang-format off -#include "voicesettingswindow.hpp" +#include + #include "abaddon.hpp" #include "audio/manager.hpp" -#include +#include "voicesettingswindow.hpp" // clang-format on diff --git a/src/windows/voicesettingswindow.hpp b/src/windows/voicesettingswindow.hpp index 9b3498e..5e5e0fb 100644 --- a/src/windows/voicesettingswindow.hpp +++ b/src/windows/voicesettingswindow.hpp @@ -6,6 +6,7 @@ #include #include #include +#include #include // clang-format on diff --git a/src/windows/voicewindow.cpp b/src/windows/voicewindow.cpp index 825681c..94ea700 100644 --- a/src/windows/voicewindow.cpp +++ b/src/windows/voicewindow.cpp @@ -2,11 +2,12 @@ // clang-format off -#include "voicewindow.hpp" -#include "components/lazyimage.hpp" #include "abaddon.hpp" #include "audio/manager.hpp" +#include "components/lazyimage.hpp" #include "voicesettingswindow.hpp" +#include "voicewindow.hpp" + // clang-format on class VoiceWindowUserListEntry : public Gtk::ListBoxRow { diff --git a/src/windows/voicewindow.hpp b/src/windows/voicewindow.hpp index 02e006f..018934b 100644 --- a/src/windows/voicewindow.hpp +++ b/src/windows/voicewindow.hpp @@ -6,7 +6,7 @@ #include "discord/snowflake.hpp" #include #include -#include +#include #include #include #include