diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-07 13:05:48 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-07 23:02:47 +0200 |
commit | 564b59d903683b14c75b72a3e93367717f201def (patch) | |
tree | 03ffe749d83dce84429a7db484bf92795047036f /src/widgets/kernel | |
parent | b5fc1e4e2643e73d3b44c483d159529f8deb8af1 (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 'src/widgets/kernel')
-rw-r--r-- | src/widgets/kernel/qapplication.cpp | 2 | ||||
-rw-r--r-- | src/widgets/kernel/qboxlayout.cpp | 8 | ||||
-rw-r--r-- | src/widgets/kernel/qgridlayout.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index fdfb54881a..87bca40468 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -358,7 +358,7 @@ int QApplicationPrivate::enabledAnimations = QPlatformTheme::GeneralUiEffect; bool QApplicationPrivate::widgetCount = false; #ifdef QT_KEYPAD_NAVIGATION Qt::NavigationMode QApplicationPrivate::navigationMode = Qt::NavigationModeKeypadTabOrder; -QWidget *QApplicationPrivate::oldEditFocus = 0; +QWidget *QApplicationPrivate::oldEditFocus = nullptr; #endif inline bool QApplicationPrivate::isAlien(QWidget *widget) diff --git a/src/widgets/kernel/qboxlayout.cpp b/src/widgets/kernel/qboxlayout.cpp index a23b89a8a5..b01227b8d5 100644 --- a/src/widgets/kernel/qboxlayout.cpp +++ b/src/widgets/kernel/qboxlayout.cpp @@ -149,8 +149,8 @@ void QBoxLayoutPrivate::effectiveMargins(int *left, int *top, int *right, int *b #ifdef Q_OS_MAC Q_Q(const QBoxLayout); if (horz(dir)) { - QBoxLayoutItem *leftBox = 0; - QBoxLayoutItem *rightBox = 0; + QBoxLayoutItem *leftBox = nullptr; + QBoxLayoutItem *rightBox = nullptr; if (left || right) { leftBox = list.value(0); @@ -194,8 +194,8 @@ void QBoxLayoutPrivate::effectiveMargins(int *left, int *top, int *right, int *b } } } else { // vertical layout - QBoxLayoutItem *topBox = 0; - QBoxLayoutItem *bottomBox = 0; + QBoxLayoutItem *topBox = nullptr; + QBoxLayoutItem *bottomBox = nullptr; if (top || bottom) { topBox = list.value(0); diff --git a/src/widgets/kernel/qgridlayout.cpp b/src/widgets/kernel/qgridlayout.cpp index 51797b0cf1..339677378f 100644 --- a/src/widgets/kernel/qgridlayout.cpp +++ b/src/widgets/kernel/qgridlayout.cpp @@ -253,7 +253,7 @@ void QGridLayoutPrivate::effectiveMargins(int *left, int *top, int *right, int * int rightMost = 0; int bottomMost = 0; - QWidget *w = 0; + QWidget *w = nullptr; const int n = things.count(); for (int i = 0; i < n; ++i) { QGridBox *box = things.at(i); |