Remove .gitignore do nothing is ignored.

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

diff --git a/synfig-core/trunk/src/synfig/paramdesc.h b/synfig-core/trunk/src/synfig/paramdesc.h
index 3daf7a3..2e0f0ad 100644 (file)
--- a/synfig-core/trunk/src/synfig/paramdesc.h
+++ b/synfig-core/trunk/src/synfig/paramdesc.h
@@ -1,28 +1,29 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!    \file paramdesc.h
 **     \brief ParamDesc Class Implementation
 **
-**     $Id: paramdesc.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_PARAMDESC_H
-#define __SINFG_PARAMDESC_H
+#ifndef __SYNFIG_PARAMDESC_H
+#define __SYNFIG_PARAMDESC_H
 
 /* === H E A D E R S ======================================================= */
 
@@ -37,10 +38,10 @@
 
 /* === C L A S S E S & S T R U C T S ======================================= */
 
-namespace sinfg {
+namespace synfig {
 
 class ValueBase;
-       
+
 /*!    \class ParamDesc
 **     \brief Parameter Description Class
 **     \todo writeme
@@ -62,7 +63,7 @@ public:
                {
                }
        };
-       
+
        /*
  --    ** -- D A T A -------------------------------------------------------------
        */
@@ -84,7 +85,7 @@ private:
        bool animation_only_;
 
        std::list<EnumData> enum_list_;
-       
+
        /*
  --    ** -- C O N S T R U C T O R S ---------------------------------------------
        */
@@ -104,7 +105,7 @@ public:
 
        ParamDesc(const ValueBase&, const String &a);
 
-       ParamDesc(sinfg::Color::BlendMethod, const String &a);
+       ParamDesc(synfig::Color::BlendMethod, const String &a);
 
 
        /*
@@ -115,7 +116,7 @@ public:
 
        //! \writeme
        const std::list<EnumData> &get_enum_list()const { return enum_list_; }
-       
+
        //! Sets the localized name of the parameter.
        ParamDesc &set_local_name(const String &n) { local_name_=n; return *this; }
 
@@ -140,14 +141,14 @@ public:
        //! Returns the flag regarding duck visibility
        bool get_invisible_duck() { return invisible_duck_; }
 
-       
+
        //! \writeme
        ParamDesc &set_animation_only(bool x=true) { animation_only_=x; return *this; }
 
        //! \writeme
        bool get_animation_only() { return animation_only_; }
 
-       
+
        //! Sets which parameter is to be used as the origin when the user edits visually.
        ParamDesc &set_origin(const String &h) { origin_=h; return *this; }
 
@@ -155,7 +156,6 @@ public:
        /*! This value determines how the value is to be presented
        **      to the user when editing visually. */
        ParamDesc &set_scalar(const Real &n) { scalar_=n; return *this; }
-       ParamDesc &set_scalar(const String &h) { hint_=h; return *this; }
 
        //!     Marks the parameter as not necessary for saving or copying
        ParamDesc &not_critical() { critical_=false; return *this; }
@@ -185,7 +185,7 @@ public:
        //! Returns the localized description of the parameter
        const String &get_description()const { return desc_; }
 
-       //! Returns the paramater's group
+       //! Returns the parameter's group
        const String &get_group()const { return group_; }
 
        //! Returns a "hint" about the parameter, regarding how it is to be displayed to the user
@@ -209,8 +209,8 @@ public:
        //! Returns \c true if the layer is hidden, \c false otherwise.
        bool get_hidden()const { return hidden_; }
 
-       
-       
+
+
        ParamDesc& set_is_distance(bool x=true) { is_distance_=x; return *this;}
        bool get_is_distance()const { return is_distance_; }
 }; // END of class ParamDesc
@@ -219,7 +219,7 @@ class ParamVocab : public std::list< ParamDesc >
 {
 };
 
-}; // END of namespace sinfg
+}; // END of namespace synfig
 
 /* === E N D =============================================================== */