cleanup

stepmania/src/archutils/Darwin/Crash.m

@@ -1,13 +1,9 @@
-#import <Cocoa/Cocoa.h>
-
 void InformUserOfCrash( const char *sPath )
 {
-	int ret = NSRunAlertPanel(@"StepMania has crashed",
-							  @"StepMania has crashed. Debugging information "
-							  @"has been output to\n\n%s\n\nPlease file a bug "
-							  @"report at\n\nhttp://sf.net/tracker/?func=add&"
-							  @"group_id=37892&atid=421366",
-							  @"Open crashinfo.txt", @"Quit", nil, sPath);
+	NSString *s = @"StepMania has crashed. Debugging information has been output to\n\n%s\n\n"
+	@"Please file a bug report at\n\nhttp://sf.net/tracker/?func=add&group_id=37892&atid=421366";
+	
+	int ret = NSRunAlertPanel( @"StepMania has crashed", s, @"Open crashinfo.txt", @"Quit", nil, sPath );
 	
 	if( ret == NSAlertDefaultReturn )
 	{

stepmania/src/archutils/Darwin/PreferredLanguage.m

@@ -1,5 +1,3 @@
-#import "Cocoa/Cocoa.h"
-
 char *GetPreferredLanguage()
 {
 	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];

stepmania/src/archutils/Darwin/Vsync.cpp

@@ -4,8 +4,6 @@
 
 bool wglSwapIntervalEXT( int swapInterval )
 {
-    /* I really have no idea what the expected return value for success. If it was an int
-    * I would return 0, since it is a bool, I'm going to guess that true is success. */
     return !CGLSetParameter( CGLGetCurrentContext(), kCGLCPSwapInterval, (long*)(&swapInterval) );
 }
 

stepmania/src/archutils/Darwin/WindowHelper.m

@@ -1,6 +1,3 @@
-#import <Cocoa/Cocoa.h>
-#import <assert.h>
-
 void SM_ShowCursor( bool b )
 {
 	if( b )

stepmania/src/archutils/Darwin/arch_setup.h

@@ -125,7 +125,8 @@ namespace std
 	{
 		typedef wchar_t    char_type;
 		typedef wchar_t    int_type; // it's big enough
-		/* streampos and wstreampos are both required to be typedefs for
+		/*
+		 * streampos and wstreampos are both required to be typedefs for
 		 * fpos<mbstate_t> as per clause 27.2--whatever that is.
 		 */
 		typedef streampos  pos_type;
@@ -142,8 +143,7 @@ namespace std
 			wmemset( s, c, n );
 		}
 		
-		static int compare(const char_type *s1, const char_type *s2,
-						   size_t n)
+		static int compare( const char_type *s1, const char_type *s2, size_t n )
 		{
 			return wmemcmp( s1, s2, n );
 		}
@@ -153,8 +153,7 @@ namespace std
 			return wmemcpy( s1, s2, n );
 		}
 		
-		static const char_type *find(const char_type *s, size_t n,
-									 const char_type& c)
+		static const char_type *find( const char_type *s, size_t n, const char_type& c )
 		{
 			return wmemchr( s, c, n );
 		}