Merge branch 'master' into divVerent/colormod

[xonotic/netradiant.git] / libs / generic / enumeration.h

diff --git a/libs/generic/enumeration.h b/libs/generic/enumeration.h
index 31e43052128dc329340e22e72d58f1c0a3962b53..8d6c75eb3480da42b2c42a87d1f571be2672d94f 100644 (file)
--- a/libs/generic/enumeration.h
+++ b/libs/generic/enumeration.h
@@ -1,25 +1,25 @@
 /*
-Copyright (C) 2001-2006, William Joseph.
-All Rights Reserved.
+   Copyright (C) 2001-2006, William Joseph.
+   All Rights Reserved.
 
-This file is part of GtkRadiant.
+   This file is part of GtkRadiant.
 
-GtkRadiant 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.
+   GtkRadiant 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.
 
-GtkRadiant 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.
+   GtkRadiant 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.
 
-You should have received a copy of the GNU General Public License
-along with GtkRadiant; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+   You should have received a copy of the GNU General Public License
+   along with GtkRadiant; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
 
-#if !defined(INCLUDED_GENERIC_ENUMERATION_H)
+#if !defined( INCLUDED_GENERIC_ENUMERATION_H )
 #define INCLUDED_GENERIC_ENUMERATION_H
 
 /// \file
@@ -35,26 +35,22 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 template<typename Enumeration>
 class EnumeratedValue : public Enumeration
 {
-  typename Enumeration::Value m_value;
+typename Enumeration::Value m_value;
 public:
-  explicit EnumeratedValue(typename Enumeration::Value value) : m_value(value)
-  {
-  }
-  typename Enumeration::Value get() const
-  {
-    return m_value;
-  }
+explicit EnumeratedValue( typename Enumeration::Value value ) : m_value( value ){
+}
+typename Enumeration::Value get() const {
+       return m_value;
+}
 };
 
 template<typename Enumeration>
-inline bool operator==(EnumeratedValue<Enumeration> self, EnumeratedValue<Enumeration> other)
-{
-  return self.get() == other.get();
+inline bool operator==( EnumeratedValue<Enumeration> self, EnumeratedValue<Enumeration> other ){
+       return self.get() == other.get();
 }
 template<typename Enumeration>
-inline bool operator!=(EnumeratedValue<Enumeration> self, EnumeratedValue<Enumeration> other)
-{
-  return !operator==(self, other);
+inline bool operator!=( EnumeratedValue<Enumeration> self, EnumeratedValue<Enumeration> other ){
+       return !operator==( self, other );
 }
 
 #endif