Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-studio / trunk / src / synfigapp / editmode.h

diff --git a/synfig-studio/trunk/src/synfigapp/editmode.h b/synfig-studio/trunk/src/synfigapp/editmode.h
index 66e6f33..0dbfac1 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/editmode.h
+++ b/synfig-studio/trunk/src/synfigapp/editmode.h
@@ -2,19 +2,20 @@
 /*!    \file editmode.h
 **     \brief Template Header
 **
-**     $Id: editmode.h,v 1.1.1.1 2005/01/07 03:34:37 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
 */
 /* ========================================================================= */
@@ -33,7 +34,7 @@
 /* === C L A S S E S & S T R U C T S ======================================= */
 
 namespace synfigapp {
-       
+
 /*!    \enum EditMode
 **     \brief \writeme
 */
@@ -73,9 +74,9 @@ operator&(const EditMode& lhs, const EditMode& rhs)
 //!    Flag Comparison. THIS IS NOT LESS-THAN-OR-EQUAL-TO.
 /*!    This function will return true of all of the flags
 **     in the \a rhs are set in the \a lhs */
-inline bool
-operator<=(const EditMode& lhs, const EditMode& rhs)
-{ return lhs&rhs==int(rhs); }
+// inline bool
+// operator<=(const EditMode& lhs, const EditMode& rhs)
+// { return (lhs&rhs)==int(rhs); }
 
 }; // END if namespace synfigapp
 /* === E N D =============================================================== */