Changeset 102502 in vbox for trunk/src

Timestamp:

Dec 6, 2023 1:25:13 PM (18 months ago)

Author:

vboxsync

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

160646

Message:

FE/Qt: A bit of reordering for UICommon to place everything propely.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• UICommon.cpp (modified) (2 diffs)
• UICommon.h (modified) (5 diffs)

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

@@ -953 +953 @@
     QSettings settings(m_strBrandingConfigFilePath, QSettings::IniFormat);
     return settings.value(QString("%1").arg(strKey)).toString();
+}
+
+#ifdef VBOX_WS_NIX
+bool UICommon::X11ServerAvailable() const
+{
+    return VBGHDisplayServerTypeIsXAvailable(m_enmDisplayServerType);
+}
+
+VBGHDISPLAYSERVERTYPE UICommon::displayServerType() const
+{
+    return m_enmDisplayServerType;
+}
+#endif
+
+QString UICommon::hostOperatingSystem() const
+{
+    if (!m_comHost.isOk())
+        return QString();
+    return m_comHost.GetOperatingSystem();
 }
 
@@ -3014 +3033 @@
     m_fWrappersValid = true;
 }
-
-#ifdef VBOX_WS_NIX
-bool UICommon::X11ServerAvailable() const
-{
-    return VBGHDisplayServerTypeIsXAvailable(m_enmDisplayServerType);
-}
-
-VBGHDISPLAYSERVERTYPE UICommon::displayServerType() const
-{
-    return m_enmDisplayServerType;
-}
-#endif
-
-QString UICommon::hostOperatingSystem() const
-{
-    if (!m_comHost.isOk())
-        return QString();
-    return m_comHost.GetOperatingSystem();
-}

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

@@ -176 +176 @@
         /** Returns whether UICommon instance cleanup is in progress. */
         bool isCleaningUp() const { return m_fCleaningUp; }
-
-#ifdef VBOX_WS_MAC
-        /** Returns whether macOS is in Dark mode. */
-        bool isInDarkMode() const { return m_fDarkMode; }
-#endif
     /** @} */
 
@@ -218 +213 @@
     /** @name Host OS stuff.
      * @{ */
-        /** Loads the color theme. */
-        void loadColorTheme();
+#ifdef VBOX_WS_MAC
+        /** macOS: Returns whether macOS is in Dark mode. */
+        bool isInDarkMode() const { return m_fDarkMode; }
+#endif
 
 #ifdef VBOX_WS_NIX
@@ -233 +230 @@
         /** Returns the name of the host OS by using IHost::getOperatingSystem. */
         QString hostOperatingSystem() const;
+
+        /** Loads the color theme. */
+        void loadColorTheme();
     /** @} */
 
@@ -643 +643 @@
         bool  m_fDataCommitted;
 #endif
-
-#ifdef VBOX_WS_MAC
-        /** Holds whether macOS is in Dark mode. */
-        bool  m_fDarkMode;
-#endif
     /** @} */
 
@@ -658 +653 @@
     /** @name Host OS stuff.
      * @{ */
+#ifdef VBOX_WS_MAC
+        /** macOS: Holds whether macOS is in Dark mode. */
+        bool  m_fDarkMode;
+#endif
+
 #ifdef VBOX_WS_NIX
         /** X11: Holds the #X11WMType of the Window Manager we are running under. */