diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-11 06:00:15 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-11 06:00:15 +0000 |
| commit | b1057f437bf65300831a0ccb45b920787c6b318d (patch) | |
| tree | f8a73db06ca1180d0da0ba6dfbe786197b4f4bc3 /kscd/docking.cpp | |
| parent | 4ddfca384ced9ad654213aef9dc2c3973720b980 (diff) | |
| download | tdemultimedia-b1057f437bf65300831a0ccb45b920787c6b318d.tar.gz tdemultimedia-b1057f437bf65300831a0ccb45b920787c6b318d.zip | |
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
Diffstat (limited to 'kscd/docking.cpp')
| -rw-r--r-- | kscd/docking.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/kscd/docking.cpp b/kscd/docking.cpp index 705c2ca8..ca85b914 100644 --- a/kscd/docking.cpp +++ b/kscd/docking.cpp @@ -38,13 +38,13 @@ #include <kdebug.h> -DockWidget::DockWidget( KSCD* parent, const char *name) - : KSystemTray( parent, name ) +DockWidget::DockWidget( KSCD* tqparent, const char *name) + : KSystemTray( tqparent, name ) { m_popup = 0; setPixmap( loadIcon("cdsmall") ); - KActionCollection* actionCollection = parent->actionCollection(); + KActionCollection* actionCollection = tqparent->actionCollection(); m_backAction = actionCollection->action("Previous"); m_forwardAction = actionCollection->action("Next"); m_backPix = loadIcon("player_start"); @@ -53,11 +53,11 @@ DockWidget::DockWidget( KSCD* parent, const char *name) // popup menu for right mouse button TQPopupMenu* popup = contextMenu(); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_play", KIcon::Small), i18n("Play/Pause"), parent, TQT_SLOT(playClicked())); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_stop", KIcon::Small), i18n("Stop"), parent, TQT_SLOT(stopClicked())); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_end", KIcon::Small), i18n("Next"), parent, TQT_SLOT(nextClicked())); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_start", KIcon::Small), i18n("Previous"), parent, TQT_SLOT(prevClicked())); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_eject", KIcon::Small), i18n("Eject"), parent, TQT_SLOT(ejectClicked())); + popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_play", KIcon::Small), i18n("Play/Pause"), tqparent, TQT_SLOT(playClicked())); + popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_stop", KIcon::Small), i18n("Stop"), tqparent, TQT_SLOT(stopClicked())); + popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_end", KIcon::Small), i18n("Next"), tqparent, TQT_SLOT(nextClicked())); + popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_start", KIcon::Small), i18n("Previous"), tqparent, TQT_SLOT(prevClicked())); + popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_eject", KIcon::Small), i18n("Eject"), tqparent, TQT_SLOT(ejectClicked())); TQToolTip::add(this, kapp->aboutData()->programName()); } @@ -120,10 +120,10 @@ void DockWidget::setToolTip(const TQString& text) void DockWidget::wheelEvent(TQWheelEvent *e) { - if (e->orientation() == Horizontal) + if (e->orientation() ==Qt::Horizontal) return; - KSCD* kscd = dynamic_cast<KSCD*>(parent()); + KSCD* kscd = dynamic_cast<KSCD*>(tqparent()); if (kscd == 0) return; |