From 2d644e67af8d517e02b058aad5a9c40d3d9579a0 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 3 Jun 2005 23:42:07 +0000 Subject: [PATCH] style --- stepmania/src/arch/Dialog/Dialog.cpp | 102 +++++++++--------- stepmania/src/arch/Dialog/Dialog.h | 10 +- .../src/arch/Dialog/DialogDriver_Win32.cpp | 19 ++-- .../src/arch/Dialog/DialogDriver_Win32.h | 8 +- 4 files changed, 70 insertions(+), 69 deletions(-) diff --git a/stepmania/src/arch/Dialog/Dialog.cpp b/stepmania/src/arch/Dialog/Dialog.cpp index 7c089d5cf3..c8295b300c 100644 --- a/stepmania/src/arch/Dialog/Dialog.cpp +++ b/stepmania/src/arch/Dialog/Dialog.cpp @@ -10,44 +10,44 @@ #include "Selector_Dialog.h" DialogDriver *MakeDialogDriver() { - CString drivers = "win32,cocoa,null"; - CStringArray DriversToTry; - split(drivers, ",", DriversToTry, true); + CString sDrivers = "win32,cocoa,null"; + CStringArray asDriversToTry; + split( sDrivers, ",", asDriversToTry, true ); - ASSERT( DriversToTry.size() != 0 ); + ASSERT( asDriversToTry.size() != 0 ); - CString Driver; - DialogDriver *ret = NULL; + CString sDriver; + DialogDriver *pRet = NULL; - for( unsigned i = 0; ret == NULL && i < DriversToTry.size(); ++i ) + for( unsigned i = 0; pRet == NULL && i < asDriversToTry.size(); ++i ) { - Driver = DriversToTry[i]; + sDriver = asDriversToTry[i]; #ifdef USE_DIALOG_DRIVER_COCOA - if( !DriversToTry[i].CompareNoCase("Cocoa") ) ret = new DialogDriver_Cocoa; + if( !asDriversToTry[i].CompareNoCase("Cocoa") ) pRet = new DialogDriver_Cocoa; #endif #ifdef USE_DIALOG_DRIVER_NULL - if( !DriversToTry[i].CompareNoCase("Null") ) ret = new DialogDriver_Null; + if( !asDriversToTry[i].CompareNoCase("Null") ) pRet = new DialogDriver_Null; #endif #ifdef USE_DIALOG_DRIVER_WIN32 - if( !DriversToTry[i].CompareNoCase("Win32") ) ret = new DialogDriver_Win32; + if( !asDriversToTry[i].CompareNoCase("Win32") ) pRet = new DialogDriver_Win32; #endif - if( ret == NULL ) + if( pRet == NULL ) { continue; } - CString sError = ret->Init(); + CString sError = pRet->Init(); if( sError != "" ) { if( LOG ) - LOG->Info( "Couldn't load driver %s: %s", DriversToTry[i].c_str(), sError.c_str() ); - SAFE_DELETE( ret ); + LOG->Info( "Couldn't load driver %s: %s", asDriversToTry[i].c_str(), sError.c_str() ); + SAFE_DELETE( pRet ); } } - return ret; + return pRet; } static DialogDriver *g_pImpl = NULL; @@ -77,53 +77,53 @@ bool Dialog::IsShowingDialog() return g_bIsShowingDialog; } -static bool MessageIsIgnored( CString ID ) +static bool MessageIsIgnored( CString sID ) { - vector list; - split( PREFSMAN->m_sIgnoredMessageWindows, ",", list ); - for( unsigned i = 0; i < list.size(); ++i ) - if( !ID.CompareNoCase(list[i]) ) + vector asList; + split( PREFSMAN->m_sIgnoredMessageWindows, ",", asList ); + for( unsigned i = 0; i < asList.size(); ++i ) + if( !sID.CompareNoCase(asList[i]) ) return true; return false; } -void Dialog::IgnoreMessage( CString ID ) +void Dialog::IgnoreMessage( CString sID ) { /* We can't ignore messages before PREFSMAN is around. */ if( PREFSMAN == NULL ) { - if( ID != "" && LOG ) - LOG->Warn( "Dialog: message \"%s\" set ID too early for ignorable messages", ID.c_str() ); + if( sID != "" && LOG ) + LOG->Warn( "Dialog: message \"%s\" set ID too early for ignorable messages", sID.c_str() ); return; } - if( ID == "" ) + if( sID == "" ) return; - if( MessageIsIgnored(ID) ) + if( MessageIsIgnored(sID) ) return; - vector list; - split( PREFSMAN->m_sIgnoredMessageWindows, ",", list ); - list.push_back( ID ); - PREFSMAN->m_sIgnoredMessageWindows.Set( join(",",list) ); + vector asList; + split( PREFSMAN->m_sIgnoredMessageWindows, ",", asList ); + asList.push_back( sID ); + PREFSMAN->m_sIgnoredMessageWindows.Set( join(",",asList) ); PREFSMAN->SaveGlobalPrefsToDisk(); } -void Dialog::Error( CString sMessage, CString ID ) +void Dialog::Error( CString sMessage, CString sID ) { Dialog::Init(); if( LOG ) - LOG->Trace( "Dialog: \"%s\" [%s]", sMessage.c_str(), ID.c_str() ); + LOG->Trace( "Dialog: \"%s\" [%s]", sMessage.c_str(), sID.c_str() ); - if( ID != "" && MessageIsIgnored( ID ) ) + if( sID != "" && MessageIsIgnored(sID) ) return; g_bIsShowingDialog = true; - g_pImpl->Error( sMessage, ID ); + g_pImpl->Error( sMessage, sID ); g_bIsShowingDialog = false; } @@ -133,69 +133,69 @@ void Dialog::SetWindowed( bool bWindowed ) g_bWindowed = bWindowed; } -void Dialog::OK( CString sMessage, CString ID ) +void Dialog::OK( CString sMessage, CString sID ) { Dialog::Init(); if( LOG ) - LOG->Trace( "Dialog: \"%s\" [%s]", sMessage.c_str(), ID.c_str() ); + LOG->Trace( "Dialog: \"%s\" [%s]", sMessage.c_str(), sID.c_str() ); - if( ID != "" && MessageIsIgnored( ID ) ) + if( sID != "" && MessageIsIgnored(sID) ) return; g_bIsShowingDialog = true; // only show Dialog if windowed if( !g_bWindowed ) - g_NullDriver.OK( sMessage, ID ); + g_NullDriver.OK( sMessage, sID ); else - g_pImpl->OK( sMessage, ID ); // call derived version + g_pImpl->OK( sMessage, sID ); // call derived version g_bIsShowingDialog = false; } -Dialog::Result Dialog::AbortRetryIgnore( CString sMessage, CString ID ) +Dialog::Result Dialog::AbortRetryIgnore( CString sMessage, CString sID ) { Dialog::Init(); if( LOG ) - LOG->Trace( "Dialog: \"%s\" [%s]", sMessage.c_str(), ID.c_str() ); + LOG->Trace( "Dialog: \"%s\" [%s]", sMessage.c_str(), sID.c_str() ); - if( ID != "" && MessageIsIgnored( ID ) ) - return g_NullDriver.AbortRetryIgnore( sMessage, ID ); + if( sID != "" && MessageIsIgnored(sID) ) + return g_NullDriver.AbortRetryIgnore( sMessage, sID ); g_bIsShowingDialog = true; // only show Dialog if windowed Dialog::Result ret; if( !g_bWindowed ) - ret = g_NullDriver.AbortRetryIgnore( sMessage, ID ); + ret = g_NullDriver.AbortRetryIgnore( sMessage, sID ); else - ret = g_pImpl->AbortRetryIgnore( sMessage, ID ); // call derived version + ret = g_pImpl->AbortRetryIgnore( sMessage, sID ); // call derived version g_bIsShowingDialog = false; return ret; } -Dialog::Result Dialog::AbortRetry( CString sMessage, CString ID ) +Dialog::Result Dialog::AbortRetry( CString sMessage, CString sID ) { Dialog::Init(); if( LOG ) - LOG->Trace( "Dialog: \"%s\" [%s]", sMessage.c_str(), ID.c_str() ); + LOG->Trace( "Dialog: \"%s\" [%s]", sMessage.c_str(), sID.c_str() ); - if( ID != "" && MessageIsIgnored( ID ) ) - return g_NullDriver.AbortRetry( sMessage, ID ); + if( sID != "" && MessageIsIgnored(sID) ) + return g_NullDriver.AbortRetry( sMessage, sID ); g_bIsShowingDialog = true; // only show Dialog if windowed Dialog::Result ret; if( !g_bWindowed ) - ret = g_NullDriver.AbortRetry( sMessage, ID ); + ret = g_NullDriver.AbortRetry( sMessage, sID ); else - ret = g_pImpl->AbortRetry( sMessage, ID ); // call derived version + ret = g_pImpl->AbortRetry( sMessage, sID ); // call derived version g_bIsShowingDialog = false; diff --git a/stepmania/src/arch/Dialog/Dialog.h b/stepmania/src/arch/Dialog/Dialog.h index e70ef422ec..b6dc0e8118 100644 --- a/stepmania/src/arch/Dialog/Dialog.h +++ b/stepmania/src/arch/Dialog/Dialog.h @@ -12,13 +12,13 @@ namespace Dialog bool IsShowingDialog(); enum Result { abort, retry, ignore }; - void Error( CString error, CString ID = "" ); - void OK( CString sMessage, CString ID = "" ); - Result AbortRetryIgnore( CString sMessage, CString ID = "" ); - Result AbortRetry( CString sMessage, CString ID = "" ); + void Error( CString sError, CString sID = "" ); + void OK( CString sMessage, CString sID = "" ); + Result AbortRetryIgnore( CString sMessage, CString sID = "" ); + Result AbortRetry( CString sMessage, CString sID = "" ); /* for DialogDrivers */ - void IgnoreMessage( CString ID ); + void IgnoreMessage( CString sID ); }; #endif diff --git a/stepmania/src/arch/Dialog/DialogDriver_Win32.cpp b/stepmania/src/arch/Dialog/DialogDriver_Win32.cpp index cba8603ef8..71393b272d 100644 --- a/stepmania/src/arch/Dialog/DialogDriver_Win32.cpp +++ b/stepmania/src/arch/Dialog/DialogDriver_Win32.cpp @@ -20,7 +20,7 @@ static BOOL CALLBACK OKWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara { case WM_INITDIALOG: { - // Disable parent, like a modal MessageBox does. + // Disable the parent window, like a modal MessageBox does. EnableWindow( GetParent(hWnd), FALSE ); // Hide or display "Don't show this message." @@ -65,14 +65,14 @@ static BOOL CALLBACK OKWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara } -void DialogDriver_Win32::OK( CString sMessage, CString ID ) +void DialogDriver_Win32::OK( CString sMessage, CString sID ) { - g_bAllowHush = ID != ""; + g_bAllowHush = sID != ""; g_sMessage = sMessage; AppInstance handle; DialogBox( handle.Get(), MAKEINTRESOURCE(IDD_OK), GraphicsWindow::GetHwnd(), OKWndProc ); if( g_bAllowHush && g_bHush ) - Dialog::IgnoreMessage( ID ); + Dialog::IgnoreMessage( sID ); } static CString g_sErrorString; @@ -90,7 +90,7 @@ static BOOL CALLBACK ErrorWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lP } break; case WM_COMMAND: - switch (LOWORD(wParam)) + switch( LOWORD(wParam) ) { case IDC_BUTTON_VIEW_LOG: { @@ -131,10 +131,11 @@ static BOOL CALLBACK ErrorWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lP return FALSE; } -void DialogDriver_Win32::Error( CString error, CString ID ) +void DialogDriver_Win32::Error( CString sError, CString sID ) { - g_sErrorString = error; - // throw up a pretty error dialog + g_sErrorString = sError; + + // throw up a pretty error dialog AppInstance handle; DialogBox( handle.Get(), MAKEINTRESOURCE(IDD_ERROR_DIALOG), NULL, ErrorWndProc ); } @@ -152,7 +153,7 @@ Dialog::Result DialogDriver_Win32::AbortRetryIgnore( CString sMessage, CString I } } -Dialog::Result DialogDriver_Win32::AbortRetry( CString sMessage, CString ID ) +Dialog::Result DialogDriver_Win32::AbortRetry( CString sMessage, CString sID ) { CString sWindowTitle = WINDOW_TITLE.IsLoaded() ? WINDOW_TITLE.GetValue() : ""; diff --git a/stepmania/src/arch/Dialog/DialogDriver_Win32.h b/stepmania/src/arch/Dialog/DialogDriver_Win32.h index 8f3bc576bd..c93b8a3071 100644 --- a/stepmania/src/arch/Dialog/DialogDriver_Win32.h +++ b/stepmania/src/arch/Dialog/DialogDriver_Win32.h @@ -6,10 +6,10 @@ class DialogDriver_Win32: public DialogDriver { public: - void Error( CString sMessage, CString ID ); - void OK( CString sMessage, CString ID ); - Dialog::Result AbortRetryIgnore( CString sMessage, CString ID ); - Dialog::Result AbortRetry( CString sMessage, CString ID ); + void Error( CString sMessage, CString sID ); + void OK( CString sMessage, CString sID ); + Dialog::Result AbortRetryIgnore( CString sMessage, CString sID ); + Dialog::Result AbortRetry( CString sMessage, CString sID ); }; #define USE_DIALOG_DRIVER_WIN32