chatterino2
Code Issues

changed notation

Browse Source
This commit is contained in:
fourtf
2017-01-18 04:33:30 +01:00
parent 552e4c957a
commit 10e4a0f785
61 changed files with 1214 additions and 1051 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels.cpp
+15 -15
View File
@@ -1,22 +1,22 @@
#include "channels.h"
#include "ircmanager.h"
Channel Channels::m_whispers(QString("/whispers"));
Channel Channels::m_mentions(QString("/mentions"));
Channel Channels::m_empty(QString(""));
Channel Channels::whispers(QString("/whispers"));
Channel Channels::mentions(QString("/mentions"));
Channel Channels::empty(QString(""));
QMap<QString, std::tuple<Channel *, int>> Channels::m_channels;
QMap<QString, std::tuple<Channel *, int>> Channels::channels;
Channel *
Channels::addChannel(const QString &channel)
{
QString c = channel.toLower();
auto a = m_channels.find(c);
auto a = Channels::channels.find(c);
if (a == m_channels.end()) {
if (a == Channels::channels.end()) {
auto _c = new Channel(c);
m_channels.insert(c, std::tuple<Channel *, int>(_c, 1));
Channels::channels.insert(c, std::tuple<Channel *, int>(_c, 1));
IrcManager::joinChannel(c);
@@ -35,19 +35,19 @@ Channels::getChannel(const QString &channel)
if (channel.length() > 1 && channel.at(0) == '/') {
if (c == "/whispers") {
return &m_whispers;
return &Channels::whispers;
}
if (c == "/mentions") {
return &m_mentions;
return &Channels::mentions;
}
return &m_empty;
return &Channels::empty;
}
auto a = m_channels.find(c);
auto a = Channels::channels.find(c);
if (a == m_channels.end()) {
if (a == Channels::channels.end()) {
return NULL;
}
@@ -63,9 +63,9 @@ Channels::removeChannel(const QString &channel)
QString c = channel.toLower();
auto a = m_channels.find(c);
auto a = Channels::channels.find(c);
if (a == m_channels.end()) {
if (a == Channels::channels.end()) {
return;
}
@@ -73,7 +73,7 @@ Channels::removeChannel(const QString &channel)
if (std::get<1>(a.value()) == 0) {
IrcManager::partChannel(c);
m_channels.remove(c);
Channels::channels.remove(c);
delete std::get<0>(a.value());
}
}