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/intersection_types.h | |
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/intersection_types.h')
-rw-r--r-- | kig/objects/intersection_types.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kig/objects/intersection_types.h b/kig/objects/intersection_types.h index 9e1df62e..46d60199 100644 --- a/kig/objects/intersection_types.h +++ b/kig/objects/intersection_types.h @@ -36,7 +36,7 @@ class ConicLineIntersectionType ~ConicLineIntersectionType(); public: static const ConicLineIntersectionType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -51,7 +51,7 @@ class ConicLineOtherIntersectionType ~ConicLineOtherIntersectionType(); public: static const ConicLineOtherIntersectionType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -62,7 +62,7 @@ class LineLineIntersectionType ~LineLineIntersectionType(); public: static const LineLineIntersectionType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -73,7 +73,7 @@ class LineCubicIntersectionType ~LineCubicIntersectionType(); public: static const LineCubicIntersectionType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -84,7 +84,7 @@ class CircleCircleIntersectionType ~CircleCircleIntersectionType(); public: static const CircleCircleIntersectionType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -98,7 +98,7 @@ class ArcLineIntersectionType ~ArcLineIntersectionType(); public: static const ArcLineIntersectionType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; |