Changeset 33632 in vbox

Timestamp:

Nov 1, 2010 6:53:26 AM (14 years ago)

Author:

vboxsync

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

67245

Message:

FE/Qt: Build fix for r67244 (part 1).

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings

Files:

• global/VBoxGLSettingsNetwork.cpp (modified) (3 diffs)
• vm/VBoxVMSettingsDisplay.cpp (modified) (2 diffs)
• vm/VBoxVMSettingsHD.cpp (modified) (1 diff)
• vm/VBoxVMSettingsSystem.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/VBoxGLSettingsNetwork.cpp

@@ -194 +194 @@
     QGridLayout *mainLayout = static_cast <QGridLayout*> (layout());
     mainLayout->addItem (shiftSpacer, 1, 4);
-    static_cast <QHBoxLayout*> (mWtActions->layout())->addStretch();
+    //static_cast <QHBoxLayout*> (mWtActions->layout())->addStretch();
 #endif
 
@@ -341 +341 @@
 
     /* Save from cache: */
-    CVirtualBox &vbox = vboxGlobal().virtualBox();
-    CHost &host = vbox.GetHost();
+    CVirtualBox vbox = vboxGlobal().virtualBox();
+    CHost host = vbox.GetHost();
     const CHostNetworkInterfaceVector &interfaces = host.GetNetworkInterfaces();
     /* Remove all the old interfaces first: */
@@ -352 +352 @@
         {
             /* Search for this interface's dhcp sserver: */
-            CDHCPServer &dhcp = vboxGlobal().virtualBox().FindDHCPServerByNetworkName(iface.GetNetworkName());
+            CDHCPServer dhcp = vboxGlobal().virtualBox().FindDHCPServerByNetworkName(iface.GetNetworkName());
             /* Delete it if its present: */
             if (!dhcp.isNull())

trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsDisplay.cpp

@@ -154 +154 @@
     m_cache.m_f2dAccelerationEnabled = m_machine.GetAccelerate2DVideoEnabled();
 #endif
-    CVRDEServer &vrdeServer = m_machine.GetVRDEServer();
+    CVRDEServer vrdeServer = m_machine.GetVRDEServer();
     m_cache.m_fVRDEServerSupported = !vrdeServer.isNull();
     m_cache.m_fVRDEServerEnabled = m_cache.m_fVRDEServerSupported && vrdeServer.GetEnabled();
@@ -233 +233 @@
     m_machine.SetAccelerate2DVideoEnabled(m_cache.m_f2dAccelerationEnabled);
 #endif
-    CVRDEServer &vrdeServer = m_machine.GetVRDEServer();
+    CVRDEServer vrdeServer = m_machine.GetVRDEServer();
     if (!vrdeServer.isNull())
     {

trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsHD.cpp

@@ -1919 +1919 @@
     {
         const UIStorageControllerData &controllerData = m_cache.m_items[iControllerIndex];
-        CStorageController &controller = m_machine.AddStorageController(controllerData.m_strControllerName, controllerData.m_controllerBus);
+        CStorageController controller = m_machine.AddStorageController(controllerData.m_strControllerName, controllerData.m_controllerBus);
         controller.SetControllerType(controllerData.m_controllerType);
         controller.SetUseHostIOCache(controllerData.m_fUseHostIOCache);

trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsSystem.cpp

@@ -50 +50 @@
      * Until there will be separate Main getter for list of supported boot device types,
      * this list will be hard-coded here... */
-    int iPossibleBootListSize = qMin((ulong)4, properties.GetMaxBootPosition());
+    int iPossibleBootListSize = qMin((ULONG)4, properties.GetMaxBootPosition());
     for (int iBootPosition = 1; iBootPosition <= iPossibleBootListSize; ++iBootPosition)
     {