Remove deprecations: tock 🕑 (#875)

Signed-off-by: Louise Poubel <[email protected]>

examples/scripts/distributed/primary.sh

@@ -4,12 +4,3 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
 ign gazebo -v 4 -z 100000000 --network-role primary --network-secondaries 3 $DIR/primary.sdf
 
-# Ignition Gazebo 1.x.x and 2.x.x support using environment variables to
-# configure distributed simulation. This capability is deprecated in
-# version 2.x.x, and removed in verion 3.x.x of Inition Gazebo. Please use the
-# --network-role and --network-secondaries command line options instead.
-
-# export IGN_GAZEBO_NETWORK_ROLE="PRIMARY"
-# export IGN_GAZEBO_NETWORK_SECONDARIES=3
-# ign-gazebo -v 4 --distributed -f $DIR/primary.sdf
-

examples/scripts/distributed/secondary.sh

@@ -4,10 +4,3 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
 ign gazebo -s -v 4 -z 100000000 --network-role secondary $DIR/secondary.sdf
 
-# Ignition Gazebo 1.x.x and 2.x.x support using environment variables to
-# configure distributed simulation. This capability is deprecated in
-# version 2.x.x, and removed in verion 3.x.x of Inition Gazebo. Please use the
-# --network-role and --network-secondaries command line options instead.
-
-# export IGN_GAZEBO_NETWORK_ROLE="SECONDARY"
-# ign-gazebo -v 4 --distributed -f $DIR/secondary.sdf

examples/scripts/distributed_levels/primary.sh

@@ -5,13 +5,3 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 # --levels is implied by --network-role
 ign gazebo -v 4 -z 100000000 --network-role primary --network-secondaries 2 $DIR/primary.sdf
 
-# Ignition Gazebo 1.x.x and 2.x.x support using environment variables to
-# configure distributed simulation. This capability is deprecated in
-# version 2.x.x, and removed in verion 3.x.x of Inition Gazebo. Please use the
-# --network-role and --network-secondaries command line options instead.
-
-# export IGN_GAZEBO_NETWORK_ROLE="PRIMARY"
-# export IGN_GAZEBO_NETWORK_SECONDARIES=3
-# ign-gazebo -v 4 --distributed -f $DIR/primary.sdf
-
-

examples/scripts/distributed_levels/secondary.sh

@@ -5,10 +5,3 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 # --levels is implied by --network-role
 ign gazebo -s -v 4 -z 100000000 --network-role secondary $DIR/secondary.sdf
 
-# Ignition Gazebo 1.x.x and 2.x.x support using environment variables to
-# configure distributed simulation. This capability is deprecated in
-# version 2.x.x, and removed in verion 3.x.x of Inition Gazebo. Please use the
-# --network-role and --network-secondaries command line options instead.
-
-# export IGN_GAZEBO_NETWORK_ROLE="SECONDARY"
-# ign-gazebo -v 4 --distributed -f $DIR/secondary.sdf

include/ignition/gazebo/ServerConfig.hh

@@ -244,16 +244,6 @@ namespace ignition
       /// \param[in] _recordPath Path to place recorded states
       public: void SetLogRecordPath(const std::string &_recordPath);
 
-      /// \brief Get whether to ignore the path specified in SDF.
-      /// \return Whether to ignore the path specified in SDF
-      public: bool IGN_DEPRECATED(4) LogIgnoreSdfPath() const;
-
-      /// \brief Set whether to ignore the path specified in SDF. Path in SDF
-      /// should be ignored if a record path is specified on the command line,
-      /// for example.
-      /// \param[in] _ignore Whether to ignore the path specified in SDF
-      public: void IGN_DEPRECATED(4) SetLogIgnoreSdfPath(bool _ignore);
-
       /// \brief Add a topic to record.
       /// \param[in] _topic Topic name, which can include wildcards.
       public: void AddLogRecordTopic(const std::string &_topic);

include/ignition/gazebo/gui/GuiEvents.hh

@@ -36,56 +36,6 @@ inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE {
 /// more information about events.
 namespace events
 {
-  /// \brief The class for sending and receiving custom snap value events.
-  class IGN_DEPRECATED(5) SnapIntervals : public QEvent
-  {
-    /// \brief Constructor
-    /// \param[in] _xyz XYZ snapping values.
-    /// \param[in] _rpy RPY snapping values.
-    /// \param[in] _scale Scale snapping values.
-    public: SnapIntervals(
-                const math::Vector3d &_xyz,
-                const math::Vector3d &_rpy,
-                const math::Vector3d &_scale)
-    : QEvent(kType), xyz(_xyz), rpy(_rpy), scale(_scale)
-    {
-    }
-
-    /// \brief Get the XYZ snapping values.
-    /// \return The XYZ snapping values.
-    public: math::Vector3d XYZ() const
-    {
-      return this->xyz;
-    }
-
-    /// \brief Get the RPY snapping values.
-    /// \return The RPY snapping values.
-    public: math::Vector3d RPY() const
-    {
-      return this->rpy;
-    }
-
-    /// \brief Get the scale snapping values.
-    /// \return The scale snapping values.
-    public: math::Vector3d Scale() const
-    {
-      return this->scale;
-    }
-
-    /// \brief The QEvent representing a snap event occurrence.
-    static const QEvent::Type kType = QEvent::Type(QEvent::User);
-
-    /// \brief XYZ snapping values in meters, these values must be positive.
-    private: math::Vector3d xyz;
-
-    /// \brief RPY snapping values in degrees, these values must be positive.
-    private: math::Vector3d rpy;
-
-    /// \brief Scale snapping values - a multiplier of the current size,
-    /// these values must be positive.
-    private: math::Vector3d scale;
-  };
-
   /// \brief Event that notifies when new entities have been selected.
   class EntitiesSelected : public QEvent
   {
@@ -148,68 +98,6 @@ namespace events
     /// \brief Whether the event was generated by the user,
     private: bool fromUser{false};
   };
-
-  /// \brief Event called in the render thread of a 3D scene.
-  /// It's safe to make rendering calls in this event's callback.
-  class IGN_DEPRECATED(5) Render : public QEvent
-  {
-    public: Render()
-        : QEvent(kType)
-    {
-    }
-    /// \brief Unique type for this event.
-    static const QEvent::Type kType = QEvent::Type(QEvent::User + 3);
-  };
-
-  /// \brief Event called to spawn a preview model.
-  /// Used by plugins that spawn models.
-  class IGN_DEPRECATED(5) SpawnPreviewModel : public QEvent
-  {
-    /// \brief Constructor
-    /// \param[in] _modelSdfString The model's SDF file as a string.
-    public: explicit SpawnPreviewModel(const std::string &_modelSdfString)
-        : QEvent(kType), modelSdfString(_modelSdfString)
-    {
-    }
-
-    /// \brief Unique type for this event.
-    static const QEvent::Type kType = QEvent::Type(QEvent::User + 4);
-
-    /// \brief Get the sdf string of the model.
-    /// \return The model sdf string
-    public: std::string ModelSdfString() const
-    {
-      return this->modelSdfString;
-    }
-
-    /// \brief The sdf string of the model to be previewed.
-    std::string modelSdfString;
-  };
-
-  /// \brief Event called to spawn a preview resource, which takes the path
-  /// to the SDF file. Used by plugins that spawn resources.
-  class IGN_DEPRECATED(5) SpawnPreviewPath : public QEvent
-  {
-    /// \brief Constructor
-    /// \param[in] _filePath The path to an SDF file.
-    public: explicit SpawnPreviewPath(const std::string &_filePath)
-        : QEvent(kType), filePath(_filePath)
-    {
-    }
-
-    /// \brief Unique type for this event.
-    static const QEvent::Type kType = QEvent::Type(QEvent::User + 5);
-
-    /// \brief Get the path of the SDF file.
-    /// \return The file path.
-    public: std::string FilePath() const
-    {
-      return this->filePath;
-    }
-
-    /// \brief The path of SDF file to be previewed.
-    std::string filePath;
-  };
 }  // namespace events
 }
 }  // namespace gui

include/ignition/gazebo/rendering/RenderUtil.hh

@@ -151,10 +151,6 @@ inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE {
     /// \param[in] _node Node representing the selected entity
     public: void SetSelectedEntity(const rendering::NodePtr &_node);
 
-    /// \brief Get the entity being selected. This will only return the
-    /// last entity selected.
-    public: rendering::NodePtr IGN_DEPRECATED(4) SelectedEntity() const;
-
     /// \brief Get the entities currently selected, in order of selection.
     /// \return Vector of currently selected entities
     public: const std::vector<Entity> &SelectedEntities() const;

include/ignition/gazebo/rendering/SceneManager.hh

@@ -216,17 +216,6 @@ inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE {
     /// \return Pointer to requested entity's skeleton
     public: common::SkeletonPtr ActorSkeletonById(Entity _id) const;
 
-    /// \brief Get the animation of actor mesh given an id
-    /// Use this function if you are animating the actor manually by its
-    /// skeleton node pose.
-    /// \param[in] _id Entity's unique id
-    /// \param[in] _time Simulation time
-    /// \return Map from the skeleton node name to transforms
-    /// \deprecated see ActorSkeletonTransformAt
-    public: std::map<std::string, math::Matrix4d> IGN_DEPRECATED(4.0)
-        ActorMeshAnimationAt(
-        Entity _id, std::chrono::steady_clock::duration _time) const;
-
     /// \brief Get the skeleton local transforms of actor mesh given an id.
     /// Use this function if you are animating the actor manually by its
     /// skeleton node pose.
@@ -250,14 +239,6 @@ inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE {
     /// \param[in] _id Entity's unique id
     public: void RemoveEntity(Entity _id);
 
-    /// \brief Get the entity for a given node.
-    /// \param[in] _node Node to get the entity for.
-    /// \return The entity for that node, or `kNullEntity` for no entity.
-    /// \todo(anyone) Deprecate in favour of
-    /// `ignition::rendering::Node::UserData` once that's available.
-    public: Entity IGN_DEPRECATED(4)
-        EntityFromNode(const rendering::NodePtr &_node) const;
-
     /// \brief Load a geometry
     /// \param[in] _geom Geometry sdf dom
     /// \param[out] _scale Geometry scale that will be set based on sdf

src/ServerConfig.cc

@@ -224,7 +224,6 @@ class ignition::gazebo::ServerConfigPrivate
             useLevels(_cfg->useLevels),
             useLogRecord(_cfg->useLogRecord),
             logRecordPath(_cfg->logRecordPath),
-            logIgnoreSdfPath(_cfg->logIgnoreSdfPath),
             logPlaybackPath(_cfg->logPlaybackPath),
             logRecordResources(_cfg->logRecordResources),
             logRecordCompressPath(_cfg->logRecordCompressPath),
@@ -256,10 +255,6 @@ class ignition::gazebo::ServerConfigPrivate
   /// \brief Path to place recorded states
   public: std::string logRecordPath = "";
 
-  /// TODO(anyone) Deprecate in public APIs in Ignition-D, remove in Ignition-E
-  /// \brief Whether log record path is specified from command line
-  public: bool logIgnoreSdfPath{false};
-
   /// \brief Path to recorded states to play back using logging system
   public: std::string logPlaybackPath = "";
 
@@ -441,18 +436,6 @@ void ServerConfig::SetLogRecordPath(const std::string &_recordPath)
   this->dataPtr->logRecordPath = _recordPath;
 }
 
-/////////////////////////////////////////////////
-bool ServerConfig::LogIgnoreSdfPath() const
-{
-  return this->dataPtr->logIgnoreSdfPath;
-}
-
-/////////////////////////////////////////////////
-void ServerConfig::SetLogIgnoreSdfPath(bool _ignore)
-{
-  this->dataPtr->logIgnoreSdfPath = _ignore;
-}
-
 /////////////////////////////////////////////////
 const std::string ServerConfig::LogPlaybackPath() const
 {

src/cmd/cmdgazebo.rb.in

@@ -158,13 +158,7 @@ COMMANDS = { 'gazebo' =>
   " locate system plugins.                                               \n\n"\
   "  IGN_GAZEBO_SERVER_CONFIG_PATH    Path to server configuration file. \n\n"\
   "  IGN_GUI_PLUGIN_PATH    Colon separated paths used to locate GUI       \n"\
-  " plugins.                                                             \n\n"\
-  "  IGN_GAZEBO_NETWORK_ROLE     Participant role used in a distributed    \n"\
-  " simulation environment. Role is one of [PRIMARY, SECONDARY]. This is   \n"\
-  " deprecated in ign-gazebo2. Please use --network-role instead.        \n\n"\
-  "  IGN_GAZEBO_NETWORK_SECONDARIES    Number of secondary participants    \n"\
-  " expected to join a distributed simulation environment. (Primary only)  \n"\
-  " This is deprecated in ign-gazebo2. Please use --network-role instead.  \n"
+  " plugins.                                                               \n"\
 }
 
 #

src/cmd/ign.cc

@@ -25,9 +25,9 @@
 #include <ignition/gui/Plugin.hh>
 
 #include "ignition/gazebo/config.hh"
-#include "ignition/gazebo/gui/GuiRunner.hh"
 #include "ignition/gazebo/Server.hh"
 #include "ignition/gazebo/ServerConfig.hh"
+#include "gui/GuiRunner.hh"
 #include "ign.hh"
 
 //////////////////////////////////////////////////

src/gui/CMakeLists.txt

@@ -4,7 +4,6 @@ set (gui_sources
   GuiFileHandler.cc
   GuiRunner.cc
   PathManager.cc
-  TmpIface.cc
 )
 
 set (gtest_sources
@@ -25,10 +24,6 @@ set(CMAKE_AUTORCC ON)
 # no need to add entries for Qt header files in `src/gui/`.
 qt5_wrap_cpp(gui_sources
   ${PROJECT_SOURCE_DIR}/include/ignition/gazebo/gui/GuiSystem.hh
-  # TODO (anyone) Remove when GuiRunner.hh is moved to `src`
-  ${PROJECT_SOURCE_DIR}/include/ignition/gazebo/gui/GuiRunner.hh
-  # TODO (anyone) Remove in v6
-  ${PROJECT_SOURCE_DIR}/include/ignition/gazebo/gui/TmpIface.hh
 )
 
 if (MSVC)