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] 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) { }