Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6

2 files changed, 12 insertions, 12 deletions

diff --git a/examples/network/network-chat/chatdialog.cpp b/examples/network/network-chat/chatdialog.cpp
index 4406844..2dbfd0e 100644
--- a/examples/network/network-chat/chatdialog.cpp
+++ b/examples/network/network-chat/chatdialog.cpp
@@ -58,12 +58,12 @@ ChatDialog::ChatDialog(QWidget *parent)
     connect(sendButton, SIGNAL(clicked()), this, SLOT(returnPressed()));
 #endif
     connect(lineEdit, SIGNAL(returnPressed()), this, SLOT(returnPressed()));
-    connect(&client, SIGNAL(newMessage(const QString &, const QString &)),
-            this, SLOT(appendMessage(const QString &, const QString &)));
-    connect(&client, SIGNAL(newParticipant(const QString &)),
-            this, SLOT(newParticipant(const QString &)));
-    connect(&client, SIGNAL(participantLeft(const QString &)),
-            this, SLOT(participantLeft(const QString &)));
+    connect(&client, SIGNAL(newMessage(QString,QString)),
+            this, SLOT(appendMessage(QString,QString)));
+    connect(&client, SIGNAL(newParticipant(QString)),
+            this, SLOT(newParticipant(QString)));
+    connect(&client, SIGNAL(participantLeft(QString)),
+            this, SLOT(participantLeft(QString)));
 
     myNickName = client.nickName();
     newParticipant(myNickName);
diff --git a/examples/network/network-chat/client.cpp b/examples/network/network-chat/client.cpp
index f1d4ced..58d74fb 100644
--- a/examples/network/network-chat/client.cpp
+++ b/examples/network/network-chat/client.cpp
@@ -51,10 +51,10 @@ Client::Client()
     peerManager->setServerPort(server.serverPort());
     peerManager->startBroadcasting();
 
-    QObject::connect(peerManager, SIGNAL(newConnection(Connection *)),
-                     this, SLOT(newConnection(Connection *)));
-    QObject::connect(&server, SIGNAL(newConnection(Connection *)),
-                     this, SLOT(newConnection(Connection *)));
+    QObject::connect(peerManager, SIGNAL(newConnection(Connection*)),
+                     this, SLOT(newConnection(Connection*)));
+    QObject::connect(&server, SIGNAL(newConnection(Connection*)),
+                     this, SLOT(newConnection(Connection*)));
 }
 
 void Client::sendMessage(const QString &message)
@@ -107,8 +107,8 @@ void Client::readyForUse()
                                      connection->peerPort()))
         return;
 
-    connect(connection, SIGNAL(newMessage(const QString &, const QString &)),
-            this, SIGNAL(newMessage(const QString &, const QString &)));
+    connect(connection, SIGNAL(newMessage(QString,QString)),
+            this, SIGNAL(newMessage(QString,QString)));
 
     peers.insert(connection->peerAddress(), connection);
     QString nick = connection->name();