Now using int as parameters for the signal/slot method. This needs to be fixed some time...

This commit is contained in:
lotodore
2007-04-27 22:55:19 +00:00
parent 73a5117066
commit e0bc14282f
8 changed files with 17 additions and 102 deletions
+8 -3
View File
@@ -538,7 +538,7 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent)
connect(this, SIGNAL(SignalNetClientGameInfo(int)), myWaitingForServerGameDialog, SLOT(refresh(int)));
// Errors are handled globally, not within one dialog.
connect(this, SIGNAL(SignalNetClientError(int, int)), this, SLOT(networkError(int, int)));
connect(this, SIGNAL(SignalNetClientGameStart(GameDataWrapper)), this, SLOT(networkStart(GameDataWrapper)));
connect(this, SIGNAL(SignalNetClientGameStart(int, int, int, int)), this, SLOT(networkStart(int, int, int, int)));
connect(this, SIGNAL(SignalNetServerPlayerJoined(QString)), myStartNetworkGameDialog, SLOT(addConnectedPlayer(QString)));
@@ -2200,9 +2200,14 @@ void mainWindowImpl::networkError(int errorID, int osErrorID) {
myWaitingForServerGameDialog->reject();
}
void mainWindowImpl::networkStart(GameDataWrapper gameData)
void mainWindowImpl::networkStart(int numberOfPlayers, int startCash, int smallBlind, int handsBeforeRaise)
{
mySession->startGame(gameData.GetGameData());
GameData gameData;
gameData.numberOfPlayers = numberOfPlayers;
gameData.startCash = startCash;
gameData.smallBlind = smallBlind;
gameData.handsBeforeRaise = handsBeforeRaise;
mySession->startGame(gameData);
}
void mainWindowImpl::keyPressEvent ( QKeyEvent * event ) {
+3 -3
View File
@@ -29,7 +29,7 @@
#include "handinterface.h"
#include "game_defs.h"
#include <gamedatawrapper.h>
#include <gamedata.h>
class Session;
class Game;
@@ -94,7 +94,7 @@ signals:
void SignalNetClientConnect(int actionID);
void SignalNetClientGameInfo(int actionID);
void SignalNetClientError(int errorID, int osErrorID);
void SignalNetClientGameStart(GameDataWrapper gameData);
void SignalNetClientGameStart(int numberOfPlayers, int startCash, int smallBlind, int handsBeforeRaise);
void SignalNetServerPlayerJoined(QString playerName);
public slots:
@@ -191,7 +191,7 @@ public slots:
void paintStartSplash();
void networkError(int, int);
void networkStart(GameDataWrapper);
void networkStart(int, int, int, int);
private: