summaryrefslogtreecommitdiffstats
path: root/kmdi/kmdichildfrm.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 03:45:53 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 03:45:53 +0000
commit10308be19ef7fa44699562cc75946e7ea1fdf6b9 (patch)
tree4bc444c00a79e88105f2cfce5b6209994c413ca0 /kmdi/kmdichildfrm.cpp
parent307136d8eef0ba133b78ceee8e901138d4c996a1 (diff)
downloadtdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.tar.gz
tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.zip
Revert automated changes
Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmdi/kmdichildfrm.cpp')
-rw-r--r--kmdi/kmdichildfrm.cpp92
1 files changed, 46 insertions, 46 deletions
diff --git a/kmdi/kmdichildfrm.cpp b/kmdi/kmdichildfrm.cpp
index e663a33ea..f471cf6c3 100644
--- a/kmdi/kmdichildfrm.cpp
+++ b/kmdi/kmdichildfrm.cpp
@@ -278,7 +278,7 @@ void KMdiChildFrm::mouseMoveEvent( TQMouseEvent *e )
if ( !m_pClient )
return;
- if ( m_pClient->tqminimumSize() == m_pClient->tqmaximumSize() )
+ if ( m_pClient->minimumSize() == m_pClient->maximumSize() )
return;
if ( m_bResizing )
@@ -286,7 +286,7 @@ void KMdiChildFrm::mouseMoveEvent( TQMouseEvent *e )
if ( !( e->state() & RightButton ) && !( e->state() & MidButton ) )
{
// same as: if no button or left button pressed
- TQPoint p = tqparentWidget()->mapFromGlobal( e->globalPos() );
+ TQPoint p = parentWidget()->mapFromGlobal( e->globalPos() );
resizeWindow( m_iResizeCorner, p.x(), p.y() );
}
else
@@ -329,11 +329,11 @@ void KMdiChildFrm::resizeWindow( int resizeCorner, int xPos, int yPos )
// it could be the client forces the childframe to enlarge its minimum size
if ( m_pClient )
{
- minWidth = m_pClient->tqminimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER;
- minHeight = m_pClient->tqminimumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER +
+ minWidth = m_pClient->minimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER;
+ minHeight = m_pClient->minimumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER +
m_pCaption->heightHint() + KMDI_CHILDFRM_SEPARATOR;
- maxWidth = m_pClient->tqmaximumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER;
- maxHeight = m_pClient->tqmaximumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER +
+ maxWidth = m_pClient->maximumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER;
+ maxHeight = m_pClient->maximumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER +
m_pCaption->heightHint() + KMDI_CHILDFRM_SEPARATOR;
}
@@ -521,22 +521,22 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
case Maximized:
m_pClient->m_stateChanged = true;
m_state = state;
- // client min / max size / tqlayout behavior don't change
+ // client min / max size / layout behavior don't change
// set frame max size indirectly by setting the clients max size to
// it's current value (calls setMaxSize() of frame)
- m_pClient->setMaximumSize( m_pClient->tqmaximumSize().width(), m_pClient->tqmaximumSize().height() );
+ m_pClient->setMaximumSize( m_pClient->maximumSize().width(), m_pClient->maximumSize().height() );
m_pMaximize->setPixmap( *m_pMaxButtonPixmap );
setGeometry( m_restoredRect );
break;
case Minimized:
m_pClient->m_stateChanged = true;
m_state = state;
- // restore client min / max size / tqlayout behavior
+ // restore client min / max size / layout behavior
m_pClient->setMinimumSize( m_oldClientMinSize.width(), m_oldClientMinSize.height() );
m_pClient->setMaximumSize( m_oldClientMaxSize.width(), m_oldClientMaxSize.height() );
- if ( m_pClient->tqlayout() != 0L )
+ if ( m_pClient->layout() != 0L )
{
- m_pClient->tqlayout() ->setResizeMode( m_oldLayoutResizeMode );
+ m_pClient->layout() ->setResizeMode( m_oldLayoutResizeMode );
}
m_pMinimize->setPixmap( *m_pMinButtonPixmap );
m_pMaximize->setPixmap( *m_pMaxButtonPixmap );
@@ -555,12 +555,12 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
{
m_pClient->m_stateChanged = true;
m_state = state;
- // restore client min / max size / tqlayout behavior
+ // restore client min / max size / layout behavior
m_pClient->setMinimumSize( m_oldClientMinSize.width(), m_oldClientMinSize.height() );
m_pClient->setMaximumSize( m_oldClientMaxSize.width(), m_oldClientMaxSize.height() );
- if ( m_pClient->tqlayout() != 0L )
+ if ( m_pClient->layout() != 0L )
{
- m_pClient->tqlayout() ->setResizeMode( m_oldLayoutResizeMode );
+ m_pClient->layout() ->setResizeMode( m_oldLayoutResizeMode );
}
setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX );
// reset to maximize-captionbar
@@ -581,7 +581,7 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
{
m_pClient->m_stateChanged = true;
m_state = state;
- // client min / max size / tqlayout behavior don't change
+ // client min / max size / layout behavior don't change
setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX );
m_pMaximize->setPixmap( *m_pRestoreButtonPixmap );
int nFrameWidth = KMDI_CHILDFRM_DOUBLE_BORDER;
@@ -590,7 +590,7 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
TQRect maximizedFrmRect( -m_pClient->x(), -m_pClient->y(),
m_pManager->width() + nFrameWidth,
m_pManager->height() + nFrameHeight );
- if ( tqgeometry() != maximizedFrmRect )
+ if ( geometry() != maximizedFrmRect )
{
setGeometry( maximizedFrmRect );
}
@@ -607,18 +607,18 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
case Maximized:
m_pClient->m_stateChanged = true;
m_state = state;
- // save client min / max size / tqlayout behavior
- m_oldClientMinSize = m_pClient->tqminimumSize();
- m_oldClientMaxSize = m_pClient->tqmaximumSize();
- if ( m_pClient->tqlayout() != 0L )
+ // save client min / max size / layout behavior
+ m_oldClientMinSize = m_pClient->minimumSize();
+ m_oldClientMaxSize = m_pClient->maximumSize();
+ if ( m_pClient->layout() != 0L )
{
- m_oldLayoutResizeMode = m_pClient->tqlayout() ->resizeMode();
+ m_oldLayoutResizeMode = m_pClient->layout() ->resizeMode();
}
m_pClient->setMinimumSize( 0, 0 );
m_pClient->setMaximumSize( 0, 0 );
- if ( m_pClient->tqlayout() != 0L )
+ if ( m_pClient->layout() != 0L )
{
- m_pClient->tqlayout() ->setResizeMode( TQLayout::FreeResize );
+ m_pClient->layout() ->setResizeMode( TQLayout::FreeResize );
}
switchToMinimizeLayout();
m_pManager->childMinimized( this, true );
@@ -626,19 +626,19 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
case Normal:
m_pClient->m_stateChanged = true;
m_state = state;
- // save client min / max size / tqlayout behavior
- m_oldClientMinSize = m_pClient->tqminimumSize();
- m_oldClientMaxSize = m_pClient->tqmaximumSize();
- if ( m_pClient->tqlayout() != 0L )
+ // save client min / max size / layout behavior
+ m_oldClientMinSize = m_pClient->minimumSize();
+ m_oldClientMaxSize = m_pClient->maximumSize();
+ if ( m_pClient->layout() != 0L )
{
- m_oldLayoutResizeMode = m_pClient->tqlayout() ->resizeMode();
+ m_oldLayoutResizeMode = m_pClient->layout() ->resizeMode();
}
- m_restoredRect = tqgeometry();
+ m_restoredRect = geometry();
m_pClient->setMinimumSize( 0, 0 );
m_pClient->setMaximumSize( 0, 0 );
- if ( m_pClient->tqlayout() != 0L )
+ if ( m_pClient->layout() != 0L )
{
- m_pClient->tqlayout() ->setResizeMode( TQLayout::FreeResize );
+ m_pClient->layout() ->setResizeMode( TQLayout::FreeResize );
}
switchToMinimizeLayout();
m_pManager->childMinimized( this, false );
@@ -694,7 +694,7 @@ void KMdiChildFrm::setCaption( const TQString& text )
void KMdiChildFrm::enableClose( bool bEnable )
{
m_pClose->setEnabled( bEnable );
- m_pClose->tqrepaint( false );
+ m_pClose->repaint( false );
}
//============ setIcon ==================//
@@ -779,8 +779,8 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize )
{
//reparent to this widget , no flags , point , show it
TQPoint pnt2( KMDI_CHILDFRM_BORDER, clientYPos );
- TQSize mincs = w->tqminimumSize();
- TQSize maxcs = w->tqmaximumSize();
+ TQSize mincs = w->minimumSize();
+ TQSize maxcs = w->maximumSize();
w->setMinimumSize( 0, 0 );
w->setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX );
@@ -798,11 +798,11 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize )
TQObject::connect( m_pClient, TQT_SIGNAL( mdiParentNowMaximized( bool ) ), m_pManager, TQT_SIGNAL( nowMaximized( bool ) ) );
if ( m_pClient->minimumWidth() > m_pManager->m_defaultChildFrmSize.width() )
- setMinimumWidth( m_pClient->tqminimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER );
+ setMinimumWidth( m_pClient->minimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER );
if ( m_pClient->minimumHeight() > m_pManager->m_defaultChildFrmSize.height() )
{
- setMinimumHeight( m_pClient->tqminimumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER +
+ setMinimumHeight( m_pClient->minimumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER +
m_pCaption->heightHint() + KMDI_CHILDFRM_SEPARATOR );
}
}
@@ -826,8 +826,8 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset )
if ( focusedChildWidget != 0 )
nameOfFocusedWidget = focusedChildWidget->name();
- TQSize mins = m_pClient->tqminimumSize();
- TQSize maxs = m_pClient->tqmaximumSize();
+ TQSize mins = m_pClient->minimumSize();
+ TQSize maxs = m_pClient->maximumSize();
m_pClient->reparent( 0, 0, mapToGlobal( pos() ) - pos() + positionOffset, isVisible() );
m_pClient->setMinimumSize( mins.width(), mins.height() );
m_pClient->setMaximumSize( maxs.width(), maxs.height() );
@@ -842,7 +842,7 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset )
{ // for each found object...
TQWidget * widg = ( TQWidget* ) obj;
++it;
- FocusPolicy* pFocPol = pFocPolDict->tqfind( widg->name() ); // remember the focus policy from before the reparent
+ FocusPolicy* pFocPol = pFocPolDict->find( widg->name() ); // remember the focus policy from before the reparent
if ( pFocPol )
widg->setFocusPolicy( *pFocPol );
@@ -894,7 +894,7 @@ void KMdiChildFrm::linkChildren( TQDict<FocusPolicy>* pFocPolDict )
{ // for each found object...
TQWidget* widg = ( TQWidget* ) obj;
++it;
- FocusPolicy* pFocPol = pFocPolDict->tqfind( widg->name() ); // remember the focus policy from before the reparent
+ FocusPolicy* pFocPol = pFocPolDict->find( widg->name() ); // remember the focus policy from before the reparent
if ( pFocPol != 0 )
widg->setFocusPolicy( *pFocPol );
@@ -1105,7 +1105,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
{
// in case we didn't click on the icon button
TQFocusEvent focusEvent( TQFocusEvent::FocusIn );
- TQApplication::sendEvent( tqApp->mainWidget(), &focusEvent );
+ TQApplication::sendEvent( qApp->mainWidget(), &focusEvent );
if ( m_pClient )
{
m_pClient->updateTimeStamp();
@@ -1284,9 +1284,9 @@ void KMdiChildFrm::showSystemMenu()
TQRect iconGeom;
if ( KMdiMainFrm::frameDecorOfAttachedViews() == KMdi::Win95Look )
- iconGeom = m_pWinIcon->tqgeometry();
+ iconGeom = m_pWinIcon->geometry();
else
- iconGeom = m_pUnixIcon->tqgeometry();
+ iconGeom = m_pUnixIcon->geometry();
popupmenuPosition = TQPoint( iconGeom.x(), iconGeom.y() + captionHeight() + KMDI_CHILDFRM_BORDER );
systemMenu() ->popup( mapToGlobal( popupmenuPosition ) );
@@ -1308,7 +1308,7 @@ void KMdiChildFrm::switchToMinimizeLayout()
resize( 300, minimumHeight() );
// positioning
- m_pManager->tqlayoutMinimizedChildren();
+ m_pManager->layoutMinimizedChildren();
}
void KMdiChildFrm::slot_resizeViaSystemMenu()
@@ -1394,7 +1394,7 @@ void KMdiChildFrm::redecorateButtons()
TQRect KMdiChildFrm::mdiAreaContentsRect() const
{
- TQFrame * p = ( TQFrame* ) tqparentWidget();
+ TQFrame * p = ( TQFrame* ) parentWidget();
if ( p )
{
return p->contentsRect();
@@ -1406,4 +1406,4 @@ TQRect KMdiChildFrm::mdiAreaContentsRect() const
}
}
-// kate: indent-mode csands; tab-width 4; space-indent off; tqreplace-tabs off;
+// kate: indent-mode csands; tab-width 4; space-indent off; replace-tabs off;