author | llornkcor <llornkcor> | 2003-07-10 02:40:10 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2003-07-10 02:40:10 (UTC) |
commit | 155d68c1e7d7dc0fed2534ac43d6d77ce2781f55 (patch) (side-by-side diff) | |
tree | e6edaa5a7040fe6c224c3943d1094dcf02e4f74c /qmake/tools/qcstring.cpp | |
parent | 86703e8a5527ef114facd02c005b6b3a7e62e263 (diff) | |
download | opie-155d68c1e7d7dc0fed2534ac43d6d77ce2781f55.zip opie-155d68c1e7d7dc0fed2534ac43d6d77ce2781f55.tar.gz opie-155d68c1e7d7dc0fed2534ac43d6d77ce2781f55.tar.bz2 |
update qmake to 1.05a
-rw-r--r-- | qmake/tools/qcstring.cpp | 91 |
1 files changed, 64 insertions, 27 deletions
diff --git a/qmake/tools/qcstring.cpp b/qmake/tools/qcstring.cpp index cf1b853..4651b97 100644 --- a/qmake/tools/qcstring.cpp +++ b/qmake/tools/qcstring.cpp @@ -143,2 +143,13 @@ char *qstrncpy( char *dst, const char *src, uint len ) /*! + \fn uint qstrlen( const char *str ); + + \relates QCString + + A safe strlen function. + + Returns the number of characters that precede the terminating '\0'. + or 0 if \a str is 0. +*/ + +/*! \fn int qstrcmp( const char *str1, const char *str2 ); @@ -301,3 +312,4 @@ Q_UINT16 qChecksum( const char *data, uint len ) #ifdef QT_THREAD_SUPPORT - QMutexLocker locker( qt_global_mutexpool->get( &crc_tbl_init ) ); + QMutexLocker locker( qt_global_mutexpool ? + qt_global_mutexpool->get( &crc_tbl_init ) : 0 ); #endif // QT_THREAD_SUPPORT @@ -321,5 +333,11 @@ Q_UINT16 qChecksum( const char *data, uint len ) -/*! \fn QByteArray qCompress( const QByteArray& data) +/*! + \fn QByteArray qCompress( const QByteArray& data ) + \relates QByteArray - \overload + + Compresses the array \a data and returns the compressed byte + array. + + \sa qUncompress() */ @@ -329,6 +347,6 @@ Q_UINT16 qChecksum( const char *data, uint len ) + \overload + Compresses the array \a data which is \a nbytes long and returns the compressed byte array. - - \sa qUncompress() */ @@ -381,5 +399,19 @@ QByteArray qCompress( const uchar* data, int nbytes ) -/*! \fn QByteArray qUncompress( const QByteArray& data ) +/*! + \fn QByteArray qUncompress( const QByteArray& data ) + \relates QByteArray - \overload + + Uncompresses the array \a data and returns the uncompressed byte + array. + + Returns an empty QByteArray if the input data was corrupt. + \omit + ADD THE FOLLOWING FOR Qt 4.0 + This function will uncompress data compressed with qCompress() + from this and any earlier Qt version, back to Qt 3.1 when this + feature was added. + \endomit + + \sa qCompress() */ @@ -389,8 +421,6 @@ QByteArray qCompress( const uchar* data, int nbytes ) + \overload + Uncompresses the array \a data which is \a nbytes long and returns the uncompressed byte array. - - Returns an empty QByteArray if the input data was corrupt. - - \sa qCompress() */ @@ -938,2 +968,7 @@ int QCString::find( const char *str, int index, bool cs ) const { + return find( str, index, cs, length() ); +} + +int QCString::find( const char *str, int index, bool cs, uint l ) const +{ if ( (uint)index >= size() ) @@ -944,3 +979,2 @@ int QCString::find( const char *str, int index, bool cs ) const return index; - const uint l = length(); const uint sl = qstrlen( str ); @@ -1154,4 +1188,5 @@ int QCString::contains( const char *str, bool cs ) const int i = -1; + uint l = length(); // use find for the faster hashing algorithm - while ( ( i = find ( str, i+1, cs ) ) != -1 ) + while ( ( i = find ( str, i+1, cs, l ) ) != -1 ) count++; @@ -1175,3 +1210,2 @@ int QCString::contains( const char *str, bool cs ) const */ - QCString QCString::left( uint len ) const @@ -1499,3 +1533,3 @@ QCString &QCString::insert( uint index, const char *s ) detach(); - if ( QByteArray::resize(nlen+index-olen+1) ) { + if ( QByteArray::resize(nlen+index-olen+1, QByteArray::SpeedOptim ) ) { memset( data()+olen, ' ', index-olen ); @@ -1503,4 +1537,5 @@ QCString &QCString::insert( uint index, const char *s ) } - } else if ( QByteArray::resize(nlen+1) ) { // normal insert + } else { detach(); + if ( QByteArray::resize(nlen+1, QByteArray::SpeedOptim ) ) { // normal insert memmove( data()+index+len, data()+index, olen-index+1 ); @@ -1508,2 +1543,3 @@ QCString &QCString::insert( uint index, const char *s ) } + } return *this; @@ -1571,3 +1607,3 @@ QCString &QCString::remove( uint index, uint len ) memmove( data()+index, data()+index+len, olen-index-len+1 ); - QByteArray::resize(olen-len+1); + QByteArray::resize(olen-len+1, QByteArray::SpeedOptim ); } @@ -1633,2 +1669,3 @@ QCString &QCString::replace( char c, const char *after ) */ + QCString &QCString::replace( const char *before, const char *after ) @@ -1648,3 +1685,3 @@ QCString &QCString::replace( const char *before, const char *after ) if ( bl ) { - while( (index = find( before, index ) ) != -1 ) { + while( (index = find( before, index, TRUE, len ) ) != -1 ) { memcpy( d+index, after, al ); @@ -1657,3 +1694,3 @@ QCString &QCString::replace( const char *before, const char *after ) uint num = 0; - while( (index = find( before, index ) ) != -1 ) { + while( (index = find( before, index, TRUE, len ) ) != -1 ) { if ( num ) { @@ -1688,3 +1725,3 @@ QCString &QCString::replace( const char *before, const char *after ) while( pos < 4095 ) { - index = find(before, index); + index = find(before, index, TRUE, len); if ( index == -1 ) @@ -1765,3 +1802,3 @@ int QCString::find( const QRegExp& rx, int index ) const { - QString d = QString::fromLatin1( data() ); + QString d = QString::fromAscii( data() ); return d.find( rx, index ); @@ -1785,3 +1822,3 @@ int QCString::findRev( const QRegExp& rx, int index ) const { - QString d = QString::fromLatin1( data() ); + QString d = QString::fromAscii( data() ); return d.findRev( rx, index ); @@ -1810,3 +1847,3 @@ int QCString::contains( const QRegExp &rx ) const { - QString d = QString::fromLatin1( data() ); + QString d = QString::fromAscii( data() ); return d.contains( rx ); @@ -1840,4 +1877,4 @@ QCString &QCString::replace( const QRegExp &rx, const char *str ) { - QString d = QString::fromLatin1( data() ); - QString r = QString::fromLatin1( str ); + QString d = QString::fromAscii( data() ); + QString r = QString::fromAscii( str ); d.replace( rx, r ); @@ -2201,3 +2238,3 @@ QCString& QCString::operator+=( const char *str ) uint len2 = qstrlen(str); - if ( !QByteArray::resize( len1 + len2 + 1 ) ) + if ( !QByteArray::resize( len1 + len2 + 1, QByteArray::SpeedOptim ) ) return *this; // no memory @@ -2217,3 +2254,3 @@ QCString &QCString::operator+=( char c ) uint len = length(); - if ( !QByteArray::resize( len + 2 ) ) + if ( !QByteArray::resize( len + 2, QByteArray::SpeedOptim ) ) return *this; // no memory |