diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-09-18 23:23:11 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-09-18 23:23:11 +0300 |
| commit | 7dc7b217107d18d531c569d2deab6ff1f62552d5 (patch) | |
| tree | 30753ed34988d26d86733c9d76b97c7b6d24a998 /src/gui/chatwindow.h | |
| parent | dc6568962a32ddb6f231c629e7ad3373e9086b6c (diff) | |
| download | manaplus-7dc7b217107d18d531c569d2deab6ff1f62552d5.tar.gz manaplus-7dc7b217107d18d531c569d2deab6ff1f62552d5.tar.bz2 manaplus-7dc7b217107d18d531c569d2deab6ff1f62552d5.tar.xz manaplus-7dc7b217107d18d531c569d2deab6ff1f62552d5.zip | |
fix name conflicts.
Diffstat (limited to 'src/gui/chatwindow.h')
| -rw-r--r-- | src/gui/chatwindow.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/chatwindow.h b/src/gui/chatwindow.h index ec60846f3..7137af08f 100644 --- a/src/gui/chatwindow.h +++ b/src/gui/chatwindow.h @@ -348,8 +348,8 @@ class ChatWindow final : public Window, History mHistory; /**< Command history. */ HistoryIterator mCurHist; /**< History iterator. */ - typedef std::list<std::string> Commands; - typedef Commands::iterator CommandsIterator; + typedef std::list<std::string> ChatCommands; + typedef ChatCommands::iterator ChatCommandsIterator; History mCommands; /**< Command list. */ History mCustomWords; |