Changeset 93890 in vbox

Timestamp:

Feb 22, 2022 5:49:28 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:3355. Correcting some typo.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• platform/x11/VBoxUtils-x11.cpp (modified) (3 diffs)
• platform/x11/VBoxUtils-x11.h (modified) (1 diff)
• runtime/UIMachineLogic.cpp (modified) (1 diff)

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

@@ -299 +299 @@
 }
 
-void NativeWindowSubsystem::X11InhibitUninhibitScrenSaver(bool fInhibit, QVector<X11ScreenSaverInhibitMethod*> &inOutIhibitMethods)
+void NativeWindowSubsystem::X11InhibitUninhibitScrenSaver(bool fInhibit, QVector<X11ScreenSaverInhibitMethod*> &inOutInhibitMethods)
 {
     QDBusConnection connection = QDBusConnection::sessionBus();
     if (!X11CheckDBusConnection(connection))
         return;
-    for (int i = 0; i < inOutIhibitMethods.size(); ++i)
-    {
-        QDBusInterface screenSaverInterface(inOutIhibitMethods[i]->m_strServiceName, inOutIhibitMethods[i]->m_strPath,
-                                            inOutIhibitMethods[i]->m_strInterface, connection);
+    for (int i = 0; i < inOutInhibitMethods.size(); ++i)
+    {
+        QDBusInterface screenSaverInterface(inOutInhibitMethods[i]->m_strServiceName, inOutInhibitMethods[i]->m_strPath,
+                                            inOutInhibitMethods[i]->m_strInterface, connection);
         if (!screenSaverInterface.isValid())
         {
             QDBusError error = screenSaverInterface.lastError();
             LogRel(("QDBus error for service %s: %s. %s\n",
-                    inOutIhibitMethods[i]->m_strServiceName.toUtf8().constData(),
+                    inOutInhibitMethods[i]->m_strServiceName.toUtf8().constData(),
                     error.name().toUtf8().constData(),
                     error.message().toUtf8().constData()));
@@ -322 +322 @@
             reply = screenSaverInterface.call("Inhibit", "Oracle VirtualBox", "ScreenSaverInhibit");
             if (reply.isValid())
-                inOutIhibitMethods[i]->m_iCookie = reply.value();
+                inOutInhibitMethods[i]->m_iCookie = reply.value();
         }
         else
         {
-            reply = screenSaverInterface.call("UnInhibit", inOutIhibitMethods[i]->m_iCookie);
+            reply = screenSaverInterface.call("UnInhibit", inOutInhibitMethods[i]->m_iCookie);
         }
         if (!reply.isValid())
@@ -332 +332 @@
             QDBusError error = reply.error();
             LogRel(("QDBus inhibition call error for service %s: %s. %s\n",
-                    inOutIhibitMethods[i]->m_strServiceName.toUtf8().constData(),
+                    inOutInhibitMethods[i]->m_strServiceName.toUtf8().constData(),
                     error.name().toUtf8().constData(),
                     error.message().toUtf8().constData()));

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

@@ -101 +101 @@
     SHARED_LIBRARY_STUFF QVector<X11ScreenSaverInhibitMethod*> X11FindDBusScrenSaverInhibitMethods();
     /** X11: Disables/enables Screen Saver through QDBus. */
-    SHARED_LIBRARY_STUFF void X11InhibitUninhibitScrenSaver(bool fInhibit, QVector<X11ScreenSaverInhibitMethod*> &inOutIhibitMethods);
+    SHARED_LIBRARY_STUFF void X11InhibitUninhibitScrenSaver(bool fInhibit, QVector<X11ScreenSaverInhibitMethod*> &inOutInhibitMethods);
 
     /** Activates window with certain @a wId, @a fSwitchDesktop if requested. */

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

@@ -611 +611 @@
 {
 #if defined(VBOX_WS_X11)
+    /* Find the methods once and cache them: */
     if (m_methods.isEmpty())
         m_methods = NativeWindowSubsystem::X11FindDBusScrenSaverInhibitMethods();