clean up some unnecessary stuff

12 files changed, 20 insertions, 33 deletions

diff --git a/windows/guildsettings/auditlogpane.cpp b/windows/guildsettings/auditlogpane.cpp
index 02fd557..5745d17 100644
--- a/windows/guildsettings/auditlogpane.cpp
+++ b/windows/guildsettings/auditlogpane.cpp
@@ -5,6 +5,7 @@ using namespace std::string_literals;
 
 GuildSettingsAuditLogPane::GuildSettingsAuditLogPane(Snowflake id)
     : GuildID(id) {
+    signal_map().connect(sigc::mem_fun(*this, &GuildSettingsAuditLogPane::OnMap));
     set_name("guild-audit-log-pane");
     set_hexpand(true);
     set_vexpand(true);
@@ -14,7 +15,7 @@ GuildSettingsAuditLogPane::GuildSettingsAuditLogPane(Snowflake id)
     add(m_list);
 }
 
-void GuildSettingsAuditLogPane::on_switched_to() {
+void GuildSettingsAuditLogPane::OnMap() {
     if (m_requested) return;
     m_requested = true;
 
diff --git a/windows/guildsettings/auditlogpane.hpp b/windows/guildsettings/auditlogpane.hpp
index 9421e22..89749aa 100644
--- a/windows/guildsettings/auditlogpane.hpp
+++ b/windows/guildsettings/auditlogpane.hpp
@@ -1,14 +1,13 @@
 #pragma once
 #include <gtkmm.h>
-#include "../../components//inotifyswitched.hpp"
 #include "../../discord/objects.hpp"
 
-class GuildSettingsAuditLogPane : public Gtk::ScrolledWindow, public INotifySwitched {
+class GuildSettingsAuditLogPane : public Gtk::ScrolledWindow {
 public:
     GuildSettingsAuditLogPane(Snowflake id);
 
 private:
-    void on_switched_to() override;
+    void OnMap();
 
     bool m_requested = false;
 
diff --git a/windows/guildsettings/banspane.cpp b/windows/guildsettings/banspane.cpp
index f75e8d6..65366b4 100644
--- a/windows/guildsettings/banspane.cpp
+++ b/windows/guildsettings/banspane.cpp
@@ -10,6 +10,7 @@ GuildSettingsBansPane::GuildSettingsBansPane(Snowflake id)
     , m_menu_unban("Unban")
     , m_menu_copy_id("Copy ID")
     , m_model(Gtk::ListStore::create(m_columns)) {
+    signal_map().connect(sigc::mem_fun(*this, &GuildSettingsBansPane::OnMap));
     set_name("guild-bans-pane");
     set_hexpand(true);
     set_vexpand(true);
@@ -54,7 +55,7 @@ GuildSettingsBansPane::GuildSettingsBansPane(Snowflake id)
     m_view.append_column("Reason", m_columns.m_col_reason);
 }
 
-void GuildSettingsBansPane::on_switched_to() {
+void GuildSettingsBansPane::OnMap() {
     if (m_requested) return;
     m_requested = true;
 
diff --git a/windows/guildsettings/banspane.hpp b/windows/guildsettings/banspane.hpp
index 39fef78..ead118e 100644
--- a/windows/guildsettings/banspane.hpp
+++ b/windows/guildsettings/banspane.hpp
@@ -1,15 +1,14 @@
 #pragma once
 #include <gtkmm.h>
-#include "../../components/inotifyswitched.hpp"
 #include "../../discord/snowflake.hpp"
 #include "../../discord/ban.hpp"
 
-class GuildSettingsBansPane : public Gtk::Box, public INotifySwitched {
+class GuildSettingsBansPane : public Gtk::Box {
 public:
     GuildSettingsBansPane(Snowflake id);
 
 private:
-    void on_switched_to() override;
+    void OnMap();
 
     bool m_requested = false;
 
diff --git a/windows/guildsettings/emojispane.cpp b/windows/guildsettings/emojispane.cpp
index ecee64e..7a88938 100644
--- a/windows/guildsettings/emojispane.cpp
+++ b/windows/guildsettings/emojispane.cpp
@@ -11,6 +11,7 @@ GuildSettingsEmojisPane::GuildSettingsEmojisPane(Snowflake guild_id)
     , m_menu_delete("Delete")
     , m_menu_copy_emoji_url("Copy Emoji URL")
     , m_menu_show_emoji("Open in Browser") {
+    signal_map().connect(sigc::mem_fun(*this, &GuildSettingsEmojisPane::OnMap));
     set_name("guild-emojis-pane");
 
     m_view_scroll.set_hexpand(true);
@@ -97,7 +98,7 @@ GuildSettingsEmojisPane::GuildSettingsEmojisPane(Snowflake guild_id)
         column->set_resizable(true);
 }
 
-void GuildSettingsEmojisPane::on_switched_to() {
+void GuildSettingsEmojisPane::OnMap() {
     m_view.grab_focus();
 
     if (m_requested) return;
diff --git a/windows/guildsettings/emojispane.hpp b/windows/guildsettings/emojispane.hpp
index 806babb..19203c7 100644
--- a/windows/guildsettings/emojispane.hpp
+++ b/windows/guildsettings/emojispane.hpp
@@ -1,15 +1,13 @@
 #pragma once
 #include <gtkmm.h>
-#include "../../components/inotifyswitched.hpp"
 #include "../../discord/emoji.hpp"
 
-class GuildSettingsEmojisPane : public Gtk::Box
-    , public INotifySwitched {
+class GuildSettingsEmojisPane : public Gtk::Box {
 public:
     GuildSettingsEmojisPane(Snowflake guild_id);
 
 private:
-    void on_switched_to() override;
+    void OnMap();
 
     bool m_requested = false;
 
diff --git a/windows/guildsettings/invitespane.cpp b/windows/guildsettings/invitespane.cpp
index 70e193f..9b23377 100644
--- a/windows/guildsettings/invitespane.cpp
+++ b/windows/guildsettings/invitespane.cpp
@@ -5,6 +5,7 @@ GuildSettingsInvitesPane::GuildSettingsInvitesPane(Snowflake id)
     : GuildID(id)
     , m_model(Gtk::ListStore::create(m_columns))
     , m_menu_delete("Delete") {
+    signal_map().connect(sigc::mem_fun(*this, &GuildSettingsInvitesPane::OnMap));
     set_name("guild-invites-pane");
     set_hexpand(true);
     set_vexpand(true);
@@ -36,7 +37,7 @@ GuildSettingsInvitesPane::GuildSettingsInvitesPane(Snowflake id)
         column->set_resizable(true);
 }
 
-void GuildSettingsInvitesPane::on_switched_to() {
+void GuildSettingsInvitesPane::OnMap() {
     if (m_requested) return;
     m_requested = true;
 
diff --git a/windows/guildsettings/invitespane.hpp b/windows/guildsettings/invitespane.hpp
index b9d1255..577e195 100644
--- a/windows/guildsettings/invitespane.hpp
+++ b/windows/guildsettings/invitespane.hpp
@@ -1,14 +1,13 @@
 #pragma once
 #include <gtkmm.h>
-#include "../../components/inotifyswitched.hpp"
 #include "../../discord/objects.hpp"
 
-class GuildSettingsInvitesPane : public Gtk::ScrolledWindow, public INotifySwitched {
+class GuildSettingsInvitesPane : public Gtk::ScrolledWindow {
 public:
     GuildSettingsInvitesPane(Snowflake id);
 
 private:
-    void on_switched_to() override;
+    void OnMap();
 
     bool m_requested = false;
 
diff --git a/windows/guildsettingswindow.cpp b/windows/guildsettingswindow.cpp
index e3b66f7..8836575 100644
--- a/windows/guildsettingswindow.cpp
+++ b/windows/guildsettingswindow.cpp
@@ -1,6 +1,5 @@
 #include "guildsettingswindow.hpp"
 #include "../abaddon.hpp"
-#include "../components/inotifyswitched.hpp"
 
 GuildSettingsWindow::GuildSettingsWindow(Snowflake id)
     : m_main(Gtk::ORIENTATION_VERTICAL)
@@ -42,11 +41,6 @@ GuildSettingsWindow::GuildSettingsWindow(Snowflake id)
     m_switcher.set_margin_top(10);
     m_switcher.show();
 
-    m_stack.property_visible_child().signal_changed().connect([this]() {
-        if (auto *w = dynamic_cast<INotifySwitched *>(m_stack.property_visible_child().get_value()))
-            w->on_switched_to();
-    });
-
     m_pane_info.show();
     m_pane_members.show();
     m_pane_roles.show();
diff --git a/windows/profile/mutualfriendspane.cpp b/windows/profile/mutualfriendspane.cpp
index 7d30453..5e6120a 100644
--- a/windows/profile/mutualfriendspane.cpp
+++ b/windows/profile/mutualfriendspane.cpp
@@ -34,6 +34,7 @@ MutualFriendItem::MutualFriendItem(const UserData &user)
 
 MutualFriendsPane::MutualFriendsPane(Snowflake id)
     : UserID(id) {
+    signal_map().connect(sigc::mem_fun(*this, &MutualFriendsPane::OnMap));
     add(m_list);
     show_all_children();
 }
@@ -49,7 +50,7 @@ void MutualFriendsPane::OnFetchRelationships(const std::vector<UserData> &users)
     }
 }
 
-void MutualFriendsPane::on_switched_to() {
+void MutualFriendsPane::OnMap() {
     if (m_requested) return;
     m_requested = true;
 
diff --git a/windows/profile/mutualfriendspane.hpp b/windows/profile/mutualfriendspane.hpp
index 10daa39..764dee9 100644
--- a/windows/profile/mutualfriendspane.hpp
+++ b/windows/profile/mutualfriendspane.hpp
@@ -1,6 +1,5 @@
 #pragma once
 #include <gtkmm.h>
-#include "../../components/inotifyswitched.hpp"
 #include "../../discord/objects.hpp"
 
 class MutualFriendItem : public Gtk::Box {
@@ -12,14 +11,14 @@ private:
     Gtk::Label m_name;
 };
 
-class MutualFriendsPane : public Gtk::ScrolledWindow, public INotifySwitched {
+class MutualFriendsPane : public Gtk::ScrolledWindow {
 public:
     MutualFriendsPane(Snowflake id);
 
     Snowflake UserID;
 
 private:
-    void on_switched_to() override;
+    void OnMap();
 
     bool m_requested = false;
 
diff --git a/windows/profilewindow.cpp b/windows/profilewindow.cpp
index 2e41692..d0fefc7 100644
--- a/windows/profilewindow.cpp
+++ b/windows/profilewindow.cpp
@@ -1,6 +1,5 @@
 #include "profilewindow.hpp"
 #include "../abaddon.hpp"
-#include "../components/inotifyswitched.hpp"
 
 ProfileWindow::ProfileWindow(Snowflake user_id)
     : ID(user_id)
@@ -71,11 +70,6 @@ ProfileWindow::ProfileWindow(Snowflake user_id)
     m_switcher.set_halign(Gtk::ALIGN_START);
     m_switcher.set_hexpand(true);
 
-    m_stack.property_visible_child().signal_changed().connect([this]() {
-        if (auto *w = dynamic_cast<INotifySwitched *>(m_stack.property_visible_child().get_value()))
-            w->on_switched_to();
-    });
-
     m_stack.add(m_pane_info, "info", "User Info");
     m_stack.add(m_pane_guilds, "guilds", "Mutual Servers");
     m_stack.add(m_pane_friends, "friends", "Mutual Friends");