IOS: Moves the helper function were it is used.

scummvm · Jan 6, 2016 · 16605a3 · 16605a3
1 parent a56c587
commit 16605a3
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 18 deletions.
diff --git a/backends/fs/chroot/chroot-fs.cpp b/backends/fs/chroot/chroot-fs.cpp
@@ -39,7 +39,7 @@ ChRootFilesystemNode::ChRootFilesystemNode(const Common::String &root, POSIXFile
 
 ChRootFilesystemNode::ChRootFilesystemNode(const Common::String &root, const Common::String &path) {
 	_root = Common::normalizePath(root, '/');
-	_realNode = new POSIXFilesystemNode(root.stringByAppendingPathComponent(path));
+	_realNode = new POSIXFilesystemNode(addPathComponent(root, path));
 }
 
 ChRootFilesystemNode::~ChRootFilesystemNode() {
@@ -108,4 +108,17 @@ Common::WriteStream *ChRootFilesystemNode::createWriteStream() {
 	return _realNode->createWriteStream();
 }
 
+Common::String ChRootFilesystemNode::addPathComponent(const Common::String &path, const Common::String &component) {
+	const char sep = '/';
+	if (path.lastChar() == sep && component.firstChar() == sep) {
+		return Common::String::format("%s%s", path.c_str(), component.c_str() + 1);
+	}
+
+	if (path.lastChar() == sep || component.firstChar() == sep) {
+		return Common::String::format("%s%s", path.c_str(), component.c_str());
+	}
+
+	return Common::String::format("%s%c%s", path.c_str(), sep, component.c_str());
+}
+
 #endif
diff --git a/backends/fs/chroot/chroot-fs.h b/backends/fs/chroot/chroot-fs.h
@@ -49,6 +49,9 @@ class ChRootFilesystemNode : public AbstractFSNode {
 
 	virtual Common::SeekableReadStream *createReadStream();
 	virtual Common::WriteStream *createWriteStream();
+
+private:
+	static Common::String addPathComponent(const Common::String &path, const Common::String &component);
 };
 
 #endif /* CHROOT_FS_H */
diff --git a/common/str.cpp b/common/str.cpp
@@ -665,18 +665,6 @@ String lastPathComponent(const String &path, const char sep) {
 	return String(first, last);
 }
 
-String String::stringByAppendingPathComponent(String component, char sep) const {
-	if (lastChar() == sep && component.firstChar() == sep) {
-		return String::format("%s%s", c_str(), component.c_str() + 1);
-	}
-
-	if (lastChar() == sep || component.firstChar() == sep) {
-		return String::format("%s%s", c_str(), component.c_str());
-	}
-
-	return String::format("%s%c%s", c_str(), sep, component.c_str());
-}
-
 String normalizePath(const String &path, const char sep) {
 	if (path.empty())
 		return path;

diff --git a/common/str.h b/common/str.h
@@ -218,11 +218,6 @@ class String {
 	 */
 	void trim();
 
-    /**
-     * Add a path component
-     */
-    String stringByAppendingPathComponent(String component, char sep = '/') const;
-
 	uint hash() const;
 
 	/**