Revert partially (auto) "reformat code! now the code is only ugly on the *inside*"

[xonotic/netradiant.git] / radiant / timer.h

diff --git a/radiant/timer.h b/radiant/timer.h
index 59d171d840d66791e193288d06ff6535389169a7..53280a8ca81d17aadf2c34d5a31fab58cb92d204 100644 (file)
--- a/radiant/timer.h
+++ b/radiant/timer.h
@@ -26,31 +26,25 @@
 
 const int msec_per_sec = 1000;
 
-class MillisecondTime {
-    unsigned int m_milliseconds;
+class MillisecondTime
+{
+unsigned int m_milliseconds;
 public:
-    MillisecondTime(unsigned int milliseconds)
-            : m_milliseconds(milliseconds)
-    {
-    }
-
-    MillisecondTime()
-    {
-    }
-
-    static MillisecondTime current();
+MillisecondTime( unsigned int milliseconds )
+       : m_milliseconds( milliseconds ){
+}
+MillisecondTime(){
+}
+static MillisecondTime current();
 
-    unsigned int milliseconds_since(const MillisecondTime &other) const
-    {
-        return m_milliseconds - other.m_milliseconds;
-    }
+unsigned int milliseconds_since( const MillisecondTime& other ) const {
+       return m_milliseconds - other.m_milliseconds;
+}
 };
 
 template<typename tick_type>
-inline MillisecondTime time_from_ticks(tick_type tick_count, tick_type ticks_per_sec)
-{
-    return MillisecondTime(
-            static_cast<unsigned int>( tick_count / static_cast<double>( ticks_per_sec / msec_per_sec )));
+inline MillisecondTime time_from_ticks( tick_type tick_count, tick_type ticks_per_sec ){
+       return MillisecondTime( static_cast<unsigned int>( tick_count / static_cast<double>( ticks_per_sec / msec_per_sec ) ) );
 }
 
 #else
@@ -63,39 +57,37 @@ unsigned int m_sec;
 unsigned int m_usec;
 public:
 MillisecondTime( unsigned int sec, unsigned int usec )
-    : m_sec( sec ), m_usec( usec ){
+       : m_sec( sec ), m_usec( usec ){
 }
 MillisecondTime(){
 }
 staticMillisecondTime current();
 
 unsigned int milliseconds_since( const MillisecondTime& other ) const {
-    return static_cast<unsigned int>( ( m_sec * static_cast<double>( usec_per_sec ) + m_usec )
-                                      - ( other.m_sec * static_cast<double>( usec_per_sec ) + other.m_usec ) ) / 1000;
+       return static_cast<unsigned int>( ( m_sec * static_cast<double>( usec_per_sec ) + m_usec )
+                                                                         - ( other.m_sec * static_cast<double>( usec_per_sec ) + other.m_usec ) ) / 1000;
 }
 };
 
 template<typename tick_type>
 inline MillisecondTime time_from_ticks( tick_type tick_count, tick_type ticks_per_sec ){
-    return MillisecondTime( static_cast<unsigned int>( tick_count / ticks_per_sec ),
-                            static_cast<unsigned int>( ( tick_count % ticks_per_sec ) * ( usec_per_sec / static_cast<double>( ticks_per_sec ) ) ) );
+       return MillisecondTime( static_cast<unsigned int>( tick_count / ticks_per_sec ),
+                                                       static_cast<unsigned int>( ( tick_count % ticks_per_sec ) * ( usec_per_sec / static_cast<double>( ticks_per_sec ) ) ) );
 }
 
 #endif
 
-class Timer {
-    MillisecondTime m_start;
+class Timer
+{
+MillisecondTime m_start;
 
 public:
-    void start()
-    {
-        m_start = MillisecondTime::current();
-    }
-
-    unsigned int elapsed_msec()
-    {
-        return MillisecondTime::current().milliseconds_since(m_start);
-    }
+void start(){
+       m_start = MillisecondTime::current();
+}
+unsigned int elapsed_msec(){
+       return MillisecondTime::current().milliseconds_since( m_start );
+}
 };
 
 #endif