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>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm b/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
index 0e127902ae..d7850b1481 100644
--- a/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
+++ b/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
@@ -74,8 +74,8 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSColorPanelDelegate);
 {
     self = [super init];
     mColorPanel = [NSColorPanel sharedColorPanel];
-    mHelper = 0;
-    mStolenContentView = 0;
+    mHelper = nullptr;
+    mStolenContentView = nil;
     mPanelButtons = nil;
     mResultCode = NSModalResponseCancel;
     mDialogIsExecuting = false;
@@ -115,9 +115,9 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSColorPanelDelegate);
         [self restoreOriginalContentView];
     } else if (!mStolenContentView) {
         // steal the color panel's contents view
-        mStolenContentView = [mColorPanel contentView];
+        mStolenContentView = mColorPanel.contentView;
         [mStolenContentView retain];
-        [mColorPanel setContentView:0];
+        mColorPanel.contentView = nil;
 
         // create a new content view and add the stolen one as a subview
         mPanelButtons = [[QNSPanelContentsWrapper alloc] initWithPanelDelegate:self];
@@ -309,7 +309,7 @@ public:
     void cleanup(QCocoaColorDialogHelper *helper)
     {
         if (mDelegate->mHelper == helper)
-            mDelegate->mHelper = 0;
+            mDelegate->mHelper = nullptr;
     }
 
     bool exec()