1 files changed, 45 insertions, 50 deletions

diff --git a/source/blender/freestyle/intern/system/BaseIterator.h b/source/blender/freestyle/intern/system/BaseIterator.h
index b01fac96267..3826a129a1c 100644
--- a/source/blender/freestyle/intern/system/BaseIterator.h
+++ b/source/blender/freestyle/intern/system/BaseIterator.h
@@ -25,88 +25,83 @@
 #include <iterator>
 
 #ifdef WITH_CXX_GUARDEDALLOC
-#include "MEM_guardedalloc.h"
+#  include "MEM_guardedalloc.h"
 #endif
 
 namespace Freestyle {
 
 // use for iterators defintions
-template <class Element>
-class Nonconst_traits;
-
-template <class Element>
-class Const_traits
-{
-public:
-	typedef Element value_type;
-	typedef const Element& reference;
-	typedef const Element *pointer;
-	typedef ptrdiff_t difference_type;
-	typedef Nonconst_traits<Element> Non_const_traits;
+template<class Element> class Nonconst_traits;
+
+template<class Element> class Const_traits {
+ public:
+  typedef Element value_type;
+  typedef const Element &reference;
+  typedef const Element *pointer;
+  typedef ptrdiff_t difference_type;
+  typedef Nonconst_traits<Element> Non_const_traits;
 
 #ifdef WITH_CXX_GUARDEDALLOC
-	MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Const_traits")
+  MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Const_traits")
 #endif
 };
 
-template <class Element>
-class Nonconst_traits
-{
-public:
-	typedef Element value_type;
-	typedef Element& reference;
-	typedef Element *pointer;
-	typedef ptrdiff_t difference_type;
-	typedef Nonconst_traits<Element> Non_const_traits;
+template<class Element> class Nonconst_traits {
+ public:
+  typedef Element value_type;
+  typedef Element &reference;
+  typedef Element *pointer;
+  typedef ptrdiff_t difference_type;
+  typedef Nonconst_traits<Element> Non_const_traits;
 
 #ifdef WITH_CXX_GUARDEDALLOC
-	MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Nonconst_traits")
+  MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Nonconst_traits")
 #endif
 };
 
-class InputIteratorTag_Traits
-{
-public:
-	typedef std::input_iterator_tag iterator_category;
+class InputIteratorTag_Traits {
+ public:
+  typedef std::input_iterator_tag iterator_category;
 
 #ifdef WITH_CXX_GUARDEDALLOC
-	MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:InputIteratorTag_Traits")
+  MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:InputIteratorTag_Traits")
 #endif
 };
 
-class BidirectionalIteratorTag_Traits
-{
-public:
-	typedef std::bidirectional_iterator_tag iterator_category;
+class BidirectionalIteratorTag_Traits {
+ public:
+  typedef std::bidirectional_iterator_tag iterator_category;
 
 #ifdef WITH_CXX_GUARDEDALLOC
-	MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BidirectionalIteratorTag_Traits")
+  MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BidirectionalIteratorTag_Traits")
 #endif
 };
 
-template<class Traits, class IteratorTagTraits>
-class IteratorBase
-{
-public:
-	virtual ~IteratorBase() {}
+template<class Traits, class IteratorTagTraits> class IteratorBase {
+ public:
+  virtual ~IteratorBase()
+  {
+  }
 
-	virtual bool begin() const = 0;
-	virtual bool end() const = 0;
+  virtual bool begin() const = 0;
+  virtual bool end() const = 0;
 
-	typedef typename IteratorTagTraits::iterator_category iterator_category;
-	typedef typename Traits::value_type                   value_type;
-	typedef typename Traits::difference_type              difference_type;
-	typedef typename Traits::pointer                      pointer;
-	typedef typename Traits::reference                    reference;
+  typedef typename IteratorTagTraits::iterator_category iterator_category;
+  typedef typename Traits::value_type value_type;
+  typedef typename Traits::difference_type difference_type;
+  typedef typename Traits::pointer pointer;
+  typedef typename Traits::reference reference;
 
-protected:
-	IteratorBase() {}
+ protected:
+  IteratorBase()
+  {
+  }
 
 #ifdef WITH_CXX_GUARDEDALLOC
-	MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:IteratorBase")
+  MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:IteratorBase")
 #endif
 };
 
 } /* namespace Freestyle */
 
-#endif // BASEITERATOR_H
+#endif  // BASEITERATOR_H