# HG changeset patch # User Zorg # Date 1302033746 14400 # Node ID e8944ed92b61f380394f2327a97ef4722ded49cb # Parent b0b560f561b5a23364e6eaf98f398cd3f426dd9d Reverting.. diff -r b0b560f561b5 -r e8944ed92b61 QTfrontend/M3Panel.mm --- a/QTfrontend/M3Panel.mm Sun Apr 03 00:13:38 2011 -0400 +++ b/QTfrontend/M3Panel.mm Tue Apr 05 16:02:26 2011 -0400 @@ -18,7 +18,6 @@ #include "M3Panel.h" #include "M3InstallController.h" -#include "CocoaInitializer.h" #include @@ -31,8 +30,7 @@ M3Panel::M3Panel(void) { c = new Private; - - CocoaInitializer initializer; + c->install = [[M3InstallController alloc] init]; [c->install retain]; diff -r b0b560f561b5 -r e8944ed92b61 QTfrontend/SDLs.cpp --- a/QTfrontend/SDLs.cpp Sun Apr 03 00:13:38 2011 -0400 +++ b/QTfrontend/SDLs.cpp Tue Apr 05 16:02:26 2011 -0400 @@ -24,10 +24,6 @@ #include -#ifdef __APPLE__ -#include "CocoaInitializer.h" -#endif - extern char sdlkeys[1024][2][128]; extern char xb360buttons[][128]; @@ -37,11 +33,7 @@ SDLInteraction::SDLInteraction() { -#ifdef __APPLE__ - // SDL_Init needs a NSAutoreleasePool set up - CocoaInitializer initializer; -#endif - + SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK); musicInitialized = 0;