Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-core / trunk / src / synfig / keyframe.cpp

diff --git a/synfig-core/trunk/src/synfig/keyframe.cpp b/synfig-core/trunk/src/synfig/keyframe.cpp
index b776a3e..baade29 100644 (file)
--- a/synfig-core/trunk/src/synfig/keyframe.cpp
+++ b/synfig-core/trunk/src/synfig/keyframe.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!    \file keyframe.cpp
 **     \brief Template File
 **
-**     $Id: keyframe.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $
+**     $Id$
 **
 **     \legal
-**     Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-**     This software and associated documentation
-**     are CONFIDENTIAL and PROPRIETARY property of
-**     the above-mentioned copyright holder.
+**     This package is free software; you can redistribute it and/or
+**     modify it under the terms of the GNU General Public License as
+**     published by the Free Software Foundation; either version 2 of
+**     the License, or (at your option) any later version.
 **
-**     You may not copy, print, publish, or in any
-**     other way distribute this software without
-**     a prior written agreement with
-**     the copyright holder.
+**     This package is distributed in the hope that it will be useful,
+**     but WITHOUT ANY WARRANTY; without even the implied warranty of
+**     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**     General Public License for more details.
 **     \endlegal
 */
 /* ========================================================================= */
@@ -43,7 +44,7 @@
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 
 /* === M A C R O S ========================================================= */
 
@@ -72,24 +73,22 @@ KeyframeList::dump()const
 {
        const_iterator iter;
        int i;
-       sinfg::info(">>>>>>>>BEGIN KEYFRAME DUMP");
+       synfig::info(">>>>>>>>BEGIN KEYFRAME DUMP");
        for(iter=begin(),i=0;iter!=end();++iter,i++)
        {
-               sinfg::info("#%d, time: %s, desc: %s",i,iter->get_time().get_string().c_str(),iter->get_description().c_str());
+               synfig::info("#%d, time: %s, desc: %s",i,iter->get_time().get_string().c_str(),iter->get_description().c_str());
        }
-       sinfg::info("<<<<<<<<END KEYFRAME DUMP");
+       synfig::info("<<<<<<<<END KEYFRAME DUMP");
 }
 
 void
 KeyframeList::sync()
 {
-       //DEBUGPOINT();
-       //sinfg::info("PRE-SORT:");
-       //dump();       
+       //synfig::info("PRE-SORT:");
+       //dump();
        sort(begin(),end());
-       //sinfg::info("POST-SORT:");
+       //synfig::info("POST-SORT:");
        //dump();
-       //DEBUGPOINT();
 }
 
 KeyframeList::iterator
@@ -163,7 +162,7 @@ KeyframeList::find_next(const Time &x)
 */
                }
        }
-       
+
        throw Exception::NotFound(strprintf("KeyframeList::find(): Can't find next Keyframe %s",x.get_string().c_str()));
 }
 
@@ -220,7 +219,7 @@ KeyframeList::find_prev_next(const Time& time, Time &prev, Time &next)const
 void
 KeyframeList::insert_time(const Time& location, const Time& delta)
 {
-//     sinfg::info("KeyframeList::insert_time(): loc=%s, delta=%s",location.get_string().c_str(),delta.get_string().c_str());
+//     synfig::info("KeyframeList::insert_time(): loc=%s, delta=%s",location.get_string().c_str(),delta.get_string().c_str());
        if(!delta)
                return;
        try