From 564b59d903683b14c75b72a3e93367717f201def Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 7 Oct 2020 13:05:48 +0200 Subject: Another round of replacing 0 with nullptr This time based on grepping to also include documentation, tests and examples previously missed by the automatic tool. Change-Id: Ied1703f4bcc470fbc275f759ed5b7c588a5c4e9f Reviewed-by: Qt CI Bot Reviewed-by: Friedemann Kleint --- tests/manual/cocoa/appicon/main.cpp | 2 +- tests/manual/cocoa/menurama/mainwindow.h | 2 +- tests/manual/cocoa/qt_on_cocoa/rasterwindow.h | 2 +- tests/manual/cocoa/wheelevent/window.h | 2 +- tests/manual/dialogs/colordialogpanel.cpp | 2 +- tests/manual/dialogs/colordialogpanel.h | 2 +- tests/manual/dialogs/filedialogpanel.cpp | 2 +- tests/manual/dialogs/filedialogpanel.h | 2 +- tests/manual/dialogs/fontdialogpanel.h | 2 +- tests/manual/dialogs/main.cpp | 4 ++-- tests/manual/dialogs/messageboxpanel.h | 2 +- tests/manual/dialogs/printdialogpanel.cpp | 2 +- tests/manual/dialogs/printdialogpanel.h | 2 +- tests/manual/dialogs/wizardpanel.cpp | 8 ++++---- tests/manual/dialogs/wizardpanel.h | 2 +- tests/manual/gestures/graphicsview/gestures.h | 2 +- tests/manual/gestures/graphicsview/main.cpp | 8 ++++---- tests/manual/gestures/scrollarea/main.cpp | 4 ++-- tests/manual/inputmethodhints/inputmethodhints.h | 2 +- tests/manual/keypadnavigation/main.cpp | 2 +- tests/manual/network_stresstest/minihttpserver.h | 2 +- tests/manual/qcursor/allcursors/mainwindow.h | 2 +- tests/manual/qcursor/grab_override/mainwindow.h | 2 +- tests/manual/qgraphicsitem/main.cpp | 2 +- tests/manual/qgraphicsitemgroup/widget.h | 2 +- tests/manual/qlayout/gridwidget.h | 2 +- tests/manual/qlayout/hbwidget.h | 2 +- tests/manual/qlayout/mainwindow.h | 2 +- tests/manual/qlayout/vbwidget.h | 2 +- tests/manual/qopenglwidget/openglwidget/openglwidget.h | 2 +- tests/manual/qscreen/propertyfield.h | 2 +- tests/manual/qtabbar/tabbarform.h | 2 +- tests/manual/qtbug-8933/widget.h | 2 +- tests/manual/qtexteditlist/widget.h | 2 +- tests/manual/qtouchevent/main.cpp | 2 +- tests/manual/qtouchevent/touchwidget.h | 2 +- tests/manual/repaint/shared/shared.h | 2 +- tests/manual/repaint/tableview/main.cpp | 2 +- tests/manual/textrendering/textperformance/main.cpp | 2 +- tests/manual/transientwindow/mainwindow.h | 2 +- tests/manual/widgetgrab/main.cpp | 2 +- tests/manual/widgets/itemviews/delegate/example.cpp | 2 +- tests/manual/widgets/itemviews/qheaderview/qheaderviewtest1.cpp | 2 +- tests/manual/widgets/widgets/bigmenucreator/mainwindow.h | 2 +- tests/manual/widgets/widgets/defaultUpMenuBar/main.cpp | 2 +- tests/manual/widgets/widgets/multiscreen-menus/mainwindow.h | 2 +- .../widgets/widgets/qtoolbutton/menuOnMultiScreens/main.cpp | 2 +- tests/manual/windowchildgeometry/controllerwidget.cpp | 2 +- tests/manual/windowchildgeometry/controllerwidget.h | 2 +- tests/manual/windowflags/controllerwindow.cpp | 2 +- tests/manual/windowflags/controllerwindow.h | 4 ++-- tests/manual/windowflags/previewwindow.h | 4 ++-- tests/manual/windowgeometry/controllerwidget.cpp | 2 +- tests/manual/windowgeometry/controllerwidget.h | 2 +- tests/manual/windowmodality/main.cpp | 8 ++++---- tests/manual/xembed-raster/rasterwindow.h | 2 +- 56 files changed, 69 insertions(+), 69 deletions(-) (limited to 'tests/manual') diff --git a/tests/manual/cocoa/appicon/main.cpp b/tests/manual/cocoa/appicon/main.cpp index e22d70988d..ba398703b7 100644 --- a/tests/manual/cocoa/appicon/main.cpp +++ b/tests/manual/cocoa/appicon/main.cpp @@ -34,7 +34,7 @@ class TopWidget : public QWidget { Q_OBJECT public: - TopWidget(QWidget *parent = 0) : QWidget(parent) + TopWidget(QWidget *parent = nullptr) : QWidget(parent) { QVBoxLayout *layout = new QVBoxLayout; QPushButton *button = new QPushButton("Change app icon"); diff --git a/tests/manual/cocoa/menurama/mainwindow.h b/tests/manual/cocoa/menurama/mainwindow.h index 3ca90dad8f..e2af43e04e 100644 --- a/tests/manual/cocoa/menurama/mainwindow.h +++ b/tests/manual/cocoa/menurama/mainwindow.h @@ -40,7 +40,7 @@ class MainWindow : public QMainWindow Q_OBJECT public: - explicit MainWindow(QWidget *parent = 0); + explicit MainWindow(QWidget *parent = nullptr); ~MainWindow(); protected: diff --git a/tests/manual/cocoa/qt_on_cocoa/rasterwindow.h b/tests/manual/cocoa/qt_on_cocoa/rasterwindow.h index 5262300b12..b8ef674994 100644 --- a/tests/manual/cocoa/qt_on_cocoa/rasterwindow.h +++ b/tests/manual/cocoa/qt_on_cocoa/rasterwindow.h @@ -32,7 +32,7 @@ class RasterWindow : public QRasterWindow { public: - RasterWindow(QRasterWindow *parent = 0); + RasterWindow(QRasterWindow *parent = nullptr); protected: void mousePressEvent(QMouseEvent *); diff --git a/tests/manual/cocoa/wheelevent/window.h b/tests/manual/cocoa/wheelevent/window.h index 122b40de69..42a6b4a1aa 100644 --- a/tests/manual/cocoa/wheelevent/window.h +++ b/tests/manual/cocoa/wheelevent/window.h @@ -32,7 +32,7 @@ class Window : public QWindow { public: - Window(QWindow *parent = 0); + Window(QWindow *parent = nullptr); Window(QScreen *screen); protected: diff --git a/tests/manual/dialogs/colordialogpanel.cpp b/tests/manual/dialogs/colordialogpanel.cpp index e2e0fbcdee..f47e4ea8f1 100644 --- a/tests/manual/dialogs/colordialogpanel.cpp +++ b/tests/manual/dialogs/colordialogpanel.cpp @@ -81,7 +81,7 @@ static inline QPushButton *addButton(const QString &description, QVBoxLayout *la class ColorProxyModel : public QSortFilterProxyModel { public: - ColorProxyModel(QObject *parent = 0) : QSortFilterProxyModel(parent) + ColorProxyModel(QObject *parent = nullptr) : QSortFilterProxyModel(parent) { } diff --git a/tests/manual/dialogs/colordialogpanel.h b/tests/manual/dialogs/colordialogpanel.h index 988518a1c8..a299337f43 100644 --- a/tests/manual/dialogs/colordialogpanel.h +++ b/tests/manual/dialogs/colordialogpanel.h @@ -42,7 +42,7 @@ class ColorDialogPanel : public QWidget { Q_OBJECT public: - explicit ColorDialogPanel(QWidget *parent = 0); + explicit ColorDialogPanel(QWidget *parent = nullptr); public slots: void execModal(); diff --git a/tests/manual/dialogs/filedialogpanel.cpp b/tests/manual/dialogs/filedialogpanel.cpp index 56a1502313..9f2ae559d7 100644 --- a/tests/manual/dialogs/filedialogpanel.cpp +++ b/tests/manual/dialogs/filedialogpanel.cpp @@ -84,7 +84,7 @@ class LabelLineEdit : public QLineEdit { Q_OBJECT public: - explicit LabelLineEdit(QFileDialog::DialogLabel label, QWidget *parent = 0) : QLineEdit(parent), m_label(label), m_dirty(false) + explicit LabelLineEdit(QFileDialog::DialogLabel label, QWidget *parent = nullptr) : QLineEdit(parent), m_label(label), m_dirty(false) { connect(this, SIGNAL(textEdited(QString)), this, SLOT(setDirty())); } diff --git a/tests/manual/dialogs/filedialogpanel.h b/tests/manual/dialogs/filedialogpanel.h index 0bad3e7456..28dded3891 100644 --- a/tests/manual/dialogs/filedialogpanel.h +++ b/tests/manual/dialogs/filedialogpanel.h @@ -47,7 +47,7 @@ class FileDialogPanel : public QWidget { Q_OBJECT public: - explicit FileDialogPanel(QWidget *parent = 0); + explicit FileDialogPanel(QWidget *parent = nullptr); public slots: void execModal(); diff --git a/tests/manual/dialogs/fontdialogpanel.h b/tests/manual/dialogs/fontdialogpanel.h index dd7fb1413a..2bcd68c74c 100644 --- a/tests/manual/dialogs/fontdialogpanel.h +++ b/tests/manual/dialogs/fontdialogpanel.h @@ -43,7 +43,7 @@ class FontDialogPanel : public QWidget { Q_OBJECT public: - explicit FontDialogPanel(QWidget *parent = 0); + explicit FontDialogPanel(QWidget *parent = nullptr); public slots: void execModal(); diff --git a/tests/manual/dialogs/main.cpp b/tests/manual/dialogs/main.cpp index 2676ceeb52..da9daab942 100644 --- a/tests/manual/dialogs/main.cpp +++ b/tests/manual/dialogs/main.cpp @@ -52,7 +52,7 @@ static bool optNoPrinter = false; class AboutDialog : public QDialog { public: - explicit AboutDialog(QWidget *parent = 0); + explicit AboutDialog(QWidget *parent = nullptr); }; AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent) @@ -79,7 +79,7 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent) class MainWindow : public QMainWindow { Q_OBJECT public: - explicit MainWindow(QWidget *parent = 0); + explicit MainWindow(QWidget *parent = nullptr); public slots: void aboutDialog(); diff --git a/tests/manual/dialogs/messageboxpanel.h b/tests/manual/dialogs/messageboxpanel.h index 1e37b5c6df..d5ca6057d1 100644 --- a/tests/manual/dialogs/messageboxpanel.h +++ b/tests/manual/dialogs/messageboxpanel.h @@ -47,7 +47,7 @@ class MessageBoxPanel : public QWidget { Q_OBJECT public: - explicit MessageBoxPanel(QWidget *parent = 0); + explicit MessageBoxPanel(QWidget *parent = nullptr); ~MessageBoxPanel(); public slots: diff --git a/tests/manual/dialogs/printdialogpanel.cpp b/tests/manual/dialogs/printdialogpanel.cpp index 338064e9be..d36715e9dd 100644 --- a/tests/manual/dialogs/printdialogpanel.cpp +++ b/tests/manual/dialogs/printdialogpanel.cpp @@ -291,7 +291,7 @@ static bool print(QPrinter *printer, QWidget *dialogParent) class PrintPreviewDialog : public QPrintPreviewDialog { Q_OBJECT public: - explicit PrintPreviewDialog(QPrinter *printer, QWidget *parent = 0) : QPrintPreviewDialog(printer, parent) + explicit PrintPreviewDialog(QPrinter *printer, QWidget *parent = nullptr) : QPrintPreviewDialog(printer, parent) { connect(this, SIGNAL(paintRequested(QPrinter*)), this, SLOT(slotPaintRequested(QPrinter*))); } diff --git a/tests/manual/dialogs/printdialogpanel.h b/tests/manual/dialogs/printdialogpanel.h index 6bf465f527..618e34d596 100644 --- a/tests/manual/dialogs/printdialogpanel.h +++ b/tests/manual/dialogs/printdialogpanel.h @@ -79,7 +79,7 @@ class PrintDialogPanel : public QWidget { Q_OBJECT public: - explicit PrintDialogPanel(QWidget *parent = 0); + explicit PrintDialogPanel(QWidget *parent = nullptr); ~PrintDialogPanel(); private slots: diff --git a/tests/manual/dialogs/wizardpanel.cpp b/tests/manual/dialogs/wizardpanel.cpp index e5624e6248..4edb10afb8 100644 --- a/tests/manual/dialogs/wizardpanel.cpp +++ b/tests/manual/dialogs/wizardpanel.cpp @@ -73,7 +73,7 @@ class WizardStyleControl : public QGroupBox { Q_OBJECT public: - WizardStyleControl(QWidget *parent = 0); + WizardStyleControl(QWidget *parent = nullptr); void setWizardStyle(int style); QWizard::WizardStyle wizardStyle() const; @@ -132,7 +132,7 @@ void WizardStyleControl::setWizardStyle(int wizardStyle) class WizardOptionsControl : public QGroupBox { public: - explicit WizardOptionsControl(QWidget *parent = 0); + explicit WizardOptionsControl(QWidget *parent = nullptr); QWizard::WizardOption wizardOptions() const; void setWizardOptions(int options); @@ -214,7 +214,7 @@ void Wizard::changeWizardStyle(int newStyle) class WizardPage : public QWizardPage { public: - explicit WizardPage(const QString &title, QWidget *parent = 0); + explicit WizardPage(const QString &title, QWidget *parent = nullptr); void initializePage(); @@ -257,7 +257,7 @@ Wizard::Wizard(QWidget *parent, Qt::WindowFlags flags) // A dialog using a Wizard as child widget (emulating Qt Designer). class WizardEmbeddingDialog : public QDialog { public: - explicit WizardEmbeddingDialog(QWidget *parent = 0); + explicit WizardEmbeddingDialog(QWidget *parent = nullptr); Wizard *wizard() const { return m_wizard; } diff --git a/tests/manual/dialogs/wizardpanel.h b/tests/manual/dialogs/wizardpanel.h index 0a937f7d31..8d9ee79274 100644 --- a/tests/manual/dialogs/wizardpanel.h +++ b/tests/manual/dialogs/wizardpanel.h @@ -41,7 +41,7 @@ class WizardPanel : public QWidget { Q_OBJECT public: - explicit WizardPanel(QWidget *parent = 0); + explicit WizardPanel(QWidget *parent = nullptr); public slots: void showModal(); diff --git a/tests/manual/gestures/graphicsview/gestures.h b/tests/manual/gestures/graphicsview/gestures.h index 4cfabc35df..20a850e67e 100644 --- a/tests/manual/gestures/graphicsview/gestures.h +++ b/tests/manual/gestures/graphicsview/gestures.h @@ -38,7 +38,7 @@ class ThreeFingerSlideGesture : public QGesture public: static Qt::GestureType Type; - ThreeFingerSlideGesture(QObject *parent = 0) : QGesture(parent) { } + ThreeFingerSlideGesture(QObject *parent = nullptr) : QGesture(parent) { } bool gestureFired; }; diff --git a/tests/manual/gestures/graphicsview/main.cpp b/tests/manual/gestures/graphicsview/main.cpp index f08b2c3549..b05d104d99 100644 --- a/tests/manual/gestures/graphicsview/main.cpp +++ b/tests/manual/gestures/graphicsview/main.cpp @@ -44,7 +44,7 @@ class GraphicsView : public QGraphicsView { public: - GraphicsView(QGraphicsScene *scene, QWidget *parent = 0) + GraphicsView(QGraphicsScene *scene, QWidget *parent = nullptr) : QGraphicsView(scene, parent) { } @@ -78,7 +78,7 @@ protected: class StandardGestures : public QWidget { public: - StandardGestures(QWidget *parent = 0) + StandardGestures(QWidget *parent = nullptr) : QWidget(parent) { scene = new QGraphicsScene(this); @@ -96,7 +96,7 @@ class GlobalViewGestures : public QWidget { Q_OBJECT public: - GlobalViewGestures(QWidget *parent = 0) + GlobalViewGestures(QWidget *parent = nullptr) : QWidget(parent) { scene = new QGraphicsScene(this); @@ -116,7 +116,7 @@ class GraphicsItemGestures : public QWidget { Q_OBJECT public: - GraphicsItemGestures(QWidget *parent = 0) + GraphicsItemGestures(QWidget *parent = nullptr) : QWidget(parent) { scene = new QGraphicsScene(this); diff --git a/tests/manual/gestures/scrollarea/main.cpp b/tests/manual/gestures/scrollarea/main.cpp index 517054eeb9..5378f48de9 100644 --- a/tests/manual/gestures/scrollarea/main.cpp +++ b/tests/manual/gestures/scrollarea/main.cpp @@ -44,7 +44,7 @@ class ScrollArea : public QScrollArea { Q_OBJECT public: - ScrollArea(QWidget *parent = 0) + ScrollArea(QWidget *parent = nullptr) : QScrollArea(parent), outside(false) { viewport()->grabGesture(Qt::PanGesture, Qt::ReceivePartialGestures); @@ -112,7 +112,7 @@ private: class Slider : public QSlider { public: - Slider(Qt::Orientation orientation, QWidget *parent = 0) + Slider(Qt::Orientation orientation, QWidget *parent = nullptr) : QSlider(orientation, parent) { grabGesture(Qt::PanGesture); diff --git a/tests/manual/inputmethodhints/inputmethodhints.h b/tests/manual/inputmethodhints/inputmethodhints.h index e128c5271e..ca8025e3ec 100644 --- a/tests/manual/inputmethodhints/inputmethodhints.h +++ b/tests/manual/inputmethodhints/inputmethodhints.h @@ -37,7 +37,7 @@ class inputmethodhints : public QMainWindow Q_OBJECT public: - inputmethodhints(QWidget *parent = 0); + inputmethodhints(QWidget *parent = nullptr); ~inputmethodhints(); public slots: diff --git a/tests/manual/keypadnavigation/main.cpp b/tests/manual/keypadnavigation/main.cpp index dad4376514..52d0dacd07 100644 --- a/tests/manual/keypadnavigation/main.cpp +++ b/tests/manual/keypadnavigation/main.cpp @@ -40,7 +40,7 @@ class KeypadNavigation : public QMainWindow Q_OBJECT public: - KeypadNavigation(QWidget *parent = 0) + KeypadNavigation(QWidget *parent = nullptr) : QMainWindow(parent) , ui(new Ui_KeypadNavigation) { diff --git a/tests/manual/network_stresstest/minihttpserver.h b/tests/manual/network_stresstest/minihttpserver.h index fcce9cd480..e17f1266a4 100644 --- a/tests/manual/network_stresstest/minihttpserver.h +++ b/tests/manual/network_stresstest/minihttpserver.h @@ -43,7 +43,7 @@ class MiniHttpServer : public QThread { Q_OBJECT public: - explicit MiniHttpServer(QObject *parent = 0); + explicit MiniHttpServer(QObject *parent = nullptr); ~MiniHttpServer(); int port() { return portnum; } diff --git a/tests/manual/qcursor/allcursors/mainwindow.h b/tests/manual/qcursor/allcursors/mainwindow.h index 9ae6f0483e..73a023afbb 100644 --- a/tests/manual/qcursor/allcursors/mainwindow.h +++ b/tests/manual/qcursor/allcursors/mainwindow.h @@ -43,7 +43,7 @@ class MainWindow : public QMainWindow Q_OBJECT public: - MainWindow(QWidget *parent = 0); + MainWindow(QWidget *parent = nullptr); ~MainWindow(); private: diff --git a/tests/manual/qcursor/grab_override/mainwindow.h b/tests/manual/qcursor/grab_override/mainwindow.h index ce753fa114..5275d80184 100644 --- a/tests/manual/qcursor/grab_override/mainwindow.h +++ b/tests/manual/qcursor/grab_override/mainwindow.h @@ -43,7 +43,7 @@ class MainWindow : public QMainWindow Q_OBJECT public: - MainWindow(QWidget *parent = 0); + MainWindow(QWidget *parent = nullptr); ~MainWindow(); private slots: diff --git a/tests/manual/qgraphicsitem/main.cpp b/tests/manual/qgraphicsitem/main.cpp index 284a4c877c..d32c3c6dec 100644 --- a/tests/manual/qgraphicsitem/main.cpp +++ b/tests/manual/qgraphicsitem/main.cpp @@ -35,7 +35,7 @@ class MyObject : public QObject { public: - MyObject(QGraphicsItem *i, QObject *parent = 0) : QObject(parent), itemToToggle(i) + MyObject(QGraphicsItem *i, QObject *parent = nullptr) : QObject(parent), itemToToggle(i) { startTimer(500); } diff --git a/tests/manual/qgraphicsitemgroup/widget.h b/tests/manual/qgraphicsitemgroup/widget.h index 0da34babdd..d778adb068 100644 --- a/tests/manual/qgraphicsitemgroup/widget.h +++ b/tests/manual/qgraphicsitemgroup/widget.h @@ -46,7 +46,7 @@ class Widget : public QWidget { Q_OBJECT public: - Widget(QWidget *parent = 0); + Widget(QWidget *parent = nullptr); ~Widget(); protected Q_SLOTS: diff --git a/tests/manual/qlayout/gridwidget.h b/tests/manual/qlayout/gridwidget.h index a3792b03c4..2d1800d64d 100644 --- a/tests/manual/qlayout/gridwidget.h +++ b/tests/manual/qlayout/gridwidget.h @@ -35,7 +35,7 @@ class GridWidget : public QWidget { Q_OBJECT public: - explicit GridWidget(QWidget *parent = 0); + explicit GridWidget(QWidget *parent = nullptr); signals: diff --git a/tests/manual/qlayout/hbwidget.h b/tests/manual/qlayout/hbwidget.h index 03642db395..4f106a9ce3 100644 --- a/tests/manual/qlayout/hbwidget.h +++ b/tests/manual/qlayout/hbwidget.h @@ -35,7 +35,7 @@ class HbWidget : public QWidget { Q_OBJECT public: - explicit HbWidget(QWidget *parent = 0); + explicit HbWidget(QWidget *parent = nullptr); signals: diff --git a/tests/manual/qlayout/mainwindow.h b/tests/manual/qlayout/mainwindow.h index fdeb80f150..1f19047b74 100644 --- a/tests/manual/qlayout/mainwindow.h +++ b/tests/manual/qlayout/mainwindow.h @@ -38,7 +38,7 @@ class MainWindow : public QMainWindow Q_OBJECT public: - MainWindow(QWidget *parent = 0); + MainWindow(QWidget *parent = nullptr); ~MainWindow(); private slots: diff --git a/tests/manual/qlayout/vbwidget.h b/tests/manual/qlayout/vbwidget.h index b722f9f95a..b5f2073faf 100644 --- a/tests/manual/qlayout/vbwidget.h +++ b/tests/manual/qlayout/vbwidget.h @@ -35,7 +35,7 @@ class VbWidget : public QWidget { Q_OBJECT public: - explicit VbWidget(QWidget *parent = 0); + explicit VbWidget(QWidget *parent = nullptr); signals: diff --git a/tests/manual/qopenglwidget/openglwidget/openglwidget.h b/tests/manual/qopenglwidget/openglwidget/openglwidget.h index 32fb4e2660..06ec5b1a40 100644 --- a/tests/manual/qopenglwidget/openglwidget/openglwidget.h +++ b/tests/manual/qopenglwidget/openglwidget/openglwidget.h @@ -37,7 +37,7 @@ class OpenGLWidget : public QOpenGLWidget { Q_OBJECT public: - OpenGLWidget(int interval = 30, const QVector3D &rotAxis = QVector3D(0, 1, 0), QWidget *parent = 0); + OpenGLWidget(int interval = 30, const QVector3D &rotAxis = QVector3D(0, 1, 0), QWidget *parent = nullptr); ~OpenGLWidget(); void initializeGL(); diff --git a/tests/manual/qscreen/propertyfield.h b/tests/manual/qscreen/propertyfield.h index 4d7074f913..364eef2f6c 100644 --- a/tests/manual/qscreen/propertyfield.h +++ b/tests/manual/qscreen/propertyfield.h @@ -42,7 +42,7 @@ class PropertyField : public QLineEdit { Q_OBJECT public: - explicit PropertyField(QObject* subject, const QMetaProperty& prop, QWidget *parent = 0); + explicit PropertyField(QObject* subject, const QMetaProperty& prop, QWidget *parent = nullptr); signals: diff --git a/tests/manual/qtabbar/tabbarform.h b/tests/manual/qtabbar/tabbarform.h index 7db3f71fa5..ac101d6402 100644 --- a/tests/manual/qtabbar/tabbarform.h +++ b/tests/manual/qtabbar/tabbarform.h @@ -13,7 +13,7 @@ class TabBarForm : public QWidget Q_OBJECT public: - explicit TabBarForm(QWidget *parent = 0); + explicit TabBarForm(QWidget *parent = nullptr); ~TabBarForm(); Ui::TabBarForm *ui; diff --git a/tests/manual/qtbug-8933/widget.h b/tests/manual/qtbug-8933/widget.h index aac6134d09..bc26971a9c 100644 --- a/tests/manual/qtbug-8933/widget.h +++ b/tests/manual/qtbug-8933/widget.h @@ -40,7 +40,7 @@ namespace Ui { class Widget : public QWidget { Q_OBJECT public: - Widget(QWidget *parent = 0); + Widget(QWidget *parent = nullptr); ~Widget(); public slots: diff --git a/tests/manual/qtexteditlist/widget.h b/tests/manual/qtexteditlist/widget.h index ffece6a6db..f22dae6add 100644 --- a/tests/manual/qtexteditlist/widget.h +++ b/tests/manual/qtexteditlist/widget.h @@ -41,7 +41,7 @@ class Widget : public QWidget Q_OBJECT public: - explicit Widget(QWidget *parent = 0); + explicit Widget(QWidget *parent = nullptr); ~Widget(); public slots: void setFontPointSize(int value); diff --git a/tests/manual/qtouchevent/main.cpp b/tests/manual/qtouchevent/main.cpp index 099aff22c4..b71fe503aa 100644 --- a/tests/manual/qtouchevent/main.cpp +++ b/tests/manual/qtouchevent/main.cpp @@ -37,7 +37,7 @@ class MultitouchTestWidget : public QWidget, public Ui::Form Q_OBJECT public: - MultitouchTestWidget(QWidget *parent = 0) + MultitouchTestWidget(QWidget *parent = nullptr) : QWidget(parent) { setAttribute(Qt::WA_QuitOnClose, false); diff --git a/tests/manual/qtouchevent/touchwidget.h b/tests/manual/qtouchevent/touchwidget.h index 792c14e765..4036693169 100644 --- a/tests/manual/qtouchevent/touchwidget.h +++ b/tests/manual/qtouchevent/touchwidget.h @@ -45,7 +45,7 @@ public: bool seenMousePress, seenMouseMove, seenMouseRelease; bool closeWindowOnMouseRelease; - inline TouchWidget(QWidget *parent = 0) + inline TouchWidget(QWidget *parent = nullptr) : QWidget(parent) { reset(); diff --git a/tests/manual/repaint/shared/shared.h b/tests/manual/repaint/shared/shared.h index 9ca5cbe2be..d6bef849f5 100644 --- a/tests/manual/repaint/shared/shared.h +++ b/tests/manual/repaint/shared/shared.h @@ -37,7 +37,7 @@ Q_OBJECT public: int hue; bool pressed; - StaticWidget(QWidget *parent = 0) + StaticWidget(QWidget *parent = nullptr) :QWidget(parent) { setAttribute(Qt::WA_StaticContents); diff --git a/tests/manual/repaint/tableview/main.cpp b/tests/manual/repaint/tableview/main.cpp index 8fd4f3b424..07d1529d1d 100644 --- a/tests/manual/repaint/tableview/main.cpp +++ b/tests/manual/repaint/tableview/main.cpp @@ -36,7 +36,7 @@ class CellWidget : public QWidget { public: - CellWidget(QWidget *parent = 0) : QWidget(parent) {} + CellWidget(QWidget *parent = nullptr) : QWidget(parent) {} void paintEvent(QPaintEvent * event) { static int value = 200; diff --git a/tests/manual/textrendering/textperformance/main.cpp b/tests/manual/textrendering/textperformance/main.cpp index 9d238ad420..8cbef84119 100644 --- a/tests/manual/textrendering/textperformance/main.cpp +++ b/tests/manual/textrendering/textperformance/main.cpp @@ -41,7 +41,7 @@ class FontBlaster: public QWidget Q_OBJECT public: - FontBlaster(QWidget *parent = 0) + FontBlaster(QWidget *parent = nullptr) : QWidget(parent) , m_currentMode(0) { diff --git a/tests/manual/transientwindow/mainwindow.h b/tests/manual/transientwindow/mainwindow.h index 253bf1726e..d822442b15 100644 --- a/tests/manual/transientwindow/mainwindow.h +++ b/tests/manual/transientwindow/mainwindow.h @@ -37,7 +37,7 @@ class MainWindow : public QMainWindow Q_OBJECT public: - MainWindow(QWidget *parent = 0); + MainWindow(QWidget *parent = nullptr); ~MainWindow(); public slots: diff --git a/tests/manual/widgetgrab/main.cpp b/tests/manual/widgetgrab/main.cpp index 6430386ee0..45c3feeefe 100644 --- a/tests/manual/widgetgrab/main.cpp +++ b/tests/manual/widgetgrab/main.cpp @@ -84,7 +84,7 @@ class ClickableLabel : public QLabel { Q_OBJECT public: - explicit ClickableLabel(const QString &text, QWidget *parent = 0) : QLabel(text, parent) {} + explicit ClickableLabel(const QString &text, QWidget *parent = nullptr) : QLabel(text, parent) {} signals: void pressed(); diff --git a/tests/manual/widgets/itemviews/delegate/example.cpp b/tests/manual/widgets/itemviews/delegate/example.cpp index cd3784332a..3108c65654 100644 --- a/tests/manual/widgets/itemviews/delegate/example.cpp +++ b/tests/manual/widgets/itemviews/delegate/example.cpp @@ -37,7 +37,7 @@ class ExampleEditor : public QLineEdit { public: - ExampleEditor(QWidget *parent = 0):QLineEdit(parent) { qDebug() << "ctor"; } + ExampleEditor(QWidget *parent = nullptr):QLineEdit(parent) { qDebug() << "ctor"; } ~ExampleEditor() { QApplication::instance()->quit(); } }; diff --git a/tests/manual/widgets/itemviews/qheaderview/qheaderviewtest1.cpp b/tests/manual/widgets/itemviews/qheaderview/qheaderviewtest1.cpp index 85f79bedfc..e78f4a5e37 100644 --- a/tests/manual/widgets/itemviews/qheaderview/qheaderviewtest1.cpp +++ b/tests/manual/widgets/itemviews/qheaderview/qheaderviewtest1.cpp @@ -74,7 +74,7 @@ class Window : public QWidget { Q_OBJECT public: - Window(QWidget *parent = 0): QWidget(parent), ckMovable(0), tableView(0), cbSelectionMode(0), m_taskInstructions(0) + Window(QWidget *parent = nullptr): QWidget(parent), ckMovable(0), tableView(0), cbSelectionMode(0), m_taskInstructions(0) { m_taskInstructions = new QLabel(); if (sizeof(tasks) > 0) diff --git a/tests/manual/widgets/widgets/bigmenucreator/mainwindow.h b/tests/manual/widgets/widgets/bigmenucreator/mainwindow.h index 2990f592e9..6d19d0e649 100644 --- a/tests/manual/widgets/widgets/bigmenucreator/mainwindow.h +++ b/tests/manual/widgets/widgets/bigmenucreator/mainwindow.h @@ -40,7 +40,7 @@ class MainWindow : public QMainWindow Q_OBJECT public: - explicit MainWindow(QWidget *parent = 0); + explicit MainWindow(QWidget *parent = nullptr); ~MainWindow(); void doAPS(QWidget *menu, int level); diff --git a/tests/manual/widgets/widgets/defaultUpMenuBar/main.cpp b/tests/manual/widgets/widgets/defaultUpMenuBar/main.cpp index 2a78f9d0f0..a6b9ca218f 100644 --- a/tests/manual/widgets/widgets/defaultUpMenuBar/main.cpp +++ b/tests/manual/widgets/widgets/defaultUpMenuBar/main.cpp @@ -60,7 +60,7 @@ class MainWindow : public QMainWindow { public: - MainWindow(QWidget *parent = 0) : QMainWindow(parent) + MainWindow(QWidget *parent = nullptr) : QMainWindow(parent) { auto *menu1Act1 = new QAction("Action 1"); auto *menu1Act2 = new QAction("Action 2"); diff --git a/tests/manual/widgets/widgets/multiscreen-menus/mainwindow.h b/tests/manual/widgets/widgets/multiscreen-menus/mainwindow.h index 7689062221..9500d501ef 100644 --- a/tests/manual/widgets/widgets/multiscreen-menus/mainwindow.h +++ b/tests/manual/widgets/widgets/multiscreen-menus/mainwindow.h @@ -40,7 +40,7 @@ class MainWindow : public QMainWindow Q_OBJECT public: - explicit MainWindow(QWidget *parent = 0); + explicit MainWindow(QWidget *parent = nullptr); ~MainWindow(); void contextMenuEvent(QContextMenuEvent *e) override; diff --git a/tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/main.cpp b/tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/main.cpp index d55f507717..c048cd3609 100644 --- a/tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/main.cpp +++ b/tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/main.cpp @@ -40,7 +40,7 @@ class MyMainWindow : public QMainWindow { public: - MyMainWindow(QWidget *parent = 0) : QMainWindow(parent) + MyMainWindow(QWidget *parent = nullptr) : QMainWindow(parent) { auto *toolBar = new QToolBar; QPixmap pix(16, 16); diff --git a/tests/manual/windowchildgeometry/controllerwidget.cpp b/tests/manual/windowchildgeometry/controllerwidget.cpp index 7a0a29fc61..1ceb785e9e 100644 --- a/tests/manual/windowchildgeometry/controllerwidget.cpp +++ b/tests/manual/windowchildgeometry/controllerwidget.cpp @@ -273,7 +273,7 @@ void WidgetWindowControl::statesChanged() class Window : public QWindow { public: - explicit Window(QWindow *parent = 0) + explicit Window(QWindow *parent = nullptr) : QWindow(parent) , m_backingStore(new QBackingStore(this)) , m_color(Qt::GlobalColor(QRandomGenerator::global()->bounded(18))) diff --git a/tests/manual/windowchildgeometry/controllerwidget.h b/tests/manual/windowchildgeometry/controllerwidget.h index 4744bfc905..d255953dd7 100644 --- a/tests/manual/windowchildgeometry/controllerwidget.h +++ b/tests/manual/windowchildgeometry/controllerwidget.h @@ -136,7 +136,7 @@ class ControllerWidget : public QMainWindow { Q_OBJECT public: - explicit ControllerWidget(QWidget *parent = 0); + explicit ControllerWidget(QWidget *parent = nullptr); ~ControllerWidget(); private: QScopedPointer m_testWindow; diff --git a/tests/manual/windowflags/controllerwindow.cpp b/tests/manual/windowflags/controllerwindow.cpp index bde24b00d1..7477e21d46 100644 --- a/tests/manual/windowflags/controllerwindow.cpp +++ b/tests/manual/windowflags/controllerwindow.cpp @@ -247,7 +247,7 @@ static Qt::WindowStates windowState(const QObject *o) class EventFilter : public QObject { public: - explicit EventFilter(QObject *parent = 0) : QObject(parent) {} + explicit EventFilter(QObject *parent = nullptr) : QObject(parent) {} bool eventFilter(QObject *o, QEvent *e) { diff --git a/tests/manual/windowflags/controllerwindow.h b/tests/manual/windowflags/controllerwindow.h index c623256112..e4d8f2df0c 100644 --- a/tests/manual/windowflags/controllerwindow.h +++ b/tests/manual/windowflags/controllerwindow.h @@ -51,7 +51,7 @@ class ControllerWidget : public QWidget Q_OBJECT public: - explicit ControllerWidget(QWidget *parent = 0); + explicit ControllerWidget(QWidget *parent = nullptr); virtual bool eventFilter(QObject *o, QEvent *e); @@ -91,7 +91,7 @@ class LogWidget : public QPlainTextEdit { Q_OBJECT public: - explicit LogWidget(QWidget *parent = 0); + explicit LogWidget(QWidget *parent = nullptr); ~LogWidget(); static LogWidget *instance() { return m_instance; } diff --git a/tests/manual/windowflags/previewwindow.h b/tests/manual/windowflags/previewwindow.h index 8f8fc39211..ab309a0139 100644 --- a/tests/manual/windowflags/previewwindow.h +++ b/tests/manual/windowflags/previewwindow.h @@ -46,7 +46,7 @@ class PreviewWidget : public QWidget Q_OBJECT public: - PreviewWidget(QWidget *parent = 0); + PreviewWidget(QWidget *parent = nullptr); void setWindowFlags(Qt::WindowFlags flags); @@ -65,7 +65,7 @@ class PreviewDialog : public QDialog Q_OBJECT public: - PreviewDialog(QWidget *parent = 0); + PreviewDialog(QWidget *parent = nullptr); void setWindowFlags(Qt::WindowFlags flags); diff --git a/tests/manual/windowgeometry/controllerwidget.cpp b/tests/manual/windowgeometry/controllerwidget.cpp index b188ea58e3..0bf089e934 100644 --- a/tests/manual/windowgeometry/controllerwidget.cpp +++ b/tests/manual/windowgeometry/controllerwidget.cpp @@ -297,7 +297,7 @@ void WidgetWindowControl::statesChanged() class Window : public QWindow { public: - explicit Window(QWindow *parent = 0) + explicit Window(QWindow *parent = nullptr) : QWindow(parent) , m_backingStore(new QBackingStore(this)) { diff --git a/tests/manual/windowgeometry/controllerwidget.h b/tests/manual/windowgeometry/controllerwidget.h index 4d8bb2d717..4b5dfac348 100644 --- a/tests/manual/windowgeometry/controllerwidget.h +++ b/tests/manual/windowgeometry/controllerwidget.h @@ -142,7 +142,7 @@ class ControllerWidget : public QMainWindow { Q_OBJECT public: - explicit ControllerWidget(QWidget *parent = 0); + explicit ControllerWidget(QWidget *parent = nullptr); ~ControllerWidget(); private: diff --git a/tests/manual/windowmodality/main.cpp b/tests/manual/windowmodality/main.cpp index 46693cdddd..3b79b5c798 100644 --- a/tests/manual/windowmodality/main.cpp +++ b/tests/manual/windowmodality/main.cpp @@ -51,7 +51,7 @@ class CustomDialog : public QDialog, public Ui::Dialog { Q_OBJECT public: - CustomDialog(QWidget *parent = 0) + CustomDialog(QWidget *parent = nullptr) : QDialog(parent) { setupUi(this); @@ -101,7 +101,7 @@ private slots: private: void newDialog(DialogType dialogType, Qt::WindowModality windowModality) { - QWidget *parent = 0; + QWidget *parent = nullptr; if (useThisAsParentCheckBox->isChecked()) parent = this; else if (createSiblingDialogCheckBox->isChecked()) @@ -166,7 +166,7 @@ class Widget : public QWidget, public Ui::Widget { Q_OBJECT public: - Widget(QWidget *parent = 0) + Widget(QWidget *parent = nullptr) : QWidget(parent) { setupUi(this); @@ -218,7 +218,7 @@ private slots: private: void newDialog(DialogType dialogType, Qt::WindowModality windowModality) { - QWidget *parent = 0; + QWidget *parent = nullptr; if (useThisAsParentCheckBox->isChecked()) parent = this; diff --git a/tests/manual/xembed-raster/rasterwindow.h b/tests/manual/xembed-raster/rasterwindow.h index b1a556023b..faa44f49cc 100644 --- a/tests/manual/xembed-raster/rasterwindow.h +++ b/tests/manual/xembed-raster/rasterwindow.h @@ -35,7 +35,7 @@ class RasterWindow : public QWindow { Q_OBJECT public: - explicit RasterWindow(QWindow *parent = 0); + explicit RasterWindow(QWindow *parent = nullptr); virtual void render(QPainter *painter); -- cgit v1.2.3