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_holder.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_holder.cc')
| -rw-r--r-- | kig/objects/object_holder.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kig/objects/object_holder.cc b/kig/objects/object_holder.cc index 70e1100b..49e6da9d 100644 --- a/kig/objects/object_holder.cc +++ b/kig/objects/object_holder.cc @@ -80,9 +80,9 @@ void ObjectHolder::draw( KigPainter& p, bool selected ) const mdrawer->draw( *imp(), p, selected ); } -bool ObjectHolder::contains( const Coordinate& pt, const KigWidget& w, bool nv ) const +bool ObjectHolder::tqcontains( const Coordinate& pt, const KigWidget& w, bool nv ) const { - return mdrawer->contains( *imp(), pt, w, nv ); + return mdrawer->tqcontains( *imp(), pt, w, nv ); } bool ObjectHolder::inRect( const Rect& r, const KigWidget& w ) const @@ -145,7 +145,7 @@ const TQString ObjectHolder::name() const return static_cast<const StringImp*>( mnamecalcer->imp() )->data(); } else - return TQString::null; + return TQString(); } void ObjectHolder::setNameCalcer( ObjectConstCalcer* namecalcer ) @@ -160,5 +160,5 @@ TQString ObjectHolder::selectStatement() const if ( n.isEmpty() ) return i18n( imp()->type()->selectStatement() ); else - return i18n( imp()->type()->selectNameStatement() ).arg( n ); + return i18n( imp()->type()->selectNameStatement() ).tqarg( n ); } |