diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 10:00:36 -0600 | 
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 10:00:36 -0600 | 
| commit | 1fffbdafa12271a1a635caf46777fb8acfb6f31b (patch) | |
| tree | 707785bd058e254fd865ca30ed35f37f206aebbc /lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp | |
| parent | 2b0e1de2ffcca7bb93f1fd8ddd32f74041d0d076 (diff) | |
| download | tdewebdev-1fffbdafa12271a1a635caf46777fb8acfb6f31b.tar.gz tdewebdev-1fffbdafa12271a1a635caf46777fb8acfb6f31b.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 2b0e1de2ffcca7bb93f1fd8ddd32f74041d0d076.
Diffstat (limited to 'lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp')
| -rw-r--r-- | lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp | 70 | 
1 files changed, 35 insertions, 35 deletions
| diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp b/lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp index 49ddccdc..331b9082 100644 --- a/lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp +++ b/lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp @@ -180,20 +180,20 @@ void KDockSplitter::setupMinMaxSize()    // Set the minimum and maximum sizes    int minx, maxx, miny, maxy;    if (m_orientation ==Qt::Horizontal) { -    miny = child0->minimumSize().height() + child1->minimumSize().height()+4; -    maxy = child0->maximumSize().height() + child1->maximumSize().height()+4; -    minx = (child0->minimumSize().width() > child1->minimumSize().width()) ? child0->minimumSize().width() : child1->minimumSize().width(); -    maxx = (child0->maximumSize().width() > child1->maximumSize().width()) ? child0->maximumSize().width() : child1->maximumSize().width(); +    miny = child0->tqminimumSize().height() + child1->tqminimumSize().height()+4; +    maxy = child0->tqmaximumSize().height() + child1->tqmaximumSize().height()+4; +    minx = (child0->tqminimumSize().width() > child1->tqminimumSize().width()) ? child0->tqminimumSize().width() : child1->tqminimumSize().width(); +    maxx = (child0->tqmaximumSize().width() > child1->tqmaximumSize().width()) ? child0->tqmaximumSize().width() : child1->tqmaximumSize().width();      miny = (miny > 4) ? miny : 4;      maxy = (maxy < 32000) ? maxy : 32000;      minx = (minx > 2) ? minx : 2;      maxx = (maxx < 32000) ? maxx : 32000;    } else { -    minx = child0->minimumSize().width() + child1->minimumSize().width()+4; -    maxx = child0->maximumSize().width() + child1->maximumSize().width()+4; -    miny = (child0->minimumSize().height() > child1->minimumSize().height()) ? child0->minimumSize().height() : child1->minimumSize().height(); -    maxy = (child0->maximumSize().height() > child1->maximumSize().height()) ? child0->maximumSize().height() : child1->maximumSize().height(); +    minx = child0->tqminimumSize().width() + child1->tqminimumSize().width()+4; +    maxx = child0->tqmaximumSize().width() + child1->tqmaximumSize().width()+4; +    miny = (child0->tqminimumSize().height() > child1->tqminimumSize().height()) ? child0->tqminimumSize().height() : child1->tqminimumSize().height(); +    maxy = (child0->tqmaximumSize().height() > child1->tqmaximumSize().height()) ? child0->tqmaximumSize().height() : child1->tqmaximumSize().height();      minx = (minx > 4) ? minx : 4;      maxx = (maxx < 32000) ? maxx : 32000; @@ -351,20 +351,20 @@ int KDockSplitter::checkValueOverlapped(int position, TQWidget *overlappingWidge  	if (initialised) {  		if (m_orientation ==Qt::Vertical) {  			if (child0==overlappingWidget) { -				if (position<(child0->minimumSize().width())) -					position=child0->minimumSize().width(); +				if (position<(child0->tqminimumSize().width())) +					position=child0->tqminimumSize().width();  				if (position>width()) position=width()-4; -			} else if (position>(width()-(child1->minimumSize().width())-4)){ -				position=width()-(child1->minimumSize().width())-4; +			} else if (position>(width()-(child1->tqminimumSize().width())-4)){ +				position=width()-(child1->tqminimumSize().width())-4;  				if (position<0) position=0;  			}  		} else {// orientation  ==Qt::Horizontal  			if (child0==overlappingWidget) { -				if (position<(child0->minimumSize().height())) -					position=child0->minimumSize().height(); +				if (position<(child0->tqminimumSize().height())) +					position=child0->tqminimumSize().height();  				if (position>height()) position=height()-4; -			} else if (position>(height()-(child1->minimumSize().height())-4)){ -				position=height()-(child1->minimumSize().height())-4; +			} else if (position>(height()-(child1->tqminimumSize().height())-4)){ +				position=height()-(child1->tqminimumSize().height())-4;  				if (position<0) position=0;  			} @@ -378,15 +378,15 @@ int KDockSplitter::checkValue( int position ) const  {    if (initialised){      if (m_orientation ==Qt::Vertical){ -      if (position < (child0->minimumSize().width())) -        position = child0->minimumSize().width(); -      if ((width()-4-position) < (child1->minimumSize().width())) -        position = width() - (child1->minimumSize().width()) -4; +      if (position < (child0->tqminimumSize().width())) +        position = child0->tqminimumSize().width(); +      if ((width()-4-position) < (child1->tqminimumSize().width())) +        position = width() - (child1->tqminimumSize().width()) -4;      } else { -      if (position < (child0->minimumSize().height())) -        position = (child0->minimumSize().height()); -      if ((height()-4-position) < (child1->minimumSize().height())) -        position = height() - (child1->minimumSize().height()) -4; +      if (position < (child0->tqminimumSize().height())) +        position = (child0->tqminimumSize().height()); +      if ((height()-4-position) < (child1->tqminimumSize().height())) +        position = height() - (child1->tqminimumSize().height()) -4;      }    } @@ -423,7 +423,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e)          } else {            xpos = factor * checkValue( mapFromGlobal(mev->globalPos()).y() ) / height();            resizeEvent(0); -          divider->repaint(true); +          divider->tqrepaint(true);          }        } else {          if ((fixedWidth0!=-1) || (fixedWidth1!=-1)) @@ -436,7 +436,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e)          } else {            xpos = factor * checkValue( mapFromGlobal( mev->globalPos()).x() ) / width();            resizeEvent(0); -          divider->repaint(true); +          divider->tqrepaint(true);          }        }        handled= true; @@ -452,7 +452,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e)          }          xpos = factor* checkValue( mapFromGlobal(mev->globalPos()).y() ) / height();          resizeEvent(0); -        divider->repaint(true); +        divider->tqrepaint(true);        } else {          if ((fixedWidth0!=-1) || (fixedWidth1!=-1))          { @@ -460,7 +460,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e)          }          xpos = factor* checkValue( mapFromGlobal(mev->globalPos()).x() ) / width();          resizeEvent(0); -        divider->repaint(true); +        divider->tqrepaint(true);        }        handled= true;        break; @@ -473,7 +473,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e)  bool KDockSplitter::event( TQEvent* e )  {    if ( e->type() == TQEvent::LayoutHint ){ -    // change children min/max size +    // change tqchildren min/max size      setupMinMaxSize();      setSeparatorPos(xpos);    } @@ -492,7 +492,7 @@ void KDockSplitter::updateName()    TQString new_name = TQString( child0->name() ) + "," + child1->name();    parentWidget()->setName( new_name.latin1() );    parentWidget()->setCaption( child0->caption() + "," + child1->caption() ); -  parentWidget()->repaint( false ); +  parentWidget()->tqrepaint( false );    ((KDockWidget*)parentWidget())->firstName = child0->name();    ((KDockWidget*)parentWidget())->lastName = child1->name(); @@ -553,7 +553,7 @@ KDockButton_Private::~KDockButton_Private()  void KDockButton_Private::drawButton( TQPainter* p )  { -  p->fillRect( 0,0, width(), height(), TQBrush(colorGroup().brush(TQColorGroup::Background)) ); +  p->fillRect( 0,0, width(), height(), TQBrush(tqcolorGroup().brush(TQColorGroup::Background)) );    p->drawPixmap( (width() - pixmap()->width()) / 2, (height() - pixmap()->height()) / 2, *pixmap() );    if ( moveMouse && !isDown() ){      p->setPen( white ); @@ -561,12 +561,12 @@ void KDockButton_Private::drawButton( TQPainter* p )      p->lineTo( 0, 0 );      p->lineTo( width() - 1, 0 ); -    p->setPen( colorGroup().dark() ); +    p->setPen( tqcolorGroup().dark() );      p->lineTo( width() - 1, height() - 1 );      p->lineTo( 0, height() - 1 );    }    if ( isOn() || isDown() ){ -    p->setPen( colorGroup().dark() ); +    p->setPen( tqcolorGroup().dark() );      p->moveTo( 0, height() - 1 );      p->lineTo( 0, 0 );      p->lineTo( width() - 1, 0 ); @@ -580,13 +580,13 @@ void KDockButton_Private::drawButton( TQPainter* p )  void KDockButton_Private::enterEvent( TQEvent * )  {    moveMouse = true; -  repaint(); +  tqrepaint();  }  void KDockButton_Private::leaveEvent( TQEvent * )  {    moveMouse = false; -  repaint(); +  tqrepaint();  }  /*************************************************************************/ | 
