TDE
/
rosegarden
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/rosegarden
0
0
Fork 0
Code Issues Releases Wiki Activity

Remove various '#define' strings - part 6

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/18/head
Michele Calgaro 12 months ago
parent 217eb15dfe
commit 9b054308ce
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
32 changed files with 629 additions and 629 deletions
Show Stats Download Patch File Download Diff File

408
src/gui/application/RosegardenGUIApp.cpp
View File

File diff suppressed because it is too large Load Diff

2
src/gui/application/main.cpp
Unescape View File

@ -594,7 +594,7 @@ int main(int argc, char *argv[])
rosegardengui = new RosegardenGUIApp(!app.noSequencerMode(), rosegardengui = new RosegardenGUIApp(!app.noSequencerMode(),
args->isSet("existingsequencer"), args->isSet("existingsequencer"),
TQT_TQOBJECT(startLogo)); startLogo);
rosegardengui->setIsFirstRun(newVersion); rosegardengui->setIsFirstRun(newVersion);

22
src/gui/dialogs/AudioManagerDialog.cpp
Unescape View File

@ -127,47 +127,47 @@ AudioManagerDialog::AudioManagerDialog(TQWidget *parent,
TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
TQIconSet icon(TQPixmap(pixmapDir + "/toolbar/transport-play.xpm")); TQIconSet icon(TQPixmap(pixmapDir + "/toolbar/transport-play.xpm"));
new TDEAction(i18n("&Add Audio File..."), "document-open", 0, TQT_TQOBJECT(this), new TDEAction(i18n("&Add Audio File..."), "document-open", 0, this,
TQT_SLOT(slotAdd()), actionCollection(), "add_audio"); TQT_SLOT(slotAdd()), actionCollection(), "add_audio");
new TDEAction(i18n("&Unload Audio File"), "edit-delete", 0, TQT_TQOBJECT(this), new TDEAction(i18n("&Unload Audio File"), "edit-delete", 0, this,
TQT_SLOT(slotRemove()), TQT_SLOT(slotRemove()),
actionCollection(), "remove_audio"); actionCollection(), "remove_audio");
icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/transport-play.xpm")); icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/transport-play.xpm"));
new TDEAction(i18n("&Play Preview"), icon, 0, TQT_TQOBJECT(this), new TDEAction(i18n("&Play Preview"), icon, 0, this,
TQT_SLOT(slotPlayPreview()), TQT_SLOT(slotPlayPreview()),
actionCollection(), "preview_audio"); actionCollection(), "preview_audio");
/*!!! Not actually implemented -- this never worked right! /*!!! Not actually implemented -- this never worked right!
new TDEAction(i18n("Re&label"), 0, 0, TQT_TQOBJECT(this), new TDEAction(i18n("Re&label"), 0, 0, this,
TQT_SLOT(slotRename()), TQT_SLOT(slotRename()),
actionCollection(), "rename_audio"); actionCollection(), "rename_audio");
*/ */
icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/insert_audio_into_track.xpm")); icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/insert_audio_into_track.xpm"));
new TDEAction(i18n("&Insert into Selected Audio Track"), new TDEAction(i18n("&Insert into Selected Audio Track"),
icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotInsert()), icon, 0, this, TQT_SLOT(slotInsert()),
actionCollection(), "insert_audio"); actionCollection(), "insert_audio");
new TDEAction(i18n("Unload &all Audio Files"), 0, 0, TQT_TQOBJECT(this), new TDEAction(i18n("Unload &all Audio Files"), 0, 0, this,
TQT_SLOT(slotRemoveAll()), TQT_SLOT(slotRemoveAll()),
actionCollection(), "remove_all_audio"); actionCollection(), "remove_all_audio");
new TDEAction(i18n("Unload all &Unused Audio Files"), 0, 0, TQT_TQOBJECT(this), new TDEAction(i18n("Unload all &Unused Audio Files"), 0, 0, this,
TQT_SLOT(slotRemoveAllUnused()), TQT_SLOT(slotRemoveAllUnused()),
actionCollection(), "remove_all_unused_audio"); actionCollection(), "remove_all_unused_audio");
new TDEAction(i18n("&Delete Unused Audio Files..."), 0, 0, TQT_TQOBJECT(this), new TDEAction(i18n("&Delete Unused Audio Files..."), 0, 0, this,
TQT_SLOT(slotDeleteUnused()), TQT_SLOT(slotDeleteUnused()),
actionCollection(), "delete_unused_audio"); actionCollection(), "delete_unused_audio");
new TDEAction(i18n("&Export Audio File..."), "fileexport", 0, TQT_TQOBJECT(this), new TDEAction(i18n("&Export Audio File..."), "fileexport", 0, this,
TQT_SLOT(slotExportAudio()), TQT_SLOT(slotExportAudio()),
actionCollection(), "export_audio"); actionCollection(), "export_audio");
/* /*
new TDEAction(i18n("Distribute Audio on &MIDI"), new TDEAction(i18n("Distribute Audio on &MIDI"),
0, 0, TQT_TQOBJECT(this), 0, 0, this,
TQT_SLOT(slotDistributeOnMidiSegment()), TQT_SLOT(slotDistributeOnMidiSegment()),
actionCollection(), actionCollection(),
"distribute_audio"); "distribute_audio");
@ -228,7 +228,7 @@ AudioManagerDialog::AudioManagerDialog(TQWidget *parent,
connect(m_playTimer, TQT_SIGNAL(timeout()), connect(m_playTimer, TQT_SIGNAL(timeout()),
this, TQT_SLOT(slotCancelPlayingAudio())); this, TQT_SLOT(slotCancelPlayingAudio()));
KStdAction::close(TQT_TQOBJECT(this), KStdAction::close(this,
TQT_SLOT(slotClose()), TQT_SLOT(slotClose()),
actionCollection()); actionCollection());

2
src/gui/dialogs/AudioSplitDialog.cpp
Unescape View File

@ -68,7 +68,7 @@ AudioSplitDialog::AudioSplitDialog(TQWidget *parent,
new TQLabel(i18n("AutoSplit Segment \"") + new TQLabel(i18n("AutoSplit Segment \"") +
strtoqstr(m_segment->getLabel()) + TQString("\""), w); strtoqstr(m_segment->getLabel()) + TQString("\""), w);
m_canvas = new TQCanvas(TQT_TQOBJECT(w)); m_canvas = new TQCanvas(w);
m_canvas->resize(m_canvasWidth, m_canvasHeight); m_canvas->resize(m_canvasWidth, m_canvasHeight);
m_canvasView = new TQCanvasView(m_canvas, w); m_canvasView = new TQCanvasView(m_canvas, w);
m_canvasView->setFixedWidth(m_canvasWidth); m_canvasView->setFixedWidth(m_canvasWidth);

30
src/gui/editors/eventlist/EventView.cpp
Unescape View File

@ -169,21 +169,21 @@ EventView::EventView(RosegardenGUIDoc *doc,
layout->addWidget(m_triggerName, 0, 1); layout->addWidget(m_triggerName, 0, 1);
TQPushButton *editButton = new TQPushButton(i18n("edit"), frame); TQPushButton *editButton = new TQPushButton(i18n("edit"), frame);
layout->addWidget(editButton, 0, 2); 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); layout->addWidget(new TQLabel(i18n("Base pitch: "), frame), 1, 0);
m_triggerPitch = new TQLabel(TQString("%1").arg(rec->getBasePitch()), frame); m_triggerPitch = new TQLabel(TQString("%1").arg(rec->getBasePitch()), frame);
layout->addWidget(m_triggerPitch, 1, 1); layout->addWidget(m_triggerPitch, 1, 1);
editButton = new TQPushButton(i18n("edit"), frame); editButton = new TQPushButton(i18n("edit"), frame);
layout->addWidget(editButton, 1, 2); 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); layout->addWidget(new TQLabel(i18n("Base velocity: "), frame), 2, 0);
m_triggerVelocity = new TQLabel(TQString("%1").arg(rec->getBaseVelocity()), frame); m_triggerVelocity = new TQLabel(TQString("%1").arg(rec->getBaseVelocity()), frame);
layout->addWidget(m_triggerVelocity, 2, 1); layout->addWidget(m_triggerVelocity, 2, 1);
editButton = new TQPushButton(i18n("edit"), frame); editButton = new TQPushButton(i18n("edit"), frame);
layout->addWidget(editButton, 2, 2); 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 /*!!! Comment out these two options, which are not yet used
anywhere else -- intended for use with library ornaments, not anywhere else -- intended for use with library ornaments, not
@ -209,11 +209,11 @@ EventView::EventView(RosegardenGUIDoc *doc,
adjust->setCurrentItem(2); 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); TQCheckBox *retune = new TQCheckBox(i18n("Adjust pitch to trigger note by default"), frame);
retune->setChecked(rec->getDefaultRetune()); 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); layout->addMultiCellWidget(retune, 4, 4, 1, 2);
*/ */
@ -1118,41 +1118,41 @@ EventView::setupActions()
TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
TQIconSet icon(TQPixmap(pixmapDir + "/toolbar/event-insert.png")); 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(), TQT_SLOT(slotEditInsert()), actionCollection(),
"insert"); "insert");
TQCanvasPixmap pixmap(pixmapDir + "/toolbar/event-delete.png"); TQCanvasPixmap pixmap(pixmapDir + "/toolbar/event-delete.png");
icon = TQIconSet(pixmap); 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(), TQT_SLOT(slotEditDelete()), actionCollection(),
"delete"); "delete");
pixmap.load(pixmapDir + "/toolbar/event-edit.png"); pixmap.load(pixmapDir + "/toolbar/event-edit.png");
icon = TQIconSet(pixmap); 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(), TQT_SLOT(slotEditEvent()), actionCollection(),
"edit_simple"); "edit_simple");
pixmap.load(pixmapDir + "/toolbar/event-edit-advanced.png"); pixmap.load(pixmapDir + "/toolbar/event-edit-advanced.png");
icon = TQIconSet(pixmap); 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(), TQT_SLOT(slotEditEventAdvanced()), actionCollection(),
"edit_advanced"); "edit_advanced");
// icon = TQIconSet(TQCanvasPixmap(pixmapDir + "/toolbar/eventfilter.xpm")); // 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(), TQT_SLOT(slotFilterSelection()), actionCollection(),
"filter_selection"); "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(), TQT_SLOT(slotSelectAll()), actionCollection(),
"select_all"); "select_all");
new TDEAction(i18n("Clear Selection"), Key_Escape, TQT_TQOBJECT(this), new TDEAction(i18n("Clear Selection"), Key_Escape, this,
TQT_SLOT(slotClearSelection()), actionCollection(), TQT_SLOT(slotClearSelection()), actionCollection(),
"clear_selection"); "clear_selection");
@ -1164,7 +1164,7 @@ EventView::setupActions()
pixmap.load(pixmapDir + "/toolbar/time-musical.png"); pixmap.load(pixmapDir + "/toolbar/time-musical.png");
icon = TQIconSet(pixmap); 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()), TQT_SLOT(slotMusicalTime()),
actionCollection(), "time_musical"); actionCollection(), "time_musical");
action->setExclusiveGroup("timeMode"); action->setExclusiveGroup("timeMode");
@ -1174,7 +1174,7 @@ EventView::setupActions()
pixmap.load(pixmapDir + "/toolbar/time-real.png"); pixmap.load(pixmapDir + "/toolbar/time-real.png");
icon = TQIconSet(pixmap); 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()), TQT_SLOT(slotRealTime()),
actionCollection(), "time_real"); actionCollection(), "time_real");
action->setExclusiveGroup("timeMode"); action->setExclusiveGroup("timeMode");
@ -1184,7 +1184,7 @@ EventView::setupActions()
pixmap.load(pixmapDir + "/toolbar/time-raw.png"); pixmap.load(pixmapDir + "/toolbar/time-raw.png");
icon = TQIconSet(pixmap); 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()), TQT_SLOT(slotRawTime()),
actionCollection(), "time_raw"); actionCollection(), "time_raw");
action->setExclusiveGroup("timeMode"); action->setExclusiveGroup("timeMode");

164
src/gui/editors/matrix/MatrixView.cpp
Unescape View File

@ -174,13 +174,13 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc,
20); // relation target/this (in percent) 20); // relation target/this (in percent)
connect(m_dockLeft, TQT_SIGNAL(iMBeingClosed()), connect(m_dockLeft, TQT_SIGNAL(iMBeingClosed()),
TQT_TQOBJECT(this), TQT_SLOT(slotParametersClosed())); this, TQT_SLOT(slotParametersClosed()));
connect(m_dockLeft, TQT_SIGNAL(hasUndocked()), 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 // Apparently, hasUndocked() is emitted when the dock widget's
// 'close' button on the dock handle is clicked. // 'close' button on the dock handle is clicked.
connect(m_mainDockWidget, TQT_SIGNAL(docking(KDockWidget*, KDockWidget::DockPosition)), 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(); Composition &comp = doc->getComposition();
@ -189,9 +189,9 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc,
initStatusBar(); initStatusBar();
connect(m_toolBox, TQT_SIGNAL(showContextHelp(const TQString &)), 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); m_config->setGroup(MatrixViewConfigGroup);
if (m_config->readBoolEntry("backgroundtextures-1.6-plus", true)) { 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 vertical scrollbars between matrix and piano
// //
connect(m_canvasView->verticalScrollBar(), TQT_SIGNAL(valueChanged(int)), 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)), 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(zoomIn()), this, TQT_SLOT(slotZoomIn()));
connect(m_canvasView, TQT_SIGNAL(zoomOut()), TQT_TQOBJECT(this), TQT_SLOT(slotZoomOut())); connect(m_canvasView, TQT_SIGNAL(zoomOut()), this, TQT_SLOT(slotZoomOut()));
connect(m_pianoView, TQT_SIGNAL(gotWheelEvent(TQWheelEvent*)), connect(m_pianoView, TQT_SIGNAL(gotWheelEvent(TQWheelEvent*)),
m_canvasView, TQT_SLOT(slotExternalWheelEvent(TQWheelEvent*))); m_canvasView, TQT_SLOT(slotExternalWheelEvent(TQWheelEvent*)));
@ -366,13 +366,13 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc,
// the canvas view rulers // the canvas view rulers
// //
connect(m_canvasView, TQT_SIGNAL(bottomWidgetHeightChanged(int)), 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()), connect(m_canvasView, TQT_SIGNAL(mouseEntered()),
TQT_TQOBJECT(this), TQT_SLOT(slotMouseEnteredCanvasView())); this, TQT_SLOT(slotMouseEnteredCanvasView()));
connect(m_canvasView, TQT_SIGNAL(mouseLeft()), connect(m_canvasView, TQT_SIGNAL(mouseLeft()),
TQT_TQOBJECT(this), TQT_SLOT(slotMouseLeftCanvasView())); this, TQT_SLOT(slotMouseLeftCanvasView()));
/* /*
TQObject::connect TQObject::connect
@ -402,31 +402,31 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc,
TQObject::connect TQObject::connect
(getCanvasView(), TQT_SIGNAL(hoveredOverNoteChanged(int, bool, timeT)), (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 TQObject::connect
(m_pitchRuler, TQT_SIGNAL(hoveredOverKeyChanged(unsigned int)), (m_pitchRuler, TQT_SIGNAL(hoveredOverKeyChanged(unsigned int)),
TQT_TQOBJECT(this), TQT_SLOT (slotHoveredOverKeyChanged(unsigned int))); this, TQT_SLOT (slotHoveredOverKeyChanged(unsigned int)));
TQObject::connect TQObject::connect
(m_pitchRuler, TQT_SIGNAL(keyPressed(unsigned int, bool)), (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 TQObject::connect
(m_pitchRuler, TQT_SIGNAL(keySelected(unsigned int, bool)), (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 TQObject::connect
(m_pitchRuler, TQT_SIGNAL(keyReleased(unsigned int, bool)), (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 TQObject::connect
(getCanvasView(), TQT_SIGNAL(hoveredOverAbsoluteTimeChanged(unsigned int)), (getCanvasView(), TQT_SIGNAL(hoveredOverAbsoluteTimeChanged(unsigned int)),
TQT_TQOBJECT(this), TQT_SLOT (slotHoveredOverAbsoluteTimeChanged(unsigned int))); this, TQT_SLOT (slotHoveredOverAbsoluteTimeChanged(unsigned int)));
TQObject::connect TQObject::connect
(doc, TQT_SIGNAL(pointerPositionChanged(timeT)), (doc, TQT_SIGNAL(pointerPositionChanged(timeT)),
TQT_TQOBJECT(this), TQT_SLOT(slotSetPointerPosition(timeT))); this, TQT_SLOT(slotSetPointerPosition(timeT)));
MATRIX_DEBUG << "MatrixView : applying layout\n"; MATRIX_DEBUG << "MatrixView : applying layout\n";
@ -468,12 +468,12 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc,
TQObject::connect TQObject::connect
(topStandardRuler->getLoopRuler(), (topStandardRuler->getLoopRuler(),
TQT_SIGNAL(setPointerPosition(timeT)), TQT_SIGNAL(setPointerPosition(timeT)),
TQT_TQOBJECT(this), TQT_SLOT(slotSetInsertCursorPosition(timeT))); this, TQT_SLOT(slotSetInsertCursorPosition(timeT)));
TQObject::connect TQObject::connect
(topStandardRuler, (topStandardRuler,
TQT_SIGNAL(dragPointerToPosition(timeT)), TQT_SIGNAL(dragPointerToPosition(timeT)),
TQT_TQOBJECT(this), TQT_SLOT(slotSetInsertCursorPosition(timeT))); this, TQT_SLOT(slotSetInsertCursorPosition(timeT)));
topStandardRuler->getLoopRuler()->setBackgroundColor topStandardRuler->getLoopRuler()->setBackgroundColor
(GUIPalette::getColour(GUIPalette::InsertCursorRuler)); (GUIPalette::getColour(GUIPalette::InsertCursorRuler));
@ -488,7 +488,7 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc,
connect(bottomStandardRuler->getLoopRuler(), TQT_SIGNAL(stopMouseMove()), connect(bottomStandardRuler->getLoopRuler(), TQT_SIGNAL(stopMouseMove()),
m_canvasView, TQT_SLOT(stopAutoScroll())); m_canvasView, TQT_SLOT(stopAutoScroll()));
connect(m_bottomStandardRuler, TQT_SIGNAL(dragPointerToPosition(timeT)), connect(m_bottomStandardRuler, TQT_SIGNAL(dragPointerToPosition(timeT)),
TQT_TQOBJECT(this), TQT_SLOT(slotSetPointerPosition(timeT))); this, TQT_SLOT(slotSetPointerPosition(timeT)));
// Force height for the moment // Force height for the moment
// //
@ -637,147 +637,147 @@ void MatrixView::setupActions()
TQIconSet icon(TQPixmap(pixmapDir + "/toolbar/select.xpm")); TQIconSet icon(TQPixmap(pixmapDir + "/toolbar/select.xpm"));
toolAction = new TDERadioAction(i18n("&Select and Edit"), icon, Key_F2, toolAction = new TDERadioAction(i18n("&Select and Edit"), icon, Key_F2,
TQT_TQOBJECT(this), TQT_SLOT(slotSelectSelected()), this, TQT_SLOT(slotSelectSelected()),
actionCollection(), "select"); actionCollection(), "select");
toolAction->setExclusiveGroup("tools"); toolAction->setExclusiveGroup("tools");
toolAction = new TDERadioAction(i18n("&Draw"), "pencil", Key_F3, toolAction = new TDERadioAction(i18n("&Draw"), "pencil", Key_F3,
TQT_TQOBJECT(this), TQT_SLOT(slotPaintSelected()), this, TQT_SLOT(slotPaintSelected()),
actionCollection(), "draw"); actionCollection(), "draw");
toolAction->setExclusiveGroup("tools"); toolAction->setExclusiveGroup("tools");
toolAction = new TDERadioAction(i18n("&Erase"), "eraser", Key_F4, toolAction = new TDERadioAction(i18n("&Erase"), "eraser", Key_F4,
TQT_TQOBJECT(this), TQT_SLOT(slotEraseSelected()), this, TQT_SLOT(slotEraseSelected()),
actionCollection(), "erase"); actionCollection(), "erase");
toolAction->setExclusiveGroup("tools"); toolAction->setExclusiveGroup("tools");
toolAction = new TDERadioAction(i18n("&Move"), "move", Key_F5, toolAction = new TDERadioAction(i18n("&Move"), "move", Key_F5,
TQT_TQOBJECT(this), TQT_SLOT(slotMoveSelected()), this, TQT_SLOT(slotMoveSelected()),
actionCollection(), "move"); actionCollection(), "move");
toolAction->setExclusiveGroup("tools"); toolAction->setExclusiveGroup("tools");
TQCanvasPixmap pixmap(pixmapDir + "/toolbar/resize.xpm"); TQCanvasPixmap pixmap(pixmapDir + "/toolbar/resize.xpm");
icon = TQIconSet(pixmap); icon = TQIconSet(pixmap);
toolAction = new TDERadioAction(i18n("Resi&ze"), icon, Key_F6, toolAction = new TDERadioAction(i18n("Resi&ze"), icon, Key_F6,
TQT_TQOBJECT(this), TQT_SLOT(slotResizeSelected()), this, TQT_SLOT(slotResizeSelected()),
actionCollection(), "resize"); actionCollection(), "resize");
toolAction->setExclusiveGroup("tools"); toolAction->setExclusiveGroup("tools");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("chord"))); icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("chord")));
(new TDEToggleAction(i18n("C&hord Insert Mode"), icon, Key_H, (new TDEToggleAction(i18n("C&hord Insert Mode"), icon, Key_H,
TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModeStatus()), this, TQT_SLOT(slotUpdateInsertModeStatus()),
actionCollection(), "chord_mode"))-> actionCollection(), "chord_mode"))->
setChecked(false); setChecked(false);
pixmap.load(pixmapDir + "/toolbar/step_by_step.xpm"); pixmap.load(pixmapDir + "/toolbar/step_by_step.xpm");
icon = TQIconSet(pixmap); 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(), TQT_SLOT(slotToggleStepByStep()), actionCollection(),
"toggle_step_by_step"); "toggle_step_by_step");
pixmap.load(pixmapDir + "/toolbar/quantize.png"); pixmap.load(pixmapDir + "/toolbar/quantize.png");
icon = TQIconSet(pixmap); 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(), TQT_SLOT(slotTransformsQuantize()), actionCollection(),
"quantize"); "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(), TQT_SLOT(slotTransformsRepeatQuantize()), actionCollection(),
"repeat_quantize"); "repeat_quantize");
new TDEAction(CollapseNotesCommand::getGlobalName(), Key_Equal + CTRL, TQT_TQOBJECT(this), new TDEAction(CollapseNotesCommand::getGlobalName(), Key_Equal + CTRL, this,
TQT_SLOT(slotTransformsCollapseNotes()), actionCollection(), TQT_SLOT(slotTransformsCollapseNotes()), actionCollection(),
"collapse_notes"); "collapse_notes");
new TDEAction(i18n("&Legato"), Key_Minus, TQT_TQOBJECT(this), new TDEAction(i18n("&Legato"), Key_Minus, this,
TQT_SLOT(slotTransformsLegato()), actionCollection(), TQT_SLOT(slotTransformsLegato()), actionCollection(),
"legatoize"); "legatoize");
new TDEAction(ChangeVelocityCommand::getGlobalName(10), 0, new TDEAction(ChangeVelocityCommand::getGlobalName(10), 0,
Key_Up + SHIFT, TQT_TQOBJECT(this), Key_Up + SHIFT, this,
TQT_SLOT(slotVelocityUp()), actionCollection(), TQT_SLOT(slotVelocityUp()), actionCollection(),
"velocity_up"); "velocity_up");
new TDEAction(ChangeVelocityCommand::getGlobalName( -10), 0, new TDEAction(ChangeVelocityCommand::getGlobalName( -10), 0,
Key_Down + SHIFT, TQT_TQOBJECT(this), Key_Down + SHIFT, this,
TQT_SLOT(slotVelocityDown()), actionCollection(), TQT_SLOT(slotVelocityDown()), actionCollection(),
"velocity_down"); "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(), TQT_SLOT(slotSetVelocitiesToCurrent()), actionCollection(),
"set_to_current_velocity"); "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(), TQT_SLOT(slotSetVelocities()), actionCollection(),
"set_velocities"); "set_velocities");
new TDEAction(i18n("Trigger Se&gment..."), 0, TQT_TQOBJECT(this), new TDEAction(i18n("Trigger Se&gment..."), 0, this,
TQT_SLOT(slotTriggerSegment()), actionCollection(), TQT_SLOT(slotTriggerSegment()), actionCollection(),
"trigger_segment"); "trigger_segment");
new TDEAction(i18n("Remove Triggers..."), 0, TQT_TQOBJECT(this), new TDEAction(i18n("Remove Triggers..."), 0, this,
TQT_SLOT(slotRemoveTriggers()), actionCollection(), TQT_SLOT(slotRemoveTriggers()), actionCollection(),
"remove_trigger"); "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(), TQT_SLOT(slotSelectAll()), actionCollection(),
"select_all"); "select_all");
new TDEAction(i18n("&Delete"), Key_Delete, TQT_TQOBJECT(this), new TDEAction(i18n("&Delete"), Key_Delete, this,
TQT_SLOT(slotEditDelete()), actionCollection(), TQT_SLOT(slotEditDelete()), actionCollection(),
"delete"); "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(), TQT_SLOT(slotStepBackward()), actionCollection(),
"cursor_back"); "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(), TQT_SLOT(slotStepForward()), actionCollection(),
"cursor_forward"); "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(), TQT_SLOT(slotJumpBackward()), actionCollection(),
"cursor_back_bar"); "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(), TQT_SLOT(slotJumpForward()), actionCollection(),
"cursor_forward_bar"); "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(), TQT_SLOT(slotExtendSelectionBackward()), actionCollection(),
"extend_selection_backward"); "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(), TQT_SLOT(slotExtendSelectionForward()), actionCollection(),
"extend_selection_forward"); "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(), TQT_SLOT(slotExtendSelectionBackwardBar()), actionCollection(),
"extend_selection_backward_bar"); "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(), TQT_SLOT(slotExtendSelectionForwardBar()), actionCollection(),
"extend_selection_forward_bar"); "extend_selection_forward_bar");
new TDEAction(i18n("Cursor to St&art"), 0, new TDEAction(i18n("Cursor to St&art"), 0,
/* #1025717: conflicting meanings for ctrl+a - dupe with Select All /* #1025717: conflicting meanings for ctrl+a - dupe with Select All
Key_A + CTRL, */ TQT_TQOBJECT(this), Key_A + CTRL, */ this,
TQT_SLOT(slotJumpToStart()), actionCollection(), TQT_SLOT(slotJumpToStart()), actionCollection(),
"cursor_start"); "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(), TQT_SLOT(slotJumpToEnd()), actionCollection(),
"cursor_end"); "cursor_end");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-cursor-to-pointer"))); ("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(), TQT_SLOT(slotJumpCursorToPlayback()), actionCollection(),
"cursor_to_playback_pointer"); "cursor_to_playback_pointer");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-play"))); ("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"); TQT_SIGNAL(play()), actionCollection(), "play");
// Alternative shortcut for Play // Alternative shortcut for Play
TDEShortcut playShortcut = play->shortcut(); TDEShortcut playShortcut = play->shortcut();
@ -786,70 +786,70 @@ void MatrixView::setupActions()
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-stop"))); ("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"); TQT_SIGNAL(stop()), actionCollection(), "stop");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-rewind"))); ("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(), TQT_SIGNAL(rewindPlayback()), actionCollection(),
"playback_pointer_back_bar"); "playback_pointer_back_bar");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-ffwd"))); ("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(), TQT_SIGNAL(fastForwardPlayback()), actionCollection(),
"playback_pointer_forward_bar"); "playback_pointer_forward_bar");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-rewind-end"))); ("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(), TQT_SIGNAL(rewindPlaybackToBeginning()), actionCollection(),
"playback_pointer_start"); "playback_pointer_start");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-ffwd-end"))); ("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(), TQT_SIGNAL(fastForwardPlaybackToEnd()), actionCollection(),
"playback_pointer_end"); "playback_pointer_end");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-pointer-to-cursor"))); ("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(), TQT_SLOT(slotJumpPlaybackToCursor()), actionCollection(),
"playback_pointer_to_cursor"); "playback_pointer_to_cursor");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-solo"))); ("transport-solo")));
new TDEToggleAction(i18n("&Solo"), icon, 0, TQT_TQOBJECT(this), new TDEToggleAction(i18n("&Solo"), icon, 0, this,
TQT_SLOT(slotToggleSolo()), actionCollection(), TQT_SLOT(slotToggleSolo()), actionCollection(),
"toggle_solo"); "toggle_solo");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-tracking"))); ("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(), TQT_SLOT(slotToggleTracking()), actionCollection(),
"toggle_tracking"))->setChecked(m_playTracking); "toggle_tracking"))->setChecked(m_playTracking);
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-panic"))); ("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"); 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(), TQT_SLOT(slotPreviewSelection()), actionCollection(),
"preview_selection"); "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(), TQT_SLOT(slotClearLoop()), actionCollection(),
"clear_loop"); "clear_loop");
new TDEAction(i18n("Clear Selection"), Key_Escape, TQT_TQOBJECT(this), new TDEAction(i18n("Clear Selection"), Key_Escape, this,
TQT_SLOT(slotClearSelection()), actionCollection(), TQT_SLOT(slotClearSelection()), actionCollection(),
"clear_selection"); "clear_selection");
// icon = TQIconSet(TQCanvasPixmap(pixmapDir + "/toolbar/eventfilter.xpm")); // 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(), TQT_SLOT(slotFilterSelection()), actionCollection(),
"filter_selection"); "filter_selection");
@ -874,16 +874,16 @@ void MatrixView::setupActions()
timeT d = m_snapValues[i]; timeT d = m_snapValues[i];
if (d == SnapGrid::NoSnap) { if (d == SnapGrid::NoSnap) {
new TDEAction(i18n("&No Snap"), 0, TQT_TQOBJECT(this), new TDEAction(i18n("&No Snap"), 0, this,
TQT_SLOT(slotSetSnapFromAction()), TQT_SLOT(slotSetSnapFromAction()),
actionCollection(), "snap_none"); actionCollection(), "snap_none");
} else if (d == SnapGrid::SnapToUnit) { } else if (d == SnapGrid::SnapToUnit) {
} else if (d == SnapGrid::SnapToBeat) { } 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()), TQT_SLOT(slotSetSnapFromAction()),
actionCollection(), "snap_beat"); actionCollection(), "snap_beat");
} else if (d == SnapGrid::SnapToBar) { } 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()), TQT_SLOT(slotSetSnapFromAction()),
actionCollection(), "snap_bar"); actionCollection(), "snap_bar");
} else { } else {
@ -903,7 +903,7 @@ void MatrixView::setupActions()
TQString actionName = TQString("snap_%1").arg(int((crotchetDuration * 4) / d)); TQString actionName = TQString("snap_%1").arg(int((crotchetDuration * 4) / d));
if (d == (crotchetDuration * 3) / 2) actionName = "snap_3"; 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(), TQT_SLOT(slotSetSnapFromAction()), actionCollection(),
actionName.ascii()); actionName.ascii());
} }
@ -912,16 +912,16 @@ void MatrixView::setupActions()
// //
// Settings menu // Settings menu
// //
new TDEAction(i18n("Show Instrument Parameters"), 0, TQT_TQOBJECT(this), new TDEAction(i18n("Show Instrument Parameters"), 0, this,
TQT_SLOT(slotDockParametersBack()), TQT_SLOT(slotDockParametersBack()),
actionCollection(), actionCollection(),
"show_inst_parameters"); "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()), TQT_SLOT(slotToggleChordsRuler()),
actionCollection(), "show_chords_ruler"); 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()), TQT_SLOT(slotToggleTempoRuler()),
actionCollection(), "show_tempo_ruler"); actionCollection(), "show_tempo_ruler");
@ -1313,10 +1313,10 @@ void MatrixView::slotSelectSelected()
EditTool* selector = m_toolBox->getTool(MatrixSelector::ToolName); EditTool* selector = m_toolBox->getTool(MatrixSelector::ToolName);
connect(selector, TQT_SIGNAL(gotSelection()), connect(selector, TQT_SIGNAL(gotSelection()),
TQT_TQOBJECT(this), TQT_SLOT(slotNewSelection())); this, TQT_SLOT(slotNewSelection()));
connect(selector, TQT_SIGNAL(editTriggerSegment(int)), connect(selector, TQT_SIGNAL(editTriggerSegment(int)),
TQT_TQOBJECT(this), TQT_SIGNAL(editTriggerSegment(int))); this, TQT_SIGNAL(editTriggerSegment(int)));
setTool(selector); setTool(selector);
} }
@ -2148,7 +2148,7 @@ MatrixView::initActionsToolbar()
} }
connect(m_snapGridCombo, TQT_SIGNAL(activated(int)), 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 // 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 // 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")); m_quantizeCombo->insertItem(noMap, i18n("Off"));
connect(m_quantizeCombo, TQT_SIGNAL(activated(int)), connect(m_quantizeCombo, TQT_SIGNAL(activated(int)),
TQT_TQOBJECT(this), TQT_SLOT(slotQuantizeSelection(int))); this, TQT_SLOT(slotQuantizeSelection(int)));
} }
void void
@ -2919,7 +2919,7 @@ MatrixView::slotToggleStepByStep()
return ; return ;
} }
if (action->isChecked()) { // after toggling, that is if (action->isChecked()) { // after toggling, that is
emit stepByStepTargetRequested(TQT_TQOBJECT(this)); emit stepByStepTargetRequested(this);
} else { } else {
emit stepByStepTargetRequested(0); emit stepByStepTargetRequested(0);
} }
@ -3024,19 +3024,19 @@ MatrixView::slotPercussionSetChanged(Instrument * newInstr)
TQObject::connect TQObject::connect
(pitchRuler, TQT_SIGNAL(hoveredOverKeyChanged(unsigned int)), (pitchRuler, TQT_SIGNAL(hoveredOverKeyChanged(unsigned int)),
TQT_TQOBJECT(this), TQT_SLOT (slotHoveredOverKeyChanged(unsigned int))); this, TQT_SLOT (slotHoveredOverKeyChanged(unsigned int)));
TQObject::connect TQObject::connect
(pitchRuler, TQT_SIGNAL(keyPressed(unsigned int, bool)), (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 TQObject::connect
(pitchRuler, TQT_SIGNAL(keySelected(unsigned int, bool)), (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 TQObject::connect
(pitchRuler, TQT_SIGNAL(keyReleased(unsigned int, bool)), (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 // Replace the old pitchruler widget
m_pitchRuler = pitchRuler; m_pitchRuler = pitchRuler;

348
src/gui/editors/notation/NotationView.cpp
View File

File diff suppressed because it is too large Load Diff

2
src/gui/editors/notation/TrackHeader.cpp
Unescape View File

@ -272,7 +272,7 @@ TrackHeader::lookAtStaff(double x, int maxWidth)
int staff; int staff;
Composition *comp = Composition *comp =
static_cast<HeadersGroup *>(TQT_TQWIDGET(parent()))->getComposition(); static_cast<HeadersGroup *>(parent())->getComposition();
Track *track = comp->getTrackById(m_track); Track *track = comp->getTrackById(m_track);
int trackPos = comp->getTrackPositionById(m_track); int trackPos = comp->getTrackPositionById(m_track);

4
src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp
Unescape View File

@ -61,7 +61,7 @@ namespace Rosegarden
MIDIInstrumentParameterPanel::MIDIInstrumentParameterPanel(RosegardenGUIDoc *doc, TQWidget* parent): MIDIInstrumentParameterPanel::MIDIInstrumentParameterPanel(RosegardenGUIDoc *doc, TQWidget* parent):
InstrumentParameterPanel(doc, parent), InstrumentParameterPanel(doc, parent),
m_rotaryFrame(0), m_rotaryFrame(0),
m_rotaryMapper(new TQSignalMapper(TQT_TQOBJECT(this))) m_rotaryMapper(new TQSignalMapper(this))
{ {
m_mainGrid = new TQGridLayout(this, 10, 3, 2, 1); m_mainGrid = new TQGridLayout(this, 10, 3, 2, 1);
@ -423,7 +423,7 @@ MIDIInstrumentParameterPanel::setupControllers(MidiDevice *md)
// Add signal mapping // Add signal mapping
// //
m_rotaryMapper->setMapping(TQT_TQOBJECT(rotary), m_rotaryMapper->setMapping(rotary,
int(it->getControllerValue())); int(it->getControllerValue()));
count++; count++;

2
src/gui/editors/segment/ControlEditorDialog.cpp
Unescape View File

@ -335,7 +335,7 @@ ControlEditorDialog::slotClose()
void void
ControlEditorDialog::setupActions() ControlEditorDialog::setupActions()
{ {
TDEAction* close = KStdAction::close(TQT_TQOBJECT(this), TDEAction* close = KStdAction::close(this,
TQT_SLOT(slotClose()), TQT_SLOT(slotClose()),
actionCollection()); actionCollection());

8
src/gui/editors/segment/MarkerEditor.cpp
Unescape View File

@ -365,7 +365,7 @@ MarkerEditor::slotClose()
void void
MarkerEditor::setupActions() MarkerEditor::setupActions()
{ {
TDEAction* close = KStdAction::close(TQT_TQOBJECT(this), TDEAction* close = KStdAction::close(this,
TQT_SLOT(slotClose()), TQT_SLOT(slotClose()),
actionCollection()); actionCollection());
@ -394,7 +394,7 @@ MarkerEditor::setupActions()
TQCanvasPixmap pixmap(pixmapDir + "/toolbar/time-musical.png"); TQCanvasPixmap pixmap(pixmapDir + "/toolbar/time-musical.png");
TQIconSet icon(pixmap); 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()), TQT_SLOT(slotMusicalTime()),
actionCollection(), "time_musical"); actionCollection(), "time_musical");
action->setExclusiveGroup("timeMode"); action->setExclusiveGroup("timeMode");
@ -404,7 +404,7 @@ MarkerEditor::setupActions()
pixmap.load(pixmapDir + "/toolbar/time-real.png"); pixmap.load(pixmapDir + "/toolbar/time-real.png");
icon = TQIconSet(pixmap); 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()), TQT_SLOT(slotRealTime()),
actionCollection(), "time_real"); actionCollection(), "time_real");
action->setExclusiveGroup("timeMode"); action->setExclusiveGroup("timeMode");
@ -414,7 +414,7 @@ MarkerEditor::setupActions()
pixmap.load(pixmapDir + "/toolbar/time-raw.png"); pixmap.load(pixmapDir + "/toolbar/time-raw.png");
icon = TQIconSet(pixmap); 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()), TQT_SLOT(slotRawTime()),
actionCollection(), "time_raw"); actionCollection(), "time_raw");
action->setExclusiveGroup("timeMode"); action->setExclusiveGroup("timeMode");

18
src/gui/editors/segment/TrackButtons.cpp
Unescape View File

@ -76,10 +76,10 @@ TrackButtons::TrackButtons(RosegardenGUIDoc* doc,
: TQFrame(parent, name, f), : TQFrame(parent, name, f),
m_doc(doc), m_doc(doc),
m_layout(new TQVBoxLayout(this)), m_layout(new TQVBoxLayout(this)),
m_recordSigMapper(new TQSignalMapper(TQT_TQOBJECT(this))), m_recordSigMapper(new TQSignalMapper(this)),
m_muteSigMapper(new TQSignalMapper(TQT_TQOBJECT(this))), m_muteSigMapper(new TQSignalMapper(this)),
m_clickedSigMapper(new TQSignalMapper(TQT_TQOBJECT(this))), m_clickedSigMapper(new TQSignalMapper(this)),
m_instListSigMapper(new TQSignalMapper(TQT_TQOBJECT(this))), m_instListSigMapper(new TQSignalMapper(this)),
m_tracks(doc->getComposition().getNbTracks()), m_tracks(doc->getComposition().getNbTracks()),
m_offset(4), m_offset(4),
m_cellSize(trackCellHeight), m_cellSize(trackCellHeight),
@ -192,7 +192,7 @@ TrackButtons::populateButtons()
// reset track tokens // reset track tokens
m_trackLabels[i]->setId(track->getId()); 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); m_trackLabels[i]->setPosition(i);
} }
@ -357,7 +357,7 @@ TrackButtons::slotUpdateTracks()
// RG_DEBUG << "TrackButtons::slotUpdateTracks - set button mapping at pos " // RG_DEBUG << "TrackButtons::slotUpdateTracks - set button mapping at pos "
// << i << " to track id " << track->getId() << endl; // << i << " to track id " << track->getId() << endl;
setButtonMapping(TQT_TQOBJECT(m_trackLabels[i]), track->getId()); setButtonMapping(m_trackLabels[i], track->getId());
} }
} }
m_tracks = newNbTracks; m_tracks = newNbTracks;
@ -1070,8 +1070,8 @@ TQFrame* TrackButtons::makeButton(Rosegarden::TrackId trackId)
m_recordSigMapper, TQT_SLOT(map())); m_recordSigMapper, TQT_SLOT(map()));
connect(mute, TQT_SIGNAL(stateChanged(bool)), connect(mute, TQT_SIGNAL(stateChanged(bool)),
m_muteSigMapper, TQT_SLOT(map())); m_muteSigMapper, TQT_SLOT(map()));
m_recordSigMapper->setMapping(TQT_TQOBJECT(record), track->getPosition()); m_recordSigMapper->setMapping(record, track->getPosition());
m_muteSigMapper->setMapping(TQT_TQOBJECT(mute), track->getPosition()); m_muteSigMapper->setMapping(mute, track->getPosition());
// Store the KLedButton // Store the KLedButton
// //
@ -1109,7 +1109,7 @@ TQFrame* TrackButtons::makeButton(Rosegarden::TrackId trackId)
m_trackLabels.push_back(trackLabel); m_trackLabels.push_back(trackLabel);
// Connect it // Connect it
setButtonMapping(TQT_TQOBJECT(trackLabel), trackId); setButtonMapping(trackLabel, trackId);
connect(trackLabel, TQT_SIGNAL(changeToInstrumentList()), connect(trackLabel, TQT_SIGNAL(changeToInstrumentList()),
m_instListSigMapper, TQT_SLOT(map())); m_instListSigMapper, TQT_SLOT(map()));

2
src/gui/editors/segment/TrackLabel.cpp
Unescape View File

@ -184,7 +184,7 @@ TrackLabel::mouseDoubleClickEvent(TQMouseEvent *e)
bool ok = false; 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"), TQString newText = KLineEditDlg::getText(i18n("Change track name"),
i18n("Enter new track name"), i18n("Enter new track name"),

12
src/gui/editors/segment/TriggerSegmentManager.cpp
Unescape View File

@ -373,12 +373,12 @@ TriggerSegmentManager::slotClose()
void void
TriggerSegmentManager::setupActions() TriggerSegmentManager::setupActions()
{ {
TDEAction* close = KStdAction::close(TQT_TQOBJECT(this), TDEAction* close = KStdAction::close(this,
TQT_SLOT(slotClose()), TQT_SLOT(slotClose()),
actionCollection()); actionCollection());
m_closeButton->setText(close->text()); 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/"); TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
@ -395,7 +395,7 @@ TriggerSegmentManager::setupActions()
actionCollection(), actionCollection(),
KStdAction::stdName(KStdAction::Redo)); 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(), TQT_SLOT(slotPasteAsNew()), actionCollection(),
"paste_to_trigger_segment"); "paste_to_trigger_segment");
@ -407,7 +407,7 @@ TriggerSegmentManager::setupActions()
TQCanvasPixmap pixmap(pixmapDir + "/toolbar/time-musical.png"); TQCanvasPixmap pixmap(pixmapDir + "/toolbar/time-musical.png");
TQIconSet icon(pixmap); 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()), TQT_SLOT(slotMusicalTime()),
actionCollection(), "time_musical"); actionCollection(), "time_musical");
action->setExclusiveGroup("timeMode"); action->setExclusiveGroup("timeMode");
@ -417,7 +417,7 @@ TriggerSegmentManager::setupActions()
pixmap.load(pixmapDir + "/toolbar/time-real.png"); pixmap.load(pixmapDir + "/toolbar/time-real.png");
icon = TQIconSet(pixmap); 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()), TQT_SLOT(slotRealTime()),
actionCollection(), "time_real"); actionCollection(), "time_real");
action->setExclusiveGroup("timeMode"); action->setExclusiveGroup("timeMode");
@ -427,7 +427,7 @@ TriggerSegmentManager::setupActions()
pixmap.load(pixmapDir + "/toolbar/time-raw.png"); pixmap.load(pixmapDir + "/toolbar/time-raw.png");
icon = TQIconSet(pixmap); 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()), TQT_SLOT(slotRawTime()),
actionCollection(), "time_raw"); actionCollection(), "time_raw");
action->setExclusiveGroup("timeMode"); action->setExclusiveGroup("timeMode");

2
src/gui/editors/segment/segmentcanvas/CompositionView.cpp
Unescape View File

@ -189,7 +189,7 @@ CompositionView::CompositionView(RosegardenGUIDoc* doc,
} }
if (doc) { if (doc) {
doc->getAudioPreviewThread().setEmptyQueueListener(TQT_TQOBJECT(this)); doc->getAudioPreviewThread().setEmptyQueueListener(this);
} }
m_segmentsDrawBuffer.setOptimization(TQPixmap::BestOptim); m_segmentsDrawBuffer.setOptimization(TQPixmap::BestOptim);

2
src/gui/editors/segment/segmentcanvas/SegmentTool.cpp
Unescape View File

@ -40,7 +40,7 @@ namespace Rosegarden
{ {
SegmentTool::SegmentTool(CompositionView* canvas, RosegardenGUIDoc *doc) 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_canvas(canvas),
m_doc(doc), m_doc(doc),
m_changeMade(false) m_changeMade(false)

18
src/gui/editors/tempo/TempoView.cpp
Unescape View File

@ -576,36 +576,36 @@ TempoView::setupActions()
TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
TQIconSet icon(TQPixmap(pixmapDir + "/toolbar/event-insert-tempo.png")); 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(), TQT_SLOT(slotEditInsertTempo()), actionCollection(),
"insert_tempo"); "insert_tempo");
TQCanvasPixmap pixmap(pixmapDir + "/toolbar/event-insert-timesig.png"); TQCanvasPixmap pixmap(pixmapDir + "/toolbar/event-insert-timesig.png");
icon = TQIconSet(pixmap); 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(), TQT_SLOT(slotEditInsertTimeSignature()), actionCollection(),
"insert_timesig"); "insert_timesig");
pixmap.load(pixmapDir + "/toolbar/event-delete.png"); pixmap.load(pixmapDir + "/toolbar/event-delete.png");
icon = TQIconSet(pixmap); 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(), TQT_SLOT(slotEditDelete()), actionCollection(),
"delete"); "delete");
pixmap.load(pixmapDir + "/toolbar/event-edit.png"); pixmap.load(pixmapDir + "/toolbar/event-edit.png");
icon = TQIconSet(pixmap); 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(), TQT_SLOT(slotEdit()), actionCollection(),
"edit"); "edit");
new TDEAction(i18n("Select &All"), 0, TQT_TQOBJECT(this), new TDEAction(i18n("Select &All"), 0, this,
TQT_SLOT(slotSelectAll()), actionCollection(), TQT_SLOT(slotSelectAll()), actionCollection(),
"select_all"); "select_all");
new TDEAction(i18n("Clear Selection"), Key_Escape, TQT_TQOBJECT(this), new TDEAction(i18n("Clear Selection"), Key_Escape, this,
TQT_SLOT(slotClearSelection()), actionCollection(), TQT_SLOT(slotClearSelection()), actionCollection(),
"clear_selection"); "clear_selection");
@ -617,7 +617,7 @@ TempoView::setupActions()
pixmap.load(pixmapDir + "/toolbar/time-musical.png"); pixmap.load(pixmapDir + "/toolbar/time-musical.png");
icon = TQIconSet(pixmap); 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()), TQT_SLOT(slotMusicalTime()),
actionCollection(), "time_musical"); actionCollection(), "time_musical");
action->setExclusiveGroup("timeMode"); action->setExclusiveGroup("timeMode");
@ -627,7 +627,7 @@ TempoView::setupActions()
pixmap.load(pixmapDir + "/toolbar/time-real.png"); pixmap.load(pixmapDir + "/toolbar/time-real.png");
icon = TQIconSet(pixmap); 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()), TQT_SLOT(slotRealTime()),
actionCollection(), "time_real"); actionCollection(), "time_real");
action->setExclusiveGroup("timeMode"); action->setExclusiveGroup("timeMode");
@ -637,7 +637,7 @@ TempoView::setupActions()
pixmap.load(pixmapDir + "/toolbar/time-raw.png"); pixmap.load(pixmapDir + "/toolbar/time-raw.png");
icon = TQIconSet(pixmap); 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()), TQT_SLOT(slotRawTime()),
actionCollection(), "time_raw"); actionCollection(), "time_raw");
action->setExclusiveGroup("timeMode"); action->setExclusiveGroup("timeMode");

2
src/gui/general/EditTool.cpp
Unescape View File

@ -39,7 +39,7 @@ namespace Rosegarden
{ {
EditTool::EditTool(const TQString& menuName, EditView* view) EditTool::EditTool(const TQString& menuName, EditView* view)
: BaseTool(menuName, view->factory(), TQT_TQOBJECT(view)), : BaseTool(menuName, view->factory(), view),
m_parentView(view) m_parentView(view)
{} {}

70
src/gui/general/EditView.cpp
Unescape View File

@ -726,82 +726,82 @@ EditView::setupActions()
TQIconSet icon = TQIconSet(pixmap); TQIconSet icon = TQIconSet(pixmap);
new TDEAction(AddTempoChangeCommand::getGlobalName(), new TDEAction(AddTempoChangeCommand::getGlobalName(),
icon, 0, icon, 0,
TQT_TQOBJECT(this), TQT_SLOT(slotAddTempo()), this, TQT_SLOT(slotAddTempo()),
actionCollection(), "add_tempo"); actionCollection(), "add_tempo");
pixmap.load(pixmapDir + "/toolbar/event-insert-timesig.png"); pixmap.load(pixmapDir + "/toolbar/event-insert-timesig.png");
icon = TQIconSet(pixmap); icon = TQIconSet(pixmap);
new TDEAction(AddTimeSignatureCommand::getGlobalName(), new TDEAction(AddTimeSignatureCommand::getGlobalName(),
icon, 0, icon, 0,
TQT_TQOBJECT(this), TQT_SLOT(slotAddTimeSignature()), this, TQT_SLOT(slotAddTimeSignature()),
actionCollection(), "add_time_signature"); actionCollection(), "add_time_signature");
// //
// Transforms // Transforms
// //
new TDEAction(i18n("&Halve Durations"), Key_H + CTRL, TQT_TQOBJECT(this), new TDEAction(i18n("&Halve Durations"), Key_H + CTRL, this,
TQT_SLOT(slotHalveDurations()), actionCollection(), TQT_SLOT(slotHalveDurations()), actionCollection(),
"halve_durations"); "halve_durations");
new TDEAction(i18n("&Double Durations"), Key_H + CTRL + SHIFT, TQT_TQOBJECT(this), new TDEAction(i18n("&Double Durations"), Key_H + CTRL + SHIFT, this,
TQT_SLOT(slotDoubleDurations()), actionCollection(), TQT_SLOT(slotDoubleDurations()), actionCollection(),
"double_durations"); "double_durations");
new TDEAction(RescaleCommand::getGlobalName(), 0, TQT_TQOBJECT(this), new TDEAction(RescaleCommand::getGlobalName(), 0, this,
TQT_SLOT(slotRescale()), actionCollection(), TQT_SLOT(slotRescale()), actionCollection(),
"rescale"); "rescale");
new TDEAction(TransposeCommand::getGlobalName(1), 0, new TDEAction(TransposeCommand::getGlobalName(1), 0,
Key_Up, TQT_TQOBJECT(this), Key_Up, this,
TQT_SLOT(slotTransposeUp()), actionCollection(), TQT_SLOT(slotTransposeUp()), actionCollection(),
"transpose_up"); "transpose_up");
new TDEAction(TransposeCommand::getGlobalName(12), 0, new TDEAction(TransposeCommand::getGlobalName(12), 0,
Key_Up + CTRL, TQT_TQOBJECT(this), Key_Up + CTRL, this,
TQT_SLOT(slotTransposeUpOctave()), actionCollection(), TQT_SLOT(slotTransposeUpOctave()), actionCollection(),
"transpose_up_octave"); "transpose_up_octave");
new TDEAction(TransposeCommand::getGlobalName( -1), 0, new TDEAction(TransposeCommand::getGlobalName( -1), 0,
Key_Down, TQT_TQOBJECT(this), Key_Down, this,
TQT_SLOT(slotTransposeDown()), actionCollection(), TQT_SLOT(slotTransposeDown()), actionCollection(),
"transpose_down"); "transpose_down");
new TDEAction(TransposeCommand::getGlobalName( -12), 0, new TDEAction(TransposeCommand::getGlobalName( -12), 0,
Key_Down + CTRL, TQT_TQOBJECT(this), Key_Down + CTRL, this,
TQT_SLOT(slotTransposeDownOctave()), actionCollection(), TQT_SLOT(slotTransposeDownOctave()), actionCollection(),
"transpose_down_octave"); "transpose_down_octave");
new TDEAction(TransposeCommand::getGlobalName(0), 0, TQT_TQOBJECT(this), new TDEAction(TransposeCommand::getGlobalName(0), 0, this,
TQT_SLOT(slotTranspose()), actionCollection(), TQT_SLOT(slotTranspose()), actionCollection(),
"general_transpose"); "general_transpose");
new TDEAction(TransposeCommand::getDiatonicGlobalName(0,0), 0, TQT_TQOBJECT(this), new TDEAction(TransposeCommand::getDiatonicGlobalName(0,0), 0, this,
TQT_SLOT(slotDiatonicTranspose()), actionCollection(), TQT_SLOT(slotDiatonicTranspose()), actionCollection(),
"general_diatonic_transpose"); "general_diatonic_transpose");
new TDEAction(InvertCommand::getGlobalName(0), 0, TQT_TQOBJECT(this), new TDEAction(InvertCommand::getGlobalName(0), 0, this,
TQT_SLOT(slotInvert()), actionCollection(), TQT_SLOT(slotInvert()), actionCollection(),
"invert"); "invert");
new TDEAction(RetrogradeCommand::getGlobalName(0), 0, TQT_TQOBJECT(this), new TDEAction(RetrogradeCommand::getGlobalName(0), 0, this,
TQT_SLOT(slotRetrograde()), actionCollection(), TQT_SLOT(slotRetrograde()), actionCollection(),
"retrograde"); "retrograde");
new TDEAction(RetrogradeInvertCommand::getGlobalName(0), 0, TQT_TQOBJECT(this), new TDEAction(RetrogradeInvertCommand::getGlobalName(0), 0, this,
TQT_SLOT(slotRetrogradeInvert()), actionCollection(), TQT_SLOT(slotRetrogradeInvert()), actionCollection(),
"retrograde_invert"); "retrograde_invert");
new TDEAction(i18n("Jog &Left"), Key_Left + ALT, TQT_TQOBJECT(this), new TDEAction(i18n("Jog &Left"), Key_Left + ALT, this,
TQT_SLOT(slotJogLeft()), actionCollection(), TQT_SLOT(slotJogLeft()), actionCollection(),
"jog_left"); "jog_left");
new TDEAction(i18n("Jog &Right"), Key_Right + ALT, TQT_TQOBJECT(this), new TDEAction(i18n("Jog &Right"), Key_Right + ALT, this,
TQT_SLOT(slotJogRight()), actionCollection(), TQT_SLOT(slotJogRight()), actionCollection(),
"jog_right"); "jog_right");
// Control rulers // Control rulers
// //
new TDEAction(i18n("Show Velocity Property Ruler"), 0, TQT_TQOBJECT(this), new TDEAction(i18n("Show Velocity Property Ruler"), 0, this,
TQT_SLOT(slotShowVelocityControlRuler()), actionCollection(), TQT_SLOT(slotShowVelocityControlRuler()), actionCollection(),
"show_velocity_control_ruler"); "show_velocity_control_ruler");
@ -820,37 +820,37 @@ EditView::setupActions()
// //
// Control Ruler context menu // Control Ruler context menu
// //
new TDEAction(i18n("Insert item"), 0, TQT_TQOBJECT(this), new TDEAction(i18n("Insert item"), 0, this,
TQT_SLOT(slotInsertControlRulerItem()), actionCollection(), TQT_SLOT(slotInsertControlRulerItem()), actionCollection(),
"insert_control_ruler_item"); "insert_control_ruler_item");
// This was on Key_Delete, but that conflicts with existing Delete commands // This was on Key_Delete, but that conflicts with existing Delete commands
// on individual edit views // on individual edit views
new TDEAction(i18n("Erase selected items"), 0, TQT_TQOBJECT(this), new TDEAction(i18n("Erase selected items"), 0, this,
TQT_SLOT(slotEraseControlRulerItem()), actionCollection(), TQT_SLOT(slotEraseControlRulerItem()), actionCollection(),
"erase_control_ruler_item"); "erase_control_ruler_item");
new TDEAction(i18n("Clear ruler"), 0, TQT_TQOBJECT(this), new TDEAction(i18n("Clear ruler"), 0, this,
TQT_SLOT(slotClearControlRulerItem()), actionCollection(), TQT_SLOT(slotClearControlRulerItem()), actionCollection(),
"clear_control_ruler_item"); "clear_control_ruler_item");
new TDEAction(i18n("Insert line of controllers"), 0, TQT_TQOBJECT(this), new TDEAction(i18n("Insert line of controllers"), 0, this,
TQT_SLOT(slotStartControlLineItem()), actionCollection(), TQT_SLOT(slotStartControlLineItem()), actionCollection(),
"start_control_line_item"); "start_control_line_item");
new TDEAction(i18n("Flip forward"), Key_BracketRight, TQT_TQOBJECT(this), new TDEAction(i18n("Flip forward"), Key_BracketRight, this,
TQT_SLOT(slotFlipForwards()), actionCollection(), TQT_SLOT(slotFlipForwards()), actionCollection(),
"flip_control_events_forward"); "flip_control_events_forward");
new TDEAction(i18n("Flip backwards"), Key_BracketLeft, TQT_TQOBJECT(this), new TDEAction(i18n("Flip backwards"), Key_BracketLeft, this,
TQT_SLOT(slotFlipBackwards()), actionCollection(), TQT_SLOT(slotFlipBackwards()), actionCollection(),
"flip_control_events_back"); "flip_control_events_back");
new TDEAction(i18n("Draw property line"), 0, TQT_TQOBJECT(this), new TDEAction(i18n("Draw property line"), 0, this,
TQT_SLOT(slotDrawPropertyLine()), actionCollection(), TQT_SLOT(slotDrawPropertyLine()), actionCollection(),
"draw_property_line"); "draw_property_line");
new TDEAction(i18n("Select all property values"), 0, TQT_TQOBJECT(this), new TDEAction(i18n("Select all property values"), 0, this,
TQT_SLOT(slotSelectAllProperties()), actionCollection(), TQT_SLOT(slotSelectAllProperties()), actionCollection(),
"select_all_properties"); "select_all_properties");
} }
@ -1080,18 +1080,18 @@ EditView::createInsertPitchActionMenu()
}; };
TDEActionMenu *insertPitchActionMenu = TDEActionMenu *insertPitchActionMenu =
new TDEActionMenu(i18n("&Insert Note"), TQT_TQOBJECT(this), "insert_note_actionmenu"); new TDEActionMenu(i18n("&Insert Note"), this, "insert_note_actionmenu");
for (int octave = 0; octave <= 2; ++octave) { for (int octave = 0; octave <= 2; ++octave) {
TDEActionMenu *menu = insertPitchActionMenu; TDEActionMenu *menu = insertPitchActionMenu;
if (octave == 1) { if (octave == 1) {
menu = new TDEActionMenu(i18n("&Upper Octave"), TQT_TQOBJECT(this), menu = new TDEActionMenu(i18n("&Upper Octave"), this,
"insert_note_actionmenu_upper_octave"); "insert_note_actionmenu_upper_octave");
insertPitchActionMenu->insert(new TDEActionSeparator(TQT_TQOBJECT(this))); insertPitchActionMenu->insert(new TDEActionSeparator(this));
insertPitchActionMenu->insert(menu); insertPitchActionMenu->insert(menu);
} else if (octave == 2) { } else if (octave == 2) {
menu = new TDEActionMenu(i18n("&Lower Octave"), TQT_TQOBJECT(this), menu = new TDEActionMenu(i18n("&Lower Octave"), this,
"insert_note_actionmenu_lower_octave"); "insert_note_actionmenu_lower_octave");
insertPitchActionMenu->insert(menu); insertPitchActionMenu->insert(menu);
} }
@ -1114,7 +1114,7 @@ EditView::createInsertPitchActionMenu()
new TDEAction new TDEAction
(flat.arg(notePitchNames[i]), (flat.arg(notePitchNames[i]),
CTRL + SHIFT + notePitchKeys[octave][i], CTRL + SHIFT + notePitchKeys[octave][i],
TQT_TQOBJECT(this), TQT_SLOT(slotInsertNoteFromAction()), actionCollection(), this, TQT_SLOT(slotInsertNoteFromAction()), actionCollection(),
TQString("insert_%1_flat%2").arg(i).arg(octaveSuffix).ascii()); TQString("insert_%1_flat%2").arg(i).arg(octaveSuffix).ascii());
menu->insert(insertPitchAction); menu->insert(insertPitchAction);
@ -1124,7 +1124,7 @@ EditView::createInsertPitchActionMenu()
new TDEAction new TDEAction
(notePitchNames[i], (notePitchNames[i],
notePitchKeys[octave][i], notePitchKeys[octave][i],
TQT_TQOBJECT(this), TQT_SLOT(slotInsertNoteFromAction()), actionCollection(), this, TQT_SLOT(slotInsertNoteFromAction()), actionCollection(),
TQString("insert_%1%2").arg(i).arg(octaveSuffix).ascii()); TQString("insert_%1%2").arg(i).arg(octaveSuffix).ascii());
menu->insert(insertPitchAction); menu->insert(insertPitchAction);
@ -1137,14 +1137,14 @@ EditView::createInsertPitchActionMenu()
new TDEAction new TDEAction
(sharp.arg(notePitchNames[i]), (sharp.arg(notePitchNames[i]),
SHIFT + notePitchKeys[octave][i], SHIFT + notePitchKeys[octave][i],
TQT_TQOBJECT(this), TQT_SLOT(slotInsertNoteFromAction()), actionCollection(), this, TQT_SLOT(slotInsertNoteFromAction()), actionCollection(),
TQString("insert_%1_sharp%2").arg(i).arg(octaveSuffix).ascii()); TQString("insert_%1_sharp%2").arg(i).arg(octaveSuffix).ascii());
menu->insert(insertPitchAction); menu->insert(insertPitchAction);
} }
if (i < 6) if (i < 6)
menu->insert(new TDEActionSeparator(TQT_TQOBJECT(this))); menu->insert(new TDEActionSeparator(this));
} }
} }
@ -1672,7 +1672,7 @@ ControlRuler* EditView::findRuler(const ControlParameter& controller, int &index
PropertyControlRuler* EditView::makePropertyControlRuler(PropertyName propertyName) PropertyControlRuler* EditView::makePropertyControlRuler(PropertyName propertyName)
{ {
TQCanvas* controlRulerCanvas = new TQCanvas(TQT_TQOBJECT(this)); TQCanvas* controlRulerCanvas = new TQCanvas(this);
TQSize viewSize = getViewSize(); TQSize viewSize = getViewSize();
controlRulerCanvas->resize(viewSize.width(), ControlRuler::DefaultRulerHeight); // TODO - keep it in sync with main canvas size controlRulerCanvas->resize(viewSize.width(), ControlRuler::DefaultRulerHeight); // TODO - keep it in sync with main canvas size
@ -1690,7 +1690,7 @@ PropertyControlRuler* EditView::makePropertyControlRuler(PropertyName propertyNa
ControllerEventsRuler* EditView::makeControllerEventRuler(const ControlParameter *controller) ControllerEventsRuler* EditView::makeControllerEventRuler(const ControlParameter *controller)
{ {
TQCanvas* controlRulerCanvas = new TQCanvas(TQT_TQOBJECT(this)); TQCanvas* controlRulerCanvas = new TQCanvas(this);
TQSize viewSize = getViewSize(); TQSize viewSize = getViewSize();
controlRulerCanvas->resize(viewSize.width(), ControlRuler::DefaultRulerHeight); // TODO - keep it in sync with main canvas size controlRulerCanvas->resize(viewSize.width(), ControlRuler::DefaultRulerHeight); // TODO - keep it in sync with main canvas size
// TQCanvas* controlRulerCanvas = ControlRulerCanvasRepository::getCanvas(getCurrentSegment(), controller, // TQCanvas* controlRulerCanvas = ControlRulerCanvasRepository::getCanvas(getCurrentSegment(), controller,

32
src/gui/general/EditViewBase.cpp
Unescape View File

@ -156,33 +156,33 @@ void EditViewBase::setupActions(TQString rcFileName, bool haveClipboard)
// Actions all edit views will have // Actions all edit views will have
KStdAction::showToolbar(TQT_TQOBJECT(this), TQT_SLOT(slotToggleToolBar()), KStdAction::showToolbar(this, TQT_SLOT(slotToggleToolBar()),
actionCollection(), "options_show_toolbar"); actionCollection(), "options_show_toolbar");
KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(slotToggleStatusBar()), KStdAction::showStatusbar(this, TQT_SLOT(slotToggleStatusBar()),
actionCollection(), "options_show_statusbar"); actionCollection(), "options_show_statusbar");
KStdAction::preferences(TQT_TQOBJECT(this), KStdAction::preferences(this,
TQT_SLOT(slotConfigure()), TQT_SLOT(slotConfigure()),
actionCollection()); actionCollection());
KStdAction::keyBindings(TQT_TQOBJECT(this), KStdAction::keyBindings(this,
TQT_SLOT(slotEditKeys()), TQT_SLOT(slotEditKeys()),
actionCollection()); actionCollection());
KStdAction::configureToolbars(TQT_TQOBJECT(this), KStdAction::configureToolbars(this,
TQT_SLOT(slotEditToolbars()), TQT_SLOT(slotEditToolbars()),
actionCollection()); actionCollection());
// File menu // File menu
KStdAction::save (TQT_TQOBJECT(this), TQT_SIGNAL(saveFile()), actionCollection()); KStdAction::save (this, TQT_SIGNAL(saveFile()), actionCollection());
KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotCloseWindow()), actionCollection()); KStdAction::close(this, TQT_SLOT(slotCloseWindow()), actionCollection());
if (haveClipboard) { if (haveClipboard) {
KStdAction::cut (TQT_TQOBJECT(this), TQT_SLOT(slotEditCut()), actionCollection()); KStdAction::cut (this, TQT_SLOT(slotEditCut()), actionCollection());
KStdAction::copy (TQT_TQOBJECT(this), TQT_SLOT(slotEditCopy()), actionCollection()); KStdAction::copy (this, TQT_SLOT(slotEditCopy()), actionCollection());
KStdAction::paste (TQT_TQOBJECT(this), TQT_SLOT(slotEditPaste()), actionCollection()); KStdAction::paste (this, TQT_SLOT(slotEditPaste()), actionCollection());
} }
new TDEToolBarPopupAction(i18n("Und&o"), new TDEToolBarPopupAction(i18n("Und&o"),
@ -201,33 +201,33 @@ void EditViewBase::setupActions(TQString rcFileName, bool haveClipboard)
TQCanvasPixmap pixmap(pixmapDir + "/toolbar/matrix.png"); TQCanvasPixmap pixmap(pixmapDir + "/toolbar/matrix.png");
TQIconSet icon = TQIconSet(pixmap); TQIconSet icon = TQIconSet(pixmap);
new TDEAction(i18n("Open in Matri&x Editor"), icon, 0, TQT_TQOBJECT(this), new TDEAction(i18n("Open in Matri&x Editor"), icon, 0, this,
TQT_SLOT(slotOpenInMatrix()), actionCollection(), TQT_SLOT(slotOpenInMatrix()), actionCollection(),
"open_in_matrix"); "open_in_matrix");
pixmap.load(pixmapDir + "/toolbar/matrix-percussion.png"); pixmap.load(pixmapDir + "/toolbar/matrix-percussion.png");
icon = TQIconSet(pixmap); icon = TQIconSet(pixmap);
new TDEAction(i18n("Open in &Percussion Matrix Editor"), icon, 0, TQT_TQOBJECT(this), new TDEAction(i18n("Open in &Percussion Matrix Editor"), icon, 0, this,
TQT_SLOT(slotOpenInPercussionMatrix()), actionCollection(), TQT_SLOT(slotOpenInPercussionMatrix()), actionCollection(),
"open_in_percussion_matrix"); "open_in_percussion_matrix");
pixmap.load(pixmapDir + "/toolbar/notation.png"); pixmap.load(pixmapDir + "/toolbar/notation.png");
icon = TQIconSet(pixmap); icon = TQIconSet(pixmap);
new TDEAction(i18n("Open in &Notation Editor"), icon, 0, TQT_TQOBJECT(this), new TDEAction(i18n("Open in &Notation Editor"), icon, 0, this,
TQT_SLOT(slotOpenInNotation()), actionCollection(), TQT_SLOT(slotOpenInNotation()), actionCollection(),
"open_in_notation"); "open_in_notation");
pixmap.load(pixmapDir + "/toolbar/eventlist.png"); pixmap.load(pixmapDir + "/toolbar/eventlist.png");
icon = TQIconSet(pixmap); icon = TQIconSet(pixmap);
new TDEAction(i18n("Open in &Event List Editor"), icon, 0, TQT_TQOBJECT(this), new TDEAction(i18n("Open in &Event List Editor"), icon, 0, this,
TQT_SLOT(slotOpenInEventList()), actionCollection(), TQT_SLOT(slotOpenInEventList()), actionCollection(),
"open_in_event_list"); "open_in_event_list");
new TDEAction(i18n("Set Segment Start Time..."), 0, TQT_TQOBJECT(this), new TDEAction(i18n("Set Segment Start Time..."), 0, this,
TQT_SLOT(slotSetSegmentStartTime()), actionCollection(), TQT_SLOT(slotSetSegmentStartTime()), actionCollection(),
"set_segment_start"); "set_segment_start");
new TDEAction(i18n("Set Segment Duration..."), 0, TQT_TQOBJECT(this), new TDEAction(i18n("Set Segment Duration..."), 0, this,
TQT_SLOT(slotSetSegmentDuration()), actionCollection(), TQT_SLOT(slotSetSegmentDuration()), actionCollection(),
"set_segment_duration"); "set_segment_duration");

6
src/gui/kdeext/klearlook.cpp
Unescape View File

@ -682,8 +682,8 @@ bool KlearlookStyle::objectEventHandler( const TQStyleControlElementData &ceData
if ( object->parent() && 0 == qstrcmp( object->name(), kdeToolbarWidget ) ) { if ( object->parent() && 0 == qstrcmp( object->name(), kdeToolbarWidget ) ) {
// Draw background for custom widgets in the toolbar that have specified a "tde toolbar widget" name. // Draw background for custom widgets in the toolbar that have specified a "tde toolbar widget" name.
if ( TQEvent::Paint == event->type() ) { if ( TQEvent::Paint == event->type() ) {
TQWidget * widget = TQT_TQWIDGET( object ), TQWidget * widget = static_cast<TQWidget*>( object ),
*parent = TQT_TQWIDGET( object->parent() ); *parent = static_cast<TQWidget*>( object->parent() );
#ifdef TQTC_GRADIENT_TOOLBARS_AND_MENUBARS #ifdef TQTC_GRADIENT_TOOLBARS_AND_MENUBARS
// Find the top-level toolbar of this widget, since it may be nested in other // Find the top-level toolbar of this widget, since it may be nested in other
// widgets that are on the toolbar. // widgets that are on the toolbar.
@ -693,7 +693,7 @@ bool KlearlookStyle::objectEventHandler( const TQStyleControlElementData &ceData
while ( parent && parent->parent() && !qstrcmp( parent->name(), kdeToolbarWidget ) ) { while ( parent && parent->parent() && !qstrcmp( parent->name(), kdeToolbarWidget ) ) {
x_offset += parent->x(); x_offset += parent->x();
y_offset += parent->y(); y_offset += parent->y();
parent = TQT_TQWIDGET( parent->parent() ); parent = static_cast<TQWidget*>( parent->parent() );
} }
TQRect pr( parent->rect() ); TQRect pr( parent->rect() );

2
src/gui/rulers/ControllerEventsRuler.cpp
Unescape View File

@ -272,7 +272,7 @@ void ControllerEventsRuler::insertControllerEvent()
number = m_controller->getControllerValue(); number = m_controller->getControllerValue();
} else { } else {
bool ok = false; bool ok = false;
TQIntValidator intValidator(0, 128, TQT_TQOBJECT(this)); TQIntValidator intValidator(0, 128, this);
TQString res = KLineEditDlg::getText(i18n("Controller Event Number"), "0", TQString res = KLineEditDlg::getText(i18n("Controller Event Number"), "0",
&ok, this, &intValidator); &ok, this, &intValidator);
if (ok) if (ok)

10
src/gui/rulers/MarkerRuler.cpp
Unescape View File

@ -78,7 +78,7 @@ MarkerRuler::MarkerRuler(RosegardenGUIDoc *doc,
// Otherwise we'll end up adding all actions to the same // Otherwise we'll end up adding all actions to the same
// (document-level) action collection regardless of which window // (document-level) action collection regardless of which window
// we're in. // we're in.
TQObject *probe = TQT_TQOBJECT(parent); TQObject *probe = parent;
while (probe && !dynamic_cast<TDEMainWindow *>(probe)) probe = probe->parent(); while (probe && !dynamic_cast<TDEMainWindow *>(probe)) probe = probe->parent();
if (probe) m_parentMainWindow = dynamic_cast<TDEMainWindow *>(probe); if (probe) m_parentMainWindow = dynamic_cast<TDEMainWindow *>(probe);
@ -95,21 +95,21 @@ MarkerRuler::MarkerRuler(RosegardenGUIDoc *doc,
// don't become more event-specific in future... // don't become more event-specific in future...
icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-insert.png")); icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-insert.png"));
new TDEAction(i18n("Insert Marker"), icon, 0, TQT_TQOBJECT(this), new TDEAction(i18n("Insert Marker"), icon, 0, this,
TQT_SLOT(slotInsertMarkerHere()), actionCollection(), TQT_SLOT(slotInsertMarkerHere()), actionCollection(),
"insert_marker_here"); "insert_marker_here");
new TDEAction(i18n("Insert Marker at Playback Position"), 0, TQT_TQOBJECT(this), new TDEAction(i18n("Insert Marker at Playback Position"), 0, this,
TQT_SLOT(slotInsertMarkerAtPointer()), actionCollection(), TQT_SLOT(slotInsertMarkerAtPointer()), actionCollection(),
"insert_marker_at_pointer"); "insert_marker_at_pointer");
icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-delete.png")); icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-delete.png"));
new TDEAction(i18n("Delete Marker"), icon, 0, TQT_TQOBJECT(this), new TDEAction(i18n("Delete Marker"), icon, 0, this,
TQT_SLOT(slotDeleteMarker()), actionCollection(), TQT_SLOT(slotDeleteMarker()), actionCollection(),
"delete_marker"); "delete_marker");
icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-edit.png")); icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-edit.png"));
new TDEAction(i18n("Edit Marker..."), icon, 0, TQT_TQOBJECT(this), new TDEAction(i18n("Edit Marker..."), icon, 0, this,
TQT_SLOT(slotEditMarker()), actionCollection(), TQT_SLOT(slotEditMarker()), actionCollection(),
"edit_marker"); "edit_marker");

16
src/gui/rulers/TempoRuler.cpp
Unescape View File

@ -122,37 +122,37 @@ TempoRuler::TempoRuler(RulerScale *rulerScale,
TQIconSet icon; TQIconSet icon;
icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-insert-tempo.png")); icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-insert-tempo.png"));
new TDEAction(i18n("Insert Tempo Change"), icon, 0, TQT_TQOBJECT(this), new TDEAction(i18n("Insert Tempo Change"), icon, 0, this,
TQT_SLOT(slotInsertTempoHere()), actionCollection(), TQT_SLOT(slotInsertTempoHere()), actionCollection(),
"insert_tempo_here"); "insert_tempo_here");
new TDEAction(i18n("Insert Tempo Change at Playback Position"), 0, 0, TQT_TQOBJECT(this), new TDEAction(i18n("Insert Tempo Change at Playback Position"), 0, 0, this,
TQT_SLOT(slotInsertTempoAtPointer()), actionCollection(), TQT_SLOT(slotInsertTempoAtPointer()), actionCollection(),
"insert_tempo_at_pointer"); "insert_tempo_at_pointer");
icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-delete.png")); icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-delete.png"));
new TDEAction(i18n("Delete Tempo Change"), icon, 0, TQT_TQOBJECT(this), new TDEAction(i18n("Delete Tempo Change"), icon, 0, this,
TQT_SLOT(slotDeleteTempoChange()), actionCollection(), TQT_SLOT(slotDeleteTempoChange()), actionCollection(),
"delete_tempo"); "delete_tempo");
new TDEAction(i18n("Ramp Tempo to Next Tempo"), 0, 0, TQT_TQOBJECT(this), new TDEAction(i18n("Ramp Tempo to Next Tempo"), 0, 0, this,
TQT_SLOT(slotRampToNext()), actionCollection(), TQT_SLOT(slotRampToNext()), actionCollection(),
"ramp_to_next"); "ramp_to_next");
new TDEAction(i18n("Un-Ramp Tempo"), 0, 0, TQT_TQOBJECT(this), new TDEAction(i18n("Un-Ramp Tempo"), 0, 0, this,
TQT_SLOT(slotUnramp()), actionCollection(), TQT_SLOT(slotUnramp()), actionCollection(),
"unramp"); "unramp");
icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-edit.png")); icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-edit.png"));
new TDEAction(i18n("Edit Tempo..."), icon, 0, TQT_TQOBJECT(this), new TDEAction(i18n("Edit Tempo..."), icon, 0, this,
TQT_SLOT(slotEditTempo()), actionCollection(), TQT_SLOT(slotEditTempo()), actionCollection(),
"edit_tempo"); "edit_tempo");
new TDEAction(i18n("Edit Time Signature..."), 0, 0, TQT_TQOBJECT(this), new TDEAction(i18n("Edit Time Signature..."), 0, 0, this,
TQT_SLOT(slotEditTimeSignature()), actionCollection(), TQT_SLOT(slotEditTimeSignature()), actionCollection(),
"edit_time_signature"); "edit_time_signature");
new TDEAction(i18n("Open Tempo and Time Signature Editor"), 0, 0, TQT_TQOBJECT(this), new TDEAction(i18n("Open Tempo and Time Signature Editor"), 0, 0, this,
TQT_SLOT(slotEditTempos()), actionCollection(), TQT_SLOT(slotEditTempos()), actionCollection(),
"edit_tempos"); "edit_tempos");

34
src/gui/studio/AudioMixerWindow.cpp
Unescape View File

@ -94,13 +94,13 @@ AudioMixerWindow::AudioMixerWindow(TQWidget *parent,
{ {
populate(); populate();
KStdAction::close(TQT_TQOBJECT(this), KStdAction::close(this,
TQT_SLOT(slotClose()), TQT_SLOT(slotClose()),
actionCollection()); actionCollection());
TQIconSet icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap TQIconSet icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-play"))); ("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"); TQT_SIGNAL(play()), actionCollection(), "play");
// Alternative shortcut for Play // Alternative shortcut for Play
TDEShortcut playShortcut = play->shortcut(); TDEShortcut playShortcut = play->shortcut();
@ -109,68 +109,68 @@ AudioMixerWindow::AudioMixerWindow(TQWidget *parent,
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-stop"))); ("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"); TQT_SIGNAL(stop()), actionCollection(), "stop");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-rewind"))); ("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(), TQT_SIGNAL(rewindPlayback()), actionCollection(),
"playback_pointer_back_bar"); "playback_pointer_back_bar");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-ffwd"))); ("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(), TQT_SIGNAL(fastForwardPlayback()), actionCollection(),
"playback_pointer_forward_bar"); "playback_pointer_forward_bar");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-rewind-end"))); ("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(), TQT_SIGNAL(rewindPlaybackToBeginning()), actionCollection(),
"playback_pointer_start"); "playback_pointer_start");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-ffwd-end"))); ("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(), TQT_SIGNAL(fastForwardPlaybackToEnd()), actionCollection(),
"playback_pointer_end"); "playback_pointer_end");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-record"))); ("transport-record")));
new TDEAction(i18n("&Record"), icon, 0, TQT_TQOBJECT(this), new TDEAction(i18n("&Record"), icon, 0, this,
TQT_SIGNAL(record()), actionCollection(), TQT_SIGNAL(record()), actionCollection(),
"record"); "record");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-panic"))); ("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(), TQT_SIGNAL(panic()), actionCollection(),
"panic"); "panic");
unsigned int mixerOptions = m_studio->getMixerDisplayOptions(); unsigned int mixerOptions = m_studio->getMixerDisplayOptions();
(new TDEToggleAction(i18n("Show Audio &Faders"), 0, TQT_TQOBJECT(this), (new TDEToggleAction(i18n("Show Audio &Faders"), 0, this,
TQT_SLOT(slotToggleFaders()), actionCollection(), TQT_SLOT(slotToggleFaders()), actionCollection(),
"show_audio_faders"))->setChecked "show_audio_faders"))->setChecked
(!(mixerOptions & MIXER_OMIT_FADERS)); (!(mixerOptions & MIXER_OMIT_FADERS));
(new TDEToggleAction(i18n("Show Synth &Faders"), 0, TQT_TQOBJECT(this), (new TDEToggleAction(i18n("Show Synth &Faders"), 0, this,
TQT_SLOT(slotToggleSynthFaders()), actionCollection(), TQT_SLOT(slotToggleSynthFaders()), actionCollection(),
"show_synth_faders"))->setChecked "show_synth_faders"))->setChecked
(!(mixerOptions & MIXER_OMIT_SYNTH_FADERS)); (!(mixerOptions & MIXER_OMIT_SYNTH_FADERS));
(new TDEToggleAction(i18n("Show &Submasters"), 0, TQT_TQOBJECT(this), (new TDEToggleAction(i18n("Show &Submasters"), 0, this,
TQT_SLOT(slotToggleSubmasters()), actionCollection(), TQT_SLOT(slotToggleSubmasters()), actionCollection(),
"show_audio_submasters"))->setChecked "show_audio_submasters"))->setChecked
(!(mixerOptions & MIXER_OMIT_SUBMASTERS)); (!(mixerOptions & MIXER_OMIT_SUBMASTERS));
(new TDEToggleAction(i18n("Show &Plugin Buttons"), 0, TQT_TQOBJECT(this), (new TDEToggleAction(i18n("Show &Plugin Buttons"), 0, this,
TQT_SLOT(slotTogglePluginButtons()), actionCollection(), TQT_SLOT(slotTogglePluginButtons()), actionCollection(),
"show_plugin_buttons"))->setChecked "show_plugin_buttons"))->setChecked
(!(mixerOptions & MIXER_OMIT_PLUGINS)); (!(mixerOptions & MIXER_OMIT_PLUGINS));
(new TDEToggleAction(i18n("Show &Unassigned Faders"), 0, TQT_TQOBJECT(this), (new TDEToggleAction(i18n("Show &Unassigned Faders"), 0, this,
TQT_SLOT(slotToggleUnassignedFaders()), actionCollection(), TQT_SLOT(slotToggleUnassignedFaders()), actionCollection(),
"show_unassigned_faders"))->setChecked "show_unassigned_faders"))->setChecked
(mixerOptions & MIXER_SHOW_UNASSIGNED_FADERS); (mixerOptions & MIXER_SHOW_UNASSIGNED_FADERS);
@ -180,7 +180,7 @@ AudioMixerWindow::AudioMixerWindow(TQWidget *parent,
for (int i = 1; i <= 16; i *= 2) { for (int i = 1; i <= 16; i *= 2) {
action = action =
new TDERadioAction(i18n("1 Input", "%n Inputs", i), new TDERadioAction(i18n("1 Input", "%n Inputs", i),
0, TQT_TQOBJECT(this), 0, this,
TQT_SLOT(slotSetInputCountFromAction()), actionCollection(), TQT_SLOT(slotSetInputCountFromAction()), actionCollection(),
TQString("inputs_%1").arg(i).ascii()); TQString("inputs_%1").arg(i).ascii());
action->setExclusiveGroup("inputs"); action->setExclusiveGroup("inputs");
@ -190,7 +190,7 @@ AudioMixerWindow::AudioMixerWindow(TQWidget *parent,
action = new TDERadioAction action = new TDERadioAction
(i18n("No Submasters"), (i18n("No Submasters"),
0, TQT_TQOBJECT(this), 0, this,
TQT_SLOT(slotSetSubmasterCountFromAction()), actionCollection(), TQT_SLOT(slotSetSubmasterCountFromAction()), actionCollection(),
TQString("submasters_0").ascii()); TQString("submasters_0").ascii());
action->setExclusiveGroup("submasters"); action->setExclusiveGroup("submasters");
@ -199,7 +199,7 @@ AudioMixerWindow::AudioMixerWindow(TQWidget *parent,
for (int i = 2; i <= 8; i *= 2) { for (int i = 2; i <= 8; i *= 2) {
action = new TDERadioAction action = new TDERadioAction
(i18n("1 Submaster", "%n Submasters", i), (i18n("1 Submaster", "%n Submasters", i),
0, TQT_TQOBJECT(this), 0, this,
TQT_SLOT(slotSetSubmasterCountFromAction()), actionCollection(), TQT_SLOT(slotSetSubmasterCountFromAction()), actionCollection(),
TQString("submasters_%1").arg(i).ascii()); TQString("submasters_%1").arg(i).ascii());
action->setExclusiveGroup("submasters"); action->setExclusiveGroup("submasters");

8
src/gui/studio/BankEditorDialog.cpp
Unescape View File

@ -301,14 +301,14 @@ BankEditorDialog::~BankEditorDialog()
void void
BankEditorDialog::setupActions() BankEditorDialog::setupActions()
{ {
TDEAction* close = KStdAction::close (TQT_TQOBJECT(this), TQT_SLOT(slotFileClose()), actionCollection()); TDEAction* close = KStdAction::close (this, TQT_SLOT(slotFileClose()), actionCollection());
m_closeButton->setText(close->text()); m_closeButton->setText(close->text());
connect(m_closeButton, TQT_SIGNAL(clicked()), connect(m_closeButton, TQT_SIGNAL(clicked()),
TQT_TQOBJECT(this), TQT_SLOT(slotFileClose())); this, TQT_SLOT(slotFileClose()));
KStdAction::copy (TQT_TQOBJECT(this), TQT_SLOT(slotEditCopy()), actionCollection()); KStdAction::copy (this, TQT_SLOT(slotEditCopy()), actionCollection());
KStdAction::paste (TQT_TQOBJECT(this), TQT_SLOT(slotEditPaste()), actionCollection()); KStdAction::paste (this, TQT_SLOT(slotEditPaste()), actionCollection());
// some adjustments // some adjustments

2
src/gui/studio/DeviceManagerDialog.cpp
Unescape View File

@ -212,7 +212,7 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
layout->addWidget(closeButton); layout->addWidget(closeButton);
layout->addSpacing(5); layout->addSpacing(5);
TDEAction* close = KStdAction::close(TQT_TQOBJECT(this), TDEAction* close = KStdAction::close(this,
TQT_SLOT(slotClose()), TQT_SLOT(slotClose()),
actionCollection()); actionCollection());

18
src/gui/studio/MidiMixerWindow.cpp
Unescape View File

@ -70,13 +70,13 @@ MidiMixerWindow::MidiMixerWindow(TQWidget *parent,
// //
setupTabs(); setupTabs();
KStdAction::close(TQT_TQOBJECT(this), KStdAction::close(this,
TQT_SLOT(slotClose()), TQT_SLOT(slotClose()),
actionCollection()); actionCollection());
TQIconSet icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap TQIconSet icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-play"))); ("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"); TQT_SIGNAL(play()), actionCollection(), "play");
// Alternative shortcut for Play // Alternative shortcut for Play
TDEShortcut playShortcut = play->shortcut(); TDEShortcut playShortcut = play->shortcut();
@ -85,42 +85,42 @@ MidiMixerWindow::MidiMixerWindow(TQWidget *parent,
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-stop"))); ("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"); TQT_SIGNAL(stop()), actionCollection(), "stop");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-rewind"))); ("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(), TQT_SIGNAL(rewindPlayback()), actionCollection(),
"playback_pointer_back_bar"); "playback_pointer_back_bar");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-ffwd"))); ("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(), TQT_SIGNAL(fastForwardPlayback()), actionCollection(),
"playback_pointer_forward_bar"); "playback_pointer_forward_bar");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-rewind-end"))); ("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(), TQT_SIGNAL(rewindPlaybackToBeginning()), actionCollection(),
"playback_pointer_start"); "playback_pointer_start");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-ffwd-end"))); ("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(), TQT_SIGNAL(fastForwardPlaybackToEnd()), actionCollection(),
"playback_pointer_end"); "playback_pointer_end");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-record"))); ("transport-record")));
new TDEAction(i18n("&Record"), icon, 0, TQT_TQOBJECT(this), new TDEAction(i18n("&Record"), icon, 0, this,
TQT_SIGNAL(record()), actionCollection(), TQT_SIGNAL(record()), actionCollection(),
"record"); "record");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-panic"))); ("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(), TQT_SIGNAL(panic()), actionCollection(),
"panic"); "panic");

2
src/gui/studio/MidiProgramsEditor.cpp
Unescape View File

@ -442,7 +442,7 @@ MidiProgramsEditor::slotNameChanged(const TQString& programName)
void void
MidiProgramsEditor::slotEntryButtonPressed() MidiProgramsEditor::slotEntryButtonPressed()
{ {
TQPushButton* button = dynamic_cast<TQPushButton*>(TQT_TQWIDGET(const_cast<TQObject*>(sender()))); TQPushButton* button = dynamic_cast<TQPushButton*>(const_cast<TQObject*>(sender()));
if (!button) { if (!button) {
RG_DEBUG << "MidiProgramsEditor::slotEntryButtonPressed() : %%% ERROR - signal sender is not a TQPushButton\n"; RG_DEBUG << "MidiProgramsEditor::slotEntryButtonPressed() : %%% ERROR - signal sender is not a TQPushButton\n";
return ; return ;

2
src/gui/studio/SynthPluginManagerDialog.cpp
Unescape View File

@ -169,7 +169,7 @@ SynthPluginManagerDialog::SynthPluginManagerDialog(TQWidget *parent,
layout->addWidget(closeButton); layout->addWidget(closeButton);
layout->addSpacing(5); layout->addSpacing(5);
TDEAction* close = KStdAction::close(TQT_TQOBJECT(this), TDEAction* close = KStdAction::close(this,
TQT_SLOT(slotClose()), TQT_SLOT(slotClose()),
actionCollection()); actionCollection());

4
src/gui/widgets/AudioFaderBox.cpp
Unescape View File

@ -60,7 +60,7 @@ AudioFaderBox::AudioFaderBox(TQWidget *parent,
bool haveInOut, bool haveInOut,
const char *name): const char *name):
TQFrame(parent, name), TQFrame(parent, name),
m_signalMapper(new TQSignalMapper(TQT_TQOBJECT(this))), m_signalMapper(new TQSignalMapper(this)),
m_id(id), m_id(id),
m_isStereo(false) m_isStereo(false)
{ {
@ -80,7 +80,7 @@ AudioFaderBox::AudioFaderBox(TQWidget *parent,
(plugin, i18n("Audio plugin button")); (plugin, i18n("Audio plugin button"));
m_plugins.push_back(plugin); m_plugins.push_back(plugin);
m_signalMapper->setMapping(TQT_TQOBJECT(plugin), i); m_signalMapper->setMapping(plugin, i);
connect(plugin, TQT_SIGNAL(clicked()), connect(plugin, TQT_SIGNAL(clicked()),
m_signalMapper, TQT_SLOT(map())); m_signalMapper, TQT_SLOT(map()));
} }

4
src/gui/widgets/HSpinBox.cpp
Unescape View File

@ -48,7 +48,7 @@ HSpinBox::HSpinBox( int minV, int maxV, int step, TQWidget* parent,
double bottom, double top, int decimals, float initialValue) double bottom, double top, int decimals, float initialValue)
: TQSpinBox(minV,maxV,step,parent) : TQSpinBox(minV,maxV,step,parent)
{ {
setValidator(new TQDoubleValidator(bottom,top,decimals,TQT_TQOBJECT(this))); setValidator(new TQDoubleValidator(bottom,top,decimals,this));
initialize(decimals); initialize(decimals);
setValuef(initialValue); setValuef(initialValue);
} }
@ -60,7 +60,7 @@ HSpinBox::HSpinBox( TQWidget* parent, float initialValue, int step,
: TQSpinBox((int)(bottom*pow(10.0, decimals)), : TQSpinBox((int)(bottom*pow(10.0, decimals)),
(int)(top*pow(10.0, decimals)), step, parent) (int)(top*pow(10.0, decimals)), step, parent)
{ {
setValidator(new TQDoubleValidator(bottom,top,decimals,TQT_TQOBJECT(this))); setValidator(new TQDoubleValidator(bottom,top,decimals,this));
initialize(decimals); initialize(decimals);
setValuef(initialValue); setValuef(initialValue);
if (recv != NULL && mem != NULL) if (recv != NULL && mem != NULL)

Write Preview
Loading…
Cancel
Save