Changeset 4397 in vbox for trunk

Timestamp:

Aug 28, 2007 8:49:13 AM (17 years ago)

Author:

vboxsync

Message:

Converted the darwin QHttp checks to VBOX_WITHOUT_QHTTP.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxDownloaderWgt.cpp (modified) (9 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxDownloaderWgt.cpp

@@ -66 +66 @@
     QString version = vboxGlobal().virtualBox().GetVersion();
 
-#ifndef RT_OS_DARWIN /// @todo fix the qt build on darwin.
+#if !defined(VBOX_WITHOUT_QHTTP)
     /* Initialize url operator */
     mHttp = new QHttp (this, "mHttp");
@@ -78 +78 @@
     connect (mHttp, SIGNAL (responseHeaderReceived (const QHttpResponseHeader&)),
              this, SLOT (processResponse (const QHttpResponseHeader&)));
-#endif /* !RT_OS_DARWIN */ /// @todo fix the qt build on darwin.
+#endif /* !VBOX_WITHOUT_QHTTP */
     connect (mCancelButton, SIGNAL (clicked()),
              this, SLOT (processAbort()));
@@ -111 +111 @@
         if (mIsChecking)
         {
-#ifndef RT_OS_DARWIN /// @todo fix the qt build on darwin.
+#if !defined(VBOX_WITHOUT_QHTTP)
             mHttp->abort();
 #endif
@@ -133 +133 @@
 void VBoxDownloaderWgt::processFinished (int, bool aError)
 {
-#ifndef RT_OS_DARWIN /// @todo fix the qt build on darwin.
+#if !defined(VBOX_WITHOUT_QHTTP)
     if (aError && mHttp->error() != QHttp::Aborted)
     {
@@ -187 +187 @@
         };
     }
-#else
+#else  /* VBOX_WITHOUT_QHTTP */
     NOREF (aError);
-#endif /* !RT_OS_DARWIN */
+#endif /* VBOX_WITHOUT_QHTTP */
 }
 
@@ -196 +196 @@
 void VBoxDownloaderWgt::processResponse (const QHttpResponseHeader &aHeader)
 {
-#ifndef RT_OS_DARWIN /// @todo fix the qt build on darwin.
+#if !defined(VBOX_WITHOUT_QHTTP)
     mStatus = aHeader.statusCode();
-#else
-    NOREF(aHeader);
 #endif
 }
@@ -208 +206 @@
     if (mConnectDone)
         return;
-#ifndef RT_OS_DARWIN /// @todo fix the qt build on darwin.
+#if !defined(VBOX_WITHOUT_QHTTP)
     mHttp->abort();
     abortDownload (tr ("Connection timed out."));
@@ -217 +215 @@
 void VBoxDownloaderWgt::processAbort()
 {
-#ifndef RT_OS_DARWIN /// @todo fix the qt build on darwin.
+#if !defined(VBOX_WITHOUT_QHTTP)
     mConnectDone = true;
     mHttp->abort();
@@ -239 +237 @@
 {
     mConnectDone = false;
-#ifndef RT_OS_DARWIN /// @todo fix the qt build on darwin.
+#if !defined(VBOX_WITHOUT_QHTTP)
     mHttp->get (mUrl.path());
 #endif