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

[Dennis Nienhüser]

SVN commit 1168375 by nienhueser:

fix compiler warnings about unused variables

 M  +3 -0      DownloadQueueSet.cpp  
 M  +2 -1      StackedTileLoader.cpp  
 M  +1 -0      TileLoader.cpp  
 M  +0 -2      runners/LocalDatabaseRunner.cpp  


--- branches/KDE/4.5/kdeedu/marble/src/lib/DownloadQueueSet.cpp #1168374:1168375
@@ -177,8 +177,10 @@
 {
     const bool disconnected = job->disconnect();
     Q_ASSERT( disconnected );
+    Q_UNUSED( disconnected ) // for release mode
     const bool removed = m_activeJobs.removeOne( job );
     Q_ASSERT( removed );
+    Q_UNUSED( removed ) // for release mode
 }
 
 bool DownloadQueueSet::jobIsActive( QString const & destinationFileName ) const
@@ -238,6 +240,7 @@
     HttpJob * const job = m_jobs.pop();
     bool const removed = m_jobsContent.remove( job->destinationFileName() );
     Q_ASSERT( removed );
+    Q_UNUSED( removed ) // for release mode
     return job;
 }
 
--- branches/KDE/4.5/kdeedu/marble/src/lib/StackedTileLoader.cpp #1168374:1168375
@@ -117,7 +117,7 @@
     delete d;
 }
 
-void StackedTileLoader::setDownloadManager( HttpDownloadManager *downloadManager )
+void StackedTileLoader::setDownloadManager( HttpDownloadManager * )
 {
 }
 
@@ -389,6 +389,7 @@
 
 void StackedTileLoader::updateTile( TileId const & stackedTileId, TileId const & tileId )
 {
+    Q_UNUSED(tileId)
     StackedTile * const displayedTile = d->m_tilesOnDisplay.value( stackedTileId, 0 );
     if ( displayedTile ) {
         displayedTile->deriveCompletionState();
--- branches/KDE/4.5/kdeedu/marble/src/lib/TileLoader.cpp #1168374:1168375
@@ -32,6 +32,7 @@
 TileLoader::TileLoader( MapThemeManager const * const mapThemeManager,
                         HttpDownloadManager * const downloadManager )
 {
+    Q_UNUSED( mapThemeManager )
     connect( this, SIGNAL( downloadTile( QUrl, QString, QString, DownloadUsage )),
              downloadManager, SLOT( addJob( QUrl, QString, QString, DownloadUsage )));
     connect( downloadManager, SIGNAL( downloadComplete( QByteArray, QString )),
--- branches/KDE/4.5/kdeedu/marble/src/lib/runners/LocalDatabaseRunner.cpp #1168374:1168375
@@ -43,8 +43,6 @@
 
 void LocalDatabaseRunner::run()
 {
-    bool successful = false;
-
     QVector<GeoDataPlacemark> vector;
 
     if (m_map) {