[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [marble] src/lib/marble: simplify
From:       Bernhard Beschow <bbeschow () cs ! tu-berlin ! de>
Date:       2016-10-03 19:52:11
Message-ID: E1br9HX-0000rO-Qp () code ! kde ! org
[Download RAW message or body]

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 QColor& color )
 
 GeoDataStyle::ConstPtr StyleBuilder::createStyle(const StyleParameters &parameters) const
 {
-    if (!parameters.placemark) {
-        Q_ASSERT(false && "Must not pass a null feature to StyleBuilder::createStyle");
+    const GeoDataPlacemark *const placemark = 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 = parameters.placemark->visualCategory();
+    auto const visualCategory = placemark->visualCategory();
     GeoDataStyle::ConstPtr style = presetStyle(visualCategory);
-    if (parameters.placemark->nodeType() != GeoDataTypes::GeoDataPlacemarkType) {
-        return style;
-    }
 
-    GeoDataPlacemark const * placemark = static_cast<GeoDataPlacemark const *>(parameters.placemark);
     OsmPlacemarkData const & osmData = placemark->osmData();
     if (placemark->geometry()->nodeType() == GeoDataTypes::GeoDataPointType) {
         if (visualCategory == GeoDataPlacemark::NaturalTree) {
[prev in list] [next in list] [prev in thread] [next in thread]