From 4c32fa867053e456fa66c11a3b6fa3a3a8d47569 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 12 Mar 2024 23:01:51 +0000 Subject: [PATCH 1/2] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/pre-commit/mirrors-clang-format: v17.0.6 → v18.1.1](https://github.com/pre-commit/mirrors-clang-format/compare/v17.0.6...v18.1.1) --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d400934..6d04071 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -4,7 +4,7 @@ repos: - id: check-useless-excludes - id: check-hooks-apply - repo: https://github.com/pre-commit/mirrors-clang-format - rev: v17.0.6 + rev: v18.1.1 hooks: - id: clang-format 'types_or': [c++, c] From 2bdade0e0ceccc915c34aafa19d5793b758d2663 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 12 Mar 2024 23:02:58 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- mc_rtc_rviz_panel/src/FormElement.cpp | 3 +-- .../src/TransformInteractiveMarkerWidget.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/mc_rtc_rviz_panel/src/FormElement.cpp b/mc_rtc_rviz_panel/src/FormElement.cpp index 4065657..6af7e9e 100644 --- a/mc_rtc_rviz_panel/src/FormElement.cpp +++ b/mc_rtc_rviz_panel/src/FormElement.cpp @@ -557,8 +557,7 @@ void DataComboInput::update_values() auto dataIn = data_; for(const auto & k : resolved_ref_) { dataIn = dataIn(k, mc_rtc::Configuration{}); } auto values = dataIn.size() ? dataIn : std::vector{}; - std::sort(values.begin(), values.end(), - [](const std::string & lhs, const std::string & rhs) + std::sort(values.begin(), values.end(), [](const std::string & lhs, const std::string & rhs) { return QString::compare(lhs.c_str(), rhs.c_str(), Qt::CaseInsensitive) < 0; }); if(values_ != values) { diff --git a/mc_rtc_rviz_panel/src/TransformInteractiveMarkerWidget.cpp b/mc_rtc_rviz_panel/src/TransformInteractiveMarkerWidget.cpp index 3f8450b..b8fd890 100644 --- a/mc_rtc_rviz_panel/src/TransformInteractiveMarkerWidget.cpp +++ b/mc_rtc_rviz_panel/src/TransformInteractiveMarkerWidget.cpp @@ -10,11 +10,11 @@ TransformInteractiveMarkerWidget::TransformInteractiveMarkerWidget(const ClientW bool control_position, ClientWidget * label) : InteractiveMarkerWidget( - params, - requestId, - server, - make6DMarker(id2name(params.id), makeAxisMarker(0.15 * 0.9), control_position, control_orientation), - label), + params, + requestId, + server, + make6DMarker(id2name(params.id), makeAxisMarker(0.15 * 0.9), control_position, control_orientation), + label), control_orientation_(control_orientation), control_position_(control_position) { }