From ad3032c50578566c9e896125ac6fbf87f4b4b544 Mon Sep 17 00:00:00 2001
From: Nikolaus Vahrenkamp <vahrenkamp@kit.edu>
Date: Fri, 20 Feb 2015 10:08:55 +0100
Subject: [PATCH] removed(renamed armar3 related code
---
source/RobotAPI/components/robotstate/RobotStateComponent.cpp | 4 ++--
.../RobotAPI/gui_plugins/HandUnitPlugin/HandUnitGuiPlugin.cpp | 2 +-
.../gui_plugins/HapticUnitPlugin/HapticUnitGuiPlugin.cpp | 2 +-
.../KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp | 2 +-
.../gui_plugins/PlatformUnitPlugin/PlatformUnitGuiPlugin.cpp | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/source/RobotAPI/components/robotstate/RobotStateComponent.cpp b/source/RobotAPI/components/robotstate/RobotStateComponent.cpp
index aa5ecd439..a8a154d61 100644
--- a/source/RobotAPI/components/robotstate/RobotStateComponent.cpp
+++ b/source/RobotAPI/components/robotstate/RobotStateComponent.cpp
@@ -96,7 +96,7 @@ namespace armarx
}
usingTopic(robotNodeSetName + "State");
- VirtualRobot::RobotNodeSetPtr pns = this->_synchronized->getRobotNodeSet("Platform");
+ /*VirtualRobot::RobotNodeSetPtr pns = this->_synchronized->getRobotNodeSet("Platform");
if (pns)
{
usingTopic("PlatformState");
@@ -107,7 +107,7 @@ namespace armarx
{
ARMARX_VERBOSE << "Node: " << node->getName() << endl;
}
- }
+ }*/
_sharedRobotServant = new SharedRobotServant(this->_synchronized);
_sharedRobotServant->ref();
}
diff --git a/source/RobotAPI/gui_plugins/HandUnitPlugin/HandUnitGuiPlugin.cpp b/source/RobotAPI/gui_plugins/HandUnitPlugin/HandUnitGuiPlugin.cpp
index 36e0a9860..7a6601400 100644
--- a/source/RobotAPI/gui_plugins/HandUnitPlugin/HandUnitGuiPlugin.cpp
+++ b/source/RobotAPI/gui_plugins/HandUnitPlugin/HandUnitGuiPlugin.cpp
@@ -182,4 +182,4 @@ void armarx::HandUnitWidget::reportJointPressures(const armarx::NameValueMap &ac
}
-Q_EXPORT_PLUGIN2(armar3_gui_HandUnitGuiPlugin, HandUnitGuiPlugin)
+Q_EXPORT_PLUGIN2(robotapi_gui_HandUnitGuiPlugin, HandUnitGuiPlugin)
diff --git a/source/RobotAPI/gui_plugins/HapticUnitPlugin/HapticUnitGuiPlugin.cpp b/source/RobotAPI/gui_plugins/HapticUnitPlugin/HapticUnitGuiPlugin.cpp
index 017445f11..56acc084c 100644
--- a/source/RobotAPI/gui_plugins/HapticUnitPlugin/HapticUnitGuiPlugin.cpp
+++ b/source/RobotAPI/gui_plugins/HapticUnitPlugin/HapticUnitGuiPlugin.cpp
@@ -188,4 +188,4 @@ void HapticUnitWidget::updateDisplayWidgets()
}
-Q_EXPORT_PLUGIN2(armar3_gui_HapticUnitGuiPlugin, HapticUnitGuiPlugin)
+Q_EXPORT_PLUGIN2(robotapi_gui_HapticUnitGuiPlugin, HapticUnitGuiPlugin)
diff --git a/source/RobotAPI/gui_plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp b/source/RobotAPI/gui_plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp
index eeb85b8d5..1dcc2186d 100644
--- a/source/RobotAPI/gui_plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp
+++ b/source/RobotAPI/gui_plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp
@@ -1088,4 +1088,4 @@ void RangeValueDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op
QStyledItemDelegate::paint(painter, option, index);
}
-Q_EXPORT_PLUGIN2(armar3_gui_KinematicUnitGuiPlugin, KinematicUnitGuiPlugin)
+Q_EXPORT_PLUGIN2(robotapi_gui_KinematicUnitGuiPlugin, KinematicUnitGuiPlugin)
diff --git a/source/RobotAPI/gui_plugins/PlatformUnitPlugin/PlatformUnitGuiPlugin.cpp b/source/RobotAPI/gui_plugins/PlatformUnitPlugin/PlatformUnitGuiPlugin.cpp
index 5cc2e5642..151de1ef3 100644
--- a/source/RobotAPI/gui_plugins/PlatformUnitPlugin/PlatformUnitGuiPlugin.cpp
+++ b/source/RobotAPI/gui_plugins/PlatformUnitPlugin/PlatformUnitGuiPlugin.cpp
@@ -194,5 +194,5 @@ void PlatformUnitWidget::controlTimerTick()
}
-Q_EXPORT_PLUGIN2(armar3_gui_PlatformUnitGuiPlugin, PlatformUnitGuiPlugin)
+Q_EXPORT_PLUGIN2(robotapi_gui_PlatformUnitGuiPlugin, PlatformUnitGuiPlugin)
--
GitLab