diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-19 01:42:14 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-19 01:42:14 +0000 |
| commit | 8155225c9be993acc0512956416d195edfef4eb9 (patch) | |
| tree | de4f3cd17614fc67e47eefabcdbe2fbe170c9be7 /kicker/extensions/kasbar/kasbarextension.cpp | |
| parent | 364641b8e0279758d236af39abd138d379328a19 (diff) | |
| download | tdebase-8155225c9be993acc0512956416d195edfef4eb9.tar.gz tdebase-8155225c9be993acc0512956416d195edfef4eb9.zip | |
Enable compilation with TQt for Qt4 3.4.0 TP2
This should not break compatibility with TQt for Qt3; if it does please fix it ASAP!
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kicker/extensions/kasbar/kasbarextension.cpp')
| -rw-r--r-- | kicker/extensions/kasbar/kasbarextension.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp index 3bc3dcd1b..c63d6e277 100644 --- a/kicker/extensions/kasbar/kasbarextension.cpp +++ b/kicker/extensions/kasbar/kasbarextension.cpp @@ -121,8 +121,8 @@ void KasBarExtension::setDetached( bool detach ) if ( detach ) { - int wflags = Qt::WStyle_Customize | Qt::WX11BypassWM | Qt::WStyle_DialogBorder | Qt::WStyle_StaysOnTop; - kasbar->reparent( 0, wflags, kasbar->detachedPosition(), true ); + int wflags = TQt::WStyle_Customize | TQt::WX11BypassWM | TQt::WStyle_DialogBorder | TQt::WStyle_StaysOnTop; + kasbar->reparent( 0, (WFlags)wflags, kasbar->detachedPosition(), true ); updateGeometry(); resize( detachedSize() ); } @@ -141,33 +141,33 @@ void KasBarExtension::showEvent( TQShowEvent */*se*/ ) { updateGeometry(); resize( kasbar->size() ); - repaint( true ); + tqrepaint( true ); } TQSize KasBarExtension::detachedSize() { - if ( orientation() == Vertical ) + if ( orientation() == Qt::Vertical ) return TQSize( kasbar->itemExtent()/2, 0 ); else return TQSize( 0, kasbar->itemExtent()/2 ); } -TQSize KasBarExtension::sizeHint(Position p, TQSize maxSize ) const +TQSize KasBarExtension::tqsizeHint(Position p, TQSize maxSize ) const { - Orientation o = Horizontal; + Orientation o = Qt::Horizontal; if ( p == Left || p == Right ) - o = Vertical; + o = Qt::Vertical; if ( detached_ ) { - if ( o == Vertical ) + if ( o == Qt::Vertical ) return TQSize( kasbar->itemExtent()/2, 0 ); else return TQSize( 0, kasbar->itemExtent()/2 ); } - return kasbar->sizeHint( o, maxSize ); + return kasbar->tqsizeHint( o, maxSize ); } void KasBarExtension::positionChange( Position /* position */) |