diff options
Diffstat (limited to 'src/gui/editors/matrix/MatrixView.cpp')
| -rw-r--r-- | src/gui/editors/matrix/MatrixView.cpp | 164 |
1 files changed, 82 insertions, 82 deletions
diff --git a/src/gui/editors/matrix/MatrixView.cpp b/src/gui/editors/matrix/MatrixView.cpp index 091d995..4992aef 100644 --- a/src/gui/editors/matrix/MatrixView.cpp +++ b/src/gui/editors/matrix/MatrixView.cpp @@ -174,13 +174,13 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc, 20); // relation target/this (in percent) connect(m_dockLeft, TQT_SIGNAL(iMBeingClosed()), - TQT_TQOBJECT(this), TQT_SLOT(slotParametersClosed())); + this, TQT_SLOT(slotParametersClosed())); connect(m_dockLeft, TQT_SIGNAL(hasUndocked()), - TQT_TQOBJECT(this), TQT_SLOT(slotParametersClosed())); + this, TQT_SLOT(slotParametersClosed())); // Apparently, hasUndocked() is emitted when the dock widget's // 'close' button on the dock handle is clicked. connect(m_mainDockWidget, TQT_SIGNAL(docking(KDockWidget*, KDockWidget::DockPosition)), - TQT_TQOBJECT(this), TQT_SLOT(slotParametersDockedBack(KDockWidget*, KDockWidget::DockPosition))); + this, TQT_SLOT(slotParametersDockedBack(KDockWidget*, KDockWidget::DockPosition))); Composition &comp = doc->getComposition(); @@ -189,9 +189,9 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc, initStatusBar(); connect(m_toolBox, TQT_SIGNAL(showContextHelp(const TQString &)), - TQT_TQOBJECT(this), TQT_SLOT(slotToolHelpChanged(const TQString &))); + this, TQT_SLOT(slotToolHelpChanged(const TQString &))); - TQCanvas *tCanvas = new TQCanvas(TQT_TQOBJECT(this)); + TQCanvas *tCanvas = new TQCanvas(this); m_config->setGroup(MatrixViewConfigGroup); if (m_config->readBoolEntry("backgroundtextures-1.6-plus", true)) { @@ -351,13 +351,13 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc, // Connect vertical scrollbars between matrix and piano // connect(m_canvasView->verticalScrollBar(), TQT_SIGNAL(valueChanged(int)), - TQT_TQOBJECT(this), TQT_SLOT(slotVerticalScrollPianoKeyboard(int))); + this, TQT_SLOT(slotVerticalScrollPianoKeyboard(int))); connect(m_canvasView->verticalScrollBar(), TQT_SIGNAL(sliderMoved(int)), - TQT_TQOBJECT(this), TQT_SLOT(slotVerticalScrollPianoKeyboard(int))); + this, TQT_SLOT(slotVerticalScrollPianoKeyboard(int))); - connect(m_canvasView, TQT_SIGNAL(zoomIn()), TQT_TQOBJECT(this), TQT_SLOT(slotZoomIn())); - connect(m_canvasView, TQT_SIGNAL(zoomOut()), TQT_TQOBJECT(this), TQT_SLOT(slotZoomOut())); + connect(m_canvasView, TQT_SIGNAL(zoomIn()), this, TQT_SLOT(slotZoomIn())); + connect(m_canvasView, TQT_SIGNAL(zoomOut()), this, TQT_SLOT(slotZoomOut())); connect(m_pianoView, TQT_SIGNAL(gotWheelEvent(TQWheelEvent*)), m_canvasView, TQT_SLOT(slotExternalWheelEvent(TQWheelEvent*))); @@ -366,13 +366,13 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc, // the canvas view rulers // connect(m_canvasView, TQT_SIGNAL(bottomWidgetHeightChanged(int)), - TQT_TQOBJECT(this), TQT_SLOT(slotCanvasBottomWidgetHeightChanged(int))); + this, TQT_SLOT(slotCanvasBottomWidgetHeightChanged(int))); connect(m_canvasView, TQT_SIGNAL(mouseEntered()), - TQT_TQOBJECT(this), TQT_SLOT(slotMouseEnteredCanvasView())); + this, TQT_SLOT(slotMouseEnteredCanvasView())); connect(m_canvasView, TQT_SIGNAL(mouseLeft()), - TQT_TQOBJECT(this), TQT_SLOT(slotMouseLeftCanvasView())); + this, TQT_SLOT(slotMouseLeftCanvasView())); /* TQObject::connect @@ -402,31 +402,31 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc, TQObject::connect (getCanvasView(), TQT_SIGNAL(hoveredOverNoteChanged(int, bool, timeT)), - TQT_TQOBJECT(this), TQT_SLOT(slotHoveredOverNoteChanged(int, bool, timeT))); + this, TQT_SLOT(slotHoveredOverNoteChanged(int, bool, timeT))); TQObject::connect (m_pitchRuler, TQT_SIGNAL(hoveredOverKeyChanged(unsigned int)), - TQT_TQOBJECT(this), TQT_SLOT (slotHoveredOverKeyChanged(unsigned int))); + this, TQT_SLOT (slotHoveredOverKeyChanged(unsigned int))); TQObject::connect (m_pitchRuler, TQT_SIGNAL(keyPressed(unsigned int, bool)), - TQT_TQOBJECT(this), TQT_SLOT (slotKeyPressed(unsigned int, bool))); + this, TQT_SLOT (slotKeyPressed(unsigned int, bool))); TQObject::connect (m_pitchRuler, TQT_SIGNAL(keySelected(unsigned int, bool)), - TQT_TQOBJECT(this), TQT_SLOT (slotKeySelected(unsigned int, bool))); + this, TQT_SLOT (slotKeySelected(unsigned int, bool))); TQObject::connect (m_pitchRuler, TQT_SIGNAL(keyReleased(unsigned int, bool)), - TQT_TQOBJECT(this), TQT_SLOT (slotKeyReleased(unsigned int, bool))); + this, TQT_SLOT (slotKeyReleased(unsigned int, bool))); TQObject::connect (getCanvasView(), TQT_SIGNAL(hoveredOverAbsoluteTimeChanged(unsigned int)), - TQT_TQOBJECT(this), TQT_SLOT (slotHoveredOverAbsoluteTimeChanged(unsigned int))); + this, TQT_SLOT (slotHoveredOverAbsoluteTimeChanged(unsigned int))); TQObject::connect (doc, TQT_SIGNAL(pointerPositionChanged(timeT)), - TQT_TQOBJECT(this), TQT_SLOT(slotSetPointerPosition(timeT))); + this, TQT_SLOT(slotSetPointerPosition(timeT))); MATRIX_DEBUG << "MatrixView : applying layout\n"; @@ -468,12 +468,12 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc, TQObject::connect (topStandardRuler->getLoopRuler(), TQT_SIGNAL(setPointerPosition(timeT)), - TQT_TQOBJECT(this), TQT_SLOT(slotSetInsertCursorPosition(timeT))); + this, TQT_SLOT(slotSetInsertCursorPosition(timeT))); TQObject::connect (topStandardRuler, TQT_SIGNAL(dragPointerToPosition(timeT)), - TQT_TQOBJECT(this), TQT_SLOT(slotSetInsertCursorPosition(timeT))); + this, TQT_SLOT(slotSetInsertCursorPosition(timeT))); topStandardRuler->getLoopRuler()->setBackgroundColor (GUIPalette::getColour(GUIPalette::InsertCursorRuler)); @@ -488,7 +488,7 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc, connect(bottomStandardRuler->getLoopRuler(), TQT_SIGNAL(stopMouseMove()), m_canvasView, TQT_SLOT(stopAutoScroll())); connect(m_bottomStandardRuler, TQT_SIGNAL(dragPointerToPosition(timeT)), - TQT_TQOBJECT(this), TQT_SLOT(slotSetPointerPosition(timeT))); + this, TQT_SLOT(slotSetPointerPosition(timeT))); // Force height for the moment // @@ -637,147 +637,147 @@ void MatrixView::setupActions() TQIconSet icon(TQPixmap(pixmapDir + "/toolbar/select.xpm")); toolAction = new TDERadioAction(i18n("&Select and Edit"), icon, Key_F2, - TQT_TQOBJECT(this), TQT_SLOT(slotSelectSelected()), + this, TQT_SLOT(slotSelectSelected()), actionCollection(), "select"); toolAction->setExclusiveGroup("tools"); toolAction = new TDERadioAction(i18n("&Draw"), "pencil", Key_F3, - TQT_TQOBJECT(this), TQT_SLOT(slotPaintSelected()), + this, TQT_SLOT(slotPaintSelected()), actionCollection(), "draw"); toolAction->setExclusiveGroup("tools"); toolAction = new TDERadioAction(i18n("&Erase"), "eraser", Key_F4, - TQT_TQOBJECT(this), TQT_SLOT(slotEraseSelected()), + this, TQT_SLOT(slotEraseSelected()), actionCollection(), "erase"); toolAction->setExclusiveGroup("tools"); toolAction = new TDERadioAction(i18n("&Move"), "move", Key_F5, - TQT_TQOBJECT(this), TQT_SLOT(slotMoveSelected()), + this, TQT_SLOT(slotMoveSelected()), actionCollection(), "move"); toolAction->setExclusiveGroup("tools"); TQCanvasPixmap pixmap(pixmapDir + "/toolbar/resize.xpm"); icon = TQIconSet(pixmap); toolAction = new TDERadioAction(i18n("Resi&ze"), icon, Key_F6, - TQT_TQOBJECT(this), TQT_SLOT(slotResizeSelected()), + this, TQT_SLOT(slotResizeSelected()), actionCollection(), "resize"); toolAction->setExclusiveGroup("tools"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("chord"))); (new TDEToggleAction(i18n("C&hord Insert Mode"), icon, Key_H, - TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModeStatus()), + this, TQT_SLOT(slotUpdateInsertModeStatus()), actionCollection(), "chord_mode"))-> setChecked(false); pixmap.load(pixmapDir + "/toolbar/step_by_step.xpm"); icon = TQIconSet(pixmap); - new TDEToggleAction(i18n("Ste&p Recording"), icon, 0, TQT_TQOBJECT(this), + new TDEToggleAction(i18n("Ste&p Recording"), icon, 0, this, TQT_SLOT(slotToggleStepByStep()), actionCollection(), "toggle_step_by_step"); pixmap.load(pixmapDir + "/toolbar/quantize.png"); icon = TQIconSet(pixmap); - new TDEAction(EventQuantizeCommand::getGlobalName(), icon, Key_Equal, TQT_TQOBJECT(this), + new TDEAction(EventQuantizeCommand::getGlobalName(), icon, Key_Equal, this, TQT_SLOT(slotTransformsQuantize()), actionCollection(), "quantize"); - new TDEAction(i18n("Repeat Last Quantize"), Key_Plus, TQT_TQOBJECT(this), + new TDEAction(i18n("Repeat Last Quantize"), Key_Plus, this, TQT_SLOT(slotTransformsRepeatQuantize()), actionCollection(), "repeat_quantize"); - new TDEAction(CollapseNotesCommand::getGlobalName(), Key_Equal + CTRL, TQT_TQOBJECT(this), + new TDEAction(CollapseNotesCommand::getGlobalName(), Key_Equal + CTRL, this, TQT_SLOT(slotTransformsCollapseNotes()), actionCollection(), "collapse_notes"); - new TDEAction(i18n("&Legato"), Key_Minus, TQT_TQOBJECT(this), + new TDEAction(i18n("&Legato"), Key_Minus, this, TQT_SLOT(slotTransformsLegato()), actionCollection(), "legatoize"); new TDEAction(ChangeVelocityCommand::getGlobalName(10), 0, - Key_Up + SHIFT, TQT_TQOBJECT(this), + Key_Up + SHIFT, this, TQT_SLOT(slotVelocityUp()), actionCollection(), "velocity_up"); new TDEAction(ChangeVelocityCommand::getGlobalName( -10), 0, - Key_Down + SHIFT, TQT_TQOBJECT(this), + Key_Down + SHIFT, this, TQT_SLOT(slotVelocityDown()), actionCollection(), "velocity_down"); - new TDEAction(i18n("Set to Current Velocity"), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Set to Current Velocity"), 0, this, TQT_SLOT(slotSetVelocitiesToCurrent()), actionCollection(), "set_to_current_velocity"); - new TDEAction(i18n("Set Event &Velocities..."), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Set Event &Velocities..."), 0, this, TQT_SLOT(slotSetVelocities()), actionCollection(), "set_velocities"); - new TDEAction(i18n("Trigger Se&gment..."), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Trigger Se&gment..."), 0, this, TQT_SLOT(slotTriggerSegment()), actionCollection(), "trigger_segment"); - new TDEAction(i18n("Remove Triggers..."), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Remove Triggers..."), 0, this, TQT_SLOT(slotRemoveTriggers()), actionCollection(), "remove_trigger"); - new TDEAction(i18n("Select &All"), Key_A + CTRL, TQT_TQOBJECT(this), + new TDEAction(i18n("Select &All"), Key_A + CTRL, this, TQT_SLOT(slotSelectAll()), actionCollection(), "select_all"); - new TDEAction(i18n("&Delete"), Key_Delete, TQT_TQOBJECT(this), + new TDEAction(i18n("&Delete"), Key_Delete, this, TQT_SLOT(slotEditDelete()), actionCollection(), "delete"); - new TDEAction(i18n("Cursor &Back"), 0, Key_Left, TQT_TQOBJECT(this), + new TDEAction(i18n("Cursor &Back"), 0, Key_Left, this, TQT_SLOT(slotStepBackward()), actionCollection(), "cursor_back"); - new TDEAction(i18n("Cursor &Forward"), 0, Key_Right, TQT_TQOBJECT(this), + new TDEAction(i18n("Cursor &Forward"), 0, Key_Right, this, TQT_SLOT(slotStepForward()), actionCollection(), "cursor_forward"); - new TDEAction(i18n("Cursor Ba&ck Bar"), 0, Key_Left + CTRL, TQT_TQOBJECT(this), + new TDEAction(i18n("Cursor Ba&ck Bar"), 0, Key_Left + CTRL, this, TQT_SLOT(slotJumpBackward()), actionCollection(), "cursor_back_bar"); - new TDEAction(i18n("Cursor For&ward Bar"), 0, Key_Right + CTRL, TQT_TQOBJECT(this), + new TDEAction(i18n("Cursor For&ward Bar"), 0, Key_Right + CTRL, this, TQT_SLOT(slotJumpForward()), actionCollection(), "cursor_forward_bar"); - new TDEAction(i18n("Cursor Back and Se&lect"), SHIFT + Key_Left, TQT_TQOBJECT(this), + new TDEAction(i18n("Cursor Back and Se&lect"), SHIFT + Key_Left, this, TQT_SLOT(slotExtendSelectionBackward()), actionCollection(), "extend_selection_backward"); - new TDEAction(i18n("Cursor Forward and &Select"), SHIFT + Key_Right, TQT_TQOBJECT(this), + new TDEAction(i18n("Cursor Forward and &Select"), SHIFT + Key_Right, this, TQT_SLOT(slotExtendSelectionForward()), actionCollection(), "extend_selection_forward"); - new TDEAction(i18n("Cursor Back Bar and Select"), SHIFT + CTRL + Key_Left, TQT_TQOBJECT(this), + new TDEAction(i18n("Cursor Back Bar and Select"), SHIFT + CTRL + Key_Left, this, TQT_SLOT(slotExtendSelectionBackwardBar()), actionCollection(), "extend_selection_backward_bar"); - new TDEAction(i18n("Cursor Forward Bar and Select"), SHIFT + CTRL + Key_Right, TQT_TQOBJECT(this), + new TDEAction(i18n("Cursor Forward Bar and Select"), SHIFT + CTRL + Key_Right, this, TQT_SLOT(slotExtendSelectionForwardBar()), actionCollection(), "extend_selection_forward_bar"); new TDEAction(i18n("Cursor to St&art"), 0, /* #1025717: conflicting meanings for ctrl+a - dupe with Select All - Key_A + CTRL, */ TQT_TQOBJECT(this), + Key_A + CTRL, */ this, TQT_SLOT(slotJumpToStart()), actionCollection(), "cursor_start"); - new TDEAction(i18n("Cursor to &End"), 0, Key_E + CTRL, TQT_TQOBJECT(this), + new TDEAction(i18n("Cursor to &End"), 0, Key_E + CTRL, this, TQT_SLOT(slotJumpToEnd()), actionCollection(), "cursor_end"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-cursor-to-pointer"))); - new TDEAction(i18n("Cursor to &Playback Pointer"), icon, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Cursor to &Playback Pointer"), icon, 0, this, TQT_SLOT(slotJumpCursorToPlayback()), actionCollection(), "cursor_to_playback_pointer"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-play"))); - TDEAction *play = new TDEAction(i18n("&Play"), icon, Key_Enter, TQT_TQOBJECT(this), + TDEAction *play = new TDEAction(i18n("&Play"), icon, Key_Enter, this, TQT_SIGNAL(play()), actionCollection(), "play"); // Alternative shortcut for Play TDEShortcut playShortcut = play->shortcut(); @@ -786,70 +786,70 @@ void MatrixView::setupActions() icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-stop"))); - new TDEAction(i18n("&Stop"), icon, Key_Insert, TQT_TQOBJECT(this), + new TDEAction(i18n("&Stop"), icon, Key_Insert, this, TQT_SIGNAL(stop()), actionCollection(), "stop"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-rewind"))); - new TDEAction(i18n("Re&wind"), icon, Key_End, TQT_TQOBJECT(this), + new TDEAction(i18n("Re&wind"), icon, Key_End, this, TQT_SIGNAL(rewindPlayback()), actionCollection(), "playback_pointer_back_bar"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-ffwd"))); - new TDEAction(i18n("&Fast Forward"), icon, Key_PageDown, TQT_TQOBJECT(this), + new TDEAction(i18n("&Fast Forward"), icon, Key_PageDown, this, TQT_SIGNAL(fastForwardPlayback()), actionCollection(), "playback_pointer_forward_bar"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-rewind-end"))); - new TDEAction(i18n("Rewind to &Beginning"), icon, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Rewind to &Beginning"), icon, 0, this, TQT_SIGNAL(rewindPlaybackToBeginning()), actionCollection(), "playback_pointer_start"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-ffwd-end"))); - new TDEAction(i18n("Fast Forward to &End"), icon, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Fast Forward to &End"), icon, 0, this, TQT_SIGNAL(fastForwardPlaybackToEnd()), actionCollection(), "playback_pointer_end"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-pointer-to-cursor"))); - new TDEAction(i18n("Playback Pointer to &Cursor"), icon, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Playback Pointer to &Cursor"), icon, 0, this, TQT_SLOT(slotJumpPlaybackToCursor()), actionCollection(), "playback_pointer_to_cursor"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-solo"))); - new TDEToggleAction(i18n("&Solo"), icon, 0, TQT_TQOBJECT(this), + new TDEToggleAction(i18n("&Solo"), icon, 0, this, TQT_SLOT(slotToggleSolo()), actionCollection(), "toggle_solo"); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-tracking"))); - (new TDEToggleAction(i18n("Scro&ll to Follow Playback"), icon, Key_Pause, TQT_TQOBJECT(this), + (new TDEToggleAction(i18n("Scro&ll to Follow Playback"), icon, Key_Pause, this, TQT_SLOT(slotToggleTracking()), actionCollection(), "toggle_tracking"))->setChecked(m_playTracking); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-panic"))); - new TDEAction(i18n("Panic"), icon, Key_P + CTRL + ALT, TQT_TQOBJECT(this), + new TDEAction(i18n("Panic"), icon, Key_P + CTRL + ALT, this, TQT_SIGNAL(panic()), actionCollection(), "panic"); - new TDEAction(i18n("Set Loop to Selection"), Key_Semicolon + CTRL, TQT_TQOBJECT(this), + new TDEAction(i18n("Set Loop to Selection"), Key_Semicolon + CTRL, this, TQT_SLOT(slotPreviewSelection()), actionCollection(), "preview_selection"); - new TDEAction(i18n("Clear L&oop"), Key_Colon + CTRL, TQT_TQOBJECT(this), + new TDEAction(i18n("Clear L&oop"), Key_Colon + CTRL, this, TQT_SLOT(slotClearLoop()), actionCollection(), "clear_loop"); - new TDEAction(i18n("Clear Selection"), Key_Escape, TQT_TQOBJECT(this), + new TDEAction(i18n("Clear Selection"), Key_Escape, this, TQT_SLOT(slotClearSelection()), actionCollection(), "clear_selection"); // icon = TQIconSet(TQCanvasPixmap(pixmapDir + "/toolbar/eventfilter.xpm")); - new TDEAction(i18n("&Filter Selection"), "filter", Key_F + CTRL, TQT_TQOBJECT(this), + new TDEAction(i18n("&Filter Selection"), "filter", Key_F + CTRL, this, TQT_SLOT(slotFilterSelection()), actionCollection(), "filter_selection"); @@ -874,16 +874,16 @@ void MatrixView::setupActions() timeT d = m_snapValues[i]; if (d == SnapGrid::NoSnap) { - new TDEAction(i18n("&No Snap"), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("&No Snap"), 0, this, TQT_SLOT(slotSetSnapFromAction()), actionCollection(), "snap_none"); } else if (d == SnapGrid::SnapToUnit) { } else if (d == SnapGrid::SnapToBeat) { - new TDEAction(i18n("Snap to Bea&t"), Key_1, TQT_TQOBJECT(this), + new TDEAction(i18n("Snap to Bea&t"), Key_1, this, TQT_SLOT(slotSetSnapFromAction()), actionCollection(), "snap_beat"); } else if (d == SnapGrid::SnapToBar) { - new TDEAction(i18n("Snap to &Bar"), Key_5, TQT_TQOBJECT(this), + new TDEAction(i18n("Snap to &Bar"), Key_5, this, TQT_SLOT(slotSetSnapFromAction()), actionCollection(), "snap_bar"); } else { @@ -903,7 +903,7 @@ void MatrixView::setupActions() TQString actionName = TQString("snap_%1").arg(int((crotchetDuration * 4) / d)); if (d == (crotchetDuration * 3) / 2) actionName = "snap_3"; - new TDEAction(i18n("Snap to %1").arg(label), pixmap, cut, TQT_TQOBJECT(this), + new TDEAction(i18n("Snap to %1").arg(label), pixmap, cut, this, TQT_SLOT(slotSetSnapFromAction()), actionCollection(), actionName.ascii()); } @@ -912,16 +912,16 @@ void MatrixView::setupActions() // // Settings menu // - new TDEAction(i18n("Show Instrument Parameters"), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Show Instrument Parameters"), 0, this, TQT_SLOT(slotDockParametersBack()), actionCollection(), "show_inst_parameters"); - new TDEToggleAction(i18n("Show Ch&ord Name Ruler"), 0, TQT_TQOBJECT(this), + new TDEToggleAction(i18n("Show Ch&ord Name Ruler"), 0, this, TQT_SLOT(slotToggleChordsRuler()), actionCollection(), "show_chords_ruler"); - new TDEToggleAction(i18n("Show &Tempo Ruler"), 0, TQT_TQOBJECT(this), + new TDEToggleAction(i18n("Show &Tempo Ruler"), 0, this, TQT_SLOT(slotToggleTempoRuler()), actionCollection(), "show_tempo_ruler"); @@ -1313,10 +1313,10 @@ void MatrixView::slotSelectSelected() EditTool* selector = m_toolBox->getTool(MatrixSelector::ToolName); connect(selector, TQT_SIGNAL(gotSelection()), - TQT_TQOBJECT(this), TQT_SLOT(slotNewSelection())); + this, TQT_SLOT(slotNewSelection())); connect(selector, TQT_SIGNAL(editTriggerSegment(int)), - TQT_TQOBJECT(this), TQT_SIGNAL(editTriggerSegment(int))); + this, TQT_SIGNAL(editTriggerSegment(int))); setTool(selector); } @@ -2148,7 +2148,7 @@ MatrixView::initActionsToolbar() } connect(m_snapGridCombo, TQT_SIGNAL(activated(int)), - TQT_TQOBJECT(this), TQT_SLOT(slotSetSnapFromIndex(int))); + this, TQT_SLOT(slotSetSnapFromIndex(int))); // Velocity combo. Not a spin box, because the spin box is too // slow to use unless we make it typeable into, and then it takes @@ -2182,7 +2182,7 @@ MatrixView::initActionsToolbar() m_quantizeCombo->insertItem(noMap, i18n("Off")); connect(m_quantizeCombo, TQT_SIGNAL(activated(int)), - TQT_TQOBJECT(this), TQT_SLOT(slotQuantizeSelection(int))); + this, TQT_SLOT(slotQuantizeSelection(int))); } void @@ -2919,7 +2919,7 @@ MatrixView::slotToggleStepByStep() return ; } if (action->isChecked()) { // after toggling, that is - emit stepByStepTargetRequested(TQT_TQOBJECT(this)); + emit stepByStepTargetRequested(this); } else { emit stepByStepTargetRequested(0); } @@ -3024,19 +3024,19 @@ MatrixView::slotPercussionSetChanged(Instrument * newInstr) TQObject::connect (pitchRuler, TQT_SIGNAL(hoveredOverKeyChanged(unsigned int)), - TQT_TQOBJECT(this), TQT_SLOT (slotHoveredOverKeyChanged(unsigned int))); + this, TQT_SLOT (slotHoveredOverKeyChanged(unsigned int))); TQObject::connect (pitchRuler, TQT_SIGNAL(keyPressed(unsigned int, bool)), - TQT_TQOBJECT(this), TQT_SLOT (slotKeyPressed(unsigned int, bool))); + this, TQT_SLOT (slotKeyPressed(unsigned int, bool))); TQObject::connect (pitchRuler, TQT_SIGNAL(keySelected(unsigned int, bool)), - TQT_TQOBJECT(this), TQT_SLOT (slotKeySelected(unsigned int, bool))); + this, TQT_SLOT (slotKeySelected(unsigned int, bool))); TQObject::connect (pitchRuler, TQT_SIGNAL(keyReleased(unsigned int, bool)), - TQT_TQOBJECT(this), TQT_SLOT (slotKeyReleased(unsigned int, bool))); + this, TQT_SLOT (slotKeyReleased(unsigned int, bool))); // Replace the old pitchruler widget m_pitchRuler = pitchRuler; |