comparison data/fileio/FileSource.cpp @ 1007:ba404199345f tonioni

Merge from default branch

     m_url(fileOrUrl, QUrl::StrictMode),
     m_localFile(0),
     m_reply(0),
     m_preferredContentType(preferredContentType),
     m_ok(false),
+    m_cancelled(false),
     m_lastStatus(0),
     m_resource(fileOrUrl.startsWith(':')),
     m_remote(isRemote(fileOrUrl)),
     m_done(false),
     m_leaveLocalFile(false),

 FileSource::FileSource(QUrl url, ProgressReporter *reporter) :
     m_url(url),
     m_localFile(0),
     m_reply(0),
     m_ok(false),
+    m_cancelled(false),
     m_lastStatus(0),
     m_resource(false),
     m_remote(isRemote(url.toString())),
     m_done(false),
     m_leaveLocalFile(false),

     QObject(),
     m_url(rf.m_url),
     m_localFile(0),
     m_reply(0),
     m_ok(rf.m_ok),
+    m_cancelled(rf.m_cancelled),
     m_lastStatus(rf.m_lastStatus),
     m_resource(rf.m_resource),
     m_remote(rf.m_remote),
     m_done(false),
     m_leaveLocalFile(false),

         m_localFile = 0;
     }
     m_done = true;
     if (m_reply) {
         QNetworkReply *r = m_reply;
+        disconnect(r, 0, this, 0);
         m_reply = 0;
         // Can only call abort() when there are no errors.
         if (r->error() == QNetworkReply::NoError) {
             r->abort();
         }

 
 bool
 FileSource::isDone() const
 {
     return m_done;
+}
+
+bool
+FileSource::wasCancelled() const
+{
+    return m_cancelled;
 }
 
 bool
 FileSource::isResource() const
 {

 {
     m_done = true;
     cleanup();
 
     m_ok = false;
+    m_cancelled = true;
     m_errorString = tr("Download cancelled");
 }
 
 void
 FileSource::replyFinished()