diff options
Diffstat (limited to 'umbrello/umbrello/kplayerslideraction.cpp')
-rw-r--r-- | umbrello/umbrello/kplayerslideraction.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/umbrello/umbrello/kplayerslideraction.cpp b/umbrello/umbrello/kplayerslideraction.cpp index 5210f8ea..c5efcb65 100644 --- a/umbrello/umbrello/kplayerslideraction.cpp +++ b/umbrello/umbrello/kplayerslideraction.cpp @@ -67,8 +67,8 @@ void KPlayerPopupFrame::mouseReleaseEvent (TQMouseEvent* ev) KPlayerPopupSliderAction::KPlayerPopupSliderAction (const TQString& text, const TQString& pix, const KShortcut& shortcut, const TQObject* receiver, - const char* slot, TQObject* tqparent, const char* name) - : KAction (text, pix, shortcut, tqparent, name) + const char* slot, TQObject* parent, const char* name) + : KAction (text, pix, shortcut, parent, name) { m_frame = new KPlayerPopupFrame; m_frame -> setFrameStyle (TQFrame::PopupPanel | TQFrame::Raised); @@ -158,9 +158,9 @@ void KPlayerPopupSliderAction::slotActivated (void) } KPlayerSliderAction::KPlayerSliderAction (const TQString& text, const KShortcut& cut, - const TQObject* receiver, const char* slot, KActionCollection* tqparent, const char* name) - : KWidgetAction (new KPlayerSlider (Qt::Horizontal, 0, name), text, cut, receiver, slot, tqparent, name) - //: KAction (text, 0, tqparent, name) + const TQObject* receiver, const char* slot, KActionCollection* parent, const char* name) + : KWidgetAction (new KPlayerSlider (Qt::Horizontal, 0, name), text, cut, receiver, slot, parent, name) + //: KAction (text, 0, parent, name) { setAutoSized (true); connect (slider(), TQT_SIGNAL (changed (int)), receiver, slot); @@ -213,7 +213,7 @@ void KPlayerSliderAction::unplug (TQWidget* widget) //Q_ASSERT (isPlugged()); //Q_ASSERT (widget -> inherits ("KToolBar")); KWidgetAction::unplug (widget); - if ( ! slider() || ! isPlugged() || TQT_BASE_OBJECT(widget) != TQT_BASE_OBJECT(slider() -> tqparent()) ) + if ( ! slider() || ! isPlugged() || TQT_BASE_OBJECT(widget) != TQT_BASE_OBJECT(slider() -> parent()) ) return; //KToolBar* toolbar = (KToolBar*) widget; disconnect (widget, TQT_SIGNAL (orientationChanged (Qt::Orientation)), this, TQT_SLOT (orientationChanged (Qt::Orientation))); @@ -264,9 +264,9 @@ void KPlayerSliderAction::orientationChanged (Qt::Orientation orientation) m_slider -> reparent (0, TQPoint()); }*/ -KPlayerSlider::KPlayerSlider (Qt::Orientation orientation, TQWidget* tqparent, const char* name) -//CHANGED : TQSlider (orientation, tqparent, name) - : TQSlider (300, 2200, 400, 1000, orientation, tqparent, name) +KPlayerSlider::KPlayerSlider (Qt::Orientation orientation, TQWidget* parent, const char* name) +//CHANGED : TQSlider (orientation, parent, name) + : TQSlider (300, 2200, 400, 1000, orientation, parent, name) { m_changing_orientation = false; setTickmarks (TQSlider::Both); |