Remove .gitignore do nothing is ignored.

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

diff --git a/synfig-core/trunk/src/synfig/keyframe.h b/synfig-core/trunk/src/synfig/keyframe.h
index 0639898..d8f9bf7 100644 (file)
--- a/synfig-core/trunk/src/synfig/keyframe.h
+++ b/synfig-core/trunk/src/synfig/keyframe.h
@@ -1,28 +1,29 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!    \file keyframe.h
 **     \brief Template Header
 **
-**     $Id: keyframe.h,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
 */
 /* ========================================================================= */
 
 /* === S T A R T =========================================================== */
 
-#ifndef __SINFG_KEYFRAME_H
-#define __SINFG_KEYFRAME_H
+#ifndef __SYNFIG_KEYFRAME_H
+#define __SYNFIG_KEYFRAME_H
 
 /* === H E A D E R S ======================================================= */
 
@@ -39,7 +40,7 @@
 
 /* === C L A S S E S & S T R U C T S ======================================= */
 
-namespace sinfg {
+namespace synfig {
 
 //! \writeme
 class Keyframe :  public UniqueID
@@ -49,7 +50,7 @@ public:
        Time time_;
        String desc_;
        GUID guid_;
-       
+
 public:
 
        Keyframe();
@@ -59,11 +60,11 @@ public:
        ~Keyframe();
 
        void set_time(Time x) { time_=x; }
-       
+
        Time get_time()const { return time_; }
 
        void set_description(String x) { desc_=x; }
-       
+
        String get_description()const { return desc_; }
 
        const GUID& get_guid()const { return guid_; }
@@ -73,7 +74,7 @@ public:
        using UniqueID::operator==;
        using UniqueID::operator!=;
        using UniqueID::operator=;
-       
+
        bool operator<(const Keyframe &rhs)const { return time_<rhs.time_; }
        bool operator<(const Time &rhs)const { return time_<rhs; }
 
@@ -109,18 +110,18 @@ public:
        const_iterator find(const Time &x)const;
        const_iterator find_next(const Time &x)const;
        const_iterator find_prev(const Time &x)const;
-       
+
        void find_prev_next(const Time& time, Time &prev, Time &next)const;
 
        void insert_time(const Time& location, const Time& delta);
 
        void dump()const;
-       void sync();    
+       void sync();
 };
 
 //typedef std::list<Keyframe> KeyframeList;
 
-}; // END of namespace sinfg
+}; // END of namespace synfig
 
 /* === E N D =============================================================== */