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

Timestamp:

Apr 18, 2023 7:29:08 AM (21 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10407. An addendum to r156894.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• platform/x11/VBoxUtils-x11.cpp (modified) (8 diffs)
• platform/x11/VBoxUtils-x11.h (modified) (2 diffs)
• runtime/UIMachineLogic.h (modified) (2 diffs)

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

@@ -174 +174 @@
 }
 
-bool X11CheckDBusConnection(const QDBusConnection &connection)
+bool checkDBusConnection(const QDBusConnection &connection)
 {
     if (!connection.isConnected())
@@ -192 +192 @@
 }
 
-QStringList X11FindDBusScreenSaverServices(const QDBusConnection &connection)
+QStringList findDBusScreenSaverServices(const QDBusConnection &connection)
 {
     QStringList serviceNames;
@@ -220 +220 @@
 {
     QDBusConnection connection = QDBusConnection::sessionBus();
-    if (!X11CheckDBusConnection(connection))
+    if (!checkDBusConnection(connection))
         return false;
 
@@ -241 +241 @@
 }
 
-void X11IntrospectInterfaceNode(const QDomElement &interface,
+void introspectDBusInterfaceNode(const QDomElement &interface,
                                 const QString &strServiceName,
-                                QVector<X11ScreenSaverInhibitMethod*> &methods)
+                                QVector<DBusScreenSaverInhibitMethod*> &methods)
 {
     QDomElement child = interface.firstChildElement();
@@ -250 +250 @@
         if (child.tagName() == "method" && child.attribute("name") == "Inhibit")
         {
-            X11ScreenSaverInhibitMethod *newMethod = new X11ScreenSaverInhibitMethod;
+            DBusScreenSaverInhibitMethod *newMethod = new DBusScreenSaverInhibitMethod;
             newMethod->m_iCookie = 0;
             newMethod->m_strServiceName = strServiceName;
@@ -266 +266 @@
                            const QString &strService,
                            const QString &strPath,
-                           QVector<X11ScreenSaverInhibitMethod*> &methods)
+                           QVector<DBusScreenSaverInhibitMethod*> &methods)
 {
     QDBusMessage call = QDBusMessage::createMethodCall(strService, strPath.isEmpty() ? QLatin1String("/") : strPath,
@@ -288 +288 @@
         }
         else if (child.tagName() == QLatin1String("interface"))
-            X11IntrospectInterfaceNode(child, strService, methods);
+            introspectDBusInterfaceNode(child, strService, methods);
         child = child.nextSiblingElement();
     }
 }
 
-QVector<X11ScreenSaverInhibitMethod*> NativeWindowSubsystem::findDBusScrenSaverInhibitMethods()
-{
-    QVector<X11ScreenSaverInhibitMethod*> methods;
+QVector<DBusScreenSaverInhibitMethod*> NativeWindowSubsystem::findDBusScrenSaverInhibitMethods()
+{
+    QVector<DBusScreenSaverInhibitMethod*> methods;
 
     QDBusConnection connection = QDBusConnection::sessionBus();
-    if (!X11CheckDBusConnection(connection))
+    if (!checkDBusConnection(connection))
         return methods;
 
-    QStringList services = X11FindDBusScreenSaverServices(connection);
+    QStringList services = findDBusScreenSaverServices(connection);
     foreach(const QString &strServiceName, services)
         introspectDBusServices(connection, strServiceName, "", methods);
@@ -308 +308 @@
 }
 
-void NativeWindowSubsystem::toggleHostScrenSaver(bool fInhibit, QVector<X11ScreenSaverInhibitMethod*> &inOutInhibitMethods)
+void NativeWindowSubsystem::toggleHostScrenSaver(bool fInhibit, QVector<DBusScreenSaverInhibitMethod*> &inOutInhibitMethods)
 {
     QDBusConnection connection = QDBusConnection::sessionBus();
-    if (!X11CheckDBusConnection(connection))
+    if (!checkDBusConnection(connection))
         return;
     for (int i = 0; i < inOutInhibitMethods.size(); ++i)

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

@@ -64 +64 @@
 
 /** X11: Screen-saver inhibit methods. */
-struct SHARED_LIBRARY_STUFF X11ScreenSaverInhibitMethod
+struct SHARED_LIBRARY_STUFF DBusScreenSaverInhibitMethod
 {
     QString  m_strServiceName;
@@ -128 +128 @@
     bool checkDBusScreenSaverServices();
     /** DBus: Returns the list of Inhibit methods found by introspecting DBus services. */
-    SHARED_LIBRARY_STUFF QVector<X11ScreenSaverInhibitMethod*> findDBusScrenSaverInhibitMethods();
+    SHARED_LIBRARY_STUFF QVector<DBusScreenSaverInhibitMethod*> findDBusScrenSaverInhibitMethods();
     /** DBus: Disables/enables Screen Saver through QDBus. */
-    SHARED_LIBRARY_STUFF void toggleHostScrenSaver(bool fInhibit, QVector<X11ScreenSaverInhibitMethod*> &inOutInhibitMethods);
+    SHARED_LIBRARY_STUFF void toggleHostScrenSaver(bool fInhibit, QVector<DBusScreenSaverInhibitMethod*> &inOutInhibitMethods);
 
     /** Wrapper function for X11ActivateWindow or WaylandActivateWindow. */

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

@@ -53 +53 @@
 class CVirtualBoxErrorInfo;
 #if defined(VBOX_WS_X11)
- struct X11ScreenSaverInhibitMethod;
+ struct DBusScreenSaverInhibitMethod;
 #endif
 
@@ -406 +406 @@
     QMap<QString, uint> m_screenSaverInhibitionCookies;
 #if defined(VBOX_WS_X11)
-    QVector<X11ScreenSaverInhibitMethod*> m_methods;
+    QVector<DBusScreenSaverInhibitMethod*> m_methods;
 #endif
 };