summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/files.h
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/files.h
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/files.h')
-rw-r--r--crawl-ref/source/files.h83
1 files changed, 38 insertions, 45 deletions
diff --git a/crawl-ref/source/files.h b/crawl-ref/source/files.h
index 829fd8bb28..c30f21239d 100644
--- a/crawl-ref/source/files.h
+++ b/crawl-ref/source/files.h
@@ -22,51 +22,45 @@ enum load_mode_type
LOAD_VISITOR, // Visitor pattern to see all levels
};
-bool file_exists(const std::string &name);
-bool dir_exists(const std::string &dir);
-bool is_absolute_path(const std::string &path);
-void assert_read_safe_path(const std::string &path) throw (std::string);
+bool file_exists(const string &name);
+bool dir_exists(const string &dir);
+bool is_absolute_path(const string &path);
+void assert_read_safe_path(const string &path) throw (string);
off_t file_size(FILE *handle);
-std::vector<std::string> get_dir_files(const std::string &dir);
-std::vector<std::string> get_dir_files_ext(const std::string &dir,
- const std::string &ext);
-std::vector<std::string> get_dir_files_recursive(
- const std::string &dirname,
- const std::string &ext = "",
- int recursion_depth = -1,
- bool include_directories = false);
-
-std::string datafile_path(
- std::string basename,
- bool croak_on_fail = true,
- bool test_base_path = false,
- bool (*thing_exists)(const std::string&) = file_exists);
-
-std::string get_parent_directory(const std::string &filename);
-std::string get_base_filename(const std::string &filename);
-std::string get_cache_name(const std::string &filename);
-std::string get_path_relative_to(const std::string &referencefile,
- const std::string &relativepath);
-std::string catpath(const std::string &first, const std::string &second);
-std::string canonicalise_file_separator(const std::string &path);
-
-bool check_mkdir(const std::string &what, std::string *dir,
- bool silent = false);
+vector<string> get_dir_files(const string &dir);
+vector<string> get_dir_files_ext(const string &dir, const string &ext);
+vector<string> get_dir_files_recursive(const string &dirname,
+ const string &ext = "",
+ int recursion_depth = -1,
+ bool include_directories = false);
+
+string datafile_path(string basename, bool croak_on_fail = true,
+ bool test_base_path = false,
+ bool (*thing_exists)(const string&) = file_exists);
+
+string get_parent_directory(const string &filename);
+string get_base_filename(const string &filename);
+string get_cache_name(const string &filename);
+string get_path_relative_to(const string &referencefile,
+ const string &relativepath);
+string catpath(const string &first, const string &second);
+string canonicalise_file_separator(const string &path);
+
+bool check_mkdir(const string &what, string *dir, bool silent = false);
// Find saved games for all game types.
-std::vector<player_save_info> find_all_saved_characters();
+vector<player_save_info> find_all_saved_characters();
-std::string get_save_filename(const std::string &name);
-std::string get_savedir_filename(const std::string &name);
-std::string savedir_versioned_path(const std::string &subdirs = "");
-std::string get_prefs_filename();
-std::string change_file_extension(const std::string &file,
- const std::string &ext);
+string get_save_filename(const string &name);
+string get_savedir_filename(const string &name);
+string savedir_versioned_path(const string &subdirs = "");
+string get_prefs_filename();
+string change_file_extension(const string &file, const string &ext);
-time_t file_modtime(const std::string &file);
+time_t file_modtime(const string &file);
time_t file_modtime(FILE *f);
-std::vector<std::string> get_title_files();
+vector<string> get_title_files();
class level_id;
@@ -82,8 +76,8 @@ void save_game_state();
bool get_save_version(reader &file, int &major, int &minor);
-bool save_exists(const std::string& filename);
-bool restore_game(const std::string& filename);
+bool save_exists(const string& filename);
+bool restore_game(const string& filename);
void sighup_save_and_exit();
@@ -105,8 +99,8 @@ public:
void save_ghost(bool force = false);
bool load_ghost(bool creating_level);
-FILE *lk_open(const char *mode, const std::string &file);
-void lk_close(FILE *handle, const char *mode, const std::string &file);
+FILE *lk_open(const char *mode, const string &file);
+void lk_close(FILE *handle, const char *mode, const string &file);
// file locking stuff
bool lock_file_handle(FILE *handle, bool write);
@@ -115,13 +109,12 @@ bool unlock_file_handle(FILE *handle);
class file_lock
{
public:
- file_lock(const std::string &filename, const char *mode,
- bool die_on_fail = true);
+ file_lock(const string &filename, const char *mode, bool die_on_fail = true);
~file_lock();
private:
FILE *handle;
const char *mode;
- std::string filename;
+ string filename;
};
FILE *fopen_replace(const char *name);