diff options
author | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2018-04-17 18:20:41 -0700 |
---|---|---|
committer | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2018-04-19 22:20:12 +0000 |
commit | 7ee44dcb9c5c4ffaba0043d7d58e0d43ccc06195 (patch) | |
tree | 5a0e04dd7cd7b808f4885ede50339418863f169b /src/plugins/platforms/cocoa/qcocoaintegration.mm | |
parent | 48defe41e1f6fb38800675922289dd7364fad8af (diff) |
Cocoa QPA: Clean up 0 as pointer
We use nil for Objective-C null pointers and nullptr everywhere
else, including CoreFoundation and similar opaque types.
Change-Id: Id75c59413dec54bf4d8e83cf7ed0ff7f3d8bb480
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoaintegration.mm')
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoaintegration.mm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm index a50b9251b7..9f4fd02139 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.mm +++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm @@ -94,11 +94,11 @@ static QCocoaIntegration::Options parseOptions(const QStringList ¶mList) return options; } -QCocoaIntegration *QCocoaIntegration::mInstance = 0; +QCocoaIntegration *QCocoaIntegration::mInstance = nullptr; QCocoaIntegration::QCocoaIntegration(const QStringList ¶mList) : mOptions(parseOptions(paramList)) - , mFontDb(0) + , mFontDb(nullptr) #ifndef QT_NO_ACCESSIBILITY , mAccessibility(new QCocoaAccessibility) #endif @@ -110,7 +110,7 @@ QCocoaIntegration::QCocoaIntegration(const QStringList ¶mList) , mServices(new QCocoaServices) , mKeyboardMapper(new QCocoaKeyMapper) { - if (mInstance != 0) + if (mInstance) qWarning("Creating multiple Cocoa platform integrations is not supported"); mInstance = this; @@ -186,7 +186,7 @@ QCocoaIntegration::QCocoaIntegration(const QStringList ¶mList) QCocoaIntegration::~QCocoaIntegration() { - mInstance = 0; + mInstance = nullptr; qt_resetNSApplicationSendEvent(); @@ -296,7 +296,7 @@ QCocoaScreen *QCocoaIntegration::screenForNSScreen(NSScreen *nsScreen) { NSUInteger index = [[NSScreen screens] indexOfObject:nsScreen]; if (index == NSNotFound) - return 0; + return nullptr; if (index >= unsigned(mScreens.count())) updateScreens(); @@ -306,7 +306,7 @@ QCocoaScreen *QCocoaIntegration::screenForNSScreen(NSScreen *nsScreen) return screen; } - return 0; + return nullptr; } bool QCocoaIntegration::hasCapability(QPlatformIntegration::Capability cap) const @@ -480,14 +480,14 @@ void QCocoaIntegration::pushPopupWindow(QCocoaWindow *window) QCocoaWindow *QCocoaIntegration::popPopupWindow() { if (m_popupWindowStack.isEmpty()) - return 0; + return nullptr; return m_popupWindowStack.takeLast(); } QCocoaWindow *QCocoaIntegration::activePopupWindow() const { if (m_popupWindowStack.isEmpty()) - return 0; + return nullptr; return m_popupWindowStack.front(); } |