Remove additional unneeded tq method conversions

1 files changed, 19 insertions, 19 deletions

diff --git a/lib/kofficecore/KoView.cpp b/lib/kofficecore/KoView.cpp
index 7dc1f0b0..259c498e 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,7 +339,7 @@ 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)
@@ -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 :)
 
@@ -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 );