AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Models: remove version check for clearItemData()

Browse Source 
The version checks for clearItemData() are no longer needed now.

Change-Id: I5052188fb96cf637128662f3442d339820f0f41d
Reviewed-by: David Faure <david.faure@kdab.com>
This commit is contained in:
Christian Ehrlicher 2020-05-13 21:07:22 +02:00
parent ee3994384a
commit c7ef17b231
6 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/itemmodels/qstringlistmodel.cpp
View File

@ -231,7 +231,6 @@ bool QStringListModel::setData(const QModelIndex &index, const QVariant &value,
return false; return false;
} }
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
/*! /*!
\reimp \reimp
\since 6.0 \since 6.0
@ -240,7 +239,6 @@ bool QStringListModel::clearItemData(const QModelIndex &index)
{ {
return setData(index, QVariant(), Qt::EditRole); return setData(index, QVariant(), Qt::EditRole);
} }
#endif
/*! /*!
Inserts \a count rows into the model, beginning at the given \a row. Inserts \a count rows into the model, beginning at the given \a row.

2
src/corelib/itemmodels/qstringlistmodel.h
View File

@ -59,9 +59,7 @@ public:
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
bool clearItemData(const QModelIndex &index) override; bool clearItemData(const QModelIndex &index) override;
#endif
Qt::ItemFlags flags(const QModelIndex &index) const override; Qt::ItemFlags flags(const QModelIndex &index) const override;

11
src/gui/itemmodels/qstandarditemmodel.cpp
View File

@ -2994,20 +2994,9 @@ bool QStandardItemModel::setData(const QModelIndex &index, const QVariant &value
return true; return true;
} }
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
/*! /*!
\reimp \reimp
*/ */
#else
/*!
\since 5.12
Removes the data stored in all the roles for the given \a index.
Returns \c true if \a index is valid and data was cleared, \c false
otherwise.
\sa setData(), data()
*/
#endif
bool QStandardItemModel::clearItemData(const QModelIndex &index) bool QStandardItemModel::clearItemData(const QModelIndex &index)
{ {
if (!checkIndex(index, CheckIndexOption::IndexIsValid)) if (!checkIndex(index, CheckIndexOption::IndexIsValid))

6
src/gui/itemmodels/qstandarditemmodel.h
View File

@ -333,11 +333,7 @@ public:
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
bool clearItemData(const QModelIndex &index) bool clearItemData(const QModelIndex &index) override;
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
override
#endif
;
QVariant headerData(int section, Qt::Orientation orientation, QVariant headerData(int section, Qt::Orientation orientation,
int role = Qt::DisplayRole) const override; int role = Qt::DisplayRole) const override;

2
src/sql/models/qsqltablemodel.cpp
View File

@ -607,7 +607,6 @@ bool QSqlTableModel::setData(const QModelIndex &index, const QVariant &value, in
return true; return true;
} }
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
/*! /*!
\reimp \reimp
*/ */
@ -615,7 +614,6 @@ bool QSqlTableModel::clearItemData(const QModelIndex &index)
{ {
return setData(index, QVariant(), Qt::EditRole); return setData(index, QVariant(), Qt::EditRole);
} }
#endif
/*! /*!
This function simply calls QSqlQueryModel::setQuery(\a query). This function simply calls QSqlQueryModel::setQuery(\a query).

2
src/sql/models/qsqltablemodel.h
View File

@ -74,9 +74,7 @@ public:
QSqlRecord record(int row) const; QSqlRecord record(int row) const;
QVariant data(const QModelIndex &idx, int role = Qt::DisplayRole) const override; QVariant data(const QModelIndex &idx, int role = Qt::DisplayRole) const override;
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
bool clearItemData(const QModelIndex &index) override; bool clearItemData(const QModelIndex &index) override;
#endif
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;