From f88ac2e062aa7d5480b562d06e99ff326aa951bf Mon Sep 17 00:00:00 2001
From: Fabian Reister <fabian.reister@kit.edu>
Date: Thu, 11 Nov 2021 08:56:25 +0100
Subject: [PATCH] source: renaming all occurences of 'Armar6Skills' to
'armar6_skills'
---
source/RobotAPI/components/DSObstacleAvoidance/main.cpp | 2 +-
.../DynamicObstacleManager/DynamicObstacleManager.cpp | 2 +-
.../DynamicObstacleManager/DynamicObstacleManager.h | 2 +-
.../components/DynamicObstacleManager/ManagedObstacle.cpp | 2 +-
.../components/DynamicObstacleManager/ManagedObstacle.h | 2 +-
.../test/DynamicObstacleManagerTest.cpp | 6 +++---
.../ObstacleAvoidance/DynamicObstacleManagerInterface.ice | 2 +-
source/RobotAPI/libraries/diffik/GraspTrajectory.cpp | 2 +-
8 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/source/RobotAPI/components/DSObstacleAvoidance/main.cpp b/source/RobotAPI/components/DSObstacleAvoidance/main.cpp
index 3443a1532..350f59edd 100644
--- a/source/RobotAPI/components/DSObstacleAvoidance/main.cpp
+++ b/source/RobotAPI/components/DSObstacleAvoidance/main.cpp
@@ -29,7 +29,7 @@
#include <ArmarXCore/core/Component.h>
#include <ArmarXCore/core/logging/Logging.h>
-// Armar6Skills
+// armar6_skills
#include <RobotAPI/components/DSObstacleAvoidance/DSObstacleAvoidance.h>
diff --git a/source/RobotAPI/components/DynamicObstacleManager/DynamicObstacleManager.cpp b/source/RobotAPI/components/DynamicObstacleManager/DynamicObstacleManager.cpp
index f15496da3..6ca25b01e 100644
--- a/source/RobotAPI/components/DynamicObstacleManager/DynamicObstacleManager.cpp
+++ b/source/RobotAPI/components/DynamicObstacleManager/DynamicObstacleManager.cpp
@@ -13,7 +13,7 @@
* 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 Armar6Skills::ArmarXObjects::DynamicObstacleManager
+ * @package armar6_skills::ArmarXObjects::DynamicObstacleManager
* @author Fabian PK ( fabian dot peller-konrad at kit dot edu )
* @date 2020
* @copyright http://www.gnu.org/licenses/gpl-2.0.txt
diff --git a/source/RobotAPI/components/DynamicObstacleManager/DynamicObstacleManager.h b/source/RobotAPI/components/DynamicObstacleManager/DynamicObstacleManager.h
index f0820c595..cdabab396 100644
--- a/source/RobotAPI/components/DynamicObstacleManager/DynamicObstacleManager.h
+++ b/source/RobotAPI/components/DynamicObstacleManager/DynamicObstacleManager.h
@@ -13,7 +13,7 @@
* 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 Armar6Skills::ArmarXObjects::DynamicObstacleManager
+ * @package armar6_skills::ArmarXObjects::DynamicObstacleManager
* @author Fabian PK ( fabian dot peller-konrad at kit dot edu )
* @date 2020
* @copyright http://www.gnu.org/licenses/gpl-2.0.txt
diff --git a/source/RobotAPI/components/DynamicObstacleManager/ManagedObstacle.cpp b/source/RobotAPI/components/DynamicObstacleManager/ManagedObstacle.cpp
index 3cebd4612..91af23ed5 100644
--- a/source/RobotAPI/components/DynamicObstacleManager/ManagedObstacle.cpp
+++ b/source/RobotAPI/components/DynamicObstacleManager/ManagedObstacle.cpp
@@ -13,7 +13,7 @@
* 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 Armar6Skills::ArmarXObjects::DynamicObstacleManager
+ * @package armar6_skills::ArmarXObjects::DynamicObstacleManager
* @author Fabian PK ( fabian dot peller-konrad at kit dot edu )
* @date 2020
* @copyright http://www.gnu.org/licenses/gpl-2.0.txt
diff --git a/source/RobotAPI/components/DynamicObstacleManager/ManagedObstacle.h b/source/RobotAPI/components/DynamicObstacleManager/ManagedObstacle.h
index 95b7491d2..5dd70f211 100644
--- a/source/RobotAPI/components/DynamicObstacleManager/ManagedObstacle.h
+++ b/source/RobotAPI/components/DynamicObstacleManager/ManagedObstacle.h
@@ -13,7 +13,7 @@
* 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 Armar6Skills::ArmarXObjects::DynamicObstacleManager
+ * @package armar6_skills::ArmarXObjects::DynamicObstacleManager
* @author Fabian PK ( fabian dot peller-konrad at kit dot edu )
* @date 2020
* @copyright http://www.gnu.org/licenses/gpl-2.0.txt
diff --git a/source/RobotAPI/components/DynamicObstacleManager/test/DynamicObstacleManagerTest.cpp b/source/RobotAPI/components/DynamicObstacleManager/test/DynamicObstacleManagerTest.cpp
index 52fa2345c..3184203cd 100644
--- a/source/RobotAPI/components/DynamicObstacleManager/test/DynamicObstacleManagerTest.cpp
+++ b/source/RobotAPI/components/DynamicObstacleManager/test/DynamicObstacleManagerTest.cpp
@@ -13,19 +13,19 @@
* 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 Armar6Skills::ArmarXObjects::DynamicObstacleManager
+ * @package armar6_skills::ArmarXObjects::DynamicObstacleManager
* @author Fabian PK ( fabian dot peller-konrad at kit dot edu )
* @date 2020
* @copyright http://www.gnu.org/licenses/gpl-2.0.txt
* GNU General Public License
*/
-#define BOOST_TEST_MODULE Armar6Skills::ArmarXObjects::DynamicObstacleManager
+#define BOOST_TEST_MODULE armar6_skills::ArmarXObjects::DynamicObstacleManager
#define ARMARX_BOOST_TEST
#include <RobotAPI/Test.h>
-#include <Armar6Skills/components/DynamicObstacleManager/DynamicObstacleManager.h>
+#include <armar6_skills/components/DynamicObstacleManager/DynamicObstacleManager.h>
#include <iostream>
diff --git a/source/RobotAPI/interface/components/ObstacleAvoidance/DynamicObstacleManagerInterface.ice b/source/RobotAPI/interface/components/ObstacleAvoidance/DynamicObstacleManagerInterface.ice
index 5ff2649fa..df0f5596b 100644
--- a/source/RobotAPI/interface/components/ObstacleAvoidance/DynamicObstacleManagerInterface.ice
+++ b/source/RobotAPI/interface/components/ObstacleAvoidance/DynamicObstacleManagerInterface.ice
@@ -13,7 +13,7 @@
* 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 Armar6Skills::ArmarXObjects::HumanAvoidance
+ * @package armar6_skills::ArmarXObjects::HumanAvoidance
* @author Christian R. G. Dreher <c.dreher@kit.edu>
* @author Fabian Peller
* @date 2019
diff --git a/source/RobotAPI/libraries/diffik/GraspTrajectory.cpp b/source/RobotAPI/libraries/diffik/GraspTrajectory.cpp
index 6d76464e9..3e6cdff5c 100644
--- a/source/RobotAPI/libraries/diffik/GraspTrajectory.cpp
+++ b/source/RobotAPI/libraries/diffik/GraspTrajectory.cpp
@@ -392,7 +392,7 @@ void GraspTrajectory::writeToFile(const std::string& filename)
GraspTrajectoryPtr GraspTrajectory::ReadFromFile(const grasping::GraspCandidatePtr& cnd)
{
- std::string packageName = "Armar6Skills";// cnd->executionHints->graspTrajectoryPackage;
+ std::string packageName = "armar6_skills";// cnd->executionHints->graspTrajectoryPackage;
armarx::CMakePackageFinder finder(packageName);
std::string dataDir = finder.getDataDir() + "/" + packageName;
return GraspTrajectory::ReadFromFile(dataDir + "/motions/grasps/" + cnd->executionHints->graspTrajectoryName + ".xml");
--
GitLab