Fixes to forward-port: version, Windows, deprecations (gazebosim#940)

Signed-off-by: Louise Poubel <[email protected]> Signed-off-by: William Lew <[email protected]>
WilliamLewww · Dec 7, 2021 · b2c6134 · b2c6134
1 parent 1a1c727
commit b2c6134
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/examples/plugin/hello_world/CMakeLists.txt b/examples/plugin/hello_world/CMakeLists.txt
@@ -7,8 +7,8 @@ project(Hello_world)
 ign_find_package(ignition-plugin1 REQUIRED COMPONENTS register)
 set(IGN_PLUGIN_VER ${ignition-plugin1_VERSION_MAJOR})
 
-ign_find_package(ignition-gazebo5 REQUIRED)
-set(IGN_GAZEBO_VER ${ignition-gazebo5_VERSION_MAJOR})
+ign_find_package(ignition-gazebo6 REQUIRED)
+set(IGN_GAZEBO_VER ${ignition-gazebo6_VERSION_MAJOR})
 
 add_library(HelloWorld SHARED HelloWorld)
 set_property(TARGET HelloWorld PROPERTY CXX_STANDARD 17)

diff --git a/src/gui/plugins/banana_for_scale/BananaForScale.cc b/src/gui/plugins/banana_for_scale/BananaForScale.cc
@@ -26,7 +26,6 @@
 #include <ignition/gui/GuiEvents.hh>
 #include <ignition/gui/MainWindow.hh>
 #include <ignition/plugin/Register.hh>
-#include <ignition/utils/SuppressWarning.hh>
 
 #include <ignition/fuel_tools/FuelClient.hh>
 #include <ignition/fuel_tools/ClientConfig.hh>
@@ -106,13 +105,6 @@ void BananaForScale::OnMode(const QString &_mode)
   ignition::gui::App()->sendEvent(
       ignition::gui::App()->findChild<ignition::gui::MainWindow *>(),
       &event);
-
-  IGN_UTILS_WARN_IGNORE__DEPRECATED_DECLARATION
-  ignition::gazebo::gui::events::SpawnPreviewPath oldEvent(sdfPath);
-  ignition::gui::App()->sendEvent(
-      ignition::gui::App()->findChild<ignition::gui::MainWindow *>(),
-      &oldEvent);
-  IGN_UTILS_WARN_RESUME__DEPRECATED_DECLARATION
 }
 
 // Register this plugin