* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
+#include "network.h"
+
#include <algorithm>
#include <QTextCodec>
-#include "network.h"
#include "peer.h"
-QTextCodec *Network::_defaultCodecForServer = nullptr;
-QTextCodec *Network::_defaultCodecForEncoding = nullptr;
-QTextCodec *Network::_defaultCodecForDecoding = nullptr;
+QTextCodec* Network::_defaultCodecForServer = nullptr;
+QTextCodec* Network::_defaultCodecForEncoding = nullptr;
+QTextCodec* Network::_defaultCodecForDecoding = nullptr;
// ====================
// Public:
// ====================
-Network::Network(const NetworkId &networkid, QObject *parent)
- : SyncableObject(parent),
- _proxy(nullptr),
- _networkId(networkid),
- _identity(0),
- _myNick(QString()),
- _latency(0),
- _networkName(QString("<not initialized>")),
- _currentServer(QString()),
- _connected(false),
- _connectionState(Disconnected),
- _prefixes(QString()),
- _prefixModes(QString()),
- _useRandomServer(false),
- _useAutoIdentify(false),
- _useSasl(false),
- _useAutoReconnect(false),
- _autoReconnectInterval(60),
- _autoReconnectRetries(10),
- _unlimitedReconnectRetries(false),
- _useCustomMessageRate(false),
- _messageRateBurstSize(5),
- _messageRateDelay(2200),
- _unlimitedMessageRate(false),
- _codecForServer(nullptr),
- _codecForEncoding(nullptr),
- _codecForDecoding(nullptr),
- _autoAwayActive(false)
+Network::Network(const NetworkId& networkid, QObject* parent)
+ : SyncableObject(parent)
+ , _proxy(nullptr)
+ , _networkId(networkid)
+ , _identity(0)
+ , _myNick(QString())
+ , _latency(0)
+ , _networkName(QString("<not initialized>"))
+ , _currentServer(QString())
+ , _connected(false)
+ , _connectionState(Disconnected)
+ , _prefixes(QString())
+ , _prefixModes(QString())
+ , _useRandomServer(false)
+ , _useAutoIdentify(false)
+ , _useSasl(false)
+ , _useAutoReconnect(false)
+ , _autoReconnectInterval(60)
+ , _autoReconnectRetries(10)
+ , _unlimitedReconnectRetries(false)
+ , _useCustomMessageRate(false)
+ , _messageRateBurstSize(5)
+ , _messageRateDelay(2200)
+ , _unlimitedMessageRate(false)
+ , _codecForServer(nullptr)
+ , _codecForEncoding(nullptr)
+ , _codecForDecoding(nullptr)
+ , _autoAwayActive(false)
{
setObjectName(QString::number(networkid.toInt()));
}
-
Network::~Network()
{
emit aboutToBeDestroyed();
}
-
-bool Network::isChannelName(const QString &channelname) const
+bool Network::isChannelName(const QString& channelname) const
{
if (channelname.isEmpty())
return false;
return QString("#&!+").contains(channelname[0]);
}
-
-bool Network::isStatusMsg(const QString &target) const
+bool Network::isStatusMsg(const QString& target) const
{
if (target.isEmpty())
return false;
return QString("@+").contains(target[0]);
}
-
NetworkInfo Network::networkInfo() const
{
NetworkInfo info;
return info;
}
-
-void Network::setNetworkInfo(const NetworkInfo &info)
+void Network::setNetworkInfo(const NetworkInfo& info)
{
// we don't set our ID!
- if (!info.networkName.isEmpty() && info.networkName != networkName()) setNetworkName(info.networkName);
- if (info.identity > 0 && info.identity != identity()) setIdentity(info.identity);
- if (info.codecForServer != codecForServer()) setCodecForServer(QTextCodec::codecForName(info.codecForServer));
- if (info.codecForEncoding != codecForEncoding()) setCodecForEncoding(QTextCodec::codecForName(info.codecForEncoding));
- if (info.codecForDecoding != codecForDecoding()) setCodecForDecoding(QTextCodec::codecForName(info.codecForDecoding));
- if (info.serverList.count()) setServerList(toVariantList(info.serverList)); // FIXME compare components
- if (info.useRandomServer != useRandomServer()) setUseRandomServer(info.useRandomServer);
- if (info.perform != perform()) setPerform(info.perform);
- if (info.useAutoIdentify != useAutoIdentify()) setUseAutoIdentify(info.useAutoIdentify);
- if (info.autoIdentifyService != autoIdentifyService()) setAutoIdentifyService(info.autoIdentifyService);
- if (info.autoIdentifyPassword != autoIdentifyPassword()) setAutoIdentifyPassword(info.autoIdentifyPassword);
- if (info.useSasl != useSasl()) setUseSasl(info.useSasl);
- if (info.saslAccount != saslAccount()) setSaslAccount(info.saslAccount);
- if (info.saslPassword != saslPassword()) setSaslPassword(info.saslPassword);
- if (info.useAutoReconnect != useAutoReconnect()) setUseAutoReconnect(info.useAutoReconnect);
- if (info.autoReconnectInterval != autoReconnectInterval()) setAutoReconnectInterval(info.autoReconnectInterval);
- if (info.autoReconnectRetries != autoReconnectRetries()) setAutoReconnectRetries(info.autoReconnectRetries);
- if (info.unlimitedReconnectRetries != unlimitedReconnectRetries()) setUnlimitedReconnectRetries(info.unlimitedReconnectRetries);
- if (info.rejoinChannels != rejoinChannels()) setRejoinChannels(info.rejoinChannels);
+ if (!info.networkName.isEmpty() && info.networkName != networkName())
+ setNetworkName(info.networkName);
+ if (info.identity > 0 && info.identity != identity())
+ setIdentity(info.identity);
+ if (info.codecForServer != codecForServer())
+ setCodecForServer(QTextCodec::codecForName(info.codecForServer));
+ if (info.codecForEncoding != codecForEncoding())
+ setCodecForEncoding(QTextCodec::codecForName(info.codecForEncoding));
+ if (info.codecForDecoding != codecForDecoding())
+ setCodecForDecoding(QTextCodec::codecForName(info.codecForDecoding));
+ if (info.serverList.count())
+ setServerList(toVariantList(info.serverList)); // FIXME compare components
+ if (info.useRandomServer != useRandomServer())
+ setUseRandomServer(info.useRandomServer);
+ if (info.perform != perform())
+ setPerform(info.perform);
+ if (info.useAutoIdentify != useAutoIdentify())
+ setUseAutoIdentify(info.useAutoIdentify);
+ if (info.autoIdentifyService != autoIdentifyService())
+ setAutoIdentifyService(info.autoIdentifyService);
+ if (info.autoIdentifyPassword != autoIdentifyPassword())
+ setAutoIdentifyPassword(info.autoIdentifyPassword);
+ if (info.useSasl != useSasl())
+ setUseSasl(info.useSasl);
+ if (info.saslAccount != saslAccount())
+ setSaslAccount(info.saslAccount);
+ if (info.saslPassword != saslPassword())
+ setSaslPassword(info.saslPassword);
+ if (info.useAutoReconnect != useAutoReconnect())
+ setUseAutoReconnect(info.useAutoReconnect);
+ if (info.autoReconnectInterval != autoReconnectInterval())
+ setAutoReconnectInterval(info.autoReconnectInterval);
+ if (info.autoReconnectRetries != autoReconnectRetries())
+ setAutoReconnectRetries(info.autoReconnectRetries);
+ if (info.unlimitedReconnectRetries != unlimitedReconnectRetries())
+ setUnlimitedReconnectRetries(info.unlimitedReconnectRetries);
+ if (info.rejoinChannels != rejoinChannels())
+ setRejoinChannels(info.rejoinChannels);
// Custom rate limiting
if (info.useCustomMessageRate != useCustomMessageRate())
setUseCustomMessageRate(info.useCustomMessageRate);
setUnlimitedMessageRate(info.unlimitedMessageRate);
}
-
-QString Network::prefixToMode(const QString &prefix) const
+QString Network::prefixToMode(const QString& prefix) const
{
if (prefixes().contains(prefix))
return QString(prefixModes()[prefixes().indexOf(prefix)]);
return QString();
}
-
-QString Network::modeToPrefix(const QString &mode) const
+QString Network::modeToPrefix(const QString& mode) const
{
if (prefixModes().contains(mode))
return QString(prefixes()[prefixModes().indexOf(mode)]);
return QString();
}
-
-QString Network::sortPrefixModes(const QString &modes) const
+QString Network::sortPrefixModes(const QString& modes) const
{
// If modes is empty or we don't have any modes, nothing can be sorted, bail out early
if (modes.isEmpty() || prefixModes().isEmpty()) {
// Sort modes as if a QChar array
// See https://en.cppreference.com/w/cpp/algorithm/sort
// Defining lambda with [&] implicitly captures variables by reference
- std::sort(sortedModes.begin(), sortedModes.end(), [&](const QChar &lmode, const QChar &rmode) {
+ std::sort(sortedModes.begin(), sortedModes.end(), [&](const QChar& lmode, const QChar& rmode) {
// Compare characters according to prefix modes
// Return true if lmode comes before rmode (is "less than")
if (!prefixModes().contains(lmode)) {
// Left mode not in prefix list, send to end
return false;
- } else if (!prefixModes().contains(rmode)) {
+ }
+ else if (!prefixModes().contains(rmode)) {
// Right mode not in prefix list, send to end
return true;
- } else {
+ }
+ else {
// Both characters known, sort according to index in prefixModes()
return (prefixModes().indexOf(lmode) < prefixModes().indexOf(rmode));
}
return sortedModes;
}
-
QStringList Network::nicks() const
{
// we don't use _ircUsers.keys() since the keys may be
// not up to date after a nick change
QStringList nicks;
- foreach(IrcUser *ircuser, _ircUsers.values()) {
+ foreach (IrcUser* ircuser, _ircUsers.values()) {
nicks << ircuser->nick();
}
return nicks;
}
-
QString Network::prefixes() const
{
if (_prefixes.isNull())
return _prefixes;
}
-
QString Network::prefixModes() const
{
if (_prefixModes.isNull())
return _prefixModes;
}
-
// example Unreal IRCD: CHANMODES=beI,kfL,lj,psmntirRcOAQKVCuzNSMTG
-Network::ChannelModeType Network::channelModeType(const QString &mode)
+Network::ChannelModeType Network::channelModeType(const QString& mode)
{
if (mode.isEmpty())
return NOT_A_CHANMODE;
return modeType;
}
-
-QString Network::support(const QString ¶m) const
+QString Network::support(const QString& param) const
{
QString support_ = param.toUpper();
if (_supports.contains(support_))
return QString();
}
-
-bool Network::saslMaybeSupports(const QString &saslMechanism) const
+bool Network::saslMaybeSupports(const QString& saslMechanism) const
{
if (!capAvailable(IrcCap::SASL)) {
// If SASL's not advertised at all, it's likely the mechanism isn't supported, as per specs.
// reduce the risk of breaking existing setups.
// See: http://ircv3.net/specs/extensions/sasl-3.1.html
// And: http://ircv3.net/specs/extensions/sasl-3.2.html
- return (saslCapValue.length() == 0)
- || (saslCapValue.contains(saslMechanism, Qt::CaseInsensitive));
+ return (saslCapValue.length() == 0) || (saslCapValue.contains(saslMechanism, Qt::CaseInsensitive));
}
-
-IrcUser *Network::newIrcUser(const QString &hostmask, const QVariantMap &initData)
+IrcUser* Network::newIrcUser(const QString& hostmask, const QVariantMap& initData)
{
QString nick(nickFromMask(hostmask).toLower());
if (!_ircUsers.contains(nick)) {
- IrcUser *ircuser = ircUserFactory(hostmask);
+ IrcUser* ircuser = ircUserFactory(hostmask);
if (!initData.isEmpty()) {
ircuser->fromVariantMap(initData);
ircuser->setInitialized();
return _ircUsers[nick];
}
-
-IrcUser *Network::ircUser(QString nickname) const
+IrcUser* Network::ircUser(QString nickname) const
{
nickname = nickname.toLower();
if (_ircUsers.contains(nickname))
return nullptr;
}
-
-void Network::removeIrcUser(IrcUser *ircuser)
+void Network::removeIrcUser(IrcUser* ircuser)
{
QString nick = _ircUsers.key(ircuser);
if (nick.isNull())
ircuser->deleteLater();
}
-
-void Network::removeIrcChannel(IrcChannel *channel)
+void Network::removeIrcChannel(IrcChannel* channel)
{
QString chanName = _ircChannels.key(channel);
if (chanName.isNull())
channel->deleteLater();
}
-
void Network::removeChansAndUsers()
{
- QList<IrcUser *> users = ircUsers();
+ QList<IrcUser*> users = ircUsers();
_ircUsers.clear();
- QList<IrcChannel *> channels = ircChannels();
+ QList<IrcChannel*> channels = ircChannels();
_ircChannels.clear();
qDeleteAll(users);
qDeleteAll(channels);
}
-
-IrcChannel *Network::newIrcChannel(const QString &channelname, const QVariantMap &initData)
+IrcChannel* Network::newIrcChannel(const QString& channelname, const QVariantMap& initData)
{
if (!_ircChannels.contains(channelname.toLower())) {
- IrcChannel *channel = ircChannelFactory(channelname);
+ IrcChannel* channel = ircChannelFactory(channelname);
if (!initData.isEmpty()) {
channel->fromVariantMap(initData);
channel->setInitialized();
return _ircChannels[channelname.toLower()];
}
-
-IrcChannel *Network::ircChannel(QString channelname) const
+IrcChannel* Network::ircChannel(QString channelname) const
{
channelname = channelname.toLower();
if (_ircChannels.contains(channelname))
return nullptr;
}
-
QByteArray Network::defaultCodecForServer()
{
if (_defaultCodecForServer)
return QByteArray();
}
-
-void Network::setDefaultCodecForServer(const QByteArray &name)
+void Network::setDefaultCodecForServer(const QByteArray& name)
{
_defaultCodecForServer = QTextCodec::codecForName(name);
}
-
QByteArray Network::defaultCodecForEncoding()
{
if (_defaultCodecForEncoding)
return QByteArray();
}
-
-void Network::setDefaultCodecForEncoding(const QByteArray &name)
+void Network::setDefaultCodecForEncoding(const QByteArray& name)
{
_defaultCodecForEncoding = QTextCodec::codecForName(name);
}
-
QByteArray Network::defaultCodecForDecoding()
{
if (_defaultCodecForDecoding)
return QByteArray();
}
-
-void Network::setDefaultCodecForDecoding(const QByteArray &name)
+void Network::setDefaultCodecForDecoding(const QByteArray& name)
{
_defaultCodecForDecoding = QTextCodec::codecForName(name);
}
-
QByteArray Network::codecForServer() const
{
if (_codecForServer)
return QByteArray();
}
-
-void Network::setCodecForServer(const QByteArray &name)
+void Network::setCodecForServer(const QByteArray& name)
{
setCodecForServer(QTextCodec::codecForName(name));
}
-
-void Network::setCodecForServer(QTextCodec *codec)
+void Network::setCodecForServer(QTextCodec* codec)
{
_codecForServer = codec;
QByteArray codecName = codecForServer();
emit configChanged();
}
-
QByteArray Network::codecForEncoding() const
{
if (_codecForEncoding)
return QByteArray();
}
-
-void Network::setCodecForEncoding(const QByteArray &name)
+void Network::setCodecForEncoding(const QByteArray& name)
{
setCodecForEncoding(QTextCodec::codecForName(name));
}
-
-void Network::setCodecForEncoding(QTextCodec *codec)
+void Network::setCodecForEncoding(QTextCodec* codec)
{
_codecForEncoding = codec;
QByteArray codecName = codecForEncoding();
emit configChanged();
}
-
QByteArray Network::codecForDecoding() const
{
if (_codecForDecoding)
return _codecForDecoding->name();
- else return QByteArray();
+ else
+ return QByteArray();
}
-
-void Network::setCodecForDecoding(const QByteArray &name)
+void Network::setCodecForDecoding(const QByteArray& name)
{
setCodecForDecoding(QTextCodec::codecForName(name));
}
-
-void Network::setCodecForDecoding(QTextCodec *codec)
+void Network::setCodecForDecoding(QTextCodec* codec)
{
_codecForDecoding = codec;
QByteArray codecName = codecForDecoding();
emit configChanged();
}
-
// FIXME use server encoding if appropriate
-QString Network::decodeString(const QByteArray &text) const
+QString Network::decodeString(const QByteArray& text) const
{
if (_codecForDecoding)
return ::decodeString(text, _codecForDecoding);
- else return ::decodeString(text, _defaultCodecForDecoding);
+ else
+ return ::decodeString(text, _defaultCodecForDecoding);
}
-
-QByteArray Network::encodeString(const QString &string) const
+QByteArray Network::encodeString(const QString& string) const
{
if (_codecForEncoding) {
return _codecForEncoding->fromUnicode(string);
return string.toLatin1();
}
-
-QString Network::decodeServerString(const QByteArray &text) const
+QString Network::decodeServerString(const QByteArray& text) const
{
if (_codecForServer)
return ::decodeString(text, _codecForServer);
return ::decodeString(text, _defaultCodecForServer);
}
-
-QByteArray Network::encodeServerString(const QString &string) const
+QByteArray Network::encodeServerString(const QString& string) const
{
if (_codecForServer) {
return _codecForServer->fromUnicode(string);
return string.toLatin1();
}
-
// ====================
// Public Slots:
// ====================
-void Network::setNetworkName(const QString &networkName)
+void Network::setNetworkName(const QString& networkName)
{
_networkName = networkName;
SYNC(ARG(networkName))
emit configChanged();
}
-
-void Network::setCurrentServer(const QString ¤tServer)
+void Network::setCurrentServer(const QString& currentServer)
{
_currentServer = currentServer;
SYNC(ARG(currentServer))
emit currentServerSet(currentServer);
}
-
void Network::setConnected(bool connected)
{
if (_connected == connected)
emit connectedSet(connected);
}
-
-//void Network::setConnectionState(ConnectionState state) {
+// void Network::setConnectionState(ConnectionState state) {
void Network::setConnectionState(int state)
{
_connectionState = (ConnectionState)state;
- //qDebug() << "netstate" << networkId() << networkName() << state;
+ // qDebug() << "netstate" << networkId() << networkName() << state;
SYNC(ARG(state))
emit connectionStateSet(_connectionState);
}
-
-void Network::setMyNick(const QString &nickname)
+void Network::setMyNick(const QString& nickname)
{
_myNick = nickname;
if (!_myNick.isEmpty() && !ircUser(myNick())) {
emit myNickSet(nickname);
}
-
void Network::setLatency(int latency)
{
if (_latency == latency)
SYNC(ARG(latency))
}
-
void Network::setIdentity(IdentityId id)
{
_identity = id;
emit configChanged();
}
-
-void Network::setServerList(const QVariantList &serverList)
+void Network::setServerList(const QVariantList& serverList)
{
_serverList = fromVariantList<Server>(serverList);
SYNC(ARG(serverList))
emit configChanged();
}
-
void Network::setUseRandomServer(bool use)
{
_useRandomServer = use;
emit configChanged();
}
-
-void Network::setPerform(const QStringList &perform)
+void Network::setPerform(const QStringList& perform)
{
_perform = perform;
SYNC(ARG(perform))
emit configChanged();
}
-
void Network::setUseAutoIdentify(bool use)
{
_useAutoIdentify = use;
emit configChanged();
}
-
-void Network::setAutoIdentifyService(const QString &service)
+void Network::setAutoIdentifyService(const QString& service)
{
_autoIdentifyService = service;
SYNC(ARG(service))
emit configChanged();
}
-
-void Network::setAutoIdentifyPassword(const QString &password)
+void Network::setAutoIdentifyPassword(const QString& password)
{
_autoIdentifyPassword = password;
SYNC(ARG(password))
emit configChanged();
}
-
void Network::setUseSasl(bool use)
{
_useSasl = use;
emit configChanged();
}
-
-void Network::setSaslAccount(const QString &account)
+void Network::setSaslAccount(const QString& account)
{
_saslAccount = account;
SYNC(ARG(account))
emit configChanged();
}
-
-void Network::setSaslPassword(const QString &password)
+void Network::setSaslPassword(const QString& password)
{
_saslPassword = password;
SYNC(ARG(password))
emit configChanged();
}
-
void Network::setUseAutoReconnect(bool use)
{
_useAutoReconnect = use;
emit configChanged();
}
-
void Network::setAutoReconnectInterval(quint32 interval)
{
_autoReconnectInterval = interval;
emit configChanged();
}
-
void Network::setAutoReconnectRetries(quint16 retries)
{
_autoReconnectRetries = retries;
emit configChanged();
}
-
void Network::setUnlimitedReconnectRetries(bool unlimited)
{
_unlimitedReconnectRetries = unlimited;
emit configChanged();
}
-
void Network::setRejoinChannels(bool rejoin)
{
_rejoinChannels = rejoin;
emit configChanged();
}
-
void Network::setUseCustomMessageRate(bool useCustomRate)
{
if (_useCustomMessageRate != useCustomRate) {
}
}
-
void Network::setMessageRateBurstSize(quint32 burstSize)
{
if (burstSize < 1) {
// Can't go slower than one message at a time. Also blocks old clients from trying to set
// this to 0.
qDebug() << "Received invalid setMessageRateBurstSize data - message burst size must be "
- "non-zero positive, given" << burstSize;
+ "non-zero positive, given"
+ << burstSize;
return;
}
if (_messageRateBurstSize != burstSize) {
}
}
-
void Network::setMessageRateDelay(quint32 messageDelay)
{
if (messageDelay == 0) {
// Nonsensical to have no delay - just check the Unlimited box instead. Also blocks old
// clients from trying to set this to 0.
qDebug() << "Received invalid setMessageRateDelay data - message delay must be non-zero "
- "positive, given" << messageDelay;
+ "positive, given"
+ << messageDelay;
return;
}
if (_messageRateDelay != messageDelay) {
}
}
-
void Network::setUnlimitedMessageRate(bool unlimitedRate)
{
if (_unlimitedMessageRate != unlimitedRate) {
}
}
-
-void Network::addSupport(const QString ¶m, const QString &value)
+void Network::addSupport(const QString& param, const QString& value)
{
if (!_supports.contains(param)) {
_supports[param] = value;
}
}
-
-void Network::removeSupport(const QString ¶m)
+void Network::removeSupport(const QString& param)
{
if (_supports.contains(param)) {
_supports.remove(param);
}
}
-
QVariantMap Network::initSupports() const
{
QVariantMap supports;
return supports;
}
-void Network::addCap(const QString &capability, const QString &value)
+void Network::addCap(const QString& capability, const QString& value)
{
// IRCv3 specs all use lowercase capability names
QString _capLowercase = capability.toLower();
}
}
-void Network::acknowledgeCap(const QString &capability)
+void Network::acknowledgeCap(const QString& capability)
{
// IRCv3 specs all use lowercase capability names
QString _capLowercase = capability.toLower();
}
}
-void Network::removeCap(const QString &capability)
+void Network::removeCap(const QString& capability)
{
// IRCv3 specs all use lowercase capability names
QString _capLowercase = capability.toLower();
// If performance issues arise, this can be converted to a more-efficient setup without breaking
// protocol (in theory).
QString _capLowercase;
- foreach (const QString &capability, _caps) {
+ foreach (const QString& capability, _caps) {
_capLowercase = capability.toLower();
emit capRemoved(_capLowercase);
}
return caps;
}
-
// There's potentially a lot of users and channels, so it makes sense to optimize the format of this.
// Rather than sending a thousand maps with identical keys, we convert this into one map containing lists
// where each list index corresponds to a particular IrcUser. This saves sending the key names a thousand times.
if (_ircUsers.count()) {
QHash<QString, QVariantList> users;
- QHash<QString, IrcUser *>::const_iterator it = _ircUsers.begin();
- QHash<QString, IrcUser *>::const_iterator end = _ircUsers.end();
+ QHash<QString, IrcUser*>::const_iterator it = _ircUsers.begin();
+ QHash<QString, IrcUser*>::const_iterator end = _ircUsers.end();
while (it != end) {
QVariantMap map = it.value()->toVariantMap();
// If the peer doesn't support LongTime, replace the lastAwayMessageTime field
// Can't have a container with a value type != QVariant in a QVariant :(
// However, working directly on a QVariantMap is awkward for appending, thus the detour via the hash above.
QVariantMap userMap;
- foreach(const QString &key, users.keys())
+ foreach (const QString& key, users.keys())
userMap[key] = users[key];
usersAndChannels["Users"] = userMap;
}
if (_ircChannels.count()) {
QHash<QString, QVariantList> channels;
- QHash<QString, IrcChannel *>::const_iterator it = _ircChannels.begin();
- QHash<QString, IrcChannel *>::const_iterator end = _ircChannels.end();
+ QHash<QString, IrcChannel*>::const_iterator it = _ircChannels.begin();
+ QHash<QString, IrcChannel*>::const_iterator end = _ircChannels.end();
while (it != end) {
- const QVariantMap &map = it.value()->toVariantMap();
+ const QVariantMap& map = it.value()->toVariantMap();
QVariantMap::const_iterator mapiter = map.begin();
while (mapiter != map.end()) {
channels[mapiter.key()] << mapiter.value();
++it;
}
QVariantMap channelMap;
- foreach(const QString &key, channels.keys())
+ foreach (const QString& key, channels.keys())
channelMap[key] = channels[key];
usersAndChannels["Channels"] = channelMap;
}
return usersAndChannels;
}
-
-void Network::initSetIrcUsersAndChannels(const QVariantMap &usersAndChannels)
+void Network::initSetIrcUsersAndChannels(const QVariantMap& usersAndChannels)
{
Q_ASSERT(proxy());
Q_ASSERT(proxy()->sourcePeer());
if (isInitialized()) {
- qWarning() << "Network" << networkId() << "received init data for users and channels although there already are known users or channels!";
+ qWarning() << "Network" << networkId()
+ << "received init data for users and channels although there already are known users or channels!";
return;
}
// toMap() and toList() are cheap, so we can avoid copying to lists...
// However, we really have to make sure to never accidentally detach from the shared data!
- const QVariantMap &users = usersAndChannels["Users"].toMap();
+ const QVariantMap& users = usersAndChannels["Users"].toMap();
// sanity check
int count = users["nick"].toList().count();
- foreach(const QString &key, users.keys()) {
+ foreach (const QString& key, users.keys()) {
if (users[key].toList().count() != count) {
qWarning() << "Received invalid usersAndChannels init data, sizes of attribute lists don't match!";
return;
}
// now create the individual IrcUsers
- for(int i = 0; i < count; i++) {
+ for (int i = 0; i < count; i++) {
QVariantMap map;
- foreach(const QString &key, users.keys())
+ foreach (const QString& key, users.keys())
map[key] = users[key].toList().at(i);
// If the peer doesn't support LongTime, upconvert the lastAwayMessageTime field
map["lastAwayMessageTime"] = lastAwayMessageTime;
}
- newIrcUser(map["nick"].toString(), map); // newIrcUser() properly handles the hostmask being just the nick
+ newIrcUser(map["nick"].toString(), map); // newIrcUser() properly handles the hostmask being just the nick
}
// same thing for IrcChannels
- const QVariantMap &channels = usersAndChannels["Channels"].toMap();
+ const QVariantMap& channels = usersAndChannels["Channels"].toMap();
// sanity check
count = channels["name"].toList().count();
- foreach(const QString &key, channels.keys()) {
+ foreach (const QString& key, channels.keys()) {
if (channels[key].toList().count() != count) {
qWarning() << "Received invalid usersAndChannels init data, sizes of attribute lists don't match!";
return;
}
}
// now create the individual IrcChannels
- for(int i = 0; i < count; i++) {
+ for (int i = 0; i < count; i++) {
QVariantMap map;
- foreach(const QString &key, channels.keys())
+ foreach (const QString& key, channels.keys())
map[key] = channels[key].toList().at(i);
newIrcChannel(map["name"].toString(), map);
}
}
-
-void Network::initSetSupports(const QVariantMap &supports)
+void Network::initSetSupports(const QVariantMap& supports)
{
QMapIterator<QString, QVariant> iter(supports);
while (iter.hasNext()) {
}
}
-
-void Network::initSetCaps(const QVariantMap &caps)
+void Network::initSetCaps(const QVariantMap& caps)
{
QMapIterator<QString, QVariant> iter(caps);
while (iter.hasNext()) {
}
}
-
-IrcUser *Network::updateNickFromMask(const QString &mask)
+IrcUser* Network::updateNickFromMask(const QString& mask)
{
QString nick(nickFromMask(mask).toLower());
- IrcUser *ircuser;
+ IrcUser* ircuser;
if (_ircUsers.contains(nick)) {
ircuser = _ircUsers[nick];
return ircuser;
}
-
void Network::ircUserNickChanged(QString newnick)
{
- QString oldnick = _ircUsers.key(qobject_cast<IrcUser *>(sender()));
+ QString oldnick = _ircUsers.key(qobject_cast<IrcUser*>(sender()));
if (oldnick.isNull())
return;
- if (newnick.toLower() != oldnick) _ircUsers[newnick.toLower()] = _ircUsers.take(oldnick);
+ if (newnick.toLower() != oldnick)
+ _ircUsers[newnick.toLower()] = _ircUsers.take(oldnick);
if (myNick().toLower() == oldnick)
setMyNick(newnick);
}
-
-void Network::emitConnectionError(const QString &errorMsg)
+void Network::emitConnectionError(const QString& errorMsg)
{
emit connectionError(errorMsg);
}
-
// ====================
// Private:
// ====================
}
}
-
/************************************************************************
* NetworkInfo
************************************************************************/
-
-bool NetworkInfo::operator==(const NetworkInfo &other) const
+bool NetworkInfo::operator==(const NetworkInfo& other) const
{
return networkName == other.networkName
&& serverList == other.serverList
;
}
-
-bool NetworkInfo::operator!=(const NetworkInfo &other) const
+bool NetworkInfo::operator!=(const NetworkInfo& other) const
{
return !(*this == other);
}
-
-QDataStream &operator<<(QDataStream &out, const NetworkInfo &info)
+QDataStream& operator<<(QDataStream& out, const NetworkInfo& info)
{
QVariantMap i;
i["NetworkName"] = info.networkName;
return out;
}
-
-QDataStream &operator>>(QDataStream &in, NetworkInfo &info)
+QDataStream& operator>>(QDataStream& in, NetworkInfo& info)
{
QVariantMap i;
in >> i;
return in;
}
-
-QDebug operator<<(QDebug dbg, const NetworkInfo &i)
+QDebug operator<<(QDebug dbg, const NetworkInfo& i)
{
dbg.nospace() << "(id = " << i.networkId << " name = " << i.networkName << " identity = " << i.identity
- << " codecForServer = " << i.codecForServer << " codecForEncoding = " << i.codecForEncoding << " codecForDecoding = " << i.codecForDecoding
- << " serverList = " << i.serverList << " useRandomServer = " << i.useRandomServer << " perform = " << i.perform
- << " useAutoIdentify = " << i.useAutoIdentify << " autoIdentifyService = " << i.autoIdentifyService << " autoIdentifyPassword = " << i.autoIdentifyPassword
- << " useSasl = " << i.useSasl << " saslAccount = " << i.saslAccount << " saslPassword = " << i.saslPassword
- << " useAutoReconnect = " << i.useAutoReconnect << " autoReconnectInterval = " << i.autoReconnectInterval
- << " autoReconnectRetries = " << i.autoReconnectRetries << " unlimitedReconnectRetries = " << i.unlimitedReconnectRetries
- << " rejoinChannels = " << i.rejoinChannels
- << " useCustomMessageRate = " << i.useCustomMessageRate
- << " messageRateBurstSize = " << i.messageRateBurstSize
- << " messageRateDelay = " << i.messageRateDelay
- << " unlimitedMessageRate = " << i.unlimitedMessageRate
- << ")";
+ << " codecForServer = " << i.codecForServer << " codecForEncoding = " << i.codecForEncoding
+ << " codecForDecoding = " << i.codecForDecoding << " serverList = " << i.serverList
+ << " useRandomServer = " << i.useRandomServer << " perform = " << i.perform << " useAutoIdentify = " << i.useAutoIdentify
+ << " autoIdentifyService = " << i.autoIdentifyService << " autoIdentifyPassword = " << i.autoIdentifyPassword
+ << " useSasl = " << i.useSasl << " saslAccount = " << i.saslAccount << " saslPassword = " << i.saslPassword
+ << " useAutoReconnect = " << i.useAutoReconnect << " autoReconnectInterval = " << i.autoReconnectInterval
+ << " autoReconnectRetries = " << i.autoReconnectRetries << " unlimitedReconnectRetries = " << i.unlimitedReconnectRetries
+ << " rejoinChannels = " << i.rejoinChannels << " useCustomMessageRate = " << i.useCustomMessageRate
+ << " messageRateBurstSize = " << i.messageRateBurstSize << " messageRateDelay = " << i.messageRateDelay
+ << " unlimitedMessageRate = " << i.unlimitedMessageRate << ")";
return dbg.space();
}
-
-QDataStream &operator<<(QDataStream &out, const Network::Server &server)
+QDataStream& operator<<(QDataStream& out, const Network::Server& server)
{
QVariantMap serverMap;
serverMap["Host"] = server.host;
return out;
}
-
-QDataStream &operator>>(QDataStream &in, Network::Server &server)
+QDataStream& operator>>(QDataStream& in, Network::Server& server)
{
QVariantMap serverMap;
in >> serverMap;
return in;
}
-
-bool Network::Server::operator==(const Server &other) const
+bool Network::Server::operator==(const Server& other) const
{
- if (host != other.host) return false;
- if (port != other.port) return false;
- if (password != other.password) return false;
- if (useSsl != other.useSsl) return false;
- if (sslVerify != other.sslVerify) return false;
- if (sslVersion != other.sslVersion) return false;
- if (useProxy != other.useProxy) return false;
- if (proxyType != other.proxyType) return false;
- if (proxyHost != other.proxyHost) return false;
- if (proxyPort != other.proxyPort) return false;
- if (proxyUser != other.proxyUser) return false;
- if (proxyPass != other.proxyPass) return false;
+ if (host != other.host)
+ return false;
+ if (port != other.port)
+ return false;
+ if (password != other.password)
+ return false;
+ if (useSsl != other.useSsl)
+ return false;
+ if (sslVerify != other.sslVerify)
+ return false;
+ if (sslVersion != other.sslVersion)
+ return false;
+ if (useProxy != other.useProxy)
+ return false;
+ if (proxyType != other.proxyType)
+ return false;
+ if (proxyHost != other.proxyHost)
+ return false;
+ if (proxyPort != other.proxyPort)
+ return false;
+ if (proxyUser != other.proxyUser)
+ return false;
+ if (proxyPass != other.proxyPass)
+ return false;
return true;
}
-
-bool Network::Server::operator!=(const Server &other) const
+bool Network::Server::operator!=(const Server& other) const
{
return !(*this == other);
}
-
-QDebug operator<<(QDebug dbg, const Network::Server &server)
+QDebug operator<<(QDebug dbg, const Network::Server& server)
{
- dbg.nospace() << "Server(host = " << server.host << ":" << server.port << ", useSsl = " <<
- server.useSsl << ", sslVerify = " << server.sslVerify << ")";
+ dbg.nospace() << "Server(host = " << server.host << ":" << server.port << ", useSsl = " << server.useSsl
+ << ", sslVerify = " << server.sslVerify << ")";
return dbg.space();
}
projects / quassel.git / blobdiff