From ae5f3eeaf91671fd69f64a8a5ba216687da434ae Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Thu, 14 Jul 2005 01:47:47 +0000
Subject: [PATCH] move ThemeMetricEnum into ThemeMetric.h, add default
 constructor

---
 stepmania/src/CommonMetrics.h |  8 --------
 stepmania/src/ThemeMetric.h   | 10 ++++++++++
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/stepmania/src/CommonMetrics.h b/stepmania/src/CommonMetrics.h
index 88b1f0e092..7c5c257b9b 100644
--- a/stepmania/src/CommonMetrics.h
+++ b/stepmania/src/CommonMetrics.h
@@ -39,14 +39,6 @@ public:
 private:
 	vector<StepsType> m_v;
 };
-template <class T>
-class ThemeMetricEnum : public ThemeMetric<int>
-{
-public:
-	ThemeMetricEnum( const CString& sGroup, const CString& sName ) : ThemeMetric<int>(sGroup,sName) {}
-	T GetValue() const { return (T)ThemeMetric<int>::GetValue(); }
-	bool operator ==( T other ) const { return GetValue() == other; }
-};
 
 
 //
diff --git a/stepmania/src/ThemeMetric.h b/stepmania/src/ThemeMetric.h
index 2ed0e32487..fe31b4db1a 100644
--- a/stepmania/src/ThemeMetric.h
+++ b/stepmania/src/ThemeMetric.h
@@ -216,6 +216,16 @@ public:
 	}
 };
 
+template <class T>
+class ThemeMetricEnum : public ThemeMetric<int>
+{
+public:
+	ThemeMetricEnum() : ThemeMetric<int>() {}
+	ThemeMetricEnum( const CString& sGroup, const CString& sName ) : ThemeMetric<int>(sGroup,sName) {}
+	T GetValue() const { return (T)ThemeMetric<int>::GetValue(); }
+	bool operator ==( T other ) const { return GetValue() == other; }
+};
+
 /* Like ThemeMetric, but evaluates Lua expressions each time.  This is fast,
  * since we only compile the expression once, but not as fast as ThemeMetric. */
 template <class T>