remove GeoDataFeature::presetStyle(), use StyleBuilder::presetStyle() directly

src/lib/marble/geodata/data/GeoDataFeature.cpp

@@ -160,12 +160,6 @@ EnumFeatureId GeoDataFeature::featureId() const
     return d->featureId();
 }
 
-
-QSharedPointer<const GeoDataStyle> GeoDataFeature::presetStyle( GeoDataVisualCategory category )
-{
-    return GeoDataFeaturePrivate::s_styleBuilder.presetStyle(category);
-}
-
 QString GeoDataFeature::name() const
 {
     return d->m_name;

src/lib/marble/geodata/data/GeoDataFeature.h

@@ -633,8 +633,6 @@ class GEODATA_EXPORT GeoDataFeature : public GeoDataObject
     /// Unserialize the contents of the feature from @p stream.
     virtual void unpack( QDataStream& stream );
 
-    static QSharedPointer<const GeoDataStyle> presetStyle( GeoDataVisualCategory category );
-
  protected:
     // the d-pointer needs to be protected to be accessible from derived classes
     GeoDataFeaturePrivate* d;

src/lib/marble/osm/OsmPresetLibrary.cpp

@@ -15,6 +15,7 @@
 #include "GeoDataPlacemark.h"
 #include "GeoDataStyle.h"
 #include "OsmPlacemarkData.h"
+#include "StyleBuilder.h"
 
 #include <QMap>
 
@@ -467,8 +468,11 @@ void OsmPresetLibrary::initializeAdditionalOsmTags()
 
 GeoDataStyle::ConstPtr OsmPresetLibrary::presetStyle( const OsmTag &tag )
 {
-  GeoDataFeature::GeoDataVisualCategory category = osmVisualCategory( tag.first + "=" + tag.second );
-  return GeoDataFeature::presetStyle( category );
+    static const StyleBuilder styleBuilder;
+
+    const GeoDataFeature::GeoDataVisualCategory category = osmVisualCategory(tag.first + "=" + tag.second);
+
+    return styleBuilder.presetStyle(category);
 }
 
 bool OsmPresetLibrary::hasVisualCategory ( const OsmTag &tag )