Changeset 769 for trunk/src/network/socket/qlocalsocket_unix.cpp

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)
• src/network/socket/qlocalsocket_unix.cpp (modified) (4 diffs)

trunk/src/network/socket/qlocalsocket_unix.cpp

@@ -110 +110 @@
     case QAbstractSocket::UnconnectedState:
         state = QLocalSocket::UnconnectedState;
-        serverName = QString();
-        fullServerName = QString();
+        serverName();
+        fullServerName();
         break;
     case QAbstractSocket::ConnectingState:
@@ -226 +226 @@
         return;
 
-    d->errorString = QString();
+    d->errorString();
     d->unixSocket.setSocketState(QAbstractSocket::ConnectingState);
     d->state = ConnectingState;
@@ -342 +342 @@
     }
     connectingSocket = -1;
-    connectingName = QString();
+    connectingName();
     connectingOpenMode = 0;
 }
@@ -439 +439 @@
         ::close(d->connectingSocket);
     d->connectingSocket = -1;
-    d->connectingName = QString();
+    d->connectingName();
     d->connectingOpenMode = 0;
-    d->serverName = QString();
-    d->fullServerName = QString();
+    d->serverName();
+    d->fullServerName();
     QIODevice::close();
 }