minor refactoring and state progress

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

diff --git a/src/Moof/Timer.hh b/src/Moof/Timer.hh
index 6c1af5615a6426913eac86788a46b9e02116bbd4..ed4e2f0bf3a1b59def8fabfb5d999dafee234e88 100644 (file)
--- a/src/Moof/Timer.hh
+++ b/src/Moof/Timer.hh
@@ -59,7 +59,7 @@ struct Timer
 
 
        Timer() :
-               mode_(INVALID) {}
+               mMode(INVALID) {}
 
        Timer(const Function& function, Scalar seconds, Mode mode = NORMAL)
        {
@@ -115,11 +115,11 @@ private:
        static unsigned getNewID();
        static Scalar findNextFire();
 
-       Function        function_;
-       Mode            mode_;
-       Scalar          absolute_;
-       Scalar          interval_;
-       unsigned        id_;
+       Function        mFunction;
+       Mode            mMode;
+       Scalar          mAbsolute;
+       Scalar          mInterval;
+       unsigned        mId;
 
        static Scalar                                           nextFire_;
        static std::map<unsigned,Timer&>        timers_;