From atlantik-devel  Mon Dec 08 18:24:31 2003
From: kde () office ! kde ! org
Date: Mon, 08 Dec 2003 18:24:31 +0000
To: atlantik-devel
Subject: [atlantik-cvs] CVS: kdegames/atlantik/client selectgame_widget.cpp,
X-MARC-Message: https://marc.info/?l=atlantik-devel&m=107090814808471

Update of /home/kde/kdegames/atlantik/client
In directory office:/tmp/cvs-serv29598/client

Modified Files:
      Tag: atlantik_3_3_branch
	selectgame_widget.cpp 
Log Message:
prevent problems with .arg().arg() and variables containing '%1'

Index: selectgame_widget.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/client/selectgame_widget.cpp,v
retrieving revision 1.28.2.3
retrieving revision 1.28.2.4
diff -u -d -r1.28.2.3 -r1.28.2.4
--- selectgame_widget.cpp	8 Dec 2003 02:33:54 -0000	1.28.2.3
+++ selectgame_widget.cpp	8 Dec 2003 18:24:26 -0000	1.28.2.4
@@ -85,7 +85,7 @@
 	}
 	else
 	{
-		QListViewItem *item = new QListViewItem( m_gameList, i18n("Join %1's %2 Game").arg( game->master() ? game->master()->name() : QString::null ).arg( game->name() ), game->description(), QString::number(game->id()), QString::number(game->players()), game->type() );
+		QListViewItem *item = new QListViewItem( m_gameList, i18n("Join %1's %2 Game").arg( (game->master() ? game->master()->name() : QString::null), game->name() ), game->description(), QString::number(game->id()), QString::number(game->players()), game->type() );
 		item->setPixmap( 0, QPixmap(SmallIcon("atlantik")) );
 		item->setEnabled(game->canBeJoined());
 
@@ -118,7 +118,7 @@
 		item->setText(0, i18n("Create a new %1 Game").arg(game->name()));
 	else
 	{
-		item->setText( 0, i18n("Join %1's %2 Game").arg( game->master() ? game->master()->name() : QString::null ).arg( game->name() ) );
+		item->setText( 0, i18n("Join %1's %2 Game").arg( (game->master() ? game->master()->name() : QString::null), game->name() ) );
 		item->setText( 3, QString::number( game->players() ) );
 		item->setEnabled( game->canBeJoined() );
 	}

_______________________________________________
atlantik-cvs mailing list
atlantik-cvs@kde.org
https://mail.kde.org/mailman/listinfo/atlantik-cvs