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

List:       kde-commits
Subject:    [marble] src/plugins/render/satellites: initialize style before assigning it
From:       Bernhard Beschow <bbeschow () cs ! tu-berlin ! de>
Date:       2014-01-04 11:08:03
Message-ID: E1VzP5H-0007jb-T7 () scm ! kde ! org
[Download RAW message or body]

Git commit 101e56fb5cb76498d2cc01fb8a555cde27522773 by Bernhard Beschow.
Committed on 04/01/2014 at 11:07.
Pushed by beschow into branch 'master'.

initialize style before assigning it

M  +5    -5    src/plugins/render/satellites/SatellitesMSCItem.cpp
M  +2    -2    src/plugins/render/satellites/SatellitesTLEItem.cpp

http://commits.kde.org/marble/101e56fb5cb76498d2cc01fb8a555cde27522773

diff --git a/src/plugins/render/satellites/SatellitesMSCItem.cpp \
b/src/plugins/render/satellites/SatellitesMSCItem.cpp index ff3b20f..a4d5711 100644
--- a/src/plugins/render/satellites/SatellitesMSCItem.cpp
+++ b/src/plugins/render/satellites/SatellitesMSCItem.cpp
@@ -54,16 +54,16 @@ SatellitesMSCItem::SatellitesMSCItem( const QString &name,
     placemark()->setGeometry( m_track );
 
     GeoDataStyle *style = new GeoDataStyle( *placemark()->style() );
-    placemark()->setStyle( style );
-    placemark()->style()->lineStyle().setPenStyle( Qt::NoPen );
-    placemark()->style()->labelStyle().setGlow( true );
+    style->lineStyle().setPenStyle( Qt::NoPen );
+    style->labelStyle().setGlow( true );
 
     // use special icon for moons
     if( m_category == "Moons" ) {
-        placemark()->style()->iconStyle().setIcon(
-            QImage( ":/icons/moon.png" ) );
+        style->iconStyle().setIcon( QImage( ":/icons/moon.png" ) );
     }
 
+    placemark()->setStyle( style );
+
 
     m_planSat->getKeplerElements(
         m_perc, m_apoc, m_inc, m_ecc, m_ra, m_tano, m_m0, m_a, m_n0 );
diff --git a/src/plugins/render/satellites/SatellitesTLEItem.cpp \
b/src/plugins/render/satellites/SatellitesTLEItem.cpp index 5248601..7680002 100644
--- a/src/plugins/render/satellites/SatellitesTLEItem.cpp
+++ b/src/plugins/render/satellites/SatellitesTLEItem.cpp
@@ -57,9 +57,9 @@ SatellitesTLEItem::SatellitesTLEItem( const QString &name,
     placemark()->setGeometry( m_track );
 
     GeoDataStyle *style = new GeoDataStyle( *placemark()->style() );
+    style->lineStyle().setPenStyle( Qt::NoPen );
+    style->labelStyle().setGlow( true );
     placemark()->setStyle( style );
-    placemark()->style()->lineStyle().setPenStyle( Qt::NoPen );
-    placemark()->style()->labelStyle().setGlow( true );
 
     update();
 }


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