anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-28 06:49:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

correct use of NSNumber constructor for NSTimeInterval;remove superfluous semicolons;fix data type conversion related compiler warnings

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36900 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Stephan Witt 2010-12-16 08:03:24 +00:00
parent e7da6a6bc9
commit 7a537da7c0
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/support/linkback/LinkBack.m
View File

@ -103,7 +103,7 @@ NSString* LinkBackEditNoneMenuTitle()
+ (NSDictionary*)linkBackDataWithServerName:(NSString*)serverName appData:(id)appData + (NSDictionary*)linkBackDataWithServerName:(NSString*)serverName appData:(id)appData
{ {
return [self linkBackDataWithServerName: serverName appData: appData actionName: nil suggestedRefreshRate: 0]; return [self linkBackDataWithServerName: serverName appData: appData actionName: nil suggestedRefreshRate: (float)0];
} }
+ (NSDictionary*)linkBackDataWithServerName:(NSString*)serverName appData:(id)appData suggestedRefreshRate:(NSTimeInterval)rate + (NSDictionary*)linkBackDataWithServerName:(NSString*)serverName appData:(id)appData suggestedRefreshRate:(NSTimeInterval)rate
@ -111,7 +111,7 @@ NSString* LinkBackEditNoneMenuTitle()
return [self linkBackDataWithServerName: serverName appData: appData actionName: LinkBackRefreshActionName suggestedRefreshRate: rate] ; return [self linkBackDataWithServerName: serverName appData: appData actionName: LinkBackRefreshActionName suggestedRefreshRate: rate] ;
} }
+ (NSDictionary*)linkBackDataWithServerName:(NSString*)serverName appData:(id)appData actionName:(NSString*)action suggestedRefreshRate:(NSTimeInterval)rate ; + (NSDictionary*)linkBackDataWithServerName:(NSString*)serverName appData:(id)appData actionName:(NSString*)action suggestedRefreshRate:(NSTimeInterval)rate
{ {
NSDictionary* appInfo = [[NSBundle mainBundle] infoDictionary] ; NSDictionary* appInfo = [[NSBundle mainBundle] infoDictionary] ;
@ -133,7 +133,7 @@ NSString* LinkBackEditNoneMenuTitle()
if (action) [ret setObject: action forKey: LinkBackServerActionKey] ; if (action) [ret setObject: action forKey: LinkBackServerActionKey] ;
if (appData) [ret setObject: appData forKey: LinkBackApplicationDataKey] ; if (appData) [ret setObject: appData forKey: LinkBackApplicationDataKey] ;
if (url) [ret setObject: url forKey: LinkBackApplicationURLKey] ; if (url) [ret setObject: url forKey: LinkBackApplicationURLKey] ;
[ret setObject: [NSNumber numberWithFloat: rate] forKey: LinkBackSuggestedRefreshKey] ; [ret setObject: [NSNumber numberWithDouble: rate] forKey: LinkBackSuggestedRefreshKey] ;
return [ret autorelease] ; return [ret autorelease] ;
} }
@ -236,7 +236,7 @@ NSMutableDictionary* keyedLinkBacks = nil ;
return self ; return self ;
} }
- (id)initClientWithSourceName:(NSString*)aName delegate:(id<LinkBackClientDelegate>)aDel itemKey:(NSString*)aKey ; - (id)initClientWithSourceName:(NSString*)aName delegate:(id<LinkBackClientDelegate>)aDel itemKey:(NSString*)aKey
{ {
if ((self = [super init])) { if ((self = [super init])) {
isServer = NO ; isServer = NO ;

10
src/support/linkback/LinkBackServer.m
View File

@ -72,7 +72,7 @@ NSMutableDictionary* LinkBackServers = nil ;
BOOL LinkBackServerIsSupported(NSString* name, id supportedServers) BOOL LinkBackServerIsSupported(NSString* name, id supportedServers)
{ {
BOOL ret = NO ; BOOL ret = NO ;
int idx ; NSUInteger idx ;
NSString* curServer = supportedServers ; NSString* curServer = supportedServers ;
// NOTE: supportedServers may be nil, an NSArray, or NSString. // NOTE: supportedServers may be nil, an NSArray, or NSString.
@ -99,15 +99,15 @@ NSString* FindLinkBackServer(NSString* bundleIdentifier, NSString* serverName, N
#else #else
NSArray* contents = [fm directoryContentsAtPath: dir] ; NSArray* contents = [fm directoryContentsAtPath: dir] ;
#endif #endif
int idx ; NSUInteger idx ;
NSLog(@"searching for %@ in folder: %@", serverName, dir) ;
// working info // working info
NSString* cpath ; NSString* cpath ;
NSBundle* cbundle ; NSBundle* cbundle ;
NSString* cbundleIdentifier ; NSString* cbundleIdentifier ;
id supportedServers ; id supportedServers ;
NSLog(@"searching for %@ in folder: %@", serverName, dir) ;
// resolve any symlinks, expand tildes. // resolve any symlinks, expand tildes.
dir = [dir stringByStandardizingPath] ; dir = [dir stringByStandardizingPath] ;
@ -173,7 +173,7 @@ void LinkBackRunAppNotFoundPanel(NSString* appName, NSURL* url)
} }
} }
+ (LinkBackServer*)LinkBackServerWithName:(NSString*)aName inApplication:(NSString*)bundleIdentifier launchIfNeeded:(BOOL)flag fallbackURL:(NSURL*)url appName:(NSString*)appName ; + (LinkBackServer*)LinkBackServerWithName:(NSString*)aName inApplication:(NSString*)bundleIdentifier launchIfNeeded:(BOOL)flag fallbackURL:(NSURL*)url appName:(NSString*)appName
{ {
BOOL connect = YES ; BOOL connect = YES ;
NSString* serverName = MakeLinkBackServerName(bundleIdentifier, aName) ; NSString* serverName = MakeLinkBackServerName(bundleIdentifier, aName) ;