diff options
| author | Timothy Pearson <[email protected]> | 2012-03-02 02:11:59 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2012-03-02 02:11:59 -0600 |
| commit | 9a75b154bf0732aa3a501b6e31e566e06c5f8a31 (patch) | |
| tree | df1e10cc7504665622d096f9ba80dc9e56f3afb8 /src/network/qsocketdevice_unix.cpp | |
| parent | a830bf10b7d4ed2c83ffe68c0b22d7c4ba9860b0 (diff) | |
| download | qt3-9a75b154bf0732aa3a501b6e31e566e06c5f8a31.tar.gz qt3-9a75b154bf0732aa3a501b6e31e566e06c5f8a31.zip | |
Undo prior accidental commit
Diffstat (limited to 'src/network/qsocketdevice_unix.cpp')
| -rw-r--r-- | src/network/qsocketdevice_unix.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/network/qsocketdevice_unix.cpp b/src/network/qsocketdevice_unix.cpp index 81f21c8..d773a0d 100644 --- a/src/network/qsocketdevice_unix.cpp +++ b/src/network/qsocketdevice_unix.cpp @@ -224,7 +224,7 @@ void QSocketDevice::close() setState( 0 ); ::close( fd ); #if defined(QSOCKETDEVICE_DEBUG) - tqDebug( "QSocketDevice::close: Closed socket %x", fd ); + qDebug( "QSocketDevice::close: Closed socket %x", fd ); #endif fd = -1; fetchConnectionParameters(); @@ -268,7 +268,7 @@ bool QSocketDevice::blocking() const void QSocketDevice::setBlocking( bool enable ) { #if defined(QSOCKETDEVICE_DEBUG) - tqDebug( "QSocketDevice::setBlocking( %d )", enable ); + qDebug( "QSocketDevice::setBlocking( %d )", enable ); #endif if ( !isValid() ) return; @@ -760,20 +760,20 @@ Q_LONG QSocketDevice::readBlock( char *data, Q_ULONG maxlen ) { #if defined(QT_CHECK_NULL) if ( data == 0 && maxlen != 0 ) { - tqWarning( "QSocketDevice::readBlock: Null pointer error" ); + qWarning( "QSocketDevice::readBlock: Null pointer error" ); } #endif #if defined(QT_CHECK_STATE) if ( !isValid() ) { - tqWarning( "QSocketDevice::readBlock: Invalid socket" ); + qWarning( "QSocketDevice::readBlock: Invalid socket" ); return -1; } if ( !isOpen() ) { - tqWarning( "QSocketDevice::readBlock: Device is not open" ); + qWarning( "QSocketDevice::readBlock: Device is not open" ); return -1; } if ( !isReadable() ) { - tqWarning( "QSocketDevice::readBlock: Read operation not permitted" ); + qWarning( "QSocketDevice::readBlock: Read operation not permitted" ); return -1; } #endif @@ -851,25 +851,25 @@ Q_LONG QSocketDevice::writeBlock( const char *data, Q_ULONG len ) { if ( data == 0 && len != 0 ) { #if defined(QT_CHECK_NULL) || defined(QSOCKETDEVICE_DEBUG) - tqWarning( "QSocketDevice::writeBlock: Null pointer error" ); + qWarning( "QSocketDevice::writeBlock: Null pointer error" ); #endif return -1; } if ( !isValid() ) { #if defined(QT_CHECK_STATE) || defined(QSOCKETDEVICE_DEBUG) - tqWarning( "QSocketDevice::writeBlock: Invalid socket" ); + qWarning( "QSocketDevice::writeBlock: Invalid socket" ); #endif return -1; } if ( !isOpen() ) { #if defined(QT_CHECK_STATE) || defined(QSOCKETDEVICE_DEBUG) - tqWarning( "QSocketDevice::writeBlock: Device is not open" ); + qWarning( "QSocketDevice::writeBlock: Device is not open" ); #endif return -1; } if ( !isWritable() ) { #if defined(QT_CHECK_STATE) || defined(QSOCKETDEVICE_DEBUG) - tqWarning( "QSocketDevice::writeBlock: Write operation not permitted" ); + qWarning( "QSocketDevice::writeBlock: Write operation not permitted" ); #endif return -1; } @@ -939,32 +939,32 @@ Q_LONG QSocketDevice::writeBlock( const char * data, Q_ULONG len, { if ( t != Datagram ) { #if defined(QT_CHECK_STATE) || defined(QSOCKETDEVICE_DEBUG) - tqWarning( "QSocketDevice::sendBlock: Not datagram" ); + qWarning( "QSocketDevice::sendBlock: Not datagram" ); #endif return -1; // for now - later we can do t/tcp } if ( data == 0 && len != 0 ) { #if defined(QT_CHECK_NULL) || defined(QSOCKETDEVICE_DEBUG) - tqWarning( "QSocketDevice::sendBlock: Null pointer error" ); + qWarning( "QSocketDevice::sendBlock: Null pointer error" ); #endif return -1; } if ( !isValid() ) { #if defined(QT_CHECK_STATE) || defined(QSOCKETDEVICE_DEBUG) - tqWarning( "QSocketDevice::sendBlock: Invalid socket" ); + qWarning( "QSocketDevice::sendBlock: Invalid socket" ); #endif return -1; } if ( !isOpen() ) { #if defined(QT_CHECK_STATE) || defined(QSOCKETDEVICE_DEBUG) - tqWarning( "QSocketDevice::sendBlock: Device is not open" ); + qWarning( "QSocketDevice::sendBlock: Device is not open" ); #endif return -1; } if ( !isWritable() ) { #if defined(QT_CHECK_STATE) || defined(QSOCKETDEVICE_DEBUG) - tqWarning( "QSocketDevice::sendBlock: Write operation not permitted" ); + qWarning( "QSocketDevice::sendBlock: Write operation not permitted" ); #endif return -1; } |