From 4ffaf21c8261c1b2f2736852475fa7d546cbd6ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mirko=20W=C3=A4chter?= <mirko.waechter@kit.edu>
Date: Fri, 21 Jun 2019 20:18:15 +0200
Subject: [PATCH] compile fix #3
---
.../RemoteGuiPlugin/RemoteGuiWidgetController.cpp | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/source/ArmarXGui/gui-plugins/RemoteGuiPlugin/RemoteGuiWidgetController.cpp b/source/ArmarXGui/gui-plugins/RemoteGuiPlugin/RemoteGuiWidgetController.cpp
index dbfce055..dbb2aca0 100644
--- a/source/ArmarXGui/gui-plugins/RemoteGuiPlugin/RemoteGuiWidgetController.cpp
+++ b/source/ArmarXGui/gui-plugins/RemoteGuiPlugin/RemoteGuiWidgetController.cpp
@@ -20,6 +20,7 @@
* GNU General Public License
*/
+
#include <QSpacerItem>
#include <QLayout>
@@ -272,12 +273,12 @@ void RemoteGuiWidgetController::onGuiStateChanged()
<< '\n' << VAROUT(GetTypeString(*widget));
};
- ARMARX_CHECK_EXPRESSION_W_HINT(tabStates.count(id), varinfodump);
- ARMARX_CHECK_EXPRESSION_W_HINT(tabStates.at(id).count(name), varinfodump);
+ ARMARX_CHECK_EXPRESSION_W_HINT(tabValueMap.count(id), varinfodump);
+ ARMARX_CHECK_EXPRESSION_W_HINT(tabValueMap.at(id).count(name), varinfodump);
ARMARX_CHECK_EXPRESSION_W_HINT(guiDescriptions.count(id), varinfodump);
ARMARX_CHECK_EXPRESSION_W_HINT(guiDescriptions.at(id).count(name), varinfodump);
- RemoteGui::Value& currentValue = tabValueMap.at(id).at(name);
+ RemoteGui::ValueVariant& currentValue = tabValueMap.at(id).at(name);
RemoteGui::WidgetPtr const& desc = guiDescriptions.at(id).at(name);
auto& widgetHandler = RemoteGui::getWidgetHandler(desc);
@@ -390,7 +391,7 @@ void RemoteGuiWidgetController::updateState(std::string const& tabId)
for (auto& pair : values)
{
std::string const& name = pair.first;
- RemoteGui::Value const& value = pair.second;
+ RemoteGui::ValueVariant const& value = pair.second;
RemoteGui::WidgetPtr const& desc = widgetDesc.at(name);
QWidget* widget = widgets.at(name);
--
GitLab