From 5a9de4c6768e413a56f0e7b6c67ea11db761cd58 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Mon, 26 Nov 2012 14:27:37 +0100 Subject: Always use QAIM to get the default flags. Change-Id: I801f5c8023e3e3672fde28139a7f34f640e650f5 Reviewed-by: Lars Knoll --- examples/widgets/itemviews/editabletreemodel/treemodel.cpp | 2 +- examples/widgets/itemviews/interview/model.cpp | 2 +- examples/widgets/itemviews/puzzle/piecesmodel.cpp | 2 +- examples/widgets/itemviews/simpledommodel/dommodel.cpp | 2 +- examples/widgets/itemviews/simpletreemodel/treemodel.cpp | 2 +- examples/widgets/tutorials/modelview/5_edit/mymodel.cpp | 4 ++-- src/sql/models/qsqltablemodel.cpp | 4 ++-- src/widgets/doc/snippets/common-table-model/model.cpp | 2 +- util/local_database/testlocales/localemodel.cpp | 4 ++-- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/examples/widgets/itemviews/editabletreemodel/treemodel.cpp b/examples/widgets/itemviews/editabletreemodel/treemodel.cpp index 4eb2abdd6f..f3f961e59e 100644 --- a/examples/widgets/itemviews/editabletreemodel/treemodel.cpp +++ b/examples/widgets/itemviews/editabletreemodel/treemodel.cpp @@ -89,7 +89,7 @@ Qt::ItemFlags TreeModel::flags(const QModelIndex &index) const if (!index.isValid()) return 0; - return Qt::ItemIsEditable | Qt::ItemIsEnabled | Qt::ItemIsSelectable; + return Qt::ItemIsEditable | QAbstractItemModel::flags(index); } //! [3] diff --git a/examples/widgets/itemviews/interview/model.cpp b/examples/widgets/itemviews/interview/model.cpp index e99eb477fb..aaecc72b32 100644 --- a/examples/widgets/itemviews/interview/model.cpp +++ b/examples/widgets/itemviews/interview/model.cpp @@ -125,7 +125,7 @@ Qt::ItemFlags Model::flags(const QModelIndex &index) const { if (!index.isValid()) return 0; - return (Qt::ItemIsDragEnabled|Qt::ItemIsSelectable|Qt::ItemIsEnabled); + return Qt::ItemIsDragEnabled|QAbstractItemModel::flags(index); } Model::Node *Model::node(int row, Node *parent) const diff --git a/examples/widgets/itemviews/puzzle/piecesmodel.cpp b/examples/widgets/itemviews/puzzle/piecesmodel.cpp index 29ce9c8ea5..c7ff78a049 100644 --- a/examples/widgets/itemviews/puzzle/piecesmodel.cpp +++ b/examples/widgets/itemviews/puzzle/piecesmodel.cpp @@ -81,7 +81,7 @@ void PiecesModel::addPiece(const QPixmap &pixmap, const QPoint &location) Qt::ItemFlags PiecesModel::flags(const QModelIndex &index) const { if (index.isValid()) - return (Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled); + return (QAbstractListModel::flags(index)|Qt::ItemIsDragEnabled); return Qt::ItemIsDropEnabled; } diff --git a/examples/widgets/itemviews/simpledommodel/dommodel.cpp b/examples/widgets/itemviews/simpledommodel/dommodel.cpp index cf43ebdf3c..7280466ad1 100644 --- a/examples/widgets/itemviews/simpledommodel/dommodel.cpp +++ b/examples/widgets/itemviews/simpledommodel/dommodel.cpp @@ -105,7 +105,7 @@ Qt::ItemFlags DomModel::flags(const QModelIndex &index) const if (!index.isValid()) return 0; - return Qt::ItemIsEnabled | Qt::ItemIsSelectable; + return QAbstractItemModel::flags(index); } //! [5] diff --git a/examples/widgets/itemviews/simpletreemodel/treemodel.cpp b/examples/widgets/itemviews/simpletreemodel/treemodel.cpp index 363aa0593a..0eef22d45b 100644 --- a/examples/widgets/itemviews/simpletreemodel/treemodel.cpp +++ b/examples/widgets/itemviews/simpletreemodel/treemodel.cpp @@ -99,7 +99,7 @@ Qt::ItemFlags TreeModel::flags(const QModelIndex &index) const if (!index.isValid()) return 0; - return Qt::ItemIsEnabled | Qt::ItemIsSelectable; + return QAbstractItemModel::flags(index); } //! [4] diff --git a/examples/widgets/tutorials/modelview/5_edit/mymodel.cpp b/examples/widgets/tutorials/modelview/5_edit/mymodel.cpp index f64e0d563a..7792c1cc2b 100644 --- a/examples/widgets/tutorials/modelview/5_edit/mymodel.cpp +++ b/examples/widgets/tutorials/modelview/5_edit/mymodel.cpp @@ -94,8 +94,8 @@ bool MyModel::setData(const QModelIndex & index, const QVariant & value, int rol //----------------------------------------------------------------- //! [quoting mymodel_f] -Qt::ItemFlags MyModel::flags(const QModelIndex & /*index*/) const +Qt::ItemFlags MyModel::flags(const QModelIndex &index) const { - return Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsEnabled ; + return Qt::ItemIsEditable | QAbstractTableModel::flags(index); } //! [quoting mymodel_f] diff --git a/src/sql/models/qsqltablemodel.cpp b/src/sql/models/qsqltablemodel.cpp index d685c7e0be..27e1c3e483 100644 --- a/src/sql/models/qsqltablemodel.cpp +++ b/src/sql/models/qsqltablemodel.cpp @@ -1307,9 +1307,9 @@ Qt::ItemFlags QSqlTableModel::flags(const QModelIndex &index) const } if (!editable) - return Qt::ItemIsSelectable | Qt::ItemIsEnabled; + return QSqlQueryModel::flags(index); else - return Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsEditable; + return QSqlQueryModel::flags(index) | Qt::ItemIsEditable; } QSqlRecord QSqlTableModel::record() const diff --git a/src/widgets/doc/snippets/common-table-model/model.cpp b/src/widgets/doc/snippets/common-table-model/model.cpp index 7bcae20dc7..6500078aaf 100644 --- a/src/widgets/doc/snippets/common-table-model/model.cpp +++ b/src/widgets/doc/snippets/common-table-model/model.cpp @@ -134,7 +134,7 @@ Qt::ItemFlags TableModel::flags(const QModelIndex &index) const if (!index.isValid()) return Qt::ItemIsEnabled; - return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable; + return QAbstractTableModel::flags(index) | Qt::ItemIsEditable; } /*! diff --git a/util/local_database/testlocales/localemodel.cpp b/util/local_database/testlocales/localemodel.cpp index 9bfb8638a0..1cc101997c 100644 --- a/util/local_database/testlocales/localemodel.cpp +++ b/util/local_database/testlocales/localemodel.cpp @@ -441,8 +441,8 @@ Qt::ItemFlags LocaleModel::flags(const QModelIndex &index) const if (index.row() == 0 && index.column() == g_model_cols - 1) return 0; if (index.row() == 0) - return Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsEnabled; - return Qt::ItemIsSelectable | Qt::ItemIsEnabled; + return QAbstractItemModel::flags(index) | Qt::ItemIsEditable; + return QAbstractItemModel::flags(index); } bool LocaleModel::setData(const QModelIndex &index, const QVariant &value, int role) -- cgit v1.2.3