Merge pull request #1003 from peetCreative/build_debian

specify abs to std library

src/control/PrintHandler.cpp

@@ -6,7 +6,7 @@
 #include "model/Document.h"
 #include "view/DocumentView.h"
 
-#include <math.h>
+#include <cmath>
 
 PrintHandler::PrintHandler()
 {

src/control/shaperecognizer/CircleRecognizer.cpp

@@ -4,7 +4,7 @@
 #include "ShapeRecognizerConfig.h"
 #include "model/Stroke.h"
 
-#include <math.h>
+#include <cmath>
 
 /**
  * Create circle stroke for inertia

src/control/shaperecognizer/Inertia.cpp

@@ -2,7 +2,7 @@
 
 #include "model/Point.h"
 
-#include <math.h>
+#include <cmath>
 
 Inertia::Inertia()
 {

src/control/shaperecognizer/RecoSegment.cpp

@@ -2,7 +2,7 @@
 
 #include "Inertia.h"
 
-#include <math.h>
+#include <cmath>
 #include <stdlib.h>
 
 RecoSegment::RecoSegment()

src/control/shaperecognizer/ShapeRecognizer.cpp

@@ -8,7 +8,7 @@
 
 #include <config-debug.h>
 
-#include <math.h>
+#include <cmath>
 
 ShapeRecognizer::ShapeRecognizer()
 {

src/control/tools/EditSelection.cpp

@@ -21,7 +21,7 @@
 #include <serializing/ObjectOutputStream.h>
 #include <serializing/ObjectInputStream.h>
 
-#include <math.h>
+#include <cmath>
 
 EditSelection::EditSelection(UndoRedoHandler* undo, PageRef page, XojPageView* view)
 {

src/control/tools/EditSelectionContents.cpp

@@ -402,7 +402,7 @@ void EditSelectionContents::finalizeSelection(double x, double y, double width,
 		fy = f;
 	}
 	bool scale = (width != this->originalWidth || height != this->originalHeight);
-	bool rotate = (abs(this->rotation) > __DBL_EPSILON__);
+	bool rotate = (std::abs(this->rotation) > __DBL_EPSILON__);
 
 	double mx = x - this->originalX;
 	double my = y - this->originalY;
@@ -465,7 +465,7 @@ void EditSelectionContents::updateContent(double x, double y, double rotation, d
 	}
 
 	bool scale = (width != this->lastWidth || height != this->lastHeight);
-	bool rotate = (abs(this->rotation) > __DBL_EPSILON__);
+	bool rotate = (std::abs(this->rotation) > __DBL_EPSILON__);
 
 	if (type == CURSOR_SELECTION_MOVE)
 	{
@@ -539,8 +539,8 @@ void EditSelectionContents::paint(cairo_t* cr, double x, double y, double rotati
 		this->relativeY = y;
 	}
 
-	if (abs(rotation) > __DBL_EPSILON__)	
-	{	
+	if (std::abs(rotation) > __DBL_EPSILON__)
+	{
 		this->rotation = rotation;
 	}
 
@@ -572,7 +572,7 @@ void EditSelectionContents::paint(cairo_t* cr, double x, double y, double rotati
 	double sx = (double) wTarget / wImg;
 	double sy = (double) hTarget / hImg;
 
-	if (wTarget != wImg || hTarget != hImg || abs(rotation) > __DBL_EPSILON__)
+	if (wTarget != wImg || hTarget != hImg || std::abs(rotation) > __DBL_EPSILON__)
 	{
 		if (!this->rescaleId)
 		{

src/control/tools/EraseHandler.cpp

@@ -15,7 +15,7 @@
 #include <Range.h>
 #include <Rectangle.h>
 
-#include <math.h>
+#include <cmath>
 
 EraseHandler::EraseHandler(UndoRedoHandler* undo, Document* doc, PageRef page, ToolHandler* handler, Redrawable* view)
 {

src/control/tools/InputHandler.cpp

@@ -12,7 +12,7 @@
 
 #include "gui/MainWindow.h"
 
-#include <math.h>
+#include <cmath>
 
 #define PIXEL_MOTION_THRESHOLD 0.3
 

src/control/tools/StrokeHandler.cpp

@@ -11,7 +11,7 @@
 #include <config-features.h>
 
 #include <gdk/gdk.h>
-#include <math.h>
+#include <cmath>
 
 StrokeHandler::StrokeHandler(XournalView* xournal, XojPageView* redrawable, PageRef page)
  : InputHandler(xournal, redrawable, page),

src/gui/PageView.cpp

@@ -45,7 +45,6 @@
 #include <gdk/gdk.h>
 
 #include <stdlib.h>
-#include <math.h>
 
 XojPageView::XojPageView(XournalView* xournal, PageRef page)
 {

src/gui/XournalView.cpp

@@ -20,8 +20,6 @@
 
 #include <gdk/gdk.h>
 
-#include <math.h>
-
 XournalView::XournalView(GtkWidget* parent, Control* control, ScrollHandling* scrollHandling)
  : scrollHandling(scrollHandling),
    control(control)

src/gui/toolbarMenubar/ColorToolItem.cpp

@@ -160,7 +160,7 @@ bool ColorToolItem::colorEqualsMoreOreLess(int color)
 	int g2 = (this->color & 0xff00) >> 8;
 	int b2 = (this->color & 0xff);
 
-	if (abs(r1 - r2) < 10 && abs(g1 - g2) < 10 && abs(b1 - b2) < 10)
+	if (std::abs(r1 - r2) < 10 && std::abs(g1 - g2) < 10 && std::abs(b1 - b2) < 10)
 	{
 		return true;
 	}

src/gui/toolbarMenubar/icon/ColorSelectImage.cpp

@@ -2,7 +2,7 @@
 
 #include <pixbuf-utils.h>
 
-#include <math.h>
+#include <cmath>
 
 ColorSelectImage::ColorSelectImage(int color, bool circle)
  : color(color),

src/gui/widgets/XournalWidget.cpp

@@ -16,7 +16,6 @@
 #include <gdk/gdk.h>
 
 #include <gdk/gdkkeysyms.h>
-#include <math.h>
 
 static void gtk_xournal_class_init(GtkXournalClass* klass);
 static void gtk_xournal_init(GtkXournal* xournal);

src/model/Stroke.cpp

@@ -5,7 +5,7 @@
 
 #include <i18n.h>
 
-#include <math.h>
+#include <cmath>
 
 Stroke::Stroke()
  : AudioElement(ELEMENT_STROKE)

src/model/eraser/EraseableStroke.cpp

@@ -6,7 +6,7 @@
 
 #include <Range.h>
 
-#include <math.h>
+#include <cmath>
 
 EraseableStroke::EraseableStroke(Stroke* stroke)
  : stroke(stroke)