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

[Thibaut Gridel]

SVN commit 1011596 by tgridel:

pedantic

 M  +1 -0      lib/MarbleModel.cpp  
 M  +2 -0      lib/MarbleWidget.cpp  
 M  +2 -2      lib/PlacemarkManager.cpp  
 M  +1 -0      lib/geodata/GeoDataTest.cpp  
 M  +1 -0      lib/geodata/writers/kml/KmlTagWriter.cpp  
 M  +2 -0      plugins/network/qnam/QNamDownloadJob.cpp  
 M  +4 -0      plugins/render/dataview/DataViewPlugin.cpp  
 M  +1 -1      qtmain.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/MarbleModel.cpp #1011595:1011596
@@ -738,6 +738,7 @@
 
 void MarbleModelPrivate::geoDataDocumentAdded( const GeoDataDocument& document )
 {
+    Q_UNUSED(document);
 /*    QVector<GeoDataFeature>::Iterator end = document->end();
     QVector<GeoDataFeature>::Iterator itr = document->begin();
     for ( ; itr != end; ++itr ) {
--- trunk/KDE/kdeedu/marble/src/lib/MarbleWidget.cpp #1011595:1011596
@@ -614,6 +614,7 @@
 
 void MarbleWidget::centerOn( const GeoDataLatLonBox &box, bool animated )
 {
+    Q_UNUSED(animated);
     //work out the needed zoom level
     ViewportParams* viewparams = d->m_map->viewParams()->viewport();
     int maxScreenSize = viewparams->height() > viewparams->width() ?
@@ -1140,6 +1141,7 @@
 
 void MarbleWidget::scheduleRepaint( QRegion dirtyRegion )
 {
+    Q_UNUSED(dirtyRegion);
     if ( !d->m_repaintTimer.isActive() ) {
         d->m_repaintTimer.start();
     }
--- trunk/KDE/kdeedu/marble/src/lib/PlacemarkManager.cpp #1011595:1011596
@@ -40,7 +40,7 @@
 class PlacemarkManagerPrivate
 {
     public:
-        PlacemarkManagerPrivate( QObject* parent )
+        PlacemarkManagerPrivate( )
         : m_model( 0 )
         , m_geomodel( 0 )
         , m_fileViewModel( new FileViewModel(parent ) )
@@ -62,7 +62,7 @@
 
 PlacemarkManager::PlacemarkManager( QObject *parent )
     : QObject( parent )
-    , d( new PlacemarkManagerPrivate( parent ) )
+    , d( new PlacemarkManagerPrivate() )
 {
     
 }
--- trunk/KDE/kdeedu/marble/src/lib/geodata/GeoDataTest.cpp #1011595:1011596
@@ -191,6 +191,7 @@
 
 void dumpGeoDataPlacemark(const GeoDataPlacemark& placemark)
 {
+    Q_UNUSED(placemark);
 //	qDebug() << placemark.name() << placemark.population() << placemark.coordinate().toString()<<"lookAt info "<<(placemark.lookAt()->coordinate())->toString()<<placemark.lookAt()->altitude();
 }
 
--- trunk/KDE/kdeedu/marble/src/lib/geodata/writers/kml/KmlTagWriter.cpp #1011595:1011596
@@ -24,6 +24,7 @@
 
 bool KmlTagWriter::write( const GeoDataObject &node, GeoWriter& writer ) const
 {
+    Q_UNUSED(node);
     writer.writeStartElement( "kml" );
     writer.writeAttribute( "xmlns", kml::kmlTag_nameSpace22 );
 
--- trunk/KDE/kdeedu/marble/src/plugins/network/qnam/QNamDownloadJob.cpp #1011595:1011596
@@ -42,6 +42,8 @@
 
 void QNamDownloadJob::downloadProgress( qint64 bytesReceived, qint64 bytesTotal )
 {
+    Q_UNUSED(bytesReceived);
+    Q_UNUSED(bytesTotal);
 //     qDebug() << "downloadProgress" << destinationFileName()
 //              << bytesReceived << '/' << bytesTotal;
 }
--- trunk/KDE/kdeedu/marble/src/plugins/render/dataview/DataViewPlugin.cpp #1011595:1011596
@@ -113,6 +113,10 @@
 
 bool DataViewPlugin::render( GeoPainter *painter, ViewportParams *viewport, const QString& renderPos, GeoSceneLayer * layer )
 {
+    Q_UNUSED(painter);
+    Q_UNUSED(viewport);
+    Q_UNUSED(renderPos);
+    Q_UNUSED(layer);
     return true;
 }
 
--- trunk/KDE/kdeedu/marble/src/qtmain.cpp #1011595:1011596
@@ -21,7 +21,7 @@
 #include "MarbleDirs.h"
 #include "MarbleTest.h"
 
-#if STATIC_BUILD
+#ifdef STATIC_BUILD
  #include <QtCore/QtPlugin>
  Q_IMPORT_PLUGIN(qjpeg)
  Q_IMPORT_PLUGIN(qsvg)