# HG changeset patch # User unc0rr # Date 1168780229 0 # Node ID c6718bfdd6424f6774e91cefe6a21980cd89c565 # Parent 17c860483407c2bbf1e4b698fdb9aaec5458fa19 Small fixes diff -r 17c860483407 -r c6718bfdd642 QTfrontend/gamecfgwidget.cpp --- a/QTfrontend/gamecfgwidget.cpp Sun Jan 14 11:58:08 2007 +0000 +++ b/QTfrontend/gamecfgwidget.cpp Sun Jan 14 13:10:29 2007 +0000 @@ -68,8 +68,8 @@ mainLayout.addWidget(new QWidget, 100); - connect(SB_InitHealth, SIGNAL(valueChanged(int i)), this, SLOT(onInitHealthChanged(int))); - connect(SB_TurnTime, SIGNAL(valueChanged(int i)), this, SLOT(onTurnTimeChanged(int time))); + connect(SB_InitHealth, SIGNAL(valueChanged(int)), this, SLOT(onInitHealthChanged(int))); + connect(SB_TurnTime, SIGNAL(valueChanged(int)), this, SLOT(onTurnTimeChanged(int))); connect(CB_mode_Forts, SIGNAL(toggled(bool)), this, SLOT(onFortsModeChanged(bool))); connect(pMapContainer, SIGNAL(seedChanged(const QString &)), this, SLOT(onSeedChanged(const QString &))); diff -r 17c860483407 -r c6718bfdd642 QTfrontend/netserver.cpp --- a/QTfrontend/netserver.cpp Sun Jan 14 11:58:08 2007 +0000 +++ b/QTfrontend/netserver.cpp Sun Jan 14 13:10:29 2007 +0000 @@ -38,7 +38,7 @@ tr("Unable to start the server: %1.") .arg(IPCServer->errorString())); } - + connect(IPCServer, SIGNAL(newConnection()), this, SLOT(NewConnection())); } @@ -52,7 +52,7 @@ QTcpSocket* client = IPCServer->nextPendingConnection(); if(!client) return; connclients.push_back(new HWConnectedClient(this, client)); - connect(connclients.back(), SIGNAL(HWClientDisconnected(HWConnectedClient*)), + connect(connclients.back(), SIGNAL(HWClientDisconnected(HWConnectedClient*)), this, SLOT(ClientDisconnect(HWConnectedClient*))); } @@ -73,7 +73,7 @@ return ds_port; } -bool HWNetServer::isCheefClient(HWConnectedClient* cl) const +bool HWNetServer::isChiefClient(HWConnectedClient* cl) const { for(QList::const_iterator it=connclients.begin(); it!=connclients.end(); ++it) { if((*it)->getClientNick()!="" && *it==cl) return true; @@ -196,7 +196,7 @@ qDebug() << "send connected"; RawSendNet(QString("CONNECTED")); m_hwserver->teamChanged(); - if(m_hwserver->isCheefClient(this)) RawSendNet(QString("CONFIGASKED")); + if(m_hwserver->isChiefClient(this)) RawSendNet(QString("CONFIGASKED")); return; } if(client_nick=="") return; @@ -224,7 +224,7 @@ m_hwserver->teamChanged(); return; } - + m_hwserver->sendOthers(this, msg); } diff -r 17c860483407 -r c6718bfdd642 QTfrontend/netserver.h --- a/QTfrontend/netserver.h Sun Jan 14 11:58:08 2007 +0000 +++ b/QTfrontend/netserver.h Sun Jan 14 13:10:29 2007 +0000 @@ -49,7 +49,7 @@ bool readyToStart; QStringList gameCfg; class ShouldDisconnectException {}; - + QString client_nick; void ParseLine(const QByteArray & line); @@ -77,7 +77,7 @@ public: void StartServer(); void StopServer(); - bool isCheefClient(HWConnectedClient* cl) const; + bool isChiefClient(HWConnectedClient* cl) const; void sendAll(QString gameCfg); void sendOthers(HWConnectedClient* this_cl, QString gameCfg); bool haveNick(const QString& nick) const;