Index: /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk	(revision 71865)
+++ /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk	(revision 71866)
@@ -441,5 +441,4 @@
 	src/UITakeSnapshotDialog.h \
 	src/extensions/QIFlowLayout.h \
-	src/extensions/QILabelSeparator.h \
 	src/extensions/QIMainDialog.h \
 	src/extensions/QIManagerDialog.h \
@@ -658,4 +657,5 @@
 	src/extensions/QIFileDialog.h \
 	src/extensions/QILabel.h \
+	src/extensions/QILabelSeparator.h \
 	src/extensions/QIMainWindow.h \
 	src/extensions/QIMessageBox.h \
@@ -732,4 +732,5 @@
 	src/extensions/QIFileDialog.h \
 	src/extensions/QILabel.h \
+	src/extensions/QILabelSeparator.h \
 	src/extensions/QIMainWindow.h \
 	src/extensions/QIMessageBox.h \
@@ -906,5 +907,4 @@
 	src/UITakeSnapshotDialog.cpp \
 	src/extensions/QIFlowLayout.cpp \
-	src/extensions/QILabelSeparator.cpp \
 	src/extensions/QILineEdit.cpp \
 	src/extensions/QIMainDialog.cpp \
@@ -1156,4 +1156,5 @@
 	src/extensions/QIFileDialog.cpp \
 	src/extensions/QILabel.cpp \
+	src/extensions/QILabelSeparator.cpp \
 	src/extensions/QIMainWindow.cpp \
 	src/extensions/QIMessageBox.cpp \
@@ -1257,4 +1258,5 @@
 	src/extensions/QIFileDialog.cpp \
 	src/extensions/QILabel.cpp \
+	src/extensions/QILabelSeparator.cpp \
 	src/extensions/QIMainWindow.cpp \
 	src/extensions/QIMessageBox.cpp \
Index: /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QILabelSeparator.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QILabelSeparator.cpp	(revision 71865)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QILabelSeparator.cpp	(revision 71866)
@@ -1,9 +1,9 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - VirtualBox Qt extensions: QILabelSeparator class implementation.
+ * VBox Qt GUI - Qt extensions: QILabelSeparator class implementation.
  */
 
 /*
- * Copyright (C) 2008-2017 Oracle Corporation
+ * Copyright (C) 2008-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -20,9 +20,9 @@
 #else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
-/* Global includes */
+/* Qt includes: */
+# include <QHBoxLayout>
 # include <QLabel>
-# include <QHBoxLayout>
 
-/* Local includes */
+/* GUI includes: */
 # include "QILabelSeparator.h"
 
@@ -30,54 +30,70 @@
 
 
-QILabelSeparator::QILabelSeparator (QWidget *aParent /* = NULL */, Qt::WindowFlags aFlags /* = 0 */)
-    : QWidget (aParent, aFlags)
-    , mLabel (0)
+QILabelSeparator::QILabelSeparator(QWidget *pParent /* = 0 */, Qt::WindowFlags fFlags /* = 0 */)
+    : QWidget(pParent, fFlags)
+    , m_pLabel(0)
 {
-    init();
+    prepare();
 }
 
-QILabelSeparator::QILabelSeparator (const QString &aText, QWidget *aParent /* = NULL */, Qt::WindowFlags aFlags /* = 0 */)
-    : QWidget (aParent, aFlags)
-    , mLabel (0)
+QILabelSeparator::QILabelSeparator(const QString &strText, QWidget *pParent /* = 0 */, Qt::WindowFlags fFlags /* = 0 */)
+    : QWidget(pParent, fFlags)
+    , m_pLabel(0)
 {
-    init();
-    setText (aText);
+    prepare();
+    setText(strText);
 }
 
 QString QILabelSeparator::text() const
 {
-    return mLabel->text();
+    return m_pLabel->text();
 }
 
-void QILabelSeparator::setBuddy (QWidget *aBuddy)
+void QILabelSeparator::setBuddy(QWidget *pBuddy)
 {
-    mLabel->setBuddy (aBuddy);
+    m_pLabel->setBuddy(pBuddy);
 }
 
 void QILabelSeparator::clear()
 {
-    mLabel->clear();
+    m_pLabel->clear();
 }
 
-void QILabelSeparator::setText (const QString &aText)
+void QILabelSeparator::setText(const QString &strText)
 {
-    mLabel->setText (aText);
+    m_pLabel->setText(strText);
 }
 
-void QILabelSeparator::init()
+void QILabelSeparator::prepare()
 {
-    mLabel = new QLabel();
-    QFrame *separator = new QFrame();
-    separator->setFrameShape (QFrame::HLine);
-    separator->setFrameShadow (QFrame::Sunken);
-    separator->setEnabled (false);
-    separator->setContentsMargins (0, 0, 0, 0);
-    // separator->setStyleSheet ("QFrame {border: 1px outset black; }");
-    separator->setSizePolicy (QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
+    /* Create layout: */
+    QHBoxLayout *pLayout = new QHBoxLayout(this);
+    if (pLayout)
+    {
+        /* Configure layout: */
+        pLayout->setContentsMargins(0, 0, 0, 0);
 
-    QHBoxLayout *pLayout = new QHBoxLayout (this);
-    pLayout->setContentsMargins(0, 0, 0, 0);
-    pLayout->addWidget (mLabel);
-    pLayout->addWidget (separator, Qt::AlignBottom);
+        /* Create label: */
+        m_pLabel = new QLabel;
+        if (m_pLabel)
+        {
+            /* Add into layout: */
+            pLayout->addWidget(m_pLabel);
+        }
+
+        /* Create separator: */
+        QFrame *pSeparator = new QFrame;
+        {
+            /* Configure separator: */
+            pSeparator->setFrameShape(QFrame::HLine);
+            pSeparator->setFrameShadow(QFrame::Sunken);
+            pSeparator->setEnabled(false);
+            pSeparator->setContentsMargins(0, 0, 0, 0);
+            // pSeparator->setStyleSheet("QFrame {border: 1px outset black; }");
+            pSeparator->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
+
+            /* Add into layout: */
+            pLayout->addWidget(pSeparator, Qt::AlignBottom);
+        }
+    }
 }
-
Index: /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QILabelSeparator.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QILabelSeparator.h	(revision 71865)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QILabelSeparator.h	(revision 71866)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2008-2017 Oracle Corporation
+ * Copyright (C) 2008-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -16,14 +16,20 @@
  */
 
-#ifndef __QILabelSeparator_h__
-#define __QILabelSeparator_h__
+#ifndef ___QILabelSeparator_h___
+#define ___QILabelSeparator_h___
 
-/* Global includes */
+/* Qt includes: */
 #include <QWidget>
 
-/* Global forwards */
+/* GUI inlcudes: */
+#include "UILibraryDefs.h"
+
+/* Forward declarations: */
 class QLabel;
+class QString;
+class QWidget;
 
-class QILabelSeparator: public QWidget
+/** QWidget extension providing GUI with label-separator. */
+class SHARED_LIBRARY_STUFF QILabelSeparator : public QWidget
 {
     Q_OBJECT;
@@ -31,22 +37,30 @@
 public:
 
-    QILabelSeparator (QWidget *aParent = 0, Qt::WindowFlags aFlags = 0);
-    QILabelSeparator (const QString &aText, QWidget *aParent = 0, Qt::WindowFlags aFlags = 0);
+    /** Constructs label-separator passing @a pParent and @a fFlags to the base-class. */
+    QILabelSeparator(QWidget *pParent = 0, Qt::WindowFlags fFlags = 0);
+    /** Constructs label-separator passing @a pParent and @a fFlags to the base-class.
+      * @param  strText  Brings the label text. */
+    QILabelSeparator(const QString &strText, QWidget *pParent = 0, Qt::WindowFlags fFlags = 0);
 
+    /** Returns the label text. */
     QString text() const;
-    void setBuddy (QWidget *aBuddy);
+    /** Defines the label buddy. */
+    void setBuddy(QWidget *pBuddy);
 
 public slots:
 
+    /** Clears the label text. */
     void clear();
-    void setText (const QString &aText);
+    /** Defines the label @a strText. */
+    void setText(const QString &strText);
 
 protected:
 
-    virtual void init();
+    /** Prepares all. */
+    virtual void prepare();
 
-    QLabel *mLabel;
+    /** Holds the label instance. */
+    QLabel *m_pLabel;
 };
 
-#endif // __QILabelSeparator_h__
-
+#endif /* !___QILabelSeparator_h___ */