Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit bd6e567a authored by Bernhard Beschow's avatar Bernhard Beschow

no need to forward to private method

parent be1aa257
......@@ -29,11 +29,6 @@ class GeoDataColorStylePrivate
{
}
const char* nodeType() const
{
return GeoDataTypes::GeoDataColorStyleType;
}
/// stores the current color
QColor m_color;
......@@ -80,7 +75,7 @@ bool GeoDataColorStyle::operator!=( const GeoDataColorStyle &other ) const
const char* GeoDataColorStyle::nodeType() const
{
return d->nodeType();
return GeoDataTypes::GeoDataColorStyleType;
}
void GeoDataColorStyle::setColor( const QColor &value )
......
......@@ -63,7 +63,7 @@ GeoDataData::GeoDataData( const QString &name, const QVariant &value )
const char* GeoDataData::nodeType() const
{
return d->nodeType();
return GeoDataTypes::GeoDataDataType;
}
QVariant GeoDataData::value() const
......
......@@ -22,11 +22,6 @@ namespace Marble
class GeoDataDataPrivate
{
public:
const char* nodeType() const
{
return GeoDataTypes::GeoDataDataType;
}
QVariant m_value;
QString m_name;
QString m_displayName;
......
......@@ -55,7 +55,7 @@ bool GeoDataExtendedData::operator!=( const GeoDataExtendedData &other ) const
const char* GeoDataExtendedData::nodeType() const
{
return d->nodeType();
return GeoDataTypes::GeoDataExtendedDataType;
}
GeoDataData& GeoDataExtendedData::valueRef( const QString& key ) const
......
......@@ -26,12 +26,6 @@ namespace Marble
class GeoDataExtendedDataPrivate
{
public:
const char* nodeType() const
{
return GeoDataTypes::GeoDataExtendedDataType;
}
QHash< QString, GeoDataData > hash;
QHash< QString, GeoDataSimpleArrayData* > arrayHash;
QHash< QString, GeoDataSchemaData> schemaDataHash;
......
......@@ -33,11 +33,6 @@ class GeoDataHotSpotPrivate
{
}
const char* nodeType() const
{
return GeoDataTypes::GeoDataHotspotType;
}
QPointF m_hotSpot;
GeoDataHotSpot::Units m_xunits;
GeoDataHotSpot::Units m_yunits;
......@@ -97,7 +92,7 @@ void GeoDataHotSpot::setHotSpot( const QPointF& hotSpot, Units xunits, Units yun
const char* GeoDataHotSpot::nodeType() const
{
return d->nodeType();
return GeoDataTypes::GeoDataHotspotType;
}
void GeoDataHotSpot::pack( QDataStream& stream ) const
......
......@@ -45,11 +45,6 @@ class GeoDataIconStylePrivate
{
}
const char* nodeType() const
{
return GeoDataTypes::GeoDataIconStyleType;
}
RemoteIconLoader* remoteIconLoader() const
{
static RemoteIconLoader *remoteIconLoader = new RemoteIconLoader();
......@@ -167,7 +162,7 @@ bool GeoDataIconStyle::operator!=( const GeoDataIconStyle &other ) const
const char* GeoDataIconStyle::nodeType() const
{
return d->nodeType();
return GeoDataTypes::GeoDataIconStyleType;
}
void GeoDataIconStyle::setIcon(const QImage &icon)
......
......@@ -45,11 +45,6 @@ class GeoDataLabelStylePrivate
{
}
const char* nodeType() const
{
return GeoDataTypes::GeoDataLabelStyleType;
}
/// The current scale of the label
float m_scale;
/// The current alignment of the label
......@@ -108,7 +103,7 @@ bool GeoDataLabelStyle::operator!=( const GeoDataLabelStyle &other ) const
const char* GeoDataLabelStyle::nodeType() const
{
return d->nodeType();
return GeoDataTypes::GeoDataLabelStyleType;
}
void GeoDataLabelStyle::setAlignment( GeoDataLabelStyle::Alignment alignment )
......
......@@ -33,11 +33,6 @@ class GeoDataLatLonAltBoxPrivate
{
}
const char* nodeType() const
{
return GeoDataTypes::GeoDataLatLonAltBoxType;
}
qreal m_minAltitude;
qreal m_maxAltitude;
AltitudeMode m_altitudeMode;
......@@ -122,7 +117,7 @@ GeoDataLatLonAltBox::~GeoDataLatLonAltBox()
const char* GeoDataLatLonAltBox::nodeType() const
{
return d->nodeType();
return GeoDataTypes::GeoDataLatLonAltBoxType;
}
qreal GeoDataLatLonAltBox::minAltitude() const
......
......@@ -37,11 +37,6 @@ class GeoDataLatLonBoxPrivate
{
}
const char* nodeType() const
{
return GeoDataTypes::GeoDataLatLonBoxType;
}
qreal m_north;
qreal m_south;
qreal m_east;
......@@ -89,7 +84,7 @@ GeoDataLatLonBox::~GeoDataLatLonBox()
const char* GeoDataLatLonBox::nodeType() const
{
return d->nodeType();
return GeoDataTypes::GeoDataLatLonBoxType;
}
qreal GeoDataLatLonBox::north( GeoDataCoordinates::Unit unit ) const
......
......@@ -28,11 +28,6 @@ class GeoDataLineStylePrivate
{
}
const char* nodeType() const
{
return GeoDataTypes::GeoDataLineStyleType;
}
/// The current width of the line
float m_width;
/// The current real width of the line
......@@ -93,7 +88,7 @@ bool GeoDataLineStyle::operator!=( const GeoDataLineStyle &other ) const
const char* GeoDataLineStyle::nodeType() const
{
return d->nodeType();
return GeoDataTypes::GeoDataLineStyleType;
}
void GeoDataLineStyle::setWidth(float width)
......
......@@ -49,7 +49,7 @@ bool GeoDataLod::operator!=(const GeoDataLod& other) const
const char* GeoDataLod::nodeType() const
{
return d->nodeType();
return GeoDataTypes::GeoDataLodType;
}
......
......@@ -29,11 +29,6 @@ class GeoDataLodPrivate
{
}
const char* nodeType() const
{
return GeoDataTypes::GeoDataLodType;
}
qreal m_minLodPixels;
qreal m_maxLodPixels;
qreal m_minFadeExtent;
......
......@@ -30,11 +30,6 @@ class GeoDataPolyStylePrivate
{
}
const char* nodeType() const
{
return GeoDataTypes::GeoDataPolyStyleType;
}
/// whether to fill the polygon
bool m_fill;
/// whether to draw the outline
......@@ -92,7 +87,7 @@ bool GeoDataPolyStyle::operator!=( const GeoDataPolyStyle &other ) const
const char* GeoDataPolyStyle::nodeType() const
{
return d->nodeType();
return GeoDataTypes::GeoDataPolyStyleType;
}
void GeoDataPolyStyle::setFill(bool fill)
......
......@@ -54,7 +54,7 @@ GeoDataRegion::~GeoDataRegion()
const char* GeoDataRegion::nodeType() const
{
return d->nodeType();
return GeoDataTypes::GeoDataRegionType;
}
bool GeoDataRegion::operator==(const GeoDataRegion& other) const
......
......@@ -62,12 +62,6 @@ class GeoDataRegionPrivate
delete m_lod;
}
const char* nodeType() const
{
return GeoDataTypes::GeoDataRegionType;
}
GeoDataFeature * m_parent;
GeoDataLatLonAltBox * m_latLonAltBox;
GeoDataLod * m_lod;
......
......@@ -39,11 +39,6 @@ class GeoDataStylePrivate
{
}
const char* nodeType() const
{
return GeoDataTypes::GeoDataStyleType;
}
GeoDataIconStyle m_iconStyle;
GeoDataLabelStyle m_labelStyle;
GeoDataLineStyle m_lineStyle;
......@@ -101,7 +96,7 @@ bool GeoDataStyle::operator!=( const GeoDataStyle &other ) const
const char* GeoDataStyle::nodeType() const
{
return d->nodeType();
return GeoDataTypes::GeoDataStyleType;
}
void GeoDataStyle::setIconStyle( const GeoDataIconStyle& style )
......
......@@ -20,11 +20,6 @@ namespace Marble
class GeoDataStyleMapPrivate
{
public:
const char* nodeType() const
{
return GeoDataTypes::GeoDataStyleMapType;
}
QString lastKey;
};
......@@ -47,7 +42,7 @@ GeoDataStyleMap::~GeoDataStyleMap()
const char* GeoDataStyleMap::nodeType() const
{
return d->nodeType();
return GeoDataTypes::GeoDataStyleMapType;
}
QString GeoDataStyleMap::lastKey() const
......
......@@ -47,7 +47,7 @@ GeoDataTimePrimitive& GeoDataTimePrimitive::operator=( const GeoDataTimePrimitiv
const char* GeoDataTimePrimitive::nodeType() const
{
return d->nodeType();
return GeoDataTypes::GeoDataTimePrimitiveType;
}
void GeoDataTimePrimitive::pack( QDataStream& stream ) const
......
......@@ -18,12 +18,6 @@ namespace Marble
class GeoDataTimePrimitivePrivate
{
public:
const char* nodeType() const
{
return GeoDataTypes::GeoDataTimePrimitiveType;
}
};
} // namespace Marble
......
......@@ -42,7 +42,7 @@ GeoDataTimeSpan::~GeoDataTimeSpan()
const char* GeoDataTimeSpan::nodeType() const
{
return d->nodeType();
return GeoDataTypes::GeoDataTimePrimitiveType;
}
const GeoDataTimeStamp & GeoDataTimeSpan::end() const
......
......@@ -20,11 +20,6 @@ namespace Marble
class GeoDataTimeSpanPrivate
{
public:
const char* nodeType() const
{
return GeoDataTypes::GeoDataTimeSpanType;
}
GeoDataTimeStamp m_begin;
GeoDataTimeStamp m_end;
};
......
......@@ -51,12 +51,7 @@ class GeoSceneDocumentPrivate
delete m_settings;
delete m_legend;
}
const char* nodeType() const
{
return GeoSceneTypes::GeoSceneDocumentType;
}
GeoSceneHead* m_head;
GeoSceneMap* m_map;
GeoSceneSettings* m_settings;
......@@ -80,7 +75,7 @@ GeoSceneDocument::~GeoSceneDocument()
const char* GeoSceneDocument::nodeType() const
{
return d->nodeType();
return GeoSceneTypes::GeoSceneDocumentType;
}
const GeoSceneHead* GeoSceneDocument::head() const
......
......@@ -53,11 +53,6 @@ class GeoSceneHeadPrivate
delete m_zoom;
delete m_license;
}
const char* nodeType() const
{
return GeoSceneTypes::GeoSceneHeadType;
}
GeoSceneZoom* m_zoom;
GeoSceneIcon* m_icon;
......@@ -85,7 +80,7 @@ GeoSceneHead::~GeoSceneHead()
const char* GeoSceneHead::nodeType() const
{
return d->nodeType();
return GeoSceneTypes::GeoSceneHeadType;
}
QString GeoSceneHead::name() const
......
......@@ -33,11 +33,6 @@ class GeoSceneLayerPrivate
public:
GeoSceneLayerPrivate(const QString &name);
~GeoSceneLayerPrivate();
const char* nodeType() const
{
return GeoSceneTypes::GeoSceneLayerType;
}
/// The vector holding all the data in the layer.
/// (We want to preserve the order and don't care
......@@ -79,7 +74,7 @@ GeoSceneLayer::~GeoSceneLayer()
const char* GeoSceneLayer::nodeType() const
{
return d->nodeType();
return GeoSceneTypes::GeoSceneLayerType;
}
void GeoSceneLayer::addDataset( GeoSceneAbstractDataset* dataset )
......
......@@ -39,11 +39,6 @@ class GeoSceneLegendPrivate
/// (We want to preserve the order and don't care
/// much about speed here), so we don't use a hash
QVector<const GeoSceneSection*> m_sections;
const char* nodeType() const
{
return GeoSceneTypes::GeoSceneLegendType;
}
};
......@@ -59,7 +54,7 @@ GeoSceneLegend::~GeoSceneLegend()
const char* GeoSceneLegend::nodeType() const
{
return d->nodeType();
return GeoSceneTypes::GeoSceneLegendType;
}
void GeoSceneLegend::addSection( const GeoSceneSection* section )
......
......@@ -45,11 +45,6 @@ class GeoSceneMapPrivate
qDeleteAll( m_layers );
qDeleteAll( m_filters );
}
const char* nodeType() const
{
return GeoSceneTypes::GeoSceneMapType;
}
/// The vector holding all the sections in the legend.
/// (We want to preserve the order and don't care
......@@ -81,7 +76,7 @@ GeoSceneMap::~GeoSceneMap()
const char* GeoSceneMap::nodeType() const
{
return d->nodeType();
return GeoSceneTypes::GeoSceneMapType;
}
void GeoSceneMap::addLayer( GeoSceneLayer* layer )
......
......@@ -42,11 +42,6 @@ class GeoSceneSettingsPrivate
/// The hash table holding all the properties in the settings.
QVector<GeoSceneProperty*> m_properties;
QVector<GeoSceneGroup*> m_groups;
const char* nodeType() const
{
return GeoSceneTypes::GeoSceneSettingsType;
}
};
......@@ -62,7 +57,7 @@ GeoSceneSettings::~GeoSceneSettings()
const char* GeoSceneSettings::nodeType() const
{
return d->nodeType();
return GeoSceneTypes::GeoSceneSettingsType;
}
bool GeoSceneSettings::propertyAvailable( const QString& name, bool& available ) const
......
Markdown is supported
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