Changeset 71402 in vbox for trunk/src/VBox

Timestamp:

Mar 20, 2018 1:43:07 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9049: Small cleanup for QIProcess.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/extensions

Files:

• QIProcess.cpp (modified) (4 diffs)
• QIProcess.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIProcess.cpp

@@ -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 @@
 # include <precomp.h>
 #else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
+
 /* GUI includes: */
 # include "QIProcess.h"
+
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
@@ -26 +28 @@
 #ifdef VBOX_WS_X11
 # include <sys/wait.h>
-#endif /* VBOX_WS_X11 */
+#endif
 
 
+QIProcess::QIProcess(QObject *pParent /* = 0 */)
+    : QProcess(pParent)
+{
+}
+
 /* static */
-QByteArray QIProcess::singleShot(const QString &strProcessName, int iTimeout)
+QByteArray QIProcess::singleShot(const QString &strProcessName, int iTimeout /* = 5000 */)
 {
-    /* Why is it really needed is because of Qt4.3 bug with QProcess.
-     * This bug is about QProcess sometimes (~70%) do not receive
-     * notification about process was finished, so this makes
-     * 'bool QProcess::waitForFinished (int)' block the GUI thread and
-     * never dismissed with 'true' result even if process was really
-     * started&finished. So we just waiting for some information
-     * on process output and destroy the process with force. Due to
-     * QProcess::~QProcess() has the same 'waitForFinished (int)' blocker
-     * we have to change process state to QProcess::NotRunning. */
+    // WORKAROUND:
+    // Why is it really needed is because of Qt4.3 bug with QProcess.
+    // This bug is about QProcess sometimes (~70%) do not receive
+    // notification about process was finished, so this makes
+    // 'bool QProcess::waitForFinished (int)' block the GUI thread and
+    // never dismissed with 'true' result even if process was really
+    // started&finished. So we just waiting for some information
+    // on process output and destroy the process with force. Due to
+    // QProcess::~QProcess() has the same 'waitForFinished (int)' blocker
+    // we have to change process state to QProcess::NotRunning.
 
+    /// @todo Do we still need this?
     QByteArray result;
     QIProcess process;
@@ -57 +66 @@
 }
 
-QIProcess::QIProcess(QObject *pParent /* = 0 */)
-    : QProcess(pParent)
-{
-}
-

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIProcess.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
@@ -16 +16 @@
  */
 
-#ifndef __QIProcess_h__
-#define __QIProcess_h__
+#ifndef ___QIProcess_h___
+#define ___QIProcess_h___
 
 /* Qt includes: */
 #include <QProcess>
 
-/* QProcess reimplementation for VBox GUI needs: */
+/** QProcess extension for VBox GUI needs. */
 class QIProcess : public QProcess
 {
     Q_OBJECT;
 
+    /** Constructs our own file-dialog passing @a pParent to the base-class.
+      * Doesn't mean to be used directly, cause this subclass is a bunch of statics. */
+    QIProcess(QObject *pParent = 0);
+
 public:
 
-    /* Static single-shot method to execute some script: */
+    /** Execute certain script specified by @a strProcessName
+      * and wait up to specified @a iTimeout amount of time for responce. */
     static QByteArray singleShot(const QString &strProcessName,
-                                 int iTimeout = 5000 /* wait for data maximum 5 seconds */);
-
-protected:
-
-    /* Constructor: */
-    QIProcess(QObject *pParent = 0);
+                                 int iTimeout = 5000);
 };
 
-#endif /* __QIProcess_h__ */
+#endif /* !___QIProcess_h___ */