Fix enum mismatch

Using own enum Direction, not Qt::Orientation

Signed-off-by: OBATA Akio <obache@wizdas.com>
(cherry picked from commit 87477e6c2b)
pull/38/head
OBATA Akio 3 years ago committed by Michele Calgaro
parent 120be495ce
commit e081da2f1d
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -309,7 +309,7 @@ BoxComponent::~BoxComponent()
int BoxComponent::widthForHeight( int height ) int BoxComponent::widthForHeight( int height )
{ {
if ( d->direction !=Qt::Horizontal ) if ( d->direction != Horizontal )
{ {
int width = 0; int width = 0;
for ( uint n = 0; n < components(); ++n ) for ( uint n = 0; n < components(); ++n )
@ -327,7 +327,7 @@ int BoxComponent::widthForHeight( int height )
int BoxComponent::heightForWidth( int width ) int BoxComponent::heightForWidth( int width )
{ {
if ( d->direction ==Qt::Horizontal ) if ( d->direction == Horizontal )
{ {
int height = 0; int height = 0;
for ( uint n = 0; n < components(); ++n ) for ( uint n = 0; n < components(); ++n )
@ -349,7 +349,7 @@ void BoxComponent::calcMinSize()
for ( uint n = 0; n < components(); ++n ) for ( uint n = 0; n < components(); ++n )
{ {
Component *comp = component( n ); Component *comp = component( n );
if ( d->direction ==Qt::Horizontal ) if ( d->direction == Horizontal )
{ {
max = TQMAX( max, comp->minHeight() ); max = TQMAX( max, comp->minHeight() );
sum += comp->minWidth(); sum += comp->minWidth();
@ -362,7 +362,7 @@ void BoxComponent::calcMinSize()
} }
bool sizeChanged = false; bool sizeChanged = false;
if ( d->direction ==Qt::Horizontal ) if ( d->direction == Horizontal )
{ {
if ( setMinWidth( sum ) ) sizeChanged = true; if ( setMinWidth( sum ) ) sizeChanged = true;
if ( setMinHeight( max ) ) sizeChanged = true; if ( setMinHeight( max ) ) sizeChanged = true;
@ -383,7 +383,7 @@ void BoxComponent::layout( const TQRect &rect )
{ {
Component::layout( rect ); Component::layout( rect );
bool horiz = (d->direction ==Qt::Horizontal); bool horiz = (d->direction == Horizontal);
int fixedSize = 0; int fixedSize = 0;
for ( uint n = 0; n < components(); ++n ) for ( uint n = 0; n < components(); ++n )
{ {

Loading…
Cancel
Save