From 1403fc983067130077bd6b87f1a8940c1ac6536f Mon Sep 17 00:00:00 2001 From: Robert Haschke Date: Fri, 26 Jan 2018 17:46:20 +0100 Subject: [PATCH] fixed some clang warnings --- core/include/moveit/task_constructor/container.h | 2 +- .../motion_planning_tasks/src/remote_task_model.cpp | 6 +++--- visualization/motion_planning_tasks/src/remote_task_model.h | 6 +++--- visualization/motion_planning_tasks/src/task_list_model.h | 6 +++--- .../motion_planning_tasks/utils/flat_merge_proxy_model.h | 2 +- .../motion_planning_tasks/utils/tree_merge_proxy_model.h | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/core/include/moveit/task_constructor/container.h b/core/include/moveit/task_constructor/container.h index aa78fee0..9a6d92c2 100644 --- a/core/include/moveit/task_constructor/container.h +++ b/core/include/moveit/task_constructor/container.h @@ -232,7 +232,7 @@ protected: Wrapper(WrapperPrivate* impl, pointer &&child = Stage::pointer()); /// called by a (direct) child when a new solution becomes available - void onNewSolution(const SolutionBase &s) = 0; + void onNewSolution(const SolutionBase &s) override = 0; }; } } diff --git a/visualization/motion_planning_tasks/src/remote_task_model.cpp b/visualization/motion_planning_tasks/src/remote_task_model.cpp index 76fb7e49..7b90c7c6 100644 --- a/visualization/motion_planning_tasks/src/remote_task_model.cpp +++ b/visualization/motion_planning_tasks/src/remote_task_model.cpp @@ -296,12 +296,12 @@ DisplaySolutionPtr RemoteTaskModel::processSolutionMessage(const moveit_task_con for (const auto& sub : msg.sub_solution) { if (sub.id == 0) continue; if (RemoteSolutionModel *m = getSolutionModel(sub.stage_id)) - m->setData(sub.id, sub.cost, QString()); + m->setSolutionData(sub.id, sub.cost, QString()); } for (const auto& sub : msg.sub_trajectory) { if (sub.id == 0) continue; if (RemoteSolutionModel *m = getSolutionModel(sub.stage_id)) - m->setData(sub.id, sub.cost, QString::fromStdString(sub.name)); + m->setSolutionData(sub.id, sub.cost, QString::fromStdString(sub.name)); } // caching is only enabled for top-level solutions (stage_id == 1) @@ -449,7 +449,7 @@ QVariant RemoteSolutionModel::data(const QModelIndex &index, int role) const return QVariant(); } -void RemoteSolutionModel::setData(uint32_t id, float cost, const QString &name) +void RemoteSolutionModel::setSolutionData(uint32_t id, float cost, const QString &name) { auto it = detail::findById(data_, id); if (it == data_.end()) return; diff --git a/visualization/motion_planning_tasks/src/remote_task_model.h b/visualization/motion_planning_tasks/src/remote_task_model.h index b7c78ae9..3fa4530e 100644 --- a/visualization/motion_planning_tasks/src/remote_task_model.h +++ b/visualization/motion_planning_tasks/src/remote_task_model.h @@ -52,7 +52,7 @@ class RemoteSolutionModel; */ class RemoteTaskModel : public BaseTaskModel { Q_OBJECT - class Node; + struct Node; Node* const root_; planning_scene::PlanningSceneConstPtr scene_; ros::ServiceClient* get_solution_client_ = nullptr; @@ -133,9 +133,9 @@ public: int columnCount(const QModelIndex &parent = QModelIndex()) const override; QVariant headerData(int section, Qt::Orientation orientation, int role) const override; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; - void sort(int column, Qt::SortOrder order); + void sort(int column, Qt::SortOrder order) override; - void setData(uint32_t id, float cost, const QString &name); + void setSolutionData(uint32_t id, float cost, const QString &name); void processSolutionIDs(const std::vector &successful, const std::vector &failed, size_t num_failed); }; diff --git a/visualization/motion_planning_tasks/src/task_list_model.h b/visualization/motion_planning_tasks/src/task_list_model.h index aa9cca4d..b6b6f6f4 100644 --- a/visualization/motion_planning_tasks/src/task_list_model.h +++ b/visualization/motion_planning_tasks/src/task_list_model.h @@ -145,7 +145,7 @@ public: void setStageFactory(const StageFactoryPtr &factory); bool dropMimeData(const QMimeData *mime, Qt::DropAction action, int row, int column, const QModelIndex &parent) override; Qt::DropActions supportedDropActions() const override; - Qt::ItemFlags flags(const QModelIndex &index) const; + Qt::ItemFlags flags(const QModelIndex &index) const override; }; @@ -165,8 +165,8 @@ public: void setAutoHideSections(const QList §ions); - void setModel(QAbstractItemModel *model); - QSize viewportSizeHint() const; + void setModel(QAbstractItemModel *model) override; + QSize viewportSizeHint() const override; void resizeEvent(QResizeEvent *event) override; }; diff --git a/visualization/motion_planning_tasks/utils/flat_merge_proxy_model.h b/visualization/motion_planning_tasks/utils/flat_merge_proxy_model.h index 4ffb89d7..0e46069f 100644 --- a/visualization/motion_planning_tasks/utils/flat_merge_proxy_model.h +++ b/visualization/motion_planning_tasks/utils/flat_merge_proxy_model.h @@ -80,7 +80,7 @@ public: void setMimeTypes(const QStringList& mime_types); QStringList mimeTypes() const override; - bool dropMimeData(const QMimeData *mime, Qt::DropAction action, int row, int column, const QModelIndex &parent); + bool dropMimeData(const QMimeData *mime, Qt::DropAction action, int row, int column, const QModelIndex &parent) override; bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) override; diff --git a/visualization/motion_planning_tasks/utils/tree_merge_proxy_model.h b/visualization/motion_planning_tasks/utils/tree_merge_proxy_model.h index 55d97219..3238bb41 100644 --- a/visualization/motion_planning_tasks/utils/tree_merge_proxy_model.h +++ b/visualization/motion_planning_tasks/utils/tree_merge_proxy_model.h @@ -81,7 +81,7 @@ public: void setMimeTypes(const QStringList& mime_types); QStringList mimeTypes() const override; - bool dropMimeData(const QMimeData *mime, Qt::DropAction action, int row, int column, const QModelIndex &parent); + bool dropMimeData(const QMimeData *mime, Qt::DropAction action, int row, int column, const QModelIndex &parent) override; bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) override;