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/kernel/tqlayoutengine.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/kernel/tqlayoutengine.cpp')
| -rw-r--r-- | tqtinterface/qt4/src/kernel/tqlayoutengine.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tqtinterface/qt4/src/kernel/tqlayoutengine.cpp b/tqtinterface/qt4/src/kernel/tqlayoutengine.cpp index 8c364d9..7dca5e0 100644 --- a/tqtinterface/qt4/src/kernel/tqlayoutengine.cpp +++ b/tqtinterface/qt4/src/kernel/tqlayoutengine.cpp @@ -256,7 +256,7 @@ TQ_EXPORT TQSize tqSmartMinSize( const TQWidgetItem *i ) if ( TQT_TQSIZEPOLICY_OBJECT(w->sizePolicy()).mayShrinkHorizontally() ) { s.setWidth( w->tqminimumSizeHint().width() ); } else { - sh = w->sizeHint(); + sh = w->tqsizeHint(); s.setWidth( sh.width() ); } } @@ -266,7 +266,7 @@ TQ_EXPORT TQSize tqSmartMinSize( const TQWidgetItem *i ) s.setHeight( w->tqminimumSizeHint().height() ); } else { s.setHeight( sh.isValid() ? sh.height() - : w->sizeHint().height() ); + : w->tqsizeHint().height() ); } } } @@ -298,11 +298,11 @@ TQ_EXPORT TQSize tqSmartMaxSize( const TQWidgetItem *i, int align ) TQSize s = w->tqmaximumSize(); if ( s.width() == TQWIDGETSIZE_MAX && !(align & TQt::AlignHorizontal_Mask) ) if ( !TQT_TQSIZEPOLICY_OBJECT(w->sizePolicy()).mayGrowHorizontally() ) - s.setWidth( w->sizeHint().width() ); + s.setWidth( w->tqsizeHint().width() ); if ( s.height() == TQWIDGETSIZE_MAX && !(align & TQt::AlignVertical_Mask) ) if ( !TQT_TQSIZEPOLICY_OBJECT(w->sizePolicy()).mayGrowVertically() ) - s.setHeight( w->sizeHint().height() ); + s.setHeight( w->tqsizeHint().height() ); s = s.expandedTo( w->tqminimumSize() ); |