From 8155225c9be993acc0512956416d195edfef4eb9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 19 Jan 2011 01:42:14 +0000 Subject: 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 --- kicker/extensions/kasbar/kaspopup.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'kicker/extensions/kasbar/kaspopup.cpp') diff --git a/kicker/extensions/kasbar/kaspopup.cpp b/kicker/extensions/kasbar/kaspopup.cpp index 7538dfbb2..0edc0a77a 100644 --- a/kicker/extensions/kasbar/kaspopup.cpp +++ b/kicker/extensions/kasbar/kaspopup.cpp @@ -60,7 +60,7 @@ #include "kaspopup.moc" KasPopup::KasPopup( KasItem *item, const char *name ) - : TQHBox( 0, name, WStyle_Customize | WStyle_StaysOnTop | WStyle_Tool | WStyle_NoBorder | WX11BypassWM ), + : TQHBox( 0, name, (WFlags)(WStyle_Customize | WStyle_StaysOnTop | WStyle_Tool | WStyle_NoBorder | WX11BypassWM) ), item_( item ), kasbar_( item->kasbar() ) { @@ -95,22 +95,22 @@ TQPoint KasPopup::calcPosition( KasItem *item, int w, int h ) int x = pos.x(); int y = pos.y(); - if ( kasbar->orientation() == Horizontal ) { - if ( y < ( qApp->desktop()->height() / 2 ) ) + if ( kasbar->orientation() == Qt::Horizontal ) { + if ( y < ( tqApp->desktop()->height() / 2 ) ) y = y + kasbar->itemExtent(); else y = y - h; - if ( (x + w) > qApp->desktop()->width() ) + if ( (x + w) > tqApp->desktop()->width() ) x = x - w + kasbar->itemExtent(); } else { - if ( x < ( qApp->desktop()->width() / 2 ) ) + if ( x < ( tqApp->desktop()->width() / 2 ) ) x = x + kasbar->itemExtent(); else x = x - w; - if ( (y + h) > qApp->desktop()->height() ) + if ( (y + h) > tqApp->desktop()->height() ) y = y - h + kasbar->itemExtent(); } -- cgit v1.2.1