diff options
| author | Xiao YaoBing <xiaoyaobing@uniontech.com> | 2021-05-26 09:08:47 +0800 |
|---|---|---|
| committer | Xiao YaoBing <xiaoyaobing@uniontech.com> | 2021-05-27 03:24:40 +0800 |
| commit | 135dbdb553f052abefb063de36785587e4031c1a (patch) | |
| tree | 9e9538a3acbc6a5fc9c96958fe18c35892d84b35 /src/widgets | |
| parent | 7f4ec4ed887ca7a3a6f4c0c80e1375b642e1ed03 (diff) | |
Partially modified to use C++11 standard nullptr
Change-Id: Ibfd76357ceb56b347afe7122fc252b866b21cb11
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/kernel/qmacgesturerecognizer.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/kernel/qwidget.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/widgets/qmdisubwindow.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/widgets/qpushbutton_p.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/widgets/kernel/qmacgesturerecognizer.cpp b/src/widgets/kernel/qmacgesturerecognizer.cpp index 8485510490..8e18132df8 100644 --- a/src/widgets/kernel/qmacgesturerecognizer.cpp +++ b/src/widgets/kernel/qmacgesturerecognizer.cpp @@ -179,7 +179,7 @@ QGesture *QMacPanGestureRecognizer::create(QObject *target) w->setAttribute(Qt::WA_TouchPadAcceptSingleTouchEvents); return new QPanGesture; } - return 0; + return nullptr; } void QMacPanGestureRecognizer::timerEvent(QTimerEvent *ev) diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index acc650e847..14012219f9 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -11977,7 +11977,7 @@ void QWidgetPrivate::adjustQuitOnCloseAttribute() QOpenGLContext *QWidgetPrivate::shareContext() const { #ifdef QT_NO_OPENGL - return 0; + return nullptr; #else if (!extra || !extra->topextra || !extra->topextra->window) return nullptr; diff --git a/src/widgets/widgets/qmdisubwindow.cpp b/src/widgets/widgets/qmdisubwindow.cpp index 1c03b02ab8..06ae0479d7 100644 --- a/src/widgets/widgets/qmdisubwindow.cpp +++ b/src/widgets/widgets/qmdisubwindow.cpp @@ -767,7 +767,7 @@ ControlContainer::~ControlContainer() QMenuBar *QMdiSubWindowPrivate::menuBar() const { #if !QT_CONFIG(mainwindow) - return 0; + return nullptr; #else Q_Q(const QMdiSubWindow); if (!q->isMaximized() || drawTitleBarWhenMaximized() || isChildOfTabbedQMdiArea(q)) diff --git a/src/widgets/widgets/qpushbutton_p.h b/src/widgets/widgets/qpushbutton_p.h index 2a3dfeff23..e940b14b79 100644 --- a/src/widgets/widgets/qpushbutton_p.h +++ b/src/widgets/widgets/qpushbutton_p.h @@ -83,7 +83,7 @@ public: #if QT_CONFIG(dialog) QDialog *dialogParent() const; #else - QDialog *dialogParent() const { return 0; } + QDialog *dialogParent() const { return nullptr; } #endif QPointer<QMenu> menu; |