diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 00d16c3f..af6067cf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -774,6 +774,7 @@ else () -Wno-strict-aliasing -Werror=return-type + -Werror=reorder ) if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") diff --git a/src/providers/twitch/TwitchIrcServer.cpp b/src/providers/twitch/TwitchIrcServer.cpp index b052134d..2526898c 100644 --- a/src/providers/twitch/TwitchIrcServer.cpp +++ b/src/providers/twitch/TwitchIrcServer.cpp @@ -30,8 +30,8 @@ namespace chatterino { TwitchIrcServer::TwitchIrcServer() : whispersChannel(new Channel("/whispers", Channel::Type::TwitchWhispers)) , mentionsChannel(new Channel("/mentions", Channel::Type::TwitchMentions)) - , watchingChannel(Channel::getEmpty(), Channel::Type::TwitchWatching) , liveChannel(new Channel("/live", Channel::Type::TwitchLive)) + , watchingChannel(Channel::getEmpty(), Channel::Type::TwitchWatching) { this->initializeIrc(); diff --git a/src/widgets/helper/ChannelView.cpp b/src/widgets/helper/ChannelView.cpp index 54837c8d..a7d3ad4a 100644 --- a/src/widgets/helper/ChannelView.cpp +++ b/src/widgets/helper/ChannelView.cpp @@ -122,8 +122,8 @@ namespace { ChannelView::ChannelView(BaseWidget *parent, Split *split, Context context) : BaseWidget(parent) - , scrollBar_(new Scrollbar(this)) , split_(split) + , scrollBar_(new Scrollbar(this)) , context_(context) { this->setMouseTracking(true);