From eac521e34ab560cf1176d100adc1b382e88ea7e1 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Tue, 10 Apr 2007 17:51:21 +0000
Subject: [PATCH] DynamicThemeMetric -> ThemeMetric

---
 stepmania/src/CommonMetrics.cpp | 2 +-
 stepmania/src/CommonMetrics.h   | 2 +-
 stepmania/src/GameState.cpp     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/stepmania/src/CommonMetrics.cpp b/stepmania/src/CommonMetrics.cpp
index 81adb87dc4..8ba4963e8e 100644
--- a/stepmania/src/CommonMetrics.cpp
+++ b/stepmania/src/CommonMetrics.cpp
@@ -11,7 +11,7 @@
 
 static RString PLAYER_COLOR_NAME( size_t p ) { return ssprintf("ColorP%dCommand",int(p+1)); }
 
-DynamicThemeMetric<RString>		CommonMetrics::INITIAL_SCREEN			("Common","InitialScreen");
+ThemeMetric<RString>			CommonMetrics::INITIAL_SCREEN			("Common","InitialScreen");
 ThemeMetric<RString>			CommonMetrics::FIRST_ATTRACT_SCREEN		("Common","FirstAttractScreen");
 ThemeMetric<RString>			CommonMetrics::DEFAULT_MODIFIERS		("Common","DefaultModifiers" );
 ThemeMetric<RString>			CommonMetrics::DEFAULT_CPU_MODIFIERS		("Common","DefaultCpuModifiers" );
diff --git a/stepmania/src/CommonMetrics.h b/stepmania/src/CommonMetrics.h
index 3835495fd9..8c4e87b6b1 100644
--- a/stepmania/src/CommonMetrics.h
+++ b/stepmania/src/CommonMetrics.h
@@ -50,7 +50,7 @@ private:
 //
 namespace CommonMetrics
 {
-	extern DynamicThemeMetric<RString>		INITIAL_SCREEN;
+	extern ThemeMetric<RString>			INITIAL_SCREEN;
 	extern ThemeMetric<RString>			FIRST_ATTRACT_SCREEN;
 	extern ThemeMetric<RString>			DEFAULT_MODIFIERS;
 	extern ThemeMetric<RString>			DEFAULT_CPU_MODIFIERS;
diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index 7ea7224953..db033d07e0 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -97,8 +97,8 @@ Song* GameState::GetDefaultSong() const
 static const ThemeMetric<Grade> GRADE_TIER_FOR_EXTRA_1 ("GameState","GradeTierForExtra1");
 static const ThemeMetric<Grade> GRADE_TIER_FOR_EXTRA_2 ("GameState","GradeTierForExtra2");
 
-static DynamicThemeMetric<bool> ARE_STAGE_PLAYER_MODS_FORCED( "GameState","AreStagePlayerModsForced" );
-static DynamicThemeMetric<bool> ARE_STAGE_SONG_MODS_FORCED( "GameState","AreStageSongModsForced" );
+static ThemeMetric<bool> ARE_STAGE_PLAYER_MODS_FORCED( "GameState","AreStagePlayerModsForced" );
+static ThemeMetric<bool> ARE_STAGE_SONG_MODS_FORCED( "GameState","AreStageSongModsForced" );
 
 static Preference<Premium> g_Premium( "Premium", Premium_Off );