1 files changed, 10 insertions, 10 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm b/src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm
index 3010aa0870..29aaaae683 100644
--- a/src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm
+++ b/src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm
@@ -100,9 +100,9 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSFontPanelDelegate);
 {
     if ((self = [super init])) {
         mFontPanel = [NSFontPanel sharedFontPanel];
-        mHelper = 0;
-        mStolenContentView = 0;
-        mPanelButtons = 0;
+        mHelper = nullptr;
+        mStolenContentView = nil;
+        mPanelButtons = nil;
         mResultCode = NSModalResponseCancel;
         mDialogIsExecuting = false;
         mResultSet = false;
@@ -136,9 +136,9 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSFontPanelDelegate);
         [self restoreOriginalContentView];
     } else if (!mStolenContentView) {
         // steal the font panel's contents view
-        mStolenContentView = [mFontPanel contentView];
+        mStolenContentView = mFontPanel.contentView;
         [mStolenContentView retain];
-        [mFontPanel setContentView:0];
+        mFontPanel.contentView = nil;
 
         // create a new content view and add the stolen one as a subview
         mPanelButtons = [[QNSPanelContentsWrapper alloc] initWithPanelDelegate:self];
@@ -160,7 +160,7 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSFontPanelDelegate);
         // return stolen stuff to its rightful owner
         [mStolenContentView removeFromSuperview];
         [mFontPanel setContentView:mStolenContentView];
-        mStolenContentView = 0;
+        mStolenContentView = nil;
         [mPanelButtons release];
         mPanelButtons = nil;
     }
@@ -192,7 +192,7 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSFontPanelDelegate);
     // Get selected font
     NSFontManager *fontManager = [NSFontManager sharedFontManager];
     NSFont *selectedFont = [fontManager selectedFont];
-    if (selectedFont == nil) {
+    if (!selectedFont) {
         selectedFont = [NSFont systemFontOfSize:[NSFont systemFontSize]];
     }
     NSFont *panelFont = [fontManager convertFont:selectedFont];
@@ -296,7 +296,7 @@ public:
     void cleanup(QCocoaFontDialogHelper *helper)
     {
         if (mDelegate->mHelper == helper)
-            mDelegate->mHelper = 0;
+            mDelegate->mHelper = nullptr;
     }
 
     bool exec()
@@ -330,7 +330,7 @@ public:
     void setCurrentFont(const QFont &font)
     {
         NSFontManager *mgr = [NSFontManager sharedFontManager];
-        const NSFont *nsFont = 0;
+        NSFont *nsFont = nil;
 
         int weight = 5;
         NSFontTraitMask mask = 0;
@@ -348,7 +348,7 @@ public:
             weight:weight
             size:fontInfo.pointSize()];
 
-        [mgr setSelectedFont:const_cast<NSFont *>(nsFont) isMultiple:NO];
+        [mgr setSelectedFont:nsFont isMultiple:NO];
         mDelegate->mQtFont = font;
     }