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:
14 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/network/socket/qabstractsocket.cpp

    r651 r769  
    156156    examples for an overview of both approaches.
    157157
     158
     159
     160
    158161    QAbstractSocket can be used with QTextStream and QDataStream's
    159162    stream operators (operator<<() and operator>>()). There is one
     
    170173    the host lookup has succeeded.
    171174
     175
     176
     177
     178
    172179    \sa connected()
    173180*/
     
    178185    This signal is emitted after connectToHost() has been called and
    179186    a connection has been successfully established.
     187
     188
     189
     190
    180191
    181192    \sa connectToHost(), disconnected()
     
    352363#include "qabstractsocket_p.h"
    353364
     365
     366
    354367#include <qabstracteventdispatcher.h>
    355368#include <qdatetime.h>
     
    13671380#endif
    13681381    } else {
    1369         if (d->threadData->eventDispatcher)
    1370             d->hostLookupId = QHostInfo::lookupHost(hostName, this, SLOT(_q_startConnecting(QHostInfo)));
     1382        if (d->threadData->eventDispatcher) {
     1383            // this internal API for QHostInfo either immediatly gives us the desired
     1384            // QHostInfo from cache or later calls the _q_startConnecting slot.
     1385            bool immediateResultValid = false;
     1386            QHostInfo hostInfo = qt_qhostinfo_lookup(hostName,
     1387                                                     this,
     1388                                                     SLOT(_q_startConnecting(QHostInfo)),
     1389                                                     &immediateResultValid,
     1390                                                     &d->hostLookupId);
     1391            if (immediateResultValid) {
     1392                d->hostLookupId = -1;
     1393                d->_q_startConnecting(hostInfo);
     1394            }
     1395        }
    13711396    }
    13721397
     
    16831708    If msecs is -1, this function will not time out.
    16841709
    1685     Note: This function may wait slightly longer than \a msecs,
     1710    This function may wait slightly longer than \a msecs,
    16861711    depending on the time it takes to complete the host lookup.
     1712
     1713
     1714
    16871715
    16881716    \sa connectToHost(), connected()
     
    17231751    }
    17241752    if (state() == UnconnectedState)
    1725         return false;
     1753        return false;
    17261754
    17271755    bool timedOut = true;
     
    23552383        qDebug("QAbstractSocket::disconnectFromHost() aborting immediately");
    23562384#endif
     2385
     2386
     2387
     2388
    23572389    } else {
    23582390        // Perhaps emit closing()
  • trunk/src/network/socket/qlocalserver.cpp

    r755 r769  
    123123    d->pendingConnections.clear();
    124124    d->closeServer();
    125     d->serverName = QString();
    126     d->fullServerName = QString();
    127     d->errorString = QString();
     125    d->serverName();
     126    d->fullServerName();
     127    d->errorString();
    128128    d->error = QAbstractSocket::UnknownSocketError;
    129129}
     
    229229
    230230    if (!d->listen(name)) {
    231         d->serverName = QString();
    232         d->fullServerName = QString();
     231        d->serverName();
     232        d->fullServerName();
    233233        return false;
    234234    }
  • trunk/src/network/socket/qlocalserver_win.cpp

    r651 r769  
    168168        } else {
    169169            if (GetLastError() != ERROR_IO_INCOMPLETE) {
     170
    170171                setError(QLatin1String("QLocalServerPrivate::_q_onNewConnection"));
    171                 closeServer();
    172172                return;
    173173            }
  • trunk/src/network/socket/qlocalsocket_p.h

    r651 r769  
    129129    void _q_error(QAbstractSocket::SocketError newError);
    130130#elif defined(Q_OS_WIN)
    131     ~QLocalSocketPrivate() {
    132         CloseHandle(overlapped.hEvent);
    133     }
    134 
     131    ~QLocalSocketPrivate();
     132    void destroyPipeHandles();
    135133    void setErrorString(const QString &function);
    136134    void _q_notified();
  • trunk/src/network/socket/qlocalsocket_tcp.cpp

    r651 r769  
    103103    case QAbstractSocket::UnconnectedState:
    104104        state = QLocalSocket::UnconnectedState;
    105         serverName = QString();
    106         fullServerName = QString();
     105        serverName();
     106        fullServerName();
    107107        break;
    108108    case QAbstractSocket::ConnectingState:
     
    219219        return;
    220220
    221     d->errorString = QString();
     221    d->errorString();
    222222    d->state = ConnectingState;
    223223    emit stateChanged(d->state);
     
    334334    Q_D(QLocalSocket);
    335335    d->tcpSocket->close();
    336     d->serverName = QString();
    337     d->fullServerName = QString();
     336    d->serverName();
     337    d->fullServerName();
    338338    QIODevice::close();
    339339}
  • trunk/src/network/socket/qlocalsocket_unix.cpp

    r651 r769  
    110110    case QAbstractSocket::UnconnectedState:
    111111        state = QLocalSocket::UnconnectedState;
    112         serverName = QString();
    113         fullServerName = QString();
     112        serverName();
     113        fullServerName();
    114114        break;
    115115    case QAbstractSocket::ConnectingState:
     
    226226        return;
    227227
    228     d->errorString = QString();
     228    d->errorString();
    229229    d->unixSocket.setSocketState(QAbstractSocket::ConnectingState);
    230230    d->state = ConnectingState;
     
    342342    }
    343343    connectingSocket = -1;
    344     connectingName = QString();
     344    connectingName();
    345345    connectingOpenMode = 0;
    346346}
     
    439439        ::close(d->connectingSocket);
    440440    d->connectingSocket = -1;
    441     d->connectingName = QString();
     441    d->connectingName();
    442442    d->connectingOpenMode = 0;
    443     d->serverName = QString();
    444     d->fullServerName = QString();
     443    d->serverName();
     444    d->fullServerName();
    445445    QIODevice::close();
    446446}
  • trunk/src/network/socket/qlocalsocket_win.cpp

    r651 r769  
    4040****************************************************************************/
    4141
    42 #include "qlocalsocket.h"
    4342#include "qlocalsocket_p.h"
    4443