summaryrefslogtreecommitdiffstats
path: root/src/gui/editors
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/editors')
-rw-r--r--src/gui/editors/eventlist/EventView.cpp30
-rw-r--r--src/gui/editors/matrix/MatrixView.cpp164
-rw-r--r--src/gui/editors/notation/NotationView.cpp348
-rw-r--r--src/gui/editors/notation/TrackHeader.cpp2
-rw-r--r--src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp4
-rw-r--r--src/gui/editors/segment/ControlEditorDialog.cpp2
-rw-r--r--src/gui/editors/segment/MarkerEditor.cpp8
-rw-r--r--src/gui/editors/segment/TrackButtons.cpp18
-rw-r--r--src/gui/editors/segment/TrackLabel.cpp2
-rw-r--r--src/gui/editors/segment/TriggerSegmentManager.cpp12
-rw-r--r--src/gui/editors/segment/segmentcanvas/CompositionView.cpp2
-rw-r--r--src/gui/editors/segment/segmentcanvas/SegmentTool.cpp2
-rw-r--r--src/gui/editors/tempo/TempoView.cpp18
13 files changed, 306 insertions, 306 deletions
diff --git a/src/gui/editors/eventlist/EventView.cpp b/src/gui/editors/eventlist/EventView.cpp
index 8f527d6..1ff9dc0 100644
--- a/src/gui/editors/eventlist/EventView.cpp
+++ b/src/gui/editors/eventlist/EventView.cpp
@@ -169,21 +169,21 @@ EventView::EventView(RosegardenGUIDoc *doc,
layout->addWidget(m_triggerName, 0, 1);
TQPushButton *editButton = new TQPushButton(i18n("edit"), frame);
layout->addWidget(editButton, 0, 2);
- connect(editButton, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotEditTriggerName()));
+ connect(editButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditTriggerName()));
layout->addWidget(new TQLabel(i18n("Base pitch: "), frame), 1, 0);
m_triggerPitch = new TQLabel(TQString("%1").arg(rec->getBasePitch()), frame);
layout->addWidget(m_triggerPitch, 1, 1);
editButton = new TQPushButton(i18n("edit"), frame);
layout->addWidget(editButton, 1, 2);
- connect(editButton, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotEditTriggerPitch()));
+ connect(editButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditTriggerPitch()));
layout->addWidget(new TQLabel(i18n("Base velocity: "), frame), 2, 0);
m_triggerVelocity = new TQLabel(TQString("%1").arg(rec->getBaseVelocity()), frame);
layout->addWidget(m_triggerVelocity, 2, 1);
editButton = new TQPushButton(i18n("edit"), frame);
layout->addWidget(editButton, 2, 2);
- connect(editButton, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotEditTriggerVelocity()));
+ connect(editButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditTriggerVelocity()));
/*!!! Comment out these two options, which are not yet used
anywhere else -- intended for use with library ornaments, not
@@ -209,11 +209,11 @@ EventView::EventView(RosegardenGUIDoc *doc,
adjust->setCurrentItem(2);
}
- connect(adjust, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotTriggerTimeAdjustChanged(int)));
+ connect(adjust, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotTriggerTimeAdjustChanged(int)));
TQCheckBox *retune = new TQCheckBox(i18n("Adjust pitch to trigger note by default"), frame);
retune->setChecked(rec->getDefaultRetune());
- connect(retune, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotTriggerRetuneChanged()));
+ connect(retune, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotTriggerRetuneChanged()));
layout->addMultiCellWidget(retune, 4, 4, 1, 2);
*/
@@ -1118,41 +1118,41 @@ EventView::setupActions()
TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
TQIconSet icon(TQPixmap(pixmapDir + "/toolbar/event-insert.png"));
- new TDEAction(i18n("&Insert Event"), icon, Key_I, TQT_TQOBJECT(this),
+ new TDEAction(i18n("&Insert Event"), icon, Key_I, this,
TQT_SLOT(slotEditInsert()), actionCollection(),
"insert");
TQCanvasPixmap pixmap(pixmapDir + "/toolbar/event-delete.png");
icon = TQIconSet(pixmap);
- new TDEAction(i18n("&Delete Event"), icon, Key_Delete, TQT_TQOBJECT(this),
+ new TDEAction(i18n("&Delete Event"), icon, Key_Delete, this,
TQT_SLOT(slotEditDelete()), actionCollection(),
"delete");
pixmap.load(pixmapDir + "/toolbar/event-edit.png");
icon = TQIconSet(pixmap);
- new TDEAction(i18n("&Edit Event"), icon, Key_E, TQT_TQOBJECT(this),
+ new TDEAction(i18n("&Edit Event"), icon, Key_E, this,
TQT_SLOT(slotEditEvent()), actionCollection(),
"edit_simple");
pixmap.load(pixmapDir + "/toolbar/event-edit-advanced.png");
icon = TQIconSet(pixmap);
- new TDEAction(i18n("&Advanced Event Editor"), icon, Key_A, TQT_TQOBJECT(this),
+ new TDEAction(i18n("&Advanced Event Editor"), icon, Key_A, this,
TQT_SLOT(slotEditEventAdvanced()), actionCollection(),
"edit_advanced");
// icon = TQIconSet(TQCanvasPixmap(pixmapDir + "/toolbar/eventfilter.xpm"));
- new TDEAction(i18n("&Filter Selection"), "filter", Key_F, TQT_TQOBJECT(this),
+ new TDEAction(i18n("&Filter Selection"), "filter", Key_F, this,
TQT_SLOT(slotFilterSelection()), actionCollection(),
"filter_selection");
- 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("Clear Selection"), Key_Escape, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Clear Selection"), Key_Escape, this,
TQT_SLOT(slotClearSelection()), actionCollection(),
"clear_selection");
@@ -1164,7 +1164,7 @@ EventView::setupActions()
pixmap.load(pixmapDir + "/toolbar/time-musical.png");
icon = TQIconSet(pixmap);
- action = new TDERadioAction(i18n("&Musical Times"), icon, 0, TQT_TQOBJECT(this),
+ action = new TDERadioAction(i18n("&Musical Times"), icon, 0, this,
TQT_SLOT(slotMusicalTime()),
actionCollection(), "time_musical");
action->setExclusiveGroup("timeMode");
@@ -1174,7 +1174,7 @@ EventView::setupActions()
pixmap.load(pixmapDir + "/toolbar/time-real.png");
icon = TQIconSet(pixmap);
- action = new TDERadioAction(i18n("&Real Times"), icon, 0, TQT_TQOBJECT(this),
+ action = new TDERadioAction(i18n("&Real Times"), icon, 0, this,
TQT_SLOT(slotRealTime()),
actionCollection(), "time_real");
action->setExclusiveGroup("timeMode");
@@ -1184,7 +1184,7 @@ EventView::setupActions()
pixmap.load(pixmapDir + "/toolbar/time-raw.png");
icon = TQIconSet(pixmap);
- action = new TDERadioAction(i18n("Ra&w Times"), icon, 0, TQT_TQOBJECT(this),
+ action = new TDERadioAction(i18n("Ra&w Times"), icon, 0, this,
TQT_SLOT(slotRawTime()),
actionCollection(), "time_raw");
action->setExclusiveGroup("timeMode");
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;
diff --git a/src/gui/editors/notation/NotationView.cpp b/src/gui/editors/notation/NotationView.cpp
index e5d84c5..a97c7c7 100644
--- a/src/gui/editors/notation/NotationView.cpp
+++ b/src/gui/editors/notation/NotationView.cpp
@@ -371,9 +371,9 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
m_leftGutter(20),
m_notePixmapFactory(new NotePixmapFactory(m_fontName, m_fontSize)),
m_hlayout(new NotationHLayout(&doc->getComposition(), m_notePixmapFactory,
- m_properties, TQT_TQOBJECT(this))),
+ m_properties, this)),
m_vlayout(new NotationVLayout(&doc->getComposition(), m_notePixmapFactory,
- m_properties, TQT_TQOBJECT(this))),
+ m_properties, this)),
m_chordNameRuler(0),
m_tempoRuler(0),
m_rawNoteRuler(0),
@@ -450,7 +450,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
setBackgroundMode(PaletteBase);
- TQCanvas *tCanvas = new TQCanvas(TQT_TQOBJECT(this));
+ TQCanvas *tCanvas = new TQCanvas(this);
tCanvas->resize(width() * 2, height() * 2);
setCanvasView(new NotationCanvasView(*this, tCanvas, getCentralWidget()));
@@ -674,10 +674,10 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
this, TQT_SLOT (slotHoveredOverAbsoluteTimeChanged(unsigned int)));
TQObject::connect
- (getCanvasView(), TQT_SIGNAL(zoomIn()), TQT_TQOBJECT(this), TQT_SLOT(slotZoomIn()));
+ (getCanvasView(), TQT_SIGNAL(zoomIn()), this, TQT_SLOT(slotZoomIn()));
TQObject::connect
- (getCanvasView(), TQT_SIGNAL(zoomOut()), TQT_TQOBJECT(this), TQT_SLOT(slotZoomOut()));
+ (getCanvasView(), TQT_SIGNAL(zoomOut()), this, TQT_SLOT(slotZoomOut()));
TQObject::connect
(m_pannerDialog->scrollbox(), TQT_SIGNAL(valueChanged(const TQPoint &)),
@@ -816,9 +816,9 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
m_leftGutter(0),
m_notePixmapFactory(new NotePixmapFactory(m_fontName, m_fontSize)),
m_hlayout(new NotationHLayout(&doc->getComposition(), m_notePixmapFactory,
- m_properties, TQT_TQOBJECT(this))),
+ m_properties, this)),
m_vlayout(new NotationVLayout(&doc->getComposition(), m_notePixmapFactory,
- m_properties, TQT_TQOBJECT(this))),
+ m_properties, this)),
m_chordNameRuler(0),
m_tempoRuler(0),
m_rawNoteRuler(0),
@@ -887,7 +887,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
setBackgroundMode(PaletteBase);
m_config->setGroup(NotationViewConfigGroup);
- TQCanvas *tCanvas = new TQCanvas(TQT_TQOBJECT(this));
+ TQCanvas *tCanvas = new TQCanvas(this);
tCanvas->resize(width() * 2, height() * 2); //!!!
setCanvasView(new NotationCanvasView(*this, tCanvas, getCentralWidget()));
@@ -1491,15 +1491,15 @@ void NotationView::readOptions()
void NotationView::setupActions()
{
- KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), actionCollection());
- KStdAction::printPreview(TQT_TQOBJECT(this), TQT_SLOT(slotFilePrintPreview()),
+ KStdAction::print(this, TQT_SLOT(slotFilePrint()), actionCollection());
+ KStdAction::printPreview(this, TQT_SLOT(slotFilePrintPreview()),
actionCollection());
- new TDEAction(i18n("Print &with LilyPond..."), 0, 0, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Print &with LilyPond..."), 0, 0, this,
TQT_SLOT(slotPrintLilyPond()), actionCollection(),
"file_print_lilypond");
- new TDEAction(i18n("Preview with Lil&yPond..."), 0, 0, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Preview with Lil&yPond..."), 0, 0, this,
TQT_SLOT(slotPreviewLilyPond()), actionCollection(),
"file_preview_lilypond");
@@ -1511,7 +1511,7 @@ void NotationView::setupActions()
// View menu stuff
TDEActionMenu *fontActionMenu =
- new TDEActionMenu(i18n("Note &Font"), TQT_TQOBJECT(this), "note_font_actionmenu");
+ new TDEActionMenu(i18n("Note &Font"), this, "note_font_actionmenu");
std::set
<std::string> fs(NoteFontFactory::getFontNames());
@@ -1524,7 +1524,7 @@ void NotationView::setupActions()
TDEToggleAction *fontAction =
new TDEToggleAction
- (fontTQName, 0, TQT_TQOBJECT(this), TQT_SLOT(slotChangeFontFromAction()),
+ (fontTQName, 0, this, TQT_SLOT(slotChangeFontFromAction()),
actionCollection(), TQString("note_font_" + fontTQName).ascii());
fontAction->setChecked(*i == m_fontName);
@@ -1534,18 +1534,18 @@ void NotationView::setupActions()
actionCollection()->insert(fontActionMenu);
m_fontSizeActionMenu =
- new TDEActionMenu(i18n("Si&ze"), TQT_TQOBJECT(this), "note_font_size_actionmenu");
+ new TDEActionMenu(i18n("Si&ze"), this, "note_font_size_actionmenu");
setupFontSizeMenu();
actionCollection()->insert(m_fontSizeActionMenu);
m_showHeadersMenuEntry
- = new TDEAction(i18n("Show Track Headers"), 0, TQT_TQOBJECT(this),
+ = new TDEAction(i18n("Show Track Headers"), 0, this,
TQT_SLOT(slotShowHeadersGroup()),
actionCollection(), "show_track_headers");
TDEActionMenu *spacingActionMenu =
- new TDEActionMenu(i18n("S&pacing"), TQT_TQOBJECT(this), "stretch_actionmenu");
+ new TDEActionMenu(i18n("S&pacing"), this, "stretch_actionmenu");
int defaultSpacing = m_hlayout->getSpacing();
std::vector<int> spacings = NotationHLayout::getAvailableSpacings();
@@ -1555,7 +1555,7 @@ void NotationView::setupActions()
TDEToggleAction *spacingAction =
new TDEToggleAction
- (TQString("%1%").arg(*i), 0, TQT_TQOBJECT(this),
+ (TQString("%1%").arg(*i), 0, this,
TQT_SLOT(slotChangeSpacingFromAction()),
actionCollection(), TQString("spacing_%1").arg(*i).ascii());
@@ -1567,7 +1567,7 @@ void NotationView::setupActions()
actionCollection()->insert(spacingActionMenu);
TDEActionMenu *proportionActionMenu =
- new TDEActionMenu(i18n("Du&ration Factor"), TQT_TQOBJECT(this), "proportion_actionmenu");
+ new TDEActionMenu(i18n("Du&ration Factor"), this, "proportion_actionmenu");
int defaultProportion = m_hlayout->getProportion();
std::vector<int> proportions = NotationHLayout::getAvailableProportions();
@@ -1581,7 +1581,7 @@ void NotationView::setupActions()
TDEToggleAction *proportionAction =
new TDEToggleAction
- (name, 0, TQT_TQOBJECT(this),
+ (name, 0, this,
TQT_SLOT(slotChangeProportionFromAction()),
actionCollection(), TQString("proportion_%1").arg(*i).ascii());
@@ -1593,7 +1593,7 @@ void NotationView::setupActions()
actionCollection()->insert(proportionActionMenu);
TDEActionMenu *styleActionMenu =
- new TDEActionMenu(i18n("Note &Style"), TQT_TQOBJECT(this), "note_style_actionmenu");
+ new TDEActionMenu(i18n("Note &Style"), this, "note_style_actionmenu");
std::vector<NoteStyleName> styles
(NoteStyleFactory::getAvailableStyleNames());
@@ -1605,7 +1605,7 @@ void NotationView::setupActions()
TDEAction *styleAction =
new TDEAction
- (styleTQName, 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetStyleFromAction()),
+ (styleTQName, 0, this, TQT_SLOT(slotSetStyleFromAction()),
actionCollection(), TQString("style_" + styleTQName).ascii());
styleActionMenu->insert(styleAction);
@@ -1614,21 +1614,21 @@ void NotationView::setupActions()
actionCollection()->insert(styleActionMenu);
TDEActionMenu *ornamentActionMenu =
- new TDEActionMenu(i18n("Use Ornament"), TQT_TQOBJECT(this), "ornament_actionmenu");
+ new TDEActionMenu(i18n("Use Ornament"), this, "ornament_actionmenu");
new TDEAction
- (i18n("Insert Rest"), Key_P, TQT_TQOBJECT(this), TQT_SLOT(slotInsertRest()),
+ (i18n("Insert Rest"), Key_P, this, TQT_SLOT(slotInsertRest()),
actionCollection(), TQString("insert_rest").ascii());
new TDEAction
- (i18n("Switch from Note to Rest"), Key_T, TQT_TQOBJECT(this),
+ (i18n("Switch from Note to Rest"), Key_T, this,
TQT_SLOT(slotSwitchFromNoteToRest()),
actionCollection(), TQString("switch_from_note_to_rest").ascii());
new TDEAction
- (i18n("Switch from Rest to Note"), Key_Y, TQT_TQOBJECT(this),
+ (i18n("Switch from Rest to Note"), Key_Y, this,
TQT_SLOT(slotSwitchFromRestToNote()),
actionCollection(), TQString("switch_from_rest_to_note").ascii());
@@ -1648,7 +1648,7 @@ void NotationView::setupActions()
noteAction = new TDERadioAction(noteActionData.title,
icon,
noteActionData.keycode,
- TQT_TQOBJECT(this),
+ this,
TQT_SLOT(slotNoteAction()),
actionCollection(),
noteActionData.actionName.ascii());
@@ -1674,7 +1674,7 @@ void NotationView::setupActions()
TDEAction *action = new TDEAction(data.title,
icon,
data.keycode,
- TQT_TQOBJECT(this),
+ this,
TQT_SLOT(slotNoteChangeAction()),
actionCollection(),
data.actionName.ascii());
@@ -1699,7 +1699,7 @@ void NotationView::setupActions()
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
(actionsAccidental[i][3].ascii())));
- noteAction = new TDERadioAction(actionsAccidental[i][0], icon, 0, TQT_TQOBJECT(this),
+ noteAction = new TDERadioAction(actionsAccidental[i][0], icon, 0, this,
actionsAccidental[i][1].ascii(),
actionCollection(), actionsAccidental[i][2].ascii());
noteAction->setExclusiveGroup("accidentals");
@@ -1712,47 +1712,47 @@ void NotationView::setupActions()
// Treble
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-treble")));
- noteAction = new TDERadioAction(i18n("&Treble Clef"), icon, 0, TQT_TQOBJECT(this),
+ noteAction = new TDERadioAction(i18n("&Treble Clef"), icon, 0, this,
TQT_SLOT(slotTrebleClef()),
actionCollection(), "treble_clef");
noteAction->setExclusiveGroup("notes");
// Alto
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-alto")));
- noteAction = new TDERadioAction(i18n("&Alto Clef"), icon, 0, TQT_TQOBJECT(this),
+ noteAction = new TDERadioAction(i18n("&Alto Clef"), icon, 0, this,
TQT_SLOT(slotAltoClef()),
actionCollection(), "alto_clef");
noteAction->setExclusiveGroup("notes");
// Tenor
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-tenor")));
- noteAction = new TDERadioAction(i18n("Te&nor Clef"), icon, 0, TQT_TQOBJECT(this),
+ noteAction = new TDERadioAction(i18n("Te&nor Clef"), icon, 0, this,
TQT_SLOT(slotTenorClef()),
actionCollection(), "tenor_clef");
noteAction->setExclusiveGroup("notes");
// Bass
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-bass")));
- noteAction = new TDERadioAction(i18n("&Bass Clef"), icon, 0, TQT_TQOBJECT(this),
+ noteAction = new TDERadioAction(i18n("&Bass Clef"), icon, 0, this,
TQT_SLOT(slotBassClef()),
actionCollection(), "bass_clef");
noteAction->setExclusiveGroup("notes");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("text")));
- noteAction = new TDERadioAction(i18n("&Text"), icon, Key_F8, TQT_TQOBJECT(this),
+ noteAction = new TDERadioAction(i18n("&Text"), icon, Key_F8, this,
TQT_SLOT(slotText()),
actionCollection(), "text");
noteAction->setExclusiveGroup("notes");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("guitarchord")));
- noteAction = new TDERadioAction(i18n("&Guitar Chord"), icon, Key_F9, TQT_TQOBJECT(this),
+ noteAction = new TDERadioAction(i18n("&Guitar Chord"), icon, Key_F9, this,
TQT_SLOT(slotGuitarChord()),
actionCollection(), "guitarchord");
noteAction->setExclusiveGroup("notes");
/* icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("lilypond")));
- noteAction = new TDERadioAction(i18n("Lil&ypond Directive"), icon, Key_F9, TQT_TQOBJECT(this),
+ noteAction = new TDERadioAction(i18n("Lil&ypond Directive"), icon, Key_F9, this,
TQT_SLOT(slotLilyPondDirective()),
actionCollection(), "lilypond_directive");
noteAction->setExclusiveGroup("notes"); */
@@ -1762,52 +1762,52 @@ void NotationView::setupActions()
// Edition tools (eraser, selector...)
//
noteAction = new TDERadioAction(i18n("&Erase"), "eraser", Key_F4,
- TQT_TQOBJECT(this), TQT_SLOT(slotEraseSelected()),
+ this, TQT_SLOT(slotEraseSelected()),
actionCollection(), "erase");
noteAction->setExclusiveGroup("notes");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("select")));
noteAction = new TDERadioAction(i18n("&Select and Edit"), icon, Key_F2,
- TQT_TQOBJECT(this), TQT_SLOT(slotSelectSelected()),
+ this, TQT_SLOT(slotSelectSelected()),
actionCollection(), "select");
noteAction->setExclusiveGroup("notes");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("step_by_step")));
- 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");
// Edit menu
- new TDEAction(i18n("Select from Sta&rt"), 0, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Select from Sta&rt"), 0, this,
TQT_SLOT(slotEditSelectFromStart()), actionCollection(),
"select_from_start");
- new TDEAction(i18n("Select to &End"), 0, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Select to &End"), 0, this,
TQT_SLOT(slotEditSelectToEnd()), actionCollection(),
"select_to_end");
- new TDEAction(i18n("Select Whole St&aff"), Key_A + CTRL, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Select Whole St&aff"), Key_A + CTRL, this,
TQT_SLOT(slotEditSelectWholeStaff()), actionCollection(),
"select_whole_staff");
- new TDEAction(i18n("C&ut and Close"), CTRL + SHIFT + Key_X, TQT_TQOBJECT(this),
+ new TDEAction(i18n("C&ut and Close"), CTRL + SHIFT + Key_X, this,
TQT_SLOT(slotEditCutAndClose()), actionCollection(),
"cut_and_close");
- new TDEAction(i18n("Pa&ste..."), CTRL + SHIFT + Key_V, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Pa&ste..."), CTRL + SHIFT + Key_V, this,
TQT_SLOT(slotEditGeneralPaste()), actionCollection(),
"general_paste");
- new TDEAction(i18n("De&lete"), Key_Delete, TQT_TQOBJECT(this),
+ new TDEAction(i18n("De&lete"), Key_Delete, this,
TQT_SLOT(slotEditDelete()), actionCollection(),
"delete");
- new TDEAction(i18n("Move to Staff Above"), 0, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Move to Staff Above"), 0, this,
TQT_SLOT(slotMoveEventsUpStaff()), actionCollection(),
"move_events_up_staff");
- new TDEAction(i18n("Move to Staff Below"), 0, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Move to Staff Below"), 0, this,
TQT_SLOT(slotMoveEventsDownStaff()), actionCollection(),
"move_events_down_staff");
@@ -1821,7 +1821,7 @@ void NotationView::setupActions()
TQCanvasPixmap pixmap(pixmapDir + "/toolbar/linear-layout.xpm");
icon = TQIconSet(pixmap);
TDERadioAction *linearModeAction = new TDERadioAction
- (i18n("&Linear Layout"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotLinearMode()),
+ (i18n("&Linear Layout"), icon, 0, this, TQT_SLOT(slotLinearMode()),
actionCollection(), "linear_mode");
linearModeAction->setExclusiveGroup("layoutMode");
if (layoutMode == 0)
@@ -1830,7 +1830,7 @@ void NotationView::setupActions()
pixmap.load(pixmapDir + "/toolbar/continuous-page-mode.xpm");
icon = TQIconSet(pixmap);
TDERadioAction *continuousPageModeAction = new TDERadioAction
- (i18n("&Continuous Page Layout"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotContinuousPageMode()),
+ (i18n("&Continuous Page Layout"), icon, 0, this, TQT_SLOT(slotContinuousPageMode()),
actionCollection(), "continuous_page_mode");
continuousPageModeAction->setExclusiveGroup("layoutMode");
if (layoutMode == 1)
@@ -1839,33 +1839,33 @@ void NotationView::setupActions()
pixmap.load(pixmapDir + "/toolbar/multi-page-mode.xpm");
icon = TQIconSet(pixmap);
TDERadioAction *multiPageModeAction = new TDERadioAction
- (i18n("&Multiple Page Layout"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotMultiPageMode()),
+ (i18n("&Multiple Page Layout"), icon, 0, this, TQT_SLOT(slotMultiPageMode()),
actionCollection(), "multi_page_mode");
multiPageModeAction->setExclusiveGroup("layoutMode");
if (layoutMode == 2)
multiPageModeAction->setChecked(true);
- 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 Ra&w Note Ruler"), 0, TQT_TQOBJECT(this),
+ new TDEToggleAction(i18n("Show Ra&w Note Ruler"), 0, this,
TQT_SLOT(slotToggleRawNoteRuler()),
actionCollection(), "show_raw_note_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");
- new TDEToggleAction(i18n("Show &Annotations"), 0, TQT_TQOBJECT(this),
+ new TDEToggleAction(i18n("Show &Annotations"), 0, this,
TQT_SLOT(slotToggleAnnotations()),
actionCollection(), "show_annotations");
- new TDEToggleAction(i18n("Show Lily&Pond Directives"), 0, TQT_TQOBJECT(this),
+ new TDEToggleAction(i18n("Show Lily&Pond Directives"), 0, this,
TQT_SLOT(slotToggleLilyPondDirectives()),
actionCollection(), "show_lilypond_directives");
- new TDEAction(i18n("Open L&yric Editor"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditLyrics()),
+ new TDEAction(i18n("Open L&yric Editor"), 0, this, TQT_SLOT(slotEditLyrics()),
actionCollection(), "lyric_editor");
//
@@ -1875,54 +1875,54 @@ void NotationView::setupActions()
(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("group-beam")));
- new TDEAction(BeamCommand::getGlobalName(), icon, Key_B + CTRL, TQT_TQOBJECT(this),
+ new TDEAction(BeamCommand::getGlobalName(), icon, Key_B + CTRL, this,
TQT_SLOT(slotGroupBeam()), actionCollection(), "beam");
- new TDEAction(AutoBeamCommand::getGlobalName(), 0, TQT_TQOBJECT(this),
+ new TDEAction(AutoBeamCommand::getGlobalName(), 0, this,
TQT_SLOT(slotGroupAutoBeam()), actionCollection(), "auto_beam");
icon = TQIconSet
(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("group-unbeam")));
- new TDEAction(BreakCommand::getGlobalName(), icon, Key_U + CTRL, TQT_TQOBJECT(this),
+ new TDEAction(BreakCommand::getGlobalName(), icon, Key_U + CTRL, this,
TQT_SLOT(slotGroupBreak()), actionCollection(), "break_group");
icon = TQIconSet
(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("group-simple-tuplet")));
- new TDEAction(TupletCommand::getGlobalName(true), icon, Key_R + CTRL, TQT_TQOBJECT(this),
+ new TDEAction(TupletCommand::getGlobalName(true), icon, Key_R + CTRL, this,
TQT_SLOT(slotGroupSimpleTuplet()), actionCollection(), "simple_tuplet");
icon = TQIconSet
(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("group-tuplet")));
- new TDEAction(TupletCommand::getGlobalName(false), icon, Key_T + CTRL, TQT_TQOBJECT(this),
+ new TDEAction(TupletCommand::getGlobalName(false), icon, Key_T + CTRL, this,
TQT_SLOT(slotGroupGeneralTuplet()), actionCollection(), "tuplet");
- new TDEAction(UnTupletCommand::getGlobalName(), 0, TQT_TQOBJECT(this),
+ new TDEAction(UnTupletCommand::getGlobalName(), 0, this,
TQT_SLOT(slotGroupUnTuplet()), actionCollection(), "break_tuplets");
icon = TQIconSet(NotePixmapFactory::toTQPixmap
(NotePixmapFactory::makeToolbarPixmap("triplet")));
(new TDEToggleAction(i18n("Trip&let Insert Mode"), icon, Key_G,
- TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModeStatus()),
+ this, TQT_SLOT(slotUpdateInsertModeStatus()),
actionCollection(), "triplet_mode"))->
setChecked(false);
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);
icon = TQIconSet(NotePixmapFactory::toTQPixmap
(NotePixmapFactory::makeToolbarPixmap("group-grace")));
(new TDEToggleAction(i18n("Grace Insert Mode"), icon, 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModeStatus()),
+ this, TQT_SLOT(slotUpdateInsertModeStatus()),
actionCollection(), "grace_mode"))->
setChecked(false);
/*!!!
@@ -1930,10 +1930,10 @@ void NotationView::setupActions()
(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("group-grace")));
- new TDEAction(GraceCommand::getGlobalName(), icon, 0, TQT_TQOBJECT(this),
+ new TDEAction(GraceCommand::getGlobalName(), icon, 0, this,
TQT_SLOT(slotGroupGrace()), actionCollection(), "grace");
- new TDEAction(UnGraceCommand::getGlobalName(), 0, TQT_TQOBJECT(this),
+ new TDEAction(UnGraceCommand::getGlobalName(), 0, this,
TQT_SLOT(slotGroupUnGrace()), actionCollection(), "ungrace");
*/
icon = TQIconSet
@@ -1941,11 +1941,11 @@ void NotationView::setupActions()
("group-slur")));
new TDEAction(AddIndicationCommand::getGlobalName
- (Indication::Slur), icon, Key_ParenRight, TQT_TQOBJECT(this),
+ (Indication::Slur), icon, Key_ParenRight, this,
TQT_SLOT(slotGroupSlur()), actionCollection(), "slur");
new TDEAction(AddIndicationCommand::getGlobalName
- (Indication::PhrasingSlur), 0, Key_ParenRight + CTRL, TQT_TQOBJECT(this),
+ (Indication::PhrasingSlur), 0, Key_ParenRight + CTRL, this,
TQT_SLOT(slotGroupPhrasingSlur()), actionCollection(), "phrasing_slur");
icon = TQIconSet
@@ -1953,7 +1953,7 @@ void NotationView::setupActions()
("group-glissando")));
new TDEAction(AddIndicationCommand::getGlobalName
- (Indication::Glissando), icon, 0, TQT_TQOBJECT(this),
+ (Indication::Glissando), icon, 0, this,
TQT_SLOT(slotGroupGlissando()), actionCollection(), "glissando");
icon = TQIconSet
@@ -1961,7 +1961,7 @@ void NotationView::setupActions()
("group-crescendo")));
new TDEAction(AddIndicationCommand::getGlobalName
- (Indication::Crescendo), icon, Key_Less, TQT_TQOBJECT(this),
+ (Indication::Crescendo), icon, Key_Less, this,
TQT_SLOT(slotGroupCrescendo()), actionCollection(), "crescendo");
icon = TQIconSet
@@ -1969,11 +1969,11 @@ void NotationView::setupActions()
("group-decrescendo")));
new TDEAction(AddIndicationCommand::getGlobalName
- (Indication::Decrescendo), icon, Key_Greater, TQT_TQOBJECT(this),
+ (Indication::Decrescendo), icon, Key_Greater, this,
TQT_SLOT(slotGroupDecrescendo()), actionCollection(), "decrescendo");
new TDEAction(AddIndicationCommand::getGlobalName
- (Indication::QuindicesimaUp), 0, 0, TQT_TQOBJECT(this),
+ (Indication::QuindicesimaUp), 0, 0, this,
TQT_SLOT(slotGroupOctave2Up()), actionCollection(), "octave_2up");
icon = TQIconSet
@@ -1981,33 +1981,33 @@ void NotationView::setupActions()
("group-ottava")));
new TDEAction(AddIndicationCommand::getGlobalName
- (Indication::OttavaUp), icon, 0, TQT_TQOBJECT(this),
+ (Indication::OttavaUp), icon, 0, this,
TQT_SLOT(slotGroupOctaveUp()), actionCollection(), "octave_up");
new TDEAction(AddIndicationCommand::getGlobalName
- (Indication::OttavaDown), 0, 0, TQT_TQOBJECT(this),
+ (Indication::OttavaDown), 0, 0, this,
TQT_SLOT(slotGroupOctaveDown()), actionCollection(), "octave_down");
new TDEAction(AddIndicationCommand::getGlobalName
- (Indication::QuindicesimaDown), 0, 0, TQT_TQOBJECT(this),
+ (Indication::QuindicesimaDown), 0, 0, this,
TQT_SLOT(slotGroupOctave2Down()), actionCollection(), "octave_2down");
icon = TQIconSet
(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("group-chord")));
- new TDEAction(MakeChordCommand::getGlobalName(), icon, 0, TQT_TQOBJECT(this),
+ new TDEAction(MakeChordCommand::getGlobalName(), icon, 0, this,
TQT_SLOT(slotGroupMakeChord()), actionCollection(), "make_chord");
// setup Transforms menu
- new TDEAction(NormalizeRestsCommand::getGlobalName(), Key_N + CTRL, TQT_TQOBJECT(this),
+ new TDEAction(NormalizeRestsCommand::getGlobalName(), Key_N + CTRL, this,
TQT_SLOT(slotTransformsNormalizeRests()), actionCollection(),
"normalize_rests");
- new TDEAction(CollapseRestsCommand::getGlobalName(), 0, TQT_TQOBJECT(this),
+ new TDEAction(CollapseRestsCommand::getGlobalName(), 0, this,
TQT_SLOT(slotTransformsCollapseRests()), actionCollection(),
"collapse_rests_aggressively");
- new TDEAction(CollapseNotesCommand::getGlobalName(), Key_Equal + CTRL, TQT_TQOBJECT(this),
+ new TDEAction(CollapseNotesCommand::getGlobalName(), Key_Equal + CTRL, this,
TQT_SLOT(slotTransformsCollapseNotes()), actionCollection(),
"collapse_notes");
@@ -2015,15 +2015,15 @@ void NotationView::setupActions()
(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transforms-tie")));
- new TDEAction(TieNotesCommand::getGlobalName(), icon, Key_AsciiTilde, TQT_TQOBJECT(this),
+ new TDEAction(TieNotesCommand::getGlobalName(), icon, Key_AsciiTilde, this,
TQT_SLOT(slotTransformsTieNotes()), actionCollection(),
"tie_notes");
- new TDEAction(UntieNotesCommand::getGlobalName(), 0, TQT_TQOBJECT(this),
+ new TDEAction(UntieNotesCommand::getGlobalName(), 0, this,
TQT_SLOT(slotTransformsUntieNotes()), actionCollection(),
"untie_notes");
- new TDEAction(MakeNotesViableCommand::getGlobalName(), 0, TQT_TQOBJECT(this),
+ new TDEAction(MakeNotesViableCommand::getGlobalName(), 0, this,
TQT_SLOT(slotTransformsMakeNotesViable()), actionCollection(),
"make_notes_viable");
@@ -2031,49 +2031,49 @@ void NotationView::setupActions()
(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transforms-decounterpoint")));
- new TDEAction(DeCounterpointCommand::getGlobalName(), icon, 0, TQT_TQOBJECT(this),
+ new TDEAction(DeCounterpointCommand::getGlobalName(), icon, 0, this,
TQT_SLOT(slotTransformsDeCounterpoint()), actionCollection(),
"de_counterpoint");
new TDEAction(ChangeStemsCommand::getGlobalName(true),
- 0, Key_PageUp + CTRL, TQT_TQOBJECT(this),
+ 0, Key_PageUp + CTRL, this,
TQT_SLOT(slotTransformsStemsUp()), actionCollection(),
"stems_up");
new TDEAction(ChangeStemsCommand::getGlobalName(false),
- 0, Key_PageDown + CTRL, TQT_TQOBJECT(this),
+ 0, Key_PageDown + CTRL, this,
TQT_SLOT(slotTransformsStemsDown()), actionCollection(),
"stems_down");
- new TDEAction(RestoreStemsCommand::getGlobalName(), 0, TQT_TQOBJECT(this),
+ new TDEAction(RestoreStemsCommand::getGlobalName(), 0, this,
TQT_SLOT(slotTransformsRestoreStems()), actionCollection(),
"restore_stems");
new TDEAction(ChangeSlurPositionCommand::getGlobalName(true),
- 0, TQT_TQOBJECT(this),
+ 0, this,
TQT_SLOT(slotTransformsSlursAbove()), actionCollection(),
"slurs_above");
new TDEAction(ChangeSlurPositionCommand::getGlobalName(false),
- 0, TQT_TQOBJECT(this),
+ 0, this,
TQT_SLOT(slotTransformsSlursBelow()), actionCollection(),
"slurs_below");
- new TDEAction(RestoreSlursCommand::getGlobalName(), 0, TQT_TQOBJECT(this),
+ new TDEAction(RestoreSlursCommand::getGlobalName(), 0, this,
TQT_SLOT(slotTransformsRestoreSlurs()), actionCollection(),
"restore_slurs");
new TDEAction(ChangeTiePositionCommand::getGlobalName(true),
- 0, TQT_TQOBJECT(this),
+ 0, this,
TQT_SLOT(slotTransformsTiesAbove()), actionCollection(),
"ties_above");
new TDEAction(ChangeTiePositionCommand::getGlobalName(false),
- 0, TQT_TQOBJECT(this),
+ 0, this,
TQT_SLOT(slotTransformsTiesBelow()), actionCollection(),
"ties_below");
- new TDEAction(RestoreTiesCommand::getGlobalName(), 0, TQT_TQOBJECT(this),
+ new TDEAction(RestoreTiesCommand::getGlobalName(), 0, this,
TQT_SLOT(slotTransformsRestoreTies()), actionCollection(),
"restore_ties");
@@ -2083,7 +2083,7 @@ void NotationView::setupActions()
new TDEAction(RespellCommand::getGlobalName
(RespellCommand::Set, Accidentals::DoubleFlat),
- icon, 0, TQT_TQOBJECT(this),
+ icon, 0, this,
TQT_SLOT(slotRespellDoubleFlat()), actionCollection(),
"respell_doubleflat");
@@ -2093,7 +2093,7 @@ void NotationView::setupActions()
new TDEAction(RespellCommand::getGlobalName
(RespellCommand::Set, Accidentals::Flat),
- icon, 0, TQT_TQOBJECT(this),
+ icon, 0, this,
TQT_SLOT(slotRespellFlat()), actionCollection(),
"respell_flat");
@@ -2103,7 +2103,7 @@ void NotationView::setupActions()
new TDEAction(RespellCommand::getGlobalName
(RespellCommand::Set, Accidentals::Natural),
- icon, 0, TQT_TQOBJECT(this),
+ icon, 0, this,
TQT_SLOT(slotRespellNatural()), actionCollection(),
"respell_natural");
@@ -2113,7 +2113,7 @@ void NotationView::setupActions()
new TDEAction(RespellCommand::getGlobalName
(RespellCommand::Set, Accidentals::Sharp),
- icon, 0, TQT_TQOBJECT(this),
+ icon, 0, this,
TQT_SLOT(slotRespellSharp()), actionCollection(),
"respell_sharp");
@@ -2123,35 +2123,35 @@ void NotationView::setupActions()
new TDEAction(RespellCommand::getGlobalName
(RespellCommand::Set, Accidentals::DoubleSharp),
- icon, 0, TQT_TQOBJECT(this),
+ icon, 0, this,
TQT_SLOT(slotRespellDoubleSharp()), actionCollection(),
"respell_doublesharp");
new TDEAction(RespellCommand::getGlobalName
(RespellCommand::Up, Accidentals::NoAccidental),
- Key_Up + CTRL + SHIFT, TQT_TQOBJECT(this),
+ Key_Up + CTRL + SHIFT, this,
TQT_SLOT(slotRespellUp()), actionCollection(),
"respell_up");
new TDEAction(RespellCommand::getGlobalName
(RespellCommand::Down, Accidentals::NoAccidental),
- Key_Down + CTRL + SHIFT, TQT_TQOBJECT(this),
+ Key_Down + CTRL + SHIFT, this,
TQT_SLOT(slotRespellDown()), actionCollection(),
"respell_down");
new TDEAction(RespellCommand::getGlobalName
(RespellCommand::Restore, Accidentals::NoAccidental),
- 0, TQT_TQOBJECT(this),
+ 0, this,
TQT_SLOT(slotRespellRestore()), actionCollection(),
"respell_restore");
new TDEAction(MakeAccidentalsCautionaryCommand::getGlobalName(true),
- 0, TQT_TQOBJECT(this),
+ 0, this,
TQT_SLOT(slotShowCautionary()), actionCollection(),
"show_cautionary");
new TDEAction(MakeAccidentalsCautionaryCommand::getGlobalName(false),
- 0, TQT_TQOBJECT(this),
+ 0, this,
TQT_SLOT(slotCancelCautionary()), actionCollection(),
"cancel_cautionary");
@@ -2159,23 +2159,23 @@ void NotationView::setupActions()
(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("quantize")));
- 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(FixNotationQuantizeCommand::getGlobalName(), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotTransformsFixQuantization()), actionCollection(),
+ this, TQT_SLOT(slotTransformsFixQuantization()), actionCollection(),
"fix_quantization");
new TDEAction(RemoveNotationQuantizeCommand::getGlobalName(), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotTransformsRemoveQuantization()), actionCollection(),
+ this, TQT_SLOT(slotTransformsRemoveQuantization()), actionCollection(),
"remove_quantization");
new TDEAction(InterpretCommand::getGlobalName(), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotTransformsInterpret()), actionCollection(),
+ this, TQT_SLOT(slotTransformsInterpret()), actionCollection(),
"interpret");
- new TDEAction(i18n("&Dump selected events to stderr"), 0, TQT_TQOBJECT(this),
+ new TDEAction(i18n("&Dump selected events to stderr"), 0, this,
TQT_SLOT(slotDebugDump()), actionCollection(), "debug_dump");
for (MarkActionDataMap::Iterator i = m_markActionDataMap->begin();
@@ -2189,7 +2189,7 @@ void NotationView::setupActions()
new TDEAction(markActionData.title,
icon,
markActionData.keycode,
- TQT_TQOBJECT(this),
+ this,
TQT_SLOT(slotAddMark()),
actionCollection(),
markActionData.actionName.ascii());
@@ -2199,59 +2199,59 @@ void NotationView::setupActions()
(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("text-mark")));
- new TDEAction(AddTextMarkCommand::getGlobalName(), icon, 0, TQT_TQOBJECT(this),
+ new TDEAction(AddTextMarkCommand::getGlobalName(), icon, 0, this,
TQT_SLOT(slotMarksAddTextMark()), actionCollection(),
"add_text_mark");
- new TDEAction(AddFingeringMarkCommand::getGlobalName("0"), 0, Key_0 + ALT, TQT_TQOBJECT(this),
+ new TDEAction(AddFingeringMarkCommand::getGlobalName("0"), 0, Key_0 + ALT, this,
TQT_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(),
"add_fingering_0");
- new TDEAction(AddFingeringMarkCommand::getGlobalName("1"), 0, Key_1 + ALT, TQT_TQOBJECT(this),
+ new TDEAction(AddFingeringMarkCommand::getGlobalName("1"), 0, Key_1 + ALT, this,
TQT_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(),
"add_fingering_1");
- new TDEAction(AddFingeringMarkCommand::getGlobalName("2"), 0, Key_2 + ALT, TQT_TQOBJECT(this),
+ new TDEAction(AddFingeringMarkCommand::getGlobalName("2"), 0, Key_2 + ALT, this,
TQT_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(),
"add_fingering_2");
- new TDEAction(AddFingeringMarkCommand::getGlobalName("3"), 0, Key_3 + ALT, TQT_TQOBJECT(this),
+ new TDEAction(AddFingeringMarkCommand::getGlobalName("3"), 0, Key_3 + ALT, this,
TQT_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(),
"add_fingering_3");
- new TDEAction(AddFingeringMarkCommand::getGlobalName("4"), 0, Key_4 + ALT, TQT_TQOBJECT(this),
+ new TDEAction(AddFingeringMarkCommand::getGlobalName("4"), 0, Key_4 + ALT, this,
TQT_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(),
"add_fingering_4");
- new TDEAction(AddFingeringMarkCommand::getGlobalName("5"), 0, Key_5 + ALT, TQT_TQOBJECT(this),
+ new TDEAction(AddFingeringMarkCommand::getGlobalName("5"), 0, Key_5 + ALT, this,
TQT_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(),
"add_fingering_5");
- new TDEAction(AddFingeringMarkCommand::getGlobalName("+"), 0, Key_9 + ALT, TQT_TQOBJECT(this),
+ new TDEAction(AddFingeringMarkCommand::getGlobalName("+"), 0, Key_9 + ALT, this,
TQT_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(),
"add_fingering_plus");
- new TDEAction(AddFingeringMarkCommand::getGlobalName(), 0, 0, TQT_TQOBJECT(this),
+ new TDEAction(AddFingeringMarkCommand::getGlobalName(), 0, 0, this,
TQT_SLOT(slotMarksAddFingeringMark()), actionCollection(),
"add_fingering_mark");
- new TDEAction(RemoveMarksCommand::getGlobalName(), 0, TQT_TQOBJECT(this),
+ new TDEAction(RemoveMarksCommand::getGlobalName(), 0, this,
TQT_SLOT(slotMarksRemoveMarks()), actionCollection(),
"remove_marks");
- new TDEAction(RemoveFingeringMarksCommand::getGlobalName(), 0, TQT_TQOBJECT(this),
+ new TDEAction(RemoveFingeringMarksCommand::getGlobalName(), 0, this,
TQT_SLOT(slotMarksRemoveFingeringMarks()), actionCollection(),
"remove_fingering_marks");
- new TDEAction(i18n("Ma&ke Ornament..."), 0, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Ma&ke Ornament..."), 0, this,
TQT_SLOT(slotMakeOrnament()), actionCollection(),
"make_ornament");
- new TDEAction(i18n("Trigger &Ornament..."), 0, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Trigger &Ornament..."), 0, this,
TQT_SLOT(slotUseOrnament()), actionCollection(),
"use_ornament");
- new TDEAction(i18n("Remove Ornament..."), 0, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Remove Ornament..."), 0, this,
TQT_SLOT(slotRemoveOrnament()), actionCollection(),
"remove_ornament");
@@ -2259,32 +2259,32 @@ void NotationView::setupActions()
i18n("&None"), "&1", "&2", "&3", "&4", "&5"
};
for (int i = 0; i <= 5; ++i) {
- new TDEAction(slashTitles[i], 0, TQT_TQOBJECT(this),
+ new TDEAction(slashTitles[i], 0, this,
TQT_SLOT(slotAddSlashes()), actionCollection(),
TQString("slashes_%1").arg(i).ascii());
}
- new TDEAction(ClefInsertionCommand::getGlobalName(), 0, TQT_TQOBJECT(this),
+ new TDEAction(ClefInsertionCommand::getGlobalName(), 0, this,
TQT_SLOT(slotEditAddClef()), actionCollection(),
"add_clef");
- new TDEAction(KeyInsertionCommand::getGlobalName(), 0, TQT_TQOBJECT(this),
+ new TDEAction(KeyInsertionCommand::getGlobalName(), 0, this,
TQT_SLOT(slotEditAddKeySignature()), actionCollection(),
"add_key_signature");
- new TDEAction(SustainInsertionCommand::getGlobalName(true), 0, TQT_TQOBJECT(this),
+ new TDEAction(SustainInsertionCommand::getGlobalName(true), 0, this,
TQT_SLOT(slotEditAddSustainDown()), actionCollection(),
"add_sustain_down");
- new TDEAction(SustainInsertionCommand::getGlobalName(false), 0, TQT_TQOBJECT(this),
+ new TDEAction(SustainInsertionCommand::getGlobalName(false), 0, this,
TQT_SLOT(slotEditAddSustainUp()), actionCollection(),
"add_sustain_up");
- new TDEAction(TransposeCommand::getDiatonicGlobalName(false), 0, TQT_TQOBJECT(this),
+ new TDEAction(TransposeCommand::getDiatonicGlobalName(false), 0, this,
TQT_SLOT(slotEditTranspose()), actionCollection(),
"transpose_segment");
- new TDEAction(i18n("Convert Notation For..."), 0, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Convert Notation For..."), 0, this,
TQT_SLOT(slotEditSwitchPreset()), actionCollection(),
"switch_preset");
@@ -2316,83 +2316,83 @@ void NotationView::setupActions()
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap(actionsToolbars[i][3].ascii())));
new TDEToggleAction(actionsToolbars[i][0], icon, 0,
- TQT_TQOBJECT(this), actionsToolbars[i][1].ascii(),
+ this, actionsToolbars[i][1].ascii(),
actionCollection(), actionsToolbars[i][2].ascii());
}
- 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");
/*!!! not here yet
- new TDEAction(i18n("Move Selection Left"), Key_Minus, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Move Selection Left"), Key_Minus, this,
TQT_SLOT(slotMoveSelectionLeft()), actionCollection(),
"move_selection_left");
*/
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");
- new TDEAction(i18n("Cursor &Up Staff"), 0, Key_Up + SHIFT, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Cursor &Up Staff"), 0, Key_Up + SHIFT, this,
TQT_SLOT(slotCurrentStaffUp()), actionCollection(),
"cursor_up_staff");
- new TDEAction(i18n("Cursor &Down Staff"), 0, Key_Down + SHIFT, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Cursor &Down Staff"), 0, Key_Down + SHIFT, this,
TQT_SLOT(slotCurrentStaffDown()), actionCollection(),
"cursor_down_staff");
- new TDEAction(i18n("Cursor Pre&vious Segment"), 0, Key_Prior + ALT, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Cursor Pre&vious Segment"), 0, Key_Prior + ALT, this,
TQT_SLOT(slotCurrentSegmentPrior()), actionCollection(),
"cursor_prior_segment");
- new TDEAction(i18n("Cursor Ne&xt Segment"), 0, Key_Next + ALT, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Cursor Ne&xt Segment"), 0, Key_Next + ALT, this,
TQT_SLOT(slotCurrentSegmentNext()), actionCollection(),
"cursor_next_segment");
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();
@@ -2401,112 +2401,112 @@ void NotationView::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");
// TQString pixmapDir =
// TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
// 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");
- new TDEAction(i18n("Push &Left"), 0, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Push &Left"), 0, this,
TQT_SLOT(slotFinePositionLeft()), actionCollection(),
"fine_position_left");
- new TDEAction(i18n("Push &Right"), 0, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Push &Right"), 0, this,
TQT_SLOT(slotFinePositionRight()), actionCollection(),
"fine_position_right");
- new TDEAction(i18n("Push &Up"), 0, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Push &Up"), 0, this,
TQT_SLOT(slotFinePositionUp()), actionCollection(),
"fine_position_up");
- new TDEAction(i18n("Push &Down"), 0, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Push &Down"), 0, this,
TQT_SLOT(slotFinePositionDown()), actionCollection(),
"fine_position_down");
- new TDEAction(i18n("&Restore Positions"), 0, TQT_TQOBJECT(this),
+ new TDEAction(i18n("&Restore Positions"), 0, this,
TQT_SLOT(slotFinePositionRestore()), actionCollection(),
"fine_position_restore");
- new TDEAction(i18n("Make &Invisible"), 0, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Make &Invisible"), 0, this,
TQT_SLOT(slotMakeInvisible()), actionCollection(),
"make_invisible");
- new TDEAction(i18n("Make &Visible"), 0, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Make &Visible"), 0, this,
TQT_SLOT(slotMakeVisible()), actionCollection(),
"make_visible");
- new TDEAction(i18n("Toggle Dot"), Key_Period, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Toggle Dot"), Key_Period, this,
TQT_SLOT(slotToggleDot()), actionCollection(),
"toggle_dot");
- new TDEAction(i18n("Add Dot"), Key_Period + CTRL, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Add Dot"), Key_Period + CTRL, this,
TQT_SLOT(slotAddDot()), actionCollection(),
"add_dot");
- new TDEAction(i18n("Add Dot"), Key_Period + CTRL + ALT, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Add Dot"), Key_Period + CTRL + ALT, this,
TQT_SLOT(slotAddDotNotationOnly()), actionCollection(),
"add_notation_dot");
@@ -2566,7 +2566,7 @@ NotationView::setupFontSizeMenu(std::string oldFontName)
if (!sizeAction) {
sizeAction =
new TDEToggleAction(i18n("1 pixel", "%n pixels", sizes[i]),
- 0, TQT_TQOBJECT(this),
+ 0, this,
TQT_SLOT(slotChangeFontSizeFromAction()),
actionCollection(), actionName.ascii());
}
@@ -7093,7 +7093,7 @@ void NotationView::slotNonNotationItemPressed(TQMouseEvent *e, TQCanvasItem *it)
getTrackById(staff->getSegment().getTrack())->getLabel();
bool ok = false;
- TQRegExpValidator validator(TQRegExp(".*"), TQT_TQOBJECT(this)); // empty is OK
+ TQRegExpValidator validator(TQRegExp(".*"), this); // empty is OK
TQString newText = KLineEditDlg::getText(TQString("Change staff name"),
TQString("Enter new staff name"),
@@ -7359,7 +7359,7 @@ NotationView::slotToggleStepByStep()
return ;
}
if (action->isChecked()) { // after toggling, that is
- emit stepByStepTargetRequested(TQT_TQOBJECT(this));
+ emit stepByStepTargetRequested(this);
} else {
emit stepByStepTargetRequested(0);
}
diff --git a/src/gui/editors/notation/TrackHeader.cpp b/src/gui/editors/notation/TrackHeader.cpp
index 8194e8d..303905c 100644
--- a/src/gui/editors/notation/TrackHeader.cpp
+++ b/src/gui/editors/notation/TrackHeader.cpp
@@ -272,7 +272,7 @@ TrackHeader::lookAtStaff(double x, int maxWidth)
int staff;
Composition *comp =
- static_cast<HeadersGroup *>(TQT_TQWIDGET(parent()))->getComposition();
+ static_cast<HeadersGroup *>(parent())->getComposition();
Track *track = comp->getTrackById(m_track);
int trackPos = comp->getTrackPositionById(m_track);
diff --git a/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp b/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp
index 9bc3133..e837028 100644
--- a/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp
+++ b/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp
@@ -61,7 +61,7 @@ namespace Rosegarden
MIDIInstrumentParameterPanel::MIDIInstrumentParameterPanel(RosegardenGUIDoc *doc, TQWidget* parent):
InstrumentParameterPanel(doc, parent),
m_rotaryFrame(0),
- m_rotaryMapper(new TQSignalMapper(TQT_TQOBJECT(this)))
+ m_rotaryMapper(new TQSignalMapper(this))
{
m_mainGrid = new TQGridLayout(this, 10, 3, 2, 1);
@@ -423,7 +423,7 @@ MIDIInstrumentParameterPanel::setupControllers(MidiDevice *md)
// Add signal mapping
//
- m_rotaryMapper->setMapping(TQT_TQOBJECT(rotary),
+ m_rotaryMapper->setMapping(rotary,
int(it->getControllerValue()));
count++;
diff --git a/src/gui/editors/segment/ControlEditorDialog.cpp b/src/gui/editors/segment/ControlEditorDialog.cpp
index 7a37027..f910299 100644
--- a/src/gui/editors/segment/ControlEditorDialog.cpp
+++ b/src/gui/editors/segment/ControlEditorDialog.cpp
@@ -335,7 +335,7 @@ ControlEditorDialog::slotClose()
void
ControlEditorDialog::setupActions()
{
- TDEAction* close = KStdAction::close(TQT_TQOBJECT(this),
+ TDEAction* close = KStdAction::close(this,
TQT_SLOT(slotClose()),
actionCollection());
diff --git a/src/gui/editors/segment/MarkerEditor.cpp b/src/gui/editors/segment/MarkerEditor.cpp
index a0b6f3c..058d030 100644
--- a/src/gui/editors/segment/MarkerEditor.cpp
+++ b/src/gui/editors/segment/MarkerEditor.cpp
@@ -365,7 +365,7 @@ MarkerEditor::slotClose()
void
MarkerEditor::setupActions()
{
- TDEAction* close = KStdAction::close(TQT_TQOBJECT(this),
+ TDEAction* close = KStdAction::close(this,
TQT_SLOT(slotClose()),
actionCollection());
@@ -394,7 +394,7 @@ MarkerEditor::setupActions()
TQCanvasPixmap pixmap(pixmapDir + "/toolbar/time-musical.png");
TQIconSet icon(pixmap);
- action = new TDERadioAction(i18n("&Musical Times"), icon, 0, TQT_TQOBJECT(this),
+ action = new TDERadioAction(i18n("&Musical Times"), icon, 0, this,
TQT_SLOT(slotMusicalTime()),
actionCollection(), "time_musical");
action->setExclusiveGroup("timeMode");
@@ -404,7 +404,7 @@ MarkerEditor::setupActions()
pixmap.load(pixmapDir + "/toolbar/time-real.png");
icon = TQIconSet(pixmap);
- action = new TDERadioAction(i18n("&Real Times"), icon, 0, TQT_TQOBJECT(this),
+ action = new TDERadioAction(i18n("&Real Times"), icon, 0, this,
TQT_SLOT(slotRealTime()),
actionCollection(), "time_real");
action->setExclusiveGroup("timeMode");
@@ -414,7 +414,7 @@ MarkerEditor::setupActions()
pixmap.load(pixmapDir + "/toolbar/time-raw.png");
icon = TQIconSet(pixmap);
- action = new TDERadioAction(i18n("Ra&w Times"), icon, 0, TQT_TQOBJECT(this),
+ action = new TDERadioAction(i18n("Ra&w Times"), icon, 0, this,
TQT_SLOT(slotRawTime()),
actionCollection(), "time_raw");
action->setExclusiveGroup("timeMode");
diff --git a/src/gui/editors/segment/TrackButtons.cpp b/src/gui/editors/segment/TrackButtons.cpp
index 2aef6e7..98bbb62 100644
--- a/src/gui/editors/segment/TrackButtons.cpp
+++ b/src/gui/editors/segment/TrackButtons.cpp
@@ -76,10 +76,10 @@ TrackButtons::TrackButtons(RosegardenGUIDoc* doc,
: TQFrame(parent, name, f),
m_doc(doc),
m_layout(new TQVBoxLayout(this)),
- m_recordSigMapper(new TQSignalMapper(TQT_TQOBJECT(this))),
- m_muteSigMapper(new TQSignalMapper(TQT_TQOBJECT(this))),
- m_clickedSigMapper(new TQSignalMapper(TQT_TQOBJECT(this))),
- m_instListSigMapper(new TQSignalMapper(TQT_TQOBJECT(this))),
+ m_recordSigMapper(new TQSignalMapper(this)),
+ m_muteSigMapper(new TQSignalMapper(this)),
+ m_clickedSigMapper(new TQSignalMapper(this)),
+ m_instListSigMapper(new TQSignalMapper(this)),
m_tracks(doc->getComposition().getNbTracks()),
m_offset(4),
m_cellSize(trackCellHeight),
@@ -192,7 +192,7 @@ TrackButtons::populateButtons()
// reset track tokens
m_trackLabels[i]->setId(track->getId());
- setButtonMapping(TQT_TQOBJECT(m_trackLabels[i]), track->getId());
+ setButtonMapping(m_trackLabels[i], track->getId());
m_trackLabels[i]->setPosition(i);
}
@@ -357,7 +357,7 @@ TrackButtons::slotUpdateTracks()
// RG_DEBUG << "TrackButtons::slotUpdateTracks - set button mapping at pos "
// << i << " to track id " << track->getId() << endl;
- setButtonMapping(TQT_TQOBJECT(m_trackLabels[i]), track->getId());
+ setButtonMapping(m_trackLabels[i], track->getId());
}
}
m_tracks = newNbTracks;
@@ -1070,8 +1070,8 @@ TQFrame* TrackButtons::makeButton(Rosegarden::TrackId trackId)
m_recordSigMapper, TQT_SLOT(map()));
connect(mute, TQT_SIGNAL(stateChanged(bool)),
m_muteSigMapper, TQT_SLOT(map()));
- m_recordSigMapper->setMapping(TQT_TQOBJECT(record), track->getPosition());
- m_muteSigMapper->setMapping(TQT_TQOBJECT(mute), track->getPosition());
+ m_recordSigMapper->setMapping(record, track->getPosition());
+ m_muteSigMapper->setMapping(mute, track->getPosition());
// Store the KLedButton
//
@@ -1109,7 +1109,7 @@ TQFrame* TrackButtons::makeButton(Rosegarden::TrackId trackId)
m_trackLabels.push_back(trackLabel);
// Connect it
- setButtonMapping(TQT_TQOBJECT(trackLabel), trackId);
+ setButtonMapping(trackLabel, trackId);
connect(trackLabel, TQT_SIGNAL(changeToInstrumentList()),
m_instListSigMapper, TQT_SLOT(map()));
diff --git a/src/gui/editors/segment/TrackLabel.cpp b/src/gui/editors/segment/TrackLabel.cpp
index 108fb7e..123d91a 100644
--- a/src/gui/editors/segment/TrackLabel.cpp
+++ b/src/gui/editors/segment/TrackLabel.cpp
@@ -184,7 +184,7 @@ TrackLabel::mouseDoubleClickEvent(TQMouseEvent *e)
bool ok = false;
- TQRegExpValidator validator(TQRegExp(".*"), TQT_TQOBJECT(this)); // empty is OK
+ TQRegExpValidator validator(TQRegExp(".*"), this); // empty is OK
TQString newText = KLineEditDlg::getText(i18n("Change track name"),
i18n("Enter new track name"),
diff --git a/src/gui/editors/segment/TriggerSegmentManager.cpp b/src/gui/editors/segment/TriggerSegmentManager.cpp
index 74f581e..cb343d9 100644
--- a/src/gui/editors/segment/TriggerSegmentManager.cpp
+++ b/src/gui/editors/segment/TriggerSegmentManager.cpp
@@ -373,12 +373,12 @@ TriggerSegmentManager::slotClose()
void
TriggerSegmentManager::setupActions()
{
- TDEAction* close = KStdAction::close(TQT_TQOBJECT(this),
+ TDEAction* close = KStdAction::close(this,
TQT_SLOT(slotClose()),
actionCollection());
m_closeButton->setText(close->text());
- connect(m_closeButton, TQT_SIGNAL(released()), TQT_TQOBJECT(this), TQT_SLOT(slotClose()));
+ connect(m_closeButton, TQT_SIGNAL(released()), this, TQT_SLOT(slotClose()));
TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
@@ -395,7 +395,7 @@ TriggerSegmentManager::setupActions()
actionCollection(),
KStdAction::stdName(KStdAction::Redo));
- new TDEAction(i18n("Pa&ste as New Triggered Segment"), CTRL + SHIFT + Key_V, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Pa&ste as New Triggered Segment"), CTRL + SHIFT + Key_V, this,
TQT_SLOT(slotPasteAsNew()), actionCollection(),
"paste_to_trigger_segment");
@@ -407,7 +407,7 @@ TriggerSegmentManager::setupActions()
TQCanvasPixmap pixmap(pixmapDir + "/toolbar/time-musical.png");
TQIconSet icon(pixmap);
- action = new TDERadioAction(i18n("&Musical Times"), icon, 0, TQT_TQOBJECT(this),
+ action = new TDERadioAction(i18n("&Musical Times"), icon, 0, this,
TQT_SLOT(slotMusicalTime()),
actionCollection(), "time_musical");
action->setExclusiveGroup("timeMode");
@@ -417,7 +417,7 @@ TriggerSegmentManager::setupActions()
pixmap.load(pixmapDir + "/toolbar/time-real.png");
icon = TQIconSet(pixmap);
- action = new TDERadioAction(i18n("&Real Times"), icon, 0, TQT_TQOBJECT(this),
+ action = new TDERadioAction(i18n("&Real Times"), icon, 0, this,
TQT_SLOT(slotRealTime()),
actionCollection(), "time_real");
action->setExclusiveGroup("timeMode");
@@ -427,7 +427,7 @@ TriggerSegmentManager::setupActions()
pixmap.load(pixmapDir + "/toolbar/time-raw.png");
icon = TQIconSet(pixmap);
- action = new TDERadioAction(i18n("Ra&w Times"), icon, 0, TQT_TQOBJECT(this),
+ action = new TDERadioAction(i18n("Ra&w Times"), icon, 0, this,
TQT_SLOT(slotRawTime()),
actionCollection(), "time_raw");
action->setExclusiveGroup("timeMode");
diff --git a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
index 3d09344..445fc33 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
+++ b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
@@ -189,7 +189,7 @@ CompositionView::CompositionView(RosegardenGUIDoc* doc,
}
if (doc) {
- doc->getAudioPreviewThread().setEmptyQueueListener(TQT_TQOBJECT(this));
+ doc->getAudioPreviewThread().setEmptyQueueListener(this);
}
m_segmentsDrawBuffer.setOptimization(TQPixmap::BestOptim);
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentTool.cpp b/src/gui/editors/segment/segmentcanvas/SegmentTool.cpp
index 5e309a7..2172abb 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentTool.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentTool.cpp
@@ -40,7 +40,7 @@ namespace Rosegarden
{
SegmentTool::SegmentTool(CompositionView* canvas, RosegardenGUIDoc *doc)
- : BaseTool("segment_tool_menu", dynamic_cast<TDEMainWindow*>(doc->parent())->factory(), TQT_TQOBJECT(canvas)),
+ : BaseTool("segment_tool_menu", dynamic_cast<TDEMainWindow*>(doc->parent())->factory(), canvas),
m_canvas(canvas),
m_doc(doc),
m_changeMade(false)
diff --git a/src/gui/editors/tempo/TempoView.cpp b/src/gui/editors/tempo/TempoView.cpp
index 001b610..30381db 100644
--- a/src/gui/editors/tempo/TempoView.cpp
+++ b/src/gui/editors/tempo/TempoView.cpp
@@ -576,36 +576,36 @@ TempoView::setupActions()
TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
TQIconSet icon(TQPixmap(pixmapDir + "/toolbar/event-insert-tempo.png"));
- new TDEAction(AddTempoChangeCommand::getGlobalName(), icon, Key_I, TQT_TQOBJECT(this),
+ new TDEAction(AddTempoChangeCommand::getGlobalName(), icon, Key_I, this,
TQT_SLOT(slotEditInsertTempo()), actionCollection(),
"insert_tempo");
TQCanvasPixmap pixmap(pixmapDir + "/toolbar/event-insert-timesig.png");
icon = TQIconSet(pixmap);
- new TDEAction(AddTimeSignatureCommand::getGlobalName(), icon, Key_G, TQT_TQOBJECT(this),
+ new TDEAction(AddTimeSignatureCommand::getGlobalName(), icon, Key_G, this,
TQT_SLOT(slotEditInsertTimeSignature()), actionCollection(),
"insert_timesig");
pixmap.load(pixmapDir + "/toolbar/event-delete.png");
icon = TQIconSet(pixmap);
- new TDEAction(i18n("&Delete"), icon, Key_Delete, TQT_TQOBJECT(this),
+ new TDEAction(i18n("&Delete"), icon, Key_Delete, this,
TQT_SLOT(slotEditDelete()), actionCollection(),
"delete");
pixmap.load(pixmapDir + "/toolbar/event-edit.png");
icon = TQIconSet(pixmap);
- new TDEAction(i18n("&Edit Item"), icon, Key_E, TQT_TQOBJECT(this),
+ new TDEAction(i18n("&Edit Item"), icon, Key_E, this,
TQT_SLOT(slotEdit()), actionCollection(),
"edit");
- new TDEAction(i18n("Select &All"), 0, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Select &All"), 0, this,
TQT_SLOT(slotSelectAll()), actionCollection(),
"select_all");
- new TDEAction(i18n("Clear Selection"), Key_Escape, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Clear Selection"), Key_Escape, this,
TQT_SLOT(slotClearSelection()), actionCollection(),
"clear_selection");
@@ -617,7 +617,7 @@ TempoView::setupActions()
pixmap.load(pixmapDir + "/toolbar/time-musical.png");
icon = TQIconSet(pixmap);
- action = new TDERadioAction(i18n("&Musical Times"), icon, 0, TQT_TQOBJECT(this),
+ action = new TDERadioAction(i18n("&Musical Times"), icon, 0, this,
TQT_SLOT(slotMusicalTime()),
actionCollection(), "time_musical");
action->setExclusiveGroup("timeMode");
@@ -627,7 +627,7 @@ TempoView::setupActions()
pixmap.load(pixmapDir + "/toolbar/time-real.png");
icon = TQIconSet(pixmap);
- action = new TDERadioAction(i18n("&Real Times"), icon, 0, TQT_TQOBJECT(this),
+ action = new TDERadioAction(i18n("&Real Times"), icon, 0, this,
TQT_SLOT(slotRealTime()),
actionCollection(), "time_real");
action->setExclusiveGroup("timeMode");
@@ -637,7 +637,7 @@ TempoView::setupActions()
pixmap.load(pixmapDir + "/toolbar/time-raw.png");
icon = TQIconSet(pixmap);
- action = new TDERadioAction(i18n("Ra&w Times"), icon, 0, TQT_TQOBJECT(this),
+ action = new TDERadioAction(i18n("Ra&w Times"), icon, 0, this,
TQT_SLOT(slotRawTime()),
actionCollection(), "time_raw");
action->setExclusiveGroup("timeMode");