From 56654496ef1b662b51cca8ec255d8927a9fca19e Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Fri, 27 Feb 2004 00:56:51 +0000
Subject: [PATCH] name cleanup "foo() ;" cleanup (itchy spacebar?)

---
 stepmania/src/PrefsManager.cpp |  6 +++---
 stepmania/src/PrefsManager.h   | 10 +++++-----
 stepmania/src/RageLog.cpp      | 16 ++++++++--------
 stepmania/src/RageLog.h        |  7 +++----
 stepmania/src/StepMania.cpp    |  4 ++--
 5 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp
index b885a1285b..450be1dc51 100644
--- a/stepmania/src/PrefsManager.cpp
+++ b/stepmania/src/PrefsManager.cpp
@@ -258,7 +258,7 @@ PrefsManager::PrefsManager()
 
 	m_sCoursesToShowRanking = "";
 
-	m_bLogging = true;
+	m_bLogToDisk = true;
 	m_bForceLogFlush = false;
 #ifdef DEBUG
 	m_bShowLogOutput = true;
@@ -502,7 +502,7 @@ void PrefsManager::ReadGlobalPrefsFromDisk()
 	FixSlashesInPlace(m_sAdditionalSongFolders);
 	FixSlashesInPlace(m_sAdditionalFolders);
 
-	ini.GetValue( "Debug", "Logging",							m_bLogging );
+	ini.GetValue( "Debug", "LogToDisk",							m_bLogToDisk );
 	ini.GetValue( "Debug", "ForceLogFlush",						m_bForceLogFlush );
 	ini.GetValue( "Debug", "ShowLogOutput",						m_bShowLogOutput );
 	ini.GetValue( "Debug", "Timestamping",						m_bTimestamping );
@@ -726,7 +726,7 @@ void PrefsManager::SaveGlobalPrefsToDisk() const
 	ini.SetValue( "Options", "AdditionalSongFolders", 			m_sAdditionalSongFolders);
 	ini.SetValue( "Options", "AdditionalFolders", 				m_sAdditionalFolders);
 
-	ini.SetValue( "Debug", "Logging",							m_bLogging );
+	ini.SetValue( "Debug", "LogToDisk",							m_bLogToDisk );
 	ini.SetValue( "Debug", "ForceLogFlush",						m_bForceLogFlush );
 	ini.SetValue( "Debug", "ShowLogOutput",						m_bShowLogOutput );
 	ini.SetValue( "Debug", "Timestamping",						m_bTimestamping );
diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h
index f9450b5bb7..91baaad751 100644
--- a/stepmania/src/PrefsManager.h
+++ b/stepmania/src/PrefsManager.h
@@ -39,10 +39,10 @@ public:
 	bool			m_bInterlaced;
 #ifdef _XBOX
 	bool			m_bPAL;
-	float			m_fScreenPosX ;
-	float			m_fScreenPosY ;
-	float			m_fScreenWidth ;
-	float			m_fScreenHeight ;
+	float			m_fScreenPosX;
+	float			m_fScreenPosY;
+	float			m_fScreenWidth;
+	float			m_fScreenHeight;
 #endif
 	bool			m_bDelayedTextureDelete;
 	bool			m_bTexturePreload;
@@ -239,7 +239,7 @@ public:
 	CString			m_sCoursesToShowRanking;
 
 	/* Debug: */
-	bool			m_bLogging;
+	bool			m_bLogToDisk;
 	bool			m_bForceLogFlush;
 	bool			m_bShowLogOutput;
 	bool			m_bTimestamping;
diff --git a/stepmania/src/RageLog.cpp b/stepmania/src/RageLog.cpp
index ae1f32e0ed..362dee3657 100644
--- a/stepmania/src/RageLog.cpp
+++ b/stepmania/src/RageLog.cpp
@@ -101,7 +101,7 @@ RageLog::RageLog()
 	
 	g_Mutex = new RageMutex;
 
-	m_bEnabled = true;
+	m_bLogToDisk = true;
 	m_bFlush = false;
 	m_bTimestamping = false;
 	m_bShowLogOutput = false;
@@ -147,7 +147,7 @@ RageLog::~RageLog()
 	}
 
 	Flush();
-	ShowLogOutput( false );
+	SetShowLogOutput( false );
 	g_fileLog->Close();
 	g_fileInfo->Close();
 
@@ -160,9 +160,9 @@ RageLog::~RageLog()
 	g_fileInfo = NULL;
 }
 
-void RageLog::SetLogging( bool b )
+void RageLog::SetLogToDisk( bool b )
 {
-	m_bEnabled = b;
+	m_bLogToDisk = b;
 }
 
 void RageLog::SetFlushing( bool b )
@@ -176,7 +176,7 @@ void RageLog::SetTimestamping( bool b )
 }
 
 /* Enable or disable display of output to stdout, or a console window in Windows. */
-void RageLog::ShowLogOutput( bool show )
+void RageLog::SetShowLogOutput( bool show )
 {
 	m_bShowLogOutput = show;
 
@@ -197,7 +197,7 @@ void RageLog::ShowLogOutput( bool show )
 
 void RageLog::Trace( const char *fmt, ...)
 {
-	if( !m_bEnabled )
+	if( !m_bLogToDisk )
 		return;
 
     va_list	va;
@@ -212,7 +212,7 @@ void RageLog::Trace( const char *fmt, ...)
  * in crash dumps. */
 void RageLog::Info( const char *fmt, ...)
 {
-	if( !m_bEnabled )
+	if( !m_bLogToDisk )
 		return;
 
     va_list	va;
@@ -225,7 +225,7 @@ void RageLog::Info( const char *fmt, ...)
 
 void RageLog::Warn( const char *fmt, ...)
 {
-	if( !m_bEnabled )
+	if( !m_bLogToDisk )
 		return;
 
     va_list	va;
diff --git a/stepmania/src/RageLog.h b/stepmania/src/RageLog.h
index abbcb09d4e..24b899f389 100644
--- a/stepmania/src/RageLog.h
+++ b/stepmania/src/RageLog.h
@@ -23,8 +23,6 @@ public:
 	void Info( const char *fmt, ...) PRINTF(2,3);
 	void Flush();
 
-	void ShowLogOutput( bool show );
-
 	void MapLog( const CString &key, const char *fmt, ... ) PRINTF(3,4);
 	void UnmapLog( const CString &key );
 
@@ -33,12 +31,13 @@ public:
 	/* Returns NULL if past the last recent log. */
 	static const char *GetRecentLog( int n );
 
-	void SetLogging( bool b );	// enable or disable logging
+	void SetShowLogOutput( bool show ); // enable or disable logging to stdout
+	void SetLogToDisk( bool b );	// enable or disable logging to file
 	void SetFlushing( bool b );	// enable or disable flushing
 	void SetTimestamping( bool b );	// enable or disable timestamping
 
 private:
-	bool m_bEnabled;
+	bool m_bLogToDisk;
 	bool m_bFlush;
 	bool m_bTimestamping;
 	bool m_bShowLogOutput;
diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp
index a345892ed3..98f05e65ed 100644
--- a/stepmania/src/StepMania.cpp
+++ b/stepmania/src/StepMania.cpp
@@ -923,8 +923,8 @@ int main(int argc, char* argv[])
 	//
 	GAMESTATE	= new GameState;
 
-	LOG->ShowLogOutput( PREFSMAN->m_bShowLogOutput );
-	LOG->SetLogging( PREFSMAN->m_bLogging );
+	LOG->SetShowLogOutput( PREFSMAN->m_bShowLogOutput );
+	LOG->SetLogToDisk( PREFSMAN->m_bLogToDisk );
 	LOG->SetFlushing( PREFSMAN->m_bForceLogFlush );
 	LOG->SetTimestamping( PREFSMAN->m_bTimestamping );
 	Checkpoints::LogCheckpoints( PREFSMAN->m_bLogCheckpoints );