chatterino2
Code Issues

refactored Channel

Browse Source
This commit is contained in:
fourtf
2018-07-06 17:30:12 +02:00
parent b639604a47
commit aa3df2e6d8
14 changed files with 55 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widgets/dialogs/EmotePopup.cpp
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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
+4 -4
View File
@@ -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;