From 9d21df8e1bca9ccfa1bcfcde3bc8f35473866166 Mon Sep 17 00:00:00 2001 From: Dylam De La Torre Date: Tue, 16 Nov 2021 20:38:14 +0100 Subject: Fix warnings shown by GCC (#47) * fix all warnings shown by GCC --- windows/guildsettings/banspane.cpp | 4 ++-- windows/guildsettings/emojispane.cpp | 3 +-- windows/guildsettings/infopane.cpp | 4 ++-- windows/guildsettings/invitespane.cpp | 2 -- windows/guildsettings/memberspane.cpp | 10 +++++----- windows/guildsettings/rolespane.cpp | 4 ++-- windows/guildsettingswindow.cpp | 8 ++++---- windows/mainwindow.cpp | 1 - windows/profile/userinfopane.cpp | 6 +++--- windows/threadswindow.cpp | 6 +++--- 10 files changed, 22 insertions(+), 26 deletions(-) (limited to 'windows') diff --git a/windows/guildsettings/banspane.cpp b/windows/guildsettings/banspane.cpp index 4c3d52f..0fede20 100644 --- a/windows/guildsettings/banspane.cpp +++ b/windows/guildsettings/banspane.cpp @@ -7,9 +7,9 @@ GuildSettingsBansPane::GuildSettingsBansPane(Snowflake id) : Gtk::Box(Gtk::ORIENTATION_VERTICAL) , GuildID(id) + , m_model(Gtk::ListStore::create(m_columns)) , m_menu_unban("Unban") - , m_menu_copy_id("Copy ID") - , m_model(Gtk::ListStore::create(m_columns)) { + , m_menu_copy_id("Copy ID") { signal_map().connect(sigc::mem_fun(*this, &GuildSettingsBansPane::OnMap)); set_name("guild-bans-pane"); set_hexpand(true); diff --git a/windows/guildsettings/emojispane.cpp b/windows/guildsettings/emojispane.cpp index 94a4d0a..e64f60d 100644 --- a/windows/guildsettings/emojispane.cpp +++ b/windows/guildsettings/emojispane.cpp @@ -7,8 +7,8 @@ GuildSettingsEmojisPane::GuildSettingsEmojisPane(Snowflake guild_id) , GuildID(guild_id) , m_model(Gtk::ListStore::create(m_columns)) , m_filter(Gtk::TreeModelFilter::create(m_model)) - , m_menu_copy_id("Copy ID") , m_menu_delete("Delete") + , m_menu_copy_id("Copy ID") , m_menu_copy_emoji_url("Copy Emoji URL") , m_menu_show_emoji("Open in Browser") { signal_map().connect(sigc::mem_fun(*this, &GuildSettingsEmojisPane::OnMap)); @@ -31,7 +31,6 @@ GuildSettingsEmojisPane::GuildSettingsEmojisPane(Snowflake guild_id) m_menu.show_all(); auto &discord = Abaddon::Get().GetDiscordClient(); - auto &img = Abaddon::Get().GetImageManager(); discord.signal_guild_emojis_update().connect(sigc::hide<0>(sigc::mem_fun(*this, &GuildSettingsEmojisPane::OnFetchEmojis))); diff --git a/windows/guildsettings/infopane.cpp b/windows/guildsettings/infopane.cpp index 85aabe1..d75def1 100644 --- a/windows/guildsettings/infopane.cpp +++ b/windows/guildsettings/infopane.cpp @@ -3,9 +3,9 @@ #include GuildSettingsInfoPane::GuildSettingsInfoPane(Snowflake id) - : GuildID(id) + : m_guild_icon_label("Guild icon") , m_guild_name_label("Guild name") - , m_guild_icon_label("Guild icon") { + , GuildID(id) { auto &discord = Abaddon::Get().GetDiscordClient(); const auto guild = *discord.GetGuild(id); const auto self_id = discord.GetUserData().ID; diff --git a/windows/guildsettings/invitespane.cpp b/windows/guildsettings/invitespane.cpp index 707a6d6..20f5258 100644 --- a/windows/guildsettings/invitespane.cpp +++ b/windows/guildsettings/invitespane.cpp @@ -49,7 +49,6 @@ void GuildSettingsInvitesPane::OnMap() { } void GuildSettingsInvitesPane::AppendInvite(const InviteData &invite) { - auto &discord = Abaddon::Get().GetDiscordClient(); auto row = *m_model->append(); row[m_columns.m_col_code] = invite.Code; if (invite.Inviter.has_value()) @@ -77,7 +76,6 @@ void GuildSettingsInvitesPane::OnInviteFetch(const std::optional &in } void GuildSettingsInvitesPane::OnInvitesFetch(const std::vector &invites) { - auto &discord = Abaddon::Get().GetDiscordClient(); for (const auto &invite : invites) AppendInvite(invite); } diff --git a/windows/guildsettings/memberspane.cpp b/windows/guildsettings/memberspane.cpp index 8e5c29c..e5fcce5 100644 --- a/windows/guildsettings/memberspane.cpp +++ b/windows/guildsettings/memberspane.cpp @@ -3,10 +3,10 @@ GuildSettingsMembersPane::GuildSettingsMembersPane(Snowflake id) : Gtk::Box(Gtk::ORIENTATION_VERTICAL) + , GuildID(id) , m_layout(Gtk::ORIENTATION_HORIZONTAL) , m_member_list(id) - , m_member_info(id) - , GuildID(id) { + , m_member_info(id) { set_name("guild-members-pane"); set_hexpand(true); set_vexpand(true); @@ -158,9 +158,9 @@ void GuildSettingsMembersListItem::UpdateColor() { } GuildSettingsMembersPaneInfo::GuildSettingsMembersPaneInfo(Snowflake guild_id) - : m_box(Gtk::ORIENTATION_VERTICAL) - , GuildID(guild_id) - , m_roles(guild_id) { + : GuildID(guild_id) + , m_roles(guild_id) + , m_box(Gtk::ORIENTATION_VERTICAL) { get_style_context()->add_class("guild-members-pane-info"); const auto label = [](Gtk::Label &lbl) { diff --git a/windows/guildsettings/rolespane.cpp b/windows/guildsettings/rolespane.cpp index 24c4d78..b2f5b35 100644 --- a/windows/guildsettings/rolespane.cpp +++ b/windows/guildsettings/rolespane.cpp @@ -57,8 +57,8 @@ GuildSettingsRolesPaneRoles::GuildSettingsRolesPaneRoles(Snowflake guild_id) auto &discord = Abaddon::Get().GetDiscordClient(); const auto num_rows = m_list.get_children().size(); const auto new_pos = num_rows - new_index - 1; - if (row->RoleID == GuildID) return true; // moving role @everyone - if (new_index == num_rows) return true; // trying to move row below @everyone + if (row->RoleID == GuildID) return true; // moving role @everyone + if (static_cast(new_index) == num_rows) return true; // trying to move row below @everyone // make sure it wont modify a neighbor role u dont have perms to modify if (!discord.CanModifyRole(GuildID, row->RoleID)) return false; const auto cb = [this](DiscordError code) { diff --git a/windows/guildsettingswindow.cpp b/windows/guildsettingswindow.cpp index 8836575..bf0160b 100644 --- a/windows/guildsettingswindow.cpp +++ b/windows/guildsettingswindow.cpp @@ -3,14 +3,14 @@ GuildSettingsWindow::GuildSettingsWindow(Snowflake id) : m_main(Gtk::ORIENTATION_VERTICAL) - , GuildID(id) , m_pane_info(id) + , m_pane_members(id) + , m_pane_roles(id) , m_pane_bans(id) , m_pane_invites(id) + , m_pane_emojis(id) , m_pane_audit_log(id) - , m_pane_members(id) - , m_pane_roles(id) - , m_pane_emojis(id) { + , GuildID(id) { auto &discord = Abaddon::Get().GetDiscordClient(); const auto guild = *discord.GetGuild(id); diff --git a/windows/mainwindow.cpp b/windows/mainwindow.cpp index 77a936f..61ebbfa 100644 --- a/windows/mainwindow.cpp +++ b/windows/mainwindow.cpp @@ -179,7 +179,6 @@ void MainWindow::UpdateChatWindowContents() { } void MainWindow::UpdateChatActiveChannel(Snowflake id) { - auto &discord = Abaddon::Get().GetDiscordClient(); m_chat.SetActiveChannel(id); m_members.SetActiveChannel(id); m_channel_list.SetActiveChannel(id); diff --git a/windows/profile/userinfopane.cpp b/windows/profile/userinfopane.cpp index 33e04ef..bfeb4ed 100644 --- a/windows/profile/userinfopane.cpp +++ b/windows/profile/userinfopane.cpp @@ -3,8 +3,8 @@ #include "../../abaddon.hpp" ConnectionItem::ConnectionItem(const ConnectionData &conn) - : m_name(conn.Name) - , m_box(Gtk::ORIENTATION_HORIZONTAL) { + : m_box(Gtk::ORIENTATION_HORIZONTAL) + , m_name(conn.Name) { Glib::RefPtr pixbuf; try { pixbuf = Gdk::Pixbuf::create_from_file(Abaddon::GetResPath("/" + conn.Type + ".png"), 32, 32); @@ -97,7 +97,7 @@ void ConnectionsContainer::SetConnections(const std::vector &con "facebook" }; - for (int i = 0; i < connections.size(); i++) { + for (size_t i = 0; i < connections.size(); i++) { const auto &conn = connections[i]; if (supported_services.find(conn.Type) == supported_services.end()) continue; auto widget = Gtk::manage(new ConnectionItem(conn)); diff --git a/windows/threadswindow.cpp b/windows/threadswindow.cpp index 1bfb326..b4cbac7 100644 --- a/windows/threadswindow.cpp +++ b/windows/threadswindow.cpp @@ -3,11 +3,11 @@ ThreadsWindow::ThreadsWindow(const ChannelData &channel) : m_channel_id(channel.ID) + , m_filter_public(m_group, "Public") + , m_filter_private(m_group, "Private") , m_box(Gtk::ORIENTATION_VERTICAL) , m_active(channel, sigc::mem_fun(*this, &ThreadsWindow::ListFilterFunc)) - , m_archived(channel, sigc::mem_fun(*this, &ThreadsWindow::ListFilterFunc)) - , m_filter_public(m_group, "Public") - , m_filter_private(m_group, "Private") { + , m_archived(channel, sigc::mem_fun(*this, &ThreadsWindow::ListFilterFunc)) { set_name("threads-window"); set_default_size(450, 375); set_title("#" + *channel.Name + " - Threads"); -- cgit v1.2.3