Always use QAIM to get the default flags.

Change-Id: I801f5c8023e3e3672fde28139a7f34f640e650f5
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
This commit is contained in:
Stephen Kelly 2012-11-26 14:27:37 +01:00 committed by The Qt Project
parent 5dcc36b15c
commit 5a9de4c676
9 changed files with 12 additions and 12 deletions

View File

@ -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]

View File

@ -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

View File

@ -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;
}

View File

@ -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]

View File

@ -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]

View File

@ -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]

View File

@ -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

View File

@ -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;
}
/*!

View File

@ -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)