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 | |
| 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')
| -rw-r--r-- | src/gui/chatwindow.cpp | 4 | ||||
| -rw-r--r-- | src/gui/chatwindow.h | 4 | ||||
| -rw-r--r-- | src/gui/serverdialog.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp index 91cf2417b..33a621cfe 100644 --- a/src/gui/chatwindow.cpp +++ b/src/gui/chatwindow.cpp @@ -1329,8 +1329,8 @@ std::string ChatWindow::autoComplete(const std::string &partName, if (!words) return ""; - Commands::const_iterator i = words->begin(); - const Commands::const_iterator i_end = words->end(); + ChatCommands::const_iterator i = words->begin(); + const ChatCommands::const_iterator i_end = words->end(); StringVect nameList; while (i != i_end) 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; diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp index d30c995aa..17d299772 100644 --- a/src/gui/serverdialog.cpp +++ b/src/gui/serverdialog.cpp @@ -826,7 +826,7 @@ int ServerDialog::downloadUpdate(void *ptr, DownloadStatus status, else if (progress > 1.0f) progress = 1.0f; - MutexLocker lock(&sd->mMutex); + MutexLocker lock1(&sd->mMutex); sd->mDownloadStatus = DOWNLOADING_IN_PROGRESS; sd->mDownloadProgress = progress; } @@ -834,7 +834,7 @@ int ServerDialog::downloadUpdate(void *ptr, DownloadStatus status, if (finished) { sd->loadServers(); - MutexLocker lock(&sd->mMutex); + MutexLocker lock1(&sd->mMutex); sd->mDownloadStatus = DOWNLOADING_COMPLETE; } |