summaryrefslogtreecommitdiffstats
path: root/kig/objects/text_type.h
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-11 04:44:41 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-11 04:44:41 +0000
commita374efce3a207b39514be3c52264091400ce297e (patch)
tree77bdf654b55826d4f59b53a5621310206bcaead1 /kig/objects/text_type.h
parentf81a494f3957d5cf38c787973415597941934727 (diff)
downloadtdeedu-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/text_type.h')
-rw-r--r--kig/objects/text_type.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/kig/objects/text_type.h b/kig/objects/text_type.h
index 8f97d4ea..5968e040 100644
--- a/kig/objects/text_type.h
+++ b/kig/objects/text_type.h
@@ -29,11 +29,11 @@ class TextType
public:
static const TextType* instance();
- const ObjectImpType* impRequirement( const ObjectImp* o, const Args& parents ) const;
- bool isDefinedOnOrThrough( const ObjectImp* o, const Args& parents ) const;
+ const ObjectImpType* impRequirement( const ObjectImp* o, const Args& tqparents ) const;
+ bool isDefinedOnOrThrough( const ObjectImp* o, const Args& tqparents ) const;
const ObjectImpType* resultId() const;
- ObjectImp* calc( const Args& parents, const KigDocument& d ) const;
+ ObjectImp* calc( const Args& tqparents, const KigDocument& d ) const;
std::vector<ObjectCalcer*> sortArgs( const std::vector<ObjectCalcer*>& os ) const;
Args sortArgs( const Args& args ) const;