diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-01-24 10:34:57 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-01-24 10:34:57 +0000 |
| commit | 68d786f3b9574c24369fcbeaa36e8280f1d6c447 (patch) | |
| tree | a484cc73fabc86ed9add6bf95dea770b6e3b79ed /src/GudhUI/gui | |
| parent | bb30a984430efda39f83ba0284e6430c625e6db6 (diff) | |
| parent | 248bbbc14e47b40b491ac30adf47391de32ed0f4 (diff) | |
Merge last trunk modifications
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/bottleneck_misc_fixes@1994 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 9f0adf9d7d1be7f0cb85f1ff2d0e41295d6e9ae0
Diffstat (limited to 'src/GudhUI/gui')
| -rw-r--r-- | src/GudhUI/gui/MainWindow.h | 3 | ||||
| -rw-r--r-- | src/GudhUI/gui/Menu_edge_contraction.h | 5 | ||||
| -rw-r--r-- | src/GudhUI/gui/Menu_k_nearest_neighbors.h | 2 | ||||
| -rw-r--r-- | src/GudhUI/gui/Menu_persistence.h | 2 | ||||
| -rw-r--r-- | src/GudhUI/gui/Menu_uniform_neighbors.h | 2 |
5 files changed, 4 insertions, 10 deletions
diff --git a/src/GudhUI/gui/MainWindow.h b/src/GudhUI/gui/MainWindow.h index 3fe0d720..15664dcb 100644 --- a/src/GudhUI/gui/MainWindow.h +++ b/src/GudhUI/gui/MainWindow.h @@ -23,9 +23,6 @@ #ifndef GUI_MAINWINDOW_H_ #define GUI_MAINWINDOW_H_ -// Workaround for moc-qt4 not parsing boost headers -#include <CGAL/config.h> - // Workaround https://svn.boost.org/trac/boost/ticket/12534 #include <boost/container/flat_map.hpp> diff --git a/src/GudhUI/gui/Menu_edge_contraction.h b/src/GudhUI/gui/Menu_edge_contraction.h index 08f0bf67..2d5640e8 100644 --- a/src/GudhUI/gui/Menu_edge_contraction.h +++ b/src/GudhUI/gui/Menu_edge_contraction.h @@ -23,11 +23,8 @@ #ifndef GUI_MENU_EDGE_CONTRACTION_H_ #define GUI_MENU_EDGE_CONTRACTION_H_ -// Workaround for moc-qt4 not parsing boost headers -#include <CGAL/config.h> - #include "gui/MainWindow.h" -#include "gui/ui_MenuEdgeContraction.h" +#include "ui_MenuEdgeContraction.h" #include "model/Model.h" diff --git a/src/GudhUI/gui/Menu_k_nearest_neighbors.h b/src/GudhUI/gui/Menu_k_nearest_neighbors.h index 8088b768..77303b67 100644 --- a/src/GudhUI/gui/Menu_k_nearest_neighbors.h +++ b/src/GudhUI/gui/Menu_k_nearest_neighbors.h @@ -24,7 +24,7 @@ #define GUI_MENU_K_NEAREST_NEIGHBORS_H_ #include <QMainWindow> -#include "gui/ui_KNearestNeighborsMenu.h" +#include "ui_KNearestNeighborsMenu.h" class QWidget; diff --git a/src/GudhUI/gui/Menu_persistence.h b/src/GudhUI/gui/Menu_persistence.h index 8c4df158..1a2a2408 100644 --- a/src/GudhUI/gui/Menu_persistence.h +++ b/src/GudhUI/gui/Menu_persistence.h @@ -25,7 +25,7 @@ #define GUI_MENU_PERSISTENCE_H_ #include <QMainWindow> -#include "gui/ui_PersistenceMenu.h" +#include "ui_PersistenceMenu.h" class QWidget; diff --git a/src/GudhUI/gui/Menu_uniform_neighbors.h b/src/GudhUI/gui/Menu_uniform_neighbors.h index 0b6f65fe..61316966 100644 --- a/src/GudhUI/gui/Menu_uniform_neighbors.h +++ b/src/GudhUI/gui/Menu_uniform_neighbors.h @@ -25,7 +25,7 @@ #define GUI_MENU_UNIFORM_NEIGHBORS_H_ #include <QMainWindow> -#include "gui/ui_UniformNeighborsMenu.h" +#include "ui_UniformNeighborsMenu.h" class Menu_uniform_neighbors : public QDialog, public Ui::UniformMenu { Q_OBJECT |