[TIMOB-18092] Updated casting of values

appcelerator-archive · Dec 8, 2014 · 60ab6fa · 60ab6fa
1 parent 7990afe
commit 60ab6fa
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/ios/Classes/TiChartsLinePlotProxy.m b/ios/Classes/TiChartsLinePlotProxy.m
@@ -88,12 +88,12 @@ -(void)scatterPlot:(CPTScatterPlot*)plot plotSymbolWasSelectedAtRecordIndex:(NSU
 
 -(NSNumber*)numberForPlot:(CPTPlot*)plot field:(NSUInteger)fieldEnum recordIndex:(NSUInteger)index
 {
-    return [self numberForPlot:index forCoordinate:fieldEnum];
+    return [self numberForPlot:index forCoordinate:(CPTCoordinate)fieldEnum];
 }
 
 -(NSNumber*)highlightIndex
 {
-    return NUMINT(highlightSymbolIndex);
+    return [NSNumber numberWithUnsignedInteger:highlightSymbolIndex];
 }
 
 -(void)setHighlightIndex:(id)value

diff --git a/ios/Classes/TiChartsPiePlotProxy.m b/ios/Classes/TiChartsPiePlotProxy.m
@@ -78,7 +78,7 @@ -(NSNumber*)numberForPlot:(CPTPlot*)plot field:(NSUInteger)fieldEnum recordIndex
 	if (fieldEnum == CPTPieChartFieldSliceWidth) {
 		num = [self numberForPlot:index];
 	} else { 
-		num = [NSNumber numberWithInt:index];
+		num = [NSNumber numberWithUnsignedInteger:index];
 	}
 
 	return num;
@@ -103,7 +103,7 @@ -(CPTLayer*)dataLabelForPlot:(CPTPlot *)plot recordIndex:(NSUInteger)index
 
 -(CGFloat)radialOffsetForPieChart:(CPTPieChart *)pieChart recordIndex:(NSUInteger)index
 {
-	if ([explodeSet containsObject:[NSNumber numberWithInt:index]]) {
+	if ([explodeSet containsObject:[NSNumber numberWithUnsignedInteger:index]]) {
 		float amt = (float)[TiUtils floatValue:[self valueForUndefinedKey:@"explodeOffset"] def:0.0];
 		return amt;
 	}

diff --git a/ios/Classes/TiChartsPlotProxy.m b/ios/Classes/TiChartsPlotProxy.m
@@ -96,7 +96,7 @@ -(NSNumber*)numberForPlot:(NSUInteger)index forCoordinate:(CPTCoordinate)coordin
         } else if (coordinate == CPTScatterPlotFieldY) {
             return val;
         } else {
-            return [NSDecimalNumber numberWithUnsignedInt:index];
+            return [NSDecimalNumber numberWithUnsignedInteger:index];
         }
     }
 
@@ -154,7 +154,7 @@ -(void)triggerReconfigure
 	[self performSelectorOnMainThread:@selector(reconfigurePlot) withObject:nil waitUntilDone:NO];
 }
 
--(void)addData:(NSArray*)values startingAtIndex:(int)index
+-(void)addData:(NSArray*)values startingAtIndex:(NSUInteger)index
 {
 	if (values != nil) {
 		Class dictionaryClass = [NSDictionary class];
@@ -268,7 +268,7 @@ -(void)notifyOfDataClickedEvent:(NSUInteger)index
 {
 	if ([self _hasListeners:@"dataClicked"]) {
 		NSDictionary *event = [NSDictionary dictionaryWithObjectsAndKeys:
-                               NUMINT(index),@"index",
+                               [NSNumber numberWithUnsignedInteger:index],@"index",
                                [self numberForPlot:index],@"value",
                                plot.identifier,@"name",                                
                                nil
@@ -293,7 +293,7 @@ -(void)notifyOfDataClickedEvent:(NSUInteger)index atPlotPoint:(CGPoint)plotPoint
 
 	if ([self _hasListeners:@"dataClicked"]) {
 		NSDictionary *event = [NSDictionary dictionaryWithObjectsAndKeys:
-								  NUMINT(index),@"index",
+								  [NSNumber numberWithUnsignedInteger:index],@"index",
 							      [self numberForPlot:index],@"value",
 							      self.plot.identifier,@"name",
                                   NUMINT(viewPoint.x),@"x",

diff --git a/ios/Classes/TiChartsScatterPlotProxy.m b/ios/Classes/TiChartsScatterPlotProxy.m
@@ -85,7 +85,7 @@ -(NSNumber*)indexFromViewPoint:(id)args
 
 -(NSDictionary*)dataPointFromIndex:(id)args
 {
-    ENSURE_ARG_COUNT(args,1)
+    ENSURE_ARG_COUNT(args, 1);
     int index = [TiUtils intValue:[args objectAtIndex:0] def:0];
 
     double pts[2];