big batch of changes

[chaz/yoink] / src / Moof / Timer.hh

diff --git a/src/Moof/Timer.hh b/src/Moof/Timer.hh
index ed4e2f0bf3a1b59def8fabfb5d999dafee234e88..bb0b48334c6b24cab36f8a8e4328f5e8b80186ea 100644 (file)
--- a/src/Moof/Timer.hh
+++ b/src/Moof/Timer.hh
@@ -45,8 +45,10 @@
 namespace Mf {
 
 
-struct Timer
+class Timer
 {
+public:
+
        enum Mode
        {
                INVALID         = -1,
@@ -105,7 +107,7 @@ struct Timer
 
        static Scalar getNextFire()
        {
-               return nextFire_;
+               return gNextFire;
        }
 
        static void fireIfExpired(Scalar t);
@@ -121,8 +123,8 @@ private:
        Scalar          mInterval;
        unsigned        mId;
 
-       static Scalar                                           nextFire_;
-       static std::map<unsigned,Timer&>        timers_;
+       static Scalar                                           gNextFire;
+       static std::map<unsigned,Timer&>        gTimers;
 };