From f5b6ec67ef4de2110d1229f1ad20a7d5dd1db04a Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Thu, 31 May 2018 09:44:49 +0100 Subject: [PATCH] Remove 'using namespace std;' from the qglviewer files --- GraphicsView/include/CGAL/Qt/camera_impl.h | 1 - GraphicsView/include/CGAL/Qt/constraint_impl.h | 1 - GraphicsView/include/CGAL/Qt/frame_impl.h | 1 - GraphicsView/include/CGAL/Qt/keyFrameInterpolator_impl.h | 1 - GraphicsView/include/CGAL/Qt/manipulatedCameraFrame_impl.h | 1 - GraphicsView/include/CGAL/Qt/manipulatedFrame_impl.h | 1 - GraphicsView/include/CGAL/Qt/qglviewer_impl.h | 1 - GraphicsView/include/CGAL/Qt/quaternion_impl.h | 3 +-- GraphicsView/include/CGAL/Qt/vec_impl.h | 3 +-- 9 files changed, 2 insertions(+), 11 deletions(-) diff --git a/GraphicsView/include/CGAL/Qt/camera_impl.h b/GraphicsView/include/CGAL/Qt/camera_impl.h index eb5e939c774..72492e2ba15 100644 --- a/GraphicsView/include/CGAL/Qt/camera_impl.h +++ b/GraphicsView/include/CGAL/Qt/camera_impl.h @@ -36,7 +36,6 @@ #include #include -using namespace std; using namespace CGAL::qglviewer; /*! Default constructor. diff --git a/GraphicsView/include/CGAL/Qt/constraint_impl.h b/GraphicsView/include/CGAL/Qt/constraint_impl.h index 7094f0c9eb5..341835f955f 100644 --- a/GraphicsView/include/CGAL/Qt/constraint_impl.h +++ b/GraphicsView/include/CGAL/Qt/constraint_impl.h @@ -36,7 +36,6 @@ #include using namespace CGAL::qglviewer; -using namespace std; //////////////////////////////////////////////////////////////////////////////// // Constraint // diff --git a/GraphicsView/include/CGAL/Qt/frame_impl.h b/GraphicsView/include/CGAL/Qt/frame_impl.h index a8433867b5a..eb519c38fb8 100644 --- a/GraphicsView/include/CGAL/Qt/frame_impl.h +++ b/GraphicsView/include/CGAL/Qt/frame_impl.h @@ -37,7 +37,6 @@ #include using namespace CGAL::qglviewer; -using namespace std; /*! Creates a default Frame. diff --git a/GraphicsView/include/CGAL/Qt/keyFrameInterpolator_impl.h b/GraphicsView/include/CGAL/Qt/keyFrameInterpolator_impl.h index 6070f37164d..3067685c994 100644 --- a/GraphicsView/include/CGAL/Qt/keyFrameInterpolator_impl.h +++ b/GraphicsView/include/CGAL/Qt/keyFrameInterpolator_impl.h @@ -34,7 +34,6 @@ #include using namespace CGAL::qglviewer; -using namespace std; /*! Creates a KeyFrameInterpolator, with \p frame as associated frame(). diff --git a/GraphicsView/include/CGAL/Qt/manipulatedCameraFrame_impl.h b/GraphicsView/include/CGAL/Qt/manipulatedCameraFrame_impl.h index cfff7d57d14..b73a6d40b5d 100644 --- a/GraphicsView/include/CGAL/Qt/manipulatedCameraFrame_impl.h +++ b/GraphicsView/include/CGAL/Qt/manipulatedCameraFrame_impl.h @@ -39,7 +39,6 @@ #include using namespace CGAL::qglviewer; -using namespace std; /*! Default constructor. diff --git a/GraphicsView/include/CGAL/Qt/manipulatedFrame_impl.h b/GraphicsView/include/CGAL/Qt/manipulatedFrame_impl.h index a31a57d6b2a..b8a7d58645f 100644 --- a/GraphicsView/include/CGAL/Qt/manipulatedFrame_impl.h +++ b/GraphicsView/include/CGAL/Qt/manipulatedFrame_impl.h @@ -41,7 +41,6 @@ #include using namespace CGAL::qglviewer; -using namespace std; /*! Default constructor. diff --git a/GraphicsView/include/CGAL/Qt/qglviewer_impl.h b/GraphicsView/include/CGAL/Qt/qglviewer_impl.h index 2d78bd719fb..dc0e84f0d86 100644 --- a/GraphicsView/include/CGAL/Qt/qglviewer_impl.h +++ b/GraphicsView/include/CGAL/Qt/qglviewer_impl.h @@ -59,7 +59,6 @@ #include #include -using namespace std; using namespace CGAL::qglviewer; // Static private variable diff --git a/GraphicsView/include/CGAL/Qt/quaternion_impl.h b/GraphicsView/include/CGAL/Qt/quaternion_impl.h index bc8960bebf1..dd09dfbe4f6 100644 --- a/GraphicsView/include/CGAL/Qt/quaternion_impl.h +++ b/GraphicsView/include/CGAL/Qt/quaternion_impl.h @@ -37,7 +37,6 @@ // All the methods are declared inline in Quaternion.h using namespace CGAL::qglviewer; -using namespace std; /*! Constructs a Quaternion that will rotate from the \p from direction to the \p to direction. @@ -533,7 +532,7 @@ Quaternion Quaternion::squadTangent(const Quaternion &before, } CGAL_INLINE_FUNCTION -ostream &operator<<(ostream &o, const Quaternion &Q) { +std::ostream &operator<<(std::ostream &o, const Quaternion &Q) { return o << Q[0] << '\t' << Q[1] << '\t' << Q[2] << '\t' << Q[3]; } diff --git a/GraphicsView/include/CGAL/Qt/vec_impl.h b/GraphicsView/include/CGAL/Qt/vec_impl.h index 2c3bfa37b0f..c9b40ac8099 100644 --- a/GraphicsView/include/CGAL/Qt/vec_impl.h +++ b/GraphicsView/include/CGAL/Qt/vec_impl.h @@ -37,7 +37,6 @@ // Most of the methods are declared inline in vec.h using namespace CGAL::qglviewer; -using namespace std; /*! Projects the Vec on the axis of direction \p direction that passes through the origin. @@ -178,6 +177,6 @@ void Vec::initFromDOMElement(const QDomElement &element) { } CGAL_INLINE_FUNCTION -ostream &operator<<(ostream &o, const Vec &v) { +std::ostream &operator<<(std::ostream &o, const Vec &v) { return o << v.x << '\t' << v.y << '\t' << v.z; }