actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[sm130futures] Remove constructor hiding warning.

Browse Source 
We had a struct called "Theme" that was throwing things off.
This commit is contained in:
Jason Felds
2011-05-04 17:24:03 -04:00
parent 1e6a4d4ef0
commit 4e8b475377
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScreenOptionsMasterPrefs.cpp
+2 -2
View File
@@ -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; vector<RString> choices;
pConfOption->MakeOptionsList( choices ); pConfOption->MakeOptionsList( choices );
@@ -653,7 +653,7 @@ static void InitializeConfOptions()
// Appearance options // Appearance options
ADD( ConfOption( "Language", Language, LanguageChoices ) ); ADD( ConfOption( "Language", Language, LanguageChoices ) );
ADD( ConfOption( "Theme", Theme, ThemeChoices ) ); ADD( ConfOption( "Theme", RequestedTheme, ThemeChoices ) );
g_ConfOptions.back().m_iEffects = OPT_APPLY_THEME; g_ConfOptions.back().m_iEffects = OPT_APPLY_THEME;
ADD( ConfOption( "Announcer", Announcer, AnnouncerChoices ) ); ADD( ConfOption( "Announcer", Announcer, AnnouncerChoices ) );