Imported Upstream version 1.6

[minitube] / src / networkaccess.h

diff --git a/src/networkaccess.h b/src/networkaccess.h
index 64cf5086c35025ed38235bad7bca04cfb9a4bc34..1a05d91d38c2520bf2d857ce28746fe6bd32bb4d 100644 (file)
--- a/src/networkaccess.h
+++ b/src/networkaccess.h
@@ -1,6 +1,7 @@
 #ifndef NETWORKACCESS_H
 #define NETWORKACCESS_H
 
+#include <QtCore>
 #include <QtNetwork>
 
 namespace The {
@@ -17,6 +18,8 @@ public:
 public slots:
     void finished();
     void requestError(QNetworkReply::NetworkError);
+    void downloadProgress(qint64 bytesReceived, qint64 bytesTotal);
+    void readTimeout();
 
 signals:
     void data(QByteArray);
@@ -25,35 +28,25 @@ signals:
 
 private:
     QNetworkReply *networkReply;
+    QTimer *readTimeoutTimer;
 
 };
 
-
 class NetworkAccess : public QObject {
 
     Q_OBJECT
 
 public:
     NetworkAccess( QObject* parent=0);
+    QNetworkReply* manualGet(QNetworkRequest request, int operation = QNetworkAccessManager::GetOperation);
+    QNetworkRequest buildRequest(QUrl url);
     QNetworkReply* simpleGet(QUrl url, int operation = QNetworkAccessManager::GetOperation);
     NetworkReply* get(QUrl url);
     NetworkReply* head(QUrl url);
-    QNetworkReply* syncGet(QUrl url);
-    QByteArray syncGetBytes(QUrl url);
-    QString syncGetString(QUrl url);
 
 private slots:
     void error(QNetworkReply::NetworkError);
-    void syncMetaDataChanged();
-    void syncFinished();
-
-private:
-    QNetworkReply *networkReply;
-    bool working;
 
 };
 
-typedef QPointer<QObject> ObjectPointer;
-Q_DECLARE_METATYPE(ObjectPointer)
-
 #endif // NETWORKACCESS_H