From ee9738eeff4d5d9ed01e8eb17c423a1a1935f95c Mon Sep 17 00:00:00 2001
From: Lingjie Zhu <lingjie.zhu@nlpr.ia.ac.cn>
Date: Wed, 21 Nov 2018 11:32:44 +0800
Subject: [PATCH] fix missing header and widget stretchers to make it compact

---
 .../Color_cheat_sheet.h                       |  5 +-
 .../Surface_mesh_approximation_dockwidget.ui  | 68 +++++++++----------
 .../Surface_mesh_approximation/VSA_wrapper.h  |  4 +-
 3 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_approximation/Color_cheat_sheet.h b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_approximation/Color_cheat_sheet.h
index f4c6e64a41b..ea626554c1a 100644
--- a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_approximation/Color_cheat_sheet.h
+++ b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_approximation/Color_cheat_sheet.h
@@ -2,14 +2,15 @@
 #define COLOR_CHEAT_SHEET_H
 
 #include <cstddef>
+#include <QtCore/qcompilerdetection.h>
 
 // 256 color cheat sheet
 // Source: https://jonasjacek.github.io/colors/
 
 #ifdef color_cheat_sheet_EXPORTS
-# define COLOR_CHEAT_SHEET_EXPORT Q_DECL_EXPORT
+#define COLOR_CHEAT_SHEET_EXPORT Q_DECL_EXPORT
 #else
-# define COLOR_CHEAT_SHEET_EXPORT Q_DECL_IMPORT
+#define COLOR_CHEAT_SHEET_EXPORT Q_DECL_IMPORT
 #endif
 
 class COLOR_CHEAT_SHEET_EXPORT Color_cheat_sheet
diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_approximation/Surface_mesh_approximation_dockwidget.ui b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_approximation/Surface_mesh_approximation_dockwidget.ui
index b8e17dd26cc..50a58c1a0c7 100644
--- a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_approximation/Surface_mesh_approximation_dockwidget.ui
+++ b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_approximation/Surface_mesh_approximation_dockwidget.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>654</width>
-    <height>347</height>
+    <height>353</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -62,19 +62,6 @@
          </item>
         </widget>
        </item>
-       <item>
-        <spacer name="verticalSpacer_2">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
        <item>
         <layout class="QGridLayout" name="gridLayout_2">
          <item row="3" column="0">
@@ -209,6 +196,19 @@
          </property>
         </widget>
        </item>
+       <item>
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
       </layout>
      </widget>
     </item>
@@ -232,19 +232,6 @@
          </property>
         </widget>
        </item>
-       <item>
-        <spacer name="verticalSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
        <item>
         <widget class="QPushButton" name="buttonTeleport">
          <property name="text">
@@ -345,6 +332,19 @@
          </layout>
         </widget>
        </item>
+       <item>
+        <spacer name="verticalSpacer_4">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
       </layout>
      </widget>
     </item>
@@ -431,6 +431,13 @@
          </item>
         </layout>
        </item>
+       <item>
+        <widget class="QPushButton" name="buttonMeshing">
+         <property name="text">
+          <string>Extract</string>
+         </property>
+        </widget>
+       </item>
        <item>
         <spacer name="verticalSpacer_3">
          <property name="orientation">
@@ -444,13 +451,6 @@
          </property>
         </spacer>
        </item>
-       <item>
-        <widget class="QPushButton" name="buttonMeshing">
-         <property name="text">
-          <string>Extract</string>
-         </property>
-        </widget>
-       </item>
       </layout>
      </widget>
     </item>
diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_approximation/VSA_wrapper.h b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_approximation/VSA_wrapper.h
index c592c225513..e12b8ef45c9 100644
--- a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_approximation/VSA_wrapper.h
+++ b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_approximation/VSA_wrapper.h
@@ -11,9 +11,9 @@
 #include "Color_cheat_sheet.h"
 
 #ifdef vsa_wrapper_EXPORTS
-# define VSA_WRAPPER_EXPORT Q_DECL_EXPORT
+#define VSA_WRAPPER_EXPORT Q_DECL_EXPORT
 #else
-# define VSA_WRAPPER_EXPORT Q_DECL_IMPORT
+#define VSA_WRAPPER_EXPORT Q_DECL_IMPORT
 #endif
 
 namespace VSA = CGAL::Surface_mesh_approximation;