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/tilereg-tab.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/tilereg-tab.h')
| -rw-r--r-- | crawl-ref/source/tilereg-tab.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/tilereg-tab.h b/crawl-ref/source/tilereg-tab.h index 55f2c5b9f6..7ab9014b2f 100644 --- a/crawl-ref/source/tilereg-tab.h +++ b/crawl-ref/source/tilereg-tab.h @@ -28,18 +28,18 @@ public: int num_tabs() const; void enable_tab(int idx); void disable_tab(int idx); - int find_tab(std::string tab_name) const; + int find_tab(string tab_name) const; virtual void update(); virtual void clear(); virtual void render(); virtual void on_resize(); virtual int handle_mouse(MouseEvent &event); - virtual bool update_tip_text(std::string &tip); - virtual bool update_tab_tip_text(std::string &tip, bool active); - virtual bool update_alt_text(std::string &alt); + virtual bool update_tip_text(string &tip); + virtual bool update_tab_tip_text(string &tip, bool active); + virtual bool update_alt_text(string &alt); - virtual const std::string name() const { return ""; } + virtual const string name() const { return ""; } protected: virtual void pack_buffers(); @@ -68,7 +68,7 @@ protected: int height; bool enabled; }; - std::vector<TabInfo> m_tabs; + vector<TabInfo> m_tabs; }; #endif |