refactored Channel

src/widgets/AttachedWindow.cpp

@@ -84,7 +84,7 @@ AttachedWindow *AttachedWindow::get(void *target, const GetArgs &args)
     }
 
     if (show) {
-        window->updateWindowRect_(window->target_);
+        window->updateWindowRect(window->target_);
         window->show();
     }
 
@@ -107,10 +107,10 @@ void AttachedWindow::setChannel(ChannelPtr channel)
 
 void AttachedWindow::showEvent(QShowEvent *)
 {
-    this->attachToHwnd_(this->target_);
+    this->attachToHwnd(this->target_);
 }
 
-void AttachedWindow::attachToHwnd_(void *_attachedPtr)
+void AttachedWindow::attachToHwnd(void *_attachedPtr)
 {
 #ifdef USEWINSDK
     if (this->attached_) {
@@ -145,13 +145,13 @@ void AttachedWindow::attachToHwnd_(void *_attachedPtr)
             this->validProcessName_ = true;
         }
 
-        this->updateWindowRect_(attached);
+        this->updateWindowRect(attached);
     });
     this->timer_.start();
 #endif
 }
 
-void AttachedWindow::updateWindowRect_(void *_attachedPtr)
+void AttachedWindow::updateWindowRect(void *_attachedPtr)
 {
 #ifdef USEWINSDK
     auto hwnd = HWND(this->winId());

src/widgets/AttachedWindow.hpp

@@ -47,8 +47,8 @@ private:
         Split *split;
     } ui_;
 
-    void attachToHwnd_(void *attached);
-    void updateWindowRect_(void *attached);
+    void attachToHwnd(void *attached);
+    void updateWindowRect(void *attached);
 
     struct Item {
         void *hwnd;

src/widgets/dialogs/EmotePopup.cpp

@@ -54,7 +54,7 @@ void EmotePopup::loadChannel(ChannelPtr _channel)
         return;
     }
 
-    ChannelPtr emoteChannel(new Channel("", Channel::None));
+    ChannelPtr emoteChannel(new Channel("", Channel::Type::None));
 
     auto addEmotes = [&](EmoteMap &map, const QString &title, const QString &emoteDesc) {
         // TITLE
@@ -134,7 +134,7 @@ void EmotePopup::loadEmojis()
 {
     auto &emojis = getApp()->emotes->emojis.emojis;
 
-    ChannelPtr emojiChannel(new Channel("", Channel::None));
+    ChannelPtr emojiChannel(new Channel("", Channel::Type::None));
 
     // title
     MessageBuilder builder1;

src/widgets/dialogs/LogsPopup.cpp

@@ -39,7 +39,7 @@ void LogsPopup::setInfo(ChannelPtr channel, QString userName)
 
 void LogsPopup::setMessages(std::vector<MessagePtr> &messages)
 {
-    ChannelPtr logsChannel(new Channel("logs", Channel::Misc));
+    ChannelPtr logsChannel(new Channel("logs", Channel::Type::Misc));
 
     logsChannel->addMessagesAtStart(messages);
     this->channelView_->setChannel(logsChannel);
@@ -68,7 +68,7 @@ void LogsPopup::getLogviewerLogs()
     req.getJSON([this, channelName](QJsonObject &data) {
 
         std::vector<MessagePtr> messages;
-        ChannelPtr logsChannel(new Channel("logs", Channel::None));
+        ChannelPtr logsChannel(new Channel("logs", Channel::Type::None));
 
         QJsonValue before = data.value("before");
 

src/widgets/dialogs/NotificationPopup.cpp

@@ -10,7 +10,7 @@ namespace chatterino {
 
 NotificationPopup::NotificationPopup()
     : BaseWindow((QWidget *)nullptr, BaseWindow::Frameless)
-    , channel(std::make_shared<Channel>("notifications", Channel::None))
+    , channel(std::make_shared<Channel>("notifications", Channel::Type::None))
 
 {
     this->channelView = new ChannelView(this);

src/widgets/dialogs/SelectChannelDialog.cpp

@@ -151,20 +151,20 @@ void SelectChannelDialog::setSelectedChannel(IndirectChannel _channel)
     this->selectedChannel = channel;
 
     switch (_channel.getType()) {
-        case Channel::Twitch: {
+        case Channel::Type::Twitch: {
             this->ui_.notebook->selectIndex(TAB_TWITCH);
             this->ui_.twitch.channel->setFocus();
             this->ui_.twitch.channelName->setText(channel->name);
         } break;
-        case Channel::TwitchWatching: {
+        case Channel::Type::TwitchWatching: {
             this->ui_.notebook->selectIndex(TAB_TWITCH);
             this->ui_.twitch.watching->setFocus();
         } break;
-        case Channel::TwitchMentions: {
+        case Channel::Type::TwitchMentions: {
             this->ui_.notebook->selectIndex(TAB_TWITCH);
             this->ui_.twitch.mentions->setFocus();
         } break;
-        case Channel::TwitchWhispers: {
+        case Channel::Type::TwitchWhispers: {
             this->ui_.notebook->selectIndex(TAB_TWITCH);
             this->ui_.twitch.whispers->setFocus();
         } break;

src/widgets/helper/SearchPopup.cpp

@@ -71,7 +71,7 @@ void SearchPopup::performSearch()
 {
     QString text = searchInput->text();
 
-    ChannelPtr channel(new Channel("search", Channel::None));
+    ChannelPtr channel(new Channel("search", Channel::Type::None));
 
     for (size_t i = 0; i < this->snapshot.getLength(); i++) {
         MessagePtr message = this->snapshot[i];

src/widgets/settingspages/LookPage.cpp

@@ -272,7 +272,7 @@ void LookPage::addLastReadMessageIndicatorPatternSelector(LayoutCreator<QVBoxLay
 
 ChannelPtr LookPage::createPreviewChannel()
 {
-    auto channel = ChannelPtr(new Channel("preview", Channel::Misc));
+    auto channel = ChannelPtr(new Channel("preview", Channel::Type::Misc));
 
     {
         auto message = MessagePtr(new Message());

src/widgets/splits/SplitHeader.cpp

@@ -311,7 +311,7 @@ void SplitHeader::updateChannelText()
 
     QString title = channel->name;
 
-    if (indirectChannel.getType() == Channel::TwitchWatching) {
+    if (indirectChannel.getType() == Channel::Type::TwitchWatching) {
         title = "watching: " + (title.isEmpty() ? "none" : title);
     }