diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-06-17 17:28:28 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-06-17 17:28:28 -0500 |
| commit | 6dec101d43dcbd4195c47d54bd388db1a8d7230e (patch) | |
| tree | 7c336cbed3a93807a34cd4df39b2f92a7d48a141 /src/kernel/ntqsizepolicy.h | |
| parent | f27c2533f735d53c6b555f387c6390c0690cc246 (diff) | |
| download | tqt3-6dec101d43dcbd4195c47d54bd388db1a8d7230e.tar.gz tqt3-6dec101d43dcbd4195c47d54bd388db1a8d7230e.zip | |
Automated update from Qt3
Diffstat (limited to 'src/kernel/ntqsizepolicy.h')
| -rw-r--r-- | src/kernel/ntqsizepolicy.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/kernel/ntqsizepolicy.h b/src/kernel/ntqsizepolicy.h index 85b087a53..ef13db7c4 100644 --- a/src/kernel/ntqsizepolicy.h +++ b/src/kernel/ntqsizepolicy.h @@ -73,7 +73,7 @@ public: TQSizePolicy() : data( 0 ) { } TQSizePolicy( SizeType hor, SizeType ver, bool hfw = FALSE ) - : data( hor | (ver<<HSize) | (hfw ? (Q_UINT32)(1<<2*HSize) : 0) ) { } + : data( hor | (ver<<HSize) | (hfw ? (TQ_UINT32)(1<<2*HSize) : 0) ) { } TQSizePolicy( SizeType hor, SizeType ver, uchar hors, uchar vers, bool hfw = FALSE ); SizeType horData() const { return (SizeType)( data & HMask ); } @@ -90,12 +90,12 @@ public: (int)(horData() & ExpMask ? Horizontally : 0) ); } - void setHorData( SizeType d ) { data = (Q_UINT32)(data & ~HMask) | d; } - void setVerData( SizeType d ) { data = (Q_UINT32)(data & ~(HMask << HSize)) | + void setHorData( SizeType d ) { data = (TQ_UINT32)(data & ~HMask) | d; } + void setVerData( SizeType d ) { data = (TQ_UINT32)(data & ~(HMask << HSize)) | (d << HSize); } - void setHeightForWidth( bool b ) { data = b ? (Q_UINT32)( data | ( 1 << 2*HSize ) ) - : (Q_UINT32)( data & ~( 1 << 2*HSize ) ); } + void setHeightForWidth( bool b ) { data = b ? (TQ_UINT32)( data | ( 1 << 2*HSize ) ) + : (TQ_UINT32)( data & ~( 1 << 2*HSize ) ); } bool hasHeightForWidth() const { return data & ( 1 << 2*HSize ); } bool operator==( const TQSizePolicy& s ) const { return data == s.data; } @@ -109,13 +109,13 @@ public: inline void transpose(); private: - TQSizePolicy( int i ) : data( (Q_UINT32)i ) { } + TQSizePolicy( int i ) : data( (TQ_UINT32)i ) { } - Q_UINT32 data; + TQ_UINT32 data; }; inline TQSizePolicy::TQSizePolicy( SizeType hor, SizeType ver, uchar hors, uchar vers, bool hfw ) - : data( hor | (ver<<HSize) | (hfw ? (Q_UINT32)(1<<2*HSize) : 0) ) { + : data( hor | (ver<<HSize) | (hfw ? (TQ_UINT32)(1<<2*HSize) : 0) ) { setHorStretch( hors ); setVerStretch( vers ); } |