diff options
Diffstat (limited to 'src/gui/application')
| -rw-r--r-- | src/gui/application/RosegardenGUIApp.cpp | 408 | ||||
| -rw-r--r-- | src/gui/application/main.cpp | 2 |
2 files changed, 205 insertions, 205 deletions
diff --git a/src/gui/application/RosegardenGUIApp.cpp b/src/gui/application/RosegardenGUIApp.cpp index fe74f3f..e1de78a 100644 --- a/src/gui/application/RosegardenGUIApp.cpp +++ b/src/gui/application/RosegardenGUIApp.cpp @@ -285,7 +285,7 @@ RosegardenGUIApp::RosegardenGUIApp(bool useSequencer, if (startupStatusMessageReceiver) { - TQObject::connect(TQT_TQOBJECT(this), TQT_SIGNAL(startupStatusMessage(TQString)), + TQObject::connect(this, TQT_SIGNAL(startupStatusMessage(TQString)), startupStatusMessageReceiver, TQT_SLOT(slotShowStatusMessage(TQString))); } @@ -355,13 +355,13 @@ RosegardenGUIApp::RosegardenGUIApp(bool useSequencer, 20); // relation target/this (in percent) connect(m_dockLeft, TQT_SIGNAL(iMBeingClosed()), - TQT_TQOBJECT(this), TQT_SLOT(slotParametersClosed())); + this, TQT_SLOT(slotParametersClosed())); connect(m_dockLeft, TQT_SIGNAL(hasUndocked()), - TQT_TQOBJECT(this), TQT_SLOT(slotParametersClosed())); + this, TQT_SLOT(slotParametersClosed())); // Apparently, hasUndocked() is emitted when the dock widget's // 'close' button on the dock handle is clicked. connect(m_mainDockWidget, TQT_SIGNAL(docking(KDockWidget*, KDockWidget::DockPosition)), - TQT_TQOBJECT(this), TQT_SLOT(slotParametersDockedBack(KDockWidget*, KDockWidget::DockPosition))); + this, TQT_SLOT(slotParametersDockedBack(KDockWidget*, KDockWidget::DockPosition))); stateChanged("parametersbox_closed", KXMLGUIClient::StateReverse); @@ -494,7 +494,7 @@ RosegardenGUIApp::RosegardenGUIApp(bool useSequencer, stateChanged("have_project_packager", KXMLGUIClient::StateReverse); stateChanged("have_lilypondview", KXMLGUIClient::StateReverse); - TQTimer::singleShot(1000, TQT_TQOBJECT(this), TQT_SLOT(slotTestStartupTester())); + TQTimer::singleShot(1000, this, TQT_SLOT(slotTestStartupTester())); } RosegardenGUIApp::~RosegardenGUIApp() @@ -539,101 +539,101 @@ void RosegardenGUIApp::setupActions() { // setup File menu // New Window ? - KStdAction::openNew (TQT_TQOBJECT(this), TQT_SLOT(slotFileNew()), actionCollection()); - KStdAction::open (TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection()); - m_fileRecent = KStdAction::openRecent(TQT_TQOBJECT(this), + KStdAction::openNew (this, TQT_SLOT(slotFileNew()), actionCollection()); + KStdAction::open (this, TQT_SLOT(slotFileOpen()), actionCollection()); + m_fileRecent = KStdAction::openRecent(this, TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); - KStdAction::save (TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection()); - KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), actionCollection()); - KStdAction::revert(TQT_TQOBJECT(this), TQT_SLOT(slotRevertToSaved()), actionCollection()); - KStdAction::close (TQT_TQOBJECT(this), TQT_SLOT(slotFileClose()), actionCollection()); - KStdAction::print (TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), actionCollection()); - KStdAction::printPreview (TQT_TQOBJECT(this), TQT_SLOT(slotFilePrintPreview()), actionCollection()); - - new TDEAction(i18n("Import Rosegarden &Project file..."), 0, 0, TQT_TQOBJECT(this), + KStdAction::save (this, TQT_SLOT(slotFileSave()), actionCollection()); + KStdAction::saveAs(this, TQT_SLOT(slotFileSaveAs()), actionCollection()); + KStdAction::revert(this, TQT_SLOT(slotRevertToSaved()), actionCollection()); + KStdAction::close (this, TQT_SLOT(slotFileClose()), actionCollection()); + KStdAction::print (this, TQT_SLOT(slotFilePrint()), actionCollection()); + KStdAction::printPreview (this, TQT_SLOT(slotFilePrintPreview()), actionCollection()); + + new TDEAction(i18n("Import Rosegarden &Project file..."), 0, 0, this, TQT_SLOT(slotImportProject()), actionCollection(), "file_import_project"); - new TDEAction(i18n("Import &MIDI file..."), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Import &MIDI file..."), 0, 0, this, TQT_SLOT(slotImportMIDI()), actionCollection(), "file_import_midi"); - new TDEAction(i18n("Import &Rosegarden 2.1 file..."), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Import &Rosegarden 2.1 file..."), 0, 0, this, TQT_SLOT(slotImportRG21()), actionCollection(), "file_import_rg21"); - new TDEAction(i18n("Import &Hydrogen file..."), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Import &Hydrogen file..."), 0, 0, this, TQT_SLOT(slotImportHydrogen()), actionCollection(), "file_import_hydrogen"); - new TDEAction(i18n("Merge &File..."), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Merge &File..."), 0, 0, this, TQT_SLOT(slotMerge()), actionCollection(), "file_merge"); - new TDEAction(i18n("Merge &MIDI file..."), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Merge &MIDI file..."), 0, 0, this, TQT_SLOT(slotMergeMIDI()), actionCollection(), "file_merge_midi"); - new TDEAction(i18n("Merge &Rosegarden 2.1 file..."), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Merge &Rosegarden 2.1 file..."), 0, 0, this, TQT_SLOT(slotMergeRG21()), actionCollection(), "file_merge_rg21"); - new TDEAction(i18n("Merge &Hydrogen file..."), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Merge &Hydrogen file..."), 0, 0, this, TQT_SLOT(slotMergeHydrogen()), actionCollection(), "file_merge_hydrogen"); - new TDEAction(i18n("Export Rosegarden &Project file..."), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Export Rosegarden &Project file..."), 0, 0, this, TQT_SLOT(slotExportProject()), actionCollection(), "file_export_project"); - new TDEAction(i18n("Export &MIDI file..."), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Export &MIDI file..."), 0, 0, this, TQT_SLOT(slotExportMIDI()), actionCollection(), "file_export_midi"); - new TDEAction(i18n("Export &LilyPond file..."), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Export &LilyPond file..."), 0, 0, this, TQT_SLOT(slotExportLilyPond()), actionCollection(), "file_export_lilypond"); - new TDEAction(i18n("Export Music&XML file..."), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Export Music&XML file..."), 0, 0, this, TQT_SLOT(slotExportMusicXml()), actionCollection(), "file_export_musicxml"); - new TDEAction(i18n("Export &Csound score file..."), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Export &Csound score file..."), 0, 0, this, TQT_SLOT(slotExportCsound()), actionCollection(), "file_export_csound"); - new TDEAction(i18n("Export M&up file..."), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Export M&up file..."), 0, 0, this, TQT_SLOT(slotExportMup()), actionCollection(), "file_export_mup"); - new TDEAction(i18n("Print &with LilyPond..."), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Print &with LilyPond..."), 0, 0, this, TQT_SLOT(slotPrintLilyPond()), actionCollection(), "file_print_lilypond"); - new TDEAction(i18n("Preview with Lil&yPond..."), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Preview with Lil&yPond..."), 0, 0, this, TQT_SLOT(slotPreviewLilyPond()), actionCollection(), "file_preview_lilypond"); - new TDEAction(i18n("Play&list"), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Play&list"), 0, 0, this, TQT_SLOT(slotPlayList()), actionCollection(), "file_show_playlist"); - KStdAction::quit (TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection()); + KStdAction::quit (this, TQT_SLOT(slotQuit()), actionCollection()); // help menu - new TDEAction(i18n("Rosegarden &Tutorial"), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Rosegarden &Tutorial"), 0, 0, this, TQT_SLOT(slotTutorial()), actionCollection(), "tutorial"); - new TDEAction(i18n("&Bug Reporting Guidelines"), 0, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("&Bug Reporting Guidelines"), 0, 0, this, TQT_SLOT(slotBugGuidelines()), actionCollection(), "guidelines"); // setup edit menu - KStdAction::cut (TQT_TQOBJECT(this), TQT_SLOT(slotEditCut()), actionCollection()); - KStdAction::copy (TQT_TQOBJECT(this), TQT_SLOT(slotEditCopy()), actionCollection()); - KStdAction::paste (TQT_TQOBJECT(this), TQT_SLOT(slotEditPaste()), actionCollection()); + KStdAction::cut (this, TQT_SLOT(slotEditCut()), actionCollection()); + KStdAction::copy (this, TQT_SLOT(slotEditCopy()), actionCollection()); + KStdAction::paste (this, TQT_SLOT(slotEditPaste()), actionCollection()); // // undo/redo actions are special in that they are connected to @@ -657,85 +657,85 @@ void RosegardenGUIApp::setupActions() // setup Settings menu // - m_viewToolBar = KStdAction::showToolbar (TQT_TQOBJECT(this), TQT_SLOT(slotToggleToolBar()), actionCollection(), + m_viewToolBar = KStdAction::showToolbar (this, TQT_SLOT(slotToggleToolBar()), actionCollection(), "show_stock_toolbar"); - m_viewToolsToolBar = new TDEToggleAction(i18n("Show T&ools Toolbar"), 0, TQT_TQOBJECT(this), + m_viewToolsToolBar = new TDEToggleAction(i18n("Show T&ools Toolbar"), 0, this, TQT_SLOT(slotToggleToolsToolBar()), actionCollection(), "show_tools_toolbar"); - m_viewTracksToolBar = new TDEToggleAction(i18n("Show Trac&ks Toolbar"), 0, TQT_TQOBJECT(this), + m_viewTracksToolBar = new TDEToggleAction(i18n("Show Trac&ks Toolbar"), 0, this, TQT_SLOT(slotToggleTracksToolBar()), actionCollection(), "show_tracks_toolbar"); - m_viewEditorsToolBar = new TDEToggleAction(i18n("Show &Editors Toolbar"), 0, TQT_TQOBJECT(this), + m_viewEditorsToolBar = new TDEToggleAction(i18n("Show &Editors Toolbar"), 0, this, TQT_SLOT(slotToggleEditorsToolBar()), actionCollection(), "show_editors_toolbar"); - m_viewTransportToolBar = new TDEToggleAction(i18n("Show Trans&port Toolbar"), 0, TQT_TQOBJECT(this), + m_viewTransportToolBar = new TDEToggleAction(i18n("Show Trans&port Toolbar"), 0, this, TQT_SLOT(slotToggleTransportToolBar()), actionCollection(), "show_transport_toolbar"); - m_viewZoomToolBar = new TDEToggleAction(i18n("Show &Zoom Toolbar"), 0, TQT_TQOBJECT(this), + m_viewZoomToolBar = new TDEToggleAction(i18n("Show &Zoom Toolbar"), 0, this, TQT_SLOT(slotToggleZoomToolBar()), actionCollection(), "show_zoom_toolbar"); - m_viewStatusBar = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(slotToggleStatusBar()), + m_viewStatusBar = KStdAction::showStatusbar(this, TQT_SLOT(slotToggleStatusBar()), actionCollection(), "show_status_bar"); - m_viewTransport = new TDEToggleAction(i18n("Show Tra&nsport"), Key_T, TQT_TQOBJECT(this), + m_viewTransport = new TDEToggleAction(i18n("Show Tra&nsport"), Key_T, this, TQT_SLOT(slotToggleTransport()), actionCollection(), "show_transport"); - m_viewTrackLabels = new TDEToggleAction(i18n("Show Track &Labels"), 0, TQT_TQOBJECT(this), + m_viewTrackLabels = new TDEToggleAction(i18n("Show Track &Labels"), 0, this, TQT_SLOT(slotToggleTrackLabels()), actionCollection(), "show_tracklabels"); - m_viewRulers = new TDEToggleAction(i18n("Show Playback Position R&uler"), 0, TQT_TQOBJECT(this), + m_viewRulers = new TDEToggleAction(i18n("Show Playback Position R&uler"), 0, this, TQT_SLOT(slotToggleRulers()), actionCollection(), "show_rulers"); - m_viewTempoRuler = new TDEToggleAction(i18n("Show Te&mpo Ruler"), 0, TQT_TQOBJECT(this), + m_viewTempoRuler = new TDEToggleAction(i18n("Show Te&mpo Ruler"), 0, this, TQT_SLOT(slotToggleTempoRuler()), actionCollection(), "show_tempo_ruler"); - m_viewChordNameRuler = new TDEToggleAction(i18n("Show Cho&rd Name Ruler"), 0, TQT_TQOBJECT(this), + m_viewChordNameRuler = new TDEToggleAction(i18n("Show Cho&rd Name Ruler"), 0, this, TQT_SLOT(slotToggleChordNameRuler()), actionCollection(), "show_chord_name_ruler"); - m_viewPreviews = new TDEToggleAction(i18n("Show Segment Pre&views"), 0, TQT_TQOBJECT(this), + m_viewPreviews = new TDEToggleAction(i18n("Show Segment Pre&views"), 0, this, TQT_SLOT(slotTogglePreviews()), actionCollection(), "show_previews"); - new TDEAction(i18n("Show Special &Parameters"), Key_P, TQT_TQOBJECT(this), + new TDEAction(i18n("Show Special &Parameters"), Key_P, this, TQT_SLOT(slotDockParametersBack()), actionCollection(), "show_inst_segment_parameters"); - KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( slotShowTip() ), actionCollection() ); + KStdAction::tipOfDay( this, TQT_SLOT( slotShowTip() ), actionCollection() ); // Standard Actions // - KStdAction::saveOptions(TQT_TQOBJECT(this), + KStdAction::saveOptions(this, TQT_SLOT(slotSaveOptions()), actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(this), + KStdAction::preferences(this, TQT_SLOT(slotConfigure()), actionCollection()); - KStdAction::keyBindings(TQT_TQOBJECT(this), + KStdAction::keyBindings(this, TQT_SLOT(slotEditKeys()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), + KStdAction::configureToolbars(this, TQT_SLOT(slotEditToolbars()), actionCollection()); @@ -749,48 +749,48 @@ void RosegardenGUIApp::setupActions() // TODO : add some shortcuts here action = new TDERadioAction(i18n("&Select and Edit"), icon, Key_F2, - TQT_TQOBJECT(this), TQT_SLOT(slotPointerSelected()), + this, TQT_SLOT(slotPointerSelected()), actionCollection(), "select"); action->setExclusiveGroup("segmenttools"); action = new TDERadioAction(i18n("&Draw"), "pencil", Key_F3, - TQT_TQOBJECT(this), TQT_SLOT(slotDrawSelected()), + this, TQT_SLOT(slotDrawSelected()), actionCollection(), "draw"); action->setExclusiveGroup("segmenttools"); action = new TDERadioAction(i18n("&Erase"), "eraser", Key_F4, - TQT_TQOBJECT(this), TQT_SLOT(slotEraseSelected()), + this, TQT_SLOT(slotEraseSelected()), actionCollection(), "erase"); action->setExclusiveGroup("segmenttools"); action = new TDERadioAction(i18n("&Move"), "move", Key_F5, - TQT_TQOBJECT(this), TQT_SLOT(slotMoveSelected()), + this, TQT_SLOT(slotMoveSelected()), actionCollection(), "move"); action->setExclusiveGroup("segmenttools"); pixmap.load(pixmapDir + "/toolbar/resize.xpm"); icon = TQIconSet(pixmap); action = new TDERadioAction(i18n("&Resize"), icon, Key_F6, - TQT_TQOBJECT(this), TQT_SLOT(slotResizeSelected()), + this, TQT_SLOT(slotResizeSelected()), actionCollection(), "resize"); action->setExclusiveGroup("segmenttools"); pixmap.load(pixmapDir + "/toolbar/split.xpm"); icon = TQIconSet(pixmap); action = new TDERadioAction(i18n("&Split"), icon, Key_F7, - TQT_TQOBJECT(this), TQT_SLOT(slotSplitSelected()), + this, TQT_SLOT(slotSplitSelected()), actionCollection(), "split"); action->setExclusiveGroup("segmenttools"); pixmap.load(pixmapDir + "/toolbar/join.xpm"); icon = TQIconSet(pixmap); action = new TDERadioAction(i18n("&Join"), icon, 0, - TQT_TQOBJECT(this), TQT_SLOT(slotJoinSelected()), + this, TQT_SLOT(slotJoinSelected()), actionCollection(), "join"); action->setExclusiveGroup("segmenttools"); - new TDEAction(i18n("&Harmonize"), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("&Harmonize"), 0, this, TQT_SLOT(slotHarmonizeSelection()), actionCollection(), "harmonize_selection"); @@ -798,40 +798,40 @@ void RosegardenGUIApp::setupActions() icon = TQIconSet(pixmap); new TDEAction(AddTimeSignatureCommand::getGlobalName(), icon, 0, - TQT_TQOBJECT(this), TQT_SLOT(slotEditTimeSignature()), + this, TQT_SLOT(slotEditTimeSignature()), actionCollection(), "add_time_signature"); - new TDEAction(i18n("Open Tempo and Time Signature Editor"), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Open Tempo and Time Signature Editor"), 0, this, TQT_SLOT(slotEditTempos()), actionCollection(), "edit_tempos"); // // Edit menu // - new TDEAction(i18n("Cut Range"), Key_X + CTRL + SHIFT, TQT_TQOBJECT(this), + new TDEAction(i18n("Cut Range"), Key_X + CTRL + SHIFT, this, TQT_SLOT(slotCutRange()), actionCollection(), "cut_range"); - new TDEAction(i18n("Copy Range"), Key_C + CTRL + SHIFT, TQT_TQOBJECT(this), + new TDEAction(i18n("Copy Range"), Key_C + CTRL + SHIFT, this, TQT_SLOT(slotCopyRange()), actionCollection(), "copy_range"); - new TDEAction(i18n("Paste Range"), Key_V + CTRL + SHIFT, TQT_TQOBJECT(this), + new TDEAction(i18n("Paste Range"), Key_V + CTRL + SHIFT, this, TQT_SLOT(slotPasteRange()), actionCollection(), "paste_range"); /* - new TDEAction(i18n("Delete Range"), Key_Delete + SHIFT, TQT_TQOBJECT(this), + new TDEAction(i18n("Delete Range"), Key_Delete + SHIFT, this, TQT_SLOT(slotDeleteRange()), actionCollection(), "delete_range"); */ - new TDEAction(i18n("Insert Range..."), Key_Insert + SHIFT, TQT_TQOBJECT(this), + new TDEAction(i18n("Insert Range..."), Key_Insert + SHIFT, this, TQT_SLOT(slotInsertRange()), actionCollection(), "insert_range"); - new TDEAction(i18n("De&lete"), Key_Delete, TQT_TQOBJECT(this), + new TDEAction(i18n("De&lete"), Key_Delete, this, TQT_SLOT(slotDeleteSelectedSegments()), actionCollection(), "delete"); - new TDEAction(i18n("Select &All Segments"), Key_A + CTRL, TQT_TQOBJECT(this), + new TDEAction(i18n("Select &All Segments"), Key_A + CTRL, this, TQT_SLOT(slotSelectAll()), actionCollection(), "select_all"); @@ -839,19 +839,19 @@ void RosegardenGUIApp::setupActions() icon = TQIconSet(pixmap); new TDEAction(AddTempoChangeCommand::getGlobalName(), icon, 0, - TQT_TQOBJECT(this), TQT_SLOT(slotEditTempo()), + this, TQT_SLOT(slotEditTempo()), actionCollection(), "add_tempo"); new TDEAction(ChangeCompositionLengthCommand::getGlobalName(), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotChangeCompositionLength()), + this, TQT_SLOT(slotChangeCompositionLength()), actionCollection(), "change_composition_length"); - new TDEAction(i18n("Edit Mar&kers..."), Key_K + CTRL, TQT_TQOBJECT(this), + new TDEAction(i18n("Edit Mar&kers..."), Key_K + CTRL, this, TQT_SLOT(slotEditMarkers()), actionCollection(), "edit_markers"); - new TDEAction(i18n("Edit Document P&roperties..."), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Edit Document P&roperties..."), 0, this, TQT_SLOT(slotEditDocumentProperties()), actionCollection(), "edit_doc_properties"); @@ -859,109 +859,109 @@ void RosegardenGUIApp::setupActions() // // Segments menu // - new TDEAction(i18n("Open in &Default Editor"), Key_Return, TQT_TQOBJECT(this), + new TDEAction(i18n("Open in &Default Editor"), Key_Return, this, TQT_SLOT(slotEdit()), actionCollection(), "edit_default"); pixmap.load(pixmapDir + "/toolbar/matrix.png"); icon = TQIconSet(pixmap); - new TDEAction(i18n("Open in Matri&x Editor"), icon, Key_M, TQT_TQOBJECT(this), + new TDEAction(i18n("Open in Matri&x Editor"), icon, Key_M, this, TQT_SLOT(slotEditInMatrix()), actionCollection(), "edit_matrix"); pixmap.load(pixmapDir + "/toolbar/matrix-percussion.png"); icon = TQIconSet(pixmap); - new TDEAction(i18n("Open in &Percussion Matrix Editor"), icon, Key_D, TQT_TQOBJECT(this), + new TDEAction(i18n("Open in &Percussion Matrix Editor"), icon, Key_D, this, TQT_SLOT(slotEditInPercussionMatrix()), actionCollection(), "edit_percussion_matrix"); pixmap.load(pixmapDir + "/toolbar/notation.png"); icon = TQIconSet(pixmap); - new TDEAction(i18n("Open in &Notation Editor"), icon, Key_N, TQT_TQOBJECT(this), + new TDEAction(i18n("Open in &Notation Editor"), icon, Key_N, this, TQT_SLOT(slotEditAsNotation()), actionCollection(), "edit_notation"); pixmap.load(pixmapDir + "/toolbar/eventlist.png"); icon = TQIconSet(pixmap); - new TDEAction(i18n("Open in &Event List Editor"), icon, Key_E, TQT_TQOBJECT(this), + new TDEAction(i18n("Open in &Event List Editor"), icon, Key_E, this, TQT_SLOT(slotEditInEventList()), actionCollection(), "edit_event_list"); pixmap.load(pixmapDir + "/toolbar/quantize.png"); icon = TQIconSet(pixmap); - new TDEAction(i18n("&Quantize..."), icon, Key_Equal, TQT_TQOBJECT(this), + new TDEAction(i18n("&Quantize..."), icon, Key_Equal, this, TQT_SLOT(slotQuantizeSelection()), actionCollection(), "quantize_selection"); new TDEAction(SegmentLabelCommand::getGlobalName(), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotRelabelSegments()), + this, TQT_SLOT(slotRelabelSegments()), actionCollection(), "relabel_segment"); new TDEAction(SegmentTransposeCommand::getGlobalName(), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotTransposeSegments()), + this, TQT_SLOT(slotTransposeSegments()), actionCollection(), "transpose"); - new TDEAction(i18n("Repeat Last Quantize"), Key_Plus, TQT_TQOBJECT(this), + new TDEAction(i18n("Repeat Last Quantize"), Key_Plus, this, TQT_SLOT(slotRepeatQuantizeSelection()), actionCollection(), "repeat_quantize"); - new TDEAction(SegmentRescaleCommand::getGlobalName(), 0, TQT_TQOBJECT(this), + new TDEAction(SegmentRescaleCommand::getGlobalName(), 0, this, TQT_SLOT(slotRescaleSelection()), actionCollection(), "rescale"); - new TDEAction(SegmentAutoSplitCommand::getGlobalName(), 0, TQT_TQOBJECT(this), + new TDEAction(SegmentAutoSplitCommand::getGlobalName(), 0, this, TQT_SLOT(slotAutoSplitSelection()), actionCollection(), "auto_split"); - new TDEAction(SegmentSplitByPitchCommand::getGlobalName(), 0, TQT_TQOBJECT(this), + new TDEAction(SegmentSplitByPitchCommand::getGlobalName(), 0, this, TQT_SLOT(slotSplitSelectionByPitch()), actionCollection(), "split_by_pitch"); - new TDEAction(SegmentSplitByRecordingSrcCommand::getGlobalName(), 0, TQT_TQOBJECT(this), + new TDEAction(SegmentSplitByRecordingSrcCommand::getGlobalName(), 0, this, TQT_SLOT(slotSplitSelectionByRecordedSrc()), actionCollection(), "split_by_recording"); - new TDEAction(i18n("Split at Time..."), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Split at Time..."), 0, this, TQT_SLOT(slotSplitSelectionAtTime()), actionCollection(), "split_at_time"); - new TDEAction(i18n("Jog &Left"), Key_Left + ALT, TQT_TQOBJECT(this), + new TDEAction(i18n("Jog &Left"), Key_Left + ALT, this, TQT_SLOT(slotJogLeft()), actionCollection(), "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(), "jog_right"); - new TDEAction(i18n("Set Start Time..."), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Set Start Time..."), 0, this, TQT_SLOT(slotSetSegmentStartTimes()), actionCollection(), "set_segment_start"); - new TDEAction(i18n("Set Duration..."), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Set Duration..."), 0, this, TQT_SLOT(slotSetSegmentDurations()), actionCollection(), "set_segment_duration"); new TDEAction(SegmentJoinCommand::getGlobalName(), Key_J + CTRL, - TQT_TQOBJECT(this), TQT_SLOT(slotJoinSegments()), + this, TQT_SLOT(slotJoinSegments()), actionCollection(), "join_segments"); new TDEAction(i18n("Turn Re&peats into Copies"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotRepeatingSegments()), + this, TQT_SLOT(slotRepeatingSegments()), actionCollection(), "repeats_to_real_copies"); new TDEAction(i18n("Manage Tri&ggered Segments"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotManageTriggerSegments()), + this, TQT_SLOT(slotManageTriggerSegments()), actionCollection(), "manage_trigger_segments"); - new TDEAction(i18n("Set Tempos from &Beat Segment"), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Set Tempos from &Beat Segment"), 0, this, TQT_SLOT(slotGrooveQuantize()), actionCollection(), "groove_quantize"); - new TDEAction(i18n("Set &Tempo to Audio Segment Duration"), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Set &Tempo to Audio Segment Duration"), 0, this, TQT_SLOT(slotTempoToSegmentLength()), actionCollection(), "set_tempo_to_segment_length"); @@ -969,10 +969,10 @@ void RosegardenGUIApp::setupActions() icon = TQIconSet(pixmap); new TDEAction(i18n("Manage A&udio Files"), icon, Key_U + CTRL, - TQT_TQOBJECT(this), TQT_SLOT(slotAudioManager()), + this, TQT_SLOT(slotAudioManager()), actionCollection(), "audio_manager"); - m_viewSegmentLabels = new TDEToggleAction(i18n("Show Segment Labels"), 0, TQT_TQOBJECT(this), + m_viewSegmentLabels = new TDEToggleAction(i18n("Show Segment Labels"), 0, this, TQT_SLOT(slotToggleSegmentLabels()), actionCollection(), "show_segment_labels"); @@ -982,64 +982,64 @@ void RosegardenGUIApp::setupActions() pixmap.load(pixmapDir + "/toolbar/add_tracks.png"); icon = TQIconSet(pixmap); new TDEAction(i18n("Add &Track"), icon, CTRL + Key_T, - TQT_TQOBJECT(this), TQT_SLOT(slotAddTrack()), + this, TQT_SLOT(slotAddTrack()), actionCollection(), "add_track"); new TDEAction(i18n("&Add Tracks..."), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotAddTracks()), + this, TQT_SLOT(slotAddTracks()), actionCollection(), "add_tracks"); pixmap.load(pixmapDir + "/toolbar/delete_track.png"); icon = TQIconSet(pixmap); new TDEAction(i18n("D&elete Track"), icon, CTRL + Key_D, - TQT_TQOBJECT(this), TQT_SLOT(slotDeleteTrack()), + this, TQT_SLOT(slotDeleteTrack()), actionCollection(), "delete_track"); pixmap.load(pixmapDir + "/toolbar/move_track_down.png"); icon = TQIconSet(pixmap); new TDEAction(i18n("Move Track &Down"), icon, SHIFT + Key_Down, - TQT_TQOBJECT(this), TQT_SLOT(slotMoveTrackDown()), + this, TQT_SLOT(slotMoveTrackDown()), actionCollection(), "move_track_down"); pixmap.load(pixmapDir + "/toolbar/move_track_up.png"); icon = TQIconSet(pixmap); new TDEAction(i18n("Move Track &Up"), icon, SHIFT + Key_Up, - TQT_TQOBJECT(this), TQT_SLOT(slotMoveTrackUp()), + this, TQT_SLOT(slotMoveTrackUp()), actionCollection(), "move_track_up"); new TDEAction(i18n("Select &Next Track"), Key_Down, - TQT_TQOBJECT(this), TQT_SLOT(slotTrackDown()), + this, TQT_SLOT(slotTrackDown()), actionCollection(), "select_next_track"); new TDEAction(i18n("Select &Previous Track"), Key_Up, - TQT_TQOBJECT(this), TQT_SLOT(slotTrackUp()), + this, TQT_SLOT(slotTrackUp()), actionCollection(), "select_previous_track"); new TDEAction(i18n("Mute or Unmute Track"), Key_U, - TQT_TQOBJECT(this), TQT_SLOT(slotToggleMutedCurrentTrack()), + this, TQT_SLOT(slotToggleMutedCurrentTrack()), actionCollection(), "toggle_mute_track"); new TDEAction(i18n("Arm or Un-arm Track for Record"), Key_R, - TQT_TQOBJECT(this), TQT_SLOT(slotToggleRecordCurrentTrack()), + this, TQT_SLOT(slotToggleRecordCurrentTrack()), actionCollection(), "toggle_arm_track"); pixmap.load(pixmapDir + "/toolbar/mute-all.png"); icon = TQIconSet(pixmap); new TDEAction(i18n("&Mute all Tracks"), icon, 0, - TQT_TQOBJECT(this), TQT_SLOT(slotMuteAllTracks()), + this, TQT_SLOT(slotMuteAllTracks()), actionCollection(), "mute_all_tracks"); pixmap.load(pixmapDir + "/toolbar/un-mute-all.png"); icon = TQIconSet(pixmap); new TDEAction(i18n("&Unmute all Tracks"), icon, 0, - TQT_TQOBJECT(this), TQT_SLOT(slotUnmuteAllTracks()), + this, TQT_SLOT(slotUnmuteAllTracks()), actionCollection(), "unmute_all_tracks"); - new TDEAction(i18n("&Remap Instruments..."), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("&Remap Instruments..."), 0, this, TQT_SLOT(slotRemapInstruments()), actionCollection(), "remap_instruments"); @@ -1048,78 +1048,78 @@ void RosegardenGUIApp::setupActions() // pixmap.load(pixmapDir + "/toolbar/mixer.png"); icon = TQIconSet(pixmap); - new TDEAction(i18n("&Audio Mixer"), icon, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("&Audio Mixer"), icon, 0, this, TQT_SLOT(slotOpenAudioMixer()), actionCollection(), "audio_mixer"); pixmap.load(pixmapDir + "/toolbar/midimixer.png"); icon = TQIconSet(pixmap); - new TDEAction(i18n("Midi Mi&xer"), icon, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Midi Mi&xer"), icon, 0, this, TQT_SLOT(slotOpenMidiMixer()), actionCollection(), "midi_mixer"); pixmap.load(pixmapDir + "/toolbar/manage-midi-devices.xpm"); icon = TQIconSet(pixmap); - new TDEAction(i18n("Manage MIDI &Devices"), icon, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Manage MIDI &Devices"), icon, 0, this, TQT_SLOT(slotManageMIDIDevices()), actionCollection(), "manage_devices"); pixmap.load(pixmapDir + "/toolbar/manage-synth-plugins.png"); icon = TQIconSet(pixmap); - new TDEAction(i18n("Manage S&ynth Plugins"), icon, 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Manage S&ynth Plugins"), icon, 0, this, TQT_SLOT(slotManageSynths()), actionCollection(), "manage_synths"); - new TDEAction(i18n("Modify MIDI &Filters"), "filter", 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Modify MIDI &Filters"), "filter", 0, this, TQT_SLOT(slotModifyMIDIFilters()), actionCollection(), "modify_midi_filters"); - m_enableMIDIrouting = new TDEToggleAction(i18n("MIDI Thru Routing"), 0, TQT_TQOBJECT(this), + m_enableMIDIrouting = new TDEToggleAction(i18n("MIDI Thru Routing"), 0, this, TQT_SLOT(slotEnableMIDIThruRouting()), actionCollection(), "enable_midi_routing"); pixmap.load(pixmapDir + "/toolbar/time-musical.png"); icon = TQIconSet(pixmap); - new TDEAction(i18n("Manage &Metronome"), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Manage &Metronome"), 0, this, TQT_SLOT(slotManageMetronome()), actionCollection(), "manage_metronome"); - new TDEAction(i18n("&Save Current Document as Default Studio"), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("&Save Current Document as Default Studio"), 0, this, TQT_SLOT(slotSaveDefaultStudio()), actionCollection(), "save_default_studio"); - new TDEAction(i18n("&Import Default Studio"), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("&Import Default Studio"), 0, this, TQT_SLOT(slotImportDefaultStudio()), actionCollection(), "load_default_studio"); - new TDEAction(i18n("Im&port Studio from File..."), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Im&port Studio from File..."), 0, this, TQT_SLOT(slotImportStudio()), actionCollection(), "load_studio"); - new TDEAction(i18n("&Reset MIDI Network"), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("&Reset MIDI Network"), 0, this, TQT_SLOT(slotResetMidiNetwork()), actionCollection(), "reset_midi_network"); - m_setQuickMarkerAction = new TDEAction(i18n("Set Quick Marker at Playback Position"), 0, CTRL + Key_1, TQT_TQOBJECT(this), + m_setQuickMarkerAction = new TDEAction(i18n("Set Quick Marker at Playback Position"), 0, CTRL + Key_1, this, TQT_SLOT(slotSetQuickMarker()), actionCollection(), "set_quick_marker"); - m_jumpToQuickMarkerAction = new TDEAction(i18n("Jump to Quick Marker"), 0, Key_1, TQT_TQOBJECT(this), + m_jumpToQuickMarkerAction = new TDEAction(i18n("Jump to Quick Marker"), 0, Key_1, this, TQT_SLOT(slotJumpToQuickMarker()), actionCollection(), "jump_to_quick_marker"); // // Marker Ruler popup menu // -// new TDEAction(i18n("Insert Marker"), 0, 0, TQT_TQOBJECT(this), +// new TDEAction(i18n("Insert Marker"), 0, 0, this, // TQT_SLOT(slotInsertMarkerHere()), actionCollection(), // "insert_marker_here"); // -// new TDEAction(i18n("Insert Marker at Playback Position"), 0, 0, TQT_TQOBJECT(this), +// new TDEAction(i18n("Insert Marker at Playback Position"), 0, 0, this, // TQT_SLOT(slotInsertMarkerAtPointer()), actionCollection(), // "insert_marker_at_pointer"); // -// new TDEAction(i18n("Delete Marker"), 0, 0, TQT_TQOBJECT(this), +// new TDEAction(i18n("Delete Marker"), 0, 0, this, // TQT_SLOT(slotDeleteMarker()), actionCollection(), // "delete_marker"); @@ -1137,7 +1137,7 @@ void RosegardenGUIApp::setupActions() // pixmap.load(pixmapDir + "/toolbar/transport-play.png"); icon = TQIconSet(pixmap); - m_playTransport = new TDEAction(i18n("&Play"), icon, Key_Enter, TQT_TQOBJECT(this), + m_playTransport = new TDEAction(i18n("&Play"), icon, Key_Enter, this, TQT_SLOT(slotPlay()), actionCollection(), "play"); // Alternative shortcut for Play @@ -1148,7 +1148,7 @@ void RosegardenGUIApp::setupActions() pixmap.load(pixmapDir + "/toolbar/transport-stop.png"); icon = TQIconSet(pixmap); - m_stopTransport = new TDEAction(i18n("&Stop"), icon, Key_Insert, TQT_TQOBJECT(this), + m_stopTransport = new TDEAction(i18n("&Stop"), icon, Key_Insert, this, TQT_SLOT(slotStop()), actionCollection(), "stop"); m_stopTransport->setGroup(TransportDialogConfigGroup); @@ -1156,59 +1156,59 @@ void RosegardenGUIApp::setupActions() pixmap.load(pixmapDir + "/toolbar/transport-ffwd.png"); icon = TQIconSet(pixmap); m_ffwdTransport = new TDEAction(i18n("&Fast Forward"), icon, Key_PageDown, - TQT_TQOBJECT(this), + this, TQT_SLOT(slotFastforward()), actionCollection(), "fast_forward"); m_ffwdTransport->setGroup(TransportDialogConfigGroup); pixmap.load(pixmapDir + "/toolbar/transport-rewind.png"); icon = TQIconSet(pixmap); - m_rewindTransport = new TDEAction(i18n("Re&wind"), icon, Key_End, TQT_TQOBJECT(this), + m_rewindTransport = new TDEAction(i18n("Re&wind"), icon, Key_End, this, TQT_SLOT(slotRewind()), actionCollection(), "rewind"); m_rewindTransport->setGroup(TransportDialogConfigGroup); pixmap.load(pixmapDir + "/toolbar/transport-record.png"); icon = TQIconSet(pixmap); - m_recordTransport = new TDEAction(i18n("P&unch in Record"), icon, Key_Space, TQT_TQOBJECT(this), + m_recordTransport = new TDEAction(i18n("P&unch in Record"), icon, Key_Space, this, TQT_SLOT(slotToggleRecord()), actionCollection(), "recordtoggle"); m_recordTransport->setGroup(TransportDialogConfigGroup); pixmap.load(pixmapDir + "/toolbar/transport-record.png"); icon = TQIconSet(pixmap); - m_recordTransport = new TDEAction(i18n("&Record"), icon, 0, TQT_TQOBJECT(this), + m_recordTransport = new TDEAction(i18n("&Record"), icon, 0, this, TQT_SLOT(slotRecord()), actionCollection(), "record"); m_recordTransport->setGroup(TransportDialogConfigGroup); pixmap.load(pixmapDir + "/toolbar/transport-rewind-end.png"); icon = TQIconSet(pixmap); - m_rewindEndTransport = new TDEAction(i18n("Rewind to &Beginning"), icon, 0, TQT_TQOBJECT(this), + m_rewindEndTransport = new TDEAction(i18n("Rewind to &Beginning"), icon, 0, this, TQT_SLOT(slotRewindToBeginning()), actionCollection(), "rewindtobeginning"); m_rewindEndTransport->setGroup(TransportDialogConfigGroup); pixmap.load(pixmapDir + "/toolbar/transport-ffwd-end.png"); icon = TQIconSet(pixmap); - m_ffwdEndTransport = new TDEAction(i18n("Fast Forward to &End"), icon, 0, TQT_TQOBJECT(this), + m_ffwdEndTransport = new TDEAction(i18n("Fast Forward to &End"), icon, 0, this, TQT_SLOT(slotFastForwardToEnd()), actionCollection(), "fastforwardtoend"); m_ffwdEndTransport->setGroup(TransportDialogConfigGroup); pixmap.load(pixmapDir + "/toolbar/transport-tracking.png"); icon = TQIconSet(pixmap); - (new TDEToggleAction(i18n("Scro&ll to Follow Playback"), icon, Key_Pause, TQT_TQOBJECT(this), + (new TDEToggleAction(i18n("Scro&ll to Follow Playback"), icon, Key_Pause, this, TQT_SLOT(slotToggleTracking()), actionCollection(), "toggle_tracking"))->setChecked(true); pixmap.load(pixmapDir + "/toolbar/transport-panic.png"); icon = TQIconSet(pixmap); - new TDEAction( i18n("Panic"), icon, Key_P + CTRL + ALT, TQT_TQOBJECT(this), TQT_SLOT(slotPanic()), + new TDEAction( i18n("Panic"), icon, Key_P + CTRL + ALT, this, TQT_SLOT(slotPanic()), actionCollection(), "panic"); // DEBUG FACILITY - new TDEAction(i18n("Segment Debug Dump "), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Segment Debug Dump "), 0, this, TQT_SLOT(slotDebugDump()), actionCollection(), "debug_dump_segments"); @@ -1226,7 +1226,7 @@ void RosegardenGUIApp::setupActions() if (setTrackInstrumentMenu) { connect(setTrackInstrumentMenu, TQT_SIGNAL(aboutToShow()), - TQT_TQOBJECT(this), TQT_SLOT(slotPopulateTrackInstrumentPopup())); + this, TQT_SLOT(slotPopulateTrackInstrumentPopup())); } else { RG_DEBUG << "RosegardenGUIApp::setupActions() : couldn't find set_track_instrument menu - check rosegardenui.rcn\n"; } @@ -1302,7 +1302,7 @@ void RosegardenGUIApp::initZoomToolbar() m_zoomLabel->setIndent(10); connect(m_zoomSlider, TQT_SIGNAL(valueChanged(int)), - TQT_TQOBJECT(this), TQT_SLOT(slotChangeZoom(int))); + this, TQT_SLOT(slotChangeZoom(int))); // set initial zoom - we might want to make this a config option // m_zoomSlider->setToDefault(); @@ -1352,7 +1352,7 @@ void RosegardenGUIApp::initView() // Connect up this signal so that we can force tool mode // changes from the view connect(m_swapView, TQT_SIGNAL(activateTool(TQString)), - TQT_TQOBJECT(this), TQT_SLOT(slotActivateTool(TQString))); + this, TQT_SLOT(slotActivateTool(TQString))); connect(m_swapView, TQT_SIGNAL(segmentsSelected(const SegmentSelection &)), @@ -1413,10 +1413,10 @@ void RosegardenGUIApp::initView() m_view = m_swapView; connect(m_view, TQT_SIGNAL(stateChange(TQString, bool)), - TQT_TQOBJECT(this), TQT_SLOT (slotStateChanged(TQString, bool))); + this, TQT_SLOT (slotStateChanged(TQString, bool))); connect(m_view, TQT_SIGNAL(instrumentParametersChanged(InstrumentId)), - TQT_TQOBJECT(this), TQT_SIGNAL(instrumentParametersChanged(InstrumentId))); + this, TQT_SIGNAL(instrumentParametersChanged(InstrumentId))); // We only check for the SequenceManager to make sure // we're not on the first pass though - we don't want @@ -1592,13 +1592,13 @@ void RosegardenGUIApp::setDocument(RosegardenGUIDoc* newDocument) m_doc, TQT_SLOT(slotDocumentModified())); connect(m_doc, TQT_SIGNAL(pointerPositionChanged(timeT)), - TQT_TQOBJECT(this), TQT_SLOT(slotSetPointerPosition(timeT))); + this, TQT_SLOT(slotSetPointerPosition(timeT))); connect(m_doc, TQT_SIGNAL(documentModified(bool)), - TQT_TQOBJECT(this), TQT_SLOT(slotDocumentModified(bool))); + this, TQT_SLOT(slotDocumentModified(bool))); connect(m_doc, TQT_SIGNAL(loopChanged(timeT, timeT)), - TQT_TQOBJECT(this), TQT_SLOT(slotSetLoop(timeT, timeT))); + this, TQT_SLOT(slotSetLoop(timeT, timeT))); m_doc->getCommandHistory()->attachView(actionCollection()); @@ -1608,13 +1608,13 @@ void RosegardenGUIApp::setDocument(RosegardenGUIDoc* newDocument) TQT_SLOT(slotTestClipboard())); // connect and start the autosave timer - connect(m_autoSaveTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotAutoSave())); + connect(m_autoSaveTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAutoSave())); m_autoSaveTimer->start(m_doc->getAutoSavePeriod() * 1000); // Connect the playback timer // - connect(m_playTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdatePlaybackPosition())); - connect(m_stopTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateMonitoring())); + connect(m_playTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdatePlaybackPosition())); + connect(m_stopTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdateMonitoring())); // finally recreate the main view // @@ -1626,7 +1626,7 @@ void RosegardenGUIApp::setDocument(RosegardenGUIDoc* newDocument) } connect(m_doc, TQT_SIGNAL(devicesResyncd()), - TQT_TQOBJECT(this), TQT_SLOT(slotDocumentDevicesResyncd())); + this, TQT_SLOT(slotDocumentDevicesResyncd())); m_doc->syncDevices(); m_doc->clearModifiedStatus(); @@ -2076,7 +2076,7 @@ bool RosegardenGUIApp::queryClose() // disconnect(m_transport, TQT_SIGNAL(closed()), - TQT_TQOBJECT(this), TQT_SLOT(slotCloseTransport())); + this, TQT_SLOT(slotCloseTransport())); } */ @@ -2292,7 +2292,7 @@ RosegardenGUIApp::getValidWriteFile(TQString descriptiveExtension, // It's too bad there isn't this functionality within // KFileDialog::getSaveFileName - KFileDialog saveFileDialog(TQString(":ROSEGARDEN"), descriptiveExtension, TQT_TQWIDGET(this), label.ascii(), true); + KFileDialog saveFileDialog(TQString(":ROSEGARDEN"), descriptiveExtension, this, label.ascii(), true); saveFileDialog.setOperationMode(KFileDialog::Saving); if (m_doc) { TQString saveFileName = m_doc->getAbsFilePath(); @@ -4500,14 +4500,14 @@ void RosegardenGUIApp::slotTestStartupTester() if (!m_startupTester) { m_startupTester = new StartupTester(); connect(m_startupTester, TQT_SIGNAL(newerVersionAvailable(TQString)), - TQT_TQOBJECT(this), TQT_SLOT(slotNewerVersionAvailable(TQString))); + this, TQT_SLOT(slotNewerVersionAvailable(TQString))); m_startupTester->start(); - TQTimer::singleShot(100, TQT_TQOBJECT(this), TQT_SLOT(slotTestStartupTester())); + TQTimer::singleShot(100, this, TQT_SLOT(slotTestStartupTester())); return ; } if (!m_startupTester->isReady()) { - TQTimer::singleShot(100, TQT_TQOBJECT(this), TQT_SLOT(slotTestStartupTester())); + TQTimer::singleShot(100, this, TQT_SLOT(slotTestStartupTester())); return ; } @@ -4738,7 +4738,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting) slotEnableTransport(true); connect(m_sequencerProcess, TQT_SIGNAL(processExited(TDEProcess*)), - TQT_TQOBJECT(this), TQT_SLOT(slotSequencerExited(TDEProcess*))); + this, TQT_SLOT(slotSequencerExited(TDEProcess*))); } catch (Exception e) { m_sequencerProcess = 0; @@ -4951,7 +4951,7 @@ void RosegardenGUIApp::exportCsoundFile(TQString file) 100, this); - CsoundExporter e(TQT_TQOBJECT(this), &m_doc->getComposition(), std::string(TQFile::encodeName(file))); + CsoundExporter e(this, &m_doc->getComposition(), std::string(TQFile::encodeName(file))); connect(&e, TQT_SIGNAL(setProgress(int)), progressDlg.progressBar(), TQT_SLOT(setValue(int))); @@ -4984,7 +4984,7 @@ void RosegardenGUIApp::exportMupFile(TQString file) 100, this); - MupExporter e(TQT_TQOBJECT(this), &m_doc->getComposition(), std::string(TQFile::encodeName(file))); + MupExporter e(this, &m_doc->getComposition(), std::string(TQFile::encodeName(file))); connect(&e, TQT_SIGNAL(setProgress(int)), progressDlg.progressBar(), TQT_SLOT(setValue(int))); @@ -5035,7 +5035,7 @@ void RosegardenGUIApp::slotPrintLilyPond() *proc << "--print"; *proc << file->name(); connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), - TQT_TQOBJECT(this), TQT_SLOT(slotLilyPondViewProcessExited(TDEProcess *))); + this, TQT_SLOT(slotLilyPondViewProcessExited(TDEProcess *))); m_lilyTempFileMap[proc] = file; proc->start(TDEProcess::NotifyOnExit); } @@ -5059,7 +5059,7 @@ void RosegardenGUIApp::slotPreviewLilyPond() *proc << "--pdf"; *proc << file->name(); connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), - TQT_TQOBJECT(this), TQT_SLOT(slotLilyPondViewProcessExited(TDEProcess *))); + this, TQT_SLOT(slotLilyPondViewProcessExited(TDEProcess *))); m_lilyTempFileMap[proc] = file; proc->start(TDEProcess::NotifyOnExit); } @@ -5125,7 +5125,7 @@ void RosegardenGUIApp::exportMusicXmlFile(TQString file) 100, this); - MusicXmlExporter e(TQT_TQOBJECT(this), m_doc, std::string(TQFile::encodeName(file))); + MusicXmlExporter e(this, m_doc, std::string(TQFile::encodeName(file))); connect(&e, TQT_SIGNAL(setProgress(int)), progressDlg.progressBar(), TQT_SLOT(setValue(int))); @@ -5307,7 +5307,7 @@ RosegardenGUIApp::slotRecord() m_seqManager->getCountdownDialog()->getAccelerators()); connect(m_seqManager->getCountdownDialog(), TQT_SIGNAL(stopped()), - TQT_TQOBJECT(this), TQT_SLOT(slotStop())); + this, TQT_SLOT(slotStop())); // Start the playback timer - this fetches the current sequencer position &c // @@ -5458,9 +5458,9 @@ void RosegardenGUIApp::slotStop() if (m_seqManager && m_seqManager->getCountdownDialog()) { disconnect(m_seqManager->getCountdownDialog(), TQT_SIGNAL(stopped()), - TQT_TQOBJECT(this), TQT_SLOT(slotStop())); + this, TQT_SLOT(slotStop())); disconnect(m_seqManager->getCountdownDialog(), TQT_SIGNAL(completed()), - TQT_TQOBJECT(this), TQT_SLOT(slotStop())); + this, TQT_SLOT(slotStop())); } try { @@ -5644,9 +5644,9 @@ void RosegardenGUIApp::slotConfigure() new ConfigureDialog(m_doc, kapp->config(), this); connect(configDlg, TQT_SIGNAL(updateAutoSaveInterval(unsigned int)), - TQT_TQOBJECT(this), TQT_SLOT(slotUpdateAutoSaveInterval(unsigned int))); + this, TQT_SLOT(slotUpdateAutoSaveInterval(unsigned int))); connect(configDlg, TQT_SIGNAL(updateSidebarStyle(unsigned int)), - TQT_TQOBJECT(this), TQT_SLOT(slotUpdateSidebarStyle(unsigned int))); + this, TQT_SLOT(slotUpdateSidebarStyle(unsigned int))); configDlg->show(); } @@ -6269,7 +6269,7 @@ RosegardenGUIApp::slotAudioManager() TQT_SLOT(slotPropagateSegmentSelection(const SegmentSelection&))); // and from us to dialog - connect(TQT_TQOBJECT(this), TQT_SIGNAL(segmentsSelected(const SegmentSelection&)), + connect(this, TQT_SIGNAL(segmentsSelected(const SegmentSelection&)), m_audioManagerDialog, TQT_SLOT(slotSegmentSelection(const SegmentSelection&))); @@ -6302,7 +6302,7 @@ RosegardenGUIApp::slotAudioManager() // And that it goes away when the current document is changing // - connect(TQT_TQOBJECT(this), TQT_SIGNAL(documentAboutToChange()), + connect(this, TQT_SIGNAL(documentAboutToChange()), m_audioManagerDialog, TQT_SLOT(close())); m_audioManagerDialog->setAudioSubsystemStatus( @@ -6521,9 +6521,9 @@ RosegardenGUIApp::slotManageMIDIDevices() m_deviceManager = new DeviceManagerDialog(this, m_doc); connect(m_deviceManager, TQT_SIGNAL(closing()), - TQT_TQOBJECT(this), TQT_SLOT(slotDeviceManagerClosed())); + this, TQT_SLOT(slotDeviceManagerClosed())); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(documentAboutToChange()), + connect(this, TQT_SIGNAL(documentAboutToChange()), m_deviceManager, TQT_SLOT(close())); // Cheating way of updating the track/instrument list @@ -6532,10 +6532,10 @@ RosegardenGUIApp::slotManageMIDIDevices() m_view, TQT_SLOT(slotSynchroniseWithComposition())); connect(m_deviceManager, TQT_SIGNAL(editBanks(DeviceId)), - TQT_TQOBJECT(this), TQT_SLOT(slotEditBanks(DeviceId))); + this, TQT_SLOT(slotEditBanks(DeviceId))); connect(m_deviceManager, TQT_SIGNAL(editControllers(DeviceId)), - TQT_TQOBJECT(this), TQT_SLOT(slotEditControlParameters(DeviceId))); + this, TQT_SLOT(slotEditControlParameters(DeviceId))); if (m_midiMixer) { connect(m_deviceManager, TQT_SIGNAL(deviceNamesChanged()), @@ -6564,9 +6564,9 @@ RosegardenGUIApp::slotManageSynths() ); connect(m_synthManager, TQT_SIGNAL(closing()), - TQT_TQOBJECT(this), TQT_SLOT(slotSynthPluginManagerClosed())); + this, TQT_SLOT(slotSynthPluginManagerClosed())); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(documentAboutToChange()), + connect(this, TQT_SIGNAL(documentAboutToChange()), m_synthManager, TQT_SLOT(close())); connect(m_synthManager, @@ -6606,10 +6606,10 @@ RosegardenGUIApp::slotOpenAudioMixer() m_audioMixer, TQT_SLOT(slotControllerDeviceEventReceived(MappedEvent *, const void *))); connect(m_audioMixer, TQT_SIGNAL(closing()), - TQT_TQOBJECT(this), TQT_SLOT(slotAudioMixerClosed())); + this, TQT_SLOT(slotAudioMixerClosed())); connect(m_audioMixer, TQT_SIGNAL(selectPlugin(TQWidget *, InstrumentId, int)), - TQT_TQOBJECT(this), TQT_SLOT(slotShowPluginDialog(TQWidget *, InstrumentId, int))); + this, TQT_SLOT(slotShowPluginDialog(TQWidget *, InstrumentId, int))); connect(this, TQT_SIGNAL(pluginSelected(InstrumentId, int, int)), @@ -6621,28 +6621,28 @@ RosegardenGUIApp::slotOpenAudioMixer() m_audioMixer, TQT_SLOT(slotPluginBypassed(InstrumentId, int, bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(documentAboutToChange()), + connect(this, TQT_SIGNAL(documentAboutToChange()), m_audioMixer, TQT_SLOT(close())); connect(m_view, TQT_SIGNAL(checkTrackAssignments()), m_audioMixer, TQT_SLOT(slotTrackAssignmentsChanged())); connect(m_audioMixer, TQT_SIGNAL(play()), - TQT_TQOBJECT(this), TQT_SLOT(slotPlay())); + this, TQT_SLOT(slotPlay())); connect(m_audioMixer, TQT_SIGNAL(stop()), - TQT_TQOBJECT(this), TQT_SLOT(slotStop())); + this, TQT_SLOT(slotStop())); connect(m_audioMixer, TQT_SIGNAL(fastForwardPlayback()), - TQT_TQOBJECT(this), TQT_SLOT(slotFastforward())); + this, TQT_SLOT(slotFastforward())); connect(m_audioMixer, TQT_SIGNAL(rewindPlayback()), - TQT_TQOBJECT(this), TQT_SLOT(slotRewind())); + this, TQT_SLOT(slotRewind())); connect(m_audioMixer, TQT_SIGNAL(fastForwardPlaybackToEnd()), - TQT_TQOBJECT(this), TQT_SLOT(slotFastForwardToEnd())); + this, TQT_SLOT(slotFastForwardToEnd())); connect(m_audioMixer, TQT_SIGNAL(rewindPlaybackToBeginning()), - TQT_TQOBJECT(this), TQT_SLOT(slotRewindToBeginning())); + this, TQT_SLOT(slotRewindToBeginning())); connect(m_audioMixer, TQT_SIGNAL(record()), - TQT_TQOBJECT(this), TQT_SLOT(slotRecord())); + this, TQT_SLOT(slotRecord())); connect(m_audioMixer, TQT_SIGNAL(panic()), - TQT_TQOBJECT(this), TQT_SLOT(slotPanic())); + this, TQT_SLOT(slotPanic())); connect(m_audioMixer, TQT_SIGNAL(instrumentParametersChanged(InstrumentId)), @@ -6685,27 +6685,27 @@ RosegardenGUIApp::slotOpenMidiMixer() m_midiMixer, TQT_SLOT(slotControllerDeviceEventReceived(MappedEvent *, const void *))); connect(m_midiMixer, TQT_SIGNAL(closing()), - TQT_TQOBJECT(this), TQT_SLOT(slotMidiMixerClosed())); + this, TQT_SLOT(slotMidiMixerClosed())); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(documentAboutToChange()), + connect(this, TQT_SIGNAL(documentAboutToChange()), m_midiMixer, TQT_SLOT(close())); connect(m_midiMixer, TQT_SIGNAL(play()), - TQT_TQOBJECT(this), TQT_SLOT(slotPlay())); + this, TQT_SLOT(slotPlay())); connect(m_midiMixer, TQT_SIGNAL(stop()), - TQT_TQOBJECT(this), TQT_SLOT(slotStop())); + this, TQT_SLOT(slotStop())); connect(m_midiMixer, TQT_SIGNAL(fastForwardPlayback()), - TQT_TQOBJECT(this), TQT_SLOT(slotFastforward())); + this, TQT_SLOT(slotFastforward())); connect(m_midiMixer, TQT_SIGNAL(rewindPlayback()), - TQT_TQOBJECT(this), TQT_SLOT(slotRewind())); + this, TQT_SLOT(slotRewind())); connect(m_midiMixer, TQT_SIGNAL(fastForwardPlaybackToEnd()), - TQT_TQOBJECT(this), TQT_SLOT(slotFastForwardToEnd())); + this, TQT_SLOT(slotFastForwardToEnd())); connect(m_midiMixer, TQT_SIGNAL(rewindPlaybackToBeginning()), - TQT_TQOBJECT(this), TQT_SLOT(slotRewindToBeginning())); + this, TQT_SLOT(slotRewindToBeginning())); connect(m_midiMixer, TQT_SIGNAL(record()), - TQT_TQOBJECT(this), TQT_SLOT(slotRecord())); + this, TQT_SLOT(slotRecord())); connect(m_midiMixer, TQT_SIGNAL(panic()), - TQT_TQOBJECT(this), TQT_SLOT(slotPanic())); + this, TQT_SLOT(slotPanic())); connect(m_midiMixer, TQT_SIGNAL(instrumentParametersChanged(InstrumentId)), @@ -6745,7 +6745,7 @@ RosegardenGUIApp::slotEditControlParameters(DeviceId device) connect(controlEditor, TQT_SIGNAL(closing()), TQT_SLOT(slotControlEditorClosed())); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(documentAboutToChange()), + connect(this, TQT_SIGNAL(documentAboutToChange()), controlEditor, TQT_SLOT(close())); connect(m_doc, TQT_SIGNAL(devicesResyncd()), @@ -6775,9 +6775,9 @@ RosegardenGUIApp::slotEditBanks(DeviceId device) m_bankEditor = new BankEditorDialog(this, m_doc, device); connect(m_bankEditor, TQT_SIGNAL(closing()), - TQT_TQOBJECT(this), TQT_SLOT(slotBankEditorClosed())); + this, TQT_SLOT(slotBankEditorClosed())); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(documentAboutToChange()), + connect(this, TQT_SIGNAL(documentAboutToChange()), m_bankEditor, TQT_SLOT(slotFileClose())); // Cheating way of updating the track/instrument list @@ -6877,7 +6877,7 @@ RosegardenGUIApp::slotEditTempos(timeT t) tempoT, TempoDialog::TempoDialogAction))); - connect(m_tempoView, TQT_SIGNAL(saveFile()), TQT_TQOBJECT(this), TQT_SLOT(slotFileSave())); + connect(m_tempoView, TQT_SIGNAL(saveFile()), this, TQT_SLOT(slotFileSave())); plugAccelerators(m_tempoView, m_tempoView->getAccelerators()); @@ -7013,7 +7013,7 @@ RosegardenGUIApp::slotShowPluginDialog(TQWidget *parent, this, TQT_SLOT(slotPluginDialogDestroyed(InstrumentId, int))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(documentAboutToChange()), dialog, TQT_SLOT(close())); + connect(this, TQT_SIGNAL(documentAboutToChange()), dialog, TQT_SLOT(close())); m_pluginDialogs[key] = dialog; m_pluginDialogs[key]->show(); diff --git a/src/gui/application/main.cpp b/src/gui/application/main.cpp index 2e5e9f0..011a0c6 100644 --- a/src/gui/application/main.cpp +++ b/src/gui/application/main.cpp @@ -594,7 +594,7 @@ int main(int argc, char *argv[]) rosegardengui = new RosegardenGUIApp(!app.noSequencerMode(), args->isSet("existingsequencer"), - TQT_TQOBJECT(startLogo)); + startLogo); rosegardengui->setIsFirstRun(newVersion); |