X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftime%2Fdatetime.cpp;h=c77796f7bc0bd8c8cd378d739fb5a458f006a491;hb=87edba02a23b1338934e36fac407966b25fcf811;hp=7fa8ceefbac56c0ac5b7507906ff15b0df1f8d31;hpb=c8c97ab483cfbf1bb3d0788cf729be92091ba2fc;p=libs%2Fcore.git diff --git a/source/time/datetime.cpp b/source/time/datetime.cpp index 7fa8cee..c77796f 100644 --- a/source/time/datetime.cpp +++ b/source/time/datetime.cpp @@ -1,16 +1,8 @@ -/* $Id$ - -This file is part of libmspcore -Copyright © 2006 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - #include #include #include #include "datetime.h" #include "timestamp.h" -#include "units.h" using namespace std; @@ -128,7 +120,7 @@ void DateTime::add_days(int days) } // Fudge factor for leap day - int fudge = (month<=2)?1:0; + int fudge = (month<=2) ? 1 : 0; // (Almost) every 4 year cycle has 1 leap year and 3 normal years unsigned cycles = days/1461; @@ -155,7 +147,7 @@ void DateTime::add_days(int days) // We passed a leap year - decrement days if(days==0) { - days = is_leap_year(new_year-fudge)?365:364; + days = is_leap_year(new_year-fudge) ? 365 : 364; --new_year; } else @@ -313,10 +305,10 @@ void DateTime::add_raw(RawTime raw) raw += 86400000000LL; } - usec+=raw%1000000; raw /= 1000000; - second+=raw%60; raw /= 60; - minute+=raw%60; raw /= 60; - hour+=raw%24; raw /= 24; + usec += raw%1000000; raw /= 1000000; + second += raw%60; raw /= 60; + minute += raw%60; raw /= 60; + hour += raw%24; raw /= 24; add_days(days); normalize();