diff options
author | Denis Shienkov <denis.shienkov@gmail.com> | 2019-02-26 14:38:54 +0300 |
---|---|---|
committer | Denis Shienkov <denis.shienkov@gmail.com> | 2019-02-26 15:52:26 +0000 |
commit | 4fd17d627106fde01284075038e15cc0680611bc (patch) | |
tree | 25c5b7e8ec774d362ad97e86d0ecd1d8527fbac5 /src/lib/corelib/tools/settingsmodel.cpp | |
parent | 0b8f0b771080e51a59664782ced6b3a1cc5111ca (diff) | |
download | qbs-4fd17d627106fde01284075038e15cc0680611bc.tar.gz |
Return initializer list where it is possible
This fixes this clang-tidy warning:
warning: avoid repeating the return type from the declaration; use a braced initializer list instead [modernize-return-braced-init-list]
Change-Id: I421e1e47462fe0e97788672684d47943af7df850
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/lib/corelib/tools/settingsmodel.cpp')
-rw-r--r-- | src/lib/corelib/tools/settingsmodel.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/corelib/tools/settingsmodel.cpp b/src/lib/corelib/tools/settingsmodel.cpp index bbfa71ead..4a90773eb 100644 --- a/src/lib/corelib/tools/settingsmodel.cpp +++ b/src/lib/corelib/tools/settingsmodel.cpp @@ -207,7 +207,7 @@ void SettingsModel::setAdditionalProperties(const QVariantMap &properties) Qt::ItemFlags SettingsModel::flags(const QModelIndex &index) const { if (!index.isValid()) - return Qt::ItemFlags(); + return Qt::NoItemFlags; const Qt::ItemFlags flags(Qt::ItemIsEnabled | Qt::ItemIsSelectable); if (index.column() == keyColumn()) { if (d->editable) @@ -217,25 +217,25 @@ Qt::ItemFlags SettingsModel::flags(const QModelIndex &index) const if (index.column() == valueColumn()) { const Node * const node = d->indexToNode(index); if (!node) - return Qt::ItemFlags(); + return Qt::NoItemFlags; // Only leaf nodes have values. return d->editable && node->children.empty() ? flags | Qt::ItemIsEditable : flags; } - return Qt::ItemFlags(); + return {}; } QVariant SettingsModel::headerData(int section, Qt::Orientation orientation, int role) const { if (orientation != Qt::Horizontal) - return QVariant(); + return {}; if (role != Qt::DisplayRole) - return QVariant(); + return {}; if (section == keyColumn()) return tr("Key"); if (section == valueColumn()) return tr("Value"); - return QVariant(); + return {}; } int SettingsModel::columnCount(const QModelIndex &parent) const @@ -256,22 +256,22 @@ int SettingsModel::rowCount(const QModelIndex &parent) const QVariant SettingsModel::data(const QModelIndex &index, int role) const { if (role != Qt::DisplayRole && role != Qt::EditRole && role != Qt::ForegroundRole) - return QVariant(); + return {}; const Node * const node = d->indexToNode(index); if (!node) - return QVariant(); + return {}; if (role == Qt::ForegroundRole) { #ifdef QT_GUI_LIB if (index.column() == valueColumn() && !node->isFromSettings) return QBrush(Qt::red); #endif - return QVariant(); + return {}; } if (index.column() == keyColumn()) return node->name; if (index.column() == valueColumn() && node->children.empty()) return node->value; - return QVariant(); + return {}; } bool SettingsModel::setData(const QModelIndex &index, const QVariant &value, int role) @@ -306,7 +306,7 @@ QModelIndex SettingsModel::index(int row, int column, const QModelIndex &parent) const Node * const parentNode = d->indexToNode(parent); Q_ASSERT(parentNode); if (parentNode->children.size() <= row) - return QModelIndex(); + return {}; return createIndex(row, column, parentNode->children.at(row)); } @@ -316,7 +316,7 @@ QModelIndex SettingsModel::parent(const QModelIndex &child) const Q_ASSERT(childNode); Node * const parentNode = childNode->parent; if (parentNode == &d->rootNode) - return QModelIndex(); + return {}; const Node * const grandParentNode = parentNode->parent; Q_ASSERT(grandParentNode); return createIndex(grandParentNode->children.indexOf(parentNode), 0, parentNode); |