comparison data/fileio/FileSource.h @ 392:183ee2a55fc7

* More work to abstract out interactive components used in the data library,
  so that it does not need to depend on QtGui.

 #include <map>
 
 class QFtp;
 class QHttp;
 class QFile;
-class QProgressDialog;
 class QHttpResponseHeader;
-class ProgressPrinter;
+class ProgressReporter;
 
 /**
  * FileSource is a class used to refer to the contents of a file that
  * may be either local or at a remote location such as a HTTP URL.
  *

 class FileSource : public QObject
 {
     Q_OBJECT
 
 public:
-
-    enum ShowProgressType {
-        ProgressNone,
-        ProgressDialog,
-        ProgressToConsole
-    };
-
     /**
      * Construct a FileSource using the given local file path or URL.
      * The URL may be raw or encoded.
      *
-     * If progressType is ProgressDialog, a progress dialog will be
-     * shown for any network transfers; if it is ProgressToConsole, a
-     * progress indication will be sent to the console.
-     * Note that the progress() signal will also be emitted regularly
-     * during retrieval, even if progressType is ProgressNone.
-     */
-    FileSource(QString fileOrUrl,
-               ShowProgressType progressType = ProgressNone);
+     * If a ProgressReporter is provided, it will be updated with
+     * progress status.  Note that the progress() signal will also be
+     * emitted regularly during retrieval, even if no reporter is
+     * supplied here.  Caller retains ownership of the reporter object.
+     */
+    FileSource(QString fileOrUrl, ProgressReporter *reporter = 0);
 
     /**
      * Construct a FileSource using the given remote URL.
      *
-     * If progressType is ProgressDialog, a progress dialog will be
-     * shown for any network transfers; if it is ProgressToConsole, a
-     * progress indication will be sent to the console.
-     * Note that the progress() signal also will be emitted regularly
-     * during retrieval, even if progressType is ProgressNone.
-     */
-    FileSource(QUrl url,
-               ShowProgressType progressType = ProgressNone);
+     * If a ProgressReporter is provided, it will be updated with
+     * progress status.  Note that the progress() signal will also be
+     * emitted regularly during retrieval, even if no reporter is
+     * supplied here.  Caller retains ownership of the reporter object.
+     */
+    FileSource(QUrl url, ProgressReporter *reporter = 0);
 
     FileSource(const FileSource &);
 
     virtual ~FileSource();
 

     void dataReadProgress(int done, int total);
     void httpResponseHeaderReceived(const QHttpResponseHeader &resp);
     void ftpCommandFinished(int, bool);
     void dataTransferProgress(qint64 done, qint64 total);
     void done(bool error);
-    void showProgressDialog();
     void cancelled();
 
 protected:
     FileSource &operator=(const FileSource &); // not provided
 

     bool m_ok;
     int m_lastStatus;
     bool m_remote;
     bool m_done;
     bool m_leaveLocalFile;
-    ShowProgressType m_progressType;
-    ProgressPrinter *m_progressPrinter;
-    QProgressDialog *m_progressDialog;
-    QTimer m_progressShowTimer;
+    ProgressReporter *m_reporter;
 
     typedef std::map<QUrl, int> RemoteRefCountMap;
     typedef std::map<QUrl, QString> RemoteLocalMap;
     static RemoteRefCountMap m_refCountMap;
     static RemoteLocalMap m_remoteLocalMap;