diff options
| author | Raphael Langella <raphael.langella@gmail.com> | 2012-08-26 22:50:06 +0200 |
|---|---|---|
| committer | Raphael Langella <raphael.langella@gmail.com> | 2012-08-26 23:06:30 +0200 |
| commit | 770bcbd1844b97b671d0e47ea8313cdf2c74c5ea (patch) | |
| tree | e030cf61afce9ca69b74bb38eb73734bf10f633e /crawl-ref/source/macro.h | |
| parent | a6c16c7f2066c854a01f25e9e6c3d8e44282a638 (diff) | |
| download | crawl-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/macro.h')
| -rw-r--r-- | crawl-ref/source/macro.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/crawl-ref/source/macro.h b/crawl-ref/source/macro.h index 12bc00331c..6ee0147894 100644 --- a/crawl-ref/source/macro.h +++ b/crawl-ref/source/macro.h @@ -11,7 +11,7 @@ #include "enum.h" class key_recorder; -typedef std::deque<int> keyseq; +typedef deque<int> keyseq; class key_recorder { @@ -33,7 +33,7 @@ public: ~pause_all_key_recorders(); private: - std::vector<bool> prev_pause_status; + vector<bool> prev_pause_status; }; int getchm(int (*rgetch)() = NULL); // keymaps applied (ie for prompts) @@ -69,7 +69,7 @@ void macro_buf_add_cmd(command_type cmd, bool reverse = false); bool is_userfunction(int key); bool is_synthetic_key(int key); -std::string get_userfunction(int key); +string get_userfunction(int key); void add_key_recorder(key_recorder* recorder); void remove_key_recorder(key_recorder* recorder); @@ -84,16 +84,16 @@ int get_macro_buf_size(); void init_keybindings(); -command_type name_to_command(std::string name); -std::string command_to_name(command_type cmd); +command_type name_to_command(string name); +string command_to_name(command_type cmd); command_type key_to_command(int key, KeymapContext context); int command_to_key(command_type cmd); void bind_command_to_key(command_type cmd, int key); -std::string command_to_string(command_type cmd, bool tutorial = false); -void insert_commands(std::string &desc, std::vector<command_type> cmds, +string command_to_string(command_type cmd, bool tutorial = false); +void insert_commands(string &desc, vector<command_type> cmds, bool formatted = true); -void insert_commands(std::string &desc, const int first, ...); +void insert_commands(string &desc, const int first, ...); #endif |