Skip to content

Commit fd818ef

Browse files
eskrocheskroch
committed
Merged the default branch into the release-2.0 branch. Fixed some new compiler warnings.
2 parents 81b0442 + 4123c28 commit fd818ef

19 files changed

Lines changed: 75 additions & 106 deletions

File tree

‎QCPlugin/CorePlotQCPlugin.xcodeproj/project.pbxproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@
212212
089C1669FE841209C02AAC07 /* Project object */ = {
213213
isa = PBXProject;
214214
attributes = {
215-
LastUpgradeCheck = 0440;
215+
LastUpgradeCheck = 0500;
216216
};
217217
buildConfigurationList = 1DEB913E08733D840010E9CD /* Build configuration list for PBXProject "CorePlotQCPlugin" */;
218218
compatibilityVersion = "Xcode 3.2";
@@ -369,7 +369,6 @@
369369
isa = XCBuildConfiguration;
370370
buildSettings = {
371371
ALWAYS_SEARCH_USER_PATHS = NO;
372-
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
373372
FRAMEWORK_SEARCH_PATHS = "";
374373
GCC_C_LANGUAGE_STANDARD = c99;
375374
GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -383,7 +382,6 @@
383382
isa = XCBuildConfiguration;
384383
buildSettings = {
385384
ALWAYS_SEARCH_USER_PATHS = NO;
386-
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
387385
FRAMEWORK_SEARCH_PATHS = "";
388386
GCC_C_LANGUAGE_STANDARD = c99;
389387
GCC_WARN_ABOUT_RETURN_TYPE = YES;

‎examples/AAPLot/AAPLot.xcodeproj/project.pbxproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@
238238
29B97313FDCFA39411CA2CEA /* Project object */ = {
239239
isa = PBXProject;
240240
attributes = {
241-
LastUpgradeCheck = 0440;
241+
LastUpgradeCheck = 0500;
242242
};
243243
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "AAPLot" */;
244244
compatibilityVersion = "Xcode 3.2";
@@ -359,7 +359,6 @@
359359
isa = XCBuildConfiguration;
360360
buildSettings = {
361361
ALWAYS_SEARCH_USER_PATHS = NO;
362-
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
363362
GCC_C_LANGUAGE_STANDARD = c99;
364363
GCC_WARN_ABOUT_RETURN_TYPE = YES;
365364
GCC_WARN_UNUSED_VARIABLE = YES;
@@ -376,7 +375,6 @@
376375
isa = XCBuildConfiguration;
377376
buildSettings = {
378377
ALWAYS_SEARCH_USER_PATHS = NO;
379-
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
380378
GCC_C_LANGUAGE_STANDARD = c99;
381379
GCC_WARN_ABOUT_RETURN_TYPE = YES;
382380
GCC_WARN_UNUSED_VARIABLE = YES;

‎examples/CPTTestApp-iPad/CPTTestApp-iPad.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180
29B97313FDCFA39411CA2CEA /* Project object */ = {
181181
isa = PBXProject;
182182
attributes = {
183-
LastUpgradeCheck = 0440;
183+
LastUpgradeCheck = 0500;
184184
};
185185
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "CPTTestApp-iPad" */;
186186
compatibilityVersion = "Xcode 3.2";
@@ -288,12 +288,12 @@
288288
isa = XCBuildConfiguration;
289289
buildSettings = {
290290
ALWAYS_SEARCH_USER_PATHS = NO;
291-
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
292291
GCC_C_LANGUAGE_STANDARD = c99;
293292
GCC_WARN_ABOUT_RETURN_TYPE = YES;
294293
GCC_WARN_UNUSED_VARIABLE = YES;
295294
HEADER_SEARCH_PATHS = "";
296295
IPHONEOS_DEPLOYMENT_TARGET = 3.2;
296+
ONLY_ACTIVE_ARCH = YES;
297297
OTHER_LDFLAGS = (
298298
"-ObjC",
299299
"-all_load",
@@ -309,7 +309,6 @@
309309
isa = XCBuildConfiguration;
310310
buildSettings = {
311311
ALWAYS_SEARCH_USER_PATHS = NO;
312-
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
313312
GCC_C_LANGUAGE_STANDARD = c99;
314313
GCC_WARN_ABOUT_RETURN_TYPE = YES;
315314
GCC_WARN_UNUSED_VARIABLE = YES;

‎examples/CPTTestApp-iPhone-SpeedTest/CPTTestApp-iPhone.xcodeproj/project.pbxproj‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@
228228
29B97313FDCFA39411CA2CEA /* Project object */ = {
229229
isa = PBXProject;
230230
attributes = {
231-
LastUpgradeCheck = 0440;
231+
LastUpgradeCheck = 0500;
232232
};
233233
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "CPTTestApp-iPhone" */;
234234
compatibilityVersion = "Xcode 3.2";
@@ -339,7 +339,6 @@
339339
isa = XCBuildConfiguration;
340340
buildSettings = {
341341
ALWAYS_SEARCH_USER_PATHS = NO;
342-
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
343342
CLANG_ENABLE_OBJC_ARC = YES;
344343
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
345344
COPY_PHASE_STRIP = YES;
@@ -362,7 +361,6 @@
362361
isa = XCBuildConfiguration;
363362
buildSettings = {
364363
ALWAYS_SEARCH_USER_PATHS = NO;
365-
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
366364
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Don't Code Sign";
367365
GCC_C_LANGUAGE_STANDARD = c99;
368366
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
@@ -382,7 +380,6 @@
382380
isa = XCBuildConfiguration;
383381
buildSettings = {
384382
ALWAYS_SEARCH_USER_PATHS = NO;
385-
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
386383
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Brad Larson";
387384
GCC_C_LANGUAGE_STANDARD = c99;
388385
GCC_TREAT_WARNINGS_AS_ERRORS = YES;

‎examples/CPTTestApp-iPhone/CPTTestApp-iPhone.xcodeproj/project.pbxproj‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@
226226
29B97313FDCFA39411CA2CEA /* Project object */ = {
227227
isa = PBXProject;
228228
attributes = {
229-
LastUpgradeCheck = 0440;
229+
LastUpgradeCheck = 0500;
230230
};
231231
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "CPTTestApp-iPhone" */;
232232
compatibilityVersion = "Xcode 3.2";
@@ -315,7 +315,6 @@
315315
isa = XCBuildConfiguration;
316316
buildSettings = {
317317
ALWAYS_SEARCH_USER_PATHS = NO;
318-
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
319318
CLANG_ENABLE_OBJC_ARC = YES;
320319
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
321320
COPY_PHASE_STRIP = NO;
@@ -340,7 +339,6 @@
340339
isa = XCBuildConfiguration;
341340
buildSettings = {
342341
ALWAYS_SEARCH_USER_PATHS = NO;
343-
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
344342
CLANG_ENABLE_OBJC_ARC = YES;
345343
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
346344
COPY_PHASE_STRIP = YES;
@@ -363,7 +361,6 @@
363361
isa = XCBuildConfiguration;
364362
buildSettings = {
365363
ALWAYS_SEARCH_USER_PATHS = NO;
366-
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
367364
CODE_SIGN_IDENTITY = "iPhone Developer";
368365
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
369366
GCC_C_LANGUAGE_STANDARD = c99;
@@ -387,7 +384,6 @@
387384
isa = XCBuildConfiguration;
388385
buildSettings = {
389386
ALWAYS_SEARCH_USER_PATHS = NO;
390-
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
391387
CODE_SIGN_IDENTITY = "iPhone Distribution";
392388
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
393389
GCC_C_LANGUAGE_STANDARD = c99;

‎examples/CPTTestApp/CPTTestApp.xcodeproj/project.pbxproj‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@
244244
isa = PBXProject;
245245
attributes = {
246246
BuildIndependentTargetsInParallel = NO;
247-
LastUpgradeCheck = 0440;
247+
LastUpgradeCheck = 0500;
248248
};
249249
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "CPTTestApp" */;
250250
compatibilityVersion = "Xcode 3.2";
@@ -345,7 +345,6 @@
345345
isa = XCBuildConfiguration;
346346
buildSettings = {
347347
ALWAYS_SEARCH_USER_PATHS = NO;
348-
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
349348
CLANG_ENABLE_OBJC_ARC = YES;
350349
COMBINE_HIDPI_IMAGES = YES;
351350
COPY_PHASE_STRIP = NO;
@@ -368,7 +367,6 @@
368367
isa = XCBuildConfiguration;
369368
buildSettings = {
370369
ALWAYS_SEARCH_USER_PATHS = NO;
371-
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
372370
CLANG_ENABLE_OBJC_ARC = YES;
373371
COMBINE_HIDPI_IMAGES = YES;
374372
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -387,7 +385,6 @@
387385
isa = XCBuildConfiguration;
388386
buildSettings = {
389387
ALWAYS_SEARCH_USER_PATHS = NO;
390-
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
391388
FRAMEWORK_SEARCH_PATHS = "";
392389
GCC_C_LANGUAGE_STANDARD = c99;
393390
GCC_OPTIMIZATION_LEVEL = 0;
@@ -405,7 +402,6 @@
405402
isa = XCBuildConfiguration;
406403
buildSettings = {
407404
ALWAYS_SEARCH_USER_PATHS = NO;
408-
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
409405
FRAMEWORK_SEARCH_PATHS = "";
410406
GCC_C_LANGUAGE_STANDARD = c99;
411407
GCC_PREPROCESSOR_DEFINITIONS = "";

‎examples/CorePlotGallery/Plot_Gallery_Mac.xcodeproj/project.pbxproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@
359359
29B97313FDCFA39411CA2CEA /* Project object */ = {
360360
isa = PBXProject;
361361
attributes = {
362-
LastUpgradeCheck = 0440;
362+
LastUpgradeCheck = 0500;
363363
};
364364
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Plot_Gallery_Mac" */;
365365
compatibilityVersion = "Xcode 3.2";
@@ -536,7 +536,6 @@
536536
C01FCF4F08A954540054247B /* Debug */ = {
537537
isa = XCBuildConfiguration;
538538
buildSettings = {
539-
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
540539
FRAMEWORK_SEARCH_PATHS = "";
541540
GCC_C_LANGUAGE_STANDARD = gnu99;
542541
GCC_OPTIMIZATION_LEVEL = 0;
@@ -556,7 +555,6 @@
556555
C01FCF5008A954540054247B /* Release */ = {
557556
isa = XCBuildConfiguration;
558557
buildSettings = {
559-
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
560558
GCC_C_LANGUAGE_STANDARD = gnu99;
561559
GCC_WARN_ABOUT_RETURN_TYPE = YES;
562560
GCC_WARN_UNUSED_VARIABLE = YES;

‎examples/CorePlotGallery/Plot_Gallery_iOS.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@
362362
29B97313FDCFA39411CA2CEA /* Project object */ = {
363363
isa = PBXProject;
364364
attributes = {
365-
LastUpgradeCheck = 0440;
365+
LastUpgradeCheck = 0500;
366366
};
367367
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Plot_Gallery_iOS" */;
368368
compatibilityVersion = "Xcode 3.2";
@@ -516,12 +516,12 @@
516516
C01FCF4F08A954540054247B /* Debug */ = {
517517
isa = XCBuildConfiguration;
518518
buildSettings = {
519-
ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
520519
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Don't Code Sign";
521520
GCC_C_LANGUAGE_STANDARD = c99;
522521
GCC_WARN_ABOUT_RETURN_TYPE = YES;
523522
GCC_WARN_UNUSED_VARIABLE = YES;
524523
IPHONEOS_DEPLOYMENT_TARGET = 3.1.3;
524+
ONLY_ACTIVE_ARCH = YES;
525525
SDKROOT = iphoneos;
526526
TARGETED_DEVICE_FAMILY = 2;
527527
};
@@ -530,7 +530,6 @@
530530
C01FCF5008A954540054247B /* Release */ = {
531531
isa = XCBuildConfiguration;
532532
buildSettings = {
533-
ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
534533
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Don't Code Sign";
535534
GCC_C_LANGUAGE_STANDARD = c99;
536535
GCC_WARN_ABOUT_RETURN_TYPE = YES;

‎examples/DatePlot/DatePlot.xcodeproj/project.pbxproj‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@
212212
isa = PBXProject;
213213
attributes = {
214214
BuildIndependentTargetsInParallel = NO;
215-
LastUpgradeCheck = 0440;
215+
LastUpgradeCheck = 0500;
216216
};
217217
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "DatePlot" */;
218218
compatibilityVersion = "Xcode 3.2";
@@ -264,7 +264,6 @@
264264
8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
265265
90AF4F440F36CF1800753D26 /* DatePlot.xib in Resources */,
266266
BCB3FD520FD85658008875A4 /* CorePlotIcon.icns in Resources */,
267-
07C13BBB0FF9322A00BEE616 /* BlueTexture.png in Resources */,
268267
);
269268
runOnlyForDeploymentPostprocessing = 0;
270269
};
@@ -341,7 +340,6 @@
341340
C01FCF4F08A954540054247B /* Debug */ = {
342341
isa = XCBuildConfiguration;
343342
buildSettings = {
344-
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
345343
FRAMEWORK_SEARCH_PATHS = "";
346344
GCC_C_LANGUAGE_STANDARD = c99;
347345
GCC_OPTIMIZATION_LEVEL = 0;
@@ -357,7 +355,6 @@
357355
C01FCF5008A954540054247B /* Release */ = {
358356
isa = XCBuildConfiguration;
359357
buildSettings = {
360-
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
361358
FRAMEWORK_SEARCH_PATHS = "";
362359
GCC_C_LANGUAGE_STANDARD = c99;
363360
GCC_PREPROCESSOR_DEFINITIONS = "";

‎examples/DropPlot/CPTPlotDocument.m‎

Lines changed: 44 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -353,65 +353,63 @@ -(BOOL)plotSpace:(CPTPlotSpace *)space shouldHandlePointingDeviceDownEvent:(id)e
353353

354354
double start[2];
355355
[graph.defaultPlotSpace doublePrecisionPlotPoint:start numberOfCoordinates:2 forPlotAreaViewPoint:dragStartInPlotArea];
356-
NSArray *anchorPoint = [NSArray arrayWithObjects :
357-
[graph.defaultPlotSpace doublePrecisionPlotPoint:start forPlotAreaViewPoint:dragStartInPlotArea];
358-
NSArray *anchorPoint = @[@(start[CPTCoordinateX]),
359-
@(start[CPTCoordinateY])];
356+
NSArray *anchorPoint = @[@(start[CPTCoordinateX]),
357+
@(start[CPTCoordinateY])];
360358

361359
// now create the annotation
362-
zoomAnnotation = [[CPTPlotSpaceAnnotation alloc] initWithPlotSpace:graph.defaultPlotSpace anchorPlotPoint:anchorPoint];
363-
zoomAnnotation.contentLayer = zoomRectangleLayer;
360+
zoomAnnotation = [[CPTPlotSpaceAnnotation alloc] initWithPlotSpace:graph.defaultPlotSpace anchorPlotPoint:anchorPoint];
361+
zoomAnnotation.contentLayer = zoomRectangleLayer;
364362

365-
[graph.plotAreaFrame.plotArea addAnnotation:zoomAnnotation];
366-
}
367-
}
363+
[graph.plotAreaFrame.plotArea addAnnotation:zoomAnnotation];
364+
}
365+
}
368366

369-
return NO;
370-
}
367+
return NO;
368+
}
371369

372-
-(BOOL)plotSpace:(CPTPlotSpace *)space shouldHandlePointingDeviceUpEvent:(id)event atPoint:(CGPoint)interactionPoint
373-
{
374-
if ( zoomAnnotation ) {
375-
dragEnd = interactionPoint;
370+
-(BOOL)plotSpace:(CPTPlotSpace *)space shouldHandlePointingDeviceUpEvent:(id)event atPoint:(CGPoint)interactionPoint
371+
{
372+
if ( zoomAnnotation ) {
373+
dragEnd = interactionPoint;
376374

377375
// double-click to completely zoom out
378-
if ( [event clickCount] == 2 ) {
379-
CPTPlotArea *plotArea = graph.plotAreaFrame.plotArea;
380-
CGPoint dragEndInPlotArea = [graph convertPoint:interactionPoint toLayer:plotArea];
381-
382-
if ( CGRectContainsPoint(plotArea.bounds, dragEndInPlotArea) ) {
383-
[self zoomOut];
384-
}
385-
}
386-
else if ( !CGPointEqualToPoint(dragStart, dragEnd) ) {
376+
if ( [event clickCount] == 2 ) {
377+
CPTPlotArea *plotArea = graph.plotAreaFrame.plotArea;
378+
CGPoint dragEndInPlotArea = [graph convertPoint:interactionPoint toLayer:plotArea];
379+
380+
if ( CGRectContainsPoint(plotArea.bounds, dragEndInPlotArea) ) {
381+
[self zoomOut];
382+
}
383+
}
384+
else if ( !CGPointEqualToPoint(dragStart, dragEnd) ) {
387385
// no accidental drag, so zoom in
388-
[self zoomIn];
389-
}
386+
[self zoomIn];
387+
}
390388

391389
// and we're done with the drag
392-
[graph.plotAreaFrame.plotArea removeAnnotation:zoomAnnotation];
393-
[zoomAnnotation release];
394-
zoomAnnotation = nil;
390+
[graph.plotAreaFrame.plotArea removeAnnotation:zoomAnnotation];
391+
[zoomAnnotation release];
392+
zoomAnnotation = nil;
395393

396-
dragStart = CGPointZero;
397-
dragEnd = CGPointZero;
398-
}
394+
dragStart = CGPointZero;
395+
dragEnd = CGPointZero;
396+
}
399397

400-
return NO;
401-
}
398+
return NO;
399+
}
402400

403-
-(BOOL)plotSpace:(CPTPlotSpace *)space shouldHandlePointingDeviceCancelledEvent:(id)event atPoint:(CGPoint)interactionPoint
404-
{
405-
if ( zoomAnnotation ) {
406-
[graph.plotAreaFrame.plotArea removeAnnotation:zoomAnnotation];
407-
[zoomAnnotation release];
408-
zoomAnnotation = nil;
401+
-(BOOL)plotSpace:(CPTPlotSpace *)space shouldHandlePointingDeviceCancelledEvent:(id)event atPoint:(CGPoint)interactionPoint
402+
{
403+
if ( zoomAnnotation ) {
404+
[graph.plotAreaFrame.plotArea removeAnnotation:zoomAnnotation];
405+
[zoomAnnotation release];
406+
zoomAnnotation = nil;
409407

410-
dragStart = CGPointZero;
411-
dragEnd = CGPointZero;
412-
}
408+
dragStart = CGPointZero;
409+
dragEnd = CGPointZero;
410+
}
413411

414-
return NO;
415-
}
412+
return NO;
413+
}
416414

417-
@end
415+
@end

0 commit comments

Comments
 (0)