summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2024-01-02 11:38:07 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2024-01-02 12:06:34 +0900
commite9f46130c2656aaf299d8793556310c9bf95daee (patch)
tree19c604d8c26146c0f36e8b13cfa02982f2196025
parent9b054308cef27a642eaa6e9a86db215151468e0b (diff)
downloadrosegarden-e9f46130c2656aaf299d8793556310c9bf95daee.tar.gz
rosegarden-e9f46130c2656aaf299d8793556310c9bf95daee.zip
Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--src/commands/segment/AudioSegmentRescaleCommand.cpp16
-rw-r--r--src/document/MultiViewCommandHistory.cpp24
-rw-r--r--src/document/RosegardenGUIDoc.cpp40
-rw-r--r--src/gui/application/LircClient.cpp2
-rw-r--r--src/gui/application/LircCommander.cpp54
-rw-r--r--src/gui/application/RosegardenGUIApp.cpp960
-rw-r--r--src/gui/application/RosegardenGUIView.cpp376
-rw-r--r--src/gui/application/StartupTester.cpp20
-rw-r--r--src/gui/application/main.cpp12
-rw-r--r--src/gui/configuration/AudioConfigurationPage.cpp2
-rw-r--r--src/gui/configuration/AudioPropertiesPage.cpp16
-rw-r--r--src/gui/configuration/ColourConfigurationPage.cpp20
-rw-r--r--src/gui/configuration/GeneralConfigurationPage.cpp4
-rw-r--r--src/gui/configuration/HeadersConfigurationPage.cpp8
-rw-r--r--src/gui/configuration/LatencyConfigurationPage.cpp12
-rw-r--r--src/gui/configuration/MIDIConfigurationPage.cpp14
-rw-r--r--src/gui/configuration/NotationConfigurationPage.cpp8
-rw-r--r--src/gui/dialogs/AudioManagerDialog.cpp64
-rw-r--r--src/gui/dialogs/AudioPluginDialog.cpp36
-rw-r--r--src/gui/dialogs/AudioSplitDialog.cpp4
-rw-r--r--src/gui/dialogs/ClefDialog.cpp8
-rw-r--r--src/gui/dialogs/ConfigureDialog.cpp8
-rw-r--r--src/gui/dialogs/CountdownDialog.cpp2
-rw-r--r--src/gui/dialogs/EventEditDialog.cpp44
-rw-r--r--src/gui/dialogs/EventFilterDialog.cpp36
-rw-r--r--src/gui/dialogs/EventParameterDialog.cpp4
-rw-r--r--src/gui/dialogs/IdentifyTextCodecDialog.cpp4
-rw-r--r--src/gui/dialogs/InterpretDialog.cpp2
-rw-r--r--src/gui/dialogs/IntervalDialog.cpp8
-rw-r--r--src/gui/dialogs/KeySignatureDialog.cpp16
-rw-r--r--src/gui/dialogs/LyricEditDialog.cpp4
-rw-r--r--src/gui/dialogs/ManageMetronomeDialog.cpp30
-rw-r--r--src/gui/dialogs/PasteNotationDialog.cpp4
-rw-r--r--src/gui/dialogs/PitchDialog.cpp4
-rw-r--r--src/gui/dialogs/RescaleDialog.cpp4
-rw-r--r--src/gui/dialogs/SimpleEventEditDialog.cpp64
-rw-r--r--src/gui/dialogs/TempoDialog.cpp42
-rw-r--r--src/gui/dialogs/TextEventDialog.cpp34
-rw-r--r--src/gui/dialogs/TimeDialog.cpp8
-rw-r--r--src/gui/dialogs/TimeSignatureDialog.cpp12
-rw-r--r--src/gui/dialogs/TransportDialog.cpp110
-rw-r--r--src/gui/dialogs/TupletDialog.cpp22
-rw-r--r--src/gui/dialogs/UseOrnamentDialog.cpp2
-rw-r--r--src/gui/editors/eventlist/EventView.cpp46
-rw-r--r--src/gui/editors/guitar/GuitarChordEditorDialog.cpp4
-rw-r--r--src/gui/editors/guitar/GuitarChordSelectorDialog.cpp28
-rw-r--r--src/gui/editors/matrix/MatrixEraser.cpp8
-rw-r--r--src/gui/editors/matrix/MatrixMover.cpp24
-rw-r--r--src/gui/editors/matrix/MatrixPainter.cpp16
-rw-r--r--src/gui/editors/matrix/MatrixResizer.cpp16
-rw-r--r--src/gui/editors/matrix/MatrixSelector.cpp22
-rw-r--r--src/gui/editors/matrix/MatrixView.cpp288
-rw-r--r--src/gui/editors/notation/ClefInserter.cpp6
-rw-r--r--src/gui/editors/notation/GuitarChordInserter.cpp6
-rw-r--r--src/gui/editors/notation/NotationEraser.cpp6
-rw-r--r--src/gui/editors/notation/NotationSelector.cpp36
-rw-r--r--src/gui/editors/notation/NotationView.cpp514
-rw-r--r--src/gui/editors/notation/NoteFontViewer.cpp12
-rw-r--r--src/gui/editors/notation/NoteInserter.cpp18
-rw-r--r--src/gui/editors/notation/RestInserter.cpp8
-rw-r--r--src/gui/editors/notation/TextInserter.cpp6
-rw-r--r--src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp36
-rw-r--r--src/gui/editors/parameters/InstrumentParameterBox.cpp32
-rw-r--r--src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp40
-rw-r--r--src/gui/editors/parameters/SegmentParameterBox.cpp66
-rw-r--r--src/gui/editors/parameters/TrackParameterBox.cpp52
-rw-r--r--src/gui/editors/segment/ControlEditorDialog.cpp20
-rw-r--r--src/gui/editors/segment/ControlParameterEditDialog.cpp36
-rw-r--r--src/gui/editors/segment/MarkerEditor.cpp38
-rw-r--r--src/gui/editors/segment/PlayList.cpp32
-rw-r--r--src/gui/editors/segment/TrackButtons.cpp40
-rw-r--r--src/gui/editors/segment/TrackEditor.cpp142
-rw-r--r--src/gui/editors/segment/TrackLabel.cpp4
-rw-r--r--src/gui/editors/segment/TriggerSegmentManager.cpp40
-rw-r--r--src/gui/editors/segment/segmentcanvas/CompositionModelImpl.cpp4
-rw-r--r--src/gui/editors/segment/segmentcanvas/CompositionView.cpp70
-rw-r--r--src/gui/editors/segment/segmentcanvas/SegmentMover.cpp8
-rw-r--r--src/gui/editors/segment/segmentcanvas/SegmentPencil.cpp8
-rw-r--r--src/gui/editors/segment/segmentcanvas/SegmentResizer.cpp16
-rw-r--r--src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp4
-rw-r--r--src/gui/editors/tempo/TempoView.cpp34
-rw-r--r--src/gui/general/BaseToolBox.cpp4
-rw-r--r--src/gui/general/EditView.cpp116
-rw-r--r--src/gui/general/EditViewBase.cpp44
-rw-r--r--src/gui/general/PresetHandlerDialog.cpp4
-rw-r--r--src/gui/general/RosegardenCanvasView.cpp4
-rw-r--r--src/gui/general/RosegardenScrollView.cpp4
-rw-r--r--src/gui/rulers/ChordNameRuler.cpp8
-rw-r--r--src/gui/rulers/ControlRuler.cpp4
-rw-r--r--src/gui/rulers/MarkerRuler.cpp8
-rw-r--r--src/gui/rulers/StandardRuler.cpp48
-rw-r--r--src/gui/rulers/TempoRuler.cpp48
-rw-r--r--src/gui/seqmanager/MidiFilterDialog.cpp8
-rw-r--r--src/gui/seqmanager/SequenceManager.cpp30
-rw-r--r--src/gui/studio/AudioMixerWindow.cpp94
-rw-r--r--src/gui/studio/BankEditorDialog.cpp70
-rw-r--r--src/gui/studio/DeviceEditorDialog.cpp10
-rw-r--r--src/gui/studio/DeviceManagerDialog.cpp44
-rw-r--r--src/gui/studio/MidiMixerWindow.cpp30
-rw-r--r--src/gui/studio/MidiProgramsEditor.cpp16
-rw-r--r--src/gui/studio/NameSetEditor.cpp12
-rw-r--r--src/gui/studio/RemapInstrumentDialog.cpp4
-rw-r--r--src/gui/studio/SynthPluginManagerDialog.cpp12
-rw-r--r--src/gui/studio/TimerCallbackAssistant.cpp2
-rw-r--r--src/gui/widgets/AudioFaderBox.cpp8
-rw-r--r--src/gui/widgets/AudioRouteMenu.cpp8
-rw-r--r--src/gui/widgets/CollapsingFrame.cpp2
-rw-r--r--src/gui/widgets/ColourTable.cpp4
-rw-r--r--src/gui/widgets/CurrentProgressDialog.cpp4
-rw-r--r--src/gui/widgets/DiatonicPitchChooser.cpp48
-rw-r--r--src/gui/widgets/Fader.cpp6
-rw-r--r--src/gui/widgets/HSpinBox.cpp2
-rw-r--r--src/gui/widgets/PitchChooser.cpp28
-rw-r--r--src/gui/widgets/PluginControl.cpp4
-rw-r--r--src/gui/widgets/ProgressDialog.cpp8
-rw-r--r--src/gui/widgets/QuantizeParameters.cpp6
-rw-r--r--src/gui/widgets/Rotary.cpp8
-rw-r--r--src/gui/widgets/TimeWidget.cpp32
-rw-r--r--src/gui/widgets/VUMeter.cpp16
-rw-r--r--src/sequencer/RosegardenSequencerApp.cpp4
-rw-r--r--src/sequencer/main.cpp2
-rw-r--r--src/sound/AudioFileManager.cpp4
-rw-r--r--src/sound/PeakFileManager.cpp4
123 files changed, 2386 insertions, 2386 deletions
diff --git a/src/commands/segment/AudioSegmentRescaleCommand.cpp b/src/commands/segment/AudioSegmentRescaleCommand.cpp
index 2077099..ec7effc 100644
--- a/src/commands/segment/AudioSegmentRescaleCommand.cpp
+++ b/src/commands/segment/AudioSegmentRescaleCommand.cpp
@@ -90,19 +90,19 @@ AudioSegmentRescaleCommand::~AudioSegmentRescaleCommand()
void
AudioSegmentRescaleCommand::connectProgressDialog(ProgressDialog *dlg)
{
- TQObject::connect(m_stretcher, TQT_SIGNAL(setProgress(int)),
- dlg->progressBar(), TQT_SLOT(setValue(int)));
- TQObject::connect(dlg, TQT_SIGNAL(cancelClicked()),
- m_stretcher, TQT_SLOT(slotStopTimestretch()));
+ TQObject::connect(m_stretcher, TQ_SIGNAL(setProgress(int)),
+ dlg->progressBar(), TQ_SLOT(setValue(int)));
+ TQObject::connect(dlg, TQ_SIGNAL(cancelClicked()),
+ m_stretcher, TQ_SLOT(slotStopTimestretch()));
}
void
AudioSegmentRescaleCommand::disconnectProgressDialog(ProgressDialog *dlg)
{
- TQObject::disconnect(m_stretcher, TQT_SIGNAL(setProgress(int)),
- dlg->progressBar(), TQT_SLOT(setValue(int)));
- TQObject::disconnect(dlg, TQT_SIGNAL(cancelClicked()),
- m_stretcher, TQT_SLOT(slotStopTimestretch()));
+ TQObject::disconnect(m_stretcher, TQ_SIGNAL(setProgress(int)),
+ dlg->progressBar(), TQ_SLOT(setValue(int)));
+ TQObject::disconnect(dlg, TQ_SIGNAL(cancelClicked()),
+ m_stretcher, TQ_SLOT(slotStopTimestretch()));
}
void
diff --git a/src/document/MultiViewCommandHistory.cpp b/src/document/MultiViewCommandHistory.cpp
index aab0b9d..13a97cf 100644
--- a/src/document/MultiViewCommandHistory.cpp
+++ b/src/document/MultiViewCommandHistory.cpp
@@ -73,40 +73,40 @@ MultiViewCommandHistory::attachView(TDEActionCollection *collection)
TDEToolBarPopupAction *undo = dynamic_cast<TDEToolBarPopupAction*>(collection->action(KStdAction::stdName(KStdAction::Undo)));
if (undo) {
- connect(undo, TQT_SIGNAL(activated()),
- this, TQT_SLOT(slotUndo()));
+ connect(undo, TQ_SIGNAL(activated()),
+ this, TQ_SLOT(slotUndo()));
connect
(undo->popupMenu(),
- TQT_SIGNAL(aboutToShow()),
+ TQ_SIGNAL(aboutToShow()),
this,
- TQT_SLOT(slotUndoAboutToShow()));
+ TQ_SLOT(slotUndoAboutToShow()));
connect
(undo->popupMenu(),
- TQT_SIGNAL(activated(int)),
+ TQ_SIGNAL(activated(int)),
this,
- TQT_SLOT(slotUndoActivated(int)));
+ TQ_SLOT(slotUndoActivated(int)));
}
TDEToolBarPopupAction *redo = dynamic_cast<TDEToolBarPopupAction*>(collection->action(KStdAction::stdName(KStdAction::Redo)));
if (redo) {
- connect(redo, TQT_SIGNAL(activated()),
- this, TQT_SLOT(slotRedo()));
+ connect(redo, TQ_SIGNAL(activated()),
+ this, TQ_SLOT(slotRedo()));
connect
(redo->popupMenu(),
- TQT_SIGNAL(aboutToShow()),
+ TQ_SIGNAL(aboutToShow()),
this,
- TQT_SLOT(slotRedoAboutToShow()));
+ TQ_SLOT(slotRedoAboutToShow()));
connect
(redo->popupMenu(),
- TQT_SIGNAL(activated(int)),
+ TQ_SIGNAL(activated(int)),
this,
- TQT_SLOT(slotRedoActivated(int)));
+ TQ_SLOT(slotRedoActivated(int)));
}
m_views.insert(collection);
diff --git a/src/document/RosegardenGUIDoc.cpp b/src/document/RosegardenGUIDoc.cpp
index 18c80d0..5d11638 100644
--- a/src/document/RosegardenGUIDoc.cpp
+++ b/src/document/RosegardenGUIDoc.cpp
@@ -135,11 +135,11 @@ RosegardenGUIDoc::RosegardenGUIDoc(TQWidget *parent,
m_viewList.setAutoDelete(false);
m_editViewList.setAutoDelete(false);
- connect(m_commandHistory, TQT_SIGNAL(commandExecuted(KCommand *)),
- this, TQT_SLOT(slotDocumentModified()));
+ connect(m_commandHistory, TQ_SIGNAL(commandExecuted(KCommand *)),
+ this, TQ_SLOT(slotDocumentModified()));
- connect(m_commandHistory, TQT_SIGNAL(documentRestored()),
- this, TQT_SLOT(slotDocumentRestored()));
+ connect(m_commandHistory, TQ_SIGNAL(documentRestored()),
+ this, TQ_SLOT(slotDocumentRestored()));
// autoload a new document
if (!skipAutoload)
@@ -584,8 +584,8 @@ bool RosegardenGUIDoc::openDocument(const TQString& filename,
100,
(TQWidget*)parent());
- connect(&progressDlg, TQT_SIGNAL(cancelClicked()),
- &m_audioFileManager, TQT_SLOT(slotStopPreview()));
+ connect(&progressDlg, TQ_SIGNAL(cancelClicked()),
+ &m_audioFileManager, TQ_SLOT(slotStopPreview()));
progressDlg.setMinimumDuration(500);
progressDlg.setAutoReset(true); // we're re-using it for the preview generation
@@ -686,8 +686,8 @@ bool RosegardenGUIDoc::openDocument(const TQString& filename,
// reuse the previous one
progressDlg.setLabel(i18n("Generating audio previews..."));
- connect(&m_audioFileManager, TQT_SIGNAL(setProgress(int)),
- progressDlg.progressBar(), TQT_SLOT(setValue(int)));
+ connect(&m_audioFileManager, TQ_SIGNAL(setProgress(int)),
+ progressDlg.progressBar(), TQ_SLOT(setValue(int)));
try {
// generate any audio previews after loading the files
m_audioFileManager.generatePreviews();
@@ -1575,14 +1575,14 @@ RosegardenGUIDoc::xmlParse(TQString fileContents, TQString &errMsg,
RoseXmlHandler handler(this, elementCount, permanent);
if (progress) {
- connect(&handler, TQT_SIGNAL(setProgress(int)),
- progress->progressBar(), TQT_SLOT(setValue(int)));
- connect(&handler, TQT_SIGNAL(setOperationName(TQString)),
- progress, TQT_SLOT(slotSetOperationName(TQString)));
- connect(&handler, TQT_SIGNAL(incrementProgress(int)),
- progress->progressBar(), TQT_SLOT(advance(int)));
- connect(progress, TQT_SIGNAL(cancelClicked()),
- &handler, TQT_SLOT(slotCancel()));
+ connect(&handler, TQ_SIGNAL(setProgress(int)),
+ progress->progressBar(), TQ_SLOT(setValue(int)));
+ connect(&handler, TQ_SIGNAL(setOperationName(TQString)),
+ progress, TQ_SLOT(slotSetOperationName(TQString)));
+ connect(&handler, TQ_SIGNAL(incrementProgress(int)),
+ progress->progressBar(), TQ_SLOT(advance(int)));
+ connect(progress, TQ_SIGNAL(cancelClicked()),
+ &handler, TQ_SLOT(slotCancel()));
}
TQXmlInputSource source;
@@ -2789,11 +2789,11 @@ RosegardenGUIDoc::finalizeAudioFile(InstrumentId iid)
progressDlg->setAutoReset(false);
progressDlg->show();
- connect(progressDlg, TQT_SIGNAL(cancelClicked()),
- &m_audioFileManager, TQT_SLOT(slotStopPreview()));
+ connect(progressDlg, TQ_SIGNAL(cancelClicked()),
+ &m_audioFileManager, TQ_SLOT(slotStopPreview()));
- connect(&m_audioFileManager, TQT_SIGNAL(setProgress(int)),
- progressDlg->progressBar(), TQT_SLOT(setValue(int)));
+ connect(&m_audioFileManager, TQ_SIGNAL(setProgress(int)),
+ progressDlg->progressBar(), TQ_SLOT(setValue(int)));
try {
m_audioFileManager.generatePreview(newAudioFile->getId());
diff --git a/src/gui/application/LircClient.cpp b/src/gui/application/LircClient.cpp
index 34fb57e..64163fc 100644
--- a/src/gui/application/LircClient.cpp
+++ b/src/gui/application/LircClient.cpp
@@ -61,7 +61,7 @@ LircClient::LircClient(void)
}
m_socketNotifier = new TQSocketNotifier(m_socket, TQSocketNotifier::Read, 0);
- connect(m_socketNotifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(readButton()) );
+ connect(m_socketNotifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(readButton()) );
RG_DEBUG << "LircClient::LircClient: connected to socket: " << m_socket << endl;
}
diff --git a/src/gui/application/LircCommander.cpp b/src/gui/application/LircCommander.cpp
index 2224048..cc919fe 100644
--- a/src/gui/application/LircCommander.cpp
+++ b/src/gui/application/LircCommander.cpp
@@ -45,33 +45,33 @@ LircCommander::LircCommander(LircClient *lirc, RosegardenGUIApp *rgGUIApp)
{
m_lirc = lirc;
m_rgGUIApp = rgGUIApp;
- connect(m_lirc, TQT_SIGNAL(buttonPressed(char *)),
- this, TQT_SLOT(slotExecute(char *)) );
-
- connect(this, TQT_SIGNAL(play()),
- m_rgGUIApp, TQT_SLOT(slotPlay()) );
- connect(this, TQT_SIGNAL(stop()),
- m_rgGUIApp, TQT_SLOT(slotStop()) );
- connect(this, TQT_SIGNAL(record()),
- m_rgGUIApp, TQT_SLOT(slotRecord()) );
- connect(this, TQT_SIGNAL(rewind()),
- m_rgGUIApp, TQT_SLOT(slotRewind()) );
- connect(this, TQT_SIGNAL(rewindToBeginning()),
- m_rgGUIApp, TQT_SLOT(slotRewindToBeginning()) );
- connect(this, TQT_SIGNAL(fastForward()),
- m_rgGUIApp, TQT_SLOT(slotFastforward()) );
- connect(this, TQT_SIGNAL(fastForwardToEnd()),
- m_rgGUIApp, TQT_SLOT(slotFastForwardToEnd()) );
- connect(this, TQT_SIGNAL(toggleRecord()),
- m_rgGUIApp, TQT_SLOT(slotToggleRecord()) );
- connect(this, TQT_SIGNAL(trackDown()),
- m_rgGUIApp, TQT_SLOT(slotTrackDown()) );
- connect(this, TQT_SIGNAL(trackUp()),
- m_rgGUIApp, TQT_SLOT(slotTrackUp()) );
- connect(this, TQT_SIGNAL(trackMute()),
- m_rgGUIApp, TQT_SLOT(slotToggleMutedCurrentTrack()) );
- connect(this, TQT_SIGNAL(trackRecord()),
- m_rgGUIApp, TQT_SLOT(slotToggleRecordCurrentTrack()) );
+ connect(m_lirc, TQ_SIGNAL(buttonPressed(char *)),
+ this, TQ_SLOT(slotExecute(char *)) );
+
+ connect(this, TQ_SIGNAL(play()),
+ m_rgGUIApp, TQ_SLOT(slotPlay()) );
+ connect(this, TQ_SIGNAL(stop()),
+ m_rgGUIApp, TQ_SLOT(slotStop()) );
+ connect(this, TQ_SIGNAL(record()),
+ m_rgGUIApp, TQ_SLOT(slotRecord()) );
+ connect(this, TQ_SIGNAL(rewind()),
+ m_rgGUIApp, TQ_SLOT(slotRewind()) );
+ connect(this, TQ_SIGNAL(rewindToBeginning()),
+ m_rgGUIApp, TQ_SLOT(slotRewindToBeginning()) );
+ connect(this, TQ_SIGNAL(fastForward()),
+ m_rgGUIApp, TQ_SLOT(slotFastforward()) );
+ connect(this, TQ_SIGNAL(fastForwardToEnd()),
+ m_rgGUIApp, TQ_SLOT(slotFastForwardToEnd()) );
+ connect(this, TQ_SIGNAL(toggleRecord()),
+ m_rgGUIApp, TQ_SLOT(slotToggleRecord()) );
+ connect(this, TQ_SIGNAL(trackDown()),
+ m_rgGUIApp, TQ_SLOT(slotTrackDown()) );
+ connect(this, TQ_SIGNAL(trackUp()),
+ m_rgGUIApp, TQ_SLOT(slotTrackUp()) );
+ connect(this, TQ_SIGNAL(trackMute()),
+ m_rgGUIApp, TQ_SLOT(slotToggleMutedCurrentTrack()) );
+ connect(this, TQ_SIGNAL(trackRecord()),
+ m_rgGUIApp, TQ_SLOT(slotToggleRecordCurrentTrack()) );
}
LircCommander::command LircCommander::commands[] =
diff --git a/src/gui/application/RosegardenGUIApp.cpp b/src/gui/application/RosegardenGUIApp.cpp
index e1de78a..b747edb 100644
--- a/src/gui/application/RosegardenGUIApp.cpp
+++ b/src/gui/application/RosegardenGUIApp.cpp
@@ -285,9 +285,9 @@ RosegardenGUIApp::RosegardenGUIApp(bool useSequencer,
if (startupStatusMessageReceiver) {
- TQObject::connect(this, TQT_SIGNAL(startupStatusMessage(TQString)),
+ TQObject::connect(this, TQ_SIGNAL(startupStatusMessage(TQString)),
startupStatusMessageReceiver,
- TQT_SLOT(slotShowStatusMessage(TQString)));
+ TQ_SLOT(slotShowStatusMessage(TQString)));
}
// Try to start the sequencer
@@ -354,14 +354,14 @@ RosegardenGUIApp::RosegardenGUIApp(bool useSequencer,
KDockWidget::DockLeft, // dock site
20); // relation target/this (in percent)
- connect(m_dockLeft, TQT_SIGNAL(iMBeingClosed()),
- this, TQT_SLOT(slotParametersClosed()));
- connect(m_dockLeft, TQT_SIGNAL(hasUndocked()),
- this, TQT_SLOT(slotParametersClosed()));
+ connect(m_dockLeft, TQ_SIGNAL(iMBeingClosed()),
+ this, TQ_SLOT(slotParametersClosed()));
+ connect(m_dockLeft, TQ_SIGNAL(hasUndocked()),
+ this, TQ_SLOT(slotParametersClosed()));
// Apparently, hasUndocked() is emitted when the dock widget's
// 'close' button on the dock handle is clicked.
- connect(m_mainDockWidget, TQT_SIGNAL(docking(KDockWidget*, KDockWidget::DockPosition)),
- this, TQT_SLOT(slotParametersDockedBack(KDockWidget*, KDockWidget::DockPosition)));
+ connect(m_mainDockWidget, TQ_SIGNAL(docking(KDockWidget*, KDockWidget::DockPosition)),
+ this, TQ_SLOT(slotParametersDockedBack(KDockWidget*, KDockWidget::DockPosition)));
stateChanged("parametersbox_closed", KXMLGUIClient::StateReverse);
@@ -391,35 +391,35 @@ RosegardenGUIApp::RosegardenGUIApp(bool useSequencer,
m_dockLeft->update();
connect(m_instrumentParameterBox,
- TQT_SIGNAL(selectPlugin(TQWidget *, InstrumentId, int)),
+ TQ_SIGNAL(selectPlugin(TQWidget *, InstrumentId, int)),
this,
- TQT_SLOT(slotShowPluginDialog(TQWidget *, InstrumentId, int)));
+ TQ_SLOT(slotShowPluginDialog(TQWidget *, InstrumentId, int)));
connect(m_instrumentParameterBox,
- TQT_SIGNAL(showPluginGUI(InstrumentId, int)),
+ TQ_SIGNAL(showPluginGUI(InstrumentId, int)),
this,
- TQT_SLOT(slotShowPluginGUI(InstrumentId, int)));
+ TQ_SLOT(slotShowPluginGUI(InstrumentId, int)));
// relay this through our own signal so that others can use it too
connect(m_instrumentParameterBox,
- TQT_SIGNAL(instrumentParametersChanged(InstrumentId)),
+ TQ_SIGNAL(instrumentParametersChanged(InstrumentId)),
this,
- TQT_SIGNAL(instrumentParametersChanged(InstrumentId)));
+ TQ_SIGNAL(instrumentParametersChanged(InstrumentId)));
connect(this,
- TQT_SIGNAL(instrumentParametersChanged(InstrumentId)),
+ TQ_SIGNAL(instrumentParametersChanged(InstrumentId)),
m_instrumentParameterBox,
- TQT_SLOT(slotInstrumentParametersChanged(InstrumentId)));
+ TQ_SLOT(slotInstrumentParametersChanged(InstrumentId)));
connect(this,
- TQT_SIGNAL(pluginSelected(InstrumentId, int, int)),
+ TQ_SIGNAL(pluginSelected(InstrumentId, int, int)),
m_instrumentParameterBox,
- TQT_SLOT(slotPluginSelected(InstrumentId, int, int)));
+ TQ_SLOT(slotPluginSelected(InstrumentId, int, int)));
connect(this,
- TQT_SIGNAL(pluginBypassed(InstrumentId, int, bool)),
+ TQ_SIGNAL(pluginBypassed(InstrumentId, int, bool)),
m_instrumentParameterBox,
- TQT_SLOT(slotPluginBypassed(InstrumentId, int, bool)));
+ TQ_SLOT(slotPluginBypassed(InstrumentId, int, bool)));
// Load the initial document (this includes doc's own autoload)
//
@@ -439,8 +439,8 @@ RosegardenGUIApp::RosegardenGUIApp(bool useSequencer,
}
if (m_view) {
- connect(m_seqManager, TQT_SIGNAL(controllerDeviceEventReceived(MappedEvent *)),
- m_view, TQT_SLOT(slotControllerDeviceEventReceived(MappedEvent *)));
+ connect(m_seqManager, TQ_SIGNAL(controllerDeviceEventReceived(MappedEvent *)),
+ m_view, TQ_SLOT(slotControllerDeviceEventReceived(MappedEvent *)));
}
if (m_seqManager->getSoundDriverStatus() & AUDIO_OK) {
@@ -494,7 +494,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, this, TQ_SLOT(slotTestStartupTester()));
}
RosegardenGUIApp::~RosegardenGUIApp()
@@ -539,101 +539,101 @@ void RosegardenGUIApp::setupActions()
{
// setup File menu
// New Window ?
- KStdAction::openNew (this, TQT_SLOT(slotFileNew()), actionCollection());
- KStdAction::open (this, TQT_SLOT(slotFileOpen()), actionCollection());
+ KStdAction::openNew (this, TQ_SLOT(slotFileNew()), actionCollection());
+ KStdAction::open (this, TQ_SLOT(slotFileOpen()), actionCollection());
m_fileRecent = KStdAction::openRecent(this,
- TQT_SLOT(slotFileOpenRecent(const KURL&)),
+ TQ_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());
+ KStdAction::save (this, TQ_SLOT(slotFileSave()), actionCollection());
+ KStdAction::saveAs(this, TQ_SLOT(slotFileSaveAs()), actionCollection());
+ KStdAction::revert(this, TQ_SLOT(slotRevertToSaved()), actionCollection());
+ KStdAction::close (this, TQ_SLOT(slotFileClose()), actionCollection());
+ KStdAction::print (this, TQ_SLOT(slotFilePrint()), actionCollection());
+ KStdAction::printPreview (this, TQ_SLOT(slotFilePrintPreview()), actionCollection());
new TDEAction(i18n("Import Rosegarden &Project file..."), 0, 0, this,
- TQT_SLOT(slotImportProject()), actionCollection(),
+ TQ_SLOT(slotImportProject()), actionCollection(),
"file_import_project");
new TDEAction(i18n("Import &MIDI file..."), 0, 0, this,
- TQT_SLOT(slotImportMIDI()), actionCollection(),
+ TQ_SLOT(slotImportMIDI()), actionCollection(),
"file_import_midi");
new TDEAction(i18n("Import &Rosegarden 2.1 file..."), 0, 0, this,
- TQT_SLOT(slotImportRG21()), actionCollection(),
+ TQ_SLOT(slotImportRG21()), actionCollection(),
"file_import_rg21");
new TDEAction(i18n("Import &Hydrogen file..."), 0, 0, this,
- TQT_SLOT(slotImportHydrogen()), actionCollection(),
+ TQ_SLOT(slotImportHydrogen()), actionCollection(),
"file_import_hydrogen");
new TDEAction(i18n("Merge &File..."), 0, 0, this,
- TQT_SLOT(slotMerge()), actionCollection(),
+ TQ_SLOT(slotMerge()), actionCollection(),
"file_merge");
new TDEAction(i18n("Merge &MIDI file..."), 0, 0, this,
- TQT_SLOT(slotMergeMIDI()), actionCollection(),
+ TQ_SLOT(slotMergeMIDI()), actionCollection(),
"file_merge_midi");
new TDEAction(i18n("Merge &Rosegarden 2.1 file..."), 0, 0, this,
- TQT_SLOT(slotMergeRG21()), actionCollection(),
+ TQ_SLOT(slotMergeRG21()), actionCollection(),
"file_merge_rg21");
new TDEAction(i18n("Merge &Hydrogen file..."), 0, 0, this,
- TQT_SLOT(slotMergeHydrogen()), actionCollection(),
+ TQ_SLOT(slotMergeHydrogen()), actionCollection(),
"file_merge_hydrogen");
new TDEAction(i18n("Export Rosegarden &Project file..."), 0, 0, this,
- TQT_SLOT(slotExportProject()), actionCollection(),
+ TQ_SLOT(slotExportProject()), actionCollection(),
"file_export_project");
new TDEAction(i18n("Export &MIDI file..."), 0, 0, this,
- TQT_SLOT(slotExportMIDI()), actionCollection(),
+ TQ_SLOT(slotExportMIDI()), actionCollection(),
"file_export_midi");
new TDEAction(i18n("Export &LilyPond file..."), 0, 0, this,
- TQT_SLOT(slotExportLilyPond()), actionCollection(),
+ TQ_SLOT(slotExportLilyPond()), actionCollection(),
"file_export_lilypond");
new TDEAction(i18n("Export Music&XML file..."), 0, 0, this,
- TQT_SLOT(slotExportMusicXml()), actionCollection(),
+ TQ_SLOT(slotExportMusicXml()), actionCollection(),
"file_export_musicxml");
new TDEAction(i18n("Export &Csound score file..."), 0, 0, this,
- TQT_SLOT(slotExportCsound()), actionCollection(),
+ TQ_SLOT(slotExportCsound()), actionCollection(),
"file_export_csound");
new TDEAction(i18n("Export M&up file..."), 0, 0, this,
- TQT_SLOT(slotExportMup()), actionCollection(),
+ TQ_SLOT(slotExportMup()), actionCollection(),
"file_export_mup");
new TDEAction(i18n("Print &with LilyPond..."), 0, 0, this,
- TQT_SLOT(slotPrintLilyPond()), actionCollection(),
+ TQ_SLOT(slotPrintLilyPond()), actionCollection(),
"file_print_lilypond");
new TDEAction(i18n("Preview with Lil&yPond..."), 0, 0, this,
- TQT_SLOT(slotPreviewLilyPond()), actionCollection(),
+ TQ_SLOT(slotPreviewLilyPond()), actionCollection(),
"file_preview_lilypond");
new TDEAction(i18n("Play&list"), 0, 0, this,
- TQT_SLOT(slotPlayList()), actionCollection(),
+ TQ_SLOT(slotPlayList()), actionCollection(),
"file_show_playlist");
- KStdAction::quit (this, TQT_SLOT(slotQuit()), actionCollection());
+ KStdAction::quit (this, TQ_SLOT(slotQuit()), actionCollection());
// help menu
new TDEAction(i18n("Rosegarden &Tutorial"), 0, 0, this,
- TQT_SLOT(slotTutorial()), actionCollection(),
+ TQ_SLOT(slotTutorial()), actionCollection(),
"tutorial");
new TDEAction(i18n("&Bug Reporting Guidelines"), 0, 0, this,
- TQT_SLOT(slotBugGuidelines()), actionCollection(),
+ TQ_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 (this, TQ_SLOT(slotEditCut()), actionCollection());
+ KStdAction::copy (this, TQ_SLOT(slotEditCopy()), actionCollection());
+ KStdAction::paste (this, TQ_SLOT(slotEditPaste()), actionCollection());
//
// undo/redo actions are special in that they are connected to
@@ -657,86 +657,86 @@ void RosegardenGUIApp::setupActions()
// setup Settings menu
//
- m_viewToolBar = KStdAction::showToolbar (this, TQT_SLOT(slotToggleToolBar()), actionCollection(),
+ m_viewToolBar = KStdAction::showToolbar (this, TQ_SLOT(slotToggleToolBar()), actionCollection(),
"show_stock_toolbar");
m_viewToolsToolBar = new TDEToggleAction(i18n("Show T&ools Toolbar"), 0, this,
- TQT_SLOT(slotToggleToolsToolBar()), actionCollection(),
+ TQ_SLOT(slotToggleToolsToolBar()), actionCollection(),
"show_tools_toolbar");
m_viewTracksToolBar = new TDEToggleAction(i18n("Show Trac&ks Toolbar"), 0, this,
- TQT_SLOT(slotToggleTracksToolBar()), actionCollection(),
+ TQ_SLOT(slotToggleTracksToolBar()), actionCollection(),
"show_tracks_toolbar");
m_viewEditorsToolBar = new TDEToggleAction(i18n("Show &Editors Toolbar"), 0, this,
- TQT_SLOT(slotToggleEditorsToolBar()), actionCollection(),
+ TQ_SLOT(slotToggleEditorsToolBar()), actionCollection(),
"show_editors_toolbar");
m_viewTransportToolBar = new TDEToggleAction(i18n("Show Trans&port Toolbar"), 0, this,
- TQT_SLOT(slotToggleTransportToolBar()), actionCollection(),
+ TQ_SLOT(slotToggleTransportToolBar()), actionCollection(),
"show_transport_toolbar");
m_viewZoomToolBar = new TDEToggleAction(i18n("Show &Zoom Toolbar"), 0, this,
- TQT_SLOT(slotToggleZoomToolBar()), actionCollection(),
+ TQ_SLOT(slotToggleZoomToolBar()), actionCollection(),
"show_zoom_toolbar");
- m_viewStatusBar = KStdAction::showStatusbar(this, TQT_SLOT(slotToggleStatusBar()),
+ m_viewStatusBar = KStdAction::showStatusbar(this, TQ_SLOT(slotToggleStatusBar()),
actionCollection(), "show_status_bar");
m_viewTransport = new TDEToggleAction(i18n("Show Tra&nsport"), Key_T, this,
- TQT_SLOT(slotToggleTransport()),
+ TQ_SLOT(slotToggleTransport()),
actionCollection(),
"show_transport");
m_viewTrackLabels = new TDEToggleAction(i18n("Show Track &Labels"), 0, this,
- TQT_SLOT(slotToggleTrackLabels()),
+ TQ_SLOT(slotToggleTrackLabels()),
actionCollection(),
"show_tracklabels");
m_viewRulers = new TDEToggleAction(i18n("Show Playback Position R&uler"), 0, this,
- TQT_SLOT(slotToggleRulers()),
+ TQ_SLOT(slotToggleRulers()),
actionCollection(),
"show_rulers");
m_viewTempoRuler = new TDEToggleAction(i18n("Show Te&mpo Ruler"), 0, this,
- TQT_SLOT(slotToggleTempoRuler()),
+ TQ_SLOT(slotToggleTempoRuler()),
actionCollection(),
"show_tempo_ruler");
m_viewChordNameRuler = new TDEToggleAction(i18n("Show Cho&rd Name Ruler"), 0, this,
- TQT_SLOT(slotToggleChordNameRuler()),
+ TQ_SLOT(slotToggleChordNameRuler()),
actionCollection(),
"show_chord_name_ruler");
m_viewPreviews = new TDEToggleAction(i18n("Show Segment Pre&views"), 0, this,
- TQT_SLOT(slotTogglePreviews()),
+ TQ_SLOT(slotTogglePreviews()),
actionCollection(),
"show_previews");
new TDEAction(i18n("Show Special &Parameters"), Key_P, this,
- TQT_SLOT(slotDockParametersBack()),
+ TQ_SLOT(slotDockParametersBack()),
actionCollection(),
"show_inst_segment_parameters");
- KStdAction::tipOfDay( this, TQT_SLOT( slotShowTip() ), actionCollection() );
+ KStdAction::tipOfDay( this, TQ_SLOT( slotShowTip() ), actionCollection() );
// Standard Actions
//
KStdAction::saveOptions(this,
- TQT_SLOT(slotSaveOptions()),
+ TQ_SLOT(slotSaveOptions()),
actionCollection());
KStdAction::preferences(this,
- TQT_SLOT(slotConfigure()),
+ TQ_SLOT(slotConfigure()),
actionCollection());
KStdAction::keyBindings(this,
- TQT_SLOT(slotEditKeys()),
+ TQ_SLOT(slotEditKeys()),
actionCollection());
KStdAction::configureToolbars(this,
- TQT_SLOT(slotEditToolbars()),
+ TQ_SLOT(slotEditToolbars()),
actionCollection());
TDERadioAction *action = 0;
@@ -749,110 +749,110 @@ void RosegardenGUIApp::setupActions()
// TODO : add some shortcuts here
action = new TDERadioAction(i18n("&Select and Edit"), icon, Key_F2,
- this, TQT_SLOT(slotPointerSelected()),
+ this, TQ_SLOT(slotPointerSelected()),
actionCollection(), "select");
action->setExclusiveGroup("segmenttools");
action = new TDERadioAction(i18n("&Draw"), "pencil", Key_F3,
- this, TQT_SLOT(slotDrawSelected()),
+ this, TQ_SLOT(slotDrawSelected()),
actionCollection(), "draw");
action->setExclusiveGroup("segmenttools");
action = new TDERadioAction(i18n("&Erase"), "eraser", Key_F4,
- this, TQT_SLOT(slotEraseSelected()),
+ this, TQ_SLOT(slotEraseSelected()),
actionCollection(), "erase");
action->setExclusiveGroup("segmenttools");
action = new TDERadioAction(i18n("&Move"), "move", Key_F5,
- this, TQT_SLOT(slotMoveSelected()),
+ this, TQ_SLOT(slotMoveSelected()),
actionCollection(), "move");
action->setExclusiveGroup("segmenttools");
pixmap.load(pixmapDir + "/toolbar/resize.xpm");
icon = TQIconSet(pixmap);
action = new TDERadioAction(i18n("&Resize"), icon, Key_F6,
- this, TQT_SLOT(slotResizeSelected()),
+ this, TQ_SLOT(slotResizeSelected()),
actionCollection(), "resize");
action->setExclusiveGroup("segmenttools");
pixmap.load(pixmapDir + "/toolbar/split.xpm");
icon = TQIconSet(pixmap);
action = new TDERadioAction(i18n("&Split"), icon, Key_F7,
- this, TQT_SLOT(slotSplitSelected()),
+ this, TQ_SLOT(slotSplitSelected()),
actionCollection(), "split");
action->setExclusiveGroup("segmenttools");
pixmap.load(pixmapDir + "/toolbar/join.xpm");
icon = TQIconSet(pixmap);
action = new TDERadioAction(i18n("&Join"), icon, 0,
- this, TQT_SLOT(slotJoinSelected()),
+ this, TQ_SLOT(slotJoinSelected()),
actionCollection(), "join");
action->setExclusiveGroup("segmenttools");
new TDEAction(i18n("&Harmonize"), 0, this,
- TQT_SLOT(slotHarmonizeSelection()), actionCollection(),
+ TQ_SLOT(slotHarmonizeSelection()), actionCollection(),
"harmonize_selection");
pixmap.load(pixmapDir + "/toolbar/event-insert-timesig.png");
icon = TQIconSet(pixmap);
new TDEAction(AddTimeSignatureCommand::getGlobalName(),
icon, 0,
- this, TQT_SLOT(slotEditTimeSignature()),
+ this, TQ_SLOT(slotEditTimeSignature()),
actionCollection(), "add_time_signature");
new TDEAction(i18n("Open Tempo and Time Signature Editor"), 0, this,
- TQT_SLOT(slotEditTempos()), actionCollection(), "edit_tempos");
+ TQ_SLOT(slotEditTempos()), actionCollection(), "edit_tempos");
//
// Edit menu
//
new TDEAction(i18n("Cut Range"), Key_X + CTRL + SHIFT, this,
- TQT_SLOT(slotCutRange()), actionCollection(),
+ TQ_SLOT(slotCutRange()), actionCollection(),
"cut_range");
new TDEAction(i18n("Copy Range"), Key_C + CTRL + SHIFT, this,
- TQT_SLOT(slotCopyRange()), actionCollection(),
+ TQ_SLOT(slotCopyRange()), actionCollection(),
"copy_range");
new TDEAction(i18n("Paste Range"), Key_V + CTRL + SHIFT, this,
- TQT_SLOT(slotPasteRange()), actionCollection(),
+ TQ_SLOT(slotPasteRange()), actionCollection(),
"paste_range");
/*
new TDEAction(i18n("Delete Range"), Key_Delete + SHIFT, this,
- TQT_SLOT(slotDeleteRange()), actionCollection(),
+ TQ_SLOT(slotDeleteRange()), actionCollection(),
"delete_range");
*/
new TDEAction(i18n("Insert Range..."), Key_Insert + SHIFT, this,
- TQT_SLOT(slotInsertRange()), actionCollection(),
+ TQ_SLOT(slotInsertRange()), actionCollection(),
"insert_range");
new TDEAction(i18n("De&lete"), Key_Delete, this,
- TQT_SLOT(slotDeleteSelectedSegments()), actionCollection(),
+ TQ_SLOT(slotDeleteSelectedSegments()), actionCollection(),
"delete");
new TDEAction(i18n("Select &All Segments"), Key_A + CTRL, this,
- TQT_SLOT(slotSelectAll()), actionCollection(),
+ TQ_SLOT(slotSelectAll()), actionCollection(),
"select_all");
pixmap.load(pixmapDir + "/toolbar/event-insert-tempo.png");
icon = TQIconSet(pixmap);
new TDEAction(AddTempoChangeCommand::getGlobalName(),
icon, 0,
- this, TQT_SLOT(slotEditTempo()),
+ this, TQ_SLOT(slotEditTempo()),
actionCollection(), "add_tempo");
new TDEAction(ChangeCompositionLengthCommand::getGlobalName(),
0,
- this, TQT_SLOT(slotChangeCompositionLength()),
+ this, TQ_SLOT(slotChangeCompositionLength()),
actionCollection(), "change_composition_length");
new TDEAction(i18n("Edit Mar&kers..."), Key_K + CTRL, this,
- TQT_SLOT(slotEditMarkers()),
+ TQ_SLOT(slotEditMarkers()),
actionCollection(), "edit_markers");
new TDEAction(i18n("Edit Document P&roperties..."), 0, this,
- TQT_SLOT(slotEditDocumentProperties()),
+ TQ_SLOT(slotEditDocumentProperties()),
actionCollection(), "edit_doc_properties");
@@ -860,120 +860,120 @@ void RosegardenGUIApp::setupActions()
// Segments menu
//
new TDEAction(i18n("Open in &Default Editor"), Key_Return, this,
- TQT_SLOT(slotEdit()), actionCollection(),
+ TQ_SLOT(slotEdit()), actionCollection(),
"edit_default");
pixmap.load(pixmapDir + "/toolbar/matrix.png");
icon = TQIconSet(pixmap);
new TDEAction(i18n("Open in Matri&x Editor"), icon, Key_M, this,
- TQT_SLOT(slotEditInMatrix()), actionCollection(),
+ TQ_SLOT(slotEditInMatrix()), actionCollection(),
"edit_matrix");
pixmap.load(pixmapDir + "/toolbar/matrix-percussion.png");
icon = TQIconSet(pixmap);
new TDEAction(i18n("Open in &Percussion Matrix Editor"), icon, Key_D, this,
- TQT_SLOT(slotEditInPercussionMatrix()), actionCollection(),
+ TQ_SLOT(slotEditInPercussionMatrix()), actionCollection(),
"edit_percussion_matrix");
pixmap.load(pixmapDir + "/toolbar/notation.png");
icon = TQIconSet(pixmap);
new TDEAction(i18n("Open in &Notation Editor"), icon, Key_N, this,
- TQT_SLOT(slotEditAsNotation()), actionCollection(),
+ TQ_SLOT(slotEditAsNotation()), actionCollection(),
"edit_notation");
pixmap.load(pixmapDir + "/toolbar/eventlist.png");
icon = TQIconSet(pixmap);
new TDEAction(i18n("Open in &Event List Editor"), icon, Key_E, this,
- TQT_SLOT(slotEditInEventList()), actionCollection(),
+ TQ_SLOT(slotEditInEventList()), actionCollection(),
"edit_event_list");
pixmap.load(pixmapDir + "/toolbar/quantize.png");
icon = TQIconSet(pixmap);
new TDEAction(i18n("&Quantize..."), icon, Key_Equal, this,
- TQT_SLOT(slotQuantizeSelection()), actionCollection(),
+ TQ_SLOT(slotQuantizeSelection()), actionCollection(),
"quantize_selection");
new TDEAction(SegmentLabelCommand::getGlobalName(),
0,
- this, TQT_SLOT(slotRelabelSegments()),
+ this, TQ_SLOT(slotRelabelSegments()),
actionCollection(), "relabel_segment");
new TDEAction(SegmentTransposeCommand::getGlobalName(),
0,
- this, TQT_SLOT(slotTransposeSegments()),
+ this, TQ_SLOT(slotTransposeSegments()),
actionCollection(), "transpose");
new TDEAction(i18n("Repeat Last Quantize"), Key_Plus, this,
- TQT_SLOT(slotRepeatQuantizeSelection()), actionCollection(),
+ TQ_SLOT(slotRepeatQuantizeSelection()), actionCollection(),
"repeat_quantize");
new TDEAction(SegmentRescaleCommand::getGlobalName(), 0, this,
- TQT_SLOT(slotRescaleSelection()), actionCollection(),
+ TQ_SLOT(slotRescaleSelection()), actionCollection(),
"rescale");
new TDEAction(SegmentAutoSplitCommand::getGlobalName(), 0, this,
- TQT_SLOT(slotAutoSplitSelection()), actionCollection(),
+ TQ_SLOT(slotAutoSplitSelection()), actionCollection(),
"auto_split");
new TDEAction(SegmentSplitByPitchCommand::getGlobalName(), 0, this,
- TQT_SLOT(slotSplitSelectionByPitch()), actionCollection(),
+ TQ_SLOT(slotSplitSelectionByPitch()), actionCollection(),
"split_by_pitch");
new TDEAction(SegmentSplitByRecordingSrcCommand::getGlobalName(), 0, this,
- TQT_SLOT(slotSplitSelectionByRecordedSrc()), actionCollection(),
+ TQ_SLOT(slotSplitSelectionByRecordedSrc()), actionCollection(),
"split_by_recording");
new TDEAction(i18n("Split at Time..."), 0, this,
- TQT_SLOT(slotSplitSelectionAtTime()), actionCollection(),
+ TQ_SLOT(slotSplitSelectionAtTime()), actionCollection(),
"split_at_time");
new TDEAction(i18n("Jog &Left"), Key_Left + ALT, this,
- TQT_SLOT(slotJogLeft()), actionCollection(),
+ TQ_SLOT(slotJogLeft()), actionCollection(),
"jog_left");
new TDEAction(i18n("Jog &Right"), Key_Right + ALT, this,
- TQT_SLOT(slotJogRight()), actionCollection(),
+ TQ_SLOT(slotJogRight()), actionCollection(),
"jog_right");
new TDEAction(i18n("Set Start Time..."), 0, this,
- TQT_SLOT(slotSetSegmentStartTimes()), actionCollection(),
+ TQ_SLOT(slotSetSegmentStartTimes()), actionCollection(),
"set_segment_start");
new TDEAction(i18n("Set Duration..."), 0, this,
- TQT_SLOT(slotSetSegmentDurations()), actionCollection(),
+ TQ_SLOT(slotSetSegmentDurations()), actionCollection(),
"set_segment_duration");
new TDEAction(SegmentJoinCommand::getGlobalName(),
Key_J + CTRL,
- this, TQT_SLOT(slotJoinSegments()),
+ this, TQ_SLOT(slotJoinSegments()),
actionCollection(), "join_segments");
new TDEAction(i18n("Turn Re&peats into Copies"),
0,
- this, TQT_SLOT(slotRepeatingSegments()),
+ this, TQ_SLOT(slotRepeatingSegments()),
actionCollection(), "repeats_to_real_copies");
new TDEAction(i18n("Manage Tri&ggered Segments"), 0,
- this, TQT_SLOT(slotManageTriggerSegments()),
+ this, TQ_SLOT(slotManageTriggerSegments()),
actionCollection(), "manage_trigger_segments");
new TDEAction(i18n("Set Tempos from &Beat Segment"), 0, this,
- TQT_SLOT(slotGrooveQuantize()), actionCollection(),
+ TQ_SLOT(slotGrooveQuantize()), actionCollection(),
"groove_quantize");
new TDEAction(i18n("Set &Tempo to Audio Segment Duration"), 0, this,
- TQT_SLOT(slotTempoToSegmentLength()), actionCollection(),
+ TQ_SLOT(slotTempoToSegmentLength()), actionCollection(),
"set_tempo_to_segment_length");
pixmap.load(pixmapDir + "/toolbar/manage-audio-segments.xpm");
icon = TQIconSet(pixmap);
new TDEAction(i18n("Manage A&udio Files"), icon,
Key_U + CTRL,
- this, TQT_SLOT(slotAudioManager()),
+ this, TQ_SLOT(slotAudioManager()),
actionCollection(), "audio_manager");
m_viewSegmentLabels = new TDEToggleAction(i18n("Show Segment Labels"), 0, this,
- TQT_SLOT(slotToggleSegmentLabels()), actionCollection(),
+ TQ_SLOT(slotToggleSegmentLabels()), actionCollection(),
"show_segment_labels");
//
@@ -982,65 +982,65 @@ void RosegardenGUIApp::setupActions()
pixmap.load(pixmapDir + "/toolbar/add_tracks.png");
icon = TQIconSet(pixmap);
new TDEAction(i18n("Add &Track"), icon, CTRL + Key_T,
- this, TQT_SLOT(slotAddTrack()),
+ this, TQ_SLOT(slotAddTrack()),
actionCollection(), "add_track");
new TDEAction(i18n("&Add Tracks..."), 0,
- this, TQT_SLOT(slotAddTracks()),
+ this, TQ_SLOT(slotAddTracks()),
actionCollection(), "add_tracks");
pixmap.load(pixmapDir + "/toolbar/delete_track.png");
icon = TQIconSet(pixmap);
new TDEAction(i18n("D&elete Track"), icon, CTRL + Key_D,
- this, TQT_SLOT(slotDeleteTrack()),
+ this, TQ_SLOT(slotDeleteTrack()),
actionCollection(), "delete_track");
pixmap.load(pixmapDir + "/toolbar/move_track_down.png");
icon = TQIconSet(pixmap);
new TDEAction(i18n("Move Track &Down"), icon, SHIFT + Key_Down,
- this, TQT_SLOT(slotMoveTrackDown()),
+ this, TQ_SLOT(slotMoveTrackDown()),
actionCollection(), "move_track_down");
pixmap.load(pixmapDir + "/toolbar/move_track_up.png");
icon = TQIconSet(pixmap);
new TDEAction(i18n("Move Track &Up"), icon, SHIFT + Key_Up,
- this, TQT_SLOT(slotMoveTrackUp()),
+ this, TQ_SLOT(slotMoveTrackUp()),
actionCollection(), "move_track_up");
new TDEAction(i18n("Select &Next Track"),
Key_Down,
- this, TQT_SLOT(slotTrackDown()),
+ this, TQ_SLOT(slotTrackDown()),
actionCollection(), "select_next_track");
new TDEAction(i18n("Select &Previous Track"),
Key_Up,
- this, TQT_SLOT(slotTrackUp()),
+ this, TQ_SLOT(slotTrackUp()),
actionCollection(), "select_previous_track");
new TDEAction(i18n("Mute or Unmute Track"),
Key_U,
- this, TQT_SLOT(slotToggleMutedCurrentTrack()),
+ this, TQ_SLOT(slotToggleMutedCurrentTrack()),
actionCollection(), "toggle_mute_track");
new TDEAction(i18n("Arm or Un-arm Track for Record"),
Key_R,
- this, TQT_SLOT(slotToggleRecordCurrentTrack()),
+ this, TQ_SLOT(slotToggleRecordCurrentTrack()),
actionCollection(), "toggle_arm_track");
pixmap.load(pixmapDir + "/toolbar/mute-all.png");
icon = TQIconSet(pixmap);
new TDEAction(i18n("&Mute all Tracks"), icon, 0,
- this, TQT_SLOT(slotMuteAllTracks()),
+ this, TQ_SLOT(slotMuteAllTracks()),
actionCollection(), "mute_all_tracks");
pixmap.load(pixmapDir + "/toolbar/un-mute-all.png");
icon = TQIconSet(pixmap);
new TDEAction(i18n("&Unmute all Tracks"), icon, 0,
- this, TQT_SLOT(slotUnmuteAllTracks()),
+ this, TQ_SLOT(slotUnmuteAllTracks()),
actionCollection(), "unmute_all_tracks");
new TDEAction(i18n("&Remap Instruments..."), 0, this,
- TQT_SLOT(slotRemapInstruments()),
+ TQ_SLOT(slotRemapInstruments()),
actionCollection(), "remap_instruments");
//
@@ -1049,78 +1049,78 @@ void RosegardenGUIApp::setupActions()
pixmap.load(pixmapDir + "/toolbar/mixer.png");
icon = TQIconSet(pixmap);
new TDEAction(i18n("&Audio Mixer"), icon, 0, this,
- TQT_SLOT(slotOpenAudioMixer()),
+ TQ_SLOT(slotOpenAudioMixer()),
actionCollection(), "audio_mixer");
pixmap.load(pixmapDir + "/toolbar/midimixer.png");
icon = TQIconSet(pixmap);
new TDEAction(i18n("Midi Mi&xer"), icon, 0, this,
- TQT_SLOT(slotOpenMidiMixer()),
+ TQ_SLOT(slotOpenMidiMixer()),
actionCollection(), "midi_mixer");
pixmap.load(pixmapDir + "/toolbar/manage-midi-devices.xpm");
icon = TQIconSet(pixmap);
new TDEAction(i18n("Manage MIDI &Devices"), icon, 0, this,
- TQT_SLOT(slotManageMIDIDevices()),
+ TQ_SLOT(slotManageMIDIDevices()),
actionCollection(), "manage_devices");
pixmap.load(pixmapDir + "/toolbar/manage-synth-plugins.png");
icon = TQIconSet(pixmap);
new TDEAction(i18n("Manage S&ynth Plugins"), icon, 0, this,
- TQT_SLOT(slotManageSynths()),
+ TQ_SLOT(slotManageSynths()),
actionCollection(), "manage_synths");
new TDEAction(i18n("Modify MIDI &Filters"), "filter", 0, this,
- TQT_SLOT(slotModifyMIDIFilters()),
+ TQ_SLOT(slotModifyMIDIFilters()),
actionCollection(), "modify_midi_filters");
m_enableMIDIrouting = new TDEToggleAction(i18n("MIDI Thru Routing"), 0, this,
- TQT_SLOT(slotEnableMIDIThruRouting()),
+ TQ_SLOT(slotEnableMIDIThruRouting()),
actionCollection(), "enable_midi_routing");
pixmap.load(pixmapDir + "/toolbar/time-musical.png");
icon = TQIconSet(pixmap);
new TDEAction(i18n("Manage &Metronome"), 0, this,
- TQT_SLOT(slotManageMetronome()),
+ TQ_SLOT(slotManageMetronome()),
actionCollection(), "manage_metronome");
new TDEAction(i18n("&Save Current Document as Default Studio"), 0, this,
- TQT_SLOT(slotSaveDefaultStudio()),
+ TQ_SLOT(slotSaveDefaultStudio()),
actionCollection(), "save_default_studio");
new TDEAction(i18n("&Import Default Studio"), 0, this,
- TQT_SLOT(slotImportDefaultStudio()),
+ TQ_SLOT(slotImportDefaultStudio()),
actionCollection(), "load_default_studio");
new TDEAction(i18n("Im&port Studio from File..."), 0, this,
- TQT_SLOT(slotImportStudio()),
+ TQ_SLOT(slotImportStudio()),
actionCollection(), "load_studio");
new TDEAction(i18n("&Reset MIDI Network"), 0, this,
- TQT_SLOT(slotResetMidiNetwork()),
+ TQ_SLOT(slotResetMidiNetwork()),
actionCollection(), "reset_midi_network");
m_setQuickMarkerAction = new TDEAction(i18n("Set Quick Marker at Playback Position"), 0, CTRL + Key_1, this,
- TQT_SLOT(slotSetQuickMarker()), actionCollection(),
+ TQ_SLOT(slotSetQuickMarker()), actionCollection(),
"set_quick_marker");
m_jumpToQuickMarkerAction = new TDEAction(i18n("Jump to Quick Marker"), 0, Key_1, this,
- TQT_SLOT(slotJumpToQuickMarker()), actionCollection(),
+ TQ_SLOT(slotJumpToQuickMarker()), actionCollection(),
"jump_to_quick_marker");
//
// Marker Ruler popup menu
//
// new TDEAction(i18n("Insert Marker"), 0, 0, this,
-// TQT_SLOT(slotInsertMarkerHere()), actionCollection(),
+// TQ_SLOT(slotInsertMarkerHere()), actionCollection(),
// "insert_marker_here");
//
// new TDEAction(i18n("Insert Marker at Playback Position"), 0, 0, this,
-// TQT_SLOT(slotInsertMarkerAtPointer()), actionCollection(),
+// TQ_SLOT(slotInsertMarkerAtPointer()), actionCollection(),
// "insert_marker_at_pointer");
//
// new TDEAction(i18n("Delete Marker"), 0, 0, this,
-// TQT_SLOT(slotDeleteMarker()), actionCollection(),
+// TQ_SLOT(slotDeleteMarker()), actionCollection(),
// "delete_marker");
@@ -1138,7 +1138,7 @@ void RosegardenGUIApp::setupActions()
pixmap.load(pixmapDir + "/toolbar/transport-play.png");
icon = TQIconSet(pixmap);
m_playTransport = new TDEAction(i18n("&Play"), icon, Key_Enter, this,
- TQT_SLOT(slotPlay()), actionCollection(),
+ TQ_SLOT(slotPlay()), actionCollection(),
"play");
// Alternative shortcut for Play
TDEShortcut playShortcut = m_playTransport->shortcut();
@@ -1149,7 +1149,7 @@ void RosegardenGUIApp::setupActions()
pixmap.load(pixmapDir + "/toolbar/transport-stop.png");
icon = TQIconSet(pixmap);
m_stopTransport = new TDEAction(i18n("&Stop"), icon, Key_Insert, this,
- TQT_SLOT(slotStop()), actionCollection(),
+ TQ_SLOT(slotStop()), actionCollection(),
"stop");
m_stopTransport->setGroup(TransportDialogConfigGroup);
@@ -1157,59 +1157,59 @@ void RosegardenGUIApp::setupActions()
icon = TQIconSet(pixmap);
m_ffwdTransport = new TDEAction(i18n("&Fast Forward"), icon, Key_PageDown,
this,
- TQT_SLOT(slotFastforward()), actionCollection(),
+ TQ_SLOT(slotFastforward()), actionCollection(),
"fast_forward");
m_ffwdTransport->setGroup(TransportDialogConfigGroup);
pixmap.load(pixmapDir + "/toolbar/transport-rewind.png");
icon = TQIconSet(pixmap);
m_rewindTransport = new TDEAction(i18n("Re&wind"), icon, Key_End, this,
- TQT_SLOT(slotRewind()), actionCollection(),
+ TQ_SLOT(slotRewind()), actionCollection(),
"rewind");
m_rewindTransport->setGroup(TransportDialogConfigGroup);
pixmap.load(pixmapDir + "/toolbar/transport-record.png");
icon = TQIconSet(pixmap);
m_recordTransport = new TDEAction(i18n("P&unch in Record"), icon, Key_Space, this,
- TQT_SLOT(slotToggleRecord()), actionCollection(),
+ TQ_SLOT(slotToggleRecord()), actionCollection(),
"recordtoggle");
m_recordTransport->setGroup(TransportDialogConfigGroup);
pixmap.load(pixmapDir + "/toolbar/transport-record.png");
icon = TQIconSet(pixmap);
m_recordTransport = new TDEAction(i18n("&Record"), icon, 0, this,
- TQT_SLOT(slotRecord()), actionCollection(),
+ TQ_SLOT(slotRecord()), actionCollection(),
"record");
m_recordTransport->setGroup(TransportDialogConfigGroup);
pixmap.load(pixmapDir + "/toolbar/transport-rewind-end.png");
icon = TQIconSet(pixmap);
m_rewindEndTransport = new TDEAction(i18n("Rewind to &Beginning"), icon, 0, this,
- TQT_SLOT(slotRewindToBeginning()), actionCollection(),
+ TQ_SLOT(slotRewindToBeginning()), actionCollection(),
"rewindtobeginning");
m_rewindEndTransport->setGroup(TransportDialogConfigGroup);
pixmap.load(pixmapDir + "/toolbar/transport-ffwd-end.png");
icon = TQIconSet(pixmap);
m_ffwdEndTransport = new TDEAction(i18n("Fast Forward to &End"), icon, 0, this,
- TQT_SLOT(slotFastForwardToEnd()), actionCollection(),
+ TQ_SLOT(slotFastForwardToEnd()), actionCollection(),
"fastforwardtoend");
m_ffwdEndTransport->setGroup(TransportDialogConfigGroup);
pixmap.load(pixmapDir + "/toolbar/transport-tracking.png");
icon = TQIconSet(pixmap);
(new TDEToggleAction(i18n("Scro&ll to Follow Playback"), icon, Key_Pause, this,
- TQT_SLOT(slotToggleTracking()), actionCollection(),
+ TQ_SLOT(slotToggleTracking()), actionCollection(),
"toggle_tracking"))->setChecked(true);
pixmap.load(pixmapDir + "/toolbar/transport-panic.png");
icon = TQIconSet(pixmap);
- new TDEAction( i18n("Panic"), icon, Key_P + CTRL + ALT, this, TQT_SLOT(slotPanic()),
+ new TDEAction( i18n("Panic"), icon, Key_P + CTRL + ALT, this, TQ_SLOT(slotPanic()),
actionCollection(), "panic");
// DEBUG FACILITY
new TDEAction(i18n("Segment Debug Dump "), 0, this,
- TQT_SLOT(slotDebugDump()), actionCollection(),
+ TQ_SLOT(slotDebugDump()), actionCollection(),
"debug_dump_segments");
// create main gui
@@ -1225,8 +1225,8 @@ void RosegardenGUIApp::setupActions()
TQPopupMenu* setTrackInstrumentMenu = dynamic_cast<TQPopupMenu*>(factory()->container("set_track_instrument", this));
if (setTrackInstrumentMenu) {
- connect(setTrackInstrumentMenu, TQT_SIGNAL(aboutToShow()),
- this, TQT_SLOT(slotPopulateTrackInstrumentPopup()));
+ connect(setTrackInstrumentMenu, TQ_SIGNAL(aboutToShow()),
+ this, TQ_SLOT(slotPopulateTrackInstrumentPopup()));
} else {
RG_DEBUG << "RosegardenGUIApp::setupActions() : couldn't find set_track_instrument menu - check rosegardenui.rcn\n";
}
@@ -1301,8 +1301,8 @@ void RosegardenGUIApp::initZoomToolbar()
m_zoomLabel = new TQLabel(minZoom, zoomToolbar, "tde toolbar widget");
m_zoomLabel->setIndent(10);
- connect(m_zoomSlider, TQT_SIGNAL(valueChanged(int)),
- this, TQT_SLOT(slotChangeZoom(int)));
+ connect(m_zoomSlider, TQ_SIGNAL(valueChanged(int)),
+ this, TQ_SLOT(slotChangeZoom(int)));
// set initial zoom - we might want to make this a config option
// m_zoomSlider->setToDefault();
@@ -1351,18 +1351,18 @@ 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)));
+ connect(m_swapView, TQ_SIGNAL(activateTool(TQString)),
+ this, TQ_SLOT(slotActivateTool(TQString)));
connect(m_swapView,
- TQT_SIGNAL(segmentsSelected(const SegmentSelection &)),
- TQT_SIGNAL(segmentsSelected(const SegmentSelection &)));
+ TQ_SIGNAL(segmentsSelected(const SegmentSelection &)),
+ TQ_SIGNAL(segmentsSelected(const SegmentSelection &)));
connect(m_swapView,
- TQT_SIGNAL(addAudioFile(AudioFileId)),
- TQT_SLOT(slotAddAudioFile(AudioFileId)));
+ TQ_SIGNAL(addAudioFile(AudioFileId)),
+ TQ_SLOT(slotAddAudioFile(AudioFileId)));
- connect(m_swapView, TQT_SIGNAL(toggleSolo(bool)), TQT_SLOT(slotToggleSolo(bool)));
+ connect(m_swapView, TQ_SIGNAL(toggleSolo(bool)), TQ_SLOT(slotToggleSolo(bool)));
m_doc->attachView(m_swapView);
@@ -1412,11 +1412,11 @@ void RosegardenGUIApp::initView()
RosegardenGUIView *oldView = m_view;
m_view = m_swapView;
- connect(m_view, TQT_SIGNAL(stateChange(TQString, bool)),
- this, TQT_SLOT (slotStateChanged(TQString, bool)));
+ connect(m_view, TQ_SIGNAL(stateChange(TQString, bool)),
+ this, TQ_SLOT (slotStateChanged(TQString, bool)));
- connect(m_view, TQT_SIGNAL(instrumentParametersChanged(InstrumentId)),
- this, TQT_SIGNAL(instrumentParametersChanged(InstrumentId)));
+ connect(m_view, TQ_SIGNAL(instrumentParametersChanged(InstrumentId)),
+ this, TQ_SIGNAL(instrumentParametersChanged(InstrumentId)));
// We only check for the SequenceManager to make sure
// we're not on the first pass though - we don't want
@@ -1445,8 +1445,8 @@ void RosegardenGUIApp::initView()
CurrentProgressDialog::thaw();
}
- connect(m_seqManager, TQT_SIGNAL(controllerDeviceEventReceived(MappedEvent *)),
- m_view, TQT_SLOT(slotControllerDeviceEventReceived(MappedEvent *)));
+ connect(m_seqManager, TQ_SIGNAL(controllerDeviceEventReceived(MappedEvent *)),
+ m_view, TQ_SLOT(slotControllerDeviceEventReceived(MappedEvent *)));
}
// delete m_playList;
@@ -1488,9 +1488,9 @@ void RosegardenGUIApp::initView()
m_view->show();
connect(m_view->getTrackEditor()->getSegmentCanvas(),
- TQT_SIGNAL(showContextHelp(const TQString &)),
+ TQ_SIGNAL(showContextHelp(const TQString &)),
this,
- TQT_SLOT(slotShowToolHelp(const TQString &)));
+ TQ_SLOT(slotShowToolHelp(const TQString &)));
// We have to do this to make sure that the 2nd call ("select")
// actually has any effect. Activating the same radio action
@@ -1588,45 +1588,45 @@ void RosegardenGUIApp::setDocument(RosegardenGUIDoc* newDocument)
// connect needed signals
//
- connect(m_segmentParameterBox, TQT_SIGNAL(documentModified()),
- m_doc, TQT_SLOT(slotDocumentModified()));
+ connect(m_segmentParameterBox, TQ_SIGNAL(documentModified()),
+ m_doc, TQ_SLOT(slotDocumentModified()));
- connect(m_doc, TQT_SIGNAL(pointerPositionChanged(timeT)),
- this, TQT_SLOT(slotSetPointerPosition(timeT)));
+ connect(m_doc, TQ_SIGNAL(pointerPositionChanged(timeT)),
+ this, TQ_SLOT(slotSetPointerPosition(timeT)));
- connect(m_doc, TQT_SIGNAL(documentModified(bool)),
- this, TQT_SLOT(slotDocumentModified(bool)));
+ connect(m_doc, TQ_SIGNAL(documentModified(bool)),
+ this, TQ_SLOT(slotDocumentModified(bool)));
- connect(m_doc, TQT_SIGNAL(loopChanged(timeT, timeT)),
- this, TQT_SLOT(slotSetLoop(timeT, timeT)));
+ connect(m_doc, TQ_SIGNAL(loopChanged(timeT, timeT)),
+ this, TQ_SLOT(slotSetLoop(timeT, timeT)));
m_doc->getCommandHistory()->attachView(actionCollection());
- connect(m_doc->getCommandHistory(), TQT_SIGNAL(commandExecuted()),
- TQT_SLOT(update()));
- connect(m_doc->getCommandHistory(), TQT_SIGNAL(commandExecuted()),
- TQT_SLOT(slotTestClipboard()));
+ connect(m_doc->getCommandHistory(), TQ_SIGNAL(commandExecuted()),
+ TQ_SLOT(update()));
+ connect(m_doc->getCommandHistory(), TQ_SIGNAL(commandExecuted()),
+ TQ_SLOT(slotTestClipboard()));
// connect and start the autosave timer
- connect(m_autoSaveTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAutoSave()));
+ connect(m_autoSaveTimer, TQ_SIGNAL(timeout()), this, TQ_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, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotUpdatePlaybackPosition()));
+ connect(m_stopTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotUpdateMonitoring()));
// finally recreate the main view
//
initView();
if (getView() && getView()->getTrackEditor()) {
- connect(m_doc, TQT_SIGNAL(makeTrackVisible(int)),
- getView()->getTrackEditor(), TQT_SLOT(slotScrollToTrack(int)));
+ connect(m_doc, TQ_SIGNAL(makeTrackVisible(int)),
+ getView()->getTrackEditor(), TQ_SLOT(slotScrollToTrack(int)));
}
- connect(m_doc, TQT_SIGNAL(devicesResyncd()),
- this, TQT_SLOT(slotDocumentDevicesResyncd()));
+ connect(m_doc, TQ_SIGNAL(devicesResyncd()),
+ this, TQ_SLOT(slotDocumentDevicesResyncd()));
m_doc->syncDevices();
m_doc->clearModifiedStatus();
@@ -2075,8 +2075,8 @@ bool RosegardenGUIApp::queryClose()
// 'off'
//
- disconnect(m_transport, TQT_SIGNAL(closed()),
- this, TQT_SLOT(slotCloseTransport()));
+ disconnect(m_transport, TQ_SIGNAL(closed()),
+ this, TQ_SLOT(slotCloseTransport()));
}
*/
@@ -2737,10 +2737,10 @@ void RosegardenGUIApp::slotRescaleSelection()
asrcs[i]->disconnectProgressDialog(progressDlg);
}
- connect(&m_doc->getAudioFileManager(), TQT_SIGNAL(setProgress(int)),
- progressDlg->progressBar(), TQT_SLOT(setValue(int)));
- connect(progressDlg, TQT_SIGNAL(cancelClicked()),
- &m_doc->getAudioFileManager(), TQT_SLOT(slotStopPreview()));
+ connect(&m_doc->getAudioFileManager(), TQ_SIGNAL(setProgress(int)),
+ progressDlg->progressBar(), TQ_SLOT(setValue(int)));
+ connect(progressDlg, TQ_SIGNAL(cancelClicked()),
+ &m_doc->getAudioFileManager(), TQ_SLOT(slotStopPreview()));
for (size_t i = 0; i < asrcs.size(); ++i) {
int fid = asrcs[i]->getNewAudioFileId();
@@ -2854,33 +2854,33 @@ void RosegardenGUIApp::createAndSetupTransport()
m_transport->getAccelerators()->connectItem
(m_transport->getAccelerators()->insertItem(Key_T),
this,
- TQT_SLOT(slotHideTransport()));
+ TQ_SLOT(slotHideTransport()));
// Ensure that the checkbox is unchecked if the dialog
// is closed
- connect(m_transport, TQT_SIGNAL(closed()),
- TQT_SLOT(slotCloseTransport()));
+ connect(m_transport, TQ_SIGNAL(closed()),
+ TQ_SLOT(slotCloseTransport()));
// Handle loop setting and unsetting from the transport loop button
//
- connect(m_transport, TQT_SIGNAL(setLoop()), TQT_SLOT(slotSetLoop()));
- connect(m_transport, TQT_SIGNAL(unsetLoop()), TQT_SLOT(slotUnsetLoop()));
- connect(m_transport, TQT_SIGNAL(panic()), TQT_SLOT(slotPanic()));
+ connect(m_transport, TQ_SIGNAL(setLoop()), TQ_SLOT(slotSetLoop()));
+ connect(m_transport, TQ_SIGNAL(unsetLoop()), TQ_SLOT(slotUnsetLoop()));
+ connect(m_transport, TQ_SIGNAL(panic()), TQ_SLOT(slotPanic()));
- connect(m_transport, TQT_SIGNAL(editTempo(TQWidget*)),
- TQT_SLOT(slotEditTempo(TQWidget*)));
+ connect(m_transport, TQ_SIGNAL(editTempo(TQWidget*)),
+ TQ_SLOT(slotEditTempo(TQWidget*)));
- connect(m_transport, TQT_SIGNAL(editTimeSignature(TQWidget*)),
- TQT_SLOT(slotEditTimeSignature(TQWidget*)));
+ connect(m_transport, TQ_SIGNAL(editTimeSignature(TQWidget*)),
+ TQ_SLOT(slotEditTimeSignature(TQWidget*)));
- connect(m_transport, TQT_SIGNAL(editTransportTime(TQWidget*)),
- TQT_SLOT(slotEditTransportTime(TQWidget*)));
+ connect(m_transport, TQ_SIGNAL(editTransportTime(TQWidget*)),
+ TQ_SLOT(slotEditTransportTime(TQWidget*)));
// Handle set loop start/stop time buttons.
//
- connect(m_transport, TQT_SIGNAL(setLoopStartTime()), TQT_SLOT(slotSetLoopStart()));
- connect(m_transport, TQT_SIGNAL(setLoopStopTime()), TQT_SLOT(slotSetLoopStop()));
+ connect(m_transport, TQ_SIGNAL(setLoopStartTime()), TQ_SLOT(slotSetLoopStart()));
+ connect(m_transport, TQ_SIGNAL(setLoopStopTime()), TQ_SLOT(slotSetLoopStop()));
if (m_seqManager != 0)
m_seqManager->setTransport(m_transport);
@@ -3868,11 +3868,11 @@ RosegardenGUIApp::createDocumentFromMIDIFile(TQString file)
CurrentProgressDialog::set
(&progressDlg);
- connect(&midiFile, TQT_SIGNAL(setProgress(int)),
- progressDlg.progressBar(), TQT_SLOT(setValue(int)));
+ connect(&midiFile, TQ_SIGNAL(setProgress(int)),
+ progressDlg.progressBar(), TQ_SLOT(setValue(int)));
- connect(&midiFile, TQT_SIGNAL(incrementProgress(int)),
- progressDlg.progressBar(), TQT_SLOT(advance(int)));
+ connect(&midiFile, TQ_SIGNAL(incrementProgress(int)),
+ progressDlg.progressBar(), TQ_SLOT(advance(int)));
if (!midiFile.open()) {
CurrentProgressDialog::freeze();
@@ -3960,8 +3960,8 @@ RosegardenGUIApp::createDocumentFromMIDIFile(TQString file)
(segment, startTime, endTime, "Notation Options", true);
subCommand->setProgressTotal(progressPer + 1);
- TQObject::connect(subCommand, TQT_SIGNAL(incrementProgress(int)),
- progressDlg.progressBar(), TQT_SLOT(advance(int)));
+ TQObject::connect(subCommand, TQ_SIGNAL(incrementProgress(int)),
+ progressDlg.progressBar(), TQ_SLOT(advance(int)));
command->addCommand(subCommand);
}
@@ -4034,11 +4034,11 @@ RosegardenGUIApp::createDocumentFromRG21File(TQString file)
// TODO: make RG21Loader to actually emit these signals
//
- connect(&rg21Loader, TQT_SIGNAL(setProgress(int)),
- progressDlg.progressBar(), TQT_SLOT(setValue(int)));
+ connect(&rg21Loader, TQ_SIGNAL(setProgress(int)),
+ progressDlg.progressBar(), TQ_SLOT(setValue(int)));
- connect(&rg21Loader, TQT_SIGNAL(incrementProgress(int)),
- progressDlg.progressBar(), TQT_SLOT(advance(int)));
+ connect(&rg21Loader, TQ_SIGNAL(incrementProgress(int)),
+ progressDlg.progressBar(), TQ_SLOT(advance(int)));
// "your starter for 40%" - helps the "freeze" work
//
@@ -4121,11 +4121,11 @@ RosegardenGUIApp::createDocumentFromHydrogenFile(TQString file)
// TODO: make RG21Loader to actually emit these signals
//
- connect(&hydrogenLoader, TQT_SIGNAL(setProgress(int)),
- progressDlg.progressBar(), TQT_SLOT(setValue(int)));
+ connect(&hydrogenLoader, TQ_SIGNAL(setProgress(int)),
+ progressDlg.progressBar(), TQ_SLOT(setValue(int)));
- connect(&hydrogenLoader, TQT_SIGNAL(incrementProgress(int)),
- progressDlg.progressBar(), TQT_SLOT(advance(int)));
+ connect(&hydrogenLoader, TQ_SIGNAL(incrementProgress(int)),
+ progressDlg.progressBar(), TQ_SLOT(advance(int)));
// "your starter for 40%" - helps the "freeze" work
//
@@ -4499,15 +4499,15 @@ void RosegardenGUIApp::slotTestStartupTester()
if (!m_startupTester) {
m_startupTester = new StartupTester();
- connect(m_startupTester, TQT_SIGNAL(newerVersionAvailable(TQString)),
- this, TQT_SLOT(slotNewerVersionAvailable(TQString)));
+ connect(m_startupTester, TQ_SIGNAL(newerVersionAvailable(TQString)),
+ this, TQ_SLOT(slotNewerVersionAvailable(TQString)));
m_startupTester->start();
- TQTimer::singleShot(100, this, TQT_SLOT(slotTestStartupTester()));
+ TQTimer::singleShot(100, this, TQ_SLOT(slotTestStartupTester()));
return ;
}
if (!m_startupTester->isReady()) {
- TQTimer::singleShot(100, this, TQT_SLOT(slotTestStartupTester()));
+ TQTimer::singleShot(100, this, TQ_SLOT(slotTestStartupTester()));
return ;
}
@@ -4737,8 +4737,8 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting)
stateChanged("sequencer_running");
slotEnableTransport(true);
- connect(m_sequencerProcess, TQT_SIGNAL(processExited(TDEProcess*)),
- this, TQT_SLOT(slotSequencerExited(TDEProcess*)));
+ connect(m_sequencerProcess, TQ_SIGNAL(processExited(TDEProcess*)),
+ this, TQ_SLOT(slotSequencerExited(TDEProcess*)));
} catch (Exception e) {
m_sequencerProcess = 0;
@@ -4919,11 +4919,11 @@ void RosegardenGUIApp::exportMIDIFile(TQString file)
MidiFile midiFile(fname,
&m_doc->getStudio());
- connect(&midiFile, TQT_SIGNAL(setProgress(int)),
- progressDlg.progressBar(), TQT_SLOT(setValue(int)));
+ connect(&midiFile, TQ_SIGNAL(setProgress(int)),
+ progressDlg.progressBar(), TQ_SLOT(setValue(int)));
- connect(&midiFile, TQT_SIGNAL(incrementProgress(int)),
- progressDlg.progressBar(), TQT_SLOT(advance(int)));
+ connect(&midiFile, TQ_SIGNAL(incrementProgress(int)),
+ progressDlg.progressBar(), TQ_SLOT(advance(int)));
midiFile.convertToMidi(m_doc->getComposition());
@@ -4953,11 +4953,11 @@ void RosegardenGUIApp::exportCsoundFile(TQString file)
CsoundExporter e(this, &m_doc->getComposition(), std::string(TQFile::encodeName(file)));
- connect(&e, TQT_SIGNAL(setProgress(int)),
- progressDlg.progressBar(), TQT_SLOT(setValue(int)));
+ connect(&e, TQ_SIGNAL(setProgress(int)),
+ progressDlg.progressBar(), TQ_SLOT(setValue(int)));
- connect(&e, TQT_SIGNAL(incrementProgress(int)),
- progressDlg.progressBar(), TQT_SLOT(advance(int)));
+ connect(&e, TQ_SIGNAL(incrementProgress(int)),
+ progressDlg.progressBar(), TQ_SLOT(advance(int)));
if (!e.write()) {
CurrentProgressDialog::freeze();
@@ -4986,11 +4986,11 @@ void RosegardenGUIApp::exportMupFile(TQString file)
MupExporter e(this, &m_doc->getComposition(), std::string(TQFile::encodeName(file)));
- connect(&e, TQT_SIGNAL(setProgress(int)),
- progressDlg.progressBar(), TQT_SLOT(setValue(int)));
+ connect(&e, TQ_SIGNAL(setProgress(int)),
+ progressDlg.progressBar(), TQ_SLOT(setValue(int)));
- connect(&e, TQT_SIGNAL(incrementProgress(int)),
- progressDlg.progressBar(), TQT_SLOT(advance(int)));
+ connect(&e, TQ_SIGNAL(incrementProgress(int)),
+ progressDlg.progressBar(), TQ_SLOT(advance(int)));
if (!e.write()) {
CurrentProgressDialog::freeze();
@@ -5034,8 +5034,8 @@ void RosegardenGUIApp::slotPrintLilyPond()
*proc << "--graphical";
*proc << "--print";
*proc << file->name();
- connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),
- this, TQT_SLOT(slotLilyPondViewProcessExited(TDEProcess *)));
+ connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),
+ this, TQ_SLOT(slotLilyPondViewProcessExited(TDEProcess *)));
m_lilyTempFileMap[proc] = file;
proc->start(TDEProcess::NotifyOnExit);
}
@@ -5058,8 +5058,8 @@ void RosegardenGUIApp::slotPreviewLilyPond()
*proc << "--graphical";
*proc << "--pdf";
*proc << file->name();
- connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),
- this, TQT_SLOT(slotLilyPondViewProcessExited(TDEProcess *)));
+ connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),
+ this, TQ_SLOT(slotLilyPondViewProcessExited(TDEProcess *)));
m_lilyTempFileMap[proc] = file;
proc->start(TDEProcess::NotifyOnExit);
}
@@ -5090,11 +5090,11 @@ bool RosegardenGUIApp::exportLilyPondFile(TQString file, bool forPreview)
LilyPondExporter e(this, m_doc, std::string(TQFile::encodeName(file)));
- connect(&e, TQT_SIGNAL(setProgress(int)),
- progressDlg.progressBar(), TQT_SLOT(setValue(int)));
+ connect(&e, TQ_SIGNAL(setProgress(int)),
+ progressDlg.progressBar(), TQ_SLOT(setValue(int)));
- connect(&e, TQT_SIGNAL(incrementProgress(int)),
- progressDlg.progressBar(), TQT_SLOT(advance(int)));
+ connect(&e, TQ_SIGNAL(incrementProgress(int)),
+ progressDlg.progressBar(), TQ_SLOT(advance(int)));
if (!e.write()) {
CurrentProgressDialog::freeze();
@@ -5127,11 +5127,11 @@ void RosegardenGUIApp::exportMusicXmlFile(TQString file)
MusicXmlExporter e(this, m_doc, std::string(TQFile::encodeName(file)));
- connect(&e, TQT_SIGNAL(setProgress(int)),
- progressDlg.progressBar(), TQT_SLOT(setValue(int)));
+ connect(&e, TQ_SIGNAL(setProgress(int)),
+ progressDlg.progressBar(), TQ_SLOT(setValue(int)));
- connect(&e, TQT_SIGNAL(incrementProgress(int)),
- progressDlg.progressBar(), TQT_SLOT(advance(int)));
+ connect(&e, TQ_SIGNAL(incrementProgress(int)),
+ progressDlg.progressBar(), TQ_SLOT(advance(int)));
if (!e.write()) {
CurrentProgressDialog::freeze();
@@ -5306,8 +5306,8 @@ RosegardenGUIApp::slotRecord()
plugAccelerators(m_seqManager->getCountdownDialog(),
m_seqManager->getCountdownDialog()->getAccelerators());
- connect(m_seqManager->getCountdownDialog(), TQT_SIGNAL(stopped()),
- this, TQT_SLOT(slotStop()));
+ connect(m_seqManager->getCountdownDialog(), TQ_SIGNAL(stopped()),
+ this, TQ_SLOT(slotStop()));
// Start the playback timer - this fetches the current sequencer position &c
//
@@ -5457,10 +5457,10 @@ void RosegardenGUIApp::slotStop()
{
if (m_seqManager &&
m_seqManager->getCountdownDialog()) {
- disconnect(m_seqManager->getCountdownDialog(), TQT_SIGNAL(stopped()),
- this, TQT_SLOT(slotStop()));
- disconnect(m_seqManager->getCountdownDialog(), TQT_SIGNAL(completed()),
- this, TQT_SLOT(slotStop()));
+ disconnect(m_seqManager->getCountdownDialog(), TQ_SIGNAL(stopped()),
+ this, TQ_SLOT(slotStop()));
+ disconnect(m_seqManager->getCountdownDialog(), TQ_SIGNAL(completed()),
+ this, TQ_SLOT(slotStop()));
}
try {
@@ -5643,10 +5643,10 @@ void RosegardenGUIApp::slotConfigure()
ConfigureDialog *configDlg =
new ConfigureDialog(m_doc, kapp->config(), this);
- connect(configDlg, TQT_SIGNAL(updateAutoSaveInterval(unsigned int)),
- this, TQT_SLOT(slotUpdateAutoSaveInterval(unsigned int)));
- connect(configDlg, TQT_SIGNAL(updateSidebarStyle(unsigned int)),
- this, TQT_SLOT(slotUpdateSidebarStyle(unsigned int)));
+ connect(configDlg, TQ_SIGNAL(updateAutoSaveInterval(unsigned int)),
+ this, TQ_SLOT(slotUpdateAutoSaveInterval(unsigned int)));
+ connect(configDlg, TQ_SIGNAL(updateSidebarStyle(unsigned int)),
+ this, TQ_SLOT(slotUpdateSidebarStyle(unsigned int)));
configDlg->show();
}
@@ -5681,8 +5681,8 @@ void RosegardenGUIApp::slotEditToolbars()
{
KEditToolbar dlg(actionCollection(), "rosegardenui.rc");
- connect(&dlg, TQT_SIGNAL(newToolbarConfig()),
- TQT_SLOT(slotUpdateToolbars()));
+ connect(&dlg, TQ_SIGNAL(newToolbarConfig()),
+ TQ_SLOT(slotUpdateToolbars()));
dlg.exec();
}
@@ -5715,11 +5715,11 @@ void RosegardenGUIApp::slotEditTempo(TQWidget *parent, timeT atTime)
TempoDialog tempoDialog(parent, m_doc);
connect(&tempoDialog,
- TQT_SIGNAL(changeTempo(timeT,
+ TQ_SIGNAL(changeTempo(timeT,
tempoT,
tempoT,
TempoDialog::TempoDialogAction)),
- TQT_SLOT(slotChangeTempo(timeT,
+ TQ_SLOT(slotChangeTempo(timeT,
tempoT,
tempoT,
TempoDialog::TempoDialogAction)));
@@ -6008,27 +6008,27 @@ RosegardenGUIApp::plugAccelerators(TQWidget *widget, TQAccel *acc)
acc->connectItem(acc->insertItem(Key_Enter),
this,
- TQT_SLOT(slotPlay()));
+ TQ_SLOT(slotPlay()));
// Alternative shortcut for Play
acc->connectItem(acc->insertItem(Key_Return + CTRL),
this,
- TQT_SLOT(slotPlay()));
+ TQ_SLOT(slotPlay()));
acc->connectItem(acc->insertItem(Key_Insert),
this,
- TQT_SLOT(slotStop()));
+ TQ_SLOT(slotStop()));
acc->connectItem(acc->insertItem(Key_PageDown),
this,
- TQT_SLOT(slotFastforward()));
+ TQ_SLOT(slotFastforward()));
acc->connectItem(acc->insertItem(Key_End),
this,
- TQT_SLOT(slotRewind()));
+ TQ_SLOT(slotRewind()));
acc->connectItem(acc->insertItem(Key_Space),
this,
- TQT_SLOT(slotToggleRecord()));
+ TQ_SLOT(slotToggleRecord()));
TransportDialog *transport =
dynamic_cast<TransportDialog*>(widget);
@@ -6036,64 +6036,64 @@ RosegardenGUIApp::plugAccelerators(TQWidget *widget, TQAccel *acc)
if (transport) {
acc->connectItem(acc->insertItem(m_jumpToQuickMarkerAction->shortcut()),
this,
- TQT_SLOT(slotJumpToQuickMarker()));
+ TQ_SLOT(slotJumpToQuickMarker()));
acc->connectItem(acc->insertItem(m_setQuickMarkerAction->shortcut()),
this,
- TQT_SLOT(slotSetQuickMarker()));
+ TQ_SLOT(slotSetQuickMarker()));
connect(transport->PlayButton(),
- TQT_SIGNAL(clicked()),
+ TQ_SIGNAL(clicked()),
this,
- TQT_SLOT(slotPlay()));
+ TQ_SLOT(slotPlay()));
connect(transport->StopButton(),
- TQT_SIGNAL(clicked()),
+ TQ_SIGNAL(clicked()),
this,
- TQT_SLOT(slotStop()));
+ TQ_SLOT(slotStop()));
connect(transport->FfwdButton(),
- TQT_SIGNAL(clicked()),
- TQT_SLOT(slotFastforward()));
+ TQ_SIGNAL(clicked()),
+ TQ_SLOT(slotFastforward()));
connect(transport->RewindButton(),
- TQT_SIGNAL(clicked()),
+ TQ_SIGNAL(clicked()),
this,
- TQT_SLOT(slotRewind()));
+ TQ_SLOT(slotRewind()));
connect(transport->RecordButton(),
- TQT_SIGNAL(clicked()),
+ TQ_SIGNAL(clicked()),
this,
- TQT_SLOT(slotRecord()));
+ TQ_SLOT(slotRecord()));
connect(transport->RewindEndButton(),
- TQT_SIGNAL(clicked()),
+ TQ_SIGNAL(clicked()),
this,
- TQT_SLOT(slotRewindToBeginning()));
+ TQ_SLOT(slotRewindToBeginning()));
connect(transport->FfwdEndButton(),
- TQT_SIGNAL(clicked()),
+ TQ_SIGNAL(clicked()),
this,
- TQT_SLOT(slotFastForwardToEnd()));
+ TQ_SLOT(slotFastForwardToEnd()));
connect(transport->MetronomeButton(),
- TQT_SIGNAL(clicked()),
+ TQ_SIGNAL(clicked()),
this,
- TQT_SLOT(slotToggleMetronome()));
+ TQ_SLOT(slotToggleMetronome()));
connect(transport->SoloButton(),
- TQT_SIGNAL(toggled(bool)),
+ TQ_SIGNAL(toggled(bool)),
this,
- TQT_SLOT(slotToggleSolo(bool)));
+ TQ_SLOT(slotToggleSolo(bool)));
connect(transport->TimeDisplayButton(),
- TQT_SIGNAL(clicked()),
+ TQ_SIGNAL(clicked()),
this,
- TQT_SLOT(slotRefreshTimeDisplay()));
+ TQ_SLOT(slotRefreshTimeDisplay()));
connect(transport->ToEndButton(),
- TQT_SIGNAL(clicked()),
- TQT_SLOT(slotRefreshTimeDisplay()));
+ TQ_SIGNAL(clicked()),
+ TQ_SLOT(slotRefreshTimeDisplay()));
}
}
@@ -6243,20 +6243,20 @@ RosegardenGUIApp::slotAudioManager()
new AudioManagerDialog(this, m_doc);
connect(m_audioManagerDialog,
- TQT_SIGNAL(playAudioFile(AudioFileId,
+ TQ_SIGNAL(playAudioFile(AudioFileId,
const RealTime &,
const RealTime&)),
- TQT_SLOT(slotPlayAudioFile(AudioFileId,
+ TQ_SLOT(slotPlayAudioFile(AudioFileId,
const RealTime &,
const RealTime &)));
connect(m_audioManagerDialog,
- TQT_SIGNAL(addAudioFile(AudioFileId)),
- TQT_SLOT(slotAddAudioFile(AudioFileId)));
+ TQ_SIGNAL(addAudioFile(AudioFileId)),
+ TQ_SLOT(slotAddAudioFile(AudioFileId)));
connect(m_audioManagerDialog,
- TQT_SIGNAL(deleteAudioFile(AudioFileId)),
- TQT_SLOT(slotDeleteAudioFile(AudioFileId)));
+ TQ_SIGNAL(deleteAudioFile(AudioFileId)),
+ TQ_SLOT(slotDeleteAudioFile(AudioFileId)));
//
// Sync segment selection between audio man. dialog and main window
@@ -6264,46 +6264,46 @@ RosegardenGUIApp::slotAudioManager()
// from dialog to us...
connect(m_audioManagerDialog,
- TQT_SIGNAL(segmentsSelected(const SegmentSelection&)),
+ TQ_SIGNAL(segmentsSelected(const SegmentSelection&)),
m_view,
- TQT_SLOT(slotPropagateSegmentSelection(const SegmentSelection&)));
+ TQ_SLOT(slotPropagateSegmentSelection(const SegmentSelection&)));
// and from us to dialog
- connect(this, TQT_SIGNAL(segmentsSelected(const SegmentSelection&)),
+ connect(this, TQ_SIGNAL(segmentsSelected(const SegmentSelection&)),
m_audioManagerDialog,
- TQT_SLOT(slotSegmentSelection(const SegmentSelection&)));
+ TQ_SLOT(slotSegmentSelection(const SegmentSelection&)));
connect(m_audioManagerDialog,
- TQT_SIGNAL(deleteSegments(const SegmentSelection&)),
- TQT_SLOT(slotDeleteSegments(const SegmentSelection&)));
+ TQ_SIGNAL(deleteSegments(const SegmentSelection&)),
+ TQ_SLOT(slotDeleteSegments(const SegmentSelection&)));
connect(m_audioManagerDialog,
- TQT_SIGNAL(insertAudioSegment(AudioFileId,
+ TQ_SIGNAL(insertAudioSegment(AudioFileId,
const RealTime&,
const RealTime&)),
m_view,
- TQT_SLOT(slotAddAudioSegmentDefaultPosition(AudioFileId,
+ TQ_SLOT(slotAddAudioSegmentDefaultPosition(AudioFileId,
const RealTime&,
const RealTime&)));
connect(m_audioManagerDialog,
- TQT_SIGNAL(cancelPlayingAudioFile(AudioFileId)),
- TQT_SLOT(slotCancelAudioPlayingFile(AudioFileId)));
+ TQ_SIGNAL(cancelPlayingAudioFile(AudioFileId)),
+ TQ_SLOT(slotCancelAudioPlayingFile(AudioFileId)));
connect(m_audioManagerDialog,
- TQT_SIGNAL(deleteAllAudioFiles()),
- TQT_SLOT(slotDeleteAllAudioFiles()));
+ TQ_SIGNAL(deleteAllAudioFiles()),
+ TQ_SLOT(slotDeleteAllAudioFiles()));
// Make sure we know when the audio man. dialog is closing
//
connect(m_audioManagerDialog,
- TQT_SIGNAL(closing()),
- TQT_SLOT(slotAudioManagerClosed()));
+ TQ_SIGNAL(closing()),
+ TQ_SLOT(slotAudioManagerClosed()));
// And that it goes away when the current document is changing
//
- connect(this, TQT_SIGNAL(documentAboutToChange()),
- m_audioManagerDialog, TQT_SLOT(close()));
+ connect(this, TQ_SIGNAL(documentAboutToChange()),
+ m_audioManagerDialog, TQ_SLOT(close()));
m_audioManagerDialog->setAudioSubsystemStatus(
m_seqManager->getSoundDriverStatus() & AUDIO_OK);
@@ -6520,26 +6520,26 @@ RosegardenGUIApp::slotManageMIDIDevices()
m_deviceManager = new DeviceManagerDialog(this, m_doc);
- connect(m_deviceManager, TQT_SIGNAL(closing()),
- this, TQT_SLOT(slotDeviceManagerClosed()));
+ connect(m_deviceManager, TQ_SIGNAL(closing()),
+ this, TQ_SLOT(slotDeviceManagerClosed()));
- connect(this, TQT_SIGNAL(documentAboutToChange()),
- m_deviceManager, TQT_SLOT(close()));
+ connect(this, TQ_SIGNAL(documentAboutToChange()),
+ m_deviceManager, TQ_SLOT(close()));
// Cheating way of updating the track/instrument list
//
- connect(m_deviceManager, TQT_SIGNAL(deviceNamesChanged()),
- m_view, TQT_SLOT(slotSynchroniseWithComposition()));
+ connect(m_deviceManager, TQ_SIGNAL(deviceNamesChanged()),
+ m_view, TQ_SLOT(slotSynchroniseWithComposition()));
- connect(m_deviceManager, TQT_SIGNAL(editBanks(DeviceId)),
- this, TQT_SLOT(slotEditBanks(DeviceId)));
+ connect(m_deviceManager, TQ_SIGNAL(editBanks(DeviceId)),
+ this, TQ_SLOT(slotEditBanks(DeviceId)));
- connect(m_deviceManager, TQT_SIGNAL(editControllers(DeviceId)),
- this, TQT_SLOT(slotEditControlParameters(DeviceId)));
+ connect(m_deviceManager, TQ_SIGNAL(editControllers(DeviceId)),
+ this, TQ_SLOT(slotEditControlParameters(DeviceId)));
if (m_midiMixer) {
- connect(m_deviceManager, TQT_SIGNAL(deviceNamesChanged()),
- m_midiMixer, TQT_SLOT(slotSynchronise()));
+ connect(m_deviceManager, TQ_SIGNAL(deviceNamesChanged()),
+ m_midiMixer, TQ_SLOT(slotSynchronise()));
}
@@ -6563,26 +6563,26 @@ RosegardenGUIApp::slotManageSynths()
#endif
);
- connect(m_synthManager, TQT_SIGNAL(closing()),
- this, TQT_SLOT(slotSynthPluginManagerClosed()));
+ connect(m_synthManager, TQ_SIGNAL(closing()),
+ this, TQ_SLOT(slotSynthPluginManagerClosed()));
- connect(this, TQT_SIGNAL(documentAboutToChange()),
- m_synthManager, TQT_SLOT(close()));
+ connect(this, TQ_SIGNAL(documentAboutToChange()),
+ m_synthManager, TQ_SLOT(close()));
connect(m_synthManager,
- TQT_SIGNAL(pluginSelected(InstrumentId, int, int)),
+ TQ_SIGNAL(pluginSelected(InstrumentId, int, int)),
this,
- TQT_SLOT(slotPluginSelected(InstrumentId, int, int)));
+ TQ_SLOT(slotPluginSelected(InstrumentId, int, int)));
connect(m_synthManager,
- TQT_SIGNAL(showPluginDialog(TQWidget *, InstrumentId, int)),
+ TQ_SIGNAL(showPluginDialog(TQWidget *, InstrumentId, int)),
this,
- TQT_SLOT(slotShowPluginDialog(TQWidget *, InstrumentId, int)));
+ TQ_SLOT(slotShowPluginDialog(TQWidget *, InstrumentId, int)));
connect(m_synthManager,
- TQT_SIGNAL(showPluginGUI(InstrumentId, int)),
+ TQ_SIGNAL(showPluginGUI(InstrumentId, int)),
this,
- TQT_SLOT(slotShowPluginGUI(InstrumentId, int)));
+ TQ_SLOT(slotShowPluginGUI(InstrumentId, int)));
m_synthManager->show();
}
@@ -6599,66 +6599,66 @@ RosegardenGUIApp::slotOpenAudioMixer()
m_audioMixer = new AudioMixerWindow(this, m_doc);
- connect(m_audioMixer, TQT_SIGNAL(windowActivated()),
- m_view, TQT_SLOT(slotActiveMainWindowChanged()));
+ connect(m_audioMixer, TQ_SIGNAL(windowActivated()),
+ m_view, TQ_SLOT(slotActiveMainWindowChanged()));
- connect(m_view, TQT_SIGNAL(controllerDeviceEventReceived(MappedEvent *, const void *)),
- m_audioMixer, TQT_SLOT(slotControllerDeviceEventReceived(MappedEvent *, const void *)));
+ connect(m_view, TQ_SIGNAL(controllerDeviceEventReceived(MappedEvent *, const void *)),
+ m_audioMixer, TQ_SLOT(slotControllerDeviceEventReceived(MappedEvent *, const void *)));
- connect(m_audioMixer, TQT_SIGNAL(closing()),
- this, TQT_SLOT(slotAudioMixerClosed()));
+ connect(m_audioMixer, TQ_SIGNAL(closing()),
+ this, TQ_SLOT(slotAudioMixerClosed()));
- connect(m_audioMixer, TQT_SIGNAL(selectPlugin(TQWidget *, InstrumentId, int)),
- this, TQT_SLOT(slotShowPluginDialog(TQWidget *, InstrumentId, int)));
+ connect(m_audioMixer, TQ_SIGNAL(selectPlugin(TQWidget *, InstrumentId, int)),
+ this, TQ_SLOT(slotShowPluginDialog(TQWidget *, InstrumentId, int)));
connect(this,
- TQT_SIGNAL(pluginSelected(InstrumentId, int, int)),
+ TQ_SIGNAL(pluginSelected(InstrumentId, int, int)),
m_audioMixer,
- TQT_SLOT(slotPluginSelected(InstrumentId, int, int)));
+ TQ_SLOT(slotPluginSelected(InstrumentId, int, int)));
connect(this,
- TQT_SIGNAL(pluginBypassed(InstrumentId, int, bool)),
+ TQ_SIGNAL(pluginBypassed(InstrumentId, int, bool)),
m_audioMixer,
- TQT_SLOT(slotPluginBypassed(InstrumentId, int, bool)));
-
- connect(this, TQT_SIGNAL(documentAboutToChange()),
- m_audioMixer, TQT_SLOT(close()));
-
- connect(m_view, TQT_SIGNAL(checkTrackAssignments()),
- m_audioMixer, TQT_SLOT(slotTrackAssignmentsChanged()));
-
- connect(m_audioMixer, TQT_SIGNAL(play()),
- this, TQT_SLOT(slotPlay()));
- connect(m_audioMixer, TQT_SIGNAL(stop()),
- this, TQT_SLOT(slotStop()));
- connect(m_audioMixer, TQT_SIGNAL(fastForwardPlayback()),
- this, TQT_SLOT(slotFastforward()));
- connect(m_audioMixer, TQT_SIGNAL(rewindPlayback()),
- this, TQT_SLOT(slotRewind()));
- connect(m_audioMixer, TQT_SIGNAL(fastForwardPlaybackToEnd()),
- this, TQT_SLOT(slotFastForwardToEnd()));
- connect(m_audioMixer, TQT_SIGNAL(rewindPlaybackToBeginning()),
- this, TQT_SLOT(slotRewindToBeginning()));
- connect(m_audioMixer, TQT_SIGNAL(record()),
- this, TQT_SLOT(slotRecord()));
- connect(m_audioMixer, TQT_SIGNAL(panic()),
- this, TQT_SLOT(slotPanic()));
+ TQ_SLOT(slotPluginBypassed(InstrumentId, int, bool)));
+
+ connect(this, TQ_SIGNAL(documentAboutToChange()),
+ m_audioMixer, TQ_SLOT(close()));
+
+ connect(m_view, TQ_SIGNAL(checkTrackAssignments()),
+ m_audioMixer, TQ_SLOT(slotTrackAssignmentsChanged()));
+
+ connect(m_audioMixer, TQ_SIGNAL(play()),
+ this, TQ_SLOT(slotPlay()));
+ connect(m_audioMixer, TQ_SIGNAL(stop()),
+ this, TQ_SLOT(slotStop()));
+ connect(m_audioMixer, TQ_SIGNAL(fastForwardPlayback()),
+ this, TQ_SLOT(slotFastforward()));
+ connect(m_audioMixer, TQ_SIGNAL(rewindPlayback()),
+ this, TQ_SLOT(slotRewind()));
+ connect(m_audioMixer, TQ_SIGNAL(fastForwardPlaybackToEnd()),
+ this, TQ_SLOT(slotFastForwardToEnd()));
+ connect(m_audioMixer, TQ_SIGNAL(rewindPlaybackToBeginning()),
+ this, TQ_SLOT(slotRewindToBeginning()));
+ connect(m_audioMixer, TQ_SIGNAL(record()),
+ this, TQ_SLOT(slotRecord()));
+ connect(m_audioMixer, TQ_SIGNAL(panic()),
+ this, TQ_SLOT(slotPanic()));
connect(m_audioMixer,
- TQT_SIGNAL(instrumentParametersChanged(InstrumentId)),
+ TQ_SIGNAL(instrumentParametersChanged(InstrumentId)),
this,
- TQT_SIGNAL(instrumentParametersChanged(InstrumentId)));
+ TQ_SIGNAL(instrumentParametersChanged(InstrumentId)));
connect(this,
- TQT_SIGNAL(instrumentParametersChanged(InstrumentId)),
+ TQ_SIGNAL(instrumentParametersChanged(InstrumentId)),
m_audioMixer,
- TQT_SLOT(slotUpdateInstrument(InstrumentId)));
+ TQ_SLOT(slotUpdateInstrument(InstrumentId)));
if (m_synthManager) {
connect(m_synthManager,
- TQT_SIGNAL(pluginSelected(InstrumentId, int, int)),
+ TQ_SIGNAL(pluginSelected(InstrumentId, int, int)),
m_audioMixer,
- TQT_SLOT(slotPluginSelected(InstrumentId, int, int)));
+ TQ_SLOT(slotPluginSelected(InstrumentId, int, int)));
}
plugAccelerators(m_audioMixer, m_audioMixer->getAccelerators());
@@ -6678,44 +6678,44 @@ RosegardenGUIApp::slotOpenMidiMixer()
m_midiMixer = new MidiMixerWindow(this, m_doc);
- connect(m_midiMixer, TQT_SIGNAL(windowActivated()),
- m_view, TQT_SLOT(slotActiveMainWindowChanged()));
-
- connect(m_view, TQT_SIGNAL(controllerDeviceEventReceived(MappedEvent *, const void *)),
- m_midiMixer, TQT_SLOT(slotControllerDeviceEventReceived(MappedEvent *, const void *)));
-
- connect(m_midiMixer, TQT_SIGNAL(closing()),
- this, TQT_SLOT(slotMidiMixerClosed()));
-
- connect(this, TQT_SIGNAL(documentAboutToChange()),
- m_midiMixer, TQT_SLOT(close()));
-
- connect(m_midiMixer, TQT_SIGNAL(play()),
- this, TQT_SLOT(slotPlay()));
- connect(m_midiMixer, TQT_SIGNAL(stop()),
- this, TQT_SLOT(slotStop()));
- connect(m_midiMixer, TQT_SIGNAL(fastForwardPlayback()),
- this, TQT_SLOT(slotFastforward()));
- connect(m_midiMixer, TQT_SIGNAL(rewindPlayback()),
- this, TQT_SLOT(slotRewind()));
- connect(m_midiMixer, TQT_SIGNAL(fastForwardPlaybackToEnd()),
- this, TQT_SLOT(slotFastForwardToEnd()));
- connect(m_midiMixer, TQT_SIGNAL(rewindPlaybackToBeginning()),
- this, TQT_SLOT(slotRewindToBeginning()));
- connect(m_midiMixer, TQT_SIGNAL(record()),
- this, TQT_SLOT(slotRecord()));
- connect(m_midiMixer, TQT_SIGNAL(panic()),
- this, TQT_SLOT(slotPanic()));
+ connect(m_midiMixer, TQ_SIGNAL(windowActivated()),
+ m_view, TQ_SLOT(slotActiveMainWindowChanged()));
+
+ connect(m_view, TQ_SIGNAL(controllerDeviceEventReceived(MappedEvent *, const void *)),
+ m_midiMixer, TQ_SLOT(slotControllerDeviceEventReceived(MappedEvent *, const void *)));
+
+ connect(m_midiMixer, TQ_SIGNAL(closing()),
+ this, TQ_SLOT(slotMidiMixerClosed()));
+
+ connect(this, TQ_SIGNAL(documentAboutToChange()),
+ m_midiMixer, TQ_SLOT(close()));
+
+ connect(m_midiMixer, TQ_SIGNAL(play()),
+ this, TQ_SLOT(slotPlay()));
+ connect(m_midiMixer, TQ_SIGNAL(stop()),
+ this, TQ_SLOT(slotStop()));
+ connect(m_midiMixer, TQ_SIGNAL(fastForwardPlayback()),
+ this, TQ_SLOT(slotFastforward()));
+ connect(m_midiMixer, TQ_SIGNAL(rewindPlayback()),
+ this, TQ_SLOT(slotRewind()));
+ connect(m_midiMixer, TQ_SIGNAL(fastForwardPlaybackToEnd()),
+ this, TQ_SLOT(slotFastForwardToEnd()));
+ connect(m_midiMixer, TQ_SIGNAL(rewindPlaybackToBeginning()),
+ this, TQ_SLOT(slotRewindToBeginning()));
+ connect(m_midiMixer, TQ_SIGNAL(record()),
+ this, TQ_SLOT(slotRecord()));
+ connect(m_midiMixer, TQ_SIGNAL(panic()),
+ this, TQ_SLOT(slotPanic()));
connect(m_midiMixer,
- TQT_SIGNAL(instrumentParametersChanged(InstrumentId)),
+ TQ_SIGNAL(instrumentParametersChanged(InstrumentId)),
this,
- TQT_SIGNAL(instrumentParametersChanged(InstrumentId)));
+ TQ_SIGNAL(instrumentParametersChanged(InstrumentId)));
connect(this,
- TQT_SIGNAL(instrumentParametersChanged(InstrumentId)),
+ TQ_SIGNAL(instrumentParametersChanged(InstrumentId)),
m_midiMixer,
- TQT_SLOT(slotUpdateInstrument(InstrumentId)));
+ TQ_SLOT(slotUpdateInstrument(InstrumentId)));
plugAccelerators(m_midiMixer, m_midiMixer->getAccelerators());
@@ -6742,14 +6742,14 @@ RosegardenGUIApp::slotEditControlParameters(DeviceId device)
RG_DEBUG << "inserting control editor dialog, have " << m_controlEditors.size() << " now" << endl;
- connect(controlEditor, TQT_SIGNAL(closing()),
- TQT_SLOT(slotControlEditorClosed()));
+ connect(controlEditor, TQ_SIGNAL(closing()),
+ TQ_SLOT(slotControlEditorClosed()));
- connect(this, TQT_SIGNAL(documentAboutToChange()),
- controlEditor, TQT_SLOT(close()));
+ connect(this, TQ_SIGNAL(documentAboutToChange()),
+ controlEditor, TQ_SLOT(close()));
- connect(m_doc, TQT_SIGNAL(devicesResyncd()),
- controlEditor, TQT_SLOT(slotUpdate()));
+ connect(m_doc, TQ_SIGNAL(devicesResyncd()),
+ controlEditor, TQ_SLOT(slotUpdate()));
controlEditor->show();
}
@@ -6774,16 +6774,16 @@ RosegardenGUIApp::slotEditBanks(DeviceId device)
m_bankEditor = new BankEditorDialog(this, m_doc, device);
- connect(m_bankEditor, TQT_SIGNAL(closing()),
- this, TQT_SLOT(slotBankEditorClosed()));
+ connect(m_bankEditor, TQ_SIGNAL(closing()),
+ this, TQ_SLOT(slotBankEditorClosed()));
- connect(this, TQT_SIGNAL(documentAboutToChange()),
- m_bankEditor, TQT_SLOT(slotFileClose()));
+ connect(this, TQ_SIGNAL(documentAboutToChange()),
+ m_bankEditor, TQ_SLOT(slotFileClose()));
// Cheating way of updating the track/instrument list
//
- connect(m_bankEditor, TQT_SIGNAL(deviceNamesChanged()),
- m_view, TQT_SLOT(slotSynchroniseWithComposition()));
+ connect(m_bankEditor, TQ_SIGNAL(deviceNamesChanged()),
+ m_view, TQ_SLOT(slotSynchroniseWithComposition()));
m_bankEditor->show();
}
@@ -6800,11 +6800,11 @@ RosegardenGUIApp::slotManageTriggerSegments()
m_triggerSegmentManager = new TriggerSegmentManager(this, m_doc);
- connect(m_triggerSegmentManager, TQT_SIGNAL(closing()),
- TQT_SLOT(slotTriggerManagerClosed()));
+ connect(m_triggerSegmentManager, TQ_SIGNAL(closing()),
+ TQ_SLOT(slotTriggerManagerClosed()));
- connect(m_triggerSegmentManager, TQT_SIGNAL(editTriggerSegment(int)),
- m_view, TQT_SLOT(slotEditTriggerSegment(int)));
+ connect(m_triggerSegmentManager, TQ_SIGNAL(editTriggerSegment(int)),
+ m_view, TQ_SLOT(slotEditTriggerSegment(int)));
m_triggerSegmentManager->show();
}
@@ -6829,11 +6829,11 @@ RosegardenGUIApp::slotEditMarkers()
m_markerEditor = new MarkerEditor(this, m_doc);
- connect(m_markerEditor, TQT_SIGNAL(closing()),
- TQT_SLOT(slotMarkerEditorClosed()));
+ connect(m_markerEditor, TQ_SIGNAL(closing()),
+ TQ_SLOT(slotMarkerEditorClosed()));
- connect(m_markerEditor, TQT_SIGNAL(jumpToMarker(timeT)),
- m_doc, TQT_SLOT(slotSetPointerPosition(timeT)));
+ connect(m_markerEditor, TQ_SIGNAL(jumpToMarker(timeT)),
+ m_doc, TQ_SLOT(slotSetPointerPosition(timeT)));
plugAccelerators(m_markerEditor, m_markerEditor->getAccelerators());
@@ -6860,24 +6860,24 @@ RosegardenGUIApp::slotEditTempos(timeT t)
m_tempoView = new TempoView(m_doc, getView(), t);
- connect(m_tempoView, TQT_SIGNAL(closing()),
- TQT_SLOT(slotTempoViewClosed()));
+ connect(m_tempoView, TQ_SIGNAL(closing()),
+ TQ_SLOT(slotTempoViewClosed()));
- connect(m_tempoView, TQT_SIGNAL(windowActivated()),
- getView(), TQT_SLOT(slotActiveMainWindowChanged()));
+ connect(m_tempoView, TQ_SIGNAL(windowActivated()),
+ getView(), TQ_SLOT(slotActiveMainWindowChanged()));
connect(m_tempoView,
- TQT_SIGNAL(changeTempo(timeT,
+ TQ_SIGNAL(changeTempo(timeT,
tempoT,
tempoT,
TempoDialog::TempoDialogAction)),
this,
- TQT_SLOT(slotChangeTempo(timeT,
+ TQ_SLOT(slotChangeTempo(timeT,
tempoT,
tempoT,
TempoDialog::TempoDialogAction)));
- connect(m_tempoView, TQT_SIGNAL(saveFile()), this, TQT_SLOT(slotFileSave()));
+ connect(m_tempoView, TQ_SIGNAL(saveFile()), this, TQ_SLOT(slotFileSave()));
plugAccelerators(m_tempoView, m_tempoView->getAccelerators());
@@ -6960,12 +6960,12 @@ RosegardenGUIApp::slotShowPluginDialog(TQWidget *parent,
container,
index);
- connect(dialog, TQT_SIGNAL(windowActivated()),
- m_view, TQT_SLOT(slotActiveMainWindowChanged()));
+ connect(dialog, TQ_SIGNAL(windowActivated()),
+ m_view, TQ_SLOT(slotActiveMainWindowChanged()));
/* This feature isn't provided by the plugin dialog
- connect(m_view, TQT_SIGNAL(controllerDeviceEventReceived(MappedEvent *, const void *)),
- dialog, TQT_SLOT(slotControllerDeviceEventReceived(MappedEvent *, const void *)));
+ connect(m_view, TQ_SIGNAL(controllerDeviceEventReceived(MappedEvent *, const void *)),
+ dialog, TQ_SLOT(slotControllerDeviceEventReceived(MappedEvent *, const void *)));
*/
// Plug the new dialog into the standard keyboard accelerators so
@@ -6974,46 +6974,46 @@ RosegardenGUIApp::slotShowPluginDialog(TQWidget *parent,
plugAccelerators(dialog, dialog->getAccelerators());
connect(dialog,
- TQT_SIGNAL(pluginSelected(InstrumentId, int, int)),
+ TQ_SIGNAL(pluginSelected(InstrumentId, int, int)),
this,
- TQT_SLOT(slotPluginSelected(InstrumentId, int, int)));
+ TQ_SLOT(slotPluginSelected(InstrumentId, int, int)));
connect(dialog,
- TQT_SIGNAL(pluginPortChanged(InstrumentId, int, int)),
+ TQ_SIGNAL(pluginPortChanged(InstrumentId, int, int)),
this,
- TQT_SLOT(slotPluginPortChanged(InstrumentId, int, int)));
+ TQ_SLOT(slotPluginPortChanged(InstrumentId, int, int)));
connect(dialog,
- TQT_SIGNAL(pluginProgramChanged(InstrumentId, int)),
+ TQ_SIGNAL(pluginProgramChanged(InstrumentId, int)),
this,
- TQT_SLOT(slotPluginProgramChanged(InstrumentId, int)));
+ TQ_SLOT(slotPluginProgramChanged(InstrumentId, int)));
connect(dialog,
- TQT_SIGNAL(changePluginConfiguration(InstrumentId, int, bool, TQString, TQString)),
+ TQ_SIGNAL(changePluginConfiguration(InstrumentId, int, bool, TQString, TQString)),
this,
- TQT_SLOT(slotChangePluginConfiguration(InstrumentId, int, bool, TQString, TQString)));
+ TQ_SLOT(slotChangePluginConfiguration(InstrumentId, int, bool, TQString, TQString)));
connect(dialog,
- TQT_SIGNAL(showPluginGUI(InstrumentId, int)),
+ TQ_SIGNAL(showPluginGUI(InstrumentId, int)),
this,
- TQT_SLOT(slotShowPluginGUI(InstrumentId, int)));
+ TQ_SLOT(slotShowPluginGUI(InstrumentId, int)));
connect(dialog,
- TQT_SIGNAL(stopPluginGUI(InstrumentId, int)),
+ TQ_SIGNAL(stopPluginGUI(InstrumentId, int)),
this,
- TQT_SLOT(slotStopPluginGUI(InstrumentId, int)));
+ TQ_SLOT(slotStopPluginGUI(InstrumentId, int)));
connect(dialog,
- TQT_SIGNAL(bypassed(InstrumentId, int, bool)),
+ TQ_SIGNAL(bypassed(InstrumentId, int, bool)),
this,
- TQT_SLOT(slotPluginBypassed(InstrumentId, int, bool)));
+ TQ_SLOT(slotPluginBypassed(InstrumentId, int, bool)));
connect(dialog,
- TQT_SIGNAL(destroyed(InstrumentId, int)),
+ TQ_SIGNAL(destroyed(InstrumentId, int)),
this,
- TQT_SLOT(slotPluginDialogDestroyed(InstrumentId, int)));
+ TQ_SLOT(slotPluginDialogDestroyed(InstrumentId, int)));
- connect(this, TQT_SIGNAL(documentAboutToChange()), dialog, TQT_SLOT(close()));
+ connect(this, TQ_SIGNAL(documentAboutToChange()), dialog, TQ_SLOT(close()));
m_pluginDialogs[key] = dialog;
m_pluginDialogs[key]->show();
@@ -7535,10 +7535,10 @@ RosegardenGUIApp::slotPlayList()
{
if (!m_playList) {
m_playList = new PlayListDialog(i18n("Play List"), this);
- connect(m_playList, TQT_SIGNAL(closing()),
- TQT_SLOT(slotPlayListClosed()));
- connect(m_playList->getPlayList(), TQT_SIGNAL(play(TQString)),
- TQT_SLOT(slotPlayListPlay(TQString)));
+ connect(m_playList, TQ_SIGNAL(closing()),
+ TQ_SLOT(slotPlayListClosed()));
+ connect(m_playList->getPlayList(), TQ_SIGNAL(play(TQString)),
+ TQ_SLOT(slotPlayListPlay(TQString)));
}
m_playList->show();
@@ -7682,10 +7682,10 @@ RosegardenGUIApp::slotPanic()
(&progressDlg);
ProgressDialog::processEvents();
- connect(m_seqManager, TQT_SIGNAL(setProgress(int)),
- progressDlg.progressBar(), TQT_SLOT(setValue(int)));
- connect(m_seqManager, TQT_SIGNAL(incrementProgress(int)),
- progressDlg.progressBar(), TQT_SLOT(advance(int)));
+ connect(m_seqManager, TQ_SIGNAL(setProgress(int)),
+ progressDlg.progressBar(), TQ_SLOT(setValue(int)));
+ connect(m_seqManager, TQ_SIGNAL(incrementProgress(int)),
+ progressDlg.progressBar(), TQ_SLOT(advance(int)));
m_seqManager->panic();
@@ -7717,9 +7717,9 @@ RosegardenGUIApp::slotRemapInstruments()
RG_DEBUG << "RosegardenGUIApp::slotRemapInstruments\n";
RemapInstrumentDialog dialog(this, m_doc);
- connect(&dialog, TQT_SIGNAL(applyClicked()),
+ connect(&dialog, TQ_SIGNAL(applyClicked()),
m_view->getTrackEditor()->getTrackButtons(),
- TQT_SLOT(slotSynchroniseWithComposition()));
+ TQ_SLOT(slotSynchroniseWithComposition()));
if (dialog.exec() == TQDialog::Accepted) {
RG_DEBUG << "slotRemapInstruments - accepted\n";
diff --git a/src/gui/application/RosegardenGUIView.cpp b/src/gui/application/RosegardenGUIView.cpp
index b8ba4ef..03e437e 100644
--- a/src/gui/application/RosegardenGUIView.cpp
+++ b/src/gui/application/RosegardenGUIView.cpp
@@ -139,91 +139,91 @@ RosegardenGUIView::RosegardenGUIView(bool showTrackLabels,
m_rulerScale, showTrackLabels, unitsPerPixel, this /*hbox*/);
connect(m_trackEditor->getSegmentCanvas(),
- TQT_SIGNAL(editSegment(Segment*)),
- TQT_SLOT(slotEditSegment(Segment*)));
+ TQ_SIGNAL(editSegment(Segment*)),
+ TQ_SLOT(slotEditSegment(Segment*)));
connect(m_trackEditor->getSegmentCanvas(),
- TQT_SIGNAL(editSegmentNotation(Segment*)),
- TQT_SLOT(slotEditSegmentNotation(Segment*)));
+ TQ_SIGNAL(editSegmentNotation(Segment*)),
+ TQ_SLOT(slotEditSegmentNotation(Segment*)));
connect(m_trackEditor->getSegmentCanvas(),
- TQT_SIGNAL(editSegmentMatrix(Segment*)),
- TQT_SLOT(slotEditSegmentMatrix(Segment*)));
+ TQ_SIGNAL(editSegmentMatrix(Segment*)),
+ TQ_SLOT(slotEditSegmentMatrix(Segment*)));
connect(m_trackEditor->getSegmentCanvas(),
- TQT_SIGNAL(editSegmentAudio(Segment*)),
- TQT_SLOT(slotEditSegmentAudio(Segment*)));
+ TQ_SIGNAL(editSegmentAudio(Segment*)),
+ TQ_SLOT(slotEditSegmentAudio(Segment*)));
connect(m_trackEditor->getSegmentCanvas(),
- TQT_SIGNAL(audioSegmentAutoSplit(Segment*)),
- TQT_SLOT(slotSegmentAutoSplit(Segment*)));
+ TQ_SIGNAL(audioSegmentAutoSplit(Segment*)),
+ TQ_SLOT(slotSegmentAutoSplit(Segment*)));
connect(m_trackEditor->getSegmentCanvas(),
- TQT_SIGNAL(editSegmentEventList(Segment*)),
- TQT_SLOT(slotEditSegmentEventList(Segment*)));
+ TQ_SIGNAL(editSegmentEventList(Segment*)),
+ TQ_SLOT(slotEditSegmentEventList(Segment*)));
connect(m_trackEditor->getSegmentCanvas(),
- TQT_SIGNAL(editRepeat(Segment*, timeT)),
- TQT_SLOT(slotEditRepeat(Segment*, timeT)));
+ TQ_SIGNAL(editRepeat(Segment*, timeT)),
+ TQ_SLOT(slotEditRepeat(Segment*, timeT)));
connect(m_trackEditor->getSegmentCanvas(),
- TQT_SIGNAL(setPointerPosition(timeT)),
- doc, TQT_SLOT(slotSetPointerPosition(timeT)));
+ TQ_SIGNAL(setPointerPosition(timeT)),
+ doc, TQ_SLOT(slotSetPointerPosition(timeT)));
connect(m_trackEditor,
- TQT_SIGNAL(droppedDocument(TQString)),
+ TQ_SIGNAL(droppedDocument(TQString)),
parent,
- TQT_SLOT(slotOpenDroppedURL(TQString)));
+ TQ_SLOT(slotOpenDroppedURL(TQString)));
connect(m_trackEditor,
- TQT_SIGNAL(droppedAudio(TQString)),
+ TQ_SIGNAL(droppedAudio(TQString)),
this,
- TQT_SLOT(slotDroppedAudio(TQString)));
+ TQ_SLOT(slotDroppedAudio(TQString)));
connect(m_trackEditor,
- TQT_SIGNAL(droppedNewAudio(TQString)),
+ TQ_SIGNAL(droppedNewAudio(TQString)),
this,
- TQT_SLOT(slotDroppedNewAudio(TQString)));
+ TQ_SLOT(slotDroppedNewAudio(TQString)));
connect(m_instrumentParameterBox,
- TQT_SIGNAL(changeInstrumentLabel(InstrumentId, TQString)),
+ TQ_SIGNAL(changeInstrumentLabel(InstrumentId, TQString)),
this,
- TQT_SLOT(slotChangeInstrumentLabel(InstrumentId, TQString)));
+ TQ_SLOT(slotChangeInstrumentLabel(InstrumentId, TQString)));
connect(m_instrumentParameterBox,
- TQT_SIGNAL(changeInstrumentLabel(InstrumentId, TQString)),
+ TQ_SIGNAL(changeInstrumentLabel(InstrumentId, TQString)),
m_trackParameterBox,
- TQT_SLOT(slotInstrumentLabelChanged(InstrumentId, TQString)));
+ TQ_SLOT(slotInstrumentLabelChanged(InstrumentId, TQString)));
connect(m_trackEditor->getTrackButtons(),
- TQT_SIGNAL(nameChanged()),
+ TQ_SIGNAL(nameChanged()),
m_trackParameterBox,
- TQT_SLOT(slotSelectedTrackNameChanged()));
+ TQ_SLOT(slotSelectedTrackNameChanged()));
connect(m_trackEditor->getTrackButtons(),
- TQT_SIGNAL(instrumentSelected(int)),
+ TQ_SIGNAL(instrumentSelected(int)),
m_trackParameterBox,
- TQT_SLOT(slotUpdateControls(int)));
+ TQ_SLOT(slotUpdateControls(int)));
connect(m_trackParameterBox,
- TQT_SIGNAL(instrumentSelected(TrackId, int)),
+ TQ_SIGNAL(instrumentSelected(TrackId, int)),
m_trackEditor->getTrackButtons(),
- TQT_SLOT(slotTrackInstrumentSelection(TrackId, int)));
+ TQ_SLOT(slotTrackInstrumentSelection(TrackId, int)));
- connect(this, TQT_SIGNAL(controllerDeviceEventReceived(MappedEvent *, const void *)),
- this, TQT_SLOT(slotControllerDeviceEventReceived(MappedEvent *, const void *)));
+ connect(this, TQ_SIGNAL(controllerDeviceEventReceived(MappedEvent *, const void *)),
+ this, TQ_SLOT(slotControllerDeviceEventReceived(MappedEvent *, const void *)));
if (doc) {
/* signal no longer exists
- connect(doc, TQT_SIGNAL(recordingSegmentUpdated(Segment *,
+ connect(doc, TQ_SIGNAL(recordingSegmentUpdated(Segment *,
timeT)),
- this, TQT_SLOT(slotUpdateRecordingSegment(Segment *,
+ this, TQ_SLOT(slotUpdateRecordingSegment(Segment *,
timeT)));
*/
TQObject::connect
- (getCommandHistory(), TQT_SIGNAL(commandExecuted()),
- m_trackEditor->getSegmentCanvas(), TQT_SLOT(slotUpdateSegmentsDrawBuffer()));
+ (getCommandHistory(), TQ_SIGNAL(commandExecuted()),
+ m_trackEditor->getSegmentCanvas(), TQ_SLOT(slotUpdateSegmentsDrawBuffer()));
}
}
@@ -455,77 +455,77 @@ RosegardenGUIView::createNotationView(std::vector<Segment *> segmentsToEdit)
// For tempo changes (ugh -- it'd be nicer to make a tempo change
// command that could interpret all this stuff from the dialog)
//
- connect(notationView, TQT_SIGNAL(changeTempo(timeT,
+ connect(notationView, TQ_SIGNAL(changeTempo(timeT,
tempoT,
tempoT,
TempoDialog::TempoDialogAction)),
- RosegardenGUIApp::self(), TQT_SLOT(slotChangeTempo(timeT,
+ RosegardenGUIApp::self(), TQ_SLOT(slotChangeTempo(timeT,
tempoT,
tempoT,
TempoDialog::TempoDialogAction)));
- connect(notationView, TQT_SIGNAL(windowActivated()),
- this, TQT_SLOT(slotActiveMainWindowChanged()));
-
- connect(notationView, TQT_SIGNAL(selectTrack(int)),
- this, TQT_SLOT(slotSelectTrackSegments(int)));
-
- connect(notationView, TQT_SIGNAL(play()),
- RosegardenGUIApp::self(), TQT_SLOT(slotPlay()));
- connect(notationView, TQT_SIGNAL(stop()),
- RosegardenGUIApp::self(), TQT_SLOT(slotStop()));
- connect(notationView, TQT_SIGNAL(fastForwardPlayback()),
- RosegardenGUIApp::self(), TQT_SLOT(slotFastforward()));
- connect(notationView, TQT_SIGNAL(rewindPlayback()),
- RosegardenGUIApp::self(), TQT_SLOT(slotRewind()));
- connect(notationView, TQT_SIGNAL(fastForwardPlaybackToEnd()),
- RosegardenGUIApp::self(), TQT_SLOT(slotFastForwardToEnd()));
- connect(notationView, TQT_SIGNAL(rewindPlaybackToBeginning()),
- RosegardenGUIApp::self(), TQT_SLOT(slotRewindToBeginning()));
- connect(notationView, TQT_SIGNAL(panic()),
- RosegardenGUIApp::self(), TQT_SLOT(slotPanic()));
-
- connect(notationView, TQT_SIGNAL(saveFile()),
- RosegardenGUIApp::self(), TQT_SLOT(slotFileSave()));
- connect(notationView, TQT_SIGNAL(jumpPlaybackTo(timeT)),
- getDocument(), TQT_SLOT(slotSetPointerPosition(timeT)));
- connect(notationView, TQT_SIGNAL(openInNotation(std::vector<Segment *>)),
- this, TQT_SLOT(slotEditSegmentsNotation(std::vector<Segment *>)));
- connect(notationView, TQT_SIGNAL(openInMatrix(std::vector<Segment *>)),
- this, TQT_SLOT(slotEditSegmentsMatrix(std::vector<Segment *>)));
- connect(notationView, TQT_SIGNAL(openInPercussionMatrix(std::vector<Segment *>)),
- this, TQT_SLOT(slotEditSegmentsPercussionMatrix(std::vector<Segment *>)));
- connect(notationView, TQT_SIGNAL(openInEventList(std::vector<Segment *>)),
- this, TQT_SLOT(slotEditSegmentsEventList(std::vector<Segment *>)));
+ connect(notationView, TQ_SIGNAL(windowActivated()),
+ this, TQ_SLOT(slotActiveMainWindowChanged()));
+
+ connect(notationView, TQ_SIGNAL(selectTrack(int)),
+ this, TQ_SLOT(slotSelectTrackSegments(int)));
+
+ connect(notationView, TQ_SIGNAL(play()),
+ RosegardenGUIApp::self(), TQ_SLOT(slotPlay()));
+ connect(notationView, TQ_SIGNAL(stop()),
+ RosegardenGUIApp::self(), TQ_SLOT(slotStop()));
+ connect(notationView, TQ_SIGNAL(fastForwardPlayback()),
+ RosegardenGUIApp::self(), TQ_SLOT(slotFastforward()));
+ connect(notationView, TQ_SIGNAL(rewindPlayback()),
+ RosegardenGUIApp::self(), TQ_SLOT(slotRewind()));
+ connect(notationView, TQ_SIGNAL(fastForwardPlaybackToEnd()),
+ RosegardenGUIApp::self(), TQ_SLOT(slotFastForwardToEnd()));
+ connect(notationView, TQ_SIGNAL(rewindPlaybackToBeginning()),
+ RosegardenGUIApp::self(), TQ_SLOT(slotRewindToBeginning()));
+ connect(notationView, TQ_SIGNAL(panic()),
+ RosegardenGUIApp::self(), TQ_SLOT(slotPanic()));
+
+ connect(notationView, TQ_SIGNAL(saveFile()),
+ RosegardenGUIApp::self(), TQ_SLOT(slotFileSave()));
+ connect(notationView, TQ_SIGNAL(jumpPlaybackTo(timeT)),
+ getDocument(), TQ_SLOT(slotSetPointerPosition(timeT)));
+ connect(notationView, TQ_SIGNAL(openInNotation(std::vector<Segment *>)),
+ this, TQ_SLOT(slotEditSegmentsNotation(std::vector<Segment *>)));
+ connect(notationView, TQ_SIGNAL(openInMatrix(std::vector<Segment *>)),
+ this, TQ_SLOT(slotEditSegmentsMatrix(std::vector<Segment *>)));
+ connect(notationView, TQ_SIGNAL(openInPercussionMatrix(std::vector<Segment *>)),
+ this, TQ_SLOT(slotEditSegmentsPercussionMatrix(std::vector<Segment *>)));
+ connect(notationView, TQ_SIGNAL(openInEventList(std::vector<Segment *>)),
+ this, TQ_SLOT(slotEditSegmentsEventList(std::vector<Segment *>)));
/* hjj: WHAT DO DO WITH THIS ?
- connect(notationView, TQT_SIGNAL(editMetadata(TQString)),
- this, TQT_SLOT(slotEditMetadata(TQString)));
+ connect(notationView, TQ_SIGNAL(editMetadata(TQString)),
+ this, TQ_SLOT(slotEditMetadata(TQString)));
*/
- connect(notationView, TQT_SIGNAL(editTriggerSegment(int)),
- this, TQT_SLOT(slotEditTriggerSegment(int)));
- connect(notationView, TQT_SIGNAL(staffLabelChanged(TrackId, TQString)),
- this, TQT_SLOT(slotChangeTrackLabel(TrackId, TQString)));
- connect(notationView, TQT_SIGNAL(toggleSolo(bool)),
- RosegardenGUIApp::self(), TQT_SLOT(slotToggleSolo(bool)));
- connect(notationView, TQT_SIGNAL(editTimeSignature(timeT)),
- RosegardenGUIApp::self(), TQT_SLOT(slotEditTempos(timeT)));
+ connect(notationView, TQ_SIGNAL(editTriggerSegment(int)),
+ this, TQ_SLOT(slotEditTriggerSegment(int)));
+ connect(notationView, TQ_SIGNAL(staffLabelChanged(TrackId, TQString)),
+ this, TQ_SLOT(slotChangeTrackLabel(TrackId, TQString)));
+ connect(notationView, TQ_SIGNAL(toggleSolo(bool)),
+ RosegardenGUIApp::self(), TQ_SLOT(slotToggleSolo(bool)));
+ connect(notationView, TQ_SIGNAL(editTimeSignature(timeT)),
+ RosegardenGUIApp::self(), TQ_SLOT(slotEditTempos(timeT)));
SequenceManager *sM = getDocument()->getSequenceManager();
- connect(sM, TQT_SIGNAL(insertableNoteOnReceived(int, int)),
- notationView, TQT_SLOT(slotInsertableNoteOnReceived(int, int)));
- connect(sM, TQT_SIGNAL(insertableNoteOffReceived(int, int)),
- notationView, TQT_SLOT(slotInsertableNoteOffReceived(int, int)));
+ connect(sM, TQ_SIGNAL(insertableNoteOnReceived(int, int)),
+ notationView, TQ_SLOT(slotInsertableNoteOnReceived(int, int)));
+ connect(sM, TQ_SIGNAL(insertableNoteOffReceived(int, int)),
+ notationView, TQ_SLOT(slotInsertableNoteOffReceived(int, int)));
- connect(notationView, TQT_SIGNAL(stepByStepTargetRequested(TQObject *)),
- this, TQT_SIGNAL(stepByStepTargetRequested(TQObject *)));
- connect(this, TQT_SIGNAL(stepByStepTargetRequested(TQObject *)),
- notationView, TQT_SLOT(slotStepByStepTargetRequested(TQObject *)));
- connect(RosegardenGUIApp::self(), TQT_SIGNAL(compositionStateUpdate()),
- notationView, TQT_SLOT(slotCompositionStateUpdate()));
- connect(this, TQT_SIGNAL(compositionStateUpdate()),
- notationView, TQT_SLOT(slotCompositionStateUpdate()));
+ connect(notationView, TQ_SIGNAL(stepByStepTargetRequested(TQObject *)),
+ this, TQ_SIGNAL(stepByStepTargetRequested(TQObject *)));
+ connect(this, TQ_SIGNAL(stepByStepTargetRequested(TQObject *)),
+ notationView, TQ_SLOT(slotStepByStepTargetRequested(TQObject *)));
+ connect(RosegardenGUIApp::self(), TQ_SIGNAL(compositionStateUpdate()),
+ notationView, TQ_SLOT(slotCompositionStateUpdate()));
+ connect(this, TQ_SIGNAL(compositionStateUpdate()),
+ notationView, TQ_SLOT(slotCompositionStateUpdate()));
// Encourage the notation view window to open to the same
// interval as the current segment view
@@ -657,73 +657,73 @@ RosegardenGUIView::createMatrixView(std::vector<Segment *> segmentsToEdit, bool
// For tempo changes (ugh -- it'd be nicer to make a tempo change
// command that could interpret all this stuff from the dialog)
//
- connect(matrixView, TQT_SIGNAL(changeTempo(timeT,
+ connect(matrixView, TQ_SIGNAL(changeTempo(timeT,
tempoT,
tempoT,
TempoDialog::TempoDialogAction)),
- RosegardenGUIApp::self(), TQT_SLOT(slotChangeTempo(timeT,
+ RosegardenGUIApp::self(), TQ_SLOT(slotChangeTempo(timeT,
tempoT,
tempoT,
TempoDialog::TempoDialogAction)));
- connect(matrixView, TQT_SIGNAL(windowActivated()),
- this, TQT_SLOT(slotActiveMainWindowChanged()));
-
- connect(matrixView, TQT_SIGNAL(selectTrack(int)),
- this, TQT_SLOT(slotSelectTrackSegments(int)));
-
- connect(matrixView, TQT_SIGNAL(play()),
- RosegardenGUIApp::self(), TQT_SLOT(slotPlay()));
- connect(matrixView, TQT_SIGNAL(stop()),
- RosegardenGUIApp::self(), TQT_SLOT(slotStop()));
- connect(matrixView, TQT_SIGNAL(fastForwardPlayback()),
- RosegardenGUIApp::self(), TQT_SLOT(slotFastforward()));
- connect(matrixView, TQT_SIGNAL(rewindPlayback()),
- RosegardenGUIApp::self(), TQT_SLOT(slotRewind()));
- connect(matrixView, TQT_SIGNAL(fastForwardPlaybackToEnd()),
- RosegardenGUIApp::self(), TQT_SLOT(slotFastForwardToEnd()));
- connect(matrixView, TQT_SIGNAL(rewindPlaybackToBeginning()),
- RosegardenGUIApp::self(), TQT_SLOT(slotRewindToBeginning()));
- connect(matrixView, TQT_SIGNAL(panic()),
- RosegardenGUIApp::self(), TQT_SLOT(slotPanic()));
-
- connect(matrixView, TQT_SIGNAL(saveFile()),
- RosegardenGUIApp::self(), TQT_SLOT(slotFileSave()));
- connect(matrixView, TQT_SIGNAL(jumpPlaybackTo(timeT)),
- getDocument(), TQT_SLOT(slotSetPointerPosition(timeT)));
- connect(matrixView, TQT_SIGNAL(openInNotation(std::vector<Segment *>)),
- this, TQT_SLOT(slotEditSegmentsNotation(std::vector<Segment *>)));
- connect(matrixView, TQT_SIGNAL(openInMatrix(std::vector<Segment *>)),
- this, TQT_SLOT(slotEditSegmentsMatrix(std::vector<Segment *>)));
- connect(matrixView, TQT_SIGNAL(openInEventList(std::vector<Segment *>)),
- this, TQT_SLOT(slotEditSegmentsEventList(std::vector<Segment *>)));
- connect(matrixView, TQT_SIGNAL(editTriggerSegment(int)),
- this, TQT_SLOT(slotEditTriggerSegment(int)));
- connect(matrixView, TQT_SIGNAL(toggleSolo(bool)),
- RosegardenGUIApp::self(), TQT_SLOT(slotToggleSolo(bool)));
- connect(matrixView, TQT_SIGNAL(editTimeSignature(timeT)),
- RosegardenGUIApp::self(), TQT_SLOT(slotEditTempos(timeT)));
+ connect(matrixView, TQ_SIGNAL(windowActivated()),
+ this, TQ_SLOT(slotActiveMainWindowChanged()));
+
+ connect(matrixView, TQ_SIGNAL(selectTrack(int)),
+ this, TQ_SLOT(slotSelectTrackSegments(int)));
+
+ connect(matrixView, TQ_SIGNAL(play()),
+ RosegardenGUIApp::self(), TQ_SLOT(slotPlay()));
+ connect(matrixView, TQ_SIGNAL(stop()),
+ RosegardenGUIApp::self(), TQ_SLOT(slotStop()));
+ connect(matrixView, TQ_SIGNAL(fastForwardPlayback()),
+ RosegardenGUIApp::self(), TQ_SLOT(slotFastforward()));
+ connect(matrixView, TQ_SIGNAL(rewindPlayback()),
+ RosegardenGUIApp::self(), TQ_SLOT(slotRewind()));
+ connect(matrixView, TQ_SIGNAL(fastForwardPlaybackToEnd()),
+ RosegardenGUIApp::self(), TQ_SLOT(slotFastForwardToEnd()));
+ connect(matrixView, TQ_SIGNAL(rewindPlaybackToBeginning()),
+ RosegardenGUIApp::self(), TQ_SLOT(slotRewindToBeginning()));
+ connect(matrixView, TQ_SIGNAL(panic()),
+ RosegardenGUIApp::self(), TQ_SLOT(slotPanic()));
+
+ connect(matrixView, TQ_SIGNAL(saveFile()),
+ RosegardenGUIApp::self(), TQ_SLOT(slotFileSave()));
+ connect(matrixView, TQ_SIGNAL(jumpPlaybackTo(timeT)),
+ getDocument(), TQ_SLOT(slotSetPointerPosition(timeT)));
+ connect(matrixView, TQ_SIGNAL(openInNotation(std::vector<Segment *>)),
+ this, TQ_SLOT(slotEditSegmentsNotation(std::vector<Segment *>)));
+ connect(matrixView, TQ_SIGNAL(openInMatrix(std::vector<Segment *>)),
+ this, TQ_SLOT(slotEditSegmentsMatrix(std::vector<Segment *>)));
+ connect(matrixView, TQ_SIGNAL(openInEventList(std::vector<Segment *>)),
+ this, TQ_SLOT(slotEditSegmentsEventList(std::vector<Segment *>)));
+ connect(matrixView, TQ_SIGNAL(editTriggerSegment(int)),
+ this, TQ_SLOT(slotEditTriggerSegment(int)));
+ connect(matrixView, TQ_SIGNAL(toggleSolo(bool)),
+ RosegardenGUIApp::self(), TQ_SLOT(slotToggleSolo(bool)));
+ connect(matrixView, TQ_SIGNAL(editTimeSignature(timeT)),
+ RosegardenGUIApp::self(), TQ_SLOT(slotEditTempos(timeT)));
SequenceManager *sM = getDocument()->getSequenceManager();
- connect(sM, TQT_SIGNAL(insertableNoteOnReceived(int, int)),
- matrixView, TQT_SLOT(slotInsertableNoteOnReceived(int, int)));
- connect(sM, TQT_SIGNAL(insertableNoteOffReceived(int, int)),
- matrixView, TQT_SLOT(slotInsertableNoteOffReceived(int, int)));
-
- connect(matrixView, TQT_SIGNAL(stepByStepTargetRequested(TQObject *)),
- this, TQT_SIGNAL(stepByStepTargetRequested(TQObject *)));
- connect(this, TQT_SIGNAL(stepByStepTargetRequested(TQObject *)),
- matrixView, TQT_SLOT(slotStepByStepTargetRequested(TQObject *)));
- connect(RosegardenGUIApp::self(), TQT_SIGNAL(compositionStateUpdate()),
- matrixView, TQT_SLOT(slotCompositionStateUpdate()));
- connect(this, TQT_SIGNAL(compositionStateUpdate()),
- matrixView, TQT_SLOT(slotCompositionStateUpdate()));
+ connect(sM, TQ_SIGNAL(insertableNoteOnReceived(int, int)),
+ matrixView, TQ_SLOT(slotInsertableNoteOnReceived(int, int)));
+ connect(sM, TQ_SIGNAL(insertableNoteOffReceived(int, int)),
+ matrixView, TQ_SLOT(slotInsertableNoteOffReceived(int, int)));
+
+ connect(matrixView, TQ_SIGNAL(stepByStepTargetRequested(TQObject *)),
+ this, TQ_SIGNAL(stepByStepTargetRequested(TQObject *)));
+ connect(this, TQ_SIGNAL(stepByStepTargetRequested(TQObject *)),
+ matrixView, TQ_SLOT(slotStepByStepTargetRequested(TQObject *)));
+ connect(RosegardenGUIApp::self(), TQ_SIGNAL(compositionStateUpdate()),
+ matrixView, TQ_SLOT(slotCompositionStateUpdate()));
+ connect(this, TQ_SIGNAL(compositionStateUpdate()),
+ matrixView, TQ_SLOT(slotCompositionStateUpdate()));
connect(this,
- TQT_SIGNAL(instrumentLevelsChanged(InstrumentId,
+ TQ_SIGNAL(instrumentLevelsChanged(InstrumentId,
const LevelInfo &)),
matrixView,
- TQT_SLOT(slotInstrumentLevelsChanged(InstrumentId,
+ TQ_SLOT(slotInstrumentLevelsChanged(InstrumentId,
const LevelInfo &)));
// Encourage the matrix view window to open to the same
@@ -1543,12 +1543,12 @@ RosegardenGUIView::slotDroppedNewAudio(TQString audioDesc)
// Connect the progress dialog
//
- connect(&aFM, TQT_SIGNAL(setProgress(int)),
- progressDlg.progressBar(), TQT_SLOT(setValue(int)));
- connect(&aFM, TQT_SIGNAL(setOperationName(TQString)),
- &progressDlg, TQT_SLOT(slotSetOperationName(TQString)));
- connect(&progressDlg, TQT_SIGNAL(cancelClicked()),
- &aFM, TQT_SLOT(slotStopImport()));
+ connect(&aFM, TQ_SIGNAL(setProgress(int)),
+ progressDlg.progressBar(), TQ_SLOT(setValue(int)));
+ connect(&aFM, TQ_SIGNAL(setOperationName(TQString)),
+ &progressDlg, TQ_SLOT(slotSetOperationName(TQString)));
+ connect(&progressDlg, TQ_SIGNAL(cancelClicked()),
+ &aFM, TQ_SLOT(slotStopImport()));
try {
audioFileId = aFM.importURL(kurl, sampleRate);
@@ -1564,10 +1564,10 @@ RosegardenGUIView::slotDroppedNewAudio(TQString audioDesc)
return ;
}
- disconnect(&progressDlg, TQT_SIGNAL(cancelClicked()),
- &aFM, TQT_SLOT(slotStopImport()));
- connect(&progressDlg, TQT_SIGNAL(cancelClicked()),
- &aFM, TQT_SLOT(slotStopPreview()));
+ disconnect(&progressDlg, TQ_SIGNAL(cancelClicked()),
+ &aFM, TQ_SLOT(slotStopImport()));
+ connect(&progressDlg, TQ_SIGNAL(cancelClicked()),
+ &aFM, TQ_SLOT(slotStopPreview()));
progressDlg.progressBar()->show();
progressDlg.slotSetOperationName(i18n("Generating audio preview..."));
@@ -1581,8 +1581,8 @@ RosegardenGUIView::slotDroppedNewAudio(TQString audioDesc)
//return false;
}
- disconnect(&progressDlg, TQT_SIGNAL(cancelClicked()),
- &aFM, TQT_SLOT(slotStopPreview()));
+ disconnect(&progressDlg, TQ_SIGNAL(cancelClicked()),
+ &aFM, TQ_SLOT(slotStopPreview()));
// add the file at the sequencer
emit addAudioFile(audioFileId);
@@ -1747,8 +1747,8 @@ RosegardenGUIView::slotUpdateRecordingSegment(Segment *segment,
/* signal no longer exists
TQObject::connect
- (getDocument(), TQT_SIGNAL(recordingSegmentUpdated(Segment *, timeT)),
- view, TQT_SLOT(slotUpdateRecordingSegment(Segment *, timeT)));
+ (getDocument(), TQ_SIGNAL(recordingSegmentUpdated(Segment *, timeT)),
+ view, TQ_SLOT(slotUpdateRecordingSegment(Segment *, timeT)));
*/
view->show();
@@ -1998,31 +1998,31 @@ RosegardenGUIView::createEventView(std::vector<Segment *> segmentsToEdit)
segmentsToEdit,
this);
- connect(eventView, TQT_SIGNAL(windowActivated()),
- this, TQT_SLOT(slotActiveMainWindowChanged()));
-
- connect(eventView, TQT_SIGNAL(selectTrack(int)),
- this, TQT_SLOT(slotSelectTrackSegments(int)));
-
- connect(eventView, TQT_SIGNAL(saveFile()),
- RosegardenGUIApp::self(), TQT_SLOT(slotFileSave()));
-
- connect(eventView, TQT_SIGNAL(openInNotation(std::vector<Segment *>)),
- this, TQT_SLOT(slotEditSegmentsNotation(std::vector<Segment *>)));
- connect(eventView, TQT_SIGNAL(openInMatrix(std::vector<Segment *>)),
- this, TQT_SLOT(slotEditSegmentsMatrix(std::vector<Segment *>)));
- connect(eventView, TQT_SIGNAL(openInPercussionMatrix(std::vector<Segment *>)),
- this, TQT_SLOT(slotEditSegmentsPercussionMatrix(std::vector<Segment *>)));
- connect(eventView, TQT_SIGNAL(openInEventList(std::vector<Segment *>)),
- this, TQT_SLOT(slotEditSegmentsEventList(std::vector<Segment *>)));
- connect(eventView, TQT_SIGNAL(editTriggerSegment(int)),
- this, TQT_SLOT(slotEditTriggerSegment(int)));
- connect(this, TQT_SIGNAL(compositionStateUpdate()),
- eventView, TQT_SLOT(slotCompositionStateUpdate()));
- connect(RosegardenGUIApp::self(), TQT_SIGNAL(compositionStateUpdate()),
- eventView, TQT_SLOT(slotCompositionStateUpdate()));
- connect(eventView, TQT_SIGNAL(toggleSolo(bool)),
- RosegardenGUIApp::self(), TQT_SLOT(slotToggleSolo(bool)));
+ connect(eventView, TQ_SIGNAL(windowActivated()),
+ this, TQ_SLOT(slotActiveMainWindowChanged()));
+
+ connect(eventView, TQ_SIGNAL(selectTrack(int)),
+ this, TQ_SLOT(slotSelectTrackSegments(int)));
+
+ connect(eventView, TQ_SIGNAL(saveFile()),
+ RosegardenGUIApp::self(), TQ_SLOT(slotFileSave()));
+
+ connect(eventView, TQ_SIGNAL(openInNotation(std::vector<Segment *>)),
+ this, TQ_SLOT(slotEditSegmentsNotation(std::vector<Segment *>)));
+ connect(eventView, TQ_SIGNAL(openInMatrix(std::vector<Segment *>)),
+ this, TQ_SLOT(slotEditSegmentsMatrix(std::vector<Segment *>)));
+ connect(eventView, TQ_SIGNAL(openInPercussionMatrix(std::vector<Segment *>)),
+ this, TQ_SLOT(slotEditSegmentsPercussionMatrix(std::vector<Segment *>)));
+ connect(eventView, TQ_SIGNAL(openInEventList(std::vector<Segment *>)),
+ this, TQ_SLOT(slotEditSegmentsEventList(std::vector<Segment *>)));
+ connect(eventView, TQ_SIGNAL(editTriggerSegment(int)),
+ this, TQ_SLOT(slotEditTriggerSegment(int)));
+ connect(this, TQ_SIGNAL(compositionStateUpdate()),
+ eventView, TQ_SLOT(slotCompositionStateUpdate()));
+ connect(RosegardenGUIApp::self(), TQ_SIGNAL(compositionStateUpdate()),
+ eventView, TQ_SLOT(slotCompositionStateUpdate()));
+ connect(eventView, TQ_SIGNAL(toggleSolo(bool)),
+ RosegardenGUIApp::self(), TQ_SLOT(slotToggleSolo(bool)));
// create keyboard accelerators on view
//
diff --git a/src/gui/application/StartupTester.cpp b/src/gui/application/StartupTester.cpp
index 7bb40a6..84e84aa 100644
--- a/src/gui/application/StartupTester.cpp
+++ b/src/gui/application/StartupTester.cpp
@@ -42,10 +42,10 @@ StartupTester::StartupTester() :
m_haveAudioFileImporter(false)
{
TQHttp *http = new TQHttp();
- connect(http, TQT_SIGNAL(responseHeaderReceived(const TQHttpResponseHeader &)),
- this, TQT_SLOT(slotHttpResponseHeaderReceived(const TQHttpResponseHeader &)));
- connect(http, TQT_SIGNAL(done(bool)),
- this, TQT_SLOT(slotHttpDone(bool)));
+ connect(http, TQ_SIGNAL(responseHeaderReceived(const TQHttpResponseHeader &)),
+ this, TQ_SLOT(slotHttpResponseHeaderReceived(const TQHttpResponseHeader &)));
+ connect(http, TQ_SIGNAL(done(bool)),
+ this, TQ_SLOT(slotHttpDone(bool)));
m_versionHttpFailed = false;
http->setHost("www.rosegardenmusic.com");
http->get("/latest-version.txt");
@@ -65,8 +65,8 @@ StartupTester::run()
TDEProcess *proc = new TDEProcess();
m_stdoutBuffer = "";
- TQObject::connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
- this, TQT_SLOT(stdoutReceived(TDEProcess *, char *, int)));
+ TQObject::connect(proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+ this, TQ_SLOT(stdoutReceived(TDEProcess *, char *, int)));
*proc << "rosegarden-audiofile-importer";
*proc << "--conftest";
proc->start(TDEProcess::Block, TDEProcess::All);
@@ -83,8 +83,8 @@ StartupTester::run()
proc = new TDEProcess;
m_stdoutBuffer = "";
- TQObject::connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
- this, TQT_SLOT(stdoutReceived(TDEProcess *, char *, int)));
+ TQObject::connect(proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+ this, TQ_SLOT(stdoutReceived(TDEProcess *, char *, int)));
*proc << "rosegarden-project-package";
*proc << "--conftest";
proc->start(TDEProcess::Block, TDEProcess::All);
@@ -103,8 +103,8 @@ StartupTester::run()
proc = new TDEProcess();
m_stdoutBuffer = "";
- TQObject::connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
- this, TQT_SLOT(stdoutReceived(TDEProcess *, char *, int)));
+ TQObject::connect(proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+ this, TQ_SLOT(stdoutReceived(TDEProcess *, char *, int)));
*proc << "rosegarden-lilypondview";
*proc << "--conftest";
proc->start(TDEProcess::Block, TDEProcess::All);
diff --git a/src/gui/application/main.cpp b/src/gui/application/main.cpp
index 011a0c6..ecb8e40 100644
--- a/src/gui/application/main.cpp
+++ b/src/gui/application/main.cpp
@@ -479,7 +479,7 @@ int main(int argc, char *argv[])
// Ensure quit on last window close
// Register main DCOP interface
//
- TQObject::connect(&app, TQT_SIGNAL(lastWindowClosed()), &app, TQT_SLOT(quit()));
+ TQObject::connect(&app, TQ_SIGNAL(lastWindowClosed()), &app, TQ_SLOT(quit()));
app.dcopClient()->registerAs(app.name(), false);
app.dcopClient()->setDefaultObject(ROSEGARDEN_GUI_IFACE_NAME);
@@ -624,8 +624,8 @@ int main(int argc, char *argv[])
}
- TQObject::connect(&app, TQT_SIGNAL(aboutToSaveState()),
- rosegardengui, TQT_SLOT(slotDeleteTransport()));
+ TQObject::connect(&app, TQ_SIGNAL(aboutToSaveState()),
+ rosegardengui, TQ_SLOT(slotDeleteTransport()));
// Now that we've started up, raise start logo
//
@@ -661,8 +661,8 @@ int main(int argc, char *argv[])
(*sfxLoadProcess) << sfxLoadPath << soundFontPath;
RG_DEBUG << "Starting sfxload : " << sfxLoadPath << " " << soundFontPath << endl;
- TQObject::connect(sfxLoadProcess, TQT_SIGNAL(processExited(TDEProcess*)),
- &app, TQT_SLOT(sfxLoadExited(TDEProcess*)));
+ TQObject::connect(sfxLoadProcess, TQ_SIGNAL(processExited(TDEProcess*)),
+ &app, TQ_SLOT(sfxLoadExited(TDEProcess*)));
sfxLoadProcess->start();
} else {
@@ -694,7 +694,7 @@ int main(int argc, char *argv[])
if (visibleFor < RealTime(2, 0)) {
int waitTime = visibleFor.sec * 1000 + visibleFor.msec();
- TQTimer::singleShot(2500 - waitTime, startLogo, TQT_SLOT(close()));
+ TQTimer::singleShot(2500 - waitTime, startLogo, TQ_SLOT(close()));
} else {
startLogo->close();
}
diff --git a/src/gui/configuration/AudioConfigurationPage.cpp b/src/gui/configuration/AudioConfigurationPage.cpp
index 516aaf9..2cedab8 100644
--- a/src/gui/configuration/AudioConfigurationPage.cpp
+++ b/src/gui/configuration/AudioConfigurationPage.cpp
@@ -135,7 +135,7 @@ AudioConfigurationPage::AudioConfigurationPage(
new TQPushButton(i18n("Choose..."), frame);
layout->addWidget(changePathButton, row, 2);
- connect(changePathButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotFileDialog()));
+ connect(changePathButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotFileDialog()));
++row;
m_cfg->setGroup(SequencerOptionsConfigGroup);
diff --git a/src/gui/configuration/AudioPropertiesPage.cpp b/src/gui/configuration/AudioPropertiesPage.cpp
index ac2849d..29bfdb4 100644
--- a/src/gui/configuration/AudioPropertiesPage.cpp
+++ b/src/gui/configuration/AudioPropertiesPage.cpp
@@ -82,8 +82,8 @@ AudioPropertiesPage::AudioPropertiesPage(RosegardenGUIDoc *doc,
calculateStats();
- connect(m_changePathButton, TQT_SIGNAL(released()),
- TQT_SLOT(slotFileDialog()));
+ connect(m_changePathButton, TQ_SIGNAL(released()),
+ TQ_SLOT(slotFileDialog()));
addTab(frame, i18n("Modify audio path"));
}
@@ -95,9 +95,9 @@ AudioPropertiesPage::calculateStats()
//
TQString mountPoint = TDEIO::findPathMountPoint(m_path->text());
KDiskFreeSp * job = new KDiskFreeSp;
- connect(job, TQT_SIGNAL(foundMountPoint(const TQString&, unsigned long, unsigned long,
+ connect(job, TQ_SIGNAL(foundMountPoint(const TQString&, unsigned long, unsigned long,
unsigned long)),
- this, TQT_SLOT(slotFoundMountPoint(const TQString&, unsigned long, unsigned long,
+ this, TQ_SLOT(slotFoundMountPoint(const TQString&, unsigned long, unsigned long,
unsigned long)));
job->readDF(mountPoint);
}
@@ -153,11 +153,11 @@ AudioPropertiesPage::slotFileDialog()
this, "file dialog", true);
fileDialog->setMode(KFile::Directory);
- connect(fileDialog, TQT_SIGNAL(fileSelected(const TQString&)),
- TQT_SLOT(slotFileSelected(const TQString&)));
+ connect(fileDialog, TQ_SIGNAL(fileSelected(const TQString&)),
+ TQ_SLOT(slotFileSelected(const TQString&)));
- connect(fileDialog, TQT_SIGNAL(destroyed()),
- TQT_SLOT(slotDirectoryDialogClosed()));
+ connect(fileDialog, TQ_SIGNAL(destroyed()),
+ TQ_SLOT(slotDirectoryDialogClosed()));
if (fileDialog->exec() == TQDialog::Accepted) {
m_path->setText(fileDialog->selectedFile());
diff --git a/src/gui/configuration/ColourConfigurationPage.cpp b/src/gui/configuration/ColourConfigurationPage.cpp
index 8a7101e..7903b7c 100644
--- a/src/gui/configuration/ColourConfigurationPage.cpp
+++ b/src/gui/configuration/ColourConfigurationPage.cpp
@@ -73,20 +73,20 @@ ColourConfigurationPage::ColourConfigurationPage(RosegardenGUIDoc *doc,
frame);
layout->addWidget(deleteColourButton, 1, 1, TQt::AlignHCenter);
- connect(addColourButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotAddNew()));
+ connect(addColourButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotAddNew()));
- connect(deleteColourButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotDelete()));
+ connect(deleteColourButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotDelete()));
- connect(this, TQT_SIGNAL(docColoursChanged()),
- m_doc, TQT_SLOT(slotDocColoursChanged()));
+ connect(this, TQ_SIGNAL(docColoursChanged()),
+ m_doc, TQ_SLOT(slotDocColoursChanged()));
- connect(m_colourtable, TQT_SIGNAL(entryTextChanged(unsigned int, TQString)),
- this, TQT_SLOT(slotTextChanged(unsigned int, TQString)));
+ connect(m_colourtable, TQ_SIGNAL(entryTextChanged(unsigned int, TQString)),
+ this, TQ_SLOT(slotTextChanged(unsigned int, TQString)));
- connect(m_colourtable, TQT_SIGNAL(entryColourChanged(unsigned int, TQColor)),
- this, TQT_SLOT(slotColourChanged(unsigned int, TQColor)));
+ connect(m_colourtable, TQ_SIGNAL(entryColourChanged(unsigned int, TQColor)),
+ this, TQ_SLOT(slotColourChanged(unsigned int, TQColor)));
addTab(frame, i18n("Color Map"));
diff --git a/src/gui/configuration/GeneralConfigurationPage.cpp b/src/gui/configuration/GeneralConfigurationPage.cpp
index 3af923d..cc218cf 100644
--- a/src/gui/configuration/GeneralConfigurationPage.cpp
+++ b/src/gui/configuration/GeneralConfigurationPage.cpp
@@ -192,8 +192,8 @@ GeneralConfigurationPage::GeneralConfigurationPage(RosegardenGUIDoc *doc,
TQPushButton *showStatusButton = new TQPushButton(i18n("Details..."),
frame);
- TQObject::connect(showStatusButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotShowStatus()));
+ TQObject::connect(showStatusButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotShowStatus()));
layout->addWidget(showStatusButton, row, 2, TQt::AlignRight);
++row;
diff --git a/src/gui/configuration/HeadersConfigurationPage.cpp b/src/gui/configuration/HeadersConfigurationPage.cpp
index b1cb0d4..e97ebee 100644
--- a/src/gui/configuration/HeadersConfigurationPage.cpp
+++ b/src/gui/configuration/HeadersConfigurationPage.cpp
@@ -215,11 +215,11 @@ HeadersConfigurationPage::HeadersConfigurationPage(TQWidget *parent,
frameOtherHeaders);
layoutOtherHeaders->addWidget(deletePropButton, 1, 1, TQt::AlignHCenter);
- connect(addPropButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotAddNewProperty()));
+ connect(addPropButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotAddNewProperty()));
- connect(deletePropButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotDeleteProperty()));
+ connect(deletePropButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotDeleteProperty()));
}
void
diff --git a/src/gui/configuration/LatencyConfigurationPage.cpp b/src/gui/configuration/LatencyConfigurationPage.cpp
index f910616..e850adb 100644
--- a/src/gui/configuration/LatencyConfigurationPage.cpp
+++ b/src/gui/configuration/LatencyConfigurationPage.cpp
@@ -68,8 +68,8 @@ LatencyConfigurationPage::LatencyConfigurationPage(RosegardenGUIDoc *doc,
layout->addWidget(m_fetchLatencyValues, 1, 3);
- connect(m_fetchLatencyValues, TQT_SIGNAL(released()),
- TQT_SLOT(slotFetchLatencyValues()));
+ connect(m_fetchLatencyValues, TQ_SIGNAL(released()),
+ TQ_SLOT(slotFetchLatencyValues()));
int jackPlaybackValue = (m_cfg->readLongNumEntry(
"jackplaybacklatencyusec", 0) / 1000) +
@@ -83,8 +83,8 @@ LatencyConfigurationPage::LatencyConfigurationPage(RosegardenGUIDoc *doc,
TQLabel *jackPlaybackLabel = new TQLabel(TQString("%1").arg(jackPlaybackValue),
frame);
layout->addWidget(jackPlaybackLabel, 2, 2, TQt::AlignHCenter);
- connect(m_jackPlayback, TQT_SIGNAL(valueChanged(int)),
- jackPlaybackLabel, TQT_SLOT(setNum(int)));
+ connect(m_jackPlayback, TQ_SIGNAL(valueChanged(int)),
+ jackPlaybackLabel, TQ_SLOT(setNum(int)));
m_jackPlayback->setMinValue(0);
layout->addWidget(new TQLabel("0", frame), 3, 1, TQt::AlignRight);
@@ -106,8 +106,8 @@ LatencyConfigurationPage::LatencyConfigurationPage(RosegardenGUIDoc *doc,
TQLabel *jackRecordLabel = new TQLabel(TQString("%1").arg(jackRecordValue),
frame);
layout->addWidget(jackRecordLabel, 4, 2, TQt::AlignHCenter);
- connect(m_jackRecord, TQT_SIGNAL(valueChanged(int)),
- jackRecordLabel, TQT_SLOT(setNum(int)));
+ connect(m_jackRecord, TQ_SIGNAL(valueChanged(int)),
+ jackRecordLabel, TQ_SLOT(setNum(int)));
m_jackRecord->setMinValue(0);
layout->addWidget(new TQLabel("0", frame), 5, 1, TQt::AlignRight);
diff --git a/src/gui/configuration/MIDIConfigurationPage.cpp b/src/gui/configuration/MIDIConfigurationPage.cpp
index ea5c632..84f5d6d 100644
--- a/src/gui/configuration/MIDIConfigurationPage.cpp
+++ b/src/gui/configuration/MIDIConfigurationPage.cpp
@@ -191,14 +191,14 @@ MIDIConfigurationPage::MIDIConfigurationPage(
m_soundFontChoose->setEnabled(false);
}
- connect(m_sfxLoadEnabled, TQT_SIGNAL(toggled(bool)),
- this, TQT_SLOT(slotSoundFontToggled(bool)));
+ connect(m_sfxLoadEnabled, TQ_SIGNAL(toggled(bool)),
+ this, TQ_SLOT(slotSoundFontToggled(bool)));
- connect(m_sfxLoadChoose, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotSfxLoadPathChoose()));
+ connect(m_sfxLoadChoose, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotSfxLoadPathChoose()));
- connect(m_soundFontChoose, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotSoundFontChoose()));
+ connect(m_soundFontChoose, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotSoundFontChoose()));
layout->setRowStretch(row, 10);
@@ -363,7 +363,7 @@ MIDIConfigurationPage::apply()
int midiClock = m_midiSync->currentItem();
m_cfg->writeEntry("midiclock", midiClock);
- // Now send it (OLD TQT_METHOD - to be removed)
+ // Now send it (OLD METHOD - to be removed)
//!!! No, don't remove -- this controls SPP as well doesn't it?
//
MappedEvent mEMIDIClock(MidiInstrumentBase, // InstrumentId
diff --git a/src/gui/configuration/NotationConfigurationPage.cpp b/src/gui/configuration/NotationConfigurationPage.cpp
index 0546361..e588449 100644
--- a/src/gui/configuration/NotationConfigurationPage.cpp
+++ b/src/gui/configuration/NotationConfigurationPage.cpp
@@ -444,14 +444,14 @@ NotationConfigurationPage::NotationConfigurationPage(TDEConfig *cfg,
m_viewButton = new TQPushButton(i18n("View"), frame);
layout->addMultiCellWidget(m_font, row, row, 1, 2);
layout->addWidget(m_viewButton, row, 3);
- TQObject::connect(m_viewButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotViewButtonPressed()));
+ TQObject::connect(m_viewButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotViewButtonPressed()));
#else
layout->addMultiCellWidget(m_font, row, row, 1, 3);
#endif
m_font->setEditable(false);
- TQObject::connect(m_font, TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(slotFontComboChanged(int)));
+ TQObject::connect(m_font, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(slotFontComboChanged(int)));
++row;
TQFrame *subFrame = new TQFrame(frame);
diff --git a/src/gui/dialogs/AudioManagerDialog.cpp b/src/gui/dialogs/AudioManagerDialog.cpp
index 8827400..7a12b9b 100644
--- a/src/gui/dialogs/AudioManagerDialog.cpp
+++ b/src/gui/dialogs/AudioManagerDialog.cpp
@@ -128,47 +128,47 @@ AudioManagerDialog::AudioManagerDialog(TQWidget *parent,
TQIconSet icon(TQPixmap(pixmapDir + "/toolbar/transport-play.xpm"));
new TDEAction(i18n("&Add Audio File..."), "document-open", 0, this,
- TQT_SLOT(slotAdd()), actionCollection(), "add_audio");
+ TQ_SLOT(slotAdd()), actionCollection(), "add_audio");
new TDEAction(i18n("&Unload Audio File"), "edit-delete", 0, this,
- TQT_SLOT(slotRemove()),
+ TQ_SLOT(slotRemove()),
actionCollection(), "remove_audio");
icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/transport-play.xpm"));
new TDEAction(i18n("&Play Preview"), icon, 0, this,
- TQT_SLOT(slotPlayPreview()),
+ TQ_SLOT(slotPlayPreview()),
actionCollection(), "preview_audio");
/*!!! Not actually implemented -- this never worked right!
new TDEAction(i18n("Re&label"), 0, 0, this,
- TQT_SLOT(slotRename()),
+ TQ_SLOT(slotRename()),
actionCollection(), "rename_audio");
*/
icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/insert_audio_into_track.xpm"));
new TDEAction(i18n("&Insert into Selected Audio Track"),
- icon, 0, this, TQT_SLOT(slotInsert()),
+ icon, 0, this, TQ_SLOT(slotInsert()),
actionCollection(), "insert_audio");
new TDEAction(i18n("Unload &all Audio Files"), 0, 0, this,
- TQT_SLOT(slotRemoveAll()),
+ TQ_SLOT(slotRemoveAll()),
actionCollection(), "remove_all_audio");
new TDEAction(i18n("Unload all &Unused Audio Files"), 0, 0, this,
- TQT_SLOT(slotRemoveAllUnused()),
+ TQ_SLOT(slotRemoveAllUnused()),
actionCollection(), "remove_all_unused_audio");
new TDEAction(i18n("&Delete Unused Audio Files..."), 0, 0, this,
- TQT_SLOT(slotDeleteUnused()),
+ TQ_SLOT(slotDeleteUnused()),
actionCollection(), "delete_unused_audio");
new TDEAction(i18n("&Export Audio File..."), "fileexport", 0, this,
- TQT_SLOT(slotExportAudio()),
+ TQ_SLOT(slotExportAudio()),
actionCollection(), "export_audio");
/*
new TDEAction(i18n("Distribute Audio on &MIDI"),
0, 0, this,
- TQT_SLOT(slotDistributeOnMidiSegment()),
+ TQ_SLOT(slotDistributeOnMidiSegment()),
actionCollection(),
"distribute_audio");
*/
@@ -200,11 +200,11 @@ AudioManagerDialog::AudioManagerDialog(TQWidget *parent,
m_fileList->setShowToolTips(true);
// connect selection mechanism
- connect(m_fileList, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
- TQT_SLOT(slotSelectionChanged(TQListViewItem*)));
+ connect(m_fileList, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+ TQ_SLOT(slotSelectionChanged(TQListViewItem*)));
- connect(m_fileList, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)),
- TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*)));
+ connect(m_fileList, TQ_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)),
+ TQ_SLOT(slotDropped(TQDropEvent*, TQListViewItem*)));
// setup local accelerators
//
@@ -214,22 +214,22 @@ AudioManagerDialog::AudioManagerDialog(TQWidget *parent,
//
m_accelerators->connectItem(m_accelerators->insertItem(Key_Delete),
this,
- TQT_SLOT(slotRemove()));
+ TQ_SLOT(slotRemove()));
slotPopulateFileList();
// Connect command history for updates
//
- connect(getCommandHistory(), TQT_SIGNAL(commandExecuted(KCommand *)),
- this, TQT_SLOT(slotCommandExecuted(KCommand *)));
+ connect(getCommandHistory(), TQ_SIGNAL(commandExecuted(KCommand *)),
+ this, TQ_SLOT(slotCommandExecuted(KCommand *)));
//setInitialSize(configDialogSize(AudioManagerDialogConfigGroup));
- connect(m_playTimer, TQT_SIGNAL(timeout()),
- this, TQT_SLOT(slotCancelPlayingAudio()));
+ connect(m_playTimer, TQ_SIGNAL(timeout()),
+ this, TQ_SLOT(slotCancelPlayingAudio()));
KStdAction::close(this,
- TQT_SLOT(slotClose()),
+ TQ_SLOT(slotClose()),
actionCollection());
createGUI("audiomanager.rc");
@@ -1091,12 +1091,12 @@ AudioManagerDialog::addFile(const KURL& kurl)
// Connect the progress dialog
//
- connect(&aFM, TQT_SIGNAL(setProgress(int)),
- progressDlg.progressBar(), TQT_SLOT(setValue(int)));
- connect(&aFM, TQT_SIGNAL(setOperationName(TQString)),
- &progressDlg, TQT_SLOT(slotSetOperationName(TQString)));
- connect(&progressDlg, TQT_SIGNAL(cancelClicked()),
- &aFM, TQT_SLOT(slotStopImport()));
+ connect(&aFM, TQ_SIGNAL(setProgress(int)),
+ progressDlg.progressBar(), TQ_SLOT(setValue(int)));
+ connect(&aFM, TQ_SIGNAL(setOperationName(TQString)),
+ &progressDlg, TQ_SLOT(slotSetOperationName(TQString)));
+ connect(&progressDlg, TQ_SIGNAL(cancelClicked()),
+ &aFM, TQ_SLOT(slotStopImport()));
try {
id = aFM.importURL(kurl, m_sampleRate);
@@ -1112,10 +1112,10 @@ AudioManagerDialog::addFile(const KURL& kurl)
return false;
}
- disconnect(&progressDlg, TQT_SIGNAL(cancelClicked()),
- &aFM, TQT_SLOT(slotStopImport()));
- connect(&progressDlg, TQT_SIGNAL(cancelClicked()),
- &aFM, TQT_SLOT(slotStopPreview()));
+ disconnect(&progressDlg, TQ_SIGNAL(cancelClicked()),
+ &aFM, TQ_SLOT(slotStopImport()));
+ connect(&progressDlg, TQ_SIGNAL(cancelClicked()),
+ &aFM, TQ_SLOT(slotStopPreview()));
progressDlg.progressBar()->show();
progressDlg.slotSetOperationName(i18n("Generating audio preview..."));
@@ -1129,8 +1129,8 @@ AudioManagerDialog::addFile(const KURL& kurl)
KMessageBox::information(this, message);
}
- disconnect(&progressDlg, TQT_SIGNAL(cancelClicked()),
- &aFM, TQT_SLOT(slotStopPreview()));
+ disconnect(&progressDlg, TQ_SIGNAL(cancelClicked()),
+ &aFM, TQ_SLOT(slotStopPreview()));
slotPopulateFileList();
diff --git a/src/gui/dialogs/AudioPluginDialog.cpp b/src/gui/dialogs/AudioPluginDialog.cpp
index 8c22d36..03afa0c 100644
--- a/src/gui/dialogs/AudioPluginDialog.cpp
+++ b/src/gui/dialogs/AudioPluginDialog.cpp
@@ -118,8 +118,8 @@ AudioPluginDialog::AudioPluginDialog(TQWidget *parent,
TQToolTip::add
(m_bypass, i18n("Bypass this plugin."));
- connect(m_bypass, TQT_SIGNAL(toggled(bool)),
- this, TQT_SLOT(slotBypassChanged(bool)));
+ connect(m_bypass, TQ_SIGNAL(toggled(bool)),
+ this, TQ_SLOT(slotBypassChanged(bool)));
m_insOuts = new TQLabel(i18n("<ports>"), h);
@@ -132,29 +132,29 @@ AudioPluginDialog::AudioPluginDialog(TQWidget *parent,
TQToolTip::add
(m_pluginId, i18n("Unique ID of plugin."));
- connect(m_pluginList, TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(slotPluginSelected(int)));
+ connect(m_pluginList, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(slotPluginSelected(int)));
- connect(m_pluginCategoryList, TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(slotCategorySelected(int)));
+ connect(m_pluginCategoryList, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(slotCategorySelected(int)));
// new line
h = new TQHBox(pluginSelectionBox);
m_copyButton = new TQPushButton(i18n("Copy"), h);
- connect(m_copyButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotCopy()));
+ connect(m_copyButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotCopy()));
TQToolTip::add
(m_copyButton, i18n("Copy plugin parameters"));
m_pasteButton = new TQPushButton(i18n("Paste"), h);
- connect(m_pasteButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotPaste()));
+ connect(m_pasteButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotPaste()));
TQToolTip::add
(m_pasteButton, i18n("Paste plugin parameters"));
m_defaultButton = new TQPushButton(i18n("Default"), h);
- connect(m_defaultButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotDefault()));
+ connect(m_defaultButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotDefault()));
TQToolTip::add
(m_defaultButton, i18n("Set to defaults"));
@@ -523,8 +523,8 @@ AudioPluginDialog::slotPluginSelected(int i)
m_gridLayout->addMultiCellWidget(m_programCombo,
0, 0, 1, m_gridLayout->numCols() - 1,
TQt::AlignLeft);
- connect(m_programCombo, TQT_SIGNAL(activated(const TQString &)),
- this, TQT_SLOT(slotPluginProgramChanged(const TQString &)));
+ connect(m_programCombo, TQ_SIGNAL(activated(const TQString &)),
+ this, TQ_SLOT(slotPluginProgramChanged(const TQString &)));
m_programCombo->clear();
m_programCombo->insertItem(i18n("<none selected>"));
@@ -553,8 +553,8 @@ AudioPluginDialog::slotPluginSelected(int i)
showBounds,
portCount > tooManyPorts);
- connect(control, TQT_SIGNAL(valueChanged(float)),
- this, TQT_SLOT(slotPluginPortChanged(float)));
+ connect(control, TQ_SIGNAL(valueChanged(float)),
+ this, TQ_SLOT(slotPluginPortChanged(float)));
m_pluginWidgets.push_back(control);
}
@@ -720,8 +720,8 @@ AudioPluginDialog::updatePluginProgramList()
m_programCombo->show();
m_programCombo->blockSignals(true);
- connect(m_programCombo, TQT_SIGNAL(activated(const TQString &)),
- this, TQT_SLOT(slotPluginProgramChanged(const TQString &)));
+ connect(m_programCombo, TQ_SIGNAL(activated(const TQString &)),
+ this, TQ_SLOT(slotPluginProgramChanged(const TQString &)));
} else {
return ;
diff --git a/src/gui/dialogs/AudioSplitDialog.cpp b/src/gui/dialogs/AudioSplitDialog.cpp
index 54d68c2..befc019 100644
--- a/src/gui/dialogs/AudioSplitDialog.cpp
+++ b/src/gui/dialogs/AudioSplitDialog.cpp
@@ -82,8 +82,8 @@ AudioSplitDialog::AudioSplitDialog(TQWidget *parent,
new TQLabel(i18n("Threshold"), hbox);
m_thresholdSpin = new TQSpinBox(hbox);
m_thresholdSpin->setSuffix(" %");
- connect(m_thresholdSpin, TQT_SIGNAL(valueChanged(int)),
- TQT_SLOT(slotThresholdChanged(int)));
+ connect(m_thresholdSpin, TQ_SIGNAL(valueChanged(int)),
+ TQ_SLOT(slotThresholdChanged(int)));
// ensure this is cleared
m_previewBoxes.clear();
diff --git a/src/gui/dialogs/ClefDialog.cpp b/src/gui/dialogs/ClefDialog.cpp
index 7f5886d..b419006 100644
--- a/src/gui/dialogs/ClefDialog.cpp
+++ b/src/gui/dialogs/ClefDialog.cpp
@@ -109,10 +109,10 @@ ClefDialog::ClefDialog(TQWidget *parent,
conversionFrame->hide();
}
- TQObject::connect(clefUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClefUp()));
- TQObject::connect(clefDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClefDown()));
- TQObject::connect(m_octaveUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOctaveUp()));
- TQObject::connect(m_octaveDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOctaveDown()));
+ TQObject::connect(clefUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClefUp()));
+ TQObject::connect(clefDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClefDown()));
+ TQObject::connect(m_octaveUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotOctaveUp()));
+ TQObject::connect(m_octaveDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotOctaveDown()));
redrawClefPixmap();
}
diff --git a/src/gui/dialogs/ConfigureDialog.cpp b/src/gui/dialogs/ConfigureDialog.cpp
index 0e66780..4f9f22a 100644
--- a/src/gui/dialogs/ConfigureDialog.cpp
+++ b/src/gui/dialogs/ConfigureDialog.cpp
@@ -78,10 +78,10 @@ ConfigureDialog::ConfigureDialog(RosegardenGUIDoc *doc,
page->setPageIndex(pageIndex(pageWidget));
m_configurationPages.push_back(page);
- connect(page, TQT_SIGNAL(updateAutoSaveInterval(unsigned int)),
- this, TQT_SIGNAL(updateAutoSaveInterval(unsigned int)));
- connect(page, TQT_SIGNAL(updateSidebarStyle(unsigned int)),
- this, TQT_SIGNAL(updateSidebarStyle(unsigned int)));
+ connect(page, TQ_SIGNAL(updateAutoSaveInterval(unsigned int)),
+ this, TQ_SIGNAL(updateAutoSaveInterval(unsigned int)));
+ connect(page, TQ_SIGNAL(updateSidebarStyle(unsigned int)),
+ this, TQ_SIGNAL(updateSidebarStyle(unsigned int)));
pageWidget = addPage(MIDIConfigurationPage::iconLabel(),
MIDIConfigurationPage::title(),
diff --git a/src/gui/dialogs/CountdownDialog.cpp b/src/gui/dialogs/CountdownDialog.cpp
index 0c76d8f..cdeb4ee 100644
--- a/src/gui/dialogs/CountdownDialog.cpp
+++ b/src/gui/dialogs/CountdownDialog.cpp
@@ -69,7 +69,7 @@ CountdownDialog::CountdownDialog(TQWidget *parent, int seconds):
layout->addWidget(m_progressBar, 0, AlignCenter);
layout->addWidget(m_stopButton, 0, AlignRight);
- connect (m_stopButton, TQT_SIGNAL(released()), this, TQT_SIGNAL(stopped()));
+ connect (m_stopButton, TQ_SIGNAL(released()), this, TQ_SIGNAL(stopped()));
// Set the total time to show the bar in initial position
//
diff --git a/src/gui/dialogs/EventEditDialog.cpp b/src/gui/dialogs/EventEditDialog.cpp
index 2a865d7..d1ca56e 100644
--- a/src/gui/dialogs/EventEditDialog.cpp
+++ b/src/gui/dialogs/EventEditDialog.cpp
@@ -92,8 +92,8 @@ EventEditDialog::EventEditDialog(TQWidget *parent,
TQSpinBox *absoluteTime = new TQSpinBox
(INT_MIN, INT_MAX, Note(Note::Shortest).getDuration(), intrinsicGrid);
absoluteTime->setValue(event.getAbsoluteTime());
- TQObject::connect(absoluteTime, TQT_SIGNAL(valueChanged(int)),
- this, TQT_SLOT(slotAbsoluteTimeChanged(int)));
+ TQObject::connect(absoluteTime, TQ_SIGNAL(valueChanged(int)),
+ this, TQ_SLOT(slotAbsoluteTimeChanged(int)));
slotAbsoluteTimeChanged(event.getAbsoluteTime());
new TQLabel(i18n("Duration: "), intrinsicGrid);
@@ -105,8 +105,8 @@ EventEditDialog::EventEditDialog(TQWidget *parent,
TQSpinBox *duration = new TQSpinBox
(0, INT_MAX, Note(Note::Shortest).getDuration(), intrinsicGrid);
duration->setValue(event.getDuration());
- TQObject::connect(duration, TQT_SIGNAL(valueChanged(int)),
- this, TQT_SLOT(slotDurationChanged(int)));
+ TQObject::connect(duration, TQ_SIGNAL(valueChanged(int)),
+ this, TQ_SLOT(slotDurationChanged(int)));
slotDurationChanged(event.getDuration());
new TQLabel(i18n("Sub-ordering: "), intrinsicGrid);
@@ -115,8 +115,8 @@ EventEditDialog::EventEditDialog(TQWidget *parent,
TQSpinBox *subOrdering = new TQSpinBox( -100, 100, 1, intrinsicGrid);
subOrdering->setValue(event.getSubOrdering());
- TQObject::connect(subOrdering, TQT_SIGNAL(valueChanged(int)),
- this, TQT_SLOT(slotSubOrderingChanged(int)));
+ TQObject::connect(subOrdering, TQ_SIGNAL(valueChanged(int)),
+ this, TQ_SLOT(slotSubOrderingChanged(int)));
slotSubOrderingChanged(event.getSubOrdering());
TQGroupBox *persistentBox = new TQGroupBox
@@ -184,8 +184,8 @@ EventEditDialog::EventEditDialog(TQWidget *parent,
button->setFixedSize(TQSize(24, 24));
TQToolTip::add
(button, i18n("Make persistent"));
- TQObject::connect(button, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotPropertyMadePersistent()));
+ TQObject::connect(button, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotPropertyMadePersistent()));
}
}
}
@@ -213,8 +213,8 @@ EventEditDialog::addPersistentProperty(const PropertyName &name)
TQSpinBox *spinBox = new TQSpinBox
(min, max, 1, m_persistentGrid, strtoqstr(name).ascii());
spinBox->setValue(m_originalEvent.get<Int>(name));
- TQObject::connect(spinBox, TQT_SIGNAL(valueChanged(int)),
- this, TQT_SLOT(slotIntPropertyChanged(int)));
+ TQObject::connect(spinBox, TQ_SIGNAL(valueChanged(int)),
+ this, TQ_SLOT(slotIntPropertyChanged(int)));
spinBox->show();
break;
}
@@ -228,8 +228,8 @@ case UInt: {
TQSpinBox *spinBox = new TQSpinBox
(min, max, 1, m_persistentGrid, strtoqstr(name).ascii());
spinBox->setValue(m_originalEvent.get<UInt>(name));
- TQObject::connect(spinBox, TQT_SIGNAL(valueChanged(int)),
- this, TQT_SLOT(slotIntPropertyChanged(int)));
+ TQObject::connect(spinBox, TQ_SIGNAL(valueChanged(int)),
+ this, TQ_SLOT(slotIntPropertyChanged(int)));
spinBox->show();
break;
}
@@ -245,8 +245,8 @@ case UInt: {
hbox, TQString(strtoqstr(name) + "%sec").ascii());
spinBox->setValue(realTime.sec);
- TQObject::connect(spinBox, TQT_SIGNAL(valueChanged(int)),
- this, TQT_SLOT(slotRealTimePropertyChanged(int)));
+ TQObject::connect(spinBox, TQ_SIGNAL(valueChanged(int)),
+ this, TQ_SLOT(slotRealTimePropertyChanged(int)));
// nseconds
//
@@ -255,8 +255,8 @@ case UInt: {
hbox, TQString(strtoqstr(name) + "%nsec").ascii());
spinBox->setValue(realTime.nsec);
- TQObject::connect(spinBox, TQT_SIGNAL(valueChanged(int)),
- this, TQT_SLOT(slotRealTimePropertyChanged(int)));
+ TQObject::connect(spinBox, TQ_SIGNAL(valueChanged(int)),
+ this, TQ_SLOT(slotRealTimePropertyChanged(int)));
spinBox->show();
break;
}
@@ -265,8 +265,8 @@ case UInt: {
TQCheckBox *checkBox = new TQCheckBox
("", m_persistentGrid, strtoqstr(name).ascii());
checkBox->setChecked(m_originalEvent.get<Bool>(name));
- TQObject::connect(checkBox, TQT_SIGNAL(activated()),
- this, TQT_SLOT(slotBoolPropertyChanged()));
+ TQObject::connect(checkBox, TQ_SIGNAL(activated()),
+ this, TQ_SLOT(slotBoolPropertyChanged()));
checkBox->show();
break;
}
@@ -276,8 +276,8 @@ case UInt: {
(strtoqstr(m_originalEvent.get<String>(name)),
m_persistentGrid,
strtoqstr(name).ascii());
- TQObject::connect(lineEdit, TQT_SIGNAL(textChanged(const TQString &)),
- this, TQT_SLOT(slotStringPropertyChanged(const TQString &)));
+ TQObject::connect(lineEdit, TQ_SIGNAL(textChanged(const TQString &)),
+ this, TQ_SLOT(slotStringPropertyChanged(const TQString &)));
lineEdit->show();
break;
}
@@ -288,8 +288,8 @@ case UInt: {
button->setFixedSize(TQSize(24, 24));
TQToolTip::add
(button, i18n("Delete this property"));
- TQObject::connect(button, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotPropertyDeleted()));
+ TQObject::connect(button, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotPropertyDeleted()));
button->show();
}
diff --git a/src/gui/dialogs/EventFilterDialog.cpp b/src/gui/dialogs/EventFilterDialog.cpp
index 89fb947..c767c45 100644
--- a/src/gui/dialogs/EventFilterDialog.cpp
+++ b/src/gui/dialogs/EventFilterDialog.cpp
@@ -128,8 +128,8 @@ EventFilterDialog::initDialog()
cfg->setGroup(EventFilterDialogConfigGroup);
m_pitchFromSpinBox->setValue(cfg->readUnsignedNumEntry("pitchfrom", 0));
noteFrameLayout->addWidget(m_pitchFromSpinBox, 1, 2);
- connect(m_pitchFromSpinBox, TQT_SIGNAL(valueChanged(int)),
- TQT_SLOT(slotPitchFromChanged(int)));
+ connect(m_pitchFromSpinBox, TQ_SIGNAL(valueChanged(int)),
+ TQ_SLOT(slotPitchFromChanged(int)));
m_pitchFromChooserButton = new TQPushButton(i18n("edit"), noteFrame);
m_pitchFromChooserButton->setSizePolicy(TQSizePolicy((TQSizePolicy::SizeType)0,
@@ -138,8 +138,8 @@ EventFilterDialog::initDialog()
TQToolTip::add
(m_pitchFromChooserButton, i18n("choose a pitch using a staff"));
noteFrameLayout->addWidget(m_pitchFromChooserButton, 1, 3);
- connect(m_pitchFromChooserButton, TQT_SIGNAL(clicked()),
- TQT_SLOT(slotPitchFromChooser()));
+ connect(m_pitchFromChooserButton, TQ_SIGNAL(clicked()),
+ TQ_SLOT(slotPitchFromChooser()));
// Pitch To
m_pitchToSpinBox = new TQSpinBox(noteFrame);
@@ -147,15 +147,15 @@ EventFilterDialog::initDialog()
cfg->setGroup(EventFilterDialogConfigGroup);
m_pitchToSpinBox->setValue(cfg->readUnsignedNumEntry("pitchto", 127));
noteFrameLayout->addWidget(m_pitchToSpinBox, 1, 4);
- connect(m_pitchToSpinBox, TQT_SIGNAL(valueChanged(int)),
- TQT_SLOT(slotPitchToChanged(int)));
+ connect(m_pitchToSpinBox, TQ_SIGNAL(valueChanged(int)),
+ TQ_SLOT(slotPitchToChanged(int)));
m_pitchToChooserButton = new TQPushButton(i18n("edit"), noteFrame);
TQToolTip::add
(m_pitchToChooserButton, i18n("choose a pitch using a staff"));
noteFrameLayout->addWidget(m_pitchToChooserButton, 1, 5);
- connect(m_pitchToChooserButton, TQT_SIGNAL(clicked()),
- TQT_SLOT(slotPitchToChooser()));
+ connect(m_pitchToChooserButton, TQ_SIGNAL(clicked()),
+ TQ_SLOT(slotPitchToChooser()));
// Velocity From/To
m_velocityFromSpinBox = new TQSpinBox(noteFrame);
@@ -163,30 +163,30 @@ EventFilterDialog::initDialog()
cfg->setGroup(EventFilterDialogConfigGroup);
m_velocityFromSpinBox->setValue(cfg->readUnsignedNumEntry("velocityfrom", 0));
noteFrameLayout->addWidget(m_velocityFromSpinBox, 2, 2);
- connect(m_velocityFromSpinBox, TQT_SIGNAL(valueChanged(int)),
- TQT_SLOT(slotVelocityFromChanged(int)));
+ connect(m_velocityFromSpinBox, TQ_SIGNAL(valueChanged(int)),
+ TQ_SLOT(slotVelocityFromChanged(int)));
m_velocityToSpinBox = new TQSpinBox(noteFrame);
m_velocityToSpinBox->setMaxValue(127);
cfg->setGroup(EventFilterDialogConfigGroup);
m_velocityToSpinBox->setValue(cfg->readUnsignedNumEntry("velocityto", 127));
noteFrameLayout->addWidget( m_velocityToSpinBox, 2, 4 );
- connect(m_velocityToSpinBox, TQT_SIGNAL(valueChanged(int)),
- TQT_SLOT(slotVelocityToChanged(int)));
+ connect(m_velocityToSpinBox, TQ_SIGNAL(valueChanged(int)),
+ TQ_SLOT(slotVelocityToChanged(int)));
// Duration From/To
m_noteDurationFromComboBox = new TQComboBox(0, noteFrame);
m_noteDurationFromComboBox->insertItem(i18n("longest"));
noteFrameLayout->addWidget(m_noteDurationFromComboBox, 3, 2);
- connect(m_noteDurationFromComboBox, TQT_SIGNAL(activated(int)),
- TQT_SLOT(slotDurationFromChanged(int)));
+ connect(m_noteDurationFromComboBox, TQ_SIGNAL(activated(int)),
+ TQ_SLOT(slotDurationFromChanged(int)));
m_noteDurationToComboBox = new TQComboBox(0, noteFrame);
m_noteDurationToComboBox->insertItem(i18n("longest"));
noteFrameLayout->addWidget(m_noteDurationToComboBox, 3, 4);
- connect(m_noteDurationToComboBox, TQT_SIGNAL(activated(int)),
- TQT_SLOT(slotDurationToChanged(int)));
+ connect(m_noteDurationToComboBox, TQ_SIGNAL(activated(int)),
+ TQ_SLOT(slotDurationToChanged(int)));
populateDurationCombos();
@@ -207,8 +207,8 @@ EventFilterDialog::initDialog()
(m_buttonNone, i18n("Exclude entire range of values"));
buttonLayout->addWidget( m_buttonNone, 0, 1 );
- connect(m_buttonAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotToggleAll()));
- connect(m_buttonNone, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotToggleNone()));
+ connect(m_buttonAll, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotToggleAll()));
+ connect(m_buttonNone, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotToggleNone()));
}
diff --git a/src/gui/dialogs/EventParameterDialog.cpp b/src/gui/dialogs/EventParameterDialog.cpp
index 97ed5c6..a12ccab 100644
--- a/src/gui/dialogs/EventParameterDialog.cpp
+++ b/src/gui/dialogs/EventParameterDialog.cpp
@@ -80,8 +80,8 @@ EventParameterDialog::EventParameterDialog(
text = i18n("Ringing - set %1 alternating from max to min with both dying to zero").arg(strtoqstr(property));
m_patternCombo->insertItem(text);
- connect(m_patternCombo, TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(slotPatternSelected(int)));
+ connect(m_patternCombo, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(slotPatternSelected(int)));
TQHBox *value1Box = new TQHBox(vBox);
m_value1Label = new TQLabel(i18n("Value"), value1Box);
diff --git a/src/gui/dialogs/IdentifyTextCodecDialog.cpp b/src/gui/dialogs/IdentifyTextCodecDialog.cpp
index e09cb75..e24ea85 100644
--- a/src/gui/dialogs/IdentifyTextCodecDialog.cpp
+++ b/src/gui/dialogs/IdentifyTextCodecDialog.cpp
@@ -134,8 +134,8 @@ IdentifyTextCodecDialog::IdentifyTextCodecDialog(TQWidget *parent,
++i;
}
- connect(codecs, TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(slotCodecSelected(int)));
+ connect(codecs, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(slotCodecSelected(int)));
new TQLabel(i18n("\nExample text from file:"), vbox);
m_example = new TQLabel("", vbox);
diff --git a/src/gui/dialogs/InterpretDialog.cpp b/src/gui/dialogs/InterpretDialog.cpp
index 645d537..b0e81b7 100644
--- a/src/gui/dialogs/InterpretDialog.cpp
+++ b/src/gui/dialogs/InterpretDialog.cpp
@@ -73,7 +73,7 @@ InterpretDialog::InterpretDialog(TQWidget *parent) :
(config->readBoolEntry("interpretarticulate", true));
connect(m_allInterpretations,
- TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAllBoxChanged()));
+ TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAllBoxChanged()));
slotAllBoxChanged();
}
diff --git a/src/gui/dialogs/IntervalDialog.cpp b/src/gui/dialogs/IntervalDialog.cpp
index b226004..ed8eb39 100644
--- a/src/gui/dialogs/IntervalDialog.cpp
+++ b/src/gui/dialogs/IntervalDialog.cpp
@@ -93,11 +93,11 @@ IntervalDialog::IntervalDialog(TQWidget *parent, bool askChangeKey, bool askTran
m_transposeSegmentBack = NULL;
}
- connect(m_referencenote, TQT_SIGNAL(noteChanged(int,int,int)),
- this, TQT_SLOT(slotSetReferenceNote(int,int,int)));
+ connect(m_referencenote, TQ_SIGNAL(noteChanged(int,int,int)),
+ this, TQ_SLOT(slotSetReferenceNote(int,int,int)));
- connect(m_targetnote, TQT_SIGNAL(noteChanged(int,int,int)),
- this, TQT_SLOT(slotSetTargetNote(int,int,int)));
+ connect(m_targetnote, TQ_SIGNAL(noteChanged(int,int,int)),
+ this, TQ_SLOT(slotSetTargetNote(int,int,int)));
}
// number of octaves the notes are apart
diff --git a/src/gui/dialogs/KeySignatureDialog.cpp b/src/gui/dialogs/KeySignatureDialog.cpp
index b0d42f1..a88177e 100644
--- a/src/gui/dialogs/KeySignatureDialog.cpp
+++ b/src/gui/dialogs/KeySignatureDialog.cpp
@@ -162,14 +162,14 @@ KeySignatureDialog::KeySignatureDialog(TQWidget *parent,
conversionFrame->hide();
}
- TQObject::connect(keyUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotKeyUp()));
- TQObject::connect(keyDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotKeyDown()));
- TQObject::connect(m_keyCombo, TQT_SIGNAL(activated(const TQString &)),
- this, TQT_SLOT(slotKeyNameChanged(const TQString &)));
- TQObject::connect(m_keyCombo, TQT_SIGNAL(textChanged(const TQString &)),
- this, TQT_SLOT(slotKeyNameChanged(const TQString &)));
- TQObject::connect(m_majorMinorCombo, TQT_SIGNAL(activated(const TQString &)),
- this, TQT_SLOT(slotMajorMinorChanged(const TQString &)));
+ TQObject::connect(keyUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotKeyUp()));
+ TQObject::connect(keyDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotKeyDown()));
+ TQObject::connect(m_keyCombo, TQ_SIGNAL(activated(const TQString &)),
+ this, TQ_SLOT(slotKeyNameChanged(const TQString &)));
+ TQObject::connect(m_keyCombo, TQ_SIGNAL(textChanged(const TQString &)),
+ this, TQ_SLOT(slotKeyNameChanged(const TQString &)));
+ TQObject::connect(m_majorMinorCombo, TQ_SIGNAL(activated(const TQString &)),
+ this, TQ_SLOT(slotMajorMinorChanged(const TQString &)));
}
KeySignatureDialog::ConversionType
diff --git a/src/gui/dialogs/LyricEditDialog.cpp b/src/gui/dialogs/LyricEditDialog.cpp
index 9501925..07b260d 100644
--- a/src/gui/dialogs/LyricEditDialog.cpp
+++ b/src/gui/dialogs/LyricEditDialog.cpp
@@ -64,9 +64,9 @@ LyricEditDialog::LyricEditDialog(TQWidget *parent,
// new TQLabel(i18n("Verse:"), hbox);
m_verseNumber = new KComboBox(hbox);
m_verseNumber->setEditable(false);
- connect(m_verseNumber, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotVerseNumberChanged(int)));
+ connect(m_verseNumber, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotVerseNumberChanged(int)));
m_verseAddButton = new TQPushButton(i18n("Add Verse"), hbox);
- connect(m_verseAddButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddVerse()));
+ connect(m_verseAddButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddVerse()));
TQFrame *f = new TQFrame(hbox);
hbox->setStretchFactor(f, 10);
diff --git a/src/gui/dialogs/ManageMetronomeDialog.cpp b/src/gui/dialogs/ManageMetronomeDialog.cpp
index b54d27d..3e70c88 100644
--- a/src/gui/dialogs/ManageMetronomeDialog.cpp
+++ b/src/gui/dialogs/ManageMetronomeDialog.cpp
@@ -108,8 +108,8 @@ ManageMetronomeDialog::ManageMetronomeDialog(TQWidget *parent,
layout->addWidget(new TQLabel(i18n("Instrument"), frame), 1, 0);
m_metronomeInstrument = new KComboBox(frame);
- connect(m_metronomeInstrument, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetModified()));
- connect(m_metronomeInstrument, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotInstrumentChanged(int)));
+ connect(m_metronomeInstrument, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSetModified()));
+ connect(m_metronomeInstrument, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotInstrumentChanged(int)));
layout->addWidget(m_metronomeInstrument, 1, 1);
TQGroupBox *beatBox = new TQGroupBox
@@ -124,58 +124,58 @@ ManageMetronomeDialog::ManageMetronomeDialog(TQWidget *parent,
m_metronomeResolution->insertItem(i18n("Bars only"));
m_metronomeResolution->insertItem(i18n("Bars and beats"));
m_metronomeResolution->insertItem(i18n("Bars, beats, and divisions"));
- connect(m_metronomeResolution, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotResolutionChanged(int)));
+ connect(m_metronomeResolution, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotResolutionChanged(int)));
layout->addWidget(m_metronomeResolution, 0, 1);
layout->addWidget(new TQLabel(i18n("Bar velocity"), frame), 1, 0);
m_metronomeBarVely = new TQSpinBox(frame);
m_metronomeBarVely->setMinValue(0);
m_metronomeBarVely->setMaxValue(127);
- connect(m_metronomeBarVely, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetModified()));
+ connect(m_metronomeBarVely, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotSetModified()));
layout->addWidget(m_metronomeBarVely, 1, 1);
layout->addWidget(new TQLabel(i18n("Beat velocity"), frame), 2, 0);
m_metronomeBeatVely = new TQSpinBox(frame);
m_metronomeBeatVely->setMinValue(0);
m_metronomeBeatVely->setMaxValue(127);
- connect(m_metronomeBeatVely, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetModified()));
+ connect(m_metronomeBeatVely, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotSetModified()));
layout->addWidget(m_metronomeBeatVely, 2, 1);
layout->addWidget(new TQLabel(i18n("Sub-beat velocity"), frame), 3, 0);
m_metronomeSubBeatVely = new TQSpinBox(frame);
m_metronomeSubBeatVely->setMinValue(0);
m_metronomeSubBeatVely->setMaxValue(127);
- connect(m_metronomeSubBeatVely, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetModified()));
+ connect(m_metronomeSubBeatVely, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotSetModified()));
layout->addWidget(m_metronomeSubBeatVely, 3, 1);
vbox = new TQVBox(hbox);
m_metronomePitch = new PitchChooser(i18n("Pitch"), vbox, 60);
- connect(m_metronomePitch, TQT_SIGNAL(pitchChanged(int)), this, TQT_SLOT(slotPitchChanged(int)));
- connect(m_metronomePitch, TQT_SIGNAL(preview(int)), this, TQT_SLOT(slotPreviewPitch(int)));
+ connect(m_metronomePitch, TQ_SIGNAL(pitchChanged(int)), this, TQ_SLOT(slotPitchChanged(int)));
+ connect(m_metronomePitch, TQ_SIGNAL(preview(int)), this, TQ_SLOT(slotPreviewPitch(int)));
m_metronomePitchSelector = new KComboBox(m_metronomePitch);
m_metronomePitchSelector->insertItem(i18n("for Bar"));
m_metronomePitchSelector->insertItem(i18n("for Beat"));
m_metronomePitchSelector->insertItem(i18n("for Sub-beat"));
- connect(m_metronomePitchSelector, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPitchSelectorChanged(int)));
+ connect(m_metronomePitchSelector, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotPitchSelectorChanged(int)));
TQGroupBox *enableBox = new TQGroupBox
(1, TQt::Horizontal, i18n("Metronome Activated"), vbox);
m_playEnabled = new TQCheckBox(i18n("Playing"), enableBox);
m_recordEnabled = new TQCheckBox(i18n("Recording"), enableBox);
- connect(m_playEnabled, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSetModified()));
- connect(m_recordEnabled, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSetModified()));
+ connect(m_playEnabled, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSetModified()));
+ connect(m_recordEnabled, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSetModified()));
// populate the dialog
populate(m_metronomeDevice->currentItem());
// connect up the device list
- connect(m_metronomeDevice, TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(populate(int)));
+ connect(m_metronomeDevice, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(populate(int)));
// connect up the device list
- connect(m_metronomeDevice, TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(slotSetModified()));
+ connect(m_metronomeDevice, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(slotSetModified()));
setModified(false);
}
diff --git a/src/gui/dialogs/PasteNotationDialog.cpp b/src/gui/dialogs/PasteNotationDialog.cpp
index 7fe3d7f..02b90d9 100644
--- a/src/gui/dialogs/PasteNotationDialog.cpp
+++ b/src/gui/dialogs/PasteNotationDialog.cpp
@@ -57,8 +57,8 @@ PasteNotationDialog::PasteNotationDialog(TQWidget *parent,
TQRadioButton *button = new TQRadioButton(i->second, pasteTypeGroup);
button->setChecked(m_defaultType == i->first);
- TQObject::connect(button, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotPasteTypeChanged()));
+ TQObject::connect(button, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotPasteTypeChanged()));
m_pasteTypeButtons.push_back(button);
}
diff --git a/src/gui/dialogs/PitchDialog.cpp b/src/gui/dialogs/PitchDialog.cpp
index f50ce27..7722116 100644
--- a/src/gui/dialogs/PitchDialog.cpp
+++ b/src/gui/dialogs/PitchDialog.cpp
@@ -41,8 +41,8 @@ PitchDialog::PitchDialog(TQWidget *parent, TQString title, int defaultPitch) :
m_pitchChooser = new PitchChooser(title, vbox, defaultPitch);
setButtonText(User1, i18n("Reset"));
- connect(this, TQT_SIGNAL(user1Clicked()),
- m_pitchChooser, TQT_SLOT(slotResetToDefault()));
+ connect(this, TQ_SIGNAL(user1Clicked()),
+ m_pitchChooser, TQ_SLOT(slotResetToDefault()));
}
int
diff --git a/src/gui/dialogs/RescaleDialog.cpp b/src/gui/dialogs/RescaleDialog.cpp
index ee52826..9e8e25b 100644
--- a/src/gui/dialogs/RescaleDialog.cpp
+++ b/src/gui/dialogs/RescaleDialog.cpp
@@ -68,8 +68,8 @@ RescaleDialog::RescaleDialog(TQWidget *parent,
}
setButtonText(User1, i18n("Reset"));
- connect(this, TQT_SIGNAL(user1Clicked()),
- m_newDuration, TQT_SLOT(slotResetToDefault()));
+ connect(this, TQ_SIGNAL(user1Clicked()),
+ m_newDuration, TQ_SLOT(slotResetToDefault()));
}
timeT
diff --git a/src/gui/dialogs/SimpleEventEditDialog.cpp b/src/gui/dialogs/SimpleEventEditDialog.cpp
index 9591d00..98eff51 100644
--- a/src/gui/dialogs/SimpleEventEditDialog.cpp
+++ b/src/gui/dialogs/SimpleEventEditDialog.cpp
@@ -101,8 +101,8 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
// Connect up the combos
//
- connect(m_typeCombo, TQT_SIGNAL(activated(int)),
- TQT_SLOT(slotEventTypeChanged(int)));
+ connect(m_typeCombo, TQ_SIGNAL(activated(int)),
+ TQ_SLOT(slotEventTypeChanged(int)));
} else {
@@ -119,10 +119,10 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
layout->addWidget(m_timeSpinBox, 1, 1);
layout->addWidget(m_timeEditButton, 1, 2);
- connect(m_timeSpinBox, TQT_SIGNAL(valueChanged(int)),
- TQT_SLOT(slotAbsoluteTimeChanged(int)));
- connect(m_timeEditButton, TQT_SIGNAL(released()),
- TQT_SLOT(slotEditAbsoluteTime()));
+ connect(m_timeSpinBox, TQ_SIGNAL(valueChanged(int)),
+ TQ_SLOT(slotAbsoluteTimeChanged(int)));
+ connect(m_timeEditButton, TQ_SIGNAL(released()),
+ TQ_SLOT(slotEditAbsoluteTime()));
m_durationLabel = new TQLabel(i18n("Duration:"), frame);
layout->addWidget(m_durationLabel, 2, 0);
@@ -131,10 +131,10 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
layout->addWidget(m_durationSpinBox, 2, 1);
layout->addWidget(m_durationEditButton, 2, 2);
- connect(m_durationSpinBox, TQT_SIGNAL(valueChanged(int)),
- TQT_SLOT(slotDurationChanged(int)));
- connect(m_durationEditButton, TQT_SIGNAL(released()),
- TQT_SLOT(slotEditDuration()));
+ connect(m_durationSpinBox, TQ_SIGNAL(valueChanged(int)),
+ TQ_SLOT(slotDurationChanged(int)));
+ connect(m_durationEditButton, TQ_SIGNAL(released()),
+ TQ_SLOT(slotEditDuration()));
m_pitchLabel = new TQLabel(i18n("Pitch:"), frame);
layout->addWidget(m_pitchLabel, 3, 0);
@@ -143,10 +143,10 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
layout->addWidget(m_pitchSpinBox, 3, 1);
layout->addWidget(m_pitchEditButton, 3, 2);
- connect(m_pitchSpinBox, TQT_SIGNAL(valueChanged(int)),
- TQT_SLOT(slotPitchChanged(int)));
- connect(m_pitchEditButton, TQT_SIGNAL(released()),
- TQT_SLOT(slotEditPitch()));
+ connect(m_pitchSpinBox, TQ_SIGNAL(valueChanged(int)),
+ TQ_SLOT(slotPitchChanged(int)));
+ connect(m_pitchEditButton, TQ_SIGNAL(released()),
+ TQ_SLOT(slotEditPitch()));
m_pitchSpinBox->setMinValue(MidiMinValue);
m_pitchSpinBox->setMaxValue(MidiMaxValue);
@@ -163,8 +163,8 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
m_velocitySpinBox = new TQSpinBox(frame);
layout->addWidget(m_velocitySpinBox, 5, 1);
- connect(m_velocitySpinBox, TQT_SIGNAL(valueChanged(int)),
- TQT_SLOT(slotVelocityChanged(int)));
+ connect(m_velocitySpinBox, TQ_SIGNAL(valueChanged(int)),
+ TQ_SLOT(slotVelocityChanged(int)));
m_velocitySpinBox->setMinValue(MidiMinValue);
m_velocitySpinBox->setMaxValue(MidiMaxValue);
@@ -179,12 +179,12 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
m_sysexSaveButton = new TQPushButton(i18n("Save data"), frame);
layout->addWidget(m_sysexSaveButton, 4, 2);
- connect(m_metaEdit, TQT_SIGNAL(textChanged(const TQString &)),
- TQT_SLOT(slotMetaChanged(const TQString &)));
- connect(m_sysexLoadButton, TQT_SIGNAL(released()),
- TQT_SLOT(slotSysexLoad()));
- connect(m_sysexSaveButton, TQT_SIGNAL(released()),
- TQT_SLOT(slotSysexSave()));
+ connect(m_metaEdit, TQ_SIGNAL(textChanged(const TQString &)),
+ TQ_SLOT(slotMetaChanged(const TQString &)));
+ connect(m_sysexLoadButton, TQ_SIGNAL(released()),
+ TQ_SLOT(slotSysexLoad()));
+ connect(m_sysexSaveButton, TQ_SIGNAL(released()),
+ TQ_SLOT(slotSysexSave()));
m_notationGroupBox = new TQGroupBox
(1, TQt::Horizontal, i18n("Notation Properties"), vbox);
@@ -197,8 +197,8 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
layout->addMultiCellWidget(m_lockNotationValues, 0, 0, 0, 2);
m_lockNotationValues->setChecked(true);
- connect(m_lockNotationValues, TQT_SIGNAL(released()),
- TQT_SLOT(slotLockNotationChanged()));
+ connect(m_lockNotationValues, TQ_SIGNAL(released()),
+ TQ_SLOT(slotLockNotationChanged()));
m_notationTimeLabel = new TQLabel(i18n("Notation time:"), frame);
layout->addWidget(m_notationTimeLabel, 1, 0);
@@ -207,10 +207,10 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
layout->addWidget(m_notationTimeSpinBox, 1, 1);
layout->addWidget(m_notationTimeEditButton, 1, 2);
- connect(m_notationTimeSpinBox, TQT_SIGNAL(valueChanged(int)),
- TQT_SLOT(slotNotationAbsoluteTimeChanged(int)));
- connect(m_notationTimeEditButton, TQT_SIGNAL(released()),
- TQT_SLOT(slotEditNotationAbsoluteTime()));
+ connect(m_notationTimeSpinBox, TQ_SIGNAL(valueChanged(int)),
+ TQ_SLOT(slotNotationAbsoluteTimeChanged(int)));
+ connect(m_notationTimeEditButton, TQ_SIGNAL(released()),
+ TQ_SLOT(slotEditNotationAbsoluteTime()));
m_notationDurationLabel = new TQLabel(i18n("Notation duration:"), frame);
layout->addWidget(m_notationDurationLabel, 2, 0);
@@ -219,10 +219,10 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
layout->addWidget(m_notationDurationSpinBox, 2, 1);
layout->addWidget(m_notationDurationEditButton, 2, 2);
- connect(m_notationDurationSpinBox, TQT_SIGNAL(valueChanged(int)),
- TQT_SLOT(slotNotationDurationChanged(int)));
- connect(m_notationDurationEditButton, TQT_SIGNAL(released()),
- TQT_SLOT(slotEditNotationDuration()));
+ connect(m_notationDurationSpinBox, TQ_SIGNAL(valueChanged(int)),
+ TQ_SLOT(slotNotationDurationChanged(int)));
+ connect(m_notationDurationEditButton, TQ_SIGNAL(released()),
+ TQ_SLOT(slotEditNotationDuration()));
setupForEvent();
}
diff --git a/src/gui/dialogs/TempoDialog.cpp b/src/gui/dialogs/TempoDialog.cpp
index 40843d1..60fd524 100644
--- a/src/gui/dialogs/TempoDialog.cpp
+++ b/src/gui/dialogs/TempoDialog.cpp
@@ -68,12 +68,12 @@ TempoDialog::TempoDialog(TQWidget *parent, RosegardenGUIDoc *doc,
m_tempoValueSpinBox = new HSpinBox(frame, 0, 100000, 0.0, 1000.0, 5);
layout->addWidget(m_tempoValueSpinBox, 0, 2);
- connect(m_tempoValueSpinBox, TQT_SIGNAL(valueChanged(const TQString &)),
- TQT_SLOT(slotTempoChanged(const TQString &)));
+ connect(m_tempoValueSpinBox, TQ_SIGNAL(valueChanged(const TQString &)),
+ TQ_SLOT(slotTempoChanged(const TQString &)));
m_tempoTap= new TQPushButton(i18n("Tap"), frame);
layout->addWidget(m_tempoTap, 0, 3);
- connect(m_tempoTap, TQT_SIGNAL(clicked()), TQT_SLOT(slotTapClicked()));
+ connect(m_tempoTap, TQ_SIGNAL(clicked()), TQ_SLOT(slotTapClicked()));
m_tempoConstant = new TQRadioButton(i18n("Tempo is fixed until the following tempo change"), frame);
@@ -91,16 +91,16 @@ TempoDialog::TempoDialog(TQWidget *parent, RosegardenGUIDoc *doc,
layout->addWidget(m_tempoRampToTarget, 3, 1);
layout->addWidget(m_tempoTargetSpinBox, 3, 2);
- // connect(m_tempoTargetCheckBox, TQT_SIGNAL(clicked()),
- // TQT_SLOT(slotTargetCheckBoxClicked()));
- connect(m_tempoConstant, TQT_SIGNAL(clicked()),
- TQT_SLOT(slotTempoConstantClicked()));
- connect(m_tempoRampToNext, TQT_SIGNAL(clicked()),
- TQT_SLOT(slotTempoRampToNextClicked()));
- connect(m_tempoRampToTarget, TQT_SIGNAL(clicked()),
- TQT_SLOT(slotTempoRampToTargetClicked()));
- connect(m_tempoTargetSpinBox, TQT_SIGNAL(valueChanged(const TQString &)),
- TQT_SLOT(slotTargetChanged(const TQString &)));
+ // connect(m_tempoTargetCheckBox, TQ_SIGNAL(clicked()),
+ // TQ_SLOT(slotTargetCheckBoxClicked()));
+ connect(m_tempoConstant, TQ_SIGNAL(clicked()),
+ TQ_SLOT(slotTempoConstantClicked()));
+ connect(m_tempoRampToNext, TQ_SIGNAL(clicked()),
+ TQ_SLOT(slotTempoRampToNextClicked()));
+ connect(m_tempoRampToTarget, TQ_SIGNAL(clicked()),
+ TQ_SLOT(slotTempoRampToTargetClicked()));
+ connect(m_tempoTargetSpinBox, TQ_SIGNAL(valueChanged(const TQString &)),
+ TQ_SLOT(slotTargetChanged(const TQString &)));
m_tempoBeatLabel = new TQLabel(frame);
layout->addWidget(m_tempoBeatLabel, 0, 4);
@@ -173,14 +173,14 @@ TempoDialog::TempoDialog(TQWidget *parent, RosegardenGUIDoc *doc,
// new TQLabel(scopeBox);
- connect(m_tempoChangeHere, TQT_SIGNAL(clicked()),
- TQT_SLOT(slotActionChanged()));
- connect(m_tempoChangeBefore, TQT_SIGNAL(clicked()),
- TQT_SLOT(slotActionChanged()));
- connect(m_tempoChangeStartOfBar, TQT_SIGNAL(clicked()),
- TQT_SLOT(slotActionChanged()));
- connect(m_tempoChangeGlobal, TQT_SIGNAL(clicked()),
- TQT_SLOT(slotActionChanged()));
+ connect(m_tempoChangeHere, TQ_SIGNAL(clicked()),
+ TQ_SLOT(slotActionChanged()));
+ connect(m_tempoChangeBefore, TQ_SIGNAL(clicked()),
+ TQ_SLOT(slotActionChanged()));
+ connect(m_tempoChangeStartOfBar, TQ_SIGNAL(clicked()),
+ TQ_SLOT(slotActionChanged()));
+ connect(m_tempoChangeGlobal, TQ_SIGNAL(clicked()),
+ TQ_SLOT(slotActionChanged()));
m_tempoChangeHere->setChecked(true);
diff --git a/src/gui/dialogs/TextEventDialog.cpp b/src/gui/dialogs/TextEventDialog.cpp
index fb6908f..78f5949 100644
--- a/src/gui/dialogs/TextEventDialog.cpp
+++ b/src/gui/dialogs/TextEventDialog.cpp
@@ -327,23 +327,23 @@ TextEventDialog::TextEventDialog(TQWidget *parent,
m_prevLyric = config->readEntry("previous_lyric", "");
m_prevAnnotation = config->readEntry("previous_annotation", "");
- TQObject::connect(m_text, TQT_SIGNAL(textChanged(const TQString &)),
- this, TQT_SLOT(slotTextChanged(const TQString &)));
- TQObject::connect(m_typeCombo, TQT_SIGNAL(activated(const TQString &)),
- this, TQT_SLOT(slotTypeChanged(const TQString &)));
- TQObject::connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotOK()));
- TQObject::connect(m_dynamicShortcutCombo, TQT_SIGNAL(activated(const TQString &)),
- this, TQT_SLOT(slotDynamicShortcutChanged(const TQString &)));
- TQObject::connect(m_directionShortcutCombo, TQT_SIGNAL(activated(const TQString &)),
- this, TQT_SLOT(slotDirectionShortcutChanged(const TQString &)));
- TQObject::connect(m_localDirectionShortcutCombo, TQT_SIGNAL(activated(const TQString &)),
- this, TQT_SLOT(slotLocalDirectionShortcutChanged(const TQString &)));
- TQObject::connect(m_tempoShortcutCombo, TQT_SIGNAL(activated(const TQString &)),
- this, TQT_SLOT(slotTempoShortcutChanged(const TQString &)));
- TQObject::connect(m_localTempoShortcutCombo, TQT_SIGNAL(activated(const TQString &)),
- this, TQT_SLOT(slotLocalTempoShortcutChanged(const TQString &)));
- TQObject::connect(m_lilyPondDirectiveCombo, TQT_SIGNAL(activated(const TQString &)),
- this, TQT_SLOT(slotLilyPondDirectiveChanged(const TQString &)));
+ TQObject::connect(m_text, TQ_SIGNAL(textChanged(const TQString &)),
+ this, TQ_SLOT(slotTextChanged(const TQString &)));
+ TQObject::connect(m_typeCombo, TQ_SIGNAL(activated(const TQString &)),
+ this, TQ_SLOT(slotTypeChanged(const TQString &)));
+ TQObject::connect(this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotOK()));
+ TQObject::connect(m_dynamicShortcutCombo, TQ_SIGNAL(activated(const TQString &)),
+ this, TQ_SLOT(slotDynamicShortcutChanged(const TQString &)));
+ TQObject::connect(m_directionShortcutCombo, TQ_SIGNAL(activated(const TQString &)),
+ this, TQ_SLOT(slotDirectionShortcutChanged(const TQString &)));
+ TQObject::connect(m_localDirectionShortcutCombo, TQ_SIGNAL(activated(const TQString &)),
+ this, TQ_SLOT(slotLocalDirectionShortcutChanged(const TQString &)));
+ TQObject::connect(m_tempoShortcutCombo, TQ_SIGNAL(activated(const TQString &)),
+ this, TQ_SLOT(slotTempoShortcutChanged(const TQString &)));
+ TQObject::connect(m_localTempoShortcutCombo, TQ_SIGNAL(activated(const TQString &)),
+ this, TQ_SLOT(slotLocalTempoShortcutChanged(const TQString &)));
+ TQObject::connect(m_lilyPondDirectiveCombo, TQ_SIGNAL(activated(const TQString &)),
+ this, TQ_SLOT(slotLilyPondDirectiveChanged(const TQString &)));
m_text->setFocus();
slotTypeChanged(strtoqstr(getTextType()));
diff --git a/src/gui/dialogs/TimeDialog.cpp b/src/gui/dialogs/TimeDialog.cpp
index c6c55dc..66a5265 100644
--- a/src/gui/dialogs/TimeDialog.cpp
+++ b/src/gui/dialogs/TimeDialog.cpp
@@ -47,8 +47,8 @@ TimeDialog::TimeDialog(TQWidget *parent, TQString title,
constrainToCompositionDuration);
setButtonText(User1, i18n("Reset"));
- connect(this, TQT_SIGNAL(user1Clicked()),
- m_timeWidget, TQT_SLOT(slotResetToDefault()));
+ connect(this, TQ_SIGNAL(user1Clicked()),
+ m_timeWidget, TQ_SLOT(slotResetToDefault()));
}
TimeDialog::TimeDialog(TQWidget *parent, TQString title,
@@ -64,8 +64,8 @@ TimeDialog::TimeDialog(TQWidget *parent, TQString title,
constrainToCompositionDuration);
setButtonText(User1, i18n("Reset"));
- connect(this, TQT_SIGNAL(user1Clicked()),
- m_timeWidget, TQT_SLOT(slotResetToDefault()));
+ connect(this, TQ_SIGNAL(user1Clicked()),
+ m_timeWidget, TQ_SLOT(slotResetToDefault()));
}
timeT
diff --git a/src/gui/dialogs/TimeSignatureDialog.cpp b/src/gui/dialogs/TimeSignatureDialog.cpp
index 797b5ab..d28752e 100644
--- a/src/gui/dialogs/TimeSignatureDialog.cpp
+++ b/src/gui/dialogs/TimeSignatureDialog.cpp
@@ -103,10 +103,10 @@ TimeSignatureDialog::TimeSignatureDialog(TQWidget *parent,
BigArrowButton *numUp = new BigArrowButton(numBox, TQt::RightArrow);
BigArrowButton *denomUp = new BigArrowButton(denomBox, TQt::RightArrow);
- TQObject::connect(numDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNumDown()));
- TQObject::connect(numUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNumUp()));
- TQObject::connect(denomDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDenomDown()));
- TQObject::connect(denomUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDenomUp()));
+ TQObject::connect(numDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNumDown()));
+ TQObject::connect(numUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNumUp()));
+ TQObject::connect(denomDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDenomDown()));
+ TQObject::connect(denomUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDenomUp()));
if (timeEditable) {
@@ -190,8 +190,8 @@ TimeSignatureDialog::TimeSignatureDialog(TQWidget *parent,
m_normalizeRestsButton->setChecked
(config->readBoolEntry("timesigdialognormalize", true));
- TQObject::connect(m_hideSignatureButton, TQT_SIGNAL(clicked()), this,
- TQT_SLOT(slotUpdateCommonTimeButton()));
+ TQObject::connect(m_hideSignatureButton, TQ_SIGNAL(clicked()), this,
+ TQ_SLOT(slotUpdateCommonTimeButton()));
slotUpdateCommonTimeButton();
m_explanatoryLabel = explanatoryLabel;
diff --git a/src/gui/dialogs/TransportDialog.cpp b/src/gui/dialogs/TransportDialog.cpp
index 3054e85..78646a0 100644
--- a/src/gui/dialogs/TransportDialog.cpp
+++ b/src/gui/dialogs/TransportDialog.cpp
@@ -140,41 +140,41 @@ TransportDialog::TransportDialog(TQWidget *parent,
m_midiOutTimer = new TQTimer(this);
m_clearMetronomeTimer = new TQTimer(this);
- connect(m_midiInTimer, TQT_SIGNAL(timeout()),
- TQT_SLOT(slotClearMidiInLabel()));
+ connect(m_midiInTimer, TQ_SIGNAL(timeout()),
+ TQ_SLOT(slotClearMidiInLabel()));
- connect(m_midiOutTimer, TQT_SIGNAL(timeout()),
- TQT_SLOT(slotClearMidiOutLabel()));
+ connect(m_midiOutTimer, TQ_SIGNAL(timeout()),
+ TQ_SLOT(slotClearMidiOutLabel()));
- connect(m_clearMetronomeTimer, TQT_SIGNAL(timeout()),
- TQT_SLOT(slotResetBackground()));
+ connect(m_clearMetronomeTimer, TQ_SIGNAL(timeout()),
+ TQ_SLOT(slotResetBackground()));
m_transport->TimeDisplayLabel->hide();
m_transport->ToEndLabel->hide();
- connect(m_transport->TimeDisplayButton, TQT_SIGNAL(clicked()),
- TQT_SLOT(slotChangeTimeDisplay()));
+ connect(m_transport->TimeDisplayButton, TQ_SIGNAL(clicked()),
+ TQ_SLOT(slotChangeTimeDisplay()));
- connect(m_transport->ToEndButton, TQT_SIGNAL(clicked()),
- TQT_SLOT(slotChangeToEnd()));
+ connect(m_transport->ToEndButton, TQ_SIGNAL(clicked()),
+ TQ_SLOT(slotChangeToEnd()));
- connect(m_transport->LoopButton, TQT_SIGNAL(clicked()),
- TQT_SLOT(slotLoopButtonClicked()));
+ connect(m_transport->LoopButton, TQ_SIGNAL(clicked()),
+ TQ_SLOT(slotLoopButtonClicked()));
- connect(m_transport->PanelOpenButton, TQT_SIGNAL(clicked()),
- TQT_SLOT(slotPanelOpenButtonClicked()));
+ connect(m_transport->PanelOpenButton, TQ_SIGNAL(clicked()),
+ TQ_SLOT(slotPanelOpenButtonClicked()));
- connect(m_transport->PanelCloseButton, TQT_SIGNAL(clicked()),
- TQT_SLOT(slotPanelCloseButtonClicked()));
+ connect(m_transport->PanelCloseButton, TQ_SIGNAL(clicked()),
+ TQ_SLOT(slotPanelCloseButtonClicked()));
- connect(m_transport->PanicButton, TQT_SIGNAL(clicked()), TQT_SIGNAL(panic()));
+ connect(m_transport->PanicButton, TQ_SIGNAL(clicked()), TQ_SIGNAL(panic()));
m_panelOpen = *m_transport->PanelOpenButton->pixmap();
m_panelClosed = *m_transport->PanelCloseButton->pixmap();
- connect(m_transport->SetStartLPButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotSetStartLoopingPointAtMarkerPos()));
- connect(m_transport->SetStopLPButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotSetStopLoopingPointAtMarkerPos()));
+ connect(m_transport->SetStartLPButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotSetStartLoopingPointAtMarkerPos()));
+ connect(m_transport->SetStopLPButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotSetStopLoopingPointAtMarkerPos()));
// clear labels
//
@@ -216,46 +216,46 @@ TransportDialog::TransportDialog(TQWidget *parent,
m_transport->TempoDisplay->setFont( localFont );
m_transport->TimeSigDisplay->setFont( localFont );
- connect(m_transport->TempoDisplay, TQT_SIGNAL(doubleClicked()),
- this, TQT_SLOT(slotEditTempo()));
+ connect(m_transport->TempoDisplay, TQ_SIGNAL(doubleClicked()),
+ this, TQ_SLOT(slotEditTempo()));
- connect(m_transport->TempoDisplay, TQT_SIGNAL(scrollWheel(int)),
- this, TQT_SIGNAL(scrollTempo(int)));
+ connect(m_transport->TempoDisplay, TQ_SIGNAL(scrollWheel(int)),
+ this, TQ_SIGNAL(scrollTempo(int)));
- connect(m_transport->TimeSigDisplay, TQT_SIGNAL(doubleClicked()),
- this, TQT_SLOT(slotEditTimeSignature()));
+ connect(m_transport->TimeSigDisplay, TQ_SIGNAL(doubleClicked()),
+ this, TQ_SLOT(slotEditTimeSignature()));
// toil through the individual pixmaps
- connect(m_transport->NegativePixmap, TQT_SIGNAL(doubleClicked()),
- this, TQT_SLOT(slotEditTime()));
- connect(m_transport->TenHoursPixmap, TQT_SIGNAL(doubleClicked()),
- this, TQT_SLOT(slotEditTime()));
- connect(m_transport->UnitHoursPixmap, TQT_SIGNAL(doubleClicked()),
- this, TQT_SLOT(slotEditTime()));
- connect(m_transport->HourColonPixmap, TQT_SIGNAL(doubleClicked()),
- this, TQT_SLOT(slotEditTime()));
- connect(m_transport->TenMinutesPixmap, TQT_SIGNAL(doubleClicked()),
- this, TQT_SLOT(slotEditTime()));
- connect(m_transport->UnitMinutesPixmap, TQT_SIGNAL(doubleClicked()),
- this, TQT_SLOT(slotEditTime()));
- connect(m_transport->MinuteColonPixmap, TQT_SIGNAL(doubleClicked()),
- this, TQT_SLOT(slotEditTime()));
- connect(m_transport->TenSecondsPixmap, TQT_SIGNAL(doubleClicked()),
- this, TQT_SLOT(slotEditTime()));
- connect(m_transport->UnitSecondsPixmap, TQT_SIGNAL(doubleClicked()),
- this, TQT_SLOT(slotEditTime()));
- connect(m_transport->SecondColonPixmap, TQT_SIGNAL(doubleClicked()),
- this, TQT_SLOT(slotEditTime()));
- connect(m_transport->TenthsPixmap, TQT_SIGNAL(doubleClicked()),
- this, TQT_SLOT(slotEditTime()));
- connect(m_transport->HundredthsPixmap, TQT_SIGNAL(doubleClicked()),
- this, TQT_SLOT(slotEditTime()));
- connect(m_transport->HundredthColonPixmap, TQT_SIGNAL(doubleClicked()),
- this, TQT_SLOT(slotEditTime()));
- connect(m_transport->TenThousandthsPixmap, TQT_SIGNAL(doubleClicked()),
- this, TQT_SLOT(slotEditTime()));
- connect(m_transport->ThousandthsPixmap, TQT_SIGNAL(doubleClicked()),
- this, TQT_SLOT(slotEditTime()));
+ connect(m_transport->NegativePixmap, TQ_SIGNAL(doubleClicked()),
+ this, TQ_SLOT(slotEditTime()));
+ connect(m_transport->TenHoursPixmap, TQ_SIGNAL(doubleClicked()),
+ this, TQ_SLOT(slotEditTime()));
+ connect(m_transport->UnitHoursPixmap, TQ_SIGNAL(doubleClicked()),
+ this, TQ_SLOT(slotEditTime()));
+ connect(m_transport->HourColonPixmap, TQ_SIGNAL(doubleClicked()),
+ this, TQ_SLOT(slotEditTime()));
+ connect(m_transport->TenMinutesPixmap, TQ_SIGNAL(doubleClicked()),
+ this, TQ_SLOT(slotEditTime()));
+ connect(m_transport->UnitMinutesPixmap, TQ_SIGNAL(doubleClicked()),
+ this, TQ_SLOT(slotEditTime()));
+ connect(m_transport->MinuteColonPixmap, TQ_SIGNAL(doubleClicked()),
+ this, TQ_SLOT(slotEditTime()));
+ connect(m_transport->TenSecondsPixmap, TQ_SIGNAL(doubleClicked()),
+ this, TQ_SLOT(slotEditTime()));
+ connect(m_transport->UnitSecondsPixmap, TQ_SIGNAL(doubleClicked()),
+ this, TQ_SLOT(slotEditTime()));
+ connect(m_transport->SecondColonPixmap, TQ_SIGNAL(doubleClicked()),
+ this, TQ_SLOT(slotEditTime()));
+ connect(m_transport->TenthsPixmap, TQ_SIGNAL(doubleClicked()),
+ this, TQ_SLOT(slotEditTime()));
+ connect(m_transport->HundredthsPixmap, TQ_SIGNAL(doubleClicked()),
+ this, TQ_SLOT(slotEditTime()));
+ connect(m_transport->HundredthColonPixmap, TQ_SIGNAL(doubleClicked()),
+ this, TQ_SLOT(slotEditTime()));
+ connect(m_transport->TenThousandthsPixmap, TQ_SIGNAL(doubleClicked()),
+ this, TQ_SLOT(slotEditTime()));
+ connect(m_transport->ThousandthsPixmap, TQ_SIGNAL(doubleClicked()),
+ this, TQ_SLOT(slotEditTime()));
// accelerator object
//
diff --git a/src/gui/dialogs/TupletDialog.cpp b/src/gui/dialogs/TupletDialog.cpp
index c6e70ab..b2f7fe6 100644
--- a/src/gui/dialogs/TupletDialog.cpp
+++ b/src/gui/dialogs/TupletDialog.cpp
@@ -103,7 +103,7 @@ TupletDialog::TupletDialog(TQWidget *parent, Note::Type defaultUnitType,
m_hasTimingAlready->setChecked(false);
timingLayout->addMultiCellWidget(m_hasTimingAlready, 2, 2, 0, 2);
- connect(m_hasTimingAlready, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotHasTimingChanged()));
+ connect(m_hasTimingAlready, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotHasTimingChanged()));
updateUntupledCombo();
updateTupledCombo();
@@ -157,18 +157,18 @@ TupletDialog::TupletDialog(TQWidget *parent, Note::Type defaultUnitType,
updateTimingDisplays();
- TQObject::connect(m_unitCombo, TQT_SIGNAL(activated(const TQString &)),
- this, TQT_SLOT(slotUnitChanged(const TQString &)));
+ TQObject::connect(m_unitCombo, TQ_SIGNAL(activated(const TQString &)),
+ this, TQ_SLOT(slotUnitChanged(const TQString &)));
- TQObject::connect(m_untupledCombo, TQT_SIGNAL(activated(const TQString &)),
- this, TQT_SLOT(slotUntupledChanged(const TQString &)));
- TQObject::connect(m_untupledCombo, TQT_SIGNAL(textChanged(const TQString &)),
- this, TQT_SLOT(slotUntupledChanged(const TQString &)));
+ TQObject::connect(m_untupledCombo, TQ_SIGNAL(activated(const TQString &)),
+ this, TQ_SLOT(slotUntupledChanged(const TQString &)));
+ TQObject::connect(m_untupledCombo, TQ_SIGNAL(textChanged(const TQString &)),
+ this, TQ_SLOT(slotUntupledChanged(const TQString &)));
- TQObject::connect(m_tupledCombo, TQT_SIGNAL(activated(const TQString &)),
- this, TQT_SLOT(slotTupledChanged(const TQString &)));
- TQObject::connect(m_tupledCombo, TQT_SIGNAL(textChanged(const TQString &)),
- this, TQT_SLOT(slotTupledChanged(const TQString &)));
+ TQObject::connect(m_tupledCombo, TQ_SIGNAL(activated(const TQString &)),
+ this, TQ_SLOT(slotTupledChanged(const TQString &)));
+ TQObject::connect(m_tupledCombo, TQ_SIGNAL(textChanged(const TQString &)),
+ this, TQ_SLOT(slotTupledChanged(const TQString &)));
}
void
diff --git a/src/gui/dialogs/UseOrnamentDialog.cpp b/src/gui/dialogs/UseOrnamentDialog.cpp
index 48bb828..5d44aeb 100644
--- a/src/gui/dialogs/UseOrnamentDialog.cpp
+++ b/src/gui/dialogs/UseOrnamentDialog.cpp
@@ -91,7 +91,7 @@ UseOrnamentDialog::UseOrnamentDialog(TQWidget *parent,
}
m_mark->insertItem(i18n("Text mark"));
- connect(m_mark, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMarkChanged(int)));
+ connect(m_mark, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMarkChanged(int)));
m_textLabel = new TQLabel(i18n(" Text: "), frame);
layout->addWidget(m_textLabel, 0, 2);
diff --git a/src/gui/editors/eventlist/EventView.cpp b/src/gui/editors/eventlist/EventView.cpp
index 1ff9dc0..1a79880 100644
--- a/src/gui/editors/eventlist/EventView.cpp
+++ b/src/gui/editors/eventlist/EventView.cpp
@@ -141,8 +141,8 @@ EventView::EventView(RosegardenGUIDoc *doc,
// Connect up
//
- connect(m_filterGroup, TQT_SIGNAL(released(int)),
- TQT_SLOT(slotModifyFilter(int)));
+ connect(m_filterGroup, TQ_SIGNAL(released(int)),
+ TQ_SLOT(slotModifyFilter(int)));
m_eventList = new TDEListView(getCentralWidget());
m_eventList->setItemsRenameable(true);
@@ -169,21 +169,21 @@ EventView::EventView(RosegardenGUIDoc *doc,
layout->addWidget(m_triggerName, 0, 1);
TQPushButton *editButton = new TQPushButton(i18n("edit"), frame);
layout->addWidget(editButton, 0, 2);
- connect(editButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditTriggerName()));
+ connect(editButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEditTriggerName()));
layout->addWidget(new TQLabel(i18n("Base pitch: "), frame), 1, 0);
m_triggerPitch = new TQLabel(TQString("%1").arg(rec->getBasePitch()), frame);
layout->addWidget(m_triggerPitch, 1, 1);
editButton = new TQPushButton(i18n("edit"), frame);
layout->addWidget(editButton, 1, 2);
- connect(editButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditTriggerPitch()));
+ connect(editButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEditTriggerPitch()));
layout->addWidget(new TQLabel(i18n("Base velocity: "), frame), 2, 0);
m_triggerVelocity = new TQLabel(TQString("%1").arg(rec->getBaseVelocity()), frame);
layout->addWidget(m_triggerVelocity, 2, 1);
editButton = new TQPushButton(i18n("edit"), frame);
layout->addWidget(editButton, 2, 2);
- connect(editButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditTriggerVelocity()));
+ connect(editButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEditTriggerVelocity()));
/*!!! Comment out these two options, which are not yet used
anywhere else -- intended for use with library ornaments, not
@@ -209,11 +209,11 @@ EventView::EventView(RosegardenGUIDoc *doc,
adjust->setCurrentItem(2);
}
- connect(adjust, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotTriggerTimeAdjustChanged(int)));
+ connect(adjust, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotTriggerTimeAdjustChanged(int)));
TQCheckBox *retune = new TQCheckBox(i18n("Adjust pitch to trigger note by default"), frame);
retune->setChecked(rec->getDefaultRetune());
- connect(retune, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotTriggerRetuneChanged()));
+ connect(retune, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotTriggerRetuneChanged()));
layout->addMultiCellWidget(retune, 4, 4, 1, 2);
*/
@@ -230,12 +230,12 @@ EventView::EventView(RosegardenGUIDoc *doc,
// Connect double clicker
//
- connect(m_eventList, TQT_SIGNAL(doubleClicked(TQListViewItem*)),
- TQT_SLOT(slotPopupEventEditor(TQListViewItem*)));
+ connect(m_eventList, TQ_SIGNAL(doubleClicked(TQListViewItem*)),
+ TQ_SLOT(slotPopupEventEditor(TQListViewItem*)));
connect(m_eventList,
- TQT_SIGNAL(rightButtonPressed(TQListViewItem*, const TQPoint&, int)),
- TQT_SLOT(slotPopupMenu(TQListViewItem*, const TQPoint&, int)));
+ TQ_SIGNAL(rightButtonPressed(TQListViewItem*, const TQPoint&, int)),
+ TQ_SLOT(slotPopupMenu(TQListViewItem*, const TQPoint&, int)));
m_eventList->setAllColumnsShowFocus(true);
m_eventList->setSelectionMode(TQListView::Extended);
@@ -1119,41 +1119,41 @@ EventView::setupActions()
TQIconSet icon(TQPixmap(pixmapDir + "/toolbar/event-insert.png"));
new TDEAction(i18n("&Insert Event"), icon, Key_I, this,
- TQT_SLOT(slotEditInsert()), actionCollection(),
+ TQ_SLOT(slotEditInsert()), actionCollection(),
"insert");
TQCanvasPixmap pixmap(pixmapDir + "/toolbar/event-delete.png");
icon = TQIconSet(pixmap);
new TDEAction(i18n("&Delete Event"), icon, Key_Delete, this,
- TQT_SLOT(slotEditDelete()), actionCollection(),
+ TQ_SLOT(slotEditDelete()), actionCollection(),
"delete");
pixmap.load(pixmapDir + "/toolbar/event-edit.png");
icon = TQIconSet(pixmap);
new TDEAction(i18n("&Edit Event"), icon, Key_E, this,
- TQT_SLOT(slotEditEvent()), actionCollection(),
+ TQ_SLOT(slotEditEvent()), actionCollection(),
"edit_simple");
pixmap.load(pixmapDir + "/toolbar/event-edit-advanced.png");
icon = TQIconSet(pixmap);
new TDEAction(i18n("&Advanced Event Editor"), icon, Key_A, this,
- TQT_SLOT(slotEditEventAdvanced()), actionCollection(),
+ TQ_SLOT(slotEditEventAdvanced()), actionCollection(),
"edit_advanced");
// icon = TQIconSet(TQCanvasPixmap(pixmapDir + "/toolbar/eventfilter.xpm"));
new TDEAction(i18n("&Filter Selection"), "filter", Key_F, this,
- TQT_SLOT(slotFilterSelection()), actionCollection(),
+ TQ_SLOT(slotFilterSelection()), actionCollection(),
"filter_selection");
new TDEAction(i18n("Select &All"), Key_A + CTRL, this,
- TQT_SLOT(slotSelectAll()), actionCollection(),
+ TQ_SLOT(slotSelectAll()), actionCollection(),
"select_all");
new TDEAction(i18n("Clear Selection"), Key_Escape, this,
- TQT_SLOT(slotClearSelection()), actionCollection(),
+ TQ_SLOT(slotClearSelection()), actionCollection(),
"clear_selection");
m_config->setGroup(EventViewConfigGroup);
@@ -1165,7 +1165,7 @@ EventView::setupActions()
icon = TQIconSet(pixmap);
action = new TDERadioAction(i18n("&Musical Times"), icon, 0, this,
- TQT_SLOT(slotMusicalTime()),
+ TQ_SLOT(slotMusicalTime()),
actionCollection(), "time_musical");
action->setExclusiveGroup("timeMode");
if (timeMode == 0)
@@ -1175,7 +1175,7 @@ EventView::setupActions()
icon = TQIconSet(pixmap);
action = new TDERadioAction(i18n("&Real Times"), icon, 0, this,
- TQT_SLOT(slotRealTime()),
+ TQ_SLOT(slotRealTime()),
actionCollection(), "time_real");
action->setExclusiveGroup("timeMode");
if (timeMode == 1)
@@ -1185,7 +1185,7 @@ EventView::setupActions()
icon = TQIconSet(pixmap);
action = new TDERadioAction(i18n("Ra&w Times"), icon, 0, this,
- TQT_SLOT(slotRawTime()),
+ TQ_SLOT(slotRawTime()),
actionCollection(), "time_raw");
action->setExclusiveGroup("timeMode");
if (timeMode == 2)
@@ -1516,8 +1516,8 @@ EventView::createMenu()
m_menu->insertItem(i18n("Open in Event Editor"), 0);
m_menu->insertItem(i18n("Open in Expert Event Editor"), 1);
- connect(m_menu, TQT_SIGNAL(activated(int)),
- TQT_SLOT(slotMenuActivated(int)));
+ connect(m_menu, TQ_SIGNAL(activated(int)),
+ TQ_SLOT(slotMenuActivated(int)));
}
void
diff --git a/src/gui/editors/guitar/GuitarChordEditorDialog.cpp b/src/gui/editors/guitar/GuitarChordEditorDialog.cpp
index 7e5fe18..481558e 100644
--- a/src/gui/editors/guitar/GuitarChordEditorDialog.cpp
+++ b/src/gui/editors/guitar/GuitarChordEditorDialog.cpp
@@ -50,8 +50,8 @@ GuitarChordEditorDialog::GuitarChordEditorDialog(Guitar::Chord& chord, const Gui
m_startFret = new TQSpinBox(1, 24, 1, page);
topLayout->addWidget(m_startFret, 1, 1);
- connect(m_startFret, TQT_SIGNAL(valueChanged(int)),
- this, TQT_SLOT(slotStartFretChanged(int)));
+ connect(m_startFret, TQ_SIGNAL(valueChanged(int)),
+ this, TQ_SLOT(slotStartFretChanged(int)));
topLayout->addWidget(new TQLabel(i18n("Root"), page), 2, 1);
m_rootNotesList = new TQComboBox(page);
diff --git a/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp b/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp
index f9845c1..ac1a266 100644
--- a/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp
+++ b/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp
@@ -63,8 +63,8 @@ GuitarChordSelectorDialog::GuitarChordSelectorDialog(TQWidget *parent)
m_chordComplexityCombo->insertItem(i18n("common"));
m_chordComplexityCombo->insertItem(i18n("all"));
- connect(m_chordComplexityCombo, TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(slotComplexityChanged(int)));
+ connect(m_chordComplexityCombo, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(slotComplexityChanged(int)));
TQVBoxLayout* vboxLayout = new TQVBoxLayout(page, 5);
topLayout->addMultiCellLayout(vboxLayout, 1, 3, 2, 2);
@@ -74,12 +74,12 @@ GuitarChordSelectorDialog::GuitarChordSelectorDialog(TQWidget *parent)
vboxLayout->addWidget(m_deleteFingeringButton);
vboxLayout->addWidget(m_editFingeringButton);
- connect(m_newFingeringButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotNewFingering()));
- connect(m_deleteFingeringButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotDeleteFingering()));
- connect(m_editFingeringButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotEditFingering()));
+ connect(m_newFingeringButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotNewFingering()));
+ connect(m_deleteFingeringButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotDeleteFingering()));
+ connect(m_editFingeringButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotEditFingering()));
topLayout->addWidget(new TQLabel(i18n("Fingerings"), page), 0, 3);
m_fingeringsList = new TQListBox(page);
@@ -88,12 +88,12 @@ GuitarChordSelectorDialog::GuitarChordSelectorDialog(TQWidget *parent)
m_fingeringBox = new FingeringBox(false, page);
topLayout->addMultiCellWidget(m_fingeringBox, 2, 2, 0, 1);
- connect(m_rootNotesList, TQT_SIGNAL(highlighted(int)),
- this, TQT_SLOT(slotRootHighlighted(int)));
- connect(m_chordExtList, TQT_SIGNAL(highlighted(int)),
- this, TQT_SLOT(slotChordExtHighlighted(int)));
- connect(m_fingeringsList, TQT_SIGNAL(highlighted(TQListBoxItem*)),
- this, TQT_SLOT(slotFingeringHighlighted(TQListBoxItem*)));
+ connect(m_rootNotesList, TQ_SIGNAL(highlighted(int)),
+ this, TQ_SLOT(slotRootHighlighted(int)));
+ connect(m_chordExtList, TQ_SIGNAL(highlighted(int)),
+ this, TQ_SLOT(slotChordExtHighlighted(int)));
+ connect(m_fingeringsList, TQ_SIGNAL(highlighted(TQListBoxItem*)),
+ this, TQ_SLOT(slotFingeringHighlighted(TQListBoxItem*)));
}
void
diff --git a/src/gui/editors/matrix/MatrixEraser.cpp b/src/gui/editors/matrix/MatrixEraser.cpp
index 3d0f960..f7926f2 100644
--- a/src/gui/editors/matrix/MatrixEraser.cpp
+++ b/src/gui/editors/matrix/MatrixEraser.cpp
@@ -50,21 +50,21 @@ MatrixEraser::MatrixEraser(MatrixView* parent)
TQIconSet icon = TQIconSet(pixmap);
new TDEAction(i18n("Switch to Select Tool"), icon, 0, this,
- TQT_SLOT(slotSelectSelected()), actionCollection(),
+ TQ_SLOT(slotSelectSelected()), actionCollection(),
"select");
new TDEAction(i18n("Switch to Draw Tool"), "pencil", 0, this,
- TQT_SLOT(slotDrawSelected()), actionCollection(),
+ TQ_SLOT(slotDrawSelected()), actionCollection(),
"draw");
new TDEAction(i18n("Switch to Move Tool"), "move", 0, this,
- TQT_SLOT(slotMoveSelected()), actionCollection(),
+ TQ_SLOT(slotMoveSelected()), actionCollection(),
"move");
pixmap.load(pixmapDir + "/toolbar/resize.xpm");
icon = TQIconSet(pixmap);
new TDEAction(i18n("Switch to Resize Tool"), icon, 0, this,
- TQT_SLOT(slotResizeSelected()), actionCollection(),
+ TQ_SLOT(slotResizeSelected()), actionCollection(),
"resize");
createMenu("matrixeraser.rc");
diff --git a/src/gui/editors/matrix/MatrixMover.cpp b/src/gui/editors/matrix/MatrixMover.cpp
index 5a0bb55..04adf49 100644
--- a/src/gui/editors/matrix/MatrixMover.cpp
+++ b/src/gui/editors/matrix/MatrixMover.cpp
@@ -63,21 +63,21 @@ MatrixMover::MatrixMover(MatrixView* parent) :
TQIconSet icon = TQIconSet(pixmap);
new TDEAction(i18n("Switch to Select Tool"), icon, 0, this,
- TQT_SLOT(slotSelectSelected()), actionCollection(),
+ TQ_SLOT(slotSelectSelected()), actionCollection(),
"select");
new TDEAction(i18n("Switch to Draw Tool"), "pencil", 0, this,
- TQT_SLOT(slotDrawSelected()), actionCollection(),
+ TQ_SLOT(slotDrawSelected()), actionCollection(),
"draw");
new TDEAction(i18n("Switch to Erase Tool"), "eraser", 0, this,
- TQT_SLOT(slotEraseSelected()), actionCollection(),
+ TQ_SLOT(slotEraseSelected()), actionCollection(),
"erase");
pixmap.load(pixmapDir + "/toolbar/resize.xpm");
icon = TQIconSet(pixmap);
new TDEAction(i18n("Switch to Resize Tool"), icon, 0, this,
- TQT_SLOT(slotResizeSelected()), actionCollection(),
+ TQ_SLOT(slotResizeSelected()), actionCollection(),
"resize");
createMenu("matrixmover.rc");
@@ -418,20 +418,20 @@ void MatrixMover::handleMouseRelease(timeT newTime,
void MatrixMover::ready()
{
- connect(m_parentView->getCanvasView(), TQT_SIGNAL(contentsMoving (int, int)),
- this, TQT_SLOT(slotMatrixScrolled(int, int)));
- connect(this, TQT_SIGNAL(hoveredOverNoteChanged(int, bool, timeT)),
- m_mParentView, TQT_SLOT(slotHoveredOverNoteChanged(int, bool, timeT)));
+ connect(m_parentView->getCanvasView(), TQ_SIGNAL(contentsMoving (int, int)),
+ this, TQ_SLOT(slotMatrixScrolled(int, int)));
+ connect(this, TQ_SIGNAL(hoveredOverNoteChanged(int, bool, timeT)),
+ m_mParentView, TQ_SLOT(slotHoveredOverNoteChanged(int, bool, timeT)));
m_mParentView->setCanvasCursor(TQt::sizeAllCursor);
setBasicContextHelp();
}
void MatrixMover::stow()
{
- disconnect(m_parentView->getCanvasView(), TQT_SIGNAL(contentsMoving (int, int)),
- this, TQT_SLOT(slotMatrixScrolled(int, int)));
- disconnect(this, TQT_SIGNAL(hoveredOverNoteChanged(int, bool, timeT)),
- m_mParentView, TQT_SLOT(slotHoveredOverNoteChanged(int, bool, timeT)));
+ disconnect(m_parentView->getCanvasView(), TQ_SIGNAL(contentsMoving (int, int)),
+ this, TQ_SLOT(slotMatrixScrolled(int, int)));
+ disconnect(this, TQ_SIGNAL(hoveredOverNoteChanged(int, bool, timeT)),
+ m_mParentView, TQ_SLOT(slotHoveredOverNoteChanged(int, bool, timeT)));
}
void MatrixMover::slotMatrixScrolled(int newX, int newY)
diff --git a/src/gui/editors/matrix/MatrixPainter.cpp b/src/gui/editors/matrix/MatrixPainter.cpp
index 6514b2d..8a22b41 100644
--- a/src/gui/editors/matrix/MatrixPainter.cpp
+++ b/src/gui/editors/matrix/MatrixPainter.cpp
@@ -61,21 +61,21 @@ MatrixPainter::MatrixPainter(MatrixView* parent)
TQIconSet icon = TQIconSet(pixmap);
new TDEAction(i18n("Switch to Select Tool"), icon, 0, this,
- TQT_SLOT(slotSelectSelected()), actionCollection(),
+ TQ_SLOT(slotSelectSelected()), actionCollection(),
"select");
new TDEAction(i18n("Switch to Erase Tool"), "eraser", 0, this,
- TQT_SLOT(slotEraseSelected()), actionCollection(),
+ TQ_SLOT(slotEraseSelected()), actionCollection(),
"erase");
new TDEAction(i18n("Switch to Move Tool"), "move", 0, this,
- TQT_SLOT(slotMoveSelected()), actionCollection(),
+ TQ_SLOT(slotMoveSelected()), actionCollection(),
"move");
pixmap.load(pixmapDir + "/toolbar/resize.xpm");
icon = TQIconSet(pixmap);
new TDEAction(i18n("Switch to Resize Tool"), icon, 0, this,
- TQT_SLOT(slotResizeSelected()), actionCollection(),
+ TQ_SLOT(slotResizeSelected()), actionCollection(),
"resize");
createMenu("matrixpainter.rc");
@@ -318,8 +318,8 @@ void MatrixPainter::handleMouseRelease(timeT endTime,
void MatrixPainter::ready()
{
- connect(m_parentView->getCanvasView(), TQT_SIGNAL(contentsMoving (int, int)),
- this, TQT_SLOT(slotMatrixScrolled(int, int)));
+ connect(m_parentView->getCanvasView(), TQ_SIGNAL(contentsMoving (int, int)),
+ this, TQ_SLOT(slotMatrixScrolled(int, int)));
m_mParentView->setCanvasCursor(TQt::crossCursor);
@@ -328,8 +328,8 @@ void MatrixPainter::ready()
void MatrixPainter::stow()
{
- disconnect(m_parentView->getCanvasView(), TQT_SIGNAL(contentsMoving (int, int)),
- this, TQT_SLOT(slotMatrixScrolled(int, int)));
+ disconnect(m_parentView->getCanvasView(), TQ_SIGNAL(contentsMoving (int, int)),
+ this, TQ_SLOT(slotMatrixScrolled(int, int)));
}
void MatrixPainter::slotMatrixScrolled(int newX, int newY)
diff --git a/src/gui/editors/matrix/MatrixResizer.cpp b/src/gui/editors/matrix/MatrixResizer.cpp
index 0e6141b..735ce3c 100644
--- a/src/gui/editors/matrix/MatrixResizer.cpp
+++ b/src/gui/editors/matrix/MatrixResizer.cpp
@@ -59,19 +59,19 @@ MatrixResizer::MatrixResizer(MatrixView* parent)
TQIconSet icon = TQIconSet(pixmap);
new TDEAction(i18n("Switch to Select Tool"), icon, 0, this,
- TQT_SLOT(slotSelectSelected()), actionCollection(),
+ TQ_SLOT(slotSelectSelected()), actionCollection(),
"select");
new TDEAction(i18n("Switch to Draw Tool"), "pencil", 0, this,
- TQT_SLOT(slotDrawSelected()), actionCollection(),
+ TQ_SLOT(slotDrawSelected()), actionCollection(),
"draw");
new TDEAction(i18n("Switch to Erase Tool"), "eraser", 0, this,
- TQT_SLOT(slotEraseSelected()), actionCollection(),
+ TQ_SLOT(slotEraseSelected()), actionCollection(),
"erase");
new TDEAction(i18n("Switch to Move Tool"), "move", 0, this,
- TQT_SLOT(slotMoveSelected()), actionCollection(),
+ TQ_SLOT(slotMoveSelected()), actionCollection(),
"move");
createMenu("matrixresizer.rc");
@@ -287,16 +287,16 @@ void MatrixResizer::handleMouseRelease(timeT newTime,
void MatrixResizer::ready()
{
- connect(m_parentView->getCanvasView(), TQT_SIGNAL(contentsMoving (int, int)),
- this, TQT_SLOT(slotMatrixScrolled(int, int)));
+ connect(m_parentView->getCanvasView(), TQ_SIGNAL(contentsMoving (int, int)),
+ this, TQ_SLOT(slotMatrixScrolled(int, int)));
m_mParentView->setCanvasCursor(TQt::sizeHorCursor);
setBasicContextHelp();
}
void MatrixResizer::stow()
{
- disconnect(m_parentView->getCanvasView(), TQT_SIGNAL(contentsMoving (int, int)),
- this, TQT_SLOT(slotMatrixScrolled(int, int)));
+ disconnect(m_parentView->getCanvasView(), TQ_SIGNAL(contentsMoving (int, int)),
+ this, TQ_SLOT(slotMatrixScrolled(int, int)));
}
void MatrixResizer::slotMatrixScrolled(int newX, int newY)
diff --git a/src/gui/editors/matrix/MatrixSelector.cpp b/src/gui/editors/matrix/MatrixSelector.cpp
index ccb9c9e..c084cd3 100644
--- a/src/gui/editors/matrix/MatrixSelector.cpp
+++ b/src/gui/editors/matrix/MatrixSelector.cpp
@@ -69,19 +69,19 @@ MatrixSelector::MatrixSelector(MatrixView* view)
m_matrixView(view),
m_selectionToMerge(0)
{
- connect(m_parentView, TQT_SIGNAL(usedSelection()),
- this, TQT_SLOT(slotHideSelection()));
+ connect(m_parentView, TQ_SIGNAL(usedSelection()),
+ this, TQ_SLOT(slotHideSelection()));
new TDEAction(i18n("Switch to Draw Tool"), "pencil", 0, this,
- TQT_SLOT(slotDrawSelected()), actionCollection(),
+ TQ_SLOT(slotDrawSelected()), actionCollection(),
"draw");
new TDEAction(i18n("Switch to Erase Tool"), "eraser", 0, this,
- TQT_SLOT(slotEraseSelected()), actionCollection(),
+ TQ_SLOT(slotEraseSelected()), actionCollection(),
"erase");
new TDEAction(i18n("Switch to Move Tool"), "move", 0, this,
- TQT_SLOT(slotMoveSelected()), actionCollection(),
+ TQ_SLOT(slotMoveSelected()), actionCollection(),
"move");
TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
@@ -89,7 +89,7 @@ MatrixSelector::MatrixSelector(MatrixView* view)
TQIconSet icon = TQIconSet(pixmap);
new TDEAction(i18n("Switch to Resize Tool"), icon, 0, this,
- TQT_SLOT(slotResizeSelected()), actionCollection(),
+ TQ_SLOT(slotResizeSelected()), actionCollection(),
"resize");
createMenu("matrixselector.rc");
@@ -316,7 +316,7 @@ void MatrixSelector::handleMouseDoubleClick(timeT ,
m_justSelectedBar = true;
TQTimer::singleShot(TQApplication::doubleClickInterval(), this,
- TQT_SLOT(slotClickTimeout()));
+ TQ_SLOT(slotClickTimeout()));
} */
}
@@ -445,8 +445,8 @@ void MatrixSelector::ready()
//m_mParentView->setPositionTracking(false);
}
- connect(m_parentView->getCanvasView(), TQT_SIGNAL(contentsMoving (int, int)),
- this, TQT_SLOT(slotMatrixScrolled(int, int)));
+ connect(m_parentView->getCanvasView(), TQ_SIGNAL(contentsMoving (int, int)),
+ this, TQ_SLOT(slotMatrixScrolled(int, int)));
setContextHelp(i18n("Click and drag to select; middle-click and drag to draw new note"));
}
@@ -459,8 +459,8 @@ void MatrixSelector::stow()
m_mParentView->canvas()->update();
}
- disconnect(m_parentView->getCanvasView(), TQT_SIGNAL(contentsMoving (int, int)),
- this, TQT_SLOT(slotMatrixScrolled(int, int)));
+ disconnect(m_parentView->getCanvasView(), TQ_SIGNAL(contentsMoving (int, int)),
+ this, TQ_SLOT(slotMatrixScrolled(int, int)));
}
diff --git a/src/gui/editors/matrix/MatrixView.cpp b/src/gui/editors/matrix/MatrixView.cpp
index 4992aef..b8f14a4 100644
--- a/src/gui/editors/matrix/MatrixView.cpp
+++ b/src/gui/editors/matrix/MatrixView.cpp
@@ -173,14 +173,14 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc,
KDockWidget::DockLeft, // dock site
20); // relation target/this (in percent)
- connect(m_dockLeft, TQT_SIGNAL(iMBeingClosed()),
- this, TQT_SLOT(slotParametersClosed()));
- connect(m_dockLeft, TQT_SIGNAL(hasUndocked()),
- this, TQT_SLOT(slotParametersClosed()));
+ connect(m_dockLeft, TQ_SIGNAL(iMBeingClosed()),
+ this, TQ_SLOT(slotParametersClosed()));
+ connect(m_dockLeft, TQ_SIGNAL(hasUndocked()),
+ this, TQ_SLOT(slotParametersClosed()));
// Apparently, hasUndocked() is emitted when the dock widget's
// 'close' button on the dock handle is clicked.
- connect(m_mainDockWidget, TQT_SIGNAL(docking(KDockWidget*, KDockWidget::DockPosition)),
- this, TQT_SLOT(slotParametersDockedBack(KDockWidget*, KDockWidget::DockPosition)));
+ connect(m_mainDockWidget, TQ_SIGNAL(docking(KDockWidget*, KDockWidget::DockPosition)),
+ this, TQ_SLOT(slotParametersDockedBack(KDockWidget*, KDockWidget::DockPosition)));
Composition &comp = doc->getComposition();
@@ -188,8 +188,8 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc,
initStatusBar();
- connect(m_toolBox, TQT_SIGNAL(showContextHelp(const TQString &)),
- this, TQT_SLOT(slotToolHelpChanged(const TQString &)));
+ connect(m_toolBox, TQ_SIGNAL(showContextHelp(const TQString &)),
+ this, TQ_SLOT(slotToolHelpChanged(const TQString &)));
TQCanvas *tCanvas = new TQCanvas(this);
@@ -276,33 +276,33 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc,
RosegardenGUIApp *app = RosegardenGUIApp::self();
connect(app,
- TQT_SIGNAL(pluginSelected(InstrumentId, int, int)),
+ TQ_SIGNAL(pluginSelected(InstrumentId, int, int)),
m_parameterBox,
- TQT_SLOT(slotPluginSelected(InstrumentId, int, int)));
+ TQ_SLOT(slotPluginSelected(InstrumentId, int, int)));
connect(app,
- TQT_SIGNAL(pluginBypassed(InstrumentId, int, bool)),
+ TQ_SIGNAL(pluginBypassed(InstrumentId, int, bool)),
m_parameterBox,
- TQT_SLOT(slotPluginBypassed(InstrumentId, int, bool)));
+ TQ_SLOT(slotPluginBypassed(InstrumentId, int, bool)));
connect(app,
- TQT_SIGNAL(instrumentParametersChanged(InstrumentId)),
+ TQ_SIGNAL(instrumentParametersChanged(InstrumentId)),
m_parameterBox,
- TQT_SLOT(slotInstrumentParametersChanged(InstrumentId)));
+ TQ_SLOT(slotInstrumentParametersChanged(InstrumentId)));
connect(m_parameterBox,
- TQT_SIGNAL(instrumentParametersChanged(InstrumentId)),
+ TQ_SIGNAL(instrumentParametersChanged(InstrumentId)),
app,
- TQT_SIGNAL(instrumentParametersChanged(InstrumentId)));
+ TQ_SIGNAL(instrumentParametersChanged(InstrumentId)));
connect(m_parameterBox,
- TQT_SIGNAL(selectPlugin(TQWidget *, InstrumentId, int)),
+ TQ_SIGNAL(selectPlugin(TQWidget *, InstrumentId, int)),
app,
- TQT_SLOT(slotShowPluginDialog(TQWidget *, InstrumentId, int)));
+ TQ_SLOT(slotShowPluginDialog(TQWidget *, InstrumentId, int)));
connect(m_parameterBox,
- TQT_SIGNAL(showPluginGUI(InstrumentId, int)),
+ TQ_SIGNAL(showPluginGUI(InstrumentId, int)),
app,
- TQT_SLOT(slotShowPluginGUI(InstrumentId, int)));
+ TQ_SLOT(slotShowPluginGUI(InstrumentId, int)));
connect(parent, // RosegardenGUIView
- TQT_SIGNAL(checkTrackAssignments()),
+ TQ_SIGNAL(checkTrackAssignments()),
this,
- TQT_SLOT(slotCheckTrackAssignments()));
+ TQ_SLOT(slotCheckTrackAssignments()));
// Assign the instrument
//
@@ -310,9 +310,9 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc,
if (m_drumMode) {
connect(m_parameterBox,
- TQT_SIGNAL(instrumentPercussionSetChanged(Instrument *)),
+ TQ_SIGNAL(instrumentPercussionSetChanged(Instrument *)),
this,
- TQT_SLOT(slotPercussionSetChanged(Instrument *)));
+ TQ_SLOT(slotPercussionSetChanged(Instrument *)));
}
// Set the snap grid from the stored size in the segment
@@ -350,83 +350,83 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc,
// Connect vertical scrollbars between matrix and piano
//
- connect(m_canvasView->verticalScrollBar(), TQT_SIGNAL(valueChanged(int)),
- this, TQT_SLOT(slotVerticalScrollPianoKeyboard(int)));
+ connect(m_canvasView->verticalScrollBar(), TQ_SIGNAL(valueChanged(int)),
+ this, TQ_SLOT(slotVerticalScrollPianoKeyboard(int)));
- connect(m_canvasView->verticalScrollBar(), TQT_SIGNAL(sliderMoved(int)),
- this, TQT_SLOT(slotVerticalScrollPianoKeyboard(int)));
+ connect(m_canvasView->verticalScrollBar(), TQ_SIGNAL(sliderMoved(int)),
+ this, TQ_SLOT(slotVerticalScrollPianoKeyboard(int)));
- connect(m_canvasView, TQT_SIGNAL(zoomIn()), this, TQT_SLOT(slotZoomIn()));
- connect(m_canvasView, TQT_SIGNAL(zoomOut()), this, TQT_SLOT(slotZoomOut()));
+ connect(m_canvasView, TQ_SIGNAL(zoomIn()), this, TQ_SLOT(slotZoomIn()));
+ connect(m_canvasView, TQ_SIGNAL(zoomOut()), this, TQ_SLOT(slotZoomOut()));
- connect(m_pianoView, TQT_SIGNAL(gotWheelEvent(TQWheelEvent*)),
- m_canvasView, TQT_SLOT(slotExternalWheelEvent(TQWheelEvent*)));
+ connect(m_pianoView, TQ_SIGNAL(gotWheelEvent(TQWheelEvent*)),
+ m_canvasView, TQ_SLOT(slotExternalWheelEvent(TQWheelEvent*)));
// ensure the piano keyb keeps the right margins when the user toggles
// the canvas view rulers
//
- connect(m_canvasView, TQT_SIGNAL(bottomWidgetHeightChanged(int)),
- this, TQT_SLOT(slotCanvasBottomWidgetHeightChanged(int)));
+ connect(m_canvasView, TQ_SIGNAL(bottomWidgetHeightChanged(int)),
+ this, TQ_SLOT(slotCanvasBottomWidgetHeightChanged(int)));
- connect(m_canvasView, TQT_SIGNAL(mouseEntered()),
- this, TQT_SLOT(slotMouseEnteredCanvasView()));
+ connect(m_canvasView, TQ_SIGNAL(mouseEntered()),
+ this, TQ_SLOT(slotMouseEnteredCanvasView()));
- connect(m_canvasView, TQT_SIGNAL(mouseLeft()),
- this, TQT_SLOT(slotMouseLeftCanvasView()));
+ connect(m_canvasView, TQ_SIGNAL(mouseLeft()),
+ this, TQ_SLOT(slotMouseLeftCanvasView()));
/*
TQObject::connect
- (getCanvasView(), TQT_SIGNAL(activeItemPressed(TQMouseEvent*, TQCanvasItem*)),
- this, TQT_SLOT (activeItemPressed(TQMouseEvent*, TQCanvasItem*)));
+ (getCanvasView(), TQ_SIGNAL(activeItemPressed(TQMouseEvent*, TQCanvasItem*)),
+ this, TQ_SLOT (activeItemPressed(TQMouseEvent*, TQCanvasItem*)));
*/
TQObject::connect
(getCanvasView(),
- TQT_SIGNAL(mousePressed(timeT,
+ TQ_SIGNAL(mousePressed(timeT,
int, TQMouseEvent*, MatrixElement*)),
this,
- TQT_SLOT(slotMousePressed(timeT,
+ TQ_SLOT(slotMousePressed(timeT,
int, TQMouseEvent*, MatrixElement*)));
TQObject::connect
(getCanvasView(),
- TQT_SIGNAL(mouseMoved(timeT, int, TQMouseEvent*)),
+ TQ_SIGNAL(mouseMoved(timeT, int, TQMouseEvent*)),
this,
- TQT_SLOT(slotMouseMoved(timeT, int, TQMouseEvent*)));
+ TQ_SLOT(slotMouseMoved(timeT, int, TQMouseEvent*)));
TQObject::connect
(getCanvasView(),
- TQT_SIGNAL(mouseReleased(timeT, int, TQMouseEvent*)),
+ TQ_SIGNAL(mouseReleased(timeT, int, TQMouseEvent*)),
this,
- TQT_SLOT(slotMouseReleased(timeT, int, TQMouseEvent*)));
+ TQ_SLOT(slotMouseReleased(timeT, int, TQMouseEvent*)));
TQObject::connect
- (getCanvasView(), TQT_SIGNAL(hoveredOverNoteChanged(int, bool, timeT)),
- this, TQT_SLOT(slotHoveredOverNoteChanged(int, bool, timeT)));
+ (getCanvasView(), TQ_SIGNAL(hoveredOverNoteChanged(int, bool, timeT)),
+ this, TQ_SLOT(slotHoveredOverNoteChanged(int, bool, timeT)));
TQObject::connect
- (m_pitchRuler, TQT_SIGNAL(hoveredOverKeyChanged(unsigned int)),
- this, TQT_SLOT (slotHoveredOverKeyChanged(unsigned int)));
+ (m_pitchRuler, TQ_SIGNAL(hoveredOverKeyChanged(unsigned int)),
+ this, TQ_SLOT (slotHoveredOverKeyChanged(unsigned int)));
TQObject::connect
- (m_pitchRuler, TQT_SIGNAL(keyPressed(unsigned int, bool)),
- this, TQT_SLOT (slotKeyPressed(unsigned int, bool)));
+ (m_pitchRuler, TQ_SIGNAL(keyPressed(unsigned int, bool)),
+ this, TQ_SLOT (slotKeyPressed(unsigned int, bool)));
TQObject::connect
- (m_pitchRuler, TQT_SIGNAL(keySelected(unsigned int, bool)),
- this, TQT_SLOT (slotKeySelected(unsigned int, bool)));
+ (m_pitchRuler, TQ_SIGNAL(keySelected(unsigned int, bool)),
+ this, TQ_SLOT (slotKeySelected(unsigned int, bool)));
TQObject::connect
- (m_pitchRuler, TQT_SIGNAL(keyReleased(unsigned int, bool)),
- this, TQT_SLOT (slotKeyReleased(unsigned int, bool)));
+ (m_pitchRuler, TQ_SIGNAL(keyReleased(unsigned int, bool)),
+ this, TQ_SLOT (slotKeyReleased(unsigned int, bool)));
TQObject::connect
- (getCanvasView(), TQT_SIGNAL(hoveredOverAbsoluteTimeChanged(unsigned int)),
- this, TQT_SLOT (slotHoveredOverAbsoluteTimeChanged(unsigned int)));
+ (getCanvasView(), TQ_SIGNAL(hoveredOverAbsoluteTimeChanged(unsigned int)),
+ this, TQ_SLOT (slotHoveredOverAbsoluteTimeChanged(unsigned int)));
TQObject::connect
- (doc, TQT_SIGNAL(pointerPositionChanged(timeT)),
- this, TQT_SLOT(slotSetPointerPosition(timeT)));
+ (doc, TQ_SIGNAL(pointerPositionChanged(timeT)),
+ this, TQ_SLOT(slotSetPointerPosition(timeT)));
MATRIX_DEBUG << "MatrixView : applying layout\n";
@@ -463,32 +463,32 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc,
TQObject::disconnect
(topStandardRuler->getLoopRuler(),
- TQT_SIGNAL(setPointerPosition(timeT)), 0, 0);
+ TQ_SIGNAL(setPointerPosition(timeT)), 0, 0);
TQObject::connect
(topStandardRuler->getLoopRuler(),
- TQT_SIGNAL(setPointerPosition(timeT)),
- this, TQT_SLOT(slotSetInsertCursorPosition(timeT)));
+ TQ_SIGNAL(setPointerPosition(timeT)),
+ this, TQ_SLOT(slotSetInsertCursorPosition(timeT)));
TQObject::connect
(topStandardRuler,
- TQT_SIGNAL(dragPointerToPosition(timeT)),
- this, TQT_SLOT(slotSetInsertCursorPosition(timeT)));
+ TQ_SIGNAL(dragPointerToPosition(timeT)),
+ this, TQ_SLOT(slotSetInsertCursorPosition(timeT)));
topStandardRuler->getLoopRuler()->setBackgroundColor
(GUIPalette::getColour(GUIPalette::InsertCursorRuler));
- connect(topStandardRuler->getLoopRuler(), TQT_SIGNAL(startMouseMove(int)),
- m_canvasView, TQT_SLOT(startAutoScroll(int)));
- connect(topStandardRuler->getLoopRuler(), TQT_SIGNAL(stopMouseMove()),
- m_canvasView, TQT_SLOT(stopAutoScroll()));
+ connect(topStandardRuler->getLoopRuler(), TQ_SIGNAL(startMouseMove(int)),
+ m_canvasView, TQ_SLOT(startAutoScroll(int)));
+ connect(topStandardRuler->getLoopRuler(), TQ_SIGNAL(stopMouseMove()),
+ m_canvasView, TQ_SLOT(stopAutoScroll()));
- connect(bottomStandardRuler->getLoopRuler(), TQT_SIGNAL(startMouseMove(int)),
- m_canvasView, TQT_SLOT(startAutoScroll(int)));
- connect(bottomStandardRuler->getLoopRuler(), TQT_SIGNAL(stopMouseMove()),
- m_canvasView, TQT_SLOT(stopAutoScroll()));
- connect(m_bottomStandardRuler, TQT_SIGNAL(dragPointerToPosition(timeT)),
- this, TQT_SLOT(slotSetPointerPosition(timeT)));
+ connect(bottomStandardRuler->getLoopRuler(), TQ_SIGNAL(startMouseMove(int)),
+ m_canvasView, TQ_SLOT(startAutoScroll(int)));
+ connect(bottomStandardRuler->getLoopRuler(), TQ_SIGNAL(stopMouseMove()),
+ m_canvasView, TQ_SLOT(stopAutoScroll()));
+ connect(m_bottomStandardRuler, TQ_SIGNAL(dragPointerToPosition(timeT)),
+ this, TQ_SLOT(slotSetPointerPosition(timeT)));
// Force height for the moment
//
@@ -637,148 +637,148 @@ void MatrixView::setupActions()
TQIconSet icon(TQPixmap(pixmapDir + "/toolbar/select.xpm"));
toolAction = new TDERadioAction(i18n("&Select and Edit"), icon, Key_F2,
- this, TQT_SLOT(slotSelectSelected()),
+ this, TQ_SLOT(slotSelectSelected()),
actionCollection(), "select");
toolAction->setExclusiveGroup("tools");
toolAction = new TDERadioAction(i18n("&Draw"), "pencil", Key_F3,
- this, TQT_SLOT(slotPaintSelected()),
+ this, TQ_SLOT(slotPaintSelected()),
actionCollection(), "draw");
toolAction->setExclusiveGroup("tools");
toolAction = new TDERadioAction(i18n("&Erase"), "eraser", Key_F4,
- this, TQT_SLOT(slotEraseSelected()),
+ this, TQ_SLOT(slotEraseSelected()),
actionCollection(), "erase");
toolAction->setExclusiveGroup("tools");
toolAction = new TDERadioAction(i18n("&Move"), "move", Key_F5,
- this, TQT_SLOT(slotMoveSelected()),
+ this, TQ_SLOT(slotMoveSelected()),
actionCollection(), "move");
toolAction->setExclusiveGroup("tools");
TQCanvasPixmap pixmap(pixmapDir + "/toolbar/resize.xpm");
icon = TQIconSet(pixmap);
toolAction = new TDERadioAction(i18n("Resi&ze"), icon, Key_F6,
- this, TQT_SLOT(slotResizeSelected()),
+ this, TQ_SLOT(slotResizeSelected()),
actionCollection(), "resize");
toolAction->setExclusiveGroup("tools");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("chord")));
(new TDEToggleAction(i18n("C&hord Insert Mode"), icon, Key_H,
- this, TQT_SLOT(slotUpdateInsertModeStatus()),
+ this, TQ_SLOT(slotUpdateInsertModeStatus()),
actionCollection(), "chord_mode"))->
setChecked(false);
pixmap.load(pixmapDir + "/toolbar/step_by_step.xpm");
icon = TQIconSet(pixmap);
new TDEToggleAction(i18n("Ste&p Recording"), icon, 0, this,
- TQT_SLOT(slotToggleStepByStep()), actionCollection(),
+ TQ_SLOT(slotToggleStepByStep()), actionCollection(),
"toggle_step_by_step");
pixmap.load(pixmapDir + "/toolbar/quantize.png");
icon = TQIconSet(pixmap);
new TDEAction(EventQuantizeCommand::getGlobalName(), icon, Key_Equal, this,
- TQT_SLOT(slotTransformsQuantize()), actionCollection(),
+ TQ_SLOT(slotTransformsQuantize()), actionCollection(),
"quantize");
new TDEAction(i18n("Repeat Last Quantize"), Key_Plus, this,
- TQT_SLOT(slotTransformsRepeatQuantize()), actionCollection(),
+ TQ_SLOT(slotTransformsRepeatQuantize()), actionCollection(),
"repeat_quantize");
new TDEAction(CollapseNotesCommand::getGlobalName(), Key_Equal + CTRL, this,
- TQT_SLOT(slotTransformsCollapseNotes()), actionCollection(),
+ TQ_SLOT(slotTransformsCollapseNotes()), actionCollection(),
"collapse_notes");
new TDEAction(i18n("&Legato"), Key_Minus, this,
- TQT_SLOT(slotTransformsLegato()), actionCollection(),
+ TQ_SLOT(slotTransformsLegato()), actionCollection(),
"legatoize");
new TDEAction(ChangeVelocityCommand::getGlobalName(10), 0,
Key_Up + SHIFT, this,
- TQT_SLOT(slotVelocityUp()), actionCollection(),
+ TQ_SLOT(slotVelocityUp()), actionCollection(),
"velocity_up");
new TDEAction(ChangeVelocityCommand::getGlobalName( -10), 0,
Key_Down + SHIFT, this,
- TQT_SLOT(slotVelocityDown()), actionCollection(),
+ TQ_SLOT(slotVelocityDown()), actionCollection(),
"velocity_down");
new TDEAction(i18n("Set to Current Velocity"), 0, this,
- TQT_SLOT(slotSetVelocitiesToCurrent()), actionCollection(),
+ TQ_SLOT(slotSetVelocitiesToCurrent()), actionCollection(),
"set_to_current_velocity");
new TDEAction(i18n("Set Event &Velocities..."), 0, this,
- TQT_SLOT(slotSetVelocities()), actionCollection(),
+ TQ_SLOT(slotSetVelocities()), actionCollection(),
"set_velocities");
new TDEAction(i18n("Trigger Se&gment..."), 0, this,
- TQT_SLOT(slotTriggerSegment()), actionCollection(),
+ TQ_SLOT(slotTriggerSegment()), actionCollection(),
"trigger_segment");
new TDEAction(i18n("Remove Triggers..."), 0, this,
- TQT_SLOT(slotRemoveTriggers()), actionCollection(),
+ TQ_SLOT(slotRemoveTriggers()), actionCollection(),
"remove_trigger");
new TDEAction(i18n("Select &All"), Key_A + CTRL, this,
- TQT_SLOT(slotSelectAll()), actionCollection(),
+ TQ_SLOT(slotSelectAll()), actionCollection(),
"select_all");
new TDEAction(i18n("&Delete"), Key_Delete, this,
- TQT_SLOT(slotEditDelete()), actionCollection(),
+ TQ_SLOT(slotEditDelete()), actionCollection(),
"delete");
new TDEAction(i18n("Cursor &Back"), 0, Key_Left, this,
- TQT_SLOT(slotStepBackward()), actionCollection(),
+ TQ_SLOT(slotStepBackward()), actionCollection(),
"cursor_back");
new TDEAction(i18n("Cursor &Forward"), 0, Key_Right, this,
- TQT_SLOT(slotStepForward()), actionCollection(),
+ TQ_SLOT(slotStepForward()), actionCollection(),
"cursor_forward");
new TDEAction(i18n("Cursor Ba&ck Bar"), 0, Key_Left + CTRL, this,
- TQT_SLOT(slotJumpBackward()), actionCollection(),
+ TQ_SLOT(slotJumpBackward()), actionCollection(),
"cursor_back_bar");
new TDEAction(i18n("Cursor For&ward Bar"), 0, Key_Right + CTRL, this,
- TQT_SLOT(slotJumpForward()), actionCollection(),
+ TQ_SLOT(slotJumpForward()), actionCollection(),
"cursor_forward_bar");
new TDEAction(i18n("Cursor Back and Se&lect"), SHIFT + Key_Left, this,
- TQT_SLOT(slotExtendSelectionBackward()), actionCollection(),
+ TQ_SLOT(slotExtendSelectionBackward()), actionCollection(),
"extend_selection_backward");
new TDEAction(i18n("Cursor Forward and &Select"), SHIFT + Key_Right, this,
- TQT_SLOT(slotExtendSelectionForward()), actionCollection(),
+ TQ_SLOT(slotExtendSelectionForward()), actionCollection(),
"extend_selection_forward");
new TDEAction(i18n("Cursor Back Bar and Select"), SHIFT + CTRL + Key_Left, this,
- TQT_SLOT(slotExtendSelectionBackwardBar()), actionCollection(),
+ TQ_SLOT(slotExtendSelectionBackwardBar()), actionCollection(),
"extend_selection_backward_bar");
new TDEAction(i18n("Cursor Forward Bar and Select"), SHIFT + CTRL + Key_Right, this,
- TQT_SLOT(slotExtendSelectionForwardBar()), actionCollection(),
+ TQ_SLOT(slotExtendSelectionForwardBar()), actionCollection(),
"extend_selection_forward_bar");
new TDEAction(i18n("Cursor to St&art"), 0,
/* #1025717: conflicting meanings for ctrl+a - dupe with Select All
Key_A + CTRL, */ this,
- TQT_SLOT(slotJumpToStart()), actionCollection(),
+ TQ_SLOT(slotJumpToStart()), actionCollection(),
"cursor_start");
new TDEAction(i18n("Cursor to &End"), 0, Key_E + CTRL, this,
- TQT_SLOT(slotJumpToEnd()), actionCollection(),
+ TQ_SLOT(slotJumpToEnd()), actionCollection(),
"cursor_end");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-cursor-to-pointer")));
new TDEAction(i18n("Cursor to &Playback Pointer"), icon, 0, this,
- TQT_SLOT(slotJumpCursorToPlayback()), actionCollection(),
+ TQ_SLOT(slotJumpCursorToPlayback()), actionCollection(),
"cursor_to_playback_pointer");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-play")));
TDEAction *play = new TDEAction(i18n("&Play"), icon, Key_Enter, this,
- TQT_SIGNAL(play()), actionCollection(), "play");
+ TQ_SIGNAL(play()), actionCollection(), "play");
// Alternative shortcut for Play
TDEShortcut playShortcut = play->shortcut();
playShortcut.append( KKey(Key_Return + CTRL) );
@@ -787,70 +787,70 @@ void MatrixView::setupActions()
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-stop")));
new TDEAction(i18n("&Stop"), icon, Key_Insert, this,
- TQT_SIGNAL(stop()), actionCollection(), "stop");
+ TQ_SIGNAL(stop()), actionCollection(), "stop");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-rewind")));
new TDEAction(i18n("Re&wind"), icon, Key_End, this,
- TQT_SIGNAL(rewindPlayback()), actionCollection(),
+ TQ_SIGNAL(rewindPlayback()), actionCollection(),
"playback_pointer_back_bar");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-ffwd")));
new TDEAction(i18n("&Fast Forward"), icon, Key_PageDown, this,
- TQT_SIGNAL(fastForwardPlayback()), actionCollection(),
+ TQ_SIGNAL(fastForwardPlayback()), actionCollection(),
"playback_pointer_forward_bar");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-rewind-end")));
new TDEAction(i18n("Rewind to &Beginning"), icon, 0, this,
- TQT_SIGNAL(rewindPlaybackToBeginning()), actionCollection(),
+ TQ_SIGNAL(rewindPlaybackToBeginning()), actionCollection(),
"playback_pointer_start");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-ffwd-end")));
new TDEAction(i18n("Fast Forward to &End"), icon, 0, this,
- TQT_SIGNAL(fastForwardPlaybackToEnd()), actionCollection(),
+ TQ_SIGNAL(fastForwardPlaybackToEnd()), actionCollection(),
"playback_pointer_end");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-pointer-to-cursor")));
new TDEAction(i18n("Playback Pointer to &Cursor"), icon, 0, this,
- TQT_SLOT(slotJumpPlaybackToCursor()), actionCollection(),
+ TQ_SLOT(slotJumpPlaybackToCursor()), actionCollection(),
"playback_pointer_to_cursor");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-solo")));
new TDEToggleAction(i18n("&Solo"), icon, 0, this,
- TQT_SLOT(slotToggleSolo()), actionCollection(),
+ TQ_SLOT(slotToggleSolo()), actionCollection(),
"toggle_solo");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-tracking")));
(new TDEToggleAction(i18n("Scro&ll to Follow Playback"), icon, Key_Pause, this,
- TQT_SLOT(slotToggleTracking()), actionCollection(),
+ TQ_SLOT(slotToggleTracking()), actionCollection(),
"toggle_tracking"))->setChecked(m_playTracking);
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-panic")));
new TDEAction(i18n("Panic"), icon, Key_P + CTRL + ALT, this,
- TQT_SIGNAL(panic()), actionCollection(), "panic");
+ TQ_SIGNAL(panic()), actionCollection(), "panic");
new TDEAction(i18n("Set Loop to Selection"), Key_Semicolon + CTRL, this,
- TQT_SLOT(slotPreviewSelection()), actionCollection(),
+ TQ_SLOT(slotPreviewSelection()), actionCollection(),
"preview_selection");
new TDEAction(i18n("Clear L&oop"), Key_Colon + CTRL, this,
- TQT_SLOT(slotClearLoop()), actionCollection(),
+ TQ_SLOT(slotClearLoop()), actionCollection(),
"clear_loop");
new TDEAction(i18n("Clear Selection"), Key_Escape, this,
- TQT_SLOT(slotClearSelection()), actionCollection(),
+ TQ_SLOT(slotClearSelection()), actionCollection(),
"clear_selection");
// icon = TQIconSet(TQCanvasPixmap(pixmapDir + "/toolbar/eventfilter.xpm"));
new TDEAction(i18n("&Filter Selection"), "filter", Key_F + CTRL, this,
- TQT_SLOT(slotFilterSelection()), actionCollection(),
+ TQ_SLOT(slotFilterSelection()), actionCollection(),
"filter_selection");
timeT crotchetDuration = Note(Note::Crotchet).getDuration();
@@ -875,16 +875,16 @@ void MatrixView::setupActions()
if (d == SnapGrid::NoSnap) {
new TDEAction(i18n("&No Snap"), 0, this,
- TQT_SLOT(slotSetSnapFromAction()),
+ TQ_SLOT(slotSetSnapFromAction()),
actionCollection(), "snap_none");
} else if (d == SnapGrid::SnapToUnit) {
} else if (d == SnapGrid::SnapToBeat) {
new TDEAction(i18n("Snap to Bea&t"), Key_1, this,
- TQT_SLOT(slotSetSnapFromAction()),
+ TQ_SLOT(slotSetSnapFromAction()),
actionCollection(), "snap_beat");
} else if (d == SnapGrid::SnapToBar) {
new TDEAction(i18n("Snap to &Bar"), Key_5, this,
- TQT_SLOT(slotSetSnapFromAction()),
+ TQ_SLOT(slotSetSnapFromAction()),
actionCollection(), "snap_bar");
} else {
@@ -904,7 +904,7 @@ void MatrixView::setupActions()
TQString actionName = TQString("snap_%1").arg(int((crotchetDuration * 4) / d));
if (d == (crotchetDuration * 3) / 2) actionName = "snap_3";
new TDEAction(i18n("Snap to %1").arg(label), pixmap, cut, this,
- TQT_SLOT(slotSetSnapFromAction()), actionCollection(),
+ TQ_SLOT(slotSetSnapFromAction()), actionCollection(),
actionName.ascii());
}
}
@@ -913,16 +913,16 @@ void MatrixView::setupActions()
// Settings menu
//
new TDEAction(i18n("Show Instrument Parameters"), 0, this,
- TQT_SLOT(slotDockParametersBack()),
+ TQ_SLOT(slotDockParametersBack()),
actionCollection(),
"show_inst_parameters");
new TDEToggleAction(i18n("Show Ch&ord Name Ruler"), 0, this,
- TQT_SLOT(slotToggleChordsRuler()),
+ TQ_SLOT(slotToggleChordsRuler()),
actionCollection(), "show_chords_ruler");
new TDEToggleAction(i18n("Show &Tempo Ruler"), 0, this,
- TQT_SLOT(slotToggleTempoRuler()),
+ TQ_SLOT(slotToggleTempoRuler()),
actionCollection(), "show_tempo_ruler");
createGUI(getRCFileName(), false);
@@ -1312,11 +1312,11 @@ void MatrixView::slotSelectSelected()
{
EditTool* selector = m_toolBox->getTool(MatrixSelector::ToolName);
- connect(selector, TQT_SIGNAL(gotSelection()),
- this, TQT_SLOT(slotNewSelection()));
+ connect(selector, TQ_SIGNAL(gotSelection()),
+ this, TQ_SLOT(slotNewSelection()));
- connect(selector, TQT_SIGNAL(editTriggerSegment(int)),
- this, TQT_SIGNAL(editTriggerSegment(int)));
+ connect(selector, TQ_SIGNAL(editTriggerSegment(int)),
+ this, TQ_SIGNAL(editTriggerSegment(int)));
setTool(selector);
}
@@ -2147,8 +2147,8 @@ MatrixView::initActionsToolbar()
}
}
- connect(m_snapGridCombo, TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(slotSetSnapFromIndex(int)));
+ connect(m_snapGridCombo, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(slotSetSnapFromIndex(int)));
// Velocity combo. Not a spin box, because the spin box is too
// slow to use unless we make it typeable into, and then it takes
@@ -2181,8 +2181,8 @@ MatrixView::initActionsToolbar()
m_quantizeCombo->insertItem(noMap, i18n("Off"));
- connect(m_quantizeCombo, TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(slotQuantizeSelection(int)));
+ connect(m_quantizeCombo, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(slotQuantizeSelection(int)));
}
void
@@ -2224,8 +2224,8 @@ MatrixView::initZoomToolbar()
m_zoomLabel->setFixedWidth(80);
connect(m_hZoomSlider,
- TQT_SIGNAL(valueChanged(int)),
- TQT_SLOT(slotChangeHorizontalZoom(int)));
+ TQ_SIGNAL(valueChanged(int)),
+ TQ_SLOT(slotChangeHorizontalZoom(int)));
}
@@ -3023,20 +3023,20 @@ MatrixView::slotPercussionSetChanged(Instrument * newInstr)
TQObject::connect
- (pitchRuler, TQT_SIGNAL(hoveredOverKeyChanged(unsigned int)),
- this, TQT_SLOT (slotHoveredOverKeyChanged(unsigned int)));
+ (pitchRuler, TQ_SIGNAL(hoveredOverKeyChanged(unsigned int)),
+ this, TQ_SLOT (slotHoveredOverKeyChanged(unsigned int)));
TQObject::connect
- (pitchRuler, TQT_SIGNAL(keyPressed(unsigned int, bool)),
- this, TQT_SLOT (slotKeyPressed(unsigned int, bool)));
+ (pitchRuler, TQ_SIGNAL(keyPressed(unsigned int, bool)),
+ this, TQ_SLOT (slotKeyPressed(unsigned int, bool)));
TQObject::connect
- (pitchRuler, TQT_SIGNAL(keySelected(unsigned int, bool)),
- this, TQT_SLOT (slotKeySelected(unsigned int, bool)));
+ (pitchRuler, TQ_SIGNAL(keySelected(unsigned int, bool)),
+ this, TQ_SLOT (slotKeySelected(unsigned int, bool)));
TQObject::connect
- (pitchRuler, TQT_SIGNAL(keyReleased(unsigned int, bool)),
- this, TQT_SLOT (slotKeyReleased(unsigned int, bool)));
+ (pitchRuler, TQ_SIGNAL(keyReleased(unsigned int, bool)),
+ this, TQ_SLOT (slotKeyReleased(unsigned int, bool)));
// Replace the old pitchruler widget
m_pitchRuler = pitchRuler;
diff --git a/src/gui/editors/notation/ClefInserter.cpp b/src/gui/editors/notation/ClefInserter.cpp
index 6541e85..ce16bf0 100644
--- a/src/gui/editors/notation/ClefInserter.cpp
+++ b/src/gui/editors/notation/ClefInserter.cpp
@@ -49,18 +49,18 @@ ClefInserter::ClefInserter(NotationView* view)
TQIconSet icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::
makeToolbarPixmap("select")));
new TDEAction(i18n("Switch to Select Tool"), icon, 0, this,
- TQT_SLOT(slotSelectSelected()), actionCollection(),
+ TQ_SLOT(slotSelectSelected()), actionCollection(),
"select");
new TDEAction(i18n("Switch to Erase Tool"), "eraser", 0, this,
- TQT_SLOT(slotEraseSelected()), actionCollection(),
+ TQ_SLOT(slotEraseSelected()), actionCollection(),
"erase");
icon = TQIconSet
(NotePixmapFactory::toTQPixmap(NotePixmapFactory::
makeToolbarPixmap("crotchet")));
new TDEAction(i18n("Switch to Inserting Notes"), icon, 0, this,
- TQT_SLOT(slotNotesSelected()), actionCollection(),
+ TQ_SLOT(slotNotesSelected()), actionCollection(),
"notes");
createMenu("clefinserter.rc");
diff --git a/src/gui/editors/notation/GuitarChordInserter.cpp b/src/gui/editors/notation/GuitarChordInserter.cpp
index cfe65b6..8fb8cff 100644
--- a/src/gui/editors/notation/GuitarChordInserter.cpp
+++ b/src/gui/editors/notation/GuitarChordInserter.cpp
@@ -55,11 +55,11 @@ GuitarChordInserter::GuitarChordInserter(NotationView* view)
makeToolbarPixmap("select")));
new TDEAction(i18n("Switch to Select Tool"), icon, 0, this,
- TQT_SLOT(slotSelectSelected()), actionCollection(),
+ TQ_SLOT(slotSelectSelected()), actionCollection(),
"select");
new TDEAction(i18n("Switch to Erase Tool"), "eraser", 0, this,
- TQT_SLOT(slotEraseSelected()), actionCollection(),
+ TQ_SLOT(slotEraseSelected()), actionCollection(),
"erase");
icon = TQIconSet
@@ -67,7 +67,7 @@ GuitarChordInserter::GuitarChordInserter(NotationView* view)
makeToolbarPixmap("crotchet")));
new TDEAction(i18n("Switch to Inserting Notes"), icon, 0, this,
- TQT_SLOT(slotNoteSelected()), actionCollection(),
+ TQ_SLOT(slotNoteSelected()), actionCollection(),
"notes");
m_guitarChordSelector = new GuitarChordSelectorDialog(m_nParentView);
diff --git a/src/gui/editors/notation/NotationEraser.cpp b/src/gui/editors/notation/NotationEraser.cpp
index 5e253e6..e5ba5a6 100644
--- a/src/gui/editors/notation/NotationEraser.cpp
+++ b/src/gui/editors/notation/NotationEraser.cpp
@@ -50,20 +50,20 @@ NotationEraser::NotationEraser(NotationView* view)
m_collapseRest = config->readBoolEntry("collapse", false);
new TDEToggleAction(i18n("Collapse rests after erase"), 0, this,
- TQT_SLOT(slotToggleRestCollapse()), actionCollection(),
+ TQ_SLOT(slotToggleRestCollapse()), actionCollection(),
"toggle_rest_collapse");
TQIconSet icon
(NotePixmapFactory::toTQPixmap(NotePixmapFactory::
makeToolbarPixmap("crotchet")));
new TDEAction(i18n("Switch to Insert Tool"), icon, 0, this,
- TQT_SLOT(slotInsertSelected()), actionCollection(),
+ TQ_SLOT(slotInsertSelected()), actionCollection(),
"insert");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::
makeToolbarPixmap("select")));
new TDEAction(i18n("Switch to Select Tool"), icon, 0, this,
- TQT_SLOT(slotSelectSelected()), actionCollection(),
+ TQ_SLOT(slotSelectSelected()), actionCollection(),
"select");
createMenu("notationeraser.rc");
diff --git a/src/gui/editors/notation/NotationSelector.cpp b/src/gui/editors/notation/NotationSelector.cpp
index 2746610..d2936d2 100644
--- a/src/gui/editors/notation/NotationSelector.cpp
+++ b/src/gui/editors/notation/NotationSelector.cpp
@@ -69,68 +69,68 @@ NotationSelector::NotationSelector(NotationView* view)
m_justSelectedBar(false),
m_wholeStaffSelectionComplete(false)
{
- connect(m_parentView, TQT_SIGNAL(usedSelection()),
- this, TQT_SLOT(slotHideSelection()));
+ connect(m_parentView, TQ_SIGNAL(usedSelection()),
+ this, TQ_SLOT(slotHideSelection()));
- connect(this, TQT_SIGNAL(editElement(NotationStaff *, NotationElement *, bool)),
- m_parentView, TQT_SLOT(slotEditElement(NotationStaff *, NotationElement *, bool)));
+ connect(this, TQ_SIGNAL(editElement(NotationStaff *, NotationElement *, bool)),
+ m_parentView, TQ_SLOT(slotEditElement(NotationStaff *, NotationElement *, bool)));
TQIconSet icon
(NotePixmapFactory::toTQPixmap(NotePixmapFactory::
makeToolbarPixmap("crotchet")));
new TDEToggleAction(i18n("Switch to Insert Tool"), icon, 0, this,
- TQT_SLOT(slotInsertSelected()), actionCollection(),
+ TQ_SLOT(slotInsertSelected()), actionCollection(),
"insert");
new TDEAction(i18n("Switch to Erase Tool"), "eraser", 0, this,
- TQT_SLOT(slotEraseSelected()), actionCollection(),
+ TQ_SLOT(slotEraseSelected()), actionCollection(),
"erase");
// (this crashed, and it might be superfluous with ^N anyway, so I'm
// commenting it out, but leaving it here in case I change my mind about
// fooling with it.) (DMM)
// new TDEAction(i18n("Normalize Rests"), 0, 0, this,
- // TQT_SLOT(slotCollapseRests()), actionCollection(),
+ // TQ_SLOT(slotCollapseRests()), actionCollection(),
// "collapse_rests");
new TDEAction(i18n("Collapse Rests"), 0, 0, this,
- TQT_SLOT(slotCollapseRestsHard()), actionCollection(),
+ TQ_SLOT(slotCollapseRestsHard()), actionCollection(),
"collapse_rests_aggressively");
new TDEAction(i18n("Respell as Flat"), 0, 0, this,
- TQT_SLOT(slotRespellFlat()), actionCollection(),
+ TQ_SLOT(slotRespellFlat()), actionCollection(),
"respell_flat");
new TDEAction(i18n("Respell as Sharp"), 0, 0, this,
- TQT_SLOT(slotRespellSharp()), actionCollection(),
+ TQ_SLOT(slotRespellSharp()), actionCollection(),
"respell_sharp");
new TDEAction(i18n("Respell as Natural"), 0, 0, this,
- TQT_SLOT(slotRespellNatural()), actionCollection(),
+ TQ_SLOT(slotRespellNatural()), actionCollection(),
"respell_natural");
new TDEAction(i18n("Collapse Notes"), 0, 0, this,
- TQT_SLOT(slotCollapseNotes()), actionCollection(),
+ TQ_SLOT(slotCollapseNotes()), actionCollection(),
"collapse_notes");
new TDEAction(i18n("Interpret"), 0, 0, this,
- TQT_SLOT(slotInterpret()), actionCollection(),
+ TQ_SLOT(slotInterpret()), actionCollection(),
"interpret");
new TDEAction(i18n("Move to Staff Above"), 0, 0, this,
- TQT_SLOT(slotStaffAbove()), actionCollection(),
+ TQ_SLOT(slotStaffAbove()), actionCollection(),
"move_events_up_staff");
new TDEAction(i18n("Move to Staff Below"), 0, 0, this,
- TQT_SLOT(slotStaffBelow()), actionCollection(),
+ TQ_SLOT(slotStaffBelow()), actionCollection(),
"move_events_down_staff");
new TDEAction(i18n("Make Invisible"), 0, 0, this,
- TQT_SLOT(slotMakeInvisible()), actionCollection(),
+ TQ_SLOT(slotMakeInvisible()), actionCollection(),
"make_invisible");
new TDEAction(i18n("Make Visible"), 0, 0, this,
- TQT_SLOT(slotMakeVisible()), actionCollection(),
+ TQ_SLOT(slotMakeVisible()), actionCollection(),
"make_visible");
createMenu("notationselector.rc");
@@ -256,7 +256,7 @@ void NotationSelector::handleMouseDoubleClick(timeT,
m_justSelectedBar = true;
TQTimer::singleShot(TQApplication::doubleClickInterval(), this,
- TQT_SLOT(slotClickTimeout()));
+ TQ_SLOT(slotClickTimeout()));
}
return ;
diff --git a/src/gui/editors/notation/NotationView.cpp b/src/gui/editors/notation/NotationView.cpp
index a97c7c7..1fa96b3 100644
--- a/src/gui/editors/notation/NotationView.cpp
+++ b/src/gui/editors/notation/NotationView.cpp
@@ -526,19 +526,19 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
m_topStandardRuler->getLoopRuler()->setBackgroundColor
(GUIPalette::getColour(GUIPalette::InsertCursorRuler));
- connect(m_topStandardRuler->getLoopRuler(), TQT_SIGNAL(startMouseMove(int)),
- m_canvasView, TQT_SLOT(startAutoScroll(int)));
- connect(m_topStandardRuler->getLoopRuler(), TQT_SIGNAL(stopMouseMove()),
- m_canvasView, TQT_SLOT(stopAutoScroll()));
+ connect(m_topStandardRuler->getLoopRuler(), TQ_SIGNAL(startMouseMove(int)),
+ m_canvasView, TQ_SLOT(startAutoScroll(int)));
+ connect(m_topStandardRuler->getLoopRuler(), TQ_SIGNAL(stopMouseMove()),
+ m_canvasView, TQ_SLOT(stopAutoScroll()));
- connect(m_bottomStandardRuler->getLoopRuler(), TQT_SIGNAL(startMouseMove(int)),
- m_canvasView, TQT_SLOT(startAutoScroll(int)));
- connect(m_bottomStandardRuler->getLoopRuler(), TQT_SIGNAL(stopMouseMove()),
- m_canvasView, TQT_SLOT(stopAutoScroll()));
+ connect(m_bottomStandardRuler->getLoopRuler(), TQ_SIGNAL(startMouseMove(int)),
+ m_canvasView, TQ_SLOT(startAutoScroll(int)));
+ connect(m_bottomStandardRuler->getLoopRuler(), TQ_SIGNAL(stopMouseMove()),
+ m_canvasView, TQ_SLOT(stopAutoScroll()));
// Following connection have to be done before calling setPageMode())
- connect(m_headersGroup, TQT_SIGNAL(headersResized(int)),
- this, TQT_SLOT(slotHeadersWidthChanged(int)));
+ connect(m_headersGroup, TQ_SIGNAL(headersResized(int)),
+ this, TQ_SLOT(slotHeadersWidthChanged(int)));
//
@@ -615,8 +615,8 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
//
TQObject::connect
- (getCanvasView(), TQT_SIGNAL(renderRequired(double, double)),
- this, TQT_SLOT(slotCheckRendered(double, double)));
+ (getCanvasView(), TQ_SIGNAL(renderRequired(double, double)),
+ this, TQ_SLOT(slotCheckRendered(double, double)));
m_topStandardRuler->connectRulerToDocPointer(doc);
m_bottomStandardRuler->connectRulerToDocPointer(doc);
@@ -626,102 +626,102 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
TQObject::disconnect
(m_topStandardRuler->getLoopRuler(),
- TQT_SIGNAL(setPointerPosition(timeT)), 0, 0);
+ TQ_SIGNAL(setPointerPosition(timeT)), 0, 0);
TQObject::connect
(m_topStandardRuler->getLoopRuler(),
- TQT_SIGNAL(setPointerPosition(timeT)),
- this, TQT_SLOT(slotSetInsertCursorPosition(timeT)));
+ TQ_SIGNAL(setPointerPosition(timeT)),
+ this, TQ_SLOT(slotSetInsertCursorPosition(timeT)));
TQObject::connect
(m_topStandardRuler,
- TQT_SIGNAL(dragPointerToPosition(timeT)),
- this, TQT_SLOT(slotSetInsertCursorPosition(timeT)));
+ TQ_SIGNAL(dragPointerToPosition(timeT)),
+ this, TQ_SLOT(slotSetInsertCursorPosition(timeT)));
- connect(m_bottomStandardRuler, TQT_SIGNAL(dragPointerToPosition(timeT)),
- this, TQT_SLOT(slotSetPointerPosition(timeT)));
+ connect(m_bottomStandardRuler, TQ_SIGNAL(dragPointerToPosition(timeT)),
+ this, TQ_SLOT(slotSetPointerPosition(timeT)));
TQObject::connect
- (getCanvasView(), TQT_SIGNAL(itemPressed(int, int, TQMouseEvent*, NotationElement*)),
- this, TQT_SLOT (slotItemPressed(int, int, TQMouseEvent*, NotationElement*)));
+ (getCanvasView(), TQ_SIGNAL(itemPressed(int, int, TQMouseEvent*, NotationElement*)),
+ this, TQ_SLOT (slotItemPressed(int, int, TQMouseEvent*, NotationElement*)));
TQObject::connect
- (getCanvasView(), TQT_SIGNAL(activeItemPressed(TQMouseEvent*, TQCanvasItem*)),
- this, TQT_SLOT (slotActiveItemPressed(TQMouseEvent*, TQCanvasItem*)));
+ (getCanvasView(), TQ_SIGNAL(activeItemPressed(TQMouseEvent*, TQCanvasItem*)),
+ this, TQ_SLOT (slotActiveItemPressed(TQMouseEvent*, TQCanvasItem*)));
TQObject::connect
- (getCanvasView(), TQT_SIGNAL(nonNotationItemPressed(TQMouseEvent*, TQCanvasItem*)),
- this, TQT_SLOT (slotNonNotationItemPressed(TQMouseEvent*, TQCanvasItem*)));
+ (getCanvasView(), TQ_SIGNAL(nonNotationItemPressed(TQMouseEvent*, TQCanvasItem*)),
+ this, TQ_SLOT (slotNonNotationItemPressed(TQMouseEvent*, TQCanvasItem*)));
TQObject::connect
- (getCanvasView(), TQT_SIGNAL(textItemPressed(TQMouseEvent*, TQCanvasItem*)),
- this, TQT_SLOT (slotTextItemPressed(TQMouseEvent*, TQCanvasItem*)));
+ (getCanvasView(), TQ_SIGNAL(textItemPressed(TQMouseEvent*, TQCanvasItem*)),
+ this, TQ_SLOT (slotTextItemPressed(TQMouseEvent*, TQCanvasItem*)));
TQObject::connect
- (getCanvasView(), TQT_SIGNAL(mouseMoved(TQMouseEvent*)),
- this, TQT_SLOT (slotMouseMoved(TQMouseEvent*)));
+ (getCanvasView(), TQ_SIGNAL(mouseMoved(TQMouseEvent*)),
+ this, TQ_SLOT (slotMouseMoved(TQMouseEvent*)));
TQObject::connect
- (getCanvasView(), TQT_SIGNAL(mouseReleased(TQMouseEvent*)),
- this, TQT_SLOT (slotMouseReleased(TQMouseEvent*)));
+ (getCanvasView(), TQ_SIGNAL(mouseReleased(TQMouseEvent*)),
+ this, TQ_SLOT (slotMouseReleased(TQMouseEvent*)));
TQObject::connect
- (getCanvasView(), TQT_SIGNAL(hoveredOverNoteChanged(const TQString&)),
- this, TQT_SLOT (slotHoveredOverNoteChanged(const TQString&)));
+ (getCanvasView(), TQ_SIGNAL(hoveredOverNoteChanged(const TQString&)),
+ this, TQ_SLOT (slotHoveredOverNoteChanged(const TQString&)));
TQObject::connect
- (getCanvasView(), TQT_SIGNAL(hoveredOverAbsoluteTimeChanged(unsigned int)),
- this, TQT_SLOT (slotHoveredOverAbsoluteTimeChanged(unsigned int)));
+ (getCanvasView(), TQ_SIGNAL(hoveredOverAbsoluteTimeChanged(unsigned int)),
+ this, TQ_SLOT (slotHoveredOverAbsoluteTimeChanged(unsigned int)));
TQObject::connect
- (getCanvasView(), TQT_SIGNAL(zoomIn()), this, TQT_SLOT(slotZoomIn()));
+ (getCanvasView(), TQ_SIGNAL(zoomIn()), this, TQ_SLOT(slotZoomIn()));
TQObject::connect
- (getCanvasView(), TQT_SIGNAL(zoomOut()), this, TQT_SLOT(slotZoomOut()));
+ (getCanvasView(), TQ_SIGNAL(zoomOut()), this, TQ_SLOT(slotZoomOut()));
TQObject::connect
- (m_pannerDialog->scrollbox(), TQT_SIGNAL(valueChanged(const TQPoint &)),
- getCanvasView(), TQT_SLOT(slotSetScrollPos(const TQPoint &)));
+ (m_pannerDialog->scrollbox(), TQ_SIGNAL(valueChanged(const TQPoint &)),
+ getCanvasView(), TQ_SLOT(slotSetScrollPos(const TQPoint &)));
TQObject::connect
- (getCanvasView()->horizontalScrollBar(), TQT_SIGNAL(valueChanged(int)),
- m_pannerDialog->scrollbox(), TQT_SLOT(setViewX(int)));
+ (getCanvasView()->horizontalScrollBar(), TQ_SIGNAL(valueChanged(int)),
+ m_pannerDialog->scrollbox(), TQ_SLOT(setViewX(int)));
TQObject::connect
- (getCanvasView()->verticalScrollBar(), TQT_SIGNAL(valueChanged(int)),
- m_pannerDialog->scrollbox(), TQT_SLOT(setViewY(int)));
+ (getCanvasView()->verticalScrollBar(), TQ_SIGNAL(valueChanged(int)),
+ m_pannerDialog->scrollbox(), TQ_SLOT(setViewY(int)));
TQObject::connect
- (doc, TQT_SIGNAL(pointerPositionChanged(timeT)),
- this, TQT_SLOT(slotSetPointerPosition(timeT)));
+ (doc, TQ_SIGNAL(pointerPositionChanged(timeT)),
+ this, TQ_SLOT(slotSetPointerPosition(timeT)));
//
// Connect vertical scrollbars between canvas and notation header
TQObject::connect
- (getCanvasView()->verticalScrollBar(), TQT_SIGNAL(valueChanged(int)),
- this, TQT_SLOT(slotVerticalScrollHeadersGroup(int)));
+ (getCanvasView()->verticalScrollBar(), TQ_SIGNAL(valueChanged(int)),
+ this, TQ_SLOT(slotVerticalScrollHeadersGroup(int)));
TQObject::connect
- (getCanvasView()->verticalScrollBar(), TQT_SIGNAL(sliderMoved(int)),
- this, TQT_SLOT(slotVerticalScrollHeadersGroup(int)));
+ (getCanvasView()->verticalScrollBar(), TQ_SIGNAL(sliderMoved(int)),
+ this, TQ_SLOT(slotVerticalScrollHeadersGroup(int)));
TQObject::connect
- (m_headersGroupView, TQT_SIGNAL(gotWheelEvent(TQWheelEvent*)),
- getCanvasView(), TQT_SLOT(slotExternalWheelEvent(TQWheelEvent*)));
+ (m_headersGroupView, TQ_SIGNAL(gotWheelEvent(TQWheelEvent*)),
+ getCanvasView(), TQ_SLOT(slotExternalWheelEvent(TQWheelEvent*)));
// Ensure notation header keeps the right bottom margin when user
// toggles the canvas view bottom rulers
- connect(getCanvasView(), TQT_SIGNAL(bottomWidgetHeightChanged(int)),
- this, TQT_SLOT(slotCanvasBottomWidgetHeightChanged(int)));
+ connect(getCanvasView(), TQ_SIGNAL(bottomWidgetHeightChanged(int)),
+ this, TQ_SLOT(slotCanvasBottomWidgetHeightChanged(int)));
// Signal canvas horizontal scroll to notation header
TQObject::connect
- (getCanvasView(), TQT_SIGNAL(contentsMoving(int, int)),
- this, TQT_SLOT(slotUpdateHeaders(int, int)));
+ (getCanvasView(), TQ_SIGNAL(contentsMoving(int, int)),
+ this, TQ_SLOT(slotUpdateHeaders(int, int)));
// Connect the close notation headers button
- TQObject::connect(hideHeadersButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotHideHeadersGroup()));
+ TQObject::connect(hideHeadersButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotHideHeadersGroup()));
stateChanged("have_selection", KXMLGUIClient::StateReverse);
stateChanged("have_notes_in_selection", KXMLGUIClient::StateReverse);
@@ -763,16 +763,16 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
updateView();
TQObject::connect
- (this, TQT_SIGNAL(renderComplete()),
- getCanvasView(), TQT_SLOT(slotRenderComplete()));
+ (this, TQ_SIGNAL(renderComplete()),
+ getCanvasView(), TQ_SLOT(slotRenderComplete()));
if (parent)
{
const TrackButtons * trackLabels =
((RosegardenGUIView*)parent)->getTrackEditor()->getTrackButtons();
TQObject::connect
- (trackLabels, TQT_SIGNAL(nameChanged()),
- this, TQT_SLOT(slotUpdateStaffName()));
+ (trackLabels, TQ_SIGNAL(nameChanged()),
+ this, TQ_SLOT(slotUpdateStaffName()));
}
setConfigDialogPageIndex(3);
@@ -1491,16 +1491,16 @@ void NotationView::readOptions()
void NotationView::setupActions()
{
- KStdAction::print(this, TQT_SLOT(slotFilePrint()), actionCollection());
- KStdAction::printPreview(this, TQT_SLOT(slotFilePrintPreview()),
+ KStdAction::print(this, TQ_SLOT(slotFilePrint()), actionCollection());
+ KStdAction::printPreview(this, TQ_SLOT(slotFilePrintPreview()),
actionCollection());
new TDEAction(i18n("Print &with LilyPond..."), 0, 0, this,
- TQT_SLOT(slotPrintLilyPond()), actionCollection(),
+ TQ_SLOT(slotPrintLilyPond()), actionCollection(),
"file_print_lilypond");
new TDEAction(i18n("Preview with Lil&yPond..."), 0, 0, this,
- TQT_SLOT(slotPreviewLilyPond()), actionCollection(),
+ TQ_SLOT(slotPreviewLilyPond()), actionCollection(),
"file_preview_lilypond");
EditViewBase::setupActions("notation.rc");
@@ -1524,7 +1524,7 @@ void NotationView::setupActions()
TDEToggleAction *fontAction =
new TDEToggleAction
- (fontTQName, 0, this, TQT_SLOT(slotChangeFontFromAction()),
+ (fontTQName, 0, this, TQ_SLOT(slotChangeFontFromAction()),
actionCollection(), TQString("note_font_" + fontTQName).ascii());
fontAction->setChecked(*i == m_fontName);
@@ -1541,7 +1541,7 @@ void NotationView::setupActions()
m_showHeadersMenuEntry
= new TDEAction(i18n("Show Track Headers"), 0, this,
- TQT_SLOT(slotShowHeadersGroup()),
+ TQ_SLOT(slotShowHeadersGroup()),
actionCollection(), "show_track_headers");
TDEActionMenu *spacingActionMenu =
@@ -1556,7 +1556,7 @@ void NotationView::setupActions()
TDEToggleAction *spacingAction =
new TDEToggleAction
(TQString("%1%").arg(*i), 0, this,
- TQT_SLOT(slotChangeSpacingFromAction()),
+ TQ_SLOT(slotChangeSpacingFromAction()),
actionCollection(), TQString("spacing_%1").arg(*i).ascii());
spacingAction->setExclusiveGroup("spacing");
@@ -1582,7 +1582,7 @@ void NotationView::setupActions()
TDEToggleAction *proportionAction =
new TDEToggleAction
(name, 0, this,
- TQT_SLOT(slotChangeProportionFromAction()),
+ TQ_SLOT(slotChangeProportionFromAction()),
actionCollection(), TQString("proportion_%1").arg(*i).ascii());
proportionAction->setExclusiveGroup("proportion");
@@ -1605,7 +1605,7 @@ void NotationView::setupActions()
TDEAction *styleAction =
new TDEAction
- (styleTQName, 0, this, TQT_SLOT(slotSetStyleFromAction()),
+ (styleTQName, 0, this, TQ_SLOT(slotSetStyleFromAction()),
actionCollection(), TQString("style_" + styleTQName).ascii());
styleActionMenu->insert(styleAction);
@@ -1619,17 +1619,17 @@ void NotationView::setupActions()
new TDEAction
- (i18n("Insert Rest"), Key_P, this, TQT_SLOT(slotInsertRest()),
+ (i18n("Insert Rest"), Key_P, this, TQ_SLOT(slotInsertRest()),
actionCollection(), TQString("insert_rest").ascii());
new TDEAction
(i18n("Switch from Note to Rest"), Key_T, this,
- TQT_SLOT(slotSwitchFromNoteToRest()),
+ TQ_SLOT(slotSwitchFromNoteToRest()),
actionCollection(), TQString("switch_from_note_to_rest").ascii());
new TDEAction
(i18n("Switch from Rest to Note"), Key_Y, this,
- TQT_SLOT(slotSwitchFromRestToNote()),
+ TQ_SLOT(slotSwitchFromRestToNote()),
actionCollection(), TQString("switch_from_rest_to_note").ascii());
@@ -1649,7 +1649,7 @@ void NotationView::setupActions()
icon,
noteActionData.keycode,
this,
- TQT_SLOT(slotNoteAction()),
+ TQ_SLOT(slotNoteAction()),
actionCollection(),
noteActionData.actionName.ascii());
noteAction->setExclusiveGroup("notes");
@@ -1675,7 +1675,7 @@ void NotationView::setupActions()
icon,
data.keycode,
this,
- TQT_SLOT(slotNoteChangeAction()),
+ TQ_SLOT(slotNoteChangeAction()),
actionCollection(),
data.actionName.ascii());
}
@@ -1713,47 +1713,47 @@ void NotationView::setupActions()
// Treble
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-treble")));
noteAction = new TDERadioAction(i18n("&Treble Clef"), icon, 0, this,
- TQT_SLOT(slotTrebleClef()),
+ TQ_SLOT(slotTrebleClef()),
actionCollection(), "treble_clef");
noteAction->setExclusiveGroup("notes");
// Alto
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-alto")));
noteAction = new TDERadioAction(i18n("&Alto Clef"), icon, 0, this,
- TQT_SLOT(slotAltoClef()),
+ TQ_SLOT(slotAltoClef()),
actionCollection(), "alto_clef");
noteAction->setExclusiveGroup("notes");
// Tenor
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-tenor")));
noteAction = new TDERadioAction(i18n("Te&nor Clef"), icon, 0, this,
- TQT_SLOT(slotTenorClef()),
+ TQ_SLOT(slotTenorClef()),
actionCollection(), "tenor_clef");
noteAction->setExclusiveGroup("notes");
// Bass
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-bass")));
noteAction = new TDERadioAction(i18n("&Bass Clef"), icon, 0, this,
- TQT_SLOT(slotBassClef()),
+ TQ_SLOT(slotBassClef()),
actionCollection(), "bass_clef");
noteAction->setExclusiveGroup("notes");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("text")));
noteAction = new TDERadioAction(i18n("&Text"), icon, Key_F8, this,
- TQT_SLOT(slotText()),
+ TQ_SLOT(slotText()),
actionCollection(), "text");
noteAction->setExclusiveGroup("notes");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("guitarchord")));
noteAction = new TDERadioAction(i18n("&Guitar Chord"), icon, Key_F9, this,
- TQT_SLOT(slotGuitarChord()),
+ TQ_SLOT(slotGuitarChord()),
actionCollection(), "guitarchord");
noteAction->setExclusiveGroup("notes");
/* icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("lilypond")));
noteAction = new TDERadioAction(i18n("Lil&ypond Directive"), icon, Key_F9, this,
- TQT_SLOT(slotLilyPondDirective()),
+ TQ_SLOT(slotLilyPondDirective()),
actionCollection(), "lilypond_directive");
noteAction->setExclusiveGroup("notes"); */
@@ -1762,53 +1762,53 @@ void NotationView::setupActions()
// Edition tools (eraser, selector...)
//
noteAction = new TDERadioAction(i18n("&Erase"), "eraser", Key_F4,
- this, TQT_SLOT(slotEraseSelected()),
+ this, TQ_SLOT(slotEraseSelected()),
actionCollection(), "erase");
noteAction->setExclusiveGroup("notes");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("select")));
noteAction = new TDERadioAction(i18n("&Select and Edit"), icon, Key_F2,
- this, TQT_SLOT(slotSelectSelected()),
+ this, TQ_SLOT(slotSelectSelected()),
actionCollection(), "select");
noteAction->setExclusiveGroup("notes");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("step_by_step")));
new TDEToggleAction(i18n("Ste&p Recording"), icon, 0, this,
- TQT_SLOT(slotToggleStepByStep()), actionCollection(),
+ TQ_SLOT(slotToggleStepByStep()), actionCollection(),
"toggle_step_by_step");
// Edit menu
new TDEAction(i18n("Select from Sta&rt"), 0, this,
- TQT_SLOT(slotEditSelectFromStart()), actionCollection(),
+ TQ_SLOT(slotEditSelectFromStart()), actionCollection(),
"select_from_start");
new TDEAction(i18n("Select to &End"), 0, this,
- TQT_SLOT(slotEditSelectToEnd()), actionCollection(),
+ TQ_SLOT(slotEditSelectToEnd()), actionCollection(),
"select_to_end");
new TDEAction(i18n("Select Whole St&aff"), Key_A + CTRL, this,
- TQT_SLOT(slotEditSelectWholeStaff()), actionCollection(),
+ TQ_SLOT(slotEditSelectWholeStaff()), actionCollection(),
"select_whole_staff");
new TDEAction(i18n("C&ut and Close"), CTRL + SHIFT + Key_X, this,
- TQT_SLOT(slotEditCutAndClose()), actionCollection(),
+ TQ_SLOT(slotEditCutAndClose()), actionCollection(),
"cut_and_close");
new TDEAction(i18n("Pa&ste..."), CTRL + SHIFT + Key_V, this,
- TQT_SLOT(slotEditGeneralPaste()), actionCollection(),
+ TQ_SLOT(slotEditGeneralPaste()), actionCollection(),
"general_paste");
new TDEAction(i18n("De&lete"), Key_Delete, this,
- TQT_SLOT(slotEditDelete()), actionCollection(),
+ TQ_SLOT(slotEditDelete()), actionCollection(),
"delete");
new TDEAction(i18n("Move to Staff Above"), 0, this,
- TQT_SLOT(slotMoveEventsUpStaff()), actionCollection(),
+ TQ_SLOT(slotMoveEventsUpStaff()), actionCollection(),
"move_events_up_staff");
new TDEAction(i18n("Move to Staff Below"), 0, this,
- TQT_SLOT(slotMoveEventsDownStaff()), actionCollection(),
+ TQ_SLOT(slotMoveEventsDownStaff()), actionCollection(),
"move_events_down_staff");
//
@@ -1821,7 +1821,7 @@ void NotationView::setupActions()
TQCanvasPixmap pixmap(pixmapDir + "/toolbar/linear-layout.xpm");
icon = TQIconSet(pixmap);
TDERadioAction *linearModeAction = new TDERadioAction
- (i18n("&Linear Layout"), icon, 0, this, TQT_SLOT(slotLinearMode()),
+ (i18n("&Linear Layout"), icon, 0, this, TQ_SLOT(slotLinearMode()),
actionCollection(), "linear_mode");
linearModeAction->setExclusiveGroup("layoutMode");
if (layoutMode == 0)
@@ -1830,7 +1830,7 @@ void NotationView::setupActions()
pixmap.load(pixmapDir + "/toolbar/continuous-page-mode.xpm");
icon = TQIconSet(pixmap);
TDERadioAction *continuousPageModeAction = new TDERadioAction
- (i18n("&Continuous Page Layout"), icon, 0, this, TQT_SLOT(slotContinuousPageMode()),
+ (i18n("&Continuous Page Layout"), icon, 0, this, TQ_SLOT(slotContinuousPageMode()),
actionCollection(), "continuous_page_mode");
continuousPageModeAction->setExclusiveGroup("layoutMode");
if (layoutMode == 1)
@@ -1839,33 +1839,33 @@ void NotationView::setupActions()
pixmap.load(pixmapDir + "/toolbar/multi-page-mode.xpm");
icon = TQIconSet(pixmap);
TDERadioAction *multiPageModeAction = new TDERadioAction
- (i18n("&Multiple Page Layout"), icon, 0, this, TQT_SLOT(slotMultiPageMode()),
+ (i18n("&Multiple Page Layout"), icon, 0, this, TQ_SLOT(slotMultiPageMode()),
actionCollection(), "multi_page_mode");
multiPageModeAction->setExclusiveGroup("layoutMode");
if (layoutMode == 2)
multiPageModeAction->setChecked(true);
new TDEToggleAction(i18n("Show Ch&ord Name Ruler"), 0, this,
- TQT_SLOT(slotToggleChordsRuler()),
+ TQ_SLOT(slotToggleChordsRuler()),
actionCollection(), "show_chords_ruler");
new TDEToggleAction(i18n("Show Ra&w Note Ruler"), 0, this,
- TQT_SLOT(slotToggleRawNoteRuler()),
+ TQ_SLOT(slotToggleRawNoteRuler()),
actionCollection(), "show_raw_note_ruler");
new TDEToggleAction(i18n("Show &Tempo Ruler"), 0, this,
- TQT_SLOT(slotToggleTempoRuler()),
+ TQ_SLOT(slotToggleTempoRuler()),
actionCollection(), "show_tempo_ruler");
new TDEToggleAction(i18n("Show &Annotations"), 0, this,
- TQT_SLOT(slotToggleAnnotations()),
+ TQ_SLOT(slotToggleAnnotations()),
actionCollection(), "show_annotations");
new TDEToggleAction(i18n("Show Lily&Pond Directives"), 0, this,
- TQT_SLOT(slotToggleLilyPondDirectives()),
+ TQ_SLOT(slotToggleLilyPondDirectives()),
actionCollection(), "show_lilypond_directives");
- new TDEAction(i18n("Open L&yric Editor"), 0, this, TQT_SLOT(slotEditLyrics()),
+ new TDEAction(i18n("Open L&yric Editor"), 0, this, TQ_SLOT(slotEditLyrics()),
actionCollection(), "lyric_editor");
//
@@ -1876,53 +1876,53 @@ void NotationView::setupActions()
("group-beam")));
new TDEAction(BeamCommand::getGlobalName(), icon, Key_B + CTRL, this,
- TQT_SLOT(slotGroupBeam()), actionCollection(), "beam");
+ TQ_SLOT(slotGroupBeam()), actionCollection(), "beam");
new TDEAction(AutoBeamCommand::getGlobalName(), 0, this,
- TQT_SLOT(slotGroupAutoBeam()), actionCollection(), "auto_beam");
+ TQ_SLOT(slotGroupAutoBeam()), actionCollection(), "auto_beam");
icon = TQIconSet
(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("group-unbeam")));
new TDEAction(BreakCommand::getGlobalName(), icon, Key_U + CTRL, this,
- TQT_SLOT(slotGroupBreak()), actionCollection(), "break_group");
+ TQ_SLOT(slotGroupBreak()), actionCollection(), "break_group");
icon = TQIconSet
(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("group-simple-tuplet")));
new TDEAction(TupletCommand::getGlobalName(true), icon, Key_R + CTRL, this,
- TQT_SLOT(slotGroupSimpleTuplet()), actionCollection(), "simple_tuplet");
+ TQ_SLOT(slotGroupSimpleTuplet()), actionCollection(), "simple_tuplet");
icon = TQIconSet
(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("group-tuplet")));
new TDEAction(TupletCommand::getGlobalName(false), icon, Key_T + CTRL, this,
- TQT_SLOT(slotGroupGeneralTuplet()), actionCollection(), "tuplet");
+ TQ_SLOT(slotGroupGeneralTuplet()), actionCollection(), "tuplet");
new TDEAction(UnTupletCommand::getGlobalName(), 0, this,
- TQT_SLOT(slotGroupUnTuplet()), actionCollection(), "break_tuplets");
+ TQ_SLOT(slotGroupUnTuplet()), actionCollection(), "break_tuplets");
icon = TQIconSet(NotePixmapFactory::toTQPixmap
(NotePixmapFactory::makeToolbarPixmap("triplet")));
(new TDEToggleAction(i18n("Trip&let Insert Mode"), icon, Key_G,
- this, TQT_SLOT(slotUpdateInsertModeStatus()),
+ this, TQ_SLOT(slotUpdateInsertModeStatus()),
actionCollection(), "triplet_mode"))->
setChecked(false);
icon = TQIconSet(NotePixmapFactory::toTQPixmap
(NotePixmapFactory::makeToolbarPixmap("chord")));
(new TDEToggleAction(i18n("C&hord Insert Mode"), icon, Key_H,
- this, TQT_SLOT(slotUpdateInsertModeStatus()),
+ this, TQ_SLOT(slotUpdateInsertModeStatus()),
actionCollection(), "chord_mode"))->
setChecked(false);
icon = TQIconSet(NotePixmapFactory::toTQPixmap
(NotePixmapFactory::makeToolbarPixmap("group-grace")));
(new TDEToggleAction(i18n("Grace Insert Mode"), icon, 0,
- this, TQT_SLOT(slotUpdateInsertModeStatus()),
+ this, TQ_SLOT(slotUpdateInsertModeStatus()),
actionCollection(), "grace_mode"))->
setChecked(false);
/*!!!
@@ -1931,10 +1931,10 @@ void NotationView::setupActions()
("group-grace")));
new TDEAction(GraceCommand::getGlobalName(), icon, 0, this,
- TQT_SLOT(slotGroupGrace()), actionCollection(), "grace");
+ TQ_SLOT(slotGroupGrace()), actionCollection(), "grace");
new TDEAction(UnGraceCommand::getGlobalName(), 0, this,
- TQT_SLOT(slotGroupUnGrace()), actionCollection(), "ungrace");
+ TQ_SLOT(slotGroupUnGrace()), actionCollection(), "ungrace");
*/
icon = TQIconSet
(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
@@ -1942,11 +1942,11 @@ void NotationView::setupActions()
new TDEAction(AddIndicationCommand::getGlobalName
(Indication::Slur), icon, Key_ParenRight, this,
- TQT_SLOT(slotGroupSlur()), actionCollection(), "slur");
+ TQ_SLOT(slotGroupSlur()), actionCollection(), "slur");
new TDEAction(AddIndicationCommand::getGlobalName
(Indication::PhrasingSlur), 0, Key_ParenRight + CTRL, this,
- TQT_SLOT(slotGroupPhrasingSlur()), actionCollection(), "phrasing_slur");
+ TQ_SLOT(slotGroupPhrasingSlur()), actionCollection(), "phrasing_slur");
icon = TQIconSet
(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
@@ -1954,7 +1954,7 @@ void NotationView::setupActions()
new TDEAction(AddIndicationCommand::getGlobalName
(Indication::Glissando), icon, 0, this,
- TQT_SLOT(slotGroupGlissando()), actionCollection(), "glissando");
+ TQ_SLOT(slotGroupGlissando()), actionCollection(), "glissando");
icon = TQIconSet
(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
@@ -1962,7 +1962,7 @@ void NotationView::setupActions()
new TDEAction(AddIndicationCommand::getGlobalName
(Indication::Crescendo), icon, Key_Less, this,
- TQT_SLOT(slotGroupCrescendo()), actionCollection(), "crescendo");
+ TQ_SLOT(slotGroupCrescendo()), actionCollection(), "crescendo");
icon = TQIconSet
(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
@@ -1970,11 +1970,11 @@ void NotationView::setupActions()
new TDEAction(AddIndicationCommand::getGlobalName
(Indication::Decrescendo), icon, Key_Greater, this,
- TQT_SLOT(slotGroupDecrescendo()), actionCollection(), "decrescendo");
+ TQ_SLOT(slotGroupDecrescendo()), actionCollection(), "decrescendo");
new TDEAction(AddIndicationCommand::getGlobalName
(Indication::QuindicesimaUp), 0, 0, this,
- TQT_SLOT(slotGroupOctave2Up()), actionCollection(), "octave_2up");
+ TQ_SLOT(slotGroupOctave2Up()), actionCollection(), "octave_2up");
icon = TQIconSet
(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
@@ -1982,33 +1982,33 @@ void NotationView::setupActions()
new TDEAction(AddIndicationCommand::getGlobalName
(Indication::OttavaUp), icon, 0, this,
- TQT_SLOT(slotGroupOctaveUp()), actionCollection(), "octave_up");
+ TQ_SLOT(slotGroupOctaveUp()), actionCollection(), "octave_up");
new TDEAction(AddIndicationCommand::getGlobalName
(Indication::OttavaDown), 0, 0, this,
- TQT_SLOT(slotGroupOctaveDown()), actionCollection(), "octave_down");
+ TQ_SLOT(slotGroupOctaveDown()), actionCollection(), "octave_down");
new TDEAction(AddIndicationCommand::getGlobalName
(Indication::QuindicesimaDown), 0, 0, this,
- TQT_SLOT(slotGroupOctave2Down()), actionCollection(), "octave_2down");
+ TQ_SLOT(slotGroupOctave2Down()), actionCollection(), "octave_2down");
icon = TQIconSet
(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("group-chord")));
new TDEAction(MakeChordCommand::getGlobalName(), icon, 0, this,
- TQT_SLOT(slotGroupMakeChord()), actionCollection(), "make_chord");
+ TQ_SLOT(slotGroupMakeChord()), actionCollection(), "make_chord");
// setup Transforms menu
new TDEAction(NormalizeRestsCommand::getGlobalName(), Key_N + CTRL, this,
- TQT_SLOT(slotTransformsNormalizeRests()), actionCollection(),
+ TQ_SLOT(slotTransformsNormalizeRests()), actionCollection(),
"normalize_rests");
new TDEAction(CollapseRestsCommand::getGlobalName(), 0, this,
- TQT_SLOT(slotTransformsCollapseRests()), actionCollection(),
+ TQ_SLOT(slotTransformsCollapseRests()), actionCollection(),
"collapse_rests_aggressively");
new TDEAction(CollapseNotesCommand::getGlobalName(), Key_Equal + CTRL, this,
- TQT_SLOT(slotTransformsCollapseNotes()), actionCollection(),
+ TQ_SLOT(slotTransformsCollapseNotes()), actionCollection(),
"collapse_notes");
icon = TQIconSet
@@ -2016,15 +2016,15 @@ void NotationView::setupActions()
("transforms-tie")));
new TDEAction(TieNotesCommand::getGlobalName(), icon, Key_AsciiTilde, this,
- TQT_SLOT(slotTransformsTieNotes()), actionCollection(),
+ TQ_SLOT(slotTransformsTieNotes()), actionCollection(),
"tie_notes");
new TDEAction(UntieNotesCommand::getGlobalName(), 0, this,
- TQT_SLOT(slotTransformsUntieNotes()), actionCollection(),
+ TQ_SLOT(slotTransformsUntieNotes()), actionCollection(),
"untie_notes");
new TDEAction(MakeNotesViableCommand::getGlobalName(), 0, this,
- TQT_SLOT(slotTransformsMakeNotesViable()), actionCollection(),
+ TQ_SLOT(slotTransformsMakeNotesViable()), actionCollection(),
"make_notes_viable");
icon = TQIconSet
@@ -2032,49 +2032,49 @@ void NotationView::setupActions()
("transforms-decounterpoint")));
new TDEAction(DeCounterpointCommand::getGlobalName(), icon, 0, this,
- TQT_SLOT(slotTransformsDeCounterpoint()), actionCollection(),
+ TQ_SLOT(slotTransformsDeCounterpoint()), actionCollection(),
"de_counterpoint");
new TDEAction(ChangeStemsCommand::getGlobalName(true),
0, Key_PageUp + CTRL, this,
- TQT_SLOT(slotTransformsStemsUp()), actionCollection(),
+ TQ_SLOT(slotTransformsStemsUp()), actionCollection(),
"stems_up");
new TDEAction(ChangeStemsCommand::getGlobalName(false),
0, Key_PageDown + CTRL, this,
- TQT_SLOT(slotTransformsStemsDown()), actionCollection(),
+ TQ_SLOT(slotTransformsStemsDown()), actionCollection(),
"stems_down");
new TDEAction(RestoreStemsCommand::getGlobalName(), 0, this,
- TQT_SLOT(slotTransformsRestoreStems()), actionCollection(),
+ TQ_SLOT(slotTransformsRestoreStems()), actionCollection(),
"restore_stems");
new TDEAction(ChangeSlurPositionCommand::getGlobalName(true),
0, this,
- TQT_SLOT(slotTransformsSlursAbove()), actionCollection(),
+ TQ_SLOT(slotTransformsSlursAbove()), actionCollection(),
"slurs_above");
new TDEAction(ChangeSlurPositionCommand::getGlobalName(false),
0, this,
- TQT_SLOT(slotTransformsSlursBelow()), actionCollection(),
+ TQ_SLOT(slotTransformsSlursBelow()), actionCollection(),
"slurs_below");
new TDEAction(RestoreSlursCommand::getGlobalName(), 0, this,
- TQT_SLOT(slotTransformsRestoreSlurs()), actionCollection(),
+ TQ_SLOT(slotTransformsRestoreSlurs()), actionCollection(),
"restore_slurs");
new TDEAction(ChangeTiePositionCommand::getGlobalName(true),
0, this,
- TQT_SLOT(slotTransformsTiesAbove()), actionCollection(),
+ TQ_SLOT(slotTransformsTiesAbove()), actionCollection(),
"ties_above");
new TDEAction(ChangeTiePositionCommand::getGlobalName(false),
0, this,
- TQT_SLOT(slotTransformsTiesBelow()), actionCollection(),
+ TQ_SLOT(slotTransformsTiesBelow()), actionCollection(),
"ties_below");
new TDEAction(RestoreTiesCommand::getGlobalName(), 0, this,
- TQT_SLOT(slotTransformsRestoreTies()), actionCollection(),
+ TQ_SLOT(slotTransformsRestoreTies()), actionCollection(),
"restore_ties");
icon = TQIconSet
@@ -2084,7 +2084,7 @@ void NotationView::setupActions()
new TDEAction(RespellCommand::getGlobalName
(RespellCommand::Set, Accidentals::DoubleFlat),
icon, 0, this,
- TQT_SLOT(slotRespellDoubleFlat()), actionCollection(),
+ TQ_SLOT(slotRespellDoubleFlat()), actionCollection(),
"respell_doubleflat");
icon = TQIconSet
@@ -2094,7 +2094,7 @@ void NotationView::setupActions()
new TDEAction(RespellCommand::getGlobalName
(RespellCommand::Set, Accidentals::Flat),
icon, 0, this,
- TQT_SLOT(slotRespellFlat()), actionCollection(),
+ TQ_SLOT(slotRespellFlat()), actionCollection(),
"respell_flat");
icon = TQIconSet
@@ -2104,7 +2104,7 @@ void NotationView::setupActions()
new TDEAction(RespellCommand::getGlobalName
(RespellCommand::Set, Accidentals::Natural),
icon, 0, this,
- TQT_SLOT(slotRespellNatural()), actionCollection(),
+ TQ_SLOT(slotRespellNatural()), actionCollection(),
"respell_natural");
icon = TQIconSet
@@ -2114,7 +2114,7 @@ void NotationView::setupActions()
new TDEAction(RespellCommand::getGlobalName
(RespellCommand::Set, Accidentals::Sharp),
icon, 0, this,
- TQT_SLOT(slotRespellSharp()), actionCollection(),
+ TQ_SLOT(slotRespellSharp()), actionCollection(),
"respell_sharp");
icon = TQIconSet
@@ -2124,35 +2124,35 @@ void NotationView::setupActions()
new TDEAction(RespellCommand::getGlobalName
(RespellCommand::Set, Accidentals::DoubleSharp),
icon, 0, this,
- TQT_SLOT(slotRespellDoubleSharp()), actionCollection(),
+ TQ_SLOT(slotRespellDoubleSharp()), actionCollection(),
"respell_doublesharp");
new TDEAction(RespellCommand::getGlobalName
(RespellCommand::Up, Accidentals::NoAccidental),
Key_Up + CTRL + SHIFT, this,
- TQT_SLOT(slotRespellUp()), actionCollection(),
+ TQ_SLOT(slotRespellUp()), actionCollection(),
"respell_up");
new TDEAction(RespellCommand::getGlobalName
(RespellCommand::Down, Accidentals::NoAccidental),
Key_Down + CTRL + SHIFT, this,
- TQT_SLOT(slotRespellDown()), actionCollection(),
+ TQ_SLOT(slotRespellDown()), actionCollection(),
"respell_down");
new TDEAction(RespellCommand::getGlobalName
(RespellCommand::Restore, Accidentals::NoAccidental),
0, this,
- TQT_SLOT(slotRespellRestore()), actionCollection(),
+ TQ_SLOT(slotRespellRestore()), actionCollection(),
"respell_restore");
new TDEAction(MakeAccidentalsCautionaryCommand::getGlobalName(true),
0, this,
- TQT_SLOT(slotShowCautionary()), actionCollection(),
+ TQ_SLOT(slotShowCautionary()), actionCollection(),
"show_cautionary");
new TDEAction(MakeAccidentalsCautionaryCommand::getGlobalName(false),
0, this,
- TQT_SLOT(slotCancelCautionary()), actionCollection(),
+ TQ_SLOT(slotCancelCautionary()), actionCollection(),
"cancel_cautionary");
icon = TQIconSet
@@ -2160,23 +2160,23 @@ void NotationView::setupActions()
("quantize")));
new TDEAction(EventQuantizeCommand::getGlobalName(), icon, Key_Equal, this,
- TQT_SLOT(slotTransformsQuantize()), actionCollection(),
+ TQ_SLOT(slotTransformsQuantize()), actionCollection(),
"quantize");
new TDEAction(FixNotationQuantizeCommand::getGlobalName(), 0,
- this, TQT_SLOT(slotTransformsFixQuantization()), actionCollection(),
+ this, TQ_SLOT(slotTransformsFixQuantization()), actionCollection(),
"fix_quantization");
new TDEAction(RemoveNotationQuantizeCommand::getGlobalName(), 0,
- this, TQT_SLOT(slotTransformsRemoveQuantization()), actionCollection(),
+ this, TQ_SLOT(slotTransformsRemoveQuantization()), actionCollection(),
"remove_quantization");
new TDEAction(InterpretCommand::getGlobalName(), 0,
- this, TQT_SLOT(slotTransformsInterpret()), actionCollection(),
+ this, TQ_SLOT(slotTransformsInterpret()), actionCollection(),
"interpret");
new TDEAction(i18n("&Dump selected events to stderr"), 0, this,
- TQT_SLOT(slotDebugDump()), actionCollection(), "debug_dump");
+ TQ_SLOT(slotDebugDump()), actionCollection(), "debug_dump");
for (MarkActionDataMap::Iterator i = m_markActionDataMap->begin();
i != m_markActionDataMap->end(); ++i) {
@@ -2190,7 +2190,7 @@ void NotationView::setupActions()
icon,
markActionData.keycode,
this,
- TQT_SLOT(slotAddMark()),
+ TQ_SLOT(slotAddMark()),
actionCollection(),
markActionData.actionName.ascii());
}
@@ -2200,59 +2200,59 @@ void NotationView::setupActions()
("text-mark")));
new TDEAction(AddTextMarkCommand::getGlobalName(), icon, 0, this,
- TQT_SLOT(slotMarksAddTextMark()), actionCollection(),
+ TQ_SLOT(slotMarksAddTextMark()), actionCollection(),
"add_text_mark");
new TDEAction(AddFingeringMarkCommand::getGlobalName("0"), 0, Key_0 + ALT, this,
- TQT_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(),
+ TQ_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(),
"add_fingering_0");
new TDEAction(AddFingeringMarkCommand::getGlobalName("1"), 0, Key_1 + ALT, this,
- TQT_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(),
+ TQ_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(),
"add_fingering_1");
new TDEAction(AddFingeringMarkCommand::getGlobalName("2"), 0, Key_2 + ALT, this,
- TQT_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(),
+ TQ_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(),
"add_fingering_2");
new TDEAction(AddFingeringMarkCommand::getGlobalName("3"), 0, Key_3 + ALT, this,
- TQT_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(),
+ TQ_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(),
"add_fingering_3");
new TDEAction(AddFingeringMarkCommand::getGlobalName("4"), 0, Key_4 + ALT, this,
- TQT_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(),
+ TQ_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(),
"add_fingering_4");
new TDEAction(AddFingeringMarkCommand::getGlobalName("5"), 0, Key_5 + ALT, this,
- TQT_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(),
+ TQ_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(),
"add_fingering_5");
new TDEAction(AddFingeringMarkCommand::getGlobalName("+"), 0, Key_9 + ALT, this,
- TQT_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(),
+ TQ_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(),
"add_fingering_plus");
new TDEAction(AddFingeringMarkCommand::getGlobalName(), 0, 0, this,
- TQT_SLOT(slotMarksAddFingeringMark()), actionCollection(),
+ TQ_SLOT(slotMarksAddFingeringMark()), actionCollection(),
"add_fingering_mark");
new TDEAction(RemoveMarksCommand::getGlobalName(), 0, this,
- TQT_SLOT(slotMarksRemoveMarks()), actionCollection(),
+ TQ_SLOT(slotMarksRemoveMarks()), actionCollection(),
"remove_marks");
new TDEAction(RemoveFingeringMarksCommand::getGlobalName(), 0, this,
- TQT_SLOT(slotMarksRemoveFingeringMarks()), actionCollection(),
+ TQ_SLOT(slotMarksRemoveFingeringMarks()), actionCollection(),
"remove_fingering_marks");
new TDEAction(i18n("Ma&ke Ornament..."), 0, this,
- TQT_SLOT(slotMakeOrnament()), actionCollection(),
+ TQ_SLOT(slotMakeOrnament()), actionCollection(),
"make_ornament");
new TDEAction(i18n("Trigger &Ornament..."), 0, this,
- TQT_SLOT(slotUseOrnament()), actionCollection(),
+ TQ_SLOT(slotUseOrnament()), actionCollection(),
"use_ornament");
new TDEAction(i18n("Remove Ornament..."), 0, this,
- TQT_SLOT(slotRemoveOrnament()), actionCollection(),
+ TQ_SLOT(slotRemoveOrnament()), actionCollection(),
"remove_ornament");
static TQString slashTitles[] = {
@@ -2260,32 +2260,32 @@ void NotationView::setupActions()
};
for (int i = 0; i <= 5; ++i) {
new TDEAction(slashTitles[i], 0, this,
- TQT_SLOT(slotAddSlashes()), actionCollection(),
+ TQ_SLOT(slotAddSlashes()), actionCollection(),
TQString("slashes_%1").arg(i).ascii());
}
new TDEAction(ClefInsertionCommand::getGlobalName(), 0, this,
- TQT_SLOT(slotEditAddClef()), actionCollection(),
+ TQ_SLOT(slotEditAddClef()), actionCollection(),
"add_clef");
new TDEAction(KeyInsertionCommand::getGlobalName(), 0, this,
- TQT_SLOT(slotEditAddKeySignature()), actionCollection(),
+ TQ_SLOT(slotEditAddKeySignature()), actionCollection(),
"add_key_signature");
new TDEAction(SustainInsertionCommand::getGlobalName(true), 0, this,
- TQT_SLOT(slotEditAddSustainDown()), actionCollection(),
+ TQ_SLOT(slotEditAddSustainDown()), actionCollection(),
"add_sustain_down");
new TDEAction(SustainInsertionCommand::getGlobalName(false), 0, this,
- TQT_SLOT(slotEditAddSustainUp()), actionCollection(),
+ TQ_SLOT(slotEditAddSustainUp()), actionCollection(),
"add_sustain_up");
new TDEAction(TransposeCommand::getDiatonicGlobalName(false), 0, this,
- TQT_SLOT(slotEditTranspose()), actionCollection(),
+ TQ_SLOT(slotEditTranspose()), actionCollection(),
"transpose_segment");
new TDEAction(i18n("Convert Notation For..."), 0, this,
- TQT_SLOT(slotEditSwitchPreset()), actionCollection(),
+ TQ_SLOT(slotEditSwitchPreset()), actionCollection(),
"switch_preset");
@@ -2321,79 +2321,79 @@ void NotationView::setupActions()
}
new TDEAction(i18n("Cursor &Back"), 0, Key_Left, this,
- TQT_SLOT(slotStepBackward()), actionCollection(),
+ TQ_SLOT(slotStepBackward()), actionCollection(),
"cursor_back");
new TDEAction(i18n("Cursor &Forward"), 0, Key_Right, this,
- TQT_SLOT(slotStepForward()), actionCollection(),
+ TQ_SLOT(slotStepForward()), actionCollection(),
"cursor_forward");
new TDEAction(i18n("Cursor Ba&ck Bar"), 0, Key_Left + CTRL, this,
- TQT_SLOT(slotJumpBackward()), actionCollection(),
+ TQ_SLOT(slotJumpBackward()), actionCollection(),
"cursor_back_bar");
new TDEAction(i18n("Cursor For&ward Bar"), 0, Key_Right + CTRL, this,
- TQT_SLOT(slotJumpForward()), actionCollection(),
+ TQ_SLOT(slotJumpForward()), actionCollection(),
"cursor_forward_bar");
new TDEAction(i18n("Cursor Back and Se&lect"), SHIFT + Key_Left, this,
- TQT_SLOT(slotExtendSelectionBackward()), actionCollection(),
+ TQ_SLOT(slotExtendSelectionBackward()), actionCollection(),
"extend_selection_backward");
new TDEAction(i18n("Cursor Forward and &Select"), SHIFT + Key_Right, this,
- TQT_SLOT(slotExtendSelectionForward()), actionCollection(),
+ TQ_SLOT(slotExtendSelectionForward()), actionCollection(),
"extend_selection_forward");
new TDEAction(i18n("Cursor Back Bar and Select"), SHIFT + CTRL + Key_Left, this,
- TQT_SLOT(slotExtendSelectionBackwardBar()), actionCollection(),
+ TQ_SLOT(slotExtendSelectionBackwardBar()), actionCollection(),
"extend_selection_backward_bar");
new TDEAction(i18n("Cursor Forward Bar and Select"), SHIFT + CTRL + Key_Right, this,
- TQT_SLOT(slotExtendSelectionForwardBar()), actionCollection(),
+ TQ_SLOT(slotExtendSelectionForwardBar()), actionCollection(),
"extend_selection_forward_bar");
/*!!! not here yet
new TDEAction(i18n("Move Selection Left"), Key_Minus, this,
- TQT_SLOT(slotMoveSelectionLeft()), actionCollection(),
+ TQ_SLOT(slotMoveSelectionLeft()), actionCollection(),
"move_selection_left");
*/
new TDEAction(i18n("Cursor to St&art"), 0,
/* #1025717: conflicting meanings for ctrl+a - dupe with Select All
Key_A + CTRL, */ this,
- TQT_SLOT(slotJumpToStart()), actionCollection(),
+ TQ_SLOT(slotJumpToStart()), actionCollection(),
"cursor_start");
new TDEAction(i18n("Cursor to &End"), 0, Key_E + CTRL, this,
- TQT_SLOT(slotJumpToEnd()), actionCollection(),
+ TQ_SLOT(slotJumpToEnd()), actionCollection(),
"cursor_end");
new TDEAction(i18n("Cursor &Up Staff"), 0, Key_Up + SHIFT, this,
- TQT_SLOT(slotCurrentStaffUp()), actionCollection(),
+ TQ_SLOT(slotCurrentStaffUp()), actionCollection(),
"cursor_up_staff");
new TDEAction(i18n("Cursor &Down Staff"), 0, Key_Down + SHIFT, this,
- TQT_SLOT(slotCurrentStaffDown()), actionCollection(),
+ TQ_SLOT(slotCurrentStaffDown()), actionCollection(),
"cursor_down_staff");
new TDEAction(i18n("Cursor Pre&vious Segment"), 0, Key_Prior + ALT, this,
- TQT_SLOT(slotCurrentSegmentPrior()), actionCollection(),
+ TQ_SLOT(slotCurrentSegmentPrior()), actionCollection(),
"cursor_prior_segment");
new TDEAction(i18n("Cursor Ne&xt Segment"), 0, Key_Next + ALT, this,
- TQT_SLOT(slotCurrentSegmentNext()), actionCollection(),
+ TQ_SLOT(slotCurrentSegmentNext()), actionCollection(),
"cursor_next_segment");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-cursor-to-pointer")));
new TDEAction(i18n("Cursor to &Playback Pointer"), icon, 0, this,
- TQT_SLOT(slotJumpCursorToPlayback()), actionCollection(),
+ TQ_SLOT(slotJumpCursorToPlayback()), actionCollection(),
"cursor_to_playback_pointer");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-play")));
TDEAction *play = new TDEAction(i18n("&Play"), icon, Key_Enter, this,
- TQT_SIGNAL(play()), actionCollection(), "play");
+ TQ_SIGNAL(play()), actionCollection(), "play");
// Alternative shortcut for Play
TDEShortcut playShortcut = play->shortcut();
playShortcut.append( KKey(Key_Return + CTRL) );
@@ -2402,112 +2402,112 @@ void NotationView::setupActions()
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-stop")));
new TDEAction(i18n("&Stop"), icon, Key_Insert, this,
- TQT_SIGNAL(stop()), actionCollection(), "stop");
+ TQ_SIGNAL(stop()), actionCollection(), "stop");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-rewind")));
new TDEAction(i18n("Re&wind"), icon, Key_End, this,
- TQT_SIGNAL(rewindPlayback()), actionCollection(),
+ TQ_SIGNAL(rewindPlayback()), actionCollection(),
"playback_pointer_back_bar");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-ffwd")));
new TDEAction(i18n("&Fast Forward"), icon, Key_PageDown, this,
- TQT_SIGNAL(fastForwardPlayback()), actionCollection(),
+ TQ_SIGNAL(fastForwardPlayback()), actionCollection(),
"playback_pointer_forward_bar");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-rewind-end")));
new TDEAction(i18n("Rewind to &Beginning"), icon, 0, this,
- TQT_SIGNAL(rewindPlaybackToBeginning()), actionCollection(),
+ TQ_SIGNAL(rewindPlaybackToBeginning()), actionCollection(),
"playback_pointer_start");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-ffwd-end")));
new TDEAction(i18n("Fast Forward to &End"), icon, 0, this,
- TQT_SIGNAL(fastForwardPlaybackToEnd()), actionCollection(),
+ TQ_SIGNAL(fastForwardPlaybackToEnd()), actionCollection(),
"playback_pointer_end");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-pointer-to-cursor")));
new TDEAction(i18n("Playback Pointer to &Cursor"), icon, 0, this,
- TQT_SLOT(slotJumpPlaybackToCursor()), actionCollection(),
+ TQ_SLOT(slotJumpPlaybackToCursor()), actionCollection(),
"playback_pointer_to_cursor");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-solo")));
new TDEToggleAction(i18n("&Solo"), icon, 0, this,
- TQT_SLOT(slotToggleSolo()), actionCollection(),
+ TQ_SLOT(slotToggleSolo()), actionCollection(),
"toggle_solo");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-tracking")));
(new TDEToggleAction(i18n("Scro&ll to Follow Playback"), icon, Key_Pause, this,
- TQT_SLOT(slotToggleTracking()), actionCollection(),
+ TQ_SLOT(slotToggleTracking()), actionCollection(),
"toggle_tracking"))->setChecked(m_playTracking);
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-panic")));
new TDEAction(i18n("Panic"), icon, Key_P + CTRL + ALT, this,
- TQT_SIGNAL(panic()), actionCollection(), "panic");
+ TQ_SIGNAL(panic()), actionCollection(), "panic");
new TDEAction(i18n("Set Loop to Selection"), Key_Semicolon + CTRL, this,
- TQT_SLOT(slotPreviewSelection()), actionCollection(),
+ TQ_SLOT(slotPreviewSelection()), actionCollection(),
"preview_selection");
new TDEAction(i18n("Clear L&oop"), Key_Colon + CTRL, this,
- TQT_SLOT(slotClearLoop()), actionCollection(),
+ TQ_SLOT(slotClearLoop()), actionCollection(),
"clear_loop");
new TDEAction(i18n("Clear Selection"), Key_Escape, this,
- TQT_SLOT(slotClearSelection()), actionCollection(),
+ TQ_SLOT(slotClearSelection()), actionCollection(),
"clear_selection");
// TQString pixmapDir =
// TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
// icon = TQIconSet(TQCanvasPixmap(pixmapDir + "/toolbar/eventfilter.xpm"));
new TDEAction(i18n("&Filter Selection"), "filter", Key_F + CTRL, this,
- TQT_SLOT(slotFilterSelection()), actionCollection(),
+ TQ_SLOT(slotFilterSelection()), actionCollection(),
"filter_selection");
new TDEAction(i18n("Push &Left"), 0, this,
- TQT_SLOT(slotFinePositionLeft()), actionCollection(),
+ TQ_SLOT(slotFinePositionLeft()), actionCollection(),
"fine_position_left");
new TDEAction(i18n("Push &Right"), 0, this,
- TQT_SLOT(slotFinePositionRight()), actionCollection(),
+ TQ_SLOT(slotFinePositionRight()), actionCollection(),
"fine_position_right");
new TDEAction(i18n("Push &Up"), 0, this,
- TQT_SLOT(slotFinePositionUp()), actionCollection(),
+ TQ_SLOT(slotFinePositionUp()), actionCollection(),
"fine_position_up");
new TDEAction(i18n("Push &Down"), 0, this,
- TQT_SLOT(slotFinePositionDown()), actionCollection(),
+ TQ_SLOT(slotFinePositionDown()), actionCollection(),
"fine_position_down");
new TDEAction(i18n("&Restore Positions"), 0, this,
- TQT_SLOT(slotFinePositionRestore()), actionCollection(),
+ TQ_SLOT(slotFinePositionRestore()), actionCollection(),
"fine_position_restore");
new TDEAction(i18n("Make &Invisible"), 0, this,
- TQT_SLOT(slotMakeInvisible()), actionCollection(),
+ TQ_SLOT(slotMakeInvisible()), actionCollection(),
"make_invisible");
new TDEAction(i18n("Make &Visible"), 0, this,
- TQT_SLOT(slotMakeVisible()), actionCollection(),
+ TQ_SLOT(slotMakeVisible()), actionCollection(),
"make_visible");
new TDEAction(i18n("Toggle Dot"), Key_Period, this,
- TQT_SLOT(slotToggleDot()), actionCollection(),
+ TQ_SLOT(slotToggleDot()), actionCollection(),
"toggle_dot");
new TDEAction(i18n("Add Dot"), Key_Period + CTRL, this,
- TQT_SLOT(slotAddDot()), actionCollection(),
+ TQ_SLOT(slotAddDot()), actionCollection(),
"add_dot");
new TDEAction(i18n("Add Dot"), Key_Period + CTRL + ALT, this,
- TQT_SLOT(slotAddDotNotationOnly()), actionCollection(),
+ TQ_SLOT(slotAddDotNotationOnly()), actionCollection(),
"add_notation_dot");
createGUI(getRCFileName(), false);
@@ -2567,7 +2567,7 @@ NotationView::setupFontSizeMenu(std::string oldFontName)
sizeAction =
new TDEToggleAction(i18n("1 pixel", "%n pixels", sizes[i]),
0, this,
- TQT_SLOT(slotChangeFontSizeFromAction()),
+ TQ_SLOT(slotChangeFontSizeFromAction()),
actionCollection(), actionName.ascii());
}
@@ -2647,8 +2647,8 @@ void NotationView::initLayoutToolbar()
m_fontName = NoteFontFactory::getDefaultFontName();
}
- connect(m_fontCombo, TQT_SIGNAL(activated(const TQString &)),
- this, TQT_SLOT(slotChangeFont(const TQString &)));
+ connect(m_fontCombo, TQ_SIGNAL(activated(const TQString &)),
+ this, TQ_SLOT(slotChangeFont(const TQString &)));
new TQLabel(i18n(" Size: "), layoutToolbar, "size label");
@@ -2669,8 +2669,8 @@ void NotationView::initLayoutToolbar()
value.setNum(m_fontSize);
m_fontSizeCombo->setCurrentText(value);
- connect(m_fontSizeCombo, TQT_SIGNAL(activated(const TQString&)),
- this, TQT_SLOT(slotChangeFontSizeFromStringValue(const TQString&)));
+ connect(m_fontSizeCombo, TQ_SIGNAL(activated(const TQString&)),
+ this, TQ_SLOT(slotChangeFontSizeFromStringValue(const TQString&)));
new TQLabel(i18n(" Spacing: "), layoutToolbar, "spacing label");
@@ -2692,8 +2692,8 @@ void NotationView::initLayoutToolbar()
value += "%";
m_spacingCombo->setCurrentText(value);
- connect(m_spacingCombo, TQT_SIGNAL(activated(const TQString&)),
- this, TQT_SLOT(slotChangeSpacingFromStringValue(const TQString&)));
+ connect(m_spacingCombo, TQ_SIGNAL(activated(const TQString&)),
+ this, TQ_SLOT(slotChangeSpacingFromStringValue(const TQString&)));
}
void NotationView::initStatusBar()
@@ -4108,24 +4108,24 @@ void NotationView::setupProgress(KProgress* bar)
if (bar) {
NOTATION_DEBUG << "NotationView::setupProgress(bar)\n";
- connect(m_hlayout, TQT_SIGNAL(setProgress(int)),
- bar, TQT_SLOT(setValue(int)));
+ connect(m_hlayout, TQ_SIGNAL(setProgress(int)),
+ bar, TQ_SLOT(setValue(int)));
- connect(m_hlayout, TQT_SIGNAL(incrementProgress(int)),
- bar, TQT_SLOT(advance(int)));
+ connect(m_hlayout, TQ_SIGNAL(incrementProgress(int)),
+ bar, TQ_SLOT(advance(int)));
- connect(this, TQT_SIGNAL(setProgress(int)),
- bar, TQT_SLOT(setValue(int)));
+ connect(this, TQ_SIGNAL(setProgress(int)),
+ bar, TQ_SLOT(setValue(int)));
- connect(this, TQT_SIGNAL(incrementProgress(int)),
- bar, TQT_SLOT(advance(int)));
+ connect(this, TQ_SIGNAL(incrementProgress(int)),
+ bar, TQ_SLOT(advance(int)));
for (unsigned int i = 0; i < m_staffs.size(); ++i) {
- connect(m_staffs[i], TQT_SIGNAL(setProgress(int)),
- bar, TQT_SLOT(setValue(int)));
+ connect(m_staffs[i], TQ_SIGNAL(setProgress(int)),
+ bar, TQ_SLOT(setValue(int)));
- connect(m_staffs[i], TQT_SIGNAL(incrementProgress(int)),
- bar, TQT_SLOT(advance(int)));
+ connect(m_staffs[i], TQ_SIGNAL(incrementProgress(int)),
+ bar, TQ_SLOT(advance(int)));
}
}
@@ -4139,19 +4139,19 @@ void NotationView::setupProgress(ProgressDialog* dialog)
if (dialog) {
setupProgress(dialog->progressBar());
- connect(dialog, TQT_SIGNAL(cancelClicked()),
- m_hlayout, TQT_SLOT(slotCancel()));
+ connect(dialog, TQ_SIGNAL(cancelClicked()),
+ m_hlayout, TQ_SLOT(slotCancel()));
for (unsigned int i = 0; i < m_staffs.size(); ++i) {
- connect(m_staffs[i], TQT_SIGNAL(setOperationName(TQString)),
- this, TQT_SLOT(slotSetOperationNameAndStatus(TQString)));
+ connect(m_staffs[i], TQ_SIGNAL(setOperationName(TQString)),
+ this, TQ_SLOT(slotSetOperationNameAndStatus(TQString)));
- connect(dialog, TQT_SIGNAL(cancelClicked()),
- m_staffs[i], TQT_SLOT(slotCancel()));
+ connect(dialog, TQ_SIGNAL(cancelClicked()),
+ m_staffs[i], TQ_SLOT(slotCancel()));
}
- connect(this, TQT_SIGNAL(setOperationName(TQString)),
- dialog, TQT_SLOT(slotSetOperationName(TQString)));
+ connect(this, TQ_SIGNAL(setOperationName(TQString)),
+ dialog, TQ_SLOT(slotSetOperationName(TQString)));
m_progressDisplayer = PROGRESS_DIALOG;
}
@@ -4169,9 +4169,9 @@ void NotationView::disconnectProgress()
NOTATION_DEBUG << "NotationView::disconnectProgress()" << endl;
m_hlayout->disconnect();
- disconnect(TQT_SIGNAL(setProgress(int)));
- disconnect(TQT_SIGNAL(incrementProgress(int)));
- disconnect(TQT_SIGNAL(setOperationName(TQString)));
+ disconnect(TQ_SIGNAL(setProgress(int)));
+ disconnect(TQ_SIGNAL(incrementProgress(int)));
+ disconnect(TQ_SIGNAL(setOperationName(TQString)));
for (unsigned int i = 0; i < m_staffs.size(); ++i) {
m_staffs[i]->disconnect();
@@ -4658,8 +4658,8 @@ void NotationView::slotPrintLilyPond()
*proc << "--graphical";
*proc << "--print";
*proc << file->name();
- connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),
- this, TQT_SLOT(slotLilyPondViewProcessExited(TDEProcess *)));
+ connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),
+ this, TQ_SLOT(slotLilyPondViewProcessExited(TDEProcess *)));
m_lilyTempFileMap[proc] = file;
proc->start(TDEProcess::NotifyOnExit);
}
@@ -4682,8 +4682,8 @@ void NotationView::slotPreviewLilyPond()
*proc << "--graphical";
*proc << "--pdf";
*proc << file->name();
- connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),
- this, TQT_SLOT(slotLilyPondViewProcessExited(TDEProcess *)));
+ connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),
+ this, TQ_SLOT(slotLilyPondViewProcessExited(TDEProcess *)));
m_lilyTempFileMap[proc] = file;
proc->start(TDEProcess::NotifyOnExit);
}
@@ -4714,11 +4714,11 @@ bool NotationView::exportLilyPondFile(TQString file, bool forPreview)
LilyPondExporter e(this, m_doc, std::string(TQFile::encodeName(file)));
- connect(&e, TQT_SIGNAL(setProgress(int)),
- progressDlg.progressBar(), TQT_SLOT(setValue(int)));
+ connect(&e, TQ_SIGNAL(setProgress(int)),
+ progressDlg.progressBar(), TQ_SLOT(setValue(int)));
- connect(&e, TQT_SIGNAL(incrementProgress(int)),
- progressDlg.progressBar(), TQT_SLOT(advance(int)));
+ connect(&e, TQ_SIGNAL(incrementProgress(int)),
+ progressDlg.progressBar(), TQ_SLOT(advance(int)));
if (!e.write()) {
// CurrentProgressDialog::freeze();
@@ -7407,7 +7407,7 @@ NotationView::slotCheckRendered(double cx0, double cx1)
if (m_renderTimer)
delete m_renderTimer;
m_renderTimer = new TQTimer(this);
- connect(m_renderTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotRenderSomething()));
+ connect(m_renderTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotRenderSomething()));
m_renderTimer->start(0, true);
}
@@ -7426,7 +7426,7 @@ NotationView::slotRenderSomething()
long elapsed = ((now - lastWork) * 1000 / CLOCKS_PER_SEC);
if (elapsed < 70) {
m_renderTimer = new TQTimer(this);
- connect(m_renderTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotRenderSomething()));
+ connect(m_renderTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotRenderSomething()));
m_renderTimer->start(0, true);
return ;
}
@@ -7437,7 +7437,7 @@ NotationView::slotRenderSomething()
if (m_staffs[i]->doRenderWork(m_staffs[i]->getSegment().getStartTime(),
m_staffs[i]->getSegment().getEndTime())) {
m_renderTimer = new TQTimer(this);
- connect(m_renderTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotRenderSomething()));
+ connect(m_renderTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotRenderSomething()));
m_renderTimer->start(0, true);
return ;
}
diff --git a/src/gui/editors/notation/NoteFontViewer.cpp b/src/gui/editors/notation/NoteFontViewer.cpp
index ca23d11..eca2c9c 100644
--- a/src/gui/editors/notation/NoteFontViewer.cpp
+++ b/src/gui/editors/notation/NoteFontViewer.cpp
@@ -107,14 +107,14 @@ NoteFontViewer::NoteFontViewer(TQWidget *parent, TQString noteFontName,
m_frame = new FontViewFrame(pixelSize, box);
- connect(m_font, TQT_SIGNAL(activated(const TQString &)),
- this, TQT_SLOT(slotFontChanged(const TQString &)));
+ connect(m_font, TQ_SIGNAL(activated(const TQString &)),
+ this, TQ_SLOT(slotFontChanged(const TQString &)));
- connect(m_view, TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(slotViewChanged(int)));
+ connect(m_view, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(slotViewChanged(int)));
- connect(m_rows, TQT_SIGNAL(activated(const TQString &)),
- this, TQT_SLOT(slotRowChanged(const TQString &)));
+ connect(m_rows, TQ_SIGNAL(activated(const TQString &)),
+ this, TQ_SLOT(slotRowChanged(const TQString &)));
slotFontChanged(m_font->currentText());
}
diff --git a/src/gui/editors/notation/NoteInserter.cpp b/src/gui/editors/notation/NoteInserter.cpp
index 273113c..74d51d6 100644
--- a/src/gui/editors/notation/NoteInserter.cpp
+++ b/src/gui/editors/notation/NoteInserter.cpp
@@ -78,7 +78,7 @@ NoteInserter::NoteInserter(NotationView* view)
TDEToggleAction *autoBeamAction =
new TDEToggleAction(i18n("Auto-Beam when appropriate"), 0, this,
- TQT_SLOT(slotToggleAutoBeam()), actionCollection(),
+ TQ_SLOT(slotToggleAutoBeam()), actionCollection(),
"toggle_auto_beam");
autoBeamAction->setChecked(m_autoBeam);
@@ -99,30 +99,30 @@ NoteInserter::NoteInserter(NotationView* view)
(NotePixmapFactory::toTQPixmap(NotePixmapFactory::
makeToolbarPixmap("dotted-crotchet")));
new TDEToggleAction(i18n("Dotted note"), icon, 0, this,
- TQT_SLOT(slotToggleDot()), actionCollection(),
+ TQ_SLOT(slotToggleDot()), actionCollection(),
"toggle_dot");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::
makeToolbarPixmap("select")));
new TDEAction(i18n("Switch to Select Tool"), icon, 0, this,
- TQT_SLOT(slotSelectSelected()), actionCollection(),
+ TQ_SLOT(slotSelectSelected()), actionCollection(),
"select");
new TDEAction(i18n("Switch to Erase Tool"), "eraser", 0, this,
- TQT_SLOT(slotEraseSelected()), actionCollection(),
+ TQ_SLOT(slotEraseSelected()), actionCollection(),
"erase");
icon = TQIconSet
(NotePixmapFactory::toTQPixmap(NotePixmapFactory::
makeToolbarPixmap("rest-crotchet")));
new TDEAction(i18n("Switch to Inserting Rests"), icon, 0, this,
- TQT_SLOT(slotRestsSelected()), actionCollection(),
+ TQ_SLOT(slotRestsSelected()), actionCollection(),
"rests");
createMenu("noteinserter.rc");
- connect(m_parentView, TQT_SIGNAL(changeAccidental(Accidental, bool)),
- this, TQT_SLOT(slotSetAccidental(Accidental, bool)));
+ connect(m_parentView, TQ_SIGNAL(changeAccidental(Accidental, bool)),
+ this, TQ_SLOT(slotSetAccidental(Accidental, bool)));
}
NoteInserter::NoteInserter(const TQString& menuName, NotationView* view)
@@ -135,8 +135,8 @@ NoteInserter::NoteInserter(const TQString& menuName, NotationView* view)
m_lastAccidental(Accidentals::NoAccidental),
m_followAccidental(false)
{
- connect(m_parentView, TQT_SIGNAL(changeAccidental(Accidental, bool)),
- this, TQT_SLOT(slotSetAccidental(Accidental, bool)));
+ connect(m_parentView, TQ_SIGNAL(changeAccidental(Accidental, bool)),
+ this, TQ_SLOT(slotSetAccidental(Accidental, bool)));
}
NoteInserter::~NoteInserter()
diff --git a/src/gui/editors/notation/RestInserter.cpp b/src/gui/editors/notation/RestInserter.cpp
index 69afade..ff0cbb7 100644
--- a/src/gui/editors/notation/RestInserter.cpp
+++ b/src/gui/editors/notation/RestInserter.cpp
@@ -58,24 +58,24 @@ RestInserter::RestInserter(NotationView* view)
(NotePixmapFactory::toTQPixmap(NotePixmapFactory::
makeToolbarPixmap("dotted-rest-crotchet")));
new TDEToggleAction(i18n("Dotted rest"), icon, 0, this,
- TQT_SLOT(slotToggleDot()), actionCollection(),
+ TQ_SLOT(slotToggleDot()), actionCollection(),
"toggle_dot");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::
makeToolbarPixmap("select")));
new TDEAction(i18n("Switch to Select Tool"), icon, 0, this,
- TQT_SLOT(slotSelectSelected()), actionCollection(),
+ TQ_SLOT(slotSelectSelected()), actionCollection(),
"select");
new TDEAction(i18n("Switch to Erase Tool"), "eraser", 0, this,
- TQT_SLOT(slotEraseSelected()), actionCollection(),
+ TQ_SLOT(slotEraseSelected()), actionCollection(),
"erase");
icon = TQIconSet
(NotePixmapFactory::toTQPixmap(NotePixmapFactory::
makeToolbarPixmap("crotchet")));
new TDEAction(i18n("Switch to Inserting Notes"), icon, 0, this,
- TQT_SLOT(slotNotesSelected()), actionCollection(),
+ TQ_SLOT(slotNotesSelected()), actionCollection(),
"notes");
createMenu("restinserter.rc");
diff --git a/src/gui/editors/notation/TextInserter.cpp b/src/gui/editors/notation/TextInserter.cpp
index 22bf6cb..09e6925 100644
--- a/src/gui/editors/notation/TextInserter.cpp
+++ b/src/gui/editors/notation/TextInserter.cpp
@@ -53,18 +53,18 @@ TextInserter::TextInserter(NotationView* view)
TQIconSet icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::
makeToolbarPixmap("select")));
new TDEAction(i18n("Switch to Select Tool"), icon, 0, this,
- TQT_SLOT(slotSelectSelected()), actionCollection(),
+ TQ_SLOT(slotSelectSelected()), actionCollection(),
"select");
new TDEAction(i18n("Switch to Erase Tool"), "eraser", 0, this,
- TQT_SLOT(slotEraseSelected()), actionCollection(),
+ TQ_SLOT(slotEraseSelected()), actionCollection(),
"erase");
icon = TQIconSet
(NotePixmapFactory::toTQPixmap(NotePixmapFactory::
makeToolbarPixmap("crotchet")));
new TDEAction(i18n("Switch to Inserting Notes"), icon, 0, this,
- TQT_SLOT(slotNotesSelected()), actionCollection(),
+ TQ_SLOT(slotNotesSelected()), actionCollection(),
"notes");
createMenu("textinserter.rc");
diff --git a/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp b/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp
index 8038f95..7d9abe8 100644
--- a/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp
+++ b/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp
@@ -254,32 +254,32 @@ AudioInstrumentParameterPanel::AudioInstrumentParameterPanel(RosegardenGUIDoc* d
gridLayout->setRowStretch(2, 1);
- connect(m_audioFader, TQT_SIGNAL(audioChannelsChanged(int)),
- this, TQT_SLOT(slotAudioChannels(int)));
+ connect(m_audioFader, TQ_SIGNAL(audioChannelsChanged(int)),
+ this, TQ_SLOT(slotAudioChannels(int)));
- connect(m_audioFader->m_signalMapper, TQT_SIGNAL(mapped(int)),
- this, TQT_SLOT(slotSelectPlugin(int)));
+ connect(m_audioFader->m_signalMapper, TQ_SIGNAL(mapped(int)),
+ this, TQ_SLOT(slotSelectPlugin(int)));
- connect(m_audioFader->m_fader, TQT_SIGNAL(faderChanged(float)),
- this, TQT_SLOT(slotSelectAudioLevel(float)));
+ connect(m_audioFader->m_fader, TQ_SIGNAL(faderChanged(float)),
+ this, TQ_SLOT(slotSelectAudioLevel(float)));
- connect(m_audioFader->m_recordFader, TQT_SIGNAL(faderChanged(float)),
- this, TQT_SLOT(slotSelectAudioRecordLevel(float)));
+ connect(m_audioFader->m_recordFader, TQ_SIGNAL(faderChanged(float)),
+ this, TQ_SLOT(slotSelectAudioRecordLevel(float)));
- connect(m_audioFader->m_pan, TQT_SIGNAL(valueChanged(float)),
- this, TQT_SLOT(slotSetPan(float)));
+ connect(m_audioFader->m_pan, TQ_SIGNAL(valueChanged(float)),
+ this, TQ_SLOT(slotSetPan(float)));
- connect(m_audioFader->m_audioOutput, TQT_SIGNAL(changed()),
- this, TQT_SLOT(slotAudioRoutingChanged()));
+ connect(m_audioFader->m_audioOutput, TQ_SIGNAL(changed()),
+ this, TQ_SLOT(slotAudioRoutingChanged()));
- connect(m_audioFader->m_audioInput, TQT_SIGNAL(changed()),
- this, TQT_SLOT(slotAudioRoutingChanged()));
+ connect(m_audioFader->m_audioInput, TQ_SIGNAL(changed()),
+ this, TQ_SLOT(slotAudioRoutingChanged()));
- connect(m_audioFader->m_synthButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotSynthButtonClicked()));
+ connect(m_audioFader->m_synthButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotSynthButtonClicked()));
- connect(m_audioFader->m_synthGUIButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotSynthGUIButtonClicked()));
+ connect(m_audioFader->m_synthGUIButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotSynthGUIButtonClicked()));
}
void
diff --git a/src/gui/editors/parameters/InstrumentParameterBox.cpp b/src/gui/editors/parameters/InstrumentParameterBox.cpp
index 2bb6292..f5ce071 100644
--- a/src/gui/editors/parameters/InstrumentParameterBox.cpp
+++ b/src/gui/editors/parameters/InstrumentParameterBox.cpp
@@ -84,39 +84,39 @@ InstrumentParameterBox::InstrumentParameterBox(RosegardenGUIDoc *doc,
m_audioInstrumentParameters->adjustSize();
m_noInstrumentParameters->adjustSize();
- connect(m_audioInstrumentParameters, TQT_SIGNAL(updateAllBoxes()),
- this, TQT_SLOT(slotUpdateAllBoxes()));
+ connect(m_audioInstrumentParameters, TQ_SIGNAL(updateAllBoxes()),
+ this, TQ_SLOT(slotUpdateAllBoxes()));
connect(m_audioInstrumentParameters,
- TQT_SIGNAL(instrumentParametersChanged(InstrumentId)),
+ TQ_SIGNAL(instrumentParametersChanged(InstrumentId)),
this,
- TQT_SIGNAL(instrumentParametersChanged(InstrumentId)));
+ TQ_SIGNAL(instrumentParametersChanged(InstrumentId)));
connect(m_audioInstrumentParameters,
- TQT_SIGNAL(selectPlugin(TQWidget *, InstrumentId, int)),
+ TQ_SIGNAL(selectPlugin(TQWidget *, InstrumentId, int)),
this,
- TQT_SIGNAL(selectPlugin(TQWidget *, InstrumentId, int)));
+ TQ_SIGNAL(selectPlugin(TQWidget *, InstrumentId, int)));
connect(m_audioInstrumentParameters,
- TQT_SIGNAL(showPluginGUI(InstrumentId, int)),
+ TQ_SIGNAL(showPluginGUI(InstrumentId, int)),
this,
- TQT_SIGNAL(showPluginGUI(InstrumentId, int)));
+ TQ_SIGNAL(showPluginGUI(InstrumentId, int)));
- connect(m_midiInstrumentParameters, TQT_SIGNAL(updateAllBoxes()),
- this, TQT_SLOT(slotUpdateAllBoxes()));
+ connect(m_midiInstrumentParameters, TQ_SIGNAL(updateAllBoxes()),
+ this, TQ_SLOT(slotUpdateAllBoxes()));
connect(m_midiInstrumentParameters,
- TQT_SIGNAL(changeInstrumentLabel(InstrumentId, TQString)),
- this, TQT_SIGNAL(changeInstrumentLabel(InstrumentId, TQString)));
+ TQ_SIGNAL(changeInstrumentLabel(InstrumentId, TQString)),
+ this, TQ_SIGNAL(changeInstrumentLabel(InstrumentId, TQString)));
connect(m_audioInstrumentParameters,
- TQT_SIGNAL(changeInstrumentLabel(InstrumentId, TQString)),
- this, TQT_SIGNAL(changeInstrumentLabel(InstrumentId, TQString)));
+ TQ_SIGNAL(changeInstrumentLabel(InstrumentId, TQString)),
+ this, TQ_SIGNAL(changeInstrumentLabel(InstrumentId, TQString)));
connect(m_midiInstrumentParameters,
- TQT_SIGNAL(instrumentParametersChanged(InstrumentId)),
+ TQ_SIGNAL(instrumentParametersChanged(InstrumentId)),
this,
- TQT_SIGNAL(instrumentParametersChanged(InstrumentId)));
+ TQ_SIGNAL(instrumentParametersChanged(InstrumentId)));
// Layout the groups left to right.
diff --git a/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp b/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp
index e837028..f962ef7 100644
--- a/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp
+++ b/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp
@@ -150,32 +150,32 @@ MIDIInstrumentParameterPanel::MIDIInstrumentParameterPanel(RosegardenGUIDoc *doc
// Connect up the toggle boxes
//
- connect(m_percussionCheckBox, TQT_SIGNAL(toggled(bool)),
- this, TQT_SLOT(slotTogglePercussion(bool)));
+ connect(m_percussionCheckBox, TQ_SIGNAL(toggled(bool)),
+ this, TQ_SLOT(slotTogglePercussion(bool)));
- connect(m_programCheckBox, TQT_SIGNAL(toggled(bool)),
- this, TQT_SLOT(slotToggleProgramChange(bool)));
+ connect(m_programCheckBox, TQ_SIGNAL(toggled(bool)),
+ this, TQ_SLOT(slotToggleProgramChange(bool)));
- connect(m_bankCheckBox, TQT_SIGNAL(toggled(bool)),
- this, TQT_SLOT(slotToggleBank(bool)));
+ connect(m_bankCheckBox, TQ_SIGNAL(toggled(bool)),
+ this, TQ_SLOT(slotToggleBank(bool)));
- connect(m_variationCheckBox, TQT_SIGNAL(toggled(bool)),
- this, TQT_SLOT(slotToggleVariation(bool)));
+ connect(m_variationCheckBox, TQ_SIGNAL(toggled(bool)),
+ this, TQ_SLOT(slotToggleVariation(bool)));
// Connect activations
//
- connect(m_bankValue, TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(slotSelectBank(int)));
+ connect(m_bankValue, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(slotSelectBank(int)));
- connect(m_variationValue, TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(slotSelectVariation(int)));
+ connect(m_variationValue, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(slotSelectVariation(int)));
- connect(m_programValue, TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(slotSelectProgram(int)));
+ connect(m_programValue, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(slotSelectProgram(int)));
- connect(m_channelValue, TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(slotSelectChannel(int)));
+ connect(m_channelValue, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(slotSelectChannel(int)));
// don't select any of the options in any dropdown
m_programValue->setCurrentItem( -1);
@@ -183,8 +183,8 @@ MIDIInstrumentParameterPanel::MIDIInstrumentParameterPanel(RosegardenGUIDoc *doc
m_channelValue->setCurrentItem( -1);
m_variationValue->setCurrentItem( -1);
- connect(m_rotaryMapper, TQT_SIGNAL(mapped(int)),
- this, TQT_SLOT(slotControllerChanged(int)));
+ connect(m_rotaryMapper, TQ_SIGNAL(mapped(int)),
+ this, TQ_SLOT(slotControllerChanged(int)));
}
void
@@ -415,8 +415,8 @@ MIDIInstrumentParameterPanel::setupControllers(MidiDevice *md)
// Connect
//
- connect(rotary, TQT_SIGNAL(valueChanged(float)),
- m_rotaryMapper, TQT_SLOT(map()));
+ connect(rotary, TQ_SIGNAL(valueChanged(float)),
+ m_rotaryMapper, TQ_SLOT(map()));
rmi = m_rotaries.end();
}
diff --git a/src/gui/editors/parameters/SegmentParameterBox.cpp b/src/gui/editors/parameters/SegmentParameterBox.cpp
index 1b28dc9..b23ee9a 100644
--- a/src/gui/editors/parameters/SegmentParameterBox.cpp
+++ b/src/gui/editors/parameters/SegmentParameterBox.cpp
@@ -96,8 +96,8 @@ SegmentParameterBox::SegmentParameterBox(RosegardenGUIDoc* doc,
m_doc->getComposition().addObserver(this);
- connect(getCommandHistory(), TQT_SIGNAL(commandExecuted()),
- this, TQT_SLOT(update()));
+ connect(getCommandHistory(), TQ_SIGNAL(commandExecuted()),
+ this, TQ_SLOT(update()));
}
SegmentParameterBox::~SegmentParameterBox()
@@ -143,15 +143,15 @@ SegmentParameterBox::initBox()
m_labelButton->setFont(font);
// m_labelButton->setFixedWidth(50);
- connect(m_labelButton, TQT_SIGNAL(released()),
- TQT_SLOT(slotEditSegmentLabel()));
+ connect(m_labelButton, TQ_SIGNAL(released()),
+ TQ_SLOT(slotEditSegmentLabel()));
m_repeatValue = new TristateCheckBox(this);
m_repeatValue->setFont(font);
//m_repeatValue->setFixedHeight(comboHeight);
// handle state changes
- connect(m_repeatValue, TQT_SIGNAL(pressed()), TQT_SLOT(slotRepeatPressed()));
+ connect(m_repeatValue, TQ_SIGNAL(pressed()), TQ_SLOT(slotRepeatPressed()));
// non-reversing motif style read-only combo
m_quantizeValue = new KComboBox(this);
@@ -159,8 +159,8 @@ SegmentParameterBox::initBox()
//m_quantizeValue->setFixedHeight(comboHeight);
// handle quantize changes from drop down
- connect(m_quantizeValue, TQT_SIGNAL(activated(int)),
- TQT_SLOT(slotQuantizeSelected(int)));
+ connect(m_quantizeValue, TQ_SIGNAL(activated(int)),
+ TQ_SLOT(slotQuantizeSelected(int)));
// reversing motif style read-write combo
m_transposeValue = new KComboBox(this);
@@ -168,12 +168,12 @@ SegmentParameterBox::initBox()
//m_transposeValue->setFixedHeight(comboHeight);
// handle transpose combo changes
- connect(m_transposeValue, TQT_SIGNAL(activated(int)),
- TQT_SLOT(slotTransposeSelected(int)));
+ connect(m_transposeValue, TQ_SIGNAL(activated(int)),
+ TQ_SLOT(slotTransposeSelected(int)));
// and text changes
- connect(m_transposeValue, TQT_SIGNAL(textChanged(const TQString&)),
- TQT_SLOT(slotTransposeTextChanged(const TQString&)));
+ connect(m_transposeValue, TQ_SIGNAL(textChanged(const TQString&)),
+ TQ_SLOT(slotTransposeTextChanged(const TQString&)));
// reversing motif style read-write combo
m_delayValue = new KComboBox(this);
@@ -181,16 +181,16 @@ SegmentParameterBox::initBox()
//m_delayValue->setFixedHeight(comboHeight);
// handle delay combo changes
- connect(m_delayValue, TQT_SIGNAL(activated(int)),
- TQT_SLOT(slotDelaySelected(int)));
+ connect(m_delayValue, TQ_SIGNAL(activated(int)),
+ TQ_SLOT(slotDelaySelected(int)));
// Detect when the document colours are updated
- connect(m_doc, TQT_SIGNAL(docColoursChanged()),
- this, TQT_SLOT(slotDocColoursChanged()));
+ connect(m_doc, TQ_SIGNAL(docColoursChanged()),
+ this, TQ_SLOT(slotDocColoursChanged()));
// handle text changes for delay
- connect(m_delayValue, TQT_SIGNAL(textChanged(const TQString&)),
- TQT_SLOT(slotDelayTextChanged(const TQString &)));
+ connect(m_delayValue, TQ_SIGNAL(textChanged(const TQString&)),
+ TQ_SLOT(slotDelayTextChanged(const TQString &)));
// set up combo box for colours
m_colourValue = new KComboBox(false, this);
@@ -200,8 +200,8 @@ SegmentParameterBox::initBox()
m_colourValue->setSizeLimit(20);
// handle colour combo changes
- connect(m_colourValue, TQT_SIGNAL(activated(int)),
- TQT_SLOT(slotColourSelected(int)));
+ connect(m_colourValue, TQ_SIGNAL(activated(int)),
+ TQ_SLOT(slotColourSelected(int)));
// pre-set width of buttons so they don't grow later
// width = fontMetrics.width(i18n("used internally for spacing", "High: ----"));
@@ -214,8 +214,8 @@ SegmentParameterBox::initBox()
// m_highButton->setFont(font);
// m_highButton->setMinimumWidth(width);
-// connect(m_highButton, TQT_SIGNAL(released()),
-// TQT_SLOT(slotHighestPressed()));
+// connect(m_highButton, TQ_SIGNAL(released()),
+// TQ_SLOT(slotHighestPressed()));
// lowest playable note
//
@@ -225,14 +225,14 @@ SegmentParameterBox::initBox()
// m_lowButton->setFont(font);
// m_lowButton->setMinimumWidth(width);
-// connect(m_lowButton, TQT_SIGNAL(released()),
-// TQT_SLOT(slotLowestPressed()));
+// connect(m_lowButton, TQ_SIGNAL(released()),
+// TQ_SLOT(slotLowestPressed()));
// Audio autofade enabled
//
// m_autoFadeBox = new TQCheckBox(this);
-// connect(m_autoFadeBox, TQT_SIGNAL(stateChanged(int)),
-// this, TQT_SLOT(slotAudioFadeChanged(int)));
+// connect(m_autoFadeBox, TQ_SIGNAL(stateChanged(int)),
+// this, TQ_SLOT(slotAudioFadeChanged(int)));
// Fade in and out times
//
@@ -240,15 +240,15 @@ SegmentParameterBox::initBox()
// m_fadeInSpin->setMinValue(0);
// m_fadeInSpin->setMaxValue(5000);
// m_fadeInSpin->setSuffix(i18n(" ms"));
-// connect(m_fadeInSpin, TQT_SIGNAL(valueChanged(int)),
-// this, TQT_SLOT(slotFadeInChanged(int)));
+// connect(m_fadeInSpin, TQ_SIGNAL(valueChanged(int)),
+// this, TQ_SLOT(slotFadeInChanged(int)));
// m_fadeOutSpin = new TQSpinBox(this);
// m_fadeOutSpin->setMinValue(0);
// m_fadeOutSpin->setMaxValue(5000);
// m_fadeOutSpin->setSuffix(i18n(" ms"));
-// connect(m_fadeOutSpin, TQT_SIGNAL(valueChanged(int)),
-// this, TQT_SLOT(slotFadeOutChanged(int)));
+// connect(m_fadeOutSpin, TQ_SIGNAL(valueChanged(int)),
+// this, TQ_SLOT(slotFadeOutChanged(int)));
label->setFont(font);
repeatLabel->setFont(font);
@@ -382,14 +382,14 @@ void
SegmentParameterBox::setDocument(RosegardenGUIDoc* doc)
{
if (m_doc != 0)
- disconnect(m_doc, TQT_SIGNAL(docColoursChanged()),
- this, TQT_SLOT(slotDocColoursChanged()));
+ disconnect(m_doc, TQ_SIGNAL(docColoursChanged()),
+ this, TQ_SLOT(slotDocColoursChanged()));
m_doc = doc;
// Detect when the document colours are updated
- connect (m_doc, TQT_SIGNAL(docColoursChanged()),
- this, TQT_SLOT(slotDocColoursChanged()));
+ connect (m_doc, TQ_SIGNAL(docColoursChanged()),
+ this, TQ_SLOT(slotDocColoursChanged()));
slotDocColoursChanged(); // repopulate combo
}
diff --git a/src/gui/editors/parameters/TrackParameterBox.cpp b/src/gui/editors/parameters/TrackParameterBox.cpp
index e453543..febded0 100644
--- a/src/gui/editors/parameters/TrackParameterBox.cpp
+++ b/src/gui/editors/parameters/TrackParameterBox.cpp
@@ -304,8 +304,8 @@ TrackParameterBox::TrackParameterBox( RosegardenGUIDoc *doc,
groupLayout->addMultiCellWidget(m_transpLbl, row, row, 3, 4, AlignRight);
m_defTranspose = new KComboBox(m_defaultsGroup);
- connect(m_defTranspose, TQT_SIGNAL(activated(int)),
- TQT_SLOT(slotTransposeIndexChanged(int)));
+ connect(m_defTranspose, TQ_SIGNAL(activated(int)),
+ TQ_SLOT(slotTransposeIndexChanged(int)));
int transposeRange = 48;
for (int i = -transposeRange; i < transposeRange + 1; i++) {
@@ -359,43 +359,43 @@ TrackParameterBox::TrackParameterBox( RosegardenGUIDoc *doc,
mainLayout->setRowStretch(mainLayout->numRows() - 1, 1);
// Connections
- connect( m_playDevice, TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(slotPlaybackDeviceChanged(int)));
+ connect( m_playDevice, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(slotPlaybackDeviceChanged(int)));
- connect( m_instrument, TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(slotInstrumentChanged(int)));
+ connect( m_instrument, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(slotInstrumentChanged(int)));
- connect( m_recDevice, TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(slotRecordingDeviceChanged(int)));
+ connect( m_recDevice, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(slotRecordingDeviceChanged(int)));
- connect( m_recChannel, TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(slotRecordingChannelChanged(int)));
+ connect( m_recChannel, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(slotRecordingChannelChanged(int)));
- connect( m_defClef, TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(slotClefChanged(int)));
+ connect( m_defClef, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(slotClefChanged(int)));
// Detect when the document colours are updated
- connect(m_doc, TQT_SIGNAL(docColoursChanged()),
- this, TQT_SLOT(slotDocColoursChanged()));
+ connect(m_doc, TQ_SIGNAL(docColoursChanged()),
+ this, TQ_SLOT(slotDocColoursChanged()));
// handle colour combo changes
- connect(m_defColor, TQT_SIGNAL(activated(int)),
- TQT_SLOT(slotColorChanged(int)));
+ connect(m_defColor, TQ_SIGNAL(activated(int)),
+ TQ_SLOT(slotColorChanged(int)));
- connect(m_highButton, TQT_SIGNAL(released()),
- TQT_SLOT(slotHighestPressed()));
+ connect(m_highButton, TQ_SIGNAL(released()),
+ TQ_SLOT(slotHighestPressed()));
- connect(m_lowButton, TQT_SIGNAL(released()),
- TQT_SLOT(slotLowestPressed()));
+ connect(m_lowButton, TQ_SIGNAL(released()),
+ TQ_SLOT(slotLowestPressed()));
- connect(m_presetButton, TQT_SIGNAL(released()),
- TQT_SLOT(slotPresetPressed()));
+ connect(m_presetButton, TQ_SIGNAL(released()),
+ TQ_SLOT(slotPresetPressed()));
- connect(m_staffSizeCombo, TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(slotStaffSizeChanged(int)));
+ connect(m_staffSizeCombo, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(slotStaffSizeChanged(int)));
- connect(m_staffBracketCombo, TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(slotStaffBracketChanged(int)));
+ connect(m_staffBracketCombo, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(slotStaffBracketChanged(int)));
}
TrackParameterBox::~TrackParameterBox()
diff --git a/src/gui/editors/segment/ControlEditorDialog.cpp b/src/gui/editors/segment/ControlEditorDialog.cpp
index f910299..3c1fcd3 100644
--- a/src/gui/editors/segment/ControlEditorDialog.cpp
+++ b/src/gui/editors/segment/ControlEditorDialog.cpp
@@ -149,20 +149,20 @@ ControlEditorDialog::ControlEditorDialog(TQWidget *parent,
layout->addWidget(m_closeButton);
layout->addSpacing(5);
- connect(m_addButton, TQT_SIGNAL(released()),
- TQT_SLOT(slotAdd()));
+ connect(m_addButton, TQ_SIGNAL(released()),
+ TQ_SLOT(slotAdd()));
- connect(m_deleteButton, TQT_SIGNAL(released()),
- TQT_SLOT(slotDelete()));
+ connect(m_deleteButton, TQ_SIGNAL(released()),
+ TQ_SLOT(slotDelete()));
setupActions();
m_doc->getCommandHistory()->attachView(actionCollection());
- connect(m_doc->getCommandHistory(), TQT_SIGNAL(commandExecuted()),
- this, TQT_SLOT(slotUpdate()));
+ connect(m_doc->getCommandHistory(), TQ_SIGNAL(commandExecuted()),
+ this, TQ_SLOT(slotUpdate()));
- connect(m_listView, TQT_SIGNAL(doubleClicked(TQListViewItem *)),
- TQT_SLOT(slotEdit(TQListViewItem *)));
+ connect(m_listView, TQ_SIGNAL(doubleClicked(TQListViewItem *)),
+ TQ_SLOT(slotEdit(TQListViewItem *)));
// Highlight all columns - enable extended selection mode
//
@@ -336,11 +336,11 @@ void
ControlEditorDialog::setupActions()
{
TDEAction* close = KStdAction::close(this,
- TQT_SLOT(slotClose()),
+ TQ_SLOT(slotClose()),
actionCollection());
m_closeButton->setText(close->text());
- connect(m_closeButton, TQT_SIGNAL(released()), this, TQT_SLOT(slotClose()));
+ connect(m_closeButton, TQ_SIGNAL(released()), this, TQ_SLOT(slotClose()));
// some adjustments
new TDEToolBarPopupAction(i18n("Und&o"),
diff --git a/src/gui/editors/segment/ControlParameterEditDialog.cpp b/src/gui/editors/segment/ControlParameterEditDialog.cpp
index 3c3c76b..1d84837 100644
--- a/src/gui/editors/segment/ControlParameterEditDialog.cpp
+++ b/src/gui/editors/segment/ControlParameterEditDialog.cpp
@@ -112,32 +112,32 @@ ControlParameterEditDialog::ControlParameterEditDialog(
m_ipbPosition = new KComboBox(frame);
layout->addMultiCellWidget(m_ipbPosition, 8, 8, 1, 2);
- connect(m_nameEdit, TQT_SIGNAL(textChanged(const TQString&)),
- TQT_SLOT(slotNameChanged(const TQString&)));
+ connect(m_nameEdit, TQ_SIGNAL(textChanged(const TQString&)),
+ TQ_SLOT(slotNameChanged(const TQString&)));
- connect(m_typeCombo, TQT_SIGNAL(activated(int)),
- TQT_SLOT(slotTypeChanged(int)));
+ connect(m_typeCombo, TQ_SIGNAL(activated(int)),
+ TQ_SLOT(slotTypeChanged(int)));
- connect(m_description, TQT_SIGNAL(textChanged(const TQString&)),
- TQT_SLOT(slotDescriptionChanged(const TQString &)));
+ connect(m_description, TQ_SIGNAL(textChanged(const TQString&)),
+ TQ_SLOT(slotDescriptionChanged(const TQString &)));
- connect(m_controllerBox, TQT_SIGNAL(valueChanged(int)),
- TQT_SLOT(slotControllerChanged(int)));
+ connect(m_controllerBox, TQ_SIGNAL(valueChanged(int)),
+ TQ_SLOT(slotControllerChanged(int)));
- connect(m_minBox, TQT_SIGNAL(valueChanged(int)),
- TQT_SLOT(slotMinChanged(int)));
+ connect(m_minBox, TQ_SIGNAL(valueChanged(int)),
+ TQ_SLOT(slotMinChanged(int)));
- connect(m_maxBox, TQT_SIGNAL(valueChanged(int)),
- TQT_SLOT(slotMaxChanged(int)));
+ connect(m_maxBox, TQ_SIGNAL(valueChanged(int)),
+ TQ_SLOT(slotMaxChanged(int)));
- connect(m_defaultBox, TQT_SIGNAL(valueChanged(int)),
- TQT_SLOT(slotDefaultChanged(int)));
+ connect(m_defaultBox, TQ_SIGNAL(valueChanged(int)),
+ TQ_SLOT(slotDefaultChanged(int)));
- connect(m_colourCombo, TQT_SIGNAL(activated(int)),
- TQT_SLOT(slotColourChanged(int)));
+ connect(m_colourCombo, TQ_SIGNAL(activated(int)),
+ TQ_SLOT(slotColourChanged(int)));
- connect(m_ipbPosition, TQT_SIGNAL(activated(int)),
- TQT_SLOT(slotIPBPositionChanged(int)));
+ connect(m_ipbPosition, TQ_SIGNAL(activated(int)),
+ TQ_SLOT(slotIPBPositionChanged(int)));
//m_nameEdit->selectAll();
//m_description->selectAll();
diff --git a/src/gui/editors/segment/MarkerEditor.cpp b/src/gui/editors/segment/MarkerEditor.cpp
index 058d030..3be2998 100644
--- a/src/gui/editors/segment/MarkerEditor.cpp
+++ b/src/gui/editors/segment/MarkerEditor.cpp
@@ -139,29 +139,29 @@ MarkerEditor::MarkerEditor(TQWidget *parent,
layout->addWidget(m_closeButton);
layout->addSpacing(5);
- connect(m_addButton, TQT_SIGNAL(released()),
- TQT_SLOT(slotAdd()));
+ connect(m_addButton, TQ_SIGNAL(released()),
+ TQ_SLOT(slotAdd()));
- connect(m_deleteButton, TQT_SIGNAL(released()),
- TQT_SLOT(slotDelete()));
+ connect(m_deleteButton, TQ_SIGNAL(released()),
+ TQ_SLOT(slotDelete()));
- connect(m_closeButton, TQT_SIGNAL(released()),
- TQT_SLOT(slotClose()));
+ connect(m_closeButton, TQ_SIGNAL(released()),
+ TQ_SLOT(slotClose()));
- connect(m_deleteAllButton, TQT_SIGNAL(released()),
- TQT_SLOT(slotDeleteAll()));
+ connect(m_deleteAllButton, TQ_SIGNAL(released()),
+ TQ_SLOT(slotDeleteAll()));
setupActions();
m_doc->getCommandHistory()->attachView(actionCollection());
- connect(m_doc->getCommandHistory(), TQT_SIGNAL(commandExecuted()),
- this, TQT_SLOT(slotUpdate()));
+ connect(m_doc->getCommandHistory(), TQ_SIGNAL(commandExecuted()),
+ this, TQ_SLOT(slotUpdate()));
- connect(m_listView, TQT_SIGNAL(doubleClicked(TQListViewItem *)),
- TQT_SLOT(slotEdit(TQListViewItem *)));
+ connect(m_listView, TQ_SIGNAL(doubleClicked(TQListViewItem *)),
+ TQ_SLOT(slotEdit(TQListViewItem *)));
- connect(m_listView, TQT_SIGNAL(pressed(TQListViewItem *)),
- this, TQT_SLOT(slotItemClicked(TQListViewItem *)));
+ connect(m_listView, TQ_SIGNAL(pressed(TQListViewItem *)),
+ this, TQ_SLOT(slotItemClicked(TQListViewItem *)));
// Highlight all columns - enable extended selection mode
//
@@ -366,11 +366,11 @@ void
MarkerEditor::setupActions()
{
TDEAction* close = KStdAction::close(this,
- TQT_SLOT(slotClose()),
+ TQ_SLOT(slotClose()),
actionCollection());
m_closeButton->setText(close->text());
- connect(m_closeButton, TQT_SIGNAL(released()), this, TQT_SLOT(slotClose()));
+ connect(m_closeButton, TQ_SIGNAL(released()), this, TQ_SLOT(slotClose()));
// some adjustments
new TDEToolBarPopupAction(i18n("Und&o"),
@@ -395,7 +395,7 @@ MarkerEditor::setupActions()
TQIconSet icon(pixmap);
action = new TDERadioAction(i18n("&Musical Times"), icon, 0, this,
- TQT_SLOT(slotMusicalTime()),
+ TQ_SLOT(slotMusicalTime()),
actionCollection(), "time_musical");
action->setExclusiveGroup("timeMode");
if (timeMode == 0)
@@ -405,7 +405,7 @@ MarkerEditor::setupActions()
icon = TQIconSet(pixmap);
action = new TDERadioAction(i18n("&Real Times"), icon, 0, this,
- TQT_SLOT(slotRealTime()),
+ TQ_SLOT(slotRealTime()),
actionCollection(), "time_real");
action->setExclusiveGroup("timeMode");
if (timeMode == 1)
@@ -415,7 +415,7 @@ MarkerEditor::setupActions()
icon = TQIconSet(pixmap);
action = new TDERadioAction(i18n("Ra&w Times"), icon, 0, this,
- TQT_SLOT(slotRawTime()),
+ TQ_SLOT(slotRawTime()),
actionCollection(), "time_raw");
action->setExclusiveGroup("timeMode");
if (timeMode == 2)
diff --git a/src/gui/editors/segment/PlayList.cpp b/src/gui/editors/segment/PlayList.cpp
index 877e93b..42cb5bc 100644
--- a/src/gui/editors/segment/PlayList.cpp
+++ b/src/gui/editors/segment/PlayList.cpp
@@ -78,29 +78,29 @@ PlayList::PlayList(TQWidget *parent, const char *name)
m_deleteButton ->setText(i18n("Delete"));
m_clearButton ->setText(i18n("Clear"));
- connect(m_openButton, TQT_SIGNAL(clicked()),
- TQT_SLOT(slotOpenFiles()));
+ connect(m_openButton, TQ_SIGNAL(clicked()),
+ TQ_SLOT(slotOpenFiles()));
- connect(m_playButton, TQT_SIGNAL(clicked()),
- TQT_SLOT(slotPlay()));
+ connect(m_playButton, TQ_SIGNAL(clicked()),
+ TQ_SLOT(slotPlay()));
- connect(m_deleteButton, TQT_SIGNAL(clicked()),
- TQT_SLOT(slotDeleteCurrent()));
+ connect(m_deleteButton, TQ_SIGNAL(clicked()),
+ TQ_SLOT(slotDeleteCurrent()));
- connect(m_clearButton, TQT_SIGNAL(clicked()),
- TQT_SLOT(slotClear()));
+ connect(m_clearButton, TQ_SIGNAL(clicked()),
+ TQ_SLOT(slotClear()));
- connect(m_moveUpButton, TQT_SIGNAL(clicked()),
- TQT_SLOT(slotMoveUp()));
+ connect(m_moveUpButton, TQ_SIGNAL(clicked()),
+ TQ_SLOT(slotMoveUp()));
- connect(m_moveDownButton, TQT_SIGNAL(clicked()),
- TQT_SLOT(slotMoveDown()));
+ connect(m_moveDownButton, TQ_SIGNAL(clicked()),
+ TQ_SLOT(slotMoveDown()));
- connect(m_listView, TQT_SIGNAL(currentChanged(TQListViewItem*)),
- TQT_SLOT(slotCurrentItemChanged(TQListViewItem*)));
+ connect(m_listView, TQ_SIGNAL(currentChanged(TQListViewItem*)),
+ TQ_SLOT(slotCurrentItemChanged(TQListViewItem*)));
- connect(m_listView, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)),
- TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*)));
+ connect(m_listView, TQ_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)),
+ TQ_SLOT(slotDropped(TQDropEvent*, TQListViewItem*)));
restore();
diff --git a/src/gui/editors/segment/TrackButtons.cpp b/src/gui/editors/segment/TrackButtons.cpp
index 98bbb62..cf2ca74 100644
--- a/src/gui/editors/segment/TrackButtons.cpp
+++ b/src/gui/editors/segment/TrackButtons.cpp
@@ -106,18 +106,18 @@ TrackButtons::TrackButtons(RosegardenGUIDoc* doc,
m_layout->addStretch(20);
- connect(m_recordSigMapper, TQT_SIGNAL(mapped(int)),
- this, TQT_SLOT(slotToggleRecordTrack(int)));
+ connect(m_recordSigMapper, TQ_SIGNAL(mapped(int)),
+ this, TQ_SLOT(slotToggleRecordTrack(int)));
- connect(m_muteSigMapper, TQT_SIGNAL(mapped(int)),
- this, TQT_SLOT(slotToggleMutedTrack(int)));
+ connect(m_muteSigMapper, TQ_SIGNAL(mapped(int)),
+ this, TQ_SLOT(slotToggleMutedTrack(int)));
// connect signal mappers
- connect(m_instListSigMapper, TQT_SIGNAL(mapped(int)),
- this, TQT_SLOT(slotInstrumentSelection(int)));
+ connect(m_instListSigMapper, TQ_SIGNAL(mapped(int)),
+ this, TQ_SLOT(slotInstrumentSelection(int)));
- connect(m_clickedSigMapper, TQT_SIGNAL(mapped(int)),
- this, TQT_SIGNAL(trackSelected(int)));
+ connect(m_clickedSigMapper, TQ_SIGNAL(mapped(int)),
+ this, TQ_SIGNAL(trackSelected(int)));
// // Populate instrument popup menu just once at start-up
// //
@@ -767,8 +767,8 @@ TrackButtons::populateInstrumentPopup(Instrument *thisTrackInstr, TQPopupMenu* i
// Connect up the submenu
//
- connect(subMenu, TQT_SIGNAL(activated(int)),
- TQT_SLOT(slotInstrumentPopupActivated(int)));
+ connect(subMenu, TQ_SIGNAL(activated(int)),
+ TQ_SLOT(slotInstrumentPopupActivated(int)));
} else if (!instrUsedByMe) {
@@ -1066,10 +1066,10 @@ TQFrame* TrackButtons::makeButton(Rosegarden::TrackId trackId)
record->off();
// Connect them to their sigmappers
- connect(record, TQT_SIGNAL(stateChanged(bool)),
- m_recordSigMapper, TQT_SLOT(map()));
- connect(mute, TQT_SIGNAL(stateChanged(bool)),
- m_muteSigMapper, TQT_SLOT(map()));
+ connect(record, TQ_SIGNAL(stateChanged(bool)),
+ m_recordSigMapper, TQ_SLOT(map()));
+ connect(mute, TQ_SIGNAL(stateChanged(bool)),
+ m_muteSigMapper, TQ_SLOT(map()));
m_recordSigMapper->setMapping(record, track->getPosition());
m_muteSigMapper->setMapping(mute, track->getPosition());
@@ -1101,8 +1101,8 @@ TQFrame* TrackButtons::makeButton(Rosegarden::TrackId trackId)
trackLabel->setFixedHeight(m_cellSize - buttonGap);
trackLabel->setIndent(7);
- connect(trackLabel, TQT_SIGNAL(renameTrack(TQString, TrackId)),
- TQT_SLOT(slotRenameTrack(TQString, TrackId)));
+ connect(trackLabel, TQ_SIGNAL(renameTrack(TQString, TrackId)),
+ TQ_SLOT(slotRenameTrack(TQString, TrackId)));
// Store the TrackLabel pointer
//
@@ -1111,10 +1111,10 @@ TQFrame* TrackButtons::makeButton(Rosegarden::TrackId trackId)
// Connect it
setButtonMapping(trackLabel, trackId);
- connect(trackLabel, TQT_SIGNAL(changeToInstrumentList()),
- m_instListSigMapper, TQT_SLOT(map()));
- connect(trackLabel, TQT_SIGNAL(clicked()),
- m_clickedSigMapper, TQT_SLOT(map()));
+ connect(trackLabel, TQ_SIGNAL(changeToInstrumentList()),
+ m_instListSigMapper, TQ_SLOT(map()));
+ connect(trackLabel, TQ_SIGNAL(clicked()),
+ m_clickedSigMapper, TQ_SLOT(map()));
//
// instrument label
diff --git a/src/gui/editors/segment/TrackEditor.cpp b/src/gui/editors/segment/TrackEditor.cpp
index e32c4b3..9a76cda 100644
--- a/src/gui/editors/segment/TrackEditor.cpp
+++ b/src/gui/editors/segment/TrackEditor.cpp
@@ -162,10 +162,10 @@ TrackEditor::init(TQWidget* rosegardenguiview)
m_doc->getStudio(),
m_rulerScale, getTrackCellHeight());
- connect(rosegardenguiview, TQT_SIGNAL(instrumentParametersChanged(InstrumentId)),
- m_compositionModel, TQT_SLOT(slotInstrumentParametersChanged(InstrumentId)));
- connect(rosegardenguiview->parent(), TQT_SIGNAL(instrumentParametersChanged(InstrumentId)),
- m_compositionModel, TQT_SLOT(slotInstrumentParametersChanged(InstrumentId)));
+ connect(rosegardenguiview, TQ_SIGNAL(instrumentParametersChanged(InstrumentId)),
+ m_compositionModel, TQ_SLOT(slotInstrumentParametersChanged(InstrumentId)));
+ connect(rosegardenguiview->parent(), TQ_SIGNAL(instrumentParametersChanged(InstrumentId)),
+ m_compositionModel, TQ_SLOT(slotInstrumentParametersChanged(InstrumentId)));
m_segmentCanvas = new CompositionView(m_doc, m_compositionModel, this);
@@ -221,105 +221,105 @@ TrackEditor::init(TQWidget* rosegardenguiview)
m_trackButtonScroll->setBottomMargin(m_bottomStandardRuler->height() +
m_segmentCanvas->horizontalScrollBar()->height());
- connect(m_trackButtons, TQT_SIGNAL(widthChanged()),
- this, TQT_SLOT(slotTrackButtonsWidthChanged()));
+ connect(m_trackButtons, TQ_SIGNAL(widthChanged()),
+ this, TQ_SLOT(slotTrackButtonsWidthChanged()));
- connect(m_trackButtons, TQT_SIGNAL(trackSelected(int)),
- rosegardenguiview, TQT_SLOT(slotSelectTrackSegments(int)));
+ connect(m_trackButtons, TQ_SIGNAL(trackSelected(int)),
+ rosegardenguiview, TQ_SLOT(slotSelectTrackSegments(int)));
- connect(m_trackButtons, TQT_SIGNAL(instrumentSelected(int)),
- rosegardenguiview, TQT_SLOT(slotUpdateInstrumentParameterBox(int)));
+ connect(m_trackButtons, TQ_SIGNAL(instrumentSelected(int)),
+ rosegardenguiview, TQ_SLOT(slotUpdateInstrumentParameterBox(int)));
- connect(this, TQT_SIGNAL(stateChange(TQString, bool)),
- rosegardenguiview, TQT_SIGNAL(stateChange(TQString, bool)));
+ connect(this, TQ_SIGNAL(stateChange(TQString, bool)),
+ rosegardenguiview, TQ_SIGNAL(stateChange(TQString, bool)));
- connect(m_trackButtons, TQT_SIGNAL(modified()),
- m_doc, TQT_SLOT(slotDocumentModified()));
+ connect(m_trackButtons, TQ_SIGNAL(modified()),
+ m_doc, TQ_SLOT(slotDocumentModified()));
- connect(m_trackButtons, TQT_SIGNAL(muteButton(TrackId, bool)),
- rosegardenguiview, TQT_SLOT(slotSetMuteButton(TrackId, bool)));
+ connect(m_trackButtons, TQ_SIGNAL(muteButton(TrackId, bool)),
+ rosegardenguiview, TQ_SLOT(slotSetMuteButton(TrackId, bool)));
// connect loop rulers' follow-scroll signals
- connect(m_topStandardRuler->getLoopRuler(), TQT_SIGNAL(startMouseMove(int)),
- m_segmentCanvas, TQT_SLOT(startAutoScroll(int)));
- connect(m_topStandardRuler->getLoopRuler(), TQT_SIGNAL(stopMouseMove()),
- m_segmentCanvas, TQT_SLOT(stopAutoScroll()));
- connect(m_bottomStandardRuler->getLoopRuler(), TQT_SIGNAL(startMouseMove(int)),
- m_segmentCanvas, TQT_SLOT(startAutoScroll(int)));
- connect(m_bottomStandardRuler->getLoopRuler(), TQT_SIGNAL(stopMouseMove()),
- m_segmentCanvas, TQT_SLOT(stopAutoScroll()));
-
- connect(m_segmentCanvas, TQT_SIGNAL(contentsMoving(int, int)),
- this, TQT_SLOT(slotCanvasScrolled(int, int)));
+ connect(m_topStandardRuler->getLoopRuler(), TQ_SIGNAL(startMouseMove(int)),
+ m_segmentCanvas, TQ_SLOT(startAutoScroll(int)));
+ connect(m_topStandardRuler->getLoopRuler(), TQ_SIGNAL(stopMouseMove()),
+ m_segmentCanvas, TQ_SLOT(stopAutoScroll()));
+ connect(m_bottomStandardRuler->getLoopRuler(), TQ_SIGNAL(startMouseMove(int)),
+ m_segmentCanvas, TQ_SLOT(startAutoScroll(int)));
+ connect(m_bottomStandardRuler->getLoopRuler(), TQ_SIGNAL(stopMouseMove()),
+ m_segmentCanvas, TQ_SLOT(stopAutoScroll()));
+
+ connect(m_segmentCanvas, TQ_SIGNAL(contentsMoving(int, int)),
+ this, TQ_SLOT(slotCanvasScrolled(int, int)));
// Synchronize bar buttons' scrollview with segment canvas' scrollbar
//
- connect(m_segmentCanvas->verticalScrollBar(), TQT_SIGNAL(valueChanged(int)),
- this, TQT_SLOT(slotVerticalScrollTrackButtons(int)));
+ connect(m_segmentCanvas->verticalScrollBar(), TQ_SIGNAL(valueChanged(int)),
+ this, TQ_SLOT(slotVerticalScrollTrackButtons(int)));
- connect(m_segmentCanvas->verticalScrollBar(), TQT_SIGNAL(sliderMoved(int)),
- this, TQT_SLOT(slotVerticalScrollTrackButtons(int)));
+ connect(m_segmentCanvas->verticalScrollBar(), TQ_SIGNAL(sliderMoved(int)),
+ this, TQ_SLOT(slotVerticalScrollTrackButtons(int)));
// scrolling with mouse wheel
- connect(m_trackButtonScroll, TQT_SIGNAL(gotWheelEvent(TQWheelEvent*)),
- m_segmentCanvas, TQT_SLOT(slotExternalWheelEvent(TQWheelEvent*)));
+ connect(m_trackButtonScroll, TQ_SIGNAL(gotWheelEvent(TQWheelEvent*)),
+ m_segmentCanvas, TQ_SLOT(slotExternalWheelEvent(TQWheelEvent*)));
// Connect horizontal scrollbar
//
- connect(m_segmentCanvas->horizontalScrollBar(), TQT_SIGNAL(valueChanged(int)),
- m_topStandardRuler, TQT_SLOT(slotScrollHoriz(int)));
- connect(m_segmentCanvas->horizontalScrollBar(), TQT_SIGNAL(sliderMoved(int)),
- m_topStandardRuler, TQT_SLOT(slotScrollHoriz(int)));
+ connect(m_segmentCanvas->horizontalScrollBar(), TQ_SIGNAL(valueChanged(int)),
+ m_topStandardRuler, TQ_SLOT(slotScrollHoriz(int)));
+ connect(m_segmentCanvas->horizontalScrollBar(), TQ_SIGNAL(sliderMoved(int)),
+ m_topStandardRuler, TQ_SLOT(slotScrollHoriz(int)));
- connect(m_segmentCanvas->horizontalScrollBar(), TQT_SIGNAL(valueChanged(int)),
- m_bottomStandardRuler, TQT_SLOT(slotScrollHoriz(int)));
- connect(m_segmentCanvas->horizontalScrollBar(), TQT_SIGNAL(sliderMoved(int)),
- m_bottomStandardRuler, TQT_SLOT(slotScrollHoriz(int)));
+ connect(m_segmentCanvas->horizontalScrollBar(), TQ_SIGNAL(valueChanged(int)),
+ m_bottomStandardRuler, TQ_SLOT(slotScrollHoriz(int)));
+ connect(m_segmentCanvas->horizontalScrollBar(), TQ_SIGNAL(sliderMoved(int)),
+ m_bottomStandardRuler, TQ_SLOT(slotScrollHoriz(int)));
- connect(m_segmentCanvas->horizontalScrollBar(), TQT_SIGNAL(valueChanged(int)),
- m_tempoRuler, TQT_SLOT(slotScrollHoriz(int)));
- connect(m_segmentCanvas->horizontalScrollBar(), TQT_SIGNAL(sliderMoved(int)),
- m_tempoRuler, TQT_SLOT(slotScrollHoriz(int)));
+ connect(m_segmentCanvas->horizontalScrollBar(), TQ_SIGNAL(valueChanged(int)),
+ m_tempoRuler, TQ_SLOT(slotScrollHoriz(int)));
+ connect(m_segmentCanvas->horizontalScrollBar(), TQ_SIGNAL(sliderMoved(int)),
+ m_tempoRuler, TQ_SLOT(slotScrollHoriz(int)));
- connect(m_segmentCanvas->horizontalScrollBar(), TQT_SIGNAL(valueChanged(int)),
- m_chordNameRuler, TQT_SLOT(slotScrollHoriz(int)));
- connect(m_segmentCanvas->horizontalScrollBar(), TQT_SIGNAL(sliderMoved(int)),
- m_chordNameRuler, TQT_SLOT(slotScrollHoriz(int)));
+ connect(m_segmentCanvas->horizontalScrollBar(), TQ_SIGNAL(valueChanged(int)),
+ m_chordNameRuler, TQ_SLOT(slotScrollHoriz(int)));
+ connect(m_segmentCanvas->horizontalScrollBar(), TQ_SIGNAL(sliderMoved(int)),
+ m_chordNameRuler, TQ_SLOT(slotScrollHoriz(int)));
- connect(this, TQT_SIGNAL(needUpdate()), m_segmentCanvas, TQT_SLOT(slotUpdateSegmentsDrawBuffer()));
+ connect(this, TQ_SIGNAL(needUpdate()), m_segmentCanvas, TQ_SLOT(slotUpdateSegmentsDrawBuffer()));
connect(m_segmentCanvas->getModel(),
- TQT_SIGNAL(selectedSegments(const SegmentSelection &)),
+ TQ_SIGNAL(selectedSegments(const SegmentSelection &)),
rosegardenguiview,
- TQT_SLOT(slotSelectedSegments(const SegmentSelection &)));
+ TQ_SLOT(slotSelectedSegments(const SegmentSelection &)));
- connect(m_segmentCanvas, TQT_SIGNAL(zoomIn()),
- RosegardenGUIApp::self(), TQT_SLOT(slotZoomIn()));
- connect(m_segmentCanvas, TQT_SIGNAL(zoomOut()),
- RosegardenGUIApp::self(), TQT_SLOT(slotZoomOut()));
+ connect(m_segmentCanvas, TQ_SIGNAL(zoomIn()),
+ RosegardenGUIApp::self(), TQ_SLOT(slotZoomIn()));
+ connect(m_segmentCanvas, TQ_SIGNAL(zoomOut()),
+ RosegardenGUIApp::self(), TQ_SLOT(slotZoomOut()));
- connect(getCommandHistory(), TQT_SIGNAL(commandExecuted()),
- this, TQT_SLOT(update()));
+ connect(getCommandHistory(), TQ_SIGNAL(commandExecuted()),
+ this, TQ_SLOT(update()));
- connect(m_doc, TQT_SIGNAL(pointerPositionChanged(timeT)),
- this, TQT_SLOT(slotSetPointerPosition(timeT)));
+ connect(m_doc, TQ_SIGNAL(pointerPositionChanged(timeT)),
+ this, TQ_SLOT(slotSetPointerPosition(timeT)));
//
// pointer and loop drag signals from top and bottom bar buttons (loop rulers actually)
//
- connect(m_topStandardRuler, TQT_SIGNAL(dragPointerToPosition(timeT)),
- this, TQT_SLOT(slotPointerDraggedToPosition(timeT)));
- connect(m_bottomStandardRuler, TQT_SIGNAL(dragPointerToPosition(timeT)),
- this, TQT_SLOT(slotPointerDraggedToPosition(timeT)));
+ connect(m_topStandardRuler, TQ_SIGNAL(dragPointerToPosition(timeT)),
+ this, TQ_SLOT(slotPointerDraggedToPosition(timeT)));
+ connect(m_bottomStandardRuler, TQ_SIGNAL(dragPointerToPosition(timeT)),
+ this, TQ_SLOT(slotPointerDraggedToPosition(timeT)));
- connect(m_topStandardRuler, TQT_SIGNAL(dragLoopToPosition(timeT)),
- this, TQT_SLOT(slotLoopDraggedToPosition(timeT)));
- connect(m_bottomStandardRuler, TQT_SIGNAL(dragLoopToPosition(timeT)),
- this, TQT_SLOT(slotLoopDraggedToPosition(timeT)));
+ connect(m_topStandardRuler, TQ_SIGNAL(dragLoopToPosition(timeT)),
+ this, TQ_SLOT(slotLoopDraggedToPosition(timeT)));
+ connect(m_bottomStandardRuler, TQ_SIGNAL(dragLoopToPosition(timeT)),
+ this, TQ_SLOT(slotLoopDraggedToPosition(timeT)));
- connect(m_doc, TQT_SIGNAL(loopChanged(timeT,
+ connect(m_doc, TQ_SIGNAL(loopChanged(timeT,
timeT)),
- this, TQT_SLOT(slotSetLoop(timeT, timeT)));
+ this, TQ_SLOT(slotSetLoop(timeT, timeT)));
}
void TrackEditor::slotReadjustCanvasSize()
@@ -756,7 +756,7 @@ void TrackEditor::dropEvent(TQDropEvent* event)
// WARNING
//
// DO NOT PERFORM ANY OPERATIONS AFTER THAT
- // EMITTING THIS TQT_SIGNAL TRIGGERS THE LOADING OF A NEW DOCUMENT
+ // EMITTING THIS TQ_SIGNAL TRIGGERS THE LOADING OF A NEW DOCUMENT
// AND AS A CONSEQUENCE THE DELETION OF THIS TrackEditor OBJECT
//
} else {
diff --git a/src/gui/editors/segment/TrackLabel.cpp b/src/gui/editors/segment/TrackLabel.cpp
index 123d91a..d0b6f5e 100644
--- a/src/gui/editors/segment/TrackLabel.cpp
+++ b/src/gui/editors/segment/TrackLabel.cpp
@@ -68,8 +68,8 @@ TrackLabel::TrackLabel(TrackId id,
m_pressTimer = new TQTimer(this);
- connect(m_pressTimer, TQT_SIGNAL(timeout()),
- this, TQT_SIGNAL(changeToInstrumentList()));
+ connect(m_pressTimer, TQ_SIGNAL(timeout()),
+ this, TQ_SIGNAL(changeToInstrumentList()));
TQToolTip::add
(this, i18n("Click and hold with left mouse button to assign this Track to an Instrument."));
diff --git a/src/gui/editors/segment/TriggerSegmentManager.cpp b/src/gui/editors/segment/TriggerSegmentManager.cpp
index cb343d9..d086a18 100644
--- a/src/gui/editors/segment/TriggerSegmentManager.cpp
+++ b/src/gui/editors/segment/TriggerSegmentManager.cpp
@@ -133,29 +133,29 @@ TriggerSegmentManager::TriggerSegmentManager(TQWidget *parent,
layout->addWidget(m_closeButton);
layout->addSpacing(5);
- connect(m_addButton, TQT_SIGNAL(released()),
- TQT_SLOT(slotAdd()));
+ connect(m_addButton, TQ_SIGNAL(released()),
+ TQ_SLOT(slotAdd()));
- connect(m_deleteButton, TQT_SIGNAL(released()),
- TQT_SLOT(slotDelete()));
+ connect(m_deleteButton, TQ_SIGNAL(released()),
+ TQ_SLOT(slotDelete()));
- connect(m_closeButton, TQT_SIGNAL(released()),
- TQT_SLOT(slotClose()));
+ connect(m_closeButton, TQ_SIGNAL(released()),
+ TQ_SLOT(slotClose()));
- connect(m_deleteAllButton, TQT_SIGNAL(released()),
- TQT_SLOT(slotDeleteAll()));
+ connect(m_deleteAllButton, TQ_SIGNAL(released()),
+ TQ_SLOT(slotDeleteAll()));
setupActions();
m_doc->getCommandHistory()->attachView(actionCollection());
- connect(m_doc->getCommandHistory(), TQT_SIGNAL(commandExecuted()),
- this, TQT_SLOT(slotUpdate()));
+ connect(m_doc->getCommandHistory(), TQ_SIGNAL(commandExecuted()),
+ this, TQ_SLOT(slotUpdate()));
- connect(m_listView, TQT_SIGNAL(doubleClicked(TQListViewItem *)),
- TQT_SLOT(slotEdit(TQListViewItem *)));
+ connect(m_listView, TQ_SIGNAL(doubleClicked(TQListViewItem *)),
+ TQ_SLOT(slotEdit(TQListViewItem *)));
- connect(m_listView, TQT_SIGNAL(pressed(TQListViewItem *)),
- this, TQT_SLOT(slotItemClicked(TQListViewItem *)));
+ connect(m_listView, TQ_SIGNAL(pressed(TQListViewItem *)),
+ this, TQ_SLOT(slotItemClicked(TQListViewItem *)));
// Highlight all columns - enable extended selection mode
//
@@ -374,11 +374,11 @@ void
TriggerSegmentManager::setupActions()
{
TDEAction* close = KStdAction::close(this,
- TQT_SLOT(slotClose()),
+ TQ_SLOT(slotClose()),
actionCollection());
m_closeButton->setText(close->text());
- connect(m_closeButton, TQT_SIGNAL(released()), this, TQT_SLOT(slotClose()));
+ connect(m_closeButton, TQ_SIGNAL(released()), this, TQ_SLOT(slotClose()));
TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
@@ -396,7 +396,7 @@ TriggerSegmentManager::setupActions()
KStdAction::stdName(KStdAction::Redo));
new TDEAction(i18n("Pa&ste as New Triggered Segment"), CTRL + SHIFT + Key_V, this,
- TQT_SLOT(slotPasteAsNew()), actionCollection(),
+ TQ_SLOT(slotPasteAsNew()), actionCollection(),
"paste_to_trigger_segment");
kapp->config()->setGroup(TriggerManagerConfigGroup);
@@ -408,7 +408,7 @@ TriggerSegmentManager::setupActions()
TQIconSet icon(pixmap);
action = new TDERadioAction(i18n("&Musical Times"), icon, 0, this,
- TQT_SLOT(slotMusicalTime()),
+ TQ_SLOT(slotMusicalTime()),
actionCollection(), "time_musical");
action->setExclusiveGroup("timeMode");
if (timeMode == 0)
@@ -418,7 +418,7 @@ TriggerSegmentManager::setupActions()
icon = TQIconSet(pixmap);
action = new TDERadioAction(i18n("&Real Times"), icon, 0, this,
- TQT_SLOT(slotRealTime()),
+ TQ_SLOT(slotRealTime()),
actionCollection(), "time_real");
action->setExclusiveGroup("timeMode");
if (timeMode == 1)
@@ -428,7 +428,7 @@ TriggerSegmentManager::setupActions()
icon = TQIconSet(pixmap);
action = new TDERadioAction(i18n("Ra&w Times"), icon, 0, this,
- TQT_SLOT(slotRawTime()),
+ TQ_SLOT(slotRawTime()),
actionCollection(), "time_raw");
action->setExclusiveGroup("timeMode");
if (timeMode == 2)
diff --git a/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.cpp b/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.cpp
index a30f33d..f85c45e 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.cpp
+++ b/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.cpp
@@ -449,8 +449,8 @@ void CompositionModelImpl::updatePreviewCacheForAudioSegment(const Segment* segm
AudioPreviewUpdater *updater = new AudioPreviewUpdater
(*m_audioPreviewThread, m_composition, segment, segRect, this);
- connect(updater, TQT_SIGNAL(audioPreviewComplete(AudioPreviewUpdater*)),
- this, TQT_SLOT(slotAudioPreviewComplete(AudioPreviewUpdater*)));
+ connect(updater, TQ_SIGNAL(audioPreviewComplete(AudioPreviewUpdater*)),
+ this, TQ_SLOT(slotAudioPreviewComplete(AudioPreviewUpdater*)));
m_audioPreviewUpdaterMap[segment] = updater;
diff --git a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
index 445fc33..0e055a2 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
+++ b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
@@ -130,8 +130,8 @@ CompositionView::CompositionView(RosegardenGUIDoc* doc,
if (doc) {
m_toolBox = new SegmentToolBox(this, doc);
- connect(m_toolBox, TQT_SIGNAL(showContextHelp(const TQString &)),
- this, TQT_SLOT(slotToolHelpChanged(const TQString &)));
+ connect(m_toolBox, TQ_SIGNAL(showContextHelp(const TQString &)),
+ this, TQ_SLOT(slotToolHelpChanged(const TQString &)));
}
setDragAutoScroll(true);
@@ -144,43 +144,43 @@ CompositionView::CompositionView(RosegardenGUIDoc* doc,
TQScrollBar* hsb = horizontalScrollBar();
// dynamically adjust content size when scrolling past current composition's end
- connect(hsb, TQT_SIGNAL(nextLine()),
- this, TQT_SLOT(scrollRight()));
- connect(hsb, TQT_SIGNAL(prevLine()),
- this, TQT_SLOT(scrollLeft()));
-
- // connect(this, TQT_SIGNAL(contentsMoving(int, int)),
- // this, TQT_SLOT(slotAllDrawBuffersNeedRefresh()));
-
- // connect(this, TQT_SIGNAL(contentsMoving(int, int)),
- // this, TQT_SLOT(slotContentsMoving(int, int)));
-
- connect(model, TQT_SIGNAL(needContentUpdate()),
- this, TQT_SLOT(slotUpdateSegmentsDrawBuffer()));
- connect(model, TQT_SIGNAL(needContentUpdate(const TQRect&)),
- this, TQT_SLOT(slotUpdateSegmentsDrawBuffer(const TQRect&)));
- connect(model, TQT_SIGNAL(needArtifactsUpdate()),
- this, TQT_SLOT(slotArtifactsDrawBufferNeedsRefresh()));
- connect(model, TQT_SIGNAL(needSizeUpdate()),
- this, TQT_SLOT(slotUpdateSize()));
+ connect(hsb, TQ_SIGNAL(nextLine()),
+ this, TQ_SLOT(scrollRight()));
+ connect(hsb, TQ_SIGNAL(prevLine()),
+ this, TQ_SLOT(scrollLeft()));
+
+ // connect(this, TQ_SIGNAL(contentsMoving(int, int)),
+ // this, TQ_SLOT(slotAllDrawBuffersNeedRefresh()));
+
+ // connect(this, TQ_SIGNAL(contentsMoving(int, int)),
+ // this, TQ_SLOT(slotContentsMoving(int, int)));
+
+ connect(model, TQ_SIGNAL(needContentUpdate()),
+ this, TQ_SLOT(slotUpdateSegmentsDrawBuffer()));
+ connect(model, TQ_SIGNAL(needContentUpdate(const TQRect&)),
+ this, TQ_SLOT(slotUpdateSegmentsDrawBuffer(const TQRect&)));
+ connect(model, TQ_SIGNAL(needArtifactsUpdate()),
+ this, TQ_SLOT(slotArtifactsDrawBufferNeedsRefresh()));
+ connect(model, TQ_SIGNAL(needSizeUpdate()),
+ this, TQ_SLOT(slotUpdateSize()));
if (doc) {
- connect(doc, TQT_SIGNAL(docColoursChanged()),
- this, TQT_SLOT(slotRefreshColourCache()));
+ connect(doc, TQ_SIGNAL(docColoursChanged()),
+ this, TQ_SLOT(slotRefreshColourCache()));
// recording-related signals
- connect(doc, TQT_SIGNAL(newMIDIRecordingSegment(Segment*)),
- this, TQT_SLOT(slotNewMIDIRecordingSegment(Segment*)));
- connect(doc, TQT_SIGNAL(newAudioRecordingSegment(Segment*)),
- this, TQT_SLOT(slotNewAudioRecordingSegment(Segment*)));
- // connect(doc, TQT_SIGNAL(recordMIDISegmentUpdated(Segment*, timeT)),
- // this, TQT_SLOT(slotRecordMIDISegmentUpdated(Segment*, timeT)));
- connect(doc, TQT_SIGNAL(stoppedAudioRecording()),
- this, TQT_SLOT(slotStoppedRecording()));
- connect(doc, TQT_SIGNAL(stoppedMIDIRecording()),
- this, TQT_SLOT(slotStoppedRecording()));
- connect(doc, TQT_SIGNAL(audioFileFinalized(Segment*)),
- getModel(), TQT_SLOT(slotAudioFileFinalized(Segment*)));
+ connect(doc, TQ_SIGNAL(newMIDIRecordingSegment(Segment*)),
+ this, TQ_SLOT(slotNewMIDIRecordingSegment(Segment*)));
+ connect(doc, TQ_SIGNAL(newAudioRecordingSegment(Segment*)),
+ this, TQ_SLOT(slotNewAudioRecordingSegment(Segment*)));
+ // connect(doc, TQ_SIGNAL(recordMIDISegmentUpdated(Segment*, timeT)),
+ // this, TQ_SLOT(slotRecordMIDISegmentUpdated(Segment*, timeT)));
+ connect(doc, TQ_SIGNAL(stoppedAudioRecording()),
+ this, TQ_SLOT(slotStoppedRecording()));
+ connect(doc, TQ_SIGNAL(stoppedMIDIRecording()),
+ this, TQ_SLOT(slotStoppedRecording()));
+ connect(doc, TQ_SIGNAL(audioFileFinalized(Segment*)),
+ getModel(), TQ_SLOT(slotAudioFileFinalized(Segment*)));
}
CompositionModelImpl* cmi = dynamic_cast<CompositionModelImpl*>(model);
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentMover.cpp b/src/gui/editors/segment/segmentcanvas/SegmentMover.cpp
index ae2c2aa..0ea6a03 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentMover.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentMover.cpp
@@ -61,15 +61,15 @@ SegmentMover::SegmentMover(CompositionView *c, RosegardenGUIDoc *d)
void SegmentMover::ready()
{
m_canvas->viewport()->setCursor(TQt::sizeAllCursor);
- connect(m_canvas, TQT_SIGNAL(contentsMoving (int, int)),
- this, TQT_SLOT(slotCanvasScrolled(int, int)));
+ connect(m_canvas, TQ_SIGNAL(contentsMoving (int, int)),
+ this, TQ_SLOT(slotCanvasScrolled(int, int)));
setBasicContextHelp();
}
void SegmentMover::stow()
{
- disconnect(m_canvas, TQT_SIGNAL(contentsMoving (int, int)),
- this, TQT_SLOT(slotCanvasScrolled(int, int)));
+ disconnect(m_canvas, TQ_SIGNAL(contentsMoving (int, int)),
+ this, TQ_SLOT(slotCanvasScrolled(int, int)));
}
void SegmentMover::slotCanvasScrolled(int newX, int newY)
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentPencil.cpp b/src/gui/editors/segment/segmentcanvas/SegmentPencil.cpp
index 38bdf31..6eb58bc 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentPencil.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentPencil.cpp
@@ -63,15 +63,15 @@ SegmentPencil::SegmentPencil(CompositionView *c, RosegardenGUIDoc *d)
void SegmentPencil::ready()
{
m_canvas->viewport()->setCursor(TQt::ibeamCursor);
- connect(m_canvas, TQT_SIGNAL(contentsMoving (int, int)),
- this, TQT_SLOT(slotCanvasScrolled(int, int)));
+ connect(m_canvas, TQ_SIGNAL(contentsMoving (int, int)),
+ this, TQ_SLOT(slotCanvasScrolled(int, int)));
setContextHelpFor(TQPoint(0, 0));
}
void SegmentPencil::stow()
{
- disconnect(m_canvas, TQT_SIGNAL(contentsMoving (int, int)),
- this, TQT_SLOT(slotCanvasScrolled(int, int)));
+ disconnect(m_canvas, TQ_SIGNAL(contentsMoving (int, int)),
+ this, TQ_SLOT(slotCanvasScrolled(int, int)));
}
void SegmentPencil::slotCanvasScrolled(int newX, int newY)
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentResizer.cpp b/src/gui/editors/segment/segmentcanvas/SegmentResizer.cpp
index 505ce3e..4b3406f 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentResizer.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentResizer.cpp
@@ -68,15 +68,15 @@ SegmentResizer::SegmentResizer(CompositionView *c, RosegardenGUIDoc *d,
void SegmentResizer::ready()
{
m_canvas->viewport()->setCursor(TQt::sizeHorCursor);
- connect(m_canvas, TQT_SIGNAL(contentsMoving (int, int)),
- this, TQT_SLOT(slotCanvasScrolled(int, int)));
+ connect(m_canvas, TQ_SIGNAL(contentsMoving (int, int)),
+ this, TQ_SLOT(slotCanvasScrolled(int, int)));
setBasicContextHelp(false);
}
void SegmentResizer::stow()
{
- disconnect(m_canvas, TQT_SIGNAL(contentsMoving (int, int)),
- this, TQT_SLOT(slotCanvasScrolled(int, int)));
+ disconnect(m_canvas, TQ_SIGNAL(contentsMoving (int, int)),
+ this, TQ_SLOT(slotCanvasScrolled(int, int)));
}
void SegmentResizer::slotCanvasScrolled(int newX, int newY)
@@ -177,10 +177,10 @@ void SegmentResizer::handleMouseButtonRelease(TQMouseEvent *e)
progressDlg.setLabel(i18n("Generating audio preview..."));
command->disconnectProgressDialog(&progressDlg);
- connect(&m_doc->getAudioFileManager(), TQT_SIGNAL(setProgress(int)),
- progressDlg.progressBar(), TQT_SLOT(setValue(int)));
- connect(&progressDlg, TQT_SIGNAL(cancelClicked()),
- &m_doc->getAudioFileManager(), TQT_SLOT(slotStopPreview()));
+ connect(&m_doc->getAudioFileManager(), TQ_SIGNAL(setProgress(int)),
+ progressDlg.progressBar(), TQ_SLOT(setValue(int)));
+ connect(&progressDlg, TQ_SIGNAL(cancelClicked()),
+ &m_doc->getAudioFileManager(), TQ_SLOT(slotStopPreview()));
int fid = command->getNewAudioFileId();
if (fid >= 0) {
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp b/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp
index cb20975..a15a6c9 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp
@@ -74,8 +74,8 @@ SegmentSelector::~SegmentSelector()
void SegmentSelector::ready()
{
m_canvas->viewport()->setCursor(TQt::arrowCursor);
- connect(m_canvas, TQT_SIGNAL(contentsMoving (int, int)),
- this, TQT_SLOT(slotCanvasScrolled(int, int)));
+ connect(m_canvas, TQ_SIGNAL(contentsMoving (int, int)),
+ this, TQ_SLOT(slotCanvasScrolled(int, int)));
setContextHelp(i18n("Click and drag to select segments"));
}
diff --git a/src/gui/editors/tempo/TempoView.cpp b/src/gui/editors/tempo/TempoView.cpp
index 30381db..1ce55ad 100644
--- a/src/gui/editors/tempo/TempoView.cpp
+++ b/src/gui/editors/tempo/TempoView.cpp
@@ -92,8 +92,8 @@ TempoView::TempoView(RosegardenGUIDoc *doc, TQWidget *parent, timeT openTime):
// Connect up
//
- connect(m_filterGroup, TQT_SIGNAL(released(int)),
- TQT_SLOT(slotModifyFilter(int)));
+ connect(m_filterGroup, TQ_SIGNAL(released(int)),
+ TQ_SLOT(slotModifyFilter(int)));
m_list = new TDEListView(getCentralWidget());
m_list->setItemsRenameable(true);
@@ -106,8 +106,8 @@ TempoView::TempoView(RosegardenGUIDoc *doc, TQWidget *parent, timeT openTime):
// Connect double clicker
//
- connect(m_list, TQT_SIGNAL(doubleClicked(TQListViewItem*)),
- TQT_SLOT(slotPopupEditor(TQListViewItem*)));
+ connect(m_list, TQ_SIGNAL(doubleClicked(TQListViewItem*)),
+ TQ_SLOT(slotPopupEditor(TQListViewItem*)));
m_list->setAllColumnsShowFocus(true);
m_list->setSelectionMode(TQListView::Extended);
@@ -487,12 +487,12 @@ TempoView::slotEditInsertTempo()
dialog.setTempoPosition(insertTime);
connect(&dialog,
- TQT_SIGNAL(changeTempo(timeT,
+ TQ_SIGNAL(changeTempo(timeT,
tempoT,
tempoT,
TempoDialog::TempoDialogAction)),
this,
- TQT_SIGNAL(changeTempo(timeT,
+ TQ_SIGNAL(changeTempo(timeT,
tempoT,
tempoT,
TempoDialog::TempoDialogAction)));
@@ -577,36 +577,36 @@ TempoView::setupActions()
TQIconSet icon(TQPixmap(pixmapDir + "/toolbar/event-insert-tempo.png"));
new TDEAction(AddTempoChangeCommand::getGlobalName(), icon, Key_I, this,
- TQT_SLOT(slotEditInsertTempo()), actionCollection(),
+ TQ_SLOT(slotEditInsertTempo()), actionCollection(),
"insert_tempo");
TQCanvasPixmap pixmap(pixmapDir + "/toolbar/event-insert-timesig.png");
icon = TQIconSet(pixmap);
new TDEAction(AddTimeSignatureCommand::getGlobalName(), icon, Key_G, this,
- TQT_SLOT(slotEditInsertTimeSignature()), actionCollection(),
+ TQ_SLOT(slotEditInsertTimeSignature()), actionCollection(),
"insert_timesig");
pixmap.load(pixmapDir + "/toolbar/event-delete.png");
icon = TQIconSet(pixmap);
new TDEAction(i18n("&Delete"), icon, Key_Delete, this,
- TQT_SLOT(slotEditDelete()), actionCollection(),
+ TQ_SLOT(slotEditDelete()), actionCollection(),
"delete");
pixmap.load(pixmapDir + "/toolbar/event-edit.png");
icon = TQIconSet(pixmap);
new TDEAction(i18n("&Edit Item"), icon, Key_E, this,
- TQT_SLOT(slotEdit()), actionCollection(),
+ TQ_SLOT(slotEdit()), actionCollection(),
"edit");
new TDEAction(i18n("Select &All"), 0, this,
- TQT_SLOT(slotSelectAll()), actionCollection(),
+ TQ_SLOT(slotSelectAll()), actionCollection(),
"select_all");
new TDEAction(i18n("Clear Selection"), Key_Escape, this,
- TQT_SLOT(slotClearSelection()), actionCollection(),
+ TQ_SLOT(slotClearSelection()), actionCollection(),
"clear_selection");
m_config->setGroup(TempoViewConfigGroup);
@@ -618,7 +618,7 @@ TempoView::setupActions()
icon = TQIconSet(pixmap);
action = new TDERadioAction(i18n("&Musical Times"), icon, 0, this,
- TQT_SLOT(slotMusicalTime()),
+ TQ_SLOT(slotMusicalTime()),
actionCollection(), "time_musical");
action->setExclusiveGroup("timeMode");
if (timeMode == 0)
@@ -628,7 +628,7 @@ TempoView::setupActions()
icon = TQIconSet(pixmap);
action = new TDERadioAction(i18n("&Real Times"), icon, 0, this,
- TQT_SLOT(slotRealTime()),
+ TQ_SLOT(slotRealTime()),
actionCollection(), "time_real");
action->setExclusiveGroup("timeMode");
if (timeMode == 1)
@@ -638,7 +638,7 @@ TempoView::setupActions()
icon = TQIconSet(pixmap);
action = new TDERadioAction(i18n("Ra&w Times"), icon, 0, this,
- TQT_SLOT(slotRawTime()),
+ TQ_SLOT(slotRawTime()),
actionCollection(), "time_raw");
action->setExclusiveGroup("timeMode");
if (timeMode == 2)
@@ -784,12 +784,12 @@ TempoView::slotPopupEditor(TQListViewItem *qitem)
dialog.setTempoPosition(time);
connect(&dialog,
- TQT_SIGNAL(changeTempo(timeT,
+ TQ_SIGNAL(changeTempo(timeT,
tempoT,
tempoT,
TempoDialog::TempoDialogAction)),
this,
- TQT_SIGNAL(changeTempo(timeT,
+ TQ_SIGNAL(changeTempo(timeT,
tempoT,
tempoT,
TempoDialog::TempoDialogAction)));
diff --git a/src/gui/general/BaseToolBox.cpp b/src/gui/general/BaseToolBox.cpp
index a6b210a..93904ad 100644
--- a/src/gui/general/BaseToolBox.cpp
+++ b/src/gui/general/BaseToolBox.cpp
@@ -46,8 +46,8 @@ BaseTool* BaseToolBox::getTool(const TQString& toolName)
if (!tool) tool = createTool(toolName);
- connect(tool, TQT_SIGNAL(showContextHelp(const TQString &)),
- this, TQT_SIGNAL(showContextHelp(const TQString &)));
+ connect(tool, TQ_SIGNAL(showContextHelp(const TQString &)),
+ this, TQ_SIGNAL(showContextHelp(const TQString &)));
return tool;
}
diff --git a/src/gui/general/EditView.cpp b/src/gui/general/EditView.cpp
index c9b01f0..24ab509 100644
--- a/src/gui/general/EditView.cpp
+++ b/src/gui/general/EditView.cpp
@@ -133,8 +133,8 @@ EditView::EditView(RosegardenGUIDoc *doc,
{
m_controlRulers->setHoverCloseButton(true);
m_controlRulers->setHoverCloseButtonDelayed(false);
- connect(m_controlRulers, TQT_SIGNAL(closeRequest(TQWidget*)),
- this, TQT_SLOT(slotRemoveControlRuler(TQWidget*)));
+ connect(m_controlRulers, TQ_SIGNAL(closeRequest(TQWidget*)),
+ this, TQ_SLOT(slotRemoveControlRuler(TQWidget*)));
(dynamic_cast<TQBoxLayout*>(m_bottomBox->layout()))->setDirection(TQBoxLayout::BottomToTop);
@@ -281,10 +281,10 @@ void EditView::setTopStandardRuler(StandardRuler* w, TQWidget *leftBox)
m_grid->addLayout(gl, TOPBARBUTTONS_ROW, m_mainCol);
if (m_canvasView) {
- connect(m_canvasView->horizontalScrollBar(), TQT_SIGNAL(valueChanged(int)),
- m_topStandardRuler, TQT_SLOT(slotScrollHoriz(int)));
- connect(m_canvasView->horizontalScrollBar(), TQT_SIGNAL(sliderMoved(int)),
- m_topStandardRuler, TQT_SLOT(slotScrollHoriz(int)));
+ connect(m_canvasView->horizontalScrollBar(), TQ_SIGNAL(valueChanged(int)),
+ m_topStandardRuler, TQ_SLOT(slotScrollHoriz(int)));
+ connect(m_canvasView->horizontalScrollBar(), TQ_SIGNAL(sliderMoved(int)),
+ m_topStandardRuler, TQ_SLOT(slotScrollHoriz(int)));
}
}
@@ -296,10 +296,10 @@ void EditView::setBottomStandardRuler(StandardRuler* w)
// m_bottomBox->insertWidget(0, w);
if (m_canvasView) {
- connect(m_canvasView->horizontalScrollBar(), TQT_SIGNAL(valueChanged(int)),
- m_bottomStandardRuler, TQT_SLOT(slotScrollHoriz(int)));
- connect(m_canvasView->horizontalScrollBar(), TQT_SIGNAL(sliderMoved(int)),
- m_bottomStandardRuler, TQT_SLOT(slotScrollHoriz(int)));
+ connect(m_canvasView->horizontalScrollBar(), TQ_SIGNAL(valueChanged(int)),
+ m_bottomStandardRuler, TQ_SLOT(slotScrollHoriz(int)));
+ connect(m_canvasView->horizontalScrollBar(), TQ_SIGNAL(sliderMoved(int)),
+ m_bottomStandardRuler, TQ_SLOT(slotScrollHoriz(int)));
}
}
@@ -343,10 +343,10 @@ void EditView::addRuler(TQWidget* w)
m_rulerBox->addWidget(w);
if (m_canvasView) {
- connect(m_canvasView->horizontalScrollBar(), TQT_SIGNAL(valueChanged(int)),
- w, TQT_SLOT(slotScrollHoriz(int)));
- connect(m_canvasView->horizontalScrollBar(), TQT_SIGNAL(sliderMoved(int)),
- w, TQT_SLOT(slotScrollHoriz(int)));
+ connect(m_canvasView->horizontalScrollBar(), TQ_SIGNAL(valueChanged(int)),
+ w, TQ_SLOT(slotScrollHoriz(int)));
+ connect(m_canvasView->horizontalScrollBar(), TQ_SIGNAL(sliderMoved(int)),
+ w, TQ_SLOT(slotScrollHoriz(int)));
}
}
@@ -363,14 +363,14 @@ void EditView::addControlRuler(ControlRuler* ruler)
m_controlRulers->showPage(ruler);
if (m_canvasView) {
- connect(m_canvasView->horizontalScrollBar(), TQT_SIGNAL(valueChanged(int)),
- ruler->horizontalScrollBar(), TQT_SIGNAL(valueChanged(int)));
- connect(m_canvasView->horizontalScrollBar(), TQT_SIGNAL(sliderMoved(int)),
- ruler->horizontalScrollBar(), TQT_SIGNAL(sliderMoved(int)));
+ connect(m_canvasView->horizontalScrollBar(), TQ_SIGNAL(valueChanged(int)),
+ ruler->horizontalScrollBar(), TQ_SIGNAL(valueChanged(int)));
+ connect(m_canvasView->horizontalScrollBar(), TQ_SIGNAL(sliderMoved(int)),
+ ruler->horizontalScrollBar(), TQ_SIGNAL(sliderMoved(int)));
}
- connect(ruler, TQT_SIGNAL(stateChange(const TQString&, bool)),
- this, TQT_SLOT(slotStateChanged(const TQString&, bool)));
+ connect(ruler, TQ_SIGNAL(stateChange(const TQString&, bool)),
+ this, TQ_SLOT(slotStateChanged(const TQString&, bool)));
stateChanged("have_control_ruler", KXMLGUIClient::StateReverse);
}
@@ -424,10 +424,10 @@ void EditView::setCanvasView(RosegardenCanvasView *canvasView)
// m_horizontalScrollBar->setSteps(m_canvasView->horizontalScrollBar()->lineStep(),
// m_canvasView->horizontalScrollBar()->pageStep());
- // connect(m_horizontalScrollBar, TQT_SIGNAL(valueChanged(int)),
- // m_canvasView->horizontalScrollBar(), TQT_SIGNAL(valueChanged(int)));
- // connect(m_horizontalScrollBar, TQT_SIGNAL(sliderMoved(int)),
- // m_canvasView->horizontalScrollBar(), TQT_SIGNAL(sliderMoved(int)));
+ // connect(m_horizontalScrollBar, TQ_SIGNAL(valueChanged(int)),
+ // m_canvasView->horizontalScrollBar(), TQ_SIGNAL(valueChanged(int)));
+ // connect(m_horizontalScrollBar, TQ_SIGNAL(sliderMoved(int)),
+ // m_canvasView->horizontalScrollBar(), TQ_SIGNAL(sliderMoved(int)));
}
@@ -726,132 +726,132 @@ EditView::setupActions()
TQIconSet icon = TQIconSet(pixmap);
new TDEAction(AddTempoChangeCommand::getGlobalName(),
icon, 0,
- this, TQT_SLOT(slotAddTempo()),
+ this, TQ_SLOT(slotAddTempo()),
actionCollection(), "add_tempo");
pixmap.load(pixmapDir + "/toolbar/event-insert-timesig.png");
icon = TQIconSet(pixmap);
new TDEAction(AddTimeSignatureCommand::getGlobalName(),
icon, 0,
- this, TQT_SLOT(slotAddTimeSignature()),
+ this, TQ_SLOT(slotAddTimeSignature()),
actionCollection(), "add_time_signature");
//
// Transforms
//
new TDEAction(i18n("&Halve Durations"), Key_H + CTRL, this,
- TQT_SLOT(slotHalveDurations()), actionCollection(),
+ TQ_SLOT(slotHalveDurations()), actionCollection(),
"halve_durations");
new TDEAction(i18n("&Double Durations"), Key_H + CTRL + SHIFT, this,
- TQT_SLOT(slotDoubleDurations()), actionCollection(),
+ TQ_SLOT(slotDoubleDurations()), actionCollection(),
"double_durations");
new TDEAction(RescaleCommand::getGlobalName(), 0, this,
- TQT_SLOT(slotRescale()), actionCollection(),
+ TQ_SLOT(slotRescale()), actionCollection(),
"rescale");
new TDEAction(TransposeCommand::getGlobalName(1), 0,
Key_Up, this,
- TQT_SLOT(slotTransposeUp()), actionCollection(),
+ TQ_SLOT(slotTransposeUp()), actionCollection(),
"transpose_up");
new TDEAction(TransposeCommand::getGlobalName(12), 0,
Key_Up + CTRL, this,
- TQT_SLOT(slotTransposeUpOctave()), actionCollection(),
+ TQ_SLOT(slotTransposeUpOctave()), actionCollection(),
"transpose_up_octave");
new TDEAction(TransposeCommand::getGlobalName( -1), 0,
Key_Down, this,
- TQT_SLOT(slotTransposeDown()), actionCollection(),
+ TQ_SLOT(slotTransposeDown()), actionCollection(),
"transpose_down");
new TDEAction(TransposeCommand::getGlobalName( -12), 0,
Key_Down + CTRL, this,
- TQT_SLOT(slotTransposeDownOctave()), actionCollection(),
+ TQ_SLOT(slotTransposeDownOctave()), actionCollection(),
"transpose_down_octave");
new TDEAction(TransposeCommand::getGlobalName(0), 0, this,
- TQT_SLOT(slotTranspose()), actionCollection(),
+ TQ_SLOT(slotTranspose()), actionCollection(),
"general_transpose");
new TDEAction(TransposeCommand::getDiatonicGlobalName(0,0), 0, this,
- TQT_SLOT(slotDiatonicTranspose()), actionCollection(),
+ TQ_SLOT(slotDiatonicTranspose()), actionCollection(),
"general_diatonic_transpose");
new TDEAction(InvertCommand::getGlobalName(0), 0, this,
- TQT_SLOT(slotInvert()), actionCollection(),
+ TQ_SLOT(slotInvert()), actionCollection(),
"invert");
new TDEAction(RetrogradeCommand::getGlobalName(0), 0, this,
- TQT_SLOT(slotRetrograde()), actionCollection(),
+ TQ_SLOT(slotRetrograde()), actionCollection(),
"retrograde");
new TDEAction(RetrogradeInvertCommand::getGlobalName(0), 0, this,
- TQT_SLOT(slotRetrogradeInvert()), actionCollection(),
+ TQ_SLOT(slotRetrogradeInvert()), actionCollection(),
"retrograde_invert");
new TDEAction(i18n("Jog &Left"), Key_Left + ALT, this,
- TQT_SLOT(slotJogLeft()), actionCollection(),
+ TQ_SLOT(slotJogLeft()), actionCollection(),
"jog_left");
new TDEAction(i18n("Jog &Right"), Key_Right + ALT, this,
- TQT_SLOT(slotJogRight()), actionCollection(),
+ TQ_SLOT(slotJogRight()), actionCollection(),
"jog_right");
// Control rulers
//
new TDEAction(i18n("Show Velocity Property Ruler"), 0, this,
- TQT_SLOT(slotShowVelocityControlRuler()), actionCollection(),
+ TQ_SLOT(slotShowVelocityControlRuler()), actionCollection(),
"show_velocity_control_ruler");
/*
new TDEAction(i18n("Show Controllers Events Ruler"), 0, this,
- TQT_SLOT(slotShowControllerEventsRuler()), actionCollection(),
+ TQ_SLOT(slotShowControllerEventsRuler()), actionCollection(),
"show_controller_events_ruler");
*/
// Disabled for now
//
// new TDEAction(i18n("Add Control Ruler..."), 0, this,
- // TQT_SLOT(slotShowPropertyControlRuler()), actionCollection(),
+ // TQ_SLOT(slotShowPropertyControlRuler()), actionCollection(),
// "add_control_ruler");
//
// Control Ruler context menu
//
new TDEAction(i18n("Insert item"), 0, this,
- TQT_SLOT(slotInsertControlRulerItem()), actionCollection(),
+ TQ_SLOT(slotInsertControlRulerItem()), actionCollection(),
"insert_control_ruler_item");
// This was on Key_Delete, but that conflicts with existing Delete commands
// on individual edit views
new TDEAction(i18n("Erase selected items"), 0, this,
- TQT_SLOT(slotEraseControlRulerItem()), actionCollection(),
+ TQ_SLOT(slotEraseControlRulerItem()), actionCollection(),
"erase_control_ruler_item");
new TDEAction(i18n("Clear ruler"), 0, this,
- TQT_SLOT(slotClearControlRulerItem()), actionCollection(),
+ TQ_SLOT(slotClearControlRulerItem()), actionCollection(),
"clear_control_ruler_item");
new TDEAction(i18n("Insert line of controllers"), 0, this,
- TQT_SLOT(slotStartControlLineItem()), actionCollection(),
+ TQ_SLOT(slotStartControlLineItem()), actionCollection(),
"start_control_line_item");
new TDEAction(i18n("Flip forward"), Key_BracketRight, this,
- TQT_SLOT(slotFlipForwards()), actionCollection(),
+ TQ_SLOT(slotFlipForwards()), actionCollection(),
"flip_control_events_forward");
new TDEAction(i18n("Flip backwards"), Key_BracketLeft, this,
- TQT_SLOT(slotFlipBackwards()), actionCollection(),
+ TQ_SLOT(slotFlipBackwards()), actionCollection(),
"flip_control_events_back");
new TDEAction(i18n("Draw property line"), 0, this,
- TQT_SLOT(slotDrawPropertyLine()), actionCollection(),
+ TQ_SLOT(slotDrawPropertyLine()), actionCollection(),
"draw_property_line");
new TDEAction(i18n("Select all property values"), 0, this,
- TQT_SLOT(slotSelectAllProperties()), actionCollection(),
+ TQ_SLOT(slotSelectAllProperties()), actionCollection(),
"select_all_properties");
}
@@ -901,8 +901,8 @@ EditView::setupAddControlRulerMenu()
addControlRulerMenu->insertItem(itemStr, i++);
}
- connect(addControlRulerMenu, TQT_SIGNAL(activated(int)),
- TQT_SLOT(slotAddControlRuler(int)));
+ connect(addControlRulerMenu, TQ_SIGNAL(activated(int)),
+ TQ_SLOT(slotAddControlRuler(int)));
}
}
@@ -1114,7 +1114,7 @@ EditView::createInsertPitchActionMenu()
new TDEAction
(flat.arg(notePitchNames[i]),
CTRL + SHIFT + notePitchKeys[octave][i],
- this, TQT_SLOT(slotInsertNoteFromAction()), actionCollection(),
+ this, TQ_SLOT(slotInsertNoteFromAction()), actionCollection(),
TQString("insert_%1_flat%2").arg(i).arg(octaveSuffix).ascii());
menu->insert(insertPitchAction);
@@ -1124,7 +1124,7 @@ EditView::createInsertPitchActionMenu()
new TDEAction
(notePitchNames[i],
notePitchKeys[octave][i],
- this, TQT_SLOT(slotInsertNoteFromAction()), actionCollection(),
+ this, TQ_SLOT(slotInsertNoteFromAction()), actionCollection(),
TQString("insert_%1%2").arg(i).arg(octaveSuffix).ascii());
menu->insert(insertPitchAction);
@@ -1137,7 +1137,7 @@ EditView::createInsertPitchActionMenu()
new TDEAction
(sharp.arg(notePitchNames[i]),
SHIFT + notePitchKeys[octave][i],
- this, TQT_SLOT(slotInsertNoteFromAction()), actionCollection(),
+ this, TQ_SLOT(slotInsertNoteFromAction()), actionCollection(),
TQString("insert_%1_sharp%2").arg(i).arg(octaveSuffix).ascii());
menu->insert(insertPitchAction);
@@ -1218,12 +1218,12 @@ void EditView::slotAddTempo()
TempoDialog tempoDlg(this, getDocument());
connect(&tempoDlg,
- TQT_SIGNAL(changeTempo(timeT,
+ TQ_SIGNAL(changeTempo(timeT,
tempoT,
tempoT,
TempoDialog::TempoDialogAction)),
this,
- TQT_SIGNAL(changeTempo(timeT,
+ TQ_SIGNAL(changeTempo(timeT,
tempoT,
tempoT,
TempoDialog::TempoDialogAction)));
diff --git a/src/gui/general/EditViewBase.cpp b/src/gui/general/EditViewBase.cpp
index 59bd2f6..ca6bc80 100644
--- a/src/gui/general/EditViewBase.cpp
+++ b/src/gui/general/EditViewBase.cpp
@@ -118,12 +118,12 @@ EditViewBase::EditViewBase(RosegardenGUIDoc *doc,
m_doc->attachEditView(this);
TQObject::connect
- (getCommandHistory(), TQT_SIGNAL(commandExecuted()),
- this, TQT_SLOT(update()));
+ (getCommandHistory(), TQ_SIGNAL(commandExecuted()),
+ this, TQ_SLOT(update()));
TQObject::connect
- (getCommandHistory(), TQT_SIGNAL(commandExecuted()),
- this, TQT_SLOT(slotTestClipboard()));
+ (getCommandHistory(), TQ_SIGNAL(commandExecuted()),
+ this, TQ_SLOT(slotTestClipboard()));
// create accelerators
//
@@ -156,33 +156,33 @@ void EditViewBase::setupActions(TQString rcFileName, bool haveClipboard)
// Actions all edit views will have
- KStdAction::showToolbar(this, TQT_SLOT(slotToggleToolBar()),
+ KStdAction::showToolbar(this, TQ_SLOT(slotToggleToolBar()),
actionCollection(), "options_show_toolbar");
- KStdAction::showStatusbar(this, TQT_SLOT(slotToggleStatusBar()),
+ KStdAction::showStatusbar(this, TQ_SLOT(slotToggleStatusBar()),
actionCollection(), "options_show_statusbar");
KStdAction::preferences(this,
- TQT_SLOT(slotConfigure()),
+ TQ_SLOT(slotConfigure()),
actionCollection());
KStdAction::keyBindings(this,
- TQT_SLOT(slotEditKeys()),
+ TQ_SLOT(slotEditKeys()),
actionCollection());
KStdAction::configureToolbars(this,
- TQT_SLOT(slotEditToolbars()),
+ TQ_SLOT(slotEditToolbars()),
actionCollection());
// File menu
- KStdAction::save (this, TQT_SIGNAL(saveFile()), actionCollection());
- KStdAction::close(this, TQT_SLOT(slotCloseWindow()), actionCollection());
+ KStdAction::save (this, TQ_SIGNAL(saveFile()), actionCollection());
+ KStdAction::close(this, TQ_SLOT(slotCloseWindow()), actionCollection());
if (haveClipboard) {
- KStdAction::cut (this, TQT_SLOT(slotEditCut()), actionCollection());
- KStdAction::copy (this, TQT_SLOT(slotEditCopy()), actionCollection());
- KStdAction::paste (this, TQT_SLOT(slotEditPaste()), actionCollection());
+ KStdAction::cut (this, TQ_SLOT(slotEditCut()), actionCollection());
+ KStdAction::copy (this, TQ_SLOT(slotEditCopy()), actionCollection());
+ KStdAction::paste (this, TQ_SLOT(slotEditPaste()), actionCollection());
}
new TDEToolBarPopupAction(i18n("Und&o"),
@@ -202,33 +202,33 @@ void EditViewBase::setupActions(TQString rcFileName, bool haveClipboard)
TQCanvasPixmap pixmap(pixmapDir + "/toolbar/matrix.png");
TQIconSet icon = TQIconSet(pixmap);
new TDEAction(i18n("Open in Matri&x Editor"), icon, 0, this,
- TQT_SLOT(slotOpenInMatrix()), actionCollection(),
+ TQ_SLOT(slotOpenInMatrix()), actionCollection(),
"open_in_matrix");
pixmap.load(pixmapDir + "/toolbar/matrix-percussion.png");
icon = TQIconSet(pixmap);
new TDEAction(i18n("Open in &Percussion Matrix Editor"), icon, 0, this,
- TQT_SLOT(slotOpenInPercussionMatrix()), actionCollection(),
+ TQ_SLOT(slotOpenInPercussionMatrix()), actionCollection(),
"open_in_percussion_matrix");
pixmap.load(pixmapDir + "/toolbar/notation.png");
icon = TQIconSet(pixmap);
new TDEAction(i18n("Open in &Notation Editor"), icon, 0, this,
- TQT_SLOT(slotOpenInNotation()), actionCollection(),
+ TQ_SLOT(slotOpenInNotation()), actionCollection(),
"open_in_notation");
pixmap.load(pixmapDir + "/toolbar/eventlist.png");
icon = TQIconSet(pixmap);
new TDEAction(i18n("Open in &Event List Editor"), icon, 0, this,
- TQT_SLOT(slotOpenInEventList()), actionCollection(),
+ TQ_SLOT(slotOpenInEventList()), actionCollection(),
"open_in_event_list");
new TDEAction(i18n("Set Segment Start Time..."), 0, this,
- TQT_SLOT(slotSetSegmentStartTime()), actionCollection(),
+ TQ_SLOT(slotSetSegmentStartTime()), actionCollection(),
"set_segment_start");
new TDEAction(i18n("Set Segment Duration..."), 0, this,
- TQT_SLOT(slotSetSegmentDuration()), actionCollection(),
+ TQ_SLOT(slotSetSegmentDuration()), actionCollection(),
"set_segment_duration");
// add undo and redo to edit menu and toolbar
@@ -254,8 +254,8 @@ void EditViewBase::slotEditToolbars()
{
KEditToolbar dlg(actionCollection(), getRCFileName());
- connect(&dlg, TQT_SIGNAL(newToolbarConfig()),
- TQT_SLOT(slotUpdateToolbars()));
+ connect(&dlg, TQ_SIGNAL(newToolbarConfig()),
+ TQ_SLOT(slotUpdateToolbars()));
dlg.exec();
}
diff --git a/src/gui/general/PresetHandlerDialog.cpp b/src/gui/general/PresetHandlerDialog.cpp
index 3c9e100..9b02ef3 100644
--- a/src/gui/general/PresetHandlerDialog.cpp
+++ b/src/gui/general/PresetHandlerDialog.cpp
@@ -145,8 +145,8 @@ PresetHandlerDialog::initDialog()
}
- connect(m_categoryCombo, TQT_SIGNAL(activated(int)),
- TQT_SLOT(slotCategoryIndexChanged(int)));
+ connect(m_categoryCombo, TQ_SIGNAL(activated(int)),
+ TQ_SLOT(slotCategoryIndexChanged(int)));
}
TQString
diff --git a/src/gui/general/RosegardenCanvasView.cpp b/src/gui/general/RosegardenCanvasView.cpp
index a3afa8e..3df211a 100644
--- a/src/gui/general/RosegardenCanvasView.cpp
+++ b/src/gui/general/RosegardenCanvasView.cpp
@@ -58,8 +58,8 @@ RosegardenCanvasView::RosegardenCanvasView(TQCanvas* canvas,
m_autoScrolling(false)
{
setDragAutoScroll(true);
- connect( &m_autoScrollTimer, TQT_SIGNAL( timeout() ),
- this, TQT_SLOT( doAutoScroll() ) );
+ connect( &m_autoScrollTimer, TQ_SIGNAL( timeout() ),
+ this, TQ_SLOT( doAutoScroll() ) );
}
void RosegardenCanvasView::fitWidthToContents()
diff --git a/src/gui/general/RosegardenScrollView.cpp b/src/gui/general/RosegardenScrollView.cpp
index 2a0f1a4..a9b1d99 100644
--- a/src/gui/general/RosegardenScrollView.cpp
+++ b/src/gui/general/RosegardenScrollView.cpp
@@ -64,8 +64,8 @@ RosegardenScrollView::RosegardenScrollView(TQWidget* parent,
m_autoScrolling(false)
{
setDragAutoScroll(true);
- connect( &m_autoScrollTimer, TQT_SIGNAL( timeout() ),
- this, TQT_SLOT( doAutoScroll() ) );
+ connect( &m_autoScrollTimer, TQ_SIGNAL( timeout() ),
+ this, TQ_SLOT( doAutoScroll() ) );
}
void RosegardenScrollView::setBottomFixedWidget(TQWidget* w)
diff --git a/src/gui/rulers/ChordNameRuler.cpp b/src/gui/rulers/ChordNameRuler.cpp
index aac1f16..eb58cf9 100644
--- a/src/gui/rulers/ChordNameRuler.cpp
+++ b/src/gui/rulers/ChordNameRuler.cpp
@@ -88,8 +88,8 @@ ChordNameRuler::ChordNameRuler(RulerScale *rulerScale,
m_compositionRefreshStatusId = m_composition->getNewRefreshStatusId();
- TQObject::connect(doc->getCommandHistory(), TQT_SIGNAL(commandExecuted()),
- this, TQT_SLOT(update()));
+ TQObject::connect(doc->getCommandHistory(), TQ_SIGNAL(commandExecuted()),
+ this, TQ_SLOT(update()));
TQToolTip::add
(this, i18n("Chord name ruler.\nTurn it on and off from the Settings->Rulers menu."));
@@ -129,8 +129,8 @@ ChordNameRuler::ChordNameRuler(RulerScale *rulerScale,
m_compositionRefreshStatusId = m_composition->getNewRefreshStatusId();
- TQObject::connect(doc->getCommandHistory(), TQT_SIGNAL(commandExecuted()),
- this, TQT_SLOT(update()));
+ TQObject::connect(doc->getCommandHistory(), TQ_SIGNAL(commandExecuted()),
+ this, TQ_SLOT(update()));
for (std::vector<Segment *>::iterator i = segments.begin();
i != segments.end(); ++i) {
diff --git a/src/gui/rulers/ControlRuler.cpp b/src/gui/rulers/ControlRuler.cpp
index 57a2d17..e98a1cf 100644
--- a/src/gui/rulers/ControlRuler.cpp
+++ b/src/gui/rulers/ControlRuler.cpp
@@ -86,8 +86,8 @@ ControlRuler::ControlRuler(Segment *segment,
setFixedHeight(sizeHint().height());
- connect(this, TQT_SIGNAL(stateChange(const TQString&, bool)),
- m_parentEditView, TQT_SLOT(slotStateChanged(const TQString&, bool)));
+ connect(this, TQ_SIGNAL(stateChange(const TQString&, bool)),
+ m_parentEditView, TQ_SLOT(slotStateChanged(const TQString&, bool)));
m_numberFloat = new TextFloat(this);
m_numberFloat->hide();
diff --git a/src/gui/rulers/MarkerRuler.cpp b/src/gui/rulers/MarkerRuler.cpp
index 4e40728..977f2d3 100644
--- a/src/gui/rulers/MarkerRuler.cpp
+++ b/src/gui/rulers/MarkerRuler.cpp
@@ -96,21 +96,21 @@ MarkerRuler::MarkerRuler(RosegardenGUIDoc *doc,
icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-insert.png"));
new TDEAction(i18n("Insert Marker"), icon, 0, this,
- TQT_SLOT(slotInsertMarkerHere()), actionCollection(),
+ TQ_SLOT(slotInsertMarkerHere()), actionCollection(),
"insert_marker_here");
new TDEAction(i18n("Insert Marker at Playback Position"), 0, this,
- TQT_SLOT(slotInsertMarkerAtPointer()), actionCollection(),
+ TQ_SLOT(slotInsertMarkerAtPointer()), actionCollection(),
"insert_marker_at_pointer");
icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-delete.png"));
new TDEAction(i18n("Delete Marker"), icon, 0, this,
- TQT_SLOT(slotDeleteMarker()), actionCollection(),
+ TQ_SLOT(slotDeleteMarker()), actionCollection(),
"delete_marker");
icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-edit.png"));
new TDEAction(i18n("Edit Marker..."), icon, 0, this,
- TQT_SLOT(slotEditMarker()), actionCollection(),
+ TQ_SLOT(slotEditMarker()), actionCollection(),
"edit_marker");
TQToolTip::add
diff --git a/src/gui/rulers/StandardRuler.cpp b/src/gui/rulers/StandardRuler.cpp
index 52f9ebb..e0489a7 100644
--- a/src/gui/rulers/StandardRuler.cpp
+++ b/src/gui/rulers/StandardRuler.cpp
@@ -74,8 +74,8 @@ StandardRuler::StandardRuler(RosegardenGUIDoc *doc,
}
TQObject::connect
- (doc->getCommandHistory(), TQT_SIGNAL(commandExecuted()),
- this, TQT_SLOT(update()));
+ (doc->getCommandHistory(), TQ_SIGNAL(commandExecuted()),
+ this, TQ_SLOT(update()));
}
@@ -94,49 +94,49 @@ void StandardRuler::connectRulerToDocPointer(RosegardenGUIDoc *doc)
// so they are re-emitted from the loop ruler by this widget
//
TQObject::connect
- (m_loopRuler, TQT_SIGNAL(setPointerPosition(timeT)),
- doc, TQT_SLOT(slotSetPointerPosition(timeT)));
+ (m_loopRuler, TQ_SIGNAL(setPointerPosition(timeT)),
+ doc, TQ_SLOT(slotSetPointerPosition(timeT)));
TQObject::connect
- (m_hButtonBar, TQT_SIGNAL(setPointerPosition(timeT)),
- doc, TQT_SLOT(slotSetPointerPosition(timeT)));
+ (m_hButtonBar, TQ_SIGNAL(setPointerPosition(timeT)),
+ doc, TQ_SLOT(slotSetPointerPosition(timeT)));
TQObject::connect
- (m_hButtonBar, TQT_SIGNAL(editMarkers()),
- RosegardenGUIApp::self(), TQT_SLOT(slotEditMarkers()));
+ (m_hButtonBar, TQ_SIGNAL(editMarkers()),
+ RosegardenGUIApp::self(), TQ_SLOT(slotEditMarkers()));
TQObject::connect
- (m_hButtonBar, TQT_SIGNAL(addMarker(timeT)),
- RosegardenGUIApp::self(), TQT_SLOT(slotAddMarker(timeT)));
+ (m_hButtonBar, TQ_SIGNAL(addMarker(timeT)),
+ RosegardenGUIApp::self(), TQ_SLOT(slotAddMarker(timeT)));
TQObject::connect
- (m_hButtonBar, TQT_SIGNAL(deleteMarker(int, timeT, TQString, TQString)),
- RosegardenGUIApp::self(), TQT_SLOT(slotDeleteMarker(int, timeT, TQString, TQString)));
+ (m_hButtonBar, TQ_SIGNAL(deleteMarker(int, timeT, TQString, TQString)),
+ RosegardenGUIApp::self(), TQ_SLOT(slotDeleteMarker(int, timeT, TQString, TQString)));
TQObject::connect
- (m_loopRuler, TQT_SIGNAL(dragPointerToPosition(timeT)),
- this, TQT_SIGNAL(dragPointerToPosition(timeT)));
+ (m_loopRuler, TQ_SIGNAL(dragPointerToPosition(timeT)),
+ this, TQ_SIGNAL(dragPointerToPosition(timeT)));
TQObject::connect
- (m_loopRuler, TQT_SIGNAL(dragLoopToPosition(timeT)),
- this, TQT_SIGNAL(dragLoopToPosition(timeT)));
+ (m_loopRuler, TQ_SIGNAL(dragLoopToPosition(timeT)),
+ this, TQ_SIGNAL(dragLoopToPosition(timeT)));
TQObject::connect
- (m_loopRuler, TQT_SIGNAL(setPlayPosition(timeT)),
- RosegardenGUIApp::self(), TQT_SLOT(slotSetPlayPosition(timeT)));
+ (m_loopRuler, TQ_SIGNAL(setPlayPosition(timeT)),
+ RosegardenGUIApp::self(), TQ_SLOT(slotSetPlayPosition(timeT)));
TQObject::connect
- (m_hButtonBar, TQT_SIGNAL(setLoop(timeT, timeT)),
- doc, TQT_SLOT(slotSetLoop(timeT, timeT)));
+ (m_hButtonBar, TQ_SIGNAL(setLoop(timeT, timeT)),
+ doc, TQ_SLOT(slotSetLoop(timeT, timeT)));
TQObject::connect
- (m_loopRuler, TQT_SIGNAL(setLoop(timeT, timeT)),
- doc, TQT_SLOT(slotSetLoop(timeT, timeT)));
+ (m_loopRuler, TQ_SIGNAL(setLoop(timeT, timeT)),
+ doc, TQ_SLOT(slotSetLoop(timeT, timeT)));
TQObject::connect
- (doc, TQT_SIGNAL(loopChanged(timeT, timeT)),
+ (doc, TQ_SIGNAL(loopChanged(timeT, timeT)),
m_loopRuler,
- TQT_SLOT(slotSetLoopMarker(timeT, timeT)));
+ TQ_SLOT(slotSetLoopMarker(timeT, timeT)));
m_loopRuler->setBackgroundColor(GUIPalette::getColour(GUIPalette::PointerRuler));
}
diff --git a/src/gui/rulers/TempoRuler.cpp b/src/gui/rulers/TempoRuler.cpp
index c987d57..d62aabf 100644
--- a/src/gui/rulers/TempoRuler.cpp
+++ b/src/gui/rulers/TempoRuler.cpp
@@ -115,45 +115,45 @@ TempoRuler::TempoRuler(RulerScale *rulerScale,
setBackgroundMode(TQt::NoBackground);
TQObject::connect
- (doc->getCommandHistory(), TQT_SIGNAL(commandExecuted()),
- this, TQT_SLOT(update()));
+ (doc->getCommandHistory(), TQ_SIGNAL(commandExecuted()),
+ this, TQ_SLOT(update()));
TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
TQIconSet icon;
icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-insert-tempo.png"));
new TDEAction(i18n("Insert Tempo Change"), icon, 0, this,
- TQT_SLOT(slotInsertTempoHere()), actionCollection(),
+ TQ_SLOT(slotInsertTempoHere()), actionCollection(),
"insert_tempo_here");
new TDEAction(i18n("Insert Tempo Change at Playback Position"), 0, 0, this,
- TQT_SLOT(slotInsertTempoAtPointer()), actionCollection(),
+ TQ_SLOT(slotInsertTempoAtPointer()), actionCollection(),
"insert_tempo_at_pointer");
icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-delete.png"));
new TDEAction(i18n("Delete Tempo Change"), icon, 0, this,
- TQT_SLOT(slotDeleteTempoChange()), actionCollection(),
+ TQ_SLOT(slotDeleteTempoChange()), actionCollection(),
"delete_tempo");
new TDEAction(i18n("Ramp Tempo to Next Tempo"), 0, 0, this,
- TQT_SLOT(slotRampToNext()), actionCollection(),
+ TQ_SLOT(slotRampToNext()), actionCollection(),
"ramp_to_next");
new TDEAction(i18n("Un-Ramp Tempo"), 0, 0, this,
- TQT_SLOT(slotUnramp()), actionCollection(),
+ TQ_SLOT(slotUnramp()), actionCollection(),
"unramp");
icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-edit.png"));
new TDEAction(i18n("Edit Tempo..."), icon, 0, this,
- TQT_SLOT(slotEditTempo()), actionCollection(),
+ TQ_SLOT(slotEditTempo()), actionCollection(),
"edit_tempo");
new TDEAction(i18n("Edit Time Signature..."), 0, 0, this,
- TQT_SLOT(slotEditTimeSignature()), actionCollection(),
+ TQ_SLOT(slotEditTimeSignature()), actionCollection(),
"edit_time_signature");
new TDEAction(i18n("Open Tempo and Time Signature Editor"), 0, 0, this,
- TQT_SLOT(slotEditTempos()), actionCollection(),
+ TQ_SLOT(slotEditTempos()), actionCollection(),
"edit_tempos");
setMouseTracking(false);
@@ -172,47 +172,47 @@ void
TempoRuler::connectSignals()
{
connect(this,
- TQT_SIGNAL(doubleClicked(timeT)),
+ TQ_SIGNAL(doubleClicked(timeT)),
RosegardenGUIApp::self(),
- TQT_SLOT(slotEditTempos(timeT)));
+ TQ_SLOT(slotEditTempos(timeT)));
connect(this,
- TQT_SIGNAL(changeTempo(timeT,
+ TQ_SIGNAL(changeTempo(timeT,
tempoT,
tempoT,
TempoDialog::TempoDialogAction)),
RosegardenGUIApp::self(),
- TQT_SLOT(slotChangeTempo(timeT,
+ TQ_SLOT(slotChangeTempo(timeT,
tempoT,
tempoT,
TempoDialog::TempoDialogAction)));
connect(this,
- TQT_SIGNAL(moveTempo(timeT,
+ TQ_SIGNAL(moveTempo(timeT,
timeT)),
RosegardenGUIApp::self(),
- TQT_SLOT(slotMoveTempo(timeT,
+ TQ_SLOT(slotMoveTempo(timeT,
timeT)));
connect(this,
- TQT_SIGNAL(deleteTempo(timeT)),
+ TQ_SIGNAL(deleteTempo(timeT)),
RosegardenGUIApp::self(),
- TQT_SLOT(slotDeleteTempo(timeT)));
+ TQ_SLOT(slotDeleteTempo(timeT)));
connect(this,
- TQT_SIGNAL(editTempo(timeT)),
+ TQ_SIGNAL(editTempo(timeT)),
RosegardenGUIApp::self(),
- TQT_SLOT(slotEditTempo(timeT)));
+ TQ_SLOT(slotEditTempo(timeT)));
connect(this,
- TQT_SIGNAL(editTimeSignature(timeT)),
+ TQ_SIGNAL(editTimeSignature(timeT)),
RosegardenGUIApp::self(),
- TQT_SLOT(slotEditTimeSignature(timeT)));
+ TQ_SLOT(slotEditTimeSignature(timeT)));
connect(this,
- TQT_SIGNAL(editTempos(timeT)),
+ TQ_SIGNAL(editTempos(timeT)),
RosegardenGUIApp::self(),
- TQT_SLOT(slotEditTempos(timeT)));
+ TQ_SLOT(slotEditTempos(timeT)));
}
void
diff --git a/src/gui/seqmanager/MidiFilterDialog.cpp b/src/gui/seqmanager/MidiFilterDialog.cpp
index 839371f..b361c9c 100644
--- a/src/gui/seqmanager/MidiFilterDialog.cpp
+++ b/src/gui/seqmanager/MidiFilterDialog.cpp
@@ -124,11 +124,11 @@ MidiFilterDialog::MidiFilterDialog(TQWidget *parent,
sysRecord->setChecked(true);
- connect(m_thruBox, TQT_SIGNAL(released(int)),
- this, TQT_SLOT(slotSetModified()));
+ connect(m_thruBox, TQ_SIGNAL(released(int)),
+ this, TQ_SLOT(slotSetModified()));
- connect(m_recordBox, TQT_SIGNAL(released(int)),
- this, TQT_SLOT(slotSetModified()));
+ connect(m_recordBox, TQ_SIGNAL(released(int)),
+ this, TQ_SLOT(slotSetModified()));
setModified(false);
}
diff --git a/src/gui/seqmanager/SequenceManager.cpp b/src/gui/seqmanager/SequenceManager.cpp
index 31820b3..4f5cac4 100644
--- a/src/gui/seqmanager/SequenceManager.cpp
+++ b/src/gui/seqmanager/SequenceManager.cpp
@@ -115,18 +115,18 @@ SequenceManager::SequenceManager(RosegardenGUIDoc *doc,
(m_doc->parent())->parentWidget());
// Connect these for use later
//
- connect(m_countdownTimer, TQT_SIGNAL(timeout()),
- this, TQT_SLOT(slotCountdownTimerTimeout()));
+ connect(m_countdownTimer, TQ_SIGNAL(timeout()),
+ this, TQ_SLOT(slotCountdownTimerTimeout()));
- connect(m_reportTimer, TQT_SIGNAL(timeout()),
- this, TQT_SLOT(slotAllowReport()));
+ connect(m_reportTimer, TQ_SIGNAL(timeout()),
+ this, TQ_SLOT(slotAllowReport()));
- connect(m_compositionMmapperResetTimer, TQT_SIGNAL(timeout()),
- this, TQT_SLOT(slotScheduledCompositionMmapperReset()));
+ connect(m_compositionMmapperResetTimer, TQ_SIGNAL(timeout()),
+ this, TQ_SLOT(slotScheduledCompositionMmapperReset()));
- connect(doc->getCommandHistory(), TQT_SIGNAL(commandExecuted()),
- this, TQT_SLOT(update()));
+ connect(doc->getCommandHistory(), TQ_SIGNAL(commandExecuted()),
+ this, TQ_SLOT(update()));
m_doc->getComposition().addObserver(this);
@@ -162,7 +162,7 @@ void SequenceManager::setDocument(RosegardenGUIDoc* doc)
DataBlockRepository::clear();
m_doc->getComposition().removeObserver(this);
- disconnect(m_doc->getCommandHistory(), TQT_SIGNAL(commandExecuted()));
+ disconnect(m_doc->getCommandHistory(), TQ_SIGNAL(commandExecuted()));
m_segments.clear();
m_triggerSegments.clear();
@@ -188,14 +188,14 @@ void SequenceManager::setDocument(RosegardenGUIDoc* doc)
// Connect this for use later
//
- connect(m_countdownTimer, TQT_SIGNAL(timeout()),
- this, TQT_SLOT(slotCountdownTimerTimeout()));
+ connect(m_countdownTimer, TQ_SIGNAL(timeout()),
+ this, TQ_SLOT(slotCountdownTimerTimeout()));
m_compositionRefreshStatusId = comp.getNewRefreshStatusId();
comp.addObserver(this);
- connect(m_doc->getCommandHistory(), TQT_SIGNAL(commandExecuted()),
- this, TQT_SLOT(update()));
+ connect(m_doc->getCommandHistory(), TQ_SIGNAL(commandExecuted()),
+ this, TQ_SLOT(update()));
for (Composition::iterator i = comp.begin(); i != comp.end(); ++i) {
@@ -215,8 +215,8 @@ void SequenceManager::setDocument(RosegardenGUIDoc* doc)
m_compositionMmapperResetTimer = new TQTimer(m_doc);
- connect(m_compositionMmapperResetTimer, TQT_SIGNAL(timeout()),
- this, TQT_SLOT(slotScheduledCompositionMmapperReset()));
+ connect(m_compositionMmapperResetTimer, TQ_SIGNAL(timeout()),
+ this, TQ_SLOT(slotScheduledCompositionMmapperReset()));
resetCompositionMmapper();
diff --git a/src/gui/studio/AudioMixerWindow.cpp b/src/gui/studio/AudioMixerWindow.cpp
index c73b4ff..905ff3a 100644
--- a/src/gui/studio/AudioMixerWindow.cpp
+++ b/src/gui/studio/AudioMixerWindow.cpp
@@ -95,13 +95,13 @@ AudioMixerWindow::AudioMixerWindow(TQWidget *parent,
populate();
KStdAction::close(this,
- TQT_SLOT(slotClose()),
+ TQ_SLOT(slotClose()),
actionCollection());
TQIconSet icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-play")));
TDEAction *play = new TDEAction(i18n("&Play"), icon, Key_Enter, this,
- TQT_SIGNAL(play()), actionCollection(), "play");
+ TQ_SIGNAL(play()), actionCollection(), "play");
// Alternative shortcut for Play
TDEShortcut playShortcut = play->shortcut();
playShortcut.append( KKey(Key_Return + CTRL) );
@@ -110,68 +110,68 @@ AudioMixerWindow::AudioMixerWindow(TQWidget *parent,
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-stop")));
new TDEAction(i18n("&Stop"), icon, Key_Insert, this,
- TQT_SIGNAL(stop()), actionCollection(), "stop");
+ TQ_SIGNAL(stop()), actionCollection(), "stop");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-rewind")));
new TDEAction(i18n("Re&wind"), icon, Key_End, this,
- TQT_SIGNAL(rewindPlayback()), actionCollection(),
+ TQ_SIGNAL(rewindPlayback()), actionCollection(),
"playback_pointer_back_bar");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-ffwd")));
new TDEAction(i18n("&Fast Forward"), icon, Key_PageDown, this,
- TQT_SIGNAL(fastForwardPlayback()), actionCollection(),
+ TQ_SIGNAL(fastForwardPlayback()), actionCollection(),
"playback_pointer_forward_bar");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-rewind-end")));
new TDEAction(i18n("Rewind to &Beginning"), icon, 0, this,
- TQT_SIGNAL(rewindPlaybackToBeginning()), actionCollection(),
+ TQ_SIGNAL(rewindPlaybackToBeginning()), actionCollection(),
"playback_pointer_start");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-ffwd-end")));
new TDEAction(i18n("Fast Forward to &End"), icon, 0, this,
- TQT_SIGNAL(fastForwardPlaybackToEnd()), actionCollection(),
+ TQ_SIGNAL(fastForwardPlaybackToEnd()), actionCollection(),
"playback_pointer_end");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-record")));
new TDEAction(i18n("&Record"), icon, 0, this,
- TQT_SIGNAL(record()), actionCollection(),
+ TQ_SIGNAL(record()), actionCollection(),
"record");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-panic")));
new TDEAction(i18n("Panic"), icon, Key_P + CTRL + ALT, this,
- TQT_SIGNAL(panic()), actionCollection(),
+ TQ_SIGNAL(panic()), actionCollection(),
"panic");
unsigned int mixerOptions = m_studio->getMixerDisplayOptions();
(new TDEToggleAction(i18n("Show Audio &Faders"), 0, this,
- TQT_SLOT(slotToggleFaders()), actionCollection(),
+ TQ_SLOT(slotToggleFaders()), actionCollection(),
"show_audio_faders"))->setChecked
(!(mixerOptions & MIXER_OMIT_FADERS));
(new TDEToggleAction(i18n("Show Synth &Faders"), 0, this,
- TQT_SLOT(slotToggleSynthFaders()), actionCollection(),
+ TQ_SLOT(slotToggleSynthFaders()), actionCollection(),
"show_synth_faders"))->setChecked
(!(mixerOptions & MIXER_OMIT_SYNTH_FADERS));
(new TDEToggleAction(i18n("Show &Submasters"), 0, this,
- TQT_SLOT(slotToggleSubmasters()), actionCollection(),
+ TQ_SLOT(slotToggleSubmasters()), actionCollection(),
"show_audio_submasters"))->setChecked
(!(mixerOptions & MIXER_OMIT_SUBMASTERS));
(new TDEToggleAction(i18n("Show &Plugin Buttons"), 0, this,
- TQT_SLOT(slotTogglePluginButtons()), actionCollection(),
+ TQ_SLOT(slotTogglePluginButtons()), actionCollection(),
"show_plugin_buttons"))->setChecked
(!(mixerOptions & MIXER_OMIT_PLUGINS));
(new TDEToggleAction(i18n("Show &Unassigned Faders"), 0, this,
- TQT_SLOT(slotToggleUnassignedFaders()), actionCollection(),
+ TQ_SLOT(slotToggleUnassignedFaders()), actionCollection(),
"show_unassigned_faders"))->setChecked
(mixerOptions & MIXER_SHOW_UNASSIGNED_FADERS);
@@ -181,7 +181,7 @@ AudioMixerWindow::AudioMixerWindow(TQWidget *parent,
action =
new TDERadioAction(i18n("1 Input", "%n Inputs", i),
0, this,
- TQT_SLOT(slotSetInputCountFromAction()), actionCollection(),
+ TQ_SLOT(slotSetInputCountFromAction()), actionCollection(),
TQString("inputs_%1").arg(i).ascii());
action->setExclusiveGroup("inputs");
if (i == int(m_studio->getRecordIns().size()))
@@ -191,7 +191,7 @@ AudioMixerWindow::AudioMixerWindow(TQWidget *parent,
action = new TDERadioAction
(i18n("No Submasters"),
0, this,
- TQT_SLOT(slotSetSubmasterCountFromAction()), actionCollection(),
+ TQ_SLOT(slotSetSubmasterCountFromAction()), actionCollection(),
TQString("submasters_0").ascii());
action->setExclusiveGroup("submasters");
action->setChecked(true);
@@ -200,7 +200,7 @@ AudioMixerWindow::AudioMixerWindow(TQWidget *parent,
action = new TDERadioAction
(i18n("1 Submaster", "%n Submasters", i),
0, this,
- TQT_SLOT(slotSetSubmasterCountFromAction()), actionCollection(),
+ TQ_SLOT(slotSetSubmasterCountFromAction()), actionCollection(),
TQString("submasters_%1").arg(i).ascii());
action->setExclusiveGroup("submasters");
if (i == int(m_studio->getBusses().size()) - 1)
@@ -388,8 +388,8 @@ AudioMixerWindow::populate()
TQToolTip::add
(plugin, i18n("Audio plugin button"));
rec.m_plugins.push_back(plugin);
- connect(plugin, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotSelectPlugin()));
+ connect(plugin, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotSelectPlugin()));
}
TQLabel *idLabel;
@@ -441,30 +441,30 @@ AudioMixerWindow::populate()
updatePluginButtons((*i)->getId());
if (rec.m_input) {
- connect(rec.m_input, TQT_SIGNAL(changed()),
- this, TQT_SLOT(slotInputChanged()));
+ connect(rec.m_input, TQ_SIGNAL(changed()),
+ this, TQ_SLOT(slotInputChanged()));
}
- connect(rec.m_output, TQT_SIGNAL(changed()),
- this, TQT_SLOT(slotOutputChanged()));
+ connect(rec.m_output, TQ_SIGNAL(changed()),
+ this, TQ_SLOT(slotOutputChanged()));
- connect(rec.m_fader, TQT_SIGNAL(faderChanged(float)),
- this, TQT_SLOT(slotFaderLevelChanged(float)));
+ connect(rec.m_fader, TQ_SIGNAL(faderChanged(float)),
+ this, TQ_SLOT(slotFaderLevelChanged(float)));
- connect(rec.m_pan, TQT_SIGNAL(valueChanged(float)),
- this, TQT_SLOT(slotPanChanged(float)));
+ connect(rec.m_pan, TQ_SIGNAL(valueChanged(float)),
+ this, TQ_SLOT(slotPanChanged(float)));
- connect(rec.m_soloButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotSoloChanged()));
+ connect(rec.m_soloButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotSoloChanged()));
- connect(rec.m_muteButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotMuteChanged()));
+ connect(rec.m_muteButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotMuteChanged()));
- connect(rec.m_stereoButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotChannelsChanged()));
+ connect(rec.m_stereoButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotChannelsChanged()));
- connect(rec.m_recordButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotRecordChanged()));
+ connect(rec.m_recordButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotRecordChanged()));
++count;
@@ -519,8 +519,8 @@ AudioMixerWindow::populate()
TQToolTip::add
(plugin, i18n("Audio plugin button"));
rec.m_plugins.push_back(plugin);
- connect(plugin, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotSelectPlugin()));
+ connect(plugin, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotSelectPlugin()));
}
TQLabel *idLabel = new TQLabel(i18n("Sub %1").arg(count), m_mainBox, "subMaster");
@@ -546,14 +546,14 @@ AudioMixerWindow::populate()
updateFader(count);
updatePluginButtons(count);
- connect(rec.m_fader, TQT_SIGNAL(faderChanged(float)),
- this, TQT_SLOT(slotFaderLevelChanged(float)));
+ connect(rec.m_fader, TQ_SIGNAL(faderChanged(float)),
+ this, TQ_SLOT(slotFaderLevelChanged(float)));
- connect(rec.m_pan, TQT_SIGNAL(valueChanged(float)),
- this, TQT_SLOT(slotPanChanged(float)));
+ connect(rec.m_pan, TQ_SIGNAL(valueChanged(float)),
+ this, TQ_SLOT(slotPanChanged(float)));
- connect(rec.m_muteButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotMuteChanged()));
+ connect(rec.m_muteButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotMuteChanged()));
++count;
@@ -597,11 +597,11 @@ AudioMixerWindow::populate()
m_master = rec;
updateFader(0);
- connect(rec.m_fader, TQT_SIGNAL(faderChanged(float)),
- this, TQT_SLOT(slotFaderLevelChanged(float)));
+ connect(rec.m_fader, TQ_SIGNAL(faderChanged(float)),
+ this, TQ_SLOT(slotFaderLevelChanged(float)));
- connect(rec.m_muteButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotMuteChanged()));
+ connect(rec.m_muteButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotMuteChanged()));
}
m_mainBox->show();
diff --git a/src/gui/studio/BankEditorDialog.cpp b/src/gui/studio/BankEditorDialog.cpp
index 819f031..3116884 100644
--- a/src/gui/studio/BankEditorDialog.cpp
+++ b/src/gui/studio/BankEditorDialog.cpp
@@ -113,10 +113,10 @@ BankEditorDialog::BankEditorDialog(TQWidget *parent,
layout->addWidget(m_closeButton);
layout->addSpacing(5);
- connect(m_applyButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotApply()));
- connect(m_resetButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotReset()));
+ connect(m_applyButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotApply()));
+ connect(m_resetButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotReset()));
//
// Left-side list view
@@ -191,8 +191,8 @@ BankEditorDialog::BankEditorDialog(TQWidget *parent,
(m_pastePrograms,
i18n("Paste Program names from clipboard to current Bank"));
- connect(m_listView, TQT_SIGNAL(currentChanged(TQListViewItem*)),
- this, TQT_SLOT(slotPopulateDevice(TQListViewItem*)));
+ connect(m_listView, TQ_SIGNAL(currentChanged(TQListViewItem*)),
+ this, TQ_SLOT(slotPopulateDevice(TQListViewItem*)));
TQFrame *vbox = new TQFrame(splitter);
TQVBoxLayout *vboxLayout = new TQVBoxLayout(vbox, 8, 6);
@@ -217,44 +217,44 @@ BankEditorDialog::BankEditorDialog(TQWidget *parent,
m_variationCombo->insertItem(i18n("MSB"));
// device/bank modification
- connect(m_listView, TQT_SIGNAL(itemRenamed (TQListViewItem*, const TQString&, int)),
- this, TQT_SLOT(slotModifyDeviceOrBankName(TQListViewItem*, const TQString&, int)));
+ connect(m_listView, TQ_SIGNAL(itemRenamed (TQListViewItem*, const TQString&, int)),
+ this, TQ_SLOT(slotModifyDeviceOrBankName(TQListViewItem*, const TQString&, int)));
- connect(m_addBank, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotAddBank()));
+ connect(m_addBank, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotAddBank()));
- connect(m_addKeyMapping, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotAddKeyMapping()));
+ connect(m_addKeyMapping, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotAddKeyMapping()));
- connect(m_delete, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotDelete()));
+ connect(m_delete, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotDelete()));
- connect(m_deleteAll, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotDeleteAll()));
+ connect(m_deleteAll, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotDeleteAll()));
- connect(m_importBanks, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotImport()));
+ connect(m_importBanks, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotImport()));
- connect(m_exportBanks, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotExport()));
+ connect(m_exportBanks, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotExport()));
- connect(m_copyPrograms, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotEditCopy()));
+ connect(m_copyPrograms, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotEditCopy()));
- connect(m_pastePrograms, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotEditPaste()));
+ connect(m_pastePrograms, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotEditPaste()));
- connect(m_variationToggle, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotVariationToggled()));
+ connect(m_variationToggle, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotVariationToggled()));
- connect(m_variationCombo, TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(slotVariationChanged(int)));
+ connect(m_variationCombo, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(slotVariationChanged(int)));
setupActions();
m_doc->getCommandHistory()->attachView(actionCollection());
- connect(m_doc->getCommandHistory(), TQT_SIGNAL(commandExecuted()),
- this, TQT_SLOT(slotUpdate()));
+ connect(m_doc->getCommandHistory(), TQ_SIGNAL(commandExecuted()),
+ this, TQ_SLOT(slotUpdate()));
// Initialise the dialog
//
@@ -301,14 +301,14 @@ BankEditorDialog::~BankEditorDialog()
void
BankEditorDialog::setupActions()
{
- TDEAction* close = KStdAction::close (this, TQT_SLOT(slotFileClose()), actionCollection());
+ TDEAction* close = KStdAction::close (this, TQ_SLOT(slotFileClose()), actionCollection());
m_closeButton->setText(close->text());
- connect(m_closeButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotFileClose()));
+ connect(m_closeButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotFileClose()));
- KStdAction::copy (this, TQT_SLOT(slotEditCopy()), actionCollection());
- KStdAction::paste (this, TQT_SLOT(slotEditPaste()), actionCollection());
+ KStdAction::copy (this, TQ_SLOT(slotEditCopy()), actionCollection());
+ KStdAction::paste (this, TQ_SLOT(slotEditPaste()), actionCollection());
// some adjustments
diff --git a/src/gui/studio/DeviceEditorDialog.cpp b/src/gui/studio/DeviceEditorDialog.cpp
index d71dd6f..d56bf43 100644
--- a/src/gui/studio/DeviceEditorDialog.cpp
+++ b/src/gui/studio/DeviceEditorDialog.cpp
@@ -90,11 +90,11 @@ DeviceEditorDialog::DeviceEditorDialog(TQWidget *parent,
TQPushButton *addButton = new TQPushButton(i18n("Add Play Device"), hbox);
TQPushButton *addRButton = new TQPushButton(i18n("Add Record Device"), hbox);
TQPushButton *deleteButton = new TQPushButton(i18n("Delete Device"), hbox);
- connect(addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddPlayDevice()));
- connect(addRButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddRecordDevice()));
- connect(deleteButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeleteDevice()));
- connect(m_table, TQT_SIGNAL(valueChanged(int, int)),
- this, TQT_SLOT(slotValueChanged (int, int)));
+ connect(addButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddPlayDevice()));
+ connect(addRButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddRecordDevice()));
+ connect(deleteButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDeleteDevice()));
+ connect(m_table, TQ_SIGNAL(valueChanged(int, int)),
+ this, TQ_SLOT(slotValueChanged (int, int)));
setMinimumHeight(250);
diff --git a/src/gui/studio/DeviceManagerDialog.cpp b/src/gui/studio/DeviceManagerDialog.cpp
index 727110d..b319d2a 100644
--- a/src/gui/studio/DeviceManagerDialog.cpp
+++ b/src/gui/studio/DeviceManagerDialog.cpp
@@ -138,17 +138,17 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
(m_controllersButton,
i18n("View and edit Control Events for the selected device - these are special Event types that you can define against your device and control through Control Rulers or the Instrument Parameter Box "));
- connect(addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddPlayDevice()));
- connect(m_deletePlayButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeletePlayDevice()));
- connect(m_importButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotImport()));
- connect(m_exportButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotExport()));
- connect(m_banksButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSetBanks()));
- connect(m_controllersButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSetControllers()));
-
- connect(m_playTable, TQT_SIGNAL(valueChanged(int, int)),
- this, TQT_SLOT(slotPlayValueChanged (int, int)));
- connect(m_playTable, TQT_SIGNAL(currentChanged(int, int)),
- this, TQT_SLOT(slotPlayDeviceSelected (int, int)));
+ connect(addButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddPlayDevice()));
+ connect(m_deletePlayButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDeletePlayDevice()));
+ connect(m_importButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotImport()));
+ connect(m_exportButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotExport()));
+ connect(m_banksButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSetBanks()));
+ connect(m_controllersButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSetControllers()));
+
+ connect(m_playTable, TQ_SIGNAL(valueChanged(int, int)),
+ this, TQ_SLOT(slotPlayValueChanged (int, int)));
+ connect(m_playTable, TQ_SIGNAL(currentChanged(int, int)),
+ this, TQ_SLOT(slotPlayDeviceSelected (int, int)));
mainLayout->addWidget(groupBox);
groupBox = new TQGroupBox(2, TQt::Horizontal, i18n("Record devices"), mainBox);
@@ -181,15 +181,15 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
(m_deleteRecordButton,
i18n("Delete the selected device"));
- connect(addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddRecordDevice()));
- connect(m_deleteRecordButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeleteRecordDevice()));
+ connect(addButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddRecordDevice()));
+ connect(m_deleteRecordButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDeleteRecordDevice()));
- connect(m_recordTable, TQT_SIGNAL(currentChanged(int, int)),
- this, TQT_SLOT(slotRecordDeviceSelected (int, int)));
- connect(m_recordTable, TQT_SIGNAL(valueChanged(int, int)),
- this, TQT_SLOT(slotRecordValueChanged (int, int)));
+ connect(m_recordTable, TQ_SIGNAL(currentChanged(int, int)),
+ this, TQ_SLOT(slotRecordDeviceSelected (int, int)));
+ connect(m_recordTable, TQ_SIGNAL(valueChanged(int, int)),
+ this, TQ_SLOT(slotRecordValueChanged (int, int)));
- connect(document, TQT_SIGNAL(devicesResyncd()), this, TQT_SLOT(slotDevicesResyncd()));
+ connect(document, TQ_SIGNAL(devicesResyncd()), this, TQ_SLOT(slotDevicesResyncd()));
m_noConnectionString = i18n("No connection");
@@ -213,11 +213,11 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
layout->addSpacing(5);
TDEAction* close = KStdAction::close(this,
- TQT_SLOT(slotClose()),
+ TQ_SLOT(slotClose()),
actionCollection());
closeButton->setText(close->text());
- connect(closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClose()));
+ connect(closeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClose()));
mainLayout->addWidget(btnBox);
@@ -237,8 +237,8 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
createGUI("devicemanager.rc");
m_document->getCommandHistory()->attachView(actionCollection());
- connect(m_document->getCommandHistory(), TQT_SIGNAL(commandExecuted()),
- this, TQT_SLOT(populate()));
+ connect(m_document->getCommandHistory(), TQ_SIGNAL(commandExecuted()),
+ this, TQ_SLOT(populate()));
m_playTable->setCurrentCell( -1, 0);
m_recordTable->setCurrentCell( -1, 0);
diff --git a/src/gui/studio/MidiMixerWindow.cpp b/src/gui/studio/MidiMixerWindow.cpp
index 5b1184d..1fb13bc 100644
--- a/src/gui/studio/MidiMixerWindow.cpp
+++ b/src/gui/studio/MidiMixerWindow.cpp
@@ -71,13 +71,13 @@ MidiMixerWindow::MidiMixerWindow(TQWidget *parent,
setupTabs();
KStdAction::close(this,
- TQT_SLOT(slotClose()),
+ TQ_SLOT(slotClose()),
actionCollection());
TQIconSet icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-play")));
TDEAction *play = new TDEAction(i18n("&Play"), icon, Key_Enter, this,
- TQT_SIGNAL(play()), actionCollection(), "play");
+ TQ_SIGNAL(play()), actionCollection(), "play");
// Alternative shortcut for Play
TDEShortcut playShortcut = play->shortcut();
playShortcut.append( KKey(Key_Return + CTRL) );
@@ -86,42 +86,42 @@ MidiMixerWindow::MidiMixerWindow(TQWidget *parent,
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-stop")));
new TDEAction(i18n("&Stop"), icon, Key_Insert, this,
- TQT_SIGNAL(stop()), actionCollection(), "stop");
+ TQ_SIGNAL(stop()), actionCollection(), "stop");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-rewind")));
new TDEAction(i18n("Re&wind"), icon, Key_End, this,
- TQT_SIGNAL(rewindPlayback()), actionCollection(),
+ TQ_SIGNAL(rewindPlayback()), actionCollection(),
"playback_pointer_back_bar");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-ffwd")));
new TDEAction(i18n("&Fast Forward"), icon, Key_PageDown, this,
- TQT_SIGNAL(fastForwardPlayback()), actionCollection(),
+ TQ_SIGNAL(fastForwardPlayback()), actionCollection(),
"playback_pointer_forward_bar");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-rewind-end")));
new TDEAction(i18n("Rewind to &Beginning"), icon, 0, this,
- TQT_SIGNAL(rewindPlaybackToBeginning()), actionCollection(),
+ TQ_SIGNAL(rewindPlaybackToBeginning()), actionCollection(),
"playback_pointer_start");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-ffwd-end")));
new TDEAction(i18n("Fast Forward to &End"), icon, 0, this,
- TQT_SIGNAL(fastForwardPlaybackToEnd()), actionCollection(),
+ TQ_SIGNAL(fastForwardPlaybackToEnd()), actionCollection(),
"playback_pointer_end");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-record")));
new TDEAction(i18n("&Record"), icon, 0, this,
- TQT_SIGNAL(record()), actionCollection(),
+ TQ_SIGNAL(record()), actionCollection(),
"record");
icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-panic")));
new TDEAction(i18n("Panic"), icon, Key_P + CTRL + ALT, this,
- TQT_SIGNAL(panic()), actionCollection(),
+ TQ_SIGNAL(panic()), actionCollection(),
"panic");
createGUI("midimixer.rc");
@@ -144,8 +144,8 @@ MidiMixerWindow::setupTabs()
//
m_tabWidget = new TQTabWidget(this);
setCentralWidget(m_tabWidget);
- connect(m_tabWidget, TQT_SIGNAL(currentChanged(TQWidget *)),
- this, TQT_SLOT(slotCurrentTabChanged(TQWidget *)));
+ connect(m_tabWidget, TQ_SIGNAL(currentChanged(TQWidget *)),
+ this, TQ_SLOT(slotCurrentTabChanged(TQWidget *)));
m_tabWidget->setTabPosition(TQTabWidget::Bottom);
setCaption(i18n("MIDI Mixer"));
@@ -246,8 +246,8 @@ MidiMixerWindow::setupTabs()
controller->setKnobColour(knobColour);
- connect(controller, TQT_SIGNAL(valueChanged(float)),
- this, TQT_SLOT(slotControllerChanged(float)));
+ connect(controller, TQ_SIGNAL(valueChanged(float)),
+ this, TQ_SLOT(slotControllerChanged(float)));
mainLayout->addWidget(controller, i + 1, posCount,
TQt::AlignCenter);
@@ -291,8 +291,8 @@ MidiMixerWindow::setupTabs()
// Connect them up
//
- connect(fader, TQT_SIGNAL(faderChanged(float)),
- this, TQT_SLOT(slotFaderLevelChanged(float)));
+ connect(fader, TQ_SIGNAL(faderChanged(float)),
+ this, TQ_SLOT(slotFaderLevelChanged(float)));
// Update all the faders and controllers
//
diff --git a/src/gui/studio/MidiProgramsEditor.cpp b/src/gui/studio/MidiProgramsEditor.cpp
index 82f2192..658400a 100644
--- a/src/gui/studio/MidiProgramsEditor.cpp
+++ b/src/gui/studio/MidiProgramsEditor.cpp
@@ -91,8 +91,8 @@ MidiProgramsEditor::makeAdditionalWidget(TQWidget *parent)
gridLayout->addWidget(new TQLabel(i18n("Percussion"), frame),
0, 0, AlignLeft);
gridLayout->addWidget(m_percussion, 0, 1, AlignLeft);
- connect(m_percussion, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotNewPercussion()));
+ connect(m_percussion, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotNewPercussion()));
gridLayout->addWidget(new TQLabel(i18n("MSB Value"), frame),
1, 0, AlignLeft);
@@ -108,8 +108,8 @@ MidiProgramsEditor::makeAdditionalWidget(TQWidget *parent)
(m_lsb,
i18n("Selects a LSB controller Bank number (MSB/LSB pairs are always unique for any Device)"));
- connect(m_msb, TQT_SIGNAL(valueChanged(int)),
- this, TQT_SLOT(slotNewMSB(int)));
+ connect(m_msb, TQ_SIGNAL(valueChanged(int)),
+ this, TQ_SLOT(slotNewMSB(int)));
gridLayout->addWidget(new TQLabel(i18n("LSB Value"), frame),
2, 0, AlignLeft);
@@ -117,8 +117,8 @@ MidiProgramsEditor::makeAdditionalWidget(TQWidget *parent)
m_lsb->setMaxValue(127);
gridLayout->addWidget(m_lsb, 2, 1, AlignLeft);
- connect(m_lsb, TQT_SIGNAL(valueChanged(int)),
- this, TQT_SLOT(slotNewLSB(int)));
+ connect(m_lsb, TQ_SIGNAL(valueChanged(int)),
+ this, TQ_SLOT(slotNewLSB(int)));
return frame;
}
@@ -472,12 +472,12 @@ MidiProgramsEditor::slotEntryButtonPressed()
int currentEntry = 0;
menu->insertItem(i18n("<no key mapping>"), this,
- TQT_SLOT(slotEntryMenuItemSelected(int)), 0, 0);
+ TQ_SLOT(slotEntryMenuItemSelected(int)), 0, 0);
menu->setItemParameter(0, 0);
for (int i = 0; i < kml.size(); ++i) {
menu->insertItem(strtoqstr(kml[i].getName()),
- this, TQT_SLOT(slotEntryMenuItemSelected(int)),
+ this, TQ_SLOT(slotEntryMenuItemSelected(int)),
0, i + 1);
menu->setItemParameter(i + 1, i + 1);
if (currentMapping && (kml[i] == *currentMapping))
diff --git a/src/gui/studio/NameSetEditor.cpp b/src/gui/studio/NameSetEditor.cpp
index 0abd9b8..8071a2d 100644
--- a/src/gui/studio/NameSetEditor.cpp
+++ b/src/gui/studio/NameSetEditor.cpp
@@ -103,9 +103,9 @@ NameSetEditor::NameSetEditor(BankEditorDialog* bankEditor,
// Initial label; button to adjust whether labels start at 0 or 1
m_initialLabel = new TQPushButton(numberText, numBox);
connect(m_initialLabel,
- TQT_SIGNAL(clicked()),
+ TQ_SIGNAL(clicked()),
this,
- TQT_SLOT(slotToggleInitialLabel()));
+ TQ_SLOT(slotToggleInitialLabel()));
} else {
TQLabel *label = new TQLabel(numberText, numBox);
label->setFixedWidth(40);
@@ -120,8 +120,8 @@ NameSetEditor::NameSetEditor(BankEditorDialog* bankEditor,
button->setMaximumWidth(40);
button->setMaximumHeight(20);
button->setFlat(true);
- connect(button, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotEntryButtonPressed()));
+ connect(button, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotEntryButtonPressed()));
m_entryButtons.push_back(button);
}
@@ -132,9 +132,9 @@ NameSetEditor::NameSetEditor(BankEditorDialog* bankEditor,
m_names.push_back(lineEdit);
connect(m_names[labelId],
- TQT_SIGNAL(textChanged(const TQString&)),
+ TQ_SIGNAL(textChanged(const TQString&)),
this,
- TQT_SLOT(slotNameChanged(const TQString&)));
+ TQ_SLOT(slotNameChanged(const TQString&)));
++labelId;
}
diff --git a/src/gui/studio/RemapInstrumentDialog.cpp b/src/gui/studio/RemapInstrumentDialog.cpp
index 90fa599..26f56e6 100644
--- a/src/gui/studio/RemapInstrumentDialog.cpp
+++ b/src/gui/studio/RemapInstrumentDialog.cpp
@@ -65,8 +65,8 @@ RemapInstrumentDialog::RemapInstrumentDialog(TQWidget *parent,
m_instrumentButton = new TQRadioButton(i18n("Instrument"), m_buttonGroup);
- connect(m_buttonGroup, TQT_SIGNAL(released(int)),
- this, TQT_SLOT(slotRemapReleased(int)));
+ connect(m_buttonGroup, TQ_SIGNAL(released(int)),
+ this, TQ_SLOT(slotRemapReleased(int)));
TQGroupBox *groupBox = new TQGroupBox(2, TQt::Horizontal,
i18n("Choose Source and Destination"),
diff --git a/src/gui/studio/SynthPluginManagerDialog.cpp b/src/gui/studio/SynthPluginManagerDialog.cpp
index 4c05314..6a293b2 100644
--- a/src/gui/studio/SynthPluginManagerDialog.cpp
+++ b/src/gui/studio/SynthPluginManagerDialog.cpp
@@ -133,8 +133,8 @@ SynthPluginManagerDialog::SynthPluginManagerDialog(TQWidget *parent,
}
}
- connect(pluginCombo, TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(slotPluginChanged(int)));
+ connect(pluginCombo, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(slotPluginChanged(int)));
pluginLayout->addWidget(pluginCombo, i, 1);
@@ -142,7 +142,7 @@ SynthPluginManagerDialog::SynthPluginManagerDialog(TQWidget *parent,
TQPushButton *controlsButton = new TQPushButton(i18n("Controls"), pluginFrame);
pluginLayout->addWidget(controlsButton, i, 2);
- connect(controlsButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotControlsButtonClicked()));
+ connect(controlsButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotControlsButtonClicked()));
m_controlsButtons.push_back(controlsButton);
#ifdef HAVE_LIBLO
@@ -151,7 +151,7 @@ SynthPluginManagerDialog::SynthPluginManagerDialog(TQWidget *parent,
pluginLayout->addWidget(guiButton, i, 3);
guiButton->setEnabled(m_guiManager->hasGUI
(id, Instrument::SYNTH_PLUGIN_POSITION));
- connect(guiButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotGUIButtonClicked()));
+ connect(guiButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotGUIButtonClicked()));
m_guiButtons.push_back(guiButton);
#endif
@@ -170,11 +170,11 @@ SynthPluginManagerDialog::SynthPluginManagerDialog(TQWidget *parent,
layout->addSpacing(5);
TDEAction* close = KStdAction::close(this,
- TQT_SLOT(slotClose()),
+ TQ_SLOT(slotClose()),
actionCollection());
closeButton->setText(close->text());
- connect(closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClose()));
+ connect(closeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClose()));
mainLayout->addWidget(btnBox);
diff --git a/src/gui/studio/TimerCallbackAssistant.cpp b/src/gui/studio/TimerCallbackAssistant.cpp
index 453e620..e37c5b6 100644
--- a/src/gui/studio/TimerCallbackAssistant.cpp
+++ b/src/gui/studio/TimerCallbackAssistant.cpp
@@ -36,7 +36,7 @@ TimerCallbackAssistant::TimerCallbackAssistant(int ms, void (*callback)(void *da
m_data(data)
{
TQTimer *timer = new TQTimer(this);
- connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCallback()));
+ connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotCallback()));
timer->start(ms, FALSE);
}
diff --git a/src/gui/widgets/AudioFaderBox.cpp b/src/gui/widgets/AudioFaderBox.cpp
index 5103719..3a0ebc3 100644
--- a/src/gui/widgets/AudioFaderBox.cpp
+++ b/src/gui/widgets/AudioFaderBox.cpp
@@ -81,8 +81,8 @@ AudioFaderBox::AudioFaderBox(TQWidget *parent,
m_plugins.push_back(plugin);
m_signalMapper->setMapping(plugin, i);
- connect(plugin, TQT_SIGNAL(clicked()),
- m_signalMapper, TQT_SLOT(map()));
+ connect(plugin, TQ_SIGNAL(clicked()),
+ m_signalMapper, TQ_SLOT(map()));
}
m_synthButton = new TQPushButton(this);
@@ -127,8 +127,8 @@ AudioFaderBox::AudioFaderBox(TQWidget *parent,
m_stereoButton->setPixmap(m_monoPixmap); // default is mono
m_stereoButton->setFixedSize(24, 24);
- connect(m_stereoButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotChannelStateChanged()));
+ connect(m_stereoButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotChannelStateChanged()));
m_synthGUIButton = new TQPushButton(this);
m_synthGUIButton->setText(i18n("Editor"));
diff --git a/src/gui/widgets/AudioRouteMenu.cpp b/src/gui/widgets/AudioRouteMenu.cpp
index 02d33ba..7b2b120 100644
--- a/src/gui/widgets/AudioRouteMenu.cpp
+++ b/src/gui/widgets/AudioRouteMenu.cpp
@@ -58,15 +58,15 @@ AudioRouteMenu::AudioRouteMenu(TQWidget *par,
case Compact: {
m_combo = 0;
m_button = new WheelyButton(par);
- connect(m_button, TQT_SIGNAL(wheel(bool)), this, TQT_SLOT(slotWheel(bool)));
- connect(m_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotShowMenu()));
+ connect(m_button, TQ_SIGNAL(wheel(bool)), this, TQ_SLOT(slotWheel(bool)));
+ connect(m_button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotShowMenu()));
break;
}
case Regular: {
m_button = 0;
m_combo = new KComboBox(par);
- connect(m_combo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotEntrySelected(int)));
+ connect(m_combo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotEntrySelected(int)));
break;
}
@@ -135,7 +135,7 @@ AudioRouteMenu::slotShowMenu()
for (int i = 0; i < getNumEntries(); ++i) {
- menu->insertItem(getEntryText(i), this, TQT_SLOT(slotEntrySelected(int)),
+ menu->insertItem(getEntryText(i), this, TQ_SLOT(slotEntrySelected(int)),
0, i);
menu->setItemParameter(i, i);
}
diff --git a/src/gui/widgets/CollapsingFrame.cpp b/src/gui/widgets/CollapsingFrame.cpp
index f34cc99..dddf415 100644
--- a/src/gui/widgets/CollapsingFrame.cpp
+++ b/src/gui/widgets/CollapsingFrame.cpp
@@ -62,7 +62,7 @@ CollapsingFrame::CollapsingFrame(TQString label, TQWidget *parent, const char *n
TQPixmap pixmap(pixmapDir + "/misc/arrow-expanded.png");
m_toggleButton->setIconSet(pixmap);
- connect(m_toggleButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggle()));
+ connect(m_toggleButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(toggle()));
m_layout->addMultiCellWidget(m_toggleButton, 0, 0, 0, 2);
}
diff --git a/src/gui/widgets/ColourTable.cpp b/src/gui/widgets/ColourTable.cpp
index 503e1d2..4845b9c 100644
--- a/src/gui/widgets/ColourTable.cpp
+++ b/src/gui/widgets/ColourTable.cpp
@@ -49,8 +49,8 @@ ColourTable::ColourTable
horizontalHeader()->setLabel(0, i18n("Name"));
horizontalHeader()->setLabel(1, i18n("Color"));
populate_table(input, list);
- connect(this, TQT_SIGNAL(doubleClicked(int, int, int, const TQPoint&)),
- TQT_SLOT(slotEditEntry(int, int)));
+ connect(this, TQ_SIGNAL(doubleClicked(int, int, int, const TQPoint&)),
+ TQ_SLOT(slotEditEntry(int, int)));
}
diff --git a/src/gui/widgets/CurrentProgressDialog.cpp b/src/gui/widgets/CurrentProgressDialog.cpp
index b3d1c3c..7c85993 100644
--- a/src/gui/widgets/CurrentProgressDialog.cpp
+++ b/src/gui/widgets/CurrentProgressDialog.cpp
@@ -54,8 +54,8 @@ CurrentProgressDialog::set(ProgressDialog* d)
m_currentProgressDialog = d;
// this lets the progress dialog deregister itself when it's deleted
- connect(d, TQT_SIGNAL(destroyed()),
- getInstance(), TQT_SLOT(slotCurrentProgressDialogDestroyed()));
+ connect(d, TQ_SIGNAL(destroyed()),
+ getInstance(), TQ_SLOT(slotCurrentProgressDialogDestroyed()));
}
void CurrentProgressDialog::freeze()
diff --git a/src/gui/widgets/DiatonicPitchChooser.cpp b/src/gui/widgets/DiatonicPitchChooser.cpp
index aae228b..d58fbe8 100644
--- a/src/gui/widgets/DiatonicPitchChooser.cpp
+++ b/src/gui/widgets/DiatonicPitchChooser.cpp
@@ -89,41 +89,41 @@ DiatonicPitchChooser::DiatonicPitchChooser(TQString title,
m_pitchLabel->setMinimumWidth(40);
- connect(m_accidental, TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(slotSetAccidental(int)));
+ connect(m_accidental, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(slotSetAccidental(int)));
- connect(m_octave, TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(slotSetOctave(int)));
+ connect(m_octave, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(slotSetOctave(int)));
- connect(m_step, TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(slotSetStep(int)));
+ connect(m_step, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(slotSetStep(int)));
- //connect(m_pitch, TQT_SIGNAL(valueChanged(int)),
- // this, TQT_SIGNAL(pitchChanged(int)));
+ //connect(m_pitch, TQ_SIGNAL(valueChanged(int)),
+ // this, TQ_SIGNAL(pitchChanged(int)));
- //connect(m_pitch, TQT_SIGNAL(valueChanged(int)),
- // this, TQT_SIGNAL(preview(int)));
+ //connect(m_pitch, TQ_SIGNAL(valueChanged(int)),
+ // this, TQ_SIGNAL(preview(int)));
- connect(m_pitchDragLabel, TQT_SIGNAL(pitchDragged(int,int,int)),
- this, TQT_SLOT(slotSetNote(int,int,int)));
+ connect(m_pitchDragLabel, TQ_SIGNAL(pitchDragged(int,int,int)),
+ this, TQ_SLOT(slotSetNote(int,int,int)));
- //connect(m_pitchDragLabel, TQT_SIGNAL(pitchChanged(int)),
- // this, TQT_SLOT(slotSetPitch(int)));
+ //connect(m_pitchDragLabel, TQ_SIGNAL(pitchChanged(int)),
+ // this, TQ_SLOT(slotSetPitch(int)));
- connect(m_pitchDragLabel, TQT_SIGNAL(pitchChanged(int,int,int)),
- this, TQT_SLOT(slotSetNote(int,int,int)));
+ connect(m_pitchDragLabel, TQ_SIGNAL(pitchChanged(int,int,int)),
+ this, TQ_SLOT(slotSetNote(int,int,int)));
- //connect(m_pitchDragLabel, TQT_SIGNAL(pitchChanged(int)),
- // this, TQT_SIGNAL(pitchChanged(int)));
+ //connect(m_pitchDragLabel, TQ_SIGNAL(pitchChanged(int)),
+ // this, TQ_SIGNAL(pitchChanged(int)));
- connect(m_pitchDragLabel, TQT_SIGNAL(pitchDragged(int,int,int)),
- this, TQT_SIGNAL(noteChanged(int,int,int)));
+ connect(m_pitchDragLabel, TQ_SIGNAL(pitchDragged(int,int,int)),
+ this, TQ_SIGNAL(noteChanged(int,int,int)));
- connect(m_pitchDragLabel, TQT_SIGNAL(pitchChanged(int,int,int)),
- this, TQT_SIGNAL(noteChanged(int,int,int)));
+ connect(m_pitchDragLabel, TQ_SIGNAL(pitchChanged(int,int,int)),
+ this, TQ_SIGNAL(noteChanged(int,int,int)));
- connect(m_pitchDragLabel, TQT_SIGNAL(preview(int)),
- this, TQT_SIGNAL(preview(int)));
+ connect(m_pitchDragLabel, TQ_SIGNAL(preview(int)),
+ this, TQ_SIGNAL(preview(int)));
}
diff --git a/src/gui/widgets/Fader.cpp b/src/gui/widgets/Fader.cpp
index d7a24ea..f3cad71 100644
--- a/src/gui/widgets/Fader.cpp
+++ b/src/gui/widgets/Fader.cpp
@@ -76,7 +76,7 @@ Fader::Fader(AudioLevel::FaderType type,
calculateGroovePixmap();
setFader(0.0);
- connect(m_floatTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotFloatTimeout()));
+ connect(m_floatTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotFloatTimeout()));
m_float->hide();
}
@@ -113,7 +113,7 @@ Fader::Fader(int min, int max, int deflt,
calculateGroovePixmap();
setFader(deflt);
- connect(m_floatTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotFloatTimeout()));
+ connect(m_floatTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotFloatTimeout()));
m_float->hide();
}
@@ -144,7 +144,7 @@ Fader::Fader(int min, int max, int deflt,
calculateGroovePixmap();
setFader(deflt);
- connect(m_floatTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotFloatTimeout()));
+ connect(m_floatTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotFloatTimeout()));
m_float->hide();
}
diff --git a/src/gui/widgets/HSpinBox.cpp b/src/gui/widgets/HSpinBox.cpp
index 0c8639b..8534205 100644
--- a/src/gui/widgets/HSpinBox.cpp
+++ b/src/gui/widgets/HSpinBox.cpp
@@ -64,7 +64,7 @@ HSpinBox::HSpinBox( TQWidget* parent, float initialValue, int step,
initialize(decimals);
setValuef(initialValue);
if (recv != NULL && mem != NULL)
- TQObject::connect(this, TQT_SIGNAL(valueChanged(int)), recv, mem);
+ TQObject::connect(this, TQ_SIGNAL(valueChanged(int)), recv, mem);
}
float HSpinBox::valuef() { return float(value()) / m_scaleFactor; }
diff --git a/src/gui/widgets/PitchChooser.cpp b/src/gui/widgets/PitchChooser.cpp
index d56b028..060009e 100644
--- a/src/gui/widgets/PitchChooser.cpp
+++ b/src/gui/widgets/PitchChooser.cpp
@@ -59,26 +59,26 @@ PitchChooser::PitchChooser(TQString title,
m_pitchLabel = new TQLabel(pl.getTQString(), hbox);
m_pitchLabel->setMinimumWidth(40);
- connect(m_pitch, TQT_SIGNAL(valueChanged(int)),
- this, TQT_SLOT(slotSetPitch(int)));
+ connect(m_pitch, TQ_SIGNAL(valueChanged(int)),
+ this, TQ_SLOT(slotSetPitch(int)));
- connect(m_pitch, TQT_SIGNAL(valueChanged(int)),
- this, TQT_SIGNAL(pitchChanged(int)));
+ connect(m_pitch, TQ_SIGNAL(valueChanged(int)),
+ this, TQ_SIGNAL(pitchChanged(int)));
- connect(m_pitch, TQT_SIGNAL(valueChanged(int)),
- this, TQT_SIGNAL(preview(int)));
+ connect(m_pitch, TQ_SIGNAL(valueChanged(int)),
+ this, TQ_SIGNAL(preview(int)));
- connect(m_pitchDragLabel, TQT_SIGNAL(pitchDragged(int)),
- this, TQT_SLOT(slotSetPitch(int)));
+ connect(m_pitchDragLabel, TQ_SIGNAL(pitchDragged(int)),
+ this, TQ_SLOT(slotSetPitch(int)));
- connect(m_pitchDragLabel, TQT_SIGNAL(pitchChanged(int)),
- this, TQT_SLOT(slotSetPitch(int)));
+ connect(m_pitchDragLabel, TQ_SIGNAL(pitchChanged(int)),
+ this, TQ_SLOT(slotSetPitch(int)));
- connect(m_pitchDragLabel, TQT_SIGNAL(pitchChanged(int)),
- this, TQT_SIGNAL(pitchChanged(int)));
+ connect(m_pitchDragLabel, TQ_SIGNAL(pitchChanged(int)),
+ this, TQ_SIGNAL(pitchChanged(int)));
- connect(m_pitchDragLabel, TQT_SIGNAL(preview(int)),
- this, TQT_SIGNAL(preview(int)));
+ connect(m_pitchDragLabel, TQ_SIGNAL(preview(int)),
+ this, TQ_SIGNAL(preview(int)));
}
diff --git a/src/gui/widgets/PluginControl.cpp b/src/gui/widgets/PluginControl.cpp
index 10b5476..b075cba 100644
--- a/src/gui/widgets/PluginControl.cpp
+++ b/src/gui/widgets/PluginControl.cpp
@@ -146,8 +146,8 @@ PluginControl::PluginControl(TQWidget *parent,
m_dial->setKnobColour(GUIPalette::getColour(GUIPalette::RotaryPlugin));
- connect(m_dial, TQT_SIGNAL(valueChanged(float)),
- this, TQT_SLOT(slotValueChanged(float)));
+ connect(m_dial, TQ_SIGNAL(valueChanged(float)),
+ this, TQ_SLOT(slotValueChanged(float)));
TQLabel *upp;
if (port->getDisplayHint() &
diff --git a/src/gui/widgets/ProgressDialog.cpp b/src/gui/widgets/ProgressDialog.cpp
index bcc5c2c..1f17e80 100644
--- a/src/gui/widgets/ProgressDialog.cpp
+++ b/src/gui/widgets/ProgressDialog.cpp
@@ -52,8 +52,8 @@ ProgressDialog::ProgressDialog(TQWidget *creator,
RG_DEBUG << "ProgressDialog::ProgressDialog type 1 - "
<< labelText() << " - modal : " << modal << endl;
- connect(progressBar(), TQT_SIGNAL(percentageChanged (int)),
- this, TQT_SLOT(slotCheckShow(int)));
+ connect(progressBar(), TQ_SIGNAL(percentageChanged (int)),
+ this, TQ_SLOT(slotCheckShow(int)));
m_chrono.start();
@@ -83,8 +83,8 @@ ProgressDialog::ProgressDialog(
RG_DEBUG << "ProgressDialog::ProgressDialog type 2 - "
<< labelText << " - modal : " << modal << endl;
- connect(progressBar(), TQT_SIGNAL(percentageChanged (int)),
- this, TQT_SLOT(slotCheckShow(int)));
+ connect(progressBar(), TQ_SIGNAL(percentageChanged (int)),
+ this, TQ_SLOT(slotCheckShow(int)));
m_chrono.start();
diff --git a/src/gui/widgets/QuantizeParameters.cpp b/src/gui/widgets/QuantizeParameters.cpp
index c28e331..e69dbaa 100644
--- a/src/gui/widgets/QuantizeParameters.cpp
+++ b/src/gui/widgets/QuantizeParameters.cpp
@@ -180,8 +180,8 @@ QuantizeParameters::QuantizeParameters(TQWidget *parent,
m_advancedButton =
new TQPushButton(i18n("Show advanced options"), this);
m_mainLayout->addWidget(m_advancedButton, zero + 2, 0, TQt::AlignLeft);
- TQObject::connect(m_advancedButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotAdvancedChanged()));
+ TQObject::connect(m_advancedButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotAdvancedChanged()));
}
TQFrame *postFrame = new TQFrame(m_postProcessingBox);
@@ -335,7 +335,7 @@ QuantizeParameters::QuantizeParameters(TQWidget *parent,
break;
}
- connect(m_typeCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTypeChanged(int)));
+ connect(m_typeCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTypeChanged(int)));
}
Quantizer *
diff --git a/src/gui/widgets/Rotary.cpp b/src/gui/widgets/Rotary.cpp
index 4b5134f..8dc3d5c 100644
--- a/src/gui/widgets/Rotary.cpp
+++ b/src/gui/widgets/Rotary.cpp
@@ -97,8 +97,8 @@ Rotary::Rotary(TQWidget *parent,
}
// connect timer
- connect(_floatTimer, TQT_SIGNAL(timeout()), this,
- TQT_SLOT(slotFloatTimeout()));
+ connect(_floatTimer, TQ_SIGNAL(timeout()), this,
+ TQ_SLOT(slotFloatTimeout()));
_float->hide();
TQToolTip::add
@@ -113,8 +113,8 @@ Rotary::~Rotary()
{
// Remove this connection
//
- disconnect(_floatTimer, TQT_SIGNAL(timeout()), this,
- TQT_SLOT(slotFloatTimeout()));
+ disconnect(_floatTimer, TQ_SIGNAL(timeout()), this,
+ TQ_SLOT(slotFloatTimeout()));
delete _float;
_float = 0;
diff --git a/src/gui/widgets/TimeWidget.cpp b/src/gui/widgets/TimeWidget.cpp
index 9fdddf6..11cf037 100644
--- a/src/gui/widgets/TimeWidget.cpp
+++ b/src/gui/widgets/TimeWidget.cpp
@@ -129,8 +129,8 @@ TimeWidget::init(bool editable)
(NotePixmapFactory::makeNoteMenuPixmap(duration, error));
m_note->insertItem(pmap, label); // ignore error
}
- connect(m_note, TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(slotNoteChanged(int)));
+ connect(m_note, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(slotNoteChanged(int)));
layout->addMultiCellWidget(m_note, 0, 0, 1, 3);
} else {
@@ -154,8 +154,8 @@ TimeWidget::init(bool editable)
m_timeT = new TQSpinBox(frame);
m_timeT->setLineStep
(Note(Note::Shortest).getDuration());
- connect(m_timeT, TQT_SIGNAL(valueChanged(int)),
- this, TQT_SLOT(slotTimeTChanged(int)));
+ connect(m_timeT, TQ_SIGNAL(valueChanged(int)),
+ this, TQ_SLOT(slotTimeTChanged(int)));
layout->addWidget(m_timeT, 0, 5);
} else {
m_timeT = 0;
@@ -176,8 +176,8 @@ TimeWidget::init(bool editable)
m_timeT = new TQSpinBox(frame);
m_timeT->setLineStep
(Note(Note::Shortest).getDuration());
- connect(m_timeT, TQT_SIGNAL(valueChanged(int)),
- this, TQT_SLOT(slotTimeTChanged(int)));
+ connect(m_timeT, TQ_SIGNAL(valueChanged(int)),
+ this, TQ_SLOT(slotTimeTChanged(int)));
layout->addWidget(m_timeT, 0, 1);
layout->addWidget(new TQLabel(i18n("units"), frame), 0, 2);
} else {
@@ -197,8 +197,8 @@ TimeWidget::init(bool editable)
m_bar = new TQSpinBox(frame);
if (m_isDuration)
m_bar->setMinValue(0);
- connect(m_bar, TQT_SIGNAL(valueChanged(int)),
- this, TQT_SLOT(slotBarBeatOrFractionChanged(int)));
+ connect(m_bar, TQ_SIGNAL(valueChanged(int)),
+ this, TQ_SLOT(slotBarBeatOrFractionChanged(int)));
layout->addWidget(m_bar, 1, 1);
} else {
m_bar = 0;
@@ -215,8 +215,8 @@ TimeWidget::init(bool editable)
m_beatLabel = 0;
m_beat = new TQSpinBox(frame);
m_beat->setMinValue(1);
- connect(m_beat, TQT_SIGNAL(valueChanged(int)),
- this, TQT_SLOT(slotBarBeatOrFractionChanged(int)));
+ connect(m_beat, TQ_SIGNAL(valueChanged(int)),
+ this, TQ_SLOT(slotBarBeatOrFractionChanged(int)));
layout->addWidget(m_beat, 1, 3);
} else {
m_beat = 0;
@@ -236,8 +236,8 @@ TimeWidget::init(bool editable)
m_fractionLabel = 0;
m_fraction = new TQSpinBox(frame);
m_fraction->setMinValue(1);
- connect(m_fraction, TQT_SIGNAL(valueChanged(int)),
- this, TQT_SLOT(slotBarBeatOrFractionChanged(int)));
+ connect(m_fraction, TQ_SIGNAL(valueChanged(int)),
+ this, TQ_SLOT(slotBarBeatOrFractionChanged(int)));
layout->addWidget(m_fraction, 1, 5);
} else {
m_fraction = 0;
@@ -258,8 +258,8 @@ TimeWidget::init(bool editable)
m_sec = new TQSpinBox(frame);
if (m_isDuration)
m_sec->setMinValue(0);
- connect(m_sec, TQT_SIGNAL(valueChanged(int)),
- this, TQT_SLOT(slotSecOrMSecChanged(int)));
+ connect(m_sec, TQ_SIGNAL(valueChanged(int)),
+ this, TQ_SLOT(slotSecOrMSecChanged(int)));
layout->addWidget(m_sec, 2, 1);
} else {
m_sec = 0;
@@ -277,8 +277,8 @@ TimeWidget::init(bool editable)
m_msec = new TQSpinBox(frame);
m_msec->setMinValue(0);
m_msec->setLineStep(10);
- connect(m_msec, TQT_SIGNAL(valueChanged(int)),
- this, TQT_SLOT(slotSecOrMSecChanged(int)));
+ connect(m_msec, TQ_SIGNAL(valueChanged(int)),
+ this, TQ_SLOT(slotSecOrMSecChanged(int)));
layout->addWidget(m_msec, 2, 3);
} else {
m_msec = 0;
diff --git a/src/gui/widgets/VUMeter.cpp b/src/gui/widgets/VUMeter.cpp
index 145139c..8838ad4 100644
--- a/src/gui/widgets/VUMeter.cpp
+++ b/src/gui/widgets/VUMeter.cpp
@@ -92,26 +92,26 @@ VUMeter::VUMeter(TQWidget *parent,
//
m_fallTimerLeft = new TQTimer();
- connect(m_fallTimerLeft, TQT_SIGNAL(timeout()),
- this, TQT_SLOT(slotReduceLevelLeft()));
+ connect(m_fallTimerLeft, TQ_SIGNAL(timeout()),
+ this, TQ_SLOT(slotReduceLevelLeft()));
if (m_showPeakLevel) {
m_peakTimerLeft = new TQTimer();
- connect(m_peakTimerLeft, TQT_SIGNAL(timeout()),
- this, TQT_SLOT(slotStopShowingPeakLeft()));
+ connect(m_peakTimerLeft, TQ_SIGNAL(timeout()),
+ this, TQ_SLOT(slotStopShowingPeakLeft()));
}
if (stereo) {
m_fallTimerRight = new TQTimer();
- connect(m_fallTimerRight, TQT_SIGNAL(timeout()),
- this, TQT_SLOT(slotReduceLevelRight()));
+ connect(m_fallTimerRight, TQ_SIGNAL(timeout()),
+ this, TQ_SLOT(slotReduceLevelRight()));
if (m_showPeakLevel) {
m_peakTimerRight = new TQTimer();
- connect(m_peakTimerRight, TQT_SIGNAL(timeout()),
- this, TQT_SLOT(slotStopShowingPeakRight()));
+ connect(m_peakTimerRight, TQ_SIGNAL(timeout()),
+ this, TQ_SLOT(slotStopShowingPeakRight()));
}
}
diff --git a/src/sequencer/RosegardenSequencerApp.cpp b/src/sequencer/RosegardenSequencerApp.cpp
index 2fb3345..fee7e93 100644
--- a/src/sequencer/RosegardenSequencerApp.cpp
+++ b/src/sequencer/RosegardenSequencerApp.cpp
@@ -118,8 +118,8 @@ RosegardenSequencerApp::RosegardenSequencerApp() :
// Check for new clients every so often
//
m_newClientTimer = new TQTimer(this);
- connect(m_newClientTimer, TQT_SIGNAL(timeout()),
- this, TQT_SLOT(slotCheckForNewClients()));
+ connect(m_newClientTimer, TQ_SIGNAL(timeout()),
+ this, TQ_SLOT(slotCheckForNewClients()));
m_newClientTimer->start(3000); // every 3 seconds
}
diff --git a/src/sequencer/main.cpp b/src/sequencer/main.cpp
index 7fb8bec..4ebf7b4 100644
--- a/src/sequencer/main.cpp
+++ b/src/sequencer/main.cpp
@@ -101,7 +101,7 @@ int main(int argc, char *argv[])
roseSeq = new RosegardenSequencerApp;
}
- TQObject::connect(&app, TQT_SIGNAL(lastWindowClosed()), &app, TQT_SLOT(quit()));
+ TQObject::connect(&app, TQ_SIGNAL(lastWindowClosed()), &app, TQ_SLOT(quit()));
app.disableSessionManagement(); // we don't want to be
// saved/restored by session
diff --git a/src/sound/AudioFileManager.cpp b/src/sound/AudioFileManager.cpp
index 0628c92..f7bae68 100644
--- a/src/sound/AudioFileManager.cpp
+++ b/src/sound/AudioFileManager.cpp
@@ -95,8 +95,8 @@ AudioFileManager::AudioFileManager() :
// Retransmit progress
//
- connect(&m_peakManager, TQT_SIGNAL(setProgress(int)),
- this, TQT_SIGNAL(setProgress(int)));
+ connect(&m_peakManager, TQ_SIGNAL(setProgress(int)),
+ this, TQ_SIGNAL(setProgress(int)));
}
AudioFileManager::~AudioFileManager()
diff --git a/src/sound/PeakFileManager.cpp b/src/sound/PeakFileManager.cpp
index 85fed3a..ec51458 100644
--- a/src/sound/PeakFileManager.cpp
+++ b/src/sound/PeakFileManager.cpp
@@ -176,8 +176,8 @@ PeakFileManager::generatePeaks(AudioFile *audioFile,
if (audioFile->getType() == WAV) {
m_currentPeakFile = getPeakFile(audioFile);
- TQObject::connect(m_currentPeakFile, TQT_SIGNAL(setProgress(int)),
- this, TQT_SIGNAL(setProgress(int)));
+ TQObject::connect(m_currentPeakFile, TQ_SIGNAL(setProgress(int)),
+ this, TQ_SIGNAL(setProgress(int)));
// Just write out a peak file
//