diff options
Diffstat (limited to 'kig/objects/text_type.cc')
-rw-r--r-- | kig/objects/text_type.cc | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/kig/objects/text_type.cc b/kig/objects/text_type.cc index 5fc637bd..09e84c30 100644 --- a/kig/objects/text_type.cc +++ b/kig/objects/text_type.cc @@ -76,11 +76,11 @@ const ObjectImpType* TextType::impRequirement( const ObjectImp* o, const Args& a return ObjectImp::stype(); } -ObjectImp* TextType::calc( const Args& tqparents, const KigDocument& doc ) const +ObjectImp* TextType::calc( const Args& parents, const KigDocument& doc ) const { - if( tqparents.size() < 3 ) return new InvalidImp; - Args firstthree( tqparents.begin(), tqparents.begin() + 3 ); - Args varargs( tqparents.begin() + 3, tqparents.end() ); + if( parents.size() < 3 ) return new InvalidImp; + Args firstthree( parents.begin(), parents.begin() + 3 ); + Args varargs( parents.begin() + 3, parents.end() ); if ( ! mparser.checkArgs( firstthree ) ) return new InvalidImp; @@ -108,9 +108,9 @@ bool TextType::isFreelyTranslatable( const ObjectTypeCalcer& ) const void TextType::move( ObjectTypeCalcer& ourobj, const Coordinate& to, const KigDocument& d ) const { - const std::vector<ObjectCalcer*> tqparents = ourobj.tqparents(); - assert( tqparents.size() >= 3 ); - const std::vector<ObjectCalcer*> firstthree( tqparents.begin(), tqparents.begin() + 3 ); + const std::vector<ObjectCalcer*> parents = ourobj.parents(); + assert( parents.size() >= 3 ); + const std::vector<ObjectCalcer*> firstthree( parents.begin(), parents.begin() + 3 ); if( dynamic_cast<ObjectConstCalcer*>( firstthree[1] ) ) { ObjectConstCalcer* c = static_cast<ObjectConstCalcer*>( firstthree[1] ); @@ -133,10 +133,10 @@ void TextType::executeAction( int i, ObjectHolder& o, ObjectTypeCalcer& c, KigPart& doc, KigWidget&, NormalMode& ) const { - std::vector<ObjectCalcer*> tqparents = c.tqparents(); - assert( tqparents.size() >= 3 ); + std::vector<ObjectCalcer*> parents = c.parents(); + assert( parents.size() >= 3 ); - std::vector<ObjectCalcer*> firstthree( tqparents.begin(), tqparents.begin() + 3 ); + std::vector<ObjectCalcer*> firstthree( parents.begin(), parents.begin() + 3 ); assert( mparser.checkArgs( firstthree ) ); assert( dynamic_cast<ObjectConstCalcer*>( firstthree[0] ) ); @@ -201,10 +201,10 @@ Args TextType::sortArgs( const Args& args ) const std::vector<ObjectCalcer*> TextType::movableParents( const ObjectTypeCalcer& ourobj ) const { - const std::vector<ObjectCalcer*> tqparents = ourobj.tqparents(); - assert( tqparents.size() >= 3 ); - std::vector<ObjectCalcer*> ret = tqparents[1]->movableParents(); - ret.push_back( tqparents[1] ); + const std::vector<ObjectCalcer*> parents = ourobj.parents(); + assert( parents.size() >= 3 ); + std::vector<ObjectCalcer*> ret = parents[1]->movableParents(); + ret.push_back( parents[1] ); return ret; } |