Git commit b5672254104e974ab4fc8cb8e8bcff7116e3c709 by Bernhard Beschow.
Committed on 03/10/2016 at 18:56.
Pushed by beschow into branch 'master'.

simplify

M  +7    -9    src/lib/marble/StyleBuilder.cpp

http://commits.kde.org/marble/b5672254104e974ab4fc8cb8e8bcff7116e3c709

diff --git a/src/lib/marble/StyleBuilder.cpp b/src/lib/marble/StyleBuilder.=
cpp
index 10a51ce..d8eabd6 100644
--- a/src/lib/marble/StyleBuilder.cpp
+++ b/src/lib/marble/StyleBuilder.cpp
@@ -1189,22 +1189,20 @@ void StyleBuilder::setDefaultLabelColor( const QCol=
or& color )
 =

 GeoDataStyle::ConstPtr StyleBuilder::createStyle(const StyleParameters &pa=
rameters) const
 {
-    if (!parameters.placemark) {
-        Q_ASSERT(false && "Must not pass a null feature to StyleBuilder::c=
reateStyle");
+    const GeoDataPlacemark *const placemark =3D parameters.placemark;
+
+    if (!placemark) {
+        Q_ASSERT(false && "Must not pass a null placemark to StyleBuilder:=
:createStyle");
         return GeoDataStyle::Ptr();
     }
 =

-    if (parameters.placemark->customStyle()) {
-        return parameters.placemark->customStyle();
+    if (placemark->customStyle()) {
+        return placemark->customStyle();
     }
 =

-    auto const visualCategory =3D parameters.placemark->visualCategory();
+    auto const visualCategory =3D placemark->visualCategory();
     GeoDataStyle::ConstPtr style =3D presetStyle(visualCategory);
-    if (parameters.placemark->nodeType() !=3D GeoDataTypes::GeoDataPlacema=
rkType) {
-        return style;
-    }
 =

-    GeoDataPlacemark const * placemark =3D static_cast<GeoDataPlacemark co=
nst *>(parameters.placemark);
     OsmPlacemarkData const & osmData =3D placemark->osmData();
     if (placemark->geometry()->nodeType() =3D=3D GeoDataTypes::GeoDataPoin=
tType) {
         if (visualCategory =3D=3D GeoDataPlacemark::NaturalTree) {