diff options
Diffstat (limited to 'tests/benchmarks/widgets')
24 files changed, 27 insertions, 27 deletions
diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemview.h b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemview.h index 8cd295ba89..80c3b3b943 100644 --- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemview.h +++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemview.h @@ -44,7 +44,7 @@ class AbstractItemView : public AbstractScrollArea { Q_OBJECT public: - AbstractItemView(QGraphicsWidget *parent = 0); + AbstractItemView(QGraphicsWidget *parent = nullptr); virtual ~AbstractItemView(); virtual void setContainer(AbstractItemContainer *container); virtual void setModel(QAbstractItemModel *model, AbstractViewItem *prototype); diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractscrollarea.h b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractscrollarea.h index f681ca9fce..4c530b2059 100644 --- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractscrollarea.h +++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractscrollarea.h @@ -40,7 +40,7 @@ class AbstractScrollArea : public GvbWidget public: - AbstractScrollArea(QGraphicsWidget *parent = 0); + AbstractScrollArea(QGraphicsWidget *parent = nullptr); ~AbstractScrollArea(); public: diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractviewitem.h b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractviewitem.h index 4f9fbf4623..423ed4f654 100644 --- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractviewitem.h +++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractviewitem.h @@ -41,7 +41,7 @@ class AbstractViewItem : public GvbWidget { Q_OBJECT public: - AbstractViewItem(QGraphicsWidget *parent = 0); + AbstractViewItem(QGraphicsWidget *parent = nullptr); virtual ~AbstractViewItem(); virtual AbstractViewItem *newItemInstance() = 0; diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/gvbwidget.h b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/gvbwidget.h index 1212703ddb..f9f0a9a2cd 100644 --- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/gvbwidget.h +++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/gvbwidget.h @@ -37,7 +37,7 @@ class GvbWidget : public QGraphicsWidget public: - GvbWidget(QGraphicsItem * parent = 0, Qt::WindowFlags wFlags = { }); + GvbWidget(QGraphicsItem * parent = nullptr, Qt::WindowFlags wFlags = { }); ~GvbWidget(); virtual void keyPressEvent(QKeyEvent *event); }; diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.h b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.h index 48d1bafe9f..a2dc81e4f5 100644 --- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.h +++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.h @@ -42,7 +42,7 @@ class IconItem : public GvbWidget public: - IconItem(const QString &filename = "", QGraphicsItem *parent = 0); + IconItem(const QString &filename = "", QGraphicsItem *parent = nullptr); virtual ~IconItem(); diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglist.h b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglist.h index a69b60c9e2..15969a6e09 100644 --- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglist.h +++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglist.h @@ -42,7 +42,7 @@ class ItemRecyclingList : public ItemRecyclingListView Q_OBJECT public: - ItemRecyclingList(const int itemBuffer = 4, QGraphicsWidget * parent = 0); + ItemRecyclingList(const int itemBuffer = 4, QGraphicsWidget * parent = nullptr); virtual ~ItemRecyclingList(); virtual void insertItem(int index, RecycledListItem *item); diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglistview.h b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglistview.h index 467f193604..28c5c0acb0 100644 --- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglistview.h +++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglistview.h @@ -34,7 +34,7 @@ class ItemRecyclingListView : public AbstractItemView { public: - ItemRecyclingListView(QGraphicsWidget * parent = 0); + ItemRecyclingListView(QGraphicsWidget * parent = nullptr); virtual ~ItemRecyclingListView(); void setCurrentRow(const int row); int rows() const; diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/label.h b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/label.h index 2c1f14b20e..1ecbe8ae49 100644 --- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/label.h +++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/label.h @@ -41,7 +41,7 @@ class Label : public GvbWidget public: - Label(const QString& text, QGraphicsItem *parent = 0); + Label(const QString& text, QGraphicsItem *parent = nullptr); ~Label(); public: diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/listitem.h b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/listitem.h index 4f033803ac..db08e948b0 100644 --- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/listitem.h +++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/listitem.h @@ -57,7 +57,7 @@ public: RightIcon = 1 }; - ListItem(QGraphicsWidget *parent = 0); + ListItem(QGraphicsWidget *parent = nullptr); virtual ~ListItem(); void setIcon(IconItem *iconItem, const IconItemPos iconPos); diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/listmodel.h b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/listmodel.h index 623c90dedc..d58db8de41 100644 --- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/listmodel.h +++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/listmodel.h @@ -40,7 +40,7 @@ class ListModel : public QAbstractListModel public: - ListModel(QObject *parent = 0); + ListModel(QObject *parent = nullptr); ~ListModel(); public: diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/listwidget.h b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/listwidget.h index 0dfd41a1c3..a1120d1871 100644 --- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/listwidget.h +++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/listwidget.h @@ -44,7 +44,7 @@ class ListWidget : public GvbWidget Q_OBJECT public: - ListWidget(QGraphicsWidget * parent = 0); + ListWidget(QGraphicsWidget * parent = nullptr); virtual ~ListWidget(); void addItem(QGraphicsWidget *item); void insertItem(int index, QGraphicsWidget *item); diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/mainview.h b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/mainview.h index e92f46a53b..23043136f3 100644 --- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/mainview.h +++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/mainview.h @@ -49,7 +49,7 @@ class MainView : public QGraphicsView { Q_OBJECT public: - MainView(const bool enableOpenGL, const bool outputFps, const bool imageBasedRendering = false, QWidget *parent = 0); + MainView(const bool enableOpenGL, const bool outputFps, const bool imageBasedRendering = false, QWidget *parent = nullptr); ~MainView(); void setTestWidget(QGraphicsWidget *testWidget); diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/scroller.h b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/scroller.h index 8f40dcfd16..d81db64d5e 100644 --- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/scroller.h +++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/scroller.h @@ -40,7 +40,7 @@ class Scroller : public QObject public: - Scroller(QObject *parent = 0); + Scroller(QObject *parent = nullptr); virtual ~Scroller(); public: diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.h b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.h index ad606cda8f..34eb7594ad 100644 --- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.h +++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.h @@ -41,7 +41,7 @@ class SimpleListView : public AbstractScrollArea public: - SimpleListView(QGraphicsWidget *parent = 0); + SimpleListView(QGraphicsWidget *parent = nullptr); virtual ~SimpleListView(); public: diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/theme.h b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/theme.h index 4aafd0c288..1e5cd8ad3b 100644 --- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/theme.h +++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/theme.h @@ -89,7 +89,7 @@ signals: void themeChanged(); private: - Theme(QObject *parent = 0); + Theme(QObject *parent = nullptr); void setBlueTheme(); void setLimeTheme(); diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/webview.h b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/webview.h index a18df35957..d5d32f146f 100644 --- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/webview.h +++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/webview.h @@ -40,7 +40,7 @@ class WebView : public AbstractScrollArea public: - WebView(QGraphicsWidget *parent = 0); + WebView(QGraphicsWidget *parent = nullptr); ~WebView(); public: diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp b/tests/benchmarks/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp index e0c5a7f683..3531ae2263 100644 --- a/tests/benchmarks/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp +++ b/tests/benchmarks/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp @@ -54,7 +54,7 @@ private slots: class RectWidget : public QGraphicsWidget { public: - RectWidget(QGraphicsItem *parent = 0) : QGraphicsWidget(parent){} + RectWidget(QGraphicsItem *parent = nullptr) : QGraphicsWidget(parent){} void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp b/tests/benchmarks/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp index bd7899e671..6cb3140e58 100644 --- a/tests/benchmarks/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp +++ b/tests/benchmarks/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp @@ -47,7 +47,7 @@ private slots: class RectWidget : public QGraphicsWidget { public: - RectWidget(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = { }) : QGraphicsWidget(parent, wFlags), setGeometryCalls(0) {} + RectWidget(QGraphicsItem *parent = nullptr, Qt::WindowFlags wFlags = { }) : QGraphicsWidget(parent, wFlags), setGeometryCalls(0) {} void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/chipTest/mainwindow.h b/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/chipTest/mainwindow.h index b0e12b448a..dd3cc2a2ad 100644 --- a/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/chipTest/mainwindow.h +++ b/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/chipTest/mainwindow.h @@ -41,7 +41,7 @@ class MainWindow : public QWidget { Q_OBJECT public: - MainWindow(QWidget *parent = 0); + MainWindow(QWidget *parent = nullptr); private: void setupMatrix(); diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/chipTest/view.h b/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/chipTest/view.h index e20543858b..a31b07f3f7 100644 --- a/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/chipTest/view.h +++ b/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/chipTest/view.h @@ -40,7 +40,7 @@ class View : public QFrame { Q_OBJECT public: - View(const QString &name, QWidget *parent = 0); + View(const QString &name, QWidget *parent = nullptr); QGraphicsView *view() const; diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chiptester.h b/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chiptester.h index 467c3fb293..c615635ad4 100644 --- a/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chiptester.h +++ b/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chiptester.h @@ -47,7 +47,7 @@ public: ZoomInOut, Translate }; - ChipTester(QWidget *parent = 0); + ChipTester(QWidget *parent = nullptr); void setAntialias(bool enabled); void runBenchmark(); diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/benchmarks/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp index 27f5a90bab..54bc3a0115 100644 --- a/tests/benchmarks/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/benchmarks/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp @@ -469,7 +469,7 @@ void tst_QGraphicsView::deepNesting() class AnimatedPixmapItem : public QGraphicsPixmapItem { public: - AnimatedPixmapItem(int x, int y, bool rot, bool scal, QGraphicsItem *parent = 0) + AnimatedPixmapItem(int x, int y, bool rot, bool scal, QGraphicsItem *parent = nullptr) : QGraphicsPixmapItem(parent), rotateFactor(0), scaleFactor(0) { rotate = rot; @@ -576,7 +576,7 @@ void tst_QGraphicsView::imageRiver() class AnimatedTextItem : public QGraphicsSimpleTextItem { public: - AnimatedTextItem(int x, int y, bool rot, bool scal, QGraphicsItem *parent = 0) + AnimatedTextItem(int x, int y, bool rot, bool scal, QGraphicsItem *parent = nullptr) : QGraphicsSimpleTextItem(parent), rotateFactor(0), scaleFactor(25) { setText("River of text"); @@ -686,7 +686,7 @@ void tst_QGraphicsView::textRiver() class AnimatedPixmapCacheItem : public QGraphicsPixmapItem { public: - AnimatedPixmapCacheItem(int x, int y, QGraphicsItem *parent = 0) + AnimatedPixmapCacheItem(int x, int y, QGraphicsItem *parent = nullptr) : QGraphicsPixmapItem(parent) { xspeed = x; @@ -787,7 +787,7 @@ void tst_QGraphicsView::moveItemCache() class UpdatedPixmapCacheItem : public QGraphicsPixmapItem { public: - UpdatedPixmapCacheItem(bool partial, QGraphicsItem *parent = 0) + UpdatedPixmapCacheItem(bool partial, QGraphicsItem *parent = nullptr) : QGraphicsPixmapItem(parent), partial(partial) { } diff --git a/tests/benchmarks/widgets/itemviews/qtableview/tst_qtableview.cpp b/tests/benchmarks/widgets/itemviews/qtableview/tst_qtableview.cpp index 858d8a4ff8..007f12516f 100644 --- a/tests/benchmarks/widgets/itemviews/qtableview/tst_qtableview.cpp +++ b/tests/benchmarks/widgets/itemviews/qtableview/tst_qtableview.cpp @@ -40,7 +40,7 @@ class QtTestTableModel: public QAbstractTableModel public: - QtTestTableModel(int rows = 0, int columns = 0, QObject *parent = 0) + QtTestTableModel(int rows = 0, int columns = 0, QObject *parent = nullptr) : QAbstractTableModel(parent), row_count(rows), column_count(columns) {} diff --git a/tests/benchmarks/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/benchmarks/widgets/kernel/qwidget/tst_qwidget.cpp index b9af7a55cd..4e000ef88e 100644 --- a/tests/benchmarks/widgets/kernel/qwidget/tst_qwidget.cpp +++ b/tests/benchmarks/widgets/kernel/qwidget/tst_qwidget.cpp @@ -46,7 +46,7 @@ public: fill(rows, columns); } - UpdateWidget(QWidget *parent = 0) + UpdateWidget(QWidget *parent = nullptr) : QWidget(parent), rowCount(0), columnCount(0), opaqueChildren(false) {} void fill(int rows, int columns) |