summaryrefslogtreecommitdiffstats
path: root/src/widgets
diff options
context:
space:
mode:
authorKonstantin Ritt <ritt.ks@gmail.com>2015-01-23 13:09:03 +0400
committerKonstantin Ritt <ritt.ks@gmail.com>2015-02-13 16:29:25 +0000
commit651329adb5e64b18a005e900e1b9c5e95d70258c (patch)
tree94e8eace0a8e39390191eb37ddb4e5a89e434507 /src/widgets
parent9b67d89c24666d405dd00e63bb56c924738aa002 (diff)
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')
-rw-r--r--src/widgets/graphicsview/qgraphicswidget.cpp4
-rw-r--r--src/widgets/graphicsview/qgraphicswidget.h4
-rw-r--r--src/widgets/itemviews/qlistwidget.cpp4
-rw-r--r--src/widgets/itemviews/qlistwidget.h4
-rw-r--r--src/widgets/itemviews/qtablewidget.cpp4
-rw-r--r--src/widgets/itemviews/qtablewidget.h4
-rw-r--r--src/widgets/itemviews/qtreewidget.cpp4
-rw-r--r--src/widgets/itemviews/qtreewidget.h4
-rw-r--r--src/widgets/kernel/qwidget.cpp4
-rw-r--r--src/widgets/kernel/qwidget.h4
-rw-r--r--src/widgets/widgets/qmenu.cpp4
-rw-r--r--src/widgets/widgets/qmenu.h4
12 files changed, 48 insertions, 0 deletions
diff --git a/src/widgets/graphicsview/qgraphicswidget.cpp b/src/widgets/graphicsview/qgraphicswidget.cpp
index 6d78b3bc99..6f10e2854c 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<QAction *> &actions)
+#else
void QGraphicsWidget::addActions(QList<QAction *> 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 8e64e180a5..3ecdeac158 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<QAction*> &actions);
+#else
void addActions(QList<QAction*> actions);
+#endif
void insertAction(QAction *before, QAction *action);
void insertActions(QAction *before, QList<QAction*> actions);
void removeAction(QAction *action);
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;
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index ae76e751ba..73815113e4 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<QAction *> &actions)
+#else
void QWidget::addActions(QList<QAction*> 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 39581723bd..c3913e9d45 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<QAction*> &actions);
+#else
void addActions(QList<QAction*> actions);
+#endif
void insertAction(QAction *before, QAction *action);
void insertActions(QAction *before, QList<QAction*> actions);
void removeAction(QAction *action);
diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp
index 9fd15ab7da..1749f9d8c7 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<QAction *> &actions, const QPoint &pos, QAction *at, QWidget *parent)
+#else
QAction *QMenu::exec(QList<QAction*> 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 f84349798d..5dda8b2370 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<QAction *> &actions, const QPoint &pos, QAction *at = 0, QWidget *parent = 0);
+#else
static QAction *exec(QList<QAction*> actions, const QPoint &pos, QAction *at=0, QWidget *parent=0);
+#endif
QSize sizeHint() const Q_DECL_OVERRIDE;