From 98144aaad0cd747f186edcd0e36a1d67326ac766 Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Sun, 9 Sep 2018 23:20:09 +0200 Subject: [PATCH] modernize: Use braced-init list when returning types --- src/client/client.cpp | 2 +- src/client/coreaccountmodel.cpp | 2 +- src/client/irclistmodel.cpp | 2 +- src/client/irclistmodel.h | 2 +- src/client/messagemodel.h | 4 ++-- src/client/networkmodel.cpp | 18 ++++++++-------- src/client/treemodel.cpp | 12 +++++------ src/core/ldapauthenticator.cpp | 2 +- src/core/postgresqlstorage.cpp | 24 +++++++++++----------- src/core/sqlitestorage.cpp | 4 ++-- src/qtui/chatline.h | 2 +- src/qtui/chatview.cpp | 6 +++--- src/qtui/nicklistwidget.cpp | 2 +- src/qtui/settingspages/aliasesmodel.cpp | 2 +- src/qtui/settingspages/aliasesmodel.h | 2 +- src/qtui/settingspages/ignorelistmodel.cpp | 2 +- src/qtui/settingspages/ignorelistmodel.h | 2 +- src/qtui/settingspages/shortcutsmodel.cpp | 4 ++-- src/qtui/verticaldock.cpp | 4 ++-- src/qtui/verticaldock.h | 2 +- src/uisupport/bufferview.cpp | 4 ++-- src/uisupport/flatproxymodel.cpp | 14 ++++++------- src/uisupport/networkmodelcontroller.cpp | 4 ++-- src/uisupport/qssparser.cpp | 2 +- src/uisupport/resizingstackedwidget.cpp | 2 +- 25 files changed, 63 insertions(+), 63 deletions(-) diff --git a/src/client/client.cpp b/src/client/client.cpp index f6e8d24d..2c1898d0 100644 --- a/src/client/client.cpp +++ b/src/client/client.cpp @@ -603,7 +603,7 @@ MsgId Client::markerLine(BufferId id) { if (id.isValid() && networkModel()) return networkModel()->markerLineMsgId(id); - return MsgId(); + return {}; } diff --git a/src/client/coreaccountmodel.cpp b/src/client/coreaccountmodel.cpp index f7c77240..04ee15f5 100644 --- a/src/client/coreaccountmodel.cpp +++ b/src/client/coreaccountmodel.cpp @@ -250,7 +250,7 @@ QModelIndex CoreAccountModel::accountIndex(AccountId accId) const if (_accounts.at(i).accountId() == accId) return index(i, 0); } - return QModelIndex(); + return {}; } diff --git a/src/client/irclistmodel.cpp b/src/client/irclistmodel.cpp index 32b39ec7..91ea7ec0 100644 --- a/src/client/irclistmodel.cpp +++ b/src/client/irclistmodel.cpp @@ -77,7 +77,7 @@ QModelIndex IrcListModel::index(int row, int column, const QModelIndex &parent) { Q_UNUSED(parent); if (row >= rowCount() || column >= columnCount()) - return QModelIndex(); + return {}; return createIndex(row, column); } diff --git a/src/client/irclistmodel.h b/src/client/irclistmodel.h index 8700d1c9..76227bc3 100644 --- a/src/client/irclistmodel.h +++ b/src/client/irclistmodel.h @@ -40,7 +40,7 @@ public: QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; - inline QModelIndex parent(const QModelIndex &) const override { return QModelIndex(); } + inline QModelIndex parent(const QModelIndex &) const override { return {}; } inline int rowCount(const QModelIndex &parent = QModelIndex()) const override { Q_UNUSED(parent) return _channelList.count(); } inline int columnCount(const QModelIndex &parent = QModelIndex()) const override { Q_UNUSED(parent) return 3; } diff --git a/src/client/messagemodel.h b/src/client/messagemodel.h index f27379c1..63772822 100644 --- a/src/client/messagemodel.h +++ b/src/client/messagemodel.h @@ -60,7 +60,7 @@ public: MessageModel(QObject *parent); inline QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; - inline QModelIndex parent(const QModelIndex &) const override { return QModelIndex(); } + inline QModelIndex parent(const QModelIndex &) const override { return {}; } inline int rowCount(const QModelIndex &parent = QModelIndex()) const override { return parent.isValid() ? 0 : messageCount(); } inline int columnCount(const QModelIndex & /*parent*/ = QModelIndex()) const override { return 3; } @@ -126,7 +126,7 @@ private: QModelIndex MessageModel::index(int row, int column, const QModelIndex &parent) const { if (row < 0 || row >= rowCount(parent) || column < 0 || column >= columnCount(parent)) - return QModelIndex(); + return {}; return createIndex(row, column); } diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp index e4e2e790..86a07465 100644 --- a/src/client/networkmodel.cpp +++ b/src/client/networkmodel.cpp @@ -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]); } @@ -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 {}; auto *netItem = qobject_cast(_bufferItemCache[bufferId]->parent()); if (netItem) return netItem->networkId(); else - return NetworkId(); + return {}; } @@ -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++) { auto *bufferItem = qobject_cast(netItem->child(i)); if (bufferItem && !bufferItem->bufferName().compare(bufferName, cs)) return bufferItem->bufferId(); } - return BufferId(); + return {}; } diff --git a/src/client/treemodel.cpp b/src/client/treemodel.cpp index 486ed6c9..314ec7f5 100644 --- a/src/client/treemodel.cpp +++ b/src/client/treemodel.cpp @@ -352,7 +352,7 @@ AbstractTreeItem *TreeModel::root() const QModelIndex TreeModel::index(int row, int column, const QModelIndex &parent) const { if (row < 0 || row >= rowCount(parent) || column < 0 || column >= columnCount(parent)) - return QModelIndex(); + return {}; AbstractTreeItem *parentItem; @@ -366,7 +366,7 @@ QModelIndex TreeModel::index(int row, int column, const QModelIndex &parent) con if (childItem) return createIndex(row, column, childItem); else - return QModelIndex(); + return {}; } @@ -374,11 +374,11 @@ QModelIndex TreeModel::indexByItem(AbstractTreeItem *item) const { if (item == nullptr) { qWarning() << "TreeModel::indexByItem(AbstractTreeItem *item) received NULL-Pointer"; - return QModelIndex(); + return {}; } if (item == rootItem) - return QModelIndex(); + return {}; else return createIndex(item->row(), 0, item); } @@ -389,7 +389,7 @@ QModelIndex TreeModel::parent(const QModelIndex &index) const if (!index.isValid()) { // ModelTest does this // qWarning() << "TreeModel::parent(): has been asked for the rootItems Parent!"; - return QModelIndex(); + return {}; } auto *childItem = static_cast(index.internalPointer()); @@ -397,7 +397,7 @@ QModelIndex TreeModel::parent(const QModelIndex &index) const Q_ASSERT(parentItem); if (parentItem == rootItem) - return QModelIndex(); + return {}; return createIndex(parentItem->row(), 0, parentItem); } diff --git a/src/core/ldapauthenticator.cpp b/src/core/ldapauthenticator.cpp index 76db681a..7448396b 100644 --- a/src/core/ldapauthenticator.cpp +++ b/src/core/ldapauthenticator.cpp @@ -131,7 +131,7 @@ UserId LdapAuthenticator::validateUser(const QString &username, const QString &p { bool result = ldapAuth(username, password); if (!result) { - return UserId(); + return {}; } // LDAP is case-insensitive, thus we will lowercase the username, in spite of diff --git a/src/core/postgresqlstorage.cpp b/src/core/postgresqlstorage.cpp index c414b876..391e2ac3 100644 --- a/src/core/postgresqlstorage.cpp +++ b/src/core/postgresqlstorage.cpp @@ -494,7 +494,7 @@ IdentityId PostgreSqlStorage::createIdentity(UserId user, CoreIdentity &identity safeExec(query); if (!watchQuery(query)) { db.rollback(); - return IdentityId(); + return {}; } query.first(); @@ -503,7 +503,7 @@ IdentityId PostgreSqlStorage::createIdentity(UserId user, CoreIdentity &identity if (!identityId.isValid()) { db.rollback(); - return IdentityId(); + return {}; } QSqlQuery insertNickQuery(db); @@ -514,14 +514,14 @@ IdentityId PostgreSqlStorage::createIdentity(UserId user, CoreIdentity &identity safeExec(insertNickQuery); if (!watchQuery(insertNickQuery)) { db.rollback(); - return IdentityId(); + return {}; } } if (!db.commit()) { qWarning() << "PostgreSqlStorage::createIdentity(): committing data failed!"; qWarning() << " -" << qPrintable(db.lastError().text()); - return IdentityId(); + return {}; } return identityId; } @@ -715,7 +715,7 @@ NetworkId PostgreSqlStorage::createNetwork(UserId user, const NetworkInfo &info) safeExec(query); if (!watchQuery(query)) { db.rollback(); - return NetworkId(); + return {}; } query.first(); @@ -723,7 +723,7 @@ NetworkId PostgreSqlStorage::createNetwork(UserId user, const NetworkInfo &info) if (!networkId.isValid()) { db.rollback(); - return NetworkId(); + return {}; } QSqlQuery insertServersQuery(db); @@ -735,14 +735,14 @@ NetworkId PostgreSqlStorage::createNetwork(UserId user, const NetworkInfo &info) safeExec(insertServersQuery); if (!watchQuery(insertServersQuery)) { db.rollback(); - return NetworkId(); + return {}; } } if (!db.commit()) { qWarning() << "PostgreSqlStorage::createNetwork(): committing data failed!"; qWarning() << " -" << qPrintable(db.lastError().text()); - return NetworkId(); + return {}; } return networkId; } @@ -1108,7 +1108,7 @@ BufferInfo PostgreSqlStorage::bufferInfo(UserId user, const NetworkId &networkId if (!beginTransaction(db)) { qWarning() << "PostgreSqlStorage::bufferInfo(): cannot start read only transaction!"; qWarning() << " -" << qPrintable(db.lastError().text()); - return BufferInfo(); + return {}; } QSqlQuery query(db); @@ -1136,7 +1136,7 @@ BufferInfo PostgreSqlStorage::bufferInfo(UserId user, const NetworkId &networkId if (!create) { db.rollback(); - return BufferInfo(); + return {}; } QSqlQuery createQuery(db); @@ -1172,10 +1172,10 @@ BufferInfo PostgreSqlStorage::getBufferInfo(UserId user, const BufferId &bufferI query.bindValue(":bufferid", bufferId.toInt()); safeExec(query); if (!watchQuery(query)) - return BufferInfo(); + return {}; if (!query.first()) - return BufferInfo(); + return {}; BufferInfo bufferInfo(query.value(0).toInt(), query.value(1).toInt(), (BufferInfo::Type)query.value(2).toInt(), 0, query.value(4).toString()); Q_ASSERT(!query.next()); diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp index b39c1873..ad5b7f2b 100644 --- a/src/core/sqlitestorage.cpp +++ b/src/core/sqlitestorage.cpp @@ -687,7 +687,7 @@ NetworkId SqliteStorage::createNetwork(UserId user, const NetworkInfo &info) } if (error) { unlock(); - return NetworkId(); + return {}; } { @@ -709,7 +709,7 @@ NetworkId SqliteStorage::createNetwork(UserId user, const NetworkInfo &info) } unlock(); if (error) - return NetworkId(); + return {}; else return networkId; } diff --git a/src/qtui/chatline.h b/src/qtui/chatline.h index 1fdedd50..e5ee5f7b 100644 --- a/src/qtui/chatline.h +++ b/src/qtui/chatline.h @@ -38,7 +38,7 @@ public: ~ChatLine() override; - inline QRectF boundingRect() const override { return QRectF(0, 0, _width, _height); } + inline QRectF boundingRect() const override { return {0, 0, _width, _height}; } inline QModelIndex index() const { return model()->index(row(), 0); } inline MsgId msgId() const { return index().data(MessageModel::MsgIdRole).value(); } diff --git a/src/qtui/chatview.cpp b/src/qtui/chatview.cpp index 7b60ba80..007d8bb6 100644 --- a/src/qtui/chatview.cpp +++ b/src/qtui/chatview.cpp @@ -262,11 +262,11 @@ void ChatView::verticalScrollbarChanged(int newPos) MsgId ChatView::lastMsgId() const { if (!scene()) - return MsgId(); + return {}; QAbstractItemModel *model = scene()->model(); if (!model || model->rowCount() == 0) - return MsgId(); + return {}; return model->index(model->rowCount() - 1, 0).data(MessageModel::MsgIdRole).value(); } @@ -279,7 +279,7 @@ MsgId ChatView::lastVisibleMsgId() const if (line) return line->msgId(); - return MsgId(); + return {}; } diff --git a/src/qtui/nicklistwidget.cpp b/src/qtui/nicklistwidget.cpp index d2b8fd54..a47e5092 100644 --- a/src/qtui/nicklistwidget.cpp +++ b/src/qtui/nicklistwidget.cpp @@ -215,7 +215,7 @@ QSize NickListWidget::sizeHint() const { QWidget *currentWidget = ui.stackedWidget->currentWidget(); if (!currentWidget || currentWidget == ui.emptyPage) - return QSize(100, height()); + return {100, height()}; else return currentWidget->sizeHint(); } diff --git a/src/qtui/settingspages/aliasesmodel.cpp b/src/qtui/settingspages/aliasesmodel.cpp index 39f2877f..cf868f02 100644 --- a/src/qtui/settingspages/aliasesmodel.cpp +++ b/src/qtui/settingspages/aliasesmodel.cpp @@ -255,7 +255,7 @@ QModelIndex AliasesModel::index(int row, int column, const QModelIndex &parent) { Q_UNUSED(parent); if (row >= rowCount() || column >= columnCount()) - return QModelIndex(); + return {}; return createIndex(row, column); } diff --git a/src/qtui/settingspages/aliasesmodel.h b/src/qtui/settingspages/aliasesmodel.h index 94cf10eb..dc6b08fe 100644 --- a/src/qtui/settingspages/aliasesmodel.h +++ b/src/qtui/settingspages/aliasesmodel.h @@ -42,7 +42,7 @@ public: QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; - inline QModelIndex parent(const QModelIndex &) const override { return QModelIndex(); } + inline QModelIndex parent(const QModelIndex &) const override { return {}; } inline int rowCount(const QModelIndex &parent = QModelIndex()) const override; inline int columnCount(const QModelIndex &parent = QModelIndex()) const override; diff --git a/src/qtui/settingspages/ignorelistmodel.cpp b/src/qtui/settingspages/ignorelistmodel.cpp index d95db34f..ade96f77 100644 --- a/src/qtui/settingspages/ignorelistmodel.cpp +++ b/src/qtui/settingspages/ignorelistmodel.cpp @@ -221,7 +221,7 @@ QModelIndex IgnoreListModel::index(int row, int column, const QModelIndex &paren { Q_UNUSED(parent); if (row >= rowCount() || column >= columnCount()) - return QModelIndex(); + return {}; return createIndex(row, column); } diff --git a/src/qtui/settingspages/ignorelistmodel.h b/src/qtui/settingspages/ignorelistmodel.h index fb83fd21..4af351e7 100644 --- a/src/qtui/settingspages/ignorelistmodel.h +++ b/src/qtui/settingspages/ignorelistmodel.h @@ -42,7 +42,7 @@ public: QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; - inline QModelIndex parent(const QModelIndex &) const override { return QModelIndex(); } + inline QModelIndex parent(const QModelIndex &) const override { return {}; } inline int rowCount(const QModelIndex &parent = QModelIndex()) const override; inline int columnCount(const QModelIndex &parent = QModelIndex()) const override; diff --git a/src/qtui/settingspages/shortcutsmodel.cpp b/src/qtui/settingspages/shortcutsmodel.cpp index 4eb5ab3f..372bafae 100644 --- a/src/qtui/settingspages/shortcutsmodel.cpp +++ b/src/qtui/settingspages/shortcutsmodel.cpp @@ -59,13 +59,13 @@ ShortcutsModel::~ShortcutsModel() QModelIndex ShortcutsModel::parent(const QModelIndex &child) const { if (!child.isValid()) - return QModelIndex(); + return {}; auto *item = static_cast(child.internalPointer()); Q_ASSERT(item); if (!item->parentItem) - return QModelIndex(); + return {}; return createIndex(item->parentItem->row, 0, item->parentItem); } diff --git a/src/qtui/verticaldock.cpp b/src/qtui/verticaldock.cpp index a4804670..ca156fae 100644 --- a/src/qtui/verticaldock.cpp +++ b/src/qtui/verticaldock.cpp @@ -34,13 +34,13 @@ VerticalDockTitle::VerticalDockTitle(QDockWidget *parent) QSize VerticalDockTitle::sizeHint() const { - return QSize(8, 15); + return {8, 15}; } QSize VerticalDockTitle::minimumSizeHint() const { - return QSize(8, 10); + return {8, 10}; } diff --git a/src/qtui/verticaldock.h b/src/qtui/verticaldock.h index f7bbe935..e6e6e132 100644 --- a/src/qtui/verticaldock.h +++ b/src/qtui/verticaldock.h @@ -50,7 +50,7 @@ class EmptyDockTitle : public QWidget public: inline EmptyDockTitle(QDockWidget *parent) : QWidget(parent) {} - inline QSize sizeHint() const override { return QSize(0, 0); } + inline QSize sizeHint() const override { return {0, 0}; } }; diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp index f1316953..620c2627 100644 --- a/src/uisupport/bufferview.cpp +++ b/src/uisupport/bufferview.cpp @@ -605,14 +605,14 @@ QSize BufferView::sizeHint() const return TreeViewTouch::sizeHint(); if (model()->rowCount() == 0) - return QSize(120, 50); + return {120, 50}; int columnSize = 0; for (int i = 0; i < model()->columnCount(); i++) { if (!isColumnHidden(i)) columnSize += sizeHintForColumn(i); } - return QSize(columnSize, 50); + return {columnSize, 50}; } diff --git a/src/uisupport/flatproxymodel.cpp b/src/uisupport/flatproxymodel.cpp index 8af50249..d722c18f 100644 --- a/src/uisupport/flatproxymodel.cpp +++ b/src/uisupport/flatproxymodel.cpp @@ -32,7 +32,7 @@ FlatProxyModel::FlatProxyModel(QObject *parent) QModelIndex FlatProxyModel::mapFromSource(const QModelIndex &sourceIndex) const { if (!sourceIndex.isValid()) - return QModelIndex(); + return {}; SourceItem *sourceItem = sourceToInternal(sourceIndex); Q_ASSERT(sourceItem); @@ -43,7 +43,7 @@ QModelIndex FlatProxyModel::mapFromSource(const QModelIndex &sourceIndex) const QModelIndex FlatProxyModel::mapToSource(const QModelIndex &proxyIndex) const { if (!proxyIndex.isValid()) - return QModelIndex(); + return {}; Q_ASSERT(proxyIndex.model() == this); Q_ASSERT(_rootSourceItem); @@ -63,7 +63,7 @@ QModelIndex FlatProxyModel::mapToSource(const QModelIndex &proxyIndex) const qWarning() << "FlatProxyModel::mapToSource(): couldn't find source index for" << proxyIndex; Q_ASSERT(false); - return QModelIndex(); // make compilers happy :) + return {}; // make compilers happy :) } @@ -367,12 +367,12 @@ QModelIndex FlatProxyModel::index(int row, int column, const QModelIndex &parent { if (parent.isValid()) { qWarning() << "FlatProxyModel::index() called with valid parent:" << parent; - return QModelIndex(); + return {}; } if (!_rootSourceItem) { qWarning() << "FlatProxyModel::index() while model has no root Item"; - return QModelIndex(); + return {}; } SourceItem *item = _rootSourceItem; @@ -380,7 +380,7 @@ QModelIndex FlatProxyModel::index(int row, int column, const QModelIndex &parent item = item->findChild(row); if (!item) { qWarning() << "FlatProxyModel::index() no such row:" << row; - return QModelIndex(); + return {}; } } @@ -393,7 +393,7 @@ QModelIndex FlatProxyModel::parent(const QModelIndex &index) const { Q_UNUSED(index) // this is a flat model - return QModelIndex(); + return {}; } diff --git a/src/uisupport/networkmodelcontroller.cpp b/src/uisupport/networkmodelcontroller.cpp index a6edb665..0112ed18 100644 --- a/src/uisupport/networkmodelcontroller.cpp +++ b/src/uisupport/networkmodelcontroller.cpp @@ -139,11 +139,11 @@ BufferId NetworkModelController::findQueryBuffer(const QModelIndex &index, const { NetworkId networkId = index.data(NetworkModel::NetworkIdRole).value(); if (!networkId.isValid()) - return BufferId(); + return {}; QString nick = predefinedNick.isEmpty() ? nickName(index) : predefinedNick; if (nick.isEmpty()) - return BufferId(); + return {}; return findQueryBuffer(networkId, nick); } diff --git a/src/uisupport/qssparser.cpp b/src/uisupport/qssparser.cpp index 031933a5..61679d95 100644 --- a/src/uisupport/qssparser.cpp +++ b/src/uisupport/qssparser.cpp @@ -630,7 +630,7 @@ QColor QssParser::parseColor(const QString &str) if (str.startsWith("rgba")) { ColorTuple tuple = parseColorTuple(str.mid(4)); if (tuple.count() == 4) - return QColor(tuple.at(0), tuple.at(1), tuple.at(2), tuple.at(3)); + return QColor(tuple.at(0), tuple.at(1), tuple.at(2), tuple.at(3)); // NOLINT(modernize-return-braced-init-list) } else if (str.startsWith("rgb")) { ColorTuple tuple = parseColorTuple(str.mid(3)); diff --git a/src/uisupport/resizingstackedwidget.cpp b/src/uisupport/resizingstackedwidget.cpp index c37522fa..2f007951 100644 --- a/src/uisupport/resizingstackedwidget.cpp +++ b/src/uisupport/resizingstackedwidget.cpp @@ -30,7 +30,7 @@ QSize ResizingStackedWidget::sizeHint() const { QWidget *widget = currentWidget(); if (!widget) - return QSize(); + return {}; return widget->sizeHint(); } -- 2.20.1