Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 13281e2856a2ef43bbab78c5528470309c23aa77.

17 files changed, 72 insertions, 72 deletions

diff --git a/kmdi/kmdi/dockcontainer.cpp b/kmdi/kmdi/dockcontainer.cpp
index 4b947d3ce..16c4438c4 100644
--- a/kmdi/kmdi/dockcontainer.cpp
+++ b/kmdi/kmdi/dockcontainer.cpp
@@ -25,7 +25,7 @@
 #include "kdockwidget_private.h"
 
 #include <tqwidgetstack.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtimer.h>
 #include <tqtooltip.h>
 #include <kmultitabbar.h>
@@ -633,7 +633,7 @@ void DockContainer::prevToolView() {
     if (pos==-1) return;
     pos--;
     if (pos<0) pos=tabs->count()-1;
-    KMultiTabBarTab *tab=tabs->at(pos);
+    KMultiTabBarTab *tab=tabs->tqat(pos);
     if (!tab) return; //can never happen here, but who knows
     m_tb->setTab(tab->id(),true);
     tabClicked(tab->id());
@@ -645,7 +645,7 @@ void DockContainer::nextToolView() {
     if (pos==-1) return;
     pos++;
     if (pos>=(int)tabs->count()) pos=0;
-    KMultiTabBarTab *tab=tabs->at(pos);
+    KMultiTabBarTab *tab=tabs->tqat(pos);
     if (!tab) return; //can never happen here, but who knows
     m_tb->setTab(tab->id(),true);
     tabClicked(tab->id());
diff --git a/kmdi/kmdi/guiclient.cpp b/kmdi/kmdi/guiclient.cpp
index 1233bc64b..b58b538c7 100644
--- a/kmdi/kmdi/guiclient.cpp
+++ b/kmdi/kmdi/guiclient.cpp
@@ -68,7 +68,7 @@ GUIClient::GUIClient (KMDI::MainWindow* mdiMainFrm,const char* name)
 
   if ( domDocument().documentElement().isNull() )
   {
-    TQString completeDescription = TQString::fromLatin1( guiDescription ).arg( actionListName );
+    TQString completeDescription = TQString::tqfromLatin1( guiDescription ).arg( actionListName );
 
     setXML( completeDescription, false /*merge*/ );
   }
@@ -100,7 +100,7 @@ GUIClient::~GUIClient()
 {
 //     actionCollection()->writeShortcutSettings( "KMDI Shortcuts", kapp->config() );
   for (uint i=0;i<m_toolViewActions.count();i++)
-    disconnect(m_toolViewActions.at(i),0,this,0);
+    disconnect(m_toolViewActions.tqat(i),0,this,0);
 
   m_toolViewActions.setAutoDelete( false );
   m_toolViewActions.clear();
@@ -119,7 +119,7 @@ void GUIClient::setupActions()
   if (m_toolViewActions.count()<3)
   {
     for (uint i=0;i<m_toolViewActions.count();i++)
-      addList.append(m_toolViewActions.at(i));
+      addList.append(m_toolViewActions.tqat(i));
   }
   else
     addList.append(m_toolMenu);
diff --git a/kmdi/kmdi/mainwindow.cpp b/kmdi/kmdi/mainwindow.cpp
index 7d6558750..358791ab0 100644
--- a/kmdi/kmdi/mainwindow.cpp
+++ b/kmdi/kmdi/mainwindow.cpp
@@ -46,7 +46,7 @@
 #include <assert.h>
 
 #include <tqcursor.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqobjectlist.h>
 #include <tqpopupmenu.h>
 #include <tqmenubar.h>
@@ -64,7 +64,7 @@
 
 
 #include <tqtoolbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqstring.h>
 #include <tqmap.h>
 #include <tqvaluelist.h>
diff --git a/kmdi/kmdi/tabwidget.cpp b/kmdi/kmdi/tabwidget.cpp
index 2d9603bf5..869dbefcb 100644
--- a/kmdi/kmdi/tabwidget.cpp
+++ b/kmdi/kmdi/tabwidget.cpp
@@ -182,7 +182,7 @@ void TabWidget::insertTab ( TQWidget * child, const TQString & label, int index)
   KTabWidget::insertTab(child,label,index);
   showPage(child);
   maybeShow();
-  tabBar()->repaint();
+  tabBar()->tqrepaint();
 }
 
 void TabWidget::insertTab ( TQWidget * child, const TQIconSet & iconset, const TQString & label, int index )
@@ -190,7 +190,7 @@ void TabWidget::insertTab ( TQWidget * child, const TQIconSet & iconset, const T
   KTabWidget::insertTab(child,iconset,label,index);
   showPage(child);
   maybeShow();
-  tabBar()->repaint();
+  tabBar()->tqrepaint();
 }
 
 void TabWidget::insertTab ( TQWidget * child, TQTab * tab, int index)
@@ -198,7 +198,7 @@ void TabWidget::insertTab ( TQWidget * child, TQTab * tab, int index)
   KTabWidget::insertTab(child,tab,index);
   showPage(child);
   maybeShow();
-  tabBar()->repaint();
+  tabBar()->tqrepaint();
 }
 
 void TabWidget::removePage ( TQWidget * w )
diff --git a/kmdi/kmdichildarea.cpp b/kmdi/kmdichildarea.cpp
index fe28fdff9..684c799df 100644
--- a/kmdi/kmdichildarea.cpp
+++ b/kmdi/kmdichildarea.cpp
@@ -424,10 +424,10 @@ void KMdiChildArea::cascadeMaximized()
 			childFrm->move( pnt );
 			TQSize curSize( width() - pnt.x(), height() - pnt.y() );
 			
-			if ( ( childFrm->minimumSize().width() > curSize.width() ) ||
-			     ( childFrm->minimumSize().height() > curSize.height() ) )
+			if ( ( childFrm->tqminimumSize().width() > curSize.width() ) ||
+			     ( childFrm->tqminimumSize().height() > curSize.height() ) )
 			{
-				childFrm->resize( childFrm->minimumSize() );
+				childFrm->resize( childFrm->tqminimumSize() );
 			}
 			else
 				childFrm->resize( curSize );
diff --git a/kmdi/kmdichildfrm.cpp b/kmdi/kmdichildfrm.cpp
index afceb2e60..c3e4fb9a1 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 )
@@ -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;
@@ -534,9 +534,9 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
 			// 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->layout() != 0L )
+			if ( m_pClient->tqlayout() != 0L )
 			{
-				m_pClient->layout() ->setResizeMode( m_oldLayoutResizeMode );
+				m_pClient->tqlayout() ->setResizeMode( m_oldLayoutResizeMode );
 			}
 			m_pMinimize->setPixmap( *m_pMinButtonPixmap );
 			m_pMaximize->setPixmap( *m_pMaxButtonPixmap );
@@ -558,9 +558,9 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
 				// 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->layout() != 0L )
+				if ( m_pClient->tqlayout() != 0L )
 				{
-					m_pClient->layout() ->setResizeMode( m_oldLayoutResizeMode );
+					m_pClient->tqlayout() ->setResizeMode( m_oldLayoutResizeMode );
 				}
 				setMaximumSize( TQWIDGETSIZE_MAX, TQWIDGETSIZE_MAX );
 				// reset to maximize-captionbar
@@ -608,17 +608,17 @@ 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();
-			if ( m_pClient->layout() != 0L )
+			m_oldClientMinSize = m_pClient->tqminimumSize();
+			m_oldClientMaxSize = m_pClient->tqmaximumSize();
+			if ( m_pClient->tqlayout() != 0L )
 			{
-				m_oldLayoutResizeMode = m_pClient->layout() ->resizeMode();
+				m_oldLayoutResizeMode = m_pClient->tqlayout() ->tqresizeMode();
 			}
 			m_pClient->setMinimumSize( 0, 0 );
 			m_pClient->setMaximumSize( 0, 0 );
-			if ( m_pClient->layout() != 0L )
+			if ( m_pClient->tqlayout() != 0L )
 			{
-				m_pClient->layout() ->setResizeMode( TQLayout::FreeResize );
+				m_pClient->tqlayout() ->setResizeMode( TQLayout::FreeResize );
 			}
 			switchToMinimizeLayout();
 			m_pManager->childMinimized( this, true );
@@ -627,18 +627,18 @@ 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();
-			if ( m_pClient->layout() != 0L )
+			m_oldClientMinSize = m_pClient->tqminimumSize();
+			m_oldClientMaxSize = m_pClient->tqmaximumSize();
+			if ( m_pClient->tqlayout() != 0L )
 			{
-				m_oldLayoutResizeMode = m_pClient->layout() ->resizeMode();
+				m_oldLayoutResizeMode = m_pClient->tqlayout() ->tqresizeMode();
 			}
 			m_restoredRect = geometry();
 			m_pClient->setMinimumSize( 0, 0 );
 			m_pClient->setMaximumSize( 0, 0 );
-			if ( m_pClient->layout() != 0L )
+			if ( m_pClient->tqlayout() != 0L )
 			{
-				m_pClient->layout() ->setResizeMode( TQLayout::FreeResize );
+				m_pClient->tqlayout() ->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->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( TQWIDGETSIZE_MAX, TQWIDGETSIZE_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() );
diff --git a/kmdi/kmdichildfrm.h b/kmdi/kmdichildfrm.h
index 53a61ed07..0fe2cd2b2 100644
--- a/kmdi/kmdichildfrm.h
+++ b/kmdi/kmdichildfrm.h
@@ -33,7 +33,7 @@
 #include <tqpushbutton.h>
 #include <tqlabel.h>
 #include <tqdatetime.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <tqdict.h>
 
diff --git a/kmdi/kmdichildfrmcaption.cpp b/kmdi/kmdichildfrmcaption.cpp
index 9ebbefb34..062fa6261 100644
--- a/kmdi/kmdichildfrmcaption.cpp
+++ b/kmdi/kmdichildfrmcaption.cpp
@@ -182,7 +182,7 @@ void KMdiChildFrmCaption::setActive( bool bActive )
 	                                            m_pParent->m_pManager->m_captionInactiveBackColor );
 
 	m_bActive = bActive;
-	repaint( false );
+	tqrepaint( false );
 }
 
 //=============== setCaption ===============//
@@ -190,7 +190,7 @@ void KMdiChildFrmCaption::setActive( bool bActive )
 void KMdiChildFrmCaption::setCaption( const TQString& text )
 {
 	m_szCaption = text;
-	repaint( false );
+	tqrepaint( false );
 }
 
 //============== heightHint ===============//
diff --git a/kmdi/kmdidockcontainer.cpp b/kmdi/kmdidockcontainer.cpp
index f488df509..71b154a14 100644
--- a/kmdi/kmdidockcontainer.cpp
+++ b/kmdi/kmdidockcontainer.cpp
@@ -24,7 +24,7 @@
 #include "kdockwidget_private.h"
 
 #include <tqwidgetstack.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtimer.h>
 #include <tqtooltip.h>
 #include <kmultitabbar.h>
@@ -826,7 +826,7 @@ void KMdiDockContainer::prevToolView()
 	if ( pos < 0 )
 		pos = tabs->count() - 1;
 
-	KMultiTabBarTab *tab = tabs->at( pos );
+	KMultiTabBarTab *tab = tabs->tqat( pos );
 	if ( !tab )
 		return ; //can never happen here, but who knows
 
@@ -847,7 +847,7 @@ void KMdiDockContainer::nextToolView()
 	if ( pos >= ( int ) tabs->count() )
 		pos = 0;
 
-	KMultiTabBarTab *tab = tabs->at( pos );
+	KMultiTabBarTab *tab = tabs->tqat( pos );
 	if ( !tab )
 		return ; //can never happen here, but who knows
 
diff --git a/kmdi/kmdidocumentviewtabwidget.cpp b/kmdi/kmdidocumentviewtabwidget.cpp
index a75000148..7656bb358 100644
--- a/kmdi/kmdidocumentviewtabwidget.cpp
+++ b/kmdi/kmdidocumentviewtabwidget.cpp
@@ -54,7 +54,7 @@ void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, const TQString & l
 	KTabWidget::insertTab( child, label, index );
 	showPage( child );
 	TQTimer::singleShot(0, this, TQT_SLOT(maybeShow()));
-	tabBar() ->repaint();
+	tabBar() ->tqrepaint();
 }
 
 void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, const TQIconSet & iconset, const TQString & label, int index )
@@ -62,7 +62,7 @@ void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, const TQIconSet &
 	KTabWidget::insertTab( child, iconset, label, index );
 	showPage( child );
 	TQTimer::singleShot(0, this, TQT_SLOT(maybeShow()));
-	tabBar() ->repaint();
+	tabBar() ->tqrepaint();
 }
 
 void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, TQTab * tab, int index )
@@ -70,7 +70,7 @@ void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, TQTab * tab, int i
 	KTabWidget::insertTab( child, tab, index );
 	showPage( child );
 	TQTimer::singleShot(0, this, TQT_SLOT(maybeShow()));
-	tabBar() ->repaint();
+	tabBar() ->tqrepaint();
 }
 
 void KMdiDocumentViewTabWidget::removePage ( TQWidget * w )
diff --git a/kmdi/kmdiguiclient.cpp b/kmdi/kmdiguiclient.cpp
index 0057172d6..4ac95c4fe 100644
--- a/kmdi/kmdiguiclient.cpp
+++ b/kmdi/kmdiguiclient.cpp
@@ -128,7 +128,7 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c
 	if ( domDocument().documentElement().isNull() )
 	{
 
-		TQString completeDescription = TQString::fromLatin1( guiDescription )
+		TQString completeDescription = TQString::tqfromLatin1( guiDescription )
 		                              .arg( actionListName );
 
 		setXML( completeDescription, false /*merge*/ );
@@ -174,7 +174,7 @@ KMDIGUIClient::~KMDIGUIClient()
 
 	//     actionCollection()->writeShortcutSettings( "KMDI Shortcuts", kapp->config() );
 	for ( uint i = 0;i < m_toolViewActions.count();i++ )
-		disconnect( m_toolViewActions.at( i ), 0, this, 0 );
+		disconnect( m_toolViewActions.tqat( i ), 0, this, 0 );
 
 	m_toolViewActions.setAutoDelete( false );
 	m_toolViewActions.clear();
@@ -230,7 +230,7 @@ void KMDIGUIClient::setupActions()
 	TQPtrList<KAction> addList;
 	if ( m_toolViewActions.count() < 3 )
 		for ( uint i = 0;i < m_toolViewActions.count();i++ )
-			addList.append( m_toolViewActions.at( i ) );
+			addList.append( m_toolViewActions.tqat( i ) );
 	else
 		addList.append( m_toolMenu );
 	if ( m_mdiMode == KMdi::IDEAlMode )
diff --git a/kmdi/kmdimainfrm.cpp b/kmdi/kmdimainfrm.cpp
index 246398053..4ac49df4e 100644
--- a/kmdi/kmdimainfrm.cpp
+++ b/kmdi/kmdimainfrm.cpp
@@ -38,7 +38,7 @@
 #include <assert.h>
 
 #include <tqcursor.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqobjectlist.h>
 #include <tqpopupmenu.h>
 #include <tqmenubar.h>
@@ -57,9 +57,9 @@
 
 #include <tqtoolbutton.h>
 #include <tqdockarea.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtimer.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqstring.h>
 #include <tqmap.h>
 #include <tqvaluelist.h>
@@ -701,7 +701,7 @@ void KMdiMainFrm::detachWindow( KMdiChildView *pWnd, bool bShow )
 #ifdef Q_WS_X11
 		if ( mdiMode() == KMdi::ToplevelMode )
 		{
-			XSetTransientForHint( qt_xdisplay(), pWnd->winId(), topLevelWidget() ->winId() );
+			XSetTransientForHint( qt_xdisplay(), pWnd->winId(), tqtopLevelWidget() ->winId() );
 		}
 #endif
 
@@ -711,7 +711,7 @@ void KMdiMainFrm::detachWindow( KMdiChildView *pWnd, bool bShow )
 #ifdef Q_WS_X11
 	if ( mdiMode() == KMdi::ToplevelMode )
 	{
-		XSetTransientForHint( qt_xdisplay(), pWnd->winId(), topLevelWidget() ->winId() );
+		XSetTransientForHint( qt_xdisplay(), pWnd->winId(), tqtopLevelWidget() ->winId() );
 	}
 #endif
 
@@ -1659,8 +1659,8 @@ void KMdiMainFrm::finishTabPageMode()
 			if ( pView->isToolView() )
 				continue;
 			kdDebug(760) << "KMdiMainFrm::finishTabPageMode: in loop" << endl;
-			TQSize mins = pView->minimumSize();
-			TQSize maxs = pView->maximumSize();
+			TQSize mins = pView->tqminimumSize();
+			TQSize maxs = pView->tqmaximumSize();
 			TQSize sz = pView->size();
 			TQWidget* pParent = pView->parentWidget();
 			TQPoint p( pParent->mapToGlobal( pParent->pos() ) - pParent->pos() + m_undockPositioningOffset );
@@ -2075,8 +2075,8 @@ void KMdiMainFrm::finishIDEAlMode( bool full )
 			KMdiChildView* pView = it.current();
 			if ( pView->isToolView() )
 				continue;
-			TQSize mins = pView->minimumSize();
-			TQSize maxs = pView->maximumSize();
+			TQSize mins = pView->tqminimumSize();
+			TQSize maxs = pView->tqmaximumSize();
 			TQSize sz = pView->size();
 			TQWidget* pParent = pView->parentWidget();
 			TQPoint p( pParent->mapToGlobal( pParent->pos() ) - pParent->pos() + m_undockPositioningOffset );
@@ -2733,7 +2733,7 @@ void KMdiMainFrm::windowMenuItemActivated( int id )
 	if ( id < 100 )
 		return ;
 	id -= 100;
-	KMdiChildView *pView = m_pDocumentViews->at( id );
+	KMdiChildView *pView = m_pDocumentViews->tqat( id );
 	if ( !pView )
 		return ;
 	if ( pView->isMinimized() )
@@ -2759,7 +2759,7 @@ void KMdiMainFrm::dockMenuItemActivated( int id )
 	if ( id < 100 )
 		return ;
 	id -= 100;
-	KMdiChildView *pView = m_pDocumentViews->at( id );
+	KMdiChildView *pView = m_pDocumentViews->tqat( id );
 	if ( !pView )
 		return ;
 	if ( pView->isMinimized() )
diff --git a/kmdi/kmdimainfrm.h b/kmdi/kmdimainfrm.h
index af2134a39..5143c8c68 100644
--- a/kmdi/kmdimainfrm.h
+++ b/kmdi/kmdimainfrm.h
@@ -142,7 +142,7 @@ public:
  * use fakeSDIApplication() to fake it and isFakingSDIApplication() to query whether or not an SDI
  * interface is being faked.
  *
- * You can dynamically change the shape of the attached MDI views using setFrameDecorOfAttachedViews().
+ * You can dynamically change the tqshape of the attached MDI views using setFrameDecorOfAttachedViews().
  *
  * Additionally, here's a hint how to restore the mainframe's settings from config file:
  * \code
diff --git a/kmdi/kmditaskbar.cpp b/kmdi/kmditaskbar.cpp
index 09b212734..70141a110 100644
--- a/kmdi/kmditaskbar.cpp
+++ b/kmdi/kmditaskbar.cpp
@@ -341,8 +341,8 @@ void KMdiTaskBar::layoutTaskBar( int taskBarWidth )
 	// if there's enough space, use actual width
 	int buttonCount = m_pButtonList->count();
 	int tbHandlePixel;
-	tbHandlePixel = tqstyle().pixelMetric( TQStyle::PM_DockWindowHandleExtent, this );
-	int buttonAreaWidth = taskBarWidth - tbHandlePixel - tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth, this ) - 5;
+	tbHandlePixel = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent, this );
+	int buttonAreaWidth = taskBarWidth - tbHandlePixel - tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, this ) - 5;
 	if ( ( ( allButtonsWidthHint ) <= buttonAreaWidth ) || ( width() < parentWidget() ->width() ) )
 	{
 		for ( b = m_pButtonList->first();b;b = m_pButtonList->next() )
diff --git a/kmdi/test/hello.cpp b/kmdi/test/hello.cpp
index d92233ea6..e00a4d705 100644
--- a/kmdi/test/hello.cpp
+++ b/kmdi/test/hello.cpp
@@ -36,7 +36,7 @@ Hello::Hello( const char *title, const char *text, TQWidget *parentWidget )
 void Hello::animate()
 {
     b = (b + 1) & 15;
-    repaint( false );
+    tqrepaint( false );
 }
 
 
diff --git a/kmdi/test/mainwidget.cpp b/kmdi/test/mainwidget.cpp
index be667e39a..e8aa8da1d 100644
--- a/kmdi/test/mainwidget.cpp
+++ b/kmdi/test/mainwidget.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqmenubar.h>
 #include <tqtoolbar.h>
 #include <tqmultilineedit.h>
diff --git a/kmdi/test/mainwidget.h b/kmdi/test/mainwidget.h
index e1ba58c3f..953512005 100644
--- a/kmdi/test/mainwidget.h
+++ b/kmdi/test/mainwidget.h
@@ -19,7 +19,7 @@
 #define MAINWIDGET_H
 
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqdom.h>
 #include <kmdimainfrm.h>