Remove C macro in favor of class template

common/gal/cairo/cairo_gal.cpp

@@ -157,7 +157,7 @@ void CAIRO_GAL_BASE::arc_angles_xform_and_normalize( double& aStartAngle, double
     }
 
     // Normalize arc angles
-    SWAP( startAngle, >, endAngle );
+    normalize( startAngle, endAngle );
 
     // now rotate arc according to the rotation transform matrix
     // Remark:
@@ -1778,9 +1778,9 @@ void CAIRO_GAL_BASE::DrawGrid()
     int gridStartY = KiROUND( ( worldStartPoint.y - m_gridOrigin.y ) / gridScreenSize.y );
     int gridEndY = KiROUND( ( worldEndPoint.y - m_gridOrigin.y ) / gridScreenSize.y );
 
-    // Ensure start coordinate > end coordinate
-    SWAP( gridStartX, >, gridEndX );
-    SWAP( gridStartY, >, gridEndY );
+    // Ensure start coordinate < end coordinate
+    normalize( gridStartX, gridEndX );
+    normalize( gridStartY, gridEndY );
 
     // Ensure the grid fills the screen
     --gridStartX;

common/gal/opengl/opengl_gal.cpp

@@ -970,7 +970,7 @@ void OPENGL_GAL::DrawArc( const VECTOR2D& aCenterPoint, double aRadius,
     double endAngle = startAngle + aAngle.AsRadians();
 
     // Normalize arc angles
-    SWAP( startAngle, >, endAngle );
+    normalize( startAngle, endAngle );
 
     const double alphaIncrement = calcAngleStep( aRadius );
 
@@ -1058,7 +1058,7 @@ void OPENGL_GAL::DrawArcSegment( const VECTOR2D& aCenterPoint, double aRadius,
     double endAngle = startAngle + aAngle.AsRadians();
 
     // Swap the angles, if start angle is greater than end angle
-    SWAP( startAngle, >, endAngle );
+    normalize( startAngle, endAngle );
 
     // Calculate the seg count to approximate the arc with aMaxError or less
     int segCount360 = GetArcToSegmentCount( aRadius, aMaxError, FULL_CIRCLE );
@@ -1786,9 +1786,9 @@ void OPENGL_GAL::DrawGrid()
     int gridStartY = KiROUND( ( worldStartPoint.y - m_gridOrigin.y ) / gridScreenSize.y );
     int gridEndY = KiROUND( ( worldEndPoint.y - m_gridOrigin.y ) / gridScreenSize.y );
 
-    // Ensure start coordinate > end coordinate
-    SWAP( gridStartX, >, gridEndX );
-    SWAP( gridStartY, >, gridEndY );
+    // Ensure start coordinate < end coordinate
+    normalize( gridStartX, gridEndX );
+    normalize( gridStartY, gridEndY );
 
     // Ensure the grid fills the screen
     --gridStartX;

include/gal/definitions.h

@@ -27,17 +27,6 @@
 #ifndef DEFINITIONS_H_
 #define DEFINITIONS_H_
 
-/// Swap the variables if a condition is met.
-#define SWAP( varA, condition, varB )   \
-    assert( typeid( varA ).hash_code() == typeid( varB ).hash_code() ); \
-    \
-    if( varA condition varB )           \
-    {                                   \
-        decltype( varA ) tmp = varA;    \
-        varA = varB;                    \
-        varB = tmp;                     \
-    }
-
 namespace KIGFX
 {
 /**

include/gal/graphics_abstraction_layer.h

@@ -1043,6 +1043,20 @@ protected:
      */
     virtual bool updatedGalDisplayOptions( const GAL_DISPLAY_OPTIONS& aOptions );
 
+    /**
+     * Ensure that the first element is smaller than the second
+     */
+    template <typename T>
+    void normalize( T &a, T &b )
+    {
+        if( a > b )
+        {
+            T tmp = a;
+            a = b;
+            b = tmp;
+        }
+    }
+
     GAL_DISPLAY_OPTIONS& m_options;
     UTIL::LINK           m_observerLink;