Changeset 261

Timestamp:

01/06/10 09:59:20 (8 months ago)

Author:

deu

Message:

CLOSED - issue QREST-15: Move to Constants
 http://requests.wardsback.org/browse/QREST-15

Location:

branches/v0.5/src

Files:

• constants.h (modified) (1 diff)
• model/document.cpp (modified) (2 diffs)
• model/document.h (modified) (1 diff)

branches/v0.5/src/constants.h

@@ -79 +79 @@
     static const int STATUSBAR_TEMP_TIMEOUT = 1500;
 
+    //Constants used for default tempo value and limits
+
+    /** Default tempo for app startup */
+    static const double TEMPO_DEFAULT = 60.0;
+    /** Minimum allowed tempo as input. */
+    static const double TEMPO_MIN = 1.0;
+    /** Maximum allowed tempo as input. */
+    static const double TEMPO_MAX = 999.0;
+
 };
 

branches/v0.5/src/model/document.cpp

@@ -30 +30 @@
 
 Document::Document() :
-    _tempo(TEMPO_DEFAULT), _steady(true), _steadiness(FULL_STEADINESS),
+    _tempo(Constants::TEMPO_DEFAULT), _steady(true), _steadiness(FULL_STEADINESS),
             _tempoFromTap(false), _multiplier(MULTIPLIER_PLAIN) {
 
@@ -74 +74 @@
 void Document::setTempo(const double tempo) {
 
-    if ((TEMPO_MIN <= tempo && tempo <= TEMPO_MAX)) {
+    if ((Constants::TEMPO_MIN <= tempo && tempo <= Constants::TEMPO_MAX)) {
 
         _tempo = tempo;

branches/v0.5/src/model/document.h

@@ -237 +237 @@
     static const int DELAYS_COUNT = 6;
 
-    //Constants used for default tempo value and limits
-
-    /** Default tempo for app startup */
-    static const double TEMPO_DEFAULT = 60.0;
-    /** Minimum allowed tempo as input. */
-    static const double TEMPO_MIN = 1.0;
-    /** Maximum allowed tempo as input. */
-    static const double TEMPO_MAX = 999.0;
-
     /** complete steadiness is expressed as 1 as a double */
     static const double FULL_STEADINESS = 1.0;