More explicit OGRE includes

rhaschke · Jun 11, 2021 · 41d62f5 · 41d62f5
1 parent e6b6acd
commit 41d62f5
Show file tree

Hide file tree

Showing 146 changed files with 586 additions and 561 deletions.
diff --git a/src/image_view/image_view.cpp b/src/image_view/image_view.cpp
@@ -38,17 +38,17 @@
 #include "ros/ros.h"
 #include <ros/package.h>
 
-#include <OgreRoot.h>
-#include <OgreRenderWindow.h>
-#include <OgreSceneManager.h>
-#include <OgreViewport.h>
-#include <OgreRectangle2D.h>
-#include <OgreMaterial.h>
-#include <OgreMaterialManager.h>
-#include <OgreTextureUnitState.h>
-#include <OgreSharedPtr.h>
-#include <OgreTechnique.h>
-#include <OgreSceneNode.h>
+#include <OGRE/OgreRoot.h>
+#include <OGRE/OgreRenderWindow.h>
+#include <OGRE/OgreSceneManager.h>
+#include <OGRE/OgreViewport.h>
+#include <OGRE/OgreRectangle2D.h>
+#include <OGRE/OgreMaterial.h>
+#include <OGRE/OgreMaterialManager.h>
+#include <OGRE/OgreTextureUnitState.h>
+#include <OGRE/OgreSharedPtr.h>
+#include <OGRE/OgreTechnique.h>
+#include <OGRE/OgreSceneNode.h>
 
 #include "image_view.h"
 

diff --git a/src/image_view/image_view.h b/src/image_view/image_view.h
@@ -35,13 +35,13 @@
 #include "ros/ros.h"
 #include <ros/package.h>
 
-#include <OgreRoot.h>
-#include <OgreSceneManager.h>
-#include <OgreViewport.h>
-#include <OgreRectangle2D.h>
-#include <OgreMaterial.h>
-#include <OgreMaterialManager.h>
-#include <OgreTextureUnitState.h>
+#include <OGRE/OgreRoot.h>
+#include <OGRE/OgreSceneManager.h>
+#include <OGRE/OgreViewport.h>
+#include <OGRE/OgreRectangle2D.h>
+#include <OGRE/OgreMaterial.h>
+#include <OGRE/OgreMaterialManager.h>
+#include <OGRE/OgreTextureUnitState.h>
 
 #include <image_transport/image_transport.h>
 #include <image_transport/subscriber_filter.h>

diff --git a/src/rviz/default_plugin/axes_display.cpp b/src/rviz/default_plugin/axes_display.cpp
@@ -29,8 +29,8 @@
 
 #include <boost/bind.hpp>
 
-#include <OgreSceneNode.h>
-#include <OgreSceneManager.h>
+#include <OGRE/OgreSceneNode.h>
+#include <OGRE/OgreSceneManager.h>
 
 #include "rviz/display_context.h"
 #include "rviz/frame_manager.h"

diff --git a/src/rviz/default_plugin/camera_display.cpp b/src/rviz/default_plugin/camera_display.cpp
@@ -29,17 +29,17 @@
 
 #include <boost/bind.hpp>
 
-#include <OgreManualObject.h>
-#include <OgreMaterialManager.h>
-#include <OgreRectangle2D.h>
-#include <OgreRenderSystem.h>
-#include <OgreRenderWindow.h>
-#include <OgreSceneManager.h>
-#include <OgreSceneNode.h>
-#include <OgreTextureManager.h>
-#include <OgreViewport.h>
-#include <OgreTechnique.h>
-#include <OgreCamera.h>
+#include <OGRE/OgreManualObject.h>
+#include <OGRE/OgreMaterialManager.h>
+#include <OGRE/OgreRectangle2D.h>
+#include <OGRE/OgreRenderSystem.h>
+#include <OGRE/OgreRenderWindow.h>
+#include <OGRE/OgreSceneManager.h>
+#include <OGRE/OgreSceneNode.h>
+#include <OGRE/OgreTextureManager.h>
+#include <OGRE/OgreViewport.h>
+#include <OGRE/OgreTechnique.h>
+#include <OGRE/OgreCamera.h>
 
 #include <tf2_ros/message_filter.h>
 

diff --git a/src/rviz/default_plugin/camera_display.h b/src/rviz/default_plugin/camera_display.h
@@ -35,9 +35,9 @@
 #include <QObject>
 
 #ifndef Q_MOC_RUN
-#include <OgreMaterial.h>
-#include <OgreRenderTargetListener.h>
-#include <OgreSharedPtr.h>
+#include <OGRE/OgreMaterial.h>
+#include <OGRE/OgreRenderTargetListener.h>
+#include <OGRE/OgreSharedPtr.h>
 
 #include <sensor_msgs/CameraInfo.h>
 

diff --git a/src/rviz/default_plugin/covariance_property.cpp b/src/rviz/default_plugin/covariance_property.cpp
@@ -36,8 +36,8 @@
 
 #include <QColor>
 
-#include <OgreSceneManager.h>
-#include <OgreSceneNode.h>
+#include <OGRE/OgreSceneManager.h>
+#include <OGRE/OgreSceneNode.h>
 
 namespace rviz
 {

diff --git a/src/rviz/default_plugin/covariance_property.h b/src/rviz/default_plugin/covariance_property.h
@@ -32,7 +32,7 @@
 
 #include <QColor>
 
-#include <OgreColourValue.h>
+#include <OGRE/OgreColourValue.h>
 
 #include "rviz/properties/bool_property.h"
 

diff --git a/src/rviz/default_plugin/covariance_visual.cpp b/src/rviz/default_plugin/covariance_visual.cpp
@@ -32,9 +32,9 @@
 #include "rviz/ogre_helpers/shape.h"
 #include "rviz/validate_quaternions.h"
 
-#include <OgreSceneManager.h>
-#include <OgreSceneNode.h>
-#include <OgreQuaternion.h>
+#include <OGRE/OgreSceneManager.h>
+#include <OGRE/OgreSceneNode.h>
+#include <OGRE/OgreQuaternion.h>
 
 #include <ros/console.h>
 

diff --git a/src/rviz/default_plugin/covariance_visual.h b/src/rviz/default_plugin/covariance_visual.h
@@ -40,8 +40,8 @@
 
 #include <Eigen/Dense>
 
-#include <OgreVector3.h>
-#include <OgreColourValue.h>
+#include <OGRE/OgreVector3.h>
+#include <OGRE/OgreColourValue.h>
 
 namespace Ogre
 {

diff --git a/src/rviz/default_plugin/depth_cloud_display.cpp b/src/rviz/default_plugin/depth_cloud_display.cpp
@@ -46,8 +46,8 @@
 #include <boost/foreach.hpp>
 #include <boost/shared_ptr.hpp>
 
-#include <OgreSceneNode.h>
-#include <OgreSceneManager.h>
+#include <OGRE/OgreSceneNode.h>
+#include <OGRE/OgreSceneManager.h>
 
 #include <image_transport/camera_common.h>
 #include <image_transport/subscriber_plugin.h>

diff --git a/src/rviz/default_plugin/effort_display.cpp b/src/rviz/default_plugin/effort_display.cpp
@@ -1,5 +1,5 @@
-#include <OgreSceneNode.h>
-#include <OgreSceneManager.h>
+#include <OGRE/OgreSceneNode.h>
+#include <OGRE/OgreSceneManager.h>
 #include <QTimer>
 
 #include <rviz/visualization_manager.h>

diff --git a/src/rviz/default_plugin/effort_visual.cpp b/src/rviz/default_plugin/effort_visual.cpp
@@ -1,6 +1,6 @@
-#include <OgreVector3.h>
-#include <OgreSceneNode.h>
-#include <OgreSceneManager.h>
+#include <OGRE/OgreVector3.h>
+#include <OGRE/OgreSceneNode.h>
+#include <OGRE/OgreSceneManager.h>
 
 #include <rviz/ogre_helpers/arrow.h>
 #include <rviz/ogre_helpers/billboard_line.h>

diff --git a/src/rviz/default_plugin/fluid_pressure_display.cpp b/src/rviz/default_plugin/fluid_pressure_display.cpp
@@ -27,8 +27,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <OgreSceneNode.h>
-#include <OgreSceneManager.h>
+#include <OGRE/OgreSceneNode.h>
+#include <OGRE/OgreSceneManager.h>
 
 #include <ros/time.h>
 

diff --git a/src/rviz/default_plugin/grid_cells_display.cpp b/src/rviz/default_plugin/grid_cells_display.cpp
@@ -28,10 +28,10 @@
  */
 
 #include <boost/bind.hpp>
-#include <OgreSceneNode.h>
-#include <OgreSceneManager.h>
-#include <OgreManualObject.h>
-#include <OgreBillboardSet.h>
+#include <OGRE/OgreSceneNode.h>
+#include <OGRE/OgreSceneManager.h>
+#include <OGRE/OgreManualObject.h>
+#include <OGRE/OgreBillboardSet.h>
 
 #include "rviz/frame_manager.h"
 #include "rviz/ogre_helpers/arrow.h"

diff --git a/src/rviz/default_plugin/grid_display.cpp b/src/rviz/default_plugin/grid_display.cpp
@@ -31,8 +31,8 @@
 
 #include <boost/bind.hpp>
 
-#include <OgreSceneNode.h>
-#include <OgreSceneManager.h>
+#include <OGRE/OgreSceneNode.h>
+#include <OGRE/OgreSceneManager.h>
 
 #include "rviz/display_context.h"
 #include "rviz/frame_manager.h"

diff --git a/src/rviz/default_plugin/illuminance_display.cpp b/src/rviz/default_plugin/illuminance_display.cpp
@@ -27,8 +27,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <OgreSceneNode.h>
-#include <OgreSceneManager.h>
+#include <OGRE/OgreSceneNode.h>
+#include <OGRE/OgreSceneManager.h>
 
 #include <ros/time.h>
 

diff --git a/src/rviz/default_plugin/image_display.cpp b/src/rviz/default_plugin/image_display.cpp
@@ -29,18 +29,18 @@
 
 #include <boost/bind.hpp>
 
-#include <OgreManualObject.h>
-#include <OgreMaterialManager.h>
-#include <OgreRectangle2D.h>
-#include <OgreRenderSystem.h>
-#include <OgreRenderWindow.h>
-#include <OgreRoot.h>
-#include <OgreSceneManager.h>
-#include <OgreSceneNode.h>
-#include <OgreTextureManager.h>
-#include <OgreViewport.h>
-#include <OgreTechnique.h>
-#include <OgreCamera.h>
+#include <OGRE/OgreManualObject.h>
+#include <OGRE/OgreMaterialManager.h>
+#include <OGRE/OgreRectangle2D.h>
+#include <OGRE/OgreRenderSystem.h>
+#include <OGRE/OgreRenderWindow.h>
+#include <OGRE/OgreRoot.h>
+#include <OGRE/OgreSceneManager.h>
+#include <OGRE/OgreSceneNode.h>
+#include <OGRE/OgreTextureManager.h>
+#include <OGRE/OgreViewport.h>
+#include <OGRE/OgreTechnique.h>
+#include <OGRE/OgreCamera.h>
 
 #include "rviz/display_context.h"
 #include "rviz/frame_manager.h"

diff --git a/src/rviz/default_plugin/image_display.h b/src/rviz/default_plugin/image_display.h
@@ -33,9 +33,9 @@
 #ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829
 #include <QObject>
 
-#include <OgreMaterial.h>
-#include <OgreRenderTargetListener.h>
-#include <OgreSharedPtr.h>
+#include <OGRE/OgreMaterial.h>
+#include <OGRE/OgreRenderTargetListener.h>
+#include <OGRE/OgreSharedPtr.h>
 
 #include "rviz/image/image_display_base.h"
 #include "rviz/image/ros_image_texture.h"

diff --git a/src/rviz/default_plugin/interactive_markers/interactive_marker.cpp b/src/rviz/default_plugin/interactive_markers/interactive_marker.cpp
@@ -31,13 +31,13 @@
 
 #include <QMenu>
 
-#include <OgreSceneNode.h>
-#include <OgreSceneManager.h>
-#include <OgreMaterialManager.h>
-#include <OgreResourceGroupManager.h>
-#include <OgreSubEntity.h>
-#include <OgreMath.h>
-#include <OgreRenderWindow.h>
+#include <OGRE/OgreSceneNode.h>
+#include <OGRE/OgreSceneManager.h>
+#include <OGRE/OgreMaterialManager.h>
+#include <OGRE/OgreResourceGroupManager.h>
+#include <OGRE/OgreSubEntity.h>
+#include <OGRE/OgreMath.h>
+#include <OGRE/OgreRenderWindow.h>
 
 #include <ros/ros.h>
 #include <interactive_markers/tools.h>

diff --git a/src/rviz/default_plugin/interactive_markers/interactive_marker.h b/src/rviz/default_plugin/interactive_markers/interactive_marker.h
@@ -36,8 +36,8 @@
 #include <boost/thread/recursive_mutex.hpp>
 #include <boost/thread/thread.hpp>
 
-#include <OgreVector3.h>
-#include <OgreQuaternion.h>
+#include <OGRE/OgreVector3.h>
+#include <OGRE/OgreQuaternion.h>
 #endif
 
 #include <visualization_msgs/InteractiveMarker.h>

diff --git a/src/rviz/default_plugin/interactive_markers/interactive_marker_control.cpp b/src/rviz/default_plugin/interactive_markers/interactive_marker_control.cpp
@@ -27,16 +27,16 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <OgreViewport.h>
-#include <OgreCamera.h>
-#include <OgreSceneNode.h>
-#include <OgreSceneManager.h>
-#include <OgrePass.h>
-#include <OgreMaterial.h>
-#include <OgreEntity.h>
-#include <OgreSubEntity.h>
-#include <OgreSharedPtr.h>
-#include <OgreTechnique.h>
+#include <OGRE/OgreViewport.h>
+#include <OGRE/OgreCamera.h>
+#include <OGRE/OgreSceneNode.h>
+#include <OGRE/OgreSceneManager.h>
+#include <OGRE/OgrePass.h>
+#include <OGRE/OgreMaterial.h>
+#include <OGRE/OgreEntity.h>
+#include <OGRE/OgreSubEntity.h>
+#include <OGRE/OgreSharedPtr.h>
+#include <OGRE/OgreTechnique.h>
 
 #include "rviz/display_context.h"
 #include "rviz/selection/selection_manager.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
@@ -35,10 +35,10 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
 
-#include <OgreRay.h>
-#include <OgreVector3.h>
-#include <OgreQuaternion.h>
-#include <OgreSceneManager.h>
+#include <OGRE/OgreRay.h>
+#include <OGRE/OgreVector3.h>
+#include <OGRE/OgreQuaternion.h>
+#include <OGRE/OgreSceneManager.h>
 #endif
 
 #include <QCursor>

diff --git a/src/rviz/default_plugin/laser_scan_display.cpp b/src/rviz/default_plugin/laser_scan_display.cpp
@@ -27,8 +27,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <OgreSceneNode.h>
-#include <OgreSceneManager.h>
+#include <OGRE/OgreSceneNode.h>
+#include <OGRE/OgreSceneManager.h>
 
 #include <ros/time.h>
 

diff --git a/src/rviz/default_plugin/map_display.cpp b/src/rviz/default_plugin/map_display.cpp
@@ -29,13 +29,13 @@
 
 #include <boost/bind.hpp>
 
-#include <OgreManualObject.h>
-#include <OgreMaterialManager.h>
-#include <OgreSceneManager.h>
-#include <OgreSceneNode.h>
-#include <OgreTextureManager.h>
-#include <OgreTechnique.h>
-#include <OgreSharedPtr.h>
+#include <OGRE/OgreManualObject.h>
+#include <OGRE/OgreMaterialManager.h>
+#include <OGRE/OgreSceneManager.h>
+#include <OGRE/OgreSceneNode.h>
+#include <OGRE/OgreTextureManager.h>
+#include <OGRE/OgreTechnique.h>
+#include <OGRE/OgreSharedPtr.h>
 
 #include <ros/ros.h>
 

diff --git a/src/rviz/default_plugin/map_display.h b/src/rviz/default_plugin/map_display.h
@@ -33,10 +33,10 @@
 #ifndef Q_MOC_RUN
 #include <boost/thread/thread.hpp>
 
-#include <OgreTexture.h>
-#include <OgreMaterial.h>
-#include <OgreVector3.h>
-#include <OgreSharedPtr.h>
+#include <OGRE/OgreTexture.h>
+#include <OGRE/OgreMaterial.h>
+#include <OGRE/OgreVector3.h>
+#include <OGRE/OgreSharedPtr.h>
 #endif
 
 #include <nav_msgs/MapMetaData.h>