Changeset 58480 in vbox

Timestamp:

Oct 29, 2015 12:58:18 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

103794

Message:

FE/Qt: Networking cleanup/rework (part 28): Some refactoring for network-request code.

Location:

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

Files:

• UINetworkRequest.cpp (modified) (10 diffs)
• UINetworkRequest.h (modified) (4 diffs)

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UINetworkRequest stuff implementation.
+ * VBox Qt GUI - UINetworkRequest class implementation.
  */
 
 /*
- * Copyright (C) 2011-2012 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -31 +31 @@
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
-
 UINetworkRequest::UINetworkRequest(UINetworkRequestType type,
                                    const QList<QUrl> &urls,
@@ -39 +38 @@
     : QObject(pNetworkManager)
     , m_type(type)
-    , m_uuid(QUuid::createUuid())
     , m_requests(urls)
     , m_requestHeaders(requestHeaders)
+    , m_pCustomer(pCustomer)
+    , m_pNetworkManager(pNetworkManager)
+    , m_uuid(QUuid::createUuid())
     , m_iCurrentRequestIndex(0)
-    , m_pCustomer(pCustomer)
     , m_fRunning(false)
 {
-    /* Initialize: */
-    initialize();
+    /* Prepare: */
+    prepare();
 }
 
 UINetworkRequest::~UINetworkRequest()
 {
-    /* Destroy network-reply: */
-    cleanupNetworkReply();
-
-    /* Unregister network-request from network-manager: */
-    manager()->unregisterNetworkRequest(m_uuid);
-}
-
-UINetworkManager* UINetworkRequest::manager() const
-{
-    AssertPtrReturn(parent(), 0);
-    return qobject_cast<UINetworkManager*>(parent());
+    /* Cleanup: */
+    cleanup();
 }
 
@@ -70 +61 @@
 }
 
-/* Network-reply progress handler: */
 void UINetworkRequest::sltHandleNetworkReplyProgress(qint64 iReceived, qint64 iTotal)
 {
@@ -79 +69 @@
 }
 
-/* Network-reply finish handler: */
 void UINetworkRequest::sltHandleNetworkReplyFinish()
 {
@@ -145 +134 @@
 }
 
-/* Slot to retry network-request: */
 void UINetworkRequest::sltRetry()
 {
@@ -159 +147 @@
 }
 
-/* Slot to cancel network-request: */
 void UINetworkRequest::sltCancel()
 {
     /* Abort network-reply if present: */
-    abortNetworkReply();
-}
-
-/* Initialize: */
-void UINetworkRequest::initialize()
-{
-    /* Prepare listeners for parent(): */
-    connect(parent(), SIGNAL(sigCancelNetworkRequests()), this, SLOT(sltCancel()), Qt::QueuedConnection);
+    if (m_pReply)
+    {
+        if (m_fRunning)
+            m_pReply->abort();
+        else
+            emit sigCanceled(m_uuid);
+    }
+}
+
+void UINetworkRequest::prepare()
+{
+    /* Prepare listeners for manager(): */
+    connect(manager(), SIGNAL(sigCancelNetworkRequests()), this, SLOT(sltCancel()), Qt::QueuedConnection);
 
     /* Register network-request in network-manager: */
@@ -179 +171 @@
     m_request = m_requests.at(m_iCurrentRequestIndex);
 
-    /* Create network-reply: */
+    /* Prepare network-reply: */
     prepareNetworkReply();
 }
 
-/* Prepare network-reply: */
 void UINetworkRequest::prepareNetworkReply()
 {
@@ -202 +193 @@
 }
 
-/* Cleanup network-reply: */
 void UINetworkRequest::cleanupNetworkReply()
 {
@@ -212 +202 @@
 }
 
-/* Abort network-reply: */
-void UINetworkRequest::abortNetworkReply()
-{
-    /* Abort network-reply if present: */
-    if (m_pReply)
-    {
-        if (m_fRunning)
-            m_pReply->abort();
-        else
-            emit sigCanceled(m_uuid);
-    }
-}
-
+void UINetworkRequest::cleanup()
+{
+    /* Cleanup network-reply: */
+    cleanupNetworkReply();
+
+    /* Unregister network-request from network-manager: */
+    manager()->unregisterNetworkRequest(m_uuid);
+}
+

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UINetworkRequest stuff declaration.
+ * VBox Qt GUI - UINetworkRequest class declaration.
  */
 
 /*
- * 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 __UINetworkRequest_h__
-#define __UINetworkRequest_h__
+#ifndef ___UINetworkRequest_h___
+#define ___UINetworkRequest_h___
 
 /* Qt includes: */
@@ -64 +64 @@
                      UINetworkCustomer *pCustomer,
                      UINetworkManager *pNetworkManager);
-    /** Destructs network request. */
+    /** Destructs network-request. */
     ~UINetworkRequest();
 
-    /** Returns parent network-manager. */
-    UINetworkManager* manager() const;
     /* Getters: */
-    const QUuid& uuid() const { return m_uuid; }
     const QString description() const;
     UINetworkCustomer* customer() { return m_pCustomer; }
+    /** Returns parent network-manager. */
+    UINetworkManager* manager() const { return m_pNetworkManager; }
+    const QUuid& uuid() const { return m_uuid; }
     UINetworkReply* reply() { return m_pReply; }
 
@@ -89 +89 @@
 private:
 
-    /* Initialize: */
-    void initialize();
-
+    /* Prepare: */
+    void prepare();
     /* Prepare network-reply: */
     void prepareNetworkReply();
+
     /* Cleanup network-reply: */
     void cleanupNetworkReply();
-    /* Abort network-reply: */
-    void abortNetworkReply();
+    /* Cleanup: */
+    void cleanup();
 
     /* Variables: */
-    UINetworkRequestType m_type;
-    QUuid m_uuid;
-    QList<QUrl> m_requests;
+    const UINetworkRequestType m_type;
+    const QList<QUrl> m_requests;
     /** Holds the request headers. */
     const UserDictionary m_requestHeaders;
+    UINetworkCustomer *m_pCustomer;
+    UINetworkManager *m_pNetworkManager;
+    const QUuid m_uuid;
+
     QUrl m_request;
     int m_iCurrentRequestIndex;
-    QString m_strDescription;
-    UINetworkCustomer *m_pCustomer;
+    bool m_fRunning;
+
     QPointer<UINetworkReply> m_pReply;
-    bool m_fRunning;
 };
 
-#endif // __UINetworkRequest_h__
+#endif /* !___UINetworkRequest_h___ */
+