[Marble-commits] KDE/kdeedu/marble/src/lib

[Thibaut Gridel]

SVN commit 1205737 by tgridel:

Provide GeoDataObject* through model::data()

 M  +3 -0      GeoDataTreeModel.cpp  
 M  +2 -2      MarblePlacemarkModel.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/GeoDataTreeModel.cpp #1205736:1205737
@@ -28,6 +28,7 @@
 #include "FileManager.h"
 #include "KmlFileViewItem.h"
 #include "MarbleDebug.h"
+#include "MarblePlacemarkModel.h"
 
 using namespace Marble;
 
@@ -223,6 +224,8 @@
         GeoDataFeature *feature = dynamic_cast<GeoDataFeature*>( object );
         if ( feature )
             return QVariant(feature->style()->iconStyle().icon());
+    } else if ( role == MarblePlacemarkModel::ObjectPointerRole ) {
+        return qVariantFromValue( object );
     }
 
     return QVariant();
--- trunk/KDE/kdeedu/marble/src/lib/MarblePlacemarkModel.cpp #1205736:1205737
@@ -119,8 +119,8 @@
         return qVariantFromValue( d->m_placemarkContainer->at( index.row() )->extendedData().value("dst").value() );
     } else if ( role == GeometryRole ) {
         return qVariantFromValue( d->m_placemarkContainer->at( index.row() )->geometry() );
-/*    } else if ( role == ObjectPointerRole ) {
-        return qVariantFromValue( dynamic_cast<GeoDataObject*>( d->m_placemarkContainer->at( index.row() ) ) );*/
+    } else if ( role == ObjectPointerRole ) {
+        return qVariantFromValue( dynamic_cast<GeoDataObject*>( d->m_placemarkContainer->at( index.row() ) ) );
     } else
         return QVariant();
 }