diff options
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm')
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm b/src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm index 815882ab06..33b102f3eb 100644 --- a/src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm +++ b/src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm @@ -74,7 +74,15 @@ static QFont qfontForCocoaFont(NSFont *cocoaFont, const QFont &resolveFont) } @interface QT_MANGLE_NAMESPACE(QNSFontPanelDelegate) : NSObject<NSWindowDelegate, QNSPanelDelegate> -{ +- (void)restoreOriginalContentView; +- (void)updateQtFont; +- (void)changeFont:(id)sender; +- (void)finishOffWithCode:(NSInteger)code; +@end + +QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSFontPanelDelegate); + +@implementation QNSFontPanelDelegate { @public NSFontPanel *mFontPanel; QCocoaFontDialogHelper *mHelper; @@ -84,34 +92,26 @@ static QFont qfontForCocoaFont(NSFont *cocoaFont, const QFont &resolveFont) NSInteger mResultCode; BOOL mDialogIsExecuting; BOOL mResultSet; -}; -- (void)restoreOriginalContentView; -- (void)updateQtFont; -- (void)changeFont:(id)sender; -- (void)finishOffWithCode:(NSInteger)code; -@end - -QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSFontPanelDelegate); - -@implementation QNSFontPanelDelegate +} -- (id)init +- (instancetype)init { - self = [super init]; - mFontPanel = [NSFontPanel sharedFontPanel]; - mHelper = 0; - mStolenContentView = 0; - mPanelButtons = 0; - mResultCode = NSModalResponseCancel; - mDialogIsExecuting = false; - mResultSet = false; + if ((self = [super init])) { + mFontPanel = [NSFontPanel sharedFontPanel]; + mHelper = nullptr; + mStolenContentView = nil; + mPanelButtons = nil; + mResultCode = NSModalResponseCancel; + mDialogIsExecuting = false; + mResultSet = false; - [mFontPanel setRestorable:NO]; - [mFontPanel setDelegate:self]; + [mFontPanel setRestorable:NO]; + [mFontPanel setDelegate:self]; - [NSFontManager sharedFontManager].target = self; // Action is changeFont: + [NSFontManager sharedFontManager].target = self; // Action is changeFont: - [mFontPanel retain]; + [mFontPanel retain]; + } return self; } @@ -135,9 +135,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]; @@ -159,7 +159,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; } @@ -191,7 +191,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]; @@ -295,7 +295,7 @@ public: void cleanup(QCocoaFontDialogHelper *helper) { if (mDelegate->mHelper == helper) - mDelegate->mHelper = 0; + mDelegate->mHelper = nullptr; } bool exec() @@ -329,7 +329,7 @@ public: void setCurrentFont(const QFont &font) { NSFontManager *mgr = [NSFontManager sharedFontManager]; - const NSFont *nsFont = 0; + NSFont *nsFont = nil; int weight = 5; NSFontTraitMask mask = 0; @@ -347,7 +347,7 @@ public: weight:weight size:fontInfo.pointSize()]; - [mgr setSelectedFont:const_cast<NSFont *>(nsFont) isMultiple:NO]; + [mgr setSelectedFont:nsFont isMultiple:NO]; mDelegate->mQtFont = font; } |