diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-20 17:31:18 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-21 12:26:21 +0000 |
| commit | f4f5e857447d42738b1b60b5c4184f39df2f1593 (patch) | |
| tree | cae2e6a223cb48350b9634c0a04b39847ebc4299 /src/templates/qquickoverlay.cpp | |
| parent | 7cad85c2f0930e4f8531a0508c28abdae0f3e0de (diff) | |
C++11 keywords
- Q_NULLPTR -> nullptr
- Q_DECL_OVERRIDE -> override
Change-Id: I8ee65caafd43ab41b6de43835200cac6c8ffa278
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/templates/qquickoverlay.cpp')
| -rw-r--r-- | src/templates/qquickoverlay.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/templates/qquickoverlay.cpp b/src/templates/qquickoverlay.cpp index e06d28ea..5455676f 100644 --- a/src/templates/qquickoverlay.cpp +++ b/src/templates/qquickoverlay.cpp @@ -109,7 +109,7 @@ void QQuickOverlayPrivate::resizeBackground() } QQuickOverlayPrivate::QQuickOverlayPrivate() : - background(Q_NULLPTR), + background(nullptr), modalPopups(0) { } @@ -152,7 +152,7 @@ void QQuickOverlay::itemChange(ItemChange change, const ItemChangeData &data) Q_D(QQuickOverlay); QQuickItem::itemChange(change, data); - QQuickPopup *popup = Q_NULLPTR; + QQuickPopup *popup = nullptr; if (change == ItemChildAddedChange || change == ItemChildRemovedChange) { QQuickDrawer *drawer = qobject_cast<QQuickDrawer *>(data.item); if (drawer) { |