// use networkDataChanged() instead. Otherwise you will end up in a infinite loop
// as we "sync" the dataChanged() signals of NetworkItem and StatusBufferItem
setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
- connect(this, SIGNAL(networkDataChanged(int)), this, SIGNAL(dataChanged(int)));
- connect(this, SIGNAL(beginRemoveChilds(int, int)), this, SLOT(onBeginRemoveChilds(int, int)));
+ connect(this, &NetworkItem::networkDataChanged, this, &NetworkItem::dataChanged);
+ connect(this, &NetworkItem::beginRemoveChilds, this, &NetworkItem::onBeginRemoveChilds);
}
case BufferInfo::StatusBuffer:
_statusBufferItem = new StatusBufferItem(bufferInfo, this);
bufferItem = _statusBufferItem;
- disconnect(this, SIGNAL(networkDataChanged(int)), this, SIGNAL(dataChanged(int)));
- connect(this, SIGNAL(networkDataChanged(int)), bufferItem, SIGNAL(dataChanged(int)));
- connect(bufferItem, SIGNAL(dataChanged(int)), this, SIGNAL(dataChanged(int)));
+ disconnect(this, &NetworkItem::networkDataChanged, this, &NetworkItem::dataChanged);
+ connect(this, &NetworkItem::networkDataChanged, bufferItem, &BufferItem::dataChanged);
+ connect(bufferItem, &BufferItem::dataChanged, this, &NetworkItem::dataChanged);
break;
case BufferInfo::ChannelBuffer:
bufferItem = new ChannelBufferItem(bufferInfo, this);
switch (bufferInfo.type()) {
case BufferInfo::ChannelBuffer:
{
- ChannelBufferItem *channelBufferItem = static_cast<ChannelBufferItem *>(bufferItem);
+ auto *channelBufferItem = static_cast<ChannelBufferItem *>(bufferItem);
if (_network) {
IrcChannel *ircChannel = _network->ircChannel(bufferInfo.bufferName());
if (ircChannel)
_network = network;
- connect(network, SIGNAL(networkNameSet(QString)),
- this, SLOT(setNetworkName(QString)));
- connect(network, SIGNAL(currentServerSet(QString)),
- this, SLOT(setCurrentServer(QString)));
- connect(network, SIGNAL(ircChannelAdded(IrcChannel *)),
- this, SLOT(attachIrcChannel(IrcChannel *)));
- connect(network, SIGNAL(ircUserAdded(IrcUser *)),
- this, SLOT(attachIrcUser(IrcUser *)));
- connect(network, SIGNAL(connectedSet(bool)),
- this, SIGNAL(networkDataChanged()));
- connect(network, SIGNAL(destroyed()),
- this, SLOT(onNetworkDestroyed()));
+ connect(network, &Network::networkNameSet,
+ this, &NetworkItem::setNetworkName);
+ connect(network, &Network::currentServerSet,
+ this, &NetworkItem::setCurrentServer);
+ connect(network, &Network::ircChannelAdded,
+ this, &NetworkItem::attachIrcChannel);
+ connect(network, &Network::ircUserAdded,
+ this, &NetworkItem::attachIrcUser);
+ connect(network, &Network::connectedSet,
+ this, [this]() { emit networkDataChanged(); });
+ connect(network, &QObject::destroyed,
+ this, &NetworkItem::onNetworkDestroyed);
emit networkDataChanged();
}
void NetworkItem::onBeginRemoveChilds(int start, int end)
{
for (int i = start; i <= end; i++) {
- StatusBufferItem *statusBufferItem = qobject_cast<StatusBufferItem *>(child(i));
+ auto *statusBufferItem = qobject_cast<StatusBufferItem *>(child(i));
if (statusBufferItem) {
_statusBufferItem = nullptr;
break;
QString StatusBufferItem::toolTip(int column) const
{
- NetworkItem *networkItem = qobject_cast<NetworkItem *>(parent());
+ auto *networkItem = qobject_cast<NetworkItem *>(parent());
if (networkItem)
return networkItem->toolTip(column);
else
}
if (ircUser) {
- connect(ircUser, SIGNAL(destroyed(QObject*)), SLOT(removeIrcUser()));
- connect(ircUser, SIGNAL(quited()), this, SLOT(removeIrcUser()));
- connect(ircUser, SIGNAL(awaySet(bool)), this, SIGNAL(dataChanged()));
- connect(ircUser, SIGNAL(encryptedSet(bool)), this, SLOT(setEncrypted(bool)));
+ connect(ircUser, &IrcUser::destroyed, this, &QueryBufferItem::removeIrcUser);
+ connect(ircUser, &IrcUser::quited, this, &QueryBufferItem::removeIrcUser);
+ connect(ircUser, &IrcUser::awaySet, this, [this]() { emit dataChanged(); });
+ connect(ircUser, &IrcUser::encryptedSet, this, &BufferItem::setEncrypted);
}
_ircUser = ircUser;
_ircChannel = ircChannel;
- connect(ircChannel, SIGNAL(destroyed(QObject*)),
- this, SLOT(ircChannelDestroyed()));
- connect(ircChannel, SIGNAL(topicSet(QString)),
- this, SLOT(setTopic(QString)));
- connect(ircChannel, SIGNAL(encryptedSet(bool)),
- this, SLOT(setEncrypted(bool)));
- connect(ircChannel, SIGNAL(ircUsersJoined(QList<IrcUser *> )),
- this, SLOT(join(QList<IrcUser *> )));
- connect(ircChannel, SIGNAL(ircUserParted(IrcUser *)),
- this, SLOT(part(IrcUser *)));
- connect(ircChannel, SIGNAL(parted()),
- this, SLOT(ircChannelParted()));
- connect(ircChannel, SIGNAL(ircUserModesSet(IrcUser *, QString)),
- this, SLOT(userModeChanged(IrcUser *)));
- connect(ircChannel, SIGNAL(ircUserModeAdded(IrcUser *, QString)),
- this, SLOT(userModeChanged(IrcUser *)));
- connect(ircChannel, SIGNAL(ircUserModeRemoved(IrcUser *, QString)),
- this, SLOT(userModeChanged(IrcUser *)));
+ connect(ircChannel, &QObject::destroyed, this, &ChannelBufferItem::ircChannelDestroyed);
+ connect(ircChannel, &IrcChannel::topicSet, this, &ChannelBufferItem::setTopic);
+ connect(ircChannel, &IrcChannel::encryptedSet, this, &ChannelBufferItem::setEncrypted);
+ connect(ircChannel, &IrcChannel::ircUsersJoined, this, &ChannelBufferItem::join);
+ connect(ircChannel, &IrcChannel::ircUserParted, this, &ChannelBufferItem::part);
+ connect(ircChannel, &IrcChannel::parted, this, &ChannelBufferItem::ircChannelParted);
+ connect(ircChannel, &IrcChannel::ircUserModesSet, this, &ChannelBufferItem::userModeChanged);
+ connect(ircChannel, &IrcChannel::ircUserModeAdded, this, &ChannelBufferItem::userModeChanged);
+ connect(ircChannel, &IrcChannel::ircUserModeRemoved, this, &ChannelBufferItem::userModeChanged);
if (!ircChannel->ircUsers().isEmpty())
join(ircChannel->ircUsers());
// find the item that needs reparenting
IrcUserItem *ircUserItem = nullptr;
for (int i = 0; i < childCount(); i++) {
- UserCategoryItem *oldCategoryItem = qobject_cast<UserCategoryItem *>(child(i));
+ auto *oldCategoryItem = qobject_cast<UserCategoryItem *>(child(i));
Q_ASSERT(oldCategoryItem);
IrcUserItem *userItem = oldCategoryItem->findIrcUser(ircUser);
if (userItem) {
bool UserCategoryItem::removeUser(IrcUser *ircUser)
{
IrcUserItem *userItem = findIrcUser(ircUser);
- bool success = (bool)userItem;
+ auto success = (bool)userItem;
if (success) {
removeChild(userItem);
emit dataChanged(0);
_ircUser(ircUser)
{
setObjectName(ircUser->nick());
- connect(ircUser, SIGNAL(quited()), this, SLOT(ircUserQuited()));
- connect(ircUser, SIGNAL(nickSet(QString)), this, SIGNAL(dataChanged()));
- connect(ircUser, SIGNAL(awaySet(bool)), this, SIGNAL(dataChanged()));
+ connect(ircUser, &IrcUser::quited, this, &IrcUserItem::ircUserQuited);
+ connect(ircUser, &IrcUser::nickSet, this, [this]() { emit dataChanged(); });
+ connect(ircUser, &IrcUser::awaySet, this, [this]() { emit dataChanged(); });
}
{
// IrcUserItems are parented to UserCategoryItem, which are parented to ChannelBufferItem.
// We want the channel buffer item in order to get the channel-specific user modes.
- UserCategoryItem *category = qobject_cast<UserCategoryItem *>(parent());
+ auto *category = qobject_cast<UserCategoryItem *>(parent());
if (!category)
return QString();
- ChannelBufferItem *channel = qobject_cast<ChannelBufferItem *>(category->parent());
+ auto *channel = qobject_cast<ChannelBufferItem *>(category->parent());
if (!channel)
return QString();
NetworkModel::NetworkModel(QObject *parent)
: TreeModel(NetworkModel::defaultHeader(), parent)
{
- connect(this, SIGNAL(rowsInserted(const QModelIndex &, int, int)),
- this, SLOT(checkForNewBuffers(const QModelIndex &, int, int)));
- connect(this, SIGNAL(rowsAboutToBeRemoved(const QModelIndex &, int, int)),
- this, SLOT(checkForRemovedBuffers(const QModelIndex &, int, int)));
+ connect(this, &NetworkModel::rowsInserted, this, &NetworkModel::checkForNewBuffers);
+ connect(this, &NetworkModel::rowsAboutToBeRemoved, this, &NetworkModel::checkForRemovedBuffers);
BufferSettings defaultSettings;
defaultSettings.notify("UserNoticesTarget", this, SLOT(messageRedirectionSettingsChanged()));
{
int netRow = networkRow(networkId);
if (netRow == -1)
- return QModelIndex();
+ return {};
else
return indexByItem(qobject_cast<NetworkItem *>(rootItem->child(netRow)));
}
QModelIndex NetworkModel::bufferIndex(BufferId bufferId)
{
if (!_bufferItemCache.contains(bufferId))
- return QModelIndex();
+ return {};
return indexByItem(_bufferItemCache[bufferId]);
}
QMimeData *NetworkModel::mimeData(const QModelIndexList &indexes) const
{
- QMimeData *mimeData = new QMimeData();
+ auto *mimeData = new QMimeData();
QStringList bufferlist;
QString netid, uid, bufferid;
MsgId NetworkModel::lastSeenMsgId(BufferId bufferId) const
{
if (!_bufferItemCache.contains(bufferId))
- return MsgId();
+ return {};
return _bufferItemCache[bufferId]->lastSeenMsgId();
}
MsgId NetworkModel::markerLineMsgId(BufferId bufferId) const
{
if (!_bufferItemCache.contains(bufferId))
- return MsgId();
+ return {};
return _bufferItemCache[bufferId]->markerLineMsgId();
}
if (!bufferItem) {
qDebug() << "NetworkModel::lastSeenMsgId(): buffer is unknown:" << bufferId;
Client::purgeKnownBufferIds();
- return MsgId();
+ return {};
}
return bufferItem->lastSeenMsgId();
}
NetworkId NetworkModel::networkId(BufferId bufferId) const
{
if (!_bufferItemCache.contains(bufferId))
- return NetworkId();
+ return {};
- NetworkItem *netItem = qobject_cast<NetworkItem *>(_bufferItemCache[bufferId]->parent());
+ auto *netItem = qobject_cast<NetworkItem *>(_bufferItemCache[bufferId]->parent());
if (netItem)
return netItem->networkId();
else
- return NetworkId();
+ return {};
}
if (!_bufferItemCache.contains(bufferId))
return QString();
- NetworkItem *netItem = qobject_cast<NetworkItem *>(_bufferItemCache[bufferId]->parent());
+ auto *netItem = qobject_cast<NetworkItem *>(_bufferItemCache[bufferId]->parent());
if (netItem)
return netItem->networkName();
else
{
const NetworkItem *netItem = findNetworkItem(networkId);
if (!netItem)
- return BufferId();
+ return {};
for (int i = 0; i < netItem->childCount(); i++) {
- BufferItem *bufferItem = qobject_cast<BufferItem *>(netItem->child(i));
+ auto *bufferItem = qobject_cast<BufferItem *>(netItem->child(i));
if (bufferItem && !bufferItem->bufferName().compare(bufferName, cs))
return bufferItem->bufferId();
}
- return BufferId();
+ return {};
}