From 7ee44dcb9c5c4ffaba0043d7d58e0d43ccc06195 Mon Sep 17 00:00:00 2001 From: Gabriel de Dietrich Date: Tue, 17 Apr 2018 18:20:41 -0700 Subject: Cocoa QPA: Clean up 0 as pointer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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ø --- src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm') diff --git a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm index 63af002c3c..bab673dd64 100644 --- a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm +++ b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm @@ -129,7 +129,7 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSOpenSavePanelDelegate); } else { mSavePanel = [NSSavePanel savePanel]; [mSavePanel setCanSelectHiddenExtension:YES]; - mOpenPanel = 0; + mOpenPanel = nil; } if ([mSavePanel respondsToSelector:@selector(setLevel:)]) @@ -569,7 +569,7 @@ static QString strippedText(QString s) QT_BEGIN_NAMESPACE QCocoaFileDialogHelper::QCocoaFileDialogHelper() - :mDelegate(0) + : mDelegate(nil) { } @@ -579,7 +579,7 @@ QCocoaFileDialogHelper::~QCocoaFileDialogHelper() return; QMacAutoReleasePool pool; [mDelegate release]; - mDelegate = 0; + mDelegate = nil; } void QCocoaFileDialogHelper::QNSOpenSavePanelDelegate_selectionChanged(const QString &newPath) -- cgit v1.2.3