diff options
Diffstat (limited to 'src/tools/qstring.cpp')
-rw-r--r-- | src/tools/qstring.cpp | 128 |
1 files changed, 64 insertions, 64 deletions
diff --git a/src/tools/qstring.cpp b/src/tools/qstring.cpp index 26e9b61cd..fcf0637fe 100644 --- a/src/tools/qstring.cpp +++ b/src/tools/qstring.cpp @@ -93,9 +93,9 @@ #define ULLONG_MAX TQ_UINT64_C(18446744073709551615) #endif -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if !defined(TQT_NO_THREAD) && defined(MAKE_QSTRING_THREAD_SAFE) #include "ntqmutex.h" -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // !TQT_NO_THREAD && MAKE_QSTRING_THREAD_SAFE extern TQMutex *tqt_sharedStringMutex; @@ -1054,9 +1054,9 @@ TQStringData::TQStringData() : TQShared(), islatin1(FALSE), security_unpaged(FALSE), cString(0) { -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if !defined(TQT_NO_THREAD) && defined(MAKE_QSTRING_THREAD_SAFE) mutex = new TQMutex(FALSE); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // !TQT_NO_THREAD && MAKE_QSTRING_THREAD_SAFE ref(); } @@ -1069,9 +1069,9 @@ TQStringData::TQStringData(TQChar *u, uint l, uint m) : TQShared(), islatin1(FALSE), security_unpaged(FALSE), cString(0) { -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if !defined(TQT_NO_THREAD) && defined(MAKE_QSTRING_THREAD_SAFE) mutex = new TQMutex(FALSE); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // !TQT_NO_THREAD && MAKE_QSTRING_THREAD_SAFE } TQStringData::~TQStringData() { @@ -1089,12 +1089,12 @@ TQStringData::~TQStringData() { if (cString) { delete cString; } -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if !defined(TQT_NO_THREAD) && defined(MAKE_QSTRING_THREAD_SAFE) if ( mutex ) { delete mutex; mutex = NULL; } -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // !TQT_NO_THREAD && MAKE_QSTRING_THREAD_SAFE } void TQStringData::setDirty() { @@ -1466,14 +1466,14 @@ const TQChar TQChar::nbsp((ushort)0x00a0); TQStringData* TQString::makeSharedNull() { -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if !defined(TQT_NO_THREAD) && defined(MAKE_QSTRING_THREAD_SAFE) if (tqt_sharedStringMutex) tqt_sharedStringMutex->lock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // !TQT_NO_THREAD && MAKE_QSTRING_THREAD_SAFE if (TQString::shared_null) { -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if !defined(TQT_NO_THREAD) && defined(MAKE_QSTRING_THREAD_SAFE) if (tqt_sharedStringMutex) tqt_sharedStringMutex->unlock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // !TQT_NO_THREAD && MAKE_QSTRING_THREAD_SAFE return TQString::shared_null; } @@ -1483,9 +1483,9 @@ TQStringData* TQString::makeSharedNull() that->d = TQString::shared_null; #endif -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if !defined(TQT_NO_THREAD) && defined(MAKE_QSTRING_THREAD_SAFE) if (tqt_sharedStringMutex) tqt_sharedStringMutex->unlock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // !TQT_NO_THREAD && MAKE_QSTRING_THREAD_SAFE return TQString::shared_null; } @@ -1526,13 +1526,13 @@ TQString::TQString( const TQString &s ) : d(s.d) { if ( d && (d != shared_null) ) { -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if !defined(TQT_NO_THREAD) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->lock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // !TQT_NO_THREAD && MAKE_QSTRING_THREAD_SAFE d->ref(); -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if !defined(TQT_NO_THREAD) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // !TQT_NO_THREAD && MAKE_QSTRING_THREAD_SAFE } } @@ -1685,20 +1685,20 @@ TQString::~TQString() return; } -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if !defined(TQT_NO_THREAD) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->lock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // !TQT_NO_THREAD && MAKE_QSTRING_THREAD_SAFE if ( d->deref() ) { -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if !defined(TQT_NO_THREAD) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // !TQT_NO_THREAD && MAKE_QSTRING_THREAD_SAFE d->deleteSelf(); d = NULL; } else { -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if !defined(TQT_NO_THREAD) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // !TQT_NO_THREAD && MAKE_QSTRING_THREAD_SAFE } } @@ -1720,22 +1720,22 @@ void TQString::real_detach() void TQString::deref() { if ( d && (d != shared_null) ) { -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if !defined(TQT_NO_THREAD) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->lock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // !TQT_NO_THREAD && MAKE_QSTRING_THREAD_SAFE if ( d->deref() ) { -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if !defined(TQT_NO_THREAD) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // !TQT_NO_THREAD && MAKE_QSTRING_THREAD_SAFE if ( d != shared_null ) { delete d; } d = 0; } else { -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if !defined(TQT_NO_THREAD) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // !TQT_NO_THREAD && MAKE_QSTRING_THREAD_SAFE } } } @@ -1778,13 +1778,13 @@ void TQStringData::deleteSelf() TQString &TQString::operator=( const TQString &s ) { if ( s.d && (s.d != shared_null) ) { -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if !defined(TQT_NO_THREAD) && defined(MAKE_QSTRING_THREAD_SAFE) s.d->mutex->lock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // !TQT_NO_THREAD && MAKE_QSTRING_THREAD_SAFE s.d->ref(); -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if !defined(TQT_NO_THREAD) && defined(MAKE_QSTRING_THREAD_SAFE) s.d->mutex->unlock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // !TQT_NO_THREAD && MAKE_QSTRING_THREAD_SAFE } deref(); d = s.d; @@ -1892,9 +1892,9 @@ void TQString::truncate( uint newLen ) */ void TQString::setLength( uint newLen ) { -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if !defined(TQT_NO_THREAD) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->lock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // !TQT_NO_THREAD && MAKE_QSTRING_THREAD_SAFE if ( d->count != 1 || newLen > d->maxl || ( newLen * 4 < d->maxl && d->maxl > 4 ) ) { @@ -1905,24 +1905,24 @@ void TQString::setLength( uint newLen ) uint len = TQMIN( d->len, newLen ); memcpy( nd, d->unicode, sizeof(TQChar) * len ); bool unpaged = d->security_unpaged; -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if !defined(TQT_NO_THREAD) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // !TQT_NO_THREAD && MAKE_QSTRING_THREAD_SAFE deref(); d = new TQStringData( nd, newLen, newMax ); setSecurityUnPaged(unpaged); } else { -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if !defined(TQT_NO_THREAD) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // !TQT_NO_THREAD && MAKE_QSTRING_THREAD_SAFE } } else { d->len = newLen; -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if !defined(TQT_NO_THREAD) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // !TQT_NO_THREAD && MAKE_QSTRING_THREAD_SAFE d->setDirty(); } } @@ -2008,21 +2008,21 @@ void TQString::squeeze() */ void TQString::grow( uint newLen ) { -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if !defined(TQT_NO_THREAD) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->lock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // !TQT_NO_THREAD && MAKE_QSTRING_THREAD_SAFE if ( d->count != 1 || newLen > d->maxl ) { -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if !defined(TQT_NO_THREAD) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // !TQT_NO_THREAD && MAKE_QSTRING_THREAD_SAFE setLength( newLen ); } else { d->len = newLen; -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if !defined(TQT_NO_THREAD) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // !TQT_NO_THREAD && MAKE_QSTRING_THREAD_SAFE d->setDirty(); } } @@ -6447,19 +6447,19 @@ TQString TQString::fromUcs2( const unsigned short *str ) */ TQChar& TQString::ref(uint i) { -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if !defined(TQT_NO_THREAD) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->lock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // !TQT_NO_THREAD && MAKE_QSTRING_THREAD_SAFE if ( (d->count != 1) || (i >= d->len) ) { -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if !defined(TQT_NO_THREAD) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // !TQT_NO_THREAD && MAKE_QSTRING_THREAD_SAFE subat( i ); } else { -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if !defined(TQT_NO_THREAD) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // !TQT_NO_THREAD && MAKE_QSTRING_THREAD_SAFE } d->setDirty(); return d->unicode[i]; @@ -6547,9 +6547,9 @@ TQString& TQString::setUnicode( const TQChar *unicode, uint len ) } } else { -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if !defined(TQT_NO_THREAD) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->lock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // !TQT_NO_THREAD && MAKE_QSTRING_THREAD_SAFE if ( d->count != 1 || len > d->maxl || ( len * 4 < d->maxl && d->maxl > 4 ) ) { // detach, grown or shrink uint newMax = computeNewMax( len ); @@ -6557,17 +6557,17 @@ TQString& TQString::setUnicode( const TQChar *unicode, uint len ) if ( unicode ) { memcpy( nd, unicode, sizeof(TQChar)*len ); } -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if !defined(TQT_NO_THREAD) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // !TQT_NO_THREAD && MAKE_QSTRING_THREAD_SAFE deref(); d = new TQStringData( nd, len, newMax ); } else { d->len = len; -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if !defined(TQT_NO_THREAD) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // !TQT_NO_THREAD && MAKE_QSTRING_THREAD_SAFE d->setDirty(); if ( unicode ) { memcpy( d->unicode, unicode, sizeof(TQChar)*len ); @@ -7278,9 +7278,9 @@ TQConstString::TQConstString( const TQChar* unicode, uint length ) : */ TQConstString::~TQConstString() { -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if !defined(TQT_NO_THREAD) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->lock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // !TQT_NO_THREAD && MAKE_QSTRING_THREAD_SAFE if ( d->count > 1 ) { TQChar* cp = QT_ALLOC_QCHAR_VEC( d->len ); @@ -7292,9 +7292,9 @@ TQConstString::~TQConstString() } // The original d->unicode is now unlinked. -#if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) +#if !defined(TQT_NO_THREAD) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE +#endif // !TQT_NO_THREAD && MAKE_QSTRING_THREAD_SAFE } /*! |