Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update urdf model.h deprecation #1266

Merged
merged 1 commit into from
Aug 28, 2024
Merged

Update urdf model.h deprecation #1266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rviz_default_plugins/include/rviz_default_plugins/displays/effort/effort_display.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
#ifndef RVIZ_DEFAULT_PLUGINS__DISPLAYS__EFFORT__EFFORT_DISPLAY_HPP_
#define RVIZ_DEFAULT_PLUGINS__DISPLAYS__EFFORT__EFFORT_DISPLAY_HPP_

#include <urdf/model.h>

#include <deque>
#include <map>
Expand All @@ -48,6 +47,7 @@
#include <rviz_rendering/objects/effort_visual.hpp>
#include <sensor_msgs/msg/joint_state.hpp>
#include <std_msgs/msg/string.hpp>
#include <urdf/model.hpp>

#include "rviz_default_plugins/visibility_control.hpp"

Expand Down
2 changes: 1 addition & 1 deletion rviz_default_plugins/include/rviz_default_plugins/robot/robot.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
#include <OgreQuaternion.h>
#include <OgreAny.h>

#include "urdf/model.h" // can be replaced later by urdf_model/types.h
#include "urdf/model.hpp" // can be replaced later by urdf_model/types.h

#include "rviz_default_plugins/robot/link_updater.hpp"
#include "rviz_default_plugins/visibility_control.hpp"
Expand Down
2 changes: 1 addition & 1 deletion rviz_default_plugins/include/rviz_default_plugins/robot/robot_element_base_class.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@

#include <QObject> // NOLINT cpplint cannot handle include order here

#include "urdf/model.h" // can be replaced later by urdf_model/types.h
#include "urdf_model/pose.h"

#include "rviz_rendering/objects/object.hpp"
#include "rviz_common/interaction/forwards.hpp"

#include "rviz_default_plugins/visibility_control.hpp"
#include "urdf/model.hpp" // can be replaced later by urdf_model/types.h

namespace Ogre
{
Expand Down
3 changes: 2 additions & 1 deletion rviz_default_plugins/include/rviz_default_plugins/robot/robot_joint.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@

#include <QObject>

#include "urdf/model.h"
#include "urdf_model/pose.h"

#include "rviz_rendering/objects/object.hpp"
Expand All @@ -57,6 +56,8 @@
#include "rviz_default_plugins/robot/robot_link.hpp"
#include "rviz_default_plugins/visibility_control.hpp"

#include "urdf/model.hpp"

namespace Ogre
{
class Quaternion;
Expand Down
3 changes: 2 additions & 1 deletion rviz_default_plugins/include/rviz_default_plugins/robot/robot_link.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,10 @@

#include <QObject>

#include <urdf/model.h> // can be replaced later by urdf_model/types.h
#include <urdf_model/pose.h>

#include <urdf/model.hpp> // can be replaced later by urdf_model/types.h

#include "rviz_rendering/objects/object.hpp"
#include "rviz_common/interaction/forwards.hpp"

Expand Down
2 changes: 1 addition & 1 deletion rviz_default_plugins/src/rviz_default_plugins/displays/effort/effort_display.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@

#include <OgreSceneNode.h>
#include <OgreSceneManager.h>
#include <urdf/model.h>

#include <QString>

Expand All @@ -49,6 +48,7 @@
#include <rviz_rendering/objects/effort_visual.hpp>
#include <sensor_msgs/msg/joint_state.hpp>
#include <rclcpp/logging.hpp>
#include <urdf/model.hpp>

using namespace std::chrono_literals;

Expand Down
4 changes: 2 additions & 2 deletions rviz_default_plugins/src/rviz_default_plugins/displays/robot_model/robot_model_display.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@

#include <QFile> // NOLINT cpplint cannot handle include order here

#include "urdf/model.h"

#include "tf2_ros/transform_listener.h"

#include "rviz_common/display_context.hpp"
Expand All @@ -53,6 +51,8 @@
#include "rviz_default_plugins/robot/robot_link.hpp"
#include "rviz_default_plugins/robot/tf_link_updater.hpp"

#include "urdf/model.hpp"

namespace rviz_default_plugins
{
namespace displays
Expand Down