diff -r 86ca84d5da74 -r e1eb64ba5e9c QTfrontend/hwform.cpp --- a/QTfrontend/hwform.cpp Wed Feb 21 19:18:05 2007 +0000 +++ b/QTfrontend/hwform.cpp Wed Feb 21 19:40:06 2007 +0000 @@ -87,10 +87,6 @@ connect(ui.pageNetGame->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack())); connect(ui.pageNetGame->BtnGo, SIGNAL(clicked()), this, SLOT(NetStartGame())); - connect(ui.pageNetChat->BtnDisconnect, SIGNAL(clicked()), this, SLOT(NetDisconnect())); - connect(ui.pageNetChat->BtnJoin, SIGNAL(clicked()), this, SLOT(NetJoin())); - connect(ui.pageNetChat->BtnCreate, SIGNAL(clicked()), this, SLOT(NetCreate())); - connect(ui.pageInfo->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack())); connect(ui.pageGameStats->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack())); @@ -268,13 +264,13 @@ connect(hwnet, SIGNAL(EnteredGame()), this, SLOT(NetGameEnter())); connect(hwnet, SIGNAL(AddNetTeam(const HWTeam&)), this, SLOT(AddNetTeam(const HWTeam&))); - connect(hwnet, SIGNAL(chatStringFromNet(const QStringList&)), + connect(hwnet, SIGNAL(chatStringFromNet(const QStringList&)), ui.pageNetGame->pChatWidget, SLOT(onChatStringFromNet(const QStringList&))); connect(ui.pageNetGame->pChatWidget, SIGNAL(chatLine(const QString&)), hwnet, SLOT(chatLineToNet(const QString&))); - connect(hwnet, SIGNAL(nickAdded(const QString&)), + connect(hwnet, SIGNAL(nickAdded(const QString&)), ui.pageNetGame->pChatWidget, SLOT(nickAdded(const QString&))); - connect(hwnet, SIGNAL(nickRemoved(const QString&)), + connect(hwnet, SIGNAL(nickRemoved(const QString&)), ui.pageNetGame->pChatWidget, SLOT(nickRemoved(const QString&))); connect(ui.pageNetGame->pNetTeamsWidget, SIGNAL(hhogsNumChanged(const HWTeam&)), @@ -348,26 +344,11 @@ GoBack(); } -void HWForm::AddGame(const QString & chan) -{ - ui.pageNetChat->ChannelsList->addItem(chan); -} - void HWForm::NetGameEnter() { GoToPage(ID_PAGE_NETCFG); } -void HWForm::NetJoin() -{ - hwnet->JoinGame("#hw"); -} - -void HWForm::NetCreate() -{ - hwnet->JoinGame("#hw"); -} - void HWForm::NetStartGame() { ui.pageNetGame->BtnGo->setText(QPushButton::tr("Waiting"));