Commit 36cbcec0 authored by Gaël de Chalendar's avatar Gaël de Chalendar

SVN_SILENT cosmetic changes

svn path=/trunk/playground/games/ksirk/; revision=648770
parent d8c37969
......@@ -4,6 +4,6 @@ add_definitions(${KDE4_ENABLE_EXCEPTIONS})
remove_definitions(-DQT_NO_STL)
MESSAGE(STATUS "currently finishing the porting of KsirK to kde4")
#MESSAGE(STATUS "currently finishing the porting of KsirK to kde4")
add_subdirectory(ksirk)
......@@ -43,7 +43,7 @@ namespace GameLogic
/**
* This is the implementation of the player configuration dialog made with
* QT Designer
* @author Gaël de Chalendar
* @author Gael de Chalendar
*/
class KPlayerSetupDialog : public QDialog, public Ui::QPlayerSetupDialog
{
......
......@@ -36,8 +36,7 @@ namespace Ksirk
RestartOrExitDialogImpl::RestartOrExitDialogImpl(
const QString& label,
QWidget *parent,
const char *name) :
QWidget *parent) :
QDialog(parent),
Ui::RestartOrExitDialog()
{
......
......@@ -40,8 +40,7 @@ class RestartOrExitDialogImpl : public QDialog, public Ui::RestartOrExitDialog
public:
RestartOrExitDialogImpl(
const QString& label,
QWidget *parent=0,
const char *name=0);
QWidget *parent=0);
virtual ~RestartOrExitDialogImpl();
private:
......
......@@ -1081,7 +1081,8 @@ bool GameAutomaton::setupPlayersNumberAndSkin(bool& networkGame, int& port, uint
if (dnssdAvailable())
setDiscoveryInfo("_ksirk._tcp","wow");
#endif
dialog->hide();
delete dialog;
}
return true;
}
......
......@@ -272,7 +272,6 @@ void KGameWindow::newSkin(const QString& onuFileName)
m_theWorld = new ONU(onuDefinitionFileName);
if (m_frame != 0)
{
// haltTimer();
m_frame->hide();
delete m_frame;
}
......@@ -304,8 +303,6 @@ void KGameWindow::newSkin(const QString& onuFileName)
kDebug() << "Setting up GUI" << endl;
setupGUI();
// initTimer();
kDebug() <<"Setting up toolbars" << endl;
/* if (mainToolBar != 0)
{
......@@ -420,7 +417,6 @@ bool KGameWindow::attackEnd()
&& ( (*currentPlayer()->goal()->players().begin()) == oldOwnerId) ) )
|| (GameLogic::GameAutomaton::changeable().playerList()->count() == 1) )
{
// haltTimer();
GameLogic::GameAutomaton::changeable().state(GameLogic::GameAutomaton::GAME_OVER);
QByteArray buffer;
QDataStream stream(&buffer, QIODevice::WriteOnly);
......@@ -638,8 +634,7 @@ bool KGameWindow::queryClose()
bool KGameWindow::actionOpenGame()
{
// kDebug() << "KGameWindow::actionOpenGame" << endl;
// haltTimer();
QString fileName = KFileDialog::getOpenFileName(KUrl(), "*.xml", this, i18n("KsirK - Load Game"));
QString fileName = KFileDialog::getOpenFileName(KUrl(), "*.xml", this, i18n("KsirK - Load Game"));
if (!fileName.isEmpty())
{
m_waitedPlayers.clear();
......@@ -663,9 +658,6 @@ bool KGameWindow::actionOpenGame()
QDataStream stream(&buffer, QIODevice::WriteOnly);
GameLogic::GameAutomaton::changeable().sendMessage(buffer,DisplayNormalGameButtons);
GameLogic::GameAutomaton::changeable().setGameStatus(KGame::Run);
// kDebug() << "slotOpenGame before initTimer" << endl;
// initTimer();
// kDebug() << "slotOpenGame after initTimer" << endl;
m_frame->setFocus();
return false;
}
......@@ -903,7 +895,6 @@ void KGameWindow::setBarFlagButton(const Player* player)
bool KGameWindow::setupPlayers()
{
kDebug() << "KGameWindow::setupPlayers" << endl;
// haltTimer();
// Number of players
bool networkGame = false;
......@@ -967,7 +958,6 @@ bool KGameWindow::setupPlayers()
bool KGameWindow::setupOnePlayer()
{
kDebug() << "KGameWindow::setupOnePlayer" << endl;
// haltTimer();
kDebug() << " building the list of available nations" << endl;
std::map< QString, QString > nations = nationsList();
......@@ -1048,7 +1038,6 @@ bool KGameWindow::setupOnePlayer()
bool KGameWindow::setupOneWaitedPlayer()
{
kDebug() << "KGameWindow::setupOneWaitedPlayer" << endl;
// haltTimer();
QString password;
int result;
......@@ -1058,14 +1047,12 @@ bool KGameWindow::setupOneWaitedPlayer()
QDataStream stream(&buffer, QIODevice::WriteOnly);
stream << (quint32)result << password;
GameLogic::GameAutomaton::changeable().sendMessage(buffer,ValidateWaitedPlayerPassword);
// initTimer();
return true;
}
bool KGameWindow::createWaitedPlayer(quint32 waitedPlayerId)
{
kDebug() << "KGameWindow::createWaitedPlayer" << endl;
// haltTimer();
PlayerMatrix& pm = m_waitedPlayers[waitedPlayerId];
Player* player = 0;
......@@ -2087,7 +2074,6 @@ bool KGameWindow::actionNewGame()
{
// @todo if new game is canceled, removed buttons should be displayed again
// clearGameActionsToolbar();
// haltTimer();
/* if (!(GameLogic::GameAutomaton::changeable().playerList()->isEmpty()))
{
GameLogic::GameAutomaton::changeable().playerList()->clear();
......@@ -2245,7 +2231,6 @@ void KGameWindow::actionRecycling()
<< I18N_NOOP("%1, please change your distributions.")
<< currentPlayer()->name();
broadcastChangeItem(messageParts, ID_STATUS_MSG2);
// initTimer();
}
void KGameWindow::actionRecyclingFinished()
......@@ -2268,7 +2253,6 @@ void KGameWindow::actionRecyclingFinished()
GameLogic::GameAutomaton::changeable().sendMessage(buffer,DisplayNormalGameButtons);
GameLogic::GameAutomaton::changeable().state(GameLogic::GameAutomaton::WAIT);
}
// initTimer();
}
void KGameWindow::finishMoves()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment