diff options
| -rw-r--r-- | backends/taskbar/macosx/dockplugin/dockplugin.m (renamed from dists/macosx/dockplugin/dockplugin.m) | 22 | ||||
| -rw-r--r-- | backends/taskbar/macosx/macosx-taskbar.mm | 10 | ||||
| -rw-r--r-- | ports.mk | 8 |
3 files changed, 20 insertions, 20 deletions
diff --git a/dists/macosx/dockplugin/dockplugin.m b/backends/taskbar/macosx/dockplugin/dockplugin.m index 9bf0b9b033..9d864ef2a8 100644 --- a/dists/macosx/dockplugin/dockplugin.m +++ b/backends/taskbar/macosx/dockplugin/dockplugin.m @@ -23,12 +23,12 @@ #include <Cocoa/Cocoa.h> @interface ScummVMDockTilePlugIn : NSObject <NSDockTilePlugIn> { - NSMenu* recentGamesMenu; + NSMenu *recentGamesMenu; } @end @interface StartGameMenuItem : NSMenuItem { - NSString* game; + NSString *game; } - (IBAction) startGame; - (NSMenuItem*)initWithGame:(NSString *)gameId description:(NSString*)desc icon:(NSString*)iconFile; @@ -56,7 +56,7 @@ - (NSMenu*)dockMenu { // Get the list or recent games CFPreferencesAppSynchronize(CFSTR("org.scummvm.scummvm")); - NSArray* array = CFPreferencesCopyAppValue(CFSTR("recentGames"), CFSTR("org.scummvm.scummvm")); + NSArray *array = CFPreferencesCopyAppValue(CFSTR("recentGames"), CFSTR("org.scummvm.scummvm")); if (array == nil) return nil; @@ -67,13 +67,13 @@ [recentGamesMenu removeAllItems]; NSEnumerator *enumerator = [array objectEnumerator]; - NSDictionary* recentGame; + NSDictionary *recentGame; while (recentGame = [enumerator nextObject]) { - NSString* gameId = [recentGame valueForKey:@"game"]; - NSString* desc = [recentGame valueForKey:@"description"]; - NSString* iconFile = [recentGame valueForKey:@"icon"]; + NSString *gameId = [recentGame valueForKey:@"game"]; + NSString *desc = [recentGame valueForKey:@"description"]; + NSString *iconFile = [recentGame valueForKey:@"icon"]; - StartGameMenuItem* menuItem = [[StartGameMenuItem alloc] initWithGame:gameId description:desc icon:iconFile]; + StartGameMenuItem *menuItem = [[StartGameMenuItem alloc] initWithGame:gameId description:desc icon:iconFile]; [recentGamesMenu addItem:menuItem]; [menuItem release]; } @@ -90,7 +90,7 @@ [self setTarget:self]; if (iconFile != nil) { - NSImage* image = [[NSImage alloc] initWithContentsOfFile:iconFile]; + NSImage *image = [[NSImage alloc] initWithContentsOfFile:iconFile]; [self setImage:image]; [image release]; } @@ -115,8 +115,8 @@ return; } // Start ScummVM.app with the game ID as argument - NSURL* url = [NSURL fileURLWithPath:scummVMPath]; - NSMutableDictionary* args = [[NSMutableDictionary alloc] init]; + NSURL *url = [NSURL fileURLWithPath:scummVMPath]; + NSMutableDictionary *args = [[NSMutableDictionary alloc] init]; [args setObject:[NSArray arrayWithObject:game] forKey:NSWorkspaceLaunchConfigurationArguments]; [[NSWorkspace sharedWorkspace] launchApplicationAtURL:url options:NSWorkspaceLaunchDefault configuration:args error:nil]; [args release]; diff --git a/backends/taskbar/macosx/macosx-taskbar.mm b/backends/taskbar/macosx/macosx-taskbar.mm index 4e3ce70320..577320b79d 100644 --- a/backends/taskbar/macosx/macosx-taskbar.mm +++ b/backends/taskbar/macosx/macosx-taskbar.mm @@ -120,7 +120,7 @@ void MacOSXTaskbarManager::setOverlayIcon(const Common::String &name, const Comm initOverlayIconView(); CFStringRef imageFile = CFStringCreateWithCString(0, path.c_str(), kCFStringEncodingASCII); - NSImage* image = [[NSImage alloc] initWithContentsOfFile:(NSString *)imageFile]; + NSImage *image = [[NSImage alloc] initWithContentsOfFile:(NSString *)imageFile]; [_overlayIconView setImage:image]; [image release]; CFRelease(imageFile); @@ -261,19 +261,19 @@ void MacOSXTaskbarManager::addRecent(const Common::String &name, const Common::S // Retrieve the current list of recent items and update it. NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - NSArray* oldArray = [defaults arrayForKey:@"recentGames"]; + NSArray *oldArray = [defaults arrayForKey:@"recentGames"]; if (oldArray == nil) { [defaults setObject:[NSArray arrayWithObject:dict] forKey:@"recentGames"]; } else { - NSMutableArray* newArray = [[NSMutableArray alloc] initWithArray:oldArray]; + NSMutableArray *newArray = [[NSMutableArray alloc] initWithArray:oldArray]; // Insert the new game at the start [newArray insertObject:dict atIndex:0]; // If the game was already present in the array, remove it for (int i = 1 ; i < [newArray count] ; ++i) { - NSDictionary* oldDict = [newArray objectAtIndex:i]; + NSDictionary *oldDict = [newArray objectAtIndex:i]; if (oldDict == nil) continue; - NSString* oldGame = [oldDict valueForKey:@"game"]; + NSString *oldGame = [oldDict valueForKey:@"game"]; if (oldGame != nil && [oldGame isEqualToString:(NSString*)gameName]) { [newArray removeObjectAtIndex:i]; break; @@ -60,13 +60,13 @@ ifdef USE_DOCKTILEPLUGIN # Therefore do not use $(CXXFLAGS) and $(LDFLAGS). ScummVMDockTilePlugin32.o: - $(CXX) -mmacosx-version-min=10.6 -arch i386 -O2 -c $(srcdir)/dists/macosx/dockplugin/dockplugin.m -o ScummVMDockTilePlugin32.o + $(CXX) -mmacosx-version-min=10.6 -arch i386 -O2 -c $(srcdir)/backends/taskbar/macosx/dockplugin/dockplugin.m -o ScummVMDockTilePlugin32.o ScummVMDockTilePlugin32: ScummVMDockTilePlugin32.o $(CXX) -mmacosx-version-min=10.6 -arch i386 -bundle -framework Foundation -framework AppKit -fobjc-link-runtime ScummVMDockTilePlugin32.o -o ScummVMDockTilePlugin32 ScummVMDockTilePlugin64.o: - $(CXX) -mmacosx-version-min=10.6 -arch x86_64 -O2 -c $(srcdir)/dists/macosx/dockplugin/dockplugin.m -o ScummVMDockTilePlugin64.o + $(CXX) -mmacosx-version-min=10.6 -arch x86_64 -O2 -c $(srcdir)/backends/taskbar/macosx/dockplugin/dockplugin.m -o ScummVMDockTilePlugin64.o ScummVMDockTilePlugin64: ScummVMDockTilePlugin64.o $(CXX) -mmacosx-version-min=10.6 -arch x86_64 -bundle -framework Foundation -framework AppKit -fobjc-link-runtime ScummVMDockTilePlugin64.o -o ScummVMDockTilePlugin64 @@ -74,7 +74,7 @@ ScummVMDockTilePlugin64: ScummVMDockTilePlugin64.o ScummVMDockTilePlugin: ScummVMDockTilePlugin32 ScummVMDockTilePlugin64 lipo -create ScummVMDockTilePlugin32 ScummVMDockTilePlugin64 -output ScummVMDockTilePlugin -dockplugin: ScummVMDockTilePlugin +scummvm.docktileplugin: ScummVMDockTilePlugin mkdir -p scummvm.docktileplugin/Contents cp $(srcdir)/dists/macosx/dockplugin/Info.plist scummvm.docktileplugin/Contents mkdir -p scummvm.docktileplugin/Contents/MacOS @@ -86,7 +86,7 @@ endif bundle_name = ScummVM.app ifdef USE_DOCKTILEPLUGIN -bundle: scummvm-static dockplugin +bundle: scummvm-static scummvm.docktileplugin else bundle: scummvm-static endif |