summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/l_file.cc
diff options
context:
space:
mode:
authorRaphael Langella <raphael.langella@gmail.com>2012-08-26 22:50:06 +0200
committerRaphael Langella <raphael.langella@gmail.com>2012-08-26 23:06:30 +0200
commit770bcbd1844b97b671d0e47ea8313cdf2c74c5ea (patch)
treee030cf61afce9ca69b74bb38eb73734bf10f633e /crawl-ref/source/l_file.cc
parenta6c16c7f2066c854a01f25e9e6c3d8e44282a638 (diff)
downloadcrawl-ref-770bcbd1844b97b671d0e47ea8313cdf2c74c5ea.tar.gz
crawl-ref-770bcbd1844b97b671d0e47ea8313cdf2c74c5ea.zip
Use std namespace.
I had to rename distance() (in coord.h) to distance2() because it conflicts with the STL function to compare 2 iterators. Not a bad change given how it returns the square of the distance anyway. I also had to rename the message global variable (in message.cc) to buffer. I tried to fix and improve the coding style has much as I could, but I probably missed a few given how huge and tedious it is. I also didn't touch crawl-gdb.py, and the stuff in prebuilt, rltiles/tool and util/levcomp.*, because I have no clue about those.
Diffstat (limited to 'crawl-ref/source/l_file.cc')
-rw-r--r--crawl-ref/source/l_file.cc29
1 files changed, 13 insertions, 16 deletions
diff --git a/crawl-ref/source/l_file.cc b/crawl-ref/source/l_file.cc
index 4fb339c8b3..0ee34621d7 100644
--- a/crawl-ref/source/l_file.cc
+++ b/crawl-ref/source/l_file.cc
@@ -148,19 +148,17 @@ static int file_unmarshall_meta(lua_State *ls)
// be resolved to an absolute path if necessary using datafile_path.
LUAFN(_file_datadir_files_recursive)
{
- const std::string rawdir(luaL_checkstring(ls, 1));
+ const string rawdir(luaL_checkstring(ls, 1));
// A filename suffix to match (such as ".des"). If empty, files
// will be unfiltered.
- const std::string ext_filter(lua_isnoneornil(ls, 2) ? "" :
- luaL_checkstring(ls, 2));
- const std::string datadir(
- datafile_path(rawdir, false, false, dir_exists));
+ const string ext_filter(lua_isnoneornil(ls, 2) ? ""
+ : luaL_checkstring(ls, 2));
+ const string datadir(datafile_path(rawdir, false, false, dir_exists));
if (datadir.empty())
luaL_error(ls, "Cannot find data directory: '%s'", rawdir.c_str());
- const std::vector<std::string> files =
- get_dir_files_recursive(datadir, ext_filter);
+ const vector<string> files = get_dir_files_recursive(datadir, ext_filter);
return clua_stringtable(ls, files);
}
@@ -169,26 +167,25 @@ LUAFN(_file_datadir_files_recursive)
// be resolved to an absolute path if necessary using datafile_path.
LUAFN(_file_datadir_files)
{
- const std::string rawdir(luaL_checkstring(ls, 1));
+ const string rawdir(luaL_checkstring(ls, 1));
// A filename suffix to match (such as ".des"). If empty, files
// will be unfiltered.
- const std::string ext_filter(lua_isnoneornil(ls, 2) ? "" :
- luaL_checkstring(ls, 2));
- const std::string datadir(
- datafile_path(rawdir, false, false, dir_exists));
+ const string ext_filter(lua_isnoneornil(ls, 2) ? ""
+ : luaL_checkstring(ls, 2));
+ const string datadir(datafile_path(rawdir, false, false, dir_exists));
if (datadir.empty())
luaL_error(ls, "Cannot find data directory: '%s'", rawdir.c_str());
- const std::vector<std::string> files =
- ext_filter.empty() ? get_dir_files(datadir) :
- get_dir_files_ext(datadir, ext_filter);
+ const vector<string> files = ext_filter.empty()
+ ? get_dir_files(datadir)
+ : get_dir_files_ext(datadir, ext_filter);
return clua_stringtable(ls, files);
}
LUAFN(_file_writefile)
{
- const std::string fname(luaL_checkstring(ls, 1));
+ const string fname(luaL_checkstring(ls, 1));
FILE *f = fopen_replace(fname.c_str());
if (f)
{