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

Timestamp:

Mar 28, 2018 3:35:23 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9049: Small cleanup for VBoxX11Helper stuff.

Location:

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

Files:

• VBoxX11Helper.cpp (modified) (6 diffs)
• VBoxX11Helper.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - X11 helpers..
+ * VBox Qt GUI - VBox X11 helper functions.
  */
 
 /*
- * Copyright (C) 2008-2017 Oracle Corporation
+ * Copyright (C) 2008-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -17 +17 @@
 
 /* Qt includes: */
+#include <QString>
 #include <QX11Info>
-#include <QString>
 
 /* GUI includes: */
@@ -26 +26 @@
 #include <iprt/cdefs.h>
 
-/* rhel3 build hack */
+// WORKAROUND:
+// rhel3 build hack
 RT_C_DECLS_BEGIN
 #include <X11/Xatom.h>
@@ -32 +33 @@
 #include <X11/extensions/dpms.h>
 RT_C_DECLS_END
+
 
 static int  gX11ScreenSaverTimeout;
@@ -108 +110 @@
 {
     int     dummy;
-    Display *display = QX11Info::display();
-    gX11ScreenSaverDpmsAvailable = DPMSQueryExtension(display, &dummy, &dummy);
+    Display *pDisplay = QX11Info::display();
+    gX11ScreenSaverDpmsAvailable = DPMSQueryExtension(pDisplay, &dummy, &dummy);
 }
 
@@ -125 +127 @@
     int     dummy;
     CARD16  dummy2;
-    Display *display = QX11Info::display();
+    Display *pDisplay = QX11Info::display();
 
-    XGetScreenSaver(display, &gX11ScreenSaverTimeout, &dummy, &dummy, &dummy);
+    XGetScreenSaver(pDisplay, &gX11ScreenSaverTimeout, &dummy, &dummy, &dummy);
     if (gX11ScreenSaverDpmsAvailable)
-        DPMSInfo(display, &dummy2, &gX11DpmsState);
+        DPMSInfo(pDisplay, &dummy2, &gX11DpmsState);
 }
 
 void X11ScreenSaverSettingsRestore()
 {
-    int     timeout, interval, preferBlank, allowExp;
-    Display *display = QX11Info::display();
+    int     iTimeout, iInterval, iPreferBlank, iAllowExp;
+    Display *pDisplay = QX11Info::display();
 
-    XGetScreenSaver(display, &timeout, &interval, &preferBlank, &allowExp);
-    timeout = gX11ScreenSaverTimeout;
-    XSetScreenSaver(display, timeout, interval, preferBlank, allowExp);
+    XGetScreenSaver(pDisplay, &iTimeout, &iInterval, &iPreferBlank, &iAllowExp);
+    iTimeout = gX11ScreenSaverTimeout;
+    XSetScreenSaver(pDisplay, iTimeout, iInterval, iPreferBlank, iAllowExp);
 
     if (gX11DpmsState && gX11ScreenSaverDpmsAvailable)
-        DPMSEnable(display);
+        DPMSEnable(pDisplay);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.h

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2017 Oracle Corporation
+ * Copyright (C) 2006-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -19 +19 @@
 #define ___VBoxX11Helpers_h___
 
+
 /** X11: Known Window Manager types. */
 enum X11WMType
@@ -30 +31 @@
     X11WMType_Xfwm4,
 };
+
 
 /** X11: Determines and returns whether the compositing manager is running. */
@@ -44 +46 @@
 void X11ScreenSaverSettingsRestore();
 
+
 #endif /* !___VBoxX11Helpers_h___ */