summaryrefslogtreecommitdiff
path: root/src/fs
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-06-29 21:44:11 +0300
committerAndrei Karas <akaras@inbox.ru>2017-06-29 21:44:11 +0300
commit337a52a41ea44570da65586403f14248042f0169 (patch)
tree27f58dd5f9c9f50310c94c649595a9e7f8e00455 /src/fs
parent36c45ae7d8d2577a900ec266b64448d4b488013d (diff)
downloadmanaplus-337a52a41ea44570da65586403f14248042f0169.tar.gz
manaplus-337a52a41ea44570da65586403f14248042f0169.tar.bz2
manaplus-337a52a41ea44570da65586403f14248042f0169.tar.xz
manaplus-337a52a41ea44570da65586403f14248042f0169.zip
Use std::move in some places.
Diffstat (limited to 'src/fs')
-rw-r--r--src/fs/virtfs/fs.cpp11
-rw-r--r--src/fs/virtfs/fsdir.cpp3
2 files changed, 8 insertions, 6 deletions
diff --git a/src/fs/virtfs/fs.cpp b/src/fs/virtfs/fs.cpp
index d9973d79b..9fe755560 100644
--- a/src/fs/virtfs/fs.cpp
+++ b/src/fs/virtfs/fs.cpp
@@ -34,6 +34,7 @@
#include "utils/checkutils.h"
#include "utils/foreach.h"
+#include "utils/stdmove.h"
#include "utils/stringutils.h"
#include "debug.h"
@@ -153,7 +154,7 @@ namespace VirtFs
return list;
}
- std::string rootDir = dirName;
+ std::string rootDir = STD_MOVE(dirName);
if (findLast(rootDir, std::string(dirSeparator)) == false)
rootDir += dirSeparator;
StringVect &names = list->names;
@@ -178,7 +179,7 @@ namespace VirtFs
return;
}
- std::string rootDir = dirName;
+ std::string rootDir = STD_MOVE(dirName);
if (findLast(rootDir, std::string(dirSeparator)) == false)
rootDir += dirSeparator;
@@ -200,7 +201,7 @@ namespace VirtFs
return;
}
- std::string rootDir = dirName;
+ std::string rootDir = STD_MOVE(dirName);
if (findLast(rootDir, std::string(dirSeparator)) == false)
rootDir += dirSeparator;
@@ -223,7 +224,7 @@ namespace VirtFs
return;
}
- std::string rootDir = dirName;
+ std::string rootDir = STD_MOVE(dirName);
if (findLast(rootDir, std::string(dirSeparator)) == false)
rootDir += dirSeparator;
@@ -243,7 +244,7 @@ namespace VirtFs
name.c_str());
return false;
}
- std::string dirName = name;
+ std::string dirName = STD_MOVE(name);
if (findLast(dirName, std::string(dirSeparator)) == false)
dirName += dirSeparator;
diff --git a/src/fs/virtfs/fsdir.cpp b/src/fs/virtfs/fsdir.cpp
index d4e9ce900..59097e5be 100644
--- a/src/fs/virtfs/fsdir.cpp
+++ b/src/fs/virtfs/fsdir.cpp
@@ -32,6 +32,7 @@
#include "utils/checkutils.h"
#include "utils/foreach.h"
+#include "utils/stdmove.h"
#include "utils/stringutils.h"
#include <dirent.h>
@@ -274,7 +275,7 @@ namespace FsDir
bool setWriteDir(std::string newDir)
{
prepareFsPath(newDir);
- mWriteDir = newDir;
+ mWriteDir = STD_MOVE(newDir);
if (findLast(mWriteDir, std::string(dirSeparator)) == false)
mWriteDir += dirSeparator;
return true;