From a0bbee4834dc39dcc7bdd3d9b4610cfececf98dc Mon Sep 17 00:00:00 2001
From: Mirko Waechter <mirko.waechter@kit.edu>
Date: Sat, 15 Apr 2017 15:37:42 +0200
Subject: [PATCH] fixed function shadowing in condition viewer
---
.../gui-plugins/ConditionViewerPlugin/TermNode.cpp | 2 +-
.../gui-plugins/ConditionViewerPlugin/TermNode.h | 2 +-
.../widgets/ConditionViewerWidget.cpp | 8 ++++----
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/source/ArmarXGui/gui-plugins/ConditionViewerPlugin/TermNode.cpp b/source/ArmarXGui/gui-plugins/ConditionViewerPlugin/TermNode.cpp
index 7ef0ffed..e7feb698 100644
--- a/source/ArmarXGui/gui-plugins/ConditionViewerPlugin/TermNode.cpp
+++ b/source/ArmarXGui/gui-plugins/ConditionViewerPlugin/TermNode.cpp
@@ -241,7 +241,7 @@ namespace armarx
checksTable->resizeColumnsToContents();
}
- void TermNode::timerEvent()
+ void TermNode::timerEventRun()
{
bool truthy = false;
{
diff --git a/source/ArmarXGui/gui-plugins/ConditionViewerPlugin/TermNode.h b/source/ArmarXGui/gui-plugins/ConditionViewerPlugin/TermNode.h
index 9640d62b..d7c1b1e8 100644
--- a/source/ArmarXGui/gui-plugins/ConditionViewerPlugin/TermNode.h
+++ b/source/ArmarXGui/gui-plugins/ConditionViewerPlugin/TermNode.h
@@ -111,7 +111,7 @@ namespace armarx
ConditionHandlerInterfacePrx handler;
// QObject interface
protected:
- void timerEvent();
+ void timerEventRun();
friend class ConditionViewerWidget;
};
diff --git a/source/ArmarXGui/gui-plugins/ConditionViewerPlugin/widgets/ConditionViewerWidget.cpp b/source/ArmarXGui/gui-plugins/ConditionViewerPlugin/widgets/ConditionViewerWidget.cpp
index 86137979..de1a3ceb 100644
--- a/source/ArmarXGui/gui-plugins/ConditionViewerPlugin/widgets/ConditionViewerWidget.cpp
+++ b/source/ArmarXGui/gui-plugins/ConditionViewerPlugin/widgets/ConditionViewerWidget.cpp
@@ -15,9 +15,9 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
- * @package
- * @author
- * @date
+ * @package
+ * @author
+ * @date
* @copyright http://www.gnu.org/licenses/gpl-2.0.txt
* GNU General Public License
*/
@@ -237,7 +237,7 @@ void ConditionViewerWidget::updateLiterals()
if (termNode && term)
{
emit termNode->newLiteralValue(term->getValue());
- termNode->timerEvent();
+ termNode->timerEventRun();
}
}
}
--
GitLab