From ba3be3547105f63b3afbc37f8b50f0fafcf71c8e Mon Sep 17 00:00:00 2001
From: Fabian Reister <fabian.reister@kit.edu>
Date: Thu, 28 Mar 2024 12:42:42 +0100
Subject: [PATCH] adapting namespaces
---
.../armem_robot_state/client/common/ReaderInterface.h | 6 +++---
.../armem_robot_state/client/common/RobotReader.cpp | 2 +-
.../armem_robot_state/client/common/RobotReader.h | 11 +++--------
.../armem_robot_state/client/common/RobotWriter.cpp | 2 +-
.../armem_robot_state/client/common/RobotWriter.h | 10 ++--------
.../client/common/VirtualRobotReader.cpp | 2 +-
.../client/common/VirtualRobotReader.h | 9 ++-------
.../armem_robot_state/client/common/WriterInterface.h | 4 ++--
8 files changed, 15 insertions(+), 31 deletions(-)
diff --git a/source/RobotAPI/libraries/armem_robot_state/client/common/ReaderInterface.h b/source/RobotAPI/libraries/armem_robot_state/client/common/ReaderInterface.h
index d8d8ae383..4ea5bfed9 100644
--- a/source/RobotAPI/libraries/armem_robot_state/client/common/ReaderInterface.h
+++ b/source/RobotAPI/libraries/armem_robot_state/client/common/ReaderInterface.h
@@ -1,11 +1,11 @@
#pragma once
-#include <RobotAPI/libraries/armem/core/forward_declarations.h>
#include <RobotAPI/libraries/armem/core/Time.h>
+#include <RobotAPI/libraries/armem/core/forward_declarations.h>
#include <RobotAPI/libraries/armem_robot_state/types.h>
-namespace armarx::armem::robot_state::client::common
+namespace armarx::armem::robot_state
{
class ReaderInterface
{
@@ -21,4 +21,4 @@ namespace armarx::armem::robot_state::client::common
};
-} // namespace armarx::armem::robot_state::client::common
+} // namespace armarx::armem::robot_state
diff --git a/source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.cpp b/source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.cpp
index c7dc200af..1b4b0dd2e 100644
--- a/source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.cpp
+++ b/source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.cpp
@@ -28,7 +28,7 @@
namespace fs = ::std::filesystem;
-namespace armarx::armem::robot_state::client::common
+namespace armarx::armem::robot_state
{
RobotReader::RobotReader(const RobotReader& r) :
properties(r.properties),
diff --git a/source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.h b/source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.h
index 30032e0c9..5b4700a00 100644
--- a/source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.h
+++ b/source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.h
@@ -32,7 +32,7 @@
#include <RobotAPI/libraries/armem_robot_state/client/localization/TransformReader.h>
#include <RobotAPI/libraries/armem_robot_state/types.h>
-namespace armarx::armem::robot_state::client::common
+namespace armarx::armem::robot_state
{
/**
* @brief The RobotReader class.
@@ -163,12 +163,7 @@ namespace armarx::armem::robot_state::client::common
armem::client::Reader memoryReader;
mutable std::mutex memoryReaderMutex;
- localization::TransformReader transformReader;
+ client::localization::TransformReader transformReader;
};
-} // namespace armarx::armem::robot_state::client::common
-
-namespace armarx::armem::robot_state
-{
- using client::common::RobotReader;
-}
+} // namespace armarx::armem::robot_state
diff --git a/source/RobotAPI/libraries/armem_robot_state/client/common/RobotWriter.cpp b/source/RobotAPI/libraries/armem_robot_state/client/common/RobotWriter.cpp
index 5d6f6a0f8..89caaa782 100644
--- a/source/RobotAPI/libraries/armem_robot_state/client/common/RobotWriter.cpp
+++ b/source/RobotAPI/libraries/armem_robot_state/client/common/RobotWriter.cpp
@@ -31,7 +31,7 @@
namespace fs = ::std::filesystem;
-namespace armarx::armem::robot_state::client::common
+namespace armarx::armem::robot_state
{
RobotWriter::RobotWriter(const RobotWriter& r) :
properties(r.properties), propertyPrefix(r.propertyPrefix), memoryWriter(r.memoryWriter)
diff --git a/source/RobotAPI/libraries/armem_robot_state/client/common/RobotWriter.h b/source/RobotAPI/libraries/armem_robot_state/client/common/RobotWriter.h
index 511845de0..1095363fd 100644
--- a/source/RobotAPI/libraries/armem_robot_state/client/common/RobotWriter.h
+++ b/source/RobotAPI/libraries/armem_robot_state/client/common/RobotWriter.h
@@ -32,7 +32,7 @@
#include <RobotAPI/libraries/armem_robot_state/client/localization/TransformReader.h>
#include <RobotAPI/libraries/armem_robot_state/types.h>
-namespace armarx::armem::robot_state::client::common
+namespace armarx::armem::robot_state
{
/**
* @brief The RobotReader class.
@@ -83,10 +83,4 @@ namespace armarx::armem::robot_state::client::common
armem::client::Writer memoryWriter;
};
-} // namespace armarx::armem::robot_state::client::common
-
-
-namespace armarx::armem::robot_state
-{
- using client::common::RobotWriter;
-}
+} // namespace armarx::armem::robot_state
diff --git a/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.cpp b/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.cpp
index b57642a1e..529aeba90 100644
--- a/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.cpp
+++ b/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.cpp
@@ -13,7 +13,7 @@
#include <ArmarXCore/core/system/cmake/CMakePackageFinder.h>
#include <ArmarXCore/core/time/Clock.h>
-namespace armarx::armem::robot_state::client::common
+namespace armarx::armem::robot_state
{
bool
diff --git a/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.h b/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.h
index f4f7f2f44..0c0eb05aa 100644
--- a/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.h
+++ b/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.h
@@ -27,7 +27,7 @@
#include "RobotReader.h"
-namespace armarx::armem::robot_state::client::common
+namespace armarx::armem::robot_state
{
/**
* @brief The VirtualRobotReader class.
@@ -78,9 +78,4 @@ namespace armarx::armem::robot_state::client::common
bool blocking = true);
};
-} // namespace armarx::armem::robot_state::client::common
-
-namespace armarx::armem::robot_state
-{
- using client::common::VirtualRobotReader;
-}
+} // namespace armarx::armem::robot_state
diff --git a/source/RobotAPI/libraries/armem_robot_state/client/common/WriterInterface.h b/source/RobotAPI/libraries/armem_robot_state/client/common/WriterInterface.h
index d49744522..b4543e2cf 100644
--- a/source/RobotAPI/libraries/armem_robot_state/client/common/WriterInterface.h
+++ b/source/RobotAPI/libraries/armem_robot_state/client/common/WriterInterface.h
@@ -5,7 +5,7 @@
#include <RobotAPI/libraries/armem/core/Time.h>
#include <RobotAPI/libraries/armem_robot_state/types.h>
-namespace armarx::armem::robot_state::client::common
+namespace armarx::armem::robot_state
{
class WriterInterface
@@ -24,4 +24,4 @@ namespace armarx::armem::robot_state::client::common
const std::string& robotRootNodeName) = 0;
};
-} // namespace armarx::armem::robot_state::client::common
+} // namespace armarx::armem::robot_state
--
GitLab