From kde-commits  Sun Oct 16 17:35:38 2016
From: Bernhard Beschow <bbeschow () cs ! tu-berlin ! de>
Date: Sun, 16 Oct 2016 17:35:38 +0000
To: kde-commits
Subject: [marble] src/lib/marble/geodata/data: no need to inherit from GeoDataCoordinatesPrivate
Message-Id: <E1bvpLW-0001hM-7E () code ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=147663934727106

Git commit 7463cfd00e53d8e0a89f933efd1755ba11084689 by Bernhard Beschow.
Committed on 16/10/2016 at 17:03.
Pushed by beschow into branch 'master'.

no need to inherit from GeoDataCoordinatesPrivate

This is a follow-up commit on 05acba924cead03d63c3d971fb2c6ab8055218be.

M  +10   -9    src/lib/marble/geodata/data/GeoDataCoordinates.h
M  +1    -3    src/lib/marble/geodata/data/GeoDataPoint_p.h

http://commits.kde.org/marble/7463cfd00e53d8e0a89f933efd1755ba11084689

diff --git a/src/lib/marble/geodata/data/GeoDataCoordinates.h b/src/lib/mar=
ble/geodata/data/GeoDataCoordinates.h
index 1089124..fb57077 100644
--- a/src/lib/marble/geodata/data/GeoDataCoordinates.h
+++ b/src/lib/marble/geodata/data/GeoDataCoordinates.h
@@ -406,21 +406,22 @@ class GEODATA_EXPORT GeoDataCoordinates
      * convenience function that uses the default notation
      */
     QString latToString() const;
-    =

-    virtual bool operator=3D=3D( const GeoDataCoordinates& ) const;
-    virtual bool operator !=3D( const GeoDataCoordinates& ) const;
+
+    bool operator=3D=3D(const GeoDataCoordinates &other) const;
+    bool operator!=3D(const GeoDataCoordinates &other) const;
+
     GeoDataCoordinates& operator=3D( const GeoDataCoordinates &other );
 =

     /** Serialize the contents of the feature to @p stream. */
-    virtual void pack( QDataStream& stream ) const;
+    void pack(QDataStream &stream) const;
     /** Unserialize the contents of the feature from @p stream. */
-    virtual void unpack( QDataStream& stream );
-
-    virtual void detach();
- protected:
-    GeoDataCoordinatesPrivate* d;
+    void unpack(QDataStream &stream);
 =

  private:
+    void detach();
+
+    GeoDataCoordinatesPrivate *d;
+
     static GeoDataCoordinates::Notation s_notation;
     static const GeoDataCoordinates null;
 };
diff --git a/src/lib/marble/geodata/data/GeoDataPoint_p.h b/src/lib/marble/=
geodata/data/GeoDataPoint_p.h
index f4c017f..9aa0079 100644
--- a/src/lib/marble/geodata/data/GeoDataPoint_p.h
+++ b/src/lib/marble/geodata/data/GeoDataPoint_p.h
@@ -12,13 +12,11 @@
 #define MARBLE_GEODATAPOINTPRIVATE_H
 =

 #include "GeoDataGeometry_p.h"
-#include "GeoDataCoordinates_p.h"
 =

 namespace Marble
 {
 =

-class GeoDataPointPrivate : public GeoDataGeometryPrivate,
-                            public GeoDataCoordinatesPrivate
+class GeoDataPointPrivate : public GeoDataGeometryPrivate
 {
 public:
     GeoDataCoordinates m_coordinates;