[Marble-commits] branches/KDE/4.5/kdeedu/marble/src/plugins/render/geodata

[Bastian Holst]

SVN commit 1148068 by bholst:

Break long lines.

backport of r1148067

 M  +8 -3      GeoRendererView.cpp  


--- branches/KDE/4.5/kdeedu/marble/src/plugins/render/geodata/GeoRendererView.cpp #1148067:1148068
@@ -102,8 +102,12 @@
      * then call the real render function. For the rest iterate through the
      * children and recurse.
      */
-    GeoDataObject* indexObject = model()->data( rootIndex(), Qt::UserRole + 11 ).value<Marble::GeoDataObject*>();
-    if( !( dynamic_cast<GeoDataFeature*>( indexObject ) && dynamic_cast<GeoDataFeature*>( indexObject )->isVisible() ) ) return;
+    QVariant indexObjectVariant = model()->data( rootIndex(), Qt::UserRole + 11 );
+    GeoDataObject* indexObject = indexObjectVariant.value<Marble::GeoDataObject*>();
+    if( !( dynamic_cast<GeoDataFeature*>( indexObject )
+           && dynamic_cast<GeoDataFeature*>( indexObject )->isVisible() ) ) {
+        return;
+    }
 
     int rowCount = model()->rowCount( index );
    
@@ -111,7 +115,8 @@
     {
         QModelIndex childIndex = model()->index( row, 0, index );
         QString output = model()->data( childIndex ).toString();
-        GeoDataObject* object = model()->data( childIndex, Qt::UserRole + 11 ).value<Marble::GeoDataObject*>();
+        QVariant objectVariant = model()->data( childIndex, Qt::UserRole + 11 );
+        GeoDataObject* object = objectVariant.value<Marble::GeoDataObject*>();
 
         if( dynamic_cast<GeoDataGeometry*>( object ) ) {
             if( static_cast<GeoDataGeometry*>( object )->geometryId() != GeoDataMultiGeometryId ) {