|
diff --git a/src/rviz/default_plugin/camera_display.h b/src/rviz/default_plugin/camera_display.h |
|
index 6cf3970..222e341 100644 |
|
--- a/src/rviz/default_plugin/camera_display.h |
|
+++ b/src/rviz/default_plugin/camera_display.h |
|
@@ -32,11 +32,11 @@ |
|
|
|
#include <QObject> |
|
|
|
+#ifndef Q_MOC_RUN |
|
#include <OgreMaterial.h> |
|
#include <OgreRenderTargetListener.h> |
|
#include <OgreSharedPtr.h> |
|
|
|
-#ifndef Q_MOC_RUN |
|
# include <sensor_msgs/CameraInfo.h> |
|
|
|
# include <message_filters/subscriber.h> |
|
diff --git a/src/rviz/default_plugin/effort_display.h b/src/rviz/default_plugin/effort_display.h |
|
index 8b95b93..bc89bd6 100644 |
|
--- a/src/rviz/default_plugin/effort_display.h |
|
+++ b/src/rviz/default_plugin/effort_display.h |
|
@@ -1,7 +1,9 @@ |
|
#ifndef EFFORT_DISPLAY_H |
|
#define EFFORT_DISPLAY_H |
|
|
|
+#ifndef Q_MOC_RUN |
|
#include <boost/circular_buffer.hpp> |
|
+#endif |
|
|
|
#include <sensor_msgs/JointState.h> |
|
#include <rviz/message_filter_display.h> |
|
diff --git a/src/rviz/default_plugin/interactive_markers/interactive_marker.h b/src/rviz/default_plugin/interactive_markers/interactive_marker.h |
|
index 332456a..c8a2ac7 100644 |
|
--- a/src/rviz/default_plugin/interactive_markers/interactive_marker.h |
|
+++ b/src/rviz/default_plugin/interactive_markers/interactive_marker.h |
|
@@ -35,8 +35,10 @@ |
|
#include <boost/thread/recursive_mutex.hpp> |
|
#include <boost/thread/thread.hpp> |
|
|
|
+#ifndef Q_MOC_RUN |
|
#include <OgreVector3.h> |
|
#include <OgreQuaternion.h> |
|
+#endif |
|
|
|
#include <visualization_msgs/InteractiveMarker.h> |
|
#include <visualization_msgs/InteractiveMarkerPose.h> |
|
diff --git a/src/rviz/default_plugin/interactive_markers/interactive_marker_control.h b/src/rviz/default_plugin/interactive_markers/interactive_marker_control.h |
|
index 0806c82..e99a7e7 100644 |
|
--- a/src/rviz/default_plugin/interactive_markers/interactive_marker_control.h |
|
+++ b/src/rviz/default_plugin/interactive_markers/interactive_marker_control.h |
|
@@ -36,10 +36,12 @@ |
|
|
|
#include <QCursor> |
|
|
|
+#ifndef Q_MOC_RUN |
|
#include <OgreRay.h> |
|
#include <OgreVector3.h> |
|
#include <OgreQuaternion.h> |
|
#include <OgreSceneManager.h> |
|
+#endif |
|
|
|
#include <visualization_msgs/InteractiveMarkerControl.h> |
|
|
|
diff --git a/src/rviz/default_plugin/map_display.h b/src/rviz/default_plugin/map_display.h |
|
index f733dfd..7d72a94 100644 |
|
--- a/src/rviz/default_plugin/map_display.h |
|
+++ b/src/rviz/default_plugin/map_display.h |
|
@@ -32,10 +32,12 @@ |
|
|
|
#include <boost/thread/thread.hpp> |
|
|
|
+#ifndef Q_MOC_RUN |
|
#include <OgreTexture.h> |
|
#include <OgreMaterial.h> |
|
#include <OgreVector3.h> |
|
#include <OgreSharedPtr.h> |
|
+#endif |
|
|
|
#include <nav_msgs/MapMetaData.h> |
|
#include <ros/time.h> |
|
diff --git a/src/rviz/default_plugin/point_cloud_transformer.h b/src/rviz/default_plugin/point_cloud_transformer.h |
|
index f20b90c..f72f570 100644 |
|
--- a/src/rviz/default_plugin/point_cloud_transformer.h |
|
+++ b/src/rviz/default_plugin/point_cloud_transformer.h |
|
@@ -34,8 +34,10 @@ |
|
|
|
#include <ros/message_forward.h> |
|
|
|
+#ifndef Q_MOC_RUN |
|
#include <OgreVector3.h> |
|
#include <OgreColourValue.h> |
|
+#endif |
|
|
|
#include <rviz/ogre_helpers/point_cloud.h> |
|
|
|
diff --git a/src/rviz/default_plugin/point_display.h b/src/rviz/default_plugin/point_display.h |
|
index c7aeccf..2f2597c 100644 |
|
--- a/src/rviz/default_plugin/point_display.h |
|
+++ b/src/rviz/default_plugin/point_display.h |
|
@@ -1,7 +1,9 @@ |
|
#ifndef POINT_DISPLAY_H |
|
#define POINT_DISPLAY_H |
|
|
|
+#ifndef Q_MOC_RUN |
|
#include <boost/circular_buffer.hpp> |
|
+#endif |
|
|
|
#include <geometry_msgs/PointStamped.h> |
|
#include <rviz/message_filter_display.h> |
|
diff --git a/src/rviz/default_plugin/wrench_display.h b/src/rviz/default_plugin/wrench_display.h |
|
index 31999e4..38b3500 100644 |
|
--- a/src/rviz/default_plugin/wrench_display.h |
|
+++ b/src/rviz/default_plugin/wrench_display.h |
|
@@ -1,7 +1,9 @@ |
|
#ifndef WRENCHSTAMPED_DISPLAY_H |
|
#define WRENCHSTAMPED_DISPLAY_H |
|
|
|
+#ifndef Q_MOC_RUN |
|
#include <boost/circular_buffer.hpp> |
|
+#endif |
|
|
|
#include <geometry_msgs/WrenchStamped.h> |
|
#include <rviz/message_filter_display.h> |
|
diff --git a/src/rviz/message_filter_display.h b/src/rviz/message_filter_display.h |
|
index 2d3eea7..86778d2 100644 |
|
--- a/src/rviz/message_filter_display.h |
|
+++ b/src/rviz/message_filter_display.h |
|
@@ -29,10 +29,10 @@ |
|
#ifndef MESSAGE_FILTER_DISPLAY_H |
|
#define MESSAGE_FILTER_DISPLAY_H |
|
|
|
+#ifndef Q_MOC_RUN |
|
#include <OgreSceneManager.h> |
|
#include <OgreSceneNode.h> |
|
|
|
-#ifndef Q_MOC_RUN |
|
#include <message_filters/subscriber.h> |
|
#include <tf/message_filter.h> |
|
#endif |
|
diff --git a/src/rviz/ogre_helpers/point_cloud.h b/src/rviz/ogre_helpers/point_cloud.h |
|
index 8812868..f982932 100644 |
|
--- a/src/rviz/ogre_helpers/point_cloud.h |
|
+++ b/src/rviz/ogre_helpers/point_cloud.h |
|
@@ -30,6 +30,7 @@ |
|
#ifndef OGRE_TOOLS_OGRE_POINT_CLOUD_H |
|
#define OGRE_TOOLS_OGRE_POINT_CLOUD_H |
|
|
|
+#ifndef Q_MOC_RUN |
|
#include <OgreSimpleRenderable.h> |
|
#include <OgreMovableObject.h> |
|
#include <OgreString.h> |
|
@@ -40,6 +41,7 @@ |
|
#include <OgreRoot.h> |
|
#include <OgreHardwareBufferManager.h> |
|
#include <OgreSharedPtr.h> |
|
+#endif |
|
|
|
#include <stdint.h> |
|
|
|
diff --git a/src/rviz/pluginlib_factory.h b/src/rviz/pluginlib_factory.h |
|
index 13f10ef..7b24bbc 100644 |
|
--- a/src/rviz/pluginlib_factory.h |
|
+++ b/src/rviz/pluginlib_factory.h |
|
@@ -36,7 +36,9 @@ |
|
#include <string> |
|
#include <vector> |
|
|
|
+#ifndef Q_MOC_RUN |
|
#include <pluginlib/class_loader.h> |
|
+#endif |
|
|
|
#include "rviz/class_id_recording_factory.h" |
|
#include "rviz/load_resource.h" |
|
diff --git a/src/rviz/render_panel.h b/src/rviz/render_panel.h |
|
index 1885fa7..c58c58e 100644 |
|
--- a/src/rviz/render_panel.h |
|
+++ b/src/rviz/render_panel.h |
|
@@ -32,7 +32,9 @@ |
|
|
|
#include "ogre_helpers/qt_ogre_render_window.h" |
|
|
|
+#ifndef Q_MOC_RUN |
|
#include <OgreSceneManager.h> |
|
+#endif |
|
|
|
#include <boost/thread/mutex.hpp> |
|
|
|
diff --git a/src/rviz/robot/robot_joint.h b/src/rviz/robot/robot_joint.h |
|
index 4835fe5..ba8a832 100644 |
|
--- a/src/rviz/robot/robot_joint.h |
|
+++ b/src/rviz/robot/robot_joint.h |
|
@@ -35,10 +35,12 @@ |
|
|
|
#include <QObject> |
|
|
|
+#ifndef Q_MOC_RUN |
|
#include <OgreVector3.h> |
|
#include <OgreQuaternion.h> |
|
#include <OgreAny.h> |
|
#include <OgreMaterial.h> |
|
+#endif |
|
|
|
#include "rviz/ogre_helpers/object.h" |
|
#include "rviz/selection/forwards.h" |
|
diff --git a/src/rviz/robot/robot_link.h b/src/rviz/robot/robot_link.h |
|
index a07a53e..31e8e6f 100644 |
|
--- a/src/rviz/robot/robot_link.h |
|
+++ b/src/rviz/robot/robot_link.h |
|
@@ -35,11 +35,13 @@ |
|
|
|
#include <QObject> |
|
|
|
+#ifndef Q_MOC_RUN |
|
#include <OgreVector3.h> |
|
#include <OgreQuaternion.h> |
|
#include <OgreAny.h> |
|
#include <OgreMaterial.h> |
|
#include <OgreSharedPtr.h> |
|
+#endif |
|
|
|
#include "rviz/ogre_helpers/object.h" |
|
#include "rviz/selection/forwards.h" |
|
diff --git a/src/rviz/selection/forwards.h b/src/rviz/selection/forwards.h |
|
index b177c8b..101c939 100644 |
|
--- a/src/rviz/selection/forwards.h |
|
+++ b/src/rviz/selection/forwards.h |
|
@@ -34,8 +34,11 @@ |
|
#include <set> |
|
#include <map> |
|
#include <boost/unordered_map.hpp> |
|
+ |
|
+#ifndef Q_MOC_RUN |
|
#include <OgrePixelFormat.h> |
|
#include <OgreColourValue.h> |
|
+#endif |
|
|
|
#include <ros/console.h> |
|
|
|
diff --git a/src/rviz/selection/selection_handler.h b/src/rviz/selection/selection_handler.h |
|
index fd2f19f..6248a60 100644 |
|
--- a/src/rviz/selection/selection_handler.h |
|
+++ b/src/rviz/selection/selection_handler.h |
|
@@ -36,7 +36,9 @@ |
|
#include <boost/shared_ptr.hpp> |
|
#include <boost/unordered_map.hpp> |
|
|
|
+#ifndef Q_MOC_RUN |
|
#include <OgreMovableObject.h> |
|
+#endif |
|
|
|
#include "rviz/selection/forwards.h" |
|
#include "rviz/selection/selection_handler.h" |
|
diff --git a/src/rviz/selection/selection_manager.h b/src/rviz/selection/selection_manager.h |
|
index 505278d..b289c64 100644 |
|
--- a/src/rviz/selection/selection_manager.h |
|
+++ b/src/rviz/selection/selection_manager.h |
|
@@ -41,12 +41,14 @@ |
|
#include <boost/unordered_map.hpp> |
|
#include <boost/thread/recursive_mutex.hpp> |
|
|
|
+#ifndef Q_MOC_RUN |
|
#include <OgreTexture.h> |
|
#include <OgreMaterial.h> |
|
#include <OgreMaterialManager.h> |
|
#include <OgreMovableObject.h> |
|
#include <OgreRenderQueueListener.h> |
|
#include <OgreSharedPtr.h> |
|
+#endif |
|
|
|
#include <vector> |
|
#include <set> |
|
-- |
|
1.9.3 (Apple Git-50) |