diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-16 02:40:35 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-16 02:40:35 +0000 |
| commit | bab40890696ec68c337dc290880423a0602b83c7 (patch) | |
| tree | 6ba03f720b1fa88235ba339e7aedb4455430357e /kmdi/kmditaskbar.cpp | |
| parent | f7e71d47719ab6094cf4a9fafffa5ea351973522 (diff) | |
| download | tdelibs-bab40890696ec68c337dc290880423a0602b83c7.tar.gz tdelibs-bab40890696ec68c337dc290880423a0602b83c7.zip | |
Finished remaining porting to new TQt API
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214736 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmdi/kmditaskbar.cpp')
| -rw-r--r-- | kmdi/kmditaskbar.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/kmdi/kmditaskbar.cpp b/kmdi/kmditaskbar.cpp index ae8ae0a09..9a412acb5 100644 --- a/kmdi/kmditaskbar.cpp +++ b/kmdi/kmditaskbar.cpp @@ -26,6 +26,10 @@ // //---------------------------------------------------------------------------- +#ifdef None +#undef None +#endif + #include "kmditaskbar.h" #include "kmditaskbar.moc" @@ -63,7 +67,7 @@ KMdiTaskBarButton::KMdiTaskBarButton( KMdiTaskBar *pTaskBar, KMdiChildView *win_ m_pWindow = win_ptr; TQToolTip::add ( this, win_ptr->caption() ); - setFocusPolicy( NoFocus ); + setFocusPolicy( TQ_NoFocus ); } KMdiTaskBarButton::~KMdiTaskBarButton() @@ -73,10 +77,10 @@ void KMdiTaskBarButton::mousePressEvent( TQMouseEvent* e ) { switch ( e->button() ) { - case TQMouseEvent::LeftButton: + case Qt::LeftButton: emit leftMouseButtonClicked( m_pWindow ); break; - case TQMouseEvent::RightButton: + case Qt::RightButton: emit rightMouseButtonClicked( m_pWindow ); break; default: @@ -152,7 +156,7 @@ KMdiTaskBar::KMdiTaskBar( KMdiMainFrm *parent, TQMainWindow::ToolBarDock dock ) m_pButtonList->setAutoDelete( true ); //QT30 setFontPropagation(TQWidget::SameFont); setMinimumWidth( 1 ); - setFocusPolicy( NoFocus ); + setFocusPolicy( TQ_NoFocus ); parent->moveToolBar( this, dock ); //XXX obsolete! } @@ -337,8 +341,8 @@ void KMdiTaskBar::layoutTaskBar( int taskBarWidth ) // if there's enough space, use actual width int buttonCount = m_pButtonList->count(); int tbHandlePixel; - tbHandlePixel = style().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent, this ); - int buttonAreaWidth = taskBarWidth - tbHandlePixel - style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, this ) - 5; + tbHandlePixel = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent, this ); + int buttonAreaWidth = taskBarWidth - tbHandlePixel - tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, this ) - 5; if ( ( ( allButtonsWidthHint ) <= buttonAreaWidth ) || ( width() < tqparentWidget() ->width() ) ) { for ( b = m_pButtonList->first();b;b = m_pButtonList->next() ) |