adium 3714:a1a587581ccb: typo fix, shadowing fix, 64->32bit fixes.

commits at adium.im commits at adium.im
Tue Mar 8 17:11:31 UTC 2011


details:	http://hg.adium.im/adium/rev/a1a587581ccb
revision:	3714:a1a587581ccb
branch:		(none)
author:		Frank Dowsett <wixardy at adium.im>
date:		Tue Mar 08 12:10:44 2011 -0500

typo fix, shadowing fix, 64->32bit fixes.

diffs (130 lines):

diff -r 692222bbfb41 -r a1a587581ccb Frameworks/AIUtilities Framework/Source/AILeopardCompatibility.h
--- a/Frameworks/AIUtilities Framework/Source/AILeopardCompatibility.h	Sat Mar 05 22:31:14 2011 +0200
+++ b/Frameworks/AIUtilities Framework/Source/AILeopardCompatibility.h	Tue Mar 08 12:10:44 2011 -0500
@@ -56,6 +56,10 @@
 - (BOOL)isOnActiveSpace;
 @end
 
+ at interface NSMenu (NewSnowLeopardMethods)
+- (BOOL)popUpMenuPositioningItem:(NSMenuItem *)item atLocation:(NSPoint)location inView:(NSView *)view;
+ at end
+
 @protocol NSToolbarDelegate
 @end
 @protocol NSSplitViewDelegate
diff -r 692222bbfb41 -r a1a587581ccb Frameworks/AIUtilities Framework/Source/AISegmentedControl.m
--- a/Frameworks/AIUtilities Framework/Source/AISegmentedControl.m	Sat Mar 05 22:31:14 2011 +0200
+++ b/Frameworks/AIUtilities Framework/Source/AISegmentedControl.m	Tue Mar 08 12:10:44 2011 -0500
@@ -18,10 +18,6 @@
 #import "AISegmentedControl.h"
 #import <AIUtilities/AIApplicationAdditions.h>
 
- at interface NSMenu (NewSnowLeopardMethods)
-- (BOOL)popUpMenuPositioningItem:(NSMenuItem *)item atLocation:(NSPoint)location inView:(NSView *)view;
- at end
-
 @interface NSSegmentedCell (ApplePrivate)
 - (void)setMenuIndicatorShown:(BOOL)shown forSegment:(NSInteger)segment;
 @end
diff -r 692222bbfb41 -r a1a587581ccb Source/AIContactListUserPictureMenuController.m
--- a/Source/AIContactListUserPictureMenuController.m	Sat Mar 05 22:31:14 2011 +0200
+++ b/Source/AIContactListUserPictureMenuController.m	Tue Mar 08 12:10:44 2011 -0500
@@ -238,22 +238,22 @@
 #pragma mark -
 #pragma mark AIImageCollectionView delegate
 
-- (BOOL)imageCollectionView:(AIImageCollectionView *)collectionView shouldHighlightItemAtIndex:(NSUInteger)index
+- (BOOL)imageCollectionView:(AIImageCollectionView *)collectionView shouldHighlightItemAtIndex:(NSUInteger)anIndex
 {	
-	return (index < [[self recentSmallPictures] count]);
+	return (anIndex < [[self recentSmallPictures] count]);
 }
 
-- (BOOL)imageCollectionView:(AIImageCollectionView *)imageCollectionView shouldSelectItemAtIndex:(NSUInteger)index
+- (BOOL)imageCollectionView:(AIImageCollectionView *)imageCollectionView shouldSelectItemAtIndex:(NSUInteger)anIndex
 {
-	return (index < [[self recentSmallPictures] count]);
+	return (anIndex < [[self recentSmallPictures] count]);
 }
 
-- (void)imageCollectionView:(AIImageCollectionView *)imageCollectionView didSelectItemAtIndex:(NSUInteger)index
+- (void)imageCollectionView:(AIImageCollectionView *)imageCollectionView didSelectItemAtIndex:(NSUInteger)anIndex
 {
 	NSArray *recentPictures = [self recentPictures];
 	
 	if (index < [recentPictures count]) {
-		id recentPicture = [recentPictures objectAtIndex:index];
+		id recentPicture = [recentPictures objectAtIndex:anIndex];
 		NSData *imageData = nil;
 		
 		if ([recentPicture respondsToSelector:@selector(smallIcon)]) {
diff -r 692222bbfb41 -r a1a587581ccb Source/AIGradientView.m
--- a/Source/AIGradientView.m	Sat Mar 05 22:31:14 2011 +0200
+++ b/Source/AIGradientView.m	Tue Mar 08 12:10:44 2011 -0500
@@ -29,7 +29,7 @@
 - (id)initWithFrame:(NSRect)frame
 {
 	if ((self = [super initWithFrame:frame])) {
-		startingColor = [NSColor colorWithCalibratedWhite:1.0 alpha:1.0];
+		startingColor = [NSColor colorWithCalibratedWhite:1.0f alpha:1.0f];
 		endingColor = nil;
 		angle = 270;
 	}
diff -r 692222bbfb41 -r a1a587581ccb Source/AIImageCollectionView.h
--- a/Source/AIImageCollectionView.h	Sat Mar 05 22:31:14 2011 +0200
+++ b/Source/AIImageCollectionView.h	Tue Mar 08 12:10:44 2011 -0500
@@ -34,7 +34,7 @@
 @protected
 	NSInteger highlightStyle;
 	CGFloat highlightSize;
-	CGFloat hightlightCornerRadius;
+	CGFloat highlightCornerRadius;
 
 	NSUInteger highlightedIndex;
 }
diff -r 692222bbfb41 -r a1a587581ccb Source/AIImageCollectionView.m
--- a/Source/AIImageCollectionView.m	Sat Mar 05 22:31:14 2011 +0200
+++ b/Source/AIImageCollectionView.m	Tue Mar 08 12:10:44 2011 -0500
@@ -137,14 +137,14 @@
  *
  * @return <tt>NSUInteger</tt>
  */
-- (void)selectItemAtIndex:(NSUInteger)index
+- (void)selectItemAtIndex:(NSUInteger)anIndex
 {
 	// Message delegate: Should Select
 	if ([delegate respondsToSelector:@selector(imageCollectionView:shouldSelectItemAtIndex:)]) {
-		if ([delegate imageCollectionView:self shouldSelectItemAtIndex:index]) {
+		if ([delegate imageCollectionView:self shouldSelectItemAtIndex:anIndex]) {
 			// Message delegate : Did Select
 			if ([delegate respondsToSelector:@selector(imageCollectionView:didSelectItemAtIndex:)]) {
-				[delegate imageCollectionView:self didSelectItemAtIndex:index];
+				[delegate imageCollectionView:self didSelectItemAtIndex:anIndex];
 			}
 		}
 	}
@@ -162,8 +162,8 @@
 	CGFloat itemHeight = self.maxItemSize.height;
 	NSUInteger numberOfCols = [self maxNumberOfColumns];
 	
-	NSUInteger indexX = ceil(aPoint.x / itemWidth);
-	NSUInteger indexY = ceil(aPoint.y / itemHeight);
+	NSUInteger indexX = AIceil(aPoint.x / itemWidth);
+	NSUInteger indexY = AIceil(aPoint.y / itemHeight);
 
 	return (((indexY * numberOfCols) - (numberOfCols - indexX)) - 1);
 }
diff -r 692222bbfb41 -r a1a587581ccb Source/AILogViewerWindowController.m
--- a/Source/AILogViewerWindowController.m	Sat Mar 05 22:31:14 2011 +0200
+++ b/Source/AILogViewerWindowController.m	Tue Mar 08 12:10:44 2011 -0500
@@ -461,8 +461,8 @@
 						waitUntilDone:YES];
 
 	//Set a gradient for the background
-	[view_FindNavigator setStartingColor:[NSColor colorWithCalibratedWhite:0.92 alpha:1.0]];
-	[view_FindNavigator setEndingColor:[NSColor colorWithCalibratedWhite:0.79 alpha:1.0]];
+	[view_FindNavigator setStartingColor:[NSColor colorWithCalibratedWhite:0.92f alpha:1.0f]];
+	[view_FindNavigator setEndingColor:[NSColor colorWithCalibratedWhite:0.79f alpha:1.0f]];
 	[view_FindNavigator setAngle:270];
 
     //Sort by preference, defaulting to sorting by date




More information about the commits mailing list