Changeset 71894 in vbox for trunk/src/VBox/Frontends

Timestamp:

Apr 18, 2018 1:02:05 PM (7 years ago)

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (6 diffs)
• src/extensions/QIFlowLayout.cpp (modified) (2 diffs)
• src/extensions/QIFlowLayout.h (modified) (5 diffs)

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

@@ -440 +440 @@
 VirtualBox_QT_MOCHDRS = \
         src/UITakeSnapshotDialog.h \
-        src/extensions/QIFlowLayout.h \
         src/extensions/QIMenu.h \
         src/extensions/QIStatusBar.h \
@@ -649 +648 @@
         src/extensions/QIDialogButtonBox.h \
         src/extensions/QIFileDialog.h \
+        src/extensions/QIFlowLayout.h \
         src/extensions/QILabel.h \
         src/extensions/QILabelSeparator.h \
@@ -732 +732 @@
         src/extensions/QIDialogButtonBox.h \
         src/extensions/QIFileDialog.h \
+        src/extensions/QIFlowLayout.h \
         src/extensions/QILabel.h \
         src/extensions/QILabelSeparator.h \
@@ -915 +916 @@
         src/main.cpp \
         src/UITakeSnapshotDialog.cpp \
-        src/extensions/QIFlowLayout.cpp \
         src/extensions/QIMenu.cpp \
         src/extensions/QIStatusBar.cpp \
@@ -1158 +1158 @@
         src/extensions/QIDialogButtonBox.cpp \
         src/extensions/QIFileDialog.cpp \
+        src/extensions/QIFlowLayout.cpp \
         src/extensions/QILabel.cpp \
         src/extensions/QILabelSeparator.cpp \
@@ -1268 +1269 @@
         src/extensions/QIDialogButtonBox.cpp \
         src/extensions/QIFileDialog.cpp \
+        src/extensions/QIFlowLayout.cpp \
         src/extensions/QILabel.cpp \
         src/extensions/QILabelSeparator.cpp \

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - QIFlowLayout class implementation.
+ * VBox Qt GUI - Qt extensions: QIFlowLayout class implementation.
  */
 
 /*
- * Copyright (C) 2017 Oracle Corporation
+ * Copyright (C) 2017-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -265 +265 @@
     return m_iSpacingV >= 0 ? m_iSpacingV : smartSpacing(QStyle::PM_LayoutVerticalSpacing);
 }
-

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIFlowLayout.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - QIFlowLayout class declaration.
+ * VBox Qt GUI - Qt extensions: QIFlowLayout class declaration.
  */
 
 /*
- * Copyright (C) 2017 Oracle Corporation
+ * Copyright (C) 2017-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -23 +23 @@
 #include <QStyle>
 
+/* GUI includes: */
+#include "UILibraryDefs.h"
 
 /** QLayout extension providing GUI with the possibility to build flow-layout.
@@ -29 +31 @@
   * It is also takes into account that some of the children can be expandable
   * horizontally allowing them to grow up to all the available width. */
-class QIFlowLayout : public QLayout
+class SHARED_LIBRARY_STUFF QIFlowLayout : public QLayout
 {
     Q_OBJECT;
@@ -51 +53 @@
 
         /** Holds the layout item. */
-        QLayoutItem *item;
+        QLayoutItem  *item;
         /** Holds the layout item expand policy. */
-        ExpandPolicy policy;
+        ExpandPolicy  policy;
         /** Holds the layout item desired width. */
-        int width;
+        int           width;
     };
     /** Layout item data list. */
@@ -130 +132 @@
 
 #endif /* !___QIFlowLayout_h___ */
-