From b9f7d232837cf5805250ce9be28526444483fac8 Mon Sep 17 00:00:00 2001 From: Allan Odgaard Date: Sun, 11 Sep 2016 08:40:22 +0200 Subject: [PATCH] Make all tabSize properties use NSUInteger as their type --- Frameworks/OakTextView/src/OTVStatusBar.h | 2 +- Frameworks/OakTextView/src/OTVStatusBar.mm | 4 ++-- Frameworks/OakTextView/src/OakTextView.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Frameworks/OakTextView/src/OTVStatusBar.h b/Frameworks/OakTextView/src/OTVStatusBar.h index a55b86f9..eacdb23b 100644 --- a/Frameworks/OakTextView/src/OTVStatusBar.h +++ b/Frameworks/OakTextView/src/OTVStatusBar.h @@ -13,7 +13,7 @@ @property (nonatomic) NSString* fileType; // This will update grammarName @property (nonatomic, getter = isRecordingMacro) BOOL recordingMacro; @property (nonatomic) BOOL softTabs; -@property (nonatomic) int32_t tabSize; +@property (nonatomic) NSUInteger tabSize; @property (nonatomic, weak) id delegate; @property (nonatomic, weak) id target; diff --git a/Frameworks/OakTextView/src/OTVStatusBar.mm b/Frameworks/OakTextView/src/OTVStatusBar.mm index 8789c0ab..394716c1 100644 --- a/Frameworks/OakTextView/src/OTVStatusBar.mm +++ b/Frameworks/OakTextView/src/OTVStatusBar.mm @@ -306,10 +306,10 @@ static NSMenuItem* OakCreateIndentMenuItem (NSString* title, SEL action, id targ - (void)updateTabSettings { - self.tabSizePopUp.title = [NSString stringWithFormat:@"%@:\u2003%d", _softTabs ? @"Soft Tabs" : @"Tab Size", _tabSize]; + self.tabSizePopUp.title = [NSString stringWithFormat:@"%@:\u2003%lu", _softTabs ? @"Soft Tabs" : @"Tab Size", _tabSize]; } -- (void)setTabSize:(int32_t)size +- (void)setTabSize:(NSUInteger)size { _tabSize = size; [self updateTabSettings]; diff --git a/Frameworks/OakTextView/src/OakTextView.h b/Frameworks/OakTextView/src/OakTextView.h index 821a9769..020e9d4b 100644 --- a/Frameworks/OakTextView/src/OakTextView.h +++ b/Frameworks/OakTextView/src/OakTextView.h @@ -38,7 +38,7 @@ PUBLIC @interface OakTextView : OakView @property (nonatomic) CGFloat fontScaleFactor; @property (nonatomic) BOOL antiAlias; @property (nonatomic) OTVFontSmoothing fontSmoothing; -@property (nonatomic) size_t tabSize; +@property (nonatomic) NSUInteger tabSize; @property (nonatomic) BOOL showInvisibles; @property (nonatomic) BOOL softWrap; @property (nonatomic) BOOL scrollPastEnd;