Initial conversion for TQt for Qt4 3.4.0 TP2

This will also compile with TQt for Qt3, and should not cause any problems
with dependent modules such as kdebase.  If it does then it needs to be fixed!


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 22 insertions, 22 deletions

diff --git a/kmdi/kmdichildfrm.cpp b/kmdi/kmdichildfrm.cpp
index f471cf6c3..162837b2b 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->minimumSize() == m_pClient->maximumSize() )
+	if ( m_pClient->tqminimumSize() == m_pClient->tqmaximumSize() )
 		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 = parentWidget()->mapFromGlobal( e->globalPos() );
+			TQPoint p = tqparentWidget()->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->minimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER;
-		minHeight = m_pClient->minimumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER +
+		minWidth = m_pClient->tqminimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER;
+		minHeight = m_pClient->tqminimumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER +
 		            m_pCaption->heightHint() + KMDI_CHILDFRM_SEPARATOR;
-		maxWidth = m_pClient->maximumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER;
-		maxHeight = m_pClient->maximumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER +
+		maxWidth = m_pClient->tqmaximumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER;
+		maxHeight = m_pClient->tqmaximumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER +
 		            m_pCaption->heightHint() + KMDI_CHILDFRM_SEPARATOR;
 	}
 	
@@ -524,7 +524,7 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
 			// 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->maximumSize().width(), m_pClient->maximumSize().height() );
+			m_pClient->setMaximumSize( m_pClient->tqmaximumSize().width(), m_pClient->tqmaximumSize().height() );
 			m_pMaximize->setPixmap( *m_pMaxButtonPixmap );
 			setGeometry( m_restoredRect );
 			break;
@@ -608,8 +608,8 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
 			m_pClient->m_stateChanged = true;
 			m_state = state;
 			// save client min / max size / layout behavior
-			m_oldClientMinSize = m_pClient->minimumSize();
-			m_oldClientMaxSize = m_pClient->maximumSize();
+			m_oldClientMinSize = m_pClient->tqminimumSize();
+			m_oldClientMaxSize = m_pClient->tqmaximumSize();
 			if ( m_pClient->layout() != 0L )
 			{
 				m_oldLayoutResizeMode = m_pClient->layout() ->resizeMode();
@@ -627,8 +627,8 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
 			m_pClient->m_stateChanged = true;
 			m_state = state;
 			// save client min / max size / layout behavior
-			m_oldClientMinSize = m_pClient->minimumSize();
-			m_oldClientMaxSize = m_pClient->maximumSize();
+			m_oldClientMinSize = m_pClient->tqminimumSize();
+			m_oldClientMaxSize = m_pClient->tqmaximumSize();
 			if ( m_pClient->layout() != 0L )
 			{
 				m_oldLayoutResizeMode = m_pClient->layout() ->resizeMode();
@@ -694,7 +694,7 @@ void KMdiChildFrm::setCaption( const TQString& text )
 void KMdiChildFrm::enableClose( bool bEnable )
 {
 	m_pClose->setEnabled( bEnable );
-	m_pClose->repaint( false );
+	m_pClose->tqrepaint( 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->minimumSize();
-		TQSize maxcs = w->maximumSize();
+		TQSize mincs = w->tqminimumSize();
+		TQSize maxcs = w->tqmaximumSize();
 		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->minimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER );
+		setMinimumWidth( m_pClient->tqminimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER );
 
 	if ( m_pClient->minimumHeight() > m_pManager->m_defaultChildFrmSize.height() )
 	{
-		setMinimumHeight( m_pClient->minimumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER +
+		setMinimumHeight( m_pClient->tqminimumSize().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->minimumSize();
-	TQSize maxs = m_pClient->maximumSize();
+	TQSize mins = m_pClient->tqminimumSize();
+	TQSize maxs = m_pClient->tqmaximumSize();
 	m_pClient->reparent( 0, 0, mapToGlobal( pos() ) - pos() + positionOffset, isVisible() );
 	m_pClient->setMinimumSize( mins.width(), mins.height() );
 	m_pClient->setMaximumSize( maxs.width(), maxs.height() );
@@ -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( qApp->mainWidget(), &focusEvent );
+					TQApplication::sendEvent( tqApp->mainWidget(), &focusEvent );
 					if ( m_pClient )
 					{
 						m_pClient->updateTimeStamp();
@@ -1177,7 +1177,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
 			// child and its children (as we did when we got our client).
 			// XXX see linkChildren() and focus policy stuff
 			TQObject* pNewChild = ( ( TQChildEvent* ) e ) ->child();
-			if ( ( pNewChild != 0L ) && ::qt_cast<TQWidget*>( pNewChild ) )
+			if ( ( pNewChild != 0L ) && ::tqqt_cast<TQWidget*>( pNewChild ) )
 			{
 				TQWidget * pNewWidget = static_cast<TQWidget*>( pNewChild );
 				TQObjectList *list = pNewWidget->queryList( "TQWidget" );
@@ -1188,7 +1188,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
 				{ // for each found object...
 					TQWidget * widg = ( TQWidget* ) obj;
 					++it;
-					if ( !::qt_cast<TQPopupMenu*>( widg ) )
+					if ( !::tqqt_cast<TQPopupMenu*>( widg ) )
 					{
 						widg->installEventFilter( this );
 					}
@@ -1394,7 +1394,7 @@ void KMdiChildFrm::redecorateButtons()
 
 TQRect KMdiChildFrm::mdiAreaContentsRect() const
 {
-	TQFrame * p = ( TQFrame* ) parentWidget();
+	TQFrame * p = ( TQFrame* ) tqparentWidget();
 	if ( p )
 	{
 		return p->contentsRect();