diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-11 04:44:41 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-11 04:44:41 +0000 |
commit | a374efce3a207b39514be3c52264091400ce297e (patch) | |
tree | 77bdf654b55826d4f59b53a5621310206bcaead1 /kig/objects/base_type.cc | |
parent | f81a494f3957d5cf38c787973415597941934727 (diff) | |
download | tdeedu-a374efce3a207b39514be3c52264091400ce297e.tar.gz tdeedu-a374efce3a207b39514be3c52264091400ce297e.zip |
TQt4 port kdeedu
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1236073 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kig/objects/base_type.cc')
-rw-r--r-- | kig/objects/base_type.cc | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/kig/objects/base_type.cc b/kig/objects/base_type.cc index 0f8eecec..77b9dc6a 100644 --- a/kig/objects/base_type.cc +++ b/kig/objects/base_type.cc @@ -33,13 +33,13 @@ ObjectABType::~ObjectABType() { } -ObjectImp* ObjectABType::calc( const Args& parents, const KigDocument& ) const +ObjectImp* ObjectABType::calc( const Args& tqparents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( parents ) ) + if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; - Coordinate a = static_cast<const PointImp*>( parents[0] )->coordinate(); - Coordinate b = static_cast<const PointImp*>( parents[1] )->coordinate(); + Coordinate a = static_cast<const PointImp*>( tqparents[0] )->coordinate(); + Coordinate b = static_cast<const PointImp*>( tqparents[1] )->coordinate(); return calc( a, b ); } @@ -57,22 +57,22 @@ bool ObjectABType::canMove( const ObjectTypeCalcer& o ) const bool ObjectABType::isFreelyTranslatable( const ObjectTypeCalcer& o ) const { - std::vector<ObjectCalcer*> parents = o.parents(); - return parents[0]->isFreelyTranslatable() && parents[1]->isFreelyTranslatable(); + std::vector<ObjectCalcer*> tqparents = o.tqparents(); + return tqparents[0]->isFreelyTranslatable() && tqparents[1]->isFreelyTranslatable(); } void ObjectABType::move( ObjectTypeCalcer& o, const Coordinate& to, const KigDocument& d ) const { - std::vector<ObjectCalcer*> parents = o.parents(); - assert( margsparser.checkArgs( parents ) ); - const Coordinate a = static_cast<const PointImp*>( parents[0]->imp() )->coordinate(); - const Coordinate b = static_cast<const PointImp*>( parents[1]->imp() )->coordinate(); + std::vector<ObjectCalcer*> tqparents = o.tqparents(); + assert( margsparser.checkArgs( tqparents ) ); + const Coordinate a = static_cast<const PointImp*>( tqparents[0]->imp() )->coordinate(); + const Coordinate b = static_cast<const PointImp*>( tqparents[1]->imp() )->coordinate(); const Coordinate dist = b - a; - if ( parents[0]->canMove() ) - parents[0]->move( to, d ); - if ( parents[1]->canMove() ) - parents[1]->move( to + dist, d ); + if ( tqparents[0]->canMove() ) + tqparents[0]->move( to, d ); + if ( tqparents[1]->canMove() ) + tqparents[1]->move( to + dist, d ); } ObjectLPType::ObjectLPType( const char* fullname, const ArgsParser::spec* spec, int n ) @@ -94,19 +94,19 @@ ObjectImp* ObjectLPType::calc( const Args& args, const KigDocument& ) const const Coordinate ObjectABType::moveReferencePoint( const ObjectTypeCalcer& o ) const { - std::vector<ObjectCalcer*> parents = o.parents(); - assert( margsparser.checkArgs( parents ) ); - return static_cast<const PointImp*>( parents[0]->imp() )->coordinate(); + std::vector<ObjectCalcer*> tqparents = o.tqparents(); + assert( margsparser.checkArgs( tqparents ) ); + return static_cast<const PointImp*>( tqparents[0]->imp() )->coordinate(); } std::vector<ObjectCalcer*> ObjectABType::movableParents( const ObjectTypeCalcer& ourobj ) const { - std::vector<ObjectCalcer*> parents = ourobj.parents(); + std::vector<ObjectCalcer*> tqparents = ourobj.tqparents(); std::set<ObjectCalcer*> ret; - std::vector<ObjectCalcer*> tmp = parents[0]->movableParents(); + std::vector<ObjectCalcer*> tmp = tqparents[0]->movableParents(); ret.insert( tmp.begin(), tmp.end() ); - tmp = parents[1]->movableParents(); + tmp = tqparents[1]->movableParents(); ret.insert( tmp.begin(), tmp.end() ); - ret.insert( parents.begin(), parents.end() ); + ret.insert( tqparents.begin(), tqparents.end() ); return std::vector<ObjectCalcer*>( ret.begin(), ret.end() ); } |