From 7fd86b3f03935c71ff7a0fa05f19f8b61c4507ce Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Thu, 9 Mar 2023 08:27:35 +0100
Subject: [PATCH] Add suggestions from rainers review
---
.../libraries/armem/server/ltm/base/detail/MemoryItem.cpp | 4 ++--
.../libraries/armem/server/ltm/base/detail/MemoryItem.h | 2 +-
source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/source/RobotAPI/libraries/armem/server/ltm/base/detail/MemoryItem.cpp b/source/RobotAPI/libraries/armem/server/ltm/base/detail/MemoryItem.cpp
index dbc68923c..d5318e1f1 100644
--- a/source/RobotAPI/libraries/armem/server/ltm/base/detail/MemoryItem.cpp
+++ b/source/RobotAPI/libraries/armem/server/ltm/base/detail/MemoryItem.cpp
@@ -34,8 +34,8 @@ namespace armarx::armem::server::ltm
return _id.getLeafItem();
}
- void MemoryItem::setMemoryName(const std::string& m)
+ void MemoryItem::setMemoryName(const std::string& memoryName)
{
- _id.memoryName = m;
+ _id.memoryName = memoryName;
}
} // namespace armarx::armem::server::ltm
diff --git a/source/RobotAPI/libraries/armem/server/ltm/base/detail/MemoryItem.h b/source/RobotAPI/libraries/armem/server/ltm/base/detail/MemoryItem.h
index 586d4d0e5..b8d17fe47 100644
--- a/source/RobotAPI/libraries/armem/server/ltm/base/detail/MemoryItem.h
+++ b/source/RobotAPI/libraries/armem/server/ltm/base/detail/MemoryItem.h
@@ -21,7 +21,7 @@ namespace armarx::armem::server::ltm
std::string name() const;
virtual void setMemoryID(const MemoryID&);
- void setMemoryName(const std::string&);
+ void setMemoryName(const std::string& memoryName);
protected:
std::shared_ptr<Processors> processors;
diff --git a/source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp b/source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp
index 825375560..02a1d846f 100644
--- a/source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp
+++ b/source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp
@@ -436,11 +436,11 @@ namespace armarx::armem::gui
}
else
{
- ARMARX_INFO << "No memory with name " << name << " available for commit. Create new virtual memory.";
+ ARMARX_INFO << "No memory with name '" << name << "' available for commit. Create new virtual memory.";
// Please note: Here we assume that a memory server with the same name does not exist.
// I think this assumption is ok, since nobody should use filepaths as memory name.
- // Nontheless, we did not restrict the user to do so...
+ // Nonetheless, we did not restrict the user to do so...
std::string virtualMemoryName = name + " (at " + path.string() + ")";
wm::Memory virtualMemory(virtualMemoryName);
virtualMemory.update(commit, true, false);
--
GitLab