From 651329adb5e64b18a005e900e1b9c5e95d70258c Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Fri, 23 Jan 2015 13:09:03 +0400 Subject: [PATCH] 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 Reviewed-by: Oswald Buddenhagen Reviewed-by: Thiago Macieira --- src/dbus/qdbusmessage.cpp | 4 ++++ src/dbus/qdbusmessage.h | 4 ++++ src/gui/image/qimage.cpp | 8 ++++++++ src/gui/image/qimage.h | 6 +++++- src/widgets/graphicsview/qgraphicswidget.cpp | 4 ++++ src/widgets/graphicsview/qgraphicswidget.h | 4 ++++ src/widgets/itemviews/qlistwidget.cpp | 4 ++++ src/widgets/itemviews/qlistwidget.h | 4 ++++ src/widgets/itemviews/qtablewidget.cpp | 4 ++++ src/widgets/itemviews/qtablewidget.h | 4 ++++ src/widgets/itemviews/qtreewidget.cpp | 4 ++++ src/widgets/itemviews/qtreewidget.h | 4 ++++ src/widgets/kernel/qwidget.cpp | 4 ++++ src/widgets/kernel/qwidget.h | 4 ++++ src/widgets/widgets/qmenu.cpp | 4 ++++ src/widgets/widgets/qmenu.h | 4 ++++ 16 files changed, 69 insertions(+), 1 deletion(-) diff --git a/src/dbus/qdbusmessage.cpp b/src/dbus/qdbusmessage.cpp index 76afffaefd9..491e1273e7e 100644 --- a/src/dbus/qdbusmessage.cpp +++ b/src/dbus/qdbusmessage.cpp @@ -457,7 +457,11 @@ QDBusMessage QDBusMessage::createReply(const QVariantList &arguments) const Constructs a new DBus message representing an error reply message, with the given \a name and \a msg. */ +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) +QDBusMessage QDBusMessage::createErrorReply(const QString &name, const QString &msg) const +#else QDBusMessage QDBusMessage::createErrorReply(const QString name, const QString &msg) const +#endif { QDBusMessage reply = QDBusMessage::createError(name, msg); if (d_ptr->msg) diff --git a/src/dbus/qdbusmessage.h b/src/dbus/qdbusmessage.h index 6a3f4f4c8ac..77f34ec5e25 100644 --- a/src/dbus/qdbusmessage.h +++ b/src/dbus/qdbusmessage.h @@ -79,7 +79,11 @@ public: inline QDBusMessage createReply(const QVariant &argument) const { return createReply(QList() << argument); } +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) + QDBusMessage createErrorReply(const QString &name, const QString &msg) const; +#else QDBusMessage createErrorReply(const QString name, const QString &msg) const; +#endif inline QDBusMessage createErrorReply(const QDBusError &err) const { return createErrorReply(err.name(), err.message()); } QDBusMessage createErrorReply(QDBusError::ErrorType type, const QString &msg) const; diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index 57e7c9a7abd..e6f86fceaab 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -1351,7 +1351,11 @@ int QImage::colorCount() const \sa colorTable(), setColor(), {QImage#Image Transformations}{Image Transformations} */ +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) +void QImage::setColorTable(const QVector &colors) +#else void QImage::setColorTable(const QVector colors) +#endif { if (!d) return; @@ -1361,7 +1365,11 @@ void QImage::setColorTable(const QVector colors) if (!d) return; +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) + d->colortable = colors; +#else d->colortable = qMove(const_cast&>(colors)); +#endif d->has_alpha_clut = false; for (int i = 0; i < d->colortable.size(); ++i) { if (qAlpha(d->colortable.at(i)) != 255) { diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h index acfdc6fd7b7..4ce99b9ab15 100644 --- a/src/gui/image/qimage.h +++ b/src/gui/image/qimage.h @@ -220,7 +220,11 @@ public: void setPixel(const QPoint &pt, uint index_or_rgb); QVector colorTable() const; - void setColorTable(const QVector colors); // ### Qt 6: remove const +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) + void setColorTable(const QVector &colors); +#else + void setColorTable(const QVector colors); +#endif qreal devicePixelRatio() const; void setDevicePixelRatio(qreal scaleFactor); diff --git a/src/widgets/graphicsview/qgraphicswidget.cpp b/src/widgets/graphicsview/qgraphicswidget.cpp index 6d78b3bc99a..6f10e2854c8 100644 --- a/src/widgets/graphicsview/qgraphicswidget.cpp +++ b/src/widgets/graphicsview/qgraphicswidget.cpp @@ -1994,7 +1994,11 @@ void QGraphicsWidget::addAction(QAction *action) \sa removeAction(), QMenu, addAction(), QWidget::addActions() */ +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) +void QGraphicsWidget::addActions(const QList &actions) +#else void QGraphicsWidget::addActions(QList actions) +#endif { for (int i = 0; i < actions.count(); ++i) insertAction(0, actions.at(i)); diff --git a/src/widgets/graphicsview/qgraphicswidget.h b/src/widgets/graphicsview/qgraphicswidget.h index 8e64e180a51..3ecdeac1588 100644 --- a/src/widgets/graphicsview/qgraphicswidget.h +++ b/src/widgets/graphicsview/qgraphicswidget.h @@ -137,7 +137,11 @@ public: #ifndef QT_NO_ACTION //actions void addAction(QAction *action); +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) + void addActions(const QList &actions); +#else void addActions(QList actions); +#endif void insertAction(QAction *before, QAction *action); void insertActions(QAction *before, QList actions); void removeAction(QAction *action); diff --git a/src/widgets/itemviews/qlistwidget.cpp b/src/widgets/itemviews/qlistwidget.cpp index 0da077aef93..66f965aa54e 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 &items) const +#else QMimeData *QListWidget::mimeData(const QList items) const +#endif { Q_D(const QListWidget); diff --git a/src/widgets/itemviews/qlistwidget.h b/src/widgets/itemviews/qlistwidget.h index 84d4b63734d..8ab864c930e 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 &items) const; +#else virtual QMimeData *mimeData(const QList 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 b275313ef16..9ebcbc35a76 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 &items) const +#else QMimeData *QTableWidget::mimeData(const QList items) const +#endif { Q_D(const QTableWidget); diff --git a/src/widgets/itemviews/qtablewidget.h b/src/widgets/itemviews/qtablewidget.h index dd0b3b680d0..93639f0753b 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 &items) const; +#else virtual QMimeData *mimeData(const QList items) const; +#endif virtual bool dropMimeData(int row, int column, const QMimeData *data, Qt::DropAction action); virtual Qt::DropActions supportedDropActions() const; QList items(const QMimeData *data) const; diff --git a/src/widgets/itemviews/qtreewidget.cpp b/src/widgets/itemviews/qtreewidget.cpp index ed7da9aeb53..bf736bc3876 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 &items) const +#else QMimeData *QTreeWidget::mimeData(const QList 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 6a3aae3c780..564e10ac1a3 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 &items) const; +#else virtual QMimeData *mimeData(const QList items) const; +#endif virtual bool dropMimeData(QTreeWidgetItem *parent, int index, const QMimeData *data, Qt::DropAction action); virtual Qt::DropActions supportedDropActions() const; diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index ae76e751ba8..73815113e49 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -3227,7 +3227,11 @@ void QWidget::addAction(QAction *action) \sa removeAction(), QMenu, addAction() */ +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) +void QWidget::addActions(const QList &actions) +#else void QWidget::addActions(QList actions) +#endif { for(int i = 0; i < actions.count(); i++) insertAction(0, actions.at(i)); diff --git a/src/widgets/kernel/qwidget.h b/src/widgets/kernel/qwidget.h index 39581723bd2..c3913e9d454 100644 --- a/src/widgets/kernel/qwidget.h +++ b/src/widgets/kernel/qwidget.h @@ -536,7 +536,11 @@ public: #ifndef QT_NO_ACTION //actions void addAction(QAction *action); +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) + void addActions(const QList &actions); +#else void addActions(QList actions); +#endif void insertAction(QAction *before, QAction *action); void insertActions(QAction *before, QList actions); void removeAction(QAction *action); diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp index 9fd15ab7daa..1749f9d8c71 100644 --- a/src/widgets/widgets/qmenu.cpp +++ b/src/widgets/widgets/qmenu.cpp @@ -2336,7 +2336,11 @@ QAction *QMenu::exec(const QPoint &p, QAction *action) \sa popup(), QWidget::mapToGlobal() */ +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) +QAction *QMenu::exec(const QList &actions, const QPoint &pos, QAction *at, QWidget *parent) +#else QAction *QMenu::exec(QList actions, const QPoint &pos, QAction *at, QWidget *parent) +#endif { QMenu menu(parent); menu.addActions(actions); diff --git a/src/widgets/widgets/qmenu.h b/src/widgets/widgets/qmenu.h index f84349798dd..5dda8b23702 100644 --- a/src/widgets/widgets/qmenu.h +++ b/src/widgets/widgets/qmenu.h @@ -111,7 +111,11 @@ public: QAction *exec(); QAction *exec(const QPoint &pos, QAction *at=0); +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) + static QAction *exec(const QList &actions, const QPoint &pos, QAction *at = 0, QWidget *parent = 0); +#else static QAction *exec(QList actions, const QPoint &pos, QAction *at=0, QWidget *parent=0); +#endif QSize sizeHint() const Q_DECL_OVERRIDE;