From 43f52f64c860e404fc421fa80d356c98e241fc4c Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 3 Jun 2005 23:45:58 +0000 Subject: [PATCH] style (Steve: sorry for poking around in code I can't test, but I'd like source consistency in platform-specific code, too. I'll commit in small pieces so it's clear what I'm up to, so it should be trivial to fix if I miss something.) --- stepmania/src/arch/Dialog/DialogDriver_Cocoa.cpp | 8 ++++---- stepmania/src/arch/Dialog/DialogDriver_Cocoa.h | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/stepmania/src/arch/Dialog/DialogDriver_Cocoa.cpp b/stepmania/src/arch/Dialog/DialogDriver_Cocoa.cpp index 5ed8f1cd43..9a798f3018 100644 --- a/stepmania/src/arch/Dialog/DialogDriver_Cocoa.cpp +++ b/stepmania/src/arch/Dialog/DialogDriver_Cocoa.cpp @@ -21,17 +21,17 @@ static SInt16 ShowAlert( int type, CFStringRef message, CFStringRef OK, CFString return result; } -void DialogDriver_Cocoa::OK( CString sMessage, CString ID ) +void DialogDriver_Cocoa::OK( CString sMessage, CString sID ) { CFStringRef message = CFStringCreateWithCString(NULL, sMessage, kCFStringEncodingASCII); SInt16 result = ShowAlert(kAlertNoteAlert, message, CFSTR("OK"), CFSTR("Don't show again")); CFRelease(message); if( result == kAlertStdAlertCancelButton ) - Dialog::IgnoreMessage( ID ); + Dialog::IgnoreMessage( sID ); } -void DialogDriver_Cocoa::Error( CString sError, CString ID ) +void DialogDriver_Cocoa::Error( CString sError, CString sID ) { CFStringRef error = CFStringCreateWithCString( NULL, sError, kCFStringEncodingASCII ); ShowAlert(kAlertStopAlert, error, CFSTR("OK")); @@ -40,7 +40,7 @@ void DialogDriver_Cocoa::Error( CString sError, CString ID ) } // XXX: should show three options, not two -Dialog::Result DialogDriver_Cocoa::AbortRetryIgnore( CString sMessage, CString ID ) +Dialog::Result DialogDriver_Cocoa::AbortRetryIgnore( CString sMessage, CString sID ) { CFStringRef error = CFStringCreateWithCString( NULL, sMessage, kCFStringEncodingASCII ); SInt16 result = ShowAlert( kAlertNoteAlert, error, CFSTR("Retry"), CFSTR("Ignore") ); diff --git a/stepmania/src/arch/Dialog/DialogDriver_Cocoa.h b/stepmania/src/arch/Dialog/DialogDriver_Cocoa.h index 3c35d56f04..ab7b455111 100644 --- a/stepmania/src/arch/Dialog/DialogDriver_Cocoa.h +++ b/stepmania/src/arch/Dialog/DialogDriver_Cocoa.h @@ -6,9 +6,9 @@ class DialogDriver_Cocoa: public DialogDriver { public: - void Error(CString sError, CString ID); - void OK(CString sMessage, CString ID); - Dialog::Result AbortRetryIgnore(CString sMessage, CString ID); + void Error( CString sError, CString sID ); + void OK( CString sMessage, CString sID ); + Dialog::Result AbortRetryIgnore( CString sMessage, CString sID ); }; #define USE_DIALOG_DRIVER_COCOA