diff options
| -rw-r--r-- | src/gui/chatwindow.cpp | 4 | ||||
| -rw-r--r-- | src/gui/chatwindow.h | 4 | ||||
| -rw-r--r-- | src/gui/serverdialog.cpp | 4 | ||||
| -rw-r--r-- | src/inventory.cpp | 6 | ||||
| -rw-r--r-- | src/net/ea/loginhandler.cpp | 18 | ||||
| -rw-r--r-- | src/net/serverinfo.h | 12 |
6 files changed, 24 insertions, 24 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; } diff --git a/src/inventory.cpp b/src/inventory.cpp index b4477f6d3..53cdeb34c 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -46,12 +46,12 @@ struct SlotUsed final : public std::unary_function<Item*, bool> } }; -Inventory::Inventory(const int type, const int size) : +Inventory::Inventory(const int type, const int size1) : mInventoryListeners(), mType(type), - mSize(size == -1 ? static_cast<unsigned>( + mSize(size1 == -1 ? static_cast<unsigned>( Net::getInventoryHandler()->getSize(type)) - : static_cast<unsigned>(size)), + : static_cast<unsigned>(size1)), mItems(new Item*[mSize]), mUsed(0) { diff --git a/src/net/ea/loginhandler.cpp b/src/net/ea/loginhandler.cpp index 70b32c92c..23f9f91c0 100644 --- a/src/net/ea/loginhandler.cpp +++ b/src/net/ea/loginhandler.cpp @@ -64,17 +64,17 @@ void LoginHandler::getRegistrationDetails() const client->setState(STATE_REGISTER); } -void LoginHandler::loginAccount(LoginData *const loginData) const +void LoginHandler::loginAccount(LoginData *const loginData1) const { - if (loginData) + if (loginData1) { // Since we're attempting to use the tAthena protocol, // let's reset the character slots to the good value, // in case we just logged out a Manaserv server // with a different config. - loginData->resetCharacterSlots(); + loginData1->resetCharacterSlots(); - sendLoginRegister(loginData->username, loginData->password, ""); + sendLoginRegister(loginData1->username, loginData1->password, ""); } } @@ -96,13 +96,13 @@ void LoginHandler::chooseServer(const unsigned int server) const client->setState(STATE_UPDATE); } -void LoginHandler::registerAccount(LoginData *const loginData) const +void LoginHandler::registerAccount(LoginData *const loginData1) const { - if (!loginData) + if (!loginData1) return; - std::string username = loginData->username; - switch (loginData->gender) + std::string username = loginData1->username; + switch (loginData1->gender) { case GENDER_FEMALE: username.append("_F"); @@ -118,7 +118,7 @@ void LoginHandler::registerAccount(LoginData *const loginData) const break; } - sendLoginRegister(username, loginData->password, loginData->email); + sendLoginRegister(username, loginData1->password, loginData1->email); } Worlds LoginHandler::getWorlds() const diff --git a/src/net/serverinfo.h b/src/net/serverinfo.h index c9a2d4f91..2a2659569 100644 --- a/src/net/serverinfo.h +++ b/src/net/serverinfo.h @@ -126,21 +126,21 @@ public: port != other.port); } - static Type parseType(const std::string &type) A_WARN_UNUSED + static Type parseType(const std::string &serverType) A_WARN_UNUSED { - if (compareStrI(type, "tmwathena") == 0) + if (compareStrI(serverType, "tmwathena") == 0) return TMWATHENA; - if (compareStrI(type, "evol") == 0) + if (compareStrI(serverType, "evol") == 0) return EVOL; #ifdef EATHENA_SUPPORT - else if (compareStrI(type, "eathena") == 0) + else if (compareStrI(serverType, "eathena") == 0) return EATHENA; #else - else if (compareStrI(type, "eathena") == 0) + else if (compareStrI(serverType, "eathena") == 0) return TMWATHENA; #endif #ifdef MANASERV_SUPPORT - else if (compareStrI(type, "manaserv") == 0) + else if (compareStrI(serverType, "manaserv") == 0) return MANASERV; #endif return UNKNOWN; |