-rw-r--r-- | qmake/include/qstrlist.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qmake/include/qstrlist.h b/qmake/include/qstrlist.h index 86de328..b9dd753 100644 --- a/qmake/include/qstrlist.h +++ b/qmake/include/qstrlist.h | |||
@@ -24,52 +24,54 @@ | |||
24 | ** | 24 | ** |
25 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 25 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
26 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 26 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
27 | ** | 27 | ** |
28 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for | 28 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for |
29 | ** information about Qt Commercial License Agreements. | 29 | ** information about Qt Commercial License Agreements. |
30 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. | 30 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. |
31 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 31 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
32 | ** | 32 | ** |
33 | ** Contact info@trolltech.com if any conditions of this licensing are | 33 | ** Contact info@trolltech.com if any conditions of this licensing are |
34 | ** not clear to you. | 34 | ** not clear to you. |
35 | ** | 35 | ** |
36 | **********************************************************************/ | 36 | **********************************************************************/ |
37 | 37 | ||
38 | #ifndef QSTRLIST_H | 38 | #ifndef QSTRLIST_H |
39 | #define QSTRLIST_H | 39 | #define QSTRLIST_H |
40 | 40 | ||
41 | #ifndef QT_H | 41 | #ifndef QT_H |
42 | #include "qstring.h" | 42 | #include "qstring.h" |
43 | #include "qptrlist.h" | 43 | #include "qptrlist.h" |
44 | #include "qdatastream.h" | 44 | #include "qdatastream.h" |
45 | #endif // QT_H | 45 | #endif // QT_H |
46 | 46 | ||
47 | 47 | ||
48 | #ifndef QT_QWINEXPORT | ||
48 | #if defined(Q_TEMPLATEDLL) | 49 | #if defined(Q_TEMPLATEDLL) |
49 | Q_TEMPLATE_EXTERN template class Q_EXPORT QPtrList<char>; | 50 | Q_TEMPLATE_EXTERN template class Q_EXPORT QPtrList<char>; |
50 | Q_TEMPLATE_EXTERN template class Q_EXPORT QPtrListIterator<char>; | 51 | Q_TEMPLATE_EXTERN template class Q_EXPORT QPtrListIterator<char>; |
51 | #endif | 52 | #endif |
53 | #endif /* QT_QWINEXPORT */ | ||
52 | 54 | ||
53 | #if defined(Q_QDOC) | 55 | #if defined(Q_QDOC) |
54 | class QStrListIterator : public QPtrListIterator<char> | 56 | class QStrListIterator : public QPtrListIterator<char> |
55 | { | 57 | { |
56 | }; | 58 | }; |
57 | #else | 59 | #else |
58 | typedef QPtrListIterator<char> QStrListIterator; | 60 | typedef QPtrListIterator<char> QStrListIterator; |
59 | #endif | 61 | #endif |
60 | 62 | ||
61 | class Q_EXPORT QStrList : public QPtrList<char> | 63 | class Q_EXPORT QStrList : public QPtrList<char> |
62 | { | 64 | { |
63 | public: | 65 | public: |
64 | QStrList( bool deepCopies=TRUE ) { dc = deepCopies; del_item = deepCopies; } | 66 | QStrList( bool deepCopies=TRUE ) { dc = deepCopies; del_item = deepCopies; } |
65 | QStrList( const QStrList & ); | 67 | QStrList( const QStrList & ); |
66 | ~QStrList() { clear(); } | 68 | ~QStrList() { clear(); } |
67 | QStrList& operator=( const QStrList & ); | 69 | QStrList& operator=( const QStrList & ); |
68 | 70 | ||
69 | private: | 71 | private: |
70 | QPtrCollection::Item newItem( QPtrCollection::Item d ) { return dc ? qstrdup( (const char*)d ) : d; } | 72 | QPtrCollection::Item newItem( QPtrCollection::Item d ) { return dc ? qstrdup( (const char*)d ) : d; } |
71 | void deleteItem( QPtrCollection::Item d ) { if ( del_item ) delete[] (char*)d; } | 73 | void deleteItem( QPtrCollection::Item d ) { if ( del_item ) delete[] (char*)d; } |
72 | int compareItems( QPtrCollection::Item s1, QPtrCollection::Item s2 ) { return qstrcmp((const char*)s1, | 74 | int compareItems( QPtrCollection::Item s1, QPtrCollection::Item s2 ) { return qstrcmp((const char*)s1, |
73 | (const char*)s2); } | 75 | (const char*)s2); } |
74 | #ifndef QT_NO_DATASTREAM | 76 | #ifndef QT_NO_DATASTREAM |
75 | QDataStream &read( QDataStream &s, QPtrCollection::Item &d ) | 77 | QDataStream &read( QDataStream &s, QPtrCollection::Item &d ) |