modernize: Use braced-init list when returning types

[quassel.git] / src / client / networkmodel.cpp

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 1634936..86a0746 100644 (file)
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -22,6 +22,7 @@
 
 #include <QAbstractItemView>
 #include <QMimeData>
+#include <utility>
 
 #include "buffermodel.h"
 #include "buffersettings.h"
@@ -134,7 +135,7 @@ BufferItem *NetworkItem::bufferItem(const BufferInfo &bufferInfo)
     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)
@@ -262,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<StatusBufferItem *>(child(i));
+        auto *statusBufferItem = qobject_cast<StatusBufferItem *>(child(i));
         if (statusBufferItem) {
             _statusBufferItem = nullptr;
             break;
@@ -282,9 +283,9 @@ void NetworkItem::onNetworkDestroyed()
 /*****************************************
 *  Fancy Buffer Items
 *****************************************/
-BufferItem::BufferItem(const BufferInfo &bufferInfo, AbstractTreeItem *parent)
+BufferItem::BufferItem(BufferInfo bufferInfo, AbstractTreeItem *parent)
     : PropertyMapItem(parent),
-    _bufferInfo(bufferInfo),
+    _bufferInfo(std::move(bufferInfo)),
     _activity(BufferInfo::NoActivity)
 {
     setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled);
@@ -485,7 +486,7 @@ StatusBufferItem::StatusBufferItem(const BufferInfo &bufferInfo, NetworkItem *pa
 
 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
@@ -974,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<UserCategoryItem *>(child(i));
+        auto *oldCategoryItem = qobject_cast<UserCategoryItem *>(child(i));
         Q_ASSERT(oldCategoryItem);
         IrcUserItem *userItem = oldCategoryItem->findIrcUser(ircUser);
         if (userItem) {
@@ -1064,7 +1065,7 @@ void UserCategoryItem::addUsers(const QList<IrcUser *> &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);
@@ -1270,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<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();
 
@@ -1333,7 +1334,7 @@ QModelIndex NetworkModel::networkIndex(NetworkId networkId)
 {
     int netRow = networkRow(networkId);
     if (netRow == -1)
-        return QModelIndex();
+        return {};
     else
         return indexByItem(qobject_cast<NetworkItem *>(rootItem->child(netRow)));
 }
@@ -1373,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]);
 }
@@ -1438,7 +1439,7 @@ QList<QPair<NetworkId, BufferId> > 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;
@@ -1484,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();
 }
@@ -1493,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();
 }
@@ -1506,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();
 }
@@ -1687,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<NetworkItem *>(_bufferItemCache[bufferId]->parent());
+    auto *netItem = qobject_cast<NetworkItem *>(_bufferItemCache[bufferId]->parent());
     if (netItem)
         return netItem->networkId();
     else
-        return NetworkId();
+        return {};
 }
 
 
@@ -1702,7 +1703,7 @@ QString NetworkModel::networkName(BufferId bufferId) const
     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
@@ -1714,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<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 {};
 }