Index: /trunk/src/VBox/Frontends/VirtualBox/src/VBoxAboutDlg.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/VBoxAboutDlg.cpp	(revision 71552)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/VBoxAboutDlg.cpp	(revision 71553)
@@ -5,5 +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
@@ -59,4 +59,5 @@
 #endif
     , m_strVersion(strVersion)
+    , m_pMainLayout(0)
     , m_pLabel(0)
 {
@@ -70,12 +71,13 @@
     if (pEvent->type() == QEvent::Polish)
         setFixedSize(m_size);
+
     /* Call to base-class: */
     return QIDialog::event(pEvent);
 }
 
-void VBoxAboutDlg::paintEvent(QPaintEvent * /* pEvent */)
-{
+void VBoxAboutDlg::paintEvent(QPaintEvent *)
+{
+    /* Draw About-VirtualBox background image: */
     QPainter painter(this);
-    /* Draw About-VirtualBox background image: */
     painter.drawPixmap(0, 0, m_pixmap);
 }
@@ -154,5 +156,5 @@
     /* Create main-layout: */
     m_pMainLayout = new QVBoxLayout(this);
-    AssertPtrReturnVoid(m_pMainLayout);
+    if (m_pMainLayout)
     {
         /* Prepare label: */
@@ -168,5 +170,5 @@
     /* Create label for version text: */
     m_pLabel = new QLabel;
-    AssertPtrReturnVoid(m_pLabel);
+    if (m_pLabel)
     {
         /* Prepare label for version text: */
@@ -193,5 +195,5 @@
     /* Create button-box: */
     QDialogButtonBox *pButtonBox = new QDialogButtonBox;
-    AssertPtrReturnVoid(pButtonBox);
+    if (pButtonBox)
     {
         /* Create close-button: */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/VBoxAboutDlg.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/VBoxAboutDlg.h	(revision 71552)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/VBoxAboutDlg.h	(revision 71553)
@@ -5,5 +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
@@ -39,6 +39,6 @@
 public:
 
-    /** Constructs dialog passing @a pParent to the QWidget base-class constructor.
-      * @param strVersion is used to specify the version number of VirtualBox. */
+    /** Constructs dialog passing @a pParent to the base-class.
+      * @param  strVersion  Brings the version number of VirtualBox. */
     VBoxAboutDlg(QWidget *pParent, const QString &strVersion);
 
@@ -46,23 +46,20 @@
 
     /** Handles any Qt @a pEvent. */
-    bool event(QEvent *pEvent);
+    virtual bool event(QEvent *pEvent) /* override */;
 
-    /** Handles Qt paint @a pEvent. */
-    void paintEvent(QPaintEvent *pEvent);
+    /** Handles paint @a pEvent. */
+    virtual void paintEvent(QPaintEvent *pEvent) /* override */;
 
     /** Handles translation event. */
-    void retranslateUi();
+    virtual void retranslateUi() /* override */;
 
 private:
 
-    /** Prepares About-VirtualBox dialog. */
+    /** Prepares all. */
     void prepare();
-
     /** Prepares main-layout. */
     void prepareMainLayout();
-
     /** Prepares label. */
     void prepareLabel();
-
     /** Prepares close-button. */
     void prepareCloseButton();
@@ -72,20 +69,17 @@
 
     /** Holds the About-VirtualBox text. */
-    QString m_strAboutText;
-
+    QString  m_strAboutText;
     /** Holds the VirtualBox version number. */
-    QString m_strVersion;
+    QString  m_strVersion;
 
     /** Holds the About-VirtualBox image. */
-    QPixmap m_pixmap;
+    QPixmap  m_pixmap;
+    /** Holds the About-VirtualBox dialog size. */
+    QSize    m_size;
 
-    /** Holds the About-VirtualBox dialog size. */
-    QSize   m_size;
-
-    /** Holds the instance of label we create for About-VirtualBox text. */
-    QLabel *m_pLabel;
-
-    /** Holds the instance of main-layout we create. */
+    /** Holds About-VirtualBox main-layout instance. */
     QVBoxLayout *m_pMainLayout;
+    /** Holds About-VirtualBox text-label instance. */
+    QLabel      *m_pLabel;
 };