From 50ca6633cb7604a9a6b93b9912fb031bb445c961 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 17 Dec 2006 07:33:09 +0000 Subject: [PATCH] cleanup --- stepmania/src/arch/Dialog/Dialog.cpp | 3 +-- stepmania/src/arch/Dialog/DialogDriver.cpp | 2 +- stepmania/src/arch/Dialog/DialogDriver.h | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/stepmania/src/arch/Dialog/Dialog.cpp b/stepmania/src/arch/Dialog/Dialog.cpp index 7d75d7547e..4a2aedf99f 100644 --- a/stepmania/src/arch/Dialog/Dialog.cpp +++ b/stepmania/src/arch/Dialog/Dialog.cpp @@ -6,7 +6,6 @@ #endif #include "RageUtil.h" #include "RageLog.h" -#include "arch/arch.h" #include "RageThreads.h" #if !defined(SMPACKAGE) @@ -27,7 +26,7 @@ void Dialog::Init() if( g_pImpl != NULL ) return; - g_pImpl = MakeDialogDriver(); + g_pImpl = DialogDriver::Create(); /* DialogDriver_Null should have worked, at least. */ ASSERT( g_pImpl != NULL ); diff --git a/stepmania/src/arch/Dialog/DialogDriver.cpp b/stepmania/src/arch/Dialog/DialogDriver.cpp index 6e5b99d11c..0b67096f66 100644 --- a/stepmania/src/arch/Dialog/DialogDriver.cpp +++ b/stepmania/src/arch/Dialog/DialogDriver.cpp @@ -15,7 +15,7 @@ RegisterDialogDriver::RegisterDialogDriver( const istring &sName, CreateDialogDr REGISTER_DIALOG_DRIVER_CLASS( Null ); -DialogDriver *MakeDialogDriver() +DialogDriver *DialogDriver::Create() { RString sDrivers = "win32,cocoa,null"; vector asDriversToTry; diff --git a/stepmania/src/arch/Dialog/DialogDriver.h b/stepmania/src/arch/Dialog/DialogDriver.h index 198b93c2a9..549f96e347 100644 --- a/stepmania/src/arch/Dialog/DialogDriver.h +++ b/stepmania/src/arch/Dialog/DialogDriver.h @@ -7,6 +7,8 @@ class DialogDriver { public: + static DialogDriver *Create(); + virtual void Error( RString sMessage, RString sID ) { printf("Error: %s\n", sMessage.c_str()); } virtual void OK( RString sMessage, RString sID ) {} virtual Dialog::Result AbortRetryIgnore( RString sMessage, RString sID ) { return Dialog::ignore; }