From b1057f437bf65300831a0ccb45b920787c6b318d Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 11 Jun 2011 06:00:15 +0000 Subject: TQt4 port kdemultimedia This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1236079 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- noatun/modules/systray/kitsystemtray.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'noatun/modules/systray/kitsystemtray.cpp') diff --git a/noatun/modules/systray/kitsystemtray.cpp b/noatun/modules/systray/kitsystemtray.cpp index 8e42a3ed..61c0f035 100644 --- a/noatun/modules/systray/kitsystemtray.cpp +++ b/noatun/modules/systray/kitsystemtray.cpp @@ -44,12 +44,12 @@ #include -KitSystemTray::KitSystemTray(const TQString &contextMenu, KMainWindow *parent, const char *name) - : KSystemTray(parent, name) +KitSystemTray::KitSystemTray(const TQString &contextMenu, KMainWindow *tqparent, const char *name) + : KSystemTray(tqparent, name) { - setAlignment(AlignHCenter | AlignVCenter); - menu = (KPopupMenu *)parent->guiFactory()->container(contextMenu, parent); - menu->insertTitle(SmallIcon("noatun"), TQString::null, 0, 0); + tqsetAlignment(AlignHCenter | AlignVCenter); + menu = (KPopupMenu *)tqparent->guiFactory()->container(contextMenu, tqparent); + menu->insertTitle(SmallIcon("noatun"), TQString(), 0, 0); setAcceptDrops(true); } @@ -67,10 +67,10 @@ void KitSystemTray::mousePressEvent(TQMouseEvent *event) { switch(event->button()) { - case LeftButton: + case Qt::LeftButton: napp->toggleInterfaces(); break; - case MidButton: + case Qt::MidButton: if (YHConfig::self()->middleMouseAction() == YHConfig::HideShowPlaylist) napp->playlist()->toggleList(); else // play or pause @@ -103,11 +103,11 @@ void KitSystemTray::wheelEvent(TQWheelEvent *event) YHConfig *c = YHConfig::self(); int action = 0; - if (event->state() & Qt::ShiftButton) + if (event->state() & TQt::ShiftButton) action = c->mouseWheelAction(YHConfig::Shift); - else if (event->state() & Qt::ControlButton) + else if (event->state() & TQt::ControlButton) action = c->mouseWheelAction(YHConfig::Ctrl); - else if (event->state() & Qt::AltButton) + else if (event->state() & TQt::AltButton) action = c->mouseWheelAction(YHConfig::Alt); else action = c->mouseWheelAction(YHConfig::None); -- cgit v1.2.1