diff options
Diffstat (limited to 'kig/objects/other_type.cc')
| -rw-r--r-- | kig/objects/other_type.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/kig/objects/other_type.cc b/kig/objects/other_type.cc index 7d632524..80986e82 100644 --- a/kig/objects/other_type.cc +++ b/kig/objects/other_type.cc @@ -103,10 +103,10 @@ bool CopyObjectType::inherits( int ) const return false; } -ObjectImp* CopyObjectType::calc( const Args& tqparents, const KigDocument& ) const +ObjectImp* CopyObjectType::calc( const Args& parents, const KigDocument& ) const { - assert( tqparents.size() == 1 ); - return tqparents[0]->copy(); + assert( parents.size() == 1 ); + return parents[0]->copy(); } const ObjectImpType* CopyObjectType::impRequirement( const ObjectImp*, const Args& ) const @@ -120,19 +120,19 @@ const ObjectImpType* CopyObjectType::resultId() const return ObjectImp::stype(); } -const ObjectImpType* LocusType::impRequirement( const ObjectImp* o, const Args& tqparents ) const +const ObjectImpType* LocusType::impRequirement( const ObjectImp* o, const Args& parents ) const { - assert( tqparents.size() >= 2 ); - Args firsttwo( tqparents.begin(), tqparents.begin() + 2 ); - if ( o == tqparents[0] || o == tqparents[1] ) + assert( parents.size() >= 2 ); + Args firsttwo( parents.begin(), parents.begin() + 2 ); + if ( o == parents[0] || o == parents[1] ) return margsparser.impRequirement( o, firsttwo ); else { - const HierarchyImp* h = dynamic_cast<const HierarchyImp*>( tqparents[0] ); + const HierarchyImp* h = dynamic_cast<const HierarchyImp*>( parents[0] ); if ( h ) { PointImp* p = new PointImp( Coordinate() ); - Args hargs( tqparents.begin()+ 2, tqparents.end() ); + Args hargs( parents.begin()+ 2, parents.end() ); hargs.push_back( p ); ArgsParser hparser = h->data().argParser(); const ObjectImpType* ret = hparser.impRequirement( o, hargs ); |