Fix some compiler warnings.

This commit is contained in:
lotodore
2010-10-11 15:44:56 +00:00
parent 2c558daf9e
commit 972f678730
5 changed files with 12 additions and 12 deletions
+8 -8
View File
@@ -30,19 +30,19 @@ public:
ServerDBNoAction(); ServerDBNoAction();
virtual ~ServerDBNoAction(); virtual ~ServerDBNoAction();
virtual void Init(const std::string &host, const std::string &user, const std::string &pwd, virtual void Init(const std::string &/*host*/, const std::string &/*user*/, const std::string &/*pwd*/,
const std::string &database, const std::string &encryptionKey) {} const std::string &/*database*/, const std::string &/*encryptionKey*/) {}
virtual void Start() {} virtual void Start() {}
virtual void Stop() {} virtual void Stop() {}
virtual void AsyncPlayerLogin(unsigned requestId, const std::string &playerName) {} virtual void AsyncPlayerLogin(unsigned /*requestId*/, const std::string &/*playerName*/) {}
virtual void PlayerPostLogin(DB_id playerId, const std::string &avatarHash, const std::string &avatarType) {} virtual void PlayerPostLogin(DB_id /*playerId*/, const std::string &/*avatarHash*/, const std::string &/*avatarType*/) {}
virtual void PlayerLogout(DB_id playerId) {} virtual void PlayerLogout(DB_id /*playerId*/) {}
virtual void AsyncCreateGame(unsigned requestId, const std::string &gameName) {} virtual void AsyncCreateGame(unsigned /*requestId*/, const std::string &/*gameName*/) {}
virtual void SetGamePlayerPlace(DB_id gameId, DB_id playerId, unsigned place) {} virtual void SetGamePlayerPlace(DB_id /*gameId*/, DB_id /*playerId*/, unsigned /*place*/) {}
virtual void EndGame(DB_id gameId) {} virtual void EndGame(DB_id /*gameId*/) {}
}; };
#endif // _SERVERDBNOACTION_H_ #endif // _SERVERDBNOACTION_H_
@@ -1434,7 +1434,7 @@ void gameLobbyDialogImpl::showNickListContextMenu(QPoint p)
if(myNickListModel->rowCount() && myNickListSelectionModel->currentIndex().isValid()) { if(myNickListModel->rowCount() && myNickListSelectionModel->currentIndex().isValid()) {
assert(mySession); assert(mySession);
int playerUid = myNickListSelectionModel->currentIndex().data(Qt::UserRole).toUInt(); unsigned playerUid = myNickListSelectionModel->currentIndex().data(Qt::UserRole).toUInt();
if(inGame && mySession->getClientGameInfo(mySession->getClientCurrentGameId()).data.gameType == GAME_TYPE_INVITE_ONLY && playerUid != mySession->getClientUniquePlayerId() && !mySession->getClientPlayerInfo(playerUid).isGuest) { if(inGame && mySession->getClientGameInfo(mySession->getClientCurrentGameId()).data.gameType == GAME_TYPE_INVITE_ONLY && playerUid != mySession->getClientUniquePlayerId() && !mySession->getClientPlayerInfo(playerUid).isGuest) {
+1 -1
View File
@@ -860,8 +860,8 @@ QString GameTableStyleReader::getActionPic(int action)
return ActionWinnerI18NPic; return ActionWinnerI18NPic;
} }
break; break;
default: return QString("");
} }
return QString("");
} }
void GameTableStyleReader::setButtonsStyle(MyActionButton *br, MyActionButton *cc, MyActionButton *f, MyActionButton *a, int state) void GameTableStyleReader::setButtonsStyle(MyActionButton *br, MyActionButton *cc, MyActionButton *f, MyActionButton *a, int state)
+1 -1
View File
@@ -1357,7 +1357,7 @@ ServerGameStateWaitPlayerAction::TimerTimeout(const boost::system::error_code &e
curPlayer->incrementActionTimeoutCounter(); curPlayer->incrementActionTimeoutCounter();
if (server->GetGameData().gameType == GAME_TYPE_RANKING if (server->GetGameData().gameType == GAME_TYPE_RANKING
&& server->GetGameData().playerActionTimeoutSec >= server->GetSmallDelaySec()) && server->GetGameData().playerActionTimeoutSec >= (int)server->GetSmallDelaySec())
{ {
if (curPlayer->getActionTimeoutCounter() == SERVER_WARNING_ACTION_TIMEOUT_THRESHOLD) if (curPlayer->getActionTimeoutCounter() == SERVER_WARNING_ACTION_TIMEOUT_THRESHOLD)
{ {
+1 -1
View File
@@ -1677,7 +1677,7 @@ ServerLobbyThread::TimerUpdateClientLoginLock(const boost::system::error_code &e
{ {
TimerClientAddressMap::iterator next = i; TimerClientAddressMap::iterator next = i;
++next; ++next;
if (i->second.elapsed().total_seconds() > SERVER_INIT_LOGIN_CLIENT_LOCK_SEC) if (i->second.elapsed().total_seconds() > (int)SERVER_INIT_LOGIN_CLIENT_LOCK_SEC)
m_timerClientAddressMap.erase(i); m_timerClientAddressMap.erase(i);
i = next; i = next;
} }