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

48 files changed, 400 insertions, 400 deletions

diff --git a/lib/kofficeui/KoBrush.h b/lib/kofficeui/KoBrush.h
index 1134b05e..7314649a 100644
--- a/lib/kofficeui/KoBrush.h
+++ b/lib/kofficeui/KoBrush.h
@@ -21,7 +21,7 @@
 #ifndef KOBRUSH_H
 #define KOBRUSH_H
 
-#include <tqbrush.h>
+#include <brush.h>
 
 class KoGenStyle;
 class KoGenStyles;
diff --git a/lib/kofficeui/KoCharSelectDia.cpp b/lib/kofficeui/KoCharSelectDia.cpp
index c8b104a9..422e4e66 100644
--- a/lib/kofficeui/KoCharSelectDia.cpp
+++ b/lib/kofficeui/KoCharSelectDia.cpp
@@ -20,7 +20,7 @@
 #include "KoCharSelectDia.h"
 #include "KoCharSelectDia.moc"
 
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klocale.h>
 #include <kcharselect.h>
@@ -58,7 +58,7 @@ void KoCharSelectDia::initDialog(const TQChar &_chr, const TQString &_font, bool
 
     charSelect = new KCharSelect( page, "", _font, _chr );
     connect(charSelect, TQT_SIGNAL(doubleClicked()),this, TQT_SLOT(slotDoubleClicked()));
-    charSelect->resize( charSelect->tqsizeHint() );
+    charSelect->resize( charSelect->sizeHint() );
     charSelect->enableFontCombo( true );
     grid->addWidget( charSelect, 0, 0 );
 
diff --git a/lib/kofficeui/KoCommandHistory.cpp b/lib/kofficeui/KoCommandHistory.cpp
index 27c51e79..8d4284da 100644
--- a/lib/kofficeui/KoCommandHistory.cpp
+++ b/lib/kofficeui/KoCommandHistory.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlistbox.h>
 
 #include <kaction.h>
@@ -53,7 +53,7 @@ void KoListBox::contentsMouseMoveEvent ( TQMouseEvent * e)
     }
 }
 
-TQSize KoListBox::tqsizeHint() const
+TQSize KoListBox::sizeHint() const
 {
   return TQSize(TQMIN(maxItemWidth() + verticalScrollBar()->width() + 4, 400),
                TQMIN(count() * itemHeight() + horizontalScrollBar()->height() + 4,300));
@@ -188,7 +188,7 @@ void KoCommandHistory::addCommand(KCommand *command, bool execute) {
         m_first=false;
         if (m_undo != 0) {
             m_undo->setEnabled(true);
-            m_undo->setText(i18n("&Undo: %1").tqarg(d->m_present->name()));
+            m_undo->setText(i18n("&Undo: %1").arg(d->m_present->name()));
         }
         if((m_redo != 0) && m_redo->isEnabled()) {
             m_redo->setEnabled(false);
@@ -203,7 +203,7 @@ void KoCommandHistory::addCommand(KCommand *command, bool execute) {
         d->m_present=command;
         if (m_undo != 0) {
             m_undo->setEnabled(true);
-            m_undo->setText(i18n("&Undo: %1").tqarg(d->m_present->name()));
+            m_undo->setText(i18n("&Undo: %1").arg(d->m_present->name()));
         }
         if (m_redo != 0) {
             m_redo->setEnabled(false);
@@ -229,7 +229,7 @@ void KoCommandHistory::undo() {
 
     if (m_redo != 0) {
         m_redo->setEnabled(true);
-        m_redo->setText(i18n("&Redo: %1").tqarg(d->m_present->name()));
+        m_redo->setText(i18n("&Redo: %1").arg(d->m_present->name()));
     }
     int index;
     if((index=m_commands.findRef(d->m_present))!=-1 && m_commands.prev()!=0) {
@@ -238,7 +238,7 @@ void KoCommandHistory::undo() {
         emit commandExecuted(commandUndone);
         if (m_undo != 0) {
             m_undo->setEnabled(true);
-            m_undo->setText(i18n("&Undo: %1").tqarg(d->m_present->name()));
+            m_undo->setText(i18n("&Undo: %1").arg(d->m_present->name()));
         }
         --index;
         if(index==d->m_savedAt)
@@ -282,13 +282,13 @@ void KoCommandHistory::redo() {
 
     if (m_undo != 0) {
         m_undo->setEnabled(true);
-        m_undo->setText(i18n("&Undo: %1").tqarg(d->m_present->name()));
+        m_undo->setText(i18n("&Undo: %1").arg(d->m_present->name()));
     }
 
     if(m_commands.next()!=0) {
         if (m_redo != 0) {
             m_redo->setEnabled(true);
-            m_redo->setText(i18n("&Redo: %1").tqarg(m_commands.current()->name()));
+            m_redo->setText(i18n("&Redo: %1").arg(m_commands.current()->name()));
         }
     }
     else {
@@ -365,7 +365,7 @@ void KoCommandHistory::slotUndoAboutToShow()
     if (m_commands.findRef(d->m_present)!=-1)
         while ( m_commands.current() && i<10 ) // TODO make number of items configurable ?
         {
-            lst.append(i18n("Undo: %1").tqarg(m_commands.current()->name()));
+            lst.append(i18n("Undo: %1").arg(m_commands.current()->name()));
             m_commands.prev();
         }
     d->m_undoListBox->insertStringList( lst );
@@ -411,12 +411,12 @@ void KoCommandHistory::slotRedoAboutToShow()
     if (m_first)
     {
         d->m_present = m_commands.first();
-        lst.append(i18n("Redo: %1").tqarg(d->m_present->name()));
+        lst.append(i18n("Redo: %1").arg(d->m_present->name()));
     }
     if (m_commands.findRef(d->m_present)!=-1 && m_commands.next())
         while ( m_commands.current() && i<10 ) // TODO make number of items configurable ?
         {
-            lst.append(i18n("Redo: %1").tqarg(m_commands.current()->name()));
+            lst.append(i18n("Redo: %1").arg(m_commands.current()->name()));
             m_commands.next();
         }
     d->m_redoListBox->insertStringList( lst );
diff --git a/lib/kofficeui/KoCommandHistory.h b/lib/kofficeui/KoCommandHistory.h
index 8522da3b..89b83744 100644
--- a/lib/kofficeui/KoCommandHistory.h
+++ b/lib/kofficeui/KoCommandHistory.h
@@ -39,7 +39,7 @@ public:
     KoListBox( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 );
 protected:
     virtual void contentsMouseMoveEvent ( TQMouseEvent * );
-    virtual TQSize tqsizeHint() const;
+    virtual TQSize sizeHint() const;
 signals:
     void changeNumberOfSelectedItem( int );
 };
diff --git a/lib/kofficeui/KoContextCelp.cpp b/lib/kofficeui/KoContextCelp.cpp
index 82f786e8..b893037c 100644
--- a/lib/kofficeui/KoContextCelp.cpp
+++ b/lib/kofficeui/KoContextCelp.cpp
@@ -23,7 +23,7 @@
 #include <tqregion.h>
 #include <tqfont.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqsimplerichtext.h>
 
 #include <kpixmap.h>
@@ -61,7 +61,7 @@ void KoVerticalLabel::paintEvent( TQPaintEvent* )
 	KPixmap pm;
 	pm.resize( height(), width() );
 	TQPainter p( &pm );
-	p.fillRect( 0, 0, height(), width(), tqcolorGroup().background() );
+	p.fillRect( 0, 0, height(), width(), colorGroup().background() );
 	p.setFont( font() );
 	p.drawText( 0, 0, height(), width(), AlignCenter, m_text );
 	p.end();
@@ -90,9 +90,9 @@ void KoHelpNavButton::paintEvent( TQPaintEvent* )
 	if ( isEnabled() )
 	{
 		if ( m_pressed )
-			p.setPen( tqcolorGroup().highlight() );
+			p.setPen( colorGroup().highlight() );
 		else
-			p.setPen( tqcolorGroup().text() );
+			p.setPen( colorGroup().text() );
 		p.drawPixmap( 1, 1, m_bitmap );
 	}
 } // KoHelpNavButton::paintEvent
@@ -142,9 +142,9 @@ void KoTinyButton::paintEvent( TQPaintEvent* )
 	if ( isEnabled() )
 	{
 		if ( m_pressed )
-			p.setPen( tqcolorGroup().highlight() );
+			p.setPen( colorGroup().highlight() );
 		else
-			p.setPen( tqcolorGroup().text() );
+			p.setPen( colorGroup().text() );
 		p.drawPixmap( width() / 2 - 2, 1, m_bitmap );
 	}
 } // KoTinyButton::paintEvent
@@ -265,20 +265,20 @@ bool KoHelpView::eventFilter( TQObject*, TQEvent* e )
 void KoHelpView::paintEvent( TQPaintEvent* )
 {
 	TQPainter p( this );
-	currentText->draw( &p, 0, 0, TQRect(), tqcolorGroup() );
+	currentText->draw( &p, 0, 0, TQRect(), colorGroup() );
 } // KoHelpView::paintEvent
 
 KoHelpWidget::KoHelpWidget( TQString help, TQWidget* parent )
 		: TQWidget( parent )
 {
-	TQGridLayout* tqlayout = new TQGridLayout( this, 3, 3 );
-	tqlayout->setMargin( 2 );
-	tqlayout->addWidget( m_upButton = new KoHelpNavButton( KoHelpNavButton::Up, this ), 0, 1, AlignHCenter );
-	tqlayout->addWidget( m_helpViewport = new TQWidget( this ), 1, 1 );
-	tqlayout->addWidget( m_downButton = new KoHelpNavButton( KoHelpNavButton::Down, this ), 2, 1, AlignHCenter );
-	tqlayout->addColSpacing( 0, 5 );
-	tqlayout->addColSpacing( 2, 5 );
-	tqlayout->setColStretch( 1, 1 );
+	TQGridLayout* layout = new TQGridLayout( this, 3, 3 );
+	layout->setMargin( 2 );
+	layout->addWidget( m_upButton = new KoHelpNavButton( KoHelpNavButton::Up, this ), 0, 1, AlignHCenter );
+	layout->addWidget( m_helpViewport = new TQWidget( this ), 1, 1 );
+	layout->addWidget( m_downButton = new KoHelpNavButton( KoHelpNavButton::Down, this ), 2, 1, AlignHCenter );
+	layout->addColSpacing( 0, 5 );
+	layout->addColSpacing( 2, 5 );
+	layout->setColStretch( 1, 1 );
 
 	m_helpView = new KoHelpView( m_helpViewport );
 	m_helpViewport->setBackgroundMode( PaletteLight );
@@ -370,20 +370,20 @@ void KoHelpWidget::stopScrolling()
 KoContextHelpPopup::KoContextHelpPopup( TQWidget* parent )
 		: TQWidget( parent, "", WType_Dialog | WStyle_Customize | WStyle_NoBorder )
 {
-	TQGridLayout* tqlayout = new TQGridLayout( this );
+	TQGridLayout* layout = new TQGridLayout( this );
 	TQHBoxLayout* buttonLayout;
-	tqlayout->addWidget( m_helpIcon = new TQLabel( this ), 0, 0 );
-	tqlayout->addWidget( m_helpTitle = new KoVerticalLabel( this ), 1, 0 );
-	buttonLayout = new TQHBoxLayout( tqlayout );
-	//tqlayout->addLayout( buttonLayout, 2, 0 );
-	tqlayout->addMultiCellWidget( m_helpViewer = new KoHelpWidget( "", this ), 0, 2, 1, 1 );
+	layout->addWidget( m_helpIcon = new TQLabel( this ), 0, 0 );
+	layout->addWidget( m_helpTitle = new KoVerticalLabel( this ), 1, 0 );
+	buttonLayout = new TQHBoxLayout( layout );
+	//layout->addLayout( buttonLayout, 2, 0 );
+	layout->addMultiCellWidget( m_helpViewer = new KoHelpWidget( "", this ), 0, 2, 1, 1 );
 	buttonLayout->add( m_close = new KoTinyButton( KoTinyButton::Close, this ) );
 	buttonLayout->add( m_sticky = new KoTinyButton( KoTinyButton::Sticky, this ) );
-	tqlayout->addColSpacing( 2, 2 );
-	tqlayout->addRowSpacing( 3, 2 );
-	tqlayout->setMargin( 3 );
-	tqlayout->setSpacing( 1 );
-	tqlayout->setRowStretch( 1, 1 );
+	layout->addColSpacing( 2, 2 );
+	layout->addRowSpacing( 3, 2 );
+	layout->setMargin( 3 );
+	layout->setSpacing( 1 );
+	layout->setRowStretch( 1, 1 );
 	buttonLayout->setSpacing( 1 );
 	setMinimumSize( 180, 180 );
 
@@ -450,7 +450,7 @@ void KoContextHelpPopup::resizeEvent( TQResizeEvent* )
 void KoContextHelpPopup::paintEvent( TQPaintEvent* )
 {
 	TQPainter p( this );
-	p.fillRect( 0, 0, width(), height(), tqcolorGroup().light() );
+	p.fillRect( 0, 0, width(), height(), colorGroup().light() );
 	p.setPen( black );
 	p.drawRect( 0, 0, width(), height() );
 	p.fillRect( width() - 3, 0, width() - 1, height() - 1, black );
@@ -537,13 +537,13 @@ KoContextHelpWidget::KoContextHelpWidget( TQWidget* parent, const char* name )
 		: TQWidget( parent, name )
 {
 	setCaption( i18n( "Context Help" ) );
-	TQGridLayout* tqlayout = new TQGridLayout( this );
-	tqlayout->addWidget( m_helpIcon = new TQLabel( this ), 0, 0 );
-	tqlayout->addWidget( m_helpTitle = new KoVerticalLabel( this ), 1, 0 );
-	tqlayout->addMultiCellWidget( m_helpViewer = new KoHelpWidget( "", this ), 0, 1, 1, 1 );
-	tqlayout->setMargin( 2 );
-	tqlayout->setSpacing( 1 );
-	tqlayout->setRowStretch( 1, 1 );
+	TQGridLayout* layout = new TQGridLayout( this );
+	layout->addWidget( m_helpIcon = new TQLabel( this ), 0, 0 );
+	layout->addWidget( m_helpTitle = new KoVerticalLabel( this ), 1, 0 );
+	layout->addMultiCellWidget( m_helpViewer = new KoHelpWidget( "", this ), 0, 1, 1, 1 );
+	layout->setMargin( 2 );
+	layout->setSpacing( 1 );
+	layout->setRowStretch( 1, 1 );
 	this->setMinimumSize( 180, 120 );
 	this->show();
 	setContextHelp( i18n( "Context Help" ), i18n( "Here will be shown help according to your actions" ), 0 );
@@ -567,13 +567,13 @@ KoContextHelpDocker::KoContextHelpDocker( TQWidget* parent, const char* name )
 {
 	setCaption( i18n( "Context Help" ) );
 	TQWidget* mainWidget = new TQWidget( this );
-	TQGridLayout* tqlayout = new TQGridLayout( mainWidget );
-	tqlayout->addWidget( m_helpIcon = new TQLabel( mainWidget ), 0, 0 );
-	tqlayout->addWidget( m_helpTitle = new KoVerticalLabel( mainWidget ), 1, 0 );
-	tqlayout->addMultiCellWidget( m_helpViewer = new KoHelpWidget( "", mainWidget ), 0, 1, 1, 1 );
-	tqlayout->setMargin( 2 );
-	tqlayout->setSpacing( 1 );
-	tqlayout->setRowStretch( 1, 1 );
+	TQGridLayout* layout = new TQGridLayout( mainWidget );
+	layout->addWidget( m_helpIcon = new TQLabel( mainWidget ), 0, 0 );
+	layout->addWidget( m_helpTitle = new KoVerticalLabel( mainWidget ), 1, 0 );
+	layout->addMultiCellWidget( m_helpViewer = new KoHelpWidget( "", mainWidget ), 0, 1, 1, 1 );
+	layout->setMargin( 2 );
+	layout->setSpacing( 1 );
+	layout->setRowStretch( 1, 1 );
 	mainWidget->setMinimumSize( 180, 120 );
 	mainWidget->show();
 	setWidget( mainWidget );
diff --git a/lib/kofficeui/KoEditPath.cpp b/lib/kofficeui/KoEditPath.cpp
index 19fd8c92..3870ede4 100644
--- a/lib/kofficeui/KoEditPath.cpp
+++ b/lib/kofficeui/KoEditPath.cpp
@@ -19,7 +19,7 @@
 
 #include <tdeversion.h>
 #include <klocale.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqlistbox.h>
 #include "KoEditPath.h"
@@ -75,7 +75,7 @@ KoChangePathDia::KoChangePathDia( const TQString & _path, TQWidget *parent, cons
     TQVBox *page =makeVBoxMainWidget();
     new TQLabel( i18n("Location:"), page);
     m_urlReq = new KURLRequester(page);
-    m_urlReq->setMinimumWidth( m_urlReq->tqsizeHint().width() * 3 );
+    m_urlReq->setMinimumWidth( m_urlReq->sizeHint().width() * 3 );
 
     m_urlReq->lineEdit()->setText( _path );
     m_urlReq->fileDialog()->setMode(KFile::Directory | KFile::LocalOnly);
diff --git a/lib/kofficeui/KoGeneralPropertyUi.ui b/lib/kofficeui/KoGeneralPropertyUi.ui
index 688688c2..399bc900 100644
--- a/lib/kofficeui/KoGeneralPropertyUi.ui
+++ b/lib/kofficeui/KoGeneralPropertyUi.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout13</cstring>
+                <cstring>layout13</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -157,7 +157,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>21</height>
diff --git a/lib/kofficeui/KoGuideLineDia.cpp b/lib/kofficeui/KoGuideLineDia.cpp
index a889b3d8..1f0fcff0 100644
--- a/lib/kofficeui/KoGuideLineDia.cpp
+++ b/lib/kofficeui/KoGuideLineDia.cpp
@@ -25,7 +25,7 @@
 #include <tqhbox.h>
 #include <tqvbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqradiobutton.h>
 
 #include <klocale.h>
@@ -60,7 +60,7 @@ KoGuideLineDia::KoGuideLineDia( TQWidget *parent, KoPoint &pos, KoRect &rect,
 
     TQButtonGroup *group = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Orientation" ), vbox );
     group->setRadioButtonExclusive( true );
-    //group->tqlayout();
+    //group->layout();
     m_hButton = new TQRadioButton( i18n( "Horizontal" ), group );
     m_vButton = new TQRadioButton( i18n( "Vertical" ), group );
 
diff --git a/lib/kofficeui/KoGuides.cpp b/lib/kofficeui/KoGuides.cpp
index 01f6e745..870fddc6 100644
--- a/lib/kofficeui/KoGuides.cpp
+++ b/lib/kofficeui/KoGuides.cpp
@@ -69,10 +69,10 @@ private:
     int m_pos;
 };
 
-const KoGuides::SnaptqStatus KoGuides::SNAP_NONE = 0;
-const KoGuides::SnaptqStatus KoGuides::SNAP_HORIZ = 1;
-const KoGuides::SnaptqStatus KoGuides::SNAP_VERT = 2;
-const KoGuides::SnaptqStatus KoGuides::SNAP_BOTH = 3;
+const KoGuides::SnapStatus KoGuides::SNAP_NONE = 0;
+const KoGuides::SnapStatus KoGuides::SNAP_HORIZ = 1;
+const KoGuides::SnapStatus KoGuides::SNAP_VERT = 2;
+const KoGuides::SnapStatus KoGuides::SNAP_BOTH = 3;
 
 KoGuides::KoGuides( KoView *view, KoZoomHandler *zoomHandler )
 : m_view( view )
@@ -365,11 +365,11 @@ void KoGuides::getGuideLines( TQValueList<double> &horizontalPos, TQValueList<do
 }
 
 
-void KoGuides::snapToGuideLines( KoRect &rect, int snap, SnaptqStatus &snaptqStatus, KoPoint &diff )
+void KoGuides::snapToGuideLines( KoRect &rect, int snap, SnapStatus &snapStatus, KoPoint &diff )
 {
-    if( !(snaptqStatus & SNAP_VERT))
+    if( !(snapStatus & SNAP_VERT))
         diff.setX(10000);
-    if( !(snaptqStatus & SNAP_HORIZ))
+    if( !(snapStatus & SNAP_HORIZ))
         diff.setY(10000);
 
     for ( int i = 0; i < GL_END; ++i )
@@ -380,60 +380,60 @@ void KoGuides::snapToGuideLines( KoRect &rect, int snap, SnaptqStatus &snaptqSta
             if ( ( *it )->orientation == Qt::Horizontal )
             {
                 double tmp = (*it)->position - rect.top();
-                if ( snaptqStatus & SNAP_HORIZ || TQABS( tmp ) < m_zoomHandler->unzoomItY( snap ) )
+                if ( snapStatus & SNAP_HORIZ || TQABS( tmp ) < m_zoomHandler->unzoomItY( snap ) )
                 {
                     if(TQABS( tmp ) < TQABS(diff.y()))
                     {
                         diff.setY( tmp );
-                        snaptqStatus |= SNAP_HORIZ;
+                        snapStatus |= SNAP_HORIZ;
                     }
                 }
                 tmp = (*it)->position - rect.bottom();
-                if ( snaptqStatus & SNAP_HORIZ || TQABS( tmp ) < m_zoomHandler->unzoomItY( snap ) )
+                if ( snapStatus & SNAP_HORIZ || TQABS( tmp ) < m_zoomHandler->unzoomItY( snap ) )
                 {
                     if(TQABS( tmp ) < TQABS(diff.y()))
                     {
                         diff.setY( tmp );
-                        snaptqStatus |= SNAP_HORIZ;
+                        snapStatus |= SNAP_HORIZ;
                     }
                 }
             }
             else
             {
                 double tmp = (*it)->position - rect.left();
-                if ( snaptqStatus & SNAP_VERT || TQABS( tmp ) < m_zoomHandler->unzoomItX( snap ) )
+                if ( snapStatus & SNAP_VERT || TQABS( tmp ) < m_zoomHandler->unzoomItX( snap ) )
                 {
                     if(TQABS( tmp ) < TQABS(diff.x()))
                     {
                         diff.setX( tmp );
-                        snaptqStatus |= SNAP_VERT;
+                        snapStatus |= SNAP_VERT;
                     }
                 }
                 tmp = (*it)->position - rect.right();
-                if ( snaptqStatus & SNAP_VERT || TQABS( tmp ) < m_zoomHandler->unzoomItX( snap ) )
+                if ( snapStatus & SNAP_VERT || TQABS( tmp ) < m_zoomHandler->unzoomItX( snap ) )
                 {
                     if(TQABS( tmp ) < TQABS(diff.x()))
                     {
                         diff.setX( tmp );
-                        snaptqStatus |= SNAP_VERT;
+                        snapStatus |= SNAP_VERT;
                     }
                 }
             }
         }
     }
 
-    if(!(snaptqStatus & SNAP_VERT))
+    if(!(snapStatus & SNAP_VERT))
         diff.setX( 0 );
 
-    if(!(snaptqStatus & SNAP_HORIZ))
+    if(!(snapStatus & SNAP_HORIZ))
         diff.setY( 0 );
 }
 
-void KoGuides::snapToGuideLines( KoPoint &pos, int snap, SnaptqStatus &snaptqStatus, KoPoint &diff )
+void KoGuides::snapToGuideLines( KoPoint &pos, int snap, SnapStatus &snapStatus, KoPoint &diff )
 {
-    if( !(snaptqStatus & SNAP_VERT))
+    if( !(snapStatus & SNAP_VERT))
         diff.setX(10000);
-    if( !(snaptqStatus & SNAP_HORIZ))
+    if( !(snapStatus & SNAP_HORIZ))
         diff.setY(10000);
 
     for ( int i = 0; i < GL_END; ++i )
@@ -444,34 +444,34 @@ void KoGuides::snapToGuideLines( KoPoint &pos, int snap, SnaptqStatus &snaptqSta
             if ( ( *it )->orientation == Qt::Horizontal )
             {
                 double tmp = (*it)->position - pos.y();
-                if ( snaptqStatus & SNAP_HORIZ || TQABS( tmp ) < m_zoomHandler->unzoomItY( snap ) )
+                if ( snapStatus & SNAP_HORIZ || TQABS( tmp ) < m_zoomHandler->unzoomItY( snap ) )
                 {
                     if(TQABS( tmp ) < TQABS(diff.y()))
                     {
                         diff.setY( tmp );
-                        snaptqStatus |= SNAP_HORIZ;
+                        snapStatus |= SNAP_HORIZ;
                     }
                 }
             }
             else
             {
                 double tmp = (*it)->position - pos.x();
-                if ( snaptqStatus & SNAP_VERT || TQABS( tmp ) < m_zoomHandler->unzoomItX( snap ) )
+                if ( snapStatus & SNAP_VERT || TQABS( tmp ) < m_zoomHandler->unzoomItX( snap ) )
                 {
                     if(TQABS( tmp ) < TQABS(diff.x()))
                     {
                         diff.setX( tmp );
-                        snaptqStatus |= SNAP_VERT;
+                        snapStatus |= SNAP_VERT;
                     }
                 }
             }
         }
     }
 
-    if(!(snaptqStatus & SNAP_VERT))
+    if(!(snapStatus & SNAP_VERT))
         diff.setX( 0 );
 
-    if(!(snaptqStatus & SNAP_HORIZ))
+    if(!(snapStatus & SNAP_HORIZ))
         diff.setY( 0 );
 }
 
@@ -530,7 +530,7 @@ void KoGuides::repaintSnapping( const KoRect &snappedRect )
 }
 
 
-void KoGuides::repaintSnapping( const KoPoint &snappedPoint, SnaptqStatus snaptqStatus )
+void KoGuides::repaintSnapping( const KoPoint &snappedPoint, SnapStatus snapStatus )
 {
     bool needRepaint = false;
     for ( int i = 0; i < GL_END; ++i )
@@ -538,7 +538,7 @@ void KoGuides::repaintSnapping( const KoPoint &snappedPoint, SnaptqStatus snaptq
         TQValueList<KoGuideLine *>::const_iterator it = m_guideLines[i].begin();
         for ( ; it != m_guideLines[i].end(); ++it )
         {
-            if ( ( *it )->orientation == Qt::Horizontal && ( snaptqStatus & SNAP_HORIZ ) )
+            if ( ( *it )->orientation == Qt::Horizontal && ( snapStatus & SNAP_HORIZ ) )
             {
                 if( virtuallyEqual( snappedPoint.y(), (*it)->position ) )
                 {
@@ -556,7 +556,7 @@ void KoGuides::repaintSnapping( const KoPoint &snappedPoint, SnaptqStatus snaptq
             }
             else
             {
-                if ( snaptqStatus & SNAP_VERT )
+                if ( snapStatus & SNAP_VERT )
                 {
                     if( virtuallyEqual( snappedPoint.x(), (*it)->position ) )
                     {
@@ -754,7 +754,7 @@ void KoGuides::slotRemove()
 
 void KoGuides::paint()
 {
-    m_view->canvas()->tqrepaint( false );
+    m_view->canvas()->repaint( false );
 }
 
 
diff --git a/lib/kofficeui/KoGuides.h b/lib/kofficeui/KoGuides.h
index b98b0472..c1f66138 100644
--- a/lib/kofficeui/KoGuides.h
+++ b/lib/kofficeui/KoGuides.h
@@ -58,8 +58,8 @@ public:
      */
     void paintGuides( TQPainter &painter );
 
-    typedef int SnaptqStatus;
-    static const SnaptqStatus SNAP_NONE, SNAP_HORIZ, SNAP_VERT, SNAP_BOTH;
+    typedef int SnapStatus;
+    static const SnapStatus SNAP_NONE, SNAP_HORIZ, SNAP_VERT, SNAP_BOTH;
 
     /**
      * @brief Handle mousePressEvent
@@ -148,17 +148,17 @@ public:
      * @brief Snap rect to guidelines
      *
      * This looks for a guide which is in reach for the guide as defined in snap.
-     * This method has the abillity to combine more calls. The snaptqStatus and diff args are both input and
-     * output. On first call you should set snaptqStatus to 0. The return value would then show in which
+     * This method has the abillity to combine more calls. The snapStatus and diff args are both input and
+     * output. On first call you should set snapStatus to 0. The return value would then show in which
      * directions it has snapped. If you combine several KoGuides you can let these output arguments
      * be input for the next koGuide. That way you'll always catch the nearest guide.
      *
      * @param rect the rect which should be snapped
      * @param snap the distance within the guide should snap - but always snap if already snapped
-     * @param snaptqStatus if horiz,vert or both directions are snapped (both in and out param). 
+     * @param snapStatus if horiz,vert or both directions are snapped (both in and out param). 
      * @param diff distance away from guide. Only valid if status is snapping (both in and out param)
      */
-    void snapToGuideLines( KoRect &rect, int snap, SnaptqStatus &snaptqStatus, KoPoint &diff );
+    void snapToGuideLines( KoRect &rect, int snap, SnapStatus &snapStatus, KoPoint &diff );
 
     /**
      * @brief Snap rect to guidelines
@@ -167,13 +167,13 @@ public:
      *
      * @param pos the position which should be snapped
      * @param snap the distance wherein the guide should snap - but always snap if already snapped
-     * @param snaptqStatus if horiz,vert or both directions are snapped (both in and out param)
+     * @param snapStatus if horiz,vert or both directions are snapped (both in and out param)
      * @param diff distance away from guide. Only valid if status is snapping (both in and out param)
      */
-    void snapToGuideLines( KoPoint &pos, int snap, SnaptqStatus &snaptqStatus, KoPoint &diff );
+    void snapToGuideLines( KoPoint &pos, int snap, SnapStatus &snapStatus, KoPoint &diff );
 
     /**
-     * @brief tqrepaint guides if any changed snapping status
+     * @brief repaint guides if any changed snapping status
      *
      * This issues a paint request if any guides have changed snapping status.
      *
@@ -182,16 +182,16 @@ public:
     void repaintSnapping( const KoRect &snappedRect );
 
     /**
-     * @brief tqrepaint guides if any changed snapping status
+     * @brief repaint guides if any changed snapping status
      *
      * This issues a paint request if any guides have changed snapping status.
      *
      * @param snappedPoint the point after it has been snapped
      */
-    void repaintSnapping( const KoPoint &snappedPoint, SnaptqStatus snaptqStatus );
+    void repaintSnapping( const KoPoint &snappedPoint, SnapStatus snapStatus );
 
     /**
-     * @brief tqrepaint guides so none is snapped
+     * @brief repaint guides so none is snapped
      *
      * This issues a paint request if any guides have changed snapping status.
      * It also effectively un-snaps all since it doesn't take an argument 
@@ -253,9 +253,9 @@ signals:
     /**
      * @brief This signal is emitted when guides start/stop painting.
      *
-     * With this signal it is possible to only tqrepaint the guides in the paint 
+     * With this signal it is possible to only repaint the guides in the paint 
      * method of the canvas. Just set/unset a flag when this signal is emmited.
-     * This signal is emitted before and after a tqrepaint is done.
+     * This signal is emitted before and after a repaint is done.
      *
      * @param state true when starting painting guides, false when stopping.
      */
diff --git a/lib/kofficeui/KoInsertLink.cpp b/lib/kofficeui/KoInsertLink.cpp
index 342889c4..50b04c60 100644
--- a/lib/kofficeui/KoInsertLink.cpp
+++ b/lib/kofficeui/KoInsertLink.cpp
@@ -20,7 +20,7 @@
 #include <kapplication.h>
 #include <klocale.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqvbox.h>
 #include <kdebug.h>
 #include <tqlabel.h>
@@ -484,7 +484,7 @@ fileLinkPage::fileLinkPage( TQWidget *parent , char *name  )
   else
       recentFile->insertStringList( lst);
   
-  recentFile->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
+  recentFile->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
   
   connect( recentFile , TQT_SIGNAL(highlighted ( const TQString &)), this,  TQT_SLOT( slotSelectRecentFile( const TQString & )));
 
diff --git a/lib/kofficeui/KoKoolBar.cpp b/lib/kofficeui/KoKoolBar.cpp
index 5f42caae..1db0ee9b 100644
--- a/lib/kofficeui/KoKoolBar.cpp
+++ b/lib/kofficeui/KoKoolBar.cpp
@@ -218,7 +218,7 @@ KoKoolBarBox::KoKoolBarBox( KoKoolBar *_bar ) :
   setFrameShape( StyledPanel );
   setFrameShadow( Sunken );
   // setBackgroundMode( PaletteBase );
-  setBackgroundColor( tqcolorGroup().background() );
+  setBackgroundColor( colorGroup().background() );
 }
 
 void KoKoolBarBox::setActiveGroup( KoKoolBarGroup *_grp )
diff --git a/lib/kofficeui/KoPageLayoutColumns.cpp b/lib/kofficeui/KoPageLayoutColumns.cpp
index 8ea3b0b9..be51e60e 100644
--- a/lib/kofficeui/KoPageLayoutColumns.cpp
+++ b/lib/kofficeui/KoPageLayoutColumns.cpp
@@ -23,20 +23,20 @@
 #include <KoUnitWidgets.h>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
-KoPageLayoutColumns::KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& tqlayout)
+KoPageLayoutColumns::KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& layout)
     : KoPageLayoutColumnsBase(parent) {
     m_columns = columns;
     TQHBoxLayout *lay = new TQHBoxLayout(previewPane);
-    m_preview = new KoPagePreview( previewPane, "Preview", tqlayout );
+    m_preview = new KoPagePreview( previewPane, "Preview", layout );
     lay->addWidget(m_preview);
     lay = new TQHBoxLayout(columnSpacingPane);
     m_spacing = new KoUnitDoubleSpinBox( columnSpacingPane );
     m_spacing->setValue(  m_columns.ptColumnSpacing );
     m_spacing->setUnit( unit );
     double dStep = KoUnit::fromUserValue( 0.2, unit );
-    m_spacing->setMinMaxStep( 0, tqlayout.ptWidth/2, dStep );
+    m_spacing->setMinMaxStep( 0, layout.ptWidth/2, dStep );
     lay->addWidget(m_spacing);
     labelSpacing->setBuddy( m_spacing );
     nColumns->setValue( m_columns.columns );
@@ -63,8 +63,8 @@ void KoPageLayoutColumns::nSpaceChanged( double spacing ) {
     emit propertyChange(m_columns);
 }
 
-void KoPageLayoutColumns::setLayout(KoPageLayout &tqlayout) {
-    m_preview->setPageLayout( tqlayout );
+void KoPageLayoutColumns::setLayout(KoPageLayout &layout) {
+    m_preview->setPageLayout( layout );
 }
 
 #include <KoPageLayoutColumns.moc>
diff --git a/lib/kofficeui/KoPageLayoutColumns.h b/lib/kofficeui/KoPageLayoutColumns.h
index 8ebac1b2..b9dcd6c2 100644
--- a/lib/kofficeui/KoPageLayoutColumns.h
+++ b/lib/kofficeui/KoPageLayoutColumns.h
@@ -43,15 +43,15 @@ public:
      * @param parent the parent widget
      * @param columns the KoColumns data structure that this dialog should be initialzed with
      * @param unit the unit-type (mm/cm/inch) that the dialog should show
-     * @param tqlayout the page tqlayout that the preview should be initialzed with.
+     * @param layout the page layout that the preview should be initialzed with.
      */
-    KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& tqlayout);
+    KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& layout);
 
     /**
-     * Update the page preview widget with the param tqlayout.
-     * @param tqlayout the new tqlayout
+     * Update the page preview widget with the param layout.
+     * @param layout the new layout
      */
-    void setLayout(KoPageLayout &tqlayout);
+    void setLayout(KoPageLayout &layout);
 public slots:
 
     /**
diff --git a/lib/kofficeui/KoPageLayoutColumnsBase.ui b/lib/kofficeui/KoPageLayoutColumnsBase.ui
index 325fe45e..07cced25 100644
--- a/lib/kofficeui/KoPageLayoutColumnsBase.ui
+++ b/lib/kofficeui/KoPageLayoutColumnsBase.ui
@@ -56,7 +56,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/lib/kofficeui/KoPageLayoutDia.cpp b/lib/kofficeui/KoPageLayoutDia.cpp
index 0b410bf1..24e32a7a 100644
--- a/lib/kofficeui/KoPageLayoutDia.cpp
+++ b/lib/kofficeui/KoPageLayoutDia.cpp
@@ -34,7 +34,7 @@
 #include <kmessagebox.h>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpainter.h>
 #include <tqlineedit.h>
 #include <tqbuttongroup.h>
@@ -49,10 +49,10 @@
 /******************************************************************/
 
 /*===================== constrcutor ==============================*/
-KoPagePreview::KoPagePreview( TQWidget* parent, const char *name, const KoPageLayout& tqlayout )
+KoPagePreview::KoPagePreview( TQWidget* parent, const char *name, const KoPageLayout& layout )
     : TQGroupBox( i18n( "Page Preview" ), parent, name )
 {
-    setPageLayout( tqlayout );
+    setPageLayout( layout );
     columns = 1;
     setMinimumSize( 150, 150 );
 }
@@ -62,15 +62,15 @@ KoPagePreview::~KoPagePreview()
 {
 }
 
-/*=================== set tqlayout =================================*/
-void KoPagePreview::setPageLayout( const KoPageLayout &tqlayout )
+/*=================== set layout =================================*/
+void KoPagePreview::setPageLayout( const KoPageLayout &layout )
 {
     // resolution[XY] is in pixel per pt
     double resolutionX = POINT_TO_INCH( static_cast<double>(KoGlobal::dpiX()) );
     double resolutionY = POINT_TO_INCH( static_cast<double>(KoGlobal::dpiY()) );
 
-    m_pageWidth = tqlayout.ptWidth * resolutionX;
-    m_pageHeight = tqlayout.ptHeight * resolutionY;
+    m_pageWidth = layout.ptWidth * resolutionX;
+    m_pageHeight = layout.ptHeight * resolutionY;
 
     double zh = 110.0 / m_pageHeight;
     double zw = 110.0 / m_pageWidth;
@@ -79,19 +79,19 @@ void KoPagePreview::setPageLayout( const KoPageLayout &tqlayout )
     m_pageWidth *= z;
     m_pageHeight *= z;
 
-    m_textFrameX = tqlayout.ptLeft * resolutionX * z;
-    m_textFrameY = tqlayout.ptTop * resolutionY * z;
-    m_textFrameWidth = m_pageWidth - ( tqlayout.ptLeft + tqlayout.ptRight ) * resolutionX * z;
-    m_textFrameHeight = m_pageHeight - ( tqlayout.ptTop + tqlayout.ptBottom ) * resolutionY * z;
+    m_textFrameX = layout.ptLeft * resolutionX * z;
+    m_textFrameY = layout.ptTop * resolutionY * z;
+    m_textFrameWidth = m_pageWidth - ( layout.ptLeft + layout.ptRight ) * resolutionX * z;
+    m_textFrameHeight = m_pageHeight - ( layout.ptTop + layout.ptBottom ) * resolutionY * z;
 
-    tqrepaint( true );
+    repaint( true );
 }
 
-/*=================== set tqlayout =================================*/
+/*=================== set layout =================================*/
 void KoPagePreview::setPageColumns( const KoColumns &_columns )
 {
     columns = _columns.columns;
-    tqrepaint( true );
+    repaint( true );
 }
 
 /*======================== draw contents =========================*/
@@ -129,7 +129,7 @@ void KoPagePreview::drawContents( TQPainter *painter )
 
 /*==================== constructor ===============================*/
 KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
-                                  const KoPageLayout& tqlayout,
+                                  const KoPageLayout& layout,
                                   const KoHeadFoot& hf, int tabs,
                                   KoUnit::Unit unit, bool modal )
     : KDialogBase( KDialogBase::Tabbed, i18n("Page Layout"), KDialogBase::Ok | KDialogBase::Cancel,
@@ -137,7 +137,7 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
 {
 
     flags = tabs;
-    m_layout = tqlayout;
+    m_layout = layout;
     m_unit = unit;
     m_pageSizeTab = 0;
     m_columnsTab = 0;
@@ -154,7 +154,7 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
 
 /*==================== constructor ===============================*/
 KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
-                  const KoPageLayout& tqlayout,
+                  const KoPageLayout& layout,
                   const KoHeadFoot& hf,
                   const KoColumns& columns,
                   const KoKWHeaderFooter& kwhf,
@@ -164,7 +164,7 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
 {
     flags = tabs;
 
-    m_layout = tqlayout;
+    m_layout = layout;
     m_column = columns;
     m_unit = unit;
     m_pageSizeTab = 0;
@@ -186,14 +186,14 @@ KoPageLayoutDia::~KoPageLayoutDia()
 }
 
 /*======================= show dialog ============================*/
-bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, int tabs, KoUnit::Unit& unit, TQWidget* parent )
+bool KoPageLayoutDia::pageLayout( KoPageLayout& layout, KoHeadFoot& hf, int tabs, KoUnit::Unit& unit, TQWidget* parent )
 {
     bool res = false;
-    KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", tqlayout, hf, tabs, unit );
+    KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", layout, hf, tabs, unit );
 
     if ( dlg->exec() == TQDialog::Accepted ) {
         res = true;
-        if ( tabs & FORMAT_AND_BORDERS ) tqlayout = dlg->tqlayout();
+        if ( tabs & FORMAT_AND_BORDERS ) layout = dlg->layout();
         if ( tabs & HEADER_AND_FOOTER ) hf = dlg->headFoot();
         unit = dlg->unit();
     }
@@ -204,15 +204,15 @@ bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, int ta
 }
 
 /*======================= show dialog ============================*/
-bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, KoColumns& columns,
+bool KoPageLayoutDia::pageLayout( KoPageLayout& layout, KoHeadFoot& hf, KoColumns& columns,
                                   KoKWHeaderFooter &_kwhf, int tabs, KoUnit::Unit& unit, TQWidget* parent )
 {
     bool res = false;
-    KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", tqlayout, hf, columns, _kwhf, tabs, unit );
+    KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", layout, hf, columns, _kwhf, tabs, unit );
 
     if ( dlg->exec() == TQDialog::Accepted ) {
         res = true;
-        if ( tabs & FORMAT_AND_BORDERS ) tqlayout = dlg->tqlayout();
+        if ( tabs & FORMAT_AND_BORDERS ) layout = dlg->layout();
         if ( tabs & HEADER_AND_FOOTER ) hf = dlg->headFoot();
         if ( tabs & COLUMNS ) columns = dlg->columns();
         if ( tabs & KW_HEADER_AND_FOOTER ) _kwhf = dlg->headerFooter();
@@ -224,7 +224,7 @@ bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, KoColu
     return res;
 }
 
-/*===================== get a standard page tqlayout ===============*/
+/*===================== get a standard page layout ===============*/
 KoPageLayout KoPageLayoutDia::standardLayout()
 {
     return KoPageLayout::standardLayout();
@@ -261,17 +261,17 @@ void KoPageLayoutDia::setupTab1( bool enableBorders )
             this, TQT_SLOT (sizeUpdated( KoPageLayout&)));
 }
 
-void KoPageLayoutDia::sizeUpdated(KoPageLayout &tqlayout) {
-    m_layout.ptWidth = tqlayout.ptWidth;
-    m_layout.ptHeight = tqlayout.ptHeight;
-    m_layout.ptLeft = tqlayout.ptLeft;
-    m_layout.ptRight = tqlayout.ptRight;
-    m_layout.ptTop = tqlayout.ptTop;
-    m_layout.ptBottom = tqlayout.ptBottom;
-    m_layout.format = tqlayout.format;
-    m_layout.orientation = tqlayout.orientation;
+void KoPageLayoutDia::sizeUpdated(KoPageLayout &layout) {
+    m_layout.ptWidth = layout.ptWidth;
+    m_layout.ptHeight = layout.ptHeight;
+    m_layout.ptLeft = layout.ptLeft;
+    m_layout.ptRight = layout.ptRight;
+    m_layout.ptTop = layout.ptTop;
+    m_layout.ptBottom = layout.ptBottom;
+    m_layout.format = layout.format;
+    m_layout.orientation = layout.orientation;
     if(m_columnsTab)
-        m_columnsTab->setLayout(tqlayout);
+        m_columnsTab->setLayout(layout);
 }
 
 /*================ setup header and footer tab ===================*/
@@ -282,9 +282,9 @@ void KoPageLayoutDia::setupTab2( const KoHeadFoot& hf )
 
     // ------------- header ---------------
     TQGroupBox *gHead = new TQGroupBox( 0, Qt::Vertical, i18n( "Head Line" ), tab2 );
-    gHead->tqlayout()->setSpacing(KDialog::spacingHint());
-    gHead->tqlayout()->setMargin(KDialog::marginHint());
-    TQGridLayout *headGrid = new TQGridLayout( gHead->tqlayout(), 2, 3 );
+    gHead->layout()->setSpacing(KDialog::spacingHint());
+    gHead->layout()->setMargin(KDialog::marginHint());
+    TQGridLayout *headGrid = new TQGridLayout( gHead->layout(), 2, 3 );
 
     TQLabel *lHeadLeft = new TQLabel( i18n( "Left:" ), gHead );
     headGrid->addWidget( lHeadLeft, 0, 0 );
@@ -311,9 +311,9 @@ void KoPageLayoutDia::setupTab2( const KoHeadFoot& hf )
 
     // ------------- footer ---------------
     TQGroupBox *gFoot = new TQGroupBox( 0, Qt::Vertical, i18n( "Foot Line" ), tab2 );
-    gFoot->tqlayout()->setSpacing(KDialog::spacingHint());
-    gFoot->tqlayout()->setMargin(KDialog::marginHint());
-    TQGridLayout *footGrid = new TQGridLayout( gFoot->tqlayout(), 2, 3 );
+    gFoot->layout()->setSpacing(KDialog::spacingHint());
+    gFoot->layout()->setMargin(KDialog::marginHint());
+    TQGridLayout *footGrid = new TQGridLayout( gFoot->layout(), 2, 3 );
 
     TQLabel *lFootLeft = new TQLabel( i18n( "Left:" ), gFoot );
     footGrid->addWidget( lFootLeft, 0, 0 );
@@ -362,7 +362,7 @@ void KoPageLayoutDia::setupTab3()
     TQWidget *tab3 = addPage(i18n( "Col&umns" ));
     TQHBoxLayout *lay = new TQHBoxLayout(tab3);
     m_columnsTab = new KoPageLayoutColumns(tab3, m_column, m_unit, m_layout);
-    m_columnsTab->tqlayout()->setMargin(0);
+    m_columnsTab->layout()->setMargin(0);
     lay->addWidget(m_columnsTab);
     m_columnsTab->show();
     connect (m_columnsTab, TQT_SIGNAL( propertyChange(KoColumns&)),
@@ -382,7 +382,7 @@ void KoPageLayoutDia::setupTab4(const KoKWHeaderFooter kwhf )
     TQWidget *tab4 = addPage(i18n( "H&eader && Footer" ));
     TQHBoxLayout *lay = new TQHBoxLayout(tab4);
     m_headerTab = new KoPageLayoutHeader(tab4, m_unit, kwhf);
-    m_headerTab->tqlayout()->setMargin(0);
+    m_headerTab->layout()->setMargin(0);
     lay->addWidget(m_headerTab);
     m_headerTab->show();
 
diff --git a/lib/kofficeui/KoPageLayoutDia.h b/lib/kofficeui/KoPageLayoutDia.h
index 21fe7df3..1ed23ec5 100644
--- a/lib/kofficeui/KoPageLayoutDia.h
+++ b/lib/kofficeui/KoPageLayoutDia.h
@@ -61,7 +61,7 @@ public:
     ~KoPagePreview();
 
     /**
-     *  set page tqlayout
+     *  set page layout
      */
     void setPageLayout( const KoPageLayout& );
     void setPageColumns( const KoColumns& );
@@ -78,7 +78,7 @@ protected:
 class KoPageLayoutDiaPrivate;
 
 /**
- *  With this dialog the user can specify the tqlayout of the paper during printing.
+ *  With this dialog the user can specify the layout of the paper during printing.
  */
 class KOFFICEUI_EXPORT KoPageLayoutDia : public KDialogBase
 {
@@ -92,14 +92,14 @@ public:
      *
      *  @param parent   The parent of the dialog.
      *  @param name     The name of the dialog.
-     *  @param tqlayout   The tqlayout.
+     *  @param layout   The layout.
      *  @param headfoot The header and the footer.
      *  @param flags     a variable with all features this dialog should show.
      *  @param unit     The unit to use for displaying the values to the user.
      *  @param modal    Whether the dialog is modal or not.
      */
     KoPageLayoutDia( TQWidget* parent, const char* name,
-             const KoPageLayout& tqlayout,
+             const KoPageLayout& layout,
              const KoHeadFoot& headfoot,
              int flags, KoUnit::Unit unit, bool modal=true );
 
@@ -108,7 +108,7 @@ public:
      *
      *  @param parent     The parent of the dialog.
      *  @param name       The name of the dialog.
-     *  @param tqlayout     The tqlayout.
+     *  @param layout     The layout.
      *  @param headfoot   The header and the footer.
      *  @param columns    The number of columns on the page.
      *  @param kwheadfoot The KWord header and footer.
@@ -116,7 +116,7 @@ public:
      *  @param unit       The unit to use for displaying the values to the user
      */
     KoPageLayoutDia( TQWidget* parent, const char* name,
-             const KoPageLayout& tqlayout,
+             const KoPageLayout& layout,
              const KoHeadFoot& headfoot,
              const KoColumns& columns,
              const KoKWHeaderFooter& kwheadfoot,
@@ -128,26 +128,26 @@ public:
     ~KoPageLayoutDia();
 
     /**
-     *  Show page tqlayout dialog.
+     *  Show page layout dialog.
      *  See constructor for documentation on the parameters
      */
     static bool pageLayout( KoPageLayout&, KoHeadFoot&, int tabs, KoUnit::Unit& unit, TQWidget* parent = 0 );
 
     /**
-     *  Show page tqlayout dialog.
+     *  Show page layout dialog.
      *  See constructor for documentation on the parameters
      */
     static bool pageLayout( KoPageLayout&, KoHeadFoot&, KoColumns&, KoKWHeaderFooter&, int tabs, KoUnit::Unit& unit, TQWidget* parent = 0 );
     /**
-     *  Retrieves a standard page tqlayout.
+     *  Retrieves a standard page layout.
      *  Deprecated: better use KoPageLayout::standardLayout()
      */
     static KDE_DEPRECATED KoPageLayout standardLayout();
 
     /**
-     *  Returns the tqlayout
+     *  Returns the layout
      */
-    const KoPageLayout& tqlayout() const { return m_layout; }
+    const KoPageLayout& layout() const { return m_layout; }
 
     /**
      *  Returns the header and footer information
@@ -177,7 +177,7 @@ private:
     TQLineEdit *eFootMid;
     TQLineEdit *eFootRight;
 
-    // tqlayout
+    // layout
     KoPageLayout m_layout;
     KoColumns m_column;
 
@@ -189,7 +189,7 @@ protected slots:
     virtual void slotOk();
 
 private slots:
-    void sizeUpdated(KoPageLayout &tqlayout);
+    void sizeUpdated(KoPageLayout &layout);
     void columnsUpdated(KoColumns &columns);
 
 private:
diff --git a/lib/kofficeui/KoPageLayoutHeader.cpp b/lib/kofficeui/KoPageLayoutHeader.cpp
index 00296957..5878ead5 100644
--- a/lib/kofficeui/KoPageLayoutHeader.cpp
+++ b/lib/kofficeui/KoPageLayoutHeader.cpp
@@ -20,7 +20,7 @@
 #include <KoPageLayoutHeader.moc>
 #include <KoUnitWidgets.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 
 KoPageLayoutHeader::KoPageLayoutHeader(TQWidget *parent, KoUnit::Unit unit, const KoKWHeaderFooter &kwhf)
diff --git a/lib/kofficeui/KoPageLayoutHeaderBase.ui b/lib/kofficeui/KoPageLayoutHeaderBase.ui
index b3bd7978..7f36378e 100644
--- a/lib/kofficeui/KoPageLayoutHeaderBase.ui
+++ b/lib/kofficeui/KoPageLayoutHeaderBase.ui
@@ -45,7 +45,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -61,7 +61,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>21</width>
                                     <height>20</height>
@@ -120,7 +120,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -136,7 +136,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>41</width>
                                     <height>20</height>
@@ -187,7 +187,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
diff --git a/lib/kofficeui/KoPageLayoutSize.cpp b/lib/kofficeui/KoPageLayoutSize.cpp
index 6ddf9409..0e8e034c 100644
--- a/lib/kofficeui/KoPageLayoutSize.cpp
+++ b/lib/kofficeui/KoPageLayoutSize.cpp
@@ -28,15 +28,15 @@
 #include <kdebug.h>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqradiobutton.h>
 #include <tqhbox.h>
 #include <tqvgroupbox.h>
 #include <tqhbuttongroup.h>
 
-KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayout, KoUnit::Unit unit,const KoColumns& columns,  bool unitChooser, bool enableBorders)
+KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, KoUnit::Unit unit,const KoColumns& columns,  bool unitChooser, bool enableBorders)
     : TQWidget(parent), m_blockSignals(false) {
-    m_layout = tqlayout;
+    m_layout = layout;
     m_unit = unit;
 
     TQGridLayout *grid1 = new TQGridLayout( this, 5, 2, 0, KDialog::spacingHint() );
@@ -61,7 +61,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayou
     else {
         TQString str=KoUnit::unitDescription(unit);
 
-        TQLabel *lpgUnit = new TQLabel( i18n("All values are given in %1.").tqarg(str), this );
+        TQLabel *lpgUnit = new TQLabel( i18n("All values are given in %1.").arg(str), this );
         grid1->addWidget( lpgUnit, 0, 0, TQt::AlignLeft );
     }
 
@@ -130,7 +130,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayou
     marginsFrame->setMargin( KDialog::marginHint() );
     grid1->addWidget( marginsFrame, 3, 0 );
 
-    TQGridLayout *marginsLayout = new TQGridLayout( marginsFrame->tqlayout(), 3, 3,
+    TQGridLayout *marginsLayout = new TQGridLayout( marginsFrame->layout(), 3, 3,
        KDialog::spacingHint() );
 
     // left margin
@@ -160,9 +160,9 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayou
     // ------------- spacers -----------
     TQWidget* spacer1 = new TQWidget( this );
     TQWidget* spacer2 = new TQWidget( this );
-    spacer1->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
+    spacer1->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
        TQSizePolicy::Expanding ) );
-    spacer2->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
+    spacer2->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
        TQSizePolicy::Expanding ) );
     grid1->addWidget( spacer1, 4, 0 );
     grid1->addWidget( spacer2, 4, 1 );
diff --git a/lib/kofficeui/KoPageLayoutSize.h b/lib/kofficeui/KoPageLayoutSize.h
index d917b349..6d50e014 100644
--- a/lib/kofficeui/KoPageLayoutSize.h
+++ b/lib/kofficeui/KoPageLayoutSize.h
@@ -42,13 +42,13 @@ public:
     /**
      * Contructor
      * @param parent the parent widget
-     * @param tqlayout the page tqlayout that this widget should be initialzed with.
+     * @param layout the page layout that this widget should be initialzed with.
      * @param unit the unit-type (mm/cm/inch) that the dialog should show
      * @param columns the KoColumns (amout of columns) that the preview should be initialized with
      * @param unitChooser if true a combobox with the unit-type is shown for the user to change
      * @param enableBorders if true enable the user to change the margins (aka borders) of the page
      */
-    KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayout, KoUnit::Unit unit,
+    KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, KoUnit::Unit unit,
             const KoColumns& columns, bool unitChooser, bool enableBorders);
 
     /**
@@ -78,11 +78,11 @@ public slots:
 signals:
     /**
      * Emitted whenever the user changed something in the dialog.
-     * @param tqlayout the update tqlayout structure with currently displayed info.
+     * @param layout the update layout structure with currently displayed info.
      * Note that the info may not be fully correct and physically possible (in which
      * case queryClose will return false)
      */
-    void propertyChange(KoPageLayout &tqlayout);
+    void propertyChange(KoPageLayout &layout);
 
 protected:
     TQComboBox *cpgFormat;
diff --git a/lib/kofficeui/KoPartSelectAction.cpp b/lib/kofficeui/KoPartSelectAction.cpp
index ca24b89a..17bda1e3 100644
--- a/lib/kofficeui/KoPartSelectAction.cpp
+++ b/lib/kofficeui/KoPartSelectAction.cpp
@@ -64,7 +64,7 @@ void KoPartSelectAction::init()
 // Called when selecting a part
 void KoPartSelectAction::slotActionActivated()
 {
-    TQString servName = TQString::tqfromLatin1( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() );
+    TQString servName = TQString::fromLatin1( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() );
     KService::Ptr serv = KService::serviceByName( servName );
     m_documentEntry = KoDocumentEntry( serv );
     emit activated();
diff --git a/lib/kofficeui/KoPartSelectDia.cpp b/lib/kofficeui/KoPartSelectDia.cpp
index b5271b97..144b8a08 100644
--- a/lib/kofficeui/KoPartSelectDia.cpp
+++ b/lib/kofficeui/KoPartSelectDia.cpp
@@ -56,7 +56,7 @@ KoPartSelectDia::KoPartSelectDia( TQWidget* parent, const char* name ) :
 
     selectionChanged( 0 );
     setFocus();
-    resize( listview->tqsizeHint().width() + 20, 300 );
+    resize( listview->sizeHint().width() + 20, 300 );
 }
 
 void KoPartSelectDia::selectionChanged( TQListViewItem *item )
diff --git a/lib/kofficeui/KoPictureFilePreview.cpp b/lib/kofficeui/KoPictureFilePreview.cpp
index 7baed8f9..e06f2127 100644
--- a/lib/kofficeui/KoPictureFilePreview.cpp
+++ b/lib/kofficeui/KoPictureFilePreview.cpp
@@ -24,7 +24,7 @@
 #include <klocale.h>
 #include <kurl.h>
 #include <tqbitmap.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqfileinfo.h>
 #include <tqpainter.h>
 #include <tqscrollview.h>
diff --git a/lib/kofficeui/KoRuler.cpp b/lib/kofficeui/KoRuler.cpp
index 212becd7..b11b0604 100644
--- a/lib/kofficeui/KoRuler.cpp
+++ b/lib/kofficeui/KoRuler.cpp
@@ -44,7 +44,7 @@ public:
     bool whileMovingBorderLeft, whileMovingBorderRight;
     bool whileMovingBorderTop, whileMovingBorderBottom;
     TQPixmap pmFirst, pmLeft;
-    KoPageLayout tqlayout;
+    KoPageLayout layout;
     KoTabChooser *tabChooser;
     KoTabulatorList tabList;
     // Do we have to remove a certain tab in the DC Event?
@@ -93,7 +93,7 @@ KoRuler::KoRuler( TQWidget *_parent, TQWidget *_canvas, Qt::Orientation _orienta
 
     d->canvas = _canvas;
     orientation = _orientation;
-    d->tqlayout = _layout;
+    d->layout = _layout;
     d->flags = _flags;
 
     d->m_bReadWrite=true;
@@ -125,11 +125,11 @@ KoRuler::KoRuler( TQWidget *_parent, TQWidget *_canvas, Qt::Orientation _orienta
 
     d->removeTab.type = T_INVALID;
     if ( orientation == Qt::Horizontal ) {
-        frameStart = tqRound( zoomIt(d->tqlayout.ptLeft) );
-        d->frameEnd = tqRound( zoomIt(d->tqlayout.ptWidth - d->tqlayout.ptRight) );
+        frameStart = tqRound( zoomIt(d->layout.ptLeft) );
+        d->frameEnd = tqRound( zoomIt(d->layout.ptWidth - d->layout.ptRight) );
     } else {
-        frameStart = tqRound( zoomIt(d->tqlayout.ptTop) );
-        d->frameEnd = tqRound( zoomIt(d->tqlayout.ptHeight - d->tqlayout.ptBottom) );
+        frameStart = tqRound( zoomIt(d->layout.ptTop) );
+        d->frameEnd = tqRound( zoomIt(d->layout.ptHeight - d->layout.ptBottom) );
     }
     m_bFrameStartSet = false;
 
@@ -209,12 +209,12 @@ void KoRuler::drawHorizontal( TQPainter *_painter )
 
     // Use a double-buffer pixmap
     TQPainter p( &buffer );
-    p.fillRect( 0, 0, width(), height(), TQBrush( tqcolorGroup().brush( TQColorGroup::Background ) ) );
+    p.fillRect( 0, 0, width(), height(), TQBrush( colorGroup().brush( TQColorGroup::Background ) ) );
 
-    int totalw = tqRound( zoomIt(d->tqlayout.ptWidth) );
+    int totalw = tqRound( zoomIt(d->layout.ptWidth) );
     TQString str;
 
-    p.setBrush( tqcolorGroup().brush( TQColorGroup::Base ) );
+    p.setBrush( colorGroup().brush( TQColorGroup::Base ) );
 
     // Draw white rect
     TQRect r;
@@ -279,13 +279,13 @@ void KoRuler::drawHorizontal( TQPainter *_painter )
     // Draw ending bar (at page width)
     //int constant=zoomIt(1);
     //p.drawLine( totalw - diffx + constant, 1, totalw - diffx + constant, height() - 1 );
-    //p.setPen( tqcolorGroup().color( TQColorGroup::Base ) );
+    //p.setPen( colorGroup().color( TQColorGroup::Base ) );
     //p.drawLine( totalw - diffx, 1, totalw - diffx, height() - 1 );
 
     // Draw starting bar (at 0)
-    //p.setPen( tqcolorGroup().color( TQColorGroup::Text ) );
+    //p.setPen( colorGroup().color( TQColorGroup::Text ) );
     //p.drawLine( -diffx, 1, -diffx, height() - 1 );
-    //p.setPen( tqcolorGroup().color( TQColorGroup::Base ) );
+    //p.setPen( colorGroup().color( TQColorGroup::Base ) );
     //p.drawLine( -diffx - constant, 1, -diffx - constant, height() - 1 );
 
     // Draw the indents triangles
@@ -307,7 +307,7 @@ void KoRuler::drawHorizontal( TQPainter *_painter )
 
     // Show the mouse position
     if ( d->action == A_NONE && showMPos ) {
-        p.setPen( tqcolorGroup().color( TQColorGroup::Text ) );
+        p.setPen( colorGroup().color( TQColorGroup::Text ) );
         p.drawLine( mposX, 1, mposX, height() - 1 );
     }
     hasToDelete = false;
@@ -325,7 +325,7 @@ void KoRuler::drawTabs( TQPainter &_painter )
 {
     int ptPos = 0;
 
-    _painter.setPen( TQPen( tqcolorGroup().color( TQColorGroup::Text ), 2, SolidLine ) );
+    _painter.setPen( TQPen( colorGroup().color( TQColorGroup::Text ), 2, SolidLine ) );
     // Check if we're in a mousemove event, removing a tab.
     // In that case, we'll have to skip drawing that one.
     bool willRemove = d->mousePressed && willRemoveTab( d->oldMy ) && d->currTab.type != T_INVALID;
@@ -356,7 +356,7 @@ void KoRuler::drawTabs( TQPainter &_painter )
             _painter.drawLine( ptPos + 4, height() - 4, ptPos + 20 - 4, height() - 4 );
             _painter.drawLine( ptPos + 20 / 2, 4, ptPos + 20 / 2, height() - 4 );
             _painter.fillRect( ptPos + 20 / 2 + 2, height() - 9, 3, 3,
-                               tqcolorGroup().color( TQColorGroup::Text ) );
+                               colorGroup().color( TQColorGroup::Text ) );
         } break;
         default: break;
         }
@@ -371,9 +371,9 @@ void KoRuler::drawVertical( TQPainter *_painter )
     resize( TQMAX( fm.height() + 4, 20 ), height() );
 
     TQPainter p( &buffer );
-    p.fillRect( 0, 0, width(), height(), TQBrush( tqcolorGroup().brush( TQColorGroup::Background ) ) );
+    p.fillRect( 0, 0, width(), height(), TQBrush( colorGroup().brush( TQColorGroup::Background ) ) );
 
-    int totalh = tqRound( zoomIt(d->tqlayout.ptHeight) );
+    int totalh = tqRound( zoomIt(d->layout.ptHeight) );
     // Clip rect - this gives basically always a rect like (2,2,width-2,height-2)
     TQRect paintRect = _painter->clipRegion( TQPainter::CoordPainter ).boundingRect();
     // Ruler rect
@@ -382,7 +382,7 @@ void KoRuler::drawVertical( TQPainter *_painter )
     if ( paintRect.intersects( rulerRect ) )  {
         TQString str;
 
-        p.setBrush( tqcolorGroup().brush( TQColorGroup::Base ) );
+        p.setBrush( colorGroup().brush( TQColorGroup::Base ) );
 
         // Draw white rect
         TQRect r;
@@ -454,19 +454,19 @@ void KoRuler::drawVertical( TQPainter *_painter )
 
         // Draw ending bar (at page height)
         //p.drawLine( 1, totalh - diffy + 1, width() - 1, totalh - diffy + 1 );
-        //p.setPen( tqcolorGroup().color( TQColorGroup::Base ) );
+        //p.setPen( colorGroup().color( TQColorGroup::Base ) );
         //p.drawLine( 1, totalh - diffy, width() - 1, totalh - diffy );
 
         // Draw starting bar (at 0)
-        //p.setPen( tqcolorGroup().color( TQColorGroup::Text ) );
+        //p.setPen( colorGroup().color( TQColorGroup::Text ) );
         //p.drawLine( 1, -diffy, width() - 1, -diffy );
-        //p.setPen( tqcolorGroup().color( TQColorGroup::Base ) );
+        //p.setPen( colorGroup().color( TQColorGroup::Base ) );
         //p.drawLine( 1, -diffy - 1, width() - 1, -diffy - 1 );
     }
 
     // Show the mouse position
     if ( d->action == A_NONE && showMPos ) {
-        p.setPen( tqcolorGroup().color( TQColorGroup::Text ) );
+        p.setPen( colorGroup().color( TQColorGroup::Text ) );
         p.drawLine( 1, mposY, width() - 1, mposY );
     }
     hasToDelete = false;
@@ -598,7 +598,7 @@ void KoRuler::mouseReleaseEvent( TQMouseEvent *e )
         if ( d->canvas )
             drawLine(d->oldMx, -1);
         update();
-        emit newPageLayout( d->tqlayout );
+        emit newPageLayout( d->layout );
     } else if ( d->action == A_BR_TOP || d->action == A_BR_BOTTOM ) {
         d->whileMovingBorderTop = false;
         d->whileMovingBorderBottom = false;
@@ -610,7 +610,7 @@ void KoRuler::mouseReleaseEvent( TQMouseEvent *e )
             p.end();
         }
         update();
-        emit newPageLayout( d->tqlayout );
+        emit newPageLayout( d->layout );
     } else if ( d->action == A_FIRST_INDENT ) {
         if ( d->canvas )
             drawLine(d->oldMx, -1);
@@ -667,12 +667,12 @@ void KoRuler::mouseMoveEvent( TQMouseEvent *e )
     hasToDelete = false;
 
     int pw = d->frameEnd - frameStart;
-    int ph = tqRound(zoomIt(d->tqlayout.ptHeight));
+    int ph = tqRound(zoomIt(d->layout.ptHeight));
     int left = frameStart - diffx;
-    int top = tqRound(zoomIt(d->tqlayout.ptTop));
+    int top = tqRound(zoomIt(d->layout.ptTop));
     top -= diffy;
     int right = d->frameEnd - diffx;
-    int bottom = tqRound(zoomIt(d->tqlayout.ptBottom));
+    int bottom = tqRound(zoomIt(d->layout.ptBottom));
     bottom = ph - bottom - diffy;
     // Cumulate first-line-indent
     int ip_first = tqRound( zoomIt( i_first + ( d->rtl ? d->i_right : i_left) ) );
@@ -693,13 +693,13 @@ void KoRuler::mouseMoveEvent( TQMouseEvent *e )
                 /////// ######
                 // At the moment, moving the left and right border indicators
                 // is disabled when setFrameStartEnd has been called (i.e. in KWord)
-                // Changing the tqlayout margins directly from it would be utterly wrong
+                // Changing the layout margins directly from it would be utterly wrong
                 // (just try the 2-columns modes...). What needs to be done is:
                 // emitting a signal frameResized in mouseReleaseEvent, when a left/right
                 // border has been moved, and in kword we need to update the margins from
                 // there, if the left border of the 1st column or the right border of the
                 // last column was moved... and find what to do with the other borders.
-                // And for normal frames, resize the frame without touching the page tqlayout.
+                // And for normal frames, resize the frame without touching the page layout.
                 // All that is too much for now -> disabling.
                 if ( !m_bFrameStartSet )
                 {
@@ -747,7 +747,7 @@ void KoRuler::mouseMoveEvent( TQMouseEvent *e )
                     case A_BR_LEFT: {
                         if ( d->canvas && mx < right-10 && mx+diffx-2 > 0) {
                             drawLine( d->oldMx, mx );
-                            d->tqlayout.ptLeft = unZoomIt(static_cast<double>(mx + diffx));
+                            d->layout.ptLeft = unZoomIt(static_cast<double>(mx + diffx));
                             if( ip_left > right-left-15 ) {
                                 ip_left=right-left-15;
                                 ip_left=ip_left<0 ? 0 : ip_left;
@@ -770,7 +770,7 @@ void KoRuler::mouseMoveEvent( TQMouseEvent *e )
                     case A_BR_RIGHT: {
                         if ( d->canvas && mx > left+10 && mx+diffx <= pw-2) {
                             drawLine( d->oldMx, mx );
-                            d->tqlayout.ptRight = unZoomIt(static_cast<double>(pw - ( mx + diffx )));
+                            d->layout.ptRight = unZoomIt(static_cast<double>(pw - ( mx + diffx )));
                             if( ip_left > right-left-15 ) {
                                 ip_left=right-left-15;
                                 ip_left=ip_left<0 ? 0 : ip_left;
@@ -895,7 +895,7 @@ void KoRuler::mouseMoveEvent( TQMouseEvent *e )
                             p.drawLine( 0, d->oldMy, d->canvas->width(), d->oldMy );
                             p.drawLine( 0, my, d->canvas->width(), my );
                             p.end();
-                            d->tqlayout.ptTop = unZoomIt(static_cast<double>(my + diffy));
+                            d->layout.ptTop = unZoomIt(static_cast<double>(my + diffy));
                             d->oldMx = mx;
                             d->oldMy = my;
                             update();
@@ -910,7 +910,7 @@ void KoRuler::mouseMoveEvent( TQMouseEvent *e )
                             p.drawLine( 0, d->oldMy, d->canvas->width(), d->oldMy );
                             p.drawLine( 0, my, d->canvas->width(), my );
                             p.end();
-                            d->tqlayout.ptBottom = unZoomIt(static_cast<double>(ph - ( my + diffy )));
+                            d->layout.ptBottom = unZoomIt(static_cast<double>(ph - ( my + diffy )));
                             d->oldMx = mx;
                             d->oldMy = my;
                             update();
@@ -984,7 +984,7 @@ void KoRuler::handleDoubleClick()
 
     // Double-clicked nothing
     d->action = A_NONE;
-    emit doubleClicked(); // usually page tqlayout dialog
+    emit doubleClicked(); // usually page layout dialog
 }
 
 void KoRuler::setTabList( const KoTabulatorList & _tabList )
@@ -1176,7 +1176,7 @@ void KoRuler::slotMenuActivated( int i )
     }
 }
 
-TQSize KoRuler::tqminimumSizeHint() const
+TQSize KoRuler::minimumSizeHint() const
 {
     TQSize size;
     TQFont font = KGlobalSettings::toolBarFont();
@@ -1188,14 +1188,14 @@ TQSize KoRuler::tqminimumSizeHint() const
     return size;
 }
 
-TQSize KoRuler::tqsizeHint() const
+TQSize KoRuler::sizeHint() const
 {
-    return tqminimumSizeHint();
+    return minimumSizeHint();
 }
 
 void KoRuler::setPageLayout( const KoPageLayout& _layout )
 {
-    d->tqlayout = _layout;
+    d->layout = _layout;
     update();
 }
 
diff --git a/lib/kofficeui/KoRuler.h b/lib/kofficeui/KoRuler.h
index 5cea5678..352e6820 100644
--- a/lib/kofficeui/KoRuler.h
+++ b/lib/kofficeui/KoRuler.h
@@ -96,7 +96,7 @@ class KoRulerPrivate;
  * and supports zooming, tabulators, paragraph indents, showing the mouse position, etc.
  *
  * It also offers a popupmenu upon right-clicking, for changing the unit,
- * the page tqlayout, or removing a tab.
+ * the page layout, or removing a tab.
  */
 class KOFFICEUI_EXPORT KoRuler : public TQFrame
 {
@@ -139,7 +139,7 @@ public:
     const double& zoom() const { return m_zoom; }
 
     /**
-     * Set the page tqlayout, see @ref KoPageLayout.
+     * Set the page layout, see @ref KoPageLayout.
      * This defines the size of the page and the margins,
      * from which the size of the ruler is deducted.
      */
@@ -246,12 +246,12 @@ public:
     /**
      * Reimplemented from TQWidget
      */
-    virtual TQSize tqminimumSizeHint() const;
+    virtual TQSize minimumSizeHint() const;
 
     /**
      * Reimplemented from TQWidget
      */
-    virtual TQSize tqsizeHint() const;
+    virtual TQSize sizeHint() const;
 
 signals:
     void newPageLayout( const KoPageLayout & );
diff --git a/lib/kofficeui/KoTabBar.cpp b/lib/kofficeui/KoTabBar.cpp
index e33ce12c..02c34f2d 100644
--- a/lib/kofficeui/KoTabBar.cpp
+++ b/lib/kofficeui/KoTabBar.cpp
@@ -37,7 +37,7 @@
 // TODO
 // improvement possibilities
 // - use offscreen buffer to reduce flicker even more
-// - keep track of tabs, only (re)tqlayout when necessary
+// - keep track of tabs, only (re)layout when necessary
 // - paint all tabs to buffer, show only by shifting
 // - customizable button pixmaps
 // - use TQStyle to paint the tabs & buttons (is it good/possible?)
@@ -57,7 +57,7 @@ public:
     // read-only: no mouse drag, double-click, right-click
     bool readOnly;
     
-    // if true, tqlayout is from right to left
+    // if true, layout is from right to left
     bool reverseLayout;
 
     // list of all tabs, in order of appearance
@@ -273,20 +273,20 @@ void KoTabBarPrivate::drawTab( TQPainter& painter, TQRect& rect, const TQString&
     painter.save();
 
     // fill it first  
-    TQBrush bg = tabbar->tqcolorGroup().background();
-    if( active ) bg = TQBrush(tabbar->tqcolorGroup().base());
+    TQBrush bg = tabbar->colorGroup().background();
+    if( active ) bg = TQBrush(tabbar->colorGroup().base());
     painter.setBrush( bg );
     painter.setPen( TQPen( TQt::NoPen ) );
     painter.drawPolygon( polygon );
 
     // draw the lines
-    painter.setPen( tabbar->tqcolorGroup().dark() );
+    painter.setPen( tabbar->colorGroup().dark() );
     if( !active )
       painter.drawLine( rect.x()-25, rect.y(), rect.right()+25, rect.top() );
     // TQt4: painter.setRenderHint( TQPainter::Antialiasing );
     painter.drawPolyline( polygon );
 
-    painter.setPen( tabbar->tqcolorGroup().buttonText() );
+    painter.setPen( tabbar->colorGroup().buttonText() );
     TQFont f = painter.font();
     if( active ) f.setBold( true );
     painter.setFont( f );
@@ -660,10 +660,10 @@ void KoTabBar::paintEvent( TQPaintEvent* )
 
     TQPainter painter;
     TQPixmap pm( size() );
-    pm.fill( tqcolorGroup().background() );
-    painter.tqbegin( TQT_TQPAINTDEVICE(&pm), this );
+    pm.fill( colorGroup().background() );
+    painter.begin( TQT_TQPAINTDEVICE(&pm), this );
 
-    painter.setPen( tqcolorGroup().dark() );
+    painter.setPen( colorGroup().dark() );
     painter.drawLine( 0, 0, width(), 0 );
 
     if( !d->reverseLayout )
@@ -722,9 +722,9 @@ void KoTabBar::resizeEvent( TQResizeEvent* )
     update();
 }
 
-TQSize KoTabBar::tqsizeHint() const
+TQSize KoTabBar::sizeHint() const
 {
-    return TQSize( 40, tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent, this ) );
+    return TQSize( 40, tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent, this ) );
 }
 
 void KoTabBar::renameTab( const TQString& old_name, const TQString& new_name )
diff --git a/lib/kofficeui/KoTabBar.h b/lib/kofficeui/KoTabBar.h
index 39cf03b8..0c4233b4 100644
--- a/lib/kofficeui/KoTabBar.h
+++ b/lib/kofficeui/KoTabBar.h
@@ -219,7 +219,7 @@ public slots:
      */
     void clear();
     
-    TQSize tqsizeHint() const;
+    TQSize sizeHint() const;
 
 signals:
 
diff --git a/lib/kofficeui/KoTabChooser.cpp b/lib/kofficeui/KoTabChooser.cpp
index ed891e89..19d93764 100644
--- a/lib/kofficeui/KoTabChooser.cpp
+++ b/lib/kofficeui/KoTabChooser.cpp
@@ -94,7 +94,7 @@ void KoTabChooser::mousePressEvent( TQMouseEvent *e )
 	    else if ( flags & TAB_RIGHT ) currType = TAB_RIGHT;
 	} break;
 	}
-	tqrepaint( true );
+	repaint( true );
     } break;
     case Qt::RightButton: {
 	TQPoint pnt( TQCursor::pos() );
diff --git a/lib/kofficeui/KoTabChooser.h b/lib/kofficeui/KoTabChooser.h
index 31ad0f85..fb9a0591 100644
--- a/lib/kofficeui/KoTabChooser.h
+++ b/lib/kofficeui/KoTabChooser.h
@@ -71,10 +71,10 @@ protected:
     KoTabChooserPrivate *d;
 
 protected slots:
-    void rbLeft() { currType = TAB_LEFT; tqrepaint( true ); }
-    void rbCenter() { currType = TAB_CENTER; tqrepaint( true ); }
-    void rbRight() { currType = TAB_RIGHT; tqrepaint( true ); }
-    void rbDecPoint() { currType = TAB_DEC_PNT; tqrepaint( true ); }
+    void rbLeft() { currType = TAB_LEFT; repaint( true ); }
+    void rbCenter() { currType = TAB_CENTER; repaint( true ); }
+    void rbRight() { currType = TAB_RIGHT; repaint( true ); }
+    void rbDecPoint() { currType = TAB_DEC_PNT; repaint( true ); }
 
 };
 
diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp
index 1e526133..6fe4f550 100644
--- a/lib/kofficeui/KoTemplateChooseDia.cpp
+++ b/lib/kofficeui/KoTemplateChooseDia.cpp
@@ -47,7 +47,7 @@
 #include <kaboutdata.h>
 
 #include <tqapplication.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtabwidget.h>
 #include <tqcombobox.h>
 #include <tqcheckbox.h>
@@ -84,7 +84,7 @@ class MyFileDialog : public KFileDialog
                 ok = TQFile::exists( url.path() );
                 if ( !ok ) {
                     // Maybe offer to create a new document with that name? (see alos KoDocument::openFile)
-                    KMessageBox::error( this, i18n( "The file %1 does not exist." ).tqarg( url.path() ) );
+                    KMessageBox::error( this, i18n( "The file %1 does not exist." ).arg( url.path() ) );
                 }
             }
             return ok;
@@ -165,7 +165,7 @@ class KoTemplateChooseDiaPrivate {
 	// choose a file
 	MyFileDialog *m_filedialog;
 
-	// for the tqlayout
+	// for the layout
 	TQTabWidget* tabWidget;
 	TQWidget* newTab;
 	TQWidget* existingTab;
@@ -298,13 +298,13 @@ KoTemplateChooseDia::DialogType KoTemplateChooseDia::getDialogType() const {
 
 /*================================================================*/
 // private
-void KoTemplateChooseDia::setupRecentDialog(TQWidget * widgetbase, TQGridLayout * tqlayout)
+void KoTemplateChooseDia::setupRecentDialog(TQWidget * widgetbase, TQGridLayout * layout)
 {
 
         d->m_recent = new KoTCDRecentFilesIconView(widgetbase, "recent files");
         // I prefer the icons to be in "most recent first" order (DF)
         d->m_recent->setSorting( static_cast<TQDir::SortSpec>( TQDir::Time | TQDir::Reversed ) );
-        tqlayout->addWidget(d->m_recent,0,0);
+        layout->addWidget(d->m_recent,0,0);
 
         TQString oldGroup = d->m_instance->config()->group();
         d->m_instance->config()->setGroup( "RecentFiles" );
@@ -312,7 +312,7 @@ void KoTemplateChooseDia::setupRecentDialog(TQWidget * widgetbase, TQGridLayout
         int i = 0;
         TQString value;
         do {
-                TQString key=TQString( "File%1" ).tqarg( i );
+                TQString key=TQString( "File%1" ).arg( i );
                 value=d->m_instance->config()->readPathEntry( key );
                 if ( !value.isEmpty() ) {
                     // Support for tdelibs-3.5's new RecentFiles format: name[url]
@@ -342,7 +342,7 @@ void KoTemplateChooseDia::setupRecentDialog(TQWidget * widgetbase, TQGridLayout
 
 /*================================================================*/
 // private
-void KoTemplateChooseDia::setupFileDialog(TQWidget * widgetbase, TQGridLayout * tqlayout)
+void KoTemplateChooseDia::setupFileDialog(TQWidget * widgetbase, TQGridLayout * layout)
 {
     TQString dir = TQString();
     TQPoint point( 0, 0 );
@@ -353,7 +353,7 @@ void KoTemplateChooseDia::setupFileDialog(TQWidget * widgetbase, TQGridLayout *
 	    "file dialog",
 	    false);
 
-    tqlayout->addWidget(d->m_filedialog,0,0);
+    layout->addWidget(d->m_filedialog,0,0);
     d->m_filedialog->reparent( widgetbase , point );
     //d->m_filedialog->setOperationMode( KFileDialog::Opening);
 
@@ -387,20 +387,20 @@ void KoTemplateChooseDia::setupFileDialog(TQWidget * widgetbase, TQGridLayout *
 
 /*================================================================*/
 // private
-void KoTemplateChooseDia::setupTemplateDialog(TQWidget * widgetbase, TQGridLayout * tqlayout)
+void KoTemplateChooseDia::setupTemplateDialog(TQWidget * widgetbase, TQGridLayout * layout)
 {
 
     d->m_jwidget = new KJanusWidget(
 	    widgetbase,
 	    "kjanuswidget",
 	    KJanusWidget::IconList);
-    tqlayout->addWidget(d->m_jwidget,0,0);
+    layout->addWidget(d->m_jwidget,0,0);
 
     d->boxdescription = new TQVGroupBox(
 	    i18n("Selected Template"),
 	    widgetbase,
 	    "boxdescription");
-    tqlayout->addWidget(d->boxdescription, 1, 0 );
+    layout->addWidget(d->boxdescription, 1, 0 );
 
     // config
     KConfigGroup grp( d->m_instance->config(), "TemplateChooserDialog" );
@@ -429,11 +429,11 @@ void KoTemplateChooseDia::setupTemplateDialog(TQWidget * widgetbase, TQGridLayou
 		group->name(),
 		group->first()->loadPicture(d->m_instance));
 
-	TQGridLayout * tqlayout = new TQGridLayout(frame);
+	TQGridLayout * layout = new TQGridLayout(frame);
 	KoTCDIconCanvas *canvas = new KoTCDIconCanvas( frame );
-	tqlayout->addWidget(canvas,0,0);
+	layout->addWidget(canvas,0,0);
 
-	canvas->setBackgroundColor( tqcolorGroup().base() );
+	canvas->setBackgroundColor( colorGroup().base() );
 	canvas->setResizeMode(TQIconView::Adjust);
 	canvas->setWordWrapIconText( true );
 	canvas->show();
@@ -478,10 +478,10 @@ void KoTemplateChooseDia::setupTemplateDialog(TQWidget * widgetbase, TQGridLayou
     currentChanged(itemtoselect);
 
     // setup the checkbox
-    TQString translatedstring = i18n("Always start %1 with the selected template").tqarg(d->m_nativeName);
+    TQString translatedstring = i18n("Always start %1 with the selected template").arg(d->m_nativeName);
 
     d->m_nodiag = new TQCheckBox ( translatedstring , widgetbase);
-    tqlayout->addWidget(d->m_nodiag, 2, 0);
+    layout->addWidget(d->m_nodiag, 2, 0);
     TQString  startwithoutdialog = grp.readEntry( "NoStartDlg" );
     bool ischecked = startwithoutdialog == TQString("yes");
 
@@ -642,7 +642,7 @@ void KoTemplateChooseDia::slotOk()
 	static const char* const s_returnTypes[] = { 0 /*Cancel ;)*/, "Template", "File", "Empty" };
 	if ( d->m_returnType <= Empty )
 	{
-	    grp.writeEntry( "LastReturnType", TQString::tqfromLatin1(s_returnTypes[d->m_returnType]) );
+	    grp.writeEntry( "LastReturnType", TQString::fromLatin1(s_returnTypes[d->m_returnType]) );
 	    if (d->m_returnType == Template)
 	    {
 		grp.writeEntry( "TemplateTab", d->m_jwidget->activePageIndex() );
@@ -706,7 +706,7 @@ bool KoTemplateChooseDia::collectInfo()
 		KURL url = item->url();
 		if(url.isLocalFile() && !TQFile::exists(url.path()))
 		{
-			KMessageBox::error( this, i18n( "The file %1 does not exist." ).tqarg( url.path() ) );
+			KMessageBox::error( this, i18n( "The file %1 does not exist." ).arg( url.path() ) );
 			return false;
 		}
 		d->m_fullTemplateName = url.url();
@@ -793,12 +793,12 @@ void KoTCDRecentFilesIconView::showToolTip( TQIconViewItem* item )
     // and another one for deciding what's the text of the tooltip...
     const KFileItem *fi = ( (KFileIconViewItem*)item )->fileInfo();
     TQString toolTipText = fi->url().prettyURL( 0, KURL::StripFileProtocol );
-    toolTip = new TQLabel( TQString::tqfromLatin1(" %1 ").tqarg(toolTipText), 0,
+    toolTip = new TQLabel( TQString::fromLatin1(" %1 ").arg(toolTipText), 0,
                           "myToolTip",
                           WStyle_StaysOnTop | WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WX11BypassWM );
     toolTip->setFrameStyle( TQFrame::Plain | TQFrame::Box );
     toolTip->setLineWidth( 1 );
-    toolTip->tqsetAlignment( AlignLeft | AlignTop );
+    toolTip->setAlignment( AlignLeft | AlignTop );
     toolTip->move( TQCursor::pos() + TQPoint( 14, 14 ) );
     toolTip->adjustSize();
     TQRect screen = TQApplication::desktop()->screenGeometry(
@@ -810,7 +810,7 @@ void KoTCDRecentFilesIconView::showToolTip( TQIconViewItem* item )
         toolTip->move(toolTip->x(), screen.bottom()-toolTip->y()-toolTip->height()+toolTip->y());
     }
     toolTip->setFont( TQToolTip::font() );
-    toolTip->tqsetPalette( TQToolTip::palette(), TRUE );
+    toolTip->setPalette( TQToolTip::palette(), TRUE );
     toolTip->show();
 }
 
diff --git a/lib/kofficeui/KoTemplateChooseDia.h b/lib/kofficeui/KoTemplateChooseDia.h
index 677c11b1..9363477d 100644
--- a/lib/kofficeui/KoTemplateChooseDia.h
+++ b/lib/kofficeui/KoTemplateChooseDia.h
@@ -236,9 +236,9 @@ private:
 
     TQString descriptionText(const TQString &name, const TQString &description);
     void setupDialog();
-    void setupTemplateDialog(TQWidget * widgetbase, TQGridLayout * tqlayout);
-    void setupFileDialog(TQWidget * widgetbase, TQGridLayout * tqlayout);
-    void setupRecentDialog(TQWidget * widgetbase, TQGridLayout * tqlayout);
+    void setupTemplateDialog(TQWidget * widgetbase, TQGridLayout * layout);
+    void setupFileDialog(TQWidget * widgetbase, TQGridLayout * layout);
+    void setupRecentDialog(TQWidget * widgetbase, TQGridLayout * layout);
     bool collectInfo();
     bool noStartupDlg() const;
 
diff --git a/lib/kofficeui/KoTemplateCreateDia.cpp b/lib/kofficeui/KoTemplateCreateDia.cpp
index 6243b9dc..53770a42 100644
--- a/lib/kofficeui/KoTemplateCreateDia.cpp
+++ b/lib/kofficeui/KoTemplateCreateDia.cpp
@@ -23,7 +23,7 @@
 #include <KoTemplateCreateDia.h>
 
 #include <tqfile.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqgroupbox.h>
 #include <tqradiobutton.h>
@@ -142,15 +142,15 @@ KoTemplateCreateDia::KoTemplateCreateDia( const TQCString &templateType, KInstan
     TQVBoxLayout *rightbox=new TQVBoxLayout(mbox);
     TQGroupBox *pixbox=new TQGroupBox(i18n("Picture"), mainwidget);
     rightbox->addWidget(pixbox);
-    TQVBoxLayout *pixtqlayout=new TQVBoxLayout(pixbox, KDialogBase::marginHint(),
+    TQVBoxLayout *pixlayout=new TQVBoxLayout(pixbox, KDialogBase::marginHint(),
                                            KDialogBase::spacingHint());
-    pixtqlayout->addSpacing(pixbox->fontMetrics().height()/2);
-    pixtqlayout->addStretch(1);
+    pixlayout->addSpacing(pixbox->fontMetrics().height()/2);
+    pixlayout->addStretch(1);
     d->m_default=new TQRadioButton(i18n("&Default"), pixbox);
     d->m_default->setChecked(true);
     connect(d->m_default, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDefault()));
-    pixtqlayout->addWidget(d->m_default);
-    TQHBoxLayout *custombox=new TQHBoxLayout(pixtqlayout);
+    pixlayout->addWidget(d->m_default);
+    TQHBoxLayout *custombox=new TQHBoxLayout(pixlayout);
     d->m_custom=new TQRadioButton(i18n("Custom"), pixbox);
     d->m_custom->setChecked(false);
     connect(d->m_custom, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCustom()));
@@ -159,19 +159,19 @@ KoTemplateCreateDia::KoTemplateCreateDia( const TQCString &templateType, KInstan
     connect(d->m_select, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelect()));
     custombox->addWidget(d->m_select, 1);
     custombox->addStretch(1);
-    pixtqlayout->addStretch(1);
+    pixlayout->addStretch(1);
     label=new TQLabel(i18n("Preview:"), pixbox);
-    pixtqlayout->addWidget(label);
-    TQHBoxLayout *previewbox=new TQHBoxLayout(pixtqlayout);
+    pixlayout->addWidget(label);
+    TQHBoxLayout *previewbox=new TQHBoxLayout(pixlayout);
     previewbox->addStretch(10);
     d->m_preview=new TQLabel(pixbox); // setPixmap() -> auto resize?
     previewbox->addWidget(d->m_preview);
     previewbox->addStretch(10);
-    pixtqlayout->addStretch(8);
+    pixlayout->addStretch(8);
 
     d->m_defaultTemplate = new TQCheckBox( i18n("Use the new template as default"), mainwidget );
     d->m_defaultTemplate->setChecked( true );
-    TQToolTip::add( d->m_defaultTemplate, i18n("Use the new template every time %1 starts").tqarg(instance->aboutData()->programName() ) );
+    TQToolTip::add( d->m_defaultTemplate, i18n("Use the new template every time %1 starts").arg(instance->aboutData()->programName() ) );
     rightbox->addWidget( d->m_defaultTemplate );
 
     enableButtonOK(false);
diff --git a/lib/kofficeui/KoToolBox.cpp b/lib/kofficeui/KoToolBox.cpp
index db4d6467..556dce02 100644
--- a/lib/kofficeui/KoToolBox.cpp
+++ b/lib/kofficeui/KoToolBox.cpp
@@ -22,7 +22,7 @@
 #include <tqtoolbutton.h>
 #include <tqlabel.h>
 #include <tqtooltip.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpixmap.h>
 #include <tqtoolbar.h>
 #include <tqdockwindow.h>
diff --git a/lib/kofficeui/KoToolBox.h b/lib/kofficeui/KoToolBox.h
index 764ce4c1..7b31d847 100644
--- a/lib/kofficeui/KoToolBox.h
+++ b/lib/kofficeui/KoToolBox.h
@@ -104,7 +104,7 @@ public:
     TQWidget* getNextParent();
 
 private:
-    TQPtrList<TQWidget>  m_tqchildren;
+    TQPtrList<TQWidget>  m_children;
     TQBoxLayout        *m_layout;
 
     TQWidget           *m_leftRow;
diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp
index 7260bbea..abe449b2 100644
--- a/lib/kofficeui/KoTooluButton.cpp
+++ b/lib/kofficeui/KoTooluButton.cpp
@@ -53,12 +53,12 @@ KoColorPanel::~KoColorPanel()
 {
 }
 
-TQSize KoColorPanel::tqsizeHint() const
+TQSize KoColorPanel::sizeHint() const
 {
-    return tqminimumSizeHint();
+    return minimumSizeHint();
 }
 
-TQSize KoColorPanel::tqminimumSizeHint() const
+TQSize KoColorPanel::minimumSizeHint() const
 {
     return TQSize( COLS << 4, lines() << 4 );
 }
@@ -109,7 +109,7 @@ void KoColorPanel::clear()
     if ( m_colorMap.isEmpty() )
         return;
 
-    TQSize area( tqminimumSizeHint() );
+    TQSize area( minimumSizeHint() );
     m_colorMap.clear();
     init();
     updateGeometry();
@@ -136,7 +136,7 @@ void KoColorPanel::insertDefaultColors()
         return;
     m_defaultsAdded = true;
 
-    int currentRow = m_nextPosition.y; // we have to tqrepaint this row below
+    int currentRow = m_nextPosition.y; // we have to repaint this row below
 
     // Note: No checking for duplicates, so take care when you modify that list
     insertColor(TQColor( 255 ,     0 ,     0 ), i18n( "color", "Red" ), false);
@@ -294,9 +294,9 @@ void KoColorPanel::insertDefaultColors()
     insertColor(TQColor(   0 ,     0 ,   205 ), i18n( "color", "MediumBlue" ), false);
     insertColor(TQColor(   0 ,     0 ,   128 ), i18n( "color", "Navy" ), false);
 
-    finalizeInsertion( m_nextPosition );  // with a no-op paint() call as we tqrepaint anyway
+    finalizeInsertion( m_nextPosition );  // with a no-op paint() call as we repaint anyway
     updateGeometry();
-    // we have to tqrepaint the "old" current row explicitly due
+    // we have to repaint the "old" current row explicitly due
     // to WStaticContents
     update( 0, currentRow << 4, COLS << 4, 16 );
 }
@@ -369,7 +369,7 @@ void KoColorPanel::paintEvent( TQPaintEvent* e )
     if ( hasFocus() && m_focusPosition.x != -1 && m_focusPosition.y != -1 &&
          mapFromPosition( m_focusPosition ).intersects( e->rect() ) )
         tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, &p, TQRect( m_focusPosition.x << 4, m_focusPosition.y << 4, TILESIZE, TILESIZE ),
-                               tqcolorGroup(), TQStyle::Style_Sunken | TQStyle::Style_Enabled );
+                               colorGroup(), TQStyle::Style_Sunken | TQStyle::Style_Enabled );
 
     --lns;  // Attention: We just avoid some lns - 1 statements
 
@@ -580,7 +580,7 @@ void KoColorPanel::updateFocusPosition( const Position& newPosition )
     if ( it != m_colorMap.end() ) {
         // draw at the new focus position
         tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, &p, TQRect( m_focusPosition.x << 4, m_focusPosition.y << 4, TILESIZE, TILESIZE ),
-                               tqcolorGroup(), TQStyle::Style_Sunken | TQStyle::Style_Enabled );
+                               colorGroup(), TQStyle::Style_Sunken | TQStyle::Style_Enabled );
         p.fillRect( ( m_focusPosition.x << 4 ) + 2, ( m_focusPosition.y << 4 ) + 2, 12, 12, it.data() );
     }
 
@@ -663,21 +663,21 @@ KoToolButton::~KoToolButton()
 {
 }
 
-TQSize KoToolButton::tqsizeHint() const
+TQSize KoToolButton::sizeHint() const
 {
-    return tqminimumSizeHint();
+    return minimumSizeHint();
 }
 
-TQSize KoToolButton::tqminimumSizeHint() const
+TQSize KoToolButton::minimumSizeHint() const
 {
-    TQSize size = KToolBarButton::tqminimumSizeHint();
+    TQSize size = KToolBarButton::minimumSizeHint();
     size.setWidth( size.width() + ARROW_WIDTH );
     return size;
 }
 
-TQSize KoToolButton::tqminimumSize() const
+TQSize KoToolButton::minimumSize() const
 {
-    return tqminimumSizeHint();
+    return minimumSizeHint();
 }
 
 void KoToolButton::colorSelected( const TQColor& color )
@@ -691,7 +691,7 @@ void KoToolButton::drawButton(TQPainter *_painter)
     TQStyle::SCFlags active = TQStyle::SC_None;
     TQStyle::SCFlags arrowActive = TQStyle::SC_None;
     TQStyleOption opt;
-    TQColorGroup cg( tqcolorGroup() );
+    TQColorGroup cg( colorGroup() );
 
     if ( isEnabled() ) {
   	flags |= TQStyle::Style_Enabled;
@@ -712,10 +712,10 @@ void KoToolButton::drawButton(TQPainter *_painter)
 
     // Draw styled toolbuttons
     _painter->setClipRect( 0, 0, width() - ARROW_WIDTH, height() );
-    tqstyle().tqdrawComplexControl( TQStyle::CC_ToolButton, _painter, this, TQRect( 0, 0, width() - ARROW_WIDTH, height() ), cg,
+    tqstyle().drawComplexControl( TQStyle::CC_ToolButton, _painter, this, TQRect( 0, 0, width() - ARROW_WIDTH, height() ), cg,
                                 flags, TQStyle::SC_ToolButton, active, opt );
     _painter->setClipRect( width() - ARROW_WIDTH, 0, ARROW_WIDTH, height() );
-    tqstyle().tqdrawComplexControl( TQStyle::CC_ToolButton, _painter, this, TQRect( width(), 0, ARROW_WIDTH, height() ), cg,
+    tqstyle().drawComplexControl( TQStyle::CC_ToolButton, _painter, this, TQRect( width(), 0, ARROW_WIDTH, height() ), cg,
                                 arrowFlags, TQStyle::SC_ToolButton, arrowActive, opt );
     _painter->setClipping( false );
 
@@ -724,7 +724,7 @@ void KoToolButton::drawButton(TQPainter *_painter)
                            cg, flags, opt );
 
     if ( KToolBarButton::isRaised() || m_arrowPressed )
-        qDrawShadeLine( _painter, width() - ARROW_WIDTH - 1, 0, width() - ARROW_WIDTH - 1, height() - 1, tqcolorGroup(), true );
+        qDrawShadeLine( _painter, width() - ARROW_WIDTH - 1, 0, width() - ARROW_WIDTH - 1, height() - 1, colorGroup(), true );
 
     int dx, dy;
     TQFont tmp_font( KGlobalSettings::toolBarFont() );
@@ -798,11 +798,11 @@ void KoToolButton::drawButton(TQPainter *_painter)
     if (!textLabel().isNull() && !textRect.isNull()) {
         _painter->setFont( KGlobalSettings::toolBarFont() );
         if ( !isEnabled() )
-            _painter->setPen( tqpalette().disabled().dark() );
+            _painter->setPen( palette().disabled().dark() );
         else if( KToolBarButton::isRaised() )
             _painter->setPen( KGlobalSettings::toolBarHighlightColor() );
         else
-            _painter->setPen( tqcolorGroup().buttonText() );
+            _painter->setPen( colorGroup().buttonText() );
         _painter->drawText( textRect, textFlags, textLabel() );
     }
 }
@@ -838,15 +838,15 @@ void KoToolButton::init()
     // We are interested in the mouse clicks on the arrow button
     m_popup->installEventFilter( this );
 
-    ARROW_WIDTH = tqstyle().tqpixelMetric(TQStyle::PM_MenuButtonIndicator) + 4;
+    ARROW_WIDTH = tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator) + 4;
     kdDebug() << "##################### Arrow: " << ARROW_WIDTH << endl;
 }
 
 void KoToolButton::buttonShift( int& dx, int& dy )
 {
     if ( isDown() && !m_arrowPressed ) {
-        dx += tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal );
-        dy += tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftVertical );
+        dx += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftHorizontal );
+        dy += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftVertical );
     }
 }
 
diff --git a/lib/kofficeui/KoTooluButton.h b/lib/kofficeui/KoTooluButton.h
index 1374f6d2..804b270b 100644
--- a/lib/kofficeui/KoTooluButton.h
+++ b/lib/kofficeui/KoTooluButton.h
@@ -34,8 +34,8 @@ public:
     KoColorPanel( TQWidget* parent = 0, const char* name = 0 );
     virtual ~KoColorPanel();
 
-    virtual TQSize tqsizeHint() const;
-    virtual TQSize tqminimumSizeHint() const;
+    virtual TQSize sizeHint() const;
+    virtual TQSize minimumSizeHint() const;
 
     enum MenuStyle { Plain, CustomColors };
     static TQPopupMenu* createColorPopup( MenuStyle style, const TQColor& defaultColor,
@@ -163,9 +163,9 @@ public:
 
     virtual ~KoToolButton();
 
-    virtual TQSize tqsizeHint() const;
-    virtual TQSize tqminimumSizeHint() const;
-    virtual TQSize tqminimumSize() const;
+    virtual TQSize sizeHint() const;
+    virtual TQSize minimumSizeHint() const;
+    virtual TQSize minimumSize() const;
 
 public slots:
     void colorSelected( const TQColor& color );
diff --git a/lib/kofficeui/KoUnitWidgets.cpp b/lib/kofficeui/KoUnitWidgets.cpp
index 476e35b3..a5af7bdf 100644
--- a/lib/kofficeui/KoUnitWidgets.cpp
+++ b/lib/kofficeui/KoUnitWidgets.cpp
@@ -24,7 +24,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 
 // ----------------------------------------------------------------
@@ -90,7 +90,7 @@ KoUnitDoubleValidator::validate( TQString &s, int &pos ) const
 
 TQString KoUnitDoubleBase::getVisibleText( double value ) const
 {
-    const TQString num ( TQString( "%1%2").tqarg( KGlobal::locale()->formatNumber( value, m_precision ), KoUnit::unitName( m_unit ) ) );
+    const TQString num ( TQString( "%1%2").arg( KGlobal::locale()->formatNumber( value, m_precision ), KoUnit::unitName( m_unit ) ) );
     kdDebug(30004) << "getVisibleText: " << TQString::number( value, 'f', 12 ) << " => " << num << endl;
     return num;
 }
@@ -223,7 +223,7 @@ KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( TQWidget *parent, const char *name )
     : KLineEdit( parent, name ), KoUnitDoubleBase( KoUnit::U_PT, 2 ), m_value( 0.0 ), m_lower( 0.0 ), m_upper( 9999.99 ),
     m_lowerInPoints( 0.0 ), m_upperInPoints( 9999.99 )
 {
-    tqsetAlignment( TQt::AlignRight );
+    setAlignment( TQt::AlignRight );
     m_validator = new KoUnitDoubleValidator( this, TQT_TQOBJECT(this) );
     setValidator( m_validator );
     setUnit( KoUnit::U_PT );
@@ -235,7 +235,7 @@ KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( TQWidget *parent, double lower, doub
     : KLineEdit( parent, name ), KoUnitDoubleBase( unit, precision ), m_value( value ), m_lower( lower ), m_upper( upper ),
     m_lowerInPoints( lower ), m_upperInPoints( upper )
 {
-    tqsetAlignment( TQt::AlignRight );
+    setAlignment( TQt::AlignRight );
     m_validator = new KoUnitDoubleValidator( this, TQT_TQOBJECT(this) );
     setValidator( m_validator );
     setUnit( unit );
@@ -287,7 +287,7 @@ double KoUnitDoubleLineEdit::value( void ) const
 KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, const char *name )
      : KComboBox( true, parent, name ), KoUnitDoubleBase( KoUnit::U_PT, 2 ), m_value( 0.0 ), m_lower( 0.0 ), m_upper( 9999.99 ), m_lowerInPoints( 0.0 ), m_upperInPoints( 9999.99 )
 {
-    lineEdit()->tqsetAlignment( TQt::AlignRight );
+    lineEdit()->setAlignment( TQt::AlignRight );
     m_validator = new KoUnitDoubleValidator( this, TQT_TQOBJECT(this) );
     lineEdit()->setValidator( m_validator );
     setUnit( KoUnit::U_PT );
@@ -300,7 +300,7 @@ KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, double lower, doub
      : KComboBox( true, parent, name ), KoUnitDoubleBase( unit, precision ), m_value( value ), m_lower( lower ), m_upper( upper ),
      m_lowerInPoints( lower ), m_upperInPoints( upper )
 {
-    lineEdit()->tqsetAlignment( TQt::AlignRight );
+    lineEdit()->setAlignment( TQt::AlignRight );
     m_validator = new KoUnitDoubleValidator( this, TQT_TQOBJECT(this) );
     lineEdit()->setValidator( m_validator );
     setUnit( unit );
@@ -379,48 +379,48 @@ double KoUnitDoubleComboBox::value( void ) const
 KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *parent, const char *name )
     : TQWidget( parent ), m_step( 1.0 )
 {
-    TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3 );
-    //tqlayout->setMargin( 2 );
+    TQGridLayout *layout = new TQGridLayout( this, 2, 3 );
+    //layout->setMargin( 2 );
     TQPushButton *up = new TQPushButton( "+", this );
     //up->setFlat( true );
     up->setMaximumHeight( 15 );
     up->setMaximumWidth( 15 );
-    tqlayout->addWidget( up, 0, 0 );
+    layout->addWidget( up, 0, 0 );
     connect( up, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpClicked() ) );
 
     TQPushButton *down = new TQPushButton( "-", this );
     down->setMaximumHeight( 15 );
     down->setMaximumWidth( 15 );
-    tqlayout->addWidget( down, 1, 0 );
+    layout->addWidget( down, 1, 0 );
     connect( down, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDownClicked() ) );
 
     m_combo = new KoUnitDoubleComboBox( this, KoUnit::ptToUnit( 0.0, KoUnit::U_PT ), KoUnit::ptToUnit( 9999.99, KoUnit::U_PT ), 0.0, KoUnit::U_PT, 2, name );
     connect( m_combo, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SIGNAL( valueChanged( double ) ) );
-    tqlayout->addMultiCellWidget( m_combo, 0, 1, 2, 2 );
+    layout->addMultiCellWidget( m_combo, 0, 1, 2, 2 );
 }
 
 KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *parent, double lower, double upper, double step, double value,
                                                     KoUnit::Unit unit, unsigned int precision, const char *name )
     : TQWidget( parent ), m_step( step )//, m_lowerInPoints( lower ), m_upperInPoints( upper )
 {
-    TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3 );
-    //tqlayout->setMargin( 2 );
+    TQGridLayout *layout = new TQGridLayout( this, 2, 3 );
+    //layout->setMargin( 2 );
     TQPushButton *up = new TQPushButton( "+", this );
     //up->setFlat( true );
     up->setMaximumHeight( 15 );
     up->setMaximumWidth( 15 );
-    tqlayout->addWidget( up, 0, 0 );
+    layout->addWidget( up, 0, 0 );
     connect( up, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpClicked() ) );
 
     TQPushButton *down = new TQPushButton( "-", this );
     down->setMaximumHeight( 15 );
     down->setMaximumWidth( 15 );
-    tqlayout->addWidget( down, 1, 0 );
+    layout->addWidget( down, 1, 0 );
     connect( down, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDownClicked() ) );
 
     m_combo = new KoUnitDoubleComboBox( this, KoUnit::ptToUnit( lower, unit ), KoUnit::ptToUnit( upper, unit ), value, unit, precision, name );
     connect( m_combo, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SIGNAL( valueChanged( double ) ) );
-    tqlayout->addMultiCellWidget( m_combo, 0, 1, 2, 2 );
+    layout->addMultiCellWidget( m_combo, 0, 1, 2, 2 );
 }
 
 void
diff --git a/lib/kofficeui/KoZoomAction.cpp b/lib/kofficeui/KoZoomAction.cpp
index 7f9e4139..df1bac4d 100644
--- a/lib/kofficeui/KoZoomAction.cpp
+++ b/lib/kofficeui/KoZoomAction.cpp
@@ -69,10 +69,10 @@ void KoZoomAction::setZoom( const TQString& text )
   // update items with new sorted zoom values
   TQStringList values;
   for (TQValueList<int>::Iterator it = list.begin(); it != list.end(); ++it )
-    values.append( i18n("%1%").tqarg(*it) );
+    values.append( i18n("%1%").arg(*it) );
   setItems( values );
   
-  TQString zoomStr = i18n("%1%").tqarg( zoom );
+  TQString zoomStr = i18n("%1%").arg( zoom );
   setCurrentItem( values.findIndex( zoomStr ) );
 }
 
@@ -92,21 +92,21 @@ void KoZoomAction::init()
   setEditable( true );
     
   TQStringList values;
-  values << i18n("%1%").tqarg("33");
-  values << i18n("%1%").tqarg("50");
-  values << i18n("%1%").tqarg("75");
-  values << i18n("%1%").tqarg("100");
-  values << i18n("%1%").tqarg("125");
-  values << i18n("%1%").tqarg("150");
-  values << i18n("%1%").tqarg("200");
-  values << i18n("%1%").tqarg("250");
-  values << i18n("%1%").tqarg("350");
-  values << i18n("%1%").tqarg("400");
-  values << i18n("%1%").tqarg("450");
-  values << i18n("%1%").tqarg("500");
+  values << i18n("%1%").arg("33");
+  values << i18n("%1%").arg("50");
+  values << i18n("%1%").arg("75");
+  values << i18n("%1%").arg("100");
+  values << i18n("%1%").arg("125");
+  values << i18n("%1%").arg("150");
+  values << i18n("%1%").arg("200");
+  values << i18n("%1%").arg("250");
+  values << i18n("%1%").arg("350");
+  values << i18n("%1%").arg("400");
+  values << i18n("%1%").arg("450");
+  values << i18n("%1%").arg("500");
   setItems( values );
   
-  setCurrentItem( values.findIndex( i18n("%1%").tqarg( 100 ) ) );
+  setCurrentItem( values.findIndex( i18n("%1%").arg( 100 ) ) );
   
   connect( this, TQT_SIGNAL( activated( const TQString& ) ), 
     TQT_SLOT( activated( const TQString& ) ) );
diff --git a/lib/kofficeui/Kolinewidthaction.cpp b/lib/kofficeui/Kolinewidthaction.cpp
index c812c1c6..c2d86aa6 100644
--- a/lib/kofficeui/Kolinewidthaction.cpp
+++ b/lib/kofficeui/Kolinewidthaction.cpp
@@ -24,7 +24,7 @@
 #include <tqbitmap.h>
 #include <tqwhatsthis.h>
 #include <tqmenubar.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 
 #include <kpopupmenu.h>
diff --git a/lib/kofficeui/kcoloractions.cpp b/lib/kofficeui/kcoloractions.cpp
index c0da86e9..e09ef63d 100644
--- a/lib/kofficeui/kcoloractions.cpp
+++ b/lib/kofficeui/kcoloractions.cpp
@@ -266,7 +266,7 @@ int KSelectColorAction::plug( TQWidget* w, int index )
             menu->setItemEnabled( id, false );
 
         if ( !whatsThis().isEmpty() )
-            menu->tqsetWhatsThis( id, whatsThisWithIcon() );
+            menu->setWhatsThis( id, whatsThisWithIcon() );
 
         addContainer( menu, id );
         connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
@@ -341,7 +341,7 @@ TQString KSelectColorAction::whatsThisWithIcon() const
 {
     TQString text = whatsThis();
     if (!icon().isEmpty())
-      return TQString::tqfromLatin1("<img source=\"small|%1\"> %2").tqarg(icon()).tqarg(text);
+      return TQString::fromLatin1("<img source=\"small|%1\"> %2").arg(icon()).arg(text);
     return text;
 }
 
diff --git a/lib/kofficeui/tests/coloraction_test.cpp b/lib/kofficeui/tests/coloraction_test.cpp
index 729285bb..4739ee81 100644
--- a/lib/kofficeui/tests/coloraction_test.cpp
+++ b/lib/kofficeui/tests/coloraction_test.cpp
@@ -18,7 +18,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqvgroupbox.h>
 #include <tqpopupmenu.h>
 #include <tqmenubar.h>
@@ -36,19 +36,19 @@
 
 TopLevel::TopLevel( TQWidget* parent, const char* name) : TQMainWindow( parent, name )
 {
-    setCaption( TQString::tqfromLatin1( "KColorAction test application" ) );
+    setCaption( TQString::fromLatin1( "KColorAction test application" ) );
 
     TQWidget *w = new TQWidget( this );
     setCentralWidget( w );
 
     TQBoxLayout* l = new TQHBoxLayout( w, KDialog::marginHint(), KDialog::spacingHint() );
-    TQGroupBox* b1 = new TQVGroupBox( TQString::tqfromLatin1( "KoColorPanel 1" ), w );
+    TQGroupBox* b1 = new TQVGroupBox( TQString::fromLatin1( "KoColorPanel 1" ), w );
     panel = new KoColorPanel( b1, "panel1" );
     connect( panel, TQT_SIGNAL( colorSelected( const TQColor& ) ), TQT_SLOT( slotColorSelected( const TQColor& ) ) );
     //panel->insertDefaultColors();
     l->addWidget( b1 );
 
-    b1 = new TQVGroupBox( TQString::tqfromLatin1( "KoColorPanel 2" ), w );
+    b1 = new TQVGroupBox( TQString::fromLatin1( "KoColorPanel 2" ), w );
 
     ( void ) new KoColorPanel( b1, "panel2" );
     l->addWidget( b1 );
diff --git a/lib/kofficeui/tkaction.cpp b/lib/kofficeui/tkaction.cpp
index 6a7d198a..c62b7745 100644
--- a/lib/kofficeui/tkaction.cpp
+++ b/lib/kofficeui/tkaction.cpp
@@ -22,7 +22,7 @@
 #include "tkcombobox.h"
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <ktoolbar.h>
 #include <kiconloader.h>
@@ -120,19 +120,19 @@ void TKAction::updateLayout()
   }
 }
 
-TQWidget* TKAction::createLayout(TQWidget* parent, TQWidget* tqchildren)
+TQWidget* TKAction::createLayout(TQWidget* parent, TQWidget* children)
 {
   TQWidget* base = new TQWidget(parent,"KTToolBarLayout");
   TQLabel* textLabel = new TQLabel(base,"text");
   textLabel->setMinimumHeight(1);
   TQLabel* pixLabel = new TQLabel(base,"pixmap");
-  tqchildren->reparent(base,TQPoint(0,0));
-  tqchildren->setName("widget");
-  TQHBoxLayout* tqlayout = new TQHBoxLayout(base,0,3);
-  tqlayout->setResizeMode(TQLayout::Minimum);
-  tqlayout->addWidget(textLabel);
-  tqlayout->addWidget(pixLabel);
-  tqlayout->addWidget(tqchildren,1);
+  children->reparent(base,TQPoint(0,0));
+  children->setName("widget");
+  TQHBoxLayout* layout = new TQHBoxLayout(base,0,3);
+  layout->setResizeMode(TQLayout::Minimum);
+  layout->addWidget(textLabel);
+  layout->addWidget(pixLabel);
+  layout->addWidget(children,1);
 
   updateLayout(base);
   return base;
@@ -166,9 +166,9 @@ void TKAction::updateLayout(TQWidget* base)
   } else
     pixLabel->hide();
 
-  base->setFixedWidth( w->tqsizeHint().width() +
-                       (textLabel->isVisible() ? textLabel->tqsizeHint().width():0) +
-                       (pixLabel->isVisible() ? pixLabel->tqsizeHint().width():0) );
+  base->setFixedWidth( w->sizeHint().width() +
+                       (textLabel->isVisible() ? textLabel->sizeHint().width():0) +
+                       (pixLabel->isVisible() ? pixLabel->sizeHint().width():0) );
 }
 /******************************************************************************/
 TKBaseSelectAction::TKBaseSelectAction( TQObject* parent, const char* name )
@@ -191,7 +191,7 @@ int TKBaseSelectAction::plug(TQWidget* widget, int index)
 
     TKComboBox* cb = new TKComboBox(m_editable,bar);
     initComboBox(cb);
-    cb->setMinimumWidth( cb->tqsizeHint().width() );
+    cb->setMinimumWidth( cb->sizeHint().width() );
     TQWidget* base = createLayout(bar,cb);
 
     bar->insertWidget( id_, 100, base, index );
diff --git a/lib/kofficeui/tkaction.h b/lib/kofficeui/tkaction.h
index 26b4069d..b9a84a41 100644
--- a/lib/kofficeui/tkaction.h
+++ b/lib/kofficeui/tkaction.h
@@ -44,7 +44,7 @@ public:
 protected:
   virtual void initToolBarButton(TKToolBarButton*);
 
-  TQWidget* createLayout(TQWidget* parent, TQWidget* tqchildren);
+  TQWidget* createLayout(TQWidget* parent, TQWidget* children);
   void updateLayout();
   virtual void updateLayout(TQWidget*);
 
diff --git a/lib/kofficeui/tkcoloractions.cpp b/lib/kofficeui/tkcoloractions.cpp
index 1449d0fb..a425421c 100644
--- a/lib/kofficeui/tkcoloractions.cpp
+++ b/lib/kofficeui/tkcoloractions.cpp
@@ -22,7 +22,7 @@
 #include "tkcoloractions.h"
 #include "tktoolbarbutton.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <kcolordialog.h>
 #include <ktoolbar.h>
 #include <tqpainter.h>
diff --git a/lib/kofficeui/tkcombobox.cpp b/lib/kofficeui/tkcombobox.cpp
index d1cb7ac2..cd20f790 100644
--- a/lib/kofficeui/tkcombobox.cpp
+++ b/lib/kofficeui/tkcombobox.cpp
@@ -59,7 +59,7 @@ void TKComboBox::paintEvent(TQPaintEvent*)
   int bh = height()-4;
 
   TQPainter p( this );
-  const TQColorGroup& g = tqcolorGroup();
+  const TQColorGroup& g = colorGroup();
 
   TQRect fr(2,2,width()-4,height()-4);
 
@@ -87,8 +87,8 @@ void TKComboBox::paintEvent(TQPaintEvent*)
   TQPixmap pixmap(arrow_down);
 
 
-  tqstyle().tqdrawControl( TQStyle::CE_PushButton, &p, this, TQRect( bx, by, bw, bh ), tqcolorGroup() );
-  tqstyle().drawItem( &p, TQRect( bx, by, bw, bh), AlignCenter, tqcolorGroup(), isEnabled(), &pixmap, TQString() );
+  tqstyle().drawControl( TQStyle::CE_PushButton, &p, this, TQRect( bx, by, bw, bh ), colorGroup() );
+  tqstyle().drawItem( &p, TQRect( bx, by, bw, bh), AlignCenter, colorGroup(), isEnabled(), &pixmap, TQString() );
 
   if ( hasFocus()) {
     tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, fr, g );
diff --git a/lib/kofficeui/tktoolbarbutton.cpp b/lib/kofficeui/tktoolbarbutton.cpp
index b0520a2c..5f829589 100644
--- a/lib/kofficeui/tktoolbarbutton.cpp
+++ b/lib/kofficeui/tktoolbarbutton.cpp
@@ -182,7 +182,7 @@ void TKToolBarButton::setEnabled( bool enabled )
 void TKToolBarButton::setText( const TQString& text)
 {
   d->m_text = text;
-  tqrepaint(false);
+  repaint(false);
 }
 
 void TKToolBarButton::setIcon( const TQString& icon )
@@ -281,7 +281,7 @@ void TKToolBarButton::setDelayedPopup (TQPopupMenu *p, bool toggle )
 void TKToolBarButton::setRaised(bool f)
 {
   d->m_isRaised = f;
-  tqrepaint(false);
+  repaint(false);
 }
 
 void TKToolBarButton::setAutoRaised(bool f)
@@ -308,7 +308,7 @@ void TKToolBarButton::enterEvent(TQEvent *)
     } else {
       TQToolButton::setPixmap(disabledPixmap);
     }
-    tqrepaint(false);
+    repaint(false);
   }
 }
 
@@ -332,7 +332,7 @@ bool TKToolBarButton::eventFilter(TQObject *o, TQEvent *ev)
       case TQEvent::Hide:
         on(false);
         setDown(false);
-        if ( !tqgeometry().contains(parentWidget()->mapFromGlobal(TQCursor::pos())) )
+        if ( !geometry().contains(parentWidget()->mapFromGlobal(TQCursor::pos())) )
           leaveEvent(0L);
         return false;
         break;
@@ -353,14 +353,14 @@ void TKToolBarButton::drawButton( TQPainter* p )
 #define DRAW_PIXMAP_AND_TEXT \
   int x = 3;\
   if (pixmap()) {\
-    tqstyle().drawItem( p, TQRect( x, 0, pixmap()->width(), height() ), AlignCenter, tqcolorGroup(), isEnabled(), pixmap(), TQString() );\
+    tqstyle().drawItem( p, TQRect( x, 0, pixmap()->width(), height() ), AlignCenter, colorGroup(), isEnabled(), pixmap(), TQString() );\
     if (d->m_iconMode==TK::IconAndText && !d->m_text.isEmpty()) {\
       x += pixmap()->width() + 3;\
     }\
   }\
   if ((d->m_iconMode==TK::IconAndText||d->m_iconMode==TK::TextOnly) && !d->m_text.isEmpty()) {\
     TQFontMetrics fm(KGlobalSettings::toolBarFont());\
-    tqstyle().drawItem( p, TQRect( x, 0, fm.width(d->m_text), height() ), AlignCenter, tqcolorGroup(), isEnabled(), 0, d->m_text );\
+    tqstyle().drawItem( p, TQRect( x, 0, fm.width(d->m_text), height() ), AlignCenter, colorGroup(), isEnabled(), 0, d->m_text );\
   }
 
   const char* arrow[] = {
@@ -384,20 +384,20 @@ void TKToolBarButton::drawButton( TQPainter* p )
             if (d->m_isRaised)	flags |= TQStyle::Style_Raised;
             if (hasFocus())	flags |= TQStyle::Style_HasFocus;
 
-            tqstyle().tqdrawComplexControl( TQStyle::CC_ToolButton, p, this, TQRect( 0, 0, width()-12, height() ), tqcolorGroup(), flags, TQStyle::SC_ToolButton );
-            tqstyle().tqdrawComplexControl( TQStyle::CC_ToolButton, p, this, TQRect( width()-13, 0, 13, height() ), tqcolorGroup(), flags, TQStyle::SC_ToolButton );
-            tqstyle().drawItem( p, TQRect( width()-13, 0, 13, height() ), AlignCenter, tqcolorGroup(), isEnabled(), &arrow_pix, TQString() );
+            tqstyle().drawComplexControl( TQStyle::CC_ToolButton, p, this, TQRect( 0, 0, width()-12, height() ), colorGroup(), flags, TQStyle::SC_ToolButton );
+            tqstyle().drawComplexControl( TQStyle::CC_ToolButton, p, this, TQRect( width()-13, 0, 13, height() ), colorGroup(), flags, TQStyle::SC_ToolButton );
+            tqstyle().drawItem( p, TQRect( width()-13, 0, 13, height() ), AlignCenter, colorGroup(), isEnabled(), &arrow_pix, TQString() );
             if ( d->m_isRaised )
-                qDrawShadeLine( p, width()-12, 0, width()-12, height(), tqcolorGroup(), true );
+                qDrawShadeLine( p, width()-12, 0, width()-12, height(), colorGroup(), true );
             DRAW_PIXMAP_AND_TEXT
         } else {
-            tqstyle().tqdrawControl( TQStyle::CE_PushButton, p, this, TQRect( 0, 0, width(), height() ), isEnabled() ? tqcolorGroup() : tqpalette().disabled(), f );
+            tqstyle().drawControl( TQStyle::CE_PushButton, p, this, TQRect( 0, 0, width(), height() ), isEnabled() ? colorGroup() : palette().disabled(), f );
             DRAW_PIXMAP_AND_TEXT
             int z = f ? 1:0;
             p->drawPixmap(width()-11+z,(height()-4)/2+z ,arrow_pix);
         }
     } else {
-        tqstyle().tqdrawControl( TQStyle::CE_PushButton, p, this, TQRect( 0, 0, width(), height() ), isEnabled() ? tqcolorGroup() : tqpalette().disabled(), f );
+        tqstyle().drawControl( TQStyle::CE_PushButton, p, this, TQRect( 0, 0, width(), height() ), isEnabled() ? colorGroup() : palette().disabled(), f );
         DRAW_PIXMAP_AND_TEXT
     }
 }
@@ -409,7 +409,7 @@ void TKToolBarButton::paletteChange(const TQPalette &)
     TQToolButton::setPixmap( disabledPixmap );
   else
     TQToolButton::setPixmap( defaultPixmap );
-  tqrepaint(false);
+  repaint(false);
 }
 
 void TKToolBarButton::makeDefaultPixmap()
@@ -430,14 +430,14 @@ void TKToolBarButton::makeDisabledPixmap()
   disabledPixmap = effect.apply(activePixmap, KIcon::Toolbar, KIcon::DisabledState);
 }
 
-TQSize TKToolBarButton::tqsizeHint() const
+TQSize TKToolBarButton::sizeHint() const
 {
-    return tqminimumSize();
+    return minimumSize();
 }
 
-TQSize TKToolBarButton::tqminimumSizeHint() const
+TQSize TKToolBarButton::minimumSizeHint() const
 {
-    return tqminimumSize();
+    return minimumSize();
 }
 
 void TKToolBarButton::showMenu()
@@ -502,7 +502,7 @@ void TKToolBarButton::slotToggled()
 void TKToolBarButton::on(bool flag)
 {
   d->m_isOn = flag;
-  tqrepaint();
+  repaint();
 }
 
 void TKToolBarButton::toggle()
@@ -519,14 +519,14 @@ void TKToolBarButton::setToggle(bool flag)
     disconnect(this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggled()));
 
   modeChange();
-  tqrepaint();
+  repaint();
 }
 
 void TKToolBarButton::setIconMode( TK::IconMode m )
 {
   d->m_iconMode = m;
   modeChange();
-  tqrepaint();
+  repaint();
 }
 
 #include <tktoolbarbutton.moc>
diff --git a/lib/kofficeui/tktoolbarbutton.h b/lib/kofficeui/tktoolbarbutton.h
index 3cec2f57..883d7811 100644
--- a/lib/kofficeui/tktoolbarbutton.h
+++ b/lib/kofficeui/tktoolbarbutton.h
@@ -180,8 +180,8 @@ public:
 
   TQPixmap getActivePixmap() const;
 
-  virtual TQSize tqsizeHint() const;
-  virtual TQSize tqminimumSizeHint() const;
+  virtual TQSize sizeHint() const;
+  virtual TQSize minimumSizeHint() const;
 
 signals:
   void buttonClicked();