From 7dc7b217107d18d531c569d2deab6ff1f62552d5 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 18 Sep 2013 23:23:11 +0300
Subject: fix name conflicts.

---
 src/gui/chatwindow.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/gui/chatwindow.h')

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;
 
-- 
cgit v1.2.3-60-g2f50