diff options
Diffstat (limited to 'src/tools/ntqtl.h')
| -rw-r--r-- | src/tools/ntqtl.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/tools/ntqtl.h b/src/tools/ntqtl.h index ae8c5af87..ee601c157 100644 --- a/src/tools/ntqtl.h +++ b/src/tools/ntqtl.h @@ -72,7 +72,7 @@ public: #endif //QT_NO_TEXTSTREAM template <class InputIterator, class OutputIterator> -inline OutputIterator qCopy( InputIterator _begin, InputIterator _end, +inline OutputIterator tqCopy( InputIterator _begin, InputIterator _end, OutputIterator _dest ) { while( _begin != _end ) @@ -81,7 +81,7 @@ inline OutputIterator qCopy( InputIterator _begin, InputIterator _end, } template <class BiIterator, class BiOutputIterator> -inline BiOutputIterator qCopyBackward( BiIterator _begin, BiIterator _end, +inline BiOutputIterator tqCopyBackward( BiIterator _begin, BiIterator _end, BiOutputIterator _dest ) { while ( _begin != _end ) @@ -90,7 +90,7 @@ inline BiOutputIterator qCopyBackward( BiIterator _begin, BiIterator _end, } template <class InputIterator1, class InputIterator2> -inline bool qEqual( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2 ) +inline bool tqEqual( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2 ) { // ### compare using !(*first1 == *first2) in TQt 4.0 for ( ; first1 != last1; ++first1, ++first2 ) @@ -100,7 +100,7 @@ inline bool qEqual( InputIterator1 first1, InputIterator1 last1, InputIterator2 } template <class ForwardIterator, class T> -inline void qFill( ForwardIterator first, ForwardIterator last, const T& val ) +inline void tqFill( ForwardIterator first, ForwardIterator last, const T& val ) { for ( ; first != last; ++first ) *first = val; @@ -122,7 +122,7 @@ inline OutputIterator qReverseCopy( BiIterator _begin, BiIterator _end, template <class InputIterator, class T> -inline InputIterator qFind( InputIterator first, InputIterator last, +inline InputIterator tqFind( InputIterator first, InputIterator last, const T& val ) { while ( first != last && *first != val ) @@ -131,7 +131,7 @@ inline InputIterator qFind( InputIterator first, InputIterator last, } template <class InputIterator, class T, class Size> -inline void qCount( InputIterator first, InputIterator last, const T& value, +inline void tqCount( InputIterator first, InputIterator last, const T& value, Size& n ) { for ( ; first != last; ++first ) @@ -140,7 +140,7 @@ inline void qCount( InputIterator first, InputIterator last, const T& value, } template <class T> -inline void qSwap( T& _value1, T& _value2 ) +inline void tqSwap( T& _value1, T& _value2 ) { T tmp = _value1; _value1 = _value2; @@ -170,7 +170,7 @@ Q_INLINE_TEMPLATES void qBubbleSort( InputIterator b, InputIterator e ) --y; if ( *x < *y ) { swapped = TRUE; - qSwap( *x, *y ); + tqSwap( *x, *y ); swap_pos = y; } } while( y != b ); @@ -197,18 +197,18 @@ Q_INLINE_TEMPLATES void qHeapSortPushDown( Value* heap, int first, int last ) if ( last == 2 * r ) { // node r has only one child if ( heap[2 * r] < heap[r] ) - qSwap( heap[r], heap[2 * r] ); + tqSwap( heap[r], heap[2 * r] ); r = last; } else { // node r has two children if ( heap[2 * r] < heap[r] && !(heap[2 * r + 1] < heap[2 * r]) ) { // swap with left child - qSwap( heap[r], heap[2 * r] ); + tqSwap( heap[r], heap[2 * r] ); r *= 2; } else if ( heap[2 * r + 1] < heap[r] && heap[2 * r + 1] < heap[2 * r] ) { // swap with right child - qSwap( heap[r], heap[2 * r + 1] ); + tqSwap( heap[r], heap[2 * r + 1] ); r = 2 * r + 1; } else { r = last; @@ -231,7 +231,7 @@ Q_INLINE_TEMPLATES void qHeapSortHelper( InputIterator b, InputIterator e, Value heap[++size] = *insert; int i = size; while( i > 1 && heap[i] < heap[i / 2] ) { - qSwap( heap[i], heap[i / 2] ); + tqSwap( heap[i], heap[i / 2] ); i /= 2; } } |