1 files changed, 27 insertions, 27 deletions

diff --git a/kig/kig/kig_commands.cpp b/kig/kig/kig_commands.cpp
index d4668f55..d6b79805 100644
--- a/kig/kig/kig_commands.cpp
+++ b/kig/kig/kig_commands.cpp
@@ -97,7 +97,7 @@ KigCommand* KigCommand::removeCommand( KigPart& doc, const std::vector<ObjectHol
   if ( os.size() == 1 )
     text = os.back()->imp()->type()->removeAStatement();
   else
-    text = i18n( "Remove %1 Objects" ).arg( os.size() );
+    text = i18n( "Remove %1 Objects" ).tqarg( os.size() );
   KigCommand* ret = new KigCommand( doc, text );
   ret->addTask( new RemoveObjectsTask( os ) );
   return ret;
@@ -109,7 +109,7 @@ KigCommand* KigCommand::addCommand( KigPart& doc, const std::vector<ObjectHolder
   if ( os.size() == 1 )
     text = os.back()->imp()->type()->addAStatement();
   else
-    text = i18n( "Add %1 Objects" ).arg( os.size() );
+    text = i18n( "Add %1 Objects" ).tqarg( os.size() );
   KigCommand* ret = new KigCommand( doc, text );
   ret->addTask( new AddObjectsTask( os ) );
   return ret;
@@ -181,11 +181,11 @@ void ChangeObjectConstCalcerTask::execute( KigPart& doc )
 {
   mnewimp = mcalcer->switchImp( mnewimp );
 
-  std::set<ObjectCalcer*> allchildren = getAllChildren( mcalcer.get() );
-  std::vector<ObjectCalcer*> allchildrenvect( allchildren.begin(), allchildren.end() );
-  allchildrenvect = calcPath( allchildrenvect );
-  for ( std::vector<ObjectCalcer*>::iterator i = allchildrenvect.begin();
-        i != allchildrenvect.end(); ++i )
+  std::set<ObjectCalcer*> alltqchildren = getAllChildren( mcalcer.get() );
+  std::vector<ObjectCalcer*> alltqchildrenvect( alltqchildren.begin(), alltqchildren.end() );
+  alltqchildrenvect = calcPath( alltqchildrenvect );
+  for ( std::vector<ObjectCalcer*>::iterator i = alltqchildrenvect.begin();
+        i != alltqchildrenvect.end(); ++i )
     ( *i )->calc( doc.document() );
 }
 
@@ -274,7 +274,7 @@ class ChangeParentsAndTypeTask::Private
 {
 public:
   ObjectTypeCalcer* o;
-  std::vector<ObjectCalcer::shared_ptr> newparents;
+  std::vector<ObjectCalcer::shared_ptr> newtqparents;
   const ObjectType* newtype;
 };
 
@@ -284,13 +284,13 @@ ChangeParentsAndTypeTask::~ChangeParentsAndTypeTask()
 }
 
 ChangeParentsAndTypeTask::ChangeParentsAndTypeTask(
-  ObjectTypeCalcer* o, const std::vector<ObjectCalcer*>& newparents,
+  ObjectTypeCalcer* o, const std::vector<ObjectCalcer*>& newtqparents,
   const ObjectType* newtype )
   : KigCommandTask(), d( new Private )
 {
   d->o = o;
-  std::copy( newparents.begin(), newparents.end(),
-             std::back_inserter( d->newparents ) );
+  std::copy( newtqparents.begin(), newtqparents.end(),
+             std::back_inserter( d->newtqparents ) );
   d->newtype = newtype;
 }
 
@@ -300,24 +300,24 @@ void ChangeParentsAndTypeTask::execute( KigPart& doc )
   d->o->setType( d->newtype );
   d->newtype = oldtype;
 
-  std::vector<ObjectCalcer*> oldparentso = d->o->parents();
-  std::vector<ObjectCalcer::shared_ptr> oldparents(
-    oldparentso.begin(), oldparentso.end() );
-  std::vector<ObjectCalcer*> newparents;
-  for ( std::vector<ObjectCalcer::shared_ptr>::iterator i = d->newparents.begin();
-        i != d->newparents.end(); ++i )
-    newparents.push_back( i->get() );
-  d->o->setParents( newparents );
-  d->newparents = oldparents;
-
-  for ( std::vector<ObjectCalcer*>::iterator i = newparents.begin(); i != newparents.end(); ++i )
+  std::vector<ObjectCalcer*> oldtqparentso = d->o->tqparents();
+  std::vector<ObjectCalcer::shared_ptr> oldtqparents(
+    oldtqparentso.begin(), oldtqparentso.end() );
+  std::vector<ObjectCalcer*> newtqparents;
+  for ( std::vector<ObjectCalcer::shared_ptr>::iterator i = d->newtqparents.begin();
+        i != d->newtqparents.end(); ++i )
+    newtqparents.push_back( i->get() );
+  d->o->setParents( newtqparents );
+  d->newtqparents = oldtqparents;
+
+  for ( std::vector<ObjectCalcer*>::iterator i = newtqparents.begin(); i != newtqparents.end(); ++i )
     ( *i )->calc( doc.document() );
   d->o->calc( doc.document() );
-  std::set<ObjectCalcer*> allchildren = getAllChildren( d->o );
-  std::vector<ObjectCalcer*> allchildrenvect( allchildren.begin(), allchildren.end() );
-  allchildrenvect = calcPath( allchildrenvect );
-  for ( std::vector<ObjectCalcer*>::iterator i = allchildrenvect.begin();
-        i != allchildrenvect.end(); ++i )
+  std::set<ObjectCalcer*> alltqchildren = getAllChildren( d->o );
+  std::vector<ObjectCalcer*> alltqchildrenvect( alltqchildren.begin(), alltqchildren.end() );
+  alltqchildrenvect = calcPath( alltqchildrenvect );
+  for ( std::vector<ObjectCalcer*>::iterator i = alltqchildrenvect.begin();
+        i != alltqchildrenvect.end(); ++i )
     ( *i )->calc( doc.document() );
 }