Changeset 82008 in vbox for trunk/src/VBox/Frontends

Timestamp:

Nov 19, 2019 8:50:14 PM (5 years ago)

Author:

vboxsync

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

134810

Message:

FE/Qt: GUI coding-style fixes for r134761; Some places too old to be updated, but new taken into account.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMachineAttributeSetter.cpp (modified) (2 diffs)
• globals/UIMessageCenter.cpp (modified) (2 diffs)
• globals/UIMessageCenter.h (modified) (1 diff)
• runtime/UIIndicatorsPool.cpp (modified) (1 diff)
• runtime/UIKeyboardHandler.cpp (modified) (3 diffs)
• runtime/UIKeyboardHandler.h (modified) (1 diff)
• runtime/scale/UIMachineLogicScale.cpp (modified) (1 diff)
• runtime/seamless/UIMachineLogicSeamless.cpp (modified) (1 diff)
• settings/machine/UIMachineSettingsDisplay.cpp (modified) (3 diffs)
• snapshots/UISnapshotDetailsWidget.cpp (modified) (2 diffs)
• wizards/newvm/UIWizardNewVM.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMachineAttributeSetter.cpp

@@ -159 +159 @@
             case MachineAttribute_VideoMemory:
             {
+                /* Acquire graphics adapter: */
+                CGraphicsAdapter comGraphics = comMachine.GetGraphicsAdapter();
+                if (!comMachine.isOk())
+                {
+                    msgCenter().cannotAcquireMachineParameter(comMachine);
+                    fErrorHappened = true;
+                    break;
+                }
                 /* Change machine video memory (VRAM): */
-                comMachine.GetGraphicsAdapter().SetVRAMSize(guiAttribute.toInt());
-                if (!comMachine.isOk())
-                {
-                    msgCenter().cannotChangeMachineAttribute(comMachine);
+                comGraphics.SetVRAMSize(guiAttribute.toInt());
+                if (!comGraphics.isOk())
+                {
+                    msgCenter().cannotChangeGraphicsAdapterAttribute(comGraphics);
                     fErrorHappened = true;
                 }
@@ -170 +178 @@
             case MachineAttribute_GraphicsControllerType:
             {
+                /* Acquire graphics adapter: */
+                CGraphicsAdapter comGraphics = comMachine.GetGraphicsAdapter();
+                if (!comMachine.isOk())
+                {
+                    msgCenter().cannotAcquireMachineParameter(comMachine);
+                    fErrorHappened = true;
+                    break;
+                }
                 /* Change machine graphics controller type: */
-                comMachine.GetGraphicsAdapter().SetGraphicsControllerType(guiAttribute.value<KGraphicsControllerType>());
-                if (!comMachine.isOk())
-                {
-                    msgCenter().cannotChangeMachineAttribute(comMachine);
+                comGraphics.SetGraphicsControllerType(guiAttribute.value<KGraphicsControllerType>());
+                if (!comGraphics.isOk())
+                {
+                    msgCenter().cannotChangeGraphicsAdapterAttribute(comGraphics);
                     fErrorHappened = true;
                 }

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp

@@ -61 +61 @@
 #include "CCloudProviderManager.h"
 #include "CDHCPServer.h"
+#include "CGraphicsAdapter.h"
 #include "CNATEngine.h"
 #include "CNATNetwork.h"
@@ -1242 +1243 @@
              .arg(machine.GetName(), CMachine(machine).GetSettingsFilePath()),
           UIErrorString::formatErrorInfo(machine));
+}
+
+void UIMessageCenter::cannotChangeGraphicsAdapterAttribute(const CGraphicsAdapter &comAdapter, QWidget *pParent /* = 0 */) const
+{
+    error(pParent, MessageType_Error,
+          tr("Failed to change graphics adapter attribute."),
+          UIErrorString::formatErrorInfo(comAdapter));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h

@@ -331 +331 @@
     void cannotChangeMachineAttribute(const CMachine &comMachine, QWidget *pParent = 0) const;
     void cannotSaveMachineSettings(const CMachine &machine, QWidget *pParent = 0) const;
+    void cannotChangeGraphicsAdapterAttribute(const CGraphicsAdapter &comAdapter, QWidget *pParent = 0) const;
     void cannotChangeAudioAdapterAttribute(const CAudioAdapter &comAdapter, QWidget *pParent = 0) const;
     void cannotChangeNetworkAdapterAttribute(const CNetworkAdapter &comAdapter, QWidget *pParent = 0) const;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp

@@ -743 +743 @@
         QString strFullData;
 
+        /* Get graphics adapter: */
         CGraphicsAdapter comGraphics = machine.GetGraphicsAdapter();
+
         /* Video Memory: */
         const ULONG uVRAMSize = comGraphics.GetVRAMSize();

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp

@@ -68 +68 @@
 /* COM includes: */
 #include "CKeyboard.h"
-#include "CGraphicsAdapter.h"
 
 /* Other VBox includes: */
@@ -983 +982 @@
     , m_hButtonGrabWindow(0)
 #endif /* VBOX_WS_X11 */
-    , m_cMonitors(1)
 {
     /* Prepare: */
@@ -1014 +1012 @@
     /* Pressed keys: */
     ::memset(m_pressedKeys, 0, sizeof(m_pressedKeys));
-
-    m_cMonitors = uisession()->machine().GetGraphicsAdapter().GetMonitorCount();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.h

@@ -232 +232 @@
     xcb_window_t m_hButtonGrabWindow;
 #endif /* VBOX_WS_X11 */
-
-    ULONG m_cMonitors;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineLogicScale.cpp

@@ -36 +36 @@
 #endif
 
-/* GUI includes: */
+/* COM includes: */
 #include "CGraphicsAdapter.h"
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.cpp

@@ -37 +37 @@
 #endif /* VBOX_WS_MAC */
 
-/* GUI includes: */
+/* COM includes: */
 #include "CGraphicsAdapter.h"
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp

@@ -371 +371 @@
     UIDataSettingsMachineDisplay oldDisplayData;
 
-    /* Gather old 'Screen' data: */
+    /* Check whether graphics adapter is valid: */
     const CGraphicsAdapter &comGraphics = m_machine.GetGraphicsAdapter();
-    oldDisplayData.m_iCurrentVRAM = comGraphics.GetVRAMSize();
-    oldDisplayData.m_cGuestScreenCount = comGraphics.GetMonitorCount();
-    oldDisplayData.m_scaleFactors = gEDataManager->scaleFactors(m_machine.GetId());
-    oldDisplayData.m_graphicsControllerType = comGraphics.GetGraphicsControllerType();
+    if (!comGraphics.isNull())
+    {
+        /* Gather old 'Screen' data: */
+        oldDisplayData.m_iCurrentVRAM = comGraphics.GetVRAMSize();
+        oldDisplayData.m_cGuestScreenCount = comGraphics.GetMonitorCount();
+        oldDisplayData.m_scaleFactors = gEDataManager->scaleFactors(m_machine.GetId());
+        oldDisplayData.m_graphicsControllerType = comGraphics.GetGraphicsControllerType();
 #ifdef VBOX_WITH_3D_ACCELERATION
-    oldDisplayData.m_f3dAccelerationEnabled = comGraphics.GetAccelerate3DEnabled();
+        oldDisplayData.m_f3dAccelerationEnabled = comGraphics.GetAccelerate3DEnabled();
 #endif
 #ifdef VBOX_WITH_VIDEOHWACCEL
-    oldDisplayData.m_f2dVideoAccelerationEnabled = comGraphics.GetAccelerate2DVideoEnabled();
-#endif
+        oldDisplayData.m_f2dVideoAccelerationEnabled = comGraphics.GetAccelerate2DVideoEnabled();
+#endif
+    }
+
     /* Check whether remote display server is valid: */
     const CVRDEServer &vrdeServer = m_machine.GetVRDEServer();
@@ -1375 +1380 @@
     if (fSuccess)
     {
-        CGraphicsAdapter comGraphics = m_machine.GetGraphicsAdapter();
         /* Get old display data from the cache: */
         const UIDataSettingsMachineDisplay &oldDisplayData = m_pCache->base();
@@ -1381 +1385 @@
         const UIDataSettingsMachineDisplay &newDisplayData = m_pCache->data();
 
-        /* Save video RAM size: */
-        if (fSuccess && isMachineOffline() && newDisplayData.m_iCurrentVRAM != oldDisplayData.m_iCurrentVRAM)
-        {
-            comGraphics.SetVRAMSize(newDisplayData.m_iCurrentVRAM);
-            fSuccess = comGraphics.isOk();
-        }
-        /* Save guest screen count: */
-        if (fSuccess && isMachineOffline() && newDisplayData.m_cGuestScreenCount != oldDisplayData.m_cGuestScreenCount)
-        {
-            comGraphics.SetMonitorCount(newDisplayData.m_cGuestScreenCount);
-            fSuccess = comGraphics.isOk();
-        }
-        /* Save the Graphics Controller Type: */
-        if (fSuccess && isMachineOffline() && newDisplayData.m_graphicsControllerType != oldDisplayData.m_graphicsControllerType)
-        {
-            comGraphics.SetGraphicsControllerType(newDisplayData.m_graphicsControllerType);
-            fSuccess = comGraphics.isOk();
-        }
-#ifdef VBOX_WITH_3D_ACCELERATION
-        /* Save whether 3D acceleration is enabled: */
-        if (fSuccess && isMachineOffline() && newDisplayData.m_f3dAccelerationEnabled != oldDisplayData.m_f3dAccelerationEnabled)
-        {
-            comGraphics.SetAccelerate3DEnabled(newDisplayData.m_f3dAccelerationEnabled);
-            fSuccess = comGraphics.isOk();
-        }
-#endif
-#ifdef VBOX_WITH_VIDEOHWACCEL
-        /* Save whether 2D video acceleration is enabled: */
-        if (fSuccess && isMachineOffline() && newDisplayData.m_f2dVideoAccelerationEnabled != oldDisplayData.m_f2dVideoAccelerationEnabled)
-        {
-            comGraphics.SetAccelerate2DVideoEnabled(newDisplayData.m_f2dVideoAccelerationEnabled);
-            fSuccess = comGraphics.isOk();
-        }
-#endif
-
-        /* Get machine ID for further activities: */
-        QUuid uMachineId;
-        if (fSuccess)
-        {
-            uMachineId = m_machine.GetId();
-            fSuccess = m_machine.isOk();
-        }
+        /* Get graphics adapter for further activities: */
+        CGraphicsAdapter comGraphics = m_machine.GetGraphicsAdapter();
+        fSuccess = m_machine.isOk() && comGraphics.isNotNull();
 
         /* Show error message if necessary: */
         if (!fSuccess)
             notifyOperationProgressError(UIErrorString::formatErrorInfo(m_machine));
-
-        /* Save guest-screen scale-factor: */
-        if (fSuccess && newDisplayData.m_scaleFactors != oldDisplayData.m_scaleFactors)
-        {
-            gEDataManager->setScaleFactors(newDisplayData.m_scaleFactors, uMachineId);
+        else
+        {
+            /* Save video RAM size: */
+            if (fSuccess && isMachineOffline() && newDisplayData.m_iCurrentVRAM != oldDisplayData.m_iCurrentVRAM)
+            {
+                comGraphics.SetVRAMSize(newDisplayData.m_iCurrentVRAM);
+                fSuccess = comGraphics.isOk();
+            }
+            /* Save guest screen count: */
+            if (fSuccess && isMachineOffline() && newDisplayData.m_cGuestScreenCount != oldDisplayData.m_cGuestScreenCount)
+            {
+                comGraphics.SetMonitorCount(newDisplayData.m_cGuestScreenCount);
+                fSuccess = comGraphics.isOk();
+            }
+            /* Save the Graphics Controller Type: */
+            if (fSuccess && isMachineOffline() && newDisplayData.m_graphicsControllerType != oldDisplayData.m_graphicsControllerType)
+            {
+                comGraphics.SetGraphicsControllerType(newDisplayData.m_graphicsControllerType);
+                fSuccess = comGraphics.isOk();
+            }
+#ifdef VBOX_WITH_3D_ACCELERATION
+            /* Save whether 3D acceleration is enabled: */
+            if (fSuccess && isMachineOffline() && newDisplayData.m_f3dAccelerationEnabled != oldDisplayData.m_f3dAccelerationEnabled)
+            {
+                comGraphics.SetAccelerate3DEnabled(newDisplayData.m_f3dAccelerationEnabled);
+                fSuccess = comGraphics.isOk();
+            }
+#endif
+#ifdef VBOX_WITH_VIDEOHWACCEL
+            /* Save whether 2D video acceleration is enabled: */
+            if (fSuccess && isMachineOffline() && newDisplayData.m_f2dVideoAccelerationEnabled != oldDisplayData.m_f2dVideoAccelerationEnabled)
+            {
+                comGraphics.SetAccelerate2DVideoEnabled(newDisplayData.m_f2dVideoAccelerationEnabled);
+                fSuccess = comGraphics.isOk();
+            }
+#endif
+
+            /* Get machine ID for further activities: */
+            QUuid uMachineId;
+            if (fSuccess)
+            {
+                uMachineId = m_machine.GetId();
+                fSuccess = m_machine.isOk();
+            }
+
+            /* Show error message if necessary: */
+            if (!fSuccess)
+                notifyOperationProgressError(UIErrorString::formatErrorInfo(m_machine));
+
+            /* Save guest-screen scale-factor: */
+            if (fSuccess && newDisplayData.m_scaleFactors != oldDisplayData.m_scaleFactors)
+                /* fSuccess = */ gEDataManager->setScaleFactors(newDisplayData.m_scaleFactors, uMachineId);
         }
     }

trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotDetailsWidget.cpp

@@ -44 +44 @@
 /* COM includes: */
 #include "CAudioAdapter.h"
-#include "CGraphicsAdapter.h"
 #include "CRecordingSettings.h"
 #include "CRecordingScreenSettings.h"
@@ -1314 +1313 @@
             const CGraphicsAdapter &comGraphics = comMachine.GetGraphicsAdapter();
             const CGraphicsAdapter &comGraphicsOld = comMachineOld.GetGraphicsAdapter();
+
             /* Video Memory: */
             ++iRowCount;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp

@@ -146 +146 @@
 void UIWizardNewVM::configureVM(const QString &strGuestTypeId, const CGuestOSType &comGuestType)
 {
-    CVirtualBox vbox = uiCommon().virtualBox();
+    /* Get graphics adapter: */
+    CGraphicsAdapter comGraphics = m_machine.GetGraphicsAdapter();
 
     /* RAM size: */
     m_machine.SetMemorySize(field("ram").toInt());
 
-    CGraphicsAdapter comGraphics = m_machine.GetGraphicsAdapter();
     /* Graphics Controller type: */
     comGraphics.SetGraphicsControllerType(comGuestType.GetRecommendedGraphicsController());