Commit 7463cfd0 authored by Bernhard Beschow's avatar Bernhard Beschow
Browse files

no need to inherit from GeoDataCoordinatesPrivate

This is a follow-up commit on 05acba92.
parent 882d42a3
......@@ -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;
};
......
......@@ -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;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment