Changeset 769 for trunk/examples/network/network-chat

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• examples/network/network-chat/chatdialog.cpp (modified) (1 diff)
• examples/network/network-chat/client.cpp (modified) (1 diff)
• examples/network/network-chat/connection.cpp (modified) (3 diffs)
• examples/network/network-chat/network-chat.pro (modified) (1 diff)
• examples/network/network-chat/peermanager.cpp (modified) (1 diff)

trunk/examples/network/network-chat/chatdialog.cpp

@@ -80 +80 @@
     cursor.movePosition(QTextCursor::End);
     QTextTable *table = cursor.insertTable(1, 2, tableFormat);
-    table->cellAt(0, 0).firstCursorPosition().insertText("<" + from + "> ");
+    table->cellAt(0, 0).firstCursorPosition().insertText( + from + "> ");
     table->cellAt(0, 1).firstCursorPosition().insertText(message);
     QScrollBar *bar = textEdit->verticalScrollBar();

trunk/examples/network/network-chat/client.cpp

@@ -70 +70 @@
 QString Client::nickName() const
 {
-    return QString(peerManager->userName()) + "@" + QHostInfo::localHostName()
-           + ":" + QString::number(server.serverPort());
+    return QString(peerManager->userName()) +  + QHostInfo::localHostName()
+           +  + QString::number(server.serverPort());
 }
 

trunk/examples/network/network-chat/connection.cpp

@@ -84 +84 @@
 
     QByteArray msg = message.toUtf8();
-    QByteArray data = "MESSAGE " + QByteArray::number(msg.size()) + " " + msg;
+    QByteArray data = "MESSAGE " + QByteArray::number(msg.size()) +  + msg;
     return write(data) == data.size();
 }
@@ -119 +119 @@
         }
 
-        username = QString(buffer) + "@" + peerAddress().toString() + ":"
+        username = QString(buffer) + 
                    + QString::number(peerPort());
         currentDataType = Undefined;
@@ -163 +163 @@
 {
     QByteArray greeting = greetingMessage.toUtf8();
-    QByteArray data = "GREETING " + QByteArray::number(greeting.size()) + " " + greeting;
+    QByteArray data = "GREETING " + QByteArray::number(greeting.size()) +  + greeting;
     if (write(data) == data.size())
         isGreetingMessageSent = true;

trunk/examples/network/network-chat/network-chat.pro

@@ -22 +22 @@
     include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     HEADERS += $$QT_SOURCE_TREE/examples/network/qftp/sym_iap_util.h
-    LIBS += -lesock -lconnmon -lcharconv -linsock
+    LIBS += -lesock -lcommdb -linsock # For IAP selection
+    LIBS += -lcharconv
     TARGET.CAPABILITY = "NetworkServices ReadUserData WriteUserData"
     TARGET.EPOCHEAPSIZE = 0x20000 0x2000000

trunk/examples/network/network-chat/peermanager.cpp

@@ -62 +62 @@
         int index = environment.indexOf(QRegExp(string));
         if (index != -1) {
-            QStringList stringList = environment.at(index).split("=");
+            QStringList stringList = environment.at(index).split();
             if (stringList.size() == 2) {
                 username = stringList.at(1).toUtf8();