Fixed a bunch of compiler warnings (mingw compiler).

This commit is contained in:
lotodore
2007-09-04 23:37:32 +00:00
parent 232382e28f
commit 0900d3844b
9 changed files with 14 additions and 12 deletions
+1 -1
View File
@@ -12,7 +12,7 @@
#include "clientbero.h" #include "clientbero.h"
ClientBeRo::ClientBeRo(HandInterface* hi, int /*id*/, int /*qP*/, int dP, int sB, GameState gS) ClientBeRo::ClientBeRo(HandInterface* hi, int /*id*/, int /*qP*/, int dP, int sB, GameState gS)
: BeRoInterface(), myHand(hi), highestCardsValue(0), myBeRoID(gS), smallBlindPosition(0), smallBlind(sB), highestSet(0), firstRound(1), playersTurn(dP), minimumRaise(0) : BeRoInterface(), myBeRoID(gS), myHand(hi), highestCardsValue(0), playersTurn(dP), highestSet(0), firstRound(true), smallBlindPosition(0), smallBlind(sB), minimumRaise(0)
{ {
} }
@@ -89,3 +89,4 @@ void createInternetGameDialogImpl::clearGamePassword(bool clear) {
if(!clear) { lineEdit_Password->clear(); } if(!clear) { lineEdit_Password->clear(); }
} }
@@ -15,7 +15,7 @@
#include "gamedata.h" #include "gamedata.h"
gameLobbyDialogImpl::gameLobbyDialogImpl(QWidget *parent, ConfigFile *c) gameLobbyDialogImpl::gameLobbyDialogImpl(QWidget *parent, ConfigFile *c)
: QDialog(parent), myW(NULL), mySession(NULL), myConfig(c), currentGameName(""), isAdmin(false) : QDialog(parent), myW(NULL), myConfig(c), mySession(NULL), currentGameName(""), isAdmin(false)
{ {
setupUi(this); setupUi(this);
-1
View File
@@ -1763,7 +1763,6 @@ void mainWindowImpl::myRaise(){
pushButton_FoldAllin->setText("All-In"); pushButton_FoldAllin->setText("All-In");
spinBox_set->show(); spinBox_set->show();
int tempHighestSet = 0;
HandInterface *currentHand = mySession->getCurrentGame()->getCurrentHand(); HandInterface *currentHand = mySession->getCurrentGame()->getCurrentHand();
spinBox_set->setMinimum(currentHand->getCurrentBeRo()->getHighestSet() - currentHand->getPlayerArray()[0]->getMySet() + currentHand->getCurrentBeRo()->getMinimumRaise()); spinBox_set->setMinimum(currentHand->getCurrentBeRo()->getHighestSet() - currentHand->getPlayerArray()[0]->getMySet() + currentHand->getCurrentBeRo()->getMinimumRaise());
+1
View File
@@ -56,3 +56,4 @@ QString QtHelper::getDataPath()
return QDir::cleanPath(path) + "/"; return QDir::cleanPath(path) + "/";
} }
@@ -359,3 +359,4 @@ void settingsDialogImpl::clearInternetGamePassword(bool clear) {
if(!clear) { lineEdit_InternetGamePassword->clear(); } if(!clear) { lineEdit_InternetGamePassword->clear(); }
} }
+2 -2
View File
@@ -96,8 +96,8 @@ protected:
void SetGameData(const GameData &gameData); void SetGameData(const GameData &gameData);
const StartData &GetStartData() const; const StartData &GetStartData() const;
void SetStartData(const StartData &startData); void SetStartData(const StartData &startData);
int GetGuiPlayerId() const; unsigned GetGuiPlayerId() const;
void SetGuiPlayerId(int guiPlayerId); void SetGuiPlayerId(unsigned guiPlayerId);
boost::shared_ptr<Game> GetGame(); boost::shared_ptr<Game> GetGame();
+3 -3
View File
@@ -282,7 +282,7 @@ ClientThread::Main()
boost::shared_ptr<EngineFactory> factory(new ClientEngineFactory); // LocalEngine erstellen boost::shared_ptr<EngineFactory> factory(new ClientEngineFactory); // LocalEngine erstellen
MapPlayerDataList(); MapPlayerDataList();
if (GetPlayerDataList().size() != GetStartData().numberOfPlayers) if (GetPlayerDataList().size() != (unsigned)GetStartData().numberOfPlayers)
throw NetException(ERR_NET_INVALID_PLAYER_COUNT, 0); throw NetException(ERR_NET_INVALID_PLAYER_COUNT, 0);
m_game.reset(new Game(&m_gui, factory, GetPlayerDataList(), GetGameData(), GetStartData(), m_curGameId++)); m_game.reset(new Game(&m_gui, factory, GetPlayerDataList(), GetGameData(), GetStartData(), m_curGameId++));
// Initialize GUI speed. // Initialize GUI speed.
@@ -441,14 +441,14 @@ ClientThread::SetStartData(const StartData &startData)
m_startData = startData; m_startData = startData;
} }
int unsigned
ClientThread::GetGuiPlayerId() const ClientThread::GetGuiPlayerId() const
{ {
return m_guiPlayerId; return m_guiPlayerId;
} }
void void
ClientThread::SetGuiPlayerId(int guiPlayerId) ClientThread::SetGuiPlayerId(unsigned guiPlayerId)
{ {
m_guiPlayerId = guiPlayerId; m_guiPlayerId = guiPlayerId;
} }
+1 -1
View File
@@ -47,7 +47,7 @@ utf8ToWchar(const char *str)
{ {
wchar_t *wstr = new wchar_t[reqLen]; wchar_t *wstr = new wchar_t[reqLen];
wstr[0] = L'\0'; wstr[0] = L'\0';
if (::MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, str, len, wstr, reqLen) == reqLen) if (::MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, str, len, wstr, reqLen) == (int)reqLen)
retStr = wstr; retStr = wstr;
delete[] wstr; delete[] wstr;
} }