include ogre without OGRE prefix

This is necessary to find Ogre files in the right place with
compatibility between Ogre < 1.9 and Ogre >= 1.9.

This is also necessary when 2 versions of Ogre are installed on the
build machine.

src/image_view/image_view.cpp

@@ -38,14 +38,14 @@
 #include "ros/ros.h"
 #include <ros/package.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 <OgreRoot.h>
+#include <OgreRenderWindow.h>
+#include <OgreSceneManager.h>
+#include <OgreViewport.h>
+#include <OgreRectangle2D.h>
+#include <OgreMaterial.h>
+#include <OgreMaterialManager.h>
+#include <OgreTextureUnitState.h>
 
 #include "image_view.h"
 

src/image_view/image_view.h

@@ -35,13 +35,13 @@
 # include "ros/ros.h"
 # include <ros/package.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 <OgreRoot.h>
+# include <OgreSceneManager.h>
+# include <OgreViewport.h>
+# include <OgreRectangle2D.h>
+# include <OgreMaterial.h>
+# include <OgreMaterialManager.h>
+# include <OgreTextureUnitState.h>
 
 # include <image_transport/image_transport.h>
 # include <image_transport/subscriber_filter.h>

src/rviz/default_plugin/axes_display.cpp

@@ -29,8 +29,8 @@
 
 #include <boost/bind.hpp>
 
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
 
 #include "rviz/display_context.h"
 #include "rviz/frame_manager.h"

src/rviz/default_plugin/camera_display.cpp

@@ -29,15 +29,15 @@
 
 #include <boost/bind.hpp>
 
-#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 <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 <tf/transform_listener.h>
 

src/rviz/default_plugin/camera_display.h

@@ -32,8 +32,8 @@
 
 #include <QObject>
 
-#include <OGRE/OgreMaterial.h>
-#include <OGRE/OgreRenderTargetListener.h>
+#include <OgreMaterial.h>
+#include <OgreRenderTargetListener.h>
 
 #ifndef Q_MOC_RUN
 # include <sensor_msgs/CameraInfo.h>

src/rviz/default_plugin/depth_cloud_display.cpp

@@ -46,8 +46,8 @@
 #include <boost/foreach.hpp>
 #include <boost/shared_ptr.hpp>
 
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
 
 #include <image_transport/camera_common.h>
 #include <image_transport/subscriber_plugin.h>

src/rviz/default_plugin/effort_display.cpp

@@ -1,5 +1,5 @@
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
 
 #include <tf/transform_listener.h>
 

src/rviz/default_plugin/effort_visual.cpp

@@ -1,6 +1,6 @@
-#include <OGRE/OgreVector3.h>
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
+#include <OgreVector3.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
 
 #include <rviz/ogre_helpers/arrow.h>
 #include <rviz/ogre_helpers/billboard_line.h>

src/rviz/default_plugin/fluid_pressure_display.cpp

@@ -27,8 +27,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
 
 #include <ros/time.h>
 

src/rviz/default_plugin/grid_cells_display.cpp

@@ -29,10 +29,10 @@
 
 #include <boost/bind.hpp>
 
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgreManualObject.h>
-#include <OGRE/OgreBillboardSet.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
+#include <OgreManualObject.h>
+#include <OgreBillboardSet.h>
 
 #include <tf/transform_listener.h>
 

src/rviz/default_plugin/grid_display.cpp

@@ -31,8 +31,8 @@
 
 #include <boost/bind.hpp>
 
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
 
 #include "rviz/display_context.h"
 #include "rviz/frame_manager.h"

src/rviz/default_plugin/illuminance_display.cpp

@@ -27,8 +27,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
 
 #include <ros/time.h>
 

src/rviz/default_plugin/image_display.cpp

@@ -29,16 +29,16 @@
 
 #include <boost/bind.hpp>
 
-#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 <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 <tf/transform_listener.h>
 

src/rviz/default_plugin/image_display.h

@@ -33,8 +33,8 @@
 #ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829
 # include <QObject>
 
-# include <OGRE/OgreMaterial.h>
-# include <OGRE/OgreRenderTargetListener.h>
+# include <OgreMaterial.h>
+# include <OgreRenderTargetListener.h>
 
 # include "rviz/image/image_display_base.h"
 # include "rviz/image/ros_image_texture.h"

src/rviz/default_plugin/interactive_markers/interactive_marker.cpp

@@ -31,13 +31,13 @@
 
 #include <QMenu>
 
-#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 <OgreSceneNode.h>
+#include <OgreSceneManager.h>
+#include <OgreMaterialManager.h>
+#include <OgreResourceGroupManager.h>
+#include <OgreSubEntity.h>
+#include <OgreMath.h>
+#include <OgreRenderWindow.h>
 
 #include <ros/ros.h>
 #include <interactive_markers/tools.h>

src/rviz/default_plugin/interactive_markers/interactive_marker.h

@@ -35,8 +35,8 @@
 #include <boost/thread/recursive_mutex.hpp>
 #include <boost/thread/thread.hpp>
 
-#include <OGRE/OgreVector3.h>
-#include <OGRE/OgreQuaternion.h>
+#include <OgreVector3.h>
+#include <OgreQuaternion.h>
 
 #include <visualization_msgs/InteractiveMarker.h>
 #include <visualization_msgs/InteractiveMarkerPose.h>

src/rviz/default_plugin/interactive_markers/interactive_marker_control.cpp

@@ -27,14 +27,14 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#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 <OgreViewport.h>
+#include <OgreCamera.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
+#include <OgrePass.h>
+#include <OgreMaterial.h>
+#include <OgreEntity.h>
+#include <OgreSubEntity.h>
 
 #include "rviz/display_context.h"
 #include "rviz/selection/selection_manager.h"

src/rviz/default_plugin/interactive_markers/interactive_marker_control.h

@@ -36,10 +36,10 @@
 
 #include <QCursor>
 
-#include <OGRE/OgreRay.h>
-#include <OGRE/OgreVector3.h>
-#include <OGRE/OgreQuaternion.h>
-#include <OGRE/OgreSceneManager.h>
+#include <OgreRay.h>
+#include <OgreVector3.h>
+#include <OgreQuaternion.h>
+#include <OgreSceneManager.h>
 
 #include <visualization_msgs/InteractiveMarkerControl.h>
 

src/rviz/default_plugin/laser_scan_display.cpp

@@ -27,8 +27,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
 
 #include <ros/time.h>
 

src/rviz/default_plugin/map_display.cpp

@@ -29,11 +29,11 @@
 
 #include <boost/bind.hpp>
 
-#include <OGRE/OgreManualObject.h>
-#include <OGRE/OgreMaterialManager.h>
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreTextureManager.h>
+#include <OgreManualObject.h>
+#include <OgreMaterialManager.h>
+#include <OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreTextureManager.h>
 
 #include <ros/ros.h>
 

src/rviz/default_plugin/map_display.h

@@ -32,9 +32,9 @@
 
 #include <boost/thread/thread.hpp>
 
-#include <OGRE/OgreTexture.h>
-#include <OGRE/OgreMaterial.h>
-#include <OGRE/OgreVector3.h>
+#include <OgreTexture.h>
+#include <OgreMaterial.h>
+#include <OgreVector3.h>
 
 #include <nav_msgs/MapMetaData.h>
 #include <ros/time.h>

src/rviz/default_plugin/markers/arrow_marker.cpp

@@ -27,11 +27,11 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <OGRE/OgreVector3.h>
-#include <OGRE/OgreQuaternion.h>
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgreEntity.h>
+#include <OgreVector3.h>
+#include <OgreQuaternion.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
+#include <OgreEntity.h>
 
 #include <tf/transform_listener.h>
 

src/rviz/default_plugin/markers/line_list_marker.cpp

@@ -34,9 +34,9 @@
 
 #include <rviz/ogre_helpers/billboard_line.h>
 
-#include <OGRE/OgreVector3.h>
-#include <OGRE/OgreQuaternion.h>
-#include <OGRE/OgreSceneNode.h>
+#include <OgreVector3.h>
+#include <OgreQuaternion.h>
+#include <OgreSceneNode.h>
 
 namespace rviz
 {

src/rviz/default_plugin/markers/line_strip_marker.cpp

@@ -35,9 +35,9 @@
 
 #include <rviz/ogre_helpers/billboard_line.h>
 
-#include <OGRE/OgreVector3.h>
-#include <OGRE/OgreQuaternion.h>
-#include <OGRE/OgreSceneNode.h>
+#include <OgreVector3.h>
+#include <OgreQuaternion.h>
+#include <OgreSceneNode.h>
 
 namespace rviz
 {

src/rviz/default_plugin/markers/marker_base.cpp

@@ -34,10 +34,10 @@
 #include "marker_selection_handler.h"
 #include "rviz/frame_manager.h"
 
-#include <OGRE/OgreSceneNode.h>
-#include <OGRE/OgreSceneManager.h>
-#include <OGRE/OgreEntity.h>
-#include <OGRE/OgreSubEntity.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
+#include <OgreEntity.h>
+#include <OgreSubEntity.h>
 
 #include <tf/tf.h>
 #include <tf/transform_listener.h>

src/rviz/default_plugin/markers/marker_selection_handler.cpp

@@ -27,8 +27,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <OGRE/OgreQuaternion.h>
-#include <OGRE/OgreVector3.h>
+#include <OgreQuaternion.h>
+#include <OgreVector3.h>
 
 #include "rviz/default_plugin/interactive_markers/interactive_marker_control.h"
 #include "rviz/default_plugin/marker_display.h"