summaryrefslogtreecommitdiffstats
path: root/tqtinterface/qt4/src/widgets/tqsplitter.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tqtinterface/qt4/src/widgets/tqsplitter.cpp')
-rw-r--r--tqtinterface/qt4/src/widgets/tqsplitter.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/tqtinterface/qt4/src/widgets/tqsplitter.cpp b/tqtinterface/qt4/src/widgets/tqsplitter.cpp
index 2750a45..78b9f90 100644
--- a/tqtinterface/qt4/src/widgets/tqsplitter.cpp
+++ b/tqtinterface/qt4/src/widgets/tqsplitter.cpp
@@ -63,7 +63,7 @@ public:
bool opaque() const { return s->opaqueResize(); }
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
int id() const { return myId; } // d->list.at(id())->wid == this
void setId( int i ) { myId = i; }
@@ -126,10 +126,10 @@ TQSplitterHandle::TQSplitterHandle( Qt::Orientation o, TQSplitter *tqparent,
setOrientation( o );
}
-TQSize TQSplitterHandle::tqsizeHint() const
+TQSize TQSplitterHandle::sizeHint() const
{
int hw = s->handleWidth();
- return parentWidget()->tqstyle().tqsizeFromContents( TQStyle::CT_Splitter, s,
+ return parentWidget()->tqstyle().sizeFromContents( TQStyle::CT_Splitter, s,
TQSize(hw, hw) )
.expandedTo( TQApplication::globalStrut() );
}
@@ -197,7 +197,7 @@ public:
TQCOORD TQSplitterLayoutStruct::getSizer( Qt::Orientation orient )
{
if ( sizer == -1 ) {
- TQSize s = wid->tqsizeHint();
+ TQSize s = wid->sizeHint();
if ( !s.isValid() || wid->testWState(WState_Resized) )
s = wid->size();
sizer = ( orient == Qt::Horizontal ) ? s.width() : s.height();
@@ -339,7 +339,7 @@ void TQSplitter::setOrientation( Qt::Orientation o )
return;
if ( !testWState( TQt::WState_OwnSizePolicy ) ) {
- TQSizePolicy sp = tqsizePolicy();
+ TQSizePolicy sp = sizePolicy();
sp.transpose();
tqsetSizePolicy( sp );
clearWState( TQt::WState_OwnSizePolicy );
@@ -435,7 +435,7 @@ TQSplitterLayoutStruct *TQSplitter::addWidget( TQWidget *w, bool prepend )
s->wid = newHandle;
newHandle->setId( d->list.count() );
s->isHandle = TRUE;
- s->sizer = pick( newHandle->tqsizeHint() );
+ s->sizer = pick( newHandle->sizeHint() );
if ( prepend )
d->list.prepend( s );
else
@@ -852,14 +852,14 @@ void TQSplitter::doResize()
if ( s->wid->isHidden() || isCollapsed(s->wid) ) {
a[i].tqmaximumSize = 0;
} else if ( s->isHandle ) {
- a[i].tqsizeHint = a[i].tqminimumSize = a[i].tqmaximumSize = s->sizer;
+ a[i].sizeHint = a[i].tqminimumSize = a[i].tqmaximumSize = s->sizer;
a[i].empty = FALSE;
} else {
int mode = s->resizeMode;
int stretch = 1;
if ( mode == DefaultResizeMode ) {
- TQSizePolicy p = s->wid->tqsizePolicy();
+ TQSizePolicy p = s->wid->sizePolicy();
int sizePolicyStretch =
pick( TQSize(p.horStretch(), p.verStretch()) );
if ( sizePolicyStretch > 0 ) {
@@ -890,11 +890,11 @@ void TQSplitter::doResize()
stretch *= s->getSizer( orient );
// TQMIN(): ad hoc work-around for tqlayout engine limitation
a[i].stretch = TQMIN( stretch, 8192 );
- a[i].tqsizeHint = a[i].tqminimumSize;
+ a[i].sizeHint = a[i].tqminimumSize;
} else if ( mode == KeepSize ) {
- a[i].tqsizeHint = s->getSizer( orient );
+ a[i].sizeHint = s->getSizer( orient );
} else { // mode == FollowSizeHint
- a[i].tqsizeHint = pick( s->wid->tqsizeHint() );
+ a[i].sizeHint = pick( s->wid->sizeHint() );
}
}
}
@@ -1109,7 +1109,7 @@ void TQSplitter::recalcId()
/*!
\reimp
*/
-TQSize TQSplitter::tqsizeHint() const
+TQSize TQSplitter::sizeHint() const
{
constPolish();
int l = 0;
@@ -1121,7 +1121,7 @@ TQSize TQSplitter::tqsizeHint() const
while( (o = it.current()) != 0 ) {
++it;
if ( o->isWidgetType() && !((TQWidget*)o)->isHidden() ) {
- TQSize s = ((TQWidget*)o)->tqsizeHint();
+ TQSize s = ((TQWidget*)o)->sizeHint();
if ( s.isValid() ) {
l += pick( s );
t = TQMAX( t, trans( s ) );