summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-07 13:05:48 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-07 23:02:47 +0200
commit564b59d903683b14c75b72a3e93367717f201def (patch)
tree03ffe749d83dce84429a7db484bf92795047036f /examples
parentb5fc1e4e2643e73d3b44c483d159529f8deb8af1 (diff)
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 <qt_ci_bot@qt-project.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'examples')
-rw-r--r--examples/dbus/chat/chat.h2
-rw-r--r--examples/dbus/remotecontrolledcar/car/car.h2
-rw-r--r--examples/dbus/remotecontrolledcar/controller/controller.h2
-rw-r--r--examples/embedded/digiflip/digiflip.cpp2
-rw-r--r--examples/embedded/flickable/main.cpp2
-rw-r--r--examples/embedded/flightinfo/flightinfo.cpp2
-rw-r--r--examples/embedded/lightmaps/lightmaps.h4
-rw-r--r--examples/embedded/lightmaps/slippymap.h2
-rw-r--r--examples/embedded/raycasting/raycasting.cpp2
-rw-r--r--examples/embedded/styleexample/stylewidget.h2
-rw-r--r--examples/gui/rasterwindow/rasterwindow.h2
-rw-r--r--examples/qmake/precompile/mydialog.h2
-rw-r--r--examples/qpa/windows/window.h2
-rw-r--r--examples/widgets/itemviews/combowidgetmapper/window.h2
-rw-r--r--examples/widgets/itemviews/customsortfiltermodel/mysortfilterproxymodel.h2
-rw-r--r--examples/widgets/itemviews/pixelator/imagemodel.h2
-rw-r--r--examples/widgets/layouts/dynamiclayouts/dialog.h2
-rw-r--r--examples/widgets/painting/concentriccircles/circlewidget.h2
-rw-r--r--examples/widgets/richtext/syntaxhighlighter/highlighter.h2
-rw-r--r--examples/widgets/richtext/syntaxhighlighter/mainwindow.h2
-rw-r--r--examples/widgets/richtext/textedit/textedit.h2
-rw-r--r--examples/xml/dombookmarks/xbeltree.h6
-rw-r--r--examples/xml/rsslisting/rsslisting.h2
23 files changed, 26 insertions, 26 deletions
diff --git a/examples/dbus/chat/chat.h b/examples/dbus/chat/chat.h
index 7faebe63fd..444d6c9d80 100644
--- a/examples/dbus/chat/chat.h
+++ b/examples/dbus/chat/chat.h
@@ -85,7 +85,7 @@ class NicknameDialog: public QDialog, public Ui::NicknameDialog
{
Q_OBJECT
public:
- NicknameDialog(QWidget *parent = 0);
+ NicknameDialog(QWidget *parent = nullptr);
};
#endif // CHAT_H
diff --git a/examples/dbus/remotecontrolledcar/car/car.h b/examples/dbus/remotecontrolledcar/car/car.h
index 92fc1ccdcb..e843786e5b 100644
--- a/examples/dbus/remotecontrolledcar/car/car.h
+++ b/examples/dbus/remotecontrolledcar/car/car.h
@@ -71,7 +71,7 @@ Q_SIGNALS:
void crashed();
protected:
- void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
+ void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr);
void timerEvent(QTimerEvent *event);
private:
diff --git a/examples/dbus/remotecontrolledcar/controller/controller.h b/examples/dbus/remotecontrolledcar/controller/controller.h
index 74776f2638..87359661ba 100644
--- a/examples/dbus/remotecontrolledcar/controller/controller.h
+++ b/examples/dbus/remotecontrolledcar/controller/controller.h
@@ -59,7 +59,7 @@ class Controller : public QWidget
Q_OBJECT
public:
- Controller(QWidget *parent = 0);
+ Controller(QWidget *parent = nullptr);
protected:
void timerEvent(QTimerEvent *event);
diff --git a/examples/embedded/digiflip/digiflip.cpp b/examples/embedded/digiflip/digiflip.cpp
index 9bbc85ea03..729337e5d1 100644
--- a/examples/embedded/digiflip/digiflip.cpp
+++ b/examples/embedded/digiflip/digiflip.cpp
@@ -298,7 +298,7 @@ class DigiFlip : public QMainWindow
Q_OBJECT
public:
- DigiFlip(QWidget *parent = 0)
+ DigiFlip(QWidget *parent = nullptr)
: QMainWindow(parent)
{
m_hour = new Digits(this);
diff --git a/examples/embedded/flickable/main.cpp b/examples/embedded/flickable/main.cpp
index d3b314fcd0..fd30d15e49 100644
--- a/examples/embedded/flickable/main.cpp
+++ b/examples/embedded/flickable/main.cpp
@@ -87,7 +87,7 @@ class ColorList : public QWidget, public Flickable
Q_OBJECT
public:
- ColorList(QWidget *parent = 0)
+ ColorList(QWidget *parent = nullptr)
: QWidget(parent) {
m_offset = 0;
m_height = QFontMetrics(font()).height() + 5;
diff --git a/examples/embedded/flightinfo/flightinfo.cpp b/examples/embedded/flightinfo/flightinfo.cpp
index 0f8dfb5b6a..32f0cd4401 100644
--- a/examples/embedded/flightinfo/flightinfo.cpp
+++ b/examples/embedded/flightinfo/flightinfo.cpp
@@ -110,7 +110,7 @@ private:
public:
- FlightInfo(QMainWindow *parent = 0): QMainWindow(parent) {
+ FlightInfo(QMainWindow *parent = nullptr): QMainWindow(parent) {
QWidget *w = new QWidget(this);
ui.setupUi(w);
diff --git a/examples/embedded/lightmaps/lightmaps.h b/examples/embedded/lightmaps/lightmaps.h
index a171065b2f..25b5785edf 100644
--- a/examples/embedded/lightmaps/lightmaps.h
+++ b/examples/embedded/lightmaps/lightmaps.h
@@ -61,7 +61,7 @@ class LightMaps: public QWidget
Q_OBJECT
public:
- LightMaps(QWidget *parent = 0);
+ LightMaps(QWidget *parent = nullptr);
void setCenter(qreal lat, qreal lng);
public slots:
@@ -94,4 +94,4 @@ private:
bool invert;
};
-#endif \ No newline at end of file
+#endif
diff --git a/examples/embedded/lightmaps/slippymap.h b/examples/embedded/lightmaps/slippymap.h
index 202d00c7e4..f20945445b 100644
--- a/examples/embedded/lightmaps/slippymap.h
+++ b/examples/embedded/lightmaps/slippymap.h
@@ -65,7 +65,7 @@ class SlippyMap: public QObject
Q_OBJECT
public:
- SlippyMap(QObject *parent = 0);
+ SlippyMap(QObject *parent = nullptr);
void invalidate();
void render(QPainter *p, const QRect &rect);
void pan(const QPoint &delta);
diff --git a/examples/embedded/raycasting/raycasting.cpp b/examples/embedded/raycasting/raycasting.cpp
index 19e3c8b271..4930dbe9f2 100644
--- a/examples/embedded/raycasting/raycasting.cpp
+++ b/examples/embedded/raycasting/raycasting.cpp
@@ -70,7 +70,7 @@ int world_map[WORLD_SIZE][WORLD_SIZE] = {
class Raycasting: public QWidget
{
public:
- Raycasting(QWidget *parent = 0)
+ Raycasting(QWidget *parent = nullptr)
: QWidget(parent)
, angle(0.5)
, playerPos(1.5, 1.5)
diff --git a/examples/embedded/styleexample/stylewidget.h b/examples/embedded/styleexample/stylewidget.h
index 6b109bbbce..c0ff33e297 100644
--- a/examples/embedded/styleexample/stylewidget.h
+++ b/examples/embedded/styleexample/stylewidget.h
@@ -58,7 +58,7 @@ class StyleWidget : public QFrame
{
Q_OBJECT
public:
- StyleWidget(QWidget *parent = 0);
+ StyleWidget(QWidget *parent = nullptr);
private:
Ui_StyleWidget m_ui;
diff --git a/examples/gui/rasterwindow/rasterwindow.h b/examples/gui/rasterwindow/rasterwindow.h
index 2ccecbf704..58c3ab89b2 100644
--- a/examples/gui/rasterwindow/rasterwindow.h
+++ b/examples/gui/rasterwindow/rasterwindow.h
@@ -58,7 +58,7 @@ class RasterWindow : public QWindow
{
Q_OBJECT
public:
- explicit RasterWindow(QWindow *parent = 0);
+ explicit RasterWindow(QWindow *parent = nullptr);
virtual void render(QPainter *painter);
diff --git a/examples/qmake/precompile/mydialog.h b/examples/qmake/precompile/mydialog.h
index 92bf956e57..ed4028fe53 100644
--- a/examples/qmake/precompile/mydialog.h
+++ b/examples/qmake/precompile/mydialog.h
@@ -58,7 +58,7 @@ class MyDialog : public QDialog, public Ui::MyDialog
Q_OBJECT
public:
- MyDialog(QWidget *parent = 0);
+ MyDialog(QWidget *parent = nullptr);
};
#endif
diff --git a/examples/qpa/windows/window.h b/examples/qpa/windows/window.h
index 5647688fbc..438be413b8 100644
--- a/examples/qpa/windows/window.h
+++ b/examples/qpa/windows/window.h
@@ -54,7 +54,7 @@
class Window : public QWindow
{
public:
- Window(QWindow *parent = 0);
+ Window(QWindow *parent = nullptr);
Window(QScreen *screen);
protected:
diff --git a/examples/widgets/itemviews/combowidgetmapper/window.h b/examples/widgets/itemviews/combowidgetmapper/window.h
index 35142d6818..78bd373c13 100644
--- a/examples/widgets/itemviews/combowidgetmapper/window.h
+++ b/examples/widgets/itemviews/combowidgetmapper/window.h
@@ -70,7 +70,7 @@ class Window : public QWidget
Q_OBJECT
public:
- Window(QWidget *parent = 0);
+ Window(QWidget *parent = nullptr);
private slots:
void updateButtons(int row);
diff --git a/examples/widgets/itemviews/customsortfiltermodel/mysortfilterproxymodel.h b/examples/widgets/itemviews/customsortfiltermodel/mysortfilterproxymodel.h
index 5fdabbd5df..909949df8e 100644
--- a/examples/widgets/itemviews/customsortfiltermodel/mysortfilterproxymodel.h
+++ b/examples/widgets/itemviews/customsortfiltermodel/mysortfilterproxymodel.h
@@ -60,7 +60,7 @@ class MySortFilterProxyModel : public QSortFilterProxyModel
Q_OBJECT
public:
- MySortFilterProxyModel(QObject *parent = 0);
+ MySortFilterProxyModel(QObject *parent = nullptr);
QDate filterMinimumDate() const { return minDate; }
void setFilterMinimumDate(QDate date);
diff --git a/examples/widgets/itemviews/pixelator/imagemodel.h b/examples/widgets/itemviews/pixelator/imagemodel.h
index c6c510dcac..04ebd705b7 100644
--- a/examples/widgets/itemviews/pixelator/imagemodel.h
+++ b/examples/widgets/itemviews/pixelator/imagemodel.h
@@ -60,7 +60,7 @@ class ImageModel : public QAbstractTableModel
Q_OBJECT
public:
- ImageModel(QObject *parent = 0);
+ ImageModel(QObject *parent = nullptr);
void setImage(const QImage &image);
diff --git a/examples/widgets/layouts/dynamiclayouts/dialog.h b/examples/widgets/layouts/dynamiclayouts/dialog.h
index 923a6fe01b..b582c1c018 100644
--- a/examples/widgets/layouts/dynamiclayouts/dialog.h
+++ b/examples/widgets/layouts/dynamiclayouts/dialog.h
@@ -68,7 +68,7 @@ class Dialog : public QDialog
Q_OBJECT
public:
- Dialog(QWidget *parent = 0);
+ Dialog(QWidget *parent = nullptr);
private slots:
void buttonsOrientationChanged(int index);
diff --git a/examples/widgets/painting/concentriccircles/circlewidget.h b/examples/widgets/painting/concentriccircles/circlewidget.h
index 79fd5c71da..a83ea0637e 100644
--- a/examples/widgets/painting/concentriccircles/circlewidget.h
+++ b/examples/widgets/painting/concentriccircles/circlewidget.h
@@ -59,7 +59,7 @@ class CircleWidget : public QWidget
Q_OBJECT
public:
- CircleWidget(QWidget *parent = 0);
+ CircleWidget(QWidget *parent = nullptr);
void setFloatBased(bool floatBased);
void setAntialiased(bool antialiased);
diff --git a/examples/widgets/richtext/syntaxhighlighter/highlighter.h b/examples/widgets/richtext/syntaxhighlighter/highlighter.h
index 163b01cda6..a60da038b3 100644
--- a/examples/widgets/richtext/syntaxhighlighter/highlighter.h
+++ b/examples/widgets/richtext/syntaxhighlighter/highlighter.h
@@ -65,7 +65,7 @@ class Highlighter : public QSyntaxHighlighter
Q_OBJECT
public:
- Highlighter(QTextDocument *parent = 0);
+ Highlighter(QTextDocument *parent = nullptr);
protected:
void highlightBlock(const QString &text) override;
diff --git a/examples/widgets/richtext/syntaxhighlighter/mainwindow.h b/examples/widgets/richtext/syntaxhighlighter/mainwindow.h
index b4b58a17e7..a54b810e16 100644
--- a/examples/widgets/richtext/syntaxhighlighter/mainwindow.h
+++ b/examples/widgets/richtext/syntaxhighlighter/mainwindow.h
@@ -65,7 +65,7 @@ class MainWindow : public QMainWindow
Q_OBJECT
public:
- MainWindow(QWidget *parent = 0);
+ MainWindow(QWidget *parent = nullptr);
public slots:
void about();
diff --git a/examples/widgets/richtext/textedit/textedit.h b/examples/widgets/richtext/textedit/textedit.h
index 9e50166c6f..07a307f83d 100644
--- a/examples/widgets/richtext/textedit/textedit.h
+++ b/examples/widgets/richtext/textedit/textedit.h
@@ -70,7 +70,7 @@ class TextEdit : public QMainWindow
Q_OBJECT
public:
- TextEdit(QWidget *parent = 0);
+ TextEdit(QWidget *parent = nullptr);
bool load(const QString &f);
diff --git a/examples/xml/dombookmarks/xbeltree.h b/examples/xml/dombookmarks/xbeltree.h
index c58e1148ff..989841d339 100644
--- a/examples/xml/dombookmarks/xbeltree.h
+++ b/examples/xml/dombookmarks/xbeltree.h
@@ -60,7 +60,7 @@ class XbelTree : public QTreeWidget
Q_OBJECT
public:
- XbelTree(QWidget *parent = 0);
+ XbelTree(QWidget *parent = nullptr);
bool read(QIODevice *device);
bool write(QIODevice *device) const;
@@ -75,9 +75,9 @@ private slots:
private:
void parseFolderElement(const QDomElement &element,
- QTreeWidgetItem *parentItem = 0);
+ QTreeWidgetItem *parentItem = nullptr);
QTreeWidgetItem *createItem(const QDomElement &element,
- QTreeWidgetItem *parentItem = 0);
+ QTreeWidgetItem *parentItem = nullptr);
QDomDocument domDocument;
QIcon folderIcon;
diff --git a/examples/xml/rsslisting/rsslisting.h b/examples/xml/rsslisting/rsslisting.h
index ae428af751..9f4fb2e7df 100644
--- a/examples/xml/rsslisting/rsslisting.h
+++ b/examples/xml/rsslisting/rsslisting.h
@@ -70,7 +70,7 @@ class RSSListing : public QWidget
{
Q_OBJECT
public:
- RSSListing(QWidget *widget = 0);
+ RSSListing(QWidget *widget = nullptr);
public slots:
void fetch();