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

[Thibaut Gridel]

SVN commit 1131745 by tgridel:

unused variables

 M  +2 -2      QtMainWindow.cpp  
 M  +2 -0      lib/StackedTileLoader.cpp  
 M  +1 -0      lib/TileLoader.cpp  
 M  +8 -0      lib/blendings/BlendingAlgorithms.cpp  
 M  +0 -1      lib/runners/LocalDatabaseRunner.cpp  


--- trunk/KDE/kdeedu/marble/src/QtMainWindow.cpp #1131744:1131745
@@ -62,8 +62,8 @@
 using namespace Marble;
 
 MainWindow::MainWindow(const QString& marbleDataPath, QWidget *parent) :
-        QMainWindow(parent), m_sunControlDialog(0), m_downloadRegionAction( 0 ),
-        m_downloadRegionDialog( 0 )
+        QMainWindow(parent), m_sunControlDialog(0),
+        m_downloadRegionDialog( 0 ), m_downloadRegionAction( 0 )
 {
     setUpdatesEnabled( false );
     
--- trunk/KDE/kdeedu/marble/src/lib/StackedTileLoader.cpp #1131744:1131745
@@ -119,6 +119,7 @@
 
 void StackedTileLoader::setDownloadManager( HttpDownloadManager *downloadManager )
 {
+    Q_UNUSED(downloadManager);
 }
 
 void StackedTileLoader::setTextureLayerSettings( GeoSceneGroup * const textureLayerSettings )
@@ -389,6 +390,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();
--- trunk/KDE/kdeedu/marble/src/lib/TileLoader.cpp #1131744:1131745
@@ -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 )),
--- trunk/KDE/kdeedu/marble/src/lib/blendings/BlendingAlgorithms.cpp #1131744:1131745
@@ -88,6 +88,8 @@
 qreal ParallelBlending::blendChannel( qreal const bottomColorIntensity,
                                       qreal const topColorIntensity ) const
 {
+    Q_UNUSED(bottomColorIntensity);
+    Q_UNUSED(topColorIntensity);
     // FIXME:    return qMin( qMax( 2.0 / ( 1.0 / bottomColorIntensity + 1.0 / topColorIntensity )), 0.0, 1.0 );
     return 0.0;
 }
@@ -95,6 +97,8 @@
 qreal TextureBlending::blendChannel( qreal const bottomColorIntensity,
                                      qreal const topColorIntensity ) const
 {
+    Q_UNUSED(bottomColorIntensity);
+    Q_UNUSED(topColorIntensity);
     // FIXME: return qMax( qMin( topColorIntensity + bottomColorIntensity ) - 0.5 ), 1.0 ), 0.0 );
     return 0.0;
 }
@@ -105,6 +109,8 @@
 qreal ColorBurnBlending::blendChannel( qreal const bottomColorIntensity,
                                        qreal const topColorIntensity ) const
 {
+    Q_UNUSED(bottomColorIntensity);
+    Q_UNUSED(topColorIntensity);
     // FIXME: check if this formula makes sense
     return qMin( 1.0, qMax( 0.0, 1.0 - ( 1.0 - bottomColorIntensity ) / topColorIntensity ));
 }
@@ -227,6 +233,8 @@
 qreal AdditiveSubtractiveBlending::blendChannel( qreal const bottomColorIntensity,
                                                  qreal const topColorIntensity ) const
 {
+    Q_UNUSED(bottomColorIntensity);
+    Q_UNUSED(topColorIntensity);
     // FIXME:
     //    return qMin( 1.0, qMax( 0.0, abs( bottomColorIntensity * bottomColorIntensity
     //                                      - topColorIntensity * topColorIntensity )));
--- trunk/KDE/kdeedu/marble/src/lib/runners/LocalDatabaseRunner.cpp #1131744:1131745
@@ -43,7 +43,6 @@
 
 void LocalDatabaseRunner::run()
 {
-    bool successful = false;
 
     QVector<GeoDataPlacemark> vector;