diff options
author | Paul Wicking <paul.wicking@qt.io> | 2020-06-10 07:22:27 +0200 |
---|---|---|
committer | Paul Wicking <paul.wicking@qt.io> | 2020-06-10 07:47:37 +0200 |
commit | f3c402a6df0060dc4d0f3013c5d1fa31960dba7c (patch) | |
tree | 9d6a8815d703f4c8d7335fc03f1c66826fdc862f /src/gui/doc/snippets | |
parent | c208b648f91da5139b8eda0c239201768f9d4059 (diff) |
Doc snippets: Use nullptr instead of 0 literal
Also mark constructors explicit, where applicable.
Pick-to: 5.15
Fixes: QTBUG-84859
Change-Id: I145d366d854fd6b4373bcc23d0b880d6361d9014
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/gui/doc/snippets')
-rw-r--r-- | src/gui/doc/snippets/clipboard/clipwindow.h | 2 | ||||
-rw-r--r-- | src/gui/doc/snippets/code/src_gui_opengl_qopenglfunctions.cpp | 2 | ||||
-rw-r--r-- | src/gui/doc/snippets/draganddrop/dragwidget.h | 2 | ||||
-rw-r--r-- | src/gui/doc/snippets/draganddrop/mainwindow.h | 2 | ||||
-rw-r--r-- | src/gui/doc/snippets/dragging/mainwindow.h | 2 | ||||
-rw-r--r-- | src/gui/doc/snippets/dropevents/window.h | 2 | ||||
-rw-r--r-- | src/gui/doc/snippets/droprectangle/window.h | 2 | ||||
-rw-r--r-- | src/gui/doc/snippets/plaintextlayout/window.h | 2 | ||||
-rw-r--r-- | src/gui/doc/snippets/qstatustipevent/main.cpp | 2 | ||||
-rw-r--r-- | src/gui/doc/snippets/scribe-overview/main.cpp | 2 | ||||
-rw-r--r-- | src/gui/doc/snippets/textdocument-imagedrop/textedit.h | 2 |
11 files changed, 11 insertions, 11 deletions
diff --git a/src/gui/doc/snippets/clipboard/clipwindow.h b/src/gui/doc/snippets/clipboard/clipwindow.h index 81e50a3c89..6e4fa0c73a 100644 --- a/src/gui/doc/snippets/clipboard/clipwindow.h +++ b/src/gui/doc/snippets/clipboard/clipwindow.h @@ -65,7 +65,7 @@ class ClipWindow : public QMainWindow Q_OBJECT public: - ClipWindow(QWidget *parent = 0); + explicit ClipWindow(QWidget *parent = nullptr); public slots: void updateClipboard(); diff --git a/src/gui/doc/snippets/code/src_gui_opengl_qopenglfunctions.cpp b/src/gui/doc/snippets/code/src_gui_opengl_qopenglfunctions.cpp index e072c110f2..e4255107d3 100644 --- a/src/gui/doc/snippets/code/src_gui_opengl_qopenglfunctions.cpp +++ b/src/gui/doc/snippets/code/src_gui_opengl_qopenglfunctions.cpp @@ -53,7 +53,7 @@ { Q_OBJECT public: - MyGLWindow(QScreen *screen = 0); + explicit MyGLWindow(QScreen *screen = nullptr); protected: void initializeGL(); diff --git a/src/gui/doc/snippets/draganddrop/dragwidget.h b/src/gui/doc/snippets/draganddrop/dragwidget.h index 709f9338bf..eb069d73d2 100644 --- a/src/gui/doc/snippets/draganddrop/dragwidget.h +++ b/src/gui/doc/snippets/draganddrop/dragwidget.h @@ -66,7 +66,7 @@ class DragWidget : public QFrame Q_OBJECT public: - DragWidget(QWidget *parent); + explicit DragWidget(QWidget *parent = nullptr); void setData(const QString &mimetype, const QByteArray &newData); signals: diff --git a/src/gui/doc/snippets/draganddrop/mainwindow.h b/src/gui/doc/snippets/draganddrop/mainwindow.h index 784371d4af..85581e7909 100644 --- a/src/gui/doc/snippets/draganddrop/mainwindow.h +++ b/src/gui/doc/snippets/draganddrop/mainwindow.h @@ -67,7 +67,7 @@ class MainWindow : public QMainWindow Q_OBJECT public: - MainWindow(QWidget *parent = 0); + explicit MainWindow(QWidget *parent = nullptr); public slots: void setDragResult(const QString &actionText); diff --git a/src/gui/doc/snippets/dragging/mainwindow.h b/src/gui/doc/snippets/dragging/mainwindow.h index 8a8e43b223..fd7f659b2d 100644 --- a/src/gui/doc/snippets/dragging/mainwindow.h +++ b/src/gui/doc/snippets/dragging/mainwindow.h @@ -65,7 +65,7 @@ class MainWindow : public QMainWindow Q_OBJECT public: - MainWindow(QWidget *parent = 0); + explicit MainWindow(QWidget *parent = nullptr); protected: void mousePressEvent(QMouseEvent *event) override; diff --git a/src/gui/doc/snippets/dropevents/window.h b/src/gui/doc/snippets/dropevents/window.h index 6ac35181ed..294ffb74cc 100644 --- a/src/gui/doc/snippets/dropevents/window.h +++ b/src/gui/doc/snippets/dropevents/window.h @@ -64,7 +64,7 @@ class Window : public QWidget Q_OBJECT public: - Window(QWidget *parent = 0); + explicit Window(QWidget *parent = nullptr); protected: void dragEnterEvent(QDragEnterEvent *event) override; diff --git a/src/gui/doc/snippets/droprectangle/window.h b/src/gui/doc/snippets/droprectangle/window.h index 5a9ef75d3b..5e2980c812 100644 --- a/src/gui/doc/snippets/droprectangle/window.h +++ b/src/gui/doc/snippets/droprectangle/window.h @@ -64,7 +64,7 @@ class Window : public QWidget Q_OBJECT public: - Window(QWidget *parent = 0); + explicit Window(QWidget *parent = nullptr); protected: void dragMoveEvent(QDragMoveEvent *event) override; diff --git a/src/gui/doc/snippets/plaintextlayout/window.h b/src/gui/doc/snippets/plaintextlayout/window.h index 8552ecd4ba..b83472f158 100644 --- a/src/gui/doc/snippets/plaintextlayout/window.h +++ b/src/gui/doc/snippets/plaintextlayout/window.h @@ -58,7 +58,7 @@ class Window : public QWidget Q_OBJECT public: - Window(QWidget *parent = 0); + explicit Window(QWidget *parent = nullptr); protected: void paintEvent(QPaintEvent *event) override; diff --git a/src/gui/doc/snippets/qstatustipevent/main.cpp b/src/gui/doc/snippets/qstatustipevent/main.cpp index cc43c56334..6cf63fd875 100644 --- a/src/gui/doc/snippets/qstatustipevent/main.cpp +++ b/src/gui/doc/snippets/qstatustipevent/main.cpp @@ -54,7 +54,7 @@ class MainWindow : public QMainWindow { public: - MainWindow(QWidget *parent = 0); + explicit MainWindow(QWidget *parent = nullptr); }; //! [0] //! [1] diff --git a/src/gui/doc/snippets/scribe-overview/main.cpp b/src/gui/doc/snippets/scribe-overview/main.cpp index 6a0ff7a341..104dee2f53 100644 --- a/src/gui/doc/snippets/scribe-overview/main.cpp +++ b/src/gui/doc/snippets/scribe-overview/main.cpp @@ -68,7 +68,7 @@ void mergeFormat(QTextEdit *edit) int main(int argc, char *argv[]) { - QWidget *parent = 0; + QWidget *parent = nullptr; QString aStringContainingHTMLtext("<h1>Scribe Overview</h1>"); QApplication app(argc, argv); diff --git a/src/gui/doc/snippets/textdocument-imagedrop/textedit.h b/src/gui/doc/snippets/textdocument-imagedrop/textedit.h index 3f570884ba..5db7dd0ad7 100644 --- a/src/gui/doc/snippets/textdocument-imagedrop/textedit.h +++ b/src/gui/doc/snippets/textdocument-imagedrop/textedit.h @@ -58,7 +58,7 @@ class TextEdit : public QTextEdit Q_OBJECT public: - TextEdit(QWidget *parent=0); + explicit TextEdit(QWidget *parent = nullptr); bool canInsertFromMimeData( const QMimeData *source ) const override; void insertFromMimeData( const QMimeData *source ) override; }; |