1 files changed, 25 insertions, 25 deletions

diff --git a/lib/kofficecore/KoChild.cpp b/lib/kofficecore/KoChild.cpp
index 41dfee8f..c78ee70f 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;