Use Cocoa integer types to facilitate 64-bit transition

This commit is contained in:
Andrew Kitchen 2017-07-01 22:07:27 -07:00
parent 8b75b53300
commit c424d8f227
5 changed files with 8 additions and 8 deletions

View file

@ -52,7 +52,7 @@
IBOutlet NSMenuItem* dockShortcutItem;
BOOL _isCapturing;
BOOL _allowToggle;
int _startupIconPreference;
NSInteger _startupIconPreference;
KCKeyboardTap* keyboardTap;
}

View file

@ -250,7 +250,7 @@
-(void) _suspendAnimations
{
int vc = [_runningAnimations count];
NSUInteger vc = [_runningAnimations count];
int i;
for (i = 0; i < vc; ++i)
{
@ -261,7 +261,7 @@
-(void) _resumeAnimations
{
int vc = [_runningAnimations count];
NSUInteger vc = [_runningAnimations count];
int i;
for (i = 0; i < vc; ++i)
{
@ -343,7 +343,7 @@
[_bezelView removeFromSuperview];
NSArray* a = [[w contentView] subviews];
int vc = [a count];
NSUInteger vc = [a count];
int i;
for (i = 0; i < vc; ++i)
{
@ -476,7 +476,7 @@ static const int kKCBezelBorder = 6;
float deltaY = size.height - frame.size.height;
NSWindow* w = [self window];
NSArray* a = [[w contentView] subviews];
int vc = [a count];
NSUInteger vc = [a count];
int i;
for (i = 0; i < vc; ++i)
{

View file

@ -247,7 +247,7 @@ CGEventRef eventTapCallback(
modifiers |= NSAlternateKeyMask;
UniChar buf[3] = {0};
UInt32 len;
UniCharCount len;
UInt32 deadKeys = 0;
TISInputSourceRef inputSource = TISCopyCurrentKeyboardLayoutInputSource();

View file

@ -39,7 +39,7 @@
NSMutableArray* toolbarItemIdentifiers;
NSToolbar* toolbar;
NSMutableArray* preferenceViews;
int _selectedPreferencePane;
NSInteger _selectedPreferencePane;
}
-(void) changeVisualizerFrom:(id<KCVisualizer>)old to:(id<KCVisualizer>)new;

View file

@ -64,7 +64,7 @@
NSToolbarItem* item = sender;
// Otherwise, switch preference panes:
int tag = [item tag];
NSInteger tag = [item tag];
if (tag == _selectedPreferencePane)
return;