From a374efce3a207b39514be3c52264091400ce297e Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 11 Jun 2011 04:44:41 +0000 Subject: 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 --- kig/objects/text_type.cc | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'kig/objects/text_type.cc') diff --git a/kig/objects/text_type.cc b/kig/objects/text_type.cc index 214b35c2..5fc637bd 100644 --- a/kig/objects/text_type.cc +++ b/kig/objects/text_type.cc @@ -76,11 +76,11 @@ const ObjectImpType* TextType::impRequirement( const ObjectImp* o, const Args& a return ObjectImp::stype(); } -ObjectImp* TextType::calc( const Args& parents, const KigDocument& doc ) const +ObjectImp* TextType::calc( const Args& tqparents, const KigDocument& doc ) const { - if( parents.size() < 3 ) return new InvalidImp; - Args firstthree( parents.begin(), parents.begin() + 3 ); - Args varargs( parents.begin() + 3, parents.end() ); + if( tqparents.size() < 3 ) return new InvalidImp; + Args firstthree( tqparents.begin(), tqparents.begin() + 3 ); + Args varargs( tqparents.begin() + 3, tqparents.end() ); if ( ! mparser.checkArgs( firstthree ) ) return new InvalidImp; @@ -108,9 +108,9 @@ bool TextType::isFreelyTranslatable( const ObjectTypeCalcer& ) const void TextType::move( ObjectTypeCalcer& ourobj, const Coordinate& to, const KigDocument& d ) const { - const std::vector parents = ourobj.parents(); - assert( parents.size() >= 3 ); - const std::vector firstthree( parents.begin(), parents.begin() + 3 ); + const std::vector tqparents = ourobj.tqparents(); + assert( tqparents.size() >= 3 ); + const std::vector firstthree( tqparents.begin(), tqparents.begin() + 3 ); if( dynamic_cast( firstthree[1] ) ) { ObjectConstCalcer* c = static_cast( firstthree[1] ); @@ -133,10 +133,10 @@ void TextType::executeAction( int i, ObjectHolder& o, ObjectTypeCalcer& c, KigPart& doc, KigWidget&, NormalMode& ) const { - std::vector parents = c.parents(); - assert( parents.size() >= 3 ); + std::vector tqparents = c.tqparents(); + assert( tqparents.size() >= 3 ); - std::vector firstthree( parents.begin(), parents.begin() + 3 ); + std::vector firstthree( tqparents.begin(), tqparents.begin() + 3 ); assert( mparser.checkArgs( firstthree ) ); assert( dynamic_cast( firstthree[0] ) ); @@ -144,11 +144,11 @@ void TextType::executeAction( int i, ObjectHolder& o, ObjectTypeCalcer& c, if ( i == 0 ) { - QClipboard* cb = kapp->clipboard(); + TQClipboard* cb = kapp->tqclipboard(); // copy the text into the clipboard const TextImp* ti = static_cast( c.imp() ); - cb->setText( ti->text(), QClipboard::Clipboard ); + cb->setText( ti->text(), TQClipboard::Clipboard ); } else if ( i == 1 ) { @@ -201,10 +201,10 @@ Args TextType::sortArgs( const Args& args ) const std::vector TextType::movableParents( const ObjectTypeCalcer& ourobj ) const { - const std::vector parents = ourobj.parents(); - assert( parents.size() >= 3 ); - std::vector ret = parents[1]->movableParents(); - ret.push_back( parents[1] ); + const std::vector tqparents = ourobj.tqparents(); + assert( tqparents.size() >= 3 ); + std::vector ret = tqparents[1]->movableParents(); + ret.push_back( tqparents[1] ); return ret; } -- cgit v1.2.1