2 files changed, 25 insertions, 25 deletions

diff --git a/examples/network/clientserver/client/client.cpp b/examples/network/clientserver/client/client.cpp
index cda1f571a..aba0fef02 100644
--- a/examples/network/clientserver/client/client.cpp
+++ b/examples/network/clientserver/client/client.cpp
@@ -32,20 +32,20 @@ public:
 	TQPushButton *close = new TQPushButton( tr("Close connection") , this );
 	TQPushButton *quit = new TQPushButton( tr("Quit") , this );
 
-	connect( send, SIGNAL(clicked()), SLOT(sendToServer()) );
-	connect( close, SIGNAL(clicked()), SLOT(closeConnection()) );
-	connect( quit, SIGNAL(clicked()), tqApp, SLOT(quit()) );
+	connect( send, TQ_SIGNAL(clicked()), TQ_SLOT(sendToServer()) );
+	connect( close, TQ_SIGNAL(clicked()), TQ_SLOT(closeConnection()) );
+	connect( quit, TQ_SIGNAL(clicked()), tqApp, TQ_SLOT(quit()) );
 
 	// create the socket and connect various of its signals
 	socket = new TQSocket( this );
-	connect( socket, SIGNAL(connected()),
-		SLOT(socketConnected()) );
-	connect( socket, SIGNAL(connectionClosed()),
-		SLOT(socketConnectionClosed()) );
-	connect( socket, SIGNAL(readyRead()),
-		SLOT(socketReadyRead()) );
-	connect( socket, SIGNAL(error(int)),
-		SLOT(socketError(int)) );
+	connect( socket, TQ_SIGNAL(connected()),
+		TQ_SLOT(socketConnected()) );
+	connect( socket, TQ_SIGNAL(connectionClosed()),
+		TQ_SLOT(socketConnectionClosed()) );
+	connect( socket, TQ_SIGNAL(readyRead()),
+		TQ_SLOT(socketReadyRead()) );
+	connect( socket, TQ_SIGNAL(error(int)),
+		TQ_SLOT(socketError(int)) );
 
 	// connect to the server
 	infoText->append( tr("Trying to connect to the server\n") );
@@ -62,8 +62,8 @@ private slots:
 	socket->close();
 	if ( socket->state() == TQSocket::Closing ) {
 	    // We have a delayed close.
-	    connect( socket, SIGNAL(delayedCloseFinished()),
-		    SLOT(socketClosed()) );
+	    connect( socket, TQ_SIGNAL(delayedCloseFinished()),
+		    TQ_SLOT(socketClosed()) );
 	} else {
 	    // The socket is closed.
 	    socketClosed();
diff --git a/examples/network/clientserver/server/server.cpp b/examples/network/clientserver/server/server.cpp
index e2b04e4a8..3d974cb50 100644
--- a/examples/network/clientserver/server/server.cpp
+++ b/examples/network/clientserver/server/server.cpp
@@ -32,10 +32,10 @@ public:
 	TQSocket( parent, name )
     {
 	line = 0;
-	connect( this, SIGNAL(readyRead()),
-		SLOT(readClient()) );
-	connect( this, SIGNAL(connectionClosed()),
-		SLOT(deleteLater()) );
+	connect( this, TQ_SIGNAL(readyRead()),
+		TQ_SLOT(readClient()) );
+	connect( this, TQ_SIGNAL(connectionClosed()),
+		TQ_SLOT(deleteLater()) );
 	setSocket( sock );
     }
 
@@ -120,10 +120,10 @@ public:
 	infoText = new TQTextView( this );
 	TQPushButton *quit = new TQPushButton( tr("Quit") , this );
 
-	connect( server, SIGNAL(newConnect(ClientSocket*)),
-		SLOT(newConnect(ClientSocket*)) );
-	connect( quit, SIGNAL(clicked()), tqApp,
-		SLOT(quit()) );
+	connect( server, TQ_SIGNAL(newConnect(ClientSocket*)),
+		TQ_SLOT(newConnect(ClientSocket*)) );
+	connect( quit, TQ_SIGNAL(clicked()), tqApp,
+		TQ_SLOT(quit()) );
     }
 
     ~ServerInfo()
@@ -134,10 +134,10 @@ private slots:
     void newConnect( ClientSocket *s )
     {
 	infoText->append( tr("New connection\n") );
-	connect( s, SIGNAL(logText(const TQString&)),
-		infoText, SLOT(append(const TQString&)) );
-	connect( s, SIGNAL(connectionClosed()),
-		SLOT(connectionClosed()) );
+	connect( s, TQ_SIGNAL(logText(const TQString&)),
+		infoText, TQ_SLOT(append(const TQString&)) );
+	connect( s, TQ_SIGNAL(connectionClosed()),
+		TQ_SLOT(connectionClosed()) );
     }
 
     void connectionClosed()