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/object_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/object_type.cc')
| -rw-r--r-- | kig/objects/object_type.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kig/objects/object_type.cc b/kig/objects/object_type.cc index ea85e4f8..93634b63 100644 --- a/kig/objects/object_type.cc +++ b/kig/objects/object_type.cc @@ -71,9 +71,9 @@ ArgsParserObjectType::ArgsParserObjectType( const char fulltypename[], { } -const ObjectImpType* ArgsParserObjectType::impRequirement( const ObjectImp* o, const Args& parents ) const +const ObjectImpType* ArgsParserObjectType::impRequirement( const ObjectImp* o, const Args& tqparents ) const { - return margsparser.impRequirement( o, parents ); + return margsparser.impRequirement( o, tqparents ); } const ArgsParser& ArgsParserObjectType::argsParser() const @@ -118,8 +118,8 @@ std::vector<ObjectCalcer*> ObjectType::movableParents( const ObjectTypeCalcer& ) return std::vector<ObjectCalcer*>(); } -bool ArgsParserObjectType::isDefinedOnOrThrough( const ObjectImp* o, const Args& parents ) const +bool ArgsParserObjectType::isDefinedOnOrThrough( const ObjectImp* o, const Args& tqparents ) const { - return margsparser.isDefinedOnOrThrough( o, parents ); + return margsparser.isDefinedOnOrThrough( o, tqparents ); } |