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

Timestamp:

Apr 18, 2023 7:18:34 AM (20 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10407. Renaming DBus related functions.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• platform/x11/VBoxUtils-x11.cpp (modified) (5 diffs)
• platform/x11/VBoxUtils-x11.h (modified) (2 diffs)
• runtime/UIMachineLogic.cpp (modified) (1 diff)
• settings/editors/UIDisplayFeaturesEditor.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxUtils-x11.cpp

@@ -217 +217 @@
 }
 
-bool NativeWindowSubsystem::X11CheckDBusScreenSaverServices()
+bool NativeWindowSubsystem::checkDBusScreenSaverServices()
 {
     QDBusConnection connection = QDBusConnection::sessionBus();
@@ -263 +263 @@
 }
 
-void X11IntrospectServices(const QDBusConnection &connection,
+void introspectDBusServices(const QDBusConnection &connection,
                            const QString &strService,
                            const QString &strPath,
@@ -285 +285 @@
         {
             QString subPath = strPath + QLatin1Char('/') + child.attribute(QLatin1String("name"));
-            X11IntrospectServices(connection, strService, subPath, methods);
+            introspectDBusServices(connection, strService, subPath, methods);
         }
         else if (child.tagName() == QLatin1String("interface"))
@@ -293 +293 @@
 }
 
-QVector<X11ScreenSaverInhibitMethod*> NativeWindowSubsystem::X11FindDBusScrenSaverInhibitMethods()
+QVector<X11ScreenSaverInhibitMethod*> NativeWindowSubsystem::findDBusScrenSaverInhibitMethods()
 {
     QVector<X11ScreenSaverInhibitMethod*> methods;
@@ -303 +303 @@
     QStringList services = X11FindDBusScreenSaverServices(connection);
     foreach(const QString &strServiceName, services)
-        X11IntrospectServices(connection, strServiceName, "", methods);
+        introspectDBusServices(connection, strServiceName, "", methods);
 
     return methods;
 }
 
-void NativeWindowSubsystem::X11InhibitUninhibitScrenSaver(bool fInhibit, QVector<X11ScreenSaverInhibitMethod*> &inOutInhibitMethods)
+void NativeWindowSubsystem::toggleHostScrenSaver(bool fInhibit, QVector<X11ScreenSaverInhibitMethod*> &inOutInhibitMethods)
 {
     QDBusConnection connection = QDBusConnection::sessionBus();

trunk/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxUtils-x11.h

@@ -120 +120 @@
     /** Wrapper for X11CheckExtension and WaylandCheckExtension functions. */
     bool checkExtension(bool fIsXServerAvailable, const char *extensionName);
-    /** X11: Returns true if XLib extension with name @p extensionName is avaible, false otherwise. */
+    /** X11: Returns true if XLib extension with name @p extensionName is available, false otherwise. */
     bool X11CheckExtension(const char *pExtensionName);
     bool WaylandCheckExtension(const char *pExtensionName);
 
 
-    /** X11: Returns whether there are any DBus services whose name contains the substring 'screensaver'. */
-    bool X11CheckDBusScreenSaverServices();
-    /** X11: Returns the list of Inhibit methods found by introspecting DBus services. */
-    SHARED_LIBRARY_STUFF QVector<X11ScreenSaverInhibitMethod*> X11FindDBusScrenSaverInhibitMethods();
-    /** X11: Disables/enables Screen Saver through QDBus. */
-    SHARED_LIBRARY_STUFF void X11InhibitUninhibitScrenSaver(bool fInhibit, QVector<X11ScreenSaverInhibitMethod*> &inOutInhibitMethods);
+    /** DBus: Returns whether there are any DBus services whose name contains the substring 'screensaver'. */
+    bool checkDBusScreenSaverServices();
+    /** DBus: Returns the list of Inhibit methods found by introspecting DBus services. */
+    SHARED_LIBRARY_STUFF QVector<X11ScreenSaverInhibitMethod*> findDBusScrenSaverInhibitMethods();
+    /** DBus: Disables/enables Screen Saver through QDBus. */
+    SHARED_LIBRARY_STUFF void toggleHostScrenSaver(bool fInhibit, QVector<X11ScreenSaverInhibitMethod*> &inOutInhibitMethods);
 
     /** Wrapper function for X11ActivateWindow or WaylandActivateWindow. */
@@ -170 +170 @@
     /** Detects and returns display server type. */
     SHARED_LIBRARY_STUFF DisplayServerType detectDisplayServerType();
-    /** Returns true if @a enmDisplayServerType is either xorg or xwayland. */
+    /** Returns true if @a enmDisplayServerType is either XOrg or XWayland. */
     SHARED_LIBRARY_STUFF bool X11XServerAvailable(DisplayServerType enmDisplayServerType);
 }

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

@@ -579 +579 @@
     /* Find the methods once and cache them: */
     if (m_methods.isEmpty())
-        m_methods = NativeWindowSubsystem::X11FindDBusScrenSaverInhibitMethods();
-    NativeWindowSubsystem::X11InhibitUninhibitScrenSaver(fDisabled, m_methods);
+        m_methods = NativeWindowSubsystem::findDBusScrenSaverInhibitMethods();
+    NativeWindowSubsystem::toggleHostScrenSaver(fDisabled, m_methods);
 #elif defined(VBOX_WS_WIN)
     NativeWindowSubsystem::setScreenSaverActive(fDisabled);

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDisplayFeaturesEditor.cpp

@@ -142 +142 @@
         m_pCheckBoxDisableHostScreenSaver = new QCheckBox(this);
 #elif defined(VBOX_WS_X11)
-        if (NativeWindowSubsystem::X11CheckDBusScreenSaverServices())
+        if (NativeWindowSubsystem::checkDBusScreenSaverServices())
             m_pCheckBoxDisableHostScreenSaver = new QCheckBox(this);
 #endif /* VBOX_WS_X11 */