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

Timestamp:

Feb 12, 2024 5:11:53 PM (12 months ago)

Author:

vboxsync

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

161622

Message:

FE/Qt: UIDesktopWidgetWatchdog: Get rid of UIDefs.h dependency; Moving SynthTest stuff to appropriate place.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• converter/UIConverterBackendGlobal.cpp (modified) (3 diffs)
• globals/UIDefs.cpp (modified) (1 diff)
• globals/UIDefs.h (modified) (2 diffs)
• globals/UIDesktopWidgetWatchdog.cpp (modified) (2 diffs)
• globals/UIDesktopWidgetWatchdog.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp

@@ -39 +39 @@
 #include "UISettingsDefs.h"
 #include "UITranslator.h"
+#if defined(VBOX_WS_NIX) && !defined(VBOX_GUI_WITH_CUSTOMIZATIONS1)
+# include "UIDesktopWidgetWatchdog.h"
+#endif
 
 /* COM includes: */
@@ -401 +404 @@
 }
 
+#if defined(VBOX_WS_NIX) && !defined(VBOX_GUI_WITH_CUSTOMIZATIONS1)
 /* DesktopWatchdogPolicy_SynthTest <= QString: */
 template<> SHARED_LIBRARY_STUFF DesktopWatchdogPolicy_SynthTest UIConverter::fromInternalString<DesktopWatchdogPolicy_SynthTest>(const QString &strPolicyType) const
@@ -414 +418 @@
     return DesktopWatchdogPolicy_SynthTest_Both;
 }
+#endif /* VBOX_WS_NIX && !VBOX_GUI_WITH_CUSTOMIZATIONS1 */
 
 /* QString <= UIExtraDataMetaDefs::DialogType: */

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

@@ -38 +38 @@
 QStringList UIDefs::VBoxExtPackFileExts = QStringList() << "vbox-extpack";
 QStringList UIDefs::OVFFileExts = QStringList() << "ovf" << "ova";
-
-/** Environment variable names: */
-const char *UIDefs::VBox_DesktopWatchdogPolicy_SynthTest = "VBOX_DESKTOPWATCHDOGPOLICY_SYNTHTEST";

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

@@ -86 +86 @@
     /** Allowed OVF file extensions. */
     SHARED_LIBRARY_STUFF extern QStringList OVFFileExts;
-
-    /** Holds environment variable name for Desktop Watchdog / Synthetic Test policy type. */
-    SHARED_LIBRARY_STUFF extern const char *VBox_DesktopWatchdogPolicy_SynthTest;
 }
 using namespace UIDefs /* if header included */;
@@ -162 +159 @@
 
 
-/** Desktop Watchdog / Synthetic Test policy type. */
-enum DesktopWatchdogPolicy_SynthTest
-{
-    DesktopWatchdogPolicy_SynthTest_Disabled,
-    DesktopWatchdogPolicy_SynthTest_ManagerOnly,
-    DesktopWatchdogPolicy_SynthTest_MachineOnly,
-    DesktopWatchdogPolicy_SynthTest_Both
-};
-Q_DECLARE_METATYPE(DesktopWatchdogPolicy_SynthTest);
-
-
 #endif /* !FEQT_INCLUDED_SRC_globals_UIDefs_h */

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

@@ -123 +123 @@
 
 #if defined(VBOX_WS_NIX) && !defined(VBOX_GUI_WITH_CUSTOMIZATIONS1)
+
+/* static */
+const QString
+UIDesktopWidgetWatchdog::s_strVBoxDesktopWatchdogPolicySynthTest = "VBOX_DESKTOPWATCHDOGPOLICY_SYNTHTEST";
 
 /** QWidget extension used as
@@ -1003 +1007 @@
 #if defined(VBOX_WS_NIX) && !defined(VBOX_GUI_WITH_CUSTOMIZATIONS1)
     /* Load Synthetic Test policy: */
-    const QString strSynthTestPolicy = QString::fromLocal8Bit(qgetenv(VBox_DesktopWatchdogPolicy_SynthTest));
+    const QString strSynthTestPolicy =
+        QString::fromLocal8Bit(qgetenv(s_strVBoxDesktopWatchdogPolicySynthTest.toLatin1().constData()));
     m_enmSynthTestPolicy = gpConverter->fromInternalString<DesktopWatchdogPolicy_SynthTest>(strSynthTestPolicy);
 

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

@@ -42 +42 @@
 /* GUI includes: */
 #include "UILibraryDefs.h"
-#if defined(VBOX_WS_NIX) && !defined(VBOX_GUI_WITH_CUSTOMIZATIONS1)
-# include "UIDefs.h"
-#endif
 
 /* Forward declarations: */
 class QScreen;
+
+#if defined(VBOX_WS_NIX) && !defined(VBOX_GUI_WITH_CUSTOMIZATIONS1)
+/** Desktop Watchdog / Synthetic Test policy type. */
+enum DesktopWatchdogPolicy_SynthTest
+{
+    DesktopWatchdogPolicy_SynthTest_Disabled,
+    DesktopWatchdogPolicy_SynthTest_ManagerOnly,
+    DesktopWatchdogPolicy_SynthTest_MachineOnly,
+    DesktopWatchdogPolicy_SynthTest_Both
+};
+Q_DECLARE_METATYPE(DesktopWatchdogPolicy_SynthTest);
+#endif /* VBOX_WS_NIX && !VBOX_GUI_WITH_CUSTOMIZATIONS1 */
 
 /** Singleton QObject extension used as desktop-widget
@@ -210 +219 @@
     void cleanupExistingWorkers();
 
+    /** Holds environment variable name for Desktop Watchdog / Synthetic Test policy type. */
+    static const QString s_strVBoxDesktopWatchdogPolicySynthTest;
+
     /** Holds the cached Synthetic Test policy. */
     DesktopWatchdogPolicy_SynthTest  m_enmSynthTestPolicy;