X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fclient%2Fnetworkmodel.cpp;h=86a074658377befb973165a50da3e62f18e490d4;hb=98144aaad0cd747f186edcd0e36a1d67326ac766;hp=7b7f5bc458e0e71719e1c7bdc1459f17453b6afe;hpb=3a3e844f9fcfd12235a0086af75ecd503b621ef4;p=quassel.git diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp index 7b7f5bc4..86a07465 100644 --- a/src/client/networkmodel.cpp +++ b/src/client/networkmodel.cpp @@ -135,7 +135,7 @@ BufferItem *NetworkItem::bufferItem(const BufferInfo &bufferInfo) switch (bufferInfo.type()) { case BufferInfo::ChannelBuffer: { - ChannelBufferItem *channelBufferItem = static_cast(bufferItem); + auto *channelBufferItem = static_cast(bufferItem); if (_network) { IrcChannel *ircChannel = _network->ircChannel(bufferInfo.bufferName()); if (ircChannel) @@ -263,7 +263,7 @@ QString NetworkItem::toolTip(int column) const void NetworkItem::onBeginRemoveChilds(int start, int end) { for (int i = start; i <= end; i++) { - StatusBufferItem *statusBufferItem = qobject_cast(child(i)); + auto *statusBufferItem = qobject_cast(child(i)); if (statusBufferItem) { _statusBufferItem = nullptr; break; @@ -486,7 +486,7 @@ StatusBufferItem::StatusBufferItem(const BufferInfo &bufferInfo, NetworkItem *pa QString StatusBufferItem::toolTip(int column) const { - NetworkItem *networkItem = qobject_cast(parent()); + auto *networkItem = qobject_cast(parent()); if (networkItem) return networkItem->toolTip(column); else @@ -975,7 +975,7 @@ void ChannelBufferItem::userModeChanged(IrcUser *ircUser) // find the item that needs reparenting IrcUserItem *ircUserItem = nullptr; for (int i = 0; i < childCount(); i++) { - UserCategoryItem *oldCategoryItem = qobject_cast(child(i)); + auto *oldCategoryItem = qobject_cast(child(i)); Q_ASSERT(oldCategoryItem); IrcUserItem *userItem = oldCategoryItem->findIrcUser(ircUser); if (userItem) { @@ -1065,7 +1065,7 @@ void UserCategoryItem::addUsers(const QList &ircUsers) bool UserCategoryItem::removeUser(IrcUser *ircUser) { IrcUserItem *userItem = findIrcUser(ircUser); - bool success = (bool)userItem; + auto success = (bool)userItem; if (success) { removeChild(userItem); emit dataChanged(0); @@ -1271,11 +1271,11 @@ QString IrcUserItem::channelModes() const { // 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(parent()); + auto *category = qobject_cast(parent()); if (!category) return QString(); - ChannelBufferItem *channel = qobject_cast(category->parent()); + auto *channel = qobject_cast(category->parent()); if (!channel) return QString(); @@ -1334,7 +1334,7 @@ QModelIndex NetworkModel::networkIndex(NetworkId networkId) { int netRow = networkRow(networkId); if (netRow == -1) - return QModelIndex(); + return {}; else return indexByItem(qobject_cast(rootItem->child(netRow))); } @@ -1374,7 +1374,7 @@ void NetworkModel::networkRemoved(const NetworkId &networkId) QModelIndex NetworkModel::bufferIndex(BufferId bufferId) { if (!_bufferItemCache.contains(bufferId)) - return QModelIndex(); + return {}; return indexByItem(_bufferItemCache[bufferId]); } @@ -1439,7 +1439,7 @@ QList > NetworkModel::mimeDataToBufferList(const QMim QMimeData *NetworkModel::mimeData(const QModelIndexList &indexes) const { - QMimeData *mimeData = new QMimeData(); + auto *mimeData = new QMimeData(); QStringList bufferlist; QString netid, uid, bufferid; @@ -1485,7 +1485,7 @@ void NetworkModel::removeBuffer(BufferId bufferId) MsgId NetworkModel::lastSeenMsgId(BufferId bufferId) const { if (!_bufferItemCache.contains(bufferId)) - return MsgId(); + return {}; return _bufferItemCache[bufferId]->lastSeenMsgId(); } @@ -1494,7 +1494,7 @@ MsgId NetworkModel::lastSeenMsgId(BufferId bufferId) const MsgId NetworkModel::markerLineMsgId(BufferId bufferId) const { if (!_bufferItemCache.contains(bufferId)) - return MsgId(); + return {}; return _bufferItemCache[bufferId]->markerLineMsgId(); } @@ -1507,7 +1507,7 @@ MsgId NetworkModel::lastSeenMsgId(const BufferId &bufferId) if (!bufferItem) { qDebug() << "NetworkModel::lastSeenMsgId(): buffer is unknown:" << bufferId; Client::purgeKnownBufferIds(); - return MsgId(); + return {}; } return bufferItem->lastSeenMsgId(); } @@ -1688,13 +1688,13 @@ BufferInfo NetworkModel::bufferInfo(BufferId bufferId) const NetworkId NetworkModel::networkId(BufferId bufferId) const { if (!_bufferItemCache.contains(bufferId)) - return NetworkId(); + return {}; - NetworkItem *netItem = qobject_cast(_bufferItemCache[bufferId]->parent()); + auto *netItem = qobject_cast(_bufferItemCache[bufferId]->parent()); if (netItem) return netItem->networkId(); else - return NetworkId(); + return {}; } @@ -1703,7 +1703,7 @@ QString NetworkModel::networkName(BufferId bufferId) const if (!_bufferItemCache.contains(bufferId)) return QString(); - NetworkItem *netItem = qobject_cast(_bufferItemCache[bufferId]->parent()); + auto *netItem = qobject_cast(_bufferItemCache[bufferId]->parent()); if (netItem) return netItem->networkName(); else @@ -1715,14 +1715,14 @@ BufferId NetworkModel::bufferId(NetworkId networkId, const QString &bufferName, { const NetworkItem *netItem = findNetworkItem(networkId); if (!netItem) - return BufferId(); + return {}; for (int i = 0; i < netItem->childCount(); i++) { - BufferItem *bufferItem = qobject_cast(netItem->child(i)); + auto *bufferItem = qobject_cast(netItem->child(i)); if (bufferItem && !bufferItem->bufferName().compare(bufferName, cs)) return bufferItem->bufferId(); } - return BufferId(); + return {}; }