diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-02 22:38:52 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-02 22:38:52 +0000 |
commit | 458efa7b0c935cbaafa2791021a5f8f7241aa876 (patch) | |
tree | 624583f2873febe23770bee3fa94b5c24bd59f4f /src/gui/application | |
parent | 747037b72944ae2c02962b7c5c96e0a7f8852e38 (diff) | |
download | rosegarden-458efa7b0c935cbaafa2791021a5f8f7241aa876.tar.gz rosegarden-458efa7b0c935cbaafa2791021a5f8f7241aa876.zip |
Initial TQt4 port of Rosegarden
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/rosegarden@1230242 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/gui/application')
-rw-r--r-- | src/gui/application/LircClient.h | 3 | ||||
-rw-r--r-- | src/gui/application/LircCommander.h | 3 | ||||
-rw-r--r-- | src/gui/application/RosegardenApplication.cpp | 6 | ||||
-rw-r--r-- | src/gui/application/RosegardenApplication.h | 5 | ||||
-rw-r--r-- | src/gui/application/RosegardenDCOP.h | 4 | ||||
-rw-r--r-- | src/gui/application/RosegardenGUIApp.cpp | 646 | ||||
-rw-r--r-- | src/gui/application/RosegardenGUIApp.cpp.orig | 216 | ||||
-rw-r--r-- | src/gui/application/RosegardenGUIApp.h | 21 | ||||
-rw-r--r-- | src/gui/application/RosegardenGUIView.cpp | 26 | ||||
-rw-r--r-- | src/gui/application/RosegardenGUIView.h | 7 | ||||
-rw-r--r-- | src/gui/application/RosegardenIface.h | 2 | ||||
-rw-r--r-- | src/gui/application/SetWaitCursor.cpp | 2 | ||||
-rw-r--r-- | src/gui/application/StartupTester.cpp | 2 | ||||
-rw-r--r-- | src/gui/application/StartupTester.h | 3 | ||||
-rw-r--r-- | src/gui/application/main.cpp | 32 |
15 files changed, 492 insertions, 486 deletions
diff --git a/src/gui/application/LircClient.h b/src/gui/application/LircClient.h index 3f69ce1..2f8cc82 100644 --- a/src/gui/application/LircClient.h +++ b/src/gui/application/LircClient.h @@ -42,9 +42,10 @@ namespace Rosegarden -class LircClient : public QObject +class LircClient : public TQObject { Q_OBJECT + TQ_OBJECT public: LircClient(void); ~LircClient(); diff --git a/src/gui/application/LircCommander.h b/src/gui/application/LircCommander.h index 60d356f..eafbda9 100644 --- a/src/gui/application/LircCommander.h +++ b/src/gui/application/LircCommander.h @@ -43,9 +43,10 @@ class TrackButtons; class LircClient; -class LircCommander : public QObject +class LircCommander : public TQObject { Q_OBJECT + TQ_OBJECT public: LircCommander(LircClient *lirc, RosegardenGUIApp *rgGUIApp); diff --git a/src/gui/application/RosegardenApplication.cpp b/src/gui/application/RosegardenApplication.cpp index b6282c3..263397e 100644 --- a/src/gui/application/RosegardenApplication.cpp +++ b/src/gui/application/RosegardenApplication.cpp @@ -101,7 +101,7 @@ void RosegardenApplication::sfxLoadExited(KProcess *proc) config()->setGroup(configGroup); KMessageBox::error(mainWidget(), - i18n("Failed to load soundfont %1").arg(soundFontPath)); + i18n("Failed to load soundfont %1").tqarg(soundFontPath)); } else { RG_DEBUG << "RosegardenApplication::sfxLoadExited() : sfxload exited normally\n"; } @@ -114,7 +114,7 @@ void RosegardenApplication::slotSetStatusMessage(TQString msg) if (mainWindow) { if (msg.isEmpty()) msg = KTmpStatusMsg::getDefaultMsg(); - mainWindow->statusBar()->changeItem(TQString(" %1").arg(msg), KTmpStatusMsg::getDefaultId()); + mainWindow->statusBar()->changeItem(TQString(" %1").tqarg(msg), KTmpStatusMsg::getDefaultId()); } } @@ -127,7 +127,7 @@ RosegardenApplication::refreshGUI(int maxTime) maxTime); } -void RosegardenApplication::saveState(QSessionManager& sm) +void RosegardenApplication::saveState(TQSessionManager& sm) { emit aboutToSaveState(); KUniqueApplication::saveState(sm); diff --git a/src/gui/application/RosegardenApplication.h b/src/gui/application/RosegardenApplication.h index ff3b2ba..648ee9d 100644 --- a/src/gui/application/RosegardenApplication.h +++ b/src/gui/application/RosegardenApplication.h @@ -31,7 +31,7 @@ #include <tqstring.h> -class QSessionManager; +class TQSessionManager; class KProcess; @@ -49,6 +49,7 @@ namespace Rosegarden class RosegardenApplication : public KUniqueApplication { Q_OBJECT + TQ_OBJECT public: RosegardenApplication(): KUniqueApplication(), m_noSequencerMode(false) {} @@ -73,7 +74,7 @@ public: void setNoSequencerMode(bool m=true) { m_noSequencerMode = m; } bool noSequencerMode() { return m_noSequencerMode; } - virtual void saveState(QSessionManager&); + virtual void saveState(TQSessionManager&); signals: // connect this to RosegardenGUIApp diff --git a/src/gui/application/RosegardenDCOP.h b/src/gui/application/RosegardenDCOP.h index 2689945..e82edbf 100644 --- a/src/gui/application/RosegardenDCOP.h +++ b/src/gui/application/RosegardenDCOP.h @@ -43,8 +43,8 @@ typedef enum STARTING_TO_PLAY, STARTING_TO_RECORD, RECORDING_ARMED, // gui only state - QUIT -} TransportStatus; + TQUIT +} TransporttqStatus; #endif // _ROSEGARDEN_DCOP_H_ diff --git a/src/gui/application/RosegardenGUIApp.cpp b/src/gui/application/RosegardenGUIApp.cpp index 2d0e23a..f3f4d1b 100644 --- a/src/gui/application/RosegardenGUIApp.cpp +++ b/src/gui/application/RosegardenGUIApp.cpp @@ -287,7 +287,7 @@ RosegardenGUIApp::RosegardenGUIApp(bool useSequencer, if (startupStatusMessageReceiver) { - TQObject::connect(this, TQT_SIGNAL(startupStatusMessage(TQString)), + TQObject::connect(TQT_TQOBJECT(this), TQT_SIGNAL(startupStatusMessage(TQString)), startupStatusMessageReceiver, TQT_SLOT(slotShowStatusMessage(TQString))); } @@ -357,13 +357,13 @@ RosegardenGUIApp::RosegardenGUIApp(bool useSequencer, 20); // relation target/this (in percent) connect(m_dockLeft, TQT_SIGNAL(iMBeingClosed()), - this, TQT_SLOT(slotParametersClosed())); + TQT_TQOBJECT(this), TQT_SLOT(slotParametersClosed())); connect(m_dockLeft, TQT_SIGNAL(hasUndocked()), - this, TQT_SLOT(slotParametersClosed())); - // Apparently, hasUndocked() is emitted when the dock widget's + TQT_TQOBJECT(this), TQT_SLOT(slotParametersClosed())); + // Aptqparently, 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)), - this, TQT_SLOT(slotParametersDockedBack(KDockWidget*, KDockWidget::DockPosition))); + TQT_TQOBJECT(this), TQT_SLOT(slotParametersDockedBack(KDockWidget*, KDockWidget::DockPosition))); stateChanged("parametersbox_closed", KXMLGUIClient::StateReverse); @@ -437,7 +437,7 @@ RosegardenGUIApp::RosegardenGUIApp(bool useSequencer, // problems. This warning has to happen early, in case it // affects the ability to load plugins etc from a file on the // command line. - m_seqManager->checkSoundDriverStatus(true); + m_seqManager->checkSoundDrivertqStatus(true); } if (m_view) { @@ -445,7 +445,7 @@ RosegardenGUIApp::RosegardenGUIApp(bool useSequencer, m_view, TQT_SLOT(slotControllerDeviceEventReceived(MappedEvent *))); } - if (m_seqManager->getSoundDriverStatus() & AUDIO_OK) { + if (m_seqManager->getSoundDrivertqStatus() & AUDIO_OK) { slotStateChanged("got_audio", true); } else { slotStateChanged("got_audio", false); @@ -496,7 +496,7 @@ RosegardenGUIApp::RosegardenGUIApp(bool useSequencer, stateChanged("have_project_packager", KXMLGUIClient::StateReverse); stateChanged("have_lilypondview", KXMLGUIClient::StateReverse); - TQTimer::singleShot(1000, this, TQT_SLOT(slotTestStartupTester())); + TQTimer::singleShot(1000, TQT_TQOBJECT(this), TQT_SLOT(slotTestStartupTester())); } RosegardenGUIApp::~RosegardenGUIApp() @@ -541,101 +541,101 @@ void RosegardenGUIApp::setupActions() { // setup File menu // New Window ? - KStdAction::openNew (this, TQT_SLOT(slotFileNew()), actionCollection()); - KStdAction::open (this, TQT_SLOT(slotFileOpen()), actionCollection()); - m_fileRecent = KStdAction::openRecent(this, + 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), TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); - 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 KAction(i18n("Import Rosegarden &Project file..."), 0, 0, this, + 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 KAction(i18n("Import Rosegarden &Project file..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotImportProject()), actionCollection(), "file_import_project"); - new KAction(i18n("Import &MIDI file..."), 0, 0, this, + new KAction(i18n("Import &MIDI file..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotImportMIDI()), actionCollection(), "file_import_midi"); - new KAction(i18n("Import &Rosegarden 2.1 file..."), 0, 0, this, + new KAction(i18n("Import &Rosegarden 2.1 file..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotImportRG21()), actionCollection(), "file_import_rg21"); - new KAction(i18n("Import &Hydrogen file..."), 0, 0, this, + new KAction(i18n("Import &Hydrogen file..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotImportHydrogen()), actionCollection(), "file_import_hydrogen"); - new KAction(i18n("Merge &File..."), 0, 0, this, + new KAction(i18n("Merge &File..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotMerge()), actionCollection(), "file_merge"); - new KAction(i18n("Merge &MIDI file..."), 0, 0, this, + new KAction(i18n("Merge &MIDI file..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotMergeMIDI()), actionCollection(), "file_merge_midi"); - new KAction(i18n("Merge &Rosegarden 2.1 file..."), 0, 0, this, + new KAction(i18n("Merge &Rosegarden 2.1 file..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotMergeRG21()), actionCollection(), "file_merge_rg21"); - new KAction(i18n("Merge &Hydrogen file..."), 0, 0, this, + new KAction(i18n("Merge &Hydrogen file..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotMergeHydrogen()), actionCollection(), "file_merge_hydrogen"); - new KAction(i18n("Export Rosegarden &Project file..."), 0, 0, this, + new KAction(i18n("Export Rosegarden &Project file..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotExportProject()), actionCollection(), "file_export_project"); - new KAction(i18n("Export &MIDI file..."), 0, 0, this, + new KAction(i18n("Export &MIDI file..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotExportMIDI()), actionCollection(), "file_export_midi"); - new KAction(i18n("Export &LilyPond file..."), 0, 0, this, + new KAction(i18n("Export &LilyPond file..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotExportLilyPond()), actionCollection(), "file_export_lilypond"); - new KAction(i18n("Export Music&XML file..."), 0, 0, this, + new KAction(i18n("Export Music&XML file..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotExportMusicXml()), actionCollection(), "file_export_musicxml"); - new KAction(i18n("Export &Csound score file..."), 0, 0, this, + new KAction(i18n("Export &Csound score file..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotExportCsound()), actionCollection(), "file_export_csound"); - new KAction(i18n("Export M&up file..."), 0, 0, this, + new KAction(i18n("Export M&up file..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotExportMup()), actionCollection(), "file_export_mup"); - new KAction(i18n("Print &with LilyPond..."), 0, 0, this, + new KAction(i18n("Print &with LilyPond..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotPrintLilyPond()), actionCollection(), "file_print_lilypond"); - new KAction(i18n("Preview with Lil&yPond..."), 0, 0, this, + new KAction(i18n("Preview with Lil&yPond..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotPreviewLilyPond()), actionCollection(), "file_preview_lilypond"); - new KAction(i18n("Play&list"), 0, 0, this, + new KAction(i18n("Play&list"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotPlayList()), actionCollection(), "file_show_playlist"); - KStdAction::quit (this, TQT_SLOT(slotQuit()), actionCollection()); + KStdAction::quit (TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection()); // help menu - new KAction(i18n("Rosegarden &Tutorial"), 0, 0, this, + new KAction(i18n("Rosegarden &Tutorial"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotTutorial()), actionCollection(), "tutorial"); - new KAction(i18n("&Bug Reporting Guidelines"), 0, 0, this, + new KAction(i18n("&Bug Reporting Guidelines"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotBugGuidelines()), actionCollection(), "guidelines"); // setup edit menu - KStdAction::cut (this, TQT_SLOT(slotEditCut()), actionCollection()); - KStdAction::copy (this, TQT_SLOT(slotEditCopy()), actionCollection()); - KStdAction::paste (this, TQT_SLOT(slotEditPaste()), actionCollection()); + 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()); // // undo/redo actions are special in that they are connected to @@ -659,85 +659,85 @@ void RosegardenGUIApp::setupActions() // setup Settings menu // - m_viewToolBar = KStdAction::showToolbar (this, TQT_SLOT(slotToggleToolBar()), actionCollection(), + m_viewToolBar = KStdAction::showToolbar (TQT_TQOBJECT(this), TQT_SLOT(slotToggleToolBar()), actionCollection(), "show_stock_toolbar"); - m_viewToolsToolBar = new KToggleAction(i18n("Show T&ools Toolbar"), 0, this, + m_viewToolsToolBar = new KToggleAction(i18n("Show T&ools Toolbar"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleToolsToolBar()), actionCollection(), "show_tools_toolbar"); - m_viewTracksToolBar = new KToggleAction(i18n("Show Trac&ks Toolbar"), 0, this, + m_viewTracksToolBar = new KToggleAction(i18n("Show Trac&ks Toolbar"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleTracksToolBar()), actionCollection(), "show_tracks_toolbar"); - m_viewEditorsToolBar = new KToggleAction(i18n("Show &Editors Toolbar"), 0, this, + m_viewEditorsToolBar = new KToggleAction(i18n("Show &Editors Toolbar"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleEditorsToolBar()), actionCollection(), "show_editors_toolbar"); - m_viewTransportToolBar = new KToggleAction(i18n("Show Trans&port Toolbar"), 0, this, + m_viewTransportToolBar = new KToggleAction(i18n("Show Trans&port Toolbar"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleTransportToolBar()), actionCollection(), "show_transport_toolbar"); - m_viewZoomToolBar = new KToggleAction(i18n("Show &Zoom Toolbar"), 0, this, + m_viewZoomToolBar = new KToggleAction(i18n("Show &Zoom Toolbar"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleZoomToolBar()), actionCollection(), "show_zoom_toolbar"); - m_viewStatusBar = KStdAction::showStatusbar(this, TQT_SLOT(slotToggleStatusBar()), + m_viewStatusBar = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(slotToggleStatusBar()), actionCollection(), "show_status_bar"); - m_viewTransport = new KToggleAction(i18n("Show Tra&nsport"), Key_T, this, + m_viewTransport = new KToggleAction(i18n("Show Tra&nsport"), Key_T, TQT_TQOBJECT(this), TQT_SLOT(slotToggleTransport()), actionCollection(), "show_transport"); - m_viewTrackLabels = new KToggleAction(i18n("Show Track &Labels"), 0, this, + m_viewTrackLabels = new KToggleAction(i18n("Show Track &Labels"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleTrackLabels()), actionCollection(), "show_tracklabels"); - m_viewRulers = new KToggleAction(i18n("Show Playback Position R&uler"), 0, this, + m_viewRulers = new KToggleAction(i18n("Show Playback Position R&uler"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleRulers()), actionCollection(), "show_rulers"); - m_viewTempoRuler = new KToggleAction(i18n("Show Te&mpo Ruler"), 0, this, + m_viewTempoRuler = new KToggleAction(i18n("Show Te&mpo Ruler"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleTempoRuler()), actionCollection(), "show_tempo_ruler"); - m_viewChordNameRuler = new KToggleAction(i18n("Show Cho&rd Name Ruler"), 0, this, + m_viewChordNameRuler = new KToggleAction(i18n("Show Cho&rd Name Ruler"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleChordNameRuler()), actionCollection(), "show_chord_name_ruler"); - m_viewPreviews = new KToggleAction(i18n("Show Segment Pre&views"), 0, this, + m_viewPreviews = new KToggleAction(i18n("Show Segment Pre&views"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTogglePreviews()), actionCollection(), "show_previews"); - new KAction(i18n("Show Special &Parameters"), Key_P, this, + new KAction(i18n("Show Special &Parameters"), Key_P, TQT_TQOBJECT(this), TQT_SLOT(slotDockParametersBack()), actionCollection(), "show_inst_segment_parameters"); - KStdAction::tipOfDay( this, TQT_SLOT( slotShowTip() ), actionCollection() ); + KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( slotShowTip() ), actionCollection() ); // Standard Actions // - KStdAction::saveOptions(this, + KStdAction::saveOptions(TQT_TQOBJECT(this), TQT_SLOT(slotSaveOptions()), actionCollection()); - KStdAction::preferences(this, + KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection()); - KStdAction::keyBindings(this, + KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotEditKeys()), actionCollection()); - KStdAction::configureToolbars(this, + KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbars()), actionCollection()); @@ -751,48 +751,48 @@ void RosegardenGUIApp::setupActions() // TODO : add some shortcuts here action = new KRadioAction(i18n("&Select and Edit"), icon, Key_F2, - this, TQT_SLOT(slotPointerSelected()), + TQT_TQOBJECT(this), TQT_SLOT(slotPointerSelected()), actionCollection(), "select"); action->setExclusiveGroup("segmenttools"); action = new KRadioAction(i18n("&Draw"), "pencil", Key_F3, - this, TQT_SLOT(slotDrawSelected()), + TQT_TQOBJECT(this), TQT_SLOT(slotDrawSelected()), actionCollection(), "draw"); action->setExclusiveGroup("segmenttools"); action = new KRadioAction(i18n("&Erase"), "eraser", Key_F4, - this, TQT_SLOT(slotEraseSelected()), + TQT_TQOBJECT(this), TQT_SLOT(slotEraseSelected()), actionCollection(), "erase"); action->setExclusiveGroup("segmenttools"); action = new KRadioAction(i18n("&Move"), "move", Key_F5, - this, TQT_SLOT(slotMoveSelected()), + TQT_TQOBJECT(this), TQT_SLOT(slotMoveSelected()), actionCollection(), "move"); action->setExclusiveGroup("segmenttools"); pixmap.load(pixmapDir + "/toolbar/resize.xpm"); icon = TQIconSet(pixmap); action = new KRadioAction(i18n("&Resize"), icon, Key_F6, - this, TQT_SLOT(slotResizeSelected()), + TQT_TQOBJECT(this), TQT_SLOT(slotResizeSelected()), actionCollection(), "resize"); action->setExclusiveGroup("segmenttools"); pixmap.load(pixmapDir + "/toolbar/split.xpm"); icon = TQIconSet(pixmap); action = new KRadioAction(i18n("&Split"), icon, Key_F7, - this, TQT_SLOT(slotSplitSelected()), + TQT_TQOBJECT(this), TQT_SLOT(slotSplitSelected()), actionCollection(), "split"); action->setExclusiveGroup("segmenttools"); pixmap.load(pixmapDir + "/toolbar/join.xpm"); icon = TQIconSet(pixmap); action = new KRadioAction(i18n("&Join"), icon, 0, - this, TQT_SLOT(slotJoinSelected()), + TQT_TQOBJECT(this), TQT_SLOT(slotJoinSelected()), actionCollection(), "join"); action->setExclusiveGroup("segmenttools"); - new KAction(i18n("&Harmonize"), 0, this, + new KAction(i18n("&Harmonize"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotHarmonizeSelection()), actionCollection(), "harmonize_selection"); @@ -800,40 +800,40 @@ void RosegardenGUIApp::setupActions() icon = TQIconSet(pixmap); new KAction(AddTimeSignatureCommand::getGlobalName(), icon, 0, - this, TQT_SLOT(slotEditTimeSignature()), + TQT_TQOBJECT(this), TQT_SLOT(slotEditTimeSignature()), actionCollection(), "add_time_signature"); - new KAction(i18n("Open Tempo and Time Signature Editor"), 0, this, + new KAction(i18n("Open Tempo and Time Signature Editor"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditTempos()), actionCollection(), "edit_tempos"); // // Edit menu // - new KAction(i18n("Cut Range"), Key_X + CTRL + SHIFT, this, + new KAction(i18n("Cut Range"), Key_X + CTRL + SHIFT, TQT_TQOBJECT(this), TQT_SLOT(slotCutRange()), actionCollection(), "cut_range"); - new KAction(i18n("Copy Range"), Key_C + CTRL + SHIFT, this, + new KAction(i18n("Copy Range"), Key_C + CTRL + SHIFT, TQT_TQOBJECT(this), TQT_SLOT(slotCopyRange()), actionCollection(), "copy_range"); - new KAction(i18n("Paste Range"), Key_V + CTRL + SHIFT, this, + new KAction(i18n("Paste Range"), Key_V + CTRL + SHIFT, TQT_TQOBJECT(this), TQT_SLOT(slotPasteRange()), actionCollection(), "paste_range"); /* - new KAction(i18n("Delete Range"), Key_Delete + SHIFT, this, + new KAction(i18n("Delete Range"), Key_Delete + SHIFT, TQT_TQOBJECT(this), TQT_SLOT(slotDeleteRange()), actionCollection(), "delete_range"); */ - new KAction(i18n("Insert Range..."), Key_Insert + SHIFT, this, + new KAction(i18n("Insert Range..."), Key_Insert + SHIFT, TQT_TQOBJECT(this), TQT_SLOT(slotInsertRange()), actionCollection(), "insert_range"); - new KAction(i18n("De&lete"), Key_Delete, this, + new KAction(i18n("De&lete"), Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotDeleteSelectedSegments()), actionCollection(), "delete"); - new KAction(i18n("Select &All Segments"), Key_A + CTRL, this, + new KAction(i18n("Select &All Segments"), Key_A + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll()), actionCollection(), "select_all"); @@ -841,19 +841,19 @@ void RosegardenGUIApp::setupActions() icon = TQIconSet(pixmap); new KAction(AddTempoChangeCommand::getGlobalName(), icon, 0, - this, TQT_SLOT(slotEditTempo()), + TQT_TQOBJECT(this), TQT_SLOT(slotEditTempo()), actionCollection(), "add_tempo"); new KAction(ChangeCompositionLengthCommand::getGlobalName(), 0, - this, TQT_SLOT(slotChangeCompositionLength()), + TQT_TQOBJECT(this), TQT_SLOT(slotChangeCompositionLength()), actionCollection(), "change_composition_length"); - new KAction(i18n("Edit Mar&kers..."), Key_K + CTRL, this, + new KAction(i18n("Edit Mar&kers..."), Key_K + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotEditMarkers()), actionCollection(), "edit_markers"); - new KAction(i18n("Edit Document P&roperties..."), 0, this, + new KAction(i18n("Edit Document P&roperties..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditDocumentProperties()), actionCollection(), "edit_doc_properties"); @@ -861,109 +861,109 @@ void RosegardenGUIApp::setupActions() // // Segments menu // - new KAction(i18n("Open in &Default Editor"), Key_Return, this, + new KAction(i18n("Open in &Default Editor"), Key_Return, TQT_TQOBJECT(this), TQT_SLOT(slotEdit()), actionCollection(), "edit_default"); pixmap.load(pixmapDir + "/toolbar/matrix.png"); icon = TQIconSet(pixmap); - new KAction(i18n("Open in Matri&x Editor"), icon, Key_M, this, + new KAction(i18n("Open in Matri&x Editor"), icon, Key_M, TQT_TQOBJECT(this), TQT_SLOT(slotEditInMatrix()), actionCollection(), "edit_matrix"); pixmap.load(pixmapDir + "/toolbar/matrix-percussion.png"); icon = TQIconSet(pixmap); - new KAction(i18n("Open in &Percussion Matrix Editor"), icon, Key_D, this, + new KAction(i18n("Open in &Percussion Matrix Editor"), icon, Key_D, TQT_TQOBJECT(this), TQT_SLOT(slotEditInPercussionMatrix()), actionCollection(), "edit_percussion_matrix"); pixmap.load(pixmapDir + "/toolbar/notation.png"); icon = TQIconSet(pixmap); - new KAction(i18n("Open in &Notation Editor"), icon, Key_N, this, + new KAction(i18n("Open in &Notation Editor"), icon, Key_N, TQT_TQOBJECT(this), TQT_SLOT(slotEditAsNotation()), actionCollection(), "edit_notation"); pixmap.load(pixmapDir + "/toolbar/eventlist.png"); icon = TQIconSet(pixmap); - new KAction(i18n("Open in &Event List Editor"), icon, Key_E, this, + new KAction(i18n("Open in &Event List Editor"), icon, Key_E, TQT_TQOBJECT(this), TQT_SLOT(slotEditInEventList()), actionCollection(), "edit_event_list"); pixmap.load(pixmapDir + "/toolbar/quantize.png"); icon = TQIconSet(pixmap); - new KAction(i18n("&Quantize..."), icon, Key_Equal, this, + new KAction(i18n("&Quantize..."), icon, Key_Equal, TQT_TQOBJECT(this), TQT_SLOT(slotQuantizeSelection()), actionCollection(), "quantize_selection"); new KAction(SegmentLabelCommand::getGlobalName(), 0, - this, TQT_SLOT(slotRelabelSegments()), + TQT_TQOBJECT(this), TQT_SLOT(slotRelabelSegments()), actionCollection(), "relabel_segment"); new KAction(SegmentTransposeCommand::getGlobalName(), 0, - this, TQT_SLOT(slotTransposeSegments()), + TQT_TQOBJECT(this), TQT_SLOT(slotTransposeSegments()), actionCollection(), "transpose"); - new KAction(i18n("Repeat Last Quantize"), Key_Plus, this, + new KAction(i18n("Repeat Last Quantize"), Key_Plus, TQT_TQOBJECT(this), TQT_SLOT(slotRepeatQuantizeSelection()), actionCollection(), "repeat_quantize"); - new KAction(SegmentRescaleCommand::getGlobalName(), 0, this, + new KAction(SegmentRescaleCommand::getGlobalName(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotRescaleSelection()), actionCollection(), "rescale"); - new KAction(SegmentAutoSplitCommand::getGlobalName(), 0, this, + new KAction(SegmentAutoSplitCommand::getGlobalName(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAutoSplitSelection()), actionCollection(), "auto_split"); - new KAction(SegmentSplitByPitchCommand::getGlobalName(), 0, this, + new KAction(SegmentSplitByPitchCommand::getGlobalName(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSplitSelectionByPitch()), actionCollection(), "split_by_pitch"); - new KAction(SegmentSplitByRecordingSrcCommand::getGlobalName(), 0, this, + new KAction(SegmentSplitByRecordingSrcCommand::getGlobalName(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSplitSelectionByRecordedSrc()), actionCollection(), "split_by_recording"); - new KAction(i18n("Split at Time..."), 0, this, + new KAction(i18n("Split at Time..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSplitSelectionAtTime()), actionCollection(), "split_at_time"); - new KAction(i18n("Jog &Left"), Key_Left + ALT, this, + new KAction(i18n("Jog &Left"), Key_Left + ALT, TQT_TQOBJECT(this), TQT_SLOT(slotJogLeft()), actionCollection(), "jog_left"); - new KAction(i18n("Jog &Right"), Key_Right + ALT, this, + new KAction(i18n("Jog &Right"), Key_Right + ALT, TQT_TQOBJECT(this), TQT_SLOT(slotJogRight()), actionCollection(), "jog_right"); - new KAction(i18n("Set Start Time..."), 0, this, + new KAction(i18n("Set Start Time..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetSegmentStartTimes()), actionCollection(), "set_segment_start"); - new KAction(i18n("Set Duration..."), 0, this, + new KAction(i18n("Set Duration..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetSegmentDurations()), actionCollection(), "set_segment_duration"); new KAction(SegmentJoinCommand::getGlobalName(), Key_J + CTRL, - this, TQT_SLOT(slotJoinSegments()), + TQT_TQOBJECT(this), TQT_SLOT(slotJoinSegments()), actionCollection(), "join_segments"); new KAction(i18n("Turn Re&peats into Copies"), 0, - this, TQT_SLOT(slotRepeatingSegments()), + TQT_TQOBJECT(this), TQT_SLOT(slotRepeatingSegments()), actionCollection(), "repeats_to_real_copies"); new KAction(i18n("Manage Tri&ggered Segments"), 0, - this, TQT_SLOT(slotManageTriggerSegments()), + TQT_TQOBJECT(this), TQT_SLOT(slotManageTriggerSegments()), actionCollection(), "manage_trigger_segments"); - new KAction(i18n("Set Tempos from &Beat Segment"), 0, this, + new KAction(i18n("Set Tempos from &Beat Segment"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotGrooveQuantize()), actionCollection(), "groove_quantize"); - new KAction(i18n("Set &Tempo to Audio Segment Duration"), 0, this, + new KAction(i18n("Set &Tempo to Audio Segment Duration"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTempoToSegmentLength()), actionCollection(), "set_tempo_to_segment_length"); @@ -971,10 +971,10 @@ void RosegardenGUIApp::setupActions() icon = TQIconSet(pixmap); new KAction(i18n("Manage A&udio Files"), icon, Key_U + CTRL, - this, TQT_SLOT(slotAudioManager()), + TQT_TQOBJECT(this), TQT_SLOT(slotAudioManager()), actionCollection(), "audio_manager"); - m_viewSegmentLabels = new KToggleAction(i18n("Show Segment Labels"), 0, this, + m_viewSegmentLabels = new KToggleAction(i18n("Show Segment Labels"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleSegmentLabels()), actionCollection(), "show_segment_labels"); @@ -984,64 +984,64 @@ void RosegardenGUIApp::setupActions() pixmap.load(pixmapDir + "/toolbar/add_tracks.png"); icon = TQIconSet(pixmap); new KAction(i18n("Add &Track"), icon, CTRL + Key_T, - this, TQT_SLOT(slotAddTrack()), + TQT_TQOBJECT(this), TQT_SLOT(slotAddTrack()), actionCollection(), "add_track"); new KAction(i18n("&Add Tracks..."), 0, - this, TQT_SLOT(slotAddTracks()), + TQT_TQOBJECT(this), TQT_SLOT(slotAddTracks()), actionCollection(), "add_tracks"); pixmap.load(pixmapDir + "/toolbar/delete_track.png"); icon = TQIconSet(pixmap); new KAction(i18n("D&elete Track"), icon, CTRL + Key_D, - this, TQT_SLOT(slotDeleteTrack()), + TQT_TQOBJECT(this), TQT_SLOT(slotDeleteTrack()), actionCollection(), "delete_track"); pixmap.load(pixmapDir + "/toolbar/move_track_down.png"); icon = TQIconSet(pixmap); new KAction(i18n("Move Track &Down"), icon, SHIFT + Key_Down, - this, TQT_SLOT(slotMoveTrackDown()), + TQT_TQOBJECT(this), TQT_SLOT(slotMoveTrackDown()), actionCollection(), "move_track_down"); pixmap.load(pixmapDir + "/toolbar/move_track_up.png"); icon = TQIconSet(pixmap); new KAction(i18n("Move Track &Up"), icon, SHIFT + Key_Up, - this, TQT_SLOT(slotMoveTrackUp()), + TQT_TQOBJECT(this), TQT_SLOT(slotMoveTrackUp()), actionCollection(), "move_track_up"); new KAction(i18n("Select &Next Track"), Key_Down, - this, TQT_SLOT(slotTrackDown()), + TQT_TQOBJECT(this), TQT_SLOT(slotTrackDown()), actionCollection(), "select_next_track"); new KAction(i18n("Select &Previous Track"), Key_Up, - this, TQT_SLOT(slotTrackUp()), + TQT_TQOBJECT(this), TQT_SLOT(slotTrackUp()), actionCollection(), "select_previous_track"); new KAction(i18n("Mute or Unmute Track"), Key_U, - this, TQT_SLOT(slotToggleMutedCurrentTrack()), + TQT_TQOBJECT(this), TQT_SLOT(slotToggleMutedCurrentTrack()), actionCollection(), "toggle_mute_track"); new KAction(i18n("Arm or Un-arm Track for Record"), Key_R, - this, TQT_SLOT(slotToggleRecordCurrentTrack()), + TQT_TQOBJECT(this), TQT_SLOT(slotToggleRecordCurrentTrack()), actionCollection(), "toggle_arm_track"); pixmap.load(pixmapDir + "/toolbar/mute-all.png"); icon = TQIconSet(pixmap); new KAction(i18n("&Mute all Tracks"), icon, 0, - this, TQT_SLOT(slotMuteAllTracks()), + TQT_TQOBJECT(this), TQT_SLOT(slotMuteAllTracks()), actionCollection(), "mute_all_tracks"); pixmap.load(pixmapDir + "/toolbar/un-mute-all.png"); icon = TQIconSet(pixmap); new KAction(i18n("&Unmute all Tracks"), icon, 0, - this, TQT_SLOT(slotUnmuteAllTracks()), + TQT_TQOBJECT(this), TQT_SLOT(slotUnmuteAllTracks()), actionCollection(), "unmute_all_tracks"); - new KAction(i18n("&Remap Instruments..."), 0, this, + new KAction(i18n("&Remap Instruments..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotRemapInstruments()), actionCollection(), "remap_instruments"); @@ -1050,78 +1050,78 @@ void RosegardenGUIApp::setupActions() // pixmap.load(pixmapDir + "/toolbar/mixer.png"); icon = TQIconSet(pixmap); - new KAction(i18n("&Audio Mixer"), icon, 0, this, + new KAction(i18n("&Audio Mixer"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenAudioMixer()), actionCollection(), "audio_mixer"); pixmap.load(pixmapDir + "/toolbar/midimixer.png"); icon = TQIconSet(pixmap); - new KAction(i18n("Midi Mi&xer"), icon, 0, this, + new KAction(i18n("Midi Mi&xer"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenMidiMixer()), actionCollection(), "midi_mixer"); pixmap.load(pixmapDir + "/toolbar/manage-midi-devices.xpm"); icon = TQIconSet(pixmap); - new KAction(i18n("Manage MIDI &Devices"), icon, 0, this, + new KAction(i18n("Manage MIDI &Devices"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotManageMIDIDevices()), actionCollection(), "manage_devices"); pixmap.load(pixmapDir + "/toolbar/manage-synth-plugins.png"); icon = TQIconSet(pixmap); - new KAction(i18n("Manage S&ynth Plugins"), icon, 0, this, + new KAction(i18n("Manage S&ynth Plugins"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotManageSynths()), actionCollection(), "manage_synths"); - new KAction(i18n("Modify MIDI &Filters"), "filter", 0, this, + new KAction(i18n("Modify MIDI &Filters"), "filter", 0, TQT_TQOBJECT(this), TQT_SLOT(slotModifyMIDIFilters()), actionCollection(), "modify_midi_filters"); - m_enableMIDIrouting = new KToggleAction(i18n("MIDI Thru Routing"), 0, this, + m_enableMIDIrouting = new KToggleAction(i18n("MIDI Thru Routing"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEnableMIDIThruRouting()), actionCollection(), "enable_midi_routing"); pixmap.load(pixmapDir + "/toolbar/time-musical.png"); icon = TQIconSet(pixmap); - new KAction(i18n("Manage &Metronome"), 0, this, + new KAction(i18n("Manage &Metronome"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotManageMetronome()), actionCollection(), "manage_metronome"); - new KAction(i18n("&Save Current Document as Default Studio"), 0, this, + new KAction(i18n("&Save Current Document as Default Studio"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveDefaultStudio()), actionCollection(), "save_default_studio"); - new KAction(i18n("&Import Default Studio"), 0, this, + new KAction(i18n("&Import Default Studio"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotImportDefaultStudio()), actionCollection(), "load_default_studio"); - new KAction(i18n("Im&port Studio from File..."), 0, this, + new KAction(i18n("Im&port Studio from File..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotImportStudio()), actionCollection(), "load_studio"); - new KAction(i18n("&Reset MIDI Network"), 0, this, + new KAction(i18n("&Reset MIDI Network"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotResetMidiNetwork()), actionCollection(), "reset_midi_network"); - m_setQuickMarkerAction = new KAction(i18n("Set Quick Marker at Playback Position"), 0, CTRL + Key_1, this, + m_setQuickMarkerAction = new KAction(i18n("Set Quick Marker at Playback Position"), 0, CTRL + Key_1, TQT_TQOBJECT(this), TQT_SLOT(slotSetQuickMarker()), actionCollection(), "set_quick_marker"); - m_jumpToQuickMarkerAction = new KAction(i18n("Jump to Quick Marker"), 0, Key_1, this, + m_jumpToQuickMarkerAction = new KAction(i18n("Jump to Quick Marker"), 0, Key_1, TQT_TQOBJECT(this), TQT_SLOT(slotJumpToQuickMarker()), actionCollection(), "jump_to_quick_marker"); // // Marker Ruler popup menu // -// new KAction(i18n("Insert Marker"), 0, 0, this, +// new KAction(i18n("Insert Marker"), 0, 0, TQT_TQOBJECT(this), // TQT_SLOT(slotInsertMarkerHere()), actionCollection(), // "insert_marker_here"); // -// new KAction(i18n("Insert Marker at Playback Position"), 0, 0, this, +// new KAction(i18n("Insert Marker at Playback Position"), 0, 0, TQT_TQOBJECT(this), // TQT_SLOT(slotInsertMarkerAtPointer()), actionCollection(), // "insert_marker_at_pointer"); // -// new KAction(i18n("Delete Marker"), 0, 0, this, +// new KAction(i18n("Delete Marker"), 0, 0, TQT_TQOBJECT(this), // TQT_SLOT(slotDeleteMarker()), actionCollection(), // "delete_marker"); @@ -1139,7 +1139,7 @@ void RosegardenGUIApp::setupActions() // pixmap.load(pixmapDir + "/toolbar/transport-play.png"); icon = TQIconSet(pixmap); - m_playTransport = new KAction(i18n("&Play"), icon, Key_Enter, this, + m_playTransport = new KAction(i18n("&Play"), icon, Key_Enter, TQT_TQOBJECT(this), TQT_SLOT(slotPlay()), actionCollection(), "play"); // Alternative shortcut for Play @@ -1150,7 +1150,7 @@ void RosegardenGUIApp::setupActions() pixmap.load(pixmapDir + "/toolbar/transport-stop.png"); icon = TQIconSet(pixmap); - m_stopTransport = new KAction(i18n("&Stop"), icon, Key_Insert, this, + m_stopTransport = new KAction(i18n("&Stop"), icon, Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotStop()), actionCollection(), "stop"); m_stopTransport->setGroup(TransportDialogConfigGroup); @@ -1158,59 +1158,59 @@ void RosegardenGUIApp::setupActions() pixmap.load(pixmapDir + "/toolbar/transport-ffwd.png"); icon = TQIconSet(pixmap); m_ffwdTransport = new KAction(i18n("&Fast Forward"), icon, Key_PageDown, - this, + TQT_TQOBJECT(this), TQT_SLOT(slotFastforward()), actionCollection(), "fast_forward"); m_ffwdTransport->setGroup(TransportDialogConfigGroup); pixmap.load(pixmapDir + "/toolbar/transport-rewind.png"); icon = TQIconSet(pixmap); - m_rewindTransport = new KAction(i18n("Re&wind"), icon, Key_End, this, + m_rewindTransport = new KAction(i18n("Re&wind"), icon, Key_End, TQT_TQOBJECT(this), TQT_SLOT(slotRewind()), actionCollection(), "rewind"); m_rewindTransport->setGroup(TransportDialogConfigGroup); pixmap.load(pixmapDir + "/toolbar/transport-record.png"); icon = TQIconSet(pixmap); - m_recordTransport = new KAction(i18n("P&unch in Record"), icon, Key_Space, this, + m_recordTransport = new KAction(i18n("P&unch in Record"), icon, Key_Space, TQT_TQOBJECT(this), TQT_SLOT(slotToggleRecord()), actionCollection(), "recordtoggle"); m_recordTransport->setGroup(TransportDialogConfigGroup); pixmap.load(pixmapDir + "/toolbar/transport-record.png"); icon = TQIconSet(pixmap); - m_recordTransport = new KAction(i18n("&Record"), icon, 0, this, + m_recordTransport = new KAction(i18n("&Record"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRecord()), actionCollection(), "record"); m_recordTransport->setGroup(TransportDialogConfigGroup); pixmap.load(pixmapDir + "/toolbar/transport-rewind-end.png"); icon = TQIconSet(pixmap); - m_rewindEndTransport = new KAction(i18n("Rewind to &Beginning"), icon, 0, this, + m_rewindEndTransport = new KAction(i18n("Rewind to &Beginning"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRewindToBeginning()), actionCollection(), "rewindtobeginning"); m_rewindEndTransport->setGroup(TransportDialogConfigGroup); pixmap.load(pixmapDir + "/toolbar/transport-ffwd-end.png"); icon = TQIconSet(pixmap); - m_ffwdEndTransport = new KAction(i18n("Fast Forward to &End"), icon, 0, this, + m_ffwdEndTransport = new KAction(i18n("Fast Forward to &End"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotFastForwardToEnd()), actionCollection(), "fastforwardtoend"); m_ffwdEndTransport->setGroup(TransportDialogConfigGroup); pixmap.load(pixmapDir + "/toolbar/transport-tracking.png"); icon = TQIconSet(pixmap); - (new KToggleAction(i18n("Scro&ll to Follow Playback"), icon, Key_Pause, this, + (new KToggleAction(i18n("Scro&ll to Follow Playback"), icon, Key_Pause, TQT_TQOBJECT(this), TQT_SLOT(slotToggleTracking()), actionCollection(), "toggle_tracking"))->setChecked(true); pixmap.load(pixmapDir + "/toolbar/transport-panic.png"); icon = TQIconSet(pixmap); - new KAction( i18n("Panic"), icon, Key_P + CTRL + ALT, this, TQT_SLOT(slotPanic()), + new KAction( i18n("Panic"), icon, Key_P + CTRL + ALT, TQT_TQOBJECT(this), TQT_SLOT(slotPanic()), actionCollection(), "panic"); // DEBUG FACILITY - new KAction(i18n("Segment Debug Dump "), 0, this, + new KAction(i18n("Segment Debug Dump "), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDebugDump()), actionCollection(), "debug_dump_segments"); @@ -1228,7 +1228,7 @@ void RosegardenGUIApp::setupActions() if (setTrackInstrumentMenu) { connect(setTrackInstrumentMenu, TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(slotPopulateTrackInstrumentPopup())); + TQT_TQOBJECT(this), TQT_SLOT(slotPopulateTrackInstrumentPopup())); } else { RG_DEBUG << "RosegardenGUIApp::setupActions() : couldn't find set_track_instrument menu - check rosegardenui.rcn\n"; } @@ -1293,18 +1293,18 @@ void RosegardenGUIApp::initZoomToolbar() } // zoom labels - TQString minZoom = TQString("%1%").arg(factors[0] * 100.0); - TQString maxZoom = TQString("%1%").arg(factors[(sizeof(factors) / sizeof(factors[0])) - 1] * 100.0); + TQString minZoom = TQString("%1%").tqarg(factors[0] * 100.0); + TQString maxZoom = TQString("%1%").tqarg(factors[(sizeof(factors) / sizeof(factors[0])) - 1] * 100.0); m_zoomSlider = new ZoomSlider<double> - (zoomSizes, -1, TQSlider::Horizontal, zoomToolbar, "kde toolbar widget"); + (zoomSizes, -1, Qt::Horizontal, zoomToolbar, "kde toolbar widget"); m_zoomSlider->setTracking(true); - m_zoomSlider->setFocusPolicy(TQWidget::NoFocus); + m_zoomSlider->setFocusPolicy(TQ_NoFocus); m_zoomLabel = new TQLabel(minZoom, zoomToolbar, "kde toolbar widget"); m_zoomLabel->setIndent(10); connect(m_zoomSlider, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotChangeZoom(int))); + TQT_TQOBJECT(this), TQT_SLOT(slotChangeZoom(int))); // set initial zoom - we might want to make this a config option // m_zoomSlider->setToDefault(); @@ -1354,7 +1354,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)), - this, TQT_SLOT(slotActivateTool(TQString))); + TQT_TQOBJECT(this), TQT_SLOT(slotActivateTool(TQString))); connect(m_swapView, TQT_SIGNAL(segmentsSelected(const SegmentSelection &)), @@ -1415,10 +1415,10 @@ void RosegardenGUIApp::initView() m_view = m_swapView; connect(m_view, TQT_SIGNAL(stateChange(TQString, bool)), - this, TQT_SLOT (slotStateChanged(TQString, bool))); + TQT_TQOBJECT(this), TQT_SLOT (slotStateChanged(TQString, bool))); connect(m_view, TQT_SIGNAL(instrumentParametersChanged(InstrumentId)), - this, TQT_SIGNAL(instrumentParametersChanged(InstrumentId))); + TQT_TQOBJECT(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 @@ -1594,13 +1594,13 @@ void RosegardenGUIApp::setDocument(RosegardenGUIDoc* newDocument) m_doc, TQT_SLOT(slotDocumentModified())); connect(m_doc, TQT_SIGNAL(pointerPositionChanged(timeT)), - this, TQT_SLOT(slotSetPointerPosition(timeT))); + TQT_TQOBJECT(this), TQT_SLOT(slotSetPointerPosition(timeT))); connect(m_doc, TQT_SIGNAL(documentModified(bool)), - this, TQT_SLOT(slotDocumentModified(bool))); + TQT_TQOBJECT(this), TQT_SLOT(slotDocumentModified(bool))); connect(m_doc, TQT_SIGNAL(loopChanged(timeT, timeT)), - this, TQT_SLOT(slotSetLoop(timeT, timeT))); + TQT_TQOBJECT(this), TQT_SLOT(slotSetLoop(timeT, timeT))); m_doc->getCommandHistory()->attachView(actionCollection()); @@ -1610,13 +1610,13 @@ void RosegardenGUIApp::setDocument(RosegardenGUIDoc* newDocument) TQT_SLOT(slotTestClipboard())); // connect and start the autosave timer - connect(m_autoSaveTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAutoSave())); + connect(m_autoSaveTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotAutoSave())); m_autoSaveTimer->start(m_doc->getAutoSavePeriod() * 1000); // Connect the playback timer // - connect(m_playTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdatePlaybackPosition())); - connect(m_stopTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdateMonitoring())); + connect(m_playTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdatePlaybackPosition())); + connect(m_stopTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateMonitoring())); // finally recreate the main view // @@ -1628,10 +1628,10 @@ void RosegardenGUIApp::setDocument(RosegardenGUIDoc* newDocument) } connect(m_doc, TQT_SIGNAL(devicesResyncd()), - this, TQT_SLOT(slotDocumentDevicesResyncd())); + TQT_TQOBJECT(this), TQT_SLOT(slotDocumentDevicesResyncd())); m_doc->syncDevices(); - m_doc->clearModifiedStatus(); + m_doc->clearModifiedtqStatus(); if (newDocument->getStudio().haveMidiDevices()) { stateChanged("got_midi_devices"); @@ -1658,7 +1658,7 @@ void RosegardenGUIApp::setDocument(RosegardenGUIDoc* newDocument) emit documentChanged(m_doc); - m_doc->clearModifiedStatus(); // because it's set as modified by the various + m_doc->clearModifiedtqStatus(); // because it's set as modified by the various // init operations // TODO: this sucks, have to sort it out somehow. @@ -1716,7 +1716,7 @@ RosegardenGUIApp::createDocument(TQString filePath, ImportType importType) if (!info.exists()) { // can happen with command-line arg, so... KStartupLogo::hideIfStillThere(); - KMessageBox::sorry(this, i18n("File \"%1\" does not exist").arg(filePath)); + KMessageBox::sorry(this, i18n("File \"%1\" does not exist").tqarg(filePath)); return 0; } @@ -1731,7 +1731,7 @@ RosegardenGUIApp::createDocument(TQString filePath, ImportType importType) if (!file.open(IO_ReadOnly)) { KStartupLogo::hideIfStillThere(); TQString errStr = - i18n("You do not have read permission for \"%1\"").arg(filePath); + i18n("You do not have read permission for \"%1\"").tqarg(filePath); KMessageBox::sorry(this, errStr); return 0; @@ -1739,7 +1739,7 @@ RosegardenGUIApp::createDocument(TQString filePath, ImportType importType) // Stop if playing // - if (m_seqManager && m_seqManager->getTransportStatus() == PLAYING) + if (m_seqManager && m_seqManager->getTransporttqStatus() == PLAYING) slotStop(); slotEnableTransport(false); @@ -1834,7 +1834,7 @@ RosegardenGUIApp::createDocumentFromRGFile(TQString filePath) newDoc->setAbsFilePath(info.absFilePath()); newDoc->setTitle(info.fileName()); } else { - newDoc->clearModifiedStatus(); + newDoc->clearModifiedtqStatus(); } } else { delete newDoc; @@ -1850,8 +1850,8 @@ void RosegardenGUIApp::slotSaveOptions() #ifdef SETTING_LOG_DEBUG - _settingLog(TQString("SETTING 2 : transport flap extended = %1").arg(getTransport()->isExpanded())); - _settingLog(TQString("SETTING 2 : show track labels = %1").arg(m_viewTrackLabels->isChecked())); + _settingLog(TQString("SETTING 2 : transport flap extended = %1").tqarg(getTransport()->isExpanded())); + _settingLog(TQString("SETTING 2 : show track labels = %1").tqarg(m_viewTrackLabels->isChecked())); #endif kapp->config()->setGroup(GeneralOptionsConfigGroup); @@ -1893,13 +1893,13 @@ void RosegardenGUIApp::setupFileDialogSpeedbar() unsigned int n = config->readUnsignedNumEntry("Number of Entries", 0); - config->writeEntry(TQString("Description_%1").arg(n), i18n("Example Files")); - config->writeEntry(TQString("IconGroup_%1").arg(n), 4); - config->writeEntry(TQString("Icon_%1").arg(n), "folder"); - config->writeEntry(TQString("URL_%1").arg(n), + config->writeEntry(TQString("Description_%1").tqarg(n), i18n("Example Files")); + config->writeEntry(TQString("IconGroup_%1").tqarg(n), 4); + config->writeEntry(TQString("Icon_%1").tqarg(n), "folder"); + config->writeEntry(TQString("URL_%1").tqarg(n), KGlobal::dirs()->findResource("appdata", "examples/")); - RG_DEBUG << "wrote url " << config->readEntry(TQString("URL_%1").arg(n)) << endl; + RG_DEBUG << "wrote url " << config->readEntry(TQString("URL_%1").tqarg(n)) << endl; config->writeEntry("Examples Set", true); config->writeEntry("Number of Entries", n + 1); @@ -1936,7 +1936,7 @@ void RosegardenGUIApp::readOptions() #ifdef SETTING_LOG_DEBUG - _settingLog(TQString("SETTING 3 : transport flap extended = %1").arg(opt)); + _settingLog(TQString("SETTING 3 : transport flap extended = %1").tqarg(opt)); #endif if (opt) @@ -1948,7 +1948,7 @@ void RosegardenGUIApp::readOptions() #ifdef SETTING_LOG_DEBUG - _settingLog(TQString("SETTING 3 : show track labels = %1").arg(opt)); + _settingLog(TQString("SETTING 3 : show track labels = %1").tqarg(opt)); #endif m_viewTrackLabels->setChecked(opt); @@ -2010,10 +2010,10 @@ void RosegardenGUIApp::saveGlobalProperties(KConfig *cfg) if (!res) { if (errMsg) KMessageBox::error(this, i18n(TQString("Could not save document at %1\nError was : %2") - .arg(tempname).arg(errMsg))); + .tqarg(tempname).tqarg(errMsg))); else KMessageBox::error(this, i18n(TQString("Could not save document at %1") - .arg(tempname))); + .tqarg(tempname))); } } } @@ -2061,8 +2061,8 @@ bool RosegardenGUIApp::queryClose() RG_DEBUG << "RosegardenGUIApp::queryClose" << endl; #ifdef SETTING_LOG_DEBUG - _settingLog(TQString("SETTING 1 : transport flap extended = %1").arg(getTransport()->isExpanded())); - _settingLog(TQString("SETTING 1 : show track labels = %1").arg(m_viewTrackLabels->isChecked())); + _settingLog(TQString("SETTING 1 : transport flap extended = %1").tqarg(getTransport()->isExpanded())); + _settingLog(TQString("SETTING 1 : show track labels = %1").tqarg(m_viewTrackLabels->isChecked())); #endif TQString errMsg; @@ -2078,7 +2078,7 @@ bool RosegardenGUIApp::queryClose() // disconnect(m_transport, TQT_SIGNAL(closed()), - this, TQT_SLOT(slotCloseTransport())); + TQT_TQOBJECT(this), TQT_SLOT(slotCloseTransport())); } */ @@ -2151,7 +2151,7 @@ void RosegardenGUIApp::openURL(const KURL& url) if (!url.isValid()) { TQString string; - string = i18n( "Malformed URL\n%1").arg(netFile); + string = i18n( "Malformed URL\n%1").tqarg(netFile); KMessageBox::sorry(this, string); return ; @@ -2160,7 +2160,7 @@ void RosegardenGUIApp::openURL(const KURL& url) TQString target, caption(url.path()); if (KIO::NetAccess::download(url, target, this) == false) { - KMessageBox::error(this, i18n("Cannot download file %1").arg(url.prettyURL())); + KMessageBox::error(this, i18n("Cannot download file %1").tqarg(url.prettyURL())); return ; } @@ -2192,7 +2192,7 @@ void RosegardenGUIApp::slotFileOpen() kapp->config()->setGroup("Recent Dirs"); TQString recentString = kapp->config()->readEntry("ROSEGARDEN", ""); kapp->config()->writeEntry - ("ROSEGARDEN", TQString("file:%1,%2").arg(examplesDir).arg(recentString)); + ("ROSEGARDEN", TQString("file:%1,%2").tqarg(examplesDir).tqarg(recentString)); } KURL url = KFileDialog::getOpenURL @@ -2226,7 +2226,7 @@ void RosegardenGUIApp::slotMerge() TQString target; if (KIO::NetAccess::download(url, target, this) == false) { - KMessageBox::error(this, i18n("Cannot download file %1").arg(url.prettyURL())); + KMessageBox::error(this, i18n("Cannot download file %1").tqarg(url.prettyURL())); return ; } @@ -2273,33 +2273,33 @@ void RosegardenGUIApp::slotFileSave() if (!res) { if (errMsg) KMessageBox::error(this, i18n(TQString("Could not save document at %1\nError was : %2") - .arg(docFilePath).arg(errMsg))); + .tqarg(docFilePath).tqarg(errMsg))); else KMessageBox::error(this, i18n(TQString("Could not save document at %1") - .arg(docFilePath))); + .tqarg(docFilePath))); } } } -QString +TQString RosegardenGUIApp::getValidWriteFile(TQString descriptiveExtension, TQString label) { // extract first extension listed in descriptiveExtension, for instance, // ".rg" from "*.rg|Rosegarden files", or ".mid" from "*.mid *.midi|MIDI Files" // - TQString extension = descriptiveExtension.left(descriptiveExtension.find('|')).mid(1).section(' ', 0, 0); + TQString extension = descriptiveExtension.left(descriptiveExtension.tqfind('|')).mid(1).section(' ', 0, 0); RG_DEBUG << "RosegardenGUIApp::getValidWriteFile() : extension = " << extension << endl; // It's too bad there isn't this functionality within // KFileDialog::getSaveFileName - KFileDialog saveFileDialog(":ROSEGARDEN", descriptiveExtension, this, label, true); + KFileDialog saveFileDialog(":ROSEGARDEN", descriptiveExtension,this, label, true); saveFileDialog.setOperationMode(KFileDialog::Saving); if (m_doc) { TQString saveFileName = m_doc->getAbsFilePath(); // Show filename without the old extension - int dotLoc = saveFileName.findRev('.'); + int dotLoc = saveFileName.tqfindRev('.'); if (dotLoc >= int(saveFileName.length() - 4)) { saveFileName = saveFileName.left(dotLoc); } @@ -2376,10 +2376,10 @@ bool RosegardenGUIApp::slotFileSaveAs() if (!res) { if (errMsg) KMessageBox::error(this, i18n(TQString("Could not save document at %1\nError was : %2") - .arg(newName).arg(errMsg))); + .tqarg(newName).tqarg(errMsg))); else KMessageBox::error(this, i18n(TQString("Could not save document at %1") - .arg(newName))); + .tqarg(newName))); } else { @@ -2764,7 +2764,7 @@ RosegardenGUIApp::testAudioPath(TQString op) } catch (AudioFileManager::BadAudioPathException) { if (KMessageBox::warningContinueCancel (this, - i18n("The audio file path does not exist or is not writable.\nYou must set the audio file path to a valid directory in Document Properties before %1.\nWould you like to set it now?").arg(op), + i18n("The audio file path does not exist or is not writable.\nYou must set the audio file path to a valid directory in Document Properties before %1.\nWould you like to set it now?").tqarg(op), i18n("Warning"), i18n("Set audio file path")) == KMessageBox::Continue) { slotOpenAudioPathSettings(); @@ -3105,7 +3105,7 @@ void RosegardenGUIApp::slotTempoToSegmentLength() slotTempoToSegmentLength(this); } -void RosegardenGUIApp::slotTempoToSegmentLength(TQWidget* parent) +void RosegardenGUIApp::slotTempoToSegmentLength(TQWidget* tqparent) { RG_DEBUG << "RosegardenGUIApp::slotTempoToSegmentLength" << endl; @@ -3134,8 +3134,8 @@ void RosegardenGUIApp::slotTempoToSegmentLength(TQWidget* parent) int beats = 0; - // Get user to tell us how many beats or bars the segment contains - BeatsBarsDialog dialog(parent); + // Get user to tell us how many beats or bars the segment tqcontains + BeatsBarsDialog dialog(tqparent); if (dialog.exec() == TQDialog::Accepted) { beats = dialog.getQuantity(); // beats (or bars) if (dialog.getMode() == 1) // bars (multiply by time sig) @@ -3714,7 +3714,7 @@ void RosegardenGUIApp::importProject(TQString filePath) if (!proc->normalExit() || proc->exitStatus()) { CurrentProgressDialog::freeze(); - KMessageBox::sorry(this, i18n("Failed to import project file \"%1\"").arg(filePath)); + KMessageBox::sorry(this, i18n("Failed to import project file \"%1\"").tqarg(filePath)); CurrentProgressDialog::thaw(); delete proc; return ; @@ -3723,8 +3723,8 @@ void RosegardenGUIApp::importProject(TQString filePath) delete proc; TQString rgFile = filePath; - rgFile.replace(TQRegExp(".rg.rgp$"), ".rg"); - rgFile.replace(TQRegExp(".rgp$"), ".rg"); + rgFile.tqreplace(TQRegExp(".rg.rgp$"), ".rg"); + rgFile.tqreplace(TQRegExp(".rgp$"), ".rg"); openURL(rgFile); } @@ -4236,7 +4236,7 @@ RosegardenGUIApp::slotUpdatePlaybackPosition() // std::cerr << "RosegardenGUIApp::slotUpdatePlaybackPosition: mapper timeT = " << elapsedTime << std::endl; - if (m_seqManager->getTransportStatus() == RECORDING) { + if (m_seqManager->getTransporttqStatus() == RECORDING) { MappedComposition mC; if (mapper->getRecordedEvents(mC) > 0) { @@ -4358,10 +4358,10 @@ void RosegardenGUIApp::slotSetPointerPosition(timeT t) // std::cerr << "RosegardenGUIApp::slotSetPointerPosition: t = " << t << std::endl; if (m_seqManager) { - if ( m_seqManager->getTransportStatus() == PLAYING || - m_seqManager->getTransportStatus() == RECORDING ) { + if ( m_seqManager->getTransporttqStatus() == PLAYING || + m_seqManager->getTransporttqStatus() == RECORDING ) { if (t > comp.getEndMarker()) { - if (m_seqManager->getTransportStatus() == PLAYING) { + if (m_seqManager->getTransporttqStatus() == PLAYING) { slotStop(); t = comp.getEndMarker(); @@ -4477,8 +4477,8 @@ void RosegardenGUIApp::slotDisplayBarTime(timeT t) void RosegardenGUIApp::slotRefreshTimeDisplay() { - if ( m_seqManager->getTransportStatus() == PLAYING || - m_seqManager->getTransportStatus() == RECORDING ) { + if ( m_seqManager->getTransporttqStatus() == PLAYING || + m_seqManager->getTransporttqStatus() == RECORDING ) { return ; // it'll be refreshed in a moment anyway } slotSetPointerPosition(m_doc->getComposition().getPosition()); @@ -4502,14 +4502,14 @@ void RosegardenGUIApp::slotTestStartupTester() if (!m_startupTester) { m_startupTester = new StartupTester(); connect(m_startupTester, TQT_SIGNAL(newerVersionAvailable(TQString)), - this, TQT_SLOT(slotNewerVersionAvailable(TQString))); + TQT_TQOBJECT(this), TQT_SLOT(slotNewerVersionAvailable(TQString))); m_startupTester->start(); - TQTimer::singleShot(100, this, TQT_SLOT(slotTestStartupTester())); + TQTimer::singleShot(100, TQT_TQOBJECT(this), TQT_SLOT(slotTestStartupTester())); return ; } if (!m_startupTester->isReady()) { - TQTimer::singleShot(100, this, TQT_SLOT(slotTestStartupTester())); + TQTimer::singleShot(100, TQT_TQOBJECT(this), TQT_SLOT(slotTestStartupTester())); return ; } @@ -4530,7 +4530,7 @@ void RosegardenGUIApp::slotTestStartupTester() } else { for (int i = 0; i < missing.count(); ++i) { // if (missingFeatures.count() > 1) { - allMissing.push_back(i18n("%1 - for project file support").arg(missing[i])); + allMissing.push_back(i18n("%1 - for project file support").tqarg(missing[i])); // } else { // allMissing.push_back(missing[i]); // } @@ -4551,7 +4551,7 @@ void RosegardenGUIApp::slotTestStartupTester() } else { for (int i = 0; i < missing.count(); ++i) { if (missingFeatures.count() > 1) { - allMissing.push_back(i18n("%1 - for LilyPond preview support").arg(missing[i])); + allMissing.push_back(i18n("%1 - for LilyPond preview support").tqarg(missing[i])); } else { allMissing.push_back(missing[i]); } @@ -4560,7 +4560,7 @@ void RosegardenGUIApp::slotTestStartupTester() } #ifdef HAVE_LIBJACK - if (m_seqManager && (m_seqManager->getSoundDriverStatus() & AUDIO_OK)) { + if (m_seqManager && (m_seqManager->getSoundDrivertqStatus() & AUDIO_OK)) { m_haveAudioImporter = m_startupTester->haveAudioFileImporter(&missing); @@ -4571,7 +4571,7 @@ void RosegardenGUIApp::slotTestStartupTester() } else { for (int i = 0; i < missing.count(); ++i) { if (missingFeatures.count() > 1) { - allMissing.push_back(i18n("%1 - for audio file import").arg(missing[i])); + allMissing.push_back(i18n("%1 - for audio file import").tqarg(missing[i])); } else { allMissing.push_back(missing[i]); } @@ -4585,13 +4585,13 @@ void RosegardenGUIApp::slotTestStartupTester() TQString message = i18n("<h3>Helper programs not found</h3><p>Rosegarden could not find one or more helper programs which it needs to provide some features. The following features will not be available:</p>"); message += i18n("<ul>"); for (int i = 0; i < missingFeatures.count(); ++i) { - message += i18n("<li>%1</li>").arg(missingFeatures[i]); + message += i18n("<li>%1</li>").tqarg(missingFeatures[i]); } message += i18n("</ul>"); message += i18n("<p>To fix this, you should install the following additional programs:</p>"); message += i18n("<ul>"); for (int i = 0; i < allMissing.count(); ++i) { - message += i18n("<li>%1</li>").arg(allMissing[i]); + message += i18n("<li>%1</li>").tqarg(allMissing[i]); } message += i18n("</ul>"); @@ -4623,7 +4623,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting) if (isSequencerRunning()) { RG_DEBUG << "RosegardenGUIApp::launchSequencer() - sequencer already running - returning\n"; - if (m_seqManager) m_seqManager->checkSoundDriverStatus(false); + if (m_seqManager) m_seqManager->checkSoundDrivertqStatus(false); return true; } @@ -4639,7 +4639,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting) << "existing DCOP registered sequencer found\n"; if (useExisting) { - if (m_seqManager) m_seqManager->checkSoundDriverStatus(false); + if (m_seqManager) m_seqManager->checkSoundDrivertqStatus(false); m_sequencerProcess = (KProcess*)SequencerExternal; return true; } @@ -4733,14 +4733,14 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting) try { // if (m_seqManager) { // RG_DEBUG << "RosegardenGUIApp::launchSequencer : checking sound driver status\n"; - // m_seqManager->checkSoundDriverStatus(); + // m_seqManager->checkSoundDrivertqStatus(); // } stateChanged("sequencer_running"); slotEnableTransport(true); connect(m_sequencerProcess, TQT_SIGNAL(processExited(KProcess*)), - this, TQT_SLOT(slotSequencerExited(KProcess*))); + TQT_TQOBJECT(this), TQT_SLOT(slotSequencerExited(KProcess*))); } catch (Exception e) { m_sequencerProcess = 0; @@ -4864,15 +4864,15 @@ void RosegardenGUIApp::slotExportProject() return ; TQString rgFile = fileName; - rgFile.replace(TQRegExp(".rg.rgp$"), ".rg"); - rgFile.replace(TQRegExp(".rgp$"), ".rg"); + rgFile.tqreplace(TQRegExp(".rg.rgp$"), ".rg"); + rgFile.tqreplace(TQRegExp(".rgp$"), ".rg"); CurrentProgressDialog::freeze(); TQString errMsg; if (!m_doc->saveDocument(rgFile, errMsg, true)) { // pretend it's autosave - KMessageBox::sorry(this, i18n("Saving Rosegarden file to package failed: %1").arg(errMsg)); + KMessageBox::sorry(this, i18n("Saving Rosegarden file to package failed: %1").tqarg(errMsg)); CurrentProgressDialog::thaw(); return ; } @@ -4886,7 +4886,7 @@ void RosegardenGUIApp::slotExportProject() proc->start(KProcess::Block, KProcess::All); if (!proc->normalExit() || proc->exitStatus()) { - KMessageBox::sorry(this, i18n("Failed to export to project file \"%1\"").arg(fileName)); + KMessageBox::sorry(this, i18n("Failed to export to project file \"%1\"").tqarg(fileName)); CurrentProgressDialog::thaw(); delete proc; return ; @@ -4953,7 +4953,7 @@ void RosegardenGUIApp::exportCsoundFile(TQString file) 100, this); - CsoundExporter e(this, &m_doc->getComposition(), std::string(TQFile::encodeName(file))); + CsoundExporter e(TQT_TQOBJECT(this), &m_doc->getComposition(), std::string(TQFile::encodeName(file))); connect(&e, TQT_SIGNAL(setProgress(int)), progressDlg.progressBar(), TQT_SLOT(setValue(int))); @@ -4986,7 +4986,7 @@ void RosegardenGUIApp::exportMupFile(TQString file) 100, this); - MupExporter e(this, &m_doc->getComposition(), std::string(TQFile::encodeName(file))); + MupExporter e(TQT_TQOBJECT(this), &m_doc->getComposition(), std::string(TQFile::encodeName(file))); connect(&e, TQT_SIGNAL(setProgress(int)), progressDlg.progressBar(), TQT_SLOT(setValue(int))); @@ -5021,7 +5021,7 @@ std::map<KProcess *, KTempFile *> RosegardenGUIApp::m_lilyTempFileMap; void RosegardenGUIApp::slotPrintLilyPond() { KTmpStatusMsg msg(i18n("Printing LilyPond file..."), this); - KTempFile *file = new KTempFile(TQString::null, ".ly"); + KTempFile *file = new KTempFile(TQString(), ".ly"); file->setAutoDelete(true); if (!file->name()) { CurrentProgressDialog::freeze(); @@ -5037,7 +5037,7 @@ void RosegardenGUIApp::slotPrintLilyPond() *proc << "--print"; *proc << file->name(); connect(proc, TQT_SIGNAL(processExited(KProcess *)), - this, TQT_SLOT(slotLilyPondViewProcessExited(KProcess *))); + TQT_TQOBJECT(this), TQT_SLOT(slotLilyPondViewProcessExited(KProcess *))); m_lilyTempFileMap[proc] = file; proc->start(KProcess::NotifyOnExit); } @@ -5045,7 +5045,7 @@ void RosegardenGUIApp::slotPrintLilyPond() void RosegardenGUIApp::slotPreviewLilyPond() { KTmpStatusMsg msg(i18n("Previewing LilyPond file..."), this); - KTempFile *file = new KTempFile(TQString::null, ".ly"); + KTempFile *file = new KTempFile(TQString(), ".ly"); file->setAutoDelete(true); if (!file->name()) { CurrentProgressDialog::freeze(); @@ -5061,7 +5061,7 @@ void RosegardenGUIApp::slotPreviewLilyPond() *proc << "--pdf"; *proc << file->name(); connect(proc, TQT_SIGNAL(processExited(KProcess *)), - this, TQT_SLOT(slotLilyPondViewProcessExited(KProcess *))); + TQT_TQOBJECT(this), TQT_SLOT(slotLilyPondViewProcessExited(KProcess *))); m_lilyTempFileMap[proc] = file; proc->start(KProcess::NotifyOnExit); } @@ -5127,7 +5127,7 @@ void RosegardenGUIApp::exportMusicXmlFile(TQString file) 100, this); - MusicXmlExporter e(this, m_doc, std::string(TQFile::encodeName(file))); + MusicXmlExporter e(TQT_TQOBJECT(this), m_doc, std::string(TQFile::encodeName(file))); connect(&e, TQT_SIGNAL(setProgress(int)), progressDlg.progressBar(), TQT_SLOT(setValue(int))); @@ -5168,9 +5168,9 @@ RosegardenGUIApp::slotToggleMetronome() { Composition &comp = m_doc->getComposition(); - if (m_seqManager->getTransportStatus() == STARTING_TO_RECORD || - m_seqManager->getTransportStatus() == RECORDING || - m_seqManager->getTransportStatus() == RECORDING_ARMED) { + if (m_seqManager->getTransporttqStatus() == STARTING_TO_RECORD || + m_seqManager->getTransporttqStatus() == RECORDING || + m_seqManager->getTransporttqStatus() == RECORDING_ARMED) { if (comp.useRecordMetronome()) comp.setRecordMetronome(false); else @@ -5192,7 +5192,7 @@ RosegardenGUIApp::slotRewindToBeginning() { // ignore requests if recording // - if (m_seqManager->getTransportStatus() == RECORDING) + if (m_seqManager->getTransporttqStatus() == RECORDING) return ; m_seqManager->rewindToBeginning(); @@ -5203,7 +5203,7 @@ RosegardenGUIApp::slotFastForwardToEnd() { // ignore requests if recording // - if (m_seqManager->getTransportStatus() == RECORDING) + if (m_seqManager->getTransporttqStatus() == RECORDING) return ; m_seqManager->fastForwardToEnd(); @@ -5213,18 +5213,18 @@ void RosegardenGUIApp::slotSetPlayPosition(timeT time) { RG_DEBUG << "RosegardenGUIApp::slotSetPlayPosition(" << time << ")" << endl; - if (m_seqManager->getTransportStatus() == RECORDING) + if (m_seqManager->getTransporttqStatus() == RECORDING) return ; m_doc->slotSetPointerPosition(time); - if (m_seqManager->getTransportStatus() == PLAYING) + if (m_seqManager->getTransporttqStatus() == PLAYING) return ; slotPlay(); } -void RosegardenGUIApp::notifySequencerStatus(int status) +void RosegardenGUIApp::notifySequencertqStatus(int status) { stateChanged("not_playing", (status == PLAYING || @@ -5232,7 +5232,7 @@ void RosegardenGUIApp::notifySequencerStatus(int status) KXMLGUIClient::StateReverse : KXMLGUIClient::StateNoReverse); if (m_seqManager) - m_seqManager->setTransportStatus((TransportStatus) status); + m_seqManager->setTransporttqStatus((TransporttqStatus) status); } void RosegardenGUIApp::processAsynchronousMidi(const MappedComposition &mC) @@ -5261,10 +5261,10 @@ RosegardenGUIApp::slotRecord() return ; } - if (m_seqManager->getTransportStatus() == RECORDING) { + if (m_seqManager->getTransporttqStatus() == RECORDING) { slotStop(); return ; - } else if (m_seqManager->getTransportStatus() == PLAYING) { + } else if (m_seqManager->getTransporttqStatus() == PLAYING) { slotToggleRecord(); return ; } @@ -5309,7 +5309,7 @@ RosegardenGUIApp::slotRecord() m_seqManager->getCountdownDialog()->getAccelerators()); connect(m_seqManager->getCountdownDialog(), TQT_SIGNAL(stopped()), - this, TQT_SLOT(slotStop())); + TQT_TQOBJECT(this), TQT_SLOT(slotStop())); // Start the playback timer - this fetches the current sequencer position &c // @@ -5398,7 +5398,7 @@ void RosegardenGUIApp::slotPlay() // slotRecord ensures we don't toggle the recording state in // SequenceManager) // - if (m_seqManager->getTransportStatus() == RECORDING_ARMED) { + if (m_seqManager->getTransporttqStatus() == RECORDING_ARMED) { slotRecord(); return ; } @@ -5434,7 +5434,7 @@ void RosegardenGUIApp::slotPlay() m_playTimer->stop(); m_stopTimer->start(100); } catch (Exception e) { - KMessageBox::error(this, e.getMessage()); + KMessageBox::error(this, e.getMessage().c_str()); m_playTimer->stop(); m_stopTimer->start(100); } @@ -5460,9 +5460,9 @@ void RosegardenGUIApp::slotStop() if (m_seqManager && m_seqManager->getCountdownDialog()) { disconnect(m_seqManager->getCountdownDialog(), TQT_SIGNAL(stopped()), - this, TQT_SLOT(slotStop())); + TQT_TQOBJECT(this), TQT_SLOT(slotStop())); disconnect(m_seqManager->getCountdownDialog(), TQT_SIGNAL(completed()), - this, TQT_SLOT(slotStop())); + TQT_TQOBJECT(this), TQT_SLOT(slotStop())); } try { @@ -5481,7 +5481,7 @@ void RosegardenGUIApp::slotRewind() { // ignore requests if recording // - if (m_seqManager->getTransportStatus() == RECORDING) + if (m_seqManager->getTransporttqStatus() == RECORDING) return ; if (m_seqManager) m_seqManager->rewind(); @@ -5491,7 +5491,7 @@ void RosegardenGUIApp::slotFastforward() { // ignore requests if recording // - if (m_seqManager->getTransportStatus() == RECORDING) + if (m_seqManager->getTransporttqStatus() == RECORDING) return ; if (m_seqManager) @@ -5646,9 +5646,9 @@ void RosegardenGUIApp::slotConfigure() new ConfigureDialog(m_doc, kapp->config(), this); connect(configDlg, TQT_SIGNAL(updateAutoSaveInterval(unsigned int)), - this, TQT_SLOT(slotUpdateAutoSaveInterval(unsigned int))); + TQT_TQOBJECT(this), TQT_SLOT(slotUpdateAutoSaveInterval(unsigned int))); connect(configDlg, TQT_SIGNAL(updateSidebarStyle(unsigned int)), - this, TQT_SLOT(slotUpdateSidebarStyle(unsigned int))); + TQT_TQOBJECT(this), TQT_SLOT(slotUpdateSidebarStyle(unsigned int))); configDlg->show(); } @@ -5705,16 +5705,16 @@ void RosegardenGUIApp::slotEditTempo(timeT atTime) slotEditTempo(this, atTime); } -void RosegardenGUIApp::slotEditTempo(TQWidget *parent) +void RosegardenGUIApp::slotEditTempo(TQWidget *tqparent) { - slotEditTempo(parent, m_doc->getComposition().getPosition()); + slotEditTempo(tqparent, m_doc->getComposition().getPosition()); } -void RosegardenGUIApp::slotEditTempo(TQWidget *parent, timeT atTime) +void RosegardenGUIApp::slotEditTempo(TQWidget *tqparent, timeT atTime) { RG_DEBUG << "RosegardenGUIApp::slotEditTempo\n"; - TempoDialog tempoDialog(parent, m_doc); + TempoDialog tempoDialog(tqparent, m_doc); connect(&tempoDialog, TQT_SIGNAL(changeTempo(timeT, @@ -5740,19 +5740,19 @@ void RosegardenGUIApp::slotEditTimeSignature(timeT atTime) slotEditTimeSignature(this, atTime); } -void RosegardenGUIApp::slotEditTimeSignature(TQWidget *parent) +void RosegardenGUIApp::slotEditTimeSignature(TQWidget *tqparent) { - slotEditTimeSignature(parent, m_doc->getComposition().getPosition()); + slotEditTimeSignature(tqparent, m_doc->getComposition().getPosition()); } -void RosegardenGUIApp::slotEditTimeSignature(TQWidget *parent, +void RosegardenGUIApp::slotEditTimeSignature(TQWidget *tqparent, timeT time) { Composition &composition(m_doc->getComposition()); TimeSignature sig = composition.getTimeSignatureAt(time); - TimeSignatureDialog dialog(parent, &composition, time, sig); + TimeSignatureDialog dialog(tqparent, &composition, time, sig); if (dialog.exec() == TQDialog::Accepted) { @@ -5775,9 +5775,9 @@ void RosegardenGUIApp::slotEditTransportTime() slotEditTransportTime(this); } -void RosegardenGUIApp::slotEditTransportTime(TQWidget *parent) +void RosegardenGUIApp::slotEditTransportTime(TQWidget *tqparent) { - TimeDialog dialog(parent, i18n("Move playback pointer to time"), + TimeDialog dialog(tqparent, i18n("Move playback pointer to time"), &m_doc->getComposition(), m_doc->getComposition().getPosition(), true); @@ -5790,13 +5790,13 @@ void RosegardenGUIApp::slotChangeZoom(int) { double duration44 = TimeSignature(4, 4).getBarDuration(); double value = double(m_zoomSlider->getCurrentSize()); - m_zoomLabel->setText(i18n("%1%").arg(duration44 / value)); + m_zoomLabel->setText(i18n("%1%").tqarg(duration44 / value)); RG_DEBUG << "RosegardenGUIApp::slotChangeZoom : zoom size = " << m_zoomSlider->getCurrentSize() << endl; // initZoomToolbar sets the zoom value. With some old versions of - // Qt3.0, this can cause slotChangeZoom() to be called while the + // TQt3.0, this can cause slotChangeZoom() to be called while the // view hasn't been initialized yet, so we need to check it's not // null // @@ -5858,7 +5858,7 @@ RosegardenGUIApp::slotChangeTempo(timeT time, timeT prevTime = comp.getTempoChange(index).first; KMacroCommand *macro = - new KMacroCommand(i18n("Replace Tempo Change at %1").arg(time)); + new KMacroCommand(i18n("Replace Tempo Change at %1").tqarg(time)); macro->addCommand(new RemoveTempoChangeCommand(&comp, index)); macro->addCommand(new AddTempoChangeCommand(&comp, prevTime, value, @@ -5946,8 +5946,8 @@ RosegardenGUIApp::slotAddMarker(timeT time) AddMarkerCommand *command = new AddMarkerCommand(&m_doc->getComposition(), time, - i18n("new marker"), - i18n("no description")); + i18n("new marker").ascii(), + i18n("no description").ascii()); m_doc->getCommandHistory()->addCommand(command); } @@ -6129,7 +6129,7 @@ RosegardenGUIApp::setCursor(const TQCursor& cursor) m_dockLeft->setCursor(cursor); } -QString +TQString RosegardenGUIApp::createNewAudioFile() { AudioFile *aF = 0; @@ -6177,7 +6177,7 @@ RosegardenGUIApp::createRecordAudioFiles(const TQValueVector<InstrumentId> &reco return qv; } -QString +TQString RosegardenGUIApp::getAudioFilePath() { return TQString(m_doc->getAudioFileManager().getAudioPath().c_str()); @@ -6271,7 +6271,7 @@ RosegardenGUIApp::slotAudioManager() TQT_SLOT(slotPropagateSegmentSelection(const SegmentSelection&))); // and from us to dialog - connect(this, TQT_SIGNAL(segmentsSelected(const SegmentSelection&)), + connect(TQT_TQOBJECT(this), TQT_SIGNAL(segmentsSelected(const SegmentSelection&)), m_audioManagerDialog, TQT_SLOT(slotSegmentSelection(const SegmentSelection&))); @@ -6304,11 +6304,11 @@ RosegardenGUIApp::slotAudioManager() // And that it goes away when the current document is changing // - connect(this, TQT_SIGNAL(documentAboutToChange()), + connect(TQT_TQOBJECT(this), TQT_SIGNAL(documentAboutToChange()), m_audioManagerDialog, TQT_SLOT(close())); - m_audioManagerDialog->setAudioSubsystemStatus( - m_seqManager->getSoundDriverStatus() & AUDIO_OK); + m_audioManagerDialog->setAudioSubsystemtqStatus( + m_seqManager->getSoundDrivertqStatus() & AUDIO_OK); plugAccelerators(m_audioManagerDialog, m_audioManagerDialog->getAccelerators()); @@ -6350,7 +6350,7 @@ RosegardenGUIApp::slotAddAudioFile(unsigned int id) TQByteArray data; TQDataStream streamOut(data, IO_WriteOnly); - // We have to pass the filename as a QString + // We have to pass the filename as a TQString // streamOut << TQString(strtoqstr(aF->getFilename())); streamOut << (int)aF->getId(); @@ -6360,7 +6360,7 @@ RosegardenGUIApp::slotAddAudioFile(unsigned int id) int result; streamIn >> result; if (!result) { - KMessageBox::error(this, i18n("Sequencer failed to add audio file %1").arg(aF->getFilename().c_str())); + KMessageBox::error(this, i18n("Sequencer failed to add audio file %1").tqarg(aF->getFilename().c_str())); } } } @@ -6385,7 +6385,7 @@ RosegardenGUIApp::slotDeleteAudioFile(unsigned int id) int result; streamIn >> result; if (!result) { - KMessageBox::error(this, i18n("Sequencer failed to remove audio file id %1").arg(id)); + KMessageBox::error(this, i18n("Sequencer failed to remove audio file id %1").tqarg(id)); } } } @@ -6523,9 +6523,9 @@ RosegardenGUIApp::slotManageMIDIDevices() m_deviceManager = new DeviceManagerDialog(this, m_doc); connect(m_deviceManager, TQT_SIGNAL(closing()), - this, TQT_SLOT(slotDeviceManagerClosed())); + TQT_TQOBJECT(this), TQT_SLOT(slotDeviceManagerClosed())); - connect(this, TQT_SIGNAL(documentAboutToChange()), + connect(TQT_TQOBJECT(this), TQT_SIGNAL(documentAboutToChange()), m_deviceManager, TQT_SLOT(close())); // Cheating way of updating the track/instrument list @@ -6534,10 +6534,10 @@ RosegardenGUIApp::slotManageMIDIDevices() m_view, TQT_SLOT(slotSynchroniseWithComposition())); connect(m_deviceManager, TQT_SIGNAL(editBanks(DeviceId)), - this, TQT_SLOT(slotEditBanks(DeviceId))); + TQT_TQOBJECT(this), TQT_SLOT(slotEditBanks(DeviceId))); connect(m_deviceManager, TQT_SIGNAL(editControllers(DeviceId)), - this, TQT_SLOT(slotEditControlParameters(DeviceId))); + TQT_TQOBJECT(this), TQT_SLOT(slotEditControlParameters(DeviceId))); if (m_midiMixer) { connect(m_deviceManager, TQT_SIGNAL(deviceNamesChanged()), @@ -6566,9 +6566,9 @@ RosegardenGUIApp::slotManageSynths() ); connect(m_synthManager, TQT_SIGNAL(closing()), - this, TQT_SLOT(slotSynthPluginManagerClosed())); + TQT_TQOBJECT(this), TQT_SLOT(slotSynthPluginManagerClosed())); - connect(this, TQT_SIGNAL(documentAboutToChange()), + connect(TQT_TQOBJECT(this), TQT_SIGNAL(documentAboutToChange()), m_synthManager, TQT_SLOT(close())); connect(m_synthManager, @@ -6608,10 +6608,10 @@ RosegardenGUIApp::slotOpenAudioMixer() m_audioMixer, TQT_SLOT(slotControllerDeviceEventReceived(MappedEvent *, const void *))); connect(m_audioMixer, TQT_SIGNAL(closing()), - this, TQT_SLOT(slotAudioMixerClosed())); + TQT_TQOBJECT(this), TQT_SLOT(slotAudioMixerClosed())); connect(m_audioMixer, TQT_SIGNAL(selectPlugin(TQWidget *, InstrumentId, int)), - this, TQT_SLOT(slotShowPluginDialog(TQWidget *, InstrumentId, int))); + TQT_TQOBJECT(this), TQT_SLOT(slotShowPluginDialog(TQWidget *, InstrumentId, int))); connect(this, TQT_SIGNAL(pluginSelected(InstrumentId, int, int)), @@ -6623,28 +6623,28 @@ RosegardenGUIApp::slotOpenAudioMixer() m_audioMixer, TQT_SLOT(slotPluginBypassed(InstrumentId, int, bool))); - connect(this, TQT_SIGNAL(documentAboutToChange()), + connect(TQT_TQOBJECT(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()), - this, TQT_SLOT(slotPlay())); + TQT_TQOBJECT(this), TQT_SLOT(slotPlay())); connect(m_audioMixer, TQT_SIGNAL(stop()), - this, TQT_SLOT(slotStop())); + TQT_TQOBJECT(this), TQT_SLOT(slotStop())); connect(m_audioMixer, TQT_SIGNAL(fastForwardPlayback()), - this, TQT_SLOT(slotFastforward())); + TQT_TQOBJECT(this), TQT_SLOT(slotFastforward())); connect(m_audioMixer, TQT_SIGNAL(rewindPlayback()), - this, TQT_SLOT(slotRewind())); + TQT_TQOBJECT(this), TQT_SLOT(slotRewind())); connect(m_audioMixer, TQT_SIGNAL(fastForwardPlaybackToEnd()), - this, TQT_SLOT(slotFastForwardToEnd())); + TQT_TQOBJECT(this), TQT_SLOT(slotFastForwardToEnd())); connect(m_audioMixer, TQT_SIGNAL(rewindPlaybackToBeginning()), - this, TQT_SLOT(slotRewindToBeginning())); + TQT_TQOBJECT(this), TQT_SLOT(slotRewindToBeginning())); connect(m_audioMixer, TQT_SIGNAL(record()), - this, TQT_SLOT(slotRecord())); + TQT_TQOBJECT(this), TQT_SLOT(slotRecord())); connect(m_audioMixer, TQT_SIGNAL(panic()), - this, TQT_SLOT(slotPanic())); + TQT_TQOBJECT(this), TQT_SLOT(slotPanic())); connect(m_audioMixer, TQT_SIGNAL(instrumentParametersChanged(InstrumentId)), @@ -6687,27 +6687,27 @@ RosegardenGUIApp::slotOpenMidiMixer() m_midiMixer, TQT_SLOT(slotControllerDeviceEventReceived(MappedEvent *, const void *))); connect(m_midiMixer, TQT_SIGNAL(closing()), - this, TQT_SLOT(slotMidiMixerClosed())); + TQT_TQOBJECT(this), TQT_SLOT(slotMidiMixerClosed())); - connect(this, TQT_SIGNAL(documentAboutToChange()), + connect(TQT_TQOBJECT(this), TQT_SIGNAL(documentAboutToChange()), m_midiMixer, TQT_SLOT(close())); connect(m_midiMixer, TQT_SIGNAL(play()), - this, TQT_SLOT(slotPlay())); + TQT_TQOBJECT(this), TQT_SLOT(slotPlay())); connect(m_midiMixer, TQT_SIGNAL(stop()), - this, TQT_SLOT(slotStop())); + TQT_TQOBJECT(this), TQT_SLOT(slotStop())); connect(m_midiMixer, TQT_SIGNAL(fastForwardPlayback()), - this, TQT_SLOT(slotFastforward())); + TQT_TQOBJECT(this), TQT_SLOT(slotFastforward())); connect(m_midiMixer, TQT_SIGNAL(rewindPlayback()), - this, TQT_SLOT(slotRewind())); + TQT_TQOBJECT(this), TQT_SLOT(slotRewind())); connect(m_midiMixer, TQT_SIGNAL(fastForwardPlaybackToEnd()), - this, TQT_SLOT(slotFastForwardToEnd())); + TQT_TQOBJECT(this), TQT_SLOT(slotFastForwardToEnd())); connect(m_midiMixer, TQT_SIGNAL(rewindPlaybackToBeginning()), - this, TQT_SLOT(slotRewindToBeginning())); + TQT_TQOBJECT(this), TQT_SLOT(slotRewindToBeginning())); connect(m_midiMixer, TQT_SIGNAL(record()), - this, TQT_SLOT(slotRecord())); + TQT_TQOBJECT(this), TQT_SLOT(slotRecord())); connect(m_midiMixer, TQT_SIGNAL(panic()), - this, TQT_SLOT(slotPanic())); + TQT_TQOBJECT(this), TQT_SLOT(slotPanic())); connect(m_midiMixer, TQT_SIGNAL(instrumentParametersChanged(InstrumentId)), @@ -6747,7 +6747,7 @@ RosegardenGUIApp::slotEditControlParameters(DeviceId device) connect(controlEditor, TQT_SIGNAL(closing()), TQT_SLOT(slotControlEditorClosed())); - connect(this, TQT_SIGNAL(documentAboutToChange()), + connect(TQT_TQOBJECT(this), TQT_SIGNAL(documentAboutToChange()), controlEditor, TQT_SLOT(close())); connect(m_doc, TQT_SIGNAL(devicesResyncd()), @@ -6777,9 +6777,9 @@ RosegardenGUIApp::slotEditBanks(DeviceId device) m_bankEditor = new BankEditorDialog(this, m_doc, device); connect(m_bankEditor, TQT_SIGNAL(closing()), - this, TQT_SLOT(slotBankEditorClosed())); + TQT_TQOBJECT(this), TQT_SLOT(slotBankEditorClosed())); - connect(this, TQT_SIGNAL(documentAboutToChange()), + connect(TQT_TQOBJECT(this), TQT_SIGNAL(documentAboutToChange()), m_bankEditor, TQT_SLOT(slotFileClose())); // Cheating way of updating the track/instrument list @@ -6879,7 +6879,7 @@ RosegardenGUIApp::slotEditTempos(timeT t) tempoT, TempoDialog::TempoDialogAction))); - connect(m_tempoView, TQT_SIGNAL(saveFile()), this, TQT_SLOT(slotFileSave())); + connect(m_tempoView, TQT_SIGNAL(saveFile()), TQT_TQOBJECT(this), TQT_SLOT(slotFileSave())); plugAccelerators(m_tempoView, m_tempoView->getAccelerators()); @@ -6897,14 +6897,14 @@ RosegardenGUIApp::slotTempoViewClosed() void RosegardenGUIApp::slotControlEditorClosed() { - const TQObject *s = sender(); + const TQObject *s = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender())); RG_DEBUG << "RosegardenGUIApp::slotControlEditorClosed" << endl; for (std::set <ControlEditorDialog *>::iterator i = m_controlEditors.begin(); i != m_controlEditors.end(); ++i) { - if (*i == s) { + if (TQT_BASE_OBJECT(*i) == TQT_BASE_OBJECT_CONST(s)) { m_controlEditors.erase(i); RG_DEBUG << "removed control editor dialog, have " << m_controlEditors.size() << " left" << endl; return ; @@ -6915,12 +6915,12 @@ RosegardenGUIApp::slotControlEditorClosed() } void -RosegardenGUIApp::slotShowPluginDialog(TQWidget *parent, +RosegardenGUIApp::slotShowPluginDialog(TQWidget *tqparent, InstrumentId instrumentId, int index) { - if (!parent) - parent = this; + if (!tqparent) + tqparent = this; int key = (index << 16) + instrumentId; @@ -6954,7 +6954,7 @@ RosegardenGUIApp::slotShowPluginDialog(TQWidget *parent, // Create the plugin dialog // AudioPluginDialog *dialog = - new AudioPluginDialog(parent, + new AudioPluginDialog(tqparent, m_doc->getPluginManager(), #ifdef HAVE_LIBLO m_pluginGUIManager, @@ -7015,7 +7015,7 @@ RosegardenGUIApp::slotShowPluginDialog(TQWidget *parent, this, TQT_SLOT(slotPluginDialogDestroyed(InstrumentId, int))); - connect(this, TQT_SIGNAL(documentAboutToChange()), dialog, TQT_SLOT(close())); + connect(TQT_TQOBJECT(this), TQT_SIGNAL(documentAboutToChange()), dialog, TQT_SLOT(close())); m_pluginDialogs[key] = dialog; m_pluginDialogs[key]->show(); @@ -7028,9 +7028,9 @@ void RosegardenGUIApp::slotPluginSelected(InstrumentId instrumentId, int index, int plugin) { - const TQObject *s = sender(); + const TQObject *s = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender())); - bool fromSynthMgr = (s == m_synthManager); + bool fromSynthMgr = (TQT_BASE_OBJECT_CONST(s) == TQT_BASE_OBJECT(m_synthManager)); // It's assumed that ports etc will already have been set up on // the AudioPluginInstance before this is invoked. @@ -7753,10 +7753,10 @@ RosegardenGUIApp::slotSaveDefaultStudio() if (!res) { if (errMsg) KMessageBox::error(this, i18n(TQString("Could not auto-save document at %1\nError was : %2") - .arg(autoloadFile).arg(errMsg))); + .tqarg(autoloadFile).tqarg(errMsg))); else KMessageBox::error(this, i18n(TQString("Could not auto-save document at %1") - .arg(autoloadFile))); + .tqarg(autoloadFile))); } } @@ -7808,7 +7808,7 @@ RosegardenGUIApp::slotImportStudio() TQString target; if (KIO::NetAccess::download(url, target, this) == false) { KMessageBox::error(this, i18n("Cannot download file %1") - .arg(url.prettyURL())); + .tqarg(url.prettyURL())); return ; } @@ -7942,8 +7942,8 @@ void RosegardenGUIApp::slotAutoSave() { if (!m_seqManager || - m_seqManager->getTransportStatus() == PLAYING || - m_seqManager->getTransportStatus() == RECORDING) + m_seqManager->getTransporttqStatus() == PLAYING || + m_seqManager->getTransporttqStatus() == RECORDING) return ; KConfig* config = kapp->config(); @@ -8012,11 +8012,11 @@ RosegardenGUIApp::awaitDialogClearance() while (haveDialog) { - const TQObjectList *c = children(); - if (!c) return; + const TQObjectList c = childrenListObject(); + if (c.isEmpty()) return; haveDialog = false; - for (TQObjectList::const_iterator i = c->begin(); i != c->end(); ++i) { + for (TQObjectList::const_iterator i = c.begin(); i != c.end(); ++i) { TQDialog *dialog = dynamic_cast<TQDialog *>(*i); if (dialog && dialog->isVisible()) { haveDialog = true; @@ -8044,7 +8044,7 @@ RosegardenGUIApp::slotNewerVersionAvailable(TQString v) (this, i18n("<h3>Newer version available</h3><p>A newer version of Rosegarden may be available.<br>Please consult the <a href=\"http://www.rosegardenmusic.com/getting/\">Rosegarden website</a> for more information.</p>"), i18n("Newer version available"), - TQString("version-%1-available-show").arg(v), + TQString("version-%1-available-show").tqarg(v), KMessageBox::AllowLink); CurrentProgressDialog::thaw(); } diff --git a/src/gui/application/RosegardenGUIApp.cpp.orig b/src/gui/application/RosegardenGUIApp.cpp.orig index 889f4f7..d3508eb 100644 --- a/src/gui/application/RosegardenGUIApp.cpp.orig +++ b/src/gui/application/RosegardenGUIApp.cpp.orig @@ -360,7 +360,7 @@ RosegardenGUIApp::RosegardenGUIApp(bool useSequencer, this, TQT_SLOT(slotParametersClosed())); connect(m_dockLeft, TQT_SIGNAL(hasUndocked()), this, TQT_SLOT(slotParametersClosed())); - // Apparently, hasUndocked() is emitted when the dock widget's + // Aptqparently, 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)), this, TQT_SLOT(slotParametersDockedBack(KDockWidget*, KDockWidget::DockPosition))); @@ -437,7 +437,7 @@ RosegardenGUIApp::RosegardenGUIApp(bool useSequencer, // problems. This warning has to happen early, in case it // affects the ability to load plugins etc from a file on the // command line. - m_seqManager->checkSoundDriverStatus(true); + m_seqManager->checkSoundDrivertqStatus(true); } if (m_view) { @@ -445,7 +445,7 @@ RosegardenGUIApp::RosegardenGUIApp(bool useSequencer, m_view, TQT_SLOT(slotControllerDeviceEventReceived(MappedEvent *))); } - if (m_seqManager->getSoundDriverStatus() & AUDIO_OK) { + if (m_seqManager->getSoundDrivertqStatus() & AUDIO_OK) { slotStateChanged("got_audio", true); } else { slotStateChanged("got_audio", false); @@ -1293,8 +1293,8 @@ void RosegardenGUIApp::initZoomToolbar() } // zoom labels - TQString minZoom = TQString("%1%").arg(factors[0] * 100.0); - TQString maxZoom = TQString("%1%").arg(factors[(sizeof(factors) / sizeof(factors[0])) - 1] * 100.0); + TQString minZoom = TQString("%1%").tqarg(factors[0] * 100.0); + TQString maxZoom = TQString("%1%").tqarg(factors[(sizeof(factors) / sizeof(factors[0])) - 1] * 100.0); m_zoomSlider = new ZoomSlider<double> (zoomSizes, -1, TQSlider::Horizontal, zoomToolbar, "kde toolbar widget"); @@ -1631,7 +1631,7 @@ void RosegardenGUIApp::setDocument(RosegardenGUIDoc* newDocument) this, TQT_SLOT(slotDocumentDevicesResyncd())); m_doc->syncDevices(); - m_doc->clearModifiedStatus(); + m_doc->clearModifiedtqStatus(); if (newDocument->getStudio().haveMidiDevices()) { stateChanged("got_midi_devices"); @@ -1658,7 +1658,7 @@ void RosegardenGUIApp::setDocument(RosegardenGUIDoc* newDocument) emit documentChanged(m_doc); - m_doc->clearModifiedStatus(); // because it's set as modified by the various + m_doc->clearModifiedtqStatus(); // because it's set as modified by the various // init operations // TODO: this sucks, have to sort it out somehow. @@ -1716,7 +1716,7 @@ RosegardenGUIApp::createDocument(TQString filePath, ImportType importType) if (!info.exists()) { // can happen with command-line arg, so... KStartupLogo::hideIfStillThere(); - KMessageBox::sorry(this, i18n("File \"%1\" does not exist").arg(filePath)); + KMessageBox::sorry(this, i18n("File \"%1\" does not exist").tqarg(filePath)); return 0; } @@ -1731,7 +1731,7 @@ RosegardenGUIApp::createDocument(TQString filePath, ImportType importType) if (!file.open(IO_ReadOnly)) { KStartupLogo::hideIfStillThere(); TQString errStr = - i18n("You do not have read permission for \"%1\"").arg(filePath); + i18n("You do not have read permission for \"%1\"").tqarg(filePath); KMessageBox::sorry(this, errStr); return 0; @@ -1739,7 +1739,7 @@ RosegardenGUIApp::createDocument(TQString filePath, ImportType importType) // Stop if playing // - if (m_seqManager && m_seqManager->getTransportStatus() == PLAYING) + if (m_seqManager && m_seqManager->getTransporttqStatus() == PLAYING) slotStop(); slotEnableTransport(false); @@ -1834,7 +1834,7 @@ RosegardenGUIApp::createDocumentFromRGFile(TQString filePath) newDoc->setAbsFilePath(info.absFilePath()); newDoc->setTitle(info.fileName()); } else { - newDoc->clearModifiedStatus(); + newDoc->clearModifiedtqStatus(); } } else { delete newDoc; @@ -1850,8 +1850,8 @@ void RosegardenGUIApp::slotSaveOptions() #ifdef SETTING_LOG_DEBUG - _settingLog(TQString("SETTING 2 : transport flap extended = %1").arg(getTransport()->isExpanded())); - _settingLog(TQString("SETTING 2 : show track labels = %1").arg(m_viewTrackLabels->isChecked())); + _settingLog(TQString("SETTING 2 : transport flap extended = %1").tqarg(getTransport()->isExpanded())); + _settingLog(TQString("SETTING 2 : show track labels = %1").tqarg(m_viewTrackLabels->isChecked())); #endif kapp->config()->setGroup(GeneralOptionsConfigGroup); @@ -1893,13 +1893,13 @@ void RosegardenGUIApp::setupFileDialogSpeedbar() unsigned int n = config->readUnsignedNumEntry("Number of Entries", 0); - config->writeEntry(TQString("Description_%1").arg(n), i18n("Example Files")); - config->writeEntry(TQString("IconGroup_%1").arg(n), 4); - config->writeEntry(TQString("Icon_%1").arg(n), "folder"); - config->writeEntry(TQString("URL_%1").arg(n), + config->writeEntry(TQString("Description_%1").tqarg(n), i18n("Example Files")); + config->writeEntry(TQString("IconGroup_%1").tqarg(n), 4); + config->writeEntry(TQString("Icon_%1").tqarg(n), "folder"); + config->writeEntry(TQString("URL_%1").tqarg(n), KGlobal::dirs()->findResource("appdata", "examples/")); - RG_DEBUG << "wrote url " << config->readEntry(TQString("URL_%1").arg(n)) << endl; + RG_DEBUG << "wrote url " << config->readEntry(TQString("URL_%1").tqarg(n)) << endl; config->writeEntry("Examples Set", true); config->writeEntry("Number of Entries", n + 1); @@ -1936,7 +1936,7 @@ void RosegardenGUIApp::readOptions() #ifdef SETTING_LOG_DEBUG - _settingLog(TQString("SETTING 3 : transport flap extended = %1").arg(opt)); + _settingLog(TQString("SETTING 3 : transport flap extended = %1").tqarg(opt)); #endif if (opt) @@ -1948,7 +1948,7 @@ void RosegardenGUIApp::readOptions() #ifdef SETTING_LOG_DEBUG - _settingLog(TQString("SETTING 3 : show track labels = %1").arg(opt)); + _settingLog(TQString("SETTING 3 : show track labels = %1").tqarg(opt)); #endif m_viewTrackLabels->setChecked(opt); @@ -2010,10 +2010,10 @@ void RosegardenGUIApp::saveGlobalProperties(KConfig *cfg) if (!res) { if (errMsg) KMessageBox::error(this, i18n(TQString("Could not save document at %1\nError was : %2") - .arg(tempname).arg(errMsg))); + .tqarg(tempname).tqarg(errMsg))); else KMessageBox::error(this, i18n(TQString("Could not save document at %1") - .arg(tempname))); + .tqarg(tempname))); } } } @@ -2061,8 +2061,8 @@ bool RosegardenGUIApp::queryClose() RG_DEBUG << "RosegardenGUIApp::queryClose" << endl; #ifdef SETTING_LOG_DEBUG - _settingLog(TQString("SETTING 1 : transport flap extended = %1").arg(getTransport()->isExpanded())); - _settingLog(TQString("SETTING 1 : show track labels = %1").arg(m_viewTrackLabels->isChecked())); + _settingLog(TQString("SETTING 1 : transport flap extended = %1").tqarg(getTransport()->isExpanded())); + _settingLog(TQString("SETTING 1 : show track labels = %1").tqarg(m_viewTrackLabels->isChecked())); #endif TQString errMsg; @@ -2151,7 +2151,7 @@ void RosegardenGUIApp::openURL(const KURL& url) if (!url.isValid()) { TQString string; - string = i18n( "Malformed URL\n%1").arg(netFile); + string = i18n( "Malformed URL\n%1").tqarg(netFile); KMessageBox::sorry(this, string); return ; @@ -2160,7 +2160,7 @@ void RosegardenGUIApp::openURL(const KURL& url) TQString target, caption(url.path()); if (KIO::NetAccess::download(url, target, this) == false) { - KMessageBox::error(this, i18n("Cannot download file %1").arg(url.prettyURL())); + KMessageBox::error(this, i18n("Cannot download file %1").tqarg(url.prettyURL())); return ; } @@ -2192,7 +2192,7 @@ void RosegardenGUIApp::slotFileOpen() kapp->config()->setGroup("Recent Dirs"); TQString recentString = kapp->config()->readEntry("ROSEGARDEN", ""); kapp->config()->writeEntry - ("ROSEGARDEN", TQString("file:%1,%2").arg(examplesDir).arg(recentString)); + ("ROSEGARDEN", TQString("file:%1,%2").tqarg(examplesDir).tqarg(recentString)); } KURL url = KFileDialog::getOpenURL @@ -2226,7 +2226,7 @@ void RosegardenGUIApp::slotMerge() TQString target; if (KIO::NetAccess::download(url, target, this) == false) { - KMessageBox::error(this, i18n("Cannot download file %1").arg(url.prettyURL())); + KMessageBox::error(this, i18n("Cannot download file %1").tqarg(url.prettyURL())); return ; } @@ -2273,22 +2273,22 @@ void RosegardenGUIApp::slotFileSave() if (!res) { if (errMsg) KMessageBox::error(this, i18n(TQString("Could not save document at %1\nError was : %2") - .arg(docFilePath).arg(errMsg))); + .tqarg(docFilePath).tqarg(errMsg))); else KMessageBox::error(this, i18n(TQString("Could not save document at %1") - .arg(docFilePath))); + .tqarg(docFilePath))); } } } -QString +TQString RosegardenGUIApp::getValidWriteFile(TQString descriptiveExtension, TQString label) { // extract first extension listed in descriptiveExtension, for instance, // ".rg" from "*.rg|Rosegarden files", or ".mid" from "*.mid *.midi|MIDI Files" // - TQString extension = descriptiveExtension.left(descriptiveExtension.find('|')).mid(1).section(' ', 0, 0); + TQString extension = descriptiveExtension.left(descriptiveExtension.tqfind('|')).mid(1).section(' ', 0, 0); RG_DEBUG << "RosegardenGUIApp::getValidWriteFile() : extension = " << extension << endl; @@ -2299,7 +2299,7 @@ RosegardenGUIApp::getValidWriteFile(TQString descriptiveExtension, if (m_doc) { TQString saveFileName = m_doc->getAbsFilePath(); // Show filename without the old extension - int dotLoc = saveFileName.findRev('.'); + int dotLoc = saveFileName.tqfindRev('.'); if (dotLoc >= int(saveFileName.length() - 4)) { saveFileName = saveFileName.left(dotLoc); } @@ -2376,10 +2376,10 @@ bool RosegardenGUIApp::slotFileSaveAs() if (!res) { if (errMsg) KMessageBox::error(this, i18n(TQString("Could not save document at %1\nError was : %2") - .arg(newName).arg(errMsg))); + .tqarg(newName).tqarg(errMsg))); else KMessageBox::error(this, i18n(TQString("Could not save document at %1") - .arg(newName))); + .tqarg(newName))); } else { @@ -2764,7 +2764,7 @@ RosegardenGUIApp::testAudioPath(TQString op) } catch (AudioFileManager::BadAudioPathException) { if (KMessageBox::warningContinueCancel (this, - i18n("The audio file path does not exist or is not writable.\nYou must set the audio file path to a valid directory in Document Properties before %1.\nWould you like to set it now?").arg(op), + i18n("The audio file path does not exist or is not writable.\nYou must set the audio file path to a valid directory in Document Properties before %1.\nWould you like to set it now?").tqarg(op), i18n("Warning"), i18n("Set audio file path")) == KMessageBox::Continue) { slotOpenAudioPathSettings(); @@ -3105,7 +3105,7 @@ void RosegardenGUIApp::slotTempoToSegmentLength() slotTempoToSegmentLength(this); } -void RosegardenGUIApp::slotTempoToSegmentLength(TQWidget* parent) +void RosegardenGUIApp::slotTempoToSegmentLength(TQWidget* tqparent) { RG_DEBUG << "RosegardenGUIApp::slotTempoToSegmentLength" << endl; @@ -3134,8 +3134,8 @@ void RosegardenGUIApp::slotTempoToSegmentLength(TQWidget* parent) int beats = 0; - // Get user to tell us how many beats or bars the segment contains - BeatsBarsDialog dialog(parent); + // Get user to tell us how many beats or bars the segment tqcontains + BeatsBarsDialog dialog(tqparent); if (dialog.exec() == TQDialog::Accepted) { beats = dialog.getQuantity(); // beats (or bars) if (dialog.getMode() == 1) // bars (multiply by time sig) @@ -3714,7 +3714,7 @@ void RosegardenGUIApp::importProject(TQString filePath) if (!proc->normalExit() || proc->exitStatus()) { CurrentProgressDialog::freeze(); - KMessageBox::sorry(this, i18n("Failed to import project file \"%1\"").arg(filePath)); + KMessageBox::sorry(this, i18n("Failed to import project file \"%1\"").tqarg(filePath)); CurrentProgressDialog::thaw(); delete proc; return ; @@ -3723,8 +3723,8 @@ void RosegardenGUIApp::importProject(TQString filePath) delete proc; TQString rgFile = filePath; - rgFile.replace(TQRegExp(".rg.rgp$"), ".rg"); - rgFile.replace(TQRegExp(".rgp$"), ".rg"); + rgFile.tqreplace(TQRegExp(".rg.rgp$"), ".rg"); + rgFile.tqreplace(TQRegExp(".rgp$"), ".rg"); openURL(rgFile); } @@ -4236,7 +4236,7 @@ RosegardenGUIApp::slotUpdatePlaybackPosition() // std::cerr << "RosegardenGUIApp::slotUpdatePlaybackPosition: mapper timeT = " << elapsedTime << std::endl; - if (m_seqManager->getTransportStatus() == RECORDING) { + if (m_seqManager->getTransporttqStatus() == RECORDING) { MappedComposition mC; if (mapper->getRecordedEvents(mC) > 0) { @@ -4358,10 +4358,10 @@ void RosegardenGUIApp::slotSetPointerPosition(timeT t) // std::cerr << "RosegardenGUIApp::slotSetPointerPosition: t = " << t << std::endl; if (m_seqManager) { - if ( m_seqManager->getTransportStatus() == PLAYING || - m_seqManager->getTransportStatus() == RECORDING ) { + if ( m_seqManager->getTransporttqStatus() == PLAYING || + m_seqManager->getTransporttqStatus() == RECORDING ) { if (t > comp.getEndMarker()) { - if (m_seqManager->getTransportStatus() == PLAYING) { + if (m_seqManager->getTransporttqStatus() == PLAYING) { slotStop(); t = comp.getEndMarker(); @@ -4477,8 +4477,8 @@ void RosegardenGUIApp::slotDisplayBarTime(timeT t) void RosegardenGUIApp::slotRefreshTimeDisplay() { - if ( m_seqManager->getTransportStatus() == PLAYING || - m_seqManager->getTransportStatus() == RECORDING ) { + if ( m_seqManager->getTransporttqStatus() == PLAYING || + m_seqManager->getTransporttqStatus() == RECORDING ) { return ; // it'll be refreshed in a moment anyway } slotSetPointerPosition(m_doc->getComposition().getPosition()); @@ -4530,7 +4530,7 @@ void RosegardenGUIApp::slotTestStartupTester() } else { for (int i = 0; i < missing.count(); ++i) { // if (missingFeatures.count() > 1) { - allMissing.push_back(i18n("%1 - for project file support").arg(missing[i])); + allMissing.push_back(i18n("%1 - for project file support").tqarg(missing[i])); // } else { // allMissing.push_back(missing[i]); // } @@ -4551,7 +4551,7 @@ void RosegardenGUIApp::slotTestStartupTester() } else { for (int i = 0; i < missing.count(); ++i) { if (missingFeatures.count() > 1) { - allMissing.push_back(i18n("%1 - for LilyPond preview support").arg(missing[i])); + allMissing.push_back(i18n("%1 - for LilyPond preview support").tqarg(missing[i])); } else { allMissing.push_back(missing[i]); } @@ -4560,7 +4560,7 @@ void RosegardenGUIApp::slotTestStartupTester() } #ifdef HAVE_LIBJACK - if (m_seqManager && (m_seqManager->getSoundDriverStatus() & AUDIO_OK)) { + if (m_seqManager && (m_seqManager->getSoundDrivertqStatus() & AUDIO_OK)) { m_haveAudioImporter = m_startupTester->haveAudioFileImporter(&missing); @@ -4571,7 +4571,7 @@ void RosegardenGUIApp::slotTestStartupTester() } else { for (int i = 0; i < missing.count(); ++i) { if (missingFeatures.count() > 1) { - allMissing.push_back(i18n("%1 - for audio file import").arg(missing[i])); + allMissing.push_back(i18n("%1 - for audio file import").tqarg(missing[i])); } else { allMissing.push_back(missing[i]); } @@ -4585,13 +4585,13 @@ void RosegardenGUIApp::slotTestStartupTester() TQString message = i18n("<h3>Helper programs not found</h3><p>Rosegarden could not find one or more helper programs which it needs to provide some features. The following features will not be available:</p>"); message += i18n("<ul>"); for (int i = 0; i < missingFeatures.count(); ++i) { - message += i18n("<li>%1</li>").arg(missingFeatures[i]); + message += i18n("<li>%1</li>").tqarg(missingFeatures[i]); } message += i18n("</ul>"); message += i18n("<p>To fix this, you should install the following additional programs:</p>"); message += i18n("<ul>"); for (int i = 0; i < allMissing.count(); ++i) { - message += i18n("<li>%1</li>").arg(allMissing[i]); + message += i18n("<li>%1</li>").tqarg(allMissing[i]); } message += i18n("</ul>"); @@ -4623,7 +4623,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting) if (isSequencerRunning()) { RG_DEBUG << "RosegardenGUIApp::launchSequencer() - sequencer already running - returning\n"; - if (m_seqManager) m_seqManager->checkSoundDriverStatus(false); + if (m_seqManager) m_seqManager->checkSoundDrivertqStatus(false); return true; } @@ -4639,7 +4639,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting) << "existing DCOP registered sequencer found\n"; if (useExisting) { - if (m_seqManager) m_seqManager->checkSoundDriverStatus(false); + if (m_seqManager) m_seqManager->checkSoundDrivertqStatus(false); m_sequencerProcess = (KProcess*)SequencerExternal; return true; } @@ -4733,7 +4733,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting) try { // if (m_seqManager) { // RG_DEBUG << "RosegardenGUIApp::launchSequencer : checking sound driver status\n"; - // m_seqManager->checkSoundDriverStatus(); + // m_seqManager->checkSoundDrivertqStatus(); // } stateChanged("sequencer_running"); @@ -4864,15 +4864,15 @@ void RosegardenGUIApp::slotExportProject() return ; TQString rgFile = fileName; - rgFile.replace(TQRegExp(".rg.rgp$"), ".rg"); - rgFile.replace(TQRegExp(".rgp$"), ".rg"); + rgFile.tqreplace(TQRegExp(".rg.rgp$"), ".rg"); + rgFile.tqreplace(TQRegExp(".rgp$"), ".rg"); CurrentProgressDialog::freeze(); TQString errMsg; if (!m_doc->saveDocument(rgFile, errMsg, true)) { // pretend it's autosave - KMessageBox::sorry(this, i18n("Saving Rosegarden file to package failed: %1").arg(errMsg)); + KMessageBox::sorry(this, i18n("Saving Rosegarden file to package failed: %1").tqarg(errMsg)); CurrentProgressDialog::thaw(); return ; } @@ -4886,7 +4886,7 @@ void RosegardenGUIApp::slotExportProject() proc->start(KProcess::Block, KProcess::All); if (!proc->normalExit() || proc->exitStatus()) { - KMessageBox::sorry(this, i18n("Failed to export to project file \"%1\"").arg(fileName)); + KMessageBox::sorry(this, i18n("Failed to export to project file \"%1\"").tqarg(fileName)); CurrentProgressDialog::thaw(); delete proc; return ; @@ -5021,7 +5021,7 @@ std::map<KProcess *, KTempFile *> RosegardenGUIApp::m_lilyTempFileMap; void RosegardenGUIApp::slotPrintLilyPond() { KTmpStatusMsg msg(i18n("Printing LilyPond file..."), this); - KTempFile *file = new KTempFile(TQString::null, ".ly"); + KTempFile *file = new KTempFile(TQString(), ".ly"); file->setAutoDelete(true); if (!file->name()) { CurrentProgressDialog::freeze(); @@ -5045,7 +5045,7 @@ void RosegardenGUIApp::slotPrintLilyPond() void RosegardenGUIApp::slotPreviewLilyPond() { KTmpStatusMsg msg(i18n("Previewing LilyPond file..."), this); - KTempFile *file = new KTempFile(TQString::null, ".ly"); + KTempFile *file = new KTempFile(TQString(), ".ly"); file->setAutoDelete(true); if (!file->name()) { CurrentProgressDialog::freeze(); @@ -5168,9 +5168,9 @@ RosegardenGUIApp::slotToggleMetronome() { Composition &comp = m_doc->getComposition(); - if (m_seqManager->getTransportStatus() == STARTING_TO_RECORD || - m_seqManager->getTransportStatus() == RECORDING || - m_seqManager->getTransportStatus() == RECORDING_ARMED) { + if (m_seqManager->getTransporttqStatus() == STARTING_TO_RECORD || + m_seqManager->getTransporttqStatus() == RECORDING || + m_seqManager->getTransporttqStatus() == RECORDING_ARMED) { if (comp.useRecordMetronome()) comp.setRecordMetronome(false); else @@ -5192,7 +5192,7 @@ RosegardenGUIApp::slotRewindToBeginning() { // ignore requests if recording // - if (m_seqManager->getTransportStatus() == RECORDING) + if (m_seqManager->getTransporttqStatus() == RECORDING) return ; m_seqManager->rewindToBeginning(); @@ -5203,7 +5203,7 @@ RosegardenGUIApp::slotFastForwardToEnd() { // ignore requests if recording // - if (m_seqManager->getTransportStatus() == RECORDING) + if (m_seqManager->getTransporttqStatus() == RECORDING) return ; m_seqManager->fastForwardToEnd(); @@ -5213,18 +5213,18 @@ void RosegardenGUIApp::slotSetPlayPosition(timeT time) { RG_DEBUG << "RosegardenGUIApp::slotSetPlayPosition(" << time << ")" << endl; - if (m_seqManager->getTransportStatus() == RECORDING) + if (m_seqManager->getTransporttqStatus() == RECORDING) return ; m_doc->slotSetPointerPosition(time); - if (m_seqManager->getTransportStatus() == PLAYING) + if (m_seqManager->getTransporttqStatus() == PLAYING) return ; slotPlay(); } -void RosegardenGUIApp::notifySequencerStatus(int status) +void RosegardenGUIApp::notifySequencertqStatus(int status) { stateChanged("not_playing", (status == PLAYING || @@ -5232,7 +5232,7 @@ void RosegardenGUIApp::notifySequencerStatus(int status) KXMLGUIClient::StateReverse : KXMLGUIClient::StateNoReverse); if (m_seqManager) - m_seqManager->setTransportStatus((TransportStatus) status); + m_seqManager->setTransporttqStatus((TransporttqStatus) status); } void RosegardenGUIApp::processAsynchronousMidi(const MappedComposition &mC) @@ -5261,10 +5261,10 @@ RosegardenGUIApp::slotRecord() return ; } - if (m_seqManager->getTransportStatus() == RECORDING) { + if (m_seqManager->getTransporttqStatus() == RECORDING) { slotStop(); return ; - } else if (m_seqManager->getTransportStatus() == PLAYING) { + } else if (m_seqManager->getTransporttqStatus() == PLAYING) { slotToggleRecord(); return ; } @@ -5398,7 +5398,7 @@ void RosegardenGUIApp::slotPlay() // slotRecord ensures we don't toggle the recording state in // SequenceManager) // - if (m_seqManager->getTransportStatus() == RECORDING_ARMED) { + if (m_seqManager->getTransporttqStatus() == RECORDING_ARMED) { slotRecord(); return ; } @@ -5481,7 +5481,7 @@ void RosegardenGUIApp::slotRewind() { // ignore requests if recording // - if (m_seqManager->getTransportStatus() == RECORDING) + if (m_seqManager->getTransporttqStatus() == RECORDING) return ; if (m_seqManager) m_seqManager->rewind(); @@ -5491,7 +5491,7 @@ void RosegardenGUIApp::slotFastforward() { // ignore requests if recording // - if (m_seqManager->getTransportStatus() == RECORDING) + if (m_seqManager->getTransporttqStatus() == RECORDING) return ; if (m_seqManager) @@ -5705,16 +5705,16 @@ void RosegardenGUIApp::slotEditTempo(timeT atTime) slotEditTempo(this, atTime); } -void RosegardenGUIApp::slotEditTempo(TQWidget *parent) +void RosegardenGUIApp::slotEditTempo(TQWidget *tqparent) { - slotEditTempo(parent, m_doc->getComposition().getPosition()); + slotEditTempo(tqparent, m_doc->getComposition().getPosition()); } -void RosegardenGUIApp::slotEditTempo(TQWidget *parent, timeT atTime) +void RosegardenGUIApp::slotEditTempo(TQWidget *tqparent, timeT atTime) { RG_DEBUG << "RosegardenGUIApp::slotEditTempo\n"; - TempoDialog tempoDialog(parent, m_doc); + TempoDialog tempoDialog(tqparent, m_doc); connect(&tempoDialog, TQT_SIGNAL(changeTempo(timeT, @@ -5740,19 +5740,19 @@ void RosegardenGUIApp::slotEditTimeSignature(timeT atTime) slotEditTimeSignature(this, atTime); } -void RosegardenGUIApp::slotEditTimeSignature(TQWidget *parent) +void RosegardenGUIApp::slotEditTimeSignature(TQWidget *tqparent) { - slotEditTimeSignature(parent, m_doc->getComposition().getPosition()); + slotEditTimeSignature(tqparent, m_doc->getComposition().getPosition()); } -void RosegardenGUIApp::slotEditTimeSignature(TQWidget *parent, +void RosegardenGUIApp::slotEditTimeSignature(TQWidget *tqparent, timeT time) { Composition &composition(m_doc->getComposition()); TimeSignature sig = composition.getTimeSignatureAt(time); - TimeSignatureDialog dialog(parent, &composition, time, sig); + TimeSignatureDialog dialog(tqparent, &composition, time, sig); if (dialog.exec() == TQDialog::Accepted) { @@ -5775,9 +5775,9 @@ void RosegardenGUIApp::slotEditTransportTime() slotEditTransportTime(this); } -void RosegardenGUIApp::slotEditTransportTime(TQWidget *parent) +void RosegardenGUIApp::slotEditTransportTime(TQWidget *tqparent) { - TimeDialog dialog(parent, i18n("Move playback pointer to time"), + TimeDialog dialog(tqparent, i18n("Move playback pointer to time"), &m_doc->getComposition(), m_doc->getComposition().getPosition(), true); @@ -5790,13 +5790,13 @@ void RosegardenGUIApp::slotChangeZoom(int) { double duration44 = TimeSignature(4, 4).getBarDuration(); double value = double(m_zoomSlider->getCurrentSize()); - m_zoomLabel->setText(i18n("%1%").arg(duration44 / value)); + m_zoomLabel->setText(i18n("%1%").tqarg(duration44 / value)); RG_DEBUG << "RosegardenGUIApp::slotChangeZoom : zoom size = " << m_zoomSlider->getCurrentSize() << endl; // initZoomToolbar sets the zoom value. With some old versions of - // Qt3.0, this can cause slotChangeZoom() to be called while the + // TQt3.0, this can cause slotChangeZoom() to be called while the // view hasn't been initialized yet, so we need to check it's not // null // @@ -5858,7 +5858,7 @@ RosegardenGUIApp::slotChangeTempo(timeT time, timeT prevTime = comp.getTempoChange(index).first; KMacroCommand *macro = - new KMacroCommand(i18n("Replace Tempo Change at %1").arg(time)); + new KMacroCommand(i18n("Replace Tempo Change at %1").tqarg(time)); macro->addCommand(new RemoveTempoChangeCommand(&comp, index)); macro->addCommand(new AddTempoChangeCommand(&comp, prevTime, value, @@ -6129,7 +6129,7 @@ RosegardenGUIApp::setCursor(const TQCursor& cursor) m_dockLeft->setCursor(cursor); } -QString +TQString RosegardenGUIApp::createNewAudioFile() { AudioFile *aF = 0; @@ -6177,7 +6177,7 @@ RosegardenGUIApp::createRecordAudioFiles(const TQValueVector<InstrumentId> &reco return qv; } -QString +TQString RosegardenGUIApp::getAudioFilePath() { return TQString(m_doc->getAudioFileManager().getAudioPath().c_str()); @@ -6307,8 +6307,8 @@ RosegardenGUIApp::slotAudioManager() connect(this, TQT_SIGNAL(documentAboutToChange()), m_audioManagerDialog, TQT_SLOT(close())); - m_audioManagerDialog->setAudioSubsystemStatus( - m_seqManager->getSoundDriverStatus() & AUDIO_OK); + m_audioManagerDialog->setAudioSubsystemtqStatus( + m_seqManager->getSoundDrivertqStatus() & AUDIO_OK); plugAccelerators(m_audioManagerDialog, m_audioManagerDialog->getAccelerators()); @@ -6350,7 +6350,7 @@ RosegardenGUIApp::slotAddAudioFile(unsigned int id) TQByteArray data; TQDataStream streamOut(data, IO_WriteOnly); - // We have to pass the filename as a QString + // We have to pass the filename as a TQString // streamOut << TQString(strtoqstr(aF->getFilename())); streamOut << (int)aF->getId(); @@ -6360,7 +6360,7 @@ RosegardenGUIApp::slotAddAudioFile(unsigned int id) int result; streamIn >> result; if (!result) { - KMessageBox::error(this, i18n("Sequencer failed to add audio file %1").arg(aF->getFilename().c_str())); + KMessageBox::error(this, i18n("Sequencer failed to add audio file %1").tqarg(aF->getFilename().c_str())); } } } @@ -6385,7 +6385,7 @@ RosegardenGUIApp::slotDeleteAudioFile(unsigned int id) int result; streamIn >> result; if (!result) { - KMessageBox::error(this, i18n("Sequencer failed to remove audio file id %1").arg(id)); + KMessageBox::error(this, i18n("Sequencer failed to remove audio file id %1").tqarg(id)); } } } @@ -6915,12 +6915,12 @@ RosegardenGUIApp::slotControlEditorClosed() } void -RosegardenGUIApp::slotShowPluginDialog(TQWidget *parent, +RosegardenGUIApp::slotShowPluginDialog(TQWidget *tqparent, InstrumentId instrumentId, int index) { - if (!parent) - parent = this; + if (!tqparent) + tqparent = this; int key = (index << 16) + instrumentId; @@ -6954,7 +6954,7 @@ RosegardenGUIApp::slotShowPluginDialog(TQWidget *parent, // Create the plugin dialog // AudioPluginDialog *dialog = - new AudioPluginDialog(parent, + new AudioPluginDialog(tqparent, m_doc->getPluginManager(), #ifdef HAVE_LIBLO m_pluginGUIManager, @@ -7723,10 +7723,10 @@ RosegardenGUIApp::slotSaveDefaultStudio() if (!res) { if (errMsg) KMessageBox::error(this, i18n(TQString("Could not auto-save document at %1\nError was : %2") - .arg(autoloadFile).arg(errMsg))); + .tqarg(autoloadFile).tqarg(errMsg))); else KMessageBox::error(this, i18n(TQString("Could not auto-save document at %1") - .arg(autoloadFile))); + .tqarg(autoloadFile))); } } @@ -7778,7 +7778,7 @@ RosegardenGUIApp::slotImportStudio() TQString target; if (KIO::NetAccess::download(url, target, this) == false) { KMessageBox::error(this, i18n("Cannot download file %1") - .arg(url.prettyURL())); + .tqarg(url.prettyURL())); return ; } @@ -7912,8 +7912,8 @@ void RosegardenGUIApp::slotAutoSave() { if (!m_seqManager || - m_seqManager->getTransportStatus() == PLAYING || - m_seqManager->getTransportStatus() == RECORDING) + m_seqManager->getTransporttqStatus() == PLAYING || + m_seqManager->getTransporttqStatus() == RECORDING) return ; KConfig* config = kapp->config(); @@ -7982,7 +7982,7 @@ RosegardenGUIApp::awaitDialogClearance() while (haveDialog) { - const TQObjectList *c = children(); + const TQObjectList *c = tqchildren(); if (!c) return; haveDialog = false; @@ -8014,7 +8014,7 @@ RosegardenGUIApp::slotNewerVersionAvailable(TQString v) (this, i18n("<h3>Newer version available</h3><p>A newer version of Rosegarden may be available.<br>Please consult the <a href=\"http://www.rosegardenmusic.com/getting/\">Rosegarden website</a> for more information.</p>"), i18n("Newer version available"), - TQString("version-%1-available-show").arg(v), + TQString("version-%1-available-show").tqarg(v), KMessageBox::AllowLink); CurrentProgressDialog::thaw(); } diff --git a/src/gui/application/RosegardenGUIApp.h b/src/gui/application/RosegardenGUIApp.h index 8ae0eaa..3221ded 100644 --- a/src/gui/application/RosegardenGUIApp.h +++ b/src/gui/application/RosegardenGUIApp.h @@ -110,6 +110,7 @@ class AudioManagerDialog; class RosegardenGUIApp : public KDockMainWindow, virtual public RosegardenIface { Q_OBJECT + TQ_OBJECT friend class RosegardenGUIView; @@ -279,7 +280,7 @@ public: /** * Set the sequencer status - pass through DCOP as an int */ - virtual void notifySequencerStatus(int status); + virtual void notifySequencertqStatus(int status); /** * Handle some random incoming MIDI events. @@ -323,7 +324,7 @@ public: void plugAccelerators(TQWidget *widget, TQAccel *accel); /** - * Override from QWidget + * Override from TQWidget * Toolbars and docks need special treatment */ virtual void setCursor(const TQCursor&); @@ -812,7 +813,7 @@ public slots: * Tempo to Segment length */ void slotTempoToSegmentLength(); - void slotTempoToSegmentLength(TQWidget* parent); + void slotTempoToSegmentLength(TQWidget* tqparent); /** * toggle segment labels @@ -855,22 +856,22 @@ public slots: */ void slotEditTempo(); void slotEditTempo(timeT atTime); - void slotEditTempo(TQWidget *parent); - void slotEditTempo(TQWidget *parent, timeT atTime); + void slotEditTempo(TQWidget *tqparent); + void slotEditTempo(TQWidget *tqparent, timeT atTime); /** * Edit the time signature - called from a Transport signal */ void slotEditTimeSignature(); void slotEditTimeSignature(timeT atTime); - void slotEditTimeSignature(TQWidget *parent); - void slotEditTimeSignature(TQWidget *parent, timeT atTime); + void slotEditTimeSignature(TQWidget *tqparent); + void slotEditTimeSignature(TQWidget *tqparent, timeT atTime); /** * Edit the playback pointer position - called from a Transport signal */ void slotEditTransportTime(); - void slotEditTransportTime(TQWidget *parent); + void slotEditTransportTime(TQWidget *tqparent); /** * Change the length of the composition @@ -1239,7 +1240,7 @@ public slots: /** * save general Options like all bar positions and status as well - * as the geometry and the recent file list to the configuration + * as the tqgeometry and the recent file list to the configuration * file */ void slotSaveOptions(); @@ -1464,7 +1465,7 @@ public slots: * Create a plugin dialog for a given instrument and slot, or * raise an exising one. */ - void slotShowPluginDialog(TQWidget *parent, + void slotShowPluginDialog(TQWidget *tqparent, InstrumentId instrument, int index); diff --git a/src/gui/application/RosegardenGUIView.cpp b/src/gui/application/RosegardenGUIView.cpp index 9eb7969..e336c2e 100644 --- a/src/gui/application/RosegardenGUIView.cpp +++ b/src/gui/application/RosegardenGUIView.cpp @@ -98,7 +98,7 @@ namespace Rosegarden // Use this to define the basic unit of the main TQCanvas size. // -// This apparently arbitrary figure is what we think is an +// This aptqparently arbitrary figure is what we think is an // appropriate width in pixels for a 4/4 bar. Beware of making it // too narrow, as shorter bars will be proportionally smaller -- // the visual difference between 2/4 and 4/4 is perhaps greater @@ -118,9 +118,9 @@ RosegardenGUIView::RosegardenGUIView(bool showTrackLabels, SegmentParameterBox* segmentParameterBox, InstrumentParameterBox* instrumentParameterBox, TrackParameterBox* trackParameterBox, - TQWidget *parent, + TQWidget *tqparent, const char* /*name*/) - : TQVBox(parent), + : TQVBox(tqparent), m_rulerScale(0), m_trackEditor(0), m_segmentParameterBox(segmentParameterBox), @@ -174,7 +174,7 @@ RosegardenGUIView::RosegardenGUIView(bool showTrackLabels, connect(m_trackEditor, TQT_SIGNAL(droppedDocument(TQString)), - parent, + tqparent, TQT_SLOT(slotOpenDroppedURL(TQString))); connect(m_trackEditor, @@ -870,7 +870,7 @@ void RosegardenGUIView::slotEditSegmentAudio(Segment *segment) } // wait cursor - TQApplication::setOverrideCursor(TQCursor(Qt::waitCursor)); + TQApplication::setOverrideCursor(TQCursor(TQt::waitCursor)); // Prepare the process // @@ -907,19 +907,19 @@ void RosegardenGUIView::setZoomSize(double size) m_trackEditor->getSegmentCanvas()->slotUpdateSegmentsDrawBuffer(); if (m_trackEditor->getTempoRuler()) { - m_trackEditor->getTempoRuler()->repaint(); + m_trackEditor->getTempoRuler()->tqrepaint(); } if (m_trackEditor->getChordNameRuler()) { - m_trackEditor->getChordNameRuler()->repaint(); + m_trackEditor->getChordNameRuler()->tqrepaint(); } if (m_trackEditor->getTopStandardRuler()) { - m_trackEditor->getTopStandardRuler()->repaint(); + m_trackEditor->getTopStandardRuler()->tqrepaint(); } if (m_trackEditor->getBottomStandardRuler()) { - m_trackEditor->getBottomStandardRuler()->repaint(); + m_trackEditor->getBottomStandardRuler()->tqrepaint(); } } @@ -1196,7 +1196,7 @@ RosegardenGUIView::updateMeters(SequencerMapper *mapper) bool toSet = false; if (states[instrumentId] == newState && - (getDocument()->getSequenceManager()->getTransportStatus() + (getDocument()->getSequenceManager()->getTransporttqStatus() != STOPPED)) { if (info.level != 0 || info.levelRight != 0) { @@ -1212,7 +1212,7 @@ RosegardenGUIView::updateMeters(SequencerMapper *mapper) if (recStates[instrumentId] == newState && instrument->getType() == Instrument::Audio && - (getDocument()->getSequenceManager()->getTransportStatus() + (getDocument()->getSequenceManager()->getTransporttqStatus() != PLAYING)) { if (recInfo.level != 0 || recInfo.levelRight != 0) { @@ -1238,7 +1238,7 @@ RosegardenGUIView::updateMeters(SequencerMapper *mapper) if (info.level == 0) continue; - if (getDocument()->getSequenceManager()->getTransportStatus() + if (getDocument()->getSequenceManager()->getTransporttqStatus() != STOPPED) { // The information in 'info' is specific for this instrument, not @@ -2028,7 +2028,7 @@ RosegardenGUIView::createEventView(std::vector<Segment *> segmentsToEdit) // create keyboard accelerators on view // - RosegardenGUIApp *par = dynamic_cast<RosegardenGUIApp*>(parent()); + RosegardenGUIApp *par = dynamic_cast<RosegardenGUIApp*>(tqparent()); if (par) { par->plugAccelerators(eventView, eventView->getAccelerators()); diff --git a/src/gui/application/RosegardenGUIView.h b/src/gui/application/RosegardenGUIView.h index 1c2e3b1..44bf12b 100644 --- a/src/gui/application/RosegardenGUIView.h +++ b/src/gui/application/RosegardenGUIView.h @@ -74,9 +74,10 @@ class LevelInfo; * @author Source Framework Automatically Generated by KDevelop, (c) The KDevelop Team. * @version KDevelop version 0.4 code generation */ -class RosegardenGUIView : public QVBox +class RosegardenGUIView : public TQVBox { Q_OBJECT + TQ_OBJECT public: /**p @@ -86,7 +87,7 @@ public: SegmentParameterBox*, InstrumentParameterBox*, TrackParameterBox*, - TQWidget *parent = 0, + TQWidget *tqparent = 0, const char *name=0); /** @@ -97,7 +98,7 @@ public: /** * returns a pointer to the document connected to the view * instance. Mind that this method requires a RosegardenGUIApp - * instance as a parent widget to get to the window document + * instance as a tqparent widget to get to the window document * pointer by calling the RosegardenGUIApp::getDocument() method. * * @see RosegardenGUIApp#getDocument diff --git a/src/gui/application/RosegardenIface.h b/src/gui/application/RosegardenIface.h index 046033c..04ab1a2 100644 --- a/src/gui/application/RosegardenIface.h +++ b/src/gui/application/RosegardenIface.h @@ -86,7 +86,7 @@ k_dcop: // Sequencer updates GUI with status // - virtual void notifySequencerStatus(int status) = 0; + virtual void notifySequencertqStatus(int status) = 0; // Used to map unexpected (async) MIDI events to the user interface. // We can show these on the Transport or on a MIDI Mixer. diff --git a/src/gui/application/SetWaitCursor.cpp b/src/gui/application/SetWaitCursor.cpp index 9d4472d..19ef147 100644 --- a/src/gui/application/SetWaitCursor.cpp +++ b/src/gui/application/SetWaitCursor.cpp @@ -79,7 +79,7 @@ SetWaitCursor::~SetWaitCursor() m_guiApp->setCursor(m_saveCursor); if (viewport) { - if (currentSegmentCanvasCursor.shape() == KCursor::waitCursor().shape()) { + if (currentSegmentCanvasCursor.tqshape() == KCursor::waitCursor().tqshape()) { viewport->setCursor(m_saveSegmentCanvasCursor); } else { viewport->setCursor(currentSegmentCanvasCursor); // because m_guiApp->setCursor() has replaced it diff --git a/src/gui/application/StartupTester.cpp b/src/gui/application/StartupTester.cpp index 5e1813d..0c3eb90 100644 --- a/src/gui/application/StartupTester.cpp +++ b/src/gui/application/StartupTester.cpp @@ -147,7 +147,7 @@ StartupTester::isReady() void StartupTester::stdoutReceived(KProcess *, char *buffer, int len) { - m_stdoutBuffer += TQString::fromLatin1(buffer, len); + m_stdoutBuffer += TQString::tqfromLatin1(buffer, len); } void diff --git a/src/gui/application/StartupTester.h b/src/gui/application/StartupTester.h index 1249cbd..5579eaf 100644 --- a/src/gui/application/StartupTester.h +++ b/src/gui/application/StartupTester.h @@ -37,9 +37,10 @@ class KProcess; namespace Rosegarden { -class StartupTester : public TQObject, public QThread +class StartupTester : public TQObject, public TQThread { Q_OBJECT + TQ_OBJECT public: StartupTester(); diff --git a/src/gui/application/main.cpp b/src/gui/application/main.cpp index 8ee67e3..8c5a5a9 100644 --- a/src/gui/application/main.cpp +++ b/src/gui/application/main.cpp @@ -66,7 +66,7 @@ structures, of which the primary ones are Event, Segment, Track, Instrument and Composition. It also contains a selection of utility and helper classes of a kind that is not specific to any particular GUI. Everything here is part of the Rosegarden namespace, and there -are no dependencies on KDE or Qt (although it uses the STL heavily). +are no dependencies on KDE or TQt (although it uses the STL heavily). The keyword for the basic structures in use is "flexibility". Our Event objects can be extended arbitrarily for the convenience of GUI @@ -98,7 +98,7 @@ disastrous side-effects. automatically ordered by their absolute time. It's the usual container for Events. A Segment has a starting time that can be changed, and a duration that is based solely on the end time of - the last Event it contains. Note that in order to facilitate + the last Event it tqcontains. Note that in order to facilitate musical notation editing, we explicitly store silences as series of rest Events; thus a Segment really should contain no gaps between its Events. (This isn't checked anywhere and nothing will @@ -153,7 +153,7 @@ The base directory also contains various music-related helper classes: The NotationTypes classes also define important constants for the names of common properties in Events. For example, the Note class contains Note::EventType, which is the type of a note Event, and - Note::EventRestType, the type of a rest Event; and Key contains + Note::EventRestType, the type of a rest Event; and Key tqcontains Key::EventType, the type of a key change Event, KeyPropertyName, the name of the property that defines the key change, and a set of the valid strings for key changes. @@ -183,7 +183,7 @@ The base directory also contains various music-related helper classes: \section gui GUI -The GUI directory builds into a KDE/Qt application. Like most KDE +The GUI directory builds into a KDE/TQt application. Like most KDE applications, it follows a document/view model. The document (class RosegardenGUIDoc, which wraps a Composition) can have several views (class RosegardenGUIView), although at the moment only a single one is @@ -246,9 +246,9 @@ and Events (our basic music element). To help lift the ambiguity, and time this corresponds to, that kind of stuff. (In the Notation and Matrix views, the LinedStaff calculates mappings between coordinates and staff lines: the former is especially - complicated because of its support for page layout.)\n + complicated because of its support for page tqlayout.)\n -# The canvas view transmits this kind of info as a signal, which is - connected to a slot in the parent EditView. + connected to a slot in the tqparent EditView. -# The EditView delegates action to the current tool.\n -# The tool performs the actual job (inserting or deleting a note, etc...). @@ -260,11 +260,11 @@ which "wraps" the complexity into simple calls and performs all the hidden tasks. The EditView also maintains (obviously) its visual appearance with the -layout classes, applying them when appropriate. +tqlayout classes, applying them when appropriate. \section sequencer Sequencer -The sequencer directory also builds into a KDE/Qt application, but one +The sequencer directory also builds into a KDE/TQt application, but one which doesn't have a gui. The Sequencer can be started automatically by the main Rosegarden GUI or manually if testing - it's sometimes more convenient to do the latter as the Sequencer needs to be connected @@ -324,7 +324,7 @@ static KCmdLineOptions options[] = // ----------------------------------------------------------------- -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <X11/Xlib.h> #include <X11/Xutil.h> #include <X11/Xatom.h> @@ -379,7 +379,7 @@ void testInstalledVersion() " 2. The upgrade was installed in a non-standard directory,\n" " and an old version was found in a standard directory. If so,\n" " you will need to add the correct directory to your KDEDIRS\n" - " environment variable before you can run it.").arg(VERSION).arg(installedVersion), + " environment variable before you can run it.").tqarg(VERSION).tqarg(installedVersion), i18n("Installation problem")); } else { @@ -531,8 +531,8 @@ int main(int argc, char *argv[]) startupSize = TQSize((desktopRect.width() * 4) / 5, (desktopRect.height() * 4) / 5); } - TQString widthKey = TQString("Width %1").arg(totalRect.width()); - TQString heightKey = TQString("Height %1").arg(totalRect.height()); + TQString widthKey = TQString("Width %1").tqarg(totalRect.width()); + TQString heightKey = TQString("Height %1").tqarg(totalRect.height()); windowWidth = config->readUnsignedNumEntry (widthKey, startupSize.width()); windowHeight = config->readUnsignedNumEntry @@ -595,7 +595,7 @@ int main(int argc, char *argv[]) rosegardengui = new RosegardenGUIApp(!app.noSequencerMode(), args->isSet("existingsequencer"), - startLogo); + TQT_TQOBJECT(startLogo)); rosegardengui->setIsFirstRun(newVersion); @@ -676,7 +676,7 @@ int main(int argc, char *argv[]) } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 XSetErrorHandler( _x_errhandler ); #endif @@ -722,13 +722,13 @@ int main(int argc, char *argv[]) TQVBox *mw = dialog->makeVBoxMainWidget(); TQHBox *hb = new TQHBox(mw); TQLabel *image = new TQLabel(hb); - image->setAlignment(Qt::AlignTop); + image->tqsetAlignment(TQt::AlignTop); TQString iconFile = locate("appdata", "pixmaps/misc/welcome-icon.png"); if (iconFile) { image->setPixmap(TQPixmap(iconFile)); } TQLabel *label = new TQLabel(hb); - label->setText(i18n("<h2>Welcome to Rosegarden!</h2><p>Welcome to the Rosegarden audio and MIDI sequencer and musical notation editor.</p><ul><li>If you have not already done so, you may wish to install some DSSI synth plugins, or a separate synth program such as QSynth. Rosegarden does not synthesize sounds from MIDI on its own, so without these you will hear nothing.</li><br><br><li>Rosegarden uses the JACK audio server for recording and playback of audio, and for playback from DSSI synth plugins. These features will only be available if the JACK server is running.</li><br><br><li>Rosegarden has comprehensive documentation: see the Help menu for the handbook, tutorials, and other information!</li></ul><p>Rosegarden was brought to you by a team of volunteers across the world. To learn more, go to <a href=\"http://www.rosegardenmusic.com/\">http://www.rosegardenmusic.com/</a>.</p>")); + label->setText(i18n("<h2>Welcome to Rosegarden!</h2><p>Welcome to the Rosegarden audio and MIDI sequencer and musical notation editor.</p><ul><li>If you have not already done so, you may wish to install some DSSI synth plugins, or a separate synth program such as TQSynth. Rosegarden does not synthesize sounds from MIDI on its own, so without these you will hear nothing.</li><br><br><li>Rosegarden uses the JACK audio server for recording and playback of audio, and for playback from DSSI synth plugins. These features will only be available if the JACK server is running.</li><br><br><li>Rosegarden has comprehensive documentation: see the Help menu for the handbook, tutorials, and other information!</li></ul><p>Rosegarden was brought to you by a team of volunteers across the world. To learn more, go to <a href=\"http://www.rosegardenmusic.com/\">http://www.rosegardenmusic.com/</a>.</p>")); dialog->showButtonOK(true); rosegardengui->awaitDialogClearance(); dialog->exec(); |