diff --git a/Archiving/Animation Exporters/PXSpriteSheetExporter.m b/Archiving/Animation Exporters/PXSpriteSheetExporter.m index 483f1d9c..c8942f41 100755 --- a/Archiving/Animation Exporters/PXSpriteSheetExporter.m +++ b/Archiving/Animation Exporters/PXSpriteSheetExporter.m @@ -137,7 +137,7 @@ - (void)windowDidLoad [self updatePreview:self]; } -- (void)savePanelDidEnd:(NSSavePanel *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo; +- (void)savePanelDidEnd:(NSSavePanel *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo { if (returnCode == NSCancelButton) { closeOnEndSheet = NO; diff --git a/Other Sources/Foreign Code/CTGradient/CTGradient.m b/Other Sources/Foreign Code/CTGradient/CTGradient.m index db3024da..7b367afe 100755 --- a/Other Sources/Foreign Code/CTGradient/CTGradient.m +++ b/Other Sources/Foreign Code/CTGradient/CTGradient.m @@ -776,7 +776,7 @@ - (void)radialFillBezierPath:(NSBezierPath *)path #pragma mark Private Methods -- (void)setBlendingMode:(CTGradientBlendingMode)mode; +- (void)setBlendingMode:(CTGradientBlendingMode)mode { blendingMode = mode; @@ -927,7 +927,7 @@ - (CTGradientElement)removeElementAtPosition:(CGFloat)position } -- (CTGradientElement *)elementAtIndex:(unsigned)index; +- (CTGradientElement *)elementAtIndex:(unsigned)index { unsigned count = 0; CTGradientElement *currentElement = elementList; diff --git a/Other Sources/Foreign Code/ThreadWorker/ThreadWorker.m b/Other Sources/Foreign Code/ThreadWorker/ThreadWorker.m index b2188b40..fedd94b6 100755 --- a/Other Sources/Foreign Code/ThreadWorker/ThreadWorker.m +++ b/Other Sources/Foreign Code/ThreadWorker/ThreadWorker.m @@ -51,7 +51,7 @@ @implementation ThreadWorker + (ThreadWorker *) workOn:(id)target withSelector:(SEL)selector withObject:(id)argument - didEndSelector:(SEL)didEndSelector; // Optional + didEndSelector:(SEL)didEndSelector // Optional { ThreadWorker *tw; NSPort *port1; diff --git a/Other Sources/Foreign Code/Wacom/TabletEvents.m b/Other Sources/Foreign Code/Wacom/TabletEvents.m index 96e2c8cc..e4b9ad8c 100755 --- a/Other Sources/Foreign Code/Wacom/TabletEvents.m +++ b/Other Sources/Foreign Code/Wacom/TabletEvents.m @@ -322,7 +322,7 @@ - (float) scaledTabletPressure ////////////////////////////////////////////////////////////////////////////// -- (float) rotationInDegrees; /* 0.0¡ <-> +359.99999¡ */ +- (float) rotationInDegrees /* 0.0¡ <-> +359.99999¡ */ { OSStatus result; TabletPointerRec tabletData; @@ -345,7 +345,7 @@ - (float) scaledTabletPressure ////////////////////////////////////////////////////////////////////////////// -- (float) rotationInRadians; /* 0 <-> 2¹ */ +- (float) rotationInRadians /* 0 <-> 2¹ */ { OSStatus result; TabletPointerRec tabletData; diff --git a/Pixel Art Core/Canvas/PXCanvasView.m b/Pixel Art Core/Canvas/PXCanvasView.m index 0937dc0d..87628f3e 100755 --- a/Pixel Art Core/Canvas/PXCanvasView.m +++ b/Pixel Art Core/Canvas/PXCanvasView.m @@ -306,7 +306,7 @@ - (void)setShouldDrawMainBackground:(BOOL)newShouldDrawBG } } -- (void)setShouldDrawGrid:(BOOL)newShouldDraw; +- (void)setShouldDrawGrid:(BOOL)newShouldDraw { shouldDrawGrid = newShouldDraw; } diff --git a/Pixel Art Core/Canvas/PXCanvas_Modifying.m b/Pixel Art Core/Canvas/PXCanvas_Modifying.m index c5496225..47d51bfe 100755 --- a/Pixel Art Core/Canvas/PXCanvas_Modifying.m +++ b/Pixel Art Core/Canvas/PXCanvas_Modifying.m @@ -204,7 +204,7 @@ - (void)reduceColorsTo:(NSUInteger)colors withTransparency:(BOOL)transparency ma +(void)reduceColorsInCanvases:(NSArray*)canvases toColorCount:(NSUInteger)colors withTransparency:(BOOL)transparency - matteColor:(NSColor *)matteColor; + matteColor:(NSColor *)matteColor { PXCanvas *first = [canvases objectAtIndex:0]; unsigned char *red = calloc([first size].width * [first size].height * [canvases count], sizeof(unsigned char)); diff --git a/Pixel Art Core/Grid/PXGrid.m b/Pixel Art Core/Grid/PXGrid.m index 52e102f9..f856c9a4 100755 --- a/Pixel Art Core/Grid/PXGrid.m +++ b/Pixel Art Core/Grid/PXGrid.m @@ -39,7 +39,7 @@ -(id) init -(id) initWithUnitSize:(NSSize)newUnitSize color:(NSColor*)newColor - shouldDraw:(BOOL)newShouldDraw; + shouldDraw:(BOOL)newShouldDraw { [self init]; if(newColor) diff --git a/Pixen Application/Application/PXDocument.m b/Pixen Application/Application/PXDocument.m index 4f7f2109..3b0ccb11 100755 --- a/Pixen Application/Application/PXDocument.m +++ b/Pixen Application/Application/PXDocument.m @@ -88,7 +88,7 @@ - (void)setFileURL:(NSURL *)fileName [[NSNotificationCenter defaultCenter] postNotificationName:PXDocumentChangedDisplayNameNotificationName object:self]; } -- (PXCanvasWindowController *)windowController; +- (PXCanvasWindowController *)windowController { return windowController; } diff --git a/Pixen Application/Background/PXDefaultBackgroundTemplateView.m b/Pixen Application/Background/PXDefaultBackgroundTemplateView.m index c100d77d..9d49669c 100755 --- a/Pixen Application/Background/PXDefaultBackgroundTemplateView.m +++ b/Pixen Application/Background/PXDefaultBackgroundTemplateView.m @@ -42,7 +42,7 @@ - (NSString *)backgroundTypeText return backgroundTypeText; } -- (void)setBackgroundTypeText:(NSString *)typeText; +- (void)setBackgroundTypeText:(NSString *)typeText { [backgroundTypeText autorelease]; backgroundTypeText = [typeText retain]; diff --git a/Pixen Application/Canvas/Canvas Resize Prompt/PXCanvasResizeView.m b/Pixen Application/Canvas/Canvas Resize Prompt/PXCanvasResizeView.m index 6594dffb..66ed37e9 100755 --- a/Pixen Application/Canvas/Canvas Resize Prompt/PXCanvasResizeView.m +++ b/Pixen Application/Canvas/Canvas Resize Prompt/PXCanvasResizeView.m @@ -152,7 +152,7 @@ - (void)setCachedImage:(NSImage *)image [self setNeedsDisplay:YES]; } -- backgroundColor; +- backgroundColor { return backgroundColor; } @@ -214,18 +214,18 @@ - (BOOL)acceptsFirstResponder return YES; } -- (int)leftOffset; +- (int)leftOffset { return position.x; } -- (void)setLeftOffset:(int)nx; +- (void)setLeftOffset:(int)nx { [self willChangeValueForKey:@"rightOffset"]; position.x = nx; [self didChangeValueForKey:@"rightOffset"]; [self setNeedsDisplay:YES]; } -- (int)topOffset; +- (int)topOffset { return position.y; } @@ -236,7 +236,7 @@ - (void)setTopOffset:(int)nv [self didChangeValueForKey:@"bottomOffset"]; [self setNeedsDisplay:YES]; } -- (int)bottomOffset; +- (int)bottomOffset { return -1 * position.y; } @@ -247,7 +247,7 @@ - (void)setBottomOffset:(int)nv [self didChangeValueForKey:@"topOffset"]; [self setNeedsDisplay:YES]; } -- (int)rightOffset; +- (int)rightOffset { return -1 * position.x; } diff --git a/Pixen Application/Canvas/PXCanvasWindowController.m b/Pixen Application/Canvas/PXCanvasWindowController.m index cc6c02af..cbd7fdbd 100755 --- a/Pixen Application/Canvas/PXCanvasWindowController.m +++ b/Pixen Application/Canvas/PXCanvasWindowController.m @@ -67,12 +67,12 @@ - (id) initWithWindowNibName:name return self; } -- (RBSplitSubview*)layerSplit; +- (RBSplitSubview*)layerSplit { return layerSplit; } -- (RBSplitSubview*)canvasSplit; +- (RBSplitSubview*)canvasSplit { return canvasSplit; } @@ -280,7 +280,7 @@ - (BOOL)validateMenuItem:(NSMenuItem *)anItem //this is to fix a bug in animation documents where expanding the //split subview trashes the dimensions of the layer control view -- (void)splitView:(RBSplitView*)sender didExpand:(RBSplitSubview*)subview; +- (void)splitView:(RBSplitView*)sender didExpand:(RBSplitSubview*)subview { [self updateFrameSizes]; } diff --git a/Pixen Application/Layers/PXLayerController.m b/Pixen Application/Layers/PXLayerController.m index 79fed1ee..9d4a5844 100755 --- a/Pixen Application/Layers/PXLayerController.m +++ b/Pixen Application/Layers/PXLayerController.m @@ -108,7 +108,7 @@ - (void)resetViewHiddenStatus } } -- (NSView *)view; +- (NSView *)view { return view; } @@ -254,7 +254,7 @@ - (void)tableView:(NSTableView *)aTableView } } -- (void)setSubview:(RBSplitSubview *)sv; +- (void)setSubview:(RBSplitSubview *)sv { subview = sv; } diff --git a/Pixen Application/Palette/PXPaletteController.h b/Pixen Application/Palette/PXPaletteController.h index 219c2fde..dc2d4858 100755 --- a/Pixen Application/Palette/PXPaletteController.h +++ b/Pixen Application/Palette/PXPaletteController.h @@ -30,9 +30,9 @@ typedef enum { - (BOOL)isPaletteIndexKey:(NSEvent *)event; - (void)keyDown:(NSEvent *)event; -- (IBAction)useMostRecentColors:sender; -- (IBAction)useMostFrequentColors:sender; -- (IBAction)useColorListColors:sender; +- (IBAction)useMostRecentColors:(id)sender; +- (IBAction)useMostFrequentColors:(id)sender; +- (IBAction)useColorListColors:(id)sender; - (void)refreshPalette:(NSNotification *)note; - (void)updatePalette:(NSNotification *)note; diff --git a/Pixen Application/Palette/PXPaletteController.m b/Pixen Application/Palette/PXPaletteController.m index 785f056b..4adcbb98 100755 --- a/Pixen Application/Palette/PXPaletteController.m +++ b/Pixen Application/Palette/PXPaletteController.m @@ -116,7 +116,7 @@ - (void)updatePalette:(NSNotification *)note [paletteView setNeedsDisplay:YES]; } -- (void)useColorAtIndex:(unsigned)index event:(NSEvent *)e; +- (void)useColorAtIndex:(unsigned)index event:(NSEvent *)e { PXToolSwitcher *switcher = [[PXToolPaletteController sharedToolPaletteController] leftSwitcher]; if([e buttonNumber] == 1 || ([e modifierFlags] & NSControlKeyMask)) @@ -126,7 +126,7 @@ - (void)useColorAtIndex:(unsigned)index event:(NSEvent *)e; [switcher setColor:PXPalette_colorAtIndex(frequencyPalette, index)]; } -- (void)modifyColorAtIndex:(unsigned)index; +- (void)modifyColorAtIndex:(unsigned)index { //FIXME: put palette adds here } @@ -151,19 +151,19 @@ - (void)keyDown:(NSEvent *)event [self useColorAtIndex:index event:event]; } -- (IBAction)useMostRecentColors:sender; +- (IBAction)useMostRecentColors:(id)sender { mode = PXPaletteModeRecent; [paletteView setPalette:recentPalette]; } -- (IBAction)useMostFrequentColors:sender; +- (IBAction)useMostFrequentColors:(id)sender { mode = PXPaletteModeFrequency; [paletteView setPalette:frequencyPalette]; } -- (IBAction)useColorListColors:sender; +- (IBAction)useColorListColors:(id)sender { mode = PXPaletteModeColorList; } diff --git a/Pixen Application/Preferences/PXHotkeyFormatter.m b/Pixen Application/Preferences/PXHotkeyFormatter.m index d0ef3a21..5dcfa7cd 100755 --- a/Pixen Application/Preferences/PXHotkeyFormatter.m +++ b/Pixen Application/Preferences/PXHotkeyFormatter.m @@ -74,7 +74,7 @@ - (BOOL)isPartialStringValid:(NSString *)partialString - (BOOL)getObjectValue:(id *)anObject forString:(NSString *) string - errorDescription:(NSString **)error; + errorDescription:(NSString **)error { *anObject = [[string copy] autorelease]; return YES; diff --git a/Pixen Application/Tools/Tool Palette/PXToolPaletteController.m b/Pixen Application/Tools/Tool Palette/PXToolPaletteController.m index f64e6ad3..5753882e 100755 --- a/Pixen Application/Tools/Tool Palette/PXToolPaletteController.m +++ b/Pixen Application/Tools/Tool Palette/PXToolPaletteController.m @@ -214,7 +214,7 @@ -(void) awakeFromNib keyMask = 0x0; } -- (void)clearBeziers; +- (void)clearBeziers { [rightSwitcher clearBeziers]; [leftSwitcher clearBeziers]; diff --git a/Pixen Application/Tools/Tool Palette/PXToolSwitcher.m b/Pixen Application/Tools/Tool Palette/PXToolSwitcher.m index 0192de94..428e21c5 100755 --- a/Pixen Application/Tools/Tool Palette/PXToolSwitcher.m +++ b/Pixen Application/Tools/Tool Palette/PXToolSwitcher.m @@ -212,7 +212,7 @@ - (void)activateColorWell [colorWell activate:YES]; } -- (void)clearBeziers; +- (void)clearBeziers { [tools makeObjectsPerformSelector:@selector(clearBeziers)]; } diff --git a/Pixen Application/Tools/Tools/PXLinearTool.m b/Pixen Application/Tools/Tools/PXLinearTool.m index 96b5d5ea..211893df 100755 --- a/Pixen Application/Tools/Tools/PXLinearTool.m +++ b/Pixen Application/Tools/Tools/PXLinearTool.m @@ -55,7 +55,7 @@ - (NSPoint)transformOrigin:(NSPoint)origin withDrawingPoint:(NSPoint)aPoint return _origin; } -- (void)fakeMouseDraggedIfNecessary; +- (void)fakeMouseDraggedIfNecessary { // kind of a HACK if (isClicking)