-rw-r--r-- | qmake/include/qcstring.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/qmake/include/qcstring.h b/qmake/include/qcstring.h index 004bb3b..6b7352a 100644 --- a/qmake/include/qcstring.h +++ b/qmake/include/qcstring.h | |||
@@ -80,51 +80,53 @@ Q_EXPORT int qstrnicmp( const char *, const char *, uint len ); | |||
80 | 80 | ||
81 | #ifndef QT_CLEAN_NAMESPACE | 81 | #ifndef QT_CLEAN_NAMESPACE |
82 | Q_EXPORT inline uint cstrlen( const char *str ) | 82 | Q_EXPORT inline uint cstrlen( const char *str ) |
83 | { return (uint)strlen(str); } | 83 | { return (uint)strlen(str); } |
84 | 84 | ||
85 | Q_EXPORT inline char *cstrcpy( char *dst, const char *src ) | 85 | Q_EXPORT inline char *cstrcpy( char *dst, const char *src ) |
86 | { return strcpy(dst,src); } | 86 | { return strcpy(dst,src); } |
87 | 87 | ||
88 | Q_EXPORT inline int cstrcmp( const char *str1, const char *str2 ) | 88 | Q_EXPORT inline int cstrcmp( const char *str1, const char *str2 ) |
89 | { return strcmp(str1,str2); } | 89 | { return strcmp(str1,str2); } |
90 | 90 | ||
91 | Q_EXPORT inline int cstrncmp( const char *str1, const char *str2, uint len ) | 91 | Q_EXPORT inline int cstrncmp( const char *str1, const char *str2, uint len ) |
92 | { return strncmp(str1,str2,len); } | 92 | { return strncmp(str1,str2,len); } |
93 | #endif | 93 | #endif |
94 | 94 | ||
95 | 95 | ||
96 | // qChecksum: Internet checksum | 96 | // qChecksum: Internet checksum |
97 | 97 | ||
98 | Q_EXPORT Q_UINT16 qChecksum( const char *s, uint len ); | 98 | Q_EXPORT Q_UINT16 qChecksum( const char *s, uint len ); |
99 | 99 | ||
100 | /***************************************************************************** | 100 | /***************************************************************************** |
101 | QByteArray class | 101 | QByteArray class |
102 | *****************************************************************************/ | 102 | *****************************************************************************/ |
103 | 103 | ||
104 | #ifndef QT_QWINEXPORT | ||
104 | #if defined(Q_TEMPLATEDLL) | 105 | #if defined(Q_TEMPLATEDLL) |
105 | Q_TEMPLATE_EXTERN template class Q_EXPORT QMemArray<char>; | 106 | Q_TEMPLATE_EXTERN template class Q_EXPORT QMemArray<char>; |
106 | #endif | 107 | #endif |
108 | #endif /* QT_QWINEXPORT */ | ||
107 | 109 | ||
108 | #if defined(Q_QDOC) | 110 | #if defined(Q_QDOC) |
109 | /* | 111 | /* |
110 | We want qdoc to document QByteArray as a real class that inherits | 112 | We want qdoc to document QByteArray as a real class that inherits |
111 | QMemArray<char> and that is inherited by QBitArray. | 113 | QMemArray<char> and that is inherited by QBitArray. |
112 | */ | 114 | */ |
113 | class QByteArray : public QMemArray<char> | 115 | class QByteArray : public QMemArray<char> |
114 | { | 116 | { |
115 | public: | 117 | public: |
116 | QByteArray(); | 118 | QByteArray(); |
117 | QByteArray( int size ); | 119 | QByteArray( int size ); |
118 | }; | 120 | }; |
119 | #else | 121 | #else |
120 | typedef QMemArray<char> QByteArray; | 122 | typedef QMemArray<char> QByteArray; |
121 | #endif | 123 | #endif |
122 | 124 | ||
123 | #ifndef QT_NO_COMPRESS | 125 | #ifndef QT_NO_COMPRESS |
124 | Q_EXPORT QByteArray qCompress( const uchar* data, int nbytes ); | 126 | Q_EXPORT QByteArray qCompress( const uchar* data, int nbytes ); |
125 | Q_EXPORT QByteArray qUncompress( const uchar* data, int nbytes ); | 127 | Q_EXPORT QByteArray qUncompress( const uchar* data, int nbytes ); |
126 | Q_EXPORT inline QByteArray qCompress( const QByteArray& data) | 128 | Q_EXPORT inline QByteArray qCompress( const QByteArray& data) |
127 | { return qCompress( (const uchar*)data.data(), data.size() ); } | 129 | { return qCompress( (const uchar*)data.data(), data.size() ); } |
128 | Q_EXPORT inline QByteArray qUncompress( const QByteArray& data ) | 130 | Q_EXPORT inline QByteArray qUncompress( const QByteArray& data ) |
129 | { return qUncompress( (const uchar*)data.data(), data.size() ); } | 131 | { return qUncompress( (const uchar*)data.data(), data.size() ); } |
130 | #endif | 132 | #endif |
@@ -211,48 +213,50 @@ public: | |||
211 | short toShort( bool *ok=0 )const; | 213 | short toShort( bool *ok=0 )const; |
212 | ushort toUShort( bool *ok=0 )const; | 214 | ushort toUShort( bool *ok=0 )const; |
213 | int toInt( bool *ok=0 )const; | 215 | int toInt( bool *ok=0 )const; |
214 | uint toUInt( bool *ok=0 )const; | 216 | uint toUInt( bool *ok=0 )const; |
215 | long toLong( bool *ok=0 )const; | 217 | long toLong( bool *ok=0 )const; |
216 | ulong toULong( bool *ok=0 )const; | 218 | ulong toULong( bool *ok=0 )const; |
217 | float toFloat( bool *ok=0 )const; | 219 | float toFloat( bool *ok=0 )const; |
218 | double toDouble( bool *ok=0 )const; | 220 | double toDouble( bool *ok=0 )const; |
219 | 221 | ||
220 | QCString &setStr( const char *s ); | 222 | QCString &setStr( const char *s ); |
221 | QCString &setNum( short ); | 223 | QCString &setNum( short ); |
222 | QCString &setNum( ushort ); | 224 | QCString &setNum( ushort ); |
223 | QCString &setNum( int ); | 225 | QCString &setNum( int ); |
224 | QCString &setNum( uint ); | 226 | QCString &setNum( uint ); |
225 | QCString &setNum( long ); | 227 | QCString &setNum( long ); |
226 | QCString &setNum( ulong ); | 228 | QCString &setNum( ulong ); |
227 | QCString &setNum( float, char f='g', int prec=6 ); | 229 | QCString &setNum( float, char f='g', int prec=6 ); |
228 | QCString &setNum( double, char f='g', int prec=6 ); | 230 | QCString &setNum( double, char f='g', int prec=6 ); |
229 | 231 | ||
230 | boolsetExpand( uint index, char c ); | 232 | boolsetExpand( uint index, char c ); |
231 | 233 | ||
232 | operator const char *() const; | 234 | operator const char *() const; |
233 | QCString &operator+=( const char *str ); | 235 | QCString &operator+=( const char *str ); |
234 | QCString &operator+=( char c ); | 236 | QCString &operator+=( char c ); |
237 | private: | ||
238 | intfind( const char *str, int index, bool cs, uint l ) const; | ||
235 | }; | 239 | }; |
236 | 240 | ||
237 | 241 | ||
238 | /***************************************************************************** | 242 | /***************************************************************************** |
239 | QCString stream functions | 243 | QCString stream functions |
240 | *****************************************************************************/ | 244 | *****************************************************************************/ |
241 | #ifndef QT_NO_DATASTREAM | 245 | #ifndef QT_NO_DATASTREAM |
242 | Q_EXPORT QDataStream &operator<<( QDataStream &, const QCString & ); | 246 | Q_EXPORT QDataStream &operator<<( QDataStream &, const QCString & ); |
243 | Q_EXPORT QDataStream &operator>>( QDataStream &, QCString & ); | 247 | Q_EXPORT QDataStream &operator>>( QDataStream &, QCString & ); |
244 | #endif | 248 | #endif |
245 | 249 | ||
246 | /***************************************************************************** | 250 | /***************************************************************************** |
247 | QCString inline functions | 251 | QCString inline functions |
248 | *****************************************************************************/ | 252 | *****************************************************************************/ |
249 | 253 | ||
250 | inline QCString &QCString::operator=( const QCString &s ) | 254 | inline QCString &QCString::operator=( const QCString &s ) |
251 | { return (QCString&)assign( s ); } | 255 | { return (QCString&)assign( s ); } |
252 | 256 | ||
253 | inline QCString &QCString::operator=( const char *str ) | 257 | inline QCString &QCString::operator=( const char *str ) |
254 | { return (QCString&)duplicate( str, qstrlen(str)+1 ); } | 258 | { return (QCString&)duplicate( str, qstrlen(str)+1 ); } |
255 | 259 | ||
256 | inline bool QCString::isNull() const | 260 | inline bool QCString::isNull() const |
257 | { return data() == 0; } | 261 | { return data() == 0; } |
258 | 262 | ||
@@ -367,25 +371,28 @@ Q_EXPORT inline const QCString operator+( const QCString &s1, const char *s2 ) | |||
367 | } | 371 | } |
368 | 372 | ||
369 | Q_EXPORT inline const QCString operator+( const char *s1, const QCString &s2 ) | 373 | Q_EXPORT inline const QCString operator+( const char *s1, const QCString &s2 ) |
370 | { | 374 | { |
371 | QCString tmp( s1 ); | 375 | QCString tmp( s1 ); |
372 | tmp += s2; | 376 | tmp += s2; |
373 | return tmp; | 377 | return tmp; |
374 | } | 378 | } |
375 | 379 | ||
376 | Q_EXPORT inline const QCString operator+( const QCString &s1, char c2 ) | 380 | Q_EXPORT inline const QCString operator+( const QCString &s1, char c2 ) |
377 | { | 381 | { |
378 | QCString tmp( s1.data() ); | 382 | QCString tmp( s1.data() ); |
379 | tmp += c2; | 383 | tmp += c2; |
380 | return tmp; | 384 | return tmp; |
381 | } | 385 | } |
382 | 386 | ||
383 | Q_EXPORT inline const QCString operator+( char c1, const QCString &s2 ) | 387 | Q_EXPORT inline const QCString operator+( char c1, const QCString &s2 ) |
384 | { | 388 | { |
385 | QCString tmp; | 389 | QCString tmp; |
386 | tmp += c1; | 390 | tmp += c1; |
387 | tmp += s2; | 391 | tmp += s2; |
388 | return tmp; | 392 | return tmp; |
389 | } | 393 | } |
390 | 394 | ||
395 | #ifdef QT_QWINEXPORT | ||
396 | #include <qwinexport.h> | ||
397 | #endif /* QT_QWINEXPORT */ | ||
391 | #endif // QCSTRING_H | 398 | #endif // QCSTRING_H |