Changeset 91065 in vbox

Timestamp:

Sep 1, 2021 3:41:42 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: A bit of cleanup for r146706, some of stuff doesn't need to be public, that reduces includes as well.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/platform/x11

Files:

• VBoxUtils-x11.cpp (modified) (7 diffs)
• VBoxUtils-x11.h (modified) (3 diffs)

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

@@ -29 +29 @@
 
 /* Other VBox includes: */
-#include <iprt/cdefs.h>
 #include <VBox/log.h>
 
+/* Other includes: */
+#include <X11/Xatom.h>
+#include <X11/Xutil.h>
+#include <X11/extensions/dpms.h>
+
+/// @todo is it required still?
 // WORKAROUND:
 // rhel3 build hack
-RT_C_DECLS_BEGIN
-#include <X11/Xatom.h>
-#include <X11/Xlib.h>
-#undef BOOL /* VBox/com/defs.h conflict */
-#include <X11/extensions/dpms.h>
-RT_C_DECLS_END
-
-
-static int  gX11ScreenSaverTimeout;
-static BOOL gX11ScreenSaverDpmsAvailable;
-static BOOL gX11DpmsState;
+//RT_C_DECLS_BEGIN
+//#include <X11/Xlib.h>
+//#undef BOOL /* VBox/com/defs.h conflict */
+//RT_C_DECLS_END
+
 
 bool NativeWindowSubsystem::X11IsCompositingManagerRunning()
@@ -110 +109 @@
 }
 
+#if 0 // unused for now?
+static int  gX11ScreenSaverTimeout;
+static BOOL gX11ScreenSaverDpmsAvailable;
+static BOOL gX11DpmsState;
+
 void NativeWindowSubsystem::X11ScreenSaverSettingsInit()
 {
@@ -148 +152 @@
         DPMSEnable(pDisplay);
 }
+#endif // unused for now?
 
 bool NativeWindowSubsystem::X11CheckExtension(const char *pExtensionName)
@@ -159 +164 @@
 }
 
-bool NativeWindowSubsystem::X11CheckDBusConnection(const QDBusConnection &connection)
+bool X11CheckDBusConnection(const QDBusConnection &connection)
 {
     if (!connection.isConnected())
@@ -177 +182 @@
 }
 
-QStringList NativeWindowSubsystem::X11FindDBusScreenSaverServices(const QDBusConnection &connection)
+QStringList X11FindDBusScreenSaverServices(const QDBusConnection &connection)
 {
     QStringList serviceNames;
@@ -226 +231 @@
 }
 
-void NativeWindowSubsystem::X11IntrospectInterfaceNode(const QDomElement &interface,
-                                                       const QString &strServiceName,
-                                                       QVector<X11ScreenSaverInhibitMethod*> &methods)
+void X11IntrospectInterfaceNode(const QDomElement &interface,
+                                const QString &strServiceName,
+                                QVector<X11ScreenSaverInhibitMethod*> &methods)
 {
     QDomElement child = interface.firstChildElement();
@@ -248 +253 @@
 }
 
-void NativeWindowSubsystem::X11IntrospectServices(const QDBusConnection &connection,
-                                                  const QString &strService,
-                                                  const QString &strPath,
-                                                  QVector<X11ScreenSaverInhibitMethod*> &methods)
+void X11IntrospectServices(const QDBusConnection &connection,
+                           const QString &strService,
+                           const QString &strPath,
+                           QVector<X11ScreenSaverInhibitMethod*> &methods)
 {
     QDBusMessage call = QDBusMessage::createMethodCall(strService, strPath.isEmpty() ? QLatin1String("/") : strPath,

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

@@ -29 +29 @@
 #include "UILibraryDefs.h"
 
-/* Forward declarations: */
-class QDBusConnection;
-class QDomElement;
-
 /** X11: Known Window Manager types. */
 enum X11WMType
@@ -58 +54 @@
 {
     /** X11: Determines and returns whether the compositing manager is running. */
-    SHARED_LIBRARY_STUFF bool X11IsCompositingManagerRunning();
+    bool X11IsCompositingManagerRunning();
+    /** X11: Determines and returns current Window Manager type. */
+    X11WMType X11WindowManagerType();
 
-    /** X11: Determines and returns current Window Manager type. */
-    SHARED_LIBRARY_STUFF X11WMType X11WindowManagerType();
-
+#if 0 // unused for now?
     /** X11: Inits the screen saver save/restore mechanism. */
     SHARED_LIBRARY_STUFF void X11ScreenSaverSettingsInit();
@@ -69 +65 @@
     /** X11: Restores previously saved screen saver settings. */
     SHARED_LIBRARY_STUFF void X11ScreenSaverSettingsRestore();
+#endif // unused for now?
+
     /** X11: Returns true if XLib extension with name @p extensionName is avaible, false otherwise. */
-    SHARED_LIBRARY_STUFF bool X11CheckExtension(const char *extensionName);
+    bool X11CheckExtension(const char *extensionName);
 
-    /** X11: Returns whether DBus @a connection is alive. */
-    bool X11CheckDBusConnection(const QDBusConnection &connection);
-    /** X11: Finds a list of DBus @a connection screen-saver services. */
-    QStringList X11FindDBusScreenSaverServices(const QDBusConnection &connection);
     /** X11: Returns whether there are any DBus services whose name contains the substring 'screensaver'. */
     bool X11CheckDBusScreenSaverServices();
-    /** X11: Does something known only to original creator... */
-    void X11IntrospectInterfaceNode(const QDomElement &interface,
-                                    const QString &strServiceName,
-                                    QVector<X11ScreenSaverInhibitMethod*> &methods);
-    /** X11: Does something known only to original creator... */
-    void X11IntrospectServices(const QDBusConnection &connection,
-                               const QString &strService,
-                               const QString &strPath,
-                               QVector<X11ScreenSaverInhibitMethod*> &methods);
-
     /** 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*> &inOutIhibitMethods);