[prev in list] [next in list] [prev in thread] [next in thread] 

List:       atlantik-devel
Subject:    [atlantik-devel] CVS: kdegames/atlantik/client atlantik.cpp,1.93,1.94 selectgame_widget.cpp,1.14,1.1
From:       kde () office ! kde ! org
Date:       2002-06-27 21:18:54
[Download RAW message or body]

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

Modified Files:
	atlantik.cpp selectgame_widget.cpp selectgame_widget.h 
Log Message:
long overdue commits fixing .gn usage

Index: atlantik.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/client/atlantik.cpp,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- atlantik.cpp	2002/05/04 15:18:16	1.93
+++ atlantik.cpp	2002/06/27 21:18:51	1.94
@@ -228,7 +228,7 @@
 	kdDebug() << "Atlantik::slotNetworkConnected()" << endl;
 
 	// We're connected, so let's make ourselves known.
-	m_atlantikNetwork->cmdName(m_config.playerName);
+	m_atlantikNetwork->setName(m_config.playerName);
 
 	// Create select game widget and replace the select server widget.
 	m_selectGame = new SelectGame(m_mainWidget, "selectGame");
@@ -241,8 +241,8 @@
 	}
 
 	connect(m_atlantikNetwork, SIGNAL(gameListClear()), m_selectGame, \
                SLOT(slotGameListClear()));
-	connect(m_atlantikNetwork, SIGNAL(gameListAdd(QString, QString, QString, QString)), \
                m_selectGame, SLOT(slotGameListAdd(QString, QString, QString, \
                QString)));
-	connect(m_atlantikNetwork, SIGNAL(gameListEdit(QString, QString, QString, \
QString)), m_selectGame, SLOT(slotGameListEdit(QString, QString, QString, QString))); \
+	connect(m_atlantikNetwork, SIGNAL(gameListAdd(QString, QString, QString, QString, \
QString)), m_selectGame, SLOT(slotGameListAdd(QString, QString, QString, QString, \
QString))); +	connect(m_atlantikNetwork, SIGNAL(gameListEdit(QString, QString, \
QString, QString, QString)), m_selectGame, SLOT(slotGameListEdit(QString, QString, \
QString, QString, QString)));  connect(m_atlantikNetwork, \
SIGNAL(gameListDel(QString)), m_selectGame, SLOT(slotGameListDel(QString)));  
 	connect(m_selectGame, SIGNAL(joinGame(int)), m_atlantikNetwork, \
SLOT(joinGame(int))); @@ -339,7 +339,7 @@
 	if (m_config.playerName != optStr)
 	{
 		m_config.playerName = optStr;
-		m_atlantikNetwork->cmdName(optStr);
+		m_atlantikNetwork->setName(optStr);
 	}
 
 	optBool = m_configDialog->indicateUnowned();

Index: selectgame_widget.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/client/selectgame_widget.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- selectgame_widget.cpp	2002/04/25 11:01:59	1.14
+++ selectgame_widget.cpp	2002/06/27 21:18:51	1.15
@@ -35,8 +35,8 @@
 
 	// List of games
 	m_gameList = new KListView(groupBox, "m_gameList");
+	m_gameList->addColumn(QString(i18n("Game")));
 	m_gameList->addColumn(QString(i18n("Description")));
-	m_gameList->addColumn(QString(i18n("Game type")));
 	m_gameList->addColumn(QString(i18n("Id")));
 	m_gameList->addColumn(QString(i18n("Players")));
 //	m_mainLayout->addWidget(m_gameList);
@@ -70,24 +70,23 @@
 //	emit statusChanged();
 }
 
-void SelectGame::slotGameListAdd(QString gameId, QString gameType, QString \
description, QString players) +void SelectGame::slotGameListAdd(QString gameId, \
QString name, QString description, QString players, QString gameType)  {
 	if (gameId == "-1")
 	{
-		QListViewItem *item = new QListViewItem(m_gameList, i18n("Start a new %1 \
game").arg(description), gameType, "", ""); +		QListViewItem *item = new \
QListViewItem(m_gameList, i18n("Start a new %1 game").arg(name), description, "", "", \
gameType);  item->setPixmap(0, QPixmap(SmallIcon("filenew")));
 	}
 	else
 	{
-		QListViewItem *item = new QListViewItem(m_gameList, description, gameType, gameId, \
players); +		QListViewItem *item = new QListViewItem(m_gameList, i18n("Join %1 game \
#%2").arg(name).arg(gameId), description, gameId, players, gameType);  \
item->setPixmap(0, QPixmap(SmallIcon("atlantik")));  }
 
 	validateConnectButton();
 }
 
-void SelectGame::slotGameListEdit(QString gameId, QString gameType, QString \
                description, QString
- players)
+void SelectGame::slotGameListEdit(QString gameId, QString name, QString description, \
QString players, QString gameType)  {
 	QListViewItem *item = m_gameList->firstChild();
 	while (item)
@@ -95,8 +94,8 @@
 		if (item->text(2) == gameId)
 		{
 			item->setText(1, description);
-			item->setText(2, gameType);
 			item->setText(3, players);
+			item->setText(4, gameType);
 			m_gameList->triggerUpdate();
 			return;
 		}
@@ -137,6 +136,6 @@
 		if (int gameId = item->text(2).toInt())
 			emit joinGame(gameId);
 		else
-			emit newGame(item->text(1));
+			emit newGame(item->text(4));
 	}
 }

Index: selectgame_widget.h
===================================================================
RCS file: /home/kde/kdegames/atlantik/client/selectgame_widget.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- selectgame_widget.h	2002/04/23 16:56:30	1.10
+++ selectgame_widget.h	2002/06/27 21:18:51	1.11
@@ -40,8 +40,8 @@
 		void validateConnectButton();
 
 		void slotGameListClear();
-		void slotGameListAdd(QString gameId, QString gameType, QString description, \
                QString players);
-		void slotGameListEdit(QString gameId, QString gameType, QString description, \
QString players); +		void slotGameListAdd(QString gameId, QString name, QString \
description, QString players, QString gameType); +		void slotGameListEdit(QString \
gameId, QString name, QString description, QString players, QString gameType);  void \
slotGameListDel(QString gameId);  
 	private slots:

_______________________________________________
atlantik-devel mailing list
atlantik-devel@mail.kde.org
http://mail.kde.org/mailman/listinfo/atlantik-devel


[prev in list] [next in list] [prev in thread] [next in thread]