formatting and whitespace fixes

kelan · Jun 3, 2009 · 7998a42 · 7998a42
1 parent 8d18203
commit 7998a42
Show file tree

Hide file tree

Showing 5 changed files with 84 additions and 58 deletions.
diff --git a/Code/SPILDAppController.h b/Code/SPILDAppController.h
@@ -14,7 +14,7 @@
 @interface SPILDAppController : NSObject {
     IBOutlet NSWindow *_window;
     IBOutlet SPILDTopLayerView *_mainView;
-    
+
     IBOutlet NSButton *_startStopButton;
     IBOutlet NSColorWell *_fgColorWell;
     IBOutlet NSColorWell *_bgColorWell;

diff --git a/Code/SPILDAppController.m b/Code/SPILDAppController.m
@@ -17,12 +17,13 @@ @implementation SPILDAppController
 #pragma mark Init, Dealloc, etc
 //------------------------------------------------------------------------------
 
-- (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
+- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
+{
     // start with a nice green
     NSColor *niceGreenColor = [NSColor colorWithCalibratedRed:0.40f green:0.69f blue:0.45f alpha:1.0f];
     _fgColorWell.color = niceGreenColor;
     [self pickNewForeColor:_fgColorWell];
-    
+
     _bgColorWell.color = [NSColor blueColor];
     [self pickNewBackColor:_bgColorWell];
 }
@@ -33,15 +34,18 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
 #pragma mark IB Actions
 //------------------------------------------------------------------------------
 
-- (IBAction)pickNewForeColor:(id)sender {
+- (IBAction)pickNewForeColor:(id)sender
+{
     [_mainView progressIndicatorLayer].foreColor = [sender color];
 }
 
-- (IBAction)pickNewBackColor:(id)sender {
+- (IBAction)pickNewBackColor:(id)sender
+{
     [_mainView setPlainBackgroundColor:[sender color]];
 }
 
-- (IBAction)startStopProgressIndicator:(id)sender {
+- (IBAction)startStopProgressIndicator:(id)sender
+{
     if ([[_mainView progressIndicatorLayer] isRunning]) {
         // it is running, so stop it
         [[_mainView progressIndicatorLayer] stopProgressAnimation];

diff --git a/Code/SPILDTopLayerView.m b/Code/SPILDTopLayerView.m
@@ -28,27 +28,30 @@ @implementation SPILDTopLayerView
 #pragma mark Init, Dealloc, etc
 //------------------------------------------------------------------------------
 
-- (void)dealloc {
+- (void)dealloc
+{
     [_rootLayer removeFromSuperlayer];
     [_rootLayer release];
-    
+
     [_progressIndicatorLayer removeFromSuperlayer];
-    [_plainBackgroundLayer removeFromSuperlayer];    
+    [_plainBackgroundLayer removeFromSuperlayer];
     [_qcBackgroundLayer removeFromSuperlayer];
-    
+
     [super dealloc];
 }
 
-- (void)awakeFromNib {
+- (void)awakeFromNib
+{
     [self setupLayers];
 }
 
 
-- (void)setupLayers {
+- (void)setupLayers
+{
     _rootLayer = [CALayer layer];
     [self setLayer:_rootLayer];
     [self setWantsLayer:YES];
-    
+
     // Create the plain background layer
     _plainBackgroundLayer = [CALayer layer];
     _plainBackgroundLayer.name = @"plainBackgroundLayer";
@@ -59,12 +62,12 @@ - (void)setupLayers {
     _plainBackgroundLayer.zPosition = 0;
     _plainBackgroundLayer.backgroundColor = CGColorCreateFromNSColor([NSColor blueColor]);
     [_rootLayer addSublayer:_plainBackgroundLayer];
-    
+
     // Start with QC background
     [self useQCBackground];
-    
-    // Put a YRKSpinningProgressIndicatorLayer in front of everything
-    _progressIndicatorLayer = [[YRKSpinningProgressIndicatorLayer alloc] init];
+
+    // Put a SpinningProgressIndicatorLayer in front of everything
+    _progressIndicatorLayer = [[SpinningProgressIndicatorLayer alloc] init];
     _progressIndicatorLayer.name = @"progressIndicatorLayer";
     _progressIndicatorLayer.anchorPoint = CGPointMake(0.0, 0.0);
     _progressIndicatorLayer.position = CGPointMake(0, 0);
@@ -81,7 +84,8 @@ - (void)setupLayers {
 #pragma mark Toggling Background
 //------------------------------------------------------------------------------
 
-- (IBAction)toggleBackground:(id)sender {
+- (IBAction)toggleBackground:(id)sender
+{
     if (nil == _qcBackgroundLayer) {
         [self useQCBackground];
     }
@@ -90,20 +94,22 @@ - (IBAction)toggleBackground:(id)sender {
     }
 }
 
-- (void)usePlainBackground {
+- (void)usePlainBackground
+{
     // Hide the QC background and show the plain one
     [CATransaction begin];
     [CATransaction setValue:[NSNumber numberWithBool:YES] forKey:kCATransactionDisableActions];
     _qcBackgroundLayer.hidden = YES;
     _plainBackgroundLayer.hidden = NO;
     [CATransaction commit];
-    
+
     // destroy the QC background completely, so we can test the CPU usage of just the progress indicator itself
     [_qcBackgroundLayer removeFromSuperlayer];
     _qcBackgroundLayer = nil;
 }
 
-- (void)useQCBackground {
+- (void)useQCBackground
+{
     // Create the QC background layer
     _qcBackgroundLayer = [QCCompositionLayer compositionLayerWithFile:
                [[NSBundle mainBundle] pathForResource:@"Background" ofType:@"qtz"]];
@@ -114,7 +120,7 @@ - (void)useQCBackground {
     _qcBackgroundLayer.autoresizingMask = (kCALayerWidthSizable|kCALayerHeightSizable);
     _qcBackgroundLayer.zPosition = 0;
     [_rootLayer addSublayer:_qcBackgroundLayer];
-    
+
     // Hide the plain background and show the QC one
     [CATransaction begin];
     [CATransaction setValue:[NSNumber numberWithBool:YES] forKey:kCATransactionDisableActions];
@@ -123,7 +129,8 @@ - (void)useQCBackground {
     [CATransaction commit];
 }
 
-- (void)setPlainBackgroundColor:(NSColor *)newColor {
+- (void)setPlainBackgroundColor:(NSColor *)newColor
+{
     [CATransaction begin];
     [CATransaction setValue:[NSNumber numberWithBool:YES] forKey:kCATransactionDisableActions];
     _plainBackgroundLayer.backgroundColor = CGColorCreateFromNSColor(newColor);

diff --git a/Code/YRKSpinningProgressIndicatorLayer.h b/Code/YRKSpinningProgressIndicatorLayer.h
@@ -13,10 +13,10 @@
     BOOL _isRunning;
     NSTimer *_animationTimer;
     NSUInteger _position;
-    
+
     CGColorRef _foreColor;
     CGFloat _fadeDownOpacity;
-    
+
     NSUInteger _numFins;
     NSMutableArray *_finLayers;
 }