summaryrefslogtreecommitdiff
path: root/windows/guildsettings
diff options
context:
space:
mode:
authorDylam De La Torre <DyXel04@gmail.com>2021-11-16 20:38:14 +0100
committerGitHub <noreply@github.com>2021-11-16 19:38:14 +0000
commit9d21df8e1bca9ccfa1bcfcde3bc8f35473866166 (patch)
tree5d2ea9d83bd779f325c1c48728fc9ac5832cdc5e /windows/guildsettings
parent108002248c0739078302e00d5ca224a44b93ea56 (diff)
downloadabaddon-portaudio-9d21df8e1bca9ccfa1bcfcde3bc8f35473866166.tar.gz
abaddon-portaudio-9d21df8e1bca9ccfa1bcfcde3bc8f35473866166.zip
Fix warnings shown by GCC (#47)
* fix all warnings shown by GCC
Diffstat (limited to 'windows/guildsettings')
-rw-r--r--windows/guildsettings/banspane.cpp4
-rw-r--r--windows/guildsettings/emojispane.cpp3
-rw-r--r--windows/guildsettings/infopane.cpp4
-rw-r--r--windows/guildsettings/invitespane.cpp2
-rw-r--r--windows/guildsettings/memberspane.cpp10
-rw-r--r--windows/guildsettings/rolespane.cpp4
6 files changed, 12 insertions, 15 deletions
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 <filesystem>
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<InviteData> &in
}
void GuildSettingsInvitesPane::OnInvitesFetch(const std::vector<InviteData> &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<size_t>(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) {