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

[Jens-Michael Hoffmann]

SVN commit 1073352 by jmhoffmann:

HttpDownloadManager::addJob: Remove default value for DownloadUsage parameter
to make it more explicit.

 M  +2 -2      AbstractDataPluginModel.cpp  
 M  +1 -1      HttpDownloadManager.h  
 M  +2 -2      MarbleModel.cpp  
 M  +2 -2      MergedLayerDecorator.cpp  
 M  +2 -1      MergedLayerDecorator.h  
 M  +1 -1      TextureTile.cpp  
 M  +2 -1      TextureTile.h  
 M  +2 -2      TileLoader.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/AbstractDataPluginModel.cpp #1073351:1073352
@@ -246,7 +246,7 @@
 
     QString id = generateFilename( item->id(), type );
     
-    d->m_downloadManager->addJob( url, id, id );
+    d->m_downloadManager->addJob( url, id, id, DownloadBrowse );
     d->m_downloadingItems.insert( id, item );
     
     connect( item, SIGNAL( destroyed( QObject* ) ), this, SLOT( removeItem( QObject* ) ) );
@@ -260,7 +260,7 @@
         QString name( descriptionPrefix );
         name += QString::number( d->m_descriptionFileNumber );
         
-        d->m_downloadManager->addJob( url, name, name );
+        d->m_downloadManager->addJob( url, name, name, DownloadBrowse );
         d->m_descriptionFileNumber++;
     }
 }
--- trunk/KDE/kdeedu/marble/src/lib/HttpDownloadManager.h #1073351:1073352
@@ -84,7 +84,7 @@
      * Adds a new job with a sourceUrl, destination file name and given id.
      */
     void addJob( const QUrl& sourceUrl, const QString& destFilename, const QString &id,
-                 const DownloadUsage usage = DownloadBrowse );
+                 const DownloadUsage usage );
 
 
  Q_SIGNALS:
--- trunk/KDE/kdeedu/marble/src/lib/MarbleModel.cpp #1073351:1073352
@@ -848,8 +848,8 @@
 //             << "requestTileUpdate" << requestTileUpdate;
     
     if ( d->m_downloadManager != 0 ) {
-        connect( d->m_layerDecorator, SIGNAL( downloadTile( QUrl, QString, QString ) ),
-                 d->m_downloadManager, SLOT( addJob( QUrl, QString, QString ) ) );
+        connect( d->m_layerDecorator, SIGNAL( downloadTile( QUrl, QString, QString, DownloadUsage ) ),
+                 d->m_downloadManager, SLOT( addJob( QUrl, QString, QString, DownloadUsage ) ) );
     }
 
     d->m_layerDecorator->setInfo( x, y, level, tile->id() );
--- trunk/KDE/kdeedu/marble/src/lib/MergedLayerDecorator.cpp #1073351:1073352
@@ -142,8 +142,8 @@
     // TODO use a TileLoader rather than directly accessing TextureTile?
     TextureTile tile( m_id );
     
-    connect( &tile, SIGNAL( downloadTile( const QUrl&, const QString&, const QString& ) ),
-             this, SIGNAL( downloadTile( const QUrl&, const QString&, const QString& ) ) );
+    connect( &tile, SIGNAL( downloadTile( const QUrl&, const QString&, const QString&, DownloadUsage ) ),
+             this, SIGNAL( downloadTile( const QUrl&, const QString&, const QString&, DownloadUsage ) ) );
 
     tile.loadDataset( textureLayer, m_level, m_x, m_y );
     return *( tile.tile() );
--- trunk/KDE/kdeedu/marble/src/lib/MergedLayerDecorator.h #1073351:1073352
@@ -20,6 +20,7 @@
 #include <QtCore/QObject>
 
 #include "TileId.h"
+#include "global.h"
 
 class QString;
 class QUrl;
@@ -54,7 +55,7 @@
 	
  Q_SIGNALS:
     void downloadTile(const QUrl& sourceUrl, const QString& destinationFileName,
-                      const QString& id);
+                      const QString& id, DownloadUsage );
     void repaintMap();
 	
  private:
--- trunk/KDE/kdeedu/marble/src/lib/TextureTile.cpp #1073351:1073352
@@ -336,7 +336,7 @@
                 TileLoaderHelper::relativeTileFileName( textureLayer, currentLevel,
                                                         currentX, currentY );
 //            mDebug() << "emit downloadTile(" << sourceUrl << destFileName << ");";
-            emit downloadTile( sourceUrl, destFileName, d->m_id.toString() );
+            emit downloadTile( sourceUrl, destFileName, d->m_id.toString(), DownloadBrowse );
         }
     }
 
--- trunk/KDE/kdeedu/marble/src/lib/TextureTile.h #1073351:1073352
@@ -24,6 +24,7 @@
 #include <QtGui/QColor>
 
 #include "AbstractTile.h"
+#include "global.h"
 
 class QImage;
 class QString;
@@ -73,7 +74,7 @@
  Q_SIGNALS:
     void tileUpdateDone();
     void downloadTile(const QUrl& sourceUrl, const QString& destinationFileName,
-                      const QString& id);
+                      const QString& id, DownloadUsage );
 
  public Q_SLOTS:
     void initJumpTables( bool requestTileUpdate = true );
--- trunk/KDE/kdeedu/marble/src/lib/TileLoader.cpp #1073351:1073352
@@ -248,8 +248,8 @@
     // d->m_datasetProvider->loadDatasets( tile );
 
     if ( d->m_downloadManager != 0 ) {
-        connect( tile, SIGNAL( downloadTile( QUrl, QString, QString ) ),
-                 d->m_downloadManager, SLOT( addJob( QUrl, QString, QString ) ) );
+        connect( tile, SIGNAL( downloadTile( QUrl, QString, QString, DownloadUsage ) ),
+                 d->m_downloadManager, SLOT( addJob( QUrl, QString, QString, DownloadUsage ) ) );
     }
     connect( tile, SIGNAL( tileUpdateDone() ),
              this, SIGNAL( tileUpdateAvailable() ) );