Changeset 58252 in vbox for trunk/src

Timestamp:

Oct 14, 2015 3:51:54 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Networking cleanup/rework (part 11): Refactoring.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/net

Files:

• UIDownloader.cpp (modified) (2 diffs)
• UINetworkDefs.h (modified) (1 diff)
• UINetworkReply.cpp (modified) (6 diffs)
• UINetworkReply.h (modified) (1 diff)
• UIUpdateManager.cpp (modified) (1 diff)
• tstSSLCertDownloads.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloader.cpp

@@ -48 +48 @@
 
     /* Create network request set: */
-    createNetworkRequest(requests, UINetworkRequestType_HEAD_Our, tr("Looking for %1...").arg(m_strDescription));
+    createNetworkRequest(requests, UINetworkRequestType_HEAD, tr("Looking for %1...").arg(m_strDescription));
 }
 
@@ -61 +61 @@
 
     /* Create network request: */
-    createNetworkRequest(request, UINetworkRequestType_GET_Our, tr("Downloading %1...").arg(m_strDescription));
+    createNetworkRequest(request, UINetworkRequestType_GET, tr("Downloading %1...").arg(m_strDescription));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkDefs.h

@@ -22 +22 @@
 enum UINetworkRequestType
 {
-    UINetworkRequestType_HEAD_Our,
-    UINetworkRequestType_GET_Our
+    UINetworkRequestType_HEAD,
+    UINetworkRequestType_GET
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkReply.cpp

@@ -406 +406 @@
     switch (m_type)
     {
-        case UINetworkRequestType_HEAD_Our:
+        case UINetworkRequestType_HEAD:
         {
             /* Perform blocking HTTP HEAD request: */
@@ -433 +433 @@
             break;
         }
-        case UINetworkRequestType_GET_Our:
+        case UINetworkRequestType_GET:
         {
             /* Perform blocking HTTP GET request: */
@@ -881 +881 @@
     void abort() { m_pThread->abort(); }
 
+    /** Returns URL of the reply. */
+    QUrl url() const { return m_pThread->url(); }
+
     /* API: Error-code getter: */
     QNetworkReply::NetworkError error() const { return m_error; }
@@ -909 +912 @@
     /** Returns value for the cached reply header of the passed @a type. */
     QString header(QNetworkRequest::KnownHeaders type) const { return m_pThread->header(type); }
-
-    /** Returns URL of the reply. */
-    QUrl url() const { return m_pThread->url(); }
 
     /** Returns value for the cached reply attribute of the passed @a code. */
@@ -973 +973 @@
 }
 
+void UINetworkReply::abort()
+{
+    return m_pReply->abort();
+}
+
+QUrl UINetworkReply::url() const
+{
+    return m_pReply->url();
+}
+
+QNetworkReply::NetworkError UINetworkReply::error() const
+{
+    return m_pReply->error();
+}
+
+QString UINetworkReply::errorString() const
+{
+    return m_pReply->errorString();
+}
+
+QByteArray UINetworkReply::readAll() const
+{
+    return m_pReply->readAll();
+}
+
 QVariant UINetworkReply::header(QNetworkRequest::KnownHeaders header) const
 {
@@ -983 +1008 @@
 }
 
-void UINetworkReply::abort()
-{
-    return m_pReply->abort();
-}
-
-QNetworkReply::NetworkError UINetworkReply::error() const
-{
-    return m_pReply->error();
-}
-
-QString UINetworkReply::errorString() const
-{
-    return m_pReply->errorString();
-}
-
-QByteArray UINetworkReply::readAll() const
-{
-    return m_pReply->readAll();
-}
-
-QUrl UINetworkReply::url() const
-{
-    return m_pReply->url();
-}
-
 #include "UINetworkReply.moc"
 

trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkReply.h

@@ -47 +47 @@
 
     /* API: */
-    QVariant header(QNetworkRequest::KnownHeaders header) const;
-    QVariant attribute(QNetworkRequest::Attribute code) const;
     void abort();
+    QUrl url() const;
     QNetworkReply::NetworkError error() const;
     QString errorString() const;
     QByteArray readAll() const;
-    QUrl url() const;
+    QVariant header(QNetworkRequest::KnownHeaders header) const;
+    QVariant attribute(QNetworkRequest::Attribute code) const;
 
 private:

trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp

@@ -193 +193 @@
         request.setUrl(url);
         request.setRawHeader("User-Agent", strUserAgent.toAscii());
-        createNetworkRequest(request, UINetworkRequestType_GET_Our, tr("Checking for a new VirtualBox version..."));
+        createNetworkRequest(request, UINetworkRequestType_GET, tr("Checking for a new VirtualBox version..."));
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/net/tstSSLCertDownloads.cpp

@@ -45 +45 @@
 {
     QNetworkRequest Dummy;
-    UINetworkReplyPrivateThread TestObj(Dummy, UINetworkRequestType_GET_Our);
+    UINetworkReplyPrivateThread TestObj(Dummy, UINetworkRequestType_GET);
 
     /*