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

[Jens-Michael Hoffmann]

SVN commit 1073398 by jmhoffmann:

Download policies, add DownloadUsage parameter to jobRedirected signal.


 M  +2 -1      DownloadQueueSet.cpp  
 M  +1 -1      DownloadQueueSet.h  
 M  +2 -2      HttpDownloadManager.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/DownloadQueueSet.cpp #1073397:1073398
@@ -118,7 +118,8 @@
 
     deactivateJob( job );
     emit jobRemoved();
-    emit jobRedirected( newSourceUrl, job->destinationFileName(), job->initiatorId() );
+    emit jobRedirected( newSourceUrl, job->destinationFileName(), job->initiatorId(),
+                        job->downloadUsage() );
     job->deleteLater();
 }
 
--- trunk/KDE/kdeedu/marble/src/lib/DownloadQueueSet.h #1073397:1073398
@@ -95,7 +95,7 @@
     void jobFinished( const QByteArray& data, const QString& destinationFileName,
                       const QString& id );
     void jobRedirected( const QUrl& newSourceUrl, const QString& destinationFileName,
-                        const QString& id );
+                        const QString& id, DownloadUsage );
 
  private Q_SLOTS:
     void finishJob( HttpJob * job, QByteArray data );
--- trunk/KDE/kdeedu/marble/src/lib/HttpDownloadManager.cpp #1073397:1073398
@@ -215,8 +215,8 @@
     connect( queueSet, SIGNAL( jobFinished( QByteArray, QString, QString )),
              SLOT( finishJob( QByteArray, QString, QString )));
     connect( queueSet, SIGNAL( jobRetry() ), SLOT( startRetryTimer() ));
-    connect( queueSet, SIGNAL( jobRedirected( QUrl, QString, QString )),
-             SLOT( addJob( QUrl, QString, QString )));
+    connect( queueSet, SIGNAL( jobRedirected( QUrl, QString, QString, DownloadUsage )),
+             SLOT( addJob( QUrl, QString, QString, DownloadUsage )));
     // relay jobAdded/jobRemoved signals (interesting for progress bar)
     connect( queueSet, SIGNAL( jobAdded() ), SIGNAL( jobAdded() ));
     connect( queueSet, SIGNAL( jobRemoved() ), SIGNAL( jobRemoved() ));