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

Timestamp:

Feb 1, 2012 2:07:19 PM (13 years ago)

Author:

vboxsync

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

76013

Message:

FE/Qt: Network Access Manager: Get rid of Qt4.6 stuff to satisfy minimum Qt version requirements.

Location:

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

Files:

• UINetworkManager.cpp (modified) (5 diffs)
• UINetworkManager.h (modified) (1 diff)

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

@@ -420 +420 @@
     , m_strDescription(strDescription)
     , m_pCustomer(pCustomer)
+    , m_fRunning(false)
 {
     /* Initialize: */
@@ -438 +439 @@
     , m_strDescription(strDescription)
     , m_pCustomer(pCustomer)
+    , m_fRunning(false)
 {
     /* Initialize: */
@@ -465 +467 @@
 void UINetworkRequest::sltHandleNetworkReplyFinish()
 {
+    /* Set as non-running: */
+    m_fRunning = false;
+
     /* Get sender network reply: */
     QNetworkReply *pNetworkReply = static_cast<QNetworkReply*>(sender());
@@ -591 +596 @@
     connect(m_pReply, SIGNAL(finished()), this, SLOT(sltHandleNetworkReplyFinish()));
 
+    /* Set as running: */
+    m_fRunning = true;
+
     /* Notify UINetworkRequestWidget: */
     emit sigStarted();
@@ -611 +619 @@
     if (m_pReply)
     {
-        if (m_pReply->isRunning())
+        if (m_fRunning)
             m_pReply->abort();
-        else if (m_pReply->isFinished())
+        else
             emit sigCanceled(m_uuid);
     }

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

@@ -112 +112 @@
     UINetworkCustomer *m_pCustomer;
     QPointer<QNetworkReply> m_pReply;
+    bool m_fRunning;
 };