Skip to content

Commit 81986f5

Browse files
authored
Fix couple of build warnings (#3218)
* Fix couple of build warnings * revert scripts * fix comment * fix localize
1 parent 0d5d072 commit 81986f5

6 files changed

+15
-9
lines changed

Source/SPConnectionController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2399,7 +2399,7 @@ - (void)failConnectionWithTitle:(NSString *)theTitle errorMessage:(NSString *)th
23992399

24002400
// Inform the delegate that the connection attempt failed
24012401
if (delegate && [delegate respondsToSelector:@selector(connectionControllerConnectAttemptFailed:)]) {
2402-
[[(NSObject *)delegate onMainThread] connectionControllerConnectAttemptFailed:self];
2402+
[[(id)delegate onMainThread] connectionControllerConnectAttemptFailed:self];
24032403
}
24042404

24052405
// Only display the connection error message if there is a window visible

Source/SPEditorPreferencePane.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ - (void)colorChanged:(id)sender
486486
/**
487487
* Sets the font panel's valid modes.
488488
*/
489-
- (NSUInteger)validModesForFontPanel:(NSFontPanel *)fontPanel
489+
- (NSFontPanelModeMask)validModesForFontPanel:(NSFontPanel *)fontPanel
490490
{
491491
return (NSFontPanelSizeModeMask | NSFontPanelCollectionModeMask);
492492
}

Source/SPFilterTableController.m

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,9 @@ - (BOOL)control:(NSControl *)control textShouldBeginEditing:(NSText *)aFieldEdit
652652
- (BOOL)control:(NSControl *)control textView:(NSTextView *)textView doCommandBySelector:(SEL)command
653653
{
654654
// Check firstly if SPCopyTable can handle command
655-
if ([control control:control textView:textView doCommandBySelector:command]) return YES;
655+
if ([control respondsToSelector:@selector(control:textView:doCommandBySelector:)]) {
656+
if ([(id)control control:control textView:textView doCommandBySelector:command]) return YES;
657+
}
656658

657659
// Trap the escape key
658660
if ([[control window] methodForSelector:command] == [[control window] methodForSelector:@selector(cancelOperation:)]) {

Source/SPNavigatorController.m

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -936,6 +936,8 @@ - (id)outlineView:(id)outlineView objectValueForTableColumn:(NSTableColumn *)tab
936936
case SPTableTypeFunc:
937937
[[tableColumn dataCell] setImage:functionIcon];
938938
break;
939+
default:
940+
break;
939941
}
940942
} else {
941943
[[tableColumn dataCell] setImage:databaseIcon];

Source/SPRuleFilterController.m

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -376,13 +376,13 @@ - (NSInteger)ruleEditor:(NSRuleEditor *)editor numberOfChildrenForCriterion:(nul
376376
// the child of an argument can only be the conjunction label if more arguments follow
377377
else if(type == RuleNodeTypeArgument) {
378378
ArgNode *node = (ArgNode *)criterion;
379-
NSInteger numOfArgs = [[[node filter] objectForKey:@"NumberOfArguments"] integerValue];
379+
NSUInteger numOfArgs = [[[node filter] objectForKey:@"NumberOfArguments"] unsignedIntegerValue];
380380
return (numOfArgs > [node argIndex]+1) ? 1 : 0;
381381
}
382382
// the child of a conjunction is the next argument, if we have one
383383
else if(type == RuleNodeTypeConnector) {
384384
ConnectorNode *node = (ConnectorNode *)criterion;
385-
NSInteger numOfArgs = [[[node filter] objectForKey:@"NumberOfArguments"] integerValue];
385+
NSUInteger numOfArgs = [[[node filter] objectForKey:@"NumberOfArguments"] unsignedIntegerValue];
386386
return (numOfArgs > [node labelIndex]+1) ? 1 : 0;
387387
}
388388
}
@@ -424,7 +424,7 @@ - (id)ruleEditor:(NSRuleEditor *)editor child:(NSInteger)index forCriterion:(nul
424424
else if(type == RuleNodeTypeArgument) {
425425
NSDictionary *filter = [(ArgNode *)criterion filter];
426426
NSUInteger argIndex = [(ArgNode *)criterion argIndex];
427-
if([[filter objectForKey:@"NumberOfArguments"] integerValue] > argIndex +1) {
427+
if([[filter objectForKey:@"NumberOfArguments"] unsignedIntegerValue] > argIndex +1) {
428428
ConnectorNode *node = [[ConnectorNode alloc] init];
429429
[node setFilter:filter];
430430
[node setLabelIndex:argIndex]; // label 0 follows argument 0
@@ -434,7 +434,7 @@ - (id)ruleEditor:(NSRuleEditor *)editor child:(NSInteger)index forCriterion:(nul
434434
// the child of a conjunction is the next argument, if we have one
435435
else if(type == RuleNodeTypeConnector) {
436436
ConnectorNode *node = (ConnectorNode *)criterion;
437-
NSInteger numOfArgs = [[[node filter] objectForKey:@"NumberOfArguments"] integerValue];
437+
NSUInteger numOfArgs = [[[node filter] objectForKey:@"NumberOfArguments"] unsignedIntegerValue];
438438
if(numOfArgs > [node labelIndex]+1) {
439439
ArgNode *arg = [[ArgNode alloc] init];
440440
[arg setFilter:[node filter]];
@@ -1141,7 +1141,7 @@ - (NSMutableDictionary *)_restoreSerializedFilter:(NSDictionary *)serialized
11411141
}
11421142

11431143
//now we have to create the argument node(s)
1144-
NSInteger numOfArgs = [[[op filter] objectForKey:@"NumberOfArguments"] integerValue];
1144+
NSUInteger numOfArgs = [[[op filter] objectForKey:@"NumberOfArguments"] unsignedIntegerValue];
11451145
//fail if the current op requires more arguments than we have stored values for
11461146
NSArray *values = [serialized objectForKey:SerFilterExprValues];
11471147
if(numOfArgs > [values count]) {

Source/SPTextView.m

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -535,6 +535,8 @@ - (NSArray *)suggestionsForSQLCompletionWith:(NSString *)currentWord dictMode:(B
535535
[possibleCompletions addObject:[NSDictionary dictionaryWithObjectsAndKeys:[[table componentsSeparatedByString:SPUniqueSchemaDelimiter] lastObject], @"display", @"func-small", @"image", tablepath, @"path", @"", @"isRef", nil]];
536536
breakFlag = YES;
537537
break;
538+
default:
539+
break;
538540
}
539541
if(!breakFlag) {
540542
NSArray *sortedFields = [allFields sortedArrayUsingDescriptors:@[desc]];
@@ -3421,7 +3423,7 @@ - (void)textStorageDidProcessEditing:(NSNotification *)notification
34213423
/**
34223424
* Set font panel's valid modes
34233425
*/
3424-
- (NSUInteger)validModesForFontPanel:(NSFontPanel *)fontPanel
3426+
- (NSFontPanelModeMask)validModesForFontPanel:(NSFontPanel *)fontPanel
34253427
{
34263428
return (NSFontPanelSizeModeMask|NSFontPanelCollectionModeMask);
34273429
}

0 commit comments

Comments
 (0)