Merge pull request #2756 from SunBlack/modeler_qt_includes

Cleanup Qt includes in Modeler app
PointCloudLibrary · Jan 13, 2019 · ae9f52b · ae9f52b
2 parents af83fd4 + 6234242
commit ae9f52b
Show file tree

Hide file tree

Showing 22 changed files with 41 additions and 104 deletions.
diff --git a/apps/modeler/CMakeLists.txt b/apps/modeler/CMakeLists.txt
@@ -68,7 +68,6 @@ set(resources
 
 set(incs
   ${moc_incs}
-  "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/qt.h"
 
   "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/dock_widget.h"
   "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/abstract_item.h"

diff --git a/apps/modeler/include/pcl/apps/modeler/abstract_worker.h b/apps/modeler/include/pcl/apps/modeler/abstract_worker.h
@@ -36,7 +36,7 @@
 
 #pragma once
 
-#include <pcl/apps/modeler/qt.h>
+#include <QObject>
 
 namespace pcl
 {

diff --git a/apps/modeler/include/pcl/apps/modeler/channel_actor_item.h b/apps/modeler/include/pcl/apps/modeler/channel_actor_item.h
@@ -36,10 +36,11 @@
 
 #pragma once
 
+#include <QTreeWidgetItem>
+
 #include <vtkSmartPointer.h>
 #include <boost/shared_ptr.hpp>
 #include <pcl/common/eigen.h>
-#include <pcl/apps/modeler/qt.h>
 #include <pcl/apps/modeler/abstract_item.h>
 
 class vtkActor;

diff --git a/apps/modeler/include/pcl/apps/modeler/cloud_mesh_item.h b/apps/modeler/include/pcl/apps/modeler/cloud_mesh_item.h
@@ -36,7 +36,8 @@
 
 #pragma once
 
-#include <pcl/apps/modeler/qt.h>
+#include <QTreeWidgetItem>
+
 #include <boost/shared_ptr.hpp>
 #include <pcl/apps/modeler/abstract_item.h>
 #include <pcl/apps/modeler/cloud_mesh.h>

diff --git a/apps/modeler/include/pcl/apps/modeler/cloud_mesh_item_updater.h b/apps/modeler/include/pcl/apps/modeler/cloud_mesh_item_updater.h
@@ -36,7 +36,7 @@
 
 #pragma once
 
-#include <pcl/apps/modeler/qt.h>
+#include <QObject>
 
 namespace pcl
 {

diff --git a/apps/modeler/include/pcl/apps/modeler/dock_widget.h b/apps/modeler/include/pcl/apps/modeler/dock_widget.h
@@ -36,7 +36,7 @@
 
 #pragma once
 
-#include <pcl/apps/modeler/qt.h>
+#include <QDockWidget>
 
 namespace pcl
 {

diff --git a/apps/modeler/include/pcl/apps/modeler/main_window.h b/apps/modeler/include/pcl/apps/modeler/main_window.h
@@ -36,7 +36,6 @@
 
 #pragma once
 
-#include <pcl/apps/modeler/qt.h>
 #include <boost/shared_ptr.hpp>
 
 #include <ui_main_window.h>

diff --git a/apps/modeler/include/pcl/apps/modeler/parameter.h b/apps/modeler/include/pcl/apps/modeler/parameter.h
@@ -40,8 +40,12 @@
 #include <string>
 
 #include <boost/any.hpp>
-#include <pcl/apps/modeler/qt.h>
 
+#include <QColor>
+#include <QVariant>
+
+class QAbstractItemModel;
+class QWidget;
 
 namespace pcl
 {

diff --git a/apps/modeler/include/pcl/apps/modeler/parameter_dialog.h b/apps/modeler/include/pcl/apps/modeler/parameter_dialog.h
@@ -36,7 +36,9 @@
 
 #pragma once
 
-#include <pcl/apps/modeler/qt.h>
+#include <QDialog>
+#include <QStandardItemModel>
+#include <QStyledItemDelegate>
 
 namespace pcl
 {

diff --git a/apps/modeler/include/pcl/apps/modeler/qt.h b/apps/modeler/include/pcl/apps/modeler/qt.h
diff --git a/apps/modeler/include/pcl/apps/modeler/render_window.h b/apps/modeler/include/pcl/apps/modeler/render_window.h
@@ -36,9 +36,10 @@
 
 #pragma once
 
-#include <pcl/apps/modeler/qt.h>
 #include <vtkSmartPointer.h>
 
+#include <QVTKWidget.h>
+
 class vtkCubeAxesActor;
 
 namespace pcl

diff --git a/apps/modeler/include/pcl/apps/modeler/render_window_item.h b/apps/modeler/include/pcl/apps/modeler/render_window_item.h
@@ -36,7 +36,8 @@
 
 #pragma once
 
-#include <pcl/apps/modeler/qt.h>
+#include <QTreeWidgetItem>
+
 #include <pcl/apps/modeler/abstract_item.h>
 #include <pcl/apps/modeler/cloud_mesh.h>
 

diff --git a/apps/modeler/include/pcl/apps/modeler/scene_tree.h b/apps/modeler/include/pcl/apps/modeler/scene_tree.h
@@ -36,7 +36,7 @@
 
 #pragma once
 
-#include <pcl/apps/modeler/qt.h>
+#include <QTreeWidget>
 
 namespace pcl
 {

diff --git a/apps/modeler/include/pcl/apps/modeler/thread_controller.h b/apps/modeler/include/pcl/apps/modeler/thread_controller.h
@@ -36,7 +36,7 @@
 
 #pragma once
 
-#include <pcl/apps/modeler/qt.h>
+#include <QObject>
 
 namespace pcl
 {

diff --git a/apps/modeler/src/abstract_item.cpp b/apps/modeler/src/abstract_item.cpp
@@ -36,7 +36,6 @@
 
 #include <pcl/apps/modeler/abstract_item.h>
 
-#include <pcl/apps/modeler/qt.h>
 #include <pcl/apps/modeler/main_window.h>
 #include <pcl/apps/modeler/parameter_dialog.h>
 

diff --git a/apps/modeler/src/abstract_worker.cpp b/apps/modeler/src/abstract_worker.cpp
@@ -36,7 +36,6 @@
 
 #include <pcl/apps/modeler/abstract_worker.h>
 
-#include <pcl/apps/modeler/qt.h>
 #include <pcl/apps/modeler/parameter_dialog.h>
 #include <pcl/apps/modeler/cloud_mesh_item.h>
 

diff --git a/apps/modeler/src/main.cpp b/apps/modeler/src/main.cpp
@@ -34,7 +34,6 @@
  *
  */
 
-#include <pcl/apps/modeler/qt.h>
 #include <pcl/apps/modeler/main_window.h>
 
 extern int qInitResources_resources();

diff --git a/apps/modeler/src/main_window.cpp b/apps/modeler/src/main_window.cpp
@@ -42,6 +42,7 @@
 #include <pcl/apps/modeler/render_window_item.h>
 
 #include <QFileInfo>
+#include <QSettings>
 #include <vtkActor.h>
 #include <vtkRenderer.h>
 

diff --git a/apps/modeler/src/parameter.cpp b/apps/modeler/src/parameter.cpp
@@ -40,6 +40,11 @@
 #include <fstream>
 #include <iomanip>
 
+#include <QAbstractItemModel>
+#include <QCheckBox>
+#include <QColorDialog>
+#include <QSpinBox>
+
 //////////////////////////////////////////////////////////////////////////////////////////////
 void
 pcl::modeler::Parameter::setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index)

diff --git a/apps/modeler/src/parameter_dialog.cpp b/apps/modeler/src/parameter_dialog.cpp
@@ -40,6 +40,13 @@
 #include <cassert>
 #include <fstream>
 
+#include <QCheckBox>
+#include <QColorDialog>
+#include <QGridLayout>
+#include <QHeaderView>
+#include <QPushButton>
+#include <QTableView>
+
 //////////////////////////////////////////////////////////////////////////////////////////////
 void
 pcl::modeler::ParameterDialog::addParameter(pcl::modeler::Parameter* parameter)

diff --git a/apps/modeler/src/scene_tree.cpp b/apps/modeler/src/scene_tree.cpp
@@ -37,6 +37,11 @@
 #include <pcl/apps/modeler/scene_tree.h>
 
 #include <set>
+
+#include <QContextMenuEvent>
+#include <QFileDialog>
+#include <QMessageBox>
+
 #include <pcl/apps/modeler/main_window.h>
 #include <pcl/apps/modeler/render_window.h>
 #include <pcl/apps/modeler/render_window_item.h>

diff --git a/apps/modeler/src/thread_controller.cpp b/apps/modeler/src/thread_controller.cpp
@@ -40,6 +40,8 @@
 #include <pcl/apps/modeler/cloud_mesh_item.h>
 #include <pcl/apps/modeler/main_window.h>
 
+#include <QDialog>
+#include <QThread>
 
 //////////////////////////////////////////////////////////////////////////////////////////////
 pcl::modeler::ThreadController::ThreadController()