diff options
Diffstat (limited to 'src/widgets/kernel/qwidget.cpp')
| -rw-r--r-- | src/widgets/kernel/qwidget.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 2ee9d307c9..c5eea1c514 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Copyright (C) 2016 Intel Corporation. ** Contact: https://www.qt.io/licensing/ ** @@ -1169,7 +1169,7 @@ void QWidgetPrivate::init(QWidget *parentWidget, Qt::WindowFlags f) if (targetScreen >= 0) { topData()->initialScreenIndex = targetScreen; if (QWindow *window = q->windowHandle()) - window->setScreen(QGuiApplication::screens().value(targetScreen, Q_NULLPTR)); + window->setScreen(QGuiApplication::screens().value(targetScreen, nullptr)); } data.fstrut_dirty = true; @@ -1463,7 +1463,7 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO screenNumber = q->windowType() != Qt::Desktop ? QDesktopWidgetPrivate::screenNumber(q) : 0; } - win->setScreen(QGuiApplication::screens().value(screenNumber, Q_NULLPTR)); + win->setScreen(QGuiApplication::screens().value(screenNumber, nullptr)); } QSurfaceFormat format = win->requestedFormat(); @@ -1504,7 +1504,7 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO QBackingStore *store = q->backingStore(); if (!store) { - if (win && q->windowType() != Qt::Desktop) { + if (q->windowType() != Qt::Desktop) { if (q->isTopLevel()) q->setBackingStore(new QBackingStore(win)); } else { @@ -7905,7 +7905,7 @@ void QWidgetPrivate::show_helper() const bool isWindow = q->isWindow(); #if QT_CONFIG(graphicsview) - bool isEmbedded = isWindow && q->graphicsProxyWidget() != Q_NULLPTR; + bool isEmbedded = isWindow && q->graphicsProxyWidget() != nullptr; #else bool isEmbedded = false; #endif @@ -12460,7 +12460,7 @@ static inline bool canMapPosition(QWindow *window) #if QT_CONFIG(graphicsview) static inline QGraphicsProxyWidget *graphicsProxyWidget(const QWidget *w) { - QGraphicsProxyWidget *result = Q_NULLPTR; + QGraphicsProxyWidget *result = nullptr; const QWidgetPrivate *d = qt_widget_private(const_cast<QWidget *>(w)); if (d->extra) result = d->extra->proxyWidget; @@ -12476,7 +12476,7 @@ struct MapToGlobalTransformResult { static MapToGlobalTransformResult mapToGlobalTransform(const QWidget *w) { MapToGlobalTransformResult result; - result.window = Q_NULLPTR; + result.window = nullptr; for ( ; w ; w = w->parentWidget()) { #if QT_CONFIG(graphicsview) if (QGraphicsProxyWidget *qgpw = graphicsProxyWidget(w)) { |