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

1 files changed, 4 insertions, 4 deletions

diff --git a/kig/objects/other_type.h b/kig/objects/other_type.h
index 6bbcead1..f8f24209 100644
--- a/kig/objects/other_type.h
+++ b/kig/objects/other_type.h
@@ -32,7 +32,7 @@ public:
 
   ObjectImp* calc( const Args& args, const KigDocument& ) const;
 
-  const ObjectImpType* impRequirement( const ObjectImp* o, const Args& parents ) const;
+  const ObjectImpType* impRequirement( const ObjectImp* o, const Args& tqparents ) const;
 
   bool inherits( int type ) const;
   const ObjectImpType* resultId() const;
@@ -50,9 +50,9 @@ protected:
 public:
   static CopyObjectType* instance();
   bool inherits( int type ) const;
-  ObjectImp* calc( const Args& parents, const KigDocument& d ) const;
-  const ObjectImpType* impRequirement( const ObjectImp* o, const Args& parents ) const;
-  bool isDefinedOnOrThrough( const ObjectImp* o, const Args& parents ) const;
+  ObjectImp* calc( const Args& tqparents, const KigDocument& d ) const;
+  const ObjectImpType* impRequirement( const ObjectImp* o, const Args& tqparents ) const;
+  bool isDefinedOnOrThrough( const ObjectImp* o, const Args& tqparents ) const;
   const ObjectImpType* resultId() const;
   std::vector<ObjectCalcer*> sortArgs( const std::vector<ObjectCalcer*>& os ) const;
   Args sortArgs( const Args& args ) const;