diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-07-17 19:19:26 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-07-17 19:19:26 -0500 |
| commit | 33d3ec06354d07cbb6164eb1c8adbd89c9ecefdd (patch) | |
| tree | 4939d6567b50d0dd669257422a6868aa1259e62b /tqtinterface/qt4/src/widgets/tqgroupbox.cpp | |
| parent | f01eee0362e54f47d0266295c5263790c04b6510 (diff) | |
| download | experimental-33d3ec06354d07cbb6164eb1c8adbd89c9ecefdd.tar.gz experimental-33d3ec06354d07cbb6164eb1c8adbd89c9ecefdd.zip | |
Revert "Rename tqsize* to size*"
This reverts commit e33879600503bacc0b4ef090f7f79ab80bb6b0da.
Diffstat (limited to 'tqtinterface/qt4/src/widgets/tqgroupbox.cpp')
| -rw-r--r-- | tqtinterface/qt4/src/widgets/tqgroupbox.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tqtinterface/qt4/src/widgets/tqgroupbox.cpp b/tqtinterface/qt4/src/widgets/tqgroupbox.cpp index fd07192..f9c341e 100644 --- a/tqtinterface/qt4/src/widgets/tqgroupbox.cpp +++ b/tqtinterface/qt4/src/widgets/tqgroupbox.cpp @@ -213,8 +213,8 @@ void TQGroupBox::setTextSpacer() int fh = fm.height(); if ( isCheckable() ) { #ifndef TQT_NO_CHECKBOX - fh = d->checkbox->sizeHint().height() + 2; - w = d->checkbox->sizeHint().width() + 2*fm.width( "xx" ); + fh = d->checkbox->tqsizeHint().height() + 2; + w = d->checkbox->tqsizeHint().width() + 2*fm.width( "xx" ); #endif } else { fh = fm.height(); @@ -766,14 +766,14 @@ void TQGroupBox::fontChange( const TQFont & oldFont ) \reimp */ -TQSize TQGroupBox::sizeHint() const +TQSize TQGroupBox::tqsizeHint() const { TQFontMetrics fm( font() ); int tw, th; if ( isCheckable() ) { #ifndef TQT_NO_CHECKBOX - tw = d->checkbox->sizeHint().width() + 2*fm.width( "xx" ); - th = d->checkbox->sizeHint().height() + fm.width( TQChar(' ') ); + tw = d->checkbox->tqsizeHint().width() + 2*fm.width( "xx" ); + th = d->checkbox->tqsizeHint().height() + fm.width( TQChar(' ') ); #endif } else { tw = fm.width( title() ) + 2 * fm.width( "xx" ); @@ -782,7 +782,7 @@ TQSize TQGroupBox::sizeHint() const TQSize s; if ( tqlayout() ) { - s = TQFrame::sizeHint(); + s = TQFrame::tqsizeHint(); return s.expandedTo( TQSize( tw, 0 ) ); } else { TQRect r = tqchildrenRect(); @@ -960,7 +960,7 @@ void TQGroupBox::setEnabled(bool on) void TQGroupBox::updateCheckBoxGeometry() { if ( d->checkbox ) { - TQSize cbSize = d->checkbox->sizeHint(); + TQSize cbSize = d->checkbox->tqsizeHint(); TQRect cbRect( 0, 0, cbSize.width(), cbSize.height() ); int marg = bFlat ? 2 : 8; |