summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Beschow <bbeschow@cs.tu-berlin.de>2016-10-09 17:08:27 (GMT)
committerBernhard Beschow <bbeschow@cs.tu-berlin.de>2016-10-16 17:03:46 (GMT)
commit7463cfd00e53d8e0a89f933efd1755ba11084689 (patch)
treedf7b521279caa536f2f3e2bab7d0fda8b2bbf56a
parent882d42a3e9bb74edb02cc709413a6182ffce51c7 (diff)
no need to inherit from GeoDataCoordinatesPrivate
This is a follow-up commit on 05acba924cead03d63c3d971fb2c6ab8055218be.
-rw-r--r--src/lib/marble/geodata/data/GeoDataCoordinates.h19
-rw-r--r--src/lib/marble/geodata/data/GeoDataPoint_p.h4
2 files changed, 11 insertions, 12 deletions
diff --git a/src/lib/marble/geodata/data/GeoDataCoordinates.h b/src/lib/marble/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==( const GeoDataCoordinates& ) const;
- virtual bool operator !=( const GeoDataCoordinates& ) const;
+
+ bool operator==(const GeoDataCoordinates &other) const;
+ bool operator!=(const GeoDataCoordinates &other) const;
+
GeoDataCoordinates& operator=( 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;