More aggressive migrations for ignition- and ign-

Signed-off-by: methylDragon <[email protected]>
gazebosim · Jun 28, 2022 · a680327 · a680327
1 parent 7afd7b4
commit a680327
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -55,7 +55,7 @@
 1. Don't crash if a plugin has invalid QML
     * [Pull request #315](https://github.com/gazebosim/gz-gui/pull/315)
 
-1. Added log storing for ign-gui
+1. Added log storing for gz-gui
     * [Pull request #272](https://github.com/gazebosim/gz-gui/pull/272)
 
 ### Gazebo GUI 6.1.0 (2021-11-05)
@@ -184,7 +184,7 @@
 1. Don't crash if a plugin has invalid QML
     * [Pull request #315](https://github.com/gazebosim/gz-gui/pull/315)
 
-1. Added log storing for ign-gui
+1. Added log storing for gz-gui
     * [Pull request #272](https://github.com/gazebosim/gz-gui/pull/272)
 
 
@@ -219,7 +219,7 @@
 1. Screenshot plugin fixed dbg message
     * [Pull request #246](https://github.com/gazebosim/gz-gui/pull/246)
 
-1. Detect gz instead of using cmake module to check for ignition-tools
+1. Detect gz instead of using cmake module to check for gz-tools
     * [Pull request #240](https://github.com/gazebosim/gz-gui/pull/240)
 
 ### Gazebo GUI 5.1.0 (2021-06-23)
@@ -299,12 +299,12 @@
 1. Screenshot plugin fixed dbg message
     * [Pull request #246](https://github.com/gazebosim/gz-gui/pull/246)
 
-1. Detect gz instead of using cmake module to check for ignition-tools
+1. Detect gz instead of using cmake module to check for gz-tools
     * [Pull request #240](https://github.com/gazebosim/gz-gui/pull/240)
 
 ### Gazebo GUI 4.4.0 (2021-06-21)
 
-1. Bump required ign-rendering version to 4.8
+1. Bump required gz-rendering version to 4.8
     * [Pull request #234](https://github.com/gazebosim/gz-gui/pull/234)
 
 1. Update codeowners
@@ -503,7 +503,7 @@
 1. 👩‍🌾 Remove bitbucket-pipelines.yml
     * [Pull request #274](https://github.com/gazebosim/gz-gui/pull/274)
 
-1. Require ign-rendering 3.5
+1. Require gz-rendering 3.5
     * [Pull request #264](https://github.com/gazebosim/gz-gui/pull/264)
 
 1. New teleop plugin implementation.
@@ -523,7 +523,7 @@
 1. Screenshot plugin fixed dbg message
     * [Pull request #246](https://github.com/gazebosim/gz-gui/pull/246)
 
-1. Detect gz instead of using cmake module to check for ignition-tools
+1. Detect gz instead of using cmake module to check for gz-tools
     * [Pull request #240](https://github.com/gazebosim/gz-gui/pull/240)
 
 ### Gazebo GUI 3.6.0 (2021-06-17)
@@ -885,7 +885,7 @@
 1. Move files not ported to v1 to a separate dir for clarity.
     * [BitBucket pull request 196](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/196)
 
-1. Get ign-gui plugin interface in case there are others.
+1. Get gz-gui plugin interface in case there are others.
     * [BitBucket pull request 186](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/186)
 
 ### Gazebo GUI 1.0.0
diff --git a/src/plugins/grid_config/GridConfig.cc b/src/plugins/grid_config/GridConfig.cc
@@ -279,7 +279,7 @@ void GridConfig::ConnectToGrid()
         gzdbg << "Connected to grid [" << grid->Name() << "]" << std::endl;
 
         // TODO(chapulina) Set to the grid's visible state when that's available
-        // through ign-rendering's API
+        // through gz-rendering's API
         this->dataPtr->visible = true;
         grid->Parent()->SetVisible(true);
 

diff --git a/src/plugins/topic_viewer/TopicViewer_TEST.cc b/src/plugins/topic_viewer/TopicViewer_TEST.cc
@@ -73,7 +73,7 @@ TEST(TopicViewerTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Load))
 // See https://github.com/gazebosim/gz-gui/issues/75
 TEST(TopicViewerTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Model))
 {
-    setenv("GZ_PARTITION", "ign-gazebo-test", 1);
+    setenv("GZ_PARTITION", "gz-sim-test", 1);
 
     // =========== Publish =================
     transport::Node node;

diff --git a/src/plugins/transport_scene_manager/TransportSceneManager.cc b/src/plugins/transport_scene_manager/TransportSceneManager.cc
@@ -30,7 +30,7 @@
 #include <gz/math/Vector3.hh>
 #include <gz/plugin/Register.hh>
 
-// TODO(louise) Remove these pragmas once ign-rendering and ign-msgs
+// TODO(louise) Remove these pragmas once gz-rendering and gz-msgs
 // are disabling the warnings
 #ifdef _MSC_VER
 #pragma warning(push, 0)
@@ -127,16 +127,16 @@ class gz::gui::plugins::TransportSceneManagerPrivate
   /// \param[in] _entity Entity to delete
   public: void DeleteEntity(const unsigned int _entity);
 
-  //// \brief Ign-transport scene service name
+  //// \brief gz-transport scene service name
   public: std::string service{"scene"};
 
-  //// \brief Ign-transport pose topic name
+  //// \brief gz-transport pose topic name
   public: std::string poseTopic{"pose"};
 
-  //// \brief Ign-transport deletion topic name
+  //// \brief gz-transport deletion topic name
   public: std::string deletionTopic{"delete"};
 
-  //// \brief Ign-transport scene topic name
+  //// \brief gz-transport scene topic name
   public: std::string sceneTopic{"scene"};
 
   //// \brief Pointer to the rendering scene
@@ -663,7 +663,7 @@ rendering::VisualPtr TransportSceneManagerPrivate::LoadVisual(
       geom->SetMaterial(material);
       // todo(anyone) SetMaterial function clones the input material.
       // but does not take ownership of it so we need to destroy it here.
-      // This is not ideal. We should let ign-rendering handle the lifetime
+      // This is not ideal. We should let gz-rendering handle the lifetime
       // of this material
       this->scene->DestroyMaterial(material);
     }