Changeset 58249 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Oct 14, 2015 3:39:48 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Networking cleanup/rework (part 10): Get rid of Qt networking stuff.

Location:

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

Files:

• UINetworkDefs.h (modified) (2 diffs)
• UINetworkReply.cpp (modified) (5 diffs)
• UINetworkReply.h (modified) (2 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2011-2012 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -16 +16 @@
  */
 
-#ifndef __UINetworkDefs_h__
-#define __UINetworkDefs_h__
+#ifndef ___UINetworkDefs_h___
+#define ___UINetworkDefs_h___
 
-/* Network-request types: */
+/** Network request types. */
 enum UINetworkRequestType
 {
-    UINetworkRequestType_HEAD,
     UINetworkRequestType_HEAD_Our,
-    UINetworkRequestType_GET,
     UINetworkRequestType_GET_Our
 };
 
-/* Network-reply types: */
-enum UINetworkReplyType
-{
-    UINetworkReplyType_Qt,
-    UINetworkReplyType_Our
-};
+#endif /* !___UINetworkDefs_h___ */
 
-#endif // __UINetworkDefs_h__
-

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

@@ -879 +879 @@
 
     /* API: Abort reply: */
-    void abort()
-    {
-        m_pThread->abort();
-    }
+    void abort() { m_pThread->abort(); }
 
     /* API: Error-code getter: */
@@ -908 +905 @@
 
     /* API: Reply getter: */
-    QByteArray readAll() { return m_pThread->readAll(); }
+    QByteArray readAll() const { return m_pThread->readAll(); }
 
     /** Returns value for the cached reply header of the passed @a type. */
@@ -915 +912 @@
     /** Returns URL of the reply. */
     QUrl url() const { return m_pThread->url(); }
+
+    /** Returns value for the cached reply attribute of the passed @a code. */
+    QVariant attribute(QNetworkRequest::Attribute code) const { /** @todo r=dsen: Fix that. */ Q_UNUSED(code); return QVariant(); }
 
 private slots:
@@ -956 +956 @@
 
 UINetworkReply::UINetworkReply(const QNetworkRequest &request, UINetworkRequestType requestType)
-    : m_replyType(UINetworkReplyType_Qt)
-    , m_pReply(0)
-{
-    /* Create network-reply object: */
-    switch (requestType)
-    {
-        /* Prepare Qt network-reply (HEAD): */
-        case UINetworkRequestType_HEAD:
-            m_replyType = UINetworkReplyType_Qt;
-            m_pReply = gNetworkManager->head(request);
-            break;
-        /* Prepare our network-reply (HEAD): */
-        case UINetworkRequestType_HEAD_Our:
-            m_replyType = UINetworkReplyType_Our;
-            m_pReply = new UINetworkReplyPrivate(request, UINetworkRequestType_HEAD_Our);
-            break;
-        /* Prepare Qt network-reply (GET): */
-        case UINetworkRequestType_GET:
-            m_replyType = UINetworkReplyType_Qt;
-            m_pReply = gNetworkManager->get(request);
-            break;
-        /* Prepare our network-reply (GET): */
-        case UINetworkRequestType_GET_Our:
-            m_replyType = UINetworkReplyType_Our;
-            m_pReply = new UINetworkReplyPrivate(request, UINetworkRequestType_GET_Our);
-            break;
-    }
-
+    : m_pReply(new UINetworkReplyPrivate(request, requestType))
+{
     /* Prepare network-reply object connections: */
     connect(m_pReply, SIGNAL(downloadProgress(qint64, qint64)), this, SIGNAL(downloadProgress(qint64, qint64)));
@@ -1001 +975 @@
 QVariant UINetworkReply::header(QNetworkRequest::KnownHeaders header) const
 {
-    QVariant result;
-    switch (m_replyType)
-    {
-        case UINetworkReplyType_Qt: result = qobject_cast<QNetworkReply*>(m_pReply)->header(header); break;
-        case UINetworkReplyType_Our: result = qobject_cast<UINetworkReplyPrivate*>(m_pReply)->header(header); break;
-    }
-    return result;
+    return m_pReply->header(header);
 }
 
 QVariant UINetworkReply::attribute(QNetworkRequest::Attribute code) const
 {
-    QVariant result;
-    switch (m_replyType)
-    {
-        case UINetworkReplyType_Qt: result = qobject_cast<QNetworkReply*>(m_pReply)->attribute(code); break;
-        case UINetworkReplyType_Our: /* TODO: attribute() */ break;
-    }
-    return result;
+    return m_pReply->attribute(code);
 }
 
 void UINetworkReply::abort()
 {
-    switch (m_replyType)
-    {
-        case UINetworkReplyType_Qt: qobject_cast<QNetworkReply*>(m_pReply)->abort(); break;
-        case UINetworkReplyType_Our: qobject_cast<UINetworkReplyPrivate*>(m_pReply)->abort(); break;
-    }
+    return m_pReply->abort();
 }
 
 QNetworkReply::NetworkError UINetworkReply::error() const
 {
-    QNetworkReply::NetworkError result = QNetworkReply::NoError;
-    switch (m_replyType)
-    {
-        case UINetworkReplyType_Qt: result = qobject_cast<QNetworkReply*>(m_pReply)->error(); break;
-        case UINetworkReplyType_Our: result = qobject_cast<UINetworkReplyPrivate*>(m_pReply)->error(); break;
-    }
-    return result;
+    return m_pReply->error();
 }
 
 QString UINetworkReply::errorString() const
 {
-    QString strResult;
-    switch (m_replyType)
-    {
-        case UINetworkReplyType_Qt: strResult = qobject_cast<QNetworkReply*>(m_pReply)->errorString(); break;
-        case UINetworkReplyType_Our: strResult = qobject_cast<UINetworkReplyPrivate*>(m_pReply)->errorString(); break;
-    }
-    return strResult;
-}
-
-QByteArray UINetworkReply::readAll()
-{
-    QByteArray result;
-    switch (m_replyType)
-    {
-        case UINetworkReplyType_Qt: result = qobject_cast<QNetworkReply*>(m_pReply)->readAll(); break;
-        case UINetworkReplyType_Our: result = qobject_cast<UINetworkReplyPrivate*>(m_pReply)->readAll(); break;
-    }
-    return result;
+    return m_pReply->errorString();
+}
+
+QByteArray UINetworkReply::readAll() const
+{
+    return m_pReply->readAll();
 }
 
 QUrl UINetworkReply::url() const
 {
-    QUrl result;
-    switch (m_replyType)
-    {
-        case UINetworkReplyType_Qt: result = qobject_cast<QNetworkReply*>(m_pReply)->url(); break;
-        case UINetworkReplyType_Our: result = qobject_cast<UINetworkReplyPrivate*>(m_pReply)->url(); break;
-    }
-    return result;
+    return m_pReply->url();
 }
 

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

@@ -26 +26 @@
 #include "UINetworkDefs.h"
 
+/* Forward declarations: */
+class UINetworkReplyPrivate;
+
 /* Network-reply interface: */
 class UINetworkReply : public QObject
@@ -49 +52 @@
     QNetworkReply::NetworkError error() const;
     QString errorString() const;
-    QByteArray readAll();
+    QByteArray readAll() const;
     QUrl url() const;
 
 private:
 
-    /* Variables: */
-    UINetworkReplyType m_replyType;
-    QPointer<QObject> m_pReply;
+    /** Holds the network reply private instance. */
+    UINetworkReplyPrivate *m_pReply;
 };