Remove Q_NO_USING_KEYWORD usage

Compilers that don't support the using keyword are too old

Change-Id: I5337271984845bdecee058da9320197ccb6f6981
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

4 files changed, 0 insertions, 69 deletions

diff --git a/src/positioning/qgeocircle.cpp b/src/positioning/qgeocircle.cpp
index 459ce824..6cacc7bc 100644
--- a/src/positioning/qgeocircle.cpp
+++ b/src/positioning/qgeocircle.cpp
@@ -57,20 +57,6 @@ QT_BEGIN_NAMESPACE
     or if the radius is less than zero.
 */
 
-#ifdef Q_NO_USING_KEYWORD
-/*!
-    \fn bool QGeoCircle::operator==(const QGeoShape &other) const
-
-    Returns true if \a other is equal to this geo circle; otherwise returns false.
-*/
-
-/*!
-    \fn bool QGeoCircle::operator!=(const QGeoShape &other) const
-
-    Returns true if \a other is not equal to this geo circle; otherwise returns false.
-*/
-#endif
-
 inline QGeoCirclePrivate *QGeoCircle::d_func()
 {
     return static_cast<QGeoCirclePrivate *>(d_ptr.data());
diff --git a/src/positioning/qgeocircle.h b/src/positioning/qgeocircle.h
index ad07ac6a..18817c33 100644
--- a/src/positioning/qgeocircle.h
+++ b/src/positioning/qgeocircle.h
@@ -53,24 +53,10 @@ public:
 
     QGeoCircle &operator=(const QGeoCircle &other);
 
-#ifdef Q_NO_USING_KEYWORD
-    bool operator==(const QGeoShape &other) const
-    {
-        return QGeoShape::operator==(other);
-    }
-#else
     using QGeoShape::operator==;
-#endif
     bool operator==(const QGeoCircle &other) const;
 
-#ifdef Q_NO_USING_KEYWORD
-    bool operator!=(const QGeoShape &other) const
-    {
-        return QGeoShape::operator!=(other);
-    }
-#else
     using QGeoShape::operator!=;
-#endif
     bool operator!=(const QGeoCircle &other) const;
 
     void setCenter(const QGeoCoordinate &center);
diff --git a/src/positioning/qgeorectangle.cpp b/src/positioning/qgeorectangle.cpp
index d514edf9..b260bbb2 100644
--- a/src/positioning/qgeorectangle.cpp
+++ b/src/positioning/qgeorectangle.cpp
@@ -67,26 +67,6 @@ QT_BEGIN_NAMESPACE
     in the center of the geo rectangle.
 */
 
-#ifdef Q_NO_USING_KEYWORD
-/*!
-    \fn bool QGeoRectangle::operator==(const QGeoShape &other) const
-
-    Returns true if \a other is equivalent to this geo rectangle; otherwise returns false.
-*/
-
-/*!
-    \fn bool QGeoRectangle::operator!=(const QGeoShape &other) const
-
-    Returns true if \a other is not equivalent to this geo rectangle; otherwise returns false.
-*/
-
-/*!
-    \fn bool QGeoRectangle::contains(const QGeoCoordinate &coordinate) const
-
-    Returns true if \a coordinate is within this geo rectangle; otherwise returns false.
-*/
-#endif
-
 inline QGeoRectanglePrivate *QGeoRectangle::d_func()
 {
     return static_cast<QGeoRectanglePrivate *>(d_ptr.data());
diff --git a/src/positioning/qgeorectangle.h b/src/positioning/qgeorectangle.h
index 662c7630..de647c92 100644
--- a/src/positioning/qgeorectangle.h
+++ b/src/positioning/qgeorectangle.h
@@ -55,24 +55,10 @@ public:
 
     QGeoRectangle &operator=(const QGeoRectangle &other);
 
-#ifdef Q_NO_USING_KEYWORD
-    bool operator==(const QGeoShape &other) const
-    {
-        return QGeoShape::operator==(other);
-    }
-#else
     using QGeoShape::operator==;
-#endif
     bool operator==(const QGeoRectangle &other) const;
 
-#ifdef Q_NO_USING_KEYWORD
-    bool operator!=(const QGeoShape &other) const
-    {
-        return QGeoShape::operator!=(other);
-    }
-#else
     using QGeoShape::operator!=;
-#endif
     bool operator!=(const QGeoRectangle &other) const;
 
     void setTopLeft(const QGeoCoordinate &topLeft);
@@ -96,14 +82,7 @@ public:
     void setHeight(double degreesHeight);
     double height() const;
 
-#ifdef Q_NO_USING_KEYWORD
-    bool contains(const QGeoCoordinate &coordinate) const
-    {
-        return QGeoShape::contains(coordinate);
-    }
-#else
     using QGeoShape::contains;
-#endif
     bool contains(const QGeoRectangle &rectangle) const;
     bool intersects(const QGeoRectangle &rectangle) const;