X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Ftime.cpp;h=ebaacdf274046512d2eb6ff3c56eb6f14ef584d4;hb=28f28705612902c15cd0702cc891fba35bf2d2df;hp=e2256330d41ddce8afb3b3870d44529799297eed;hpb=2c43cbfff01496919316f600ee76112be551392d;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/time.cpp b/synfig-core/trunk/src/synfig/time.cpp index e225633..ebaacdf 100644 --- a/synfig-core/trunk/src/synfig/time.cpp +++ b/synfig-core/trunk/src/synfig/time.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file time.cpp ** \brief Template File ** @@ -59,7 +59,7 @@ extern "C" { int _isnan(double x); } using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; #define tolower ::tolower @@ -104,7 +104,7 @@ Time::Time(const String &str_, float fps): // to warn about units if the value is zero // it is the only case where units are irrelevant. if(amount!=0) - sinfg::warning("Time(): No unit provided in time code, assuming SECONDS (\"%s\")",str.c_str()); + synfig::warning("Time(): No unit provided in time code, assuming SECONDS (\"%s\")",str.c_str()); value_+=amount; return; } @@ -127,7 +127,7 @@ Time::Time(const String &str_, float fps): if(fps) value_+=amount/fps; else - sinfg::warning("Time(): Individual frames referenced, but frame rate is unknown"); + synfig::warning("Time(): Individual frames referenced, but frame rate is unknown"); break; case ':': // try to read it in as a traditional time format @@ -146,12 +146,12 @@ Time::Time(const String &str_, float fps): return; } } - sinfg::warning("Time(): Bad time format"); + synfig::warning("Time(): Bad time format"); break; default: value_+=amount; - sinfg::warning("Time(): Unexpected character '%c' when parsing time string \"%s\"",str[pos],str.c_str()); + synfig::warning("Time(): Unexpected character '%c' when parsing time string \"%s\"",str[pos],str.c_str()); break; } pos++;