Remove unused define, clean and sort code.

diff --git a/synfig-core/src/modules/lyr_std/stretch.cpp b/synfig-core/src/modules/lyr_std/stretch.cpp
index de0de94..0f1c37d 100644 (file)
--- a/synfig-core/src/modules/lyr_std/stretch.cpp
+++ b/synfig-core/src/modules/lyr_std/stretch.cpp
@@ -23,8 +23,6 @@
 
 /* === H E A D E R S ======================================================= */
 
-#define SYNFIG_NO_ANGLE
-
 #ifdef USING_PCH
 #      include "pch.h"
 #else

diff --git a/synfig-core/src/modules/mod_bmp/main.cpp b/synfig-core/src/modules/mod_bmp/main.cpp
index 88fbbbd..dbf86b1 100644 (file)
--- a/synfig-core/src/modules/mod_bmp/main.cpp
+++ b/synfig-core/src/modules/mod_bmp/main.cpp
@@ -22,8 +22,6 @@
 
 /* === H E A D E R S ======================================================= */
 
-#define SYNFIG_NO_ANGLE
-
 #ifdef USING_PCH
 #      include "pch.h"
 #else

diff --git a/synfig-core/src/modules/mod_bmp/mptr_bmp.cpp b/synfig-core/src/modules/mod_bmp/mptr_bmp.cpp
index 9151cfe..d8c07b7 100644 (file)
--- a/synfig-core/src/modules/mod_bmp/mptr_bmp.cpp
+++ b/synfig-core/src/modules/mod_bmp/mptr_bmp.cpp
@@ -24,8 +24,6 @@
 
 /* === H E A D E R S ======================================================= */
 
-#define SYNFIG_NO_ANGLE
-
 #ifdef USING_PCH
 #      include "pch.h"
 #else

diff --git a/synfig-core/src/modules/mod_bmp/trgt_bmp.cpp b/synfig-core/src/modules/mod_bmp/trgt_bmp.cpp
index fe2d433..5a126ff 100644 (file)
--- a/synfig-core/src/modules/mod_bmp/trgt_bmp.cpp
+++ b/synfig-core/src/modules/mod_bmp/trgt_bmp.cpp
@@ -23,8 +23,6 @@
 
 /* === H E A D E R S ======================================================= */
 
-#define SYNFIG_NO_ANGLE
-
 #ifdef USING_PCH
 #      include "pch.h"
 #else

diff --git a/synfig-core/src/modules/mod_libavcodec/main.cpp b/synfig-core/src/modules/mod_libavcodec/main.cpp
index 70fa9c5..30aa3c5 100644 (file)
--- a/synfig-core/src/modules/mod_libavcodec/main.cpp
+++ b/synfig-core/src/modules/mod_libavcodec/main.cpp
@@ -22,8 +22,6 @@
 
 /* === H E A D E R S ======================================================= */
 
-#define SYNFIG_NO_ANGLE
-
 #ifdef USING_PCH
 #      include "pch.h"
 #else

diff --git a/synfig-core/src/modules/mod_libavcodec/mptr.cpp b/synfig-core/src/modules/mod_libavcodec/mptr.cpp
index 667968b..4c9bfb8 100644 (file)
--- a/synfig-core/src/modules/mod_libavcodec/mptr.cpp
+++ b/synfig-core/src/modules/mod_libavcodec/mptr.cpp
@@ -22,8 +22,6 @@
 
 /* === H E A D E R S ======================================================= */
 
-#define SYNFIG_NO_ANGLE
-
 #ifdef USING_PCH
 #      include "pch.h"
 #else

diff --git a/synfig-core/src/modules/mod_libavcodec/trgt_av.cpp b/synfig-core/src/modules/mod_libavcodec/trgt_av.cpp
index f329081..5f481f6 100644 (file)
--- a/synfig-core/src/modules/mod_libavcodec/trgt_av.cpp
+++ b/synfig-core/src/modules/mod_libavcodec/trgt_av.cpp
@@ -24,8 +24,6 @@
 
 /* === H E A D E R S ======================================================= */
 
-#define SYNFIG_NO_ANGLE
-
 #ifdef USING_PCH
 #      include "pch.h"
 #else

diff --git a/synfig-core/src/modules/mod_svg/main.cpp b/synfig-core/src/modules/mod_svg/main.cpp
index 1f5be67..1906b70 100644 (file)
--- a/synfig-core/src/modules/mod_svg/main.cpp
+++ b/synfig-core/src/modules/mod_svg/main.cpp
@@ -23,8 +23,6 @@
 
 /* === H E A D E R S ======================================================= */
 
-#define SYNFIG_NO_ANGLE
-
 #ifdef USING_PCH
 #      include "pch.h"
 #else

diff --git a/synfig-core/src/synfig/canvas.cpp b/synfig-core/src/synfig/canvas.cpp
index 2bbb743..eeecdb0 100644 (file)
--- a/synfig-core/src/synfig/canvas.cpp
+++ b/synfig-core/src/synfig/canvas.cpp
@@ -23,8 +23,6 @@
 
 /* === H E A D E R S ======================================================= */
 
-#define SYNFIG_NO_ANGLE
-
 #ifdef USING_PCH
 #      include "pch.h"
 #else

diff --git a/synfig-core/src/synfig/color.h b/synfig-core/src/synfig/color.h
index d54b0e9..ee5f501 100644 (file)
--- a/synfig-core/src/synfig/color.h
+++ b/synfig-core/src/synfig/color.h
@@ -29,20 +29,16 @@
 /* === H E A D E R S ======================================================= */
 
 
-//#include <cmath>
 #include <math.h>
 #include <cassert>
 #include "gamma.h"
 #include <synfig/string.h>
+# include "angle.h"
 
 #ifdef USE_HALF_TYPE
 #include <OpenEXR/half.h>
 #endif
 
-#ifndef SYNFIG_NO_ANGLE
-# include "angle.h"
-#endif
-
 /* === M A C R O S ========================================================= */
 
 #define use_colorspace_gamma() App::use_colorspace_gamma
@@ -386,7 +382,6 @@ public:
        static Color YUV(const float& y, const float& u, const float& v, const value_type& a=1)
                { return Color().set_yuv(y,u,v).set_a(a); }
 
-#ifndef SYNFIG_NO_ANGLE
        //! Returns the hue of the chromanance
        /*!     This is the angle of the U and V components.
        **      \see set_hue() */
@@ -443,7 +438,6 @@ public:
        static Color YUV(const float& y, const float& s, const Angle& theta, const value_type& a=1)
                { return Color().set_yuv(y,s,theta).set_a(a); }
 
-#endif
 
        //! Clamps a color so that its values are in range. Ignores attempting to visualize negative colors.
        Color clamped()const;

diff --git a/synfig-core/src/synfig/importer.cpp b/synfig-core/src/synfig/importer.cpp
index 7002638..1784d3a 100644 (file)
--- a/synfig-core/src/synfig/importer.cpp
+++ b/synfig-core/src/synfig/importer.cpp
@@ -23,8 +23,6 @@
 
 /* === H E A D E R S ======================================================= */
 
-#define SYNFIG_NO_ANGLE
-
 #ifdef USING_PCH
 #      include "pch.h"
 #else

diff --git a/synfig-core/src/synfig/layer.cpp b/synfig-core/src/synfig/layer.cpp
index 8fcbfbf..9d1adf3 100644 (file)
--- a/synfig-core/src/synfig/layer.cpp
+++ b/synfig-core/src/synfig/layer.cpp
@@ -23,8 +23,6 @@
 
 /* === H E A D E R S ======================================================= */
 
-#define SYNFIG_NO_ANGLE
-
 #ifdef USING_PCH
 #      include "pch.h"
 #else

diff --git a/synfig-core/src/synfig/layer_bitmap.cpp b/synfig-core/src/synfig/layer_bitmap.cpp
index cda5d09..8443429 100644 (file)
--- a/synfig-core/src/synfig/layer_bitmap.cpp
+++ b/synfig-core/src/synfig/layer_bitmap.cpp
@@ -22,8 +22,6 @@
 
 /* === H E A D E R S ======================================================= */
 
-#define SYNFIG_NO_ANGLE
-
 #ifdef USING_PCH
 #      include "pch.h"
 #else

diff --git a/synfig-core/src/synfig/main.cpp b/synfig-core/src/synfig/main.cpp
index 9e0a56a..31c9afe 100644 (file)
--- a/synfig-core/src/synfig/main.cpp
+++ b/synfig-core/src/synfig/main.cpp
@@ -23,8 +23,6 @@
 
 /* === H E A D E R S ======================================================= */
 
-//#define SYNFIG_NO_ANGLE
-
 #ifdef USING_PCH
 #      include "pch.h"
 #else

diff --git a/synfig-core/src/synfig/module.cpp b/synfig-core/src/synfig/module.cpp
index 5d64003..13523b0 100644 (file)
--- a/synfig-core/src/synfig/module.cpp
+++ b/synfig-core/src/synfig/module.cpp
@@ -22,8 +22,6 @@
 
 /* === H E A D E R S ======================================================= */
 
-#define SYNFIG_NO_ANGLE
-
 #ifdef USING_PCH
 #      include "pch.h"
 #else

diff --git a/synfig-core/src/synfig/render.cpp b/synfig-core/src/synfig/render.cpp
index af58a0e..fffdd6f 100644 (file)
--- a/synfig-core/src/synfig/render.cpp
+++ b/synfig-core/src/synfig/render.cpp
@@ -22,8 +22,6 @@
 
 /* === H E A D E R S ======================================================= */
 
-#define SYNFIG_NO_ANGLE
-
 #ifdef USING_PCH
 #      include "pch.h"
 #else

diff --git a/synfig-core/src/synfig/surface.cpp b/synfig-core/src/synfig/surface.cpp
index 91e1663..471b85a 100644 (file)
--- a/synfig-core/src/synfig/surface.cpp
+++ b/synfig-core/src/synfig/surface.cpp
@@ -24,8 +24,6 @@
 
 /* === H E A D E R S ======================================================= */
 
-#define SYNFIG_NO_ANGLE
-
 #ifdef USING_PCH
 #      include "pch.h"
 #else

diff --git a/synfig-core/src/synfig/target.cpp b/synfig-core/src/synfig/target.cpp
index b6aa1c4..a74d374 100644 (file)
--- a/synfig-core/src/synfig/target.cpp
+++ b/synfig-core/src/synfig/target.cpp
@@ -23,8 +23,6 @@
 
 /* === H E A D E R S ======================================================= */
 
-#define SYNFIG_NO_ANGLE
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif

diff --git a/synfig-core/src/synfig/types.h b/synfig-core/src/synfig/types.h
index 6c3b7ea..866e388 100644 (file)
--- a/synfig-core/src/synfig/types.h
+++ b/synfig-core/src/synfig/types.h
@@ -28,11 +28,7 @@
 /* === H E A D E R S ======================================================= */
 
 #include <cmath>
-
-#ifndef SYNFIG_NO_ANGLE
 #include "angle.h"
-#endif
-
 #include "time.h"
 #include "vector.h"
 

diff --git a/synfig-core/src/synfig/value.h b/synfig-core/src/synfig/value.h
index 7079dba..eff65bb 100644 (file)
--- a/synfig-core/src/synfig/value.h
+++ b/synfig-core/src/synfig/value.h
@@ -28,17 +28,14 @@
 
 /* === H E A D E R S ======================================================= */
 
-//#include "vector.h"
-//#include "time.h"
+#include "angle.h"
 #include "segment.h"
-//#include "color.h"
 #include "string.h"
 #include <list>
 #include <vector>
 #include <ETL/trivial>
 #include <ETL/handle>
 #include "general.h"
-//#include "gradient.h"
 #include "blinepoint.h"
 #include "exception.h"
 
@@ -46,9 +43,6 @@
 #include <OpenEXR/half.h>
 #endif
 
-#ifndef SYNFIG_NO_ANGLE
-#include "angle.h"
-#endif
 
 #include <ETL/ref_count>
 
@@ -349,10 +343,8 @@ public:
        operator half()const { return get(Real()); }
 #endif
 
-#ifndef SYNFIG_NO_ANGLE
        operator const Angle&()const { return get(Angle()); }
        static Type get_type(const Angle&) { return TYPE_ANGLE; }
-#endif
 
        template <class T>
        operator std::list<T>()const

diff --git a/synfig-core/src/synfig/valuenode.cpp b/synfig-core/src/synfig/valuenode.cpp
index cae9692..c249559 100644 (file)
--- a/synfig-core/src/synfig/valuenode.cpp
+++ b/synfig-core/src/synfig/valuenode.cpp
@@ -24,10 +24,6 @@
 
 /* === H E A D E R S ======================================================= */
 
-#define SYNFIG_NO_ANGLE
-
-//#define HAS_HASH_MAP 1
-
 #ifdef USING_PCH
 #      include "pch.h"
 #else

diff --git a/synfig-core/src/synfig/valuenode.h b/synfig-core/src/synfig/valuenode.h
index a7a8f30..e74c679 100644 (file)
--- a/synfig-core/src/synfig/valuenode.h
+++ b/synfig-core/src/synfig/valuenode.h
@@ -38,10 +38,7 @@
 #include <map>
 #include <sigc++/signal.h>
 #include "guid.h"
-
-#ifndef SYNFIG_NO_ANGLE
 #include <ETL/angle>
-#endif
 
 #include "node.h"
 
@@ -289,7 +286,7 @@ public:
 
 
        //! Type that represents a pointer to a ValueNode's constructor
-       /*! As a pointer to the constructor, it represents a "factory" of 
+       /*! As a pointer to the constructor, it represents a "factory" of
        **  objects of this class.
        */
        typedef LinkableValueNode* (*Factory)(const ValueBase&);
@@ -305,9 +302,9 @@ public:
        };
 
        //! Book of types of linkable value nodes indexed by type name.
-       /*! While the sifz file is read, each time a new LinkableValueNode entry 
-       **  is found, the factory constructor that the "factory" pointer member 
-       **  of the "BookEntry" struct points to, is called, and a new object of 
+       /*! While the sifz file is read, each time a new LinkableValueNode entry
+       **  is found, the factory constructor that the "factory" pointer member
+       **  of the "BookEntry" struct points to, is called, and a new object of
        **  that type is created.
        **  \sa LinkableValueNode::Factory
        */