-rw-r--r-- | qmake/include/qvaluelist.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/qmake/include/qvaluelist.h b/qmake/include/qvaluelist.h index 54f7aec..f5cd7bb 100644 --- a/qmake/include/qvaluelist.h +++ b/qmake/include/qvaluelist.h | |||
@@ -617,49 +617,53 @@ Q_INLINE_TEMPLATES QValueList<T> QValueList<T>::operator+ ( const QValueList<T>& | |||
617 | QValueList<T> l2( *this ); | 617 | QValueList<T> l2( *this ); |
618 | for( const_iterator it = l.begin(); it != l.end(); ++it ) | 618 | for( const_iterator it = l.begin(); it != l.end(); ++it ) |
619 | l2.append( *it ); | 619 | l2.append( *it ); |
620 | return l2; | 620 | return l2; |
621 | } | 621 | } |
622 | 622 | ||
623 | template <class T> | 623 | template <class T> |
624 | Q_INLINE_TEMPLATES QValueList<T>& QValueList<T>::operator+= ( const QValueList<T>& l ) | 624 | Q_INLINE_TEMPLATES QValueList<T>& QValueList<T>::operator+= ( const QValueList<T>& l ) |
625 | { | 625 | { |
626 | for( const_iterator it = l.begin(); it != l.end(); ++it ) | 626 | for( const_iterator it = l.begin(); it != l.end(); ++it ) |
627 | append( *it ); | 627 | append( *it ); |
628 | return *this; | 628 | return *this; |
629 | } | 629 | } |
630 | 630 | ||
631 | template <class T> | 631 | template <class T> |
632 | Q_INLINE_TEMPLATES void QValueList<T>::detachInternal() | 632 | Q_INLINE_TEMPLATES void QValueList<T>::detachInternal() |
633 | { | 633 | { |
634 | sh->deref(); sh = new QValueListPrivate<T>( *sh ); | 634 | sh->deref(); sh = new QValueListPrivate<T>( *sh ); |
635 | } | 635 | } |
636 | 636 | ||
637 | #ifndef QT_NO_DATASTREAM | 637 | #ifndef QT_NO_DATASTREAM |
638 | template <class T> | 638 | template <class T> |
639 | Q_INLINE_TEMPLATES QDataStream& operator>>( QDataStream& s, QValueList<T>& l ) | 639 | Q_INLINE_TEMPLATES QDataStream& operator>>( QDataStream& s, QValueList<T>& l ) |
640 | { | 640 | { |
641 | l.clear(); | 641 | l.clear(); |
642 | Q_UINT32 c; | 642 | Q_UINT32 c; |
643 | s >> c; | 643 | s >> c; |
644 | for( Q_UINT32 i = 0; i < c; ++i ) | 644 | for( Q_UINT32 i = 0; i < c; ++i ) |
645 | { | 645 | { |
646 | T t; | 646 | T t; |
647 | s >> t; | 647 | s >> t; |
648 | l.append( t ); | 648 | l.append( t ); |
649 | if ( s.atEnd() ) | 649 | if ( s.atEnd() ) |
650 | break; | 650 | break; |
651 | } | 651 | } |
652 | return s; | 652 | return s; |
653 | } | 653 | } |
654 | 654 | ||
655 | template <class T> | 655 | template <class T> |
656 | Q_INLINE_TEMPLATES QDataStream& operator<<( QDataStream& s, const QValueList<T>& l ) | 656 | Q_INLINE_TEMPLATES QDataStream& operator<<( QDataStream& s, const QValueList<T>& l ) |
657 | { | 657 | { |
658 | s << (Q_UINT32)l.size(); | 658 | s << (Q_UINT32)l.size(); |
659 | QValueListConstIterator<T> it = l.begin(); | 659 | QValueListConstIterator<T> it = l.begin(); |
660 | for( ; it != l.end(); ++it ) | 660 | for( ; it != l.end(); ++it ) |
661 | s << *it; | 661 | s << *it; |
662 | return s; | 662 | return s; |
663 | } | 663 | } |
664 | #endif // QT_NO_DATASTREAM | 664 | #endif // QT_NO_DATASTREAM |
665 | #ifdef QT_QWINEXPORT | ||
666 | #define Q_DEFINED_QVALUELIST | ||
667 | #include "qwinexport.h" | ||
668 | #endif /* QT_QWINEXPORT */ | ||
665 | #endif // QVALUELIST_H | 669 | #endif // QVALUELIST_H |