Changeset 90529 in vbox

Timestamp:

Aug 5, 2021 11:42:38 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: A bit of refactoring for UINetworkRequestManager; Unify request creation step and return id for customer needs.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/networking

Files:

• UINetworkRequestManager.cpp (modified) (2 diffs)
• UINetworkRequestManager.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/networking/UINetworkRequestManager.cpp

@@ -58 +58 @@
 }
 
-void UINetworkRequestManager::createNetworkRequest(UINetworkRequestType enmType,
-                                                   const QList<QUrl> &urls,
-                                                   const QString &strTarget,
-                                                   const UserDictionary &requestHeaders,
-                                                   UINetworkCustomer *pCustomer)
+QUuid UINetworkRequestManager::createNetworkRequest(UINetworkRequestType enmType,
+                                                    const QList<QUrl> &urls,
+                                                    const QString &strTarget,
+                                                    const UserDictionary &requestHeaders,
+                                                    UINetworkCustomer *pCustomer)
 {
     /* Create network-request: */
     UINetworkRequest *pNetworkRequest = new UINetworkRequest(enmType, urls, strTarget, requestHeaders, pCustomer, this);
-    /* Prepare created network-request: */
-    prepareNetworkRequest(pNetworkRequest);
+    if (pNetworkRequest)
+    {
+        /* Configure request listeners: */
+        connect(pNetworkRequest, &UINetworkRequest::sigProgress,
+                this, &UINetworkRequestManager::sltHandleNetworkRequestProgress);
+        connect(pNetworkRequest, &UINetworkRequest::sigCanceled,
+                this, &UINetworkRequestManager::sltHandleNetworkRequestCancel);
+        connect(pNetworkRequest, &UINetworkRequest::sigFinished,
+                this, &UINetworkRequestManager::sltHandleNetworkRequestFinish);
+        connect(pNetworkRequest, &UINetworkRequest::sigFailed,
+                this, &UINetworkRequestManager::sltHandleNetworkRequestFailure);
+
+        /* [Re]generate ID until unique: */
+        QUuid uId = QUuid::createUuid();
+        while (m_requests.contains(uId))
+            uId = QUuid::createUuid();
+
+        /* Add request to map: */
+        m_requests.insert(uId, pNetworkRequest);
+
+        /* Add network-request widget to network-manager dialog: */
+        m_pNetworkManagerDialog->addNetworkRequestWidget(uId, pNetworkRequest);
+
+        /* Return ID: */
+        return uId;
+    }
+
+    /* Null ID by default: */
+    return QUuid();
 }
 
@@ -162 +189 @@
 }
 
-void UINetworkRequestManager::prepareNetworkRequest(UINetworkRequest *pNetworkRequest)
-{
-    /* Configure request listeners: */
-    connect(pNetworkRequest, &UINetworkRequest::sigProgress,
-            this, &UINetworkRequestManager::sltHandleNetworkRequestProgress);
-    connect(pNetworkRequest, &UINetworkRequest::sigCanceled,
-            this, &UINetworkRequestManager::sltHandleNetworkRequestCancel);
-    connect(pNetworkRequest, &UINetworkRequest::sigFinished,
-            this, &UINetworkRequestManager::sltHandleNetworkRequestFinish);
-    connect(pNetworkRequest, &UINetworkRequest::sigFailed,
-            this, &UINetworkRequestManager::sltHandleNetworkRequestFailure);
-
-    /* [Re]generate ID until unique: */
-    QUuid uId = QUuid::createUuid();
-    while (m_requests.contains(uId))
-        uId = QUuid::createUuid();
-
-    /* Add request to map: */
-    m_requests.insert(uId, pNetworkRequest);
-
-    /* Add network-request widget to network-manager dialog: */
-    m_pNetworkManagerDialog->addNetworkRequestWidget(uId, pNetworkRequest);
-}
-
 void UINetworkRequestManager::cleanupNetworkRequest(const QUuid &uId)
 {

trunk/src/VBox/Frontends/VirtualBox/src/networking/UINetworkRequestManager.h

@@ -65 +65 @@
       * @param  requestHeaders  Brings request headers in dictionary form.
       * @param  pCustomer       Brings customer this request being ordered by. */
-    void createNetworkRequest(UINetworkRequestType enmType,
-                              const QList<QUrl> &urls,
-                              const QString &strTarget,
-                              const UserDictionary &requestHeaders,
-                              UINetworkCustomer *pCustomer);
+    QUuid createNetworkRequest(UINetworkRequestType enmType,
+                               const QList<QUrl> &urls,
+                               const QString &strTarget,
+                               const UserDictionary &requestHeaders,
+                               UINetworkCustomer *pCustomer);
 
 public slots:
@@ -76 +76 @@
     void show();
 
-private:
+protected:
 
     /** Constructs network manager. */
@@ -98 +98 @@
     /** Prepares all. */
     void prepare();
-    /** Prepares @a pNetworkRequest. */
-    void prepareNetworkRequest(UINetworkRequest *pNetworkRequest);
     /** Cleanups network-request with passed @a uId. */
     void cleanupNetworkRequest(const QUuid &uId);