From 4e8b475377e1232ee0e6757c62a54a746ff554c8 Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Wed, 4 May 2011 17:24:03 -0400
Subject: [PATCH] [sm130futures] Remove constructor hiding warning.

We had a struct called "Theme" that was throwing things off.
---
 src/ScreenOptionsMasterPrefs.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ScreenOptionsMasterPrefs.cpp b/src/ScreenOptionsMasterPrefs.cpp
index 5495de6f86..347ecf041d 100644
--- a/src/ScreenOptionsMasterPrefs.cpp
+++ b/src/ScreenOptionsMasterPrefs.cpp
@@ -264,7 +264,7 @@ static void DisplayResolutionChoices( vector<RString> &out )
 	}
 }
 
-static void Theme( int &sel, bool ToSel, const ConfOption *pConfOption )
+static void RequestedTheme( int &sel, bool ToSel, const ConfOption *pConfOption )
 {
 	vector<RString> choices;
 	pConfOption->MakeOptionsList( choices );
@@ -653,7 +653,7 @@ static void InitializeConfOptions()
 
 	// Appearance options
 	ADD( ConfOption( "Language",			Language,		LanguageChoices ) );
-	ADD( ConfOption( "Theme",			Theme,			ThemeChoices ) );
+	ADD( ConfOption( "Theme",			RequestedTheme,		ThemeChoices ) );
 	g_ConfOptions.back().m_iEffects = OPT_APPLY_THEME;
 
 	ADD( ConfOption( "Announcer",			Announcer,		AnnouncerChoices ) );