Clean up library.hh headers (#479)

* Clean up library.hh headers Signed-off-by: Louise Poubel <louise@openrobotics.org> * sort Signed-off-by: Louise Poubel <louise@openrobotics.org> * fix pragmas Signed-off-by: Louise Poubel <louise@openrobotics.org> Signed-off-by: Louise Poubel <louise@openrobotics.org>
gazebosim · Aug 30, 2022 · d32c41b · d32c41b
1 parent b5f354a
commit d32c41b
Show file tree

Hide file tree

Showing 35 changed files with 89 additions and 178 deletions.
diff --git a/include/gz/gui/Conversions.hh b/include/gz/gui/Conversions.hh
@@ -18,13 +18,8 @@
 #ifndef GZ_GUI_CONVERSIONS_HH_
 #define GZ_GUI_CONVERSIONS_HH_
 
-#ifdef _MSC_VER
-#pragma warning(push, 0)
-#endif
 #include <gz/msgs/time.pb.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
+
 #include <gz/common/KeyEvent.hh>
 #include <gz/common/MouseEvent.hh>
 #include <gz/math/Color.hh>

diff --git a/include/gz/gui/PlottingInterface.hh b/include/gz/gui/PlottingInterface.hh
@@ -22,7 +22,8 @@
 #include <QMap>
 #include <QVariant>
 #ifdef _MSC_VER
-#pragma warning(push, 0)
+#pragma warning(push)
+#pragma warning(disable: 4251)
 #endif
 #include <google/protobuf/message.h>
 #include <google/protobuf/descriptor.h>

diff --git a/src/PlottingInterface_TEST.cc b/src/PlottingInterface_TEST.cc
@@ -16,17 +16,17 @@
 */
 #include <gtest/gtest.h>
 
-#ifdef _MSC_VER
-#pragma warning(push, 0)
-#endif
-#include <gz/msgs.hh>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-#include <gz/transport.hh>
+#include <gz/msgs/collision.pb.h>
+#include <gz/msgs/header.pb.h>
+#include <gz/msgs/int32.pb.h>
+#include <gz/msgs/pose.pb.h>
+#include <gz/msgs/time.pb.h>
+#include <gz/msgs/vector3d.pb.h>
+
 #include <gz/common/Console.hh>
+#include <gz/transport/Node.hh>
 #include <gz/utils/ExtraTestMacros.hh>
+
 #include "test_config.hh"  // NOLINT(build/include)
 #include "gz/gui/Enums.hh"
 #include "gz/gui/PlottingInterface.hh"

diff --git a/src/plugins/camera_tracking/CameraTracking.cc b/src/plugins/camera_tracking/CameraTracking.cc
@@ -18,27 +18,17 @@
 #include <mutex>
 #include <string>
 
+#include <gz/msgs/stringmsg.pb.h>
+
 #include <gz/common/Console.hh>
 #include <gz/common/Profiler.hh>
-#include <gz/plugin/Register.hh>
-
-// TODO(anyone) Remove these pragmas once gz-rendering and gz-msgs
-// are disabling the warnings
-#ifdef _MSC_VER
-#pragma warning(push, 0)
-#endif
-#include <gz/msgs/stringmsg.pb.h>
 #include <gz/msgs/Utility.hh>
-
+#include <gz/plugin/Register.hh>
 #include <gz/rendering/Camera.hh>
 #include <gz/rendering/MoveToHelper.hh>
 #include <gz/rendering/RenderingIface.hh>
 #include <gz/rendering/Scene.hh>
 
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
 #include "gz/gui/Application.hh"
 #include "gz/gui/Conversions.hh"
 #include "gz/gui/GuiEvents.hh"

diff --git a/src/plugins/grid_config/GridConfig.cc b/src/plugins/grid_config/GridConfig.cc
@@ -26,7 +26,9 @@
 #include <gz/plugin/Register.hh>
 #include <gz/math/Color.hh>
 #include <gz/math/Pose3.hh>
-#include <gz/rendering.hh>
+#include <gz/rendering/Grid.hh>
+#include <gz/rendering/RenderingIface.hh>
+#include <gz/rendering/Scene.hh>
 
 #include "GridConfig.hh"
 

diff --git a/src/plugins/grid_config/GridConfig.hh b/src/plugins/grid_config/GridConfig.hh
@@ -21,7 +21,6 @@
 #include <memory>
 
 #include <gz/gui/Plugin.hh>
-#include <gz/rendering.hh>
 
 namespace gz
 {

diff --git a/src/plugins/image_display/ImageDisplay.cc b/src/plugins/image_display/ImageDisplay.cc
@@ -15,6 +15,8 @@
  *
 */
 
+#include <gz/msgs/image.pb.h>
+
 #include "ImageDisplay.hh"
 
 #include <QQuickImageProvider>
@@ -27,6 +29,7 @@
 
 #include <gz/common/Console.hh>
 #include <gz/common/Image.hh>
+#include <gz/msgs/Utility.hh>
 #include <gz/plugin/Register.hh>
 #include <gz/transport/Node.hh>
 

diff --git a/src/plugins/image_display/ImageDisplay.hh b/src/plugins/image_display/ImageDisplay.hh
@@ -19,13 +19,7 @@
 #define GZ_GUI_PLUGINS_IMAGEDISPLAY_HH_
 
 #include <memory>
-#ifdef _MSC_VER
-#pragma warning(push, 0)
-#endif
 #include <gz/msgs/image.pb.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
 
 #include "gz/gui/Plugin.hh"
 

diff --git a/src/plugins/interactive_view_control/InteractiveViewControl.cc b/src/plugins/interactive_view_control/InteractiveViewControl.cc
@@ -15,6 +15,9 @@
  *
  */
 
+#include <gz/msgs/boolean.pb.h>
+#include <gz/msgs/stringmsg.pb.h>
+
 #include <string>
 #include <mutex>
 

diff --git a/src/plugins/key_publisher/KeyPublisher.cc b/src/plugins/key_publisher/KeyPublisher.cc
@@ -15,13 +15,7 @@
  *
 */
 
-#ifdef _MSC_VER
-#pragma warning(push, 0)
-#endif
 #include <gz/msgs/int32.pb.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
 
 #include <string>
 

diff --git a/src/plugins/marker_manager/MarkerManager.cc b/src/plugins/marker_manager/MarkerManager.cc
@@ -22,26 +22,24 @@
 
 #include <QQmlProperty>
 
+#include <gz/msgs/boolean.pb.h>
+#include <gz/msgs/marker.pb.h>
+#include <gz/msgs/marker_v.pb.h>
+#include <gz/msgs/world_stats.pb.h>
+
 #include <gz/common/Console.hh>
 #include <gz/common/Profiler.hh>
 #include <gz/common/StringUtils.hh>
 
 #include <gz/math/Rand.hh>
 
-#ifdef _MSC_VER
-#pragma warning(push, 0)
-#endif
-#include <gz/msgs.hh>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
 #include <gz/plugin/Register.hh>
 
 #include "gz/rendering/Marker.hh"
 #include <gz/rendering/RenderingIface.hh>
 #include <gz/rendering/Scene.hh>
 
+#include <gz/msgs/Utility.hh>
 #include <gz/transport/Node.hh>
 
 #include "gz/gui/Application.hh"

diff --git a/src/plugins/minimal_scene/MinimalScene.cc b/src/plugins/minimal_scene/MinimalScene.cc
@@ -32,24 +32,13 @@
 #include <gz/math/Vector2.hh>
 #include <gz/math/Vector3.hh>
 #include <gz/plugin/Register.hh>
-
-// TODO(louise) Remove these pragmas once gz-rendering
-// is disabling the warnings
-#ifdef _MSC_VER
-#pragma warning(push, 0)
-#endif
-
 #include <gz/rendering/Camera.hh>
 #include <gz/rendering/RayQuery.hh>
 #include <gz/rendering/RenderEngine.hh>
 #include <gz/rendering/RenderingIface.hh>
 #include <gz/rendering/Scene.hh>
 #include <gz/rendering/Utils.hh>
 
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
 #include "gz/gui/Application.hh"
 #include "gz/gui/Conversions.hh"
 #include "gz/gui/GuiEvents.hh"

diff --git a/src/plugins/navsat_map/NavSatMap.hh b/src/plugins/navsat_map/NavSatMap.hh
@@ -19,13 +19,8 @@
 #define GZ_GUI_PLUGINS_IMAGEDISPLAY_HH_
 
 #include <memory>
-#ifdef _MSC_VER
-#pragma warning(push, 0)
-#endif
+
 #include <gz/msgs/navsat.pb.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
 
 #include "gz/gui/Plugin.hh"
 

diff --git a/src/plugins/point_cloud/PointCloud.hh b/src/plugins/point_cloud/PointCloud.hh
@@ -20,14 +20,8 @@
 
 #include <memory>
 
-#ifdef _MSC_VER
-#pragma warning(push, 0)
-#endif
 #include <gz/msgs/float_v.pb.h>
 #include <gz/msgs/pointcloud_packed.pb.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
 
 #include "gz/gui/Plugin.hh"
 

diff --git a/src/plugins/publisher/Publisher.cc b/src/plugins/publisher/Publisher.cc
@@ -16,14 +16,8 @@
 */
 
 #include <iostream>
-#ifdef _MSC_VER
-#pragma warning(push, 0)
-#endif
-#include <gz/msgs.hh>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
 #include <gz/common/Console.hh>
+#include <gz/msgs/Utility.hh>
 #include <gz/plugin/Register.hh>
 #include <gz/transport/Node.hh>
 

diff --git a/src/plugins/publisher/Publisher_TEST.cc b/src/plugins/publisher/Publisher_TEST.cc
@@ -16,13 +16,8 @@
 */
 
 #include <gtest/gtest.h>
-#ifdef _MSC_VER
-#pragma warning(push, 0)
-#endif
 #include <gz/msgs/stringmsg.pb.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
+
 #include <gz/transport/Node.hh>
 #include <gz/utils/ExtraTestMacros.hh>
 

diff --git a/src/plugins/screenshot/Screenshot.cc b/src/plugins/screenshot/Screenshot.cc
@@ -22,18 +22,10 @@
 #include <gz/common/Filesystem.hh>
 #include <gz/common/Image.hh>
 #include <gz/plugin/Register.hh>
-
-#ifdef _MSC_VER
-#pragma warning(push, 0)
-#endif
 #include <gz/rendering/Camera.hh>
 #include <gz/rendering/RenderEngine.hh>
 #include <gz/rendering/RenderingIface.hh>
 #include <gz/rendering/Scene.hh>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
 #include <gz/transport/Node.hh>
 
 #include "gz/gui/Application.hh"

diff --git a/src/plugins/screenshot/Screenshot.hh b/src/plugins/screenshot/Screenshot.hh
@@ -17,14 +17,8 @@
 #ifndef GZ_GUI_PLUGINS_SCREENSHOT_HH_
 #define GZ_GUI_PLUGINS_SCREENSHOT_HH_
 
-#ifdef _MSC_VER
-#pragma warning(push, 0)
-#endif
 #include <gz/msgs/boolean.pb.h>
 #include <gz/msgs/stringmsg.pb.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
 
 #include <memory>
 

diff --git a/src/plugins/screenshot/Screenshot_TEST.cc b/src/plugins/screenshot/Screenshot_TEST.cc
@@ -14,15 +14,9 @@
  * limitations under the License.
  *
 */
-#ifdef _MSC_VER
-#pragma warning(push, 0)
-#endif
+
 #include <gz/msgs/boolean.pb.h>
 #include <gz/msgs/stringmsg.pb.h>
-#include <gz/rendering.hh>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
 
 #include <gtest/gtest.h>
 #include <string>

diff --git a/src/plugins/shutdown_button/ShutdownButton_TEST.cc b/src/plugins/shutdown_button/ShutdownButton_TEST.cc
@@ -17,6 +17,9 @@
 
 #include <gtest/gtest.h>
 
+#include <gz/msgs/boolean.pb.h>
+#include <gz/msgs/server_control.pb.h>
+
 #include <gz/common/Console.hh>
 #include <gz/transport/Node.hh>
 #include <gz/utils/ExtraTestMacros.hh>

diff --git a/src/plugins/teleop/Teleop.cc b/src/plugins/teleop/Teleop.cc
@@ -16,18 +16,12 @@
 */
 
 #include <iostream>
-#ifdef _MSC_VER
-#pragma warning(push, 0)
-#endif
+#include <string>
+
 #include <gz/msgs/twist.pb.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
 
 #include "Teleop.hh"
 
-#include <string>
-
 #include <gz/plugin/Register.hh>
 
 #include <gz/gui/Application.hh>

diff --git a/src/plugins/teleop/Teleop_TEST.cc b/src/plugins/teleop/Teleop_TEST.cc
@@ -16,13 +16,9 @@
 */
 
 #include <gtest/gtest.h>
-#ifdef _MSC_VER
-#pragma warning(push, 0)
-#endif
+
 #include <gz/msgs/stringmsg.pb.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
+#include <gz/msgs/twist.pb.h>
 
 #include <gz/utils/ExtraTestMacros.hh>
 

diff --git a/src/plugins/topic_echo/TopicEcho.hh b/src/plugins/topic_echo/TopicEcho.hh
@@ -19,7 +19,8 @@
 #define GZ_GUI_PLUGINS_TOPICECHO_HH_
 
 #ifdef _MSC_VER
-#pragma warning(push, 0)
+#pragma warning(push)
+#pragma warning(disable: 4251)
 #endif
 #include <google/protobuf/message.h>
 #ifdef _MSC_VER

diff --git a/src/plugins/topic_echo/TopicEcho_TEST.cc b/src/plugins/topic_echo/TopicEcho_TEST.cc
@@ -18,13 +18,7 @@
 #include <gtest/gtest.h>
 #include <QRegExp>
 
-#ifdef _MSC_VER
-#pragma warning(push, 0)
-#endif
 #include <gz/msgs/stringmsg.pb.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
 
 #include <gz/common/Console.hh>
 #include <gz/common/Filesystem.hh>