summaryrefslogtreecommitdiffstats
path: root/src/ui/widget/preview.cpp
diff options
context:
space:
mode:
authorMartin Owens <doctormo@gmail.com>2019-03-06 23:54:12 +0000
committerMartin Owens <doctormo@gmail.com>2019-03-06 23:54:12 +0000
commit3711d5d705436c20590c1ff4cef12e67beed6597 (patch)
tree9026f75a574bc3b9b531acb959eced87c5d4a9f7 /src/ui/widget/preview.cpp
parentMerge: Correct text for enabling grid (diff)
parentAvoid the “using std::*;” or “using namespace std;” constructs. (diff)
downloadinkscape-3711d5d705436c20590c1ff4cef12e67beed6597.tar.gz
inkscape-3711d5d705436c20590c1ff4cef12e67beed6597.zip
Merge: Avoid the “using std::*;” or “using namespace std;” construct
Diffstat (limited to 'src/ui/widget/preview.cpp')
-rw-r--r--src/ui/widget/preview.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/ui/widget/preview.cpp b/src/ui/widget/preview.cpp
index f22032b65..2de9a9a28 100644
--- a/src/ui/widget/preview.cpp
+++ b/src/ui/widget/preview.cpp
@@ -36,8 +36,6 @@
* ***** END LICENSE BLOCK ***** */
#include <algorithm>
-using std::min;
-
#include <gdkmm/general.h>
#include "preview.h"
#include "preferences.h"
@@ -272,7 +270,7 @@ Preview::on_draw(const Cairo::RefPtr<Cairo::Context> &cr)
context->render_arrow(cr,
G_PI, // Down-pointing arrow
area.x, area.y,
- min(area.width, area.height)
+ std::min(area.width, area.height)
);
}
@@ -286,7 +284,7 @@ Preview::on_draw(const Cairo::RefPtr<Cairo::Context> &cr)
context->render_arrow(cr,
G_PI, // Down-pointing arrow
otherArea.x, otherArea.y,
- min(otherArea.width, otherArea.height)
+ std::min(otherArea.width, otherArea.height)
);
}
@@ -300,7 +298,7 @@ Preview::on_draw(const Cairo::RefPtr<Cairo::Context> &cr)
context->render_arrow(cr,
1.5*G_PI, // Left-pointing arrow
otherArea.x, otherArea.y,
- min(otherArea.width, otherArea.height)
+ std::min(otherArea.width, otherArea.height)
);
}