TQt4 port kdegames

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegames@1236074 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 17 insertions, 17 deletions

diff --git a/libksirtet/lib/meeting.cpp b/libksirtet/lib/meeting.cpp
index 71df0e4d..8730fb96 100644
--- a/libksirtet/lib/meeting.cpp
+++ b/libksirtet/lib/meeting.cpp
@@ -14,16 +14,16 @@
 
 NetMeeting::NetMeeting(const cId &_id, Socket *socket,
                        MPOptionWidget *option,
-					   bool _server, TQWidget *parent, const char * name)
+					   bool _server, TQWidget *tqparent, const char * name)
 : KDialogBase(Plain, i18n("Network Meeting"),
 			  (_server ? Ok|Cancel|Help : Cancel|Help),
-			  (_server ? Ok : Cancel), parent, name),
+			  (_server ? Ok : Cancel), tqparent, name),
   server(_server), ow(option), id(_id), socketRemoved(FALSE)
 {
 	sm.append(socket, SocketManager::ReadWrite);
 	sm[0]->notifier()->setEnabled(TRUE);
 
-/* top layout */
+/* top tqlayout */
 	TQVBoxLayout *top = new TQVBoxLayout(plainPage(), spacingHint());
 	top->setResizeMode(TQLayout::Fixed);
 
@@ -37,7 +37,7 @@ NetMeeting::NetMeeting(const cId &_id, Socket *socket,
 	top->addWidget(wl);
 
 	labWait = new TQLabel(i18n("Waiting for clients"), plainPage());
-	labWait->setAlignment(AlignCenter);
+	labWait->tqsetAlignment(AlignCenter);
 	top->addWidget(labWait);
 
 	// options widget
@@ -68,7 +68,7 @@ void NetMeeting::appendLine(const MeetingLineData &pld, bool server)
 	if (pld.own) connect(pl, TQT_SIGNAL(textChanged(const TQString &)),
 						 TQT_SLOT(textChanged(const TQString &)));
 	else message(i18n("A new client has just arrived (#%1)")
-				 .arg(wl->size()+1));
+				 .tqarg(wl->size()+1));
 	pl->setData(pld.ed);
 	connect(pl, TQT_SIGNAL(typeChanged(MeetingCheckBox::Type)),
 			TQT_SLOT(typeChanged(MeetingCheckBox::Type)));
@@ -136,7 +136,7 @@ void NetMeeting::cleanReject(const TQString &str)
 // Read incoming data
 void NetMeeting::readNotifier(int fd)
 {
-	int i = sm.find(fd);
+	int i = sm.tqfind(fd);
     Q_ASSERT( i!=-1 );
 	switch ( sm[i]->read() ) {
 	 case -1: readError(i);  break;
@@ -213,8 +213,8 @@ void NetMeeting::message(const TQString &str)
 /** ServerNetMeeting *********************************************************/
 ServerNetMeeting::ServerNetMeeting(const cId &id,
 	const RemoteHostData &r, MPOptionWidget *option,
-	TQPtrList<RemoteHostData> &arhd, TQWidget *parent, const char * name)
-: NetMeeting(id, r.socket, option, TRUE, parent, name), rhd(arhd)
+	TQPtrList<RemoteHostData> &arhd, TQWidget *tqparent, const char * name)
+: NetMeeting(id, r.socket, option, TRUE, tqparent, name), rhd(arhd)
 {
 	connect(sm[0]->notifier(), TQT_SIGNAL(activated(int)), TQT_SLOT(newHost(int)));
 	players.append(Accepted); // server
@@ -241,7 +241,7 @@ void ServerNetMeeting::writeToAll(uint i)
 void ServerNetMeeting::netError(uint i, const TQString &type)
 {
 	Q_ASSERT( i!=0 );
-	disconnectHost(i, i18n("%1 client #%2: disconnect it").arg(type).arg(i));
+	disconnectHost(i, i18n("%1 client #%2: disconnect it").tqarg(type).tqarg(i));
 }
 
 void ServerNetMeeting::disconnectHost(uint i, const TQString &str)
@@ -265,7 +265,7 @@ void ServerNetMeeting::newHost(int)
     int res = sm[0]->accept(s);
     if ( res!=0 ) {
         message(i18n("Failed to accept incoming client:\n%1")
-                .arg(socketError(s)));
+                .tqarg(socketError(s)));
         return;
     }
 	players.append(NewPlayer);
@@ -301,7 +301,7 @@ void ServerNetMeeting::idFlag(uint i)
 
 void ServerNetMeeting::endFlag(uint i)
 {
-	disconnectHost(i, i18n("Client #%1 has left").arg(i));
+	disconnectHost(i, i18n("Client #%1 has left").tqarg(i));
 }
 
 void ServerNetMeeting::newFlag(uint i)
@@ -421,7 +421,7 @@ void ServerNetMeeting::accept()
 
 			// send play message to client (Play flag
 			// + bool [accepted/rejected])
-			sm[0]->writingStream() << PlayFlag << (Q_UINT8)willPlay;
+			sm[0]->writingStream() << PlayFlag << (TQ_UINT8)willPlay;
 			// if write failed and the client is not playing : silently
 			// put it aside ...
 			if ( !sm[0]->write() && willPlay ) {
@@ -448,8 +448,8 @@ void ServerNetMeeting::optionsChanged()
 /** ClientNetMeeting *********************************************************/
 ClientNetMeeting::ClientNetMeeting(const cId &id,
 		const RemoteHostData &rhd, MPOptionWidget *option,
-	    TQWidget *parent, const char * name)
-: NetMeeting(id, rhd.socket, option, FALSE, parent, name), bds(rhd.bds)
+	    TQWidget *tqparent, const char * name)
+: NetMeeting(id, rhd.socket, option, FALSE, tqparent, name), bds(rhd.bds)
 {
 	connect(sm[0]->notifier(), TQT_SIGNAL(activated(int)),
 			TQT_SLOT(readNotifier(int)));
@@ -462,7 +462,7 @@ ClientNetMeeting::ClientNetMeeting(const cId &id,
 
 void ClientNetMeeting::netError(uint, const TQString &str)
 {
-	cleanReject(i18n("%1 server: aborting connection.").arg(str));
+	cleanReject(i18n("%1 server: aborting connection.").tqarg(str));
 }
 
 void ClientNetMeeting::writeToAll(uint)
@@ -529,7 +529,7 @@ void ClientNetMeeting::delFlag(uint)
 	sm[0]->readingStream() >> k;
 	CHECK_READ(0);
 	removeLine(k-1);
-	message(i18n("Client %1 has left").arg(k));
+	message(i18n("Client %1 has left").tqarg(k));
 }
 
 void ClientNetMeeting::textChanged(const TQString &text)
@@ -549,7 +549,7 @@ void ClientNetMeeting::typeChanged(MeetingCheckBox::Type type)
 void ClientNetMeeting::playFlag(uint)
 {
 	// receive accept or reject (bool)
-	Q_UINT8 i;
+	TQ_UINT8 i;
 	sm[0]->readingStream() >> i;
 	CHECK_READ(0);
     sm[0]->notifier()->setEnabled(false);