diff options
Diffstat (limited to 'kig/modes/moving.cc')
-rw-r--r-- | kig/modes/moving.cc | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/kig/modes/moving.cc b/kig/modes/moving.cc index 980a5feb..d6f2c74b 100644 --- a/kig/modes/moving.cc +++ b/kig/modes/moving.cc @@ -129,8 +129,8 @@ MovingMode::MovingMode( const std::vector<ObjectHolder*>& os, const Coordinate& emo.push_back( ( *i )->calcer() ); d->refmap[( *i )->calcer()] = (*i)->moveReferencePoint(); objs.insert( ( *i )->calcer() ); - std::vector<ObjectCalcer*> tqparents = ( *i )->calcer()->movableParents(); - objs.insert( tqparents.begin(), tqparents.end() ); + std::vector<ObjectCalcer*> parents = ( *i )->calcer()->movableParents(); + objs.insert( parents.begin(), parents.end() ); }; emo = calcPath( emo ); @@ -176,12 +176,12 @@ PointRedefineMode::PointRedefineMode( ObjectHolder* p, KigPart& d, KigWidget& v { assert( dynamic_cast<ObjectTypeCalcer*>( p->calcer() ) ); moldtype = static_cast<ObjectTypeCalcer*>( p->calcer() )->type(); - std::vector<ObjectCalcer*> oldtqparents = p->calcer()->tqparents(); - std::copy( oldtqparents.begin(), oldtqparents.end(), std::back_inserter( moldtqparents ) ); + std::vector<ObjectCalcer*> oldparents = p->calcer()->parents(); + std::copy( oldparents.begin(), oldparents.end(), std::back_inserter( moldparents ) ); - std::vector<ObjectCalcer*> tqparents = getAllParents( mp->calcer() ); - mmon = new MonitorDataObjects( tqparents ); - std::vector<ObjectCalcer*> moving = tqparents; + std::vector<ObjectCalcer*> parents = getAllParents( mp->calcer() ); + mmon = new MonitorDataObjects( parents ); + std::vector<ObjectCalcer*> moving = parents; std::set<ObjectCalcer*> tqchildren = getAllChildren( mp->calcer() ); std::copy( tqchildren.begin(), tqchildren.end(), std::back_inserter( moving ) ); initScreen( moving ); @@ -224,22 +224,22 @@ void PointRedefineMode::stopMove() assert( dynamic_cast<ObjectTypeCalcer*>( mp->calcer() ) ); ObjectTypeCalcer* mpcalc = static_cast<ObjectTypeCalcer*>( mp->calcer() ); - std::vector<ObjectCalcer*> newtqparents = mpcalc->tqparents(); - std::vector<ObjectCalcer::shared_ptr> newtqparentsref( - newtqparents.begin(), newtqparents.end() ); + std::vector<ObjectCalcer*> newparents = mpcalc->parents(); + std::vector<ObjectCalcer::shared_ptr> newparentsref( + newparents.begin(), newparents.end() ); const ObjectType* newtype = mpcalc->type(); - std::vector<ObjectCalcer*> oldtqparents; - for( std::vector<ObjectCalcer::shared_ptr>::iterator i = moldtqparents.begin(); - i != moldtqparents.end(); ++i ) - oldtqparents.push_back( i->get() ); + std::vector<ObjectCalcer*> oldparents; + for( std::vector<ObjectCalcer::shared_ptr>::iterator i = moldparents.begin(); + i != moldparents.end(); ++i ) + oldparents.push_back( i->get() ); mpcalc->setType( moldtype ); - mpcalc->setParents( oldtqparents ); + mpcalc->setParents( oldparents ); mp->calc( mdoc.document() ); KigCommand* command = new KigCommand( mdoc, i18n( "Redefine Point" ) ); command->addTask( - new ChangeParentsAndTypeTask( mpcalc, newtqparents, newtype ) ); + new ChangeParentsAndTypeTask( mpcalc, newparents, newtype ) ); mmon->finish( command ); mdoc.history()->addCommand( command ); } |