1 files changed, 20 insertions, 20 deletions

diff --git a/kig/modes/label.cc b/kig/modes/label.cc
index 298e75d0..48f729bf 100644
--- a/kig/modes/label.cc
+++ b/kig/modes/label.cc
@@ -55,8 +55,8 @@ public:
   TQPoint plc;
   // the currently selected coordinate
   Coordinate mcoord;
-  // the possible tqparent object that defines the location of the label..
-  ObjectCalcer* locationtqparent;
+  // the possible parent object that defines the location of the label..
+  ObjectCalcer* locationparent;
 
   // the text is only kept in the text input widget, not here
   // TQString mtext;
@@ -65,7 +65,7 @@ public:
   // to them in the args object, and keep a pointer to them ( or 0 )
   // in the correct order in args ( separately, because we can't use
   // the order of the parents of a ReferenceObject, and certainly
-  // can't give 0 as a tqparent..
+  // can't give 0 as a parent..
   argvect args;
 
   // if we're ReallySelectingArgs, then this var points to the arg
@@ -90,7 +90,7 @@ TextLabelModeBase::~TextLabelModeBase()
 TextLabelModeBase::TextLabelModeBase( KigPart& doc )
   : KigMode( doc ), d( new Private )
 {
-  d->locationtqparent = 0;
+  d->locationparent = 0;
   d->lpc = 0;
   d->mwawd = SelectingLocation;
   d->wiz = new TextLabelWizard( doc.widget(), this );
@@ -212,7 +212,7 @@ void TextLabelModeBase::mouseMoved( TQMouseEvent* e, KigWidget* w )
   {
     std::vector<ObjectHolder*> os = mdoc.document().whatAmIOn( w->fromScreen( e->pos() ), *w );
     bool attachable = false;
-    d->locationtqparent = 0;
+    d->locationparent = 0;
     for ( std::vector<ObjectHolder*>::iterator i = os.begin(); i != os.end(); ++i )
     {
       if( (*i)->imp()->attachPoint().valid() ||
@@ -220,7 +220,7 @@ void TextLabelModeBase::mouseMoved( TQMouseEvent* e, KigWidget* w )
           (*i)->imp()->inherits( CurveImp::stype() ) )
       {
         attachable = true;
-        d->locationtqparent = (*i)->calcer();
+        d->locationparent = (*i)->calcer();
         break;
       };
     };
@@ -228,7 +228,7 @@ void TextLabelModeBase::mouseMoved( TQMouseEvent* e, KigWidget* w )
     if ( attachable )
     {
       w->setCursor( KCursor::handCursor() );
-      TQString s = d->locationtqparent->imp()->type()->attachToThisStatement();
+      TQString s = d->locationparent->imp()->type()->attachToThisStatement();
       mdoc.emitStatusBarText( s );
 
       KigPainter p( w->screenInfo(), TQT_TQPAINTDEVICE(&w->curPix), mdoc.document() );
@@ -296,7 +296,7 @@ void TextLabelModeBase::finishPressed()
                               "value for. Please remove them or select enough arguments." ) );
   else
   {
-    finish( d->mcoord, s, d->args, needframe, d->locationtqparent );
+    finish( d->mcoord, s, d->args, needframe, d->locationparent );
     killMode();
   };
 }
@@ -452,7 +452,7 @@ TextLabelConstructionMode::~TextLabelConstructionMode()
 void TextLabelConstructionMode::finish(
   const Coordinate& coord, const TQString& s,
   const argvect& props, bool needframe,
-  ObjectCalcer* locationtqparent )
+  ObjectCalcer* locationparent )
 {
   std::vector<ObjectCalcer*> args;
   for ( argvect::const_iterator i = props.begin();
@@ -460,8 +460,8 @@ void TextLabelConstructionMode::finish(
     args.push_back( i->get() );
 
   ObjectHolder* label = 0;
-  if ( locationtqparent )
-    label = ObjectFactory::instance()->attachedLabel( s, locationtqparent, coord, needframe, args, mdoc.document() );
+  if ( locationparent )
+    label = ObjectFactory::instance()->attachedLabel( s, locationparent, coord, needframe, args, mdoc.document() );
   else
     label = ObjectFactory::instance()->label( s, coord, needframe, args, mdoc.document() );
   mdoc.addObject( label );
@@ -507,7 +507,7 @@ TextLabelRedefineMode::~TextLabelRedefineMode()
 void TextLabelRedefineMode::finish(
   const Coordinate& coord, const TQString& s,
   const argvect& props, bool needframe,
-  ObjectCalcer* locationtqparent )
+  ObjectCalcer* locationparent )
 {
   std::vector<ObjectCalcer*> parents = mlabel->parents();
   assert( parents.size() >= 3 );
@@ -552,19 +552,19 @@ void TextLabelRedefineMode::finish(
    * take advantage of the method "getAttachPoint" that should
    * do all the work; it is also used when creating a new label
    */
-  np[1] = ObjectFactory::instance()->getAttachPoint( locationtqparent, coord, mdoc.document() );
+  np[1] = ObjectFactory::instance()->getAttachPoint( locationparent, coord, mdoc.document() );
 
 /* this is the old code, just in case... */
-//  if ( locationtqparent && locationtqparent->imp()->inherits( CurveImp::stype() ) )
+//  if ( locationparent && locationparent->imp()->inherits( CurveImp::stype() ) )
 //  {
-//    double param = static_cast<const CurveImp*>( locationtqparent->imp() )->getParam( coord, mdoc.document() );
-//    np[1] = ObjectFactory::instance()->constrainedPointCalcer( locationtqparent, param );
+//    double param = static_cast<const CurveImp*>( locationparent->imp() )->getParam( coord, mdoc.document() );
+//    np[1] = ObjectFactory::instance()->constrainedPointCalcer( locationparent, param );
 //    np[1]->calc( mdoc.document() );
 //  }
-//  else if ( locationtqparent )
+//  else if ( locationparent )
 //  {
-//    assert( locationtqparent->imp()->inherits( PointImp::stype() ) );
-//    np[1] = locationtqparent;
+//    assert( locationparent->imp()->inherits( PointImp::stype() ) );
+//    np[1] = locationparent;
 //  }
 //  else
 //    np[1] = new ObjectConstCalcer( new PointImp( coord ) );
@@ -585,5 +585,5 @@ void TextLabelModeBase::setFrame( bool f )
 
 void TextLabelModeBase::setLocationParent( ObjectCalcer* o )
 {
-  d->locationtqparent = o;
+  d->locationparent = o;
 }