From 879a1db872963f0e42ab1c7d81f6beb89181b6ed Mon Sep 17 00:00:00 2001
From: Christoph Pohl <christoph.pohl@kit.edu>
Date: Wed, 20 Dec 2023 17:04:11 +0000
Subject: [PATCH] Fix GCC13 compilation issues (Werror)
---
source/ArmarXGui/gui-plugins/PlotterPlugin/ArmarXPlotter.cpp | 2 +-
.../StatechartEditorPlugin/view/dialogs/StateDialog.cpp | 4 ++--
.../gui-plugins/StatechartViewerPlugin/view/StateItem.cpp | 4 +++-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/source/ArmarXGui/gui-plugins/PlotterPlugin/ArmarXPlotter.cpp b/source/ArmarXGui/gui-plugins/PlotterPlugin/ArmarXPlotter.cpp
index e4604405..385991be 100644
--- a/source/ArmarXGui/gui-plugins/PlotterPlugin/ArmarXPlotter.cpp
+++ b/source/ArmarXGui/gui-plugins/PlotterPlugin/ArmarXPlotter.cpp
@@ -274,7 +274,7 @@ namespace armarx
logstream << (IceUtil::Time::microSeconds(timestamp) - logStartTime).toMilliSecondsDouble();
- for (const std::string f : csvHeader)
+ for (const auto& f : csvHeader)
{
logstream << ",";
if (dataMaptoAppend.count(f))
diff --git a/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/view/dialogs/StateDialog.cpp b/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/view/dialogs/StateDialog.cpp
index 6e04f763..2cbca5d7 100644
--- a/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/view/dialogs/StateDialog.cpp
+++ b/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/view/dialogs/StateDialog.cpp
@@ -409,14 +409,14 @@ namespace armarx
p = p->getParent();
}
- for (const std::pair<QString, statechartmodel::StateParameterPtr>& oldParamEntry : source.toStdMap())
+ for (const auto& oldParamEntry : source.toStdMap())
{
QString key = oldParamEntry.first;
// copy default values for other profiles if the parameter still exists && the type is unchanged:
if (newValues.contains(key) && newValues[key]->type == oldParamEntry.second->type)
{
- for (const std::pair<QString, QPair<VariantContainerBasePtr, QString>>& pdvEntry : oldParamEntry.second->profileDefaultValues.toStdMap())
+ for (const auto& pdvEntry : oldParamEntry.second->profileDefaultValues.toStdMap())
{
if (!profiles.contains(pdvEntry.first))
{
diff --git a/source/ArmarXGui/gui-plugins/StatechartViewerPlugin/view/StateItem.cpp b/source/ArmarXGui/gui-plugins/StatechartViewerPlugin/view/StateItem.cpp
index 78a7824b..d6f3f5ff 100644
--- a/source/ArmarXGui/gui-plugins/StatechartViewerPlugin/view/StateItem.cpp
+++ b/source/ArmarXGui/gui-plugins/StatechartViewerPlugin/view/StateItem.cpp
@@ -114,7 +114,9 @@ namespace armarx
bool showStateClassName = stateClass && (instanceName != stateClass->getStateName() /*|| !showSubstates*/);
- const int renderFlags = Qt::TextSingleLine | Qt::AlignTop | Qt::AlignHCenter;
+ const int renderFlags = static_cast<uint8_t>(Qt::TextSingleLine) |
+ static_cast<uint8_t>(Qt::AlignTop) |
+ static_cast<uint8_t>(Qt::AlignHCenter);
QRectF textRect = bounds;
--
GitLab