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

[Dennis Nienhüser]

SVN commit 1168530 by nienhueser:

Fix compiler warnings.

 M  +1 -1      BookmarkInfoDialog.cpp  
 M  +3 -0      GeometryLayer.cpp  
 M  +1 -1      PositionTracking.cpp  
 M  +1 -1      geodata/data/GeoDataLookAt.cpp  
 M  +0 -5      geodata/data/GeoDataLookAt_p.h  


--- trunk/KDE/kdeedu/marble/src/lib/BookmarkInfoDialog.cpp #1168529:1168530
@@ -58,7 +58,7 @@
 
 void BookmarkInfoDialog::retrieveGeocodeResult( const GeoDataCoordinates &coordinates, const GeoDataPlacemark &placemark)
 {
-    
+    Q_UNUSED(coordinates)
     GeoDataExtendedData extended = placemark.extendedData();
     QString bookmarkName = "";
     qreal distance = m_widget->distance() * KM2METER;        
--- trunk/KDE/kdeedu/marble/src/lib/GeometryLayer.cpp #1168529:1168530
@@ -66,6 +66,9 @@
 bool GeometryLayer::render( GeoPainter *painter, ViewportParams *viewport,
    const QString& renderPos, GeoSceneLayer * layer )
 {
+    Q_UNUSED(viewport)
+    Q_UNUSED(renderPos)
+    Q_UNUSED(layer)
 //    QTime t;
 //    t.start();
 //    mDebug() << "rendering " << m_root;
--- trunk/KDE/kdeedu/marble/src/lib/PositionTracking.cpp #1168529:1168530
@@ -34,7 +34,7 @@
         PositionProviderStatusAvailable )
     {
         GeoDataPlacemark *placemark = static_cast<GeoDataPlacemark*>(m_document->child(m_document->size()-1));
-        GeoDataMultiGeometry *geometry = static_cast<GeoDataMultiGeometry*>(placemark->geometry());
+        //GeoDataMultiGeometry *geometry = static_cast<GeoDataMultiGeometry*>(placemark->geometry());
         m_currentLineString->append(position);
 
         //if the position has moved then update the current position
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataLookAt.cpp #1168529:1168530
@@ -50,7 +50,7 @@
 
 QString GeoDataLookAt::nodeType() const
 {
-        return d->nodeType();
+    return GeoDataTypes::GeoDataLookAtType;
 }
 
 void GeoDataLookAt::setAltitude( qreal altitude )
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataLookAt_p.h #1168529:1168530
@@ -32,11 +32,6 @@
     {
     }
     
-    virtual QString nodeType() const
-    {
-        return GeoDataTypes::GeoDataLookAtType;
-    }
-
     GeoDataCoordinates m_coordinates;
     qreal m_range;