Menu
▾
▴
[Vienna-rss-submits] SF.net SVN: vienna-rss:[1573] branches/64bit
|
From: <joh...@us...> - 2010-09-04 00:19:50
|
Revision: 1573
http://vienna-rss.svn.sourceforge.net/vienna-rss/?rev=1573&view=rev
Author: johnson1234
Date: 2010-09-04 00:19:43 +0000 (Sat, 04 Sep 2010)
Log Message:
-----------
Fix most of the build warnings and errors.
Modified Paths:
--------------
branches/64bit/ActivityViewer.h
branches/64bit/AppController.h
branches/64bit/AppController.m
branches/64bit/AppearancesPreferences.h
branches/64bit/ArticleListView.h
branches/64bit/ArticleListView.m
branches/64bit/BrowserPane.m
branches/64bit/DSClickableURLTextField.m
branches/64bit/Database.m
branches/64bit/DownloadWindow.h
branches/64bit/DownloadWindow.m
branches/64bit/Folder.m
branches/64bit/FolderView.h
branches/64bit/FolderView.m
branches/64bit/FoldersTree.h
branches/64bit/FoldersTree.m
branches/64bit/HelperFunctions.m
branches/64bit/ImageAndTextCell.m
branches/64bit/InfoWindow.h
branches/64bit/InfoWindow.m
branches/64bit/Message.m
branches/64bit/MessageListView.h
branches/64bit/MessageListView.m
branches/64bit/NewPreferencesController.h
branches/64bit/NewPreferencesController.m
branches/64bit/Preferences.m
branches/64bit/RichXMLParser.m
branches/64bit/SNDisclosableView.m
branches/64bit/SquareWindow.m
branches/64bit/TableViewExtensions.m
branches/64bit/ViennaApp.m
branches/64bit/ViewExtensions.h
branches/64bit/ViewExtensions.m
Modified: branches/64bit/ActivityViewer.h
===================================================================
--- branches/64bit/ActivityViewer.h 2010-09-04 00:19:04 UTC (rev 1572)
+++ branches/64bit/ActivityViewer.h 2010-09-04 00:19:43 UTC (rev 1573)
@@ -21,7 +21,7 @@
#import <Cocoa/Cocoa.h>
#import "TableViewExtensions.h"
-@interface ActivityViewer : NSWindowController {
+@interface ActivityViewer : NSWindowController <NSWindowDelegate> {
IBOutlet NSWindow * activityWindow;
IBOutlet ExtendedTableView * activityTable;
IBOutlet NSSplitView * splitView;
Modified: branches/64bit/AppController.h
===================================================================
--- branches/64bit/AppController.h 2010-09-04 00:19:04 UTC (rev 1572)
+++ branches/64bit/AppController.h 2010-09-04 00:19:43 UTC (rev 1573)
@@ -41,7 +41,7 @@
@class ClickableProgressIndicator;
@class SearchPanel;
-@interface AppController : NSObject <GrowlApplicationBridgeDelegate>
+@interface AppController : NSObject <GrowlApplicationBridgeDelegate, NSMenuDelegate, NSSplitViewDelegate, NSToolbarDelegate, NSWindowDelegate>
{
IBOutlet NSWindow * mainWindow;
IBOutlet ArticleController * articleController;
Modified: branches/64bit/AppController.m
===================================================================
--- branches/64bit/AppController.m 2010-09-04 00:19:04 UTC (rev 1572)
+++ branches/64bit/AppController.m 2010-09-04 00:19:43 UTC (rev 1573)
@@ -499,7 +499,7 @@
[self showAppInStatusBar];
// Use Growl if it is installed
- [GrowlApplicationBridge setGrowlDelegate:self];
+ //[GrowlApplicationBridge setGrowlDelegate:self]; FIXME
// Start the check timer
[self handleCheckFrequencyChange:nil];
@@ -716,17 +716,29 @@
// Make sure we actually have a destination folder.
NSFileManager * fileManager = [NSFileManager defaultManager];
BOOL isDir = NO;
-
+ NSError *error;
if (![fileManager fileExistsAtPath:path isDirectory:&isDir])
{
- if (![fileManager createDirectoryAtPath:path withIntermediateDirectories:YES attributes:NULL error:NULL])
+ if (![fileManager createDirectoryAtPath:path withIntermediateDirectories:YES attributes:nil error:&error])
{
+ NSLog(@"Can't create directory at path '%@': %@", path, error);
runOKAlertPanel(NSLocalizedString(@"Cannot create folder title", nil), NSLocalizedString(@"Cannot create folder body", nil), path);
return NO;
}
}
- [fileManager removeFileAtPath:fullPath handler:nil];
- return [fileManager copyPath:srcFile toPath:fullPath handler:nil];
+ if (![fileManager removeItemAtPath:fullPath error:&error])
+ {
+ NSLog(@"Can't remove item at path '%@': %@", fullPath, error);
+ }
+ if ([fileManager copyItemAtPath:srcFile toPath:fullPath error:&error])
+ {
+ return YES;
+ }
+ else
+ {
+ NSLog(@"Can't copy '%@' to '%@': %@", srcFile, fullPath, error);
+ return NO;
+ }
}
/* searchFieldMenu
@@ -820,7 +832,7 @@
* Make sure the folder width isn't shrunk beyond a minimum width. Otherwise it looks
* untidy.
*/
--(float)splitView:(NSSplitView *)sender constrainMinCoordinate:(float)proposedMin ofSubviewAt:(int)offset
+-(CGFloat)splitView:(NSSplitView *)sender constrainMinCoordinate:(CGFloat)proposedMin ofSubviewAt:(NSInteger)offset
{
return (sender == splitView1 && offset == 0) ? MA_Minimum_Folder_Pane_Width : proposedMin;
}
@@ -829,7 +841,7 @@
* Make sure that the browserview isn't shrunk beyond a minimum size otherwise the splitview
* or controls within it start resizing odd.
*/
--(float)splitView:(NSSplitView *)sender constrainMaxCoordinate:(float)proposedMax ofSubviewAt:(int)offset
+-(CGFloat)splitView:(NSSplitView *)sender constrainMaxCoordinate:(CGFloat)proposedMax ofSubviewAt:(NSInteger)offset
{
if (sender == splitView1 && offset == 0)
{
@@ -1341,7 +1353,8 @@
*/
-(IBAction)keepFoldersArranged:(id)sender
{
- [[Preferences standardPreferences] setFoldersTreeSortMethod:[sender tag]];
+ NSParameterAssert([sender isKindOfClass:[NSMenuItem class]]);
+ [[Preferences standardPreferences] setFoldersTreeSortMethod:[(NSMenuItem *)sender tag]];
}
/* runAppleScript
@@ -1493,14 +1506,14 @@
*/
-(void)growlNotify:(id)notifyContext title:(NSString *)title description:(NSString *)description notificationName:(NSString *)notificationName
{
- if (growlAvailable)
+ /* if (growlAvailable)
[GrowlApplicationBridge notifyWithTitle:title
description:description
notificationName:notificationName
iconData:nil
priority:0.0
isSticky:NO
- clickContext:notifyContext];
+ clickContext:notifyContext]; FIXME */
}
/* growlIsReady
@@ -1510,7 +1523,7 @@
{
if (!growlAvailable)
{
- [GrowlApplicationBridge setGrowlDelegate:self];
+ //[GrowlApplicationBridge setGrowlDelegate:self]; FIXME
growlAvailable = YES;
}
}
@@ -2416,7 +2429,8 @@
*/
-(IBAction)localPerformFindPanelAction:(id)sender
{
- switch ([sender tag])
+ NSParameterAssert([sender isKindOfClass:[NSMenuItem class]]);
+ switch ([(NSMenuItem *)sender tag])
{
case NSFindPanelActionSetFindString:
[self setFocusToSearchField:self];
@@ -2429,7 +2443,7 @@
break;
default:
- [[browserView activeTabItemView] performFindPanelAction:[sender tag]];
+ [[browserView activeTabItemView] performFindPanelAction:[(NSMenuItem *)sender tag]];
break;
}
}
Modified: branches/64bit/AppearancesPreferences.h
===================================================================
--- branches/64bit/AppearancesPreferences.h 2010-09-04 00:19:04 UTC (rev 1572)
+++ branches/64bit/AppearancesPreferences.h 2010-09-04 00:19:43 UTC (rev 1573)
@@ -20,7 +20,7 @@
#import <Cocoa/Cocoa.h>
-@interface AppearancesPreferences : NSWindowController
+@interface AppearancesPreferences : NSWindowController <NSWindowDelegate>
{
IBOutlet NSTextField * articleFontSample;
IBOutlet NSTextField * folderFontSample;
Modified: branches/64bit/ArticleListView.h
===================================================================
--- branches/64bit/ArticleListView.h 2010-09-04 00:19:04 UTC (rev 1572)
+++ branches/64bit/ArticleListView.h 2010-09-04 00:19:43 UTC (rev 1573)
@@ -32,7 +32,7 @@
@class ArticleView;
@class FoldersTree;
-@interface ArticleListView : NSView<BaseView, ArticleBaseView>
+@interface ArticleListView : NSView<BaseView, ArticleBaseView, NSSplitViewDelegate, NSTableViewDataSource, NSTableViewDelegate>
{
IBOutlet AppController * controller;
IBOutlet ArticleController * articleController;
Modified: branches/64bit/ArticleListView.m
===================================================================
--- branches/64bit/ArticleListView.m 2010-09-04 00:19:04 UTC (rev 1572)
+++ branches/64bit/ArticleListView.m 2010-09-04 00:19:43 UTC (rev 1573)
@@ -42,7 +42,6 @@
// Private functions
@interface ArticleListView (Private)
-(void)initTableView;
- -(BOOL)copyTableSelection:(NSArray *)rows toPasteboard:(NSPasteboard *)pboard;
-(void)setTableViewFont;
-(void)showSortDirection;
-(void)selectArticleAfterReload;
@@ -166,7 +165,7 @@
* Make sure the article pane width isn't shrunk beyond a minimum width. Otherwise it looks
* untidy.
*/
--(float)splitView:(NSSplitView *)sender constrainMinCoordinate:(float)proposedMin ofSubviewAt:(int)offset
+-(CGFloat)splitView:(NSSplitView *)sender constrainMinCoordinate:(CGFloat)proposedMin ofSubviewAt:(NSInteger)offset
{
return (sender == splitView2 && offset == 0) ? MA_Minimum_ArticleList_Pane_Width : proposedMin;
}
@@ -175,7 +174,7 @@
* Make sure that the article pane isn't shrunk beyond a minimum size otherwise the splitview
* or controls within it start resizing odd.
*/
--(float)splitView:(NSSplitView *)sender constrainMaxCoordinate:(float)proposedMax ofSubviewAt:(int)offset
+-(CGFloat)splitView:(NSSplitView *)sender constrainMaxCoordinate:(CGFloat)proposedMax ofSubviewAt:(NSInteger)offset
{
if (sender == splitView2 && offset == 0)
{
@@ -1452,7 +1451,7 @@
* Datasource for the table view. Return the total number of rows we'll display which
* is equivalent to the number of articles in the current folder.
*/
--(int)numberOfRowsInTableView:(NSTableView *)aTableView
+-(NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView
{
return [[articleController allArticles] count];
}
@@ -1461,7 +1460,7 @@
* Called by the table view to obtain the object at the specified column and row. This is
* called often so it needs to be fast.
*/
--(id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex
+-(id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex
{
Database * db = [Database sharedDatabase];
NSArray * allArticles = [articleController allArticles];
Modified: branches/64bit/BrowserPane.m
===================================================================
--- branches/64bit/BrowserPane.m 2010-09-04 00:19:04 UTC (rev 1572)
+++ branches/64bit/BrowserPane.m 2010-09-04 00:19:43 UTC (rev 1573)
@@ -69,6 +69,17 @@
@implementation BrowserPane
++ (NSSet *)keyPathsForValuesAffectingValueForKey:(NSString *)key
+{
+ NSSet *keyPaths = [super keyPathsForValuesAffectingValueForKey:key];
+
+ if ([key isEqualToString:@"isProcessing"])
+ {
+ keyPaths = [keyPaths setByAddingObject:@"isLoading"];
+ }
+ return keyPaths;
+}
+
+ (void)load
{
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
@@ -77,8 +88,6 @@
//These are synonyms
[self exposeBinding:@"isLoading"];
[self exposeBinding:@"isProcessing"];
-
- [self setKeys:[NSArray arrayWithObject:@"isLoading"] triggerChangeNotificationsForDependentKey:@"isProcessing"];
}
[pool release];
Modified: branches/64bit/DSClickableURLTextField.m
===================================================================
--- branches/64bit/DSClickableURLTextField.m 2010-09-04 00:19:04 UTC (rev 1572)
+++ branches/64bit/DSClickableURLTextField.m 2010-09-04 00:19:43 UTC (rev 1573)
@@ -164,7 +164,7 @@
if ( aVal != nil ) {
NSRectArray aRectArray = NULL;
- unsigned numRects = 0, j = 0;
+ NSUInteger numRects = 0, j = 0;
glyphRange = [URLManager glyphRangeForCharacterRange:returnRange actualCharacterRange:nil];
aRectArray = [URLManager rectArrayForGlyphRange:glyphRange withinSelectedGlyphRange:glyphRange inTextContainer:URLContainer rectCount:&numRects];
for ( j = 0; j < numRects; j++ ) {
@@ -195,7 +195,7 @@
NSRectArray linkRect = NULL;
unsigned glyphIndex = [URLManager glyphIndexForPoint:mousePoint inTextContainer:URLContainer];
unsigned charIndex = [URLManager characterIndexForGlyphAtIndex:glyphIndex];
- unsigned numRects = 0, j = 0;
+ NSUInteger numRects = 0, j = 0;
aVal = [URLStorage attribute:NSLinkAttributeName atIndex:charIndex longestEffectiveRange:&returnRange inRange:NSMakeRange(charIndex, [URLStorage length] - charIndex)];
if ( (aVal != nil) ) {
@@ -265,7 +265,7 @@
NSURL* urlAtMouse = [self urlAtMouse:mouseEvent];
if ( (urlAtMouse != nil) && [urlAtMouse isEqualTo:clickedURL] ) {
// check if delegate wants to open the URL itself, if not, let the workspace open the URL
- if ( ([self delegate] == nil) || ![[self delegate] respondsToSelector:@selector(textField:openURL:)] || ![[self delegate] textField:self openURL:urlAtMouse] )
+ if ( ([self delegate] == nil) || ![[self delegate] respondsToSelector:@selector(textField:openURL:)] || ![(id)[self delegate] textField:self openURL:urlAtMouse] )
[[NSWorkspace sharedWorkspace] openURL:urlAtMouse];
}
[clickedURL release];
Modified: branches/64bit/Database.m
===================================================================
--- branches/64bit/Database.m 2010-09-04 00:19:04 UTC (rev 1572)
+++ branches/64bit/Database.m 2010-09-04 00:19:43 UTC (rev 1573)
@@ -113,8 +113,10 @@
if (![fileManager fileExistsAtPath:databaseFolder isDirectory:&isDir])
{
- if (![fileManager createDirectoryAtPath:databaseFolder attributes:NULL])
+ NSError *error;
+ if (![fileManager createDirectoryAtPath:databaseFolder withIntermediateDirectories:NO attributes:nil error:&error])
{
+ NSLog(@"Can't create directory at path '%@'. Error: %@", databaseFolder, error);
NSRunAlertPanel(NSLocalizedString(@"Cannot create database folder", nil),
NSLocalizedString(@"Cannot create database folder text", nil),
NSLocalizedString(@"Close", nil), @"", @"",
@@ -267,7 +269,11 @@
// Backup the database before any upgrade
NSString * backupDatabaseFileName = [qualifiedDatabaseFileName stringByAppendingPathExtension:@"bak"];
- [[NSFileManager defaultManager] copyPath:qualifiedDatabaseFileName toPath:backupDatabaseFileName handler:nil];
+ NSError *error;
+ if (![[NSFileManager defaultManager] copyItemAtPath:qualifiedDatabaseFileName toPath:backupDatabaseFileName error:&error])
+ {
+ NSLog(@"Can't copy '%@' to '%@': %@", qualifiedDatabaseFileName, backupDatabaseFileName, backupDatabaseFileName);
+ }
}
// Upgrade to rev 13.
@@ -447,7 +453,11 @@
[sqlDatabase close];
[sqlDatabase release];
sqlDatabase = nil;
- [[NSFileManager defaultManager] removeFileAtPath:path handler:nil];
+ NSError *error;
+ if (![[NSFileManager defaultManager] removeItemAtPath:path error:&error])
+ {
+ NSLog(@"Can't remove item at path '%@': %@", path, error);
+ }
}
// Bring up modal UI to select the new location
Modified: branches/64bit/DownloadWindow.h
===================================================================
--- branches/64bit/DownloadWindow.h 2010-09-04 00:19:04 UTC (rev 1572)
+++ branches/64bit/DownloadWindow.h 2010-09-04 00:19:43 UTC (rev 1573)
@@ -22,7 +22,7 @@
#import "SquareWindow.h"
#import "TableViewExtensions.h"
-@interface DownloadWindow : NSWindowController {
+@interface DownloadWindow : NSWindowController <NSTableViewDataSource, NSTableViewDelegate, NSWindowDelegate> {
IBOutlet SquareWindow * downloadWindow;
IBOutlet ExtendedTableView * table;
IBOutlet NSButton * clearButton;
Modified: branches/64bit/DownloadWindow.m
===================================================================
--- branches/64bit/DownloadWindow.m 2010-09-04 00:19:04 UTC (rev 1572)
+++ branches/64bit/DownloadWindow.m 2010-09-04 00:19:43 UTC (rev 1573)
@@ -175,7 +175,7 @@
* Datasource for the table view. Return the total number of rows we'll display which
* is equivalent to the number of log items.
*/
--(int)numberOfRowsInTableView:(NSTableView *)aTableView
+-(NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView
{
int itemCount = [[[DownloadManager sharedInstance] downloadsList] count];
[clearButton setEnabled:itemCount > 0];
@@ -185,7 +185,7 @@
/* willDisplayCell [delegate]
* Catch the table view before it displays a cell.
*/
--(void)tableView:(NSTableView *)aTableView willDisplayCell:(id)aCell forTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex
+-(void)tableView:(NSTableView *)aTableView willDisplayCell:(id)aCell forTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex
{
if ([aCell isKindOfClass:[ImageAndTextCell class]])
{
@@ -201,7 +201,7 @@
/* objectValueForTableColumn [datasource]
* Called by the table view to obtain the object at the specified column and row.
*/
--(id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex
+-(id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex
{
NSArray * list = [[DownloadManager sharedInstance] downloadsList];
NSAssert(rowIndex >= 0 && rowIndex < [list count], @"objectValueForTableColumn sent an out-of-range rowIndex");
Modified: branches/64bit/Folder.m
===================================================================
--- branches/64bit/Folder.m 2010-09-04 00:19:04 UTC (rev 1572)
+++ branches/64bit/Folder.m 2010-09-04 00:19:43 UTC (rev 1573)
@@ -140,11 +140,12 @@
// exists. The penalty for it not existing AND us being unable to create it is that
// we don't cache folder icons in this session.
imagesCacheFolder = [[Preferences standardPreferences] imagesFolder];
+ NSError *error;
if (![fileManager fileExistsAtPath:imagesCacheFolder isDirectory:&isDir])
{
- if (![fileManager createDirectoryAtPath:imagesCacheFolder attributes:NULL])
+ if (![fileManager createDirectoryAtPath:imagesCacheFolder withIntermediateDirectories:NO attributes:nil error:&error])
{
- NSLog(@"Cannot create image cache at %@. Will not cache folder images in this session.", imagesCacheFolder);
+ NSLog(@"Cannot create image cache at %@. Will not cache folder images in this session. Error: %@", imagesCacheFolder, error);
imagesCacheFolder = nil;
}
initializedFolderImagesArray = YES;
@@ -162,9 +163,13 @@
// Remember - not every file we find may be a valid image file. We use the filename as
// the key but check the extension too.
- listOfFiles = [fileManager directoryContentsAtPath:imagesCacheFolder];
- if (listOfFiles != nil)
+ listOfFiles = [fileManager contentsOfDirectoryAtPath:imagesCacheFolder error:&error];
+ if (listOfFiles == nil)
{
+ NSLog(@"Can't get contents of directory at path '%@'. Error: %@", imagesCacheFolder, error);
+ }
+ else
+ {
NSString * fileName;
for (fileName in listOfFiles)
Modified: branches/64bit/FolderView.h
===================================================================
--- branches/64bit/FolderView.h 2010-09-04 00:19:04 UTC (rev 1572)
+++ branches/64bit/FolderView.h 2010-09-04 00:19:43 UTC (rev 1573)
@@ -36,3 +36,11 @@
-(NSString *)outlineView:(FolderView *)outlineView tooltipForItem:(id)item;
-(void)outlineView:(FolderView *)outlineView menuWillAppear:(NSEvent *)theEvent;
@end
+
+@interface NSObject (FoldersViewDelegate)
+-(BOOL)handleKeyDown:(unichar)keyChar withFlags:(unsigned int)flags;
+-(BOOL)copyTableSelection:(NSArray *)items toPasteboard:(NSPasteboard *)pboard;
+-(BOOL)canDeleteFolderAtRow:(int)row;
+-(IBAction)deleteFolder:(id)sender;
+-(void)outlineViewWillBecomeFirstResponder;
+@end
Modified: branches/64bit/FolderView.m
===================================================================
--- branches/64bit/FolderView.m 2010-09-04 00:19:04 UTC (rev 1572)
+++ branches/64bit/FolderView.m 2010-09-04 00:19:43 UTC (rev 1573)
@@ -22,14 +22,6 @@
#import "ImageAndTextCell.h"
#import "TreeNode.h"
-@interface NSObject (FoldersViewDelegate)
- -(BOOL)handleKeyDown:(unichar)keyChar withFlags:(unsigned int)flags;
- -(BOOL)copyTableSelection:(NSArray *)items toPasteboard:(NSPasteboard *)pboard;
- -(BOOL)canDeleteFolderAtRow:(int)row;
- -(IBAction)deleteFolder:(id)sender;
- -(void)outlineViewWillBecomeFirstResponder;
-@end
-
@implementation FolderView
/* init
@@ -67,7 +59,7 @@
*/
-(BOOL)becomeFirstResponder
{
- [[self delegate] outlineViewWillBecomeFirstResponder];
+ [(id)[self delegate] outlineViewWillBecomeFirstResponder];
return [super becomeFirstResponder];
}
@@ -215,7 +207,7 @@
-(NSMenu *)menuForEvent:(NSEvent *)theEvent
{
if ([self delegate] && [[self delegate] respondsToSelector:@selector(outlineView:menuWillAppear:)])
- [[self delegate] outlineView:self menuWillAppear:theEvent];
+ [(id)[self delegate] outlineView:self menuWillAppear:theEvent];
return [self menu];
}
@@ -236,7 +228,7 @@
[array addObject:node];
item = [selectedRowIndexes indexGreaterThanIndex:item];
}
- [[self delegate] copyTableSelection:array toPasteboard:[NSPasteboard generalPasteboard]];
+ [(id)[self delegate] copyTableSelection:array toPasteboard:[NSPasteboard generalPasteboard]];
}
}
@@ -260,7 +252,7 @@
}
if ([menuItem action] == @selector(delete:))
{
- return [[self delegate] canDeleteFolderAtRow:[self selectedRow]];
+ return [(id)[self delegate] canDeleteFolderAtRow:[self selectedRow]];
}
if ([menuItem action] == @selector(selectAll:))
{
Modified: branches/64bit/FoldersTree.h
===================================================================
--- branches/64bit/FoldersTree.h 2010-09-04 00:19:04 UTC (rev 1572)
+++ branches/64bit/FoldersTree.h 2010-09-04 00:19:43 UTC (rev 1573)
@@ -47,7 +47,6 @@
-(void)saveFolderSettings;
-(void)updateAlternateMenuTitle;
-(void)updateFolder:(int)folderId recurseToParents:(BOOL)recurseToParents;
--(BOOL)canDeleteFolderAtRow:(int)row;
-(BOOL)selectFolder:(int)folderId;
-(void)renameFolder:(int)folderId;
-(int)actualSelection;
@@ -59,5 +58,4 @@
-(int)nextFolderWithUnread:(int)currentFolderId;
-(NSArray *)folders:(int)folderId;
-(NSView *)mainView;
--(void)outlineViewWillBecomeFirstResponder;
@end
Modified: branches/64bit/FoldersTree.m
===================================================================
--- branches/64bit/FoldersTree.m 2010-09-04 00:19:04 UTC (rev 1572)
+++ branches/64bit/FoldersTree.m 2010-09-04 00:19:43 UTC (rev 1573)
@@ -48,7 +48,6 @@
-(void)handleFolderFontChange:(NSNotification *)nc;
-(void)reloadFolderItem:(id)node reloadChildren:(BOOL)flag;
-(void)expandToParent:(TreeNode *)node;
- -(BOOL)copyTableSelection:(NSArray *)items toPasteboard:(NSPasteboard *)pboard;
-(BOOL)moveFolders:(NSArray *)array;
-(void)enableFoldersRenaming:(id)sender;
-(void)enableFoldersRenamingAfterDelay;
@@ -322,7 +321,7 @@
}
if (index < (int)[listOfFolders count])
{
- NSLog(@"Missing children for folder with id %i", nextChildId, [node nodeId]);
+ NSLog(@"Missing children for folder with id %i", [node nodeId]);
return NO;
}
}
Modified: branches/64bit/HelperFunctions.m
===================================================================
--- branches/64bit/HelperFunctions.m 2010-09-04 00:19:04 UTC (rev 1572)
+++ branches/64bit/HelperFunctions.m 2010-09-04 00:19:43 UTC (rev 1573)
@@ -167,7 +167,8 @@
void loadMapFromPath(NSString * path, NSMutableDictionary * pathMappings, BOOL foldersOnly, NSArray * validExtensions)
{
NSFileManager * fileManager = [NSFileManager defaultManager];
- NSArray * arrayOfFiles = [fileManager directoryContentsAtPath:path];
+ NSError *error;
+ NSArray * arrayOfFiles = [fileManager contentsOfDirectoryAtPath:path error:&error];
if (arrayOfFiles != nil)
{
if (validExtensions)
@@ -196,10 +197,18 @@
{
SCNetworkConnectionFlags flags;
NSURL * url = [NSURL URLWithString:urlString];
-
- if (!SCNetworkCheckReachabilityByName([[url host] UTF8String], &flags))
+ SCNetworkReachabilityRef target = SCNetworkReachabilityCreateWithName(NULL, [[url host] UTF8String]);
+ if (target == NULL)
+ {
return NO;
- return (flags & kSCNetworkFlagsReachable) && !(flags & kSCNetworkFlagsConnectionRequired);
+ }
+ BOOL isAccessible = NO;
+ if (SCNetworkReachabilityGetFlags(target, &flags))
+ {
+ isAccessible = (flags & kSCNetworkFlagsReachable) && !(flags & kSCNetworkFlagsConnectionRequired);
+ }
+ CFRelease(target);
+ return isAccessible;
}
/* runOKAlertPanel
Modified: branches/64bit/ImageAndTextCell.m
===================================================================
--- branches/64bit/ImageAndTextCell.m 2010-09-04 00:19:04 UTC (rev 1572)
+++ branches/64bit/ImageAndTextCell.m 2010-09-04 00:19:43 UTC (rev 1573)
@@ -301,7 +301,7 @@
* Draws the selection around the cell. We overload this to handle our custom field editor
* frame in the FolderView class.
*/
--(void)selectWithFrame:(NSRect)aRect inView:(NSView *)controlView editor:(NSText *)textObj delegate:(id)anObject start:(int)selStart length:(int)selLength
+-(void)selectWithFrame:(NSRect)aRect inView:(NSView *)controlView editor:(NSText *)textObj delegate:(id)anObject start:(NSInteger)selStart length:(NSInteger)selLength
{
if ([controlView isKindOfClass:[FolderView class]])
{
Modified: branches/64bit/InfoWindow.h
===================================================================
--- branches/64bit/InfoWindow.h 2010-09-04 00:19:04 UTC (rev 1572)
+++ branches/64bit/InfoWindow.h 2010-09-04 00:19:43 UTC (rev 1573)
@@ -29,7 +29,7 @@
-(void)showInfoWindowForFolder:(int)folderId;
@end
-@interface InfoWindow : NSWindowController {
+@interface InfoWindow : NSWindowController <NSWindowDelegate> {
IBOutlet NSTextField * folderName;
IBOutlet NSTextField * lastRefreshDate;
IBOutlet NSImageView * folderImage;
Modified: branches/64bit/InfoWindow.m
===================================================================
--- branches/64bit/InfoWindow.m 2010-09-04 00:19:04 UTC (rev 1572)
+++ branches/64bit/InfoWindow.m 2010-09-04 00:19:43 UTC (rev 1573)
@@ -80,7 +80,7 @@
/* retainCount
* Return UINT_MAX to denote an object that cannot be released.
*/
--(unsigned)retainCount
+-(NSUInteger)retainCount
{
return UINT_MAX;
}
Modified: branches/64bit/Message.m
===================================================================
--- branches/64bit/Message.m 2010-09-04 00:19:04 UTC (rev 1572)
+++ branches/64bit/Message.m 2010-09-04 00:19:43 UTC (rev 1573)
@@ -419,9 +419,9 @@
// Use the tag name as the selector to a member function that returns the expanded
// value. If no function exists then we just delete the tag name from the source string.
NSString * tagSelName = [@"tag" stringByAppendingString:tagName];
- const char * cTagSelName = [tagSelName cStringUsingEncoding:NSASCIIStringEncoding];
- if (sel_getUid(cTagSelName))
- replacementString = [self performSelector:sel_getUid(cTagSelName)];
+ SEL cTagSelName = NSSelectorFromString(tagSelName);
+ if (cTagSelName != NULL)
+ replacementString = [self performSelector:cTagSelName];
if (replacementString == nil)
[newString deleteCharactersInRange:NSMakeRange(tagStartIndex, tagLength)];
Modified: branches/64bit/MessageListView.h
===================================================================
--- branches/64bit/MessageListView.h 2010-09-04 00:19:04 UTC (rev 1572)
+++ branches/64bit/MessageListView.h 2010-09-04 00:19:43 UTC (rev 1573)
@@ -24,3 +24,10 @@
@interface MessageListView : ExtendedTableView
-(void)keyDown:(NSEvent *)theEvent;
@end
+
+@interface NSObject(MessageListViewDelegate)
+-(BOOL)handleKeyDown:(unichar)keyChar withFlags:(unsigned int)flags;
+-(BOOL)copyTableSelection:(NSArray *)rows toPasteboard:(NSPasteboard *)pboard;
+-(BOOL)canDeleteMessageAtRow:(int)row;
+-(IBAction)deleteMessage:(id)sender;
+@end
Modified: branches/64bit/MessageListView.m
===================================================================
--- branches/64bit/MessageListView.m 2010-09-04 00:19:04 UTC (rev 1572)
+++ branches/64bit/MessageListView.m 2010-09-04 00:19:43 UTC (rev 1573)
@@ -20,13 +20,6 @@
#import "MessageListView.h"
-@interface NSObject(MessageListViewDelegate)
- -(BOOL)handleKeyDown:(unichar)keyChar withFlags:(unsigned int)flags;
- -(BOOL)copyTableSelection:(NSArray *)rows toPasteboard:(NSPasteboard *)pboard;
- -(BOOL)canDeleteMessageAtRow:(int)row;
- -(IBAction)deleteMessage:(id)sender;
-@end
-
@implementation MessageListView
/* keyDown
@@ -59,7 +52,7 @@
[rows addObject:[NSNumber numberWithUnsignedInt:rowIndex]];
rowIndex = [selectedRowIndexes indexGreaterThanIndex:rowIndex];
}
- [[self delegate] copyTableSelection:rows toPasteboard:[NSPasteboard generalPasteboard]];
+ [(id)[self delegate] copyTableSelection:rows toPasteboard:[NSPasteboard generalPasteboard]];
}
}
@@ -83,7 +76,7 @@
}
if ([menuItem action] == @selector(delete:))
{
- return [[self delegate] canDeleteMessageAtRow:[self selectedRow]];
+ return [(id)[self delegate] canDeleteMessageAtRow:[self selectedRow]];
}
if ([menuItem action] == @selector(selectAll:))
{
Modified: branches/64bit/NewPreferencesController.h
===================================================================
--- branches/64bit/NewPreferencesController.h 2010-09-04 00:19:04 UTC (rev 1572)
+++ branches/64bit/NewPreferencesController.h 2010-09-04 00:19:43 UTC (rev 1573)
@@ -20,7 +20,7 @@
#import <Cocoa/Cocoa.h>
-@interface NewPreferencesController : NSWindowController
+@interface NewPreferencesController : NSWindowController <NSToolbarDelegate>
{
IBOutlet NSWindow * prefWindow;
NSView * blankView;
Modified: branches/64bit/NewPreferencesController.m
===================================================================
--- branches/64bit/NewPreferencesController.m 2010-09-04 00:19:04 UTC (rev 1572)
+++ branches/64bit/NewPreferencesController.m 2010-09-04 00:19:43 UTC (rev 1573)
@@ -148,7 +148,7 @@
NSLog(@"Missing ClassName attribute from preference %@", identifier);
return;
}
- Class classObject = objc_getClass([className cStringUsingEncoding:NSASCIIStringEncoding]);
+ Class classObject = NSClassFromString(className);
if (classObject == nil)
{
NSLog(@"Cannot find class '%@' in preference %@", className, identifier);
Modified: branches/64bit/Preferences.m
===================================================================
--- branches/64bit/Preferences.m 2010-09-04 00:19:04 UTC (rev 1572)
+++ branches/64bit/Preferences.m 2010-09-04 00:19:43 UTC (rev 1573)
@@ -121,9 +121,10 @@
if (![fileManager fileExistsAtPath:profilePath isDirectory:&isDir])
{
- if (![fileManager createDirectoryAtPath:profilePath attributes:NULL])
+ NSError *error;
+ if (![fileManager createDirectoryAtPath:profilePath withIntermediateDirectories:NO attributes:nil error:&error])
{
- NSLog(@"Cannot create profile folder %@", profilePath);
+ NSLog(@"Cannot create profile folder '%@': %@", profilePath, error);
profilePath = nil;
}
}
Modified: branches/64bit/RichXMLParser.m
===================================================================
--- branches/64bit/RichXMLParser.m 2010-09-04 00:19:04 UTC (rev 1572)
+++ branches/64bit/RichXMLParser.m 2010-09-04 00:19:43 UTC (rev 1573)
@@ -789,7 +789,7 @@
{
if ([anItem date] == nil)
[anItem setDate:itemDate];
- itemDate = [itemDate addTimeInterval:-1.0];
+ itemDate = [itemDate dateByAddingTimeInterval:-1.0];
}
return success;
}
Modified: branches/64bit/SNDisclosableView.m
===================================================================
--- branches/64bit/SNDisclosableView.m 2010-09-04 00:19:04 UTC (rev 1572)
+++ branches/64bit/SNDisclosableView.m 2010-09-04 00:19:43 UTC (rev 1573)
@@ -375,7 +375,7 @@
count = [masks count];
for (index = 0; index < count; index++)
- [[views objectAtIndex:index] setAutoresizingMask:[[masks objectAtIndex:index] unsignedIntValue]];
+ [(NSView *)[views objectAtIndex:index] setAutoresizingMask:[[masks objectAtIndex:index] unsignedIntValue]];
}
@end
Modified: branches/64bit/SquareWindow.m
===================================================================
--- branches/64bit/SquareWindow.m 2010-09-04 00:19:04 UTC (rev 1572)
+++ branches/64bit/SquareWindow.m 2010-09-04 00:19:43 UTC (rev 1573)
@@ -25,7 +25,7 @@
* Subclass the designated initialiser for NSWindow to set the square bottom edge style using the
* undocumented setBottomCornerRounded function.
*/
--(id)initWithContentRect:(NSRect)contentRect styleMask:(unsigned int)styleMask backing:(NSBackingStoreType)backingType defer:(BOOL)flag
+-(id)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)styleMask backing:(NSBackingStoreType)backingType defer:(BOOL)flag
{
if ((self = [super initWithContentRect:contentRect styleMask:styleMask backing:backingType defer:flag]) != nil)
{
Modified: branches/64bit/TableViewExtensions.m
===================================================================
--- branches/64bit/TableViewExtensions.m 2010-09-04 00:19:04 UTC (rev 1572)
+++ branches/64bit/TableViewExtensions.m 2010-09-04 00:19:43 UTC (rev 1573)
@@ -59,21 +59,21 @@
-(void)resetCursorRects
{
[self removeAllToolTips];
- if (delegateImplementsShouldDisplayToolTips && [[self delegate] tableViewShouldDisplayCellToolTips:self])
+ if (delegateImplementsShouldDisplayToolTips && [(id)[self delegate] tableViewShouldDisplayCellToolTips:self])
{
NSRect visibleRect = [self visibleRect];
- NSRange colRange = [self columnsInRect:visibleRect];
+ NSIndexSet *columnIndexes = [self columnIndexesInRect:visibleRect];
NSRange rowRange = [self rowsInRect:visibleRect];
NSRect frameOfCell;
- unsigned col, row;
-
- for (col = colRange.location; col < colRange.location + colRange.length; col++)
+ NSInteger columnIndex = [columnIndexes firstIndex];
+ while (columnIndex != NSNotFound)
{
- for (row = rowRange.location; row < rowRange.location + rowRange.length; row++)
+ for (NSInteger row = rowRange.location; row < rowRange.location + rowRange.length; row++)
{
- frameOfCell = [self frameOfCellAtColumn:col row:row];
+ frameOfCell = [self frameOfCellAtColumn:columnIndex row:row];
[self addToolTipRect:frameOfCell owner:self userData:NULL];
}
+ columnIndex = [columnIndexes indexGreaterThanIndex:columnIndex];
}
}
}
@@ -86,7 +86,7 @@
int rowIndex = [self rowAtPoint:point];
int columnIndex = [self columnAtPoint:point];
NSTableColumn *tableColumn = (columnIndex != -1) ? [[self tableColumns] objectAtIndex:columnIndex] : nil;
- return (columnIndex != -1) ? [[self delegate] tableView:self toolTipForTableColumn:tableColumn row:rowIndex] : @"";
+ return (columnIndex != -1) ? [(id)[self delegate] tableView:self toolTipForTableColumn:tableColumn row:rowIndex] : @"";
}
/* localiseHeaderStrings
@@ -109,7 +109,7 @@
-(NSMenu *)menuForEvent:(NSEvent *)theEvent
{
if ([self delegate] && [[self delegate] respondsToSelector:@selector(tableView:menuWillAppear:)])
- [[self delegate] tableView:self menuWillAppear:theEvent];
+ [(id)[self delegate] tableView:self menuWillAppear:theEvent];
return [self selectedRow] >= 0 ? [self menu] : nil;
}
Modified: branches/64bit/ViennaApp.m
===================================================================
--- branches/64bit/ViennaApp.m 2010-09-04 00:19:04 UTC (rev 1572)
+++ branches/64bit/ViennaApp.m 2010-09-04 00:19:43 UTC (rev 1573)
@@ -62,7 +62,7 @@
*/
-(id)handleRefreshAllSubscriptions:(NSScriptCommand *)cmd
{
- [[self delegate] refreshAllSubscriptions:nil];
+ [(AppController *)[self delegate] refreshAllSubscriptions:nil];
return nil;
}
@@ -144,7 +144,7 @@
NSDictionary * args = [cmd evaluatedArguments];
NSArray * argArray = [self evaluatedArrayOfFolders:[args objectForKey:@"Folder"] withCommand:cmd];
if (argArray != nil)
- [[self delegate] markSelectedFoldersRead:argArray];
+ [(AppController *)[self delegate] markSelectedFoldersRead:argArray];
return nil;
}
@@ -154,7 +154,7 @@
*/
-(id)handleMarkAllSubscriptionsRead:(NSScriptCommand *)cmd
{
- [[self delegate] markAllSubscriptionsRead:nil];
+ [(AppController *)[self delegate] markAllSubscriptionsRead:nil];
return nil;
}
@@ -173,7 +173,7 @@
*/
-(id)handleEmptyTrash:(NSScriptCommand *)cmd
{
- [[self delegate] clearUndoStack];
+ [(AppController *)[self delegate] clearUndoStack];
[[Database sharedDatabase] purgeDeletedArticles];
return nil;
}
@@ -184,7 +184,7 @@
-(id)handleImportSubscriptions:(NSScriptCommand *)cmd
{
NSDictionary * args = [cmd evaluatedArguments];
- [[self delegate] importFromFile:[args objectForKey:@"FileName"]];
+ [(AppController *)[self delegate] importFromFile:[args objectForKey:@"FileName"]];
return nil;
}
@@ -199,7 +199,7 @@
int countExported = 0;
if (argArray != nil)
- countExported = [[self delegate] exportToFile:[args objectForKey:@"FileName"] from:argArray withGroups:YES];
+ countExported = [(AppController *)[self delegate] exportToFile:[args objectForKey:@"FileName"] from:argArray withGroups:YES];
return [NSNumber numberWithInt:countExported];
}
@@ -214,7 +214,7 @@
int parentId = folder ? ((IsGroupFolder(folder)) ? [folder itemId] :[folder parentId]) : MA_Root_Folder;
- [[self delegate] createNewSubscription:[args objectForKey:@"URL"] underFolder:parentId afterChild:-1];
+ [(AppController *)[self delegate] createNewSubscription:[args objectForKey:@"URL"] underFolder:parentId afterChild:-1];
return nil;
}
@@ -244,7 +244,7 @@
*/
-(NSArray *)folders
{
- return [[self delegate] folders];
+ return [(AppController *)[self delegate] folders];
}
/* isRefreshing
@@ -252,7 +252,7 @@
*/
-(BOOL)isRefreshing
{
- return [[self delegate] isConnecting];
+ return [(AppController *)[self delegate] isConnecting];
}
/* totalUnreadCount
@@ -269,7 +269,7 @@
*/
-(NSString *)currentTextSelection
{
- NSView<BaseView> * theView = [[[self delegate] browserView] activeTabItemView];
+ NSView<BaseView> * theView = [[(AppController *)[self delegate] browserView] activeTabItemView];
WebView * webPane = nil;
if ([theView isKindOfClass:[BrowserPane class]])
@@ -293,7 +293,7 @@
-(NSString *)documentHTMLSource
{
- NSView<BaseView> * theView = [[[self delegate] browserView] activeTabItemView];
+ NSView<BaseView> * theView = [[(AppController *)[self delegate] browserView] activeTabItemView];
WebView * webPane = [theView webView];
if (webPane != nil)
@@ -314,7 +314,7 @@
*/
-(Article *)currentArticle;
{
- return [[self delegate] selectedArticle];
+ return [(AppController *)[self delegate] selectedArticle];
}
/* currentFolder
@@ -322,7 +322,7 @@
*/
-(Folder *)currentFolder
{
- return [[Database sharedDatabase] folderFromID:[[self delegate] currentFolderId]];
+ return [[Database sharedDatabase] folderFromID:[(AppController *)[self delegate] currentFolderId]];
}
/* setCurrentFolder
Modified: branches/64bit/ViewExtensions.h
===================================================================
--- branches/64bit/ViewExtensions.h 2010-09-04 00:19:04 UTC (rev 1572)
+++ branches/64bit/ViewExtensions.h 2010-09-04 00:19:43 UTC (rev 1573)
@@ -20,7 +20,7 @@
#import <Cocoa/Cocoa.h>
-@interface NSView (ViewExtensions)
+@interface NSView (ViewExtensions) <NSAnimationDelegate>
-(void)resizeViewWithAnimation:(NSRect)newFrame withTag:(int)viewTag;
@end
Modified: branches/64bit/ViewExtensions.m
===================================================================
--- branches/64bit/ViewExtensions.m 2010-09-04 00:19:04 UTC (rev 1572)
+++ branches/64bit/ViewExtensions.m 2010-09-04 00:19:43 UTC (rev 1573)
@@ -93,7 +93,7 @@
[animation release];
if ([[viewWindow delegate] respondsToSelector:@selector(viewAnimationCompleted:withTag:)])
- [[viewWindow delegate] viewAnimationCompleted:self withTag:viewTag];
+ [(id)[viewWindow delegate] viewAnimationCompleted:self withTag:viewTag];
}
@end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|