From 77b0f48bf002a8343ecaba53e952d6333f456424 Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Sat, 22 May 2010 10:05:25 -0500
Subject: [PATCH] Small wheel-related cleanups

---
 src/MusicWheel.h    | 10 +++++-----
 src/WheelBase.h     |  2 +-
 src/WheelItemBase.h | 12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/MusicWheel.h b/src/MusicWheel.h
index e6c1791d3e..cae7e80db4 100644
--- a/src/MusicWheel.h
+++ b/src/MusicWheel.h
@@ -23,8 +23,8 @@ public:
 	virtual void Load( RString sType );
 	void BeginScreen();
 
-	bool ChangeSort( SortOrder new_so );		// return true if change successful
-	bool NextSort();				// return true if change successful
+	bool ChangeSort( SortOrder new_so );	// return true if change successful
+	bool NextSort();						// return true if change successful
 	void StartRoulette();
 	void StartRandom();
 	bool IsRouletting() const;
@@ -71,15 +71,15 @@ protected:
 	ThemeMetric<float>		ROULETTE_SWITCH_SECONDS;
 	ThemeMetric<int>		ROULETTE_SLOW_DOWN_SWITCHES;
 	ThemeMetric<int>		NUM_SECTION_COLORS;
-	ThemeMetric<RageColor>		SONG_REAL_EXTRA_COLOR;
-	ThemeMetric<RageColor>		SORT_MENU_COLOR;
+	ThemeMetric<RageColor>	SONG_REAL_EXTRA_COLOR;
+	ThemeMetric<RageColor>	SORT_MENU_COLOR;
 	ThemeMetric<bool>		SHOW_ROULETTE;
 	ThemeMetric<bool>		SHOW_RANDOM;
 	ThemeMetric<bool>		SHOW_PORTAL;
 	ThemeMetric<bool>		RANDOM_PICKS_LOCKED_SONGS;
 	ThemeMetric<int>		MOST_PLAYED_SONGS_TO_SHOW;
 	ThemeMetric<int>		RECENT_SONGS_TO_SHOW;
-	ThemeMetric<RString>		MODE_MENU_CHOICE_NAMES;
+	ThemeMetric<RString>	MODE_MENU_CHOICE_NAMES;
 	ThemeMetricMap<RString>		CHOICE;
 	ThemeMetric1D<RageColor>	SECTION_COLORS;
 	ThemeMetric<LuaReference>	SORT_ORDERS;
diff --git a/src/WheelBase.h b/src/WheelBase.h
index fbb7dde0ca..d6149f638c 100644
--- a/src/WheelBase.h
+++ b/src/WheelBase.h
@@ -30,7 +30,7 @@ public:
 	virtual void ChangeMusic(int dist); /* +1 or -1 */
 	virtual void SetOpenSection( RString group ) { }
 
-	/* Return true if we're moving fast automatically. */
+	// Return true if we're moving fast automatically.
 	int IsMoving() const;
 	bool IsSettled() const;
 
diff --git a/src/WheelItemBase.h b/src/WheelItemBase.h
index e6ac85ab01..7021b18614 100644
--- a/src/WheelItemBase.h
+++ b/src/WheelItemBase.h
@@ -28,9 +28,9 @@ struct WheelItemBaseData
 	WheelItemBaseData() {}
 	WheelItemBaseData( WheelItemDataType type, RString sText, RageColor color );
 	virtual ~WheelItemBaseData() {}
-	WheelItemDataType	m_Type;
-	RString			m_sText;
-	RageColor		m_color;	// either text color or section background color
+	WheelItemDataType m_Type;
+	RString		m_sText;
+	RageColor	m_color;	// either text color or section background color
 };
 
 class WheelItemBase : public ActorFrame
@@ -47,15 +47,15 @@ public:
 
 	virtual void LoadFromWheelItemData( const WheelItemBaseData* pWID, int iIndex, bool bHasFocus, int iDrawIndex );
 
-	RageColor	m_colorLocked;
+	RageColor m_colorLocked;
 
 protected:
 	void SetGrayBar( Actor *pBar ) { m_pGrayBar = pBar; }
 
 	const WheelItemBaseData* m_pData;
-	bool m_bExpanded;	// if TYPE_SECTION, whether this section is expanded
+	bool m_bExpanded; // if TYPE_SECTION whether this section is expanded
 
-	Actor*		m_pGrayBar;
+	Actor* m_pGrayBar;
 };
 
 #endif