Changeset 71922 in vbox for trunk

Timestamp:

Apr 19, 2018 1:14:59 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9049: Tiny cleanup for UIMediumSizeEditor and move it to VBoxGlobal library.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (6 diffs)
• src/widgets/UIMediumSizeEditor.cpp (modified) (8 diffs)
• src/widgets/UIMediumSizeEditor.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -558 +558 @@
         src/widgets/UIEmptyFilePathSelector.h \
         src/widgets/UILineTextEdit.h \
-        src/widgets/UIMediumSizeEditor.h \
         src/widgets/UIMenuBar.h \
         src/widgets/UIPortForwardingTable.h \
@@ -686 +685 @@
         src/widgets/UIHostComboEditor.h \
         src/widgets/UIHotKeyEditor.h \
+        src/widgets/UIMediumSizeEditor.h \
         src/widgets/UIPopupBox.h \
         src/widgets/UIPopupPane.h \
@@ -778 +778 @@
         src/widgets/UIHostComboEditor.h \
         src/widgets/UIHotKeyEditor.h \
+        src/widgets/UIMediumSizeEditor.h \
         src/widgets/UIPopupBox.h \
         src/widgets/UIPopupPane.h \
@@ -1048 +1049 @@
         src/widgets/UIEmptyFilePathSelector.cpp \
         src/widgets/UILineTextEdit.cpp \
-        src/widgets/UIMediumSizeEditor.cpp \
         src/widgets/UIMenuBar.cpp \
         src/widgets/UIPortForwardingTable.cpp \
@@ -1216 +1216 @@
         src/widgets/UIHostComboEditor.cpp \
         src/widgets/UIHotKeyEditor.cpp \
+        src/widgets/UIMediumSizeEditor.cpp \
         src/widgets/UIPopupBox.cpp \
         src/widgets/UIPopupPane.cpp \
@@ -1334 +1335 @@
         src/widgets/UIHostComboEditor.cpp \
         src/widgets/UIHotKeyEditor.cpp \
+        src/widgets/UIMediumSizeEditor.cpp \
         src/widgets/UIPopupBox.cpp \
         src/widgets/UIPopupPane.cpp \

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMediumSizeEditor.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
@@ -28 +28 @@
 /* GUI includes: */
 # include "QILineEdit.h"
+# include "VBoxGlobal.h"
 # include "UIMediumSizeEditor.h"
-# include "VBoxGlobal.h"
 
 /* COM includes: */
@@ -114 +114 @@
     /* Create layout: */
     QGridLayout *pLayout = new QGridLayout(this);
-    AssertPtrReturnVoid(pLayout);
+    if (pLayout)
     {
         /* Configure layout: */
@@ -124 +124 @@
         /* Create size slider: */
         m_pSlider = new QSlider;
-        AssertPtrReturnVoid(m_pSlider);
+        if (m_pSlider)
         {
             /* Configure slider: */
@@ -145 +145 @@
         /* Create minimum size label: */
         m_pLabelMinSize = new QLabel;
-        AssertPtrReturnVoid(m_pLabelMinSize);
+        if (m_pLabelMinSize)
         {
             /* Configure label: */
@@ -156 +156 @@
         /* Create maximum size label: */
         m_pLabelMaxSize = new QLabel;
-        AssertPtrReturnVoid(m_pLabelMaxSize);
+        if (m_pLabelMaxSize)
         {
             /* Configure label: */
@@ -167 +167 @@
         /* Create size editor: */
         m_pEditor = new QILineEdit;
-        AssertPtrReturnVoid(m_pEditor);
+        if (m_pEditor)
         {
             /* Configure editor: */
@@ -266 +266 @@
     m_pEditor->setToolTip(strToolTip);
 }
-

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMediumSizeEditor.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
@@ -24 +24 @@
 /* GUI includes: */
 #include "QIWithRetranslateUI.h"
+#include "UILibraryDefs.h"
 
 /* Forward declarations: */
 class QLabel;
 class QSlider;
+class QString;
+class QWidget;
 class QILineEdit;
 
-
 /** Medium size editor widget. */
-class UIMediumSizeEditor : public QIWithRetranslateUI<QWidget>
+class SHARED_LIBRARY_STUFF UIMediumSizeEditor : public QIWithRetranslateUI<QWidget>
 {
     Q_OBJECT;
@@ -99 +101 @@
 
 #endif /* !___UIMediumSizeEditor_h___ */
-