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

50 files changed, 343 insertions, 343 deletions

diff --git a/lib/kofficecore/KoApplication.cpp b/lib/kofficecore/KoApplication.cpp
index d127f4448..a4cfcc149 100644
--- a/lib/kofficecore/KoApplication.cpp
+++ b/lib/kofficecore/KoApplication.cpp
@@ -180,10 +180,10 @@ bool KoApplication::start()
 			   paths = KGlobal::dirs()->findAllResources("data", appName +"/templates/" + desktopName );
 	             }
 		     if ( paths.isEmpty()) {
-		        KMessageBox::error(0L, i18n("No template found for: %1 ").tqarg(desktopName) );
+		        KMessageBox::error(0L, i18n("No template found for: %1 ").arg(desktopName) );
 		        delete shell;
 		     } else if ( paths.count() > 1 ) {
-		        KMessageBox::error(0L,  i18n("Too many templates found for: %1").tqarg(desktopName) );
+		        KMessageBox::error(0L,  i18n("Too many templates found for: %1").arg(desktopName) );
 		        delete shell;
 		     }
 		  }
@@ -203,7 +203,7 @@ bool KoApplication::start()
 		       kdDebug(30003) << "Template loaded..." << endl;
 		       n++;
 		     } else {
-		        KMessageBox::error(0L, i18n("Template %1 failed to load.").tqarg(templateURL.prettyURL()) );
+		        KMessageBox::error(0L, i18n("Template %1 failed to load.").arg(templateURL.prettyURL()) );
  		        delete shell;
 		     }
 		  }
diff --git a/lib/kofficecore/KoApplicationIface.cc b/lib/kofficecore/KoApplicationIface.cc
index 042a39a82..3348e8734 100644
--- a/lib/kofficecore/KoApplicationIface.cc
+++ b/lib/kofficecore/KoApplicationIface.cc
@@ -45,7 +45,7 @@ DCOPRef KoApplicationIface::createDocument( const TQString &nativeFormat )
     KoDocumentEntry entry = KoDocumentEntry::queryByMimeType( nativeFormat );
     if ( entry.isEmpty() )
     {
-        KMessageBox::questionYesNo( 0, i18n( "Unknown KOffice MimeType %s. Check your installation." ).tqarg( nativeFormat ) );
+        KMessageBox::questionYesNo( 0, i18n( "Unknown KOffice MimeType %s. Check your installation." ).arg( nativeFormat ) );
         return DCOPRef();
     }
     KoDocument* doc = entry.createDoc( 0 );
diff --git a/lib/kofficecore/KoChild.cpp b/lib/kofficecore/KoChild.cpp
index 41dfee8f2..c78ee70f5 100644
--- a/lib/kofficecore/KoChild.cpp
+++ b/lib/kofficecore/KoChild.cpp
@@ -34,7 +34,7 @@ public:
   {
   }
 
-  TQRect m_tqgeometry;
+  TQRect m_geometry;
 
   double m_rotation;
   double m_shearX;
@@ -74,14 +74,14 @@ void KoChild::setGeometry( const TQRect &rect, bool noEmit )
   if ( !d->m_lock )
     d->m_old = framePointArray();
 
-  d->m_tqgeometry = rect;
+  d->m_geometry = rect;
 
   // Embedded objects should have a minimum size of 3, so they can be selected
-  if( d->m_tqgeometry.width() < 3 )
-    d->m_tqgeometry.setWidth( 3 );
+  if( d->m_geometry.width() < 3 )
+    d->m_geometry.setWidth( 3 );
 
-  if( d->m_tqgeometry.height() < 3 )
-    d->m_tqgeometry.setHeight( 3 );
+  if( d->m_geometry.height() < 3 )
+    d->m_geometry.setHeight( 3 );
 
   updateMatrix();
 
@@ -89,9 +89,9 @@ void KoChild::setGeometry( const TQRect &rect, bool noEmit )
     emit changed( this );
 }
 
-TQRect KoChild::tqgeometry() const
+TQRect KoChild::geometry() const
 {
-  return d->m_tqgeometry;
+  return d->m_geometry;
 }
 
 TQRegion KoChild::region( const TQWMatrix &matrix ) const
@@ -101,7 +101,7 @@ TQRegion KoChild::region( const TQWMatrix &matrix ) const
 
 TQPointArray KoChild::pointArray( const TQWMatrix &matrix ) const
 {
-  return pointArray( TQRect( 0, 0, d->m_tqgeometry.width(), d->m_tqgeometry.height() ), matrix );
+  return pointArray( TQRect( 0, 0, d->m_geometry.width(), d->m_geometry.height() ), matrix );
 }
 
 //bool KoChild::contains( const TQPoint &point ) const
@@ -123,9 +123,9 @@ void KoChild::setClipRegion( TQPainter &painter, bool combine )
 {
   painter.setClipping( true );
   if ( combine && !painter.clipRegion().isEmpty() )
-    painter.setClipRegion( region( painter.tqworldMatrix() ).intersect( painter.clipRegion() ) );
+    painter.setClipRegion( region( painter.worldMatrix() ).intersect( painter.clipRegion() ) );
   else
-    painter.setClipRegion( region( painter.tqworldMatrix() ) );
+    painter.setClipRegion( region( painter.worldMatrix() ) );
 }
 
 void KoChild::setScaling( double x, double y )
@@ -218,7 +218,7 @@ void KoChild::transform( TQPainter &painter )
 {
     setClipRegion( painter, true );
 
-    TQWMatrix m = painter.tqworldMatrix();
+    TQWMatrix m = painter.worldMatrix();
     m = d->m_matrix * m;
     m.scale( d->m_scaleX, d->m_scaleY );
     painter.setWorldMatrix( m );
@@ -232,13 +232,13 @@ void KoChild::setContentsPos( int x, int y )
 
 TQRect KoChild::contentRect() const
 {
-  return TQRect( d->m_contentsX, d->m_contentsY, int(d->m_tqgeometry.width() / d->m_scaleX),
-                int(d->m_tqgeometry.height() / d->m_scaleY) );
+  return TQRect( d->m_contentsX, d->m_contentsY, int(d->m_geometry.width() / d->m_scaleX),
+                int(d->m_geometry.height() / d->m_scaleY) );
 }
 
 TQPointArray KoChild::framePointArray( const TQWMatrix &matrix ) const
 {
-  return pointArray( TQRect( -6, -6, d->m_tqgeometry.width() + 12, d->m_tqgeometry.height() + 12 ), matrix );
+  return pointArray( TQRect( -6, -6, d->m_geometry.width() + 12, d->m_geometry.height() + 12 ), matrix );
 }
 
 TQRegion KoChild::frameRegion( const TQWMatrix &matrix, bool solid ) const
@@ -281,7 +281,7 @@ void KoChild::updateMatrix()
 
   TQWMatrix m;
   m.rotate( d->m_rotation );
-  m.translate( -d->m_rotationPoint.x() + d->m_tqgeometry.x(), -d->m_rotationPoint.y() + d->m_tqgeometry.y() );
+  m.translate( -d->m_rotationPoint.x() + d->m_geometry.x(), -d->m_rotationPoint.y() + d->m_geometry.y() );
   m.translate( p.x(), p.y() );
   m.shear( d->m_shearX, d->m_shearY );
 
@@ -343,21 +343,21 @@ KoChild::Gadget KoChild::gadgetHitTest( const TQPoint &p )
 
   if ( TQRegion( pointArray( TQRect( -5, -5, 5, 5 ) ) ).contains( p ) )
       return TopLeft;
-  if ( TQRegion( pointArray( TQRect( d->m_tqgeometry.width() / 2 - 3, -5, 5, 5 ) ) ).contains( p ) )
+  if ( TQRegion( pointArray( TQRect( d->m_geometry.width() / 2 - 3, -5, 5, 5 ) ) ).contains( p ) )
       return TopMid;
-  if ( TQRegion( pointArray( TQRect( d->m_tqgeometry.width(), -5, 5, 5 ) ) ).contains( p ) )
+  if ( TQRegion( pointArray( TQRect( d->m_geometry.width(), -5, 5, 5 ) ) ).contains( p ) )
       return TopRight;
-  if ( TQRegion( pointArray( TQRect( -5, d->m_tqgeometry.height() / 2 - 3, 5, 5 ) ) ).contains( p ) )
+  if ( TQRegion( pointArray( TQRect( -5, d->m_geometry.height() / 2 - 3, 5, 5 ) ) ).contains( p ) )
       return MidLeft;
-  if ( TQRegion( pointArray( TQRect( -5, d->m_tqgeometry.height(), 5, 5 ) ) ).contains( p ) )
+  if ( TQRegion( pointArray( TQRect( -5, d->m_geometry.height(), 5, 5 ) ) ).contains( p ) )
       return BottomLeft;
-  if ( TQRegion( pointArray( TQRect( d->m_tqgeometry.width() / 2 - 3,
-				   d->m_tqgeometry.height(), 5, 5 ) ) ).contains( p ) )
+  if ( TQRegion( pointArray( TQRect( d->m_geometry.width() / 2 - 3,
+				   d->m_geometry.height(), 5, 5 ) ) ).contains( p ) )
     return BottomMid;
-  if ( TQRegion( pointArray( TQRect( d->m_tqgeometry.width(), d->m_tqgeometry.height(), 5, 5 ) ) ).contains( p ) )
+  if ( TQRegion( pointArray( TQRect( d->m_geometry.width(), d->m_geometry.height(), 5, 5 ) ) ).contains( p ) )
       return BottomRight;
-  if ( TQRegion( pointArray( TQRect( d->m_tqgeometry.width(),
-				   d->m_tqgeometry.height() / 2 - 3, 5, 5 ) ) ).contains( p ) )
+  if ( TQRegion( pointArray( TQRect( d->m_geometry.width(),
+				   d->m_geometry.height() / 2 - 3, 5, 5 ) ) ).contains( p ) )
     return MidRight;
 
   return Move;
diff --git a/lib/kofficecore/KoChild.h b/lib/kofficecore/KoChild.h
index b7285deb9..fe345e2e1 100644
--- a/lib/kofficecore/KoChild.h
+++ b/lib/kofficecore/KoChild.h
@@ -24,7 +24,7 @@
 #include <koffice_export.h>
 
 /**
- * KoChild is an abstract base class that represents the tqgeometry
+ * KoChild is an abstract base class that represents the geometry
  * associated with an embedded document. In general it handles its position
  * relative to the embedded document's parent.
  *
@@ -60,7 +60,7 @@ public:
   virtual ~KoChild();
 
   /**
-   *  Sets a new tqgeometry for this child document.
+   *  Sets a new geometry for this child document.
    *  Use noEmit = true if you do not want the 'changed'-signal to be emitted
    */
   void setGeometry( const TQRect &rect, bool noEmit = false );
@@ -74,7 +74,7 @@ public:
    *
    * @see #setGeometry
    */
-  TQRect tqgeometry() const;
+  TQRect geometry() const;
 
   /**
    * @return the region of this child part relative to the
@@ -189,10 +189,10 @@ public:
 
   /**
    * @return the contents rectangle that is visible.
-   *         This value depends on the scaling and the tqgeometry.
+   *         This value depends on the scaling and the geometry.
    *         This is the value that is passed to KoDocument::paintContent.
    *
-   * @see #xScaling #tqgeometry
+   * @see #xScaling #geometry
    */
   virtual TQRect contentRect() const;
 
@@ -204,7 +204,7 @@ public:
   virtual TQRegion frameRegion( const TQWMatrix& matrix = TQWMatrix(), bool solid = false ) const;
 
   /**
-   * @return the frame tqgeometry including a border (6 pixels) as a point
+   * @return the frame geometry including a border (6 pixels) as a point
    *         array with 4 points, one for each corner, transformed by given matrix.
    */
   virtual TQPointArray framePointArray( const TQWMatrix &matrix = TQWMatrix() ) const;
@@ -234,11 +234,11 @@ public:
   void unlock();
 
   /**
-   * If the child is locked, tqgeometry changes
+   * If the child is locked, geometry changes
    * (including scaling, rotation, ...) are not backed up.
    *
    * As long as this child is locked, the backed up
-   * tqgeometry state can be recovered with oldPointArray.
+   * geometry state can be recovered with oldPointArray.
    *
    * @return true when this child is locked.
    *
@@ -247,7 +247,7 @@ public:
   bool locked() const;
 
   /**
-   * @return the backed up tqgeometry transformed by given matrix.
+   * @return the backed up geometry transformed by given matrix.
    */
   virtual TQPointArray oldPointArray( const TQWMatrix &matrix );
 
diff --git a/lib/kofficecore/KoContainerHandler.cpp b/lib/kofficecore/KoContainerHandler.cpp
index bd4bb4894..ae4dbeabe 100644
--- a/lib/kofficecore/KoContainerHandler.cpp
+++ b/lib/kofficecore/KoContainerHandler.cpp
@@ -47,7 +47,7 @@ public:
                               KoChild::Gadget gadget, const TQPoint& point ) :
         m_gadget(gadget), m_view(view), m_child(child), m_parentMatrix(matrix) {
 
-        m_geometryStart = child->tqgeometry();
+        m_geometryStart = child->geometry();
         m_matrix = child->matrix() * matrix;
         m_invertParentMatrix = matrix.invert();
 
@@ -84,11 +84,11 @@ KoPartResizeHandler::~KoPartResizeHandler()
     d=0L;
 }
 
-void KoPartResizeHandler::tqrepaint(TQRegion &rgn)
+void KoPartResizeHandler::repaint(TQRegion &rgn)
 {
   rgn = rgn.unite( d->m_child->frameRegion( d->m_parentMatrix, true ) );
  // rgn.translate(- d->m_view->canvasXOffset(), - d->m_view->canvasYOffset());
-  ((TQWidget*)target())->tqrepaint( rgn );
+  ((TQWidget*)target())->repaint( rgn );
 }
 
 bool KoPartResizeHandler::eventFilter( TQObject*, TQEvent* ev )
@@ -128,7 +128,7 @@ bool KoPartResizeHandler::eventFilter( TQObject*, TQEvent* ev )
 
                 d->m_child->setGeometry( TQRect( d->m_geometryStart.x() + x, d->m_geometryStart.y() + y,
                                              d->m_geometryStart.width() - x, d->m_geometryStart.height() - y ) );
-                tqrepaint(rgn);
+                repaint(rgn);
             }
             break;
         case KoChild::TopMid:
@@ -137,7 +137,7 @@ bool KoPartResizeHandler::eventFilter( TQObject*, TQEvent* ev )
 
                 d->m_child->setGeometry( TQRect( d->m_geometryStart.x(), d->m_geometryStart.y() + y,
                                              d->m_geometryStart.width(), d->m_geometryStart.height() - y ) );
-                tqrepaint(rgn);
+                repaint(rgn);
             }
             break;
         case KoChild::TopRight:
@@ -147,7 +147,7 @@ bool KoPartResizeHandler::eventFilter( TQObject*, TQEvent* ev )
 
                 d->m_child->setGeometry( TQRect( d->m_geometryStart.x(), d->m_geometryStart.y() + y,
                                              d->m_geometryStart.width() + x, d->m_geometryStart.height() - y ) );
-                tqrepaint(rgn);
+                repaint(rgn);
             }
             break;
         case KoChild::MidLeft:
@@ -156,7 +156,7 @@ bool KoPartResizeHandler::eventFilter( TQObject*, TQEvent* ev )
 
                 d->m_child->setGeometry( TQRect( d->m_geometryStart.x() + x, d->m_geometryStart.y(),
                                              d->m_geometryStart.width() - x, d->m_geometryStart.height() ) );
-                tqrepaint(rgn);
+                repaint(rgn);
             }
             break;
         case KoChild::MidRight:
@@ -165,7 +165,7 @@ bool KoPartResizeHandler::eventFilter( TQObject*, TQEvent* ev )
 
                 d->m_child->setGeometry( TQRect( d->m_geometryStart.x(), d->m_geometryStart.y(),
                                              d->m_geometryStart.width() + x, d->m_geometryStart.height() ) );
-                tqrepaint(rgn);
+                repaint(rgn);
             }
             break;
         case KoChild::BottomLeft:
@@ -175,7 +175,7 @@ bool KoPartResizeHandler::eventFilter( TQObject*, TQEvent* ev )
 
                 d->m_child->setGeometry( TQRect( d->m_geometryStart.x() + x, d->m_geometryStart.y(),
                                              d->m_geometryStart.width() - x, d->m_geometryStart.height() + y ) );
-                tqrepaint(rgn);
+                repaint(rgn);
             }
             break;
         case KoChild::BottomMid:
@@ -184,7 +184,7 @@ bool KoPartResizeHandler::eventFilter( TQObject*, TQEvent* ev )
 
                 d->m_child->setGeometry( TQRect( d->m_geometryStart.x(), d->m_geometryStart.y(),
                                              d->m_geometryStart.width(), d->m_geometryStart.height() + y ) );
-                tqrepaint(rgn);
+                repaint(rgn);
             }
             break;
         case KoChild::BottomRight:
@@ -194,7 +194,7 @@ bool KoPartResizeHandler::eventFilter( TQObject*, TQEvent* ev )
 
                 d->m_child->setGeometry( TQRect( d->m_geometryStart.x(), d->m_geometryStart.y(),
                                              d->m_geometryStart.width() + x, d->m_geometryStart.height() + y ) );
-                tqrepaint(rgn);
+                repaint(rgn);
             }
             break;
         default:
@@ -214,7 +214,7 @@ public:
                                                    m_parentMatrix(matrix) {
         m_invertParentMatrix = matrix.invert();
         m_mouseDragStart = m_invertParentMatrix.map( point );
-        m_geometryDragStart = m_dragChild->tqgeometry();
+        m_geometryDragStart = m_dragChild->geometry();
         m_rotationDragStart = m_dragChild->rotationPoint();
     }
     ~KoPartMoveHandlerPrivate() {}
@@ -263,7 +263,7 @@ bool KoPartMoveHandler::eventFilter( TQObject*, TQEvent* ev )
                                                d->m_rotationDragStart.y() + pos.y() - d->m_mouseDragStart.y() ) );
         bound = bound.unite( d->m_dragChild->frameRegion( d->m_parentMatrix, false ) );
       //  bound.translate(- d->m_view->canvasXOffset(), - d->m_view->canvasYOffset());
-        ((TQWidget*)target())->tqrepaint( bound );
+        ((TQWidget*)target())->repaint( bound );
 
         return true;
     }
diff --git a/lib/kofficecore/KoContainerHandler.h b/lib/kofficecore/KoContainerHandler.h
index 0ea9ba35f..0187128d8 100644
--- a/lib/kofficecore/KoContainerHandler.h
+++ b/lib/kofficecore/KoContainerHandler.h
@@ -68,7 +68,7 @@ public:
     ~KoPartResizeHandler();
 
 protected:
-    void tqrepaint(TQRegion &rgn);
+    void repaint(TQRegion &rgn);
     bool eventFilter( TQObject*, TQEvent* );
 
 private:
diff --git a/lib/kofficecore/KoDetailsPane.cpp b/lib/kofficecore/KoDetailsPane.cpp
index ecbd496f3..51fd1111e 100644
--- a/lib/kofficecore/KoDetailsPane.cpp
+++ b/lib/kofficecore/KoDetailsPane.cpp
@@ -24,7 +24,7 @@
 #include <tqimage.h>
 #include <tqheader.h>
 #include <tqrect.h>
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqpainter.h>
 #include <tqsimplerichtext.h>
 #include <tqevent.h>
@@ -296,7 +296,7 @@ KoRecentDocumentsPane::KoRecentDocumentsPane(TQWidget* parent, KInstance* instan
   fileList.setAutoDelete(false);
 
   do {
-    TQString key = TQString("File%1").tqarg(i);
+    TQString key = TQString("File%1").arg(i);
     value = instance->config()->readPathEntry(key);
 
     if(!value.isEmpty()) {
@@ -369,9 +369,9 @@ void KoRecentDocumentsPane::selectionChanged(TQListViewItem* item)
       KFileItem* fileItem = static_cast<KoFileListItem*>(item)->fileItem();
       TQString details = "<center><table border=\"0\">";
       details += i18n("File modification date and time. %1 is date time", "<tr><td><b>Modified:</b></td><td>%1</td></tr>")
-          .tqarg(fileItem->timeString(KIO::UDS_MODIFICATION_TIME));
+          .arg(fileItem->timeString(KIO::UDS_MODIFICATION_TIME));
       details += i18n("File access date and time. %1 is date time", "<tr><td><b>Accessed:</b></td><td>%1</td></tr>")
-          .tqarg(fileItem->timeString(KIO::UDS_ACCESS_TIME));
+          .arg(fileItem->timeString(KIO::UDS_ACCESS_TIME));
       details += "</table></center>";
       m_detailsLabel->setText(details);
     } else {
diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp
index ba3c9d547..eab229e39 100644
--- a/lib/kofficecore/KoDocument.cpp
+++ b/lib/kofficecore/KoDocument.cpp
@@ -59,7 +59,7 @@
 #include <tqpainter.h>
 #include <tqtimer.h>
 #include <tqxml.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <config.h>
 #include <assert.h>
@@ -120,7 +120,7 @@ public:
     }
 
     TQPtrList<KoView> m_views;
-    TQPtrList<KoDocumentChild> m_tqchildren;
+    TQPtrList<KoDocumentChild> m_children;
     TQPtrList<KoMainWindow> m_shells;
     TQValueList<TQDomDocument> m_viewBuildDocuments;
 
@@ -271,7 +271,7 @@ KoDocument::~KoDocument()
 {
     d->m_autoSaveTimer.stop();
 
-    TQPtrListIterator<KoDocumentChild> childIt( d->m_tqchildren );
+    TQPtrListIterator<KoDocumentChild> childIt( d->m_children );
     for (; childIt.current(); ++childIt )
         disconnect( childIt.current(), TQT_SIGNAL( destroyed() ),
                     this, TQT_SLOT( slotChildDestroyed() ) );
@@ -285,8 +285,8 @@ KoDocument::~KoDocument()
     delete d->m_startUpWidget;
     d->m_startUpWidget = 0;
 
-    d->m_tqchildren.setAutoDelete( true );
-    d->m_tqchildren.clear();
+    d->m_children.setAutoDelete( true );
+    d->m_children.clear();
 
     d->m_shells.setAutoDelete( true );
     d->m_shells.clear();
@@ -401,7 +401,7 @@ bool KoDocument::saveFile()
                     backup = url();
                 else
                     backup = d->m_backupPath +"/"+url().fileName();
-                backup.setPath( backup.path() + TQString::tqfromLatin1("~") );
+                backup.setPath( backup.path() + TQString::fromLatin1("~") );
                 KFileItem item( entry, url() );
                 Q_ASSERT( item.name() == url().fileName() );
                 KIO::NetAccess::file_copy( url(), backup, item.permissions(), true /*overwrite*/, false /*resume*/, shells().current() );
@@ -418,7 +418,7 @@ bool KoDocument::saveFile()
         if ( !d->filterManager )
             d->filterManager = new KoFilterManager( this );
 
-        KoFilter::ConversiontqStatus status = d->filterManager->exp0rt( m_file, outputMimeType );
+        KoFilter::ConversionStatus status = d->filterManager->exp0rt( m_file, outputMimeType );
         ret = status == KoFilter::OK;
         suppressErrorDialog = (status == KoFilter::UserCancelled || status == KoFilter::BadConversionGraph );
     } else {
@@ -591,7 +591,7 @@ void KoDocument::setManager( KParts::PartManager *manager )
 
     if ( manager )
     {
-        TQPtrListIterator<KoDocumentChild> it( d->m_tqchildren );
+        TQPtrListIterator<KoDocumentChild> it( d->m_children );
         for (; it.current(); ++it )
             if ( it.current()->document() )
                 manager->addPart( it.current()->document(), false );
@@ -606,7 +606,7 @@ void KoDocument::setReadWrite( bool readwrite )
     for (; vIt.current(); ++vIt )
         vIt.current()->updateReadWrite( readwrite );
 
-    TQPtrListIterator<KoDocumentChild> dIt( d->m_tqchildren );
+    TQPtrListIterator<KoDocumentChild> dIt( d->m_children );
     for (; dIt.current(); ++dIt )
         if ( dIt.current()->document() )
             dIt.current()->document()->setReadWrite( readwrite );
@@ -651,7 +651,7 @@ void KoDocument::insertChild( KoDocumentChild *child )
 {
     setModified( true );
 
-    d->m_tqchildren.append( child );
+    d->m_children.append( child );
 
     connect( child, TQT_SIGNAL( changed( KoChild * ) ),
              this, TQT_SLOT( slotChildChanged( KoChild * ) ) );
@@ -681,12 +681,12 @@ void KoDocument::slotChildDestroyed()
     setModified( true );
 
     const KoDocumentChild *child = static_cast<const KoDocumentChild *>( sender() );
-    d->m_tqchildren.removeRef( child );
+    d->m_children.removeRef( child );
 }
 
-const TQPtrList<KoDocumentChild>& KoDocument::tqchildren() const
+const TQPtrList<KoDocumentChild>& KoDocument::children() const
 {
-    return d->m_tqchildren;
+    return d->m_children;
 }
 
 KParts::Part *KoDocument::hitTest( TQWidget *widget, const TQPoint &globalPos )
@@ -718,7 +718,7 @@ KoView* KoDocument::hitTestView()
 KoDocument* KoDocument::hitTest( const TQPoint &pos, const TQWMatrix &matrix )
 {
     // Call KoDocumentChild::hitTest for any child document
-    TQPtrListIterator<KoDocumentChild> it( d->m_tqchildren );
+    TQPtrListIterator<KoDocumentChild> it( d->m_children );
     for (; it.current(); ++it )
     {
         KoDocument *doc = it.current()->hitTest( pos, matrix );
@@ -732,7 +732,7 @@ KoDocument* KoDocument::hitTest( const TQPoint &pos, const TQWMatrix &matrix )
 
 KoDocumentChild *KoDocument::child( KoDocument *doc )
 {
-    TQPtrListIterator<KoDocumentChild> it( d->m_tqchildren );
+    TQPtrListIterator<KoDocumentChild> it( d->m_children );
     for (; it.current(); ++it )
         if ( it.current()->document() == doc )
             return it.current();
@@ -786,7 +786,7 @@ void KoDocument::paintEverything( TQPainter &painter, const TQRect &rect, bool t
 
 void KoDocument::paintChildren( TQPainter &painter, const TQRect &/*rect*/, KoView *view, double zoomX, double zoomY )
 {
-    TQPtrListIterator<KoDocumentChild> it( d->m_tqchildren );
+    TQPtrListIterator<KoDocumentChild> it( d->m_children );
     for (; it.current(); ++it )
     {
         // #### todo: paint only if child is visible inside rect
@@ -863,8 +863,8 @@ bool KoDocument::isModified() const
         //kdDebug(30003)<<k_funcinfo<<" Modified doc='"<<url().url()<<"' extern="<<isStoredExtern()<<endl;
         return true;
     }
-    // Then go through internally stored tqchildren (considered to be part of this doc)
-    TQPtrListIterator<KoDocumentChild> it = tqchildren();
+    // Then go through internally stored children (considered to be part of this doc)
+    TQPtrListIterator<KoDocumentChild> it = children();
     for (; it.current(); ++it )
     {
         KoDocument *doc = it.current()->document();
@@ -876,9 +876,9 @@ bool KoDocument::isModified() const
 
 bool KoDocument::saveChildren( KoStore* _store )
 {
-    //kdDebug(30003)<<k_funcinfo<<" checking tqchildren of doc='"<<url().url()<<"'"<<endl;
+    //kdDebug(30003)<<k_funcinfo<<" checking children of doc='"<<url().url()<<"'"<<endl;
     int i = 0;
-    TQPtrListIterator<KoDocumentChild> it( tqchildren() );
+    TQPtrListIterator<KoDocumentChild> it( children() );
     for( ; it.current(); ++it ) {
         KoDocument* childDoc = it.current()->document();
         if (childDoc && !it.current()->isDeleted())
@@ -900,8 +900,8 @@ bool KoDocument::saveChildren( KoStore* _store )
 
 bool KoDocument::saveChildrenOasis( KoStore* store, KoXmlWriter* manifestWriter )
 {
-    //kdDebug(30003)<<k_funcinfo<<" checking tqchildren of doc='"<<url().url()<<"'"<<endl;
-    TQPtrListIterator<KoDocumentChild> it( tqchildren() );
+    //kdDebug(30003)<<k_funcinfo<<" checking children of doc='"<<url().url()<<"'"<<endl;
+    TQPtrListIterator<KoDocumentChild> it( children() );
     for( ; it.current(); ++it ) {
         KoDocument* childDoc = it.current()->document();
         if ( childDoc && !it.current()->isDeleted() )
@@ -924,9 +924,9 @@ bool KoDocument::saveExternalChildren()
         return true;
     }
 
-    //kdDebug(30003)<<k_funcinfo<<" checking tqchildren of doc='"<<url().url()<<"'"<<endl;
+    //kdDebug(30003)<<k_funcinfo<<" checking children of doc='"<<url().url()<<"'"<<endl;
     KoDocumentChild *ch;
-    TQPtrListIterator<KoDocumentChild> it = tqchildren();
+    TQPtrListIterator<KoDocumentChild> it = children();
     for (; (ch = it.current()); ++it )
     {
         if ( !ch->isDeleted() )
@@ -935,7 +935,7 @@ bool KoDocument::saveExternalChildren()
             if ( doc && doc->isStoredExtern() && doc->isModified() )
             {
                 kdDebug(30003)<<" save external doc='"<<url().url()<<"'"<<endl;
-                doc->setDoNotSaveExtDoc(); // Only save doc + it's internal tqchildren
+                doc->setDoNotSaveExtDoc(); // Only save doc + it's internal children
                 if ( !doc->save() )
                     return false; // error
             }
@@ -1031,7 +1031,7 @@ bool KoDocument::saveNativeFormat( const TQString & file )
         }
         else
         {
-            d->lastErrorMessage = i18n( "Not able to write '%1'. Partition full?" ).tqarg( "meta.xml" );
+            d->lastErrorMessage = i18n( "Not able to write '%1'. Partition full?" ).arg( "meta.xml" );
             delete store;
             return false;
         }
@@ -1039,7 +1039,7 @@ bool KoDocument::saveNativeFormat( const TQString & file )
         if ( store->open( "Thumbnails/thumbnail.png" ) )
         {
             if ( !saveOasisPreview( store, manifestWriter ) || !store->close() ) {
-                d->lastErrorMessage = i18n( "Error while trying to write '%1'. Partition full?" ).tqarg( "Thumbnails/thumbnail.png" );
+                d->lastErrorMessage = i18n( "Error while trying to write '%1'. Partition full?" ).arg( "Thumbnails/thumbnail.png" );
                 delete store;
                 return false;
             }
@@ -1047,7 +1047,7 @@ bool KoDocument::saveNativeFormat( const TQString & file )
         }
         else
         {
-            d->lastErrorMessage = i18n( "Not able to write '%1'. Partition full?" ).tqarg( "Thumbnails/thumbnail.png" );
+            d->lastErrorMessage = i18n( "Not able to write '%1'. Partition full?" ).arg( "Thumbnails/thumbnail.png" );
             delete store;
             return false;
         }
@@ -1055,7 +1055,7 @@ bool KoDocument::saveNativeFormat( const TQString & file )
         // Write out manifest file
         if ( !oasisStore.closeManifestWriter() )
         {
-            d->lastErrorMessage = i18n( "Error while trying to write '%1'. Partition full?" ).tqarg( "META-INF/manifest.xml" );
+            d->lastErrorMessage = i18n( "Error while trying to write '%1'. Partition full?" ).arg( "META-INF/manifest.xml" );
             delete store;
             return false;
         }
@@ -1064,7 +1064,7 @@ bool KoDocument::saveNativeFormat( const TQString & file )
     }
     else
     {
-        // Save internal tqchildren first since they might get a new url
+        // Save internal children first since they might get a new url
         if ( !saveChildren( store ) && !oasis )
         {
             if ( d->lastErrorMessage.isEmpty() )
@@ -1086,7 +1086,7 @@ bool KoDocument::saveNativeFormat( const TQString & file )
         }
         else
         {
-            d->lastErrorMessage = i18n( "Not able to write '%1'. Partition full?" ).tqarg( "maindoc.xml" );
+            d->lastErrorMessage = i18n( "Not able to write '%1'. Partition full?" ).arg( "maindoc.xml" );
             delete store;
             return false;
         }
@@ -1146,7 +1146,7 @@ bool KoDocument::saveToStore( KoStore* _store, const TQString & _path )
     else // ugly hack to pass a relative URI
         m_url = KURL( INTERNAL_PREFIX +  _path );
 
-    // To make the tqchildren happy cd to the correct directory
+    // To make the children happy cd to the correct directory
     _store->pushDirectory();
     _store->enterDirectory( _path );
 
@@ -1222,7 +1222,7 @@ TQPixmap KoDocument::generatePreview( const TQSize& size )
         docHeight = m_pageLayout.ptHeight / 72 * KoGlobal::dpiY();
 
     } else {
-        // If we don't have a page tqlayout, just draw the top left hand corner
+        // If we don't have a page layout, just draw the top left hand corner
         docWidth = 500.0;
         docHeight = 500.0;
     }
@@ -1274,7 +1274,7 @@ TQString KoDocument::autoSaveFile( const TQString & path ) const
         // Never saved? Use a temp file in $HOME then
         // Yes, two open unnamed docs will overwrite each other's autosave file,
         // but hmm, we can only do something if that's in the same process anyway...
-        TQString ret = TQDir::homeDirPath() + "/." + TQString::tqfromLatin1(instance()->instanceName()) + ".autosave" + extension;
+        TQString ret = TQDir::homeDirPath() + "/." + TQString::fromLatin1(instance()->instanceName()) + ".autosave" + extension;
         return ret;
     }
     else
@@ -1297,7 +1297,7 @@ bool KoDocument::checkAutoSaveFile()
         TQString dateStr = date.toString(Qt::LocalDate);
         int res = KMessageBox::warningYesNoCancel(
             0, i18n( "An autosaved file for an unnamed document exists in %1.\nThis file is dated %2\nDo you want to open it?" )
-            .tqarg(asf, dateStr) );
+            .arg(asf, dateStr) );
         switch(res) {
         case KMessageBox::Yes : {
             KURL url;
@@ -1349,7 +1349,7 @@ bool KoDocument::openURL( const KURL & _url )
     // Reimplemented, to add a check for autosave files and to improve error reporting
     if ( !_url.isValid() )
     {
-        d->lastErrorMessage = i18n( "Malformed URL\n%1" ).tqarg( _url.url() ); // ## used anywhere ?
+        d->lastErrorMessage = i18n( "Malformed URL\n%1" ).arg( _url.url() ); // ## used anywhere ?
         return false;
     }
     if ( !closeURL() )
@@ -1408,7 +1408,7 @@ bool KoDocument::openFile()
         TQApplication::restoreOverrideCursor();
         if ( d->m_autoErrorHandlingEnabled )
             // Maybe offer to create a new document with that name ?
-            KMessageBox::error(0L, i18n("The file %1 does not exist.").tqarg(m_file) );
+            KMessageBox::error(0L, i18n("The file %1 does not exist.").arg(m_file) );
         d->m_bLoading = false;
         return false;
     }
@@ -1456,7 +1456,7 @@ bool KoDocument::openFile()
     if ( !isNativeFormat( typeName.latin1() ) ) {
         if ( !d->filterManager )
             d->filterManager = new KoFilterManager( this );
-        KoFilter::ConversiontqStatus status;
+        KoFilter::ConversionStatus status;
         importedFile = d->filterManager->import( m_file, status );
         if ( status != KoFilter::OK )
         {
@@ -1516,7 +1516,7 @@ bool KoDocument::openFile()
             {
                 TQString errorMsg( i18n( "Could not open\n%2.\nReason: %1" ) );
                 TQString docUrl = url().prettyURL( 0, KURL::StripFileProtocol );
-                KMessageBox::error( 0L, errorMsg.tqarg(msg).tqarg(docUrl) );
+                KMessageBox::error( 0L, errorMsg.arg(msg).arg(docUrl) );
             }
 
             d->m_bLoading = false;
@@ -1623,7 +1623,7 @@ bool KoDocument::oldLoadAndParse(KoStore* store, const TQString& filename, TQDom
     if (!store->open(filename))
     {
         kdWarning(30003) << "Entry " << filename << " not found!" << endl;
-        d->lastErrorMessage = i18n( "Could not find %1" ).tqarg( filename );
+        d->lastErrorMessage = i18n( "Could not find %1" ).arg( filename );
         return false;
     }
     // Error variables for TQDomDocument::setContent
@@ -1636,8 +1636,8 @@ bool KoDocument::oldLoadAndParse(KoStore* store, const TQString& filename, TQDom
             << " In line: " << errorLine << ", column: " << errorColumn << endl
             << " Error message: " << errorMsg << endl;
         d->lastErrorMessage = i18n( "Parsing error in %1 at line %2, column %3\nError message: %4" )
-                              .tqarg( filename ).tqarg( errorLine ).tqarg( errorColumn )
-                              .tqarg( i18n ( "TQXml", errorMsg.utf8() ) );
+                              .arg( filename ).arg( errorLine ).arg( errorColumn )
+                              .arg( i18n ( "TQXml", errorMsg.utf8() ) );
         store->close();
         return false;
     }
@@ -1650,12 +1650,12 @@ bool KoDocument::loadNativeFormat( const TQString & file )
     TQFileInfo fileInfo( file );
     if ( !fileInfo.exists() ) // check duplicated from openURL, but this is useful for templates
     {
-        d->lastErrorMessage = i18n("The file %1 does not exist.").tqarg(file);
+        d->lastErrorMessage = i18n("The file %1 does not exist.").arg(file);
         return false;
     }
     if ( !fileInfo.isFile() )
     {
-        d->lastErrorMessage = i18n( "%1 is not a file." ).tqarg(file);
+        d->lastErrorMessage = i18n( "%1 is not a file." ).arg(file);
         return false;
     }
 
@@ -1733,7 +1733,7 @@ bool KoDocument::loadNativeFormat( const TQString & file )
                             << "  Line: " << errorLine << " Column: " << errorColumn << endl
                             << "  Message: " << errorMsg << endl;
             d->lastErrorMessage = i18n( "parsing error in the main document at line %1, column %2\nError message: %3" )
-                                  .tqarg( errorLine ).tqarg( errorColumn ).tqarg( i18n ( errorMsg.utf8() ) );
+                                  .arg( errorLine ).arg( errorColumn ).arg( i18n ( errorMsg.utf8() ) );
             res=false;
         }
 
@@ -1756,7 +1756,7 @@ bool KoDocument::loadNativeFormatFromStore( const TQString& file )
 
     if ( store->bad() )
     {
-        d->lastErrorMessage = i18n( "Not a valid KOffice file: %1" ).tqarg( file );
+        d->lastErrorMessage = i18n( "Not a valid KOffice file: %1" ).arg( file );
         delete store;
         TQApplication::restoreOverrideCursor();
         return false;
@@ -1795,7 +1795,7 @@ bool KoDocument::loadNativeFormatFromStore( const TQString& file )
 
         if ( !loadChildren( store ) )
         {
-            kdError(30003) << "ERROR: Could not load tqchildren" << endl;
+            kdError(30003) << "ERROR: Could not load children" << endl;
             // Don't abort, proceed nonetheless
         }
 
@@ -1865,7 +1865,7 @@ bool KoDocument::loadFromStore( KoStore* _store, const TQString& url )
 
     if ( !loadChildren( _store ) )
     {
-        kdError(30003) << "ERROR: Could not load tqchildren" << endl;
+        kdError(30003) << "ERROR: Could not load children" << endl;
 #if 0
         return false;
 #endif
@@ -1967,7 +1967,7 @@ void KoDocument::setModified( bool mod )
         m_bEmpty = FALSE;
     } else {
         // When saving this document, all non-external child documents get saved too.
-        TQPtrListIterator<KoDocumentChild> it = tqchildren();
+        TQPtrListIterator<KoDocumentChild> it = children();
         for (; it.current(); ++it )
         {
             KoDocument *doc = it.current()->document();
@@ -2002,7 +2002,7 @@ int KoDocument::queryCloseDia()
         name = i18n( "Untitled" );
 
     int res = KMessageBox::warningYesNoCancel( 0L,
-                    i18n( "<p>The document <b>'%1'</b> has been modified.</p><p>Do you want to save it?</p>" ).tqarg(name));
+                    i18n( "<p>The document <b>'%1'</b> has been modified.</p><p>Do you want to save it?</p>" ).arg(name));
 
     switch(res)
     {
@@ -2023,9 +2023,9 @@ int KoDocument::queryCloseDia()
 
 int KoDocument::queryCloseExternalChildren()
 {
-    //kdDebug(30003)<<k_funcinfo<<" checking for tqchildren in: "<<url().url()<<endl;
+    //kdDebug(30003)<<k_funcinfo<<" checking for children in: "<<url().url()<<endl;
     setDoNotSaveExtDoc(false);
-    TQPtrListIterator<KoDocumentChild> it( tqchildren() );
+    TQPtrListIterator<KoDocumentChild> it( children() );
     for (; it.current(); ++it )
     {
         if ( !it.current()->isDeleted() )
@@ -2082,7 +2082,7 @@ void KoDocument::setTitleModified()
         // Get caption from document info (title(), in about page)
         if ( documentInfo() )
         {
-            KoDocumentInfoPage * page = documentInfo()->page( TQString::tqfromLatin1("about") );
+            KoDocumentInfoPage * page = documentInfo()->page( TQString::fromLatin1("about") );
             if (page)
                 caption = static_cast<KoDocumentInfoAbout *>(page)->title();
         }
@@ -2133,12 +2133,12 @@ TQDomDocument KoDocument::createDomDocument( const TQString& tagName, const TQSt
 TQDomDocument KoDocument::createDomDocument( const TQString& appName, const TQString& tagName, const TQString& version )
 {
     TQDomImplementation impl;
-    TQString url = TQString("http://www.koffice.org/DTD/%1-%1.dtd").tqarg(appName).tqarg(version);
+    TQString url = TQString("http://www.koffice.org/DTD/%1-%1.dtd").arg(appName).arg(version);
     TQDomDocumentType dtype = impl.createDocumentType( tagName,
-                                                      TQString("-//KDE//DTD %1 %1//EN").tqarg(appName).tqarg(version),
+                                                      TQString("-//KDE//DTD %1 %1//EN").arg(appName).arg(version),
                                                       url );
     // The namespace URN doesn't need to include the version number.
-    TQString namespaceURN = TQString("http://www.koffice.org/DTD/%1").tqarg(appName);
+    TQString namespaceURN = TQString("http://www.koffice.org/DTD/%1").arg(appName);
     TQDomDocument doc = impl.createDocument( namespaceURN, tagName, dtype );
     doc.insertBefore( doc.createProcessingInstruction( "xml", "version=\"1.0\" encoding=\"UTF-8\"" ), doc.documentElement() );
     return doc;
@@ -2233,7 +2233,7 @@ KService::Ptr KoDocument::readNativeService( KInstance *instance )
         // Try by path first, so that we find the global one (which has the native mimetype)
         // even if the user created a kword.desktop in ~/.kde/share/applnk or any subdir of it.
         // If he created it under ~/.kde/share/applnk/Office/ then no problem anyway.
-        service = KService::serviceByDesktopPath( TQString::tqfromLatin1("Office/%1.desktop").tqarg(instname) );
+        service = KService::serviceByDesktopPath( TQString::fromLatin1("Office/%1.desktop").arg(instname) );
     }
     if ( !service )
         service = KService::serviceByDesktopName( instname );
@@ -2364,11 +2364,11 @@ void KoDocument::showSavingErrorDialog()
 {
     if ( d->lastErrorMessage.isEmpty() )
     {
-        KMessageBox::error( 0L, i18n( "Could not save\n%1" ).tqarg( m_file ) );
+        KMessageBox::error( 0L, i18n( "Could not save\n%1" ).arg( m_file ) );
     }
     else if ( d->lastErrorMessage != "USER_CANCELED" )
     {
-        KMessageBox::error( 0L, i18n( "Could not save %1\nReason: %2" ).tqarg( m_file, d->lastErrorMessage ) );
+        KMessageBox::error( 0L, i18n( "Could not save %1\nReason: %2" ).arg( m_file, d->lastErrorMessage ) );
     }
 }
 
@@ -2376,11 +2376,11 @@ void KoDocument::showLoadingErrorDialog()
 {
     if ( d->lastErrorMessage.isEmpty() )
     {
-        KMessageBox::error( 0L, i18n( "Could not open\n%1" ).tqarg( url().prettyURL( 0, KURL::StripFileProtocol ) ) );
+        KMessageBox::error( 0L, i18n( "Could not open\n%1" ).arg( url().prettyURL( 0, KURL::StripFileProtocol ) ) );
     }
     else if ( d->lastErrorMessage != "USER_CANCELED" )
     {
-        KMessageBox::error( 0L, i18n( "Could not open %1\nReason: %2" ).tqarg( url().prettyURL( 0, KURL::StripFileProtocol ), d->lastErrorMessage ) );
+        KMessageBox::error( 0L, i18n( "Could not open %1\nReason: %2" ).arg( url().prettyURL( 0, KURL::StripFileProtocol ), d->lastErrorMessage ) );
     }
 }
 
@@ -2656,7 +2656,7 @@ bool KoDocument::showEmbedInitDialog(TQWidget* parent)
 {
     KDialogBase dlg(parent, "EmbedInitDialog", true, i18n("Embedding Object"), 0, KDialogBase::NoDefault);
     KoOpenPane* pane = createOpenPane(&dlg, instance(), templateType());
-    pane->tqlayout()->setMargin(0);
+    pane->layout()->setMargin(0);
     dlg.setMainWidget(pane);
     dlg.setInitialSize(dlg.configDialogSize("EmbedInitDialog"));
     connect(this, TQT_SIGNAL(closeEmbedInitDialog()), &dlg, TQT_SLOT(slotOk()));
diff --git a/lib/kofficecore/KoDocument.h b/lib/kofficecore/KoDocument.h
index ac6de7e8c..1a5d08056 100644
--- a/lib/kofficecore/KoDocument.h
+++ b/lib/kofficecore/KoDocument.h
@@ -385,7 +385,7 @@ public:
      *  @param painter     The painter object onto which will be drawn.
      *  @param rect        The rect that should be used in the painter object.
      *  @param transparent If true then the entire rectangle is erased before painting.
-     *  @param view        The KoView is needed to fiddle about with the active widget, when painting tqchildren.
+     *  @param view        The KoView is needed to fiddle about with the active widget, when painting children.
      *  @param zoomX       The zoom value to be applied to X coordinates when painting.
      *  @param zoomY       The zoom value to be applied to Y coordinates when painting.
      */
@@ -399,7 +399,7 @@ public:
     virtual TQPixmap generatePreview( const TQSize& size );
 
     /**
-     *  Paints all of the documents tqchildren into the given painter object.
+     *  Paints all of the documents children into the given painter object.
      *
      *  @param painter     The painter object onto which will be drawn.
      *  @param rect        The rect that should be used in the painter object.
@@ -427,7 +427,7 @@ public:
 
     /**
      *  Paints the data itself. Normally called by paintEverything(). It does not
-     *  paint the tqchildren.
+     *  paint the children.
      *  It's this method that %KOffice Parts have to implement.
      *
      *  @param painter     The painter object onto which will be drawn.
@@ -659,17 +659,17 @@ public:
     static int defaultAutoSave() { return s_defaultAutoSave; }
 
     /**
-     * @return the list of all tqchildren. Do not modify the
+     * @return the list of all children. Do not modify the
      *         returned list.
      */
-    const TQPtrList<KoDocumentChild>& tqchildren() const;
+    const TQPtrList<KoDocumentChild>& children() const;
 
     /**
      * @return the KoDocumentChild associated with the given Document, but only if
      *         @p doc is a direct child of this document.
      *
      * This is a convenience function. You could get the same result
-     * by traversing the list returned by tqchildren().
+     * by traversing the list returned by children().
      */
     KoDocumentChild *child( KoDocument *doc );
 
@@ -741,7 +741,7 @@ public:
     virtual bool isStoredExtern() const;
 
     /**
-     * @return the page tqlayout associated with this document (margins, pageSize, etc).
+     * @return the page layout associated with this document (margins, pageSize, etc).
      * Override this if you want to provide different sized pages.
      *
      * @see KoPageLayout
@@ -771,14 +771,14 @@ public:
     int queryCloseDia();
 
     /**
-     * @brief Set when we do not want to save external tqchildren when saving our 'main' doc.
+     * @brief Set when we do not want to save external children when saving our 'main' doc.
      *
-     * This makes it possible to save 'main' doc + all its internal tqchildren first, then
-     * go on to save external tqchildren. Typically used by query close.
+     * This makes it possible to save 'main' doc + all its internal children first, then
+     * go on to save external children. Typically used by query close.
      * Use:
      * @code
      *      doc->setDoNotSaveExtDoc();
-     *      doc->save();    // saves doc and its internal tqchildren,
+     *      doc->save();    // saves doc and its internal children,
      *                            //also calls saveExternalChildren() which sets setDoNotSaveExtDoc(false)
      *      doc->saveExternalChildren();
      * @endcode
@@ -1029,7 +1029,7 @@ protected:
      *
      *  An example implementation may look like this:
      *  @code
-     *  TQPtrListIterator<KoDocumentChild> it( tqchildren() );
+     *  TQPtrListIterator<KoDocumentChild> it( children() );
      *  for( ; it.current(); ++it )
      *  {
      *    if ( !it.current()->loadDocument( _store ) )
@@ -1043,16 +1043,16 @@ protected:
     virtual bool loadChildren( KoStore* );
 
     /**
-     *  Saves all internal tqchildren (only!).
-     *  @see saveExternalChildren if you have external tqchildren.
+     *  Saves all internal children (only!).
+     *  @see saveExternalChildren if you have external children.
      *  Returns true on success.
      */
     virtual bool saveChildren( KoStore* store );
 
     /**
-     *  Saves all internal tqchildren (only!), to the store, using the OASIS format.
+     *  Saves all internal children (only!), to the store, using the OASIS format.
      *  This is called automatically during saveNativeFormat.
-     *  @see saveExternalChildren if you have external tqchildren.
+     *  @see saveExternalChildren if you have external children.
      *  Returns true on success.
      */
     virtual bool saveChildrenOasis( KoStore* store, KoXmlWriter* manifestWriter );
@@ -1077,7 +1077,7 @@ protected:
     virtual bool completeSaving( KoStore* store );
 
     /**
-     * Inserts the new child in the list of tqchildren and emits the
+     * Inserts the new child in the list of children and emits the
      * childChanged() signal.
      *
      * At the same time this method marks this document as modified.
@@ -1098,9 +1098,9 @@ protected:
     KoPageLayout m_pageLayout;
 
     /**
-     *  Saves all externally stored tqchildren.
+     *  Saves all externally stored children.
      *  Returns true on success.
-     * @see #saveChildren for internal tqchildren
+     * @see #saveChildren for internal children
      */
     virtual bool saveExternalChildren();
 
diff --git a/lib/kofficecore/KoDocumentChild.cpp b/lib/kofficecore/KoDocumentChild.cpp
index 0767ab049..c71c76094 100644
--- a/lib/kofficecore/KoDocumentChild.cpp
+++ b/lib/kofficecore/KoDocumentChild.cpp
@@ -67,13 +67,13 @@ public:
   bool m_deleted;
 };
 
-KoDocumentChild::KoDocumentChild( KoDocument* parent, KoDocument* doc, const TQRect& tqgeometry )
+KoDocumentChild::KoDocumentChild( KoDocument* parent, KoDocument* doc, const TQRect& geometry )
     : KoChild( parent )
 {
   d = new KoDocumentChildPrivate;
   d->m_parent = parent;
   d->m_doc = doc;
-  setGeometry( tqgeometry );
+  setGeometry( geometry );
   d->m_deleted = false;
   if ( doc )
     doc->setStoreInternal( !doc->hasExternURL() );
@@ -88,11 +88,11 @@ KoDocumentChild::KoDocumentChild( KoDocument* parent )
   d->m_deleted = false;
 }
 
-void KoDocumentChild::setDocument( KoDocument *doc, const TQRect &tqgeometry )
+void KoDocumentChild::setDocument( KoDocument *doc, const TQRect &geometry )
 {
   kdDebug()<<k_funcinfo<<"doc: "<<doc->url().url()<<endl;
   d->m_doc = doc;
-  setGeometry( tqgeometry );
+  setGeometry( geometry );
 
   updateMatrix();
 }
@@ -213,7 +213,7 @@ bool KoDocumentChild::loadDocument( KoStore* store )
             KMimeType::Ptr mime = KMimeType::mimeType( m_tmpMimeType );
             if ( mime->name() != KMimeType::defaultMimeType() )
                 mimeName = mime->comment();
-            d->m_doc->setProperty( "unavailReason", i18n( "No handler found for %1" ).tqarg( mimeName ) );
+            d->m_doc->setProperty( "unavailReason", i18n( "No handler found for %1" ).arg( mimeName ) );
         }
         return res;
     }
@@ -252,7 +252,7 @@ bool KoDocumentChild::loadOasisDocument( KoStore* store, const TQDomDocument& ma
             KMimeType::Ptr mime = KMimeType::mimeType( mimeType );
             if ( mime->name() != KMimeType::defaultMimeType() )
                 mimeName = mime->comment();
-            d->m_doc->setProperty( "unavailReason", i18n( "No handler found for %1" ).tqarg( mimeName ) );
+            d->m_doc->setProperty( "unavailReason", i18n( "No handler found for %1" ).arg( mimeName ) );
         }
         return res;
     }
@@ -306,7 +306,7 @@ bool KoDocumentChild::loadDocumentInternal( KoStore* store, const KoDocumentEntr
                 TQApplication::restoreOverrideCursor();
                 // For security reasons we need to ask confirmation if the url is remote
                 int result = KMessageBox::warningYesNoCancel(
-                    0, i18n( "This document contains an external link to a remote document\n%1").tqarg(m_tmpURL),
+                    0, i18n( "This document contains an external link to a remote document\n%1").arg(m_tmpURL),
                     i18n( "Confirmation Required" ), i18n( "Download" ), i18n( "Skip" ) );
 
                 if ( result == KMessageBox::Cancel )
@@ -335,9 +335,9 @@ bool KoDocumentChild::loadDocumentInternal( KoStore* store, const KoDocumentEntr
                 d->m_doc->setProperty( "realURL", tmpURL ); // so that it gets saved correctly
                 d->m_doc->setStoreInternal( true );
                 if ( internalURL )
-                    d->m_doc->setProperty( "unavailReason", i18n( "Could not load embedded object:\n%1" ).tqarg( errorMessage ) );
+                    d->m_doc->setProperty( "unavailReason", i18n( "Could not load embedded object:\n%1" ).arg( errorMessage ) );
                 else
-                    d->m_doc->setProperty( "unavailReason", i18n( "Could not load external document %1:\n%2" ).tqarg( tmpURL, errorMessage ) );
+                    d->m_doc->setProperty( "unavailReason", i18n( "Could not load external document %1:\n%2" ).arg( tmpURL, errorMessage ) );
             }
             return res;
         }
@@ -409,7 +409,7 @@ bool KoDocumentChild::saveOasis( KoStore* store, KoXmlWriter* manifestWriter )
         }
         else
         {
-            // To make the tqchildren happy cd to the correct directory
+            // To make the children happy cd to the correct directory
             store->pushDirectory();
             store->enterDirectory( name );
 
@@ -454,7 +454,7 @@ void KoDocumentChild::saveOasisAttributes( KoXmlWriter &xmlWriter, const TQStrin
         d->m_doc->setURL( u );
     }
 
-    //<draw:object draw:style-name="standard" draw:id="1" draw:layer="tqlayout" svg:width="14.973cm" svg:height="4.478cm" svg:x="11.641cm" svg:y="14.613cm" xlink:href="#./Object 1" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
+    //<draw:object draw:style-name="standard" draw:id="1" draw:layer="layout" svg:width="14.973cm" svg:height="4.478cm" svg:x="11.641cm" svg:y="14.613cm" xlink:href="#./Object 1" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
     xmlWriter.addAttribute( "xlink:type", "simple" );
     xmlWriter.addAttribute( "xlink:show", "embed" );
     xmlWriter.addAttribute( "xlink:actuate", "onLoad" );
@@ -480,10 +480,10 @@ TQDomElement KoDocumentChild::save( TQDomDocument& doc, bool uppercase )
         e.setAttribute( "mime", d->m_doc->nativeFormatMimeType().data() );
         kdDebug() << "KoDocumentChild::save mime=" << d->m_doc->nativeFormatMimeType() << endl;
         TQDomElement rect = doc.createElement( ( uppercase ? "RECT" : "rect" ) );
-        rect.setAttribute( "x", tqgeometry().left() );
-        rect.setAttribute( "y", tqgeometry().top() );
-        rect.setAttribute( "w", tqgeometry().width() );
-        rect.setAttribute( "h", tqgeometry().height() );
+        rect.setAttribute( "x", geometry().left() );
+        rect.setAttribute( "y", geometry().top() );
+        rect.setAttribute( "w", geometry().width() );
+        rect.setAttribute( "h", geometry().height() );
         e.appendChild(rect);
         return e;
     }
diff --git a/lib/kofficecore/KoDocumentChild.h b/lib/kofficecore/KoDocumentChild.h
index de3704c09..50029cee1 100644
--- a/lib/kofficecore/KoDocumentChild.h
+++ b/lib/kofficecore/KoDocumentChild.h
@@ -45,7 +45,7 @@ class KOFFICECORE_EXPORT KoDocumentChild : public KoChild
   Q_OBJECT
   TQ_OBJECT
 public:
-  KoDocumentChild( KoDocument* parent, KoDocument* doc, const TQRect& tqgeometry );
+  KoDocumentChild( KoDocument* parent, KoDocument* doc, const TQRect& geometry );
 
   /**
    * When using this constructor you must call @ref #setDocument before
@@ -59,7 +59,7 @@ public:
    * Call this function only directly after calling the constructor
    * that takes only a parent as argument.
    */
-  virtual void setDocument( KoDocument *doc, const TQRect &tqgeometry );
+  virtual void setDocument( KoDocument *doc, const TQRect &geometry );
 
   /**
    * @return document contained in this child
diff --git a/lib/kofficecore/KoDocumentInfo.cpp b/lib/kofficecore/KoDocumentInfo.cpp
index cd4ecbafb..1c9400c63 100644
--- a/lib/kofficecore/KoDocumentInfo.cpp
+++ b/lib/kofficecore/KoDocumentInfo.cpp
@@ -122,7 +122,7 @@ bool KoDocumentInfo::saveOasis( KoStore* store )
     xmlWriter->startElement( "office:meta" );
 
     xmlWriter->startElement( "meta:generator");
-    xmlWriter->addTextNode( TQString( "KOffice/%1" ).tqarg( KOFFICE_VERSION_STRING ) );
+    xmlWriter->addTextNode( TQString( "KOffice/%1" ).arg( KOFFICE_VERSION_STRING ) );
     xmlWriter->endElement();
     TQStringList lst = pages();
     TQStringList::ConstIterator it = lst.begin();
@@ -232,7 +232,7 @@ void KoDocumentInfoAuthor::initParameters()
   m_emailCfg = new KConfig( "emaildefaults", true );
   m_emailCfg->setGroup( "Defaults" );
   TQString group = m_emailCfg->readEntry("Profile","Default");
-  m_emailCfg->setGroup(TQString("PROFILE_%1").tqarg(group));
+  m_emailCfg->setGroup(TQString("PROFILE_%1").arg(group));
 
   if ( m_fullName.isNull() ) // only if null. Empty means the user made it explicitly empty.
   {
@@ -629,7 +629,7 @@ KoDocumentInfoAbout::KoDocumentInfoAbout( KoDocumentInfo* info )
     m_docInfo = info;
     m_editingCycles = 0;
     m_initialCreator = m_docInfo->creator();
-    m_creationDate = TQDateTime::tqcurrentDateTime();
+    m_creationDate = TQDateTime::currentDateTime();
 }
 
 void KoDocumentInfoAbout::saveParameters()
@@ -637,7 +637,7 @@ void KoDocumentInfoAbout::saveParameters()
     KoDocument* doc = dynamic_cast< KoDocument* >( m_docInfo->parent() );
     if ( m_firstSave && doc && !doc->isAutosaving() )
        m_editingCycles++;
-    m_modificationDate = TQDateTime::tqcurrentDateTime();
+    m_modificationDate = TQDateTime::currentDateTime();
     m_firstSave = false;
 }
 
@@ -878,7 +878,7 @@ void KoDocumentInfoAbout::resetMetaData()
 {
     m_editingCycles = 0;
     m_initialCreator = m_docInfo->creator();
-    m_creationDate = TQDateTime::tqcurrentDateTime();
+    m_creationDate = TQDateTime::currentDateTime();
     m_modificationDate = TQDateTime();
 }
 
diff --git a/lib/kofficecore/KoDocumentInfoDlg.cpp b/lib/kofficecore/KoDocumentInfoDlg.cpp
index 5973dbb47..a4aa21fcc 100644
--- a/lib/kofficecore/KoDocumentInfoDlg.cpp
+++ b/lib/kofficecore/KoDocumentInfoDlg.cpp
@@ -49,7 +49,7 @@
 #include <kdebug.h>
 #include <ktempfile.h>
 #include <kmimetype.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <klistview.h>
 #include <tqgrid.h>
 #include <tqmap.h>
@@ -191,7 +191,7 @@ void KoDocumentInfoDlg::deleteInfo()
 
 void KoDocumentInfoDlg::resetMetaData()
 {
-  TQString s = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime() );
+  TQString s = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() );
   d->m_aboutWidget->labelCreated->setText( s + ", " + d->m_info->creator() );
   d->m_aboutWidget->labelModified->setText( "" );
   d->m_aboutWidget->labelRevision->setText( "0" );
diff --git a/lib/kofficecore/KoFileDialog.cpp b/lib/kofficecore/KoFileDialog.cpp
index 2a7bd3158..1c3a7fcb1 100644
--- a/lib/kofficecore/KoFileDialog.cpp
+++ b/lib/kofficecore/KoFileDialog.cpp
@@ -90,9 +90,9 @@ void KoFileDialog::setSpecialMimeFilter( TQStringList& mimeFilter,
     int idx = 1; // 0 is the native format
 
     if ( addUncompressed )
-        filterWidget->changeItem( i18n("%1 (Uncompressed XML Files)").tqarg( type->comment() ), idx++ );
+        filterWidget->changeItem( i18n("%1 (Uncompressed XML Files)").arg( type->comment() ), idx++ );
     if ( addFlatXML )
-        filterWidget->changeItem( i18n("%1 (Flat XML File)").tqarg( type->comment() ), idx++ );
+        filterWidget->changeItem( i18n("%1 (Flat XML File)").arg( type->comment() ), idx++ );
     // if you add an entry here, update numSpecialEntries above and specialEntrySelected() below
 
     // For native format...
@@ -109,7 +109,7 @@ void KoFileDialog::setSpecialMimeFilter( TQStringList& mimeFilter,
         KMimeType::Ptr mime = KMimeType::mimeType (*mimeFilterIt);
         TQString compatString = mime->property ("X-KDE-CompatibleApplication").toString ();
         if (!compatString.isEmpty ())
-            filterWidget->changeItem (i18n ("%1 (%2 Compatible)").tqarg (mime->comment ()).tqarg (compatString), i);
+            filterWidget->changeItem (i18n ("%1 (%2 Compatible)").arg (mime->comment ()).arg (compatString), i);
     }
 }
 
diff --git a/lib/kofficecore/KoFilter.cpp b/lib/kofficecore/KoFilter.cpp
index 628d5f17a..1e5beb479 100644
--- a/lib/kofficecore/KoFilter.cpp
+++ b/lib/kofficecore/KoFilter.cpp
@@ -54,7 +54,7 @@ TQString KoEmbeddingFilter::mimeTypeByExtension( const TQString& extension )
     // We need to resort to an ugly hack to determine the mimetype
     // from the extension, as kservicetypefactory.h isn't installed
     KURL url;
-    url.setPath( TQString( "dummy.%1" ).tqarg( extension ) );
+    url.setPath( TQString( "dummy.%1" ).arg( extension ) );
     KMimeType::Ptr m( KMimeType::findByURL( url, 0, true, true ) );
     return m->name();
 }
@@ -65,7 +65,7 @@ KoEmbeddingFilter::KoEmbeddingFilter() : KoFilter()
 }
 
 int KoEmbeddingFilter::embedPart( const TQCString& from, TQCString& to,
-                                  KoFilter::ConversiontqStatus& status, const TQString& key )
+                                  KoFilter::ConversionStatus& status, const TQString& key )
 {
     ++( m_partStack.top()->m_lruPartIndex );
 
diff --git a/lib/kofficecore/KoFilter.h b/lib/kofficecore/KoFilter.h
index 77439648e..cafad7741 100644
--- a/lib/kofficecore/KoFilter.h
+++ b/lib/kofficecore/KoFilter.h
@@ -61,7 +61,7 @@ public:
      * Feel free to add some more error conditions @em before the last item
      * if it's needed.
      */
-    enum ConversiontqStatus { OK, StupidError, UsageError, CreationError, FileNotFound,
+    enum ConversionStatus { OK, StupidError, UsageError, CreationError, FileNotFound,
                             StorageCreationError, BadMimeType, BadConversionGraph,
                             EmbeddedDocError, WrongFormat, NotImplemented,
                             ParsingError, InternalError, UnexpectedEOF,
@@ -79,10 +79,10 @@ public:
      *
      * @param from The mimetype of the source file/document
      * @param to The mimetype of the destination file/document
-     * @return The error status, see the @ref #ConversiontqStatus enum.
+     * @return The error status, see the @ref #ConversionStatus enum.
      *         KoFilter::OK means that everything is alright.
      */
-    virtual ConversiontqStatus convert( const TQCString& from, const TQCString& to ) = 0;
+    virtual ConversionStatus convert( const TQCString& from, const TQCString& to ) = 0;
 
 signals:
     /**
@@ -201,7 +201,7 @@ protected:
      *         within the embedding filter).
      */
     int embedPart( const TQCString& from, TQCString& to,
-                   KoFilter::ConversiontqStatus& status,
+                   KoFilter::ConversionStatus& status,
                    const TQString& key = TQString() );
 
     /**
@@ -262,7 +262,7 @@ private:
 
     /**
      * This struct keeps track of the last used index for a
-     * child part and all references to existing tqchildren
+     * child part and all references to existing children
      * We use it to build a whole stack, one PartState per
      * embedding level.
      * @internal
diff --git a/lib/kofficecore/KoFilterChain.cpp b/lib/kofficecore/KoFilterChain.cpp
index 471d60988..62d93aa5a 100644
--- a/lib/kofficecore/KoFilterChain.cpp
+++ b/lib/kofficecore/KoFilterChain.cpp
@@ -46,7 +46,7 @@ KoFilterChain::ChainLink::ChainLink( KoFilterChain* chain, KoFilterEntry::Ptr fi
 {
 }
 
-KoFilter::ConversiontqStatus KoFilterChain::ChainLink::invokeFilter( const ChainLink* const parentChainLink )
+KoFilter::ConversionStatus KoFilterChain::ChainLink::invokeFilter( const ChainLink* const parentChainLink )
 {
     if ( !m_filterEntry ) {
         kdError( 30500 ) << "This filter entry is null. Strange stuff going on." << endl;
@@ -63,7 +63,7 @@ KoFilter::ConversiontqStatus KoFilterChain::ChainLink::invokeFilter( const Chain
     if ( parentChainLink )
         setupCommunication( parentChainLink->m_filter );
 
-    KoFilter::ConversiontqStatus status = m_filter->convert( m_from, m_to );
+    KoFilter::ConversionStatus status = m_filter->convert( m_from, m_to );
     delete m_filter;
     m_filter=0;
     return status;
@@ -90,8 +90,8 @@ void KoFilterChain::ChainLink::setupCommunication( const KoFilter* const parentF
     if ( !parentFilter )
         return;
 
-    const TQMetaObject* const parent = parentFilter->tqmetaObject();
-    const TQMetaObject* const child = m_filter->tqmetaObject();
+    const TQMetaObject* const parent = parentFilter->metaObject();
+    const TQMetaObject* const child = m_filter->metaObject();
     if ( !parent || !child )
         return;
 
@@ -131,9 +131,9 @@ KoFilterChain::~KoFilterChain()
     manageIO(); // Called for the 2nd time in a row -> clean up
 }
 
-KoFilter::ConversiontqStatus KoFilterChain::invokeChain()
+KoFilter::ConversionStatus KoFilterChain::invokeChain()
 {
-    KoFilter::ConversiontqStatus status = KoFilter::OK;
+    KoFilter::ConversionStatus status = KoFilter::OK;
 
     m_state = Beginning;
     int count = m_chainLinks.count();
@@ -568,7 +568,7 @@ KoStoreDevice* KoFilterChain::storageInitEmbedding( const TQString& name )
         return storageCleanupHelper( &m_outputStorage );
     }
 
-    if ( !m_outputStorage->enterDirectory( TQString( "part%1" ).tqarg( lruPartIndex ) ) )
+    if ( !m_outputStorage->enterDirectory( TQString( "part%1" ).arg( lruPartIndex ) ) )
         return storageCleanupHelper( &m_outputStorage );
 
     return storageCreateFirstStream( name, &m_outputStorage, &m_outputStorageDevice );
diff --git a/lib/kofficecore/KoFilterChain.h b/lib/kofficecore/KoFilterChain.h
index d926c613f..a044eebe2 100644
--- a/lib/kofficecore/KoFilterChain.h
+++ b/lib/kofficecore/KoFilterChain.h
@@ -69,7 +69,7 @@ public:
      * @return The return status of the conversion. KoFilter::OK
      * if everything is alright.
      */
-    KoFilter::ConversiontqStatus invokeChain();
+    KoFilter::ConversionStatus invokeChain();
 
     /**
      * Tells the @ref KoFilterManager the output file of the
@@ -182,7 +182,7 @@ private:
         ChainLink( KoFilterChain* chain, KoFilterEntry::Ptr filterEntry,
                    const TQCString& from, const TQCString& to );
 
-        KoFilter::ConversiontqStatus invokeFilter( const ChainLink* const parentChainLink );
+        KoFilter::ConversionStatus invokeFilter( const ChainLink* const parentChainLink );
 
         TQCString from() const { return m_from; }
         TQCString to() const { return m_to; }
diff --git a/lib/kofficecore/KoFilterManager.cpp b/lib/kofficecore/KoFilterManager.cpp
index 31a1e43ea..2b44459cd 100644
--- a/lib/kofficecore/KoFilterManager.cpp
+++ b/lib/kofficecore/KoFilterManager.cpp
@@ -25,7 +25,7 @@
 
 #include <tqfile.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqptrlist.h>
 #include <tqapplication.h>
 
@@ -59,13 +59,13 @@ KoFilterChooser::KoFilterChooser (TQWidget *parent, const TQStringList &mimeType
     setMainWidget (page);
 
     // looks too squashed together without * 2
-    TQVBoxLayout *tqlayout = new TQVBoxLayout (page, marginHint (), spacingHint () * 2);
+    TQVBoxLayout *layout = new TQVBoxLayout (page, marginHint (), spacingHint () * 2);
 
     TQLabel *filterLabel = new TQLabel (i18n ("Select a filter:"), page, "filterlabel");
-    tqlayout->addWidget (filterLabel);
+    layout->addWidget (filterLabel);
 
     m_filterList = new KListBox (page, "filterlist");
-    tqlayout->addWidget (m_filterList);
+    layout->addWidget (m_filterList);
 
     Q_ASSERT (!m_mimeTypes.isEmpty ());
     for (TQStringList::ConstIterator it = m_mimeTypes.begin ();
@@ -138,7 +138,7 @@ KoFilterManager::~KoFilterManager()
     delete d;
 }
 
-TQString KoFilterManager::import( const TQString& url, KoFilter::ConversiontqStatus& status )
+TQString KoFilterManager::import( const TQString& url, KoFilter::ConversionStatus& status )
 {
     // Find the mime type for the file to be imported.
     KURL u;
@@ -231,7 +231,7 @@ TQString KoFilterManager::import( const TQString& url, KoFilter::ConversiontqSta
     return TQString();
 }
 
-KoFilter::ConversiontqStatus KoFilterManager::exp0rt( const TQString& url, TQCString& mimeType )
+KoFilter::ConversionStatus KoFilterManager::exp0rt( const TQString& url, TQCString& mimeType )
 {
     bool userCancelled = false;
 
@@ -482,7 +482,7 @@ TQStringList KoFilterManager::mimeFilter( const TQCString& mimetype, Direction d
     // TODO maybe use the fake vertex trick from the method below, to make the search faster?
 
     TQStringList nativeMimeTypes;
-    nativeMimeTypes.append( TQString::tqfromLatin1( mimetype ) );
+    nativeMimeTypes.append( TQString::fromLatin1( mimetype ) );
     nativeMimeTypes += extraNativeMimeTypes;
 
     // Add the native mimetypes first so that they are on top.
@@ -583,7 +583,7 @@ bool KoFilterManager::filterAvailable( KoFilterEntry::Ptr entry )
 
 void KoFilterManager::importErrorHelper( const TQString& mimeType, const bool suppressDialog )
 {
-    TQString tmp = i18n("Could not import file of type\n%1").tqarg( mimeType );
+    TQString tmp = i18n("Could not import file of type\n%1").arg( mimeType );
     // ###### FIXME: use KLibLoader::lastErrorMessage() here
     if (!suppressDialog) KMessageBox::error( 0L, tmp, i18n("Missing Import Filter") );
 }
diff --git a/lib/kofficecore/KoFilterManager.h b/lib/kofficecore/KoFilterManager.h
index 5f0641f4f..111580126 100644
--- a/lib/kofficecore/KoFilterManager.h
+++ b/lib/kofficecore/KoFilterManager.h
@@ -81,7 +81,7 @@ public:
      * If the TQString which is returned isEmpty() and the status is OK,
      * then we imported the file directly into the document.
      */
-    TQString import( const TQString& url, KoFilter::ConversiontqStatus& status );
+    TQString import( const TQString& url, KoFilter::ConversionStatus& status );
     /**
      * @brief Exports the given file/document to the specified URL/mimetype.
      *
@@ -89,7 +89,7 @@ public:
      * and when the method returns @p mimeType contains this mimetype.
      * Oh, well, export is a C++ keyword ;)
      */
-    KoFilter::ConversiontqStatus exp0rt( const TQString& url, TQCString& mimeType );
+    KoFilter::ConversionStatus exp0rt( const TQString& url, TQCString& mimeType );
 
 
 
diff --git a/lib/kofficecore/KoFrame.cpp b/lib/kofficecore/KoFrame.cpp
index 4909e1e04..f9b3930ef 100644
--- a/lib/kofficecore/KoFrame.cpp
+++ b/lib/kofficecore/KoFrame.cpp
@@ -254,7 +254,7 @@ void KoFrame::mouseMoveEvent( TQMouseEvent* ev )
       TQPoint p = parentWidget()->mapFromGlobal( ev->globalPos() );
       move( TQPoint( p.x() + d->m_framePos.x() - d->m_mousePressPos.x(),
 		    p.y() + d->m_framePos.y() - d->m_mousePressPos.y() ) );
-      // The other modes change the tqgeometry so they call resizeEvent.
+      // The other modes change the geometry so they call resizeEvent.
       // This one doesn't, so it has to emit geometryChangedby itself.
       emit geometryChanged();
       //kdDebug() << "KoFrame::mouseMoveEvent koFrame position is " << x() << "," << y() << endl;
diff --git a/lib/kofficecore/KoGenStyles.cpp b/lib/kofficecore/KoGenStyles.cpp
index 5c8f680f3..e140ac50f 100644
--- a/lib/kofficecore/KoGenStyles.cpp
+++ b/lib/kofficecore/KoGenStyles.cpp
@@ -225,7 +225,7 @@ void KoGenStyle::writeStyle( KoXmlWriter* writer, KoGenStyles& styles, const cha
     }
     if ( !m_familyName.isEmpty() )
         const_cast<KoGenStyle *>( this )->
-            addAttribute( "style:family", TQString::tqfromLatin1( m_familyName ) );
+            addAttribute( "style:family", TQString::fromLatin1( m_familyName ) );
     else {
         if ( qstrcmp( elementName, "style:style" ) == 0 )
             kdWarning(30003) << "User style " << name << " is without family - invalid. m_type=" << m_type << endl;
diff --git a/lib/kofficecore/KoGenStyles.h b/lib/kofficecore/KoGenStyles.h
index 2a54f944a..d75167328 100644
--- a/lib/kofficecore/KoGenStyles.h
+++ b/lib/kofficecore/KoGenStyles.h
@@ -274,7 +274,7 @@ public:
     {
         /**
          *  DefaultType depends on family: e.g. paragraph-properties if family=paragraph
-         *  or on the type of style (e.g. page-tqlayout -> page-tqlayout-properties).
+         *  or on the type of style (e.g. page-layout -> page-layout-properties).
          *  (In fact that tag name is the one passed to writeStyle)
          */
         DefaultType = 0,
diff --git a/lib/kofficecore/KoGlobal.cpp b/lib/kofficecore/KoGlobal.cpp
index 8ba1c0777..3c979f934 100644
--- a/lib/kofficecore/KoGlobal.cpp
+++ b/lib/kofficecore/KoGlobal.cpp
@@ -136,7 +136,7 @@ void KoGlobal::createListOfLanguages()
     // currently have en_GB or en_US etc.
 
     const TQStringList translationList = KGlobal::dirs()->findAllResources("locale",
-                                                            TQString::tqfromLatin1("*/entry.desktop"));
+                                                            TQString::fromLatin1("*/entry.desktop"));
     for ( TQStringList::ConstIterator it = translationList.begin();
           it != translationList.end(); ++it )
     {
diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp
index 1219bf093..248d3ed39 100644
--- a/lib/kofficecore/KoMainWindow.cpp
+++ b/lib/kofficecore/KoMainWindow.cpp
@@ -499,19 +499,19 @@ void KoMainWindow::updateCaption()
       // Get caption from document info (title(), in about page)
       if ( rootDocument()->documentInfo() )
       {
-          KoDocumentInfoPage * page = rootDocument()->documentInfo()->page( TQString::tqfromLatin1("about") );
+          KoDocumentInfoPage * page = rootDocument()->documentInfo()->page( TQString::fromLatin1("about") );
           if (page)
               caption = static_cast<KoDocumentInfoAbout *>(page)->title();
       }
       const TQString url = rootDocument()->url().prettyURL( 0, KURL::StripFileProtocol );
       if ( !caption.isEmpty() && !url.isEmpty() )
-          caption = TQString( "%1 - %2" ).tqarg( caption ).tqarg( url );
+          caption = TQString( "%1 - %2" ).arg( caption ).arg( url );
       else if ( caption.isEmpty() )
           caption = url;
 
       setCaption( caption, rootDocument()->isModified() );
       if ( !rootDocument()->url().fileName(false).isEmpty() )
-        d->m_paSave->setToolTip( i18n("Save as %1").tqarg(rootDocument()->url().fileName(false)) );
+        d->m_paSave->setToolTip( i18n("Save as %1").arg(rootDocument()->url().fileName(false)) );
       else
         d->m_paSave->setToolTip( i18n("Save") );
   }
@@ -544,7 +544,7 @@ bool KoMainWindow::openDocument( const KURL & url )
 {
     if ( !KIO::NetAccess::exists(url,true,0) )
     {
-        KMessageBox::error(0L, i18n("The file %1 does not exist.").tqarg(url.url()) );
+        KMessageBox::error(0L, i18n("The file %1 does not exist.").arg(url.url()) );
         m_recent->removeURL(url); //remove the file from the recent-opened-file-list
         saveRecentFiles();
         return false;
@@ -677,7 +677,7 @@ bool KoMainWindow::exportConfirmation( const TQCString &outputFormat )
 
     const bool neverHeardOfIt = ( mime->name() == KMimeType::defaultMimeType() );
     TQString comment = neverHeardOfIt ?
-                      i18n( "%1 (unknown file type)" ).tqarg( outputFormat.data() )
+                      i18n( "%1 (unknown file type)" ).arg( outputFormat.data() )
                       : mime->comment();
 
     // Warn the user
@@ -689,7 +689,7 @@ bool KoMainWindow::exportConfirmation( const TQCString &outputFormat )
                   this,
                   i18n( "<qt>Saving as a %1 may result in some loss of formatting."
                         "<p>Do you still want to save in this format?</qt>" )
-                  .tqarg( TQString( "<b>%1</b>" ).tqarg( comment ) ), // in case we want to remove the bold later
+                  .arg( TQString( "<b>%1</b>" ).arg( comment ) ), // in case we want to remove the bold later
                   i18n( "Confirm Save" ),
                   KStdGuiItem::save (),
                   "NonNativeSaveConfirmation",
@@ -703,7 +703,7 @@ bool KoMainWindow::exportConfirmation( const TQCString &outputFormat )
                   this,
                   i18n( "<qt>Exporting as a %1 may result in some loss of formatting."
                         "<p>Do you still want to export to this format?</qt>" )
-                  .tqarg( TQString( "<b>%1</b>" ).tqarg( comment ) ), // in case we want to remove the bold later
+                  .arg( TQString( "<b>%1</b>" ).arg( comment ) ), // in case we want to remove the bold later
                   i18n( "Confirm Export" ),
                   i18n ("Export"),
                   "NonNativeExportConfirmation", // different to the one used for Save (above)
@@ -1039,7 +1039,7 @@ bool KoMainWindow::queryClose()
             name = i18n( "Untitled" );
 
         int res = KMessageBox::warningYesNoCancel( this,
-                        i18n( "<p>The document <b>'%1'</b> has been modified.</p><p>Do you want to save it?</p>" ).tqarg(name),
+                        i18n( "<p>The document <b>'%1'</b> has been modified.</p><p>Do you want to save it?</p>" ).arg(name),
                         TQString(),
                         KStdGuiItem::save(),
                         KStdGuiItem::discard());
@@ -1212,7 +1212,7 @@ void KoMainWindow::print(bool quick) {
     if ( title.isEmpty() ) {
         // #139905 - breaks message freeze though
         //const TQString programName = instance()->aboutData() ? instance()->aboutData()->programName() : instance()->instanceName();
-        //title = i18n("%1 unsaved document (%2)").tqarg(programName).tqarg(KGlobal::locale()->formatDate(TQDate::tqcurrentDate(), true/*short*/));
+        //title = i18n("%1 unsaved document (%2)").arg(programName).arg(KGlobal::locale()->formatDate(TQDate::currentDate(), true/*short*/));
     }
     printer.setDocName( title );
     printer.setDocFileName( fileName );
@@ -1529,9 +1529,9 @@ void KoMainWindow::slotActivePartChanged( KParts::Part *newPart )
       if ( it.current()->inherits("KToolBar") )
       {
           KToolBar * tb = static_cast<KToolBar *>(it.current());
-          KToggleAction * act = new KToggleAction( i18n("Show %1 Toolbar").tqarg( tb->text() ), 0,
+          KToggleAction * act = new KToggleAction( i18n("Show %1 Toolbar").arg( tb->text() ), 0,
                                                actionCollection(), tb->name() );
-	  act->setCheckedState(i18n("Hide %1 Toolbar").tqarg( tb->text() ));
+	  act->setCheckedState(i18n("Hide %1 Toolbar").arg( tb->text() ));
 	  connect( act, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(this), TQT_SLOT( slotToolbarToggled( bool ) ) );
           act->setChecked ( !tb->isHidden() );
           d->m_toolbarList.append( act );
@@ -1618,7 +1618,7 @@ void KoMainWindow::slotEmailFile()
     else
     {
         fileURL = rootDocument()->url().url();
-        theSubject = i18n("Document - %1").tqarg(rootDocument()->url().fileName(false));
+        theSubject = i18n("Document - %1").arg(rootDocument()->url().fileName(false));
         urls.append( fileURL );
     }
 
diff --git a/lib/kofficecore/KoOasisStore.cpp b/lib/kofficecore/KoOasisStore.cpp
index ea99ce8ab..fa1642e74 100644
--- a/lib/kofficecore/KoOasisStore.cpp
+++ b/lib/kofficecore/KoOasisStore.cpp
@@ -145,7 +145,7 @@ bool KoOasisStore::loadAndParse( const TQString& fileName, TQDomDocument& doc, T
     if (!m_store->open(fileName))
     {
         kdWarning(30003) << "Entry " << fileName << " not found!" << endl;
-        errorMessage = i18n( "Could not find %1" ).tqarg( fileName );
+        errorMessage = i18n( "Could not find %1" ).arg( fileName );
         return false;
     }
     // Error variables for TQDomDocument::setContent
@@ -168,7 +168,7 @@ bool KoOasisStore::loadAndParse( const TQString& fileName, TQDomDocument& doc, T
                        << " In line: " << errorLine << ", column: " << errorColumn << endl
                        << " Error message: " << errorMsg << endl;
         errorMessage = i18n( "Parsing error in the main document at line %1, column %2\nError message: %3" )
-                       .tqarg( errorLine ).tqarg( errorColumn ).tqarg( i18n ( "TQXml", errorMsg.utf8() ) );
+                       .arg( errorLine ).arg( errorColumn ).arg( i18n ( "TQXml", errorMsg.utf8() ) );
     }
     else
     {
diff --git a/lib/kofficecore/KoOasisStyles.cpp b/lib/kofficecore/KoOasisStyles.cpp
index fe88a11b2..04a0eb208 100644
--- a/lib/kofficecore/KoOasisStyles.cpp
+++ b/lib/kofficecore/KoOasisStyles.cpp
@@ -26,7 +26,7 @@
 #include <tqbuffer.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <tqbrush.h>
+#include <brush.h>
 #include <KoStyleStack.h>
 
 class KoOasisStyles::Private
@@ -194,9 +194,9 @@ void KoOasisStyles::insertStyle( const TQDomElement& e, bool styleAutoStyles )
             //kdDebug(30003) << "Style: '" << name << "' loaded " << endl;
         }
     } else if ( ns == KoXmlNS::style && (
-                localName == "page-tqlayout"
+                localName == "page-layout"
              || localName == "font-decl"
-             || localName == "presentation-page-tqlayout" ) )
+             || localName == "presentation-page-layout" ) )
     {
         if ( m_styles.find( name ) != 0 )
             kdDebug(30003) << "Style: '" << name << "' already exists" << endl;
diff --git a/lib/kofficecore/KoOasisStyles.h b/lib/kofficecore/KoOasisStyles.h
index dfa9e468c..e73eab0e7 100644
--- a/lib/kofficecore/KoOasisStyles.h
+++ b/lib/kofficecore/KoOasisStyles.h
@@ -47,8 +47,8 @@ public:
 
     /**
      * Look up a style by name.
-     *  This method can find styles defined by the tags "style:page-tqlayout",
-     *   "style:presentation-page-tqlayout", or "style:font-decl".
+     *  This method can find styles defined by the tags "style:page-layout",
+     *   "style:presentation-page-layout", or "style:font-decl".
      * Do NOT use this method for style:style styles.
      *
      * @param name the style name
@@ -148,7 +148,7 @@ private:
     KoOasisStyles& operator=( const KoOasisStyles & ); // forbidden
 
 private:
-    TQDict<TQDomElement>   m_styles; // page-tqlayout, font-decl etc.
+    TQDict<TQDomElement>   m_styles; // page-layout, font-decl etc.
     TQDict<TQDomElement>   m_defaultStyle;
     TQDomElement m_officeStyle;
 
diff --git a/lib/kofficecore/KoOpenPane.cpp b/lib/kofficecore/KoOpenPane.cpp
index 83978239f..15da91513 100644
--- a/lib/kofficecore/KoOpenPane.cpp
+++ b/lib/kofficecore/KoOpenPane.cpp
@@ -20,7 +20,7 @@
 #include "KoOpenPane.h"
 
 #include <tqvbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqheader.h>
 #include <tqwidgetstack.h>
 #include <tqlabel.h>
diff --git a/lib/kofficecore/KoPageLayout.cpp b/lib/kofficecore/KoPageLayout.cpp
index 05eff10ba..c3965d450 100644
--- a/lib/kofficecore/KoPageLayout.cpp
+++ b/lib/kofficecore/KoPageLayout.cpp
@@ -59,7 +59,7 @@ KoGenStyle KoPageLayout::saveOasis() const
 
 void KoPageLayout::loadOasis(const TQDomElement &style)
 {
-    TQDomElement properties( KoDom::namedItemNS( style, KoXmlNS::style, "page-tqlayout-properties" ) );
+    TQDomElement properties( KoDom::namedItemNS( style, KoXmlNS::style, "page-layout-properties" ) );
     if ( !properties.isNull() )
     {
         ptWidth = KoUnit::parseValue(properties.attributeNS( KoXmlNS::fo, "page-width", TQString() ) );
@@ -82,18 +82,18 @@ void KoPageLayout::loadOasis(const TQDomElement &style)
 
 KoPageLayout KoPageLayout::standardLayout()
 {
-    KoPageLayout tqlayout;
-    tqlayout.format = KoPageFormat::defaultFormat();
-    tqlayout.orientation = PG_PORTRAIT;
-    tqlayout.ptWidth = MM_TO_POINT( KoPageFormat::width( tqlayout.format, tqlayout.orientation ) );
-    tqlayout.ptHeight = MM_TO_POINT( KoPageFormat::height( tqlayout.format, tqlayout.orientation ) );
-    tqlayout.ptLeft = MM_TO_POINT( 20.0 );
-    tqlayout.ptRight = MM_TO_POINT( 20.0 );
-    tqlayout.ptTop = MM_TO_POINT( 20.0 );
-    tqlayout.ptBottom = MM_TO_POINT( 20.0 );
-    tqlayout.ptPageEdge = -1;
-    tqlayout.ptBindingSide = -1;
-    return tqlayout;
+    KoPageLayout layout;
+    layout.format = KoPageFormat::defaultFormat();
+    layout.orientation = PG_PORTRAIT;
+    layout.ptWidth = MM_TO_POINT( KoPageFormat::width( layout.format, layout.orientation ) );
+    layout.ptHeight = MM_TO_POINT( KoPageFormat::height( layout.format, layout.orientation ) );
+    layout.ptLeft = MM_TO_POINT( 20.0 );
+    layout.ptRight = MM_TO_POINT( 20.0 );
+    layout.ptTop = MM_TO_POINT( 20.0 );
+    layout.ptBottom = MM_TO_POINT( 20.0 );
+    layout.ptPageEdge = -1;
+    layout.ptBindingSide = -1;
+    return layout;
 }
 
 struct PageFormatInfo
@@ -149,12 +149,12 @@ int KoPageFormat::printerPageSize( KoFormat format )
 {
     if ( format == PG_SCREEN )
     {
-            kdWarning() << "You use the page tqlayout SCREEN. Printing in DIN A4 LANDSCAPE." << endl;
+            kdWarning() << "You use the page layout SCREEN. Printing in DIN A4 LANDSCAPE." << endl;
             return KPrinter::A4;
     }
     else if ( format == PG_CUSTOM )
     {
-            kdWarning() << "The used page tqlayout (CUSTOM) is not supported by KPrinter. Printing in A4." << endl;
+            kdWarning() << "The used page layout (CUSTOM) is not supported by KPrinter. Printing in A4." << endl;
             return KPrinter::A4;
     }
     else if ( format <= PG_LAST_FORMAT )
@@ -198,15 +198,15 @@ KoFormat KoPageFormat::guessFormat( double width, double height )
 TQString KoPageFormat::formatString( KoFormat format )
 {
     if ( format <= PG_LAST_FORMAT )
-        return TQString::tqfromLatin1( pageFormatInfo[ format ].shortName );
-    return TQString::tqfromLatin1( "A4" );
+        return TQString::fromLatin1( pageFormatInfo[ format ].shortName );
+    return TQString::fromLatin1( "A4" );
 }
 
 KoFormat KoPageFormat::formatFromString( const TQString & string )
 {
     for ( int i = 0 ; i <= PG_LAST_FORMAT ; ++i )
     {
-        if (string == TQString::tqfromLatin1( pageFormatInfo[ i ].shortName ))
+        if (string == TQString::fromLatin1( pageFormatInfo[ i ].shortName ))
             return pageFormatInfo[ i ].format;
     }
     // We do not know the format name, so we have a custom format
diff --git a/lib/kofficecore/KoPageLayout.h b/lib/kofficecore/KoPageLayout.h
index 4d4dc6cc8..f854b1eb7 100644
--- a/lib/kofficecore/KoPageLayout.h
+++ b/lib/kofficecore/KoPageLayout.h
@@ -154,7 +154,7 @@ enum KoHFType {
 };
 
 /**
- * This structure defines the page tqlayout, including
+ * This structure defines the page layout, including
  * its size in pt, its format (e.g. A4), orientation, unit, margins etc.
  */
 struct KoPageLayout
@@ -194,17 +194,17 @@ struct KoPageLayout
     }
 
     /**
-     * Save this page tqlayout to OASIS.
+     * Save this page layout to OASIS.
      */
     KOFFICECORE_EXPORT KoGenStyle saveOasis() const;
 
     /**
-     * Load this page tqlayout from OASIS
+     * Load this page layout from OASIS
      */
     KOFFICECORE_EXPORT void loadOasis(const TQDomElement &style);
 
     /**
-     * @return a page tqlayout with the default page size depending on the locale settings,
+     * @return a page layout with the default page size depending on the locale settings,
      * default margins (2 cm), and portrait orientation.
      * @since 1.4
      */
diff --git a/lib/kofficecore/KoPictureEps.cpp b/lib/kofficecore/KoPictureEps.cpp
index 9edbc981a..62269f054 100644
--- a/lib/kofficecore/KoPictureEps.cpp
+++ b/lib/kofficecore/KoPictureEps.cpp
@@ -25,7 +25,7 @@
 #include <tqpainter.h>
 #include <tqpaintdevicemetrics.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h>
 #include <tqimage.h>
 #include <tqpixmap.h>
@@ -244,7 +244,7 @@ void KoPictureEps::draw(TQPainter& painter, int x, int y, int width, int height,
     TQPaintDeviceMetrics metrics (painter.device());
     kdDebug(30003) << "Metrics: X: " << metrics.logicalDpiX() << " x Y: " << metrics.logicalDpiX() << " (in KoPictureEps::draw)" << endl;
 
-    if ( painter.tqdevice()->isExtDev() ) // Is it an external device (i.e. printer)
+    if ( painter.device()->isExtDev() ) // Is it an external device (i.e. printer)
     {
         kdDebug(30003) << "Drawing for a printer (in KoPictureEps::draw)" << endl;
         // For printing, always re-sample the image, as a printer has never the same resolution than a display.
@@ -399,7 +399,7 @@ bool KoPictureEps::loadData(const TQByteArray& array, const TQString& /* extensi
         kdError(30003) << "Not standard bounding box: " << line << endl;
         return false;
     }
-    kdDebug(30003) << "Reg. Exp. Found: " << exp.tqcapturedTexts() << endl;
+    kdDebug(30003) << "Reg. Exp. Found: " << exp.capturedTexts() << endl;
     rect.setLeft((int)exp.cap(1).toDouble());
     rect.setTop((int)exp.cap(2).toDouble());
     rect.setRight((int)exp.cap(3).toDouble());
diff --git a/lib/kofficecore/KoPictureImage.cpp b/lib/kofficecore/KoPictureImage.cpp
index c0775ac74..b0b28ff36 100644
--- a/lib/kofficecore/KoPictureImage.cpp
+++ b/lib/kofficecore/KoPictureImage.cpp
@@ -95,7 +95,7 @@ void KoPictureImage::draw(TQPainter& painter, int x, int y, int width, int heigh
     if ( !width || !height )
         return;
     TQSize origSize = getOriginalSize();
-    const bool scaleImage = painter.tqdevice()->isExtDev() // we are printing
+    const bool scaleImage = painter.device()->isExtDev() // we are printing
         && ((width <= origSize.width()) || (height <= origSize.height()));
     if( scaleImage )
     {
diff --git a/lib/kofficecore/KoPictureKey.cpp b/lib/kofficecore/KoPictureKey.cpp
index 0badb429e..ea2869a9a 100644
--- a/lib/kofficecore/KoPictureKey.cpp
+++ b/lib/kofficecore/KoPictureKey.cpp
@@ -139,8 +139,8 @@ void KoPictureKey::loadAttributes( const TQDomElement &elem )
 TQString KoPictureKey::toString() const
 {
     // We do not use the default TQDateTime::toString has it does not show microseconds
-    return TQString::tqfromLatin1( "%1 %2" )
-        .tqarg( m_filename, m_lastModified.toString("yyyy-MM-dd hh:mm:ss.zzz") );
+    return TQString::fromLatin1( "%1 %2" )
+        .arg( m_filename, m_lastModified.toString("yyyy-MM-dd hh:mm:ss.zzz") );
 }
 
 void KoPictureKey::setKeyFromFile (const TQString& filename)
diff --git a/lib/kofficecore/KoQueryTrader.cpp b/lib/kofficecore/KoQueryTrader.cpp
index 0003d00d1..84a1be4bf 100644
--- a/lib/kofficecore/KoQueryTrader.cpp
+++ b/lib/kofficecore/KoQueryTrader.cpp
@@ -76,14 +76,14 @@ KoDocument* KoDocumentEntry::createDoc( KoDocument* parent, const char* name ) c
 
 KoDocumentEntry KoDocumentEntry::queryByMimeType( const TQString & mimetype )
 {
-  TQString constr = TQString::tqfromLatin1( "[X-KDE-NativeMimeType] == '%1' or '%2' in [X-KDE-ExtraNativeMimeTypes]" ).tqarg( mimetype ).tqarg( mimetype );
+  TQString constr = TQString::fromLatin1( "[X-KDE-NativeMimeType] == '%1' or '%2' in [X-KDE-ExtraNativeMimeTypes]" ).arg( mimetype ).arg( mimetype );
 
   TQValueList<KoDocumentEntry> vec = query( false,constr );
   if ( vec.isEmpty() )
   {
     kdWarning(30003) << "Got no results with " << constr << endl;
     // Fallback to the old way (which was probably wrong, but better be safe)
-    TQString constr = TQString::tqfromLatin1( "'%1' in ServiceTypes" ).tqarg( mimetype );
+    TQString constr = TQString::fromLatin1( "'%1' in ServiceTypes" ).arg( mimetype );
     vec = query( constr );
     if ( vec.isEmpty() )
     {
diff --git a/lib/kofficecore/KoSpeaker.cpp b/lib/kofficecore/KoSpeaker.cpp
index 75c8fec8c..e309cc7e1 100644
--- a/lib/kofficecore/KoSpeaker.cpp
+++ b/lib/kofficecore/KoSpeaker.cpp
@@ -33,14 +33,14 @@
 #include <tqtabbar.h>
 #include <tqgroupbox.h>
 #include <tqlineedit.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqlistview.h>
 #include <tqlistbox.h>
 #include <tqiconview.h>
 #include <tqtable.h>
 #include <tqgridview.h>
 #include <tqregexp.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 
 // KDE includes.
 #include <kapplication.h>
@@ -136,7 +136,7 @@ void KoSpeaker::probe()
     TQPoint pos;
     bool spoke = false;
     if ( d->m_speakFlags & SpeakFocusWidget ) {
-        w = kapp->tqfocusWidget();
+        w = kapp->focusWidget();
         if (w) {
             spoke = maybeSayWidget(w);
             if (!spoke)
diff --git a/lib/kofficecore/KoTemplates.h b/lib/kofficecore/KoTemplates.h
index 98c3ef720..d65fab446 100644
--- a/lib/kofficecore/KoTemplates.h
+++ b/lib/kofficecore/KoTemplates.h
@@ -80,9 +80,9 @@ public:
     void addDir(const TQString &dir) { m_dirs.append(dir); m_touched=true; }
     int sortingWeight() const { return m_sortingWeight; }
     void setSortingWeight(int weight) { m_sortingWeight = weight; }
-    /// If all tqchildren are hidden, we are hidden too
+    /// If all children are hidden, we are hidden too
     bool isHidden() const;
-    /// if we should hide, we hide all the tqchildren
+    /// if we should hide, we hide all the children
     void setHidden(bool hidden=true) const;
 
     KoTemplate *first() { return m_templates.first(); }
diff --git a/lib/kofficecore/KoUnit.cpp b/lib/kofficecore/KoUnit.cpp
index cc8823457..3ba89f24b 100644
--- a/lib/kofficecore/KoUnit.cpp
+++ b/lib/kofficecore/KoUnit.cpp
@@ -183,15 +183,15 @@ KoUnit::Unit KoUnit::unit( const TQString &_unitName, bool* ok )
 {
     if ( ok )
         *ok = true;
-    if ( _unitName == TQString::tqfromLatin1( "mm" ) ) return U_MM;
-    if ( _unitName == TQString::tqfromLatin1( "cm" ) ) return U_CM;
-    if ( _unitName == TQString::tqfromLatin1( "dm" ) ) return U_DM;
-    if ( _unitName == TQString::tqfromLatin1( "in" )
-         || _unitName == TQString::tqfromLatin1("inch") /*compat*/ ) return U_INCH;
-    if ( _unitName == TQString::tqfromLatin1( "pi" ) ) return U_PI;
-    if ( _unitName == TQString::tqfromLatin1( "dd" ) ) return U_DD;
-    if ( _unitName == TQString::tqfromLatin1( "cc" ) ) return U_CC;
-    if ( _unitName == TQString::tqfromLatin1( "pt" ) ) return U_PT;
+    if ( _unitName == TQString::fromLatin1( "mm" ) ) return U_MM;
+    if ( _unitName == TQString::fromLatin1( "cm" ) ) return U_CM;
+    if ( _unitName == TQString::fromLatin1( "dm" ) ) return U_DM;
+    if ( _unitName == TQString::fromLatin1( "in" )
+         || _unitName == TQString::fromLatin1("inch") /*compat*/ ) return U_INCH;
+    if ( _unitName == TQString::fromLatin1( "pi" ) ) return U_PI;
+    if ( _unitName == TQString::fromLatin1( "dd" ) ) return U_DD;
+    if ( _unitName == TQString::fromLatin1( "cc" ) ) return U_CC;
+    if ( _unitName == TQString::fromLatin1( "pt" ) ) return U_PT;
     if ( ok )
         *ok = false;
     return U_PT;
@@ -199,14 +199,14 @@ KoUnit::Unit KoUnit::unit( const TQString &_unitName, bool* ok )
 
 TQString KoUnit::unitName( Unit _unit )
 {
-    if ( _unit == U_MM ) return TQString::tqfromLatin1( "mm" );
-    if ( _unit == U_CM ) return TQString::tqfromLatin1( "cm" );
-    if ( _unit == U_DM ) return TQString::tqfromLatin1( "dm" );
-    if ( _unit == U_INCH ) return TQString::tqfromLatin1( "in" );
-    if ( _unit == U_PI ) return TQString::tqfromLatin1( "pi" );
-    if ( _unit == U_DD ) return TQString::tqfromLatin1( "dd" );
-    if ( _unit == U_CC ) return TQString::tqfromLatin1( "cc" );
-    return TQString::tqfromLatin1( "pt" );
+    if ( _unit == U_MM ) return TQString::fromLatin1( "mm" );
+    if ( _unit == U_CM ) return TQString::fromLatin1( "cm" );
+    if ( _unit == U_DM ) return TQString::fromLatin1( "dm" );
+    if ( _unit == U_INCH ) return TQString::fromLatin1( "in" );
+    if ( _unit == U_PI ) return TQString::fromLatin1( "pi" );
+    if ( _unit == U_DD ) return TQString::fromLatin1( "dd" );
+    if ( _unit == U_CC ) return TQString::fromLatin1( "cc" );
+    return TQString::fromLatin1( "pt" );
 }
 
 void KoUnit::saveOasis(KoXmlWriter* settingsWriter, Unit _unit)
diff --git a/lib/kofficecore/KoView.cpp b/lib/kofficecore/KoView.cpp
index debb9f7c0..634a13934 100644
--- a/lib/kofficecore/KoView.cpp
+++ b/lib/kofficecore/KoView.cpp
@@ -42,7 +42,7 @@ public:
   {
     m_inOperation = false;
     m_zoom = 1.0;
-    m_tqchildren.setAutoDelete( true );
+    m_children.setAutoDelete( true );
     m_manager = 0L;
     m_tempActiveWidget = 0L;
     m_dcopObject = 0;
@@ -56,7 +56,7 @@ public:
   TQGuardedPtr<KoDocument> m_doc; // our KoDocument
   TQGuardedPtr<KParts::PartManager> m_manager;
   double m_zoom;
-  TQPtrList<KoViewChild> m_tqchildren;
+  TQPtrList<KoViewChild> m_children;
   TQWidget *m_tempActiveWidget;
   KoViewIface *m_dcopObject;
   bool m_registered;  // are we registered at the part manager?
@@ -339,10 +339,10 @@ void KoView::partActivateEvent( KParts::PartActivateEvent *event )
       if ( child->isRectangle() && !child->isTransparent() )
       {
         KoViewChild *viewChild = new KoViewChild( child, this );
-        d->m_tqchildren.append( viewChild );
+        d->m_children.append( viewChild );
 
         TQApplication::setOverrideCursor(waitCursor);
-        // This is the long operation (due to toolbar tqlayout stuff)
+        // This is the long operation (due to toolbar layout stuff)
         d->m_manager->setActivePart( child->document(), viewChild->frame()->view() );
         TQApplication::restoreOverrideCursor();
 
@@ -484,7 +484,7 @@ void KoView::paintEverything( TQPainter &painter, const TQRect &rect, bool trans
 
 KoViewChild *KoView::child( KoView *view )
 {
-  TQPtrListIterator<KoViewChild> it( d->m_tqchildren );
+  TQPtrListIterator<KoViewChild> it( d->m_children );
   for (; it.current(); ++it )
     if ( it.current()->frame()->view() == view )
       return it.current();
@@ -494,7 +494,7 @@ KoViewChild *KoView::child( KoView *view )
 
 KoViewChild *KoView::child( KoDocument *doc )
 {
-  TQPtrListIterator<KoViewChild> it( d->m_tqchildren );
+  TQPtrListIterator<KoViewChild> it( d->m_children );
   for (; it.current(); ++it )
     if ( it.current()->documentChild()->document() == doc )
       return it.current();
@@ -554,7 +554,7 @@ void KoView::slotChildActivated( bool a )
     docChild->document()->setViewBuildDocument( chFrame->view(), chFrame->view()->xmlguiBuildDocument() );
   }
 
-  d->m_tqchildren.remove( ch );
+  d->m_children.remove( ch );
 
   d->m_manager->addPart( docChild->document(), false ); // the destruction of the view removed the part from the partmanager. re-add it :)
 
@@ -671,12 +671,12 @@ void KoView::endOperation()
 
 KoMainWindow * KoView::shell() const
 {
-    return dynamic_cast<KoMainWindow *>( tqtopLevelWidget() );
+    return dynamic_cast<KoMainWindow *>( topLevelWidget() );
 }
 
 KMainWindow * KoView::mainWindow() const
 {
-    return dynamic_cast<KMainWindow *>( tqtopLevelWidget() );
+    return dynamic_cast<KMainWindow *>( topLevelWidget() );
 }
 
 KStatusBar * KoView::statusBar() const
@@ -741,11 +741,11 @@ KoViewChild::KoViewChild( KoDocumentChild *child, KoView *_parentView )
 
   /*
    KoViewChild has basically three geometries to keep in sync.
-   - The KoDocumentChild tqgeometry (i.e. the embedded object's tqgeometry, unzoomed)
-   - Its own tqgeometry (used for hit-test etc.)
-   - The KoFrame tqgeometry (the graphical widget for moving the object when active)
+   - The KoDocumentChild geometry (i.e. the embedded object's geometry, unzoomed)
+   - Its own geometry (used for hit-test etc.)
+   - The KoFrame geometry (the graphical widget for moving the object when active)
 
-   So we need to subtract the scrollview's offset for the frame tqgeometry, since it's a widget.
+   So we need to subtract the scrollview's offset for the frame geometry, since it's a widget.
 
    The rules are
    (R1) frameGeometry = viewGeometry(childGeometry) "+" m_frame->{left|right|top|bottom}Border() - scrollview offset,
@@ -779,8 +779,8 @@ KoViewChild::~KoViewChild()
 
 void KoViewChild::slotFrameGeometryChanged()
 {
-  // Set our tqgeometry from the frame tqgeometry (R2 reversed)
-  TQRect geom = m_frame->tqgeometry();
+  // Set our geometry from the frame geometry (R2 reversed)
+  TQRect geom = m_frame->geometry();
   int b = m_frame->border();
   TQRect borderRect( geom.x() + b + parentView()->canvasXOffset(),
                     geom.y() + b + parentView()->canvasYOffset(),
@@ -790,7 +790,7 @@ void KoViewChild::slotFrameGeometryChanged()
 
   if(m_child)
   {
-    // Set the child tqgeometry from the frame tqgeometry (R1 reversed)
+    // Set the child geometry from the frame geometry (R1 reversed)
     TQRect borderLessRect( geom.x() + m_frame->leftBorder() + parentView()->canvasXOffset(),
                           geom.y() + m_frame->topBorder() + parentView()->canvasYOffset(),
                           geom.width() - m_frame->leftBorder() - m_frame->rightBorder(),
@@ -799,8 +799,8 @@ void KoViewChild::slotFrameGeometryChanged()
     // We don't want to trigger slotDocGeometryChanged again
     lock();
     TQRect childGeom = parentView()->reverseViewTransformations( borderLessRect );
-    kdDebug() << "KoChild::slotFrameGeometryChanged child tqgeometry "
-              << ( tqgeometry() == childGeom ? "already " : "set to " )
+    kdDebug() << "KoChild::slotFrameGeometryChanged child geometry "
+              << ( geometry() == childGeom ? "already " : "set to " )
               << childGeom << endl;
     m_child->setGeometry( childGeom );
     unlock();
@@ -811,15 +811,15 @@ void KoViewChild::slotDocGeometryChanged()
 {
   if ( locked() )
       return;
-  // Set frame tqgeometry from child tqgeometry (R1)
+  // Set frame geometry from child geometry (R1)
   // The frame's resizeEvent will call slotFrameGeometryChanged.
-  TQRect geom = parentView()->applyViewTransformations( m_child->tqgeometry() );
+  TQRect geom = parentView()->applyViewTransformations( m_child->geometry() );
   TQRect borderRect( geom.x() - m_frame->leftBorder() - parentView()->canvasXOffset(),
                     geom.y() - m_frame->topBorder() - parentView()->canvasYOffset(),
                     geom.width() + m_frame->leftBorder() + m_frame->rightBorder(),
                     geom.height() + m_frame->topBorder() + m_frame->bottomBorder() );
-  kdDebug() << "KoViewChild::slotDocGeometryChanged frame tqgeometry "
-            << ( m_frame->tqgeometry() == borderRect ? "already " : "set to " )
+  kdDebug() << "KoViewChild::slotDocGeometryChanged frame geometry "
+            << ( m_frame->geometry() == borderRect ? "already " : "set to " )
             << borderRect << endl;
 
   m_frame->setGeometry( borderRect );
diff --git a/lib/kofficecore/KoXmlReader.cpp b/lib/kofficecore/KoXmlReader.cpp
index 3b2d3efb4..16a08f0ce 100644
--- a/lib/kofficecore/KoXmlReader.cpp
+++ b/lib/kofficecore/KoXmlReader.cpp
@@ -305,7 +305,7 @@ KoXmlNodeData::KoXmlNodeData()
   fastLoading = false;
 
   // assume true, it will be set to false by XML parser when this node
-  // apparently has tqchildren AND the tqchildren are not loaded
+  // apparently has children AND the children are not loaded
   loaded = true;
 }
 
@@ -534,7 +534,7 @@ void KoXmlNodeData::loadChildren( int depth )
     !doc->xmlReader->feature( "http://xml.org/sax/features/namespace-prefixes" );
 
 
-  // XML snippet for the tqchildren, including this element
+  // XML snippet for the children, including this element
   TQString snippet = doc->buffer.mid( startPos, endPos-startPos+1 );
 
   // now parse all subnodes
diff --git a/lib/kofficecore/Koversiondialog.cpp b/lib/kofficecore/Koversiondialog.cpp
index 188d58889..f55d4abb7 100644
--- a/lib/kofficecore/Koversiondialog.cpp
+++ b/lib/kofficecore/Koversiondialog.cpp
@@ -19,12 +19,12 @@
 
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqmultilineedit.h>
 #include <tqpushbutton.h>
 #include <tqtoolbutton.h>
 #include <tqapplication.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <kiconloader.h>
 #include <kbuttonbox.h>
 #include <kdebug.h>
diff --git a/lib/kofficecore/THOUGHTS b/lib/kofficecore/THOUGHTS
index fc936fdc1..f0121aa91 100644
--- a/lib/kofficecore/THOUGHTS
+++ b/lib/kofficecore/THOUGHTS
@@ -30,7 +30,7 @@ solve zooming and "scrolling" problems.
 One ugly problem also is what we will do about performance problems on
 repainting a part. Some time ago we got a mail on KOffice where some guy
 asked what to do about making that embedded painting faster. The reason is
-that we *always* tqrepaint the whole area, no matter what. This can easily be
+that we *always* repaint the whole area, no matter what. This can easily be
 optimized to a WNorthWestGravity like behavior, because you can't edit those
 embedded parts anyway, so even kchart and other non-WNG apps support that.
 ( we have to translate the painter, of course).
@@ -44,7 +44,7 @@ whether they are the root views (not embedded), or they are
 *active* embedded views. There only has to be a KoView object.
  
 There is *one* zoom factor for both axes (x/y) and the whole
-content (text, objects, tqchildren,...) is zoomed accordingly.
+content (text, objects, children,...) is zoomed accordingly.
  
 This kind of zooming is like the zoom support you know from
 other applications.
diff --git a/lib/kofficecore/kkbdaccessextensions.cpp b/lib/kofficecore/kkbdaccessextensions.cpp
index 9535c14ac..a9a1cb2ae 100644
--- a/lib/kofficecore/kkbdaccessextensions.cpp
+++ b/lib/kofficecore/kkbdaccessextensions.cpp
@@ -77,7 +77,7 @@ class KPanelKbdSizerIcon : public TQCursor
 
         void setShape(int shayp)
         {
-            if (shayp != tqshape()) {
+            if (shayp != shape()) {
                 // Must restore and override to get the icon to refresh.
                 if (isActive) kapp->restoreOverrideCursor();
                 TQCursor::setShape((Qt::CursorShape)shayp);
@@ -274,7 +274,7 @@ bool KKbdAccessExtensions::eventFilter( TQObject *o, TQEvent *e )
 
 TQWidgetList* KKbdAccessExtensions::getAllPanels()
 {
-    TQWidgetList* allWidgets = kapp->tqallWidgets();
+    TQWidgetList* allWidgets = kapp->allWidgets();
     TQWidgetList* allPanels = new TQWidgetList;
     TQWidget* widget = allWidgets->first();
     while (widget) {
@@ -390,7 +390,7 @@ void KKbdAccessExtensions::showIcon()
 {
     if (!d->panel) return;
     TQPoint p;
-    // kdDebug() << "KKbdAccessExtensions::showIcon: tqtopLevelWidget = " << d->panel->tqtopLevelWidget()->name() << endl;
+    // kdDebug() << "KKbdAccessExtensions::showIcon: topLevelWidget = " << d->panel->topLevelWidget()->name() << endl;
     if (::tqqt_cast<TQSplitter*>( d->panel )) {
         TQSplitter* splitter = dynamic_cast<TQSplitter *>(d->panel);
         int handleNdx = d->handleNdx - 1;
@@ -413,8 +413,8 @@ void KKbdAccessExtensions::showIcon()
         p = dockWindow->pos();
         if (dockWindow->area()) {
             // kdDebug() << "KKbdAccessExtensions::showIcon: pos = " << p << " of window = " << dockWindow->parentWidget()->name() << endl;
-            p = dockWindow->parentWidget()->mapTo(dockWindow->tqtopLevelWidget(), p);
-            // kdDebug() << "KKbdAccessExtensions::showIcon: mapTo = " << p << " of window = " << dockWindow->tqtopLevelWidget()->name() << endl;
+            p = dockWindow->parentWidget()->mapTo(dockWindow->topLevelWidget(), p);
+            // kdDebug() << "KKbdAccessExtensions::showIcon: mapTo = " << p << " of window = " << dockWindow->topLevelWidget()->name() << endl;
             // TODO: How to get the handle width?
             if (d->handleNdx == 1) {
                 d->icon->setShape(TQt::SizeHorCursor);
@@ -440,7 +440,7 @@ void KKbdAccessExtensions::showIcon()
                         // else Handle is above the dock window.
                 }
             }
-            p = dockWindow->tqtopLevelWidget()->mapToGlobal(p);
+            p = dockWindow->topLevelWidget()->mapToGlobal(p);
         } else {
             d->icon->setShape(TQt::SizeAllCursor);
             p = TQPoint(dockWindow->width() / 2, dockWindow->height() / 2);
@@ -571,7 +571,7 @@ void KKbdAccessExtensions::displayAccessKeys()
     }
     // Find all visible, focusable widgets and create a TQLabel for each.  Don't exceed
     // available list of access keys.
-    TQWidgetList* allWidgets = kapp->tqallWidgets();
+    TQWidgetList* allWidgets = kapp->allWidgets();
     TQWidget* widget = allWidgets->first();
     int accessCount = 0;
     int maxAccessCount = availableAccessKeys.length();
diff --git a/lib/kofficecore/koDetailsPaneBase.ui b/lib/kofficecore/koDetailsPaneBase.ui
index c29e4a468..0b64d5ebd 100644
--- a/lib/kofficecore/koDetailsPaneBase.ui
+++ b/lib/kofficecore/koDetailsPaneBase.ui
@@ -58,7 +58,7 @@
             </widget>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>tqlayout2</cstring>
+                    <cstring>layout2</cstring>
                 </property>
                 <grid>
                     <property name="name">
@@ -82,7 +82,7 @@
                         <property name="text">
                             <string></string>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>AlignCenter</set>
                         </property>
                     </widget>
@@ -96,7 +96,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>0</width>
                                 <height>20</height>
@@ -158,7 +158,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>0</width>
                                 <height>20</height>
@@ -177,7 +177,7 @@
                         <property name="text">
                             <string></string>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>AlignCenter</set>
                         </property>
                     </widget>
@@ -191,7 +191,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>0</width>
                                 <height>20</height>
@@ -208,7 +208,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>0</width>
                                 <height>20</height>
diff --git a/lib/kofficecore/koDocumentInfoAboutWidget.ui b/lib/kofficecore/koDocumentInfoAboutWidget.ui
index cf65eb81e..9e100ed2f 100644
--- a/lib/kofficecore/koDocumentInfoAboutWidget.ui
+++ b/lib/kofficecore/koDocumentInfoAboutWidget.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout8</cstring>
+                <cstring>layout8</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -31,7 +31,7 @@
                     <property name="name">
                         <cstring>pixmapLabel</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>56</width>
                             <height>56</height>
@@ -67,7 +67,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -96,7 +96,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="3" column="0">
                     <property name="name">
-                        <cstring>tqlayout14</cstring>
+                        <cstring>layout14</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -120,7 +120,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>31</height>
@@ -173,7 +173,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout11</cstring>
+                <cstring>layout11</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -189,7 +189,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>90</width>
                             <height>70</height>
@@ -206,7 +206,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -277,13 +277,13 @@
                     <property name="name">
                         <cstring>pbReset</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>0</width>
                             <height>24</height>
                         </size>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>32767</width>
                             <height>24</height>
@@ -321,7 +321,7 @@
                     <property name="sizeType">
                         <enum>Minimum</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>50</width>
                             <height>16</height>
diff --git a/lib/kofficecore/koDocumentInfoAuthorWidget.ui b/lib/kofficecore/koDocumentInfoAuthorWidget.ui
index 60353b915..bce294468 100644
--- a/lib/kofficecore/koDocumentInfoAuthorWidget.ui
+++ b/lib/kofficecore/koDocumentInfoAuthorWidget.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -31,7 +31,7 @@
                     <property name="name">
                         <cstring>labelAuthor</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>56</width>
                             <height>56</height>
@@ -61,7 +61,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout16</cstring>
+                <cstring>layout16</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -227,7 +227,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -264,7 +264,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui b/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui
index 2a8a531e8..bc650f10e 100644
--- a/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui
+++ b/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui
@@ -26,7 +26,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -36,7 +36,7 @@
                     <property name="name">
                         <cstring>kPushButton2</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>130</width>
                             <height>0</height>
@@ -64,7 +64,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>101</height>
diff --git a/lib/kofficecore/koOpenPaneBase.ui b/lib/kofficecore/koOpenPaneBase.ui
index a85ecb383..c0076afa4 100644
--- a/lib/kofficecore/koOpenPaneBase.ui
+++ b/lib/kofficecore/koOpenPaneBase.ui
@@ -25,7 +25,7 @@
             </property>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>tqlayout5</cstring>
+                    <cstring>layout5</cstring>
                 </property>
                 <vbox>
                     <property name="name">
@@ -71,7 +71,7 @@
             </widget>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>tqlayout4</cstring>
+                    <cstring>layout4</cstring>
                 </property>
                 <vbox>
                     <property name="name">
diff --git a/lib/kofficecore/tests/filter_graph.cpp b/lib/kofficecore/tests/filter_graph.cpp
index baead627c..7ce1ed77d 100644
--- a/lib/kofficecore/tests/filter_graph.cpp
+++ b/lib/kofficecore/tests/filter_graph.cpp
@@ -52,7 +52,7 @@ int main( int /*argc*/, char ** /*argv*/ )
             if ( !key.isEmpty() ) {
                 output += "    \"";
                 output += key.latin1();
-                output += "\" [tqshape=box, style=filled, fillcolor=lightblue];\n";
+                output += "\" [shape=box, style=filled, fillcolor=lightblue];\n";
                 if ( vertices.find( key ) == vertices.end() )
                     vertices.append( key );
             }
diff --git a/lib/kofficecore/tests/koxmlreadertest.cpp b/lib/kofficecore/tests/koxmlreadertest.cpp
index 5056e416c..a298bd509 100644
--- a/lib/kofficecore/tests/koxmlreadertest.cpp
+++ b/lib/kofficecore/tests/koxmlreadertest.cpp
@@ -22,7 +22,7 @@
 #include <tqstring.h>
 #include <tqcstring.h>
 #include <tqbuffer.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqdatetime.h>
 #include <tqfile.h>
 
@@ -639,7 +639,7 @@ void testDocument()
   CHECK( doc.previousSibling().isNull(), true );
   CHECK( doc.nextSibling().isNull(), true );
 
-  // make sure its tqchildren are fine
+  // make sure its children are fine
   KoXmlElement rootElement;
   rootElement = doc.firstChild().toElement();
   CHECK( rootElement.isNull(), false );
@@ -1419,9 +1419,9 @@ void testSimpleOpenDocumentPresentation()
   xmlstream << "  <office:presentation>";
   xmlstream << "   <draw:page draw:name=\"Title\" draw:style-name=\"dp1\" ";
   xmlstream << "      draw:master-page-name=\"lyt-cool\" ";
-  xmlstream << "      presentation:presentation-page-tqlayout-name=\"AL1T0\">";
+  xmlstream << "      presentation:presentation-page-layout-name=\"AL1T0\">";
   xmlstream << "    <draw:frame presentation:style-name=\"pr1\" ";
-  xmlstream << "      draw:text-style-name=\"P2\" draw:layer=\"tqlayout\" ";
+  xmlstream << "      draw:text-style-name=\"P2\" draw:layer=\"layout\" ";
   xmlstream << "      svg:width=\"23.912cm\" svg:height=\"3.508cm\" ";
   xmlstream << "      svg:x=\"2.058cm\" svg:y=\"1.543cm\" ";
   xmlstream << "      presentation:class=\"title\" ";
@@ -1431,7 +1431,7 @@ void testSimpleOpenDocumentPresentation()
   xmlstream << "     </draw:text-box>";
   xmlstream << "    </draw:frame>";
   xmlstream << "    <draw:frame presentation:style-name=\"pr2\" ";
-  xmlstream << "      draw:text-style-name=\"P3\" draw:layer=\"tqlayout\"";
+  xmlstream << "      draw:text-style-name=\"P3\" draw:layer=\"layout\"";
   xmlstream << "      svg:width=\"23.912cm\" svg:height=\"13.231cm\"";
   xmlstream << "      svg:x=\"2.058cm\" svg:y=\"5.838cm\" ";
   xmlstream << "      presentation:class=\"subtitle\">";
@@ -1440,8 +1440,8 @@ void testSimpleOpenDocumentPresentation()
   xmlstream << "     </draw:text-box>";
   xmlstream << "    </draw:frame>";
   xmlstream << "    <presentation:notes draw:style-name=\"dp2\">";
-  xmlstream << "     <draw:page-thumbnail draw:style-name=\"gr1\" draw:layer=\"tqlayout\" svg:width=\"13.706cm\" svg:height=\"10.28cm\" svg:x=\"3.647cm\" svg:y=\"2.853cm\" draw:page-number=\"1\" presentation:class=\"page\"/>";
-  xmlstream << "     <draw:frame presentation:style-name=\"pr3\" draw:text-style-name=\"P1\" draw:layer=\"tqlayout\" svg:width=\"14.518cm\" svg:height=\"11.411cm\" svg:x=\"3.249cm\" svg:y=\"14.13cm\" presentation:class=\"notes\" presentation:placeholder=\"true\">";
+  xmlstream << "     <draw:page-thumbnail draw:style-name=\"gr1\" draw:layer=\"layout\" svg:width=\"13.706cm\" svg:height=\"10.28cm\" svg:x=\"3.647cm\" svg:y=\"2.853cm\" draw:page-number=\"1\" presentation:class=\"page\"/>";
+  xmlstream << "     <draw:frame presentation:style-name=\"pr3\" draw:text-style-name=\"P1\" draw:layer=\"layout\" svg:width=\"14.518cm\" svg:height=\"11.411cm\" svg:x=\"3.249cm\" svg:y=\"14.13cm\" presentation:class=\"notes\" presentation:placeholder=\"true\">";
   xmlstream << "      <draw:text-box/>";
   xmlstream << "     </draw:frame>";
   xmlstream << "    </presentation:notes>";
@@ -1587,7 +1587,7 @@ void testSimpleOpenDocumentPresentation()
   CHECK( titlePageElement.attributeNS(drawNS,"style-name",""), TQString("dp1") );
   CHECK( titlePageElement.attributeNS(drawNS,"master-page-name",""), TQString("lyt-cool") );
   CHECK( titlePageElement.attributeNS(presentationNS,
-    "presentation-page-tqlayout-name",""), TQString("AL1T0") );
+    "presentation-page-layout-name",""), TQString("AL1T0") );
 
   // <draw:frame> for the title frame
   KoXmlElement titleFrameElement;
@@ -1605,7 +1605,7 @@ void testSimpleOpenDocumentPresentation()
   CHECK( titleFrameElement.attributeNS(presentationNS,"class",""), TQString("title") );
   CHECK( titleFrameElement.attributeNS(presentationNS,"user-transformed",""), TQString("true") );
   CHECK( titleFrameElement.attributeNS(drawNS,"text-style-name",""), TQString("P2") );
-  CHECK( titleFrameElement.attributeNS(drawNS,"layer",""), TQString("tqlayout") );
+  CHECK( titleFrameElement.attributeNS(drawNS,"layer",""), TQString("layout") );
   CHECK( titleFrameElement.attributeNS(svgNS,"width",""), TQString("23.912cm") );
   CHECK( titleFrameElement.attributeNS(svgNS,"height",""), TQString("3.508cm") );
   CHECK( titleFrameElement.attributeNS(svgNS,"x",""), TQString("2.058cm") );
@@ -1655,7 +1655,7 @@ void testSimpleOpenDocumentPresentation()
   CHECK( subtitleFrameElement.attributeNS(presentationNS,"class",""), TQString("subtitle") );
   CHECK( subtitleFrameElement.hasAttributeNS(presentationNS,"user-transformed"), false );
   CHECK( subtitleFrameElement.attributeNS(drawNS,"text-style-name",""), TQString("P3") );
-  CHECK( subtitleFrameElement.attributeNS(drawNS,"layer",""), TQString("tqlayout") );
+  CHECK( subtitleFrameElement.attributeNS(drawNS,"layer",""), TQString("layout") );
   CHECK( subtitleFrameElement.attributeNS(svgNS,"width",""), TQString("23.912cm") );
   CHECK( subtitleFrameElement.attributeNS(svgNS,"height",""), TQString("13.231cm") );
   CHECK( subtitleFrameElement.attributeNS(svgNS,"x",""), TQString("2.058cm") );
@@ -1887,7 +1887,7 @@ void testLargeOpenDocumentSpreadsheet()
   xmlstream << "<office:spreadsheet>";
   for( int i = 0; i < sheetCount; i++ )
   {
-    TQString sheetName = TQString("Sheet%1").tqarg(i+1);
+    TQString sheetName = TQString("Sheet%1").arg(i+1);
     xmlstream << "<table:table table:name=\"" << sheetName;
     xmlstream << "\" table:print=\"false\">";
     for( int j = 0; j < rowCount; j++ )
@@ -1981,7 +1981,7 @@ void testLargeOpenDocumentSpreadsheet()
   tableElement = spreadsheetElement.firstChild().toElement();
   for( int table=0; table < sheetCount; table++ )
   {
-    TQString tableName = TQString("Sheet%1").tqarg(table+1);
+    TQString tableName = TQString("Sheet%1").arg(table+1);
     CHECK( tableElement.isNull(), false );
     CHECK( tableElement.isElement(), true );
     CHECK( tableElement.localName(), TQString("table") );