| author | llornkcor <llornkcor> | 2003-07-10 02:40:10 (UTC) |
|---|---|---|
| committer | llornkcor <llornkcor> | 2003-07-10 02:40:10 (UTC) |
| commit | 155d68c1e7d7dc0fed2534ac43d6d77ce2781f55 (patch) (unidiff) | |
| tree | e6edaa5a7040fe6c224c3943d1094dcf02e4f74c /qmake/include/qgarray.h | |
| parent | 86703e8a5527ef114facd02c005b6b3a7e62e263 (diff) | |
| download | opie-155d68c1e7d7dc0fed2534ac43d6d77ce2781f55.zip opie-155d68c1e7d7dc0fed2534ac43d6d77ce2781f55.tar.gz opie-155d68c1e7d7dc0fed2534ac43d6d77ce2781f55.tar.bz2 | |
update qmake to 1.05a
| -rw-r--r-- | qmake/include/qgarray.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/qmake/include/qgarray.h b/qmake/include/qgarray.h index 12edea6..40720a6 100644 --- a/qmake/include/qgarray.h +++ b/qmake/include/qgarray.h | |||
| @@ -49,11 +49,19 @@ friend class QBuffer; | |||
| 49 | public: | 49 | public: |
| 50 | //### DO NOT USE THIS. IT IS PUBLIC BUT DO NOT USE IT IN NEW CODE. | 50 | //### DO NOT USE THIS. IT IS PUBLIC BUT DO NOT USE IT IN NEW CODE. |
| 51 | struct array_data : public QShared {// shared array | 51 | struct array_data : public QShared {// shared array |
| 52 | array_data(){ data=0; len=0; } | 52 | array_data():data(0),len(0) |
| 53 | #ifdef QT_QGARRAY_SPEED_OPTIM | ||
| 54 | ,maxl(0) | ||
| 55 | #endif | ||
| 56 | {} | ||
| 53 | char *data; // actual array data | 57 | char *data; // actual array data |
| 54 | uint len; | 58 | uint len; |
| 59 | #ifdef QT_QGARRAY_SPEED_OPTIM | ||
| 60 | uint maxl; | ||
| 61 | #endif | ||
| 55 | }; | 62 | }; |
| 56 | QGArray(); | 63 | QGArray(); |
| 64 | enum Optimization { MemOptim, SpeedOptim }; | ||
| 57 | protected: | 65 | protected: |
| 58 | QGArray( int, int ); // dummy; does not alloc | 66 | QGArray( int, int ); // dummy; does not alloc |
| 59 | QGArray( int size ); // allocate 'size' bytes | 67 | QGArray( int size ); // allocate 'size' bytes |
| @@ -70,6 +78,7 @@ protected: | |||
| 70 | uint size() const{ return shd->len; } | 78 | uint size() const{ return shd->len; } |
| 71 | boolisEqual( const QGArray &a ) const; | 79 | boolisEqual( const QGArray &a ) const; |
| 72 | 80 | ||
| 81 | boolresize( uint newsize, Optimization optim ); | ||
| 73 | boolresize( uint newsize ); | 82 | boolresize( uint newsize ); |
| 74 | 83 | ||
| 75 | boolfill( const char *d, int len, uint sz ); | 84 | boolfill( const char *d, int len, uint sz ); |
| @@ -88,7 +97,7 @@ protected: | |||
| 88 | 97 | ||
| 89 | int find( const char *d, uint index, uint sz ) const; | 98 | int find( const char *d, uint index, uint sz ) const; |
| 90 | int contains( const char *d, uint sz ) const; | 99 | int contains( const char *d, uint sz ) const; |
| 91 | 100 | ||
| 92 | voidsort( uint sz ); | 101 | voidsort( uint sz ); |
| 93 | int bsearch( const char *d, uint sz ) const; | 102 | int bsearch( const char *d, uint sz ) const; |
| 94 | 103 | ||