Skip to content

Commit 3fe4436

Browse files
committed
clang-tidy: modernize-use-override
1 parent 3616634 commit 3fe4436

File tree

16 files changed

+26
-25
lines changed

16 files changed

+26
-25
lines changed

.clang-tidy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
Checks: '-*,
3+
modernize-use-override,
34
modernize-use-using,
45
'
56
HeaderFilterRegex: '.*/moveit/task_constructor/.*\.h'

capabilities/src/execute_task_solution_capability.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class ExecuteTaskSolutionCapability : public MoveGroupCapability
5555
public:
5656
ExecuteTaskSolutionCapability();
5757

58-
virtual void initialize();
58+
void initialize() override;
5959

6060
private:
6161
bool constructMotionPlan(const moveit_task_constructor_msgs::Solution& solution,

core/include/moveit/task_constructor/stage.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ class InitStageException : public std::exception
131131
/// check of existing errors
132132
operator bool() const { return !errors_.empty(); }
133133

134-
virtual const char* what() const noexcept override;
134+
const char* what() const noexcept override;
135135

136136
private:
137137
std::list<std::pair<const Stage*, const std::string>> errors_;

core/test/test_cost_queue.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ class CostOrderedTest : public ::testing::Test
145145

146146
cost_ordered<ValueType, CostType> queue;
147147

148-
void SetUp() {}
149-
void TearDown() {}
148+
void SetUp() override {}
149+
void TearDown() override {}
150150
};
151151
using CostOrderedTestInt = CostOrderedTest<int, int>;
152152

core/test/test_properties.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ TEST(Property, serialize) {
110110
class InitFromTest : public ::testing::Test
111111
{
112112
protected:
113-
void SetUp() {
113+
void SetUp() override {
114114
master.declare<double>("double1", 1);
115115
master.declare<double>("double2", 2);
116116
master.declare<double>("double4", 4);

visualization/motion_planning_tasks/src/pluginlib_factory.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,12 @@ class PluginlibFactory : public rviz::Factory
7575
: mime_type_(QString("application/%1/%2").arg(package, base_class_type)) {
7676
class_loader_ = new pluginlib::ClassLoader<Type>(package.toStdString(), base_class_type.toStdString());
7777
}
78-
virtual ~PluginlibFactory() { delete class_loader_; }
78+
~PluginlibFactory() override { delete class_loader_; }
7979

8080
/// retrieve mime type used for given factory
8181
QString mimeType() const { return mime_type_; }
8282

83-
virtual QStringList getDeclaredClassIds() {
83+
QStringList getDeclaredClassIds() override {
8484
QStringList ids;
8585
for (const auto& record : built_ins_)
8686
ids.push_back(record.class_id_);
@@ -93,23 +93,23 @@ class PluginlibFactory : public rviz::Factory
9393
return ids;
9494
}
9595

96-
virtual QString getClassDescription(const QString& class_id) const {
96+
QString getClassDescription(const QString& class_id) const override {
9797
auto it = built_ins_.find(class_id);
9898
if (it != built_ins_.end()) {
9999
return it->description_;
100100
}
101101
return QString::fromStdString(class_loader_->getClassDescription(class_id.toStdString()));
102102
}
103103

104-
virtual QString getClassName(const QString& class_id) const {
104+
QString getClassName(const QString& class_id) const override {
105105
auto it = built_ins_.find(class_id);
106106
if (it != built_ins_.end()) {
107107
return it->name_;
108108
}
109109
return QString::fromStdString(class_loader_->getName(class_id.toStdString()));
110110
}
111111

112-
virtual QString getClassPackage(const QString& class_id) const {
112+
QString getClassPackage(const QString& class_id) const override {
113113
auto it = built_ins_.find(class_id);
114114
if (it != built_ins_.end()) {
115115
return it->package_;
@@ -125,7 +125,7 @@ class PluginlibFactory : public rviz::Factory
125125
return QString::fromStdString(class_loader_->getPluginManifestPath(class_id.toStdString()));
126126
}
127127

128-
virtual QIcon getIcon(const QString& class_id) const {
128+
QIcon getIcon(const QString& class_id) const override {
129129
QString package = getClassPackage(class_id);
130130
QString class_name = getClassName(class_id);
131131
QIcon icon = rviz::loadPixmap("package://" + package + "/icons/classes/" + class_name + ".svg");

visualization/motion_planning_tasks/src/remote_task_model.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class RemoteTaskModel : public BaseTaskModel
7272
public:
7373
RemoteTaskModel(const planning_scene::PlanningSceneConstPtr& scene, rviz::DisplayContext* display_context,
7474
QObject* parent = nullptr);
75-
~RemoteTaskModel();
75+
~RemoteTaskModel() override;
7676

7777
void setSolutionClient(ros::ServiceClient* client);
7878

visualization/motion_planning_tasks/src/task_list_model.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ class TaskListModel : public utils::FlatMergeProxyModel
143143

144144
public:
145145
TaskListModel(QObject* parent = nullptr);
146-
~TaskListModel();
146+
~TaskListModel() override;
147147

148148
void setScene(const planning_scene::PlanningSceneConstPtr& scene);
149149
void setDisplayContext(rviz::DisplayContext* display_context);

visualization/motion_planning_tasks/src/task_panel.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ class TaskPanel : public rviz::Panel
8080

8181
public:
8282
TaskPanel(QWidget* parent = 0);
83-
~TaskPanel();
83+
~TaskPanel() override;
8484

8585
/// add a new sub panel widget
8686
void addSubPanel(SubPanel* w, const QString& title, const QIcon& icon);
@@ -127,7 +127,7 @@ class TaskView : public SubPanel
127127

128128
public:
129129
TaskView(TaskPanel* parent, rviz::Property* root);
130-
~TaskView();
130+
~TaskView() override;
131131

132132
void save(rviz::Config config) override;
133133
void load(const rviz::Config& config) override;
@@ -152,7 +152,7 @@ class GlobalSettingsWidget : public SubPanel
152152

153153
public:
154154
GlobalSettingsWidget(TaskPanel* parent, rviz::Property* root);
155-
~GlobalSettingsWidget();
155+
~GlobalSettingsWidget() override;
156156

157157
void save(rviz::Config config) override;
158158
void load(const rviz::Config& config) override;

visualization/motion_planning_tasks/test/test_merge_models.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ class FlatMergeModelRemove : public ::testing::Test
195195
{
196196
protected:
197197
FlatMergeProxyModel flat;
198-
void SetUp() {
198+
void SetUp() override {
199199
flat.insertModel(createStandardModel(&flat, 1, 3, 2));
200200
flat.insertModel(createStandardModel(&flat, 2, 3, 2));
201201
flat.insertModel(createStandardModel(&flat, 3, 3, 2));

0 commit comments

Comments
 (0)