summaryrefslogtreecommitdiffstats
path: root/src/color.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/color.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/color.cpp')
-rw-r--r--src/color.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/color.cpp b/src/color.cpp
index 6baf6470c..c3353ef1c 100644
--- a/src/color.cpp
+++ b/src/color.cpp
@@ -15,6 +15,7 @@
#include <cmath>
#include <cstdio>
+#include <vector>
#define MIN(X,Y) ((X) < (Y) ? (X) : (Y))
#define MAX(X,Y) ((X) > (Y) ? (X) : (Y))
@@ -29,7 +30,6 @@
#define return_val_if_fail(x, val) if (!(x)) { printf("assertion failed: " #x); return val; }
using Inkscape::CSSOStringStream;
-using std::vector;
static bool profileMatches( SVGICCColor const* first, SVGICCColor const* second );
@@ -205,7 +205,7 @@ std::string SPColor::toString() const
css << " ";
}
css << "icc-color(" << icc->colorProfile;
- for (vector<double>::const_iterator i(icc->colors.begin()),
+ for (std::vector<double>::const_iterator i(icc->colors.begin()),
iEnd(icc->colors.end());
i != iEnd; ++i) {
css << ", " << *i;