diff options
author | Konstantin Ritt <ritt.ks@gmail.com> | 2015-01-23 13:09:03 +0400 |
---|---|---|
committer | Konstantin Ritt <ritt.ks@gmail.com> | 2015-02-13 16:29:25 +0000 |
commit | 651329adb5e64b18a005e900e1b9c5e95d70258c (patch) | |
tree | 94e8eace0a8e39390191eb37ddb4e5a89e434507 /src/widgets/itemviews | |
parent | 9b67d89c24666d405dd00e63bb56c924738aa002 (diff) | |
download | qtbase-651329adb5e64b18a005e900e1b9c5e95d70258c.tar.gz |
Pass params of shareable type by const-ref rather than by value
Instead of leaving a note for Qt6 and then forget to do
the actual change once again, change APIs now inside
QT_VERSION >= QT_VERSION_CHECK(6,0,0) blocks.
Change-Id: Ifa769904e304358a9c2accfd6c9f86eeb342f9dc
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/widgets/itemviews')
-rw-r--r-- | src/widgets/itemviews/qlistwidget.cpp | 4 | ||||
-rw-r--r-- | src/widgets/itemviews/qlistwidget.h | 4 | ||||
-rw-r--r-- | src/widgets/itemviews/qtablewidget.cpp | 4 | ||||
-rw-r--r-- | src/widgets/itemviews/qtablewidget.h | 4 | ||||
-rw-r--r-- | src/widgets/itemviews/qtreewidget.cpp | 4 | ||||
-rw-r--r-- | src/widgets/itemviews/qtreewidget.h | 4 |
6 files changed, 24 insertions, 0 deletions
diff --git a/src/widgets/itemviews/qlistwidget.cpp b/src/widgets/itemviews/qlistwidget.cpp index 0da077aef9..66f965aa54 100644 --- a/src/widgets/itemviews/qlistwidget.cpp +++ b/src/widgets/itemviews/qlistwidget.cpp @@ -1783,7 +1783,11 @@ QStringList QListWidget::mimeTypes() const If the list of items is empty, 0 is returned instead of a serialized empty list. */ +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) +QMimeData *QListWidget::mimeData(const QList<QListWidgetItem *> &items) const +#else QMimeData *QListWidget::mimeData(const QList<QListWidgetItem*> items) const +#endif { Q_D(const QListWidget); diff --git a/src/widgets/itemviews/qlistwidget.h b/src/widgets/itemviews/qlistwidget.h index 84d4b63734..8ab864c930 100644 --- a/src/widgets/itemviews/qlistwidget.h +++ b/src/widgets/itemviews/qlistwidget.h @@ -266,7 +266,11 @@ Q_SIGNALS: protected: bool event(QEvent *e) Q_DECL_OVERRIDE; virtual QStringList mimeTypes() const; +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) + virtual QMimeData *mimeData(const QList<QListWidgetItem *> &items) const; +#else virtual QMimeData *mimeData(const QList<QListWidgetItem*> items) const; +#endif #ifndef QT_NO_DRAGANDDROP virtual bool dropMimeData(int index, const QMimeData *data, Qt::DropAction action); virtual Qt::DropActions supportedDropActions() const; diff --git a/src/widgets/itemviews/qtablewidget.cpp b/src/widgets/itemviews/qtablewidget.cpp index b275313ef1..9ebcbc35a7 100644 --- a/src/widgets/itemviews/qtablewidget.cpp +++ b/src/widgets/itemviews/qtablewidget.cpp @@ -2553,7 +2553,11 @@ QStringList QTableWidget::mimeTypes() const If the list of items is empty, 0 is returned rather than a serialized empty list. */ +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) +QMimeData *QTableWidget::mimeData(const QList<QTableWidgetItem *> &items) const +#else QMimeData *QTableWidget::mimeData(const QList<QTableWidgetItem*> items) const +#endif { Q_D(const QTableWidget); diff --git a/src/widgets/itemviews/qtablewidget.h b/src/widgets/itemviews/qtablewidget.h index dd0b3b680d..93639f0753 100644 --- a/src/widgets/itemviews/qtablewidget.h +++ b/src/widgets/itemviews/qtablewidget.h @@ -313,7 +313,11 @@ Q_SIGNALS: protected: bool event(QEvent *e) Q_DECL_OVERRIDE; virtual QStringList mimeTypes() const; +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) + virtual QMimeData *mimeData(const QList<QTableWidgetItem *> &items) const; +#else virtual QMimeData *mimeData(const QList<QTableWidgetItem*> items) const; +#endif virtual bool dropMimeData(int row, int column, const QMimeData *data, Qt::DropAction action); virtual Qt::DropActions supportedDropActions() const; QList<QTableWidgetItem*> items(const QMimeData *data) const; diff --git a/src/widgets/itemviews/qtreewidget.cpp b/src/widgets/itemviews/qtreewidget.cpp index ed7da9aeb5..bf736bc387 100644 --- a/src/widgets/itemviews/qtreewidget.cpp +++ b/src/widgets/itemviews/qtreewidget.cpp @@ -3267,7 +3267,11 @@ QStringList QTreeWidget::mimeTypes() const If the list of items is empty, 0 is returned rather than a serialized empty list. */ +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) +QMimeData *QTreeWidget::mimeData(const QList<QTreeWidgetItem *> &items) const +#else QMimeData *QTreeWidget::mimeData(const QList<QTreeWidgetItem*> items) const +#endif { Q_D(const QTreeWidget); if (d->treeModel()->cachedIndexes.isEmpty()) { diff --git a/src/widgets/itemviews/qtreewidget.h b/src/widgets/itemviews/qtreewidget.h index 6a3aae3c78..564e10ac1a 100644 --- a/src/widgets/itemviews/qtreewidget.h +++ b/src/widgets/itemviews/qtreewidget.h @@ -340,7 +340,11 @@ Q_SIGNALS: protected: bool event(QEvent *e) Q_DECL_OVERRIDE; virtual QStringList mimeTypes() const; +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) + virtual QMimeData *mimeData(const QList<QTreeWidgetItem *> &items) const; +#else virtual QMimeData *mimeData(const QList<QTreeWidgetItem*> items) const; +#endif virtual bool dropMimeData(QTreeWidgetItem *parent, int index, const QMimeData *data, Qt::DropAction action); virtual Qt::DropActions supportedDropActions() const; |