summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
commit3fcef18c75f7cd751ed706c12977230242fb817d (patch)
treea94c2497a3923ed9972e71c5bbba0697882c1427
parent80ee419f074dc252449791628d4584b5c0ea0c9b (diff)
downloadrosegarden-3fcef18c.tar.gz
rosegarden-3fcef18c.zip
rename the following methods:
tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/rosegarden@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--src/base/AnalysisTypes.cpp20
-rw-r--r--src/base/AnalysisTypes.h2
-rw-r--r--src/base/Instrument.h4
-rw-r--r--src/base/MidiProgram.h2
-rw-r--r--src/document/RoseXmlHandler.cpp2
-rw-r--r--src/document/RosegardenGUIDoc.cpp20
-rw-r--r--src/document/RosegardenGUIDoc.h4
-rw-r--r--src/document/io/CsoundExporter.cpp4
-rw-r--r--src/document/io/CsoundExporter.h2
-rw-r--r--src/document/io/HydrogenLoader.cpp4
-rw-r--r--src/document/io/HydrogenLoader.h2
-rw-r--r--src/document/io/LilyPondExporter.cpp12
-rw-r--r--src/document/io/LilyPondExporter.h4
-rw-r--r--src/document/io/MupExporter.cpp4
-rw-r--r--src/document/io/MupExporter.h2
-rw-r--r--src/document/io/MusicXmlExporter.cpp4
-rw-r--r--src/document/io/MusicXmlExporter.h2
-rw-r--r--src/document/io/RG21Loader.cpp4
-rw-r--r--src/document/io/RG21Loader.h2
-rw-r--r--src/gui/application/RosegardenGUIApp.cpp32
-rw-r--r--src/gui/application/RosegardenGUIApp.cpp.orig32
-rw-r--r--src/gui/application/RosegardenGUIApp.h14
-rw-r--r--src/gui/application/RosegardenGUIView.cpp8
-rw-r--r--src/gui/application/RosegardenGUIView.h4
-rw-r--r--src/gui/application/main.cpp2
-rw-r--r--src/gui/configuration/AudioConfigurationPage.cpp4
-rw-r--r--src/gui/configuration/AudioConfigurationPage.h2
-rw-r--r--src/gui/configuration/AudioPropertiesPage.cpp4
-rw-r--r--src/gui/configuration/AudioPropertiesPage.h2
-rw-r--r--src/gui/configuration/ColourConfigurationPage.cpp4
-rw-r--r--src/gui/configuration/ColourConfigurationPage.h2
-rw-r--r--src/gui/configuration/ConfigurationPage.h12
-rw-r--r--src/gui/configuration/DocumentMetaConfigurationPage.cpp4
-rw-r--r--src/gui/configuration/DocumentMetaConfigurationPage.h2
-rw-r--r--src/gui/configuration/GeneralConfigurationPage.cpp4
-rw-r--r--src/gui/configuration/GeneralConfigurationPage.h2
-rw-r--r--src/gui/configuration/HeadersConfigurationPage.cpp4
-rw-r--r--src/gui/configuration/HeadersConfigurationPage.h2
-rw-r--r--src/gui/configuration/LatencyConfigurationPage.cpp4
-rw-r--r--src/gui/configuration/LatencyConfigurationPage.h2
-rw-r--r--src/gui/configuration/MIDIConfigurationPage.cpp4
-rw-r--r--src/gui/configuration/MIDIConfigurationPage.h2
-rw-r--r--src/gui/configuration/MatrixConfigurationPage.cpp4
-rw-r--r--src/gui/configuration/MatrixConfigurationPage.h2
-rw-r--r--src/gui/configuration/NotationConfigurationPage.cpp4
-rw-r--r--src/gui/configuration/NotationConfigurationPage.h2
-rw-r--r--src/gui/configuration/TabbedConfigurationPage.cpp12
-rw-r--r--src/gui/configuration/TabbedConfigurationPage.h6
-rw-r--r--src/gui/dialogs/AddTracksDialog.cpp4
-rw-r--r--src/gui/dialogs/AddTracksDialog.h2
-rw-r--r--src/gui/dialogs/AudioManagerDialog.cpp8
-rw-r--r--src/gui/dialogs/AudioManagerDialog.h2
-rw-r--r--src/gui/dialogs/AudioPlayingDialog.cpp4
-rw-r--r--src/gui/dialogs/AudioPlayingDialog.h2
-rw-r--r--src/gui/dialogs/AudioPluginDialog.cpp12
-rw-r--r--src/gui/dialogs/AudioPluginDialog.h2
-rw-r--r--src/gui/dialogs/AudioSplitDialog.cpp4
-rw-r--r--src/gui/dialogs/AudioSplitDialog.h2
-rw-r--r--src/gui/dialogs/BeatsBarsDialog.cpp4
-rw-r--r--src/gui/dialogs/BeatsBarsDialog.h2
-rw-r--r--src/gui/dialogs/ClefDialog.cpp4
-rw-r--r--src/gui/dialogs/ClefDialog.h2
-rw-r--r--src/gui/dialogs/CompositionLengthDialog.cpp4
-rw-r--r--src/gui/dialogs/CompositionLengthDialog.h2
-rw-r--r--src/gui/dialogs/ConfigureDialog.cpp4
-rw-r--r--src/gui/dialogs/ConfigureDialog.h2
-rw-r--r--src/gui/dialogs/ConfigureDialogBase.cpp4
-rw-r--r--src/gui/dialogs/ConfigureDialogBase.h2
-rw-r--r--src/gui/dialogs/CountdownBar.cpp4
-rw-r--r--src/gui/dialogs/CountdownBar.h2
-rw-r--r--src/gui/dialogs/CountdownDialog.cpp4
-rw-r--r--src/gui/dialogs/CountdownDialog.h2
-rw-r--r--src/gui/dialogs/DocumentConfigureDialog.cpp4
-rw-r--r--src/gui/dialogs/DocumentConfigureDialog.h2
-rw-r--r--src/gui/dialogs/EventEditDialog.cpp4
-rw-r--r--src/gui/dialogs/EventEditDialog.h2
-rw-r--r--src/gui/dialogs/EventFilterDialog.cpp4
-rw-r--r--src/gui/dialogs/EventFilterDialog.h2
-rw-r--r--src/gui/dialogs/EventParameterDialog.cpp4
-rw-r--r--src/gui/dialogs/EventParameterDialog.h2
-rw-r--r--src/gui/dialogs/ExportDeviceDialog.cpp4
-rw-r--r--src/gui/dialogs/ExportDeviceDialog.h2
-rw-r--r--src/gui/dialogs/FileLocateDialog.cpp4
-rw-r--r--src/gui/dialogs/FileLocateDialog.h2
-rw-r--r--src/gui/dialogs/FileMergeDialog.cpp4
-rw-r--r--src/gui/dialogs/FileMergeDialog.h2
-rw-r--r--src/gui/dialogs/FloatEdit.cpp4
-rw-r--r--src/gui/dialogs/FloatEdit.h2
-rw-r--r--src/gui/dialogs/IdentifyTextCodecDialog.cpp4
-rw-r--r--src/gui/dialogs/IdentifyTextCodecDialog.h2
-rw-r--r--src/gui/dialogs/ImportDeviceDialog.cpp4
-rw-r--r--src/gui/dialogs/ImportDeviceDialog.h2
-rw-r--r--src/gui/dialogs/InterpretDialog.cpp4
-rw-r--r--src/gui/dialogs/InterpretDialog.h2
-rw-r--r--src/gui/dialogs/IntervalDialog.cpp4
-rw-r--r--src/gui/dialogs/IntervalDialog.h2
-rw-r--r--src/gui/dialogs/KeySignatureDialog.cpp4
-rw-r--r--src/gui/dialogs/KeySignatureDialog.h2
-rw-r--r--src/gui/dialogs/LilyPondOptionsDialog.cpp4
-rw-r--r--src/gui/dialogs/LilyPondOptionsDialog.h2
-rw-r--r--src/gui/dialogs/LyricEditDialog.cpp4
-rw-r--r--src/gui/dialogs/LyricEditDialog.h2
-rw-r--r--src/gui/dialogs/MakeOrnamentDialog.cpp4
-rw-r--r--src/gui/dialogs/MakeOrnamentDialog.h2
-rw-r--r--src/gui/dialogs/ManageMetronomeDialog.cpp4
-rw-r--r--src/gui/dialogs/ManageMetronomeDialog.h2
-rw-r--r--src/gui/dialogs/MarkerModifyDialog.cpp8
-rw-r--r--src/gui/dialogs/MarkerModifyDialog.h4
-rw-r--r--src/gui/dialogs/PasteNotationDialog.cpp4
-rw-r--r--src/gui/dialogs/PasteNotationDialog.h2
-rw-r--r--src/gui/dialogs/PitchDialog.cpp4
-rw-r--r--src/gui/dialogs/PitchDialog.h2
-rw-r--r--src/gui/dialogs/PitchPickerDialog.cpp4
-rw-r--r--src/gui/dialogs/PitchPickerDialog.h2
-rw-r--r--src/gui/dialogs/QuantizeDialog.cpp4
-rw-r--r--src/gui/dialogs/QuantizeDialog.h2
-rw-r--r--src/gui/dialogs/RescaleDialog.cpp4
-rw-r--r--src/gui/dialogs/RescaleDialog.h2
-rw-r--r--src/gui/dialogs/ShowSequencerStatusDialog.cpp4
-rw-r--r--src/gui/dialogs/ShowSequencerStatusDialog.h2
-rw-r--r--src/gui/dialogs/SimpleEventEditDialog.cpp4
-rw-r--r--src/gui/dialogs/SimpleEventEditDialog.h2
-rw-r--r--src/gui/dialogs/SplitByPitchDialog.cpp4
-rw-r--r--src/gui/dialogs/SplitByPitchDialog.h2
-rw-r--r--src/gui/dialogs/SplitByRecordingSrcDialog.cpp4
-rw-r--r--src/gui/dialogs/SplitByRecordingSrcDialog.h2
-rw-r--r--src/gui/dialogs/TempoDialog.cpp4
-rw-r--r--src/gui/dialogs/TempoDialog.h2
-rw-r--r--src/gui/dialogs/TextEventDialog.cpp12
-rw-r--r--src/gui/dialogs/TextEventDialog.h2
-rw-r--r--src/gui/dialogs/TimeDialog.cpp8
-rw-r--r--src/gui/dialogs/TimeDialog.h4
-rw-r--r--src/gui/dialogs/TimeSignatureDialog.cpp4
-rw-r--r--src/gui/dialogs/TimeSignatureDialog.h2
-rw-r--r--src/gui/dialogs/TransportDialog.cpp4
-rw-r--r--src/gui/dialogs/TransportDialog.h2
-rw-r--r--src/gui/dialogs/TriggerSegmentDialog.cpp4
-rw-r--r--src/gui/dialogs/TriggerSegmentDialog.h2
-rw-r--r--src/gui/dialogs/TupletDialog.cpp4
-rw-r--r--src/gui/dialogs/TupletDialog.h2
-rw-r--r--src/gui/dialogs/UnusedAudioSelectionDialog.cpp4
-rw-r--r--src/gui/dialogs/UseOrnamentDialog.cpp4
-rw-r--r--src/gui/dialogs/UseOrnamentDialog.h2
-rw-r--r--src/gui/editors/eventlist/EventView.cpp4
-rw-r--r--src/gui/editors/eventlist/EventView.h2
-rw-r--r--src/gui/editors/eventlist/EventViewItem.h16
-rw-r--r--src/gui/editors/eventlist/TrivialVelocityDialog.cpp4
-rw-r--r--src/gui/editors/eventlist/TrivialVelocityDialog.h2
-rw-r--r--src/gui/editors/guitar/FingeringBox.cpp8
-rw-r--r--src/gui/editors/guitar/FingeringBox.h4
-rw-r--r--src/gui/editors/guitar/FingeringListBoxItem.cpp4
-rw-r--r--src/gui/editors/guitar/FingeringListBoxItem.h2
-rw-r--r--src/gui/editors/guitar/GuitarChordEditorDialog.cpp4
-rw-r--r--src/gui/editors/guitar/GuitarChordEditorDialog.h2
-rw-r--r--src/gui/editors/guitar/GuitarChordSelectorDialog.cpp4
-rw-r--r--src/gui/editors/guitar/GuitarChordSelectorDialog.h2
-rw-r--r--src/gui/editors/matrix/MatrixCanvasView.cpp4
-rw-r--r--src/gui/editors/matrix/MatrixCanvasView.h2
-rw-r--r--src/gui/editors/matrix/MatrixEraser.cpp4
-rw-r--r--src/gui/editors/matrix/MatrixMover.cpp4
-rw-r--r--src/gui/editors/matrix/MatrixPainter.cpp8
-rw-r--r--src/gui/editors/matrix/MatrixParameterBox.cpp4
-rw-r--r--src/gui/editors/matrix/MatrixParameterBox.h2
-rw-r--r--src/gui/editors/matrix/MatrixResizer.cpp4
-rw-r--r--src/gui/editors/matrix/MatrixTool.cpp6
-rw-r--r--src/gui/editors/matrix/MatrixToolBox.cpp6
-rw-r--r--src/gui/editors/matrix/MatrixToolBox.h2
-rw-r--r--src/gui/editors/matrix/MatrixView.cpp6
-rw-r--r--src/gui/editors/matrix/MatrixView.h2
-rw-r--r--src/gui/editors/matrix/PianoKeyboard.cpp4
-rw-r--r--src/gui/editors/matrix/PianoKeyboard.h2
-rw-r--r--src/gui/editors/notation/FontViewFrame.cpp4
-rw-r--r--src/gui/editors/notation/FontViewFrame.h2
-rw-r--r--src/gui/editors/notation/HeadersGroup.cpp4
-rw-r--r--src/gui/editors/notation/HeadersGroup.h2
-rw-r--r--src/gui/editors/notation/NotationCanvasView.cpp4
-rw-r--r--src/gui/editors/notation/NotationCanvasView.h2
-rw-r--r--src/gui/editors/notation/NotationHLayout.cpp4
-rw-r--r--src/gui/editors/notation/NotationHLayout.h2
-rw-r--r--src/gui/editors/notation/NotationSelector.h2
-rw-r--r--src/gui/editors/notation/NotationToolBox.cpp6
-rw-r--r--src/gui/editors/notation/NotationToolBox.h2
-rw-r--r--src/gui/editors/notation/NotationVLayout.cpp6
-rw-r--r--src/gui/editors/notation/NotationVLayout.h2
-rw-r--r--src/gui/editors/notation/NotationView.cpp20
-rw-r--r--src/gui/editors/notation/NotationView.h6
-rw-r--r--src/gui/editors/notation/NoteCharacter.cpp4
-rw-r--r--src/gui/editors/notation/NoteFont.cpp4
-rw-r--r--src/gui/editors/notation/NoteFontViewer.cpp4
-rw-r--r--src/gui/editors/notation/NoteFontViewer.h2
-rw-r--r--src/gui/editors/notation/NotePixmapFactory.cpp6
-rw-r--r--src/gui/editors/notation/NotePixmapPainter.h10
-rw-r--r--src/gui/editors/notation/TrackHeader.cpp10
-rw-r--r--src/gui/editors/notation/TrackHeader.h4
-rw-r--r--src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp4
-rw-r--r--src/gui/editors/parameters/AudioInstrumentParameterPanel.h2
-rw-r--r--src/gui/editors/parameters/InstrumentParameterBox.cpp4
-rw-r--r--src/gui/editors/parameters/InstrumentParameterBox.h2
-rw-r--r--src/gui/editors/parameters/InstrumentParameterPanel.cpp4
-rw-r--r--src/gui/editors/parameters/InstrumentParameterPanel.h2
-rw-r--r--src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp4
-rw-r--r--src/gui/editors/parameters/MIDIInstrumentParameterPanel.h2
-rw-r--r--src/gui/editors/parameters/RosegardenParameterArea.cpp6
-rw-r--r--src/gui/editors/parameters/RosegardenParameterArea.h2
-rw-r--r--src/gui/editors/parameters/RosegardenParameterBox.cpp4
-rw-r--r--src/gui/editors/parameters/RosegardenParameterBox.h6
-rw-r--r--src/gui/editors/parameters/SegmentParameterBox.cpp4
-rw-r--r--src/gui/editors/parameters/SegmentParameterBox.h2
-rw-r--r--src/gui/editors/parameters/TrackParameterBox.cpp4
-rw-r--r--src/gui/editors/parameters/TrackParameterBox.h2
-rw-r--r--src/gui/editors/segment/ControlEditorDialog.cpp4
-rw-r--r--src/gui/editors/segment/ControlEditorDialog.h2
-rw-r--r--src/gui/editors/segment/ControlParameterEditDialog.cpp4
-rw-r--r--src/gui/editors/segment/ControlParameterEditDialog.h2
-rw-r--r--src/gui/editors/segment/ControlParameterItem.h4
-rw-r--r--src/gui/editors/segment/MarkerEditor.cpp4
-rw-r--r--src/gui/editors/segment/MarkerEditor.h2
-rw-r--r--src/gui/editors/segment/MarkerEditorViewItem.h4
-rw-r--r--src/gui/editors/segment/PlayList.cpp4
-rw-r--r--src/gui/editors/segment/PlayList.h2
-rw-r--r--src/gui/editors/segment/PlayListDialog.cpp4
-rw-r--r--src/gui/editors/segment/PlayListDialog.h2
-rw-r--r--src/gui/editors/segment/PlayListView.cpp4
-rw-r--r--src/gui/editors/segment/PlayListView.h2
-rw-r--r--src/gui/editors/segment/PlayListViewItem.cpp8
-rw-r--r--src/gui/editors/segment/PlayListViewItem.h4
-rw-r--r--src/gui/editors/segment/TrackButtons.cpp4
-rw-r--r--src/gui/editors/segment/TrackButtons.h2
-rw-r--r--src/gui/editors/segment/TrackEditor.cpp6
-rw-r--r--src/gui/editors/segment/TrackEditor.h2
-rw-r--r--src/gui/editors/segment/TrackHeader.h4
-rw-r--r--src/gui/editors/segment/TrackLabel.cpp4
-rw-r--r--src/gui/editors/segment/TrackLabel.h2
-rw-r--r--src/gui/editors/segment/TrackVUMeter.cpp4
-rw-r--r--src/gui/editors/segment/TrackVUMeter.h2
-rw-r--r--src/gui/editors/segment/TriggerManagerItem.h4
-rw-r--r--src/gui/editors/segment/TriggerSegmentManager.cpp4
-rw-r--r--src/gui/editors/segment/TriggerSegmentManager.h2
-rw-r--r--src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.cpp4
-rw-r--r--src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.h2
-rw-r--r--src/gui/editors/segment/segmentcanvas/CompositionView.cpp6
-rw-r--r--src/gui/editors/segment/segmentcanvas/CompositionView.h2
-rw-r--r--src/gui/editors/segment/segmentcanvas/SegmentItemPreview.h2
-rw-r--r--src/gui/editors/segment/segmentcanvas/SegmentTool.cpp4
-rw-r--r--src/gui/editors/segment/segmentcanvas/SegmentTool.h2
-rw-r--r--src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp6
-rw-r--r--src/gui/editors/segment/segmentcanvas/SegmentToolBox.h2
-rw-r--r--src/gui/editors/tempo/TempoListItem.h4
-rw-r--r--src/gui/editors/tempo/TempoView.cpp4
-rw-r--r--src/gui/editors/tempo/TempoView.h2
-rw-r--r--src/gui/general/BaseTool.cpp4
-rw-r--r--src/gui/general/BaseTool.h6
-rw-r--r--src/gui/general/BaseToolBox.cpp4
-rw-r--r--src/gui/general/BaseToolBox.h2
-rw-r--r--src/gui/general/EditToolBox.cpp6
-rw-r--r--src/gui/general/EditToolBox.h2
-rw-r--r--src/gui/general/EditView.cpp4
-rw-r--r--src/gui/general/EditView.h2
-rw-r--r--src/gui/general/EditViewBase.cpp4
-rw-r--r--src/gui/general/EditViewBase.h2
-rw-r--r--src/gui/general/PixmapFunctions.cpp22
-rw-r--r--src/gui/general/PixmapFunctions.h16
-rw-r--r--src/gui/general/PresetHandlerDialog.cpp4
-rw-r--r--src/gui/general/PresetHandlerDialog.h2
-rw-r--r--src/gui/general/ProgressReporter.cpp4
-rw-r--r--src/gui/general/ProgressReporter.h2
-rw-r--r--src/gui/general/RosegardenCanvasView.cpp4
-rw-r--r--src/gui/general/RosegardenCanvasView.h4
-rw-r--r--src/gui/general/RosegardenScrollView.cpp4
-rw-r--r--src/gui/general/RosegardenScrollView.h2
-rw-r--r--src/gui/kdeext/KLedButton.cpp8
-rw-r--r--src/gui/kdeext/KLedButton.h4
-rw-r--r--src/gui/kdeext/KStartupLogo.cpp4
-rw-r--r--src/gui/kdeext/KStartupLogo.h2
-rw-r--r--src/gui/kdeext/RGLed.cpp14
-rw-r--r--src/gui/kdeext/klearlook.cpp52
-rw-r--r--src/gui/rulers/ChordNameRuler.cpp8
-rw-r--r--src/gui/rulers/ChordNameRuler.h4
-rw-r--r--src/gui/rulers/ControlRuler.cpp6
-rw-r--r--src/gui/rulers/ControlRuler.h2
-rw-r--r--src/gui/rulers/ControlSelector.cpp6
-rw-r--r--src/gui/rulers/ControlSelector.h2
-rw-r--r--src/gui/rulers/ControllerEventsRuler.cpp4
-rw-r--r--src/gui/rulers/ControllerEventsRuler.h2
-rw-r--r--src/gui/rulers/LoopRuler.cpp4
-rw-r--r--src/gui/rulers/LoopRuler.h2
-rw-r--r--src/gui/rulers/MarkerRuler.cpp14
-rw-r--r--src/gui/rulers/MarkerRuler.h2
-rw-r--r--src/gui/rulers/PercussionPitchRuler.cpp4
-rw-r--r--src/gui/rulers/PercussionPitchRuler.h2
-rw-r--r--src/gui/rulers/PitchRuler.cpp4
-rw-r--r--src/gui/rulers/PitchRuler.h2
-rw-r--r--src/gui/rulers/PropertyBox.cpp4
-rw-r--r--src/gui/rulers/PropertyBox.h2
-rw-r--r--src/gui/rulers/PropertyControlRuler.cpp4
-rw-r--r--src/gui/rulers/PropertyControlRuler.h2
-rw-r--r--src/gui/rulers/PropertyViewRuler.cpp4
-rw-r--r--src/gui/rulers/PropertyViewRuler.h2
-rw-r--r--src/gui/rulers/RawNoteRuler.cpp6
-rw-r--r--src/gui/rulers/RawNoteRuler.h2
-rw-r--r--src/gui/rulers/StandardRuler.cpp4
-rw-r--r--src/gui/rulers/StandardRuler.h2
-rw-r--r--src/gui/rulers/TempoRuler.cpp16
-rw-r--r--src/gui/rulers/TempoRuler.h2
-rw-r--r--src/gui/rulers/TextRuler.cpp4
-rw-r--r--src/gui/rulers/TextRuler.h2
-rw-r--r--src/gui/seqmanager/MidiFilterDialog.cpp4
-rw-r--r--src/gui/seqmanager/MidiFilterDialog.h2
-rw-r--r--src/gui/seqmanager/SequenceManager.cpp20
-rw-r--r--src/gui/studio/AudioMixerWindow.cpp4
-rw-r--r--src/gui/studio/AudioMixerWindow.h2
-rw-r--r--src/gui/studio/BankEditorDialog.cpp14
-rw-r--r--src/gui/studio/BankEditorDialog.h2
-rw-r--r--src/gui/studio/DeviceEditorDialog.cpp4
-rw-r--r--src/gui/studio/DeviceEditorDialog.h2
-rw-r--r--src/gui/studio/DeviceManagerDialog.cpp4
-rw-r--r--src/gui/studio/DeviceManagerDialog.h2
-rw-r--r--src/gui/studio/MidiBankListViewItem.cpp4
-rw-r--r--src/gui/studio/MidiBankListViewItem.h2
-rw-r--r--src/gui/studio/MidiDeviceListViewItem.cpp12
-rw-r--r--src/gui/studio/MidiDeviceListViewItem.h6
-rw-r--r--src/gui/studio/MidiKeyMapListViewItem.cpp4
-rw-r--r--src/gui/studio/MidiKeyMapListViewItem.h2
-rw-r--r--src/gui/studio/MidiKeyMappingEditor.cpp6
-rw-r--r--src/gui/studio/MidiKeyMappingEditor.h4
-rw-r--r--src/gui/studio/MidiMixerVUMeter.cpp4
-rw-r--r--src/gui/studio/MidiMixerVUMeter.h2
-rw-r--r--src/gui/studio/MidiMixerWindow.cpp4
-rw-r--r--src/gui/studio/MidiMixerWindow.h2
-rw-r--r--src/gui/studio/MidiProgramsEditor.cpp8
-rw-r--r--src/gui/studio/MidiProgramsEditor.h4
-rw-r--r--src/gui/studio/MixerWindow.cpp4
-rw-r--r--src/gui/studio/MixerWindow.h2
-rw-r--r--src/gui/studio/NameSetEditor.cpp4
-rw-r--r--src/gui/studio/NameSetEditor.h2
-rw-r--r--src/gui/studio/RemapInstrumentDialog.cpp4
-rw-r--r--src/gui/studio/RemapInstrumentDialog.h2
-rw-r--r--src/gui/studio/SynthPluginManagerDialog.cpp4
-rw-r--r--src/gui/studio/SynthPluginManagerDialog.h2
-rw-r--r--src/gui/studio/TimerCallbackAssistant.cpp2
-rw-r--r--src/gui/widgets/AudioFaderBox.cpp8
-rw-r--r--src/gui/widgets/AudioFaderBox.h2
-rw-r--r--src/gui/widgets/AudioListItem.h12
-rw-r--r--src/gui/widgets/AudioListView.cpp4
-rw-r--r--src/gui/widgets/AudioListView.h2
-rw-r--r--src/gui/widgets/AudioRouteMenu.cpp2
-rw-r--r--src/gui/widgets/AudioRouteMenu.h2
-rw-r--r--src/gui/widgets/AudioVUMeter.cpp8
-rw-r--r--src/gui/widgets/AudioVUMeter.h4
-rw-r--r--src/gui/widgets/BigArrowButton.h4
-rw-r--r--src/gui/widgets/CollapsingFrame.cpp4
-rw-r--r--src/gui/widgets/CollapsingFrame.h2
-rw-r--r--src/gui/widgets/ColourTable.cpp4
-rw-r--r--src/gui/widgets/ColourTable.h2
-rw-r--r--src/gui/widgets/CurrentProgressDialog.h4
-rw-r--r--src/gui/widgets/DiatonicPitchChooser.cpp4
-rw-r--r--src/gui/widgets/DiatonicPitchChooser.h2
-rw-r--r--src/gui/widgets/Fader.cpp12
-rw-r--r--src/gui/widgets/Fader.h6
-rw-r--r--src/gui/widgets/HSpinBox.cpp8
-rw-r--r--src/gui/widgets/HSpinBox.h4
-rw-r--r--src/gui/widgets/Label.h4
-rw-r--r--src/gui/widgets/MidiFaderWidget.h2
-rw-r--r--src/gui/widgets/PitchChooser.cpp4
-rw-r--r--src/gui/widgets/PitchChooser.h2
-rw-r--r--src/gui/widgets/PitchDragLabel.cpp4
-rw-r--r--src/gui/widgets/PitchDragLabel.h2
-rw-r--r--src/gui/widgets/PluginControl.cpp16
-rw-r--r--src/gui/widgets/PluginControl.h2
-rw-r--r--src/gui/widgets/QDeferScrollView.cpp4
-rw-r--r--src/gui/widgets/QDeferScrollView.h2
-rw-r--r--src/gui/widgets/QuantizeParameters.cpp4
-rw-r--r--src/gui/widgets/QuantizeParameters.h2
-rw-r--r--src/gui/widgets/RosegardenPopupMenu.h2
-rw-r--r--src/gui/widgets/Rotary.cpp4
-rw-r--r--src/gui/widgets/Rotary.h2
-rw-r--r--src/gui/widgets/ScrollBox.cpp4
-rw-r--r--src/gui/widgets/ScrollBox.h2
-rw-r--r--src/gui/widgets/ScrollBoxDialog.cpp4
-rw-r--r--src/gui/widgets/ScrollBoxDialog.h2
-rw-r--r--src/gui/widgets/SpinBox.cpp4
-rw-r--r--src/gui/widgets/SpinBox.h2
-rw-r--r--src/gui/widgets/TextFloat.cpp8
-rw-r--r--src/gui/widgets/TextFloat.h4
-rw-r--r--src/gui/widgets/TimeWidget.cpp8
-rw-r--r--src/gui/widgets/TimeWidget.h4
-rw-r--r--src/gui/widgets/TristateCheckBox.h4
-rw-r--r--src/gui/widgets/VUMeter.cpp4
-rw-r--r--src/gui/widgets/VUMeter.h2
-rw-r--r--src/gui/widgets/ZoomSlider.h6
-rw-r--r--src/sequencer/main.cpp2
-rw-r--r--src/sound/AlsaDriver.cpp2
-rw-r--r--src/sound/MappedStudio.cpp38
-rw-r--r--src/sound/MappedStudio.h26
394 files changed, 880 insertions, 880 deletions
diff --git a/src/base/AnalysisTypes.cpp b/src/base/AnalysisTypes.cpp
index 316c58f..b2d8727 100644
--- a/src/base/AnalysisTypes.cpp
+++ b/src/base/AnalysisTypes.cpp
@@ -109,7 +109,7 @@ AnalysisHelper::labelChords(CompositionTimeSliceAdapter &c, Segment &s,
if ((*i)->isa(Note::EventType)) {
int bass = 999;
- int tqmask = 0;
+ int mask = 0;
GlobalChord chord(c, i, quantizer);
if (chord.size() == 0) continue;
@@ -121,15 +121,15 @@ AnalysisHelper::labelChords(CompositionTimeSliceAdapter &c, Segment &s,
assert(bass == 999); // should be in ascending order already
bass = pitch;
}
- tqmask |= 1 << (pitch % 12);
+ mask |= 1 << (pitch % 12);
}
}
i = chord.getFinalElement();
- if (tqmask == 0) continue;
+ if (mask == 0) continue;
- ChordLabel ch(key, tqmask, bass);
+ ChordLabel ch(key, mask, bass);
if (ch.isValid())
{
@@ -154,15 +154,15 @@ ChordLabel::ChordLabel()
checkMap();
}
-ChordLabel::ChordLabel(Key key, int tqmask, int /* bass */) :
+ChordLabel::ChordLabel(Key key, int mask, int /* bass */) :
m_data()
{
checkMap();
// Look for a chord built on an unaltered scale step of the current key.
- for (ChordMap::iterator i = m_chordMap.find(tqmask);
- i != m_chordMap.end() && i->first==tqmask; ++i)
+ for (ChordMap::iterator i = m_chordMap.find(mask);
+ i != m_chordMap.end() && i->first==mask; ++i)
{
if (Pitch(i->second.m_rootPitch).isDiatonicInKey(key))
@@ -233,7 +233,7 @@ ChordLabel::checkMap()
// What the basicChordMasks mean: each bit set in each one represents
// a pitch class (pitch%12) in a chord. C major has three pitch
// classes, C, E, and G natural; if you take the MIDI pitches
- // of those notes modulo 12, you get 0, 4, and 7, so the tqmask for
+ // of those notes modulo 12, you get 0, 4, and 7, so the mask for
// major triads is (1<<0)+(1<<4)+(1<<7). All the masks are for chords
// built on C.
@@ -249,8 +249,8 @@ ChordLabel::checkMap()
1 + (1<<3) + (1<<6) + (1<<9) // diminished 7th
};
- // Each tqmask is inserted into the map rotated twelve ways; each
- // rotation is a tqmask you would get by transposing the chord
+ // Each mask is inserted into the map rotated twelve ways; each
+ // rotation is a mask you would get by transposing the chord
// to have a new root (i.e., C, C#, D, D#, E, F...)
for (int i = 0; i < 8; ++i)
diff --git a/src/base/AnalysisTypes.h b/src/base/AnalysisTypes.h
index fb99cac..d7eabad 100644
--- a/src/base/AnalysisTypes.h
+++ b/src/base/AnalysisTypes.h
@@ -71,7 +71,7 @@ class ChordLabel
{
public:
ChordLabel();
- ChordLabel(Key key, int tqmask, int bass);
+ ChordLabel(Key key, int mask, int bass);
ChordLabel(ChordType type, int rootPitch, int inversion = 0) :
m_data(type, rootPitch, inversion) { };
int rootPitch();
diff --git a/src/base/Instrument.h b/src/base/Instrument.h
index fe1bc98..8c348f0 100644
--- a/src/base/Instrument.h
+++ b/src/base/Instrument.h
@@ -220,7 +220,7 @@ public:
//
virtual std::string toXmlString();
- // Get and set the tqparent device
+ // Get and set the parent device
//
Device* getDevice() const { return m_device; }
void setDevice(Device* dev) { m_device = dev; }
@@ -263,7 +263,7 @@ private:
Device *m_device;
// Do we send at this intrument or do we leave these
- // things up to the tqparent device and God? These are
+ // things up to the parent device and God? These are
// directly relatable to GUI elements
//
bool m_sendBankSelect;
diff --git a/src/base/MidiProgram.h b/src/base/MidiProgram.h
index a5ab7a9..e44f631 100644
--- a/src/base/MidiProgram.h
+++ b/src/base/MidiProgram.h
@@ -168,7 +168,7 @@ private:
};
-// MidiFilter is a bittqmask of MappedEvent::MappedEventType.
+// MidiFilter is a bitmask of MappedEvent::MappedEventType.
// Look in sound/MappedEvent.h
//
typedef unsigned int MidiFilter;
diff --git a/src/document/RoseXmlHandler.cpp b/src/document/RoseXmlHandler.cpp
index c378687..99718f3 100644
--- a/src/document/RoseXmlHandler.cpp
+++ b/src/document/RoseXmlHandler.cpp
@@ -1046,7 +1046,7 @@ RoseXmlHandler::startElement(const TQString& namespaceURI,
do {
- FileLocateDialog fL((RosegardenGUIApp *)m_doc->tqparent(),
+ FileLocateDialog fL((RosegardenGUIApp *)m_doc->parent(),
file,
TQString(getAudioFileManager().getAudioPath().c_str()));
int result = fL.exec();
diff --git a/src/document/RosegardenGUIDoc.cpp b/src/document/RosegardenGUIDoc.cpp
index 71c3c2a..9f2bcd6 100644
--- a/src/document/RosegardenGUIDoc.cpp
+++ b/src/document/RosegardenGUIDoc.cpp
@@ -117,11 +117,11 @@ namespace Rosegarden
using namespace BaseProperties;
-RosegardenGUIDoc::RosegardenGUIDoc(TQWidget *tqparent,
+RosegardenGUIDoc::RosegardenGUIDoc(TQWidget *parent,
AudioPluginManager *pluginManager,
bool skipAutoload,
const char *name)
- : TQObject(tqparent, name),
+ : TQObject(parent, name),
m_modified(false),
m_autoSaved(false),
m_audioPreviewThread(&m_audioFileManager),
@@ -321,7 +321,7 @@ bool RosegardenGUIDoc::saveIfModified()
return completed;
- RosegardenGUIApp *win = (RosegardenGUIApp *)tqparent();
+ RosegardenGUIApp *win = (RosegardenGUIApp *)parent();
int wantSave = KMessageBox::warningYesNoCancel
(win,
@@ -584,7 +584,7 @@ bool RosegardenGUIDoc::openDocument(const TQString& filename,
ProgressDialog progressDlg(i18n("Reading file..."),
100,
- (TQWidget*)tqparent());
+ (TQWidget*)parent());
connect(&progressDlg, TQT_SIGNAL(cancelClicked()),
&m_audioFileManager, TQT_SLOT(slotStopPreview()));
@@ -1224,7 +1224,7 @@ bool RosegardenGUIDoc::saveDocumentActual(const TQString& filename,
progressDlg = new ProgressDialog(i18n("Saving file..."),
100,
- (TQWidget*)tqparent());
+ (TQWidget*)parent());
progress = progressDlg->progressBar();
progressDlg->setMinimumDuration(500);
@@ -1232,7 +1232,7 @@ bool RosegardenGUIDoc::saveDocumentActual(const TQString& filename,
} else {
- progress = ((RosegardenGUIApp *)tqparent())->getProgressBar();
+ progress = ((RosegardenGUIApp *)parent())->getProgressBar();
}
// Send out Composition (this includes Tracks, Instruments, Tempo
@@ -1556,7 +1556,7 @@ void RosegardenGUIDoc::saveSegment(TQTextStream& outStream, Segment *segment,
bool RosegardenGUIDoc::isSequencerRunning()
{
- RosegardenGUIApp* parentApp = dynamic_cast<RosegardenGUIApp*>(tqparent());
+ RosegardenGUIApp* parentApp = dynamic_cast<RosegardenGUIApp*>(parent());
if (!parentApp) {
RG_DEBUG << "RosegardenGUIDoc::isSequencerRunning() : parentApp == 0\n";
return false;
@@ -2317,7 +2317,7 @@ RosegardenGUIDoc::syncDevices()
}
delete proc;
- RosegardenGUIApp *app = (RosegardenGUIApp*)tqparent();
+ RosegardenGUIApp *app = (RosegardenGUIApp*)parent();
app->slotSequencerExited(0);
return ;
}
@@ -2786,7 +2786,7 @@ RosegardenGUIDoc::finalizeAudioFile(InstrumentId iid)
// Create a progress dialog
//
ProgressDialog *progressDlg = new ProgressDialog
- (i18n("Generating audio preview..."), 100, (TQWidget*)tqparent());
+ (i18n("Generating audio preview..."), 100, (TQWidget*)parent());
progressDlg->setAutoClose(false);
progressDlg->setAutoReset(false);
progressDlg->show();
@@ -3070,7 +3070,7 @@ RosegardenGUIDoc::clearAllPlugins()
Clipboard*
RosegardenGUIDoc::getClipboard()
{
- RosegardenGUIApp *app = (RosegardenGUIApp*)tqparent();
+ RosegardenGUIApp *app = (RosegardenGUIApp*)parent();
return app->getClipboard();
}
diff --git a/src/document/RosegardenGUIDoc.h b/src/document/RosegardenGUIDoc.h
index 85cd484..a7d972e 100644
--- a/src/document/RosegardenGUIDoc.h
+++ b/src/document/RosegardenGUIDoc.h
@@ -96,7 +96,7 @@ public:
/**
* Constructor for the fileclass of the application
*/
- RosegardenGUIDoc(TQWidget *tqparent,
+ RosegardenGUIDoc(TQWidget *parent,
AudioPluginManager *audioPluginManager = 0,
bool skipAutoload = false,
const char *name=0);
@@ -426,7 +426,7 @@ public:
// Get the sequence manager from the app
//
SequenceManager* getSequenceManager()
- { return (dynamic_cast<RosegardenGUIApp*>(tqparent()))
+ { return (dynamic_cast<RosegardenGUIApp*>(parent()))
->getSequenceManager(); }
//Obsolete: multitrack MIDI recording. plcl 06/2006.
diff --git a/src/document/io/CsoundExporter.cpp b/src/document/io/CsoundExporter.cpp
index 9316de6..70f1e51 100644
--- a/src/document/io/CsoundExporter.cpp
+++ b/src/document/io/CsoundExporter.cpp
@@ -40,10 +40,10 @@
namespace Rosegarden
{
-CsoundExporter::CsoundExporter(TQObject *tqparent,
+CsoundExporter::CsoundExporter(TQObject *parent,
Composition *composition,
std::string fileName) :
- ProgressReporter(tqparent, "csoundExporter"),
+ ProgressReporter(parent, "csoundExporter"),
m_composition(composition),
m_fileName(fileName)
{
diff --git a/src/document/io/CsoundExporter.h b/src/document/io/CsoundExporter.h
index a2476e0..f179fb6 100644
--- a/src/document/io/CsoundExporter.h
+++ b/src/document/io/CsoundExporter.h
@@ -46,7 +46,7 @@ class Composition;
class CsoundExporter : public ProgressReporter
{
public:
- CsoundExporter(TQObject *tqparent, Composition *, std::string fileName);
+ CsoundExporter(TQObject *parent, Composition *, std::string fileName);
~CsoundExporter();
bool write();
diff --git a/src/document/io/HydrogenLoader.cpp b/src/document/io/HydrogenLoader.cpp
index 4a4876c..984527d 100644
--- a/src/document/io/HydrogenLoader.cpp
+++ b/src/document/io/HydrogenLoader.cpp
@@ -41,8 +41,8 @@ namespace Rosegarden
{
HydrogenLoader::HydrogenLoader(Studio *studio,
- TQObject *tqparent, const char *name):
- ProgressReporter(tqparent, name),
+ TQObject *parent, const char *name):
+ ProgressReporter(parent, name),
m_studio(studio)
{}
diff --git a/src/document/io/HydrogenLoader.h b/src/document/io/HydrogenLoader.h
index e4975ad..bd3cffb 100644
--- a/src/document/io/HydrogenLoader.h
+++ b/src/document/io/HydrogenLoader.h
@@ -54,7 +54,7 @@ class HydrogenLoader : public ProgressReporter
{
public:
HydrogenLoader(Studio *,
- TQObject *tqparent = 0, const char *name = 0);
+ TQObject *parent = 0, const char *name = 0);
/**
* Load and parse the Hydrogen file \a fileName, and write it into the
diff --git a/src/document/io/LilyPondExporter.cpp b/src/document/io/LilyPondExporter.cpp
index b445a41..f2d6008 100644
--- a/src/document/io/LilyPondExporter.cpp
+++ b/src/document/io/LilyPondExporter.cpp
@@ -85,26 +85,26 @@ using namespace BaseProperties;
const PropertyName LilyPondExporter::SKIP_PROPERTY
= "LilyPondExportSkipThisEvent";
-LilyPondExporter::LilyPondExporter(RosegardenGUIApp *tqparent,
+LilyPondExporter::LilyPondExporter(RosegardenGUIApp *parent,
RosegardenGUIDoc *doc,
std::string fileName) :
- ProgressReporter((TQObject *)tqparent, "lilypondExporter"),
+ ProgressReporter((TQObject *)parent, "lilypondExporter"),
m_doc(doc),
m_fileName(fileName),
m_lastClefFound(Clef::Treble)
{
m_composition = &m_doc->getComposition();
m_studio = &m_doc->getStudio();
- m_view = ((RosegardenGUIApp *)tqparent)->getView();
+ m_view = ((RosegardenGUIApp *)parent)->getView();
m_notationView = NULL;
readConfigVariables();
}
-LilyPondExporter::LilyPondExporter(NotationView *tqparent,
+LilyPondExporter::LilyPondExporter(NotationView *parent,
RosegardenGUIDoc *doc,
std::string fileName) :
- ProgressReporter((TQObject *)tqparent, "lilypondExporter"),
+ ProgressReporter((TQObject *)parent, "lilypondExporter"),
m_doc(doc),
m_fileName(fileName),
m_lastClefFound(Clef::Treble)
@@ -113,7 +113,7 @@ LilyPondExporter::LilyPondExporter(NotationView *tqparent,
m_composition = &m_doc->getComposition();
m_studio = &m_doc->getStudio();
m_view = NULL;
- m_notationView = ((NotationView *)tqparent);
+ m_notationView = ((NotationView *)parent);
readConfigVariables();
}
diff --git a/src/document/io/LilyPondExporter.h b/src/document/io/LilyPondExporter.h
index 5656f77..6ba3a21 100644
--- a/src/document/io/LilyPondExporter.h
+++ b/src/document/io/LilyPondExporter.h
@@ -87,8 +87,8 @@ public:
typedef std::multiset<Event*, Event::EventEndCmp> eventendlist;
public:
- LilyPondExporter(RosegardenGUIApp *tqparent, RosegardenGUIDoc *, std::string fileName);
- LilyPondExporter(NotationView *tqparent, RosegardenGUIDoc *, std::string fileName);
+ LilyPondExporter(RosegardenGUIApp *parent, RosegardenGUIDoc *, std::string fileName);
+ LilyPondExporter(NotationView *parent, RosegardenGUIDoc *, std::string fileName);
~LilyPondExporter();
bool write();
diff --git a/src/document/io/MupExporter.cpp b/src/document/io/MupExporter.cpp
index f17a8a3..6207512 100644
--- a/src/document/io/MupExporter.cpp
+++ b/src/document/io/MupExporter.cpp
@@ -45,10 +45,10 @@ namespace Rosegarden
{
using namespace BaseProperties;
-MupExporter::MupExporter(TQObject *tqparent,
+MupExporter::MupExporter(TQObject *parent,
Composition *composition,
string fileName) :
- ProgressReporter(tqparent, "mupExporter"),
+ ProgressReporter(parent, "mupExporter"),
m_composition(composition),
m_fileName(fileName)
{
diff --git a/src/document/io/MupExporter.h b/src/document/io/MupExporter.h
index 781080d..1ba8d5d 100644
--- a/src/document/io/MupExporter.h
+++ b/src/document/io/MupExporter.h
@@ -55,7 +55,7 @@ class Composition;
class MupExporter : public ProgressReporter
{
public:
- MupExporter(TQObject *tqparent, Composition *, std::string fileName);
+ MupExporter(TQObject *parent, Composition *, std::string fileName);
~MupExporter();
bool write();
diff --git a/src/document/io/MusicXmlExporter.cpp b/src/document/io/MusicXmlExporter.cpp
index febd911..365a792 100644
--- a/src/document/io/MusicXmlExporter.cpp
+++ b/src/document/io/MusicXmlExporter.cpp
@@ -46,10 +46,10 @@ namespace Rosegarden
using namespace BaseProperties;
-MusicXmlExporter::MusicXmlExporter(TQObject *tqparent,
+MusicXmlExporter::MusicXmlExporter(TQObject *parent,
RosegardenGUIDoc *doc,
std::string fileName) :
- ProgressReporter(tqparent, "musicXmlExporter"),
+ ProgressReporter(parent, "musicXmlExporter"),
m_doc(doc),
m_fileName(fileName)
{
diff --git a/src/document/io/MusicXmlExporter.h b/src/document/io/MusicXmlExporter.h
index f2da943..7d8287d 100644
--- a/src/document/io/MusicXmlExporter.h
+++ b/src/document/io/MusicXmlExporter.h
@@ -60,7 +60,7 @@ public:
typedef std::multiset<Event*, Event::EventCmp> eventstartlist;
typedef std::multiset<Event*, Event::EventEndCmp> eventendlist;
public:
- MusicXmlExporter(TQObject *tqparent, RosegardenGUIDoc *, std::string fileName);
+ MusicXmlExporter(TQObject *parent, RosegardenGUIDoc *, std::string fileName);
~MusicXmlExporter();
bool write();
diff --git a/src/document/io/RG21Loader.cpp b/src/document/io/RG21Loader.cpp
index 78950de..c36a228 100644
--- a/src/document/io/RG21Loader.cpp
+++ b/src/document/io/RG21Loader.cpp
@@ -58,8 +58,8 @@ using namespace Accidentals;
using namespace Marks;
RG21Loader::RG21Loader(Studio *studio,
- TQObject *tqparent, const char* name)
- : ProgressReporter(tqparent, name),
+ TQObject *parent, const char* name)
+ : ProgressReporter(parent, name),
m_stream(0),
m_studio(studio),
m_composition(0),
diff --git a/src/document/io/RG21Loader.h b/src/document/io/RG21Loader.h
index 51e663b..236d6c6 100644
--- a/src/document/io/RG21Loader.h
+++ b/src/document/io/RG21Loader.h
@@ -58,7 +58,7 @@ class RG21Loader : public ProgressReporter
{
public:
RG21Loader(Studio *,
- TQObject *tqparent = 0, const char *name = 0);
+ TQObject *parent = 0, const char *name = 0);
~RG21Loader();
/**
diff --git a/src/gui/application/RosegardenGUIApp.cpp b/src/gui/application/RosegardenGUIApp.cpp
index 520d363..7bfdfb1 100644
--- a/src/gui/application/RosegardenGUIApp.cpp
+++ b/src/gui/application/RosegardenGUIApp.cpp
@@ -3105,7 +3105,7 @@ void RosegardenGUIApp::slotTempoToSegmentLength()
slotTempoToSegmentLength(this);
}
-void RosegardenGUIApp::slotTempoToSegmentLength(TQWidget* tqparent)
+void RosegardenGUIApp::slotTempoToSegmentLength(TQWidget* parent)
{
RG_DEBUG << "RosegardenGUIApp::slotTempoToSegmentLength" << endl;
@@ -3135,7 +3135,7 @@ void RosegardenGUIApp::slotTempoToSegmentLength(TQWidget* tqparent)
int beats = 0;
// Get user to tell us how many beats or bars the segment contains
- BeatsBarsDialog dialog(tqparent);
+ BeatsBarsDialog dialog(parent);
if (dialog.exec() == TQDialog::Accepted) {
beats = dialog.getQuantity(); // beats (or bars)
if (dialog.getMode() == 1) // bars (multiply by time sig)
@@ -5705,16 +5705,16 @@ void RosegardenGUIApp::slotEditTempo(timeT atTime)
slotEditTempo(this, atTime);
}
-void RosegardenGUIApp::slotEditTempo(TQWidget *tqparent)
+void RosegardenGUIApp::slotEditTempo(TQWidget *parent)
{
- slotEditTempo(tqparent, m_doc->getComposition().getPosition());
+ slotEditTempo(parent, m_doc->getComposition().getPosition());
}
-void RosegardenGUIApp::slotEditTempo(TQWidget *tqparent, timeT atTime)
+void RosegardenGUIApp::slotEditTempo(TQWidget *parent, timeT atTime)
{
RG_DEBUG << "RosegardenGUIApp::slotEditTempo\n";
- TempoDialog tempoDialog(tqparent, m_doc);
+ TempoDialog tempoDialog(parent, m_doc);
connect(&tempoDialog,
TQT_SIGNAL(changeTempo(timeT,
@@ -5740,19 +5740,19 @@ void RosegardenGUIApp::slotEditTimeSignature(timeT atTime)
slotEditTimeSignature(this, atTime);
}
-void RosegardenGUIApp::slotEditTimeSignature(TQWidget *tqparent)
+void RosegardenGUIApp::slotEditTimeSignature(TQWidget *parent)
{
- slotEditTimeSignature(tqparent, m_doc->getComposition().getPosition());
+ slotEditTimeSignature(parent, m_doc->getComposition().getPosition());
}
-void RosegardenGUIApp::slotEditTimeSignature(TQWidget *tqparent,
+void RosegardenGUIApp::slotEditTimeSignature(TQWidget *parent,
timeT time)
{
Composition &composition(m_doc->getComposition());
TimeSignature sig = composition.getTimeSignatureAt(time);
- TimeSignatureDialog dialog(tqparent, &composition, time, sig);
+ TimeSignatureDialog dialog(parent, &composition, time, sig);
if (dialog.exec() == TQDialog::Accepted) {
@@ -5775,9 +5775,9 @@ void RosegardenGUIApp::slotEditTransportTime()
slotEditTransportTime(this);
}
-void RosegardenGUIApp::slotEditTransportTime(TQWidget *tqparent)
+void RosegardenGUIApp::slotEditTransportTime(TQWidget *parent)
{
- TimeDialog dialog(tqparent, i18n("Move playback pointer to time"),
+ TimeDialog dialog(parent, i18n("Move playback pointer to time"),
&m_doc->getComposition(),
m_doc->getComposition().getPosition(),
true);
@@ -6915,12 +6915,12 @@ RosegardenGUIApp::slotControlEditorClosed()
}
void
-RosegardenGUIApp::slotShowPluginDialog(TQWidget *tqparent,
+RosegardenGUIApp::slotShowPluginDialog(TQWidget *parent,
InstrumentId instrumentId,
int index)
{
- if (!tqparent)
- tqparent = this;
+ if (!parent)
+ parent = this;
int key = (index << 16) + instrumentId;
@@ -6954,7 +6954,7 @@ RosegardenGUIApp::slotShowPluginDialog(TQWidget *tqparent,
// Create the plugin dialog
//
AudioPluginDialog *dialog =
- new AudioPluginDialog(tqparent,
+ new AudioPluginDialog(parent,
m_doc->getPluginManager(),
#ifdef HAVE_LIBLO
m_pluginGUIManager,
diff --git a/src/gui/application/RosegardenGUIApp.cpp.orig b/src/gui/application/RosegardenGUIApp.cpp.orig
index a5bf4bb..0b6e768 100644
--- a/src/gui/application/RosegardenGUIApp.cpp.orig
+++ b/src/gui/application/RosegardenGUIApp.cpp.orig
@@ -3105,7 +3105,7 @@ void RosegardenGUIApp::slotTempoToSegmentLength()
slotTempoToSegmentLength(this);
}
-void RosegardenGUIApp::slotTempoToSegmentLength(TQWidget* tqparent)
+void RosegardenGUIApp::slotTempoToSegmentLength(TQWidget* parent)
{
RG_DEBUG << "RosegardenGUIApp::slotTempoToSegmentLength" << endl;
@@ -3135,7 +3135,7 @@ void RosegardenGUIApp::slotTempoToSegmentLength(TQWidget* tqparent)
int beats = 0;
// Get user to tell us how many beats or bars the segment contains
- BeatsBarsDialog dialog(tqparent);
+ BeatsBarsDialog dialog(parent);
if (dialog.exec() == TQDialog::Accepted) {
beats = dialog.getQuantity(); // beats (or bars)
if (dialog.getMode() == 1) // bars (multiply by time sig)
@@ -5705,16 +5705,16 @@ void RosegardenGUIApp::slotEditTempo(timeT atTime)
slotEditTempo(this, atTime);
}
-void RosegardenGUIApp::slotEditTempo(TQWidget *tqparent)
+void RosegardenGUIApp::slotEditTempo(TQWidget *parent)
{
- slotEditTempo(tqparent, m_doc->getComposition().getPosition());
+ slotEditTempo(parent, m_doc->getComposition().getPosition());
}
-void RosegardenGUIApp::slotEditTempo(TQWidget *tqparent, timeT atTime)
+void RosegardenGUIApp::slotEditTempo(TQWidget *parent, timeT atTime)
{
RG_DEBUG << "RosegardenGUIApp::slotEditTempo\n";
- TempoDialog tempoDialog(tqparent, m_doc);
+ TempoDialog tempoDialog(parent, m_doc);
connect(&tempoDialog,
TQT_SIGNAL(changeTempo(timeT,
@@ -5740,19 +5740,19 @@ void RosegardenGUIApp::slotEditTimeSignature(timeT atTime)
slotEditTimeSignature(this, atTime);
}
-void RosegardenGUIApp::slotEditTimeSignature(TQWidget *tqparent)
+void RosegardenGUIApp::slotEditTimeSignature(TQWidget *parent)
{
- slotEditTimeSignature(tqparent, m_doc->getComposition().getPosition());
+ slotEditTimeSignature(parent, m_doc->getComposition().getPosition());
}
-void RosegardenGUIApp::slotEditTimeSignature(TQWidget *tqparent,
+void RosegardenGUIApp::slotEditTimeSignature(TQWidget *parent,
timeT time)
{
Composition &composition(m_doc->getComposition());
TimeSignature sig = composition.getTimeSignatureAt(time);
- TimeSignatureDialog dialog(tqparent, &composition, time, sig);
+ TimeSignatureDialog dialog(parent, &composition, time, sig);
if (dialog.exec() == TQDialog::Accepted) {
@@ -5775,9 +5775,9 @@ void RosegardenGUIApp::slotEditTransportTime()
slotEditTransportTime(this);
}
-void RosegardenGUIApp::slotEditTransportTime(TQWidget *tqparent)
+void RosegardenGUIApp::slotEditTransportTime(TQWidget *parent)
{
- TimeDialog dialog(tqparent, i18n("Move playback pointer to time"),
+ TimeDialog dialog(parent, i18n("Move playback pointer to time"),
&m_doc->getComposition(),
m_doc->getComposition().getPosition(),
true);
@@ -6915,12 +6915,12 @@ RosegardenGUIApp::slotControlEditorClosed()
}
void
-RosegardenGUIApp::slotShowPluginDialog(TQWidget *tqparent,
+RosegardenGUIApp::slotShowPluginDialog(TQWidget *parent,
InstrumentId instrumentId,
int index)
{
- if (!tqparent)
- tqparent = this;
+ if (!parent)
+ parent = this;
int key = (index << 16) + instrumentId;
@@ -6954,7 +6954,7 @@ RosegardenGUIApp::slotShowPluginDialog(TQWidget *tqparent,
// Create the plugin dialog
//
AudioPluginDialog *dialog =
- new AudioPluginDialog(tqparent,
+ new AudioPluginDialog(parent,
m_doc->getPluginManager(),
#ifdef HAVE_LIBLO
m_pluginGUIManager,
diff --git a/src/gui/application/RosegardenGUIApp.h b/src/gui/application/RosegardenGUIApp.h
index 3221ded..6aeeb7a 100644
--- a/src/gui/application/RosegardenGUIApp.h
+++ b/src/gui/application/RosegardenGUIApp.h
@@ -813,7 +813,7 @@ public slots:
* Tempo to Segment length
*/
void slotTempoToSegmentLength();
- void slotTempoToSegmentLength(TQWidget* tqparent);
+ void slotTempoToSegmentLength(TQWidget* parent);
/**
* toggle segment labels
@@ -856,22 +856,22 @@ public slots:
*/
void slotEditTempo();
void slotEditTempo(timeT atTime);
- void slotEditTempo(TQWidget *tqparent);
- void slotEditTempo(TQWidget *tqparent, timeT atTime);
+ void slotEditTempo(TQWidget *parent);
+ void slotEditTempo(TQWidget *parent, timeT atTime);
/**
* Edit the time signature - called from a Transport signal
*/
void slotEditTimeSignature();
void slotEditTimeSignature(timeT atTime);
- void slotEditTimeSignature(TQWidget *tqparent);
- void slotEditTimeSignature(TQWidget *tqparent, timeT atTime);
+ void slotEditTimeSignature(TQWidget *parent);
+ void slotEditTimeSignature(TQWidget *parent, timeT atTime);
/**
* Edit the playback pointer position - called from a Transport signal
*/
void slotEditTransportTime();
- void slotEditTransportTime(TQWidget *tqparent);
+ void slotEditTransportTime(TQWidget *parent);
/**
* Change the length of the composition
@@ -1465,7 +1465,7 @@ public slots:
* Create a plugin dialog for a given instrument and slot, or
* raise an exising one.
*/
- void slotShowPluginDialog(TQWidget *tqparent,
+ void slotShowPluginDialog(TQWidget *parent,
InstrumentId instrument,
int index);
diff --git a/src/gui/application/RosegardenGUIView.cpp b/src/gui/application/RosegardenGUIView.cpp
index 90b3b09..83784f2 100644
--- a/src/gui/application/RosegardenGUIView.cpp
+++ b/src/gui/application/RosegardenGUIView.cpp
@@ -118,9 +118,9 @@ RosegardenGUIView::RosegardenGUIView(bool showTrackLabels,
SegmentParameterBox* segmentParameterBox,
InstrumentParameterBox* instrumentParameterBox,
TrackParameterBox* trackParameterBox,
- TQWidget *tqparent,
+ TQWidget *parent,
const char* /*name*/)
- : TQVBox(tqparent),
+ : TQVBox(parent),
m_rulerScale(0),
m_trackEditor(0),
m_segmentParameterBox(segmentParameterBox),
@@ -174,7 +174,7 @@ RosegardenGUIView::RosegardenGUIView(bool showTrackLabels,
connect(m_trackEditor,
TQT_SIGNAL(droppedDocument(TQString)),
- tqparent,
+ parent,
TQT_SLOT(slotOpenDroppedURL(TQString)));
connect(m_trackEditor,
@@ -2028,7 +2028,7 @@ RosegardenGUIView::createEventView(std::vector<Segment *> segmentsToEdit)
// create keyboard accelerators on view
//
- RosegardenGUIApp *par = dynamic_cast<RosegardenGUIApp*>(tqparent());
+ RosegardenGUIApp *par = dynamic_cast<RosegardenGUIApp*>(parent());
if (par) {
par->plugAccelerators(eventView, eventView->getAccelerators());
diff --git a/src/gui/application/RosegardenGUIView.h b/src/gui/application/RosegardenGUIView.h
index 44bf12b..da52c9f 100644
--- a/src/gui/application/RosegardenGUIView.h
+++ b/src/gui/application/RosegardenGUIView.h
@@ -87,7 +87,7 @@ public:
SegmentParameterBox*,
InstrumentParameterBox*,
TrackParameterBox*,
- TQWidget *tqparent = 0,
+ TQWidget *parent = 0,
const char *name=0);
/**
@@ -98,7 +98,7 @@ public:
/**
* returns a pointer to the document connected to the view
* instance. Mind that this method requires a RosegardenGUIApp
- * instance as a tqparent widget to get to the window document
+ * instance as a parent widget to get to the window document
* pointer by calling the RosegardenGUIApp::getDocument() method.
*
* @see RosegardenGUIApp#getDocument
diff --git a/src/gui/application/main.cpp b/src/gui/application/main.cpp
index c9ade00..863c085 100644
--- a/src/gui/application/main.cpp
+++ b/src/gui/application/main.cpp
@@ -248,7 +248,7 @@ and Events (our basic music element). To help lift the ambiguity,
between coordinates and staff lines: the former is especially
complicated because of its support for page tqlayout.)\n
-# The canvas view transmits this kind of info as a signal, which is
- connected to a slot in the tqparent EditView.
+ connected to a slot in the parent EditView.
-# The EditView delegates action to the current tool.\n
-# The tool performs the actual job (inserting or deleting a note,
etc...).
diff --git a/src/gui/configuration/AudioConfigurationPage.cpp b/src/gui/configuration/AudioConfigurationPage.cpp
index 38b675a..e7d6128 100644
--- a/src/gui/configuration/AudioConfigurationPage.cpp
+++ b/src/gui/configuration/AudioConfigurationPage.cpp
@@ -67,9 +67,9 @@ namespace Rosegarden
AudioConfigurationPage::AudioConfigurationPage(
RosegardenGUIDoc *doc,
KConfig *cfg,
- TQWidget *tqparent,
+ TQWidget *parent,
const char *name):
- TabbedConfigurationPage(cfg, tqparent, name),
+ TabbedConfigurationPage(cfg, parent, name),
m_externalAudioEditorPath(0)
{
// set the document in the super class
diff --git a/src/gui/configuration/AudioConfigurationPage.h b/src/gui/configuration/AudioConfigurationPage.h
index b5bd5f0..fe6af51 100644
--- a/src/gui/configuration/AudioConfigurationPage.h
+++ b/src/gui/configuration/AudioConfigurationPage.h
@@ -54,7 +54,7 @@ class AudioConfigurationPage : public TabbedConfigurationPage
public:
AudioConfigurationPage(RosegardenGUIDoc *doc,
KConfig *cfg,
- TQWidget *tqparent=0,
+ TQWidget *parent=0,
const char *name=0);
virtual void apply();
diff --git a/src/gui/configuration/AudioPropertiesPage.cpp b/src/gui/configuration/AudioPropertiesPage.cpp
index 85dc0b4..b81655b 100644
--- a/src/gui/configuration/AudioPropertiesPage.cpp
+++ b/src/gui/configuration/AudioPropertiesPage.cpp
@@ -52,9 +52,9 @@ namespace Rosegarden
{
AudioPropertiesPage::AudioPropertiesPage(RosegardenGUIDoc *doc,
- TQWidget *tqparent,
+ TQWidget *parent,
const char *name)
- : TabbedConfigurationPage(doc, tqparent, name)
+ : TabbedConfigurationPage(doc, parent, name)
{
AudioFileManager &afm = doc->getAudioFileManager();
diff --git a/src/gui/configuration/AudioPropertiesPage.h b/src/gui/configuration/AudioPropertiesPage.h
index 3ddb83f..8ba6484 100644
--- a/src/gui/configuration/AudioPropertiesPage.h
+++ b/src/gui/configuration/AudioPropertiesPage.h
@@ -53,7 +53,7 @@ class AudioPropertiesPage : public TabbedConfigurationPage
TQ_OBJECT
public:
AudioPropertiesPage(RosegardenGUIDoc *doc,
- TQWidget *tqparent=0, const char *name=0);
+ TQWidget *parent=0, const char *name=0);
virtual void apply();
static TQString iconLabel() { return i18n("Audio"); }
diff --git a/src/gui/configuration/ColourConfigurationPage.cpp b/src/gui/configuration/ColourConfigurationPage.cpp
index 5ef9321..8196125 100644
--- a/src/gui/configuration/ColourConfigurationPage.cpp
+++ b/src/gui/configuration/ColourConfigurationPage.cpp
@@ -52,9 +52,9 @@ namespace Rosegarden
{
ColourConfigurationPage::ColourConfigurationPage(RosegardenGUIDoc *doc,
- TQWidget *tqparent,
+ TQWidget *parent,
const char *name)
- : TabbedConfigurationPage(doc, tqparent, name)
+ : TabbedConfigurationPage(doc, parent, name)
{
TQFrame *frame = new TQFrame(m_tabWidget);
TQGridLayout *tqlayout = new TQGridLayout(frame, 2, 2,
diff --git a/src/gui/configuration/ColourConfigurationPage.h b/src/gui/configuration/ColourConfigurationPage.h
index f6c8bfd..4bd0499 100644
--- a/src/gui/configuration/ColourConfigurationPage.h
+++ b/src/gui/configuration/ColourConfigurationPage.h
@@ -53,7 +53,7 @@ class ColourConfigurationPage : public TabbedConfigurationPage
TQ_OBJECT
public:
ColourConfigurationPage(RosegardenGUIDoc *doc,
- TQWidget *tqparent=0, const char *name=0);
+ TQWidget *parent=0, const char *name=0);
virtual void apply();
void populate_table();
diff --git a/src/gui/configuration/ConfigurationPage.h b/src/gui/configuration/ConfigurationPage.h
index cfc4f18..72a3e3e 100644
--- a/src/gui/configuration/ConfigurationPage.h
+++ b/src/gui/configuration/ConfigurationPage.h
@@ -52,16 +52,16 @@ class ConfigurationPage : public TQWidget
public:
ConfigurationPage(RosegardenGUIDoc *doc,
- TQWidget *tqparent=0, const char *name=0)
- : TQWidget(tqparent, name), m_doc(doc), m_cfg(0), m_pageIndex(0) {}
+ TQWidget *parent=0, const char *name=0)
+ : TQWidget(parent, name), m_doc(doc), m_cfg(0), m_pageIndex(0) {}
ConfigurationPage(KConfig *cfg,
- TQWidget *tqparent=0, const char *name=0)
- : TQWidget(tqparent, name), m_doc(0), m_cfg(cfg), m_pageIndex(0) {}
+ TQWidget *parent=0, const char *name=0)
+ : TQWidget(parent, name), m_doc(0), m_cfg(cfg), m_pageIndex(0) {}
ConfigurationPage(RosegardenGUIDoc *doc, KConfig *cfg,
- TQWidget *tqparent=0, const char *name=0)
- : TQWidget(tqparent, name), m_doc(doc), m_cfg(cfg), m_pageIndex(0) {}
+ TQWidget *parent=0, const char *name=0)
+ : TQWidget(parent, name), m_doc(doc), m_cfg(cfg), m_pageIndex(0) {}
virtual ~ConfigurationPage() {};
diff --git a/src/gui/configuration/DocumentMetaConfigurationPage.cpp b/src/gui/configuration/DocumentMetaConfigurationPage.cpp
index 35e614d..fbcf519 100644
--- a/src/gui/configuration/DocumentMetaConfigurationPage.cpp
+++ b/src/gui/configuration/DocumentMetaConfigurationPage.cpp
@@ -104,9 +104,9 @@ public:
};
DocumentMetaConfigurationPage::DocumentMetaConfigurationPage(RosegardenGUIDoc *doc,
- TQWidget *tqparent,
+ TQWidget *parent,
const char *name) :
- TabbedConfigurationPage(doc, tqparent, name)
+ TabbedConfigurationPage(doc, parent, name)
{
m_headersPage = new HeadersConfigurationPage(this, doc);
addTab(m_headersPage, i18n("Headers"));
diff --git a/src/gui/configuration/DocumentMetaConfigurationPage.h b/src/gui/configuration/DocumentMetaConfigurationPage.h
index 7fa375a..564a2d5 100644
--- a/src/gui/configuration/DocumentMetaConfigurationPage.h
+++ b/src/gui/configuration/DocumentMetaConfigurationPage.h
@@ -52,7 +52,7 @@ class DocumentMetaConfigurationPage : public TabbedConfigurationPage
TQ_OBJECT
public:
DocumentMetaConfigurationPage(RosegardenGUIDoc *doc,
- TQWidget *tqparent = 0, const char *name = 0);
+ TQWidget *parent = 0, const char *name = 0);
virtual void apply();
static TQString iconLabel() { return i18n("About"); }
diff --git a/src/gui/configuration/GeneralConfigurationPage.cpp b/src/gui/configuration/GeneralConfigurationPage.cpp
index 763f077..11b4c31 100644
--- a/src/gui/configuration/GeneralConfigurationPage.cpp
+++ b/src/gui/configuration/GeneralConfigurationPage.cpp
@@ -59,8 +59,8 @@ namespace Rosegarden
GeneralConfigurationPage::GeneralConfigurationPage(RosegardenGUIDoc *doc,
KConfig *cfg,
- TQWidget *tqparent, const char *name)
- : TabbedConfigurationPage(cfg, tqparent, name),
+ TQWidget *parent, const char *name)
+ : TabbedConfigurationPage(cfg, parent, name),
m_doc(doc),
m_client(0),
m_countIn(0),
diff --git a/src/gui/configuration/GeneralConfigurationPage.h b/src/gui/configuration/GeneralConfigurationPage.h
index a51d079..9dc7190 100644
--- a/src/gui/configuration/GeneralConfigurationPage.h
+++ b/src/gui/configuration/GeneralConfigurationPage.h
@@ -72,7 +72,7 @@ public:
GeneralConfigurationPage(RosegardenGUIDoc *doc,
KConfig *cfg,
- TQWidget *tqparent=0, const char *name=0);
+ TQWidget *parent=0, const char *name=0);
virtual void apply();
diff --git a/src/gui/configuration/HeadersConfigurationPage.cpp b/src/gui/configuration/HeadersConfigurationPage.cpp
index 4c550b6..f853d1c 100644
--- a/src/gui/configuration/HeadersConfigurationPage.cpp
+++ b/src/gui/configuration/HeadersConfigurationPage.cpp
@@ -50,9 +50,9 @@
namespace Rosegarden
{
-HeadersConfigurationPage::HeadersConfigurationPage(TQWidget *tqparent,
+HeadersConfigurationPage::HeadersConfigurationPage(TQWidget *parent,
RosegardenGUIDoc *doc) :
- TQVBox(tqparent),
+ TQVBox(parent),
m_doc(doc)
{
//
diff --git a/src/gui/configuration/HeadersConfigurationPage.h b/src/gui/configuration/HeadersConfigurationPage.h
index 4b90b0e..f71b8ab 100644
--- a/src/gui/configuration/HeadersConfigurationPage.h
+++ b/src/gui/configuration/HeadersConfigurationPage.h
@@ -44,7 +44,7 @@ class HeadersConfigurationPage : public TQVBox
TQ_OBJECT
public:
- HeadersConfigurationPage(TQWidget *tqparent = 0,
+ HeadersConfigurationPage(TQWidget *parent = 0,
RosegardenGUIDoc *doc = 0);
public slots:
diff --git a/src/gui/configuration/LatencyConfigurationPage.cpp b/src/gui/configuration/LatencyConfigurationPage.cpp
index 489bcaf..a1929aa 100644
--- a/src/gui/configuration/LatencyConfigurationPage.cpp
+++ b/src/gui/configuration/LatencyConfigurationPage.cpp
@@ -45,9 +45,9 @@ namespace Rosegarden
LatencyConfigurationPage::LatencyConfigurationPage(RosegardenGUIDoc *doc,
KConfig *cfg,
- TQWidget *tqparent,
+ TQWidget *parent,
const char *name)
- : TabbedConfigurationPage(doc, cfg, tqparent, name)
+ : TabbedConfigurationPage(doc, cfg, parent, name)
{
// Configuration &config = doc->getConfiguration();
m_cfg->setGroup(LatencyOptionsConfigGroup);
diff --git a/src/gui/configuration/LatencyConfigurationPage.h b/src/gui/configuration/LatencyConfigurationPage.h
index efd7687..61fb365 100644
--- a/src/gui/configuration/LatencyConfigurationPage.h
+++ b/src/gui/configuration/LatencyConfigurationPage.h
@@ -56,7 +56,7 @@ class LatencyConfigurationPage : public TabbedConfigurationPage
public:
LatencyConfigurationPage(RosegardenGUIDoc *doc,
KConfig *cfg,
- TQWidget *tqparent=0, const char *name=0);
+ TQWidget *parent=0, const char *name=0);
virtual void apply();
diff --git a/src/gui/configuration/MIDIConfigurationPage.cpp b/src/gui/configuration/MIDIConfigurationPage.cpp
index 8a22e62..44c4c49 100644
--- a/src/gui/configuration/MIDIConfigurationPage.cpp
+++ b/src/gui/configuration/MIDIConfigurationPage.cpp
@@ -67,9 +67,9 @@ namespace Rosegarden
MIDIConfigurationPage::MIDIConfigurationPage(
RosegardenGUIDoc *doc,
KConfig *cfg,
- TQWidget *tqparent,
+ TQWidget *parent,
const char *name):
- TabbedConfigurationPage(cfg, tqparent, name),
+ TabbedConfigurationPage(cfg, parent, name),
m_midiPitchOctave(0)
{
// set the document in the super class
diff --git a/src/gui/configuration/MIDIConfigurationPage.h b/src/gui/configuration/MIDIConfigurationPage.h
index f3b953f..2306cad 100644
--- a/src/gui/configuration/MIDIConfigurationPage.h
+++ b/src/gui/configuration/MIDIConfigurationPage.h
@@ -55,7 +55,7 @@ class MIDIConfigurationPage : public TabbedConfigurationPage
public:
MIDIConfigurationPage(RosegardenGUIDoc *doc,
KConfig *cfg,
- TQWidget *tqparent=0,
+ TQWidget *parent=0,
const char *name=0);
virtual void apply();
diff --git a/src/gui/configuration/MatrixConfigurationPage.cpp b/src/gui/configuration/MatrixConfigurationPage.cpp
index db4eb85..c5adbd9 100644
--- a/src/gui/configuration/MatrixConfigurationPage.cpp
+++ b/src/gui/configuration/MatrixConfigurationPage.cpp
@@ -43,9 +43,9 @@ namespace Rosegarden
{
MatrixConfigurationPage::MatrixConfigurationPage(KConfig *cfg,
- TQWidget *tqparent,
+ TQWidget *parent,
const char *name) :
- TabbedConfigurationPage(cfg, tqparent, name)
+ TabbedConfigurationPage(cfg, parent, name)
{
m_cfg->setGroup(MatrixViewConfigGroup);
diff --git a/src/gui/configuration/MatrixConfigurationPage.h b/src/gui/configuration/MatrixConfigurationPage.h
index 849fc16..bc97a15 100644
--- a/src/gui/configuration/MatrixConfigurationPage.h
+++ b/src/gui/configuration/MatrixConfigurationPage.h
@@ -50,7 +50,7 @@ class MatrixConfigurationPage : public TabbedConfigurationPage
public:
MatrixConfigurationPage(KConfig *cfg,
- TQWidget *tqparent = 0, const char *name=0);
+ TQWidget *parent = 0, const char *name=0);
virtual void apply();
diff --git a/src/gui/configuration/NotationConfigurationPage.cpp b/src/gui/configuration/NotationConfigurationPage.cpp
index 990ca26..e132a25 100644
--- a/src/gui/configuration/NotationConfigurationPage.cpp
+++ b/src/gui/configuration/NotationConfigurationPage.cpp
@@ -67,9 +67,9 @@ namespace Rosegarden
{
NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
- TQWidget *tqparent,
+ TQWidget *parent,
const char *name) :
- TabbedConfigurationPage(cfg, tqparent, name)
+ TabbedConfigurationPage(cfg, parent, name)
{
m_cfg->setGroup(NotationViewConfigGroup);
diff --git a/src/gui/configuration/NotationConfigurationPage.h b/src/gui/configuration/NotationConfigurationPage.h
index c43de4f..fc1e226 100644
--- a/src/gui/configuration/NotationConfigurationPage.h
+++ b/src/gui/configuration/NotationConfigurationPage.h
@@ -58,7 +58,7 @@ class NotationConfigurationPage : public TabbedConfigurationPage
public:
NotationConfigurationPage(KConfig *cfg,
- TQWidget *tqparent = 0, const char *name=0);
+ TQWidget *parent = 0, const char *name=0);
virtual void apply();
diff --git a/src/gui/configuration/TabbedConfigurationPage.cpp b/src/gui/configuration/TabbedConfigurationPage.cpp
index de1f58b..ae64894 100644
--- a/src/gui/configuration/TabbedConfigurationPage.cpp
+++ b/src/gui/configuration/TabbedConfigurationPage.cpp
@@ -39,26 +39,26 @@ namespace Rosegarden
{
TabbedConfigurationPage::TabbedConfigurationPage(RosegardenGUIDoc *doc,
- TQWidget *tqparent,
+ TQWidget *parent,
const char *name)
- : ConfigurationPage(doc, tqparent, name)
+ : ConfigurationPage(doc, parent, name)
{
init();
}
TabbedConfigurationPage::TabbedConfigurationPage(KConfig *cfg,
- TQWidget *tqparent,
+ TQWidget *parent,
const char *name)
- : ConfigurationPage(cfg, tqparent, name)
+ : ConfigurationPage(cfg, parent, name)
{
init();
}
TabbedConfigurationPage::TabbedConfigurationPage(RosegardenGUIDoc *doc,
KConfig *cfg,
- TQWidget *tqparent,
+ TQWidget *parent,
const char *name)
- : ConfigurationPage(doc, cfg, tqparent, name)
+ : ConfigurationPage(doc, cfg, parent, name)
{
init();
}
diff --git a/src/gui/configuration/TabbedConfigurationPage.h b/src/gui/configuration/TabbedConfigurationPage.h
index a542b55..6f16f8a 100644
--- a/src/gui/configuration/TabbedConfigurationPage.h
+++ b/src/gui/configuration/TabbedConfigurationPage.h
@@ -52,14 +52,14 @@ class TabbedConfigurationPage : public ConfigurationPage
public:
TabbedConfigurationPage(RosegardenGUIDoc *doc,
- TQWidget *tqparent=0, const char *name=0);
+ TQWidget *parent=0, const char *name=0);
TabbedConfigurationPage(KConfig *cfg,
- TQWidget *tqparent=0, const char *name=0);
+ TQWidget *parent=0, const char *name=0);
TabbedConfigurationPage(RosegardenGUIDoc *doc,
KConfig *cfg,
- TQWidget *tqparent=0, const char *name=0);
+ TQWidget *parent=0, const char *name=0);
static TQString iconName() { return "misc"; }
diff --git a/src/gui/dialogs/AddTracksDialog.cpp b/src/gui/dialogs/AddTracksDialog.cpp
index 529174c..498e010 100644
--- a/src/gui/dialogs/AddTracksDialog.cpp
+++ b/src/gui/dialogs/AddTracksDialog.cpp
@@ -42,8 +42,8 @@
namespace Rosegarden
{
-AddTracksDialog::AddTracksDialog(TQWidget *tqparent, int currentTrack) :
- KDialogBase(tqparent, 0, true, i18n("Add Tracks"),
+AddTracksDialog::AddTracksDialog(TQWidget *parent, int currentTrack) :
+ KDialogBase(parent, 0, true, i18n("Add Tracks"),
Ok | Cancel),
m_currentTrack(currentTrack)
{
diff --git a/src/gui/dialogs/AddTracksDialog.h b/src/gui/dialogs/AddTracksDialog.h
index 9de3165..675c263 100644
--- a/src/gui/dialogs/AddTracksDialog.h
+++ b/src/gui/dialogs/AddTracksDialog.h
@@ -40,7 +40,7 @@ class AddTracksDialog : public KDialogBase
TQ_OBJECT
public:
- AddTracksDialog(TQWidget *tqparent, int currentTrack = -1);
+ AddTracksDialog(TQWidget *parent, int currentTrack = -1);
int getTracks();
int getInsertPosition();
diff --git a/src/gui/dialogs/AudioManagerDialog.cpp b/src/gui/dialogs/AudioManagerDialog.cpp
index 229f405..b2a2142 100644
--- a/src/gui/dialogs/AudioManagerDialog.cpp
+++ b/src/gui/dialogs/AudioManagerDialog.cpp
@@ -93,9 +93,9 @@ const int AudioManagerDialog::m_maxPreviewWidth = 100;
const int AudioManagerDialog::m_previewHeight = 30;
const char* const AudioManagerDialog::m_listViewLayoutName = "AudioManagerDialog Layout";
-AudioManagerDialog::AudioManagerDialog(TQWidget *tqparent,
+AudioManagerDialog::AudioManagerDialog(TQWidget *parent,
RosegardenGUIDoc *doc):
- KMainWindow(tqparent, "audioManagerDialog"),
+ KMainWindow(parent, "audioManagerDialog"),
m_doc(doc),
m_playingAudioFile(0),
m_audioPlayingDialog(0),
@@ -558,10 +558,10 @@ AudioManagerDialog::slotRemove()
if (newItem == 0)
newItem = item->itemAbove();
- // Or the tqparent
+ // Or the parent
//
if (newItem == 0)
- newItem = item->tqparent();
+ newItem = item->parent();
// Get the id and segment of the next item so that we can
// match against it
diff --git a/src/gui/dialogs/AudioManagerDialog.h b/src/gui/dialogs/AudioManagerDialog.h
index e78eff1..e6b9cdc 100644
--- a/src/gui/dialogs/AudioManagerDialog.h
+++ b/src/gui/dialogs/AudioManagerDialog.h
@@ -62,7 +62,7 @@ class AudioManagerDialog : public KMainWindow
TQ_OBJECT
public:
- AudioManagerDialog(TQWidget *tqparent,
+ AudioManagerDialog(TQWidget *parent,
RosegardenGUIDoc *doc);
~AudioManagerDialog();
diff --git a/src/gui/dialogs/AudioPlayingDialog.cpp b/src/gui/dialogs/AudioPlayingDialog.cpp
index 3f94c4d..af711ac 100644
--- a/src/gui/dialogs/AudioPlayingDialog.cpp
+++ b/src/gui/dialogs/AudioPlayingDialog.cpp
@@ -36,9 +36,9 @@
namespace Rosegarden
{
-AudioPlayingDialog::AudioPlayingDialog(TQWidget *tqparent,
+AudioPlayingDialog::AudioPlayingDialog(TQWidget *parent,
const TQString &name):
- KDialogBase(tqparent, 0, true,
+ KDialogBase(parent, 0, true,
i18n("Playing audio file"),
Cancel)
{
diff --git a/src/gui/dialogs/AudioPlayingDialog.h b/src/gui/dialogs/AudioPlayingDialog.h
index 928eedd..1916e58 100644
--- a/src/gui/dialogs/AudioPlayingDialog.h
+++ b/src/gui/dialogs/AudioPlayingDialog.h
@@ -45,7 +45,7 @@ class AudioPlayingDialog : public KDialogBase
TQ_OBJECT
public:
- AudioPlayingDialog(TQWidget *tqparent, const TQString &label);
+ AudioPlayingDialog(TQWidget *parent, const TQString &label);
signals:
diff --git a/src/gui/dialogs/AudioPluginDialog.cpp b/src/gui/dialogs/AudioPluginDialog.cpp
index 9e07fd4..e3a32a2 100644
--- a/src/gui/dialogs/AudioPluginDialog.cpp
+++ b/src/gui/dialogs/AudioPluginDialog.cpp
@@ -60,14 +60,14 @@
namespace Rosegarden
{
-AudioPluginDialog::AudioPluginDialog(TQWidget *tqparent,
+AudioPluginDialog::AudioPluginDialog(TQWidget *parent,
AudioPluginManager *aPM,
#ifdef HAVE_LIBLO
AudioPluginOSCGUIManager *aGM,
#endif
PluginContainer *pluginContainer,
int index):
- KDialogBase(tqparent, "", false, i18n("Audio Plugin"),
+ KDialogBase(parent, "", false, i18n("Audio Plugin"),
#ifdef HAVE_LIBLO
Close | Details | Help),
#else
@@ -330,10 +330,10 @@ AudioPluginDialog::populatePluginList()
}
void
-AudioPluginDialog::makePluginParamsBox(TQWidget *tqparent, int portCount,
+AudioPluginDialog::makePluginParamsBox(TQWidget *parent, int portCount,
int tooManyPorts)
{
- m_pluginParamsBox = new TQFrame(tqparent);
+ m_pluginParamsBox = new TQFrame(parent);
int columns = 2;
if (portCount > tooManyPorts) {
@@ -402,7 +402,7 @@ AudioPluginDialog::slotPluginSelected(int i)
// Destroy old param widgets
//
- TQWidget* tqparent = dynamic_cast<TQWidget*>(m_pluginParamsBox->tqparent());
+ TQWidget* parent = dynamic_cast<TQWidget*>(m_pluginParamsBox->parent());
delete m_pluginParamsBox;
m_pluginWidgets.clear(); // The widgets are deleted with the parameter box
@@ -418,7 +418,7 @@ AudioPluginDialog::slotPluginSelected(int i)
}
int tooManyPorts = 96;
- makePluginParamsBox(tqparent, portCount, tooManyPorts);
+ makePluginParamsBox(parent, portCount, tooManyPorts);
bool showBounds = (portCount <= 48);
if (portCount > tooManyPorts) {
diff --git a/src/gui/dialogs/AudioPluginDialog.h b/src/gui/dialogs/AudioPluginDialog.h
index 9ea1e2c..39b6560 100644
--- a/src/gui/dialogs/AudioPluginDialog.h
+++ b/src/gui/dialogs/AudioPluginDialog.h
@@ -61,7 +61,7 @@ class AudioPluginDialog : public KDialogBase
TQ_OBJECT
public:
- AudioPluginDialog(TQWidget *tqparent,
+ AudioPluginDialog(TQWidget *parent,
AudioPluginManager *aPM,
#ifdef HAVE_LIBLO
AudioPluginOSCGUIManager *aGM,
diff --git a/src/gui/dialogs/AudioSplitDialog.cpp b/src/gui/dialogs/AudioSplitDialog.cpp
index 2c1e4ec..839e506 100644
--- a/src/gui/dialogs/AudioSplitDialog.cpp
+++ b/src/gui/dialogs/AudioSplitDialog.cpp
@@ -50,10 +50,10 @@
namespace Rosegarden
{
-AudioSplitDialog::AudioSplitDialog(TQWidget *tqparent,
+AudioSplitDialog::AudioSplitDialog(TQWidget *parent,
Segment *segment,
RosegardenGUIDoc *doc):
- KDialogBase(tqparent, 0, true,
+ KDialogBase(parent, 0, true,
i18n("Autosplit Audio Segment"), Ok | Cancel),
m_doc(doc),
m_segment(segment),
diff --git a/src/gui/dialogs/AudioSplitDialog.h b/src/gui/dialogs/AudioSplitDialog.h
index b4d1cae..09b2a29 100644
--- a/src/gui/dialogs/AudioSplitDialog.h
+++ b/src/gui/dialogs/AudioSplitDialog.h
@@ -49,7 +49,7 @@ class AudioSplitDialog : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- AudioSplitDialog(TQWidget *tqparent,
+ AudioSplitDialog(TQWidget *parent,
Segment *segment,
RosegardenGUIDoc *doc);
diff --git a/src/gui/dialogs/BeatsBarsDialog.cpp b/src/gui/dialogs/BeatsBarsDialog.cpp
index 0b22d6c..1624e03 100644
--- a/src/gui/dialogs/BeatsBarsDialog.cpp
+++ b/src/gui/dialogs/BeatsBarsDialog.cpp
@@ -40,8 +40,8 @@
namespace Rosegarden
{
-BeatsBarsDialog::BeatsBarsDialog(TQWidget* tqparent) :
- KDialogBase(tqparent, 0, true, i18n("Audio Segment Duration"),
+BeatsBarsDialog::BeatsBarsDialog(TQWidget* parent) :
+ KDialogBase(parent, 0, true, i18n("Audio Segment Duration"),
Ok | Cancel, Ok)
{
TQHBox *hbox = makeHBoxMainWidget();
diff --git a/src/gui/dialogs/BeatsBarsDialog.h b/src/gui/dialogs/BeatsBarsDialog.h
index 11c0810..1915ae5 100644
--- a/src/gui/dialogs/BeatsBarsDialog.h
+++ b/src/gui/dialogs/BeatsBarsDialog.h
@@ -47,7 +47,7 @@ class BeatsBarsDialog : public KDialogBase
public:
BeatsBarsDialog();
- BeatsBarsDialog(TQWidget *tqparent);
+ BeatsBarsDialog(TQWidget *parent);
int getQuantity() { return m_spinBox->value(); }
int getMode() { return m_comboBox->currentItem(); }
diff --git a/src/gui/dialogs/ClefDialog.cpp b/src/gui/dialogs/ClefDialog.cpp
index 588e768..30f49fb 100644
--- a/src/gui/dialogs/ClefDialog.cpp
+++ b/src/gui/dialogs/ClefDialog.cpp
@@ -46,11 +46,11 @@
namespace Rosegarden
{
-ClefDialog::ClefDialog(TQWidget *tqparent,
+ClefDialog::ClefDialog(TQWidget *parent,
NotePixmapFactory *npf,
Clef defaultClef,
bool showConversionOptions) :
- KDialogBase(tqparent, 0, true, i18n("Clef"), Ok | Cancel | Help),
+ KDialogBase(parent, 0, true, i18n("Clef"), Ok | Cancel | Help),
m_notePixmapFactory(npf),
m_clef(defaultClef)
{
diff --git a/src/gui/dialogs/ClefDialog.h b/src/gui/dialogs/ClefDialog.h
index a88158f..0cae674 100644
--- a/src/gui/dialogs/ClefDialog.h
+++ b/src/gui/dialogs/ClefDialog.h
@@ -54,7 +54,7 @@ public:
Transpose,
};
- ClefDialog(TQWidget *tqparent,
+ ClefDialog(TQWidget *parent,
NotePixmapFactory *npf,
Clef defaultClef,
bool showConversionOptions = true);
diff --git a/src/gui/dialogs/CompositionLengthDialog.cpp b/src/gui/dialogs/CompositionLengthDialog.cpp
index fb5fc21..85d2530 100644
--- a/src/gui/dialogs/CompositionLengthDialog.cpp
+++ b/src/gui/dialogs/CompositionLengthDialog.cpp
@@ -39,9 +39,9 @@ namespace Rosegarden
{
CompositionLengthDialog::CompositionLengthDialog(
- TQWidget *tqparent,
+ TQWidget *parent,
Composition *composition):
- KDialogBase(tqparent, 0, true, i18n("Change Composition Length"),
+ KDialogBase(parent, 0, true, i18n("Change Composition Length"),
Ok | Cancel),
m_composition(composition)
{
diff --git a/src/gui/dialogs/CompositionLengthDialog.h b/src/gui/dialogs/CompositionLengthDialog.h
index 03235d5..4140723 100644
--- a/src/gui/dialogs/CompositionLengthDialog.h
+++ b/src/gui/dialogs/CompositionLengthDialog.h
@@ -45,7 +45,7 @@ class CompositionLengthDialog : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- CompositionLengthDialog(TQWidget *tqparent,
+ CompositionLengthDialog(TQWidget *parent,
Composition *composition);
timeT getStartMarker();
diff --git a/src/gui/dialogs/ConfigureDialog.cpp b/src/gui/dialogs/ConfigureDialog.cpp
index a10a985..9d07860 100644
--- a/src/gui/dialogs/ConfigureDialog.cpp
+++ b/src/gui/dialogs/ConfigureDialog.cpp
@@ -61,9 +61,9 @@ static TQPixmap loadIcon(const char *name)
ConfigureDialog::ConfigureDialog(RosegardenGUIDoc *doc,
KConfig* cfg,
- TQWidget *tqparent,
+ TQWidget *parent,
const char *name)
- : ConfigureDialogBase(tqparent, i18n("Configure Rosegarden"), name)
+ : ConfigureDialogBase(parent, i18n("Configure Rosegarden"), name)
{
TQWidget *pageWidget = 0;
TQVBoxLayout *vlay = 0;
diff --git a/src/gui/dialogs/ConfigureDialog.h b/src/gui/dialogs/ConfigureDialog.h
index ee004a0..b449236 100644
--- a/src/gui/dialogs/ConfigureDialog.h
+++ b/src/gui/dialogs/ConfigureDialog.h
@@ -46,7 +46,7 @@ class ConfigureDialog : public ConfigureDialogBase
public:
ConfigureDialog(RosegardenGUIDoc *doc,
KConfig* cfg,
- TQWidget *tqparent=0,
+ TQWidget *parent=0,
const char *name=0);
signals:
void updateAutoSaveInterval(unsigned int);
diff --git a/src/gui/dialogs/ConfigureDialogBase.cpp b/src/gui/dialogs/ConfigureDialogBase.cpp
index 65c4856..017e6a6 100644
--- a/src/gui/dialogs/ConfigureDialogBase.cpp
+++ b/src/gui/dialogs/ConfigureDialogBase.cpp
@@ -35,11 +35,11 @@
namespace Rosegarden
{
-ConfigureDialogBase::ConfigureDialogBase(TQWidget *tqparent,
+ConfigureDialogBase::ConfigureDialogBase(TQWidget *parent,
TQString label,
const char *name):
KDialogBase(IconList, label ? label : i18n("Configure"), Help | Apply | Ok | Cancel,
- Ok, tqparent, name, true) // modal
+ Ok, parent, name, true) // modal
{
setWFlags(WDestructiveClose);
}
diff --git a/src/gui/dialogs/ConfigureDialogBase.h b/src/gui/dialogs/ConfigureDialogBase.h
index 90ac259..c970b60 100644
--- a/src/gui/dialogs/ConfigureDialogBase.h
+++ b/src/gui/dialogs/ConfigureDialogBase.h
@@ -45,7 +45,7 @@ class ConfigureDialogBase : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- ConfigureDialogBase(TQWidget *tqparent=0,
+ ConfigureDialogBase(TQWidget *parent=0,
TQString label = 0,
const char *name=0);
virtual ~ConfigureDialogBase();
diff --git a/src/gui/dialogs/CountdownBar.cpp b/src/gui/dialogs/CountdownBar.cpp
index 98eb9ac..5e77345 100644
--- a/src/gui/dialogs/CountdownBar.cpp
+++ b/src/gui/dialogs/CountdownBar.cpp
@@ -34,8 +34,8 @@
namespace Rosegarden
{
-CountdownBar::CountdownBar(TQWidget *tqparent, int width, int height):
- TQFrame(tqparent), m_width(width), m_height(height), m_position(0)
+CountdownBar::CountdownBar(TQWidget *parent, int width, int height):
+ TQFrame(parent), m_width(width), m_height(height), m_position(0)
{
resize(m_width, m_height);
tqrepaint();
diff --git a/src/gui/dialogs/CountdownBar.h b/src/gui/dialogs/CountdownBar.h
index 3337b29..a1d41cd 100644
--- a/src/gui/dialogs/CountdownBar.h
+++ b/src/gui/dialogs/CountdownBar.h
@@ -43,7 +43,7 @@ class CountdownBar : public TQFrame
Q_OBJECT
TQ_OBJECT
public:
- CountdownBar(TQWidget *tqparent, int width, int height);
+ CountdownBar(TQWidget *parent, int width, int height);
void setPosition(int position);
protected:
diff --git a/src/gui/dialogs/CountdownDialog.cpp b/src/gui/dialogs/CountdownDialog.cpp
index 31b3bef..8b69eb8 100644
--- a/src/gui/dialogs/CountdownDialog.cpp
+++ b/src/gui/dialogs/CountdownDialog.cpp
@@ -41,8 +41,8 @@
namespace Rosegarden
{
-CountdownDialog::CountdownDialog(TQWidget *tqparent, int seconds):
- TQDialog(tqparent, "", false, WStyle_StaysOnTop | WStyle_DialogBorder),
+CountdownDialog::CountdownDialog(TQWidget *parent, int seconds):
+ TQDialog(parent, "", false, WStyle_StaysOnTop | WStyle_DialogBorder),
m_pastEndMode(false),
m_totalTime(seconds),
m_progressBarWidth(150),
diff --git a/src/gui/dialogs/CountdownDialog.h b/src/gui/dialogs/CountdownDialog.h
index c4c793d..aa48f14 100644
--- a/src/gui/dialogs/CountdownDialog.h
+++ b/src/gui/dialogs/CountdownDialog.h
@@ -49,7 +49,7 @@ class CountdownDialog : public TQDialog // KDialogBase
TQ_OBJECT
public:
- CountdownDialog(TQWidget *tqparent, int seconds = 300);
+ CountdownDialog(TQWidget *parent, int seconds = 300);
void setLabel(const TQString &label);
void setElapsedTime(int seconds);
diff --git a/src/gui/dialogs/DocumentConfigureDialog.cpp b/src/gui/dialogs/DocumentConfigureDialog.cpp
index 50d06ee..ff855d7 100644
--- a/src/gui/dialogs/DocumentConfigureDialog.cpp
+++ b/src/gui/dialogs/DocumentConfigureDialog.cpp
@@ -59,9 +59,9 @@ static TQPixmap loadIcon(const char *name)
DocumentConfigureDialog::DocumentConfigureDialog(RosegardenGUIDoc *doc,
- TQWidget *tqparent,
+ TQWidget *parent,
const char *name)
- : ConfigureDialogBase(tqparent, i18n("Document Properties"), name)
+ : ConfigureDialogBase(parent, i18n("Document Properties"), name)
{
TQWidget *pageWidget = 0;
TQVBoxLayout *vlay = 0;
diff --git a/src/gui/dialogs/DocumentConfigureDialog.h b/src/gui/dialogs/DocumentConfigureDialog.h
index 1ed0b70..08f9283 100644
--- a/src/gui/dialogs/DocumentConfigureDialog.h
+++ b/src/gui/dialogs/DocumentConfigureDialog.h
@@ -42,7 +42,7 @@ class DocumentConfigureDialog : public ConfigureDialogBase
{
public:
DocumentConfigureDialog(RosegardenGUIDoc *doc,
- TQWidget *tqparent=0,
+ TQWidget *parent=0,
const char *name=0);
void showAudioPage();
diff --git a/src/gui/dialogs/EventEditDialog.cpp b/src/gui/dialogs/EventEditDialog.cpp
index fc73f51..0502fce 100644
--- a/src/gui/dialogs/EventEditDialog.cpp
+++ b/src/gui/dialogs/EventEditDialog.cpp
@@ -57,10 +57,10 @@
namespace Rosegarden
{
-EventEditDialog::EventEditDialog(TQWidget *tqparent,
+EventEditDialog::EventEditDialog(TQWidget *parent,
const Event &event,
bool editable) :
- KDialogBase(tqparent, 0, true, i18n(editable ? "Advanced Event Edit" : "Advanced Event Viewer"),
+ KDialogBase(parent, 0, true, i18n(editable ? "Advanced Event Edit" : "Advanced Event Viewer"),
(editable ? (Ok | Cancel) : Ok)),
m_durationDisplay(0),
m_durationDisplayAux(0),
diff --git a/src/gui/dialogs/EventEditDialog.h b/src/gui/dialogs/EventEditDialog.h
index 7593c79..800f1ba 100644
--- a/src/gui/dialogs/EventEditDialog.h
+++ b/src/gui/dialogs/EventEditDialog.h
@@ -58,7 +58,7 @@ public:
* the resulting edited version can subsequently be queried
* through getEvent().
*/
- EventEditDialog(TQWidget *tqparent,
+ EventEditDialog(TQWidget *parent,
const Event &event,
bool editable = true);
diff --git a/src/gui/dialogs/EventFilterDialog.cpp b/src/gui/dialogs/EventFilterDialog.cpp
index 0f13ad3..fbfcdb4 100644
--- a/src/gui/dialogs/EventFilterDialog.cpp
+++ b/src/gui/dialogs/EventFilterDialog.cpp
@@ -61,8 +61,8 @@
namespace Rosegarden
{
-EventFilterDialog::EventFilterDialog(TQWidget* tqparent)
- : KDialogBase(tqparent, "eventfilerdialog", true, i18n("Event Filter"), Ok | Cancel, Ok),
+EventFilterDialog::EventFilterDialog(TQWidget* parent)
+ : KDialogBase(parent, "eventfilerdialog", true, i18n("Event Filter"), Ok | Cancel, Ok),
m_standardQuantizations(BasicQuantizer::getStandardQuantizations())
{
cfg = kapp->config();
diff --git a/src/gui/dialogs/EventFilterDialog.h b/src/gui/dialogs/EventFilterDialog.h
index c07fa58..4e3f5f8 100644
--- a/src/gui/dialogs/EventFilterDialog.h
+++ b/src/gui/dialogs/EventFilterDialog.h
@@ -63,7 +63,7 @@ class EventFilterDialog : public KDialogBase
public:
- EventFilterDialog(TQWidget* tqparent);
+ EventFilterDialog(TQWidget* parent);
~EventFilterDialog();
KConfig *cfg;
diff --git a/src/gui/dialogs/EventParameterDialog.cpp b/src/gui/dialogs/EventParameterDialog.cpp
index 6443f48..28beb95 100644
--- a/src/gui/dialogs/EventParameterDialog.cpp
+++ b/src/gui/dialogs/EventParameterDialog.cpp
@@ -42,11 +42,11 @@ namespace Rosegarden
{
EventParameterDialog::EventParameterDialog(
- TQWidget *tqparent,
+ TQWidget *parent,
const TQString &name,
const PropertyName &property,
int startValue):
- KDialogBase(tqparent, 0, true, name, Ok | Cancel),
+ KDialogBase(parent, 0, true, name, Ok | Cancel),
m_property(property)
{
TQVBox *vBox = makeVBoxMainWidget();
diff --git a/src/gui/dialogs/EventParameterDialog.h b/src/gui/dialogs/EventParameterDialog.h
index cfc71a9..9ad189d 100644
--- a/src/gui/dialogs/EventParameterDialog.h
+++ b/src/gui/dialogs/EventParameterDialog.h
@@ -47,7 +47,7 @@ class EventParameterDialog : public KDialogBase
TQ_OBJECT
public:
- EventParameterDialog(TQWidget *tqparent,
+ EventParameterDialog(TQWidget *parent,
const TQString &name, // name
const PropertyName &property, // property
int startValue); // start
diff --git a/src/gui/dialogs/ExportDeviceDialog.cpp b/src/gui/dialogs/ExportDeviceDialog.cpp
index 34260c7..b02ff47 100644
--- a/src/gui/dialogs/ExportDeviceDialog.cpp
+++ b/src/gui/dialogs/ExportDeviceDialog.cpp
@@ -38,8 +38,8 @@
namespace Rosegarden
{
-ExportDeviceDialog::ExportDeviceDialog(TQWidget *tqparent, TQString deviceName) :
- KDialogBase(tqparent, "exportdevicedialog", true, i18n("Export Devices..."),
+ExportDeviceDialog::ExportDeviceDialog(TQWidget *parent, TQString deviceName) :
+ KDialogBase(parent, "exportdevicedialog", true, i18n("Export Devices..."),
Ok | Cancel, Ok)
{
TQVBox *vbox = makeVBoxMainWidget();
diff --git a/src/gui/dialogs/ExportDeviceDialog.h b/src/gui/dialogs/ExportDeviceDialog.h
index 4526ba2..0b092bc 100644
--- a/src/gui/dialogs/ExportDeviceDialog.h
+++ b/src/gui/dialogs/ExportDeviceDialog.h
@@ -44,7 +44,7 @@ class ExportDeviceDialog : public KDialogBase
public:
enum ExportType { ExportOne, ExportAll };
- ExportDeviceDialog(TQWidget *tqparent, TQString deviceName);
+ ExportDeviceDialog(TQWidget *parent, TQString deviceName);
ExportType getExportType();
diff --git a/src/gui/dialogs/FileLocateDialog.cpp b/src/gui/dialogs/FileLocateDialog.cpp
index 6a40742..2668ef4 100644
--- a/src/gui/dialogs/FileLocateDialog.cpp
+++ b/src/gui/dialogs/FileLocateDialog.cpp
@@ -39,10 +39,10 @@
namespace Rosegarden
{
-FileLocateDialog::FileLocateDialog(TQWidget *tqparent,
+FileLocateDialog::FileLocateDialog(TQWidget *parent,
const TQString &file,
const TQString & /*path*/):
- KDialogBase(tqparent, 0, true,
+ KDialogBase(parent, 0, true,
i18n("Locate audio file"),
User1 | User2 | User3,
Ok,
diff --git a/src/gui/dialogs/FileLocateDialog.h b/src/gui/dialogs/FileLocateDialog.h
index 7f36591..990d61d 100644
--- a/src/gui/dialogs/FileLocateDialog.h
+++ b/src/gui/dialogs/FileLocateDialog.h
@@ -44,7 +44,7 @@ class FileLocateDialog : public KDialogBase
TQ_OBJECT
public:
- FileLocateDialog(TQWidget *tqparent,
+ FileLocateDialog(TQWidget *parent,
const TQString &file,
const TQString &path);
diff --git a/src/gui/dialogs/FileMergeDialog.cpp b/src/gui/dialogs/FileMergeDialog.cpp
index 7d378e6..d7d48cf 100644
--- a/src/gui/dialogs/FileMergeDialog.cpp
+++ b/src/gui/dialogs/FileMergeDialog.cpp
@@ -40,10 +40,10 @@
namespace Rosegarden
{
-FileMergeDialog::FileMergeDialog(TQWidget *tqparent,
+FileMergeDialog::FileMergeDialog(TQWidget *parent,
TQString /*fileName*/,
bool timingsDiffer) :
- KDialogBase(tqparent, 0, true, i18n("Merge File"), Ok | Cancel | Help)
+ KDialogBase(parent, 0, true, i18n("Merge File"), Ok | Cancel | Help)
{
setHelp("file-merge");
diff --git a/src/gui/dialogs/FileMergeDialog.h b/src/gui/dialogs/FileMergeDialog.h
index 5675f59..94ef70b 100644
--- a/src/gui/dialogs/FileMergeDialog.h
+++ b/src/gui/dialogs/FileMergeDialog.h
@@ -46,7 +46,7 @@ class FileMergeDialog : public KDialogBase
TQ_OBJECT
public:
- FileMergeDialog(TQWidget *tqparent, TQString fileName, bool timingsDiffer);
+ FileMergeDialog(TQWidget *parent, TQString fileName, bool timingsDiffer);
int getMergeOptions();
diff --git a/src/gui/dialogs/FloatEdit.cpp b/src/gui/dialogs/FloatEdit.cpp
index db2dc43..fc25fea 100644
--- a/src/gui/dialogs/FloatEdit.cpp
+++ b/src/gui/dialogs/FloatEdit.cpp
@@ -37,14 +37,14 @@
namespace Rosegarden
{
-FloatEdit::FloatEdit(TQWidget *tqparent,
+FloatEdit::FloatEdit(TQWidget *parent,
const TQString &title,
const TQString &text,
float min,
float max,
float value,
float step):
- KDialogBase(tqparent, "rosegardenFloatEdit", true, title, Ok | Cancel, Ok)
+ KDialogBase(parent, "rosegardenFloatEdit", true, title, Ok | Cancel, Ok)
{
TQVBox *vbox = makeVBoxMainWidget();
TQGroupBox *groupBox = new TQGroupBox(1, Qt::Horizontal, text, vbox);
diff --git a/src/gui/dialogs/FloatEdit.h b/src/gui/dialogs/FloatEdit.h
index 4c7ca20..11afc4d 100644
--- a/src/gui/dialogs/FloatEdit.h
+++ b/src/gui/dialogs/FloatEdit.h
@@ -46,7 +46,7 @@ class FloatEdit : public KDialogBase
TQ_OBJECT
public:
- FloatEdit(TQWidget *tqparent,
+ FloatEdit(TQWidget *parent,
const TQString &title,
const TQString &text,
float min,
diff --git a/src/gui/dialogs/IdentifyTextCodecDialog.cpp b/src/gui/dialogs/IdentifyTextCodecDialog.cpp
index f8deb14..0a0dbd1 100644
--- a/src/gui/dialogs/IdentifyTextCodecDialog.cpp
+++ b/src/gui/dialogs/IdentifyTextCodecDialog.cpp
@@ -41,9 +41,9 @@
namespace Rosegarden
{
-IdentifyTextCodecDialog::IdentifyTextCodecDialog(TQWidget *tqparent,
+IdentifyTextCodecDialog::IdentifyTextCodecDialog(TQWidget *parent,
std::string text) :
- KDialogBase(tqparent, 0, true, i18n("Choose Text Encoding"), Ok),
+ KDialogBase(parent, 0, true, i18n("Choose Text Encoding"), Ok),
m_text(text)
{
TQVBox *vbox = makeVBoxMainWidget();
diff --git a/src/gui/dialogs/IdentifyTextCodecDialog.h b/src/gui/dialogs/IdentifyTextCodecDialog.h
index 1d32f79..a38f639 100644
--- a/src/gui/dialogs/IdentifyTextCodecDialog.h
+++ b/src/gui/dialogs/IdentifyTextCodecDialog.h
@@ -46,7 +46,7 @@ class IdentifyTextCodecDialog : public KDialogBase
TQ_OBJECT
public:
- IdentifyTextCodecDialog(TQWidget *tqparent, std::string text);
+ IdentifyTextCodecDialog(TQWidget *parent, std::string text);
std::string getCodec() const { return m_codec; }
diff --git a/src/gui/dialogs/ImportDeviceDialog.cpp b/src/gui/dialogs/ImportDeviceDialog.cpp
index 53f98bc..6e8b494 100644
--- a/src/gui/dialogs/ImportDeviceDialog.cpp
+++ b/src/gui/dialogs/ImportDeviceDialog.cpp
@@ -54,8 +54,8 @@
namespace Rosegarden
{
-ImportDeviceDialog::ImportDeviceDialog(TQWidget *tqparent, KURL url) :
- KDialogBase(tqparent, "importdevicedialog", true,
+ImportDeviceDialog::ImportDeviceDialog(TQWidget *parent, KURL url) :
+ KDialogBase(parent, "importdevicedialog", true,
i18n("Import from Device..."),
Ok | Cancel, Ok),
m_url(url),
diff --git a/src/gui/dialogs/ImportDeviceDialog.h b/src/gui/dialogs/ImportDeviceDialog.h
index e376f1c..3f15dbd 100644
--- a/src/gui/dialogs/ImportDeviceDialog.h
+++ b/src/gui/dialogs/ImportDeviceDialog.h
@@ -58,7 +58,7 @@ class ImportDeviceDialog : public KDialogBase
TQ_OBJECT
public:
- ImportDeviceDialog(TQWidget *tqparent, KURL url);
+ ImportDeviceDialog(TQWidget *parent, KURL url);
virtual ~ImportDeviceDialog();
bool doImport();
diff --git a/src/gui/dialogs/InterpretDialog.cpp b/src/gui/dialogs/InterpretDialog.cpp
index 75889c6..465a50d 100644
--- a/src/gui/dialogs/InterpretDialog.cpp
+++ b/src/gui/dialogs/InterpretDialog.cpp
@@ -40,8 +40,8 @@
namespace Rosegarden
{
-InterpretDialog::InterpretDialog(TQWidget *tqparent) :
- KDialogBase(tqparent, 0, true, i18n("Interpret"), Ok | Cancel | Help)
+InterpretDialog::InterpretDialog(TQWidget *parent) :
+ KDialogBase(parent, 0, true, i18n("Interpret"), Ok | Cancel | Help)
{
setHelp("nv-interpret");
diff --git a/src/gui/dialogs/InterpretDialog.h b/src/gui/dialogs/InterpretDialog.h
index db5f0ac..da06003 100644
--- a/src/gui/dialogs/InterpretDialog.h
+++ b/src/gui/dialogs/InterpretDialog.h
@@ -43,7 +43,7 @@ class InterpretDialog : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- InterpretDialog(TQWidget *tqparent);
+ InterpretDialog(TQWidget *parent);
// an OR from InterpretCommand's constants
int getInterpretations();
diff --git a/src/gui/dialogs/IntervalDialog.cpp b/src/gui/dialogs/IntervalDialog.cpp
index be238d3..0535e8e 100644
--- a/src/gui/dialogs/IntervalDialog.cpp
+++ b/src/gui/dialogs/IntervalDialog.cpp
@@ -48,8 +48,8 @@
namespace Rosegarden
{
-IntervalDialog::IntervalDialog(TQWidget *tqparent, bool askChangeKey, bool askTransposeSegmentBack) :
- KDialogBase(tqparent, 0, true, i18n("Specify Interval"), Ok | Cancel )
+IntervalDialog::IntervalDialog(TQWidget *parent, bool askChangeKey, bool askTransposeSegmentBack) :
+ KDialogBase(parent, 0, true, i18n("Specify Interval"), Ok | Cancel )
{
TQVBox *vBox = makeVBoxMainWidget();
diff --git a/src/gui/dialogs/IntervalDialog.h b/src/gui/dialogs/IntervalDialog.h
index d464731..3306fb4 100644
--- a/src/gui/dialogs/IntervalDialog.h
+++ b/src/gui/dialogs/IntervalDialog.h
@@ -49,7 +49,7 @@ class IntervalDialog : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- IntervalDialog(TQWidget *tqparent, bool askChangeKey = false, bool askTransposeSegmentBack = false);
+ IntervalDialog(TQWidget *parent, bool askChangeKey = false, bool askTransposeSegmentBack = false);
// Distance in semitones
int getChromaticDistance();
diff --git a/src/gui/dialogs/KeySignatureDialog.cpp b/src/gui/dialogs/KeySignatureDialog.cpp
index 0d5335e..79f190c 100644
--- a/src/gui/dialogs/KeySignatureDialog.cpp
+++ b/src/gui/dialogs/KeySignatureDialog.cpp
@@ -49,14 +49,14 @@
namespace Rosegarden
{
-KeySignatureDialog::KeySignatureDialog(TQWidget *tqparent,
+KeySignatureDialog::KeySignatureDialog(TQWidget *parent,
NotePixmapFactory *npf,
Clef clef,
Rosegarden::Key defaultKey,
bool showApplyToAll,
bool showConversionOptions,
TQString explanatoryText) :
- KDialogBase(tqparent, 0, true, i18n("Key Change"), Ok | Cancel | Help),
+ KDialogBase(parent, 0, true, i18n("Key Change"), Ok | Cancel | Help),
m_notePixmapFactory(npf),
m_key(defaultKey),
m_clef(clef),
diff --git a/src/gui/dialogs/KeySignatureDialog.h b/src/gui/dialogs/KeySignatureDialog.h
index 96448d1..8007412 100644
--- a/src/gui/dialogs/KeySignatureDialog.h
+++ b/src/gui/dialogs/KeySignatureDialog.h
@@ -58,7 +58,7 @@ public:
Transpose
};
- KeySignatureDialog(TQWidget *tqparent,
+ KeySignatureDialog(TQWidget *parent,
NotePixmapFactory *npf,
Clef clef,
Rosegarden::Key defaultKey =
diff --git a/src/gui/dialogs/LilyPondOptionsDialog.cpp b/src/gui/dialogs/LilyPondOptionsDialog.cpp
index ce53b5b..b1adfec 100644
--- a/src/gui/dialogs/LilyPondOptionsDialog.cpp
+++ b/src/gui/dialogs/LilyPondOptionsDialog.cpp
@@ -54,11 +54,11 @@
namespace Rosegarden
{
-LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *tqparent,
+LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *parent,
RosegardenGUIDoc *doc,
TQString windowCaption,
TQString heading) :
- KDialogBase(tqparent, 0, true,
+ KDialogBase(parent, 0, true,
(windowCaption = "" ? i18n("LilyPond Export/Preview") : windowCaption),
Apply | Ok | Cancel),
m_doc(doc)
diff --git a/src/gui/dialogs/LilyPondOptionsDialog.h b/src/gui/dialogs/LilyPondOptionsDialog.h
index e0272ca..f6f151b 100644
--- a/src/gui/dialogs/LilyPondOptionsDialog.h
+++ b/src/gui/dialogs/LilyPondOptionsDialog.h
@@ -48,7 +48,7 @@ class LilyPondOptionsDialog : public KDialogBase
TQ_OBJECT
public:
- LilyPondOptionsDialog(TQWidget *tqparent,
+ LilyPondOptionsDialog(TQWidget *parent,
RosegardenGUIDoc *doc,
TQString windowCaption = "",
TQString heading = "");
diff --git a/src/gui/dialogs/LyricEditDialog.cpp b/src/gui/dialogs/LyricEditDialog.cpp
index cdbf02e..a10cb72 100644
--- a/src/gui/dialogs/LyricEditDialog.cpp
+++ b/src/gui/dialogs/LyricEditDialog.cpp
@@ -48,9 +48,9 @@
namespace Rosegarden
{
-LyricEditDialog::LyricEditDialog(TQWidget *tqparent,
+LyricEditDialog::LyricEditDialog(TQWidget *parent,
Segment *segment) :
- KDialogBase(tqparent, 0, true, i18n("Edit Lyrics"), Ok | Cancel | Help),
+ KDialogBase(parent, 0, true, i18n("Edit Lyrics"), Ok | Cancel | Help),
m_segment(segment),
m_verseCount(0)
{
diff --git a/src/gui/dialogs/LyricEditDialog.h b/src/gui/dialogs/LyricEditDialog.h
index fe46882..f924412 100644
--- a/src/gui/dialogs/LyricEditDialog.h
+++ b/src/gui/dialogs/LyricEditDialog.h
@@ -49,7 +49,7 @@ class LyricEditDialog : public KDialogBase
TQ_OBJECT
public:
- LyricEditDialog(TQWidget *tqparent, Segment *segment);
+ LyricEditDialog(TQWidget *parent, Segment *segment);
int getVerseCount() const;
TQString getLyricData(int verse) const;
diff --git a/src/gui/dialogs/MakeOrnamentDialog.cpp b/src/gui/dialogs/MakeOrnamentDialog.cpp
index e403a7d..8bd283f 100644
--- a/src/gui/dialogs/MakeOrnamentDialog.cpp
+++ b/src/gui/dialogs/MakeOrnamentDialog.cpp
@@ -40,9 +40,9 @@
namespace Rosegarden
{
-MakeOrnamentDialog::MakeOrnamentDialog(TQWidget *tqparent, TQString defaultName,
+MakeOrnamentDialog::MakeOrnamentDialog(TQWidget *parent, TQString defaultName,
int defaultBasePitch) :
- KDialogBase(tqparent, "makeornamentdialog", true, i18n("Make Ornament"),
+ KDialogBase(parent, "makeornamentdialog", true, i18n("Make Ornament"),
Ok | Cancel, Ok)
{
TQVBox *vbox = makeVBoxMainWidget();
diff --git a/src/gui/dialogs/MakeOrnamentDialog.h b/src/gui/dialogs/MakeOrnamentDialog.h
index 4396c18..af7dc99 100644
--- a/src/gui/dialogs/MakeOrnamentDialog.h
+++ b/src/gui/dialogs/MakeOrnamentDialog.h
@@ -46,7 +46,7 @@ class MakeOrnamentDialog : public KDialogBase
TQ_OBJECT
public:
- MakeOrnamentDialog(TQWidget *tqparent, TQString defaultName, int defaultBasePitch);
+ MakeOrnamentDialog(TQWidget *parent, TQString defaultName, int defaultBasePitch);
TQString getName() const;
int getBasePitch() const;
diff --git a/src/gui/dialogs/ManageMetronomeDialog.cpp b/src/gui/dialogs/ManageMetronomeDialog.cpp
index 64b99f7..158cd07 100644
--- a/src/gui/dialogs/ManageMetronomeDialog.cpp
+++ b/src/gui/dialogs/ManageMetronomeDialog.cpp
@@ -58,9 +58,9 @@
namespace Rosegarden
{
-ManageMetronomeDialog::ManageMetronomeDialog(TQWidget *tqparent,
+ManageMetronomeDialog::ManageMetronomeDialog(TQWidget *parent,
RosegardenGUIDoc *doc) :
- KDialogBase(tqparent, 0, true, i18n("Metronome"), Ok | Apply | Close | Help),
+ KDialogBase(parent, 0, true, i18n("Metronome"), Ok | Apply | Close | Help),
m_doc(doc)
{
setHelp("studio-metronome");
diff --git a/src/gui/dialogs/ManageMetronomeDialog.h b/src/gui/dialogs/ManageMetronomeDialog.h
index fbb28f6..3457251 100644
--- a/src/gui/dialogs/ManageMetronomeDialog.h
+++ b/src/gui/dialogs/ManageMetronomeDialog.h
@@ -50,7 +50,7 @@ class ManageMetronomeDialog : public KDialogBase
TQ_OBJECT
public:
- ManageMetronomeDialog(TQWidget *tqparent, RosegardenGUIDoc *doc);
+ ManageMetronomeDialog(TQWidget *parent, RosegardenGUIDoc *doc);
void setModified(bool value);
diff --git a/src/gui/dialogs/MarkerModifyDialog.cpp b/src/gui/dialogs/MarkerModifyDialog.cpp
index c1eefab..b5c8c2c 100644
--- a/src/gui/dialogs/MarkerModifyDialog.cpp
+++ b/src/gui/dialogs/MarkerModifyDialog.cpp
@@ -45,20 +45,20 @@
namespace Rosegarden
{
-MarkerModifyDialog::MarkerModifyDialog(TQWidget *tqparent,
+MarkerModifyDialog::MarkerModifyDialog(TQWidget *parent,
Composition *composition,
int time,
const TQString &name,
const TQString &des):
- KDialogBase(tqparent, 0, true, i18n("Edit Marker"), Ok | Cancel)
+ KDialogBase(parent, 0, true, i18n("Edit Marker"), Ok | Cancel)
{
initialise(composition, time, name, des);
}
-MarkerModifyDialog::MarkerModifyDialog(TQWidget *tqparent,
+MarkerModifyDialog::MarkerModifyDialog(TQWidget *parent,
Composition *composition,
Marker *marker) :
- KDialogBase(tqparent, 0, true, i18n("Edit Marker"), Ok | Cancel)
+ KDialogBase(parent, 0, true, i18n("Edit Marker"), Ok | Cancel)
{
initialise(composition, marker->getTime(),
strtoqstr(marker->getName()),
diff --git a/src/gui/dialogs/MarkerModifyDialog.h b/src/gui/dialogs/MarkerModifyDialog.h
index 2da55ca..046a464 100644
--- a/src/gui/dialogs/MarkerModifyDialog.h
+++ b/src/gui/dialogs/MarkerModifyDialog.h
@@ -47,13 +47,13 @@ class MarkerModifyDialog : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- MarkerModifyDialog(TQWidget *tqparent,
+ MarkerModifyDialog(TQWidget *parent,
Composition *composition,
int time,
const TQString &name,
const TQString &des);
- MarkerModifyDialog(TQWidget *tqparent,
+ MarkerModifyDialog(TQWidget *parent,
Composition *composition,
Marker *marker);
diff --git a/src/gui/dialogs/PasteNotationDialog.cpp b/src/gui/dialogs/PasteNotationDialog.cpp
index 8ea23b0..cb0aa43 100644
--- a/src/gui/dialogs/PasteNotationDialog.cpp
+++ b/src/gui/dialogs/PasteNotationDialog.cpp
@@ -39,9 +39,9 @@
namespace Rosegarden
{
-PasteNotationDialog::PasteNotationDialog(TQWidget *tqparent,
+PasteNotationDialog::PasteNotationDialog(TQWidget *parent,
PasteEventsCommand::PasteType defaultType) :
- KDialogBase(tqparent, 0, true, i18n("Paste"), Ok | Cancel | Help ),
+ KDialogBase(parent, 0, true, i18n("Paste"), Ok | Cancel | Help ),
m_defaultType(defaultType)
{
setHelp("nv-paste-types");
diff --git a/src/gui/dialogs/PasteNotationDialog.h b/src/gui/dialogs/PasteNotationDialog.h
index d604d0e..794661e 100644
--- a/src/gui/dialogs/PasteNotationDialog.h
+++ b/src/gui/dialogs/PasteNotationDialog.h
@@ -47,7 +47,7 @@ class PasteNotationDialog : public KDialogBase
TQ_OBJECT
public:
- PasteNotationDialog(TQWidget *tqparent,
+ PasteNotationDialog(TQWidget *parent,
PasteEventsCommand::PasteType defaultType);
PasteEventsCommand::PasteType getPasteType() const;
diff --git a/src/gui/dialogs/PitchDialog.cpp b/src/gui/dialogs/PitchDialog.cpp
index 169ff21..c484142 100644
--- a/src/gui/dialogs/PitchDialog.cpp
+++ b/src/gui/dialogs/PitchDialog.cpp
@@ -36,8 +36,8 @@
namespace Rosegarden
{
-PitchDialog::PitchDialog(TQWidget *tqparent, TQString title, int defaultPitch) :
- KDialogBase(tqparent, 0, true, title, User1 | Ok)
+PitchDialog::PitchDialog(TQWidget *parent, TQString title, int defaultPitch) :
+ KDialogBase(parent, 0, true, title, User1 | Ok)
{
TQVBox *vbox = makeVBoxMainWidget();
m_pitchChooser = new PitchChooser(title, vbox, defaultPitch);
diff --git a/src/gui/dialogs/PitchDialog.h b/src/gui/dialogs/PitchDialog.h
index dd228bf..3e5759c 100644
--- a/src/gui/dialogs/PitchDialog.h
+++ b/src/gui/dialogs/PitchDialog.h
@@ -44,7 +44,7 @@ class PitchDialog : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- PitchDialog(TQWidget *tqparent, TQString title, int defaultPitch = 60);
+ PitchDialog(TQWidget *parent, TQString title, int defaultPitch = 60);
int getPitch() const;
diff --git a/src/gui/dialogs/PitchPickerDialog.cpp b/src/gui/dialogs/PitchPickerDialog.cpp
index 737726c..ed09662 100644
--- a/src/gui/dialogs/PitchPickerDialog.cpp
+++ b/src/gui/dialogs/PitchPickerDialog.cpp
@@ -36,8 +36,8 @@
namespace Rosegarden
{
-PitchPickerDialog::PitchPickerDialog(TQWidget *tqparent, int initialPitch, TQString text) :
- KDialogBase(tqparent, 0, true, i18n("Pitch Selector"), Ok | Cancel)
+PitchPickerDialog::PitchPickerDialog(TQWidget *parent, int initialPitch, TQString text) :
+ KDialogBase(parent, 0, true, i18n("Pitch Selector"), Ok | Cancel)
{
TQVBox *vBox = makeVBoxMainWidget();
diff --git a/src/gui/dialogs/PitchPickerDialog.h b/src/gui/dialogs/PitchPickerDialog.h
index 23125c9..0ed78f7 100644
--- a/src/gui/dialogs/PitchPickerDialog.h
+++ b/src/gui/dialogs/PitchPickerDialog.h
@@ -43,7 +43,7 @@ class PitchPickerDialog : public KDialogBase
public:
- PitchPickerDialog(TQWidget* tqparent, int initialPitch, TQString text);
+ PitchPickerDialog(TQWidget* parent, int initialPitch, TQString text);
~PitchPickerDialog();
int getPitch() { return m_pitch->getPitch(); }
diff --git a/src/gui/dialogs/QuantizeDialog.cpp b/src/gui/dialogs/QuantizeDialog.cpp
index d893b1c..87d7f79 100644
--- a/src/gui/dialogs/QuantizeDialog.cpp
+++ b/src/gui/dialogs/QuantizeDialog.cpp
@@ -36,8 +36,8 @@
namespace Rosegarden
{
-QuantizeDialog::QuantizeDialog(TQWidget *tqparent, bool inNotation) :
- KDialogBase(tqparent, 0, true, i18n("Quantize"), Ok | Cancel | Details | Help)
+QuantizeDialog::QuantizeDialog(TQWidget *parent, bool inNotation) :
+ KDialogBase(parent, 0, true, i18n("Quantize"), Ok | Cancel | Details | Help)
{
setHelp("quantization");
diff --git a/src/gui/dialogs/QuantizeDialog.h b/src/gui/dialogs/QuantizeDialog.h
index 1be603a..24505c9 100644
--- a/src/gui/dialogs/QuantizeDialog.h
+++ b/src/gui/dialogs/QuantizeDialog.h
@@ -45,7 +45,7 @@ class QuantizeDialog : public KDialogBase
TQ_OBJECT
public:
- QuantizeDialog(TQWidget *tqparent, bool inNotation = false);
+ QuantizeDialog(TQWidget *parent, bool inNotation = false);
/// Returned quantizer object is on heap -- caller must delete
Quantizer *getQuantizer() const;
diff --git a/src/gui/dialogs/RescaleDialog.cpp b/src/gui/dialogs/RescaleDialog.cpp
index fdf5755..702443d 100644
--- a/src/gui/dialogs/RescaleDialog.cpp
+++ b/src/gui/dialogs/RescaleDialog.cpp
@@ -42,13 +42,13 @@
namespace Rosegarden
{
-RescaleDialog::RescaleDialog(TQWidget *tqparent,
+RescaleDialog::RescaleDialog(TQWidget *parent,
Composition *composition,
timeT startTime,
timeT originalDuration,
bool showCloseGapOption,
bool constrainToCompositionDuration) :
- KDialogBase(tqparent, 0, true, i18n("Rescale"), User1 | Ok | Cancel)
+ KDialogBase(parent, 0, true, i18n("Rescale"), User1 | Ok | Cancel)
{
TQVBox *vbox = makeVBoxMainWidget();
diff --git a/src/gui/dialogs/RescaleDialog.h b/src/gui/dialogs/RescaleDialog.h
index 0e6d285..5995585 100644
--- a/src/gui/dialogs/RescaleDialog.h
+++ b/src/gui/dialogs/RescaleDialog.h
@@ -47,7 +47,7 @@ class RescaleDialog : public KDialogBase
TQ_OBJECT
public:
- RescaleDialog(TQWidget *tqparent,
+ RescaleDialog(TQWidget *parent,
Composition *composition, // for TimeWidget calculations
timeT startTime,
timeT originalDuration,
diff --git a/src/gui/dialogs/ShowSequencerStatusDialog.cpp b/src/gui/dialogs/ShowSequencerStatusDialog.cpp
index 7afccf4..fd71383 100644
--- a/src/gui/dialogs/ShowSequencerStatusDialog.cpp
+++ b/src/gui/dialogs/ShowSequencerStatusDialog.cpp
@@ -40,8 +40,8 @@
namespace Rosegarden
{
-ShowSequencerStatusDialog::ShowSequencerStatusDialog(TQWidget *tqparent) :
- KDialogBase(tqparent, 0, true, i18n("Sequencer status"), Close)
+ShowSequencerStatusDialog::ShowSequencerStatusDialog(TQWidget *parent) :
+ KDialogBase(parent, 0, true, i18n("Sequencer status"), Close)
{
TQVBox *vbox = makeVBoxMainWidget();
diff --git a/src/gui/dialogs/ShowSequencerStatusDialog.h b/src/gui/dialogs/ShowSequencerStatusDialog.h
index ce66740..35385df 100644
--- a/src/gui/dialogs/ShowSequencerStatusDialog.h
+++ b/src/gui/dialogs/ShowSequencerStatusDialog.h
@@ -42,7 +42,7 @@ class ShowSequencerStatusDialog : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- ShowSequencerStatusDialog(TQWidget *tqparent);
+ ShowSequencerStatusDialog(TQWidget *parent);
};
diff --git a/src/gui/dialogs/SimpleEventEditDialog.cpp b/src/gui/dialogs/SimpleEventEditDialog.cpp
index 98e4c4e..b3009f6 100644
--- a/src/gui/dialogs/SimpleEventEditDialog.cpp
+++ b/src/gui/dialogs/SimpleEventEditDialog.cpp
@@ -56,11 +56,11 @@
namespace Rosegarden
{
-SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *tqparent,
+SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
RosegardenGUIDoc *doc,
const Event &event,
bool inserting) :
- KDialogBase(tqparent, 0, true,
+ KDialogBase(parent, 0, true,
i18n(inserting ? "Insert Event" : "Edit Event"), Ok | Cancel),
m_event(event),
m_doc(doc),
diff --git a/src/gui/dialogs/SimpleEventEditDialog.h b/src/gui/dialogs/SimpleEventEditDialog.h
index 5f709e7..bfaf251 100644
--- a/src/gui/dialogs/SimpleEventEditDialog.h
+++ b/src/gui/dialogs/SimpleEventEditDialog.h
@@ -53,7 +53,7 @@ class SimpleEventEditDialog : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- SimpleEventEditDialog(TQWidget *tqparent,
+ SimpleEventEditDialog(TQWidget *parent,
RosegardenGUIDoc *doc,
const Event &event,
bool inserting = false); // inserting or editing
diff --git a/src/gui/dialogs/SplitByPitchDialog.cpp b/src/gui/dialogs/SplitByPitchDialog.cpp
index 94d34f5..2c93253 100644
--- a/src/gui/dialogs/SplitByPitchDialog.cpp
+++ b/src/gui/dialogs/SplitByPitchDialog.cpp
@@ -42,8 +42,8 @@
namespace Rosegarden
{
-SplitByPitchDialog::SplitByPitchDialog(TQWidget *tqparent) :
- KDialogBase(tqparent, 0, true, i18n("Split by Pitch"), Ok | Cancel)
+SplitByPitchDialog::SplitByPitchDialog(TQWidget *parent) :
+ KDialogBase(parent, 0, true, i18n("Split by Pitch"), Ok | Cancel)
{
TQVBox *vBox = makeVBoxMainWidget();
diff --git a/src/gui/dialogs/SplitByPitchDialog.h b/src/gui/dialogs/SplitByPitchDialog.h
index def9f01..87ce40f 100644
--- a/src/gui/dialogs/SplitByPitchDialog.h
+++ b/src/gui/dialogs/SplitByPitchDialog.h
@@ -45,7 +45,7 @@ class SplitByPitchDialog : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- SplitByPitchDialog(TQWidget *tqparent);
+ SplitByPitchDialog(TQWidget *parent);
int getPitch();
diff --git a/src/gui/dialogs/SplitByRecordingSrcDialog.cpp b/src/gui/dialogs/SplitByRecordingSrcDialog.cpp
index bd3331b..1609865 100644
--- a/src/gui/dialogs/SplitByRecordingSrcDialog.cpp
+++ b/src/gui/dialogs/SplitByRecordingSrcDialog.cpp
@@ -44,8 +44,8 @@
namespace Rosegarden
{
-SplitByRecordingSrcDialog::SplitByRecordingSrcDialog(TQWidget *tqparent, RosegardenGUIDoc *doc) :
- KDialogBase(tqparent, 0, true, i18n("Split by Recording Source"), Ok | Cancel )
+SplitByRecordingSrcDialog::SplitByRecordingSrcDialog(TQWidget *parent, RosegardenGUIDoc *doc) :
+ KDialogBase(parent, 0, true, i18n("Split by Recording Source"), Ok | Cancel )
{
TQVBox *vBox = makeVBoxMainWidget();
diff --git a/src/gui/dialogs/SplitByRecordingSrcDialog.h b/src/gui/dialogs/SplitByRecordingSrcDialog.h
index dcf3080..492e719 100644
--- a/src/gui/dialogs/SplitByRecordingSrcDialog.h
+++ b/src/gui/dialogs/SplitByRecordingSrcDialog.h
@@ -46,7 +46,7 @@ class SplitByRecordingSrcDialog : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- SplitByRecordingSrcDialog(TQWidget *tqparent, RosegardenGUIDoc *doc);
+ SplitByRecordingSrcDialog(TQWidget *parent, RosegardenGUIDoc *doc);
int getChannel();
int getDevice();
diff --git a/src/gui/dialogs/TempoDialog.cpp b/src/gui/dialogs/TempoDialog.cpp
index 6d2c716..92d7165 100644
--- a/src/gui/dialogs/TempoDialog.cpp
+++ b/src/gui/dialogs/TempoDialog.cpp
@@ -51,9 +51,9 @@
namespace Rosegarden
{
-TempoDialog::TempoDialog(TQWidget *tqparent, RosegardenGUIDoc *doc,
+TempoDialog::TempoDialog(TQWidget *parent, RosegardenGUIDoc *doc,
bool timeEditable):
- KDialogBase(tqparent, 0, true, i18n("Insert Tempo Change"), Ok | Cancel | Help),
+ KDialogBase(parent, 0, true, i18n("Insert Tempo Change"), Ok | Cancel | Help),
m_doc(doc),
m_tempoTime(0)
{
diff --git a/src/gui/dialogs/TempoDialog.h b/src/gui/dialogs/TempoDialog.h
index 0131d32..31502e4 100644
--- a/src/gui/dialogs/TempoDialog.h
+++ b/src/gui/dialogs/TempoDialog.h
@@ -61,7 +61,7 @@ public:
GlobalTempoWithDefault
};
- TempoDialog(TQWidget *tqparent, RosegardenGUIDoc *doc,
+ TempoDialog(TQWidget *parent, RosegardenGUIDoc *doc,
bool timeEditable = false);
~TempoDialog();
diff --git a/src/gui/dialogs/TextEventDialog.cpp b/src/gui/dialogs/TextEventDialog.cpp
index 756edf0..e7984dd 100644
--- a/src/gui/dialogs/TextEventDialog.cpp
+++ b/src/gui/dialogs/TextEventDialog.cpp
@@ -50,11 +50,11 @@
namespace Rosegarden
{
-TextEventDialog::TextEventDialog(TQWidget *tqparent,
+TextEventDialog::TextEventDialog(TQWidget *parent,
NotePixmapFactory *npf,
Text defaultText,
int maxLength) :
- KDialogBase(tqparent, 0, true, i18n("Text"), Ok | Cancel | Help),
+ KDialogBase(parent, 0, true, i18n("Text"), Ok | Cancel | Help),
m_notePixmapFactory(npf),
m_styles(Text::getUserStyles()) /*,
//m_directives(Text::getLilyPondDirectives()) */
@@ -282,15 +282,15 @@ TextEventDialog::TextEventDialog(TQWidget *tqparent,
int mapWidth = 200;
TQPixmap map(mapWidth, ls * 5 + 1);
- TQBitmap tqmask(mapWidth, ls * 5 + 1);
+ TQBitmap mask(mapWidth, ls * 5 + 1);
map.fill();
- tqmask.fill(TQt::color0);
+ mask.fill(TQt::color0);
TQPainter p, pm;
p.begin(&map);
- pm.begin(&tqmask);
+ pm.begin(&mask);
p.setPen(TQt::black);
pm.setPen(TQt::white);
@@ -304,7 +304,7 @@ TextEventDialog::TextEventDialog(TQWidget *tqparent,
p.end();
pm.end();
- map.setMask(tqmask);
+ map.setMask(mask);
m_staffAboveLabel = new TQLabel("staff", exampleVBox);
m_staffAboveLabel->setPixmap(map);
diff --git a/src/gui/dialogs/TextEventDialog.h b/src/gui/dialogs/TextEventDialog.h
index fa8419c..28f9cbf 100644
--- a/src/gui/dialogs/TextEventDialog.h
+++ b/src/gui/dialogs/TextEventDialog.h
@@ -51,7 +51,7 @@ class TextEventDialog : public KDialogBase
TQ_OBJECT
public:
- TextEventDialog(TQWidget *tqparent,
+ TextEventDialog(TQWidget *parent,
NotePixmapFactory *npf,
Text defaultText,
int maxLength = -1); // for TQt default
diff --git a/src/gui/dialogs/TimeDialog.cpp b/src/gui/dialogs/TimeDialog.cpp
index 3dc78e3..d4eb4b6 100644
--- a/src/gui/dialogs/TimeDialog.cpp
+++ b/src/gui/dialogs/TimeDialog.cpp
@@ -37,11 +37,11 @@
namespace Rosegarden
{
-TimeDialog::TimeDialog(TQWidget *tqparent, TQString title,
+TimeDialog::TimeDialog(TQWidget *parent, TQString title,
Composition *composition,
timeT defaultTime,
bool constrainToCompositionDuration) :
- KDialogBase(tqparent, 0, true, title, User1 | Ok | Cancel)
+ KDialogBase(parent, 0, true, title, User1 | Ok | Cancel)
{
TQVBox *vbox = makeVBoxMainWidget();
m_timeWidget = new TimeWidget
@@ -53,12 +53,12 @@ TimeDialog::TimeDialog(TQWidget *tqparent, TQString title,
m_timeWidget, TQT_SLOT(slotResetToDefault()));
}
-TimeDialog::TimeDialog(TQWidget *tqparent, TQString title,
+TimeDialog::TimeDialog(TQWidget *parent, TQString title,
Composition *composition,
timeT startTime,
timeT defaultTime,
bool constrainToCompositionDuration) :
- KDialogBase(tqparent, 0, true, title, User1 | Ok | Cancel)
+ KDialogBase(parent, 0, true, title, User1 | Ok | Cancel)
{
TQVBox *vbox = makeVBoxMainWidget();
m_timeWidget = new TimeWidget
diff --git a/src/gui/dialogs/TimeDialog.h b/src/gui/dialogs/TimeDialog.h
index ec246d3..50173f6 100644
--- a/src/gui/dialogs/TimeDialog.h
+++ b/src/gui/dialogs/TimeDialog.h
@@ -47,11 +47,11 @@ class TimeDialog : public KDialogBase
TQ_OBJECT
public:
/// for absolute times
- TimeDialog(TQWidget *tqparent, TQString title, Composition *composition,
+ TimeDialog(TQWidget *parent, TQString title, Composition *composition,
timeT defaultTime, bool constrainToCompositionDuration);
/// for durations
- TimeDialog(TQWidget *tqparent, TQString title, Composition *composition,
+ TimeDialog(TQWidget *parent, TQString title, Composition *composition,
timeT startTime, timeT defaultDuration,
bool constrainToCompositionDuration);
diff --git a/src/gui/dialogs/TimeSignatureDialog.cpp b/src/gui/dialogs/TimeSignatureDialog.cpp
index 99d4830..eae6501 100644
--- a/src/gui/dialogs/TimeSignatureDialog.cpp
+++ b/src/gui/dialogs/TimeSignatureDialog.cpp
@@ -50,13 +50,13 @@
namespace Rosegarden
{
-TimeSignatureDialog::TimeSignatureDialog(TQWidget *tqparent,
+TimeSignatureDialog::TimeSignatureDialog(TQWidget *parent,
Composition *composition,
timeT insertionTime,
TimeSignature sig,
bool timeEditable,
TQString explanatoryText) :
- KDialogBase(tqparent, 0, true, i18n("Time Signature"), Ok | Cancel | Help),
+ KDialogBase(parent, 0, true, i18n("Time Signature"), Ok | Cancel | Help),
m_composition(composition),
m_timeSignature(sig),
m_time(insertionTime),
diff --git a/src/gui/dialogs/TimeSignatureDialog.h b/src/gui/dialogs/TimeSignatureDialog.h
index fd97c69..15dc483 100644
--- a/src/gui/dialogs/TimeSignatureDialog.h
+++ b/src/gui/dialogs/TimeSignatureDialog.h
@@ -51,7 +51,7 @@ class TimeSignatureDialog : public KDialogBase
TQ_OBJECT
public:
- TimeSignatureDialog(TQWidget *tqparent,
+ TimeSignatureDialog(TQWidget *parent,
Composition *composition,
timeT insertionTime,
TimeSignature defaultSig =
diff --git a/src/gui/dialogs/TransportDialog.cpp b/src/gui/dialogs/TransportDialog.cpp
index 85d311b..d4c94a9 100644
--- a/src/gui/dialogs/TransportDialog.cpp
+++ b/src/gui/dialogs/TransportDialog.cpp
@@ -57,10 +57,10 @@
namespace Rosegarden
{
-TransportDialog::TransportDialog(TQWidget *tqparent,
+TransportDialog::TransportDialog(TQWidget *parent,
const char *name,
WFlags flags):
- TQWidget(tqparent, name, WType_TopLevel | WStyle_DialogBorder | WStyle_Minimize | WStyle_SysMenu | WDestructiveClose),
+ TQWidget(parent, name, WType_TopLevel | WStyle_DialogBorder | WStyle_Minimize | WStyle_SysMenu | WDestructiveClose),
m_transport(0),
m_lastTenHours(0),
m_lastUnitHours(0),
diff --git a/src/gui/dialogs/TransportDialog.h b/src/gui/dialogs/TransportDialog.h
index 46eb1a9..b305100 100644
--- a/src/gui/dialogs/TransportDialog.h
+++ b/src/gui/dialogs/TransportDialog.h
@@ -53,7 +53,7 @@ class TransportDialog : public TQWidget
Q_OBJECT
TQ_OBJECT
public:
- TransportDialog(TQWidget *tqparent=0,
+ TransportDialog(TQWidget *parent=0,
const char *name=0,
WFlags flags = /*TQt::WStyle_StaysOnTop |*/
TQt::WStyle_NormalBorder);
diff --git a/src/gui/dialogs/TriggerSegmentDialog.cpp b/src/gui/dialogs/TriggerSegmentDialog.cpp
index 1e92c95..744d628 100644
--- a/src/gui/dialogs/TriggerSegmentDialog.cpp
+++ b/src/gui/dialogs/TriggerSegmentDialog.cpp
@@ -47,9 +47,9 @@
namespace Rosegarden
{
-TriggerSegmentDialog::TriggerSegmentDialog(TQWidget *tqparent,
+TriggerSegmentDialog::TriggerSegmentDialog(TQWidget *parent,
Composition *composition) :
- KDialogBase(tqparent, "triggersegmentdialog", true, i18n("Trigger Segment"),
+ KDialogBase(parent, "triggersegmentdialog", true, i18n("Trigger Segment"),
Ok | Cancel, Ok),
m_composition(composition)
{
diff --git a/src/gui/dialogs/TriggerSegmentDialog.h b/src/gui/dialogs/TriggerSegmentDialog.h
index 5dac0bb..8fcbe6c 100644
--- a/src/gui/dialogs/TriggerSegmentDialog.h
+++ b/src/gui/dialogs/TriggerSegmentDialog.h
@@ -48,7 +48,7 @@ class TriggerSegmentDialog : public KDialogBase
TQ_OBJECT
public:
- TriggerSegmentDialog(TQWidget *tqparent, Composition *);
+ TriggerSegmentDialog(TQWidget *parent, Composition *);
TriggerSegmentId getId() const;
bool getRetune() const;
diff --git a/src/gui/dialogs/TupletDialog.cpp b/src/gui/dialogs/TupletDialog.cpp
index aaa50da..d9d528b 100644
--- a/src/gui/dialogs/TupletDialog.cpp
+++ b/src/gui/dialogs/TupletDialog.cpp
@@ -46,9 +46,9 @@
namespace Rosegarden
{
-TupletDialog::TupletDialog(TQWidget *tqparent, Note::Type defaultUnitType,
+TupletDialog::TupletDialog(TQWidget *parent, Note::Type defaultUnitType,
timeT maxDuration) :
- KDialogBase(tqparent, 0, true, i18n("Tuplet"), Ok | Cancel | Help),
+ KDialogBase(parent, 0, true, i18n("Tuplet"), Ok | Cancel | Help),
m_maxDuration(maxDuration)
{
setHelp("nv-tuplets");
diff --git a/src/gui/dialogs/TupletDialog.h b/src/gui/dialogs/TupletDialog.h
index 6ee424a..c81e020 100644
--- a/src/gui/dialogs/TupletDialog.h
+++ b/src/gui/dialogs/TupletDialog.h
@@ -50,7 +50,7 @@ class TupletDialog : public KDialogBase
TQ_OBJECT
public:
- TupletDialog(TQWidget *tqparent,
+ TupletDialog(TQWidget *parent,
Note::Type defaultUnitType,
timeT maxDuration = 0);
diff --git a/src/gui/dialogs/UnusedAudioSelectionDialog.cpp b/src/gui/dialogs/UnusedAudioSelectionDialog.cpp
index c55a634..9a86252 100644
--- a/src/gui/dialogs/UnusedAudioSelectionDialog.cpp
+++ b/src/gui/dialogs/UnusedAudioSelectionDialog.cpp
@@ -39,11 +39,11 @@
namespace Rosegarden
{
-UnusedAudioSelectionDialog::UnusedAudioSelectionDialog(TQWidget *tqparent,
+UnusedAudioSelectionDialog::UnusedAudioSelectionDialog(TQWidget *parent,
TQString introductoryText,
std::vector<TQString> fileNames,
bool offerCancel) :
- KDialogBase(tqparent, 0, true, i18n("Select Unused Audio Files"), (offerCancel ? (Ok | Cancel) : Ok))
+ KDialogBase(parent, 0, true, i18n("Select Unused Audio Files"), (offerCancel ? (Ok | Cancel) : Ok))
{
TQVBox *vbox = makeVBoxMainWidget();
new TQLabel(introductoryText, vbox);
diff --git a/src/gui/dialogs/UseOrnamentDialog.cpp b/src/gui/dialogs/UseOrnamentDialog.cpp
index d5f7895..2c8fb97 100644
--- a/src/gui/dialogs/UseOrnamentDialog.cpp
+++ b/src/gui/dialogs/UseOrnamentDialog.cpp
@@ -51,9 +51,9 @@
namespace Rosegarden
{
-UseOrnamentDialog::UseOrnamentDialog(TQWidget *tqparent,
+UseOrnamentDialog::UseOrnamentDialog(TQWidget *parent,
Composition *composition) :
- KDialogBase(tqparent, "useornamentdialog", true, i18n("Use Ornament"),
+ KDialogBase(parent, "useornamentdialog", true, i18n("Use Ornament"),
Ok | Cancel, Ok),
m_composition(composition)
{
diff --git a/src/gui/dialogs/UseOrnamentDialog.h b/src/gui/dialogs/UseOrnamentDialog.h
index bbab171..d5f8200 100644
--- a/src/gui/dialogs/UseOrnamentDialog.h
+++ b/src/gui/dialogs/UseOrnamentDialog.h
@@ -52,7 +52,7 @@ class UseOrnamentDialog : public KDialogBase
TQ_OBJECT
public:
- UseOrnamentDialog(TQWidget *tqparent, Composition *);
+ UseOrnamentDialog(TQWidget *parent, Composition *);
TriggerSegmentId getId() const;
Mark getMark() const;
diff --git a/src/gui/editors/eventlist/EventView.cpp b/src/gui/editors/eventlist/EventView.cpp
index 8e251ac..91b2b4d 100644
--- a/src/gui/editors/eventlist/EventView.cpp
+++ b/src/gui/editors/eventlist/EventView.cpp
@@ -97,8 +97,8 @@ EventView::m_lastSetEventFilter = -1;
EventView::EventView(RosegardenGUIDoc *doc,
std::vector<Segment *> segments,
- TQWidget *tqparent):
- EditViewBase(doc, segments, 2, tqparent, "eventview"),
+ TQWidget *parent):
+ EditViewBase(doc, segments, 2, parent, "eventview"),
m_eventFilter(Note | Text | SystemExclusive | Controller |
ProgramChange | PitchBend | Indication | Other),
m_menu(0)
diff --git a/src/gui/editors/eventlist/EventView.h b/src/gui/editors/eventlist/EventView.h
index b4f03c9..0adbab0 100644
--- a/src/gui/editors/eventlist/EventView.h
+++ b/src/gui/editors/eventlist/EventView.h
@@ -81,7 +81,7 @@ class EventView : public EditViewBase, public SegmentObserver
public:
EventView(RosegardenGUIDoc *doc,
std::vector<Segment *> segments,
- TQWidget *tqparent);
+ TQWidget *parent);
virtual ~EventView();
diff --git a/src/gui/editors/eventlist/EventViewItem.h b/src/gui/editors/eventlist/EventViewItem.h
index f5b47bb..b46f8b2 100644
--- a/src/gui/editors/eventlist/EventViewItem.h
+++ b/src/gui/editors/eventlist/EventViewItem.h
@@ -41,21 +41,21 @@ class EventViewItem : public KListViewItem
public:
EventViewItem(Rosegarden::Segment *segment,
Rosegarden::Event *event,
- KListView *tqparent) :
- KListViewItem(tqparent),
+ KListView *parent) :
+ KListViewItem(parent),
m_segment(segment),
m_event(event) {;}
EventViewItem(Rosegarden::Segment *segment,
Rosegarden::Event *event,
- KListViewItem *tqparent) :
- KListViewItem(tqparent),
+ KListViewItem *parent) :
+ KListViewItem(parent),
m_segment(segment),
m_event(event) {;}
EventViewItem(Rosegarden::Segment *segment,
Rosegarden::Event *event,
- TQListView *tqparent, TQString label1,
+ TQListView *parent, TQString label1,
TQString label2 = TQString(),
TQString label3 = TQString(),
TQString label4 = TQString(),
@@ -63,14 +63,14 @@ public:
TQString label6 = TQString(),
TQString label7 = TQString(),
TQString label8 = TQString()) :
- KListViewItem(tqparent, label1, label2, label3, label4,
+ KListViewItem(parent, label1, label2, label3, label4,
label5, label6, label7, label8),
m_segment(segment),
m_event(event) {;}
EventViewItem(Rosegarden::Segment *segment,
Rosegarden::Event *event,
- KListViewItem *tqparent, TQString label1,
+ KListViewItem *parent, TQString label1,
TQString label2 = TQString(),
TQString label3 = TQString(),
TQString label4 = TQString(),
@@ -78,7 +78,7 @@ public:
TQString label6 = TQString(),
TQString label7 = TQString(),
TQString label8 = TQString()) :
- KListViewItem(tqparent, label1, label2, label3, label4,
+ KListViewItem(parent, label1, label2, label3, label4,
label5, label6, label7, label8),
m_segment(segment),
m_event(event) {;}
diff --git a/src/gui/editors/eventlist/TrivialVelocityDialog.cpp b/src/gui/editors/eventlist/TrivialVelocityDialog.cpp
index 08a4d22..6b9f748 100644
--- a/src/gui/editors/eventlist/TrivialVelocityDialog.cpp
+++ b/src/gui/editors/eventlist/TrivialVelocityDialog.cpp
@@ -30,8 +30,8 @@
namespace Rosegarden {
-TrivialVelocityDialog::TrivialVelocityDialog(TQWidget *tqparent, TQString label, int deft) :
- KDialogBase(tqparent, 0, true, label, Ok | Cancel)
+TrivialVelocityDialog::TrivialVelocityDialog(TQWidget *parent, TQString label, int deft) :
+ KDialogBase(parent, 0, true, label, Ok | Cancel)
{
TQHBox *hbox = makeHBoxMainWidget();
new TQLabel(label, hbox);
diff --git a/src/gui/editors/eventlist/TrivialVelocityDialog.h b/src/gui/editors/eventlist/TrivialVelocityDialog.h
index cadb1e1..c164110 100644
--- a/src/gui/editors/eventlist/TrivialVelocityDialog.h
+++ b/src/gui/editors/eventlist/TrivialVelocityDialog.h
@@ -35,7 +35,7 @@ namespace Rosegarden {
class TrivialVelocityDialog : public KDialogBase
{
public:
- TrivialVelocityDialog(TQWidget *tqparent, TQString label, int deft);
+ TrivialVelocityDialog(TQWidget *parent, TQString label, int deft);
int getVelocity();
diff --git a/src/gui/editors/guitar/FingeringBox.cpp b/src/gui/editors/guitar/FingeringBox.cpp
index 7677b85..6ca2c39 100644
--- a/src/gui/editors/guitar/FingeringBox.cpp
+++ b/src/gui/editors/guitar/FingeringBox.cpp
@@ -31,8 +31,8 @@
namespace Rosegarden
{
-FingeringBox::FingeringBox(unsigned int nbFrets, unsigned int nbStrings, bool editable, TQWidget *tqparent, const char* name)
- : TQFrame(tqparent, name),
+FingeringBox::FingeringBox(unsigned int nbFrets, unsigned int nbStrings, bool editable, TQWidget *parent, const char* name)
+ : TQFrame(parent, name),
m_nbFretsDisplayed(nbFrets),
m_startFret(1),
m_nbStrings(nbStrings),
@@ -44,8 +44,8 @@ FingeringBox::FingeringBox(unsigned int nbFrets, unsigned int nbStrings, bool ed
init();
}
-FingeringBox::FingeringBox(bool editable, TQWidget *tqparent, const char* name)
- : TQFrame(tqparent, name),
+FingeringBox::FingeringBox(bool editable, TQWidget *parent, const char* name)
+ : TQFrame(parent, name),
m_nbFretsDisplayed(DEFAULT_NB_DISPLAYED_FRETS),
m_startFret(1),
m_nbStrings(Guitar::Fingering::DEFAULT_NB_STRINGS),
diff --git a/src/gui/editors/guitar/FingeringBox.h b/src/gui/editors/guitar/FingeringBox.h
index 06b8500..8c5a600 100644
--- a/src/gui/editors/guitar/FingeringBox.h
+++ b/src/gui/editors/guitar/FingeringBox.h
@@ -43,8 +43,8 @@ class FingeringBox : public TQFrame
static const unsigned int IMG_HEIGHT = 200;
public:
- FingeringBox(unsigned int nbFrets, unsigned int nbStrings, bool editable, TQWidget *tqparent, const char* name = 0);
- FingeringBox(bool editable, TQWidget *tqparent, const char* name = 0);
+ FingeringBox(unsigned int nbFrets, unsigned int nbStrings, bool editable, TQWidget *parent, const char* name = 0);
+ FingeringBox(bool editable, TQWidget *parent, const char* name = 0);
void setStartFret(unsigned int f) { m_startFret = f; update(); }
unsigned int getStartFret() const { return m_startFret; }
diff --git a/src/gui/editors/guitar/FingeringListBoxItem.cpp b/src/gui/editors/guitar/FingeringListBoxItem.cpp
index 64b7f10..aeb8fcd 100644
--- a/src/gui/editors/guitar/FingeringListBoxItem.cpp
+++ b/src/gui/editors/guitar/FingeringListBoxItem.cpp
@@ -27,8 +27,8 @@
namespace Rosegarden {
-FingeringListBoxItem::FingeringListBoxItem(const Guitar::Chord& chord, TQListBox* tqparent, TQPixmap pixmap, TQString fingeringString)
- : TQListBoxPixmap(tqparent, pixmap, fingeringString),
+FingeringListBoxItem::FingeringListBoxItem(const Guitar::Chord& chord, TQListBox* parent, TQPixmap pixmap, TQString fingeringString)
+ : TQListBoxPixmap(parent, pixmap, fingeringString),
m_chord(chord)
{
}
diff --git a/src/gui/editors/guitar/FingeringListBoxItem.h b/src/gui/editors/guitar/FingeringListBoxItem.h
index f900056..5524054 100644
--- a/src/gui/editors/guitar/FingeringListBoxItem.h
+++ b/src/gui/editors/guitar/FingeringListBoxItem.h
@@ -34,7 +34,7 @@ namespace Rosegarden {
class FingeringListBoxItem : public TQListBoxPixmap
{
public:
- FingeringListBoxItem(const Guitar::Chord& chord, TQListBox* tqparent, TQPixmap pixmap, TQString fingeringString);
+ FingeringListBoxItem(const Guitar::Chord& chord, TQListBox* parent, TQPixmap pixmap, TQString fingeringString);
const Guitar::Chord& getChord() { return m_chord; }
protected:
diff --git a/src/gui/editors/guitar/GuitarChordEditorDialog.cpp b/src/gui/editors/guitar/GuitarChordEditorDialog.cpp
index 58ec54d..8a4fb3e 100644
--- a/src/gui/editors/guitar/GuitarChordEditorDialog.cpp
+++ b/src/gui/editors/guitar/GuitarChordEditorDialog.cpp
@@ -39,8 +39,8 @@
namespace Rosegarden
{
-GuitarChordEditorDialog::GuitarChordEditorDialog(Guitar::Chord& chord, const Guitar::ChordMap& chordMap, TQWidget *tqparent)
- : KDialogBase(tqparent, "GuitarChordEditor", true, i18n("Guitar Chord Editor"), Ok|Cancel),
+GuitarChordEditorDialog::GuitarChordEditorDialog(Guitar::Chord& chord, const Guitar::ChordMap& chordMap, TQWidget *parent)
+ : KDialogBase(parent, "GuitarChordEditor", true, i18n("Guitar Chord Editor"), Ok|Cancel),
m_chord(chord),
m_chordMap(chordMap)
{
diff --git a/src/gui/editors/guitar/GuitarChordEditorDialog.h b/src/gui/editors/guitar/GuitarChordEditorDialog.h
index 2b286ee..1e8e1e1 100644
--- a/src/gui/editors/guitar/GuitarChordEditorDialog.h
+++ b/src/gui/editors/guitar/GuitarChordEditorDialog.h
@@ -45,7 +45,7 @@ class GuitarChordEditorDialog : public KDialogBase
TQ_OBJECT
public:
- GuitarChordEditorDialog(Guitar::Chord&, const Guitar::ChordMap& chordMap, TQWidget *tqparent=0);
+ GuitarChordEditorDialog(Guitar::Chord&, const Guitar::ChordMap& chordMap, TQWidget *parent=0);
protected slots:
void slotStartFretChanged(int);
diff --git a/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp b/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp
index f564fdb..f401cd1 100644
--- a/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp
+++ b/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp
@@ -41,8 +41,8 @@
namespace Rosegarden
{
-GuitarChordSelectorDialog::GuitarChordSelectorDialog(TQWidget *tqparent)
- : KDialogBase(tqparent, "GuitarChordSelector", true, i18n("Guitar Chord Selector"), Ok|Cancel)
+GuitarChordSelectorDialog::GuitarChordSelectorDialog(TQWidget *parent)
+ : KDialogBase(parent, "GuitarChordSelector", true, i18n("Guitar Chord Selector"), Ok|Cancel)
{
TQWidget *page = new TQWidget(this);
setMainWidget(page);
diff --git a/src/gui/editors/guitar/GuitarChordSelectorDialog.h b/src/gui/editors/guitar/GuitarChordSelectorDialog.h
index b6ddea1..bb0e529 100644
--- a/src/gui/editors/guitar/GuitarChordSelectorDialog.h
+++ b/src/gui/editors/guitar/GuitarChordSelectorDialog.h
@@ -51,7 +51,7 @@ class GuitarChordSelectorDialog : public KDialogBase
enum { COMPLEXITY_BEGINNER, COMPLEXITY_COMMON, COMPLEXITY_ALL };
public:
- GuitarChordSelectorDialog(TQWidget *tqparent=0);
+ GuitarChordSelectorDialog(TQWidget *parent=0);
void init();
diff --git a/src/gui/editors/matrix/MatrixCanvasView.cpp b/src/gui/editors/matrix/MatrixCanvasView.cpp
index ee0bab2..9c56805 100644
--- a/src/gui/editors/matrix/MatrixCanvasView.cpp
+++ b/src/gui/editors/matrix/MatrixCanvasView.cpp
@@ -45,9 +45,9 @@ namespace Rosegarden
MatrixCanvasView::MatrixCanvasView(MatrixStaff& staff,
SnapGrid *snapGrid,
bool drumMode,
- TQCanvas *viewing, TQWidget *tqparent,
+ TQCanvas *viewing, TQWidget *parent,
const char *name, WFlags f)
- : RosegardenCanvasView(viewing, tqparent, name, f),
+ : RosegardenCanvasView(viewing, parent, name, f),
m_staff(staff),
m_snapGrid(snapGrid),
m_drumMode(drumMode),
diff --git a/src/gui/editors/matrix/MatrixCanvasView.h b/src/gui/editors/matrix/MatrixCanvasView.h
index 5391f9f..440e941 100644
--- a/src/gui/editors/matrix/MatrixCanvasView.h
+++ b/src/gui/editors/matrix/MatrixCanvasView.h
@@ -55,7 +55,7 @@ public:
SnapGrid *,
bool drumMode,
TQCanvas *viewing,
- TQWidget *tqparent=0, const char *name=0, WFlags f=0);
+ TQWidget *parent=0, const char *name=0, WFlags f=0);
~MatrixCanvasView();
diff --git a/src/gui/editors/matrix/MatrixEraser.cpp b/src/gui/editors/matrix/MatrixEraser.cpp
index a5f261a..9f60479 100644
--- a/src/gui/editors/matrix/MatrixEraser.cpp
+++ b/src/gui/editors/matrix/MatrixEraser.cpp
@@ -43,8 +43,8 @@
namespace Rosegarden
{
-MatrixEraser::MatrixEraser(MatrixView* tqparent)
- : MatrixTool("MatrixEraser", tqparent),
+MatrixEraser::MatrixEraser(MatrixView* parent)
+ : MatrixTool("MatrixEraser", parent),
m_currentStaff(0)
{
TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
diff --git a/src/gui/editors/matrix/MatrixMover.cpp b/src/gui/editors/matrix/MatrixMover.cpp
index b525b4b..cb604ba 100644
--- a/src/gui/editors/matrix/MatrixMover.cpp
+++ b/src/gui/editors/matrix/MatrixMover.cpp
@@ -54,8 +54,8 @@
namespace Rosegarden
{
-MatrixMover::MatrixMover(MatrixView* tqparent) :
- MatrixTool("MatrixMover", tqparent),
+MatrixMover::MatrixMover(MatrixView* parent) :
+ MatrixTool("MatrixMover", parent),
m_currentElement(0),
m_currentStaff(0),
m_lastPlayedPitch(-1)
diff --git a/src/gui/editors/matrix/MatrixPainter.cpp b/src/gui/editors/matrix/MatrixPainter.cpp
index 4ed4c6b..04048a7 100644
--- a/src/gui/editors/matrix/MatrixPainter.cpp
+++ b/src/gui/editors/matrix/MatrixPainter.cpp
@@ -53,8 +53,8 @@
namespace Rosegarden
{
-MatrixPainter::MatrixPainter(MatrixView* tqparent)
- : MatrixTool("MatrixPainter", tqparent),
+MatrixPainter::MatrixPainter(MatrixView* parent)
+ : MatrixTool("MatrixPainter", parent),
m_currentElement(0),
m_currentStaff(0)
{
@@ -83,8 +83,8 @@ MatrixPainter::MatrixPainter(MatrixView* tqparent)
createMenu("matrixpainter.rc");
}
-MatrixPainter::MatrixPainter(TQString name, MatrixView* tqparent)
- : MatrixTool(name, tqparent),
+MatrixPainter::MatrixPainter(TQString name, MatrixView* parent)
+ : MatrixTool(name, parent),
m_currentElement(0),
m_currentStaff(0)
{}
diff --git a/src/gui/editors/matrix/MatrixParameterBox.cpp b/src/gui/editors/matrix/MatrixParameterBox.cpp
index cd4a743..75228c3 100644
--- a/src/gui/editors/matrix/MatrixParameterBox.cpp
+++ b/src/gui/editors/matrix/MatrixParameterBox.cpp
@@ -42,8 +42,8 @@ namespace Rosegarden
{
MatrixParameterBox::MatrixParameterBox(RosegardenGUIDoc *doc,
- TQWidget *tqparent, const char* name):
- TQFrame(tqparent, name),
+ TQWidget *parent, const char* name):
+ TQFrame(parent, name),
m_quantizations(BasicQuantizer::getStandardQuantizations()),
m_doc(doc)
{
diff --git a/src/gui/editors/matrix/MatrixParameterBox.h b/src/gui/editors/matrix/MatrixParameterBox.h
index d67269a..be69899 100644
--- a/src/gui/editors/matrix/MatrixParameterBox.h
+++ b/src/gui/editors/matrix/MatrixParameterBox.h
@@ -50,7 +50,7 @@ class MatrixParameterBox : public TQFrame
TQ_OBJECT
public:
- MatrixParameterBox(RosegardenGUIDoc *doc=0, TQWidget *tqparent=0, const char* name=0);
+ MatrixParameterBox(RosegardenGUIDoc *doc=0, TQWidget *parent=0, const char* name=0);
~MatrixParameterBox();
void initBox();
diff --git a/src/gui/editors/matrix/MatrixResizer.cpp b/src/gui/editors/matrix/MatrixResizer.cpp
index 817b4c3..253f3c0 100644
--- a/src/gui/editors/matrix/MatrixResizer.cpp
+++ b/src/gui/editors/matrix/MatrixResizer.cpp
@@ -51,8 +51,8 @@
namespace Rosegarden
{
-MatrixResizer::MatrixResizer(MatrixView* tqparent)
- : MatrixTool("MatrixResizer", tqparent),
+MatrixResizer::MatrixResizer(MatrixView* parent)
+ : MatrixTool("MatrixResizer", parent),
m_currentElement(0),
m_currentStaff(0)
{
diff --git a/src/gui/editors/matrix/MatrixTool.cpp b/src/gui/editors/matrix/MatrixTool.cpp
index 7876caf..a478aa3 100644
--- a/src/gui/editors/matrix/MatrixTool.cpp
+++ b/src/gui/editors/matrix/MatrixTool.cpp
@@ -34,9 +34,9 @@
namespace Rosegarden
{
-MatrixTool::MatrixTool(const TQString& menuName, MatrixView* tqparent)
- : EditTool(menuName, tqparent),
- m_mParentView(tqparent)
+MatrixTool::MatrixTool(const TQString& menuName, MatrixView* parent)
+ : EditTool(menuName, parent),
+ m_mParentView(parent)
{}
void
diff --git a/src/gui/editors/matrix/MatrixToolBox.cpp b/src/gui/editors/matrix/MatrixToolBox.cpp
index e38abf1..3254b35 100644
--- a/src/gui/editors/matrix/MatrixToolBox.cpp
+++ b/src/gui/editors/matrix/MatrixToolBox.cpp
@@ -40,9 +40,9 @@
namespace Rosegarden
{
-MatrixToolBox::MatrixToolBox(MatrixView* tqparent)
- : EditToolBox(tqparent),
- m_mParentView(tqparent)
+MatrixToolBox::MatrixToolBox(MatrixView* parent)
+ : EditToolBox(parent),
+ m_mParentView(parent)
{}
EditTool* MatrixToolBox::createTool(const TQString& toolName)
diff --git a/src/gui/editors/matrix/MatrixToolBox.h b/src/gui/editors/matrix/MatrixToolBox.h
index b997405..2f43206 100644
--- a/src/gui/editors/matrix/MatrixToolBox.h
+++ b/src/gui/editors/matrix/MatrixToolBox.h
@@ -44,7 +44,7 @@ class MatrixToolBox : public EditToolBox
Q_OBJECT
TQ_OBJECT
public:
- MatrixToolBox(MatrixView* tqparent);
+ MatrixToolBox(MatrixView* parent);
protected:
diff --git a/src/gui/editors/matrix/MatrixView.cpp b/src/gui/editors/matrix/MatrixView.cpp
index 22db8a6..568f70f 100644
--- a/src/gui/editors/matrix/MatrixView.cpp
+++ b/src/gui/editors/matrix/MatrixView.cpp
@@ -137,9 +137,9 @@ static double xorigin = 0.0;
MatrixView::MatrixView(RosegardenGUIDoc *doc,
std::vector<Segment *> segments,
- TQWidget *tqparent,
+ TQWidget *parent,
bool drumMode)
- : EditView(doc, segments, 3, tqparent, "matrixview"),
+ : EditView(doc, segments, 3, parent, "matrixview"),
m_htqlayout(&doc->getComposition()),
m_referenceRuler(new ZoomableMatrixHLayoutRulerScale(m_htqlayout)),
m_vtqlayout(),
@@ -301,7 +301,7 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc,
TQT_SIGNAL(showPluginGUI(InstrumentId, int)),
app,
TQT_SLOT(slotShowPluginGUI(InstrumentId, int)));
- connect(tqparent, // RosegardenGUIView
+ connect(parent, // RosegardenGUIView
TQT_SIGNAL(checkTrackAssignments()),
this,
TQT_SLOT(slotCheckTrackAssignments()));
diff --git a/src/gui/editors/matrix/MatrixView.h b/src/gui/editors/matrix/MatrixView.h
index afe07d7..6dc6519 100644
--- a/src/gui/editors/matrix/MatrixView.h
+++ b/src/gui/editors/matrix/MatrixView.h
@@ -89,7 +89,7 @@ class MatrixView : public EditView
public:
MatrixView(RosegardenGUIDoc *doc,
std::vector<Segment *> segments,
- TQWidget *tqparent, bool drumMode);
+ TQWidget *parent, bool drumMode);
virtual ~MatrixView();
diff --git a/src/gui/editors/matrix/PianoKeyboard.cpp b/src/gui/editors/matrix/PianoKeyboard.cpp
index e61cdc6..7ae4a5a 100644
--- a/src/gui/editors/matrix/PianoKeyboard.cpp
+++ b/src/gui/editors/matrix/PianoKeyboard.cpp
@@ -46,8 +46,8 @@ namespace Rosegarden
const unsigned int _smallWhiteKeyHeight = 14;
const unsigned int _whiteKeyHeight = 18;
-PianoKeyboard::PianoKeyboard(TQWidget *tqparent, int keys)
- : PitchRuler(tqparent),
+PianoKeyboard::PianoKeyboard(TQWidget *parent, int keys)
+ : PitchRuler(parent),
m_keySize(48, 18),
m_blackKeySize(24, 8),
m_nbKeys(keys),
diff --git a/src/gui/editors/matrix/PianoKeyboard.h b/src/gui/editors/matrix/PianoKeyboard.h
index c8c09e8..7c29c89 100644
--- a/src/gui/editors/matrix/PianoKeyboard.h
+++ b/src/gui/editors/matrix/PianoKeyboard.h
@@ -47,7 +47,7 @@ class PianoKeyboard : public PitchRuler
Q_OBJECT
TQ_OBJECT
public:
- PianoKeyboard(TQWidget *tqparent, int keys = 88);
+ PianoKeyboard(TQWidget *parent, int keys = 88);
virtual TQSize tqsizeHint() const;
virtual TQSize tqminimumSizeHint() const;
diff --git a/src/gui/editors/notation/FontViewFrame.cpp b/src/gui/editors/notation/FontViewFrame.cpp
index 5bfdee1..3770441 100644
--- a/src/gui/editors/notation/FontViewFrame.cpp
+++ b/src/gui/editors/notation/FontViewFrame.cpp
@@ -46,8 +46,8 @@
namespace Rosegarden
{
-FontViewFrame::FontViewFrame( int pixelSize, TQWidget* tqparent, const char* name ) :
- TQFrame(tqparent, name),
+FontViewFrame::FontViewFrame( int pixelSize, TQWidget* parent, const char* name ) :
+ TQFrame(parent, name),
m_fontSize(pixelSize),
m_tableFont(0)
{
diff --git a/src/gui/editors/notation/FontViewFrame.h b/src/gui/editors/notation/FontViewFrame.h
index 524e393..fbfc95a 100644
--- a/src/gui/editors/notation/FontViewFrame.h
+++ b/src/gui/editors/notation/FontViewFrame.h
@@ -46,7 +46,7 @@ class FontViewFrame : public TQFrame
TQ_OBJECT
public:
- FontViewFrame(int pixelSize, TQWidget *tqparent = 0, const char *name = 0);
+ FontViewFrame(int pixelSize, TQWidget *parent = 0, const char *name = 0);
virtual ~FontViewFrame();
TQSize tqsizeHint() const;
diff --git a/src/gui/editors/notation/HeadersGroup.cpp b/src/gui/editors/notation/HeadersGroup.cpp
index b08ed1c..f7dcc82 100644
--- a/src/gui/editors/notation/HeadersGroup.cpp
+++ b/src/gui/editors/notation/HeadersGroup.cpp
@@ -43,8 +43,8 @@ namespace Rosegarden
HeadersGroup::
-HeadersGroup(TQWidget *tqparent, NotationView * nv, Composition * comp) :
- TQVBox(tqparent),
+HeadersGroup(TQWidget *parent, NotationView * nv, Composition * comp) :
+ TQVBox(parent),
m_notationView(nv),
m_composition(comp),
m_usedHeight(0),
diff --git a/src/gui/editors/notation/HeadersGroup.h b/src/gui/editors/notation/HeadersGroup.h
index a995646..a3fb706 100644
--- a/src/gui/editors/notation/HeadersGroup.h
+++ b/src/gui/editors/notation/HeadersGroup.h
@@ -59,7 +59,7 @@ public:
/**
* Create an empty headers group
*/
- HeadersGroup(TQWidget *tqparent, NotationView * nv, Composition * comp);
+ HeadersGroup(TQWidget *parent, NotationView * nv, Composition * comp);
void removeAllHeaders();
diff --git a/src/gui/editors/notation/NotationCanvasView.cpp b/src/gui/editors/notation/NotationCanvasView.cpp
index 40c2d59..a80d04d 100644
--- a/src/gui/editors/notation/NotationCanvasView.cpp
+++ b/src/gui/editors/notation/NotationCanvasView.cpp
@@ -49,9 +49,9 @@ namespace Rosegarden
{
NotationCanvasView::NotationCanvasView(const LinedStaffManager &staffmgr,
- TQCanvas *viewing, TQWidget *tqparent,
+ TQCanvas *viewing, TQWidget *parent,
const char *name, WFlags f) :
- RosegardenCanvasView(viewing, tqparent, name, f),
+ RosegardenCanvasView(viewing, parent, name, f),
m_linedStaffManager(staffmgr),
m_lastYPosNearStaff(0),
m_currentStaff(0),
diff --git a/src/gui/editors/notation/NotationCanvasView.h b/src/gui/editors/notation/NotationCanvasView.h
index e327de8..01f19b2 100644
--- a/src/gui/editors/notation/NotationCanvasView.h
+++ b/src/gui/editors/notation/NotationCanvasView.h
@@ -70,7 +70,7 @@ class NotationCanvasView : public RosegardenCanvasView
public:
NotationCanvasView(const LinedStaffManager &staffmgr,
- TQCanvas *viewing, TQWidget *tqparent=0,
+ TQCanvas *viewing, TQWidget *parent=0,
const char *name=0, WFlags f=0);
~NotationCanvasView();
diff --git a/src/gui/editors/notation/NotationHLayout.cpp b/src/gui/editors/notation/NotationHLayout.cpp
index be40dca..e971521 100644
--- a/src/gui/editors/notation/NotationHLayout.cpp
+++ b/src/gui/editors/notation/NotationHLayout.cpp
@@ -58,8 +58,8 @@ using namespace BaseProperties;
NotationHLayout::NotationHLayout(Composition *c, NotePixmapFactory *npf,
const NotationProperties &properties,
- TQObject* tqparent, const char* name) :
- ProgressReporter(tqparent, name),
+ TQObject* parent, const char* name) :
+ ProgressReporter(parent, name),
HorizontalLayoutEngine(c),
m_totalWidth(0.),
m_pageMode(false),
diff --git a/src/gui/editors/notation/NotationHLayout.h b/src/gui/editors/notation/NotationHLayout.h
index aba9a27..07cf25e 100644
--- a/src/gui/editors/notation/NotationHLayout.h
+++ b/src/gui/editors/notation/NotationHLayout.h
@@ -68,7 +68,7 @@ public:
NotationHLayout(Composition *c,
NotePixmapFactory *npf,
const NotationProperties &properties,
- TQObject* tqparent, const char* name = 0);
+ TQObject* parent, const char* name = 0);
virtual ~NotationHLayout();
diff --git a/src/gui/editors/notation/NotationSelector.h b/src/gui/editors/notation/NotationSelector.h
index f865cb7..85ab92a 100644
--- a/src/gui/editors/notation/NotationSelector.h
+++ b/src/gui/editors/notation/NotationSelector.h
@@ -160,7 +160,7 @@ protected:
NotationSelector(NotationView*);
/**
- * Set the current selection on the tqparent NotationView
+ * Set the current selection on the parent NotationView
*/
void setViewCurrentSelection(bool preview);
diff --git a/src/gui/editors/notation/NotationToolBox.cpp b/src/gui/editors/notation/NotationToolBox.cpp
index d3511fb..f2fa642 100644
--- a/src/gui/editors/notation/NotationToolBox.cpp
+++ b/src/gui/editors/notation/NotationToolBox.cpp
@@ -42,9 +42,9 @@
namespace Rosegarden
{
-NotationToolBox::NotationToolBox(NotationView *tqparent)
- : EditToolBox(tqparent),
- m_nParentView(tqparent)
+NotationToolBox::NotationToolBox(NotationView *parent)
+ : EditToolBox(parent),
+ m_nParentView(parent)
{
//m_tools.setAutoDelete(true);
}
diff --git a/src/gui/editors/notation/NotationToolBox.h b/src/gui/editors/notation/NotationToolBox.h
index 5c15b2b..06ef576 100644
--- a/src/gui/editors/notation/NotationToolBox.h
+++ b/src/gui/editors/notation/NotationToolBox.h
@@ -49,7 +49,7 @@ class NotationToolBox : public EditToolBox
Q_OBJECT
TQ_OBJECT
public:
- NotationToolBox(NotationView* tqparent);
+ NotationToolBox(NotationView* parent);
protected:
virtual EditTool* createTool(const TQString& toolName);
diff --git a/src/gui/editors/notation/NotationVLayout.cpp b/src/gui/editors/notation/NotationVLayout.cpp
index 12979ea..55f4d76 100644
--- a/src/gui/editors/notation/NotationVLayout.cpp
+++ b/src/gui/editors/notation/NotationVLayout.cpp
@@ -55,8 +55,8 @@ using namespace BaseProperties;
NotationVLayout::NotationVLayout(Composition *c, NotePixmapFactory *npf,
const NotationProperties &properties,
- TQObject* tqparent, const char* name) :
- ProgressReporter(tqparent, name),
+ TQObject* parent, const char* name) :
+ ProgressReporter(parent, name),
m_composition(c),
m_npf(npf),
m_notationQuantizer(c->getNotationQuantizer()),
@@ -490,7 +490,7 @@ NotationVLayout::positionSlur(NotationStaff &staff,
if (!event->get
<Int>(m_properties.HEIGHT_ON_STAFF, h)) {
KMessageBox::sorry
- ((TQWidget *)tqparent(), i18n("Spanned note at %1 has no HEIGHT_ON_STAFF property!\nThis is a bug (the program would previously have crashed by now)").tqarg((*scooter)->getViewAbsoluteTime()));
+ ((TQWidget *)parent(), i18n("Spanned note at %1 has no HEIGHT_ON_STAFF property!\nThis is a bug (the program would previously have crashed by now)").tqarg((*scooter)->getViewAbsoluteTime()));
event->dump(std::cerr);
}
diff --git a/src/gui/editors/notation/NotationVLayout.h b/src/gui/editors/notation/NotationVLayout.h
index afddb0b..b69c06c 100644
--- a/src/gui/editors/notation/NotationVLayout.h
+++ b/src/gui/editors/notation/NotationVLayout.h
@@ -63,7 +63,7 @@ class NotationVLayout : public ProgressReporter,
public:
NotationVLayout(Composition *c, NotePixmapFactory *npf,
const NotationProperties &properties,
- TQObject* tqparent, const char* name = 0);
+ TQObject* parent, const char* name = 0);
virtual ~NotationVLayout();
diff --git a/src/gui/editors/notation/NotationView.cpp b/src/gui/editors/notation/NotationView.cpp
index 707e85c..0a471d5 100644
--- a/src/gui/editors/notation/NotationView.cpp
+++ b/src/gui/editors/notation/NotationView.cpp
@@ -346,9 +346,9 @@ public:
NotationView::NotationView(RosegardenGUIDoc *doc,
std::vector<Segment *> segments,
- TQWidget *tqparent,
+ TQWidget *parent,
bool showProgressive) :
- EditView(doc, segments, 2, tqparent, "notationview"),
+ EditView(doc, segments, 2, parent, "notationview"),
m_properties(getViewLocalPropertyPrefix()),
m_selectionCounter(0),
m_insertModeLabel(0),
@@ -768,10 +768,10 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
(this, TQT_SIGNAL(renderComplete()),
getCanvasView(), TQT_SLOT(slotRenderComplete()));
- if (tqparent)
+ if (parent)
{
const TrackButtons * trackLabels =
- ((RosegardenGUIView*)tqparent)->getTrackEditor()->getTrackButtons();
+ ((RosegardenGUIView*)parent)->getTrackEditor()->getTrackButtons();
TQObject::connect
(trackLabels, TQT_SIGNAL(nameChanged()),
this, TQT_SLOT(slotUpdateStaffName()));
@@ -796,7 +796,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
NotationView::NotationView(RosegardenGUIDoc *doc,
std::vector<Segment *> segments,
- TQWidget *tqparent,
+ TQWidget *parent,
NotationView *referenceView)
: EditView(doc, segments, 1, 0, "printview"),
m_properties(getViewLocalPropertyPrefix()),
@@ -907,7 +907,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
ProgressDialog* progressDlg = 0;
- if (tqparent)
+ if (parent)
{
ProgressDialog::processEvents();
@@ -915,7 +915,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
NOTATION_DEBUG << "NotationView : setting up progress dialog" << endl;
progressDlg = new ProgressDialog(i18n("Preparing to print..."),
- 100, tqparent);
+ 100, parent);
progressDlg->setAutoClose(false);
progressDlg->setAutoReset(true);
progressDlg->setMinimumDuration(1000);
@@ -3541,7 +3541,7 @@ void NotationView::print(bool previewOnly)
if (previewOnly)
printer.setPreviewOnly(true);
- else if (!printer.setup((TQWidget *)tqparent()))
+ else if (!printer.setup((TQWidget *)parent()))
return ;
TQPaintDeviceMetrics pdm(&printer);
@@ -4613,7 +4613,7 @@ NotationView::slotFilePrint()
SetWaitCursor waitCursor;
NotationView printingView(getDocument(), m_segments,
- (TQWidget *)tqparent(), this);
+ (TQWidget *)parent(), this);
if (!printingView.isOK()) {
NOTATION_DEBUG << "Print : operation cancelled\n";
@@ -4630,7 +4630,7 @@ NotationView::slotFilePrintPreview()
SetWaitCursor waitCursor;
NotationView printingView(getDocument(), m_segments,
- (TQWidget *)tqparent(), this);
+ (TQWidget *)parent(), this);
if (!printingView.isOK()) {
NOTATION_DEBUG << "Print preview : operation cancelled\n";
diff --git a/src/gui/editors/notation/NotationView.h b/src/gui/editors/notation/NotationView.h
index 236b89b..461d299 100644
--- a/src/gui/editors/notation/NotationView.h
+++ b/src/gui/editors/notation/NotationView.h
@@ -114,18 +114,18 @@ class NotationView : public EditView,
public:
explicit NotationView(RosegardenGUIDoc *doc,
std::vector<Segment *> segments,
- TQWidget *tqparent,
+ TQWidget *parent,
bool showProgressive); // update during initial render?
/**
- * Constructor for printing only. If tqparent is provided, a
+ * Constructor for printing only. If parent is provided, a
* progress dialog will be shown -- otherwise not. If another
* NotationView is provided, the fonts and other settings used
* for printing will be taken from that view.
*/
explicit NotationView(RosegardenGUIDoc *doc,
std::vector<Segment *> segments,
- TQWidget *tqparent,
+ TQWidget *parent,
NotationView *referenceView);
~NotationView();
diff --git a/src/gui/editors/notation/NoteCharacter.cpp b/src/gui/editors/notation/NoteCharacter.cpp
index e3beed2..9f49131 100644
--- a/src/gui/editors/notation/NoteCharacter.cpp
+++ b/src/gui/editors/notation/NoteCharacter.cpp
@@ -125,8 +125,8 @@ NoteCharacter::draw(TQPainter *painter, int x, int y) const
void
NoteCharacter::drawMask(TQPainter *painter, int x, int y) const
{
- if (!m_rep && m_pixmap->tqmask()) {
- painter->drawPixmap(x, y, *(m_pixmap->tqmask()));
+ if (!m_rep && m_pixmap->mask()) {
+ painter->drawPixmap(x, y, *(m_pixmap->mask()));
}
}
diff --git a/src/gui/editors/notation/NoteFont.cpp b/src/gui/editors/notation/NoteFont.cpp
index e494169..18f82f7 100644
--- a/src/gui/editors/notation/NoteFont.cpp
+++ b/src/gui/editors/notation/NoteFont.cpp
@@ -286,8 +286,8 @@ NoteFont::getPixmap(CharName charName, TQPixmap &pixmap, bool inverted) const
if (!found->isNull()) {
- if (found->tqmask() == 0) {
- std::cerr << "NoteFont::getPixmap: Warning: No automatic tqmask "
+ if (found->mask() == 0) {
+ std::cerr << "NoteFont::getPixmap: Warning: No automatic mask "
<< "for character \"" << charName << "\""
<< (inverted ? " (inverted)" : "") << " in font \""
<< m_fontMap.getName() << "-" << m_size
diff --git a/src/gui/editors/notation/NoteFontViewer.cpp b/src/gui/editors/notation/NoteFontViewer.cpp
index 918c7ac..d485244 100644
--- a/src/gui/editors/notation/NoteFontViewer.cpp
+++ b/src/gui/editors/notation/NoteFontViewer.cpp
@@ -81,9 +81,9 @@ NoteFontViewer::slotFontChanged(const TQString &s)
slotViewChanged(m_view->currentItem());
}
-NoteFontViewer::NoteFontViewer(TQWidget *tqparent, TQString noteFontName,
+NoteFontViewer::NoteFontViewer(TQWidget *parent, TQString noteFontName,
TQStringList fontNames, int pixelSize) :
- KDialogBase(tqparent, 0, true,
+ KDialogBase(parent, 0, true,
i18n("Note Font Viewer: %1").tqarg(noteFontName), Close)
{
TQVBox *box = makeVBoxMainWidget();
diff --git a/src/gui/editors/notation/NoteFontViewer.h b/src/gui/editors/notation/NoteFontViewer.h
index 17b41a7..69c62c6 100644
--- a/src/gui/editors/notation/NoteFontViewer.h
+++ b/src/gui/editors/notation/NoteFontViewer.h
@@ -47,7 +47,7 @@ class NoteFontViewer : public KDialogBase
TQ_OBJECT
public:
- NoteFontViewer(TQWidget *tqparent, TQString noteFontName,
+ NoteFontViewer(TQWidget *parent, TQString noteFontName,
TQStringList systemFontNames, int pixelSize);
protected slots:
diff --git a/src/gui/editors/notation/NotePixmapFactory.cpp b/src/gui/editors/notation/NotePixmapFactory.cpp
index e5f306b..ac9064a 100644
--- a/src/gui/editors/notation/NotePixmapFactory.cpp
+++ b/src/gui/editors/notation/NotePixmapFactory.cpp
@@ -1261,7 +1261,7 @@ NotePixmapFactory::drawFlags(int flagCount,
} else {
- // No problem with tqmask here
+ // No problem with mask here
m_p->drawNoteCharacter(m_left + s1.x() - hotspot.x(),
y,
flagChar);
@@ -2890,7 +2890,7 @@ NotePixmapFactory::drawOttavaAux(int length, int octavesUp,
m_p->beginExternal(painter);
painter->translate(x - backpedal, y - height);
} else {
- NOTATION_DEBUG << "NotePixmapFactory::drawOttavaAux: making pixmap and tqmask " << width << "x" << height << endl;
+ NOTATION_DEBUG << "NotePixmapFactory::drawOttavaAux: making pixmap and mask " << width << "x" << height << endl;
createPixmapAndMask(width, height);
}
@@ -3443,7 +3443,7 @@ NotePixmapFactory::createPixmapAndMask(int width, int height,
total += width * height;
// NOTATION_DEBUG << "createPixmapAndMask: " << width << "x" << height << " (" << (width*height) << " px, " << total << " total)" << endl;
- // clear up pixmap and tqmask
+ // clear up pixmap and mask
m_generatedPixmap->fill();
m_generatedMask->fill(TQt::color0);
diff --git a/src/gui/editors/notation/NotePixmapPainter.h b/src/gui/editors/notation/NotePixmapPainter.h
index 485f5a1..9b56052 100644
--- a/src/gui/editors/notation/NotePixmapPainter.h
+++ b/src/gui/editors/notation/NotePixmapPainter.h
@@ -33,7 +33,7 @@ namespace Rosegarden {
class NotePixmapPainter
{
// Just a trivial class that instructs two painters to do the
- // same thing (one for the pixmap, one for the tqmask). We only
+ // same thing (one for the pixmap, one for the mask). We only
// duplicate those methods we actually use in NotePixmapFactory
public:
@@ -55,13 +55,13 @@ public:
}
}
- bool begin(TQPaintDevice *device, TQPaintDevice *tqmask = 0, bool unclipped = false) {
+ bool begin(TQPaintDevice *device, TQPaintDevice *mask = 0, bool unclipped = false) {
m_externalPainter = 0;
- if (tqmask) {
+ if (mask) {
m_useMask = true;
- m_maskPainter.tqbegin(tqmask, unclipped);
+ m_maskPainter.tqbegin(mask, unclipped);
} else {
m_useMask = false;
}
@@ -117,7 +117,7 @@ public:
void drawPixmap(int x, int y, const TQPixmap &pm,
int sx = 0, int sy = 0, int sw = -1, int sh = -1) {
m_painter->tqdrawPixmap(x, y, pm, sx, sy, sw, sh);
- if (m_useMask) m_maskPainter.tqdrawPixmap(x, y, *(pm.tqmask()), sx, sy, sw, sh);
+ if (m_useMask) m_maskPainter.tqdrawPixmap(x, y, *(pm.mask()), sx, sy, sw, sh);
}
void drawText(int x, int y, const TQString &string) {
diff --git a/src/gui/editors/notation/TrackHeader.cpp b/src/gui/editors/notation/TrackHeader.cpp
index de5bf5f..fa19ca5 100644
--- a/src/gui/editors/notation/TrackHeader.cpp
+++ b/src/gui/editors/notation/TrackHeader.cpp
@@ -75,8 +75,8 @@ const int TrackHeader::INCONSISTENT_TRANSPOSITIONS = 1 << 5;
const int TrackHeader::BEFORE_FIRST_SEGMENT = 1 << 6;
-TrackHeader::TrackHeader(TQWidget *tqparent, TrackId trackId, int height, int ypos) :
- TQLabel(tqparent),
+TrackHeader::TrackHeader(TQWidget *parent, TrackId trackId, int height, int ypos) :
+ TQLabel(parent),
m_track(trackId),
m_height(height),
m_ypos(ypos),
@@ -96,7 +96,7 @@ TrackHeader::TrackHeader(TQWidget *tqparent, TrackId trackId, int height, int yp
m_current(false)
{
- m_notationView = static_cast<HeadersGroup *>(tqparent)->getNotationView();
+ m_notationView = static_cast<HeadersGroup *>(parent)->getNotationView();
setFrameStyle(TQFrame::Box | TQFrame::Plain);
setCurrent(false);
@@ -106,7 +106,7 @@ TrackHeader::TrackHeader(TQWidget *tqparent, TrackId trackId, int height, int yp
// Tooltip text creation
Composition *comp =
- static_cast<HeadersGroup *>(tqparent)->getComposition();
+ static_cast<HeadersGroup *>(parent)->getComposition();
Track *track = comp->getTrackById(m_track);
int trackPos = comp->getTrackPositionById(m_track);
@@ -274,7 +274,7 @@ TrackHeader::lookAtStaff(double x, int maxWidth)
int staff;
Composition *comp =
- static_cast<HeadersGroup *>(TQT_TQWIDGET(tqparent()))->getComposition();
+ static_cast<HeadersGroup *>(TQT_TQWIDGET(parent()))->getComposition();
Track *track = comp->getTrackById(m_track);
int trackPos = comp->getTrackPositionById(m_track);
diff --git a/src/gui/editors/notation/TrackHeader.h b/src/gui/editors/notation/TrackHeader.h
index 0b8a0a6..3f7029e 100644
--- a/src/gui/editors/notation/TrackHeader.h
+++ b/src/gui/editors/notation/TrackHeader.h
@@ -57,10 +57,10 @@ class TrackHeader : public TQLabel
public:
/**
* Create a new track header for track of id trackId.
- * *tqparent is the tqparent widget, height the height of staff and
+ * *parent is the parent widget, height the height of staff and
* ypos is the staff y position on canvas.
*/
- TrackHeader(TQWidget *tqparent, TrackId trackId, int height, int ypos);
+ TrackHeader(TQWidget *parent, TrackId trackId, int height, int ypos);
/**
* Draw a blue line around header when current is true
diff --git a/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp b/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp
index d7bf79a..7299a9f 100644
--- a/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp
+++ b/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp
@@ -242,8 +242,8 @@ AudioInstrumentParameterPanel::setButtonColour(
}
}
-AudioInstrumentParameterPanel::AudioInstrumentParameterPanel(RosegardenGUIDoc* doc, TQWidget* tqparent)
- : InstrumentParameterPanel(doc, tqparent),
+AudioInstrumentParameterPanel::AudioInstrumentParameterPanel(RosegardenGUIDoc* doc, TQWidget* parent)
+ : InstrumentParameterPanel(doc, parent),
m_audioFader(new AudioFaderBox(this))
{
TQGridLayout *gridLayout = new TQGridLayout(this, 3, 2, 5, 5);
diff --git a/src/gui/editors/parameters/AudioInstrumentParameterPanel.h b/src/gui/editors/parameters/AudioInstrumentParameterPanel.h
index a9ff117..9b771c7 100644
--- a/src/gui/editors/parameters/AudioInstrumentParameterPanel.h
+++ b/src/gui/editors/parameters/AudioInstrumentParameterPanel.h
@@ -49,7 +49,7 @@ class AudioInstrumentParameterPanel : public InstrumentParameterPanel
Q_OBJECT
TQ_OBJECT
public:
- AudioInstrumentParameterPanel(RosegardenGUIDoc* doc, TQWidget* tqparent);
+ AudioInstrumentParameterPanel(RosegardenGUIDoc* doc, TQWidget* parent);
virtual void setupForInstrument(Instrument*);
diff --git a/src/gui/editors/parameters/InstrumentParameterBox.cpp b/src/gui/editors/parameters/InstrumentParameterBox.cpp
index f31c474..b618bed 100644
--- a/src/gui/editors/parameters/InstrumentParameterBox.cpp
+++ b/src/gui/editors/parameters/InstrumentParameterBox.cpp
@@ -49,10 +49,10 @@ namespace Rosegarden
{
InstrumentParameterBox::InstrumentParameterBox(RosegardenGUIDoc *doc,
- TQWidget *tqparent)
+ TQWidget *parent)
: RosegardenParameterBox(i18n("Instrument"),
i18n("Instrument Parameters"),
- tqparent),
+ parent),
m_widgetStack(new TQWidgetStack(this)),
m_noInstrumentParameters(new TQVBox(this)),
m_midiInstrumentParameters(new MIDIInstrumentParameterPanel(doc, this)),
diff --git a/src/gui/editors/parameters/InstrumentParameterBox.h b/src/gui/editors/parameters/InstrumentParameterBox.h
index cb50d7a..6d03b7b 100644
--- a/src/gui/editors/parameters/InstrumentParameterBox.h
+++ b/src/gui/editors/parameters/InstrumentParameterBox.h
@@ -57,7 +57,7 @@ Q_OBJECT
public:
InstrumentParameterBox(RosegardenGUIDoc *doc,
- TQWidget *tqparent = 0);
+ TQWidget *parent = 0);
~InstrumentParameterBox();
void useInstrument(Instrument *instrument);
diff --git a/src/gui/editors/parameters/InstrumentParameterPanel.cpp b/src/gui/editors/parameters/InstrumentParameterPanel.cpp
index d0f45d4..9cca26d 100644
--- a/src/gui/editors/parameters/InstrumentParameterPanel.cpp
+++ b/src/gui/editors/parameters/InstrumentParameterPanel.cpp
@@ -38,8 +38,8 @@ namespace Rosegarden
{
InstrumentParameterPanel::InstrumentParameterPanel(RosegardenGUIDoc *doc,
- TQWidget* tqparent)
- : TQFrame(tqparent),
+ TQWidget* parent)
+ : TQFrame(parent),
m_instrumentLabel(new KSqueezedTextLabel(this)),
m_selectedInstrument(0),
m_doc(doc)
diff --git a/src/gui/editors/parameters/InstrumentParameterPanel.h b/src/gui/editors/parameters/InstrumentParameterPanel.h
index 42ceee5..1674a74 100644
--- a/src/gui/editors/parameters/InstrumentParameterPanel.h
+++ b/src/gui/editors/parameters/InstrumentParameterPanel.h
@@ -52,7 +52,7 @@ class InstrumentParameterPanel : public TQFrame
Q_OBJECT
TQ_OBJECT
public:
- InstrumentParameterPanel(RosegardenGUIDoc *doc, TQWidget* tqparent);
+ InstrumentParameterPanel(RosegardenGUIDoc *doc, TQWidget* parent);
virtual ~InstrumentParameterPanel() {};
diff --git a/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp b/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp
index 3f0e543..ceb2e26 100644
--- a/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp
+++ b/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp
@@ -60,8 +60,8 @@
namespace Rosegarden
{
-MIDIInstrumentParameterPanel::MIDIInstrumentParameterPanel(RosegardenGUIDoc *doc, TQWidget* tqparent):
- InstrumentParameterPanel(doc, tqparent),
+MIDIInstrumentParameterPanel::MIDIInstrumentParameterPanel(RosegardenGUIDoc *doc, TQWidget* parent):
+ InstrumentParameterPanel(doc, parent),
m_rotaryFrame(0),
m_rotaryMapper(new TQSignalMapper(TQT_TQOBJECT(this)))
{
diff --git a/src/gui/editors/parameters/MIDIInstrumentParameterPanel.h b/src/gui/editors/parameters/MIDIInstrumentParameterPanel.h
index 635c009..1a8db85 100644
--- a/src/gui/editors/parameters/MIDIInstrumentParameterPanel.h
+++ b/src/gui/editors/parameters/MIDIInstrumentParameterPanel.h
@@ -55,7 +55,7 @@ class MIDIInstrumentParameterPanel : public InstrumentParameterPanel
TQ_OBJECT
public:
- MIDIInstrumentParameterPanel(RosegardenGUIDoc *doc, TQWidget* tqparent);
+ MIDIInstrumentParameterPanel(RosegardenGUIDoc *doc, TQWidget* parent);
void setupControllers(MidiDevice *); // setup ControlParameters on box
diff --git a/src/gui/editors/parameters/RosegardenParameterArea.cpp b/src/gui/editors/parameters/RosegardenParameterArea.cpp
index 9d717a1..5e13652 100644
--- a/src/gui/editors/parameters/RosegardenParameterArea.cpp
+++ b/src/gui/editors/parameters/RosegardenParameterArea.cpp
@@ -46,9 +46,9 @@
namespace Rosegarden
{
-RosegardenParameterArea::RosegardenParameterArea(TQWidget *tqparent,
+RosegardenParameterArea::RosegardenParameterArea(TQWidget *parent,
const char *name, WFlags f)
- : TQWidgetStack(tqparent, name, f),
+ : TQWidgetStack(parent, name, f),
m_style(RosegardenParameterArea::CLASSIC_STYLE),
m_scrollView(new TQScrollView(this, 0, TQt::WStaticContents)),
m_classic(new TQVBox(m_scrollView->viewport())),
@@ -204,7 +204,7 @@ void RosegardenParameterArea::moveWidget(TQWidget *old_container,
m_tabBox->removePage(box);
}
- // Retqparent the parameter box, and perform any container-specific
+ // Reparent the parameter box, and perform any container-specific
// configuration.
if (new_container == m_classic) {
diff --git a/src/gui/editors/parameters/RosegardenParameterArea.h b/src/gui/editors/parameters/RosegardenParameterArea.h
index 1000017..7fd8989 100644
--- a/src/gui/editors/parameters/RosegardenParameterArea.h
+++ b/src/gui/editors/parameters/RosegardenParameterArea.h
@@ -57,7 +57,7 @@ public:
// Create the parameter display area.
- RosegardenParameterArea(TQWidget *tqparent=0, const char *name=0, WFlags f=0);
+ RosegardenParameterArea(TQWidget *parent=0, const char *name=0, WFlags f=0);
// Add a rosegarden parameter box to the list that are to be displayed.
diff --git a/src/gui/editors/parameters/RosegardenParameterBox.cpp b/src/gui/editors/parameters/RosegardenParameterBox.cpp
index b52d65c..dbefda0 100644
--- a/src/gui/editors/parameters/RosegardenParameterBox.cpp
+++ b/src/gui/editors/parameters/RosegardenParameterBox.cpp
@@ -41,9 +41,9 @@ namespace Rosegarden
RosegardenParameterBox::RosegardenParameterBox(const TQString &shortLabel,
const TQString &longLabel,
- TQWidget *tqparent,
+ TQWidget *parent,
const char *name) :
- TQFrame(tqparent, name),
+ TQFrame(parent, name),
m_shortLabel(shortLabel),
m_longLabel(longLabel),
m_mode(LANDSCAPE_MODE)
diff --git a/src/gui/editors/parameters/RosegardenParameterBox.h b/src/gui/editors/parameters/RosegardenParameterBox.h
index c75f875..459aeab 100644
--- a/src/gui/editors/parameters/RosegardenParameterBox.h
+++ b/src/gui/editors/parameters/RosegardenParameterBox.h
@@ -55,7 +55,7 @@ class RosegardenParameterBox : public TQFrame
public:
RosegardenParameterBox(const TQString &shortLabel, // e.g. i18n("Track")
const TQString &longLabel, // e.g. i18n("Track Parameters")
- TQWidget *tqparent = 0,
+ TQWidget *parent = 0,
const char *name = 0);
// Ask for a one-word string that can be used to label the widget.
@@ -75,8 +75,8 @@ protected:
// List the tqlayout styles that may be requested via a call to setStyle().
enum LayoutMode {
- LANDSCAPE_MODE, // Optimize the tqlayout for a tall and narrow tqparent.
- PORTRAIT_MODE // Optimize the tqlayout for a short and wide tqparent.
+ LANDSCAPE_MODE, // Optimize the tqlayout for a tall and narrow parent.
+ PORTRAIT_MODE // Optimize the tqlayout for a short and wide parent.
};
void setLayoutMode(LayoutMode mode);
diff --git a/src/gui/editors/parameters/SegmentParameterBox.cpp b/src/gui/editors/parameters/SegmentParameterBox.cpp
index 8e35960..34f3976 100644
--- a/src/gui/editors/parameters/SegmentParameterBox.cpp
+++ b/src/gui/editors/parameters/SegmentParameterBox.cpp
@@ -84,10 +84,10 @@ namespace Rosegarden
{
SegmentParameterBox::SegmentParameterBox(RosegardenGUIDoc* doc,
- TQWidget *tqparent)
+ TQWidget *parent)
: RosegardenParameterBox(i18n("Segment"),
i18n("Segment Parameters"),
- tqparent),
+ parent),
m_highestPlayable(127),
m_lowestPlayable(0),
m_standardQuantizations(BasicQuantizer::getStandardQuantizations()),
diff --git a/src/gui/editors/parameters/SegmentParameterBox.h b/src/gui/editors/parameters/SegmentParameterBox.h
index b67a8f1..cfc801a 100644
--- a/src/gui/editors/parameters/SegmentParameterBox.h
+++ b/src/gui/editors/parameters/SegmentParameterBox.h
@@ -73,7 +73,7 @@ public:
} Tristate;
SegmentParameterBox(RosegardenGUIDoc *doc,
- TQWidget *tqparent=0);
+ TQWidget *parent=0);
~SegmentParameterBox();
// Use Segments to update GUI parameters
diff --git a/src/gui/editors/parameters/TrackParameterBox.cpp b/src/gui/editors/parameters/TrackParameterBox.cpp
index b9bdcdd..94b1137 100644
--- a/src/gui/editors/parameters/TrackParameterBox.cpp
+++ b/src/gui/editors/parameters/TrackParameterBox.cpp
@@ -88,10 +88,10 @@ namespace Rosegarden
{
TrackParameterBox::TrackParameterBox( RosegardenGUIDoc *doc,
- TQWidget *tqparent)
+ TQWidget *parent)
: RosegardenParameterBox(i18n("Track"),
i18n("Track Parameters"),
- tqparent),
+ parent),
m_doc(doc),
m_highestPlayable(127),
m_lowestPlayable(0),
diff --git a/src/gui/editors/parameters/TrackParameterBox.h b/src/gui/editors/parameters/TrackParameterBox.h
index 3d55201..3975813 100644
--- a/src/gui/editors/parameters/TrackParameterBox.h
+++ b/src/gui/editors/parameters/TrackParameterBox.h
@@ -61,7 +61,7 @@ Q_OBJECT
public:
TrackParameterBox( RosegardenGUIDoc *doc,
- TQWidget *tqparent=0);
+ TQWidget *parent=0);
~TrackParameterBox();
void setDocument( RosegardenGUIDoc *doc );
diff --git a/src/gui/editors/segment/ControlEditorDialog.cpp b/src/gui/editors/segment/ControlEditorDialog.cpp
index 48d0f0a..581e065 100644
--- a/src/gui/editors/segment/ControlEditorDialog.cpp
+++ b/src/gui/editors/segment/ControlEditorDialog.cpp
@@ -72,10 +72,10 @@ namespace Rosegarden
const TQString notShowing(i18n("<not showing>"));
-ControlEditorDialog::ControlEditorDialog(TQWidget *tqparent,
+ControlEditorDialog::ControlEditorDialog(TQWidget *parent,
RosegardenGUIDoc *doc,
DeviceId device):
- KMainWindow(tqparent, "controleditordialog"),
+ KMainWindow(parent, "controleditordialog"),
m_studio(&doc->getStudio()),
m_doc(doc),
m_device(device),
diff --git a/src/gui/editors/segment/ControlEditorDialog.h b/src/gui/editors/segment/ControlEditorDialog.h
index e9722e5..fa481d1 100644
--- a/src/gui/editors/segment/ControlEditorDialog.h
+++ b/src/gui/editors/segment/ControlEditorDialog.h
@@ -53,7 +53,7 @@ class ControlEditorDialog : public KMainWindow
TQ_OBJECT
public:
- ControlEditorDialog(TQWidget *tqparent,
+ ControlEditorDialog(TQWidget *parent,
RosegardenGUIDoc *doc,
DeviceId device);
diff --git a/src/gui/editors/segment/ControlParameterEditDialog.cpp b/src/gui/editors/segment/ControlParameterEditDialog.cpp
index 47f01db..b00ac83 100644
--- a/src/gui/editors/segment/ControlParameterEditDialog.cpp
+++ b/src/gui/editors/segment/ControlParameterEditDialog.cpp
@@ -55,10 +55,10 @@ namespace Rosegarden
const TQString notShowing(i18n("<not showing>"));
ControlParameterEditDialog::ControlParameterEditDialog(
- TQWidget *tqparent,
+ TQWidget *parent,
ControlParameter *control,
RosegardenGUIDoc *doc):
- KDialogBase(tqparent, 0, true,
+ KDialogBase(parent, 0, true,
i18n("Edit Control Parameter"), Ok | Cancel),
m_doc(doc),
m_control(control)
diff --git a/src/gui/editors/segment/ControlParameterEditDialog.h b/src/gui/editors/segment/ControlParameterEditDialog.h
index 289dc68..727585d 100644
--- a/src/gui/editors/segment/ControlParameterEditDialog.h
+++ b/src/gui/editors/segment/ControlParameterEditDialog.h
@@ -49,7 +49,7 @@ class ControlParameterEditDialog : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- ControlParameterEditDialog(TQWidget *tqparent,
+ ControlParameterEditDialog(TQWidget *parent,
ControlParameter *control,
RosegardenGUIDoc *doc);
diff --git a/src/gui/editors/segment/ControlParameterItem.h b/src/gui/editors/segment/ControlParameterItem.h
index e64b1d3..7be91b3 100644
--- a/src/gui/editors/segment/ControlParameterItem.h
+++ b/src/gui/editors/segment/ControlParameterItem.h
@@ -38,7 +38,7 @@ class ControlParameterItem : public KListViewItem
{
public:
ControlParameterItem(int id,
- TQListView *tqparent,
+ TQListView *parent,
TQString str1,
TQString str2,
TQString str3,
@@ -48,7 +48,7 @@ public:
TQString str7,
TQString str8,
TQString str9):
- KListViewItem(tqparent, str1, str2, str3, str4, str5, str6, str7, str8),
+ KListViewItem(parent, str1, str2, str3, str4, str5, str6, str7, str8),
m_id(id) { setText(8, str9); }
int getId() const { return m_id; }
diff --git a/src/gui/editors/segment/MarkerEditor.cpp b/src/gui/editors/segment/MarkerEditor.cpp
index dffe446..029ff9c 100644
--- a/src/gui/editors/segment/MarkerEditor.cpp
+++ b/src/gui/editors/segment/MarkerEditor.cpp
@@ -71,9 +71,9 @@
namespace Rosegarden
{
-MarkerEditor::MarkerEditor(TQWidget *tqparent,
+MarkerEditor::MarkerEditor(TQWidget *parent,
RosegardenGUIDoc *doc):
- KMainWindow(tqparent, "markereditordialog"),
+ KMainWindow(parent, "markereditordialog"),
m_doc(doc),
m_modified(false)
{
diff --git a/src/gui/editors/segment/MarkerEditor.h b/src/gui/editors/segment/MarkerEditor.h
index c5a1973..1ddc200 100644
--- a/src/gui/editors/segment/MarkerEditor.h
+++ b/src/gui/editors/segment/MarkerEditor.h
@@ -54,7 +54,7 @@ class MarkerEditor : public KMainWindow
TQ_OBJECT
public:
- MarkerEditor(TQWidget *tqparent,
+ MarkerEditor(TQWidget *parent,
RosegardenGUIDoc *doc);
~MarkerEditor();
diff --git a/src/gui/editors/segment/MarkerEditorViewItem.h b/src/gui/editors/segment/MarkerEditorViewItem.h
index 03320aa..1a835c0 100644
--- a/src/gui/editors/segment/MarkerEditorViewItem.h
+++ b/src/gui/editors/segment/MarkerEditorViewItem.h
@@ -35,7 +35,7 @@ namespace Rosegarden {
class MarkerEditorViewItem : public KListViewItem
{
public:
- MarkerEditorViewItem(TQListView * tqparent, int id,
+ MarkerEditorViewItem(TQListView * parent, int id,
TQString label1,
TQString label2 = TQString(),
TQString label3 = TQString(),
@@ -44,7 +44,7 @@ public:
TQString label6 = TQString(),
TQString label7 = TQString(),
TQString label8 = TQString()):
- KListViewItem(tqparent, label1, label2, label3, label4,
+ KListViewItem(parent, label1, label2, label3, label4,
label5, label6, label7, label8),
m_rawTime(0), m_fake(false), m_id(id) { ; }
diff --git a/src/gui/editors/segment/PlayList.cpp b/src/gui/editors/segment/PlayList.cpp
index c0154ec..da56edc 100644
--- a/src/gui/editors/segment/PlayList.cpp
+++ b/src/gui/editors/segment/PlayList.cpp
@@ -47,8 +47,8 @@
namespace Rosegarden
{
-PlayList::PlayList(TQWidget *tqparent, const char *name)
- : TQVBox(tqparent, name),
+PlayList::PlayList(TQWidget *parent, const char *name)
+ : TQVBox(parent, name),
m_listView(new PlayListView(this)),
m_buttonBar(new TQFrame(this)),
m_barLayout(new TQHBoxLayout(m_buttonBar)),
diff --git a/src/gui/editors/segment/PlayList.h b/src/gui/editors/segment/PlayList.h
index 606eecd..cf7b073 100644
--- a/src/gui/editors/segment/PlayList.h
+++ b/src/gui/editors/segment/PlayList.h
@@ -49,7 +49,7 @@ class PlayList : public TQVBox
TQ_OBJECT
public:
- PlayList(TQWidget *tqparent = 0, const char *name = 0);
+ PlayList(TQWidget *parent = 0, const char *name = 0);
~PlayList();
PlayListView* getListView() { return m_listView; }
diff --git a/src/gui/editors/segment/PlayListDialog.cpp b/src/gui/editors/segment/PlayListDialog.cpp
index 74c386b..b519b6e 100644
--- a/src/gui/editors/segment/PlayListDialog.cpp
+++ b/src/gui/editors/segment/PlayListDialog.cpp
@@ -36,8 +36,8 @@ namespace Rosegarden
{
PlayListDialog::PlayListDialog(TQString caption,
- TQWidget* tqparent, const char* name)
- : KDialogBase(tqparent, name, false, caption,
+ TQWidget* parent, const char* name)
+ : KDialogBase(parent, name, false, caption,
KDialogBase::Close, // standard buttons
KDialogBase::Close, // default button
true),
diff --git a/src/gui/editors/segment/PlayListDialog.h b/src/gui/editors/segment/PlayListDialog.h
index 69956dd..0ae205c 100644
--- a/src/gui/editors/segment/PlayListDialog.h
+++ b/src/gui/editors/segment/PlayListDialog.h
@@ -46,7 +46,7 @@ class PlayListDialog : public KDialogBase
TQ_OBJECT
public:
- PlayListDialog(TQString caption, TQWidget* tqparent = 0, const char* name = 0);
+ PlayListDialog(TQString caption, TQWidget* parent = 0, const char* name = 0);
PlayList* getPlayList() { return m_playList; }
diff --git a/src/gui/editors/segment/PlayListView.cpp b/src/gui/editors/segment/PlayListView.cpp
index e83e5e6..ff4d1c8 100644
--- a/src/gui/editors/segment/PlayListView.cpp
+++ b/src/gui/editors/segment/PlayListView.cpp
@@ -29,8 +29,8 @@
namespace Rosegarden {
-PlayListView::PlayListView(TQWidget *tqparent, const char *name)
- : KListView(tqparent, name)
+PlayListView::PlayListView(TQWidget *parent, const char *name)
+ : KListView(parent, name)
{
addColumn(i18n("Title"));
addColumn(i18n("File name"));
diff --git a/src/gui/editors/segment/PlayListView.h b/src/gui/editors/segment/PlayListView.h
index b21551e..43390d0 100644
--- a/src/gui/editors/segment/PlayListView.h
+++ b/src/gui/editors/segment/PlayListView.h
@@ -32,7 +32,7 @@ namespace Rosegarden {
class PlayListView : public KListView
{
public:
- PlayListView(TQWidget *tqparent=0, const char *name=0);
+ PlayListView(TQWidget *parent=0, const char *name=0);
TQListViewItem* previousSibling(TQListViewItem*);
diff --git a/src/gui/editors/segment/PlayListViewItem.cpp b/src/gui/editors/segment/PlayListViewItem.cpp
index 12d60b8..ab0c25c 100644
--- a/src/gui/editors/segment/PlayListViewItem.cpp
+++ b/src/gui/editors/segment/PlayListViewItem.cpp
@@ -26,14 +26,14 @@
namespace Rosegarden {
-PlayListViewItem::PlayListViewItem(KListView* tqparent, KURL kurl)
- : KListViewItem(tqparent, kurl.fileName(), kurl.prettyURL()),
+PlayListViewItem::PlayListViewItem(KListView* parent, KURL kurl)
+ : KListViewItem(parent, kurl.fileName(), kurl.prettyURL()),
m_kurl(kurl)
{
}
-PlayListViewItem::PlayListViewItem(KListView* tqparent, TQListViewItem* after, KURL kurl)
- : KListViewItem(tqparent, after, kurl.fileName(), kurl.prettyURL()),
+PlayListViewItem::PlayListViewItem(KListView* parent, TQListViewItem* after, KURL kurl)
+ : KListViewItem(parent, after, kurl.fileName(), kurl.prettyURL()),
m_kurl(kurl)
{
}
diff --git a/src/gui/editors/segment/PlayListViewItem.h b/src/gui/editors/segment/PlayListViewItem.h
index aa39bb8..a622682 100644
--- a/src/gui/editors/segment/PlayListViewItem.h
+++ b/src/gui/editors/segment/PlayListViewItem.h
@@ -33,8 +33,8 @@ namespace Rosegarden {
class PlayListViewItem : public KListViewItem
{
public:
- PlayListViewItem(KListView* tqparent, KURL);
- PlayListViewItem(KListView* tqparent, TQListViewItem*, KURL);
+ PlayListViewItem(KListView* parent, KURL);
+ PlayListViewItem(KListView* parent, TQListViewItem*, KURL);
const KURL& getURL() { return m_kurl; }
diff --git a/src/gui/editors/segment/TrackButtons.cpp b/src/gui/editors/segment/TrackButtons.cpp
index fba7327..2e779fd 100644
--- a/src/gui/editors/segment/TrackButtons.cpp
+++ b/src/gui/editors/segment/TrackButtons.cpp
@@ -72,10 +72,10 @@ TrackButtons::TrackButtons(RosegardenGUIDoc* doc,
unsigned int trackLabelWidth,
bool showTrackLabels,
int overallHeight,
- TQWidget* tqparent,
+ TQWidget* parent,
const char* name,
WFlags f)
- : TQFrame(tqparent, name, f),
+ : TQFrame(parent, name, f),
m_doc(doc),
m_tqlayout(new TQVBoxLayout(this)),
m_recordSigMapper(new TQSignalMapper(TQT_TQOBJECT(this))),
diff --git a/src/gui/editors/segment/TrackButtons.h b/src/gui/editors/segment/TrackButtons.h
index 050c564..0622642 100644
--- a/src/gui/editors/segment/TrackButtons.h
+++ b/src/gui/editors/segment/TrackButtons.h
@@ -62,7 +62,7 @@ public:
unsigned int trackLabelWidth,
bool showTrackLabels,
int overallHeight,
- TQWidget* tqparent = 0,
+ TQWidget* parent = 0,
const char* name = 0,
WFlags f=0);
diff --git a/src/gui/editors/segment/TrackEditor.cpp b/src/gui/editors/segment/TrackEditor.cpp
index 7381790..3fa85ba 100644
--- a/src/gui/editors/segment/TrackEditor.cpp
+++ b/src/gui/editors/segment/TrackEditor.cpp
@@ -87,10 +87,10 @@ TrackEditor::TrackEditor(RosegardenGUIDoc* doc,
RulerScale *rulerScale,
bool showTrackLabels,
double initialUnitsPerPixel,
- TQWidget* tqparent, const char* name,
+ TQWidget* parent, const char* name,
WFlags) :
DCOPObject("TrackEditorIface"),
- TQWidget(tqparent, name),
+ TQWidget(parent, name),
m_doc(doc),
m_rulerScale(rulerScale),
m_topStandardRuler(0),
@@ -166,7 +166,7 @@ TrackEditor::init(TQWidget* rosegardenguiview)
connect(rosegardenguiview, TQT_SIGNAL(instrumentParametersChanged(InstrumentId)),
m_compositionModel, TQT_SLOT(slotInstrumentParametersChanged(InstrumentId)));
- connect(rosegardenguiview->tqparent(), TQT_SIGNAL(instrumentParametersChanged(InstrumentId)),
+ connect(rosegardenguiview->parent(), TQT_SIGNAL(instrumentParametersChanged(InstrumentId)),
m_compositionModel, TQT_SLOT(slotInstrumentParametersChanged(InstrumentId)));
m_segmentCanvas = new CompositionView(m_doc, m_compositionModel, this);
diff --git a/src/gui/editors/segment/TrackEditor.h b/src/gui/editors/segment/TrackEditor.h
index 86e3b77..88dab1d 100644
--- a/src/gui/editors/segment/TrackEditor.h
+++ b/src/gui/editors/segment/TrackEditor.h
@@ -78,7 +78,7 @@ public:
RulerScale *rulerScale,
bool showTrackLabels,
double initialUnitsPerPixel = 0,
- TQWidget* tqparent = 0, const char* name = 0,
+ TQWidget* parent = 0, const char* name = 0,
WFlags f=0);
~TrackEditor();
diff --git a/src/gui/editors/segment/TrackHeader.h b/src/gui/editors/segment/TrackHeader.h
index 56891f4..d1abcc1 100644
--- a/src/gui/editors/segment/TrackHeader.h
+++ b/src/gui/editors/segment/TrackHeader.h
@@ -43,9 +43,9 @@ class TrackHeader : public TQHeader
public:
TrackHeader(int number,
- TQWidget *tqparent=0,
+ TQWidget *parent=0,
const char *name=0 ):
- TQHeader(number, tqparent, name) {;}
+ TQHeader(number, parent, name) {;}
~TrackHeader();
protected:
diff --git a/src/gui/editors/segment/TrackLabel.cpp b/src/gui/editors/segment/TrackLabel.cpp
index 53795a7..144fcd6 100644
--- a/src/gui/editors/segment/TrackLabel.cpp
+++ b/src/gui/editors/segment/TrackLabel.cpp
@@ -45,9 +45,9 @@ namespace Rosegarden
TrackLabel::TrackLabel(TrackId id,
int position,
- TQWidget *tqparent,
+ TQWidget *parent,
const char *name):
- TQWidgetStack(tqparent, name),
+ TQWidgetStack(parent, name),
m_instrumentLabel(new TQLabel(this)),
m_trackLabel(new TQLabel(this)),
m_id(id),
diff --git a/src/gui/editors/segment/TrackLabel.h b/src/gui/editors/segment/TrackLabel.h
index a7b5207..5369165 100644
--- a/src/gui/editors/segment/TrackLabel.h
+++ b/src/gui/editors/segment/TrackLabel.h
@@ -62,7 +62,7 @@ public:
TrackLabel(TrackId id,
int position,
- TQWidget *tqparent,
+ TQWidget *parent,
const char *name=0);
~TrackLabel();
diff --git a/src/gui/editors/segment/TrackVUMeter.cpp b/src/gui/editors/segment/TrackVUMeter.cpp
index 5001a28..ad91278 100644
--- a/src/gui/editors/segment/TrackVUMeter.cpp
+++ b/src/gui/editors/segment/TrackVUMeter.cpp
@@ -34,13 +34,13 @@
namespace Rosegarden
{
-TrackVUMeter::TrackVUMeter(TQWidget *tqparent,
+TrackVUMeter::TrackVUMeter(TQWidget *parent,
VUMeterType type,
int width,
int height,
int position,
const char *name):
- VUMeter(tqparent, type, false, false, width, height, VUMeter::Horizontal, name),
+ VUMeter(parent, type, false, false, width, height, VUMeter::Horizontal, name),
m_position(position), m_textHeight(12)
{
tqsetAlignment(AlignCenter);
diff --git a/src/gui/editors/segment/TrackVUMeter.h b/src/gui/editors/segment/TrackVUMeter.h
index 9630301..dad0455 100644
--- a/src/gui/editors/segment/TrackVUMeter.h
+++ b/src/gui/editors/segment/TrackVUMeter.h
@@ -40,7 +40,7 @@ namespace Rosegarden
class TrackVUMeter: public VUMeter
{
public:
- TrackVUMeter(TQWidget *tqparent = 0,
+ TrackVUMeter(TQWidget *parent = 0,
VUMeterType type = Plain,
int width = 0,
int height = 0,
diff --git a/src/gui/editors/segment/TriggerManagerItem.h b/src/gui/editors/segment/TriggerManagerItem.h
index 1d6a819..eb52a86 100644
--- a/src/gui/editors/segment/TriggerManagerItem.h
+++ b/src/gui/editors/segment/TriggerManagerItem.h
@@ -35,7 +35,7 @@ namespace Rosegarden {
class TriggerManagerItem : public TQListViewItem
{
public:
- TriggerManagerItem(TQListView * tqparent, TQString label1,
+ TriggerManagerItem(TQListView * parent, TQString label1,
TQString label2 = TQString(),
TQString label3 = TQString(),
TQString label4 = TQString(),
@@ -43,7 +43,7 @@ public:
TQString label6 = TQString(),
TQString label7 = TQString(),
TQString label8 = TQString()):
- TQListViewItem(tqparent, label1, label2, label3, label4,
+ TQListViewItem(parent, label1, label2, label3, label4,
label5, label6, label7, label8) { ; }
virtual int compare(TQListViewItem * i, int col, bool ascending) const;
diff --git a/src/gui/editors/segment/TriggerSegmentManager.cpp b/src/gui/editors/segment/TriggerSegmentManager.cpp
index e658cc3..29b7bf0 100644
--- a/src/gui/editors/segment/TriggerSegmentManager.cpp
+++ b/src/gui/editors/segment/TriggerSegmentManager.cpp
@@ -73,9 +73,9 @@
namespace Rosegarden
{
-TriggerSegmentManager::TriggerSegmentManager(TQWidget *tqparent,
+TriggerSegmentManager::TriggerSegmentManager(TQWidget *parent,
RosegardenGUIDoc *doc):
- KMainWindow(tqparent, "triggereditordialog"),
+ KMainWindow(parent, "triggereditordialog"),
m_doc(doc),
m_modified(false)
{
diff --git a/src/gui/editors/segment/TriggerSegmentManager.h b/src/gui/editors/segment/TriggerSegmentManager.h
index dbe5ea0..bae2245 100644
--- a/src/gui/editors/segment/TriggerSegmentManager.h
+++ b/src/gui/editors/segment/TriggerSegmentManager.h
@@ -53,7 +53,7 @@ class TriggerSegmentManager : public KMainWindow
TQ_OBJECT
public:
- TriggerSegmentManager(TQWidget *tqparent,
+ TriggerSegmentManager(TQWidget *parent,
RosegardenGUIDoc *doc);
~TriggerSegmentManager();
diff --git a/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.cpp b/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.cpp
index 1ae0acd..182eb9b 100644
--- a/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.cpp
+++ b/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.cpp
@@ -44,8 +44,8 @@ static int apuExtantCount = 0;
AudioPreviewUpdater::AudioPreviewUpdater(AudioPreviewThread &thread,
const Composition& c, const Segment* s,
const TQRect& r,
- CompositionModelImpl* tqparent)
- : TQObject(tqparent),
+ CompositionModelImpl* parent)
+ : TQObject(parent),
m_thread(thread),
m_composition(c),
m_segment(s),
diff --git a/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.h b/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.h
index 047f9b2..f7ef967 100644
--- a/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.h
+++ b/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.h
@@ -53,7 +53,7 @@ public:
const Composition &composition,
const Segment *segment,
const TQRect &displayExtent,
- CompositionModelImpl *tqparent);
+ CompositionModelImpl *parent);
~AudioPreviewUpdater();
void update();
diff --git a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
index d4e7909..7d38151 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
+++ b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
@@ -88,12 +88,12 @@ protected:
CompositionView::CompositionView(RosegardenGUIDoc* doc,
CompositionModel* model,
- TQWidget * tqparent, const char * name, WFlags f)
+ TQWidget * parent, const char * name, WFlags f)
#if KDE_VERSION >= KDE_MAKE_VERSION(3,2,0)
- : RosegardenScrollView(tqparent, name, f | WNoAutoErase | WStaticContents),
+ : RosegardenScrollView(parent, name, f | WNoAutoErase | WStaticContents),
#else
:
- RosegardenScrollView(tqparent, name, f | WRepaintNoErase | WResizeNoErase | WStaticContents),
+ RosegardenScrollView(parent, name, f | WRepaintNoErase | WResizeNoErase | WStaticContents),
#endif
m_model(model),
m_currentItem(0),
diff --git a/src/gui/editors/segment/segmentcanvas/CompositionView.h b/src/gui/editors/segment/segmentcanvas/CompositionView.h
index 12c5fb4..a1f6f07 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionView.h
+++ b/src/gui/editors/segment/segmentcanvas/CompositionView.h
@@ -67,7 +67,7 @@ class CompositionView : public RosegardenScrollView
TQ_OBJECT
public:
CompositionView(RosegardenGUIDoc*, CompositionModel*,
- TQWidget * tqparent=0, const char* name=0, WFlags f=0);
+ TQWidget * parent=0, const char* name=0, WFlags f=0);
void setPointerPos(int pos);
int getPointerPos() { return m_pointerPos; }
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentItemPreview.h b/src/gui/editors/segment/segmentcanvas/SegmentItemPreview.h
index 00d942e..cdf373e 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentItemPreview.h
+++ b/src/gui/editors/segment/segmentcanvas/SegmentItemPreview.h
@@ -44,7 +44,7 @@ class RulerScale;
class SegmentItemPreview
{
public:
- SegmentItemPreview(Segment& tqparent,
+ SegmentItemPreview(Segment& parent,
RulerScale* scale);
virtual ~SegmentItemPreview();
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentTool.cpp b/src/gui/editors/segment/segmentcanvas/SegmentTool.cpp
index 130add7..85800b2 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentTool.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentTool.cpp
@@ -42,7 +42,7 @@ namespace Rosegarden
{
SegmentTool::SegmentTool(CompositionView* canvas, RosegardenGUIDoc *doc)
- : BaseTool("segment_tool_menu", dynamic_cast<KMainWindow*>(doc->tqparent())->factory(), TQT_TQOBJECT(canvas)),
+ : BaseTool("segment_tool_menu", dynamic_cast<KMainWindow*>(doc->parent())->factory(), TQT_TQOBJECT(canvas)),
m_canvas(canvas),
m_doc(doc),
m_changeMade(false)
@@ -86,7 +86,7 @@ SegmentTool::createMenu()
RG_DEBUG << "SegmentTool::createMenu()\n";
RosegardenGUIApp *app =
- dynamic_cast<RosegardenGUIApp*>(m_doc->tqparent());
+ dynamic_cast<RosegardenGUIApp*>(m_doc->parent());
if (app) {
m_menu = static_cast<TQPopupMenu*>
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentTool.h b/src/gui/editors/segment/segmentcanvas/SegmentTool.h
index 1b33ba3..5b054a8 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentTool.h
+++ b/src/gui/editors/segment/segmentcanvas/SegmentTool.h
@@ -64,7 +64,7 @@ public:
virtual ~SegmentTool();
/**
- * Is called by the tqparent View (EditView or SegmentCanvas) when
+ * Is called by the parent View (EditView or SegmentCanvas) when
* the tool is set as current.
* Add any setup here
*/
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp b/src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp
index c0b4aeb..68bee60 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp
@@ -42,9 +42,9 @@
namespace Rosegarden
{
-SegmentToolBox::SegmentToolBox(CompositionView* tqparent, RosegardenGUIDoc* doc)
- : BaseToolBox(tqparent),
- m_canvas(tqparent),
+SegmentToolBox::SegmentToolBox(CompositionView* parent, RosegardenGUIDoc* doc)
+ : BaseToolBox(parent),
+ m_canvas(parent),
m_doc(doc)
{}
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentToolBox.h b/src/gui/editors/segment/segmentcanvas/SegmentToolBox.h
index c975e53..92306f3 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentToolBox.h
+++ b/src/gui/editors/segment/segmentcanvas/SegmentToolBox.h
@@ -45,7 +45,7 @@ class SegmentToolBox : public BaseToolBox
Q_OBJECT
TQ_OBJECT
public:
- SegmentToolBox(CompositionView* tqparent, RosegardenGUIDoc*);
+ SegmentToolBox(CompositionView* parent, RosegardenGUIDoc*);
virtual SegmentTool* getTool(const TQString& toolName);
diff --git a/src/gui/editors/tempo/TempoListItem.h b/src/gui/editors/tempo/TempoListItem.h
index be9e7a1..4d62ab0 100644
--- a/src/gui/editors/tempo/TempoListItem.h
+++ b/src/gui/editors/tempo/TempoListItem.h
@@ -42,12 +42,12 @@ public:
Type type,
timeT time,
int index,
- KListView *tqparent,
+ KListView *parent,
TQString label1,
TQString label2,
TQString label3,
TQString label4 = TQString()) :
- KListViewItem(tqparent, label1, label2, label3, label4),
+ KListViewItem(parent, label1, label2, label3, label4),
m_composition(composition),
m_type(type),
m_time(time),
diff --git a/src/gui/editors/tempo/TempoView.cpp b/src/gui/editors/tempo/TempoView.cpp
index f8b680d..7629632 100644
--- a/src/gui/editors/tempo/TempoView.cpp
+++ b/src/gui/editors/tempo/TempoView.cpp
@@ -70,8 +70,8 @@ int
TempoView::m_lastSetFilter = -1;
-TempoView::TempoView(RosegardenGUIDoc *doc, TQWidget *tqparent, timeT openTime):
- EditViewBase(doc, std::vector<Segment *>(), 2, tqparent, "tempoview"),
+TempoView::TempoView(RosegardenGUIDoc *doc, TQWidget *parent, timeT openTime):
+ EditViewBase(doc, std::vector<Segment *>(), 2, parent, "tempoview"),
m_filter(Tempo | TimeSignature),
m_ignoreUpdates(true)
{
diff --git a/src/gui/editors/tempo/TempoView.h b/src/gui/editors/tempo/TempoView.h
index b715d24..ad69a32 100644
--- a/src/gui/editors/tempo/TempoView.h
+++ b/src/gui/editors/tempo/TempoView.h
@@ -72,7 +72,7 @@ class TempoView : public EditViewBase, public CompositionObserver
};
public:
- TempoView(RosegardenGUIDoc *doc, TQWidget *tqparent, timeT);
+ TempoView(RosegardenGUIDoc *doc, TQWidget *parent, timeT);
virtual ~TempoView();
virtual bool applyLayout(int staffNo = -1);
diff --git a/src/gui/general/BaseTool.cpp b/src/gui/general/BaseTool.cpp
index 76dc608..75202ac 100644
--- a/src/gui/general/BaseTool.cpp
+++ b/src/gui/general/BaseTool.cpp
@@ -36,8 +36,8 @@
namespace Rosegarden
{
-BaseTool::BaseTool(const TQString& menuName, KXMLGUIFactory* factory, TQObject* tqparent)
- : TQObject(tqparent),
+BaseTool::BaseTool(const TQString& menuName, KXMLGUIFactory* factory, TQObject* parent)
+ : TQObject(parent),
m_menuName(menuName),
m_menu(0),
m_parentFactory(factory)
diff --git a/src/gui/general/BaseTool.h b/src/gui/general/BaseTool.h
index c750679..2c1eab1 100644
--- a/src/gui/general/BaseTool.h
+++ b/src/gui/general/BaseTool.h
@@ -56,14 +56,14 @@ public:
virtual ~BaseTool();
/**
- * Is called by the tqparent View (EditView or SegmentCanvas) when
+ * Is called by the parent View (EditView or SegmentCanvas) when
* the tool is set as current.
* Add any setup here (e.g. setting the mouse cursor tqshape)
*/
virtual void ready();
/**
- * Is called by the tqparent View (EditView or SegmentCanvas) after
+ * Is called by the parent View (EditView or SegmentCanvas) after
* the tool is put away.
* Add any cleanup here
*/
@@ -88,7 +88,7 @@ protected:
*
* \a menuName : the name of the menu defined in the XML rc file
*/
- BaseTool(const TQString& menuName, KXMLGUIFactory*, TQObject* tqparent);
+ BaseTool(const TQString& menuName, KXMLGUIFactory*, TQObject* parent);
virtual void createMenu() = 0;
virtual bool hasMenu() { return false; }
diff --git a/src/gui/general/BaseToolBox.cpp b/src/gui/general/BaseToolBox.cpp
index 70cf3bd..1a018fd 100644
--- a/src/gui/general/BaseToolBox.cpp
+++ b/src/gui/general/BaseToolBox.cpp
@@ -34,8 +34,8 @@
namespace Rosegarden
{
-BaseToolBox::BaseToolBox(TQWidget* tqparent)
- : TQObject(tqparent),
+BaseToolBox::BaseToolBox(TQWidget* parent)
+ : TQObject(parent),
m_tools(17, // default size, from the TQt docs
false) // but we want it to be case insensitive
{
diff --git a/src/gui/general/BaseToolBox.h b/src/gui/general/BaseToolBox.h
index faf2b3a..63fbe51 100644
--- a/src/gui/general/BaseToolBox.h
+++ b/src/gui/general/BaseToolBox.h
@@ -51,7 +51,7 @@ class BaseToolBox : public TQObject
TQ_OBJECT
public:
- BaseToolBox(TQWidget* tqparent);
+ BaseToolBox(TQWidget* parent);
virtual BaseTool* getTool(const TQString& toolName);
diff --git a/src/gui/general/EditToolBox.cpp b/src/gui/general/EditToolBox.cpp
index c96f8af..48fa7e4 100644
--- a/src/gui/general/EditToolBox.cpp
+++ b/src/gui/general/EditToolBox.cpp
@@ -35,9 +35,9 @@
namespace Rosegarden
{
-EditToolBox::EditToolBox(EditView *tqparent)
- : BaseToolBox(tqparent),
- m_parentView(tqparent)
+EditToolBox::EditToolBox(EditView *parent)
+ : BaseToolBox(parent),
+ m_parentView(parent)
{
}
diff --git a/src/gui/general/EditToolBox.h b/src/gui/general/EditToolBox.h
index becb023..b9b5a01 100644
--- a/src/gui/general/EditToolBox.h
+++ b/src/gui/general/EditToolBox.h
@@ -48,7 +48,7 @@ class EditToolBox : public BaseToolBox
Q_OBJECT
TQ_OBJECT
public:
- EditToolBox(EditView* tqparent);
+ EditToolBox(EditView* parent);
virtual EditTool* getTool(const TQString& toolName);
diff --git a/src/gui/general/EditView.cpp b/src/gui/general/EditView.cpp
index 8566b7e..2fc60b7 100644
--- a/src/gui/general/EditView.cpp
+++ b/src/gui/general/EditView.cpp
@@ -119,8 +119,8 @@ static int FeatureShowVelocity = 0x00001; // show the velocity ruler
EditView::EditView(RosegardenGUIDoc *doc,
std::vector<Segment *> segments,
unsigned int cols,
- TQWidget *tqparent, const char *name) :
- EditViewBase(doc, segments, cols, tqparent, name),
+ TQWidget *parent, const char *name) :
+ EditViewBase(doc, segments, cols, parent, name),
m_currentEventSelection(0),
m_activeItem(0),
m_canvasView(0),
diff --git a/src/gui/general/EditView.h b/src/gui/general/EditView.h
index ecbfb6a..57ac833 100644
--- a/src/gui/general/EditView.h
+++ b/src/gui/general/EditView.h
@@ -82,7 +82,7 @@ public:
EditView(RosegardenGUIDoc *doc,
std::vector<Segment *> segments,
unsigned int cols,
- TQWidget *tqparent,
+ TQWidget *parent,
const char *name = 0);
virtual ~EditView();
diff --git a/src/gui/general/EditViewBase.cpp b/src/gui/general/EditViewBase.cpp
index 15852c8..2cb3518 100644
--- a/src/gui/general/EditViewBase.cpp
+++ b/src/gui/general/EditViewBase.cpp
@@ -77,8 +77,8 @@ const unsigned int EditViewBase::NbLayoutRows = 6;
EditViewBase::EditViewBase(RosegardenGUIDoc *doc,
std::vector<Segment *> segments,
unsigned int cols,
- TQWidget *tqparent, const char *name) :
- KDockMainWindow(tqparent, name),
+ TQWidget *parent, const char *name) :
+ KDockMainWindow(parent, name),
m_viewNumber( -1),
m_viewLocalPropertyPrefix(makeViewLocalPropertyPrefix()),
m_config(kapp->config()),
diff --git a/src/gui/general/EditViewBase.h b/src/gui/general/EditViewBase.h
index 9d18d3b..aaf6dbe 100644
--- a/src/gui/general/EditViewBase.h
+++ b/src/gui/general/EditViewBase.h
@@ -73,7 +73,7 @@ public:
EditViewBase(RosegardenGUIDoc *doc,
std::vector<Segment *> segments,
unsigned int cols,
- TQWidget *tqparent,
+ TQWidget *parent,
const char *name = 0);
virtual ~EditViewBase();
diff --git a/src/gui/general/PixmapFunctions.cpp b/src/gui/general/PixmapFunctions.cpp
index 50dff1a..7bd8b2f 100644
--- a/src/gui/general/PixmapFunctions.cpp
+++ b/src/gui/general/PixmapFunctions.cpp
@@ -127,8 +127,8 @@ PixmapFunctions::colourPixmap(const TQPixmap &map, int hue, int minValue)
TQPixmap rmap;
rmap.convertFromImage(image);
- if (map.tqmask())
- rmap.setMask(*map.tqmask());
+ if (map.mask())
+ rmap.setMask(*map.mask());
return rmap;
}
@@ -156,8 +156,8 @@ PixmapFunctions::shadePixmap(const TQPixmap &map)
TQPixmap rmap;
rmap.convertFromImage(image);
- if (map.tqmask())
- rmap.setMask(*map.tqmask());
+ if (map.mask())
+ rmap.setMask(*map.mask());
return rmap;
}
@@ -168,8 +168,8 @@ PixmapFunctions::flipVertical(const TQPixmap &map)
TQImage i(map.convertToImage());
rmap.convertFromImage(i.mirror(false, true));
- if (map.tqmask()) {
- TQImage im(map.tqmask()->convertToImage());
+ if (map.mask()) {
+ TQImage im(map.mask()->convertToImage());
TQBitmap newMask;
newMask.convertFromImage(im.mirror(false, true));
rmap.setMask(newMask);
@@ -185,8 +185,8 @@ PixmapFunctions::flipHorizontal(const TQPixmap &map)
TQImage i(map.convertToImage());
rmap.convertFromImage(i.mirror(true, false));
- if (map.tqmask()) {
- TQImage im(map.tqmask()->convertToImage());
+ if (map.mask()) {
+ TQImage im(map.mask()->convertToImage());
TQBitmap newMask;
newMask.convertFromImage(im.mirror(true, false));
rmap.setMask(newMask);
@@ -211,7 +211,7 @@ PixmapFunctions::splitPixmap(const TQPixmap &pixmap, int x)
paint.end();
paint.begin(&leftMask);
- paint.drawPixmap(0, 0, *pixmap.tqmask(), 0, 0, left.width(), left.height());
+ paint.drawPixmap(0, 0, *pixmap.mask(), 0, 0, left.width(), left.height());
paint.end();
left.setMask(leftMask);
@@ -221,7 +221,7 @@ PixmapFunctions::splitPixmap(const TQPixmap &pixmap, int x)
paint.end();
paint.begin(&rightMask);
- paint.drawPixmap(0, 0, *pixmap.tqmask(), left.width(), 0, right.width(), right.height());
+ paint.drawPixmap(0, 0, *pixmap.mask(), left.width(), 0, right.width(), right.height());
paint.end();
right.setMask(rightMask);
@@ -237,7 +237,7 @@ PixmapFunctions::drawPixmapMasked(TQPixmap &dest, TQBitmap &destMask,
TQImage idp(dest.convertToImage());
TQImage idm(destMask.convertToImage());
TQImage isp(src.convertToImage());
- TQImage ism(src.tqmask()->convertToImage());
+ TQImage ism(src.mask()->convertToImage());
for (int y = 0; y < isp.height(); ++y) {
for (int x = 0; x < isp.width(); ++x) {
diff --git a/src/gui/general/PixmapFunctions.h b/src/gui/general/PixmapFunctions.h
index 8a84813..4564573 100644
--- a/src/gui/general/PixmapFunctions.h
+++ b/src/gui/general/PixmapFunctions.h
@@ -40,8 +40,8 @@ class PixmapFunctions
{
public:
/**
- * Generate a heuristic tqmask for the given pixmap. Unlike
- * TQPixmap::createHeuristicMask, this removes from the tqmask all
+ * Generate a heuristic mask for the given pixmap. Unlike
+ * TQPixmap::createHeuristicMask, this removes from the mask all
* pixels that are apparently "background" even if they appear in
* holes in the middle of the image. This is more usually what we
* want than the default behaviour of createHeuristicMask.
@@ -53,8 +53,8 @@ public:
static TQBitmap generateMask(const TQPixmap &map, const TQRgb &rgb);
/**
- * Generate a heuristic tqmask for the given pixmap. Unlike
- * TQPixmap::createHeuristicMask, this removes from the tqmask all
+ * Generate a heuristic mask for the given pixmap. Unlike
+ * TQPixmap::createHeuristicMask, this removes from the mask all
* pixels that are apparently "background" even if they appear in
* holes in the middle of the image. This is more usually what we
* want than the default behaviour of createHeuristicMask.
@@ -78,10 +78,10 @@ public:
*/
static TQPixmap shadePixmap(const TQPixmap &map);
- /// Return a TQPixmap that is a mirror image of map (including tqmask)
+ /// Return a TQPixmap that is a mirror image of map (including mask)
static TQPixmap flipVertical(const TQPixmap &map);
- /// Return a TQPixmap that is a mirror image of map (including tqmask)
+ /// Return a TQPixmap that is a mirror image of map (including mask)
static TQPixmap flipHorizontal(const TQPixmap &map);
/// Return left and right parts of the TQPixmap
@@ -89,12 +89,12 @@ public:
/**
* Using TQPainter::drawPixmap to draw one pixmap on another does
- * not appear to take the tqmask into account properly. Background
+ * not appear to take the mask into account properly. Background
* pixels in the second pixmap erase foreground pixels in the
* first one, regardless of whether they're masked or not. This
* function does what I expect.
*
- * Note that the source pixmap _must_ have a tqmask.
+ * Note that the source pixmap _must_ have a mask.
*/
static void drawPixmapMasked(TQPixmap &dest, TQBitmap &destMask,
int x, int y,
diff --git a/src/gui/general/PresetHandlerDialog.cpp b/src/gui/general/PresetHandlerDialog.cpp
index a4144f0..9d9c897 100644
--- a/src/gui/general/PresetHandlerDialog.cpp
+++ b/src/gui/general/PresetHandlerDialog.cpp
@@ -52,8 +52,8 @@
namespace Rosegarden
{
-PresetHandlerDialog::PresetHandlerDialog(TQWidget *tqparent, bool fromNotation)
- : KDialogBase(tqparent, "presethandlerdialog", true, i18n("Load track parameters preset"), Ok | Cancel, Ok),
+PresetHandlerDialog::PresetHandlerDialog(TQWidget *parent, bool fromNotation)
+ : KDialogBase(parent, "presethandlerdialog", true, i18n("Load track parameters preset"), Ok | Cancel, Ok),
m_config(kapp->config()),
m_fromNotation(fromNotation)
{
diff --git a/src/gui/general/PresetHandlerDialog.h b/src/gui/general/PresetHandlerDialog.h
index c28e85a..685f980 100644
--- a/src/gui/general/PresetHandlerDialog.h
+++ b/src/gui/general/PresetHandlerDialog.h
@@ -52,7 +52,7 @@ class PresetHandlerDialog : public KDialogBase
public:
- PresetHandlerDialog(TQWidget* tqparent, bool fromNotation = false);
+ PresetHandlerDialog(TQWidget* parent, bool fromNotation = false);
~PresetHandlerDialog();
PresetGroup *m_presets;
diff --git a/src/gui/general/ProgressReporter.cpp b/src/gui/general/ProgressReporter.cpp
index 94fbb40..3fdfacc 100644
--- a/src/gui/general/ProgressReporter.cpp
+++ b/src/gui/general/ProgressReporter.cpp
@@ -31,8 +31,8 @@
namespace Rosegarden
{
-ProgressReporter::ProgressReporter(TQObject* tqparent, const char* name)
- : TQObject(tqparent, name), m_isCancelled(false)
+ProgressReporter::ProgressReporter(TQObject* parent, const char* name)
+ : TQObject(parent, name), m_isCancelled(false)
{}
diff --git a/src/gui/general/ProgressReporter.h b/src/gui/general/ProgressReporter.h
index 7039e92..6d2f18f 100644
--- a/src/gui/general/ProgressReporter.h
+++ b/src/gui/general/ProgressReporter.h
@@ -41,7 +41,7 @@ class ProgressReporter : public TQObject
Q_OBJECT
TQ_OBJECT
public:
- ProgressReporter(TQObject* tqparent, const char* name = 0);
+ ProgressReporter(TQObject* parent, const char* name = 0);
// exception class for cancellations
class Cancelled { };
diff --git a/src/gui/general/RosegardenCanvasView.cpp b/src/gui/general/RosegardenCanvasView.cpp
index 0798140..a806e8a 100644
--- a/src/gui/general/RosegardenCanvasView.cpp
+++ b/src/gui/general/RosegardenCanvasView.cpp
@@ -42,9 +42,9 @@ namespace Rosegarden
{
RosegardenCanvasView::RosegardenCanvasView(TQCanvas* canvas,
- TQWidget* tqparent,
+ TQWidget* parent,
const char* name, WFlags f)
- : TQCanvasView(canvas, tqparent, name, f),
+ : TQCanvasView(canvas, parent, name, f),
m_bottomWidget(0),
m_currentBottomWidgetHeight( -1),
m_leftWidget(0),
diff --git a/src/gui/general/RosegardenCanvasView.h b/src/gui/general/RosegardenCanvasView.h
index 02faef2..01bca28 100644
--- a/src/gui/general/RosegardenCanvasView.h
+++ b/src/gui/general/RosegardenCanvasView.h
@@ -43,7 +43,7 @@ namespace Rosegarden
/**
* A TQCanvasView with an auxiliary horiz. scrollbar
- * That scrollbar should be provided by the tqparent widget
+ * That scrollbar should be provided by the parent widget
* (typically an EditView). The RosegardenCanvasView keeps
* the auxilliary horiz. scrollbar range in sync with the
* one of its own scrollbar with slotUpdate().
@@ -55,7 +55,7 @@ class RosegardenCanvasView : public TQCanvasView
TQ_OBJECT
public:
RosegardenCanvasView(TQCanvas*,
- TQWidget* tqparent=0, const char* name=0, WFlags f=0);
+ TQWidget* parent=0, const char* name=0, WFlags f=0);
/**
* EditTool::handleMouseMove() returns a OR-ed combination of these
diff --git a/src/gui/general/RosegardenScrollView.cpp b/src/gui/general/RosegardenScrollView.cpp
index cc73afb..815ab6b 100644
--- a/src/gui/general/RosegardenScrollView.cpp
+++ b/src/gui/general/RosegardenScrollView.cpp
@@ -49,9 +49,9 @@ const int RosegardenScrollView::InitialScrollAccel = 5;
const int RosegardenScrollView::MaxScrollDelta = 100; // max a.scroll speed
const double RosegardenScrollView::ScrollAccelValue = 1.04;// acceleration rate
-RosegardenScrollView::RosegardenScrollView(TQWidget* tqparent,
+RosegardenScrollView::RosegardenScrollView(TQWidget* parent,
const char* name, WFlags f)
- : TQScrollView(tqparent, name, f),
+ : TQScrollView(parent, name, f),
m_bottomWidget(0),
m_currentBottomWidgetHeight( -1),
m_smoothScroll(true),
diff --git a/src/gui/general/RosegardenScrollView.h b/src/gui/general/RosegardenScrollView.h
index 14744ee..e9fbf70 100644
--- a/src/gui/general/RosegardenScrollView.h
+++ b/src/gui/general/RosegardenScrollView.h
@@ -53,7 +53,7 @@ class RosegardenScrollView : public TQScrollView
Q_OBJECT
TQ_OBJECT
public:
- RosegardenScrollView(TQWidget* tqparent=0, const char* name=0, WFlags f=0);
+ RosegardenScrollView(TQWidget* parent=0, const char* name=0, WFlags f=0);
/**
* EditTool::handleMouseMove() returns a OR-ed combination of these
diff --git a/src/gui/kdeext/KLedButton.cpp b/src/gui/kdeext/KLedButton.cpp
index 03945b0..3e2f460 100644
--- a/src/gui/kdeext/KLedButton.cpp
+++ b/src/gui/kdeext/KLedButton.cpp
@@ -36,13 +36,13 @@
namespace Rosegarden
{
-KLedButton::KLedButton(const TQColor &col, TQWidget *tqparent, const char *name)
- : KLed( col, tqparent, name )
+KLedButton::KLedButton(const TQColor &col, TQWidget *parent, const char *name)
+ : KLed( col, parent, name )
{}
KLedButton::KLedButton(const TQColor& col, KLed::State st, KLed::Look look,
- KLed::Shape tqshape, TQWidget *tqparent, const char *name)
- : KLed( col, st, look, tqshape, tqparent, name )
+ KLed::Shape tqshape, TQWidget *parent, const char *name)
+ : KLed( col, st, look, tqshape, parent, name )
{}
KLedButton::~KLedButton()
diff --git a/src/gui/kdeext/KLedButton.h b/src/gui/kdeext/KLedButton.h
index 3bd8c5c..197f96b 100644
--- a/src/gui/kdeext/KLedButton.h
+++ b/src/gui/kdeext/KLedButton.h
@@ -51,9 +51,9 @@ class KLedButton : public KLed {
Q_OBJECT
TQ_OBJECT
public:
- KLedButton(const TQColor &col=TQt::green, TQWidget *tqparent=0, const char *name=0);
+ KLedButton(const TQColor &col=TQt::green, TQWidget *parent=0, const char *name=0);
KLedButton(const TQColor& col, KLed::State st, KLed::Look look, KLed::Shape tqshape,
- TQWidget *tqparent=0, const char *name=0);
+ TQWidget *parent=0, const char *name=0);
~KLedButton();
signals:
diff --git a/src/gui/kdeext/KStartupLogo.cpp b/src/gui/kdeext/KStartupLogo.cpp
index 689c657..f368d96 100644
--- a/src/gui/kdeext/KStartupLogo.cpp
+++ b/src/gui/kdeext/KStartupLogo.cpp
@@ -36,8 +36,8 @@
#include "KStartupLogo.h"
#include "misc/Debug.h"
-KStartupLogo::KStartupLogo(TQWidget * tqparent, const char *name)
- : TQWidget(tqparent, name,
+KStartupLogo::KStartupLogo(TQWidget * parent, const char *name)
+ : TQWidget(parent, name,
WStyle_Customize |
WStyle_Splash
),
diff --git a/src/gui/kdeext/KStartupLogo.h b/src/gui/kdeext/KStartupLogo.h
index 154a749..04e6f73 100644
--- a/src/gui/kdeext/KStartupLogo.h
+++ b/src/gui/kdeext/KStartupLogo.h
@@ -47,7 +47,7 @@ public slots:
protected:
- KStartupLogo(TQWidget *tqparent=0, const char *name=0);
+ KStartupLogo(TQWidget *parent=0, const char *name=0);
~KStartupLogo();
virtual void paintEvent(TQPaintEvent*);
diff --git a/src/gui/kdeext/RGLed.cpp b/src/gui/kdeext/RGLed.cpp
index 9d34dcb..3ffa38a 100644
--- a/src/gui/kdeext/RGLed.cpp
+++ b/src/gui/kdeext/RGLed.cpp
@@ -81,7 +81,7 @@
*
* Revision 1.14 2000/06/03 01:04:42 gehrmab
* * Made drawing routines available for overriding
- * * Added a tqparent/name constructor
+ * * Added a parent/name constructor
* * Propertyfication
*
* Revision 1.13 2000/05/08 19:38:49 sschiman
@@ -156,8 +156,8 @@ class KLed::KLedPrivate
-KLed::KLed(TQWidget *tqparent, const char *name)
- : TQWidget( tqparent, name),
+KLed::KLed(TQWidget *parent, const char *name)
+ : TQWidget( parent, name),
led_state(On),
led_look(Raised),
led_tqshape(Circular)
@@ -173,8 +173,8 @@ KLed::KLed(TQWidget *tqparent, const char *name)
}
-KLed::KLed(const TQColor& col, TQWidget *tqparent, const char *name)
- : TQWidget( tqparent, name),
+KLed::KLed(const TQColor& col, TQWidget *parent, const char *name)
+ : TQWidget( parent, name),
led_state(On),
led_look(Raised),
led_tqshape(Circular)
@@ -190,8 +190,8 @@ KLed::KLed(const TQColor& col, TQWidget *tqparent, const char *name)
}
KLed::KLed(const TQColor& col, KLed::State state,
- KLed::Look look, KLed::Shape tqshape, TQWidget *tqparent, const char *name )
- : TQWidget(tqparent, name),
+ KLed::Look look, KLed::Shape tqshape, TQWidget *parent, const char *name )
+ : TQWidget(parent, name),
led_state(state),
led_look(look),
led_tqshape(tqshape)
diff --git a/src/gui/kdeext/klearlook.cpp b/src/gui/kdeext/klearlook.cpp
index 17d37ad..adfe33e 100644
--- a/src/gui/kdeext/klearlook.cpp
+++ b/src/gui/kdeext/klearlook.cpp
@@ -664,38 +664,38 @@ void KlearlookStyle::unPolish( TQWidget *widget ) {
}
bool KlearlookStyle::eventFilter( TQObject *object, TQEvent *event ) {
- if ( object->tqparent() && 0 == qstrcmp( object->name(), kdeToolbarWidget ) ) {
+ if ( object->parent() && 0 == qstrcmp( object->name(), kdeToolbarWidget ) ) {
// Draw background for custom widgets in the toolbar that have specified a "kde toolbar widget" name.
if ( TQEvent::Paint == event->type() ) {
TQWidget * widget = TQT_TQWIDGET( object ),
- *tqparent = TQT_TQWIDGET( object->tqparent() );
+ *parent = TQT_TQWIDGET( object->parent() );
#ifdef TQTC_GRADIENT_TOOLBARS_AND_MENUBARS
// Find the top-level toolbar of this widget, since it may be nested in other
// widgets that are on the toolbar.
int x_offset = widget->x(),
y_offset = widget->y();
- while ( tqparent && tqparent->tqparent() && !qstrcmp( tqparent->name(), kdeToolbarWidget ) ) {
- x_offset += tqparent->x();
- y_offset += tqparent->y();
- tqparent = TQT_TQWIDGET( tqparent->tqparent() );
+ while ( parent && parent->parent() && !qstrcmp( parent->name(), kdeToolbarWidget ) ) {
+ x_offset += parent->x();
+ y_offset += parent->y();
+ parent = TQT_TQWIDGET( parent->parent() );
}
- TQRect pr( tqparent->rect() );
+ TQRect pr( parent->rect() );
bool horiz_grad = pr.width() < pr.height();
- // Check if the tqparent is a TQToolbar, and use its orientation, else guess.
- TQToolBar *toolbar = dynamic_cast<TQToolBar*>( tqparent );
+ // Check if the parent is a TQToolbar, and use its orientation, else guess.
+ TQToolBar *toolbar = dynamic_cast<TQToolBar*>( parent );
if ( toolbar )
horiz_grad = toolbar->orientation() == TQt::Vertical;
- drawBevelGradient( tqparent->tqcolorGroup().background(), true, 1, &TQPainter( widget ),
+ drawBevelGradient( parent->tqcolorGroup().background(), true, 1, &TQPainter( widget ),
TQRect( x_offset, y_offset, pr.width(), pr.height() ),
horiz_grad, SHADE_BAR_LIGHT, SHADE_BAR_DARK );
#else
- TQPainter( widget ).fillRect( widget->rect(), tqparent->tqcolorGroup().background() );
+ TQPainter( widget ).fillRect( widget->rect(), parent->tqcolorGroup().background() );
#endif
return false; // Now draw the contents
@@ -1478,8 +1478,8 @@ void KlearlookStyle::tqdrawPrimitive( TQ_PrimitiveElement pe, TQPainter *p, cons
: lv->tqpalette().color( TQPalette::Disabled, TQColorGroup::Text ) ) );
if ( flags & Style_Selected && !lv->rootIsDecorated() &&
- !( ( item->tqparent() && 1 == item->tqparent() ->rtti() &&
- TQCheckListItem::Controller == ( ( TQCheckListItem* ) item->tqparent() ) ->type() ) )) {
+ !( ( item->parent() && 1 == item->parent() ->rtti() &&
+ TQCheckListItem::Controller == ( ( TQCheckListItem* ) item->parent() ) ->type() ) )) {
p->fillRect( 0, 0, x + marg + w + 4, item->height(),
cg.brush( TQColorGroup::Highlight ) );
if ( item->isEnabled() )
@@ -1504,9 +1504,9 @@ void KlearlookStyle::tqdrawPrimitive( TQ_PrimitiveElement pe, TQPainter *p, cons
if ( flags & Style_Selected ) {
flags -= Style_Selected;
if ( !lv->rootIsDecorated() &&
- !( ( item->tqparent() && 1 == item->tqparent() ->rtti() &&
+ !( ( item->parent() && 1 == item->parent() ->rtti() &&
TQCheckListItem::Controller ==
- ( ( TQCheckListItem* ) item->tqparent() ) ->type() ) ) ) {
+ ( ( TQCheckListItem* ) item->parent() ) ->type() ) ) ) {
p->fillRect( 0, 0, r.x() + lv->itemMargin() + r.width() + 4, item->height(),
cg.brush( TQColorGroup::Highlight ) );
if ( item->isEnabled() ) {
@@ -2212,8 +2212,8 @@ void KlearlookStyle::tqdrawControl(
bool cornerWidget = false,
firstTab = 0 == tb->indexOf( data.tab() ->identifier() );
- if ( ::tqqt_cast<const TQTabWidget *>( tb->tqparent() ) ) {
- const TQTabWidget * tw = ( const TQTabWidget* ) tb->tqparent();
+ if ( ::tqqt_cast<const TQTabWidget *>( tb->parent() ) ) {
+ const TQTabWidget * tw = ( const TQTabWidget* ) tb->parent();
// is there a corner widget in the (top) left edge?
if ( tw->cornerWidget( TQt::TopLeft ) )
@@ -3127,22 +3127,22 @@ void KlearlookStyle::tqdrawComplexControl(
!toolbutton->parentWidget() ->backgroundPixmap() ->isNull() ) {
p->drawTiledPixmap( r,
*( toolbutton->parentWidget() ->backgroundPixmap() ), toolbutton->pos() );
- } else if ( widget->tqparent() ) {
- if ( ::tqqt_cast<const TQToolBar *>( widget->tqparent() ) ) {
- TQToolBar * tqparent = ( TQToolBar* ) widget->tqparent();
+ } else if ( widget->parent() ) {
+ if ( ::tqqt_cast<const TQToolBar *>( widget->parent() ) ) {
+ TQToolBar * parent = ( TQToolBar* ) widget->parent();
#ifdef TQTC_GRADIENT_TOOLBARS_AND_MENUBARS
if ( APPEARANCE_FLAT != appearance )
drawBevelGradient( cg.background(), true, 0,
- p, tqparent->rect(), true, SHADE_BAR_LIGHT, SHADE_BAR_DARK );
+ p, parent->rect(), true, SHADE_BAR_LIGHT, SHADE_BAR_DARK );
else
#endif
- p->fillRect( tqparent->rect(), cg.background() );
- } else if ( widget->tqparent() ->inherits( "TQToolBarExtensionWidget" ) ) {
- TQWidget * tqparent = ( TQWidget* ) widget->tqparent();
- TQToolBar *toolbar = ( TQToolBar* ) tqparent->tqparent();
+ p->fillRect( parent->rect(), cg.background() );
+ } else if ( widget->parent() ->inherits( "TQToolBarExtensionWidget" ) ) {
+ TQWidget * parent = ( TQWidget* ) widget->parent();
+ TQToolBar *toolbar = ( TQToolBar* ) parent->parent();
#ifdef TQTC_GRADIENT_TOOLBARS_AND_MENUBARS
@@ -3555,7 +3555,7 @@ TQSize KlearlookStyle::tqsizeFromContents( ContentsType t,
}
case CT_ToolButton: {
- if ( widget->tqparent() && ::tqqt_cast<TQToolBar*>( widget->tqparent() ) )
+ if ( widget->parent() && ::tqqt_cast<TQToolBar*>( widget->parent() ) )
return TQSize( s.width() + 2 * 4, s.height() + 2 * 4 );
else {
return KStyle::tqsizeFromContents ( t, widget, s, opt );
diff --git a/src/gui/rulers/ChordNameRuler.cpp b/src/gui/rulers/ChordNameRuler.cpp
index 121d911..91dde1d 100644
--- a/src/gui/rulers/ChordNameRuler.cpp
+++ b/src/gui/rulers/ChordNameRuler.cpp
@@ -62,9 +62,9 @@ ChordNameRuler::ChordNameRuler(RulerScale *rulerScale,
RosegardenGUIDoc *doc,
double xorigin,
int height,
- TQWidget *tqparent,
+ TQWidget *parent,
const char *name) :
- TQWidget(tqparent, name),
+ TQWidget(parent, name),
m_xorigin(xorigin),
m_height(height),
m_currentXOffset(0),
@@ -103,9 +103,9 @@ ChordNameRuler::ChordNameRuler(RulerScale *rulerScale,
std::vector<Segment *> &segments,
double xorigin,
int height,
- TQWidget *tqparent,
+ TQWidget *parent,
const char *name) :
- TQWidget(tqparent, name),
+ TQWidget(parent, name),
m_xorigin(xorigin),
m_height(height),
m_currentXOffset(0),
diff --git a/src/gui/rulers/ChordNameRuler.h b/src/gui/rulers/ChordNameRuler.h
index 1b77ae0..54efd7c 100644
--- a/src/gui/rulers/ChordNameRuler.h
+++ b/src/gui/rulers/ChordNameRuler.h
@@ -70,7 +70,7 @@ public:
RosegardenGUIDoc *doc,
double xorigin = 0.0,
int height = 0,
- TQWidget* tqparent = 0,
+ TQWidget* parent = 0,
const char *name = 0);
/**
@@ -84,7 +84,7 @@ public:
std::vector<Segment *> &segments,
double xorigin = 0.0,
int height = 0,
- TQWidget* tqparent = 0,
+ TQWidget* parent = 0,
const char *name = 0);
~ChordNameRuler();
diff --git a/src/gui/rulers/ControlRuler.cpp b/src/gui/rulers/ControlRuler.cpp
index 469bf1b..94c66e8 100644
--- a/src/gui/rulers/ControlRuler.cpp
+++ b/src/gui/rulers/ControlRuler.cpp
@@ -63,9 +63,9 @@ const int ControlRuler::ItemHeightRange = 64;
ControlRuler::ControlRuler(Segment *segment,
RulerScale* rulerScale,
EditViewBase* parentView,
- TQCanvas* c, TQWidget* tqparent,
+ TQCanvas* c, TQWidget* parent,
const char* name, WFlags f) :
- RosegardenCanvasView(c, tqparent, name, f),
+ RosegardenCanvasView(c, parent, name, f),
m_parentEditView(parentView),
m_mainHorizontalScrollBar(0),
m_rulerScale(rulerScale),
@@ -402,7 +402,7 @@ void ControlRuler::createMenu()
RG_DEBUG << "ControlRuler::createMenu() failed\n";
}
} else {
- RG_DEBUG << "ControlRuler::createMenu() failed: no tqparent factory\n";
+ RG_DEBUG << "ControlRuler::createMenu() failed: no parent factory\n";
}
}
diff --git a/src/gui/rulers/ControlRuler.h b/src/gui/rulers/ControlRuler.h
index 8df6da1..8c8c833 100644
--- a/src/gui/rulers/ControlRuler.h
+++ b/src/gui/rulers/ControlRuler.h
@@ -72,7 +72,7 @@ public:
RulerScale*,
EditViewBase* parentView,
TQCanvas*,
- TQWidget* tqparent=0, const char* name=0, WFlags f=0);
+ TQWidget* parent=0, const char* name=0, WFlags f=0);
virtual ~ControlRuler();
virtual TQString getName() = 0;
diff --git a/src/gui/rulers/ControlSelector.cpp b/src/gui/rulers/ControlSelector.cpp
index 7f36234..15e2814 100644
--- a/src/gui/rulers/ControlSelector.cpp
+++ b/src/gui/rulers/ControlSelector.cpp
@@ -29,9 +29,9 @@
namespace Rosegarden {
-ControlSelector::ControlSelector(ControlRuler* tqparent)
- : TQObject(tqparent),
- m_ruler(tqparent)
+ControlSelector::ControlSelector(ControlRuler* parent)
+ : TQObject(parent),
+ m_ruler(parent)
{
}
diff --git a/src/gui/rulers/ControlSelector.h b/src/gui/rulers/ControlSelector.h
index 8ad1917..9df2425 100644
--- a/src/gui/rulers/ControlSelector.h
+++ b/src/gui/rulers/ControlSelector.h
@@ -41,7 +41,7 @@ namespace Rosegarden {
class ControlSelector : public TQObject
{
public:
- ControlSelector(ControlRuler* tqparent);
+ ControlSelector(ControlRuler* parent);
virtual ~ControlSelector() {};
virtual void handleMouseButtonPress(TQMouseEvent *e);
diff --git a/src/gui/rulers/ControllerEventsRuler.cpp b/src/gui/rulers/ControllerEventsRuler.cpp
index acbdc65..a6a7d2f 100644
--- a/src/gui/rulers/ControllerEventsRuler.cpp
+++ b/src/gui/rulers/ControllerEventsRuler.cpp
@@ -59,10 +59,10 @@ ControllerEventsRuler::ControllerEventsRuler(Segment *segment,
RulerScale* rulerScale,
EditViewBase* parentView,
TQCanvas* c,
- TQWidget* tqparent,
+ TQWidget* parent,
const ControlParameter *controller,
const char* name, WFlags f)
- : ControlRuler(segment, rulerScale, parentView, c, tqparent, name, f),
+ : ControlRuler(segment, rulerScale, parentView, c, parent, name, f),
m_defaultItemWidth(20),
m_controlLine(new TQCanvasLine(canvas())),
m_controlLineShowing(false),
diff --git a/src/gui/rulers/ControllerEventsRuler.h b/src/gui/rulers/ControllerEventsRuler.h
index 56a858e..fc1d1f6 100644
--- a/src/gui/rulers/ControllerEventsRuler.h
+++ b/src/gui/rulers/ControllerEventsRuler.h
@@ -58,7 +58,7 @@ public:
RulerScale*,
EditViewBase* parentView,
TQCanvas*,
- TQWidget* tqparent=0,
+ TQWidget* parent=0,
const ControlParameter *controller = 0,
const char* name=0, WFlags f=0);
diff --git a/src/gui/rulers/LoopRuler.cpp b/src/gui/rulers/LoopRuler.cpp
index 2d84890..885d7fc 100644
--- a/src/gui/rulers/LoopRuler.cpp
+++ b/src/gui/rulers/LoopRuler.cpp
@@ -51,9 +51,9 @@ LoopRuler::LoopRuler(RosegardenGUIDoc *doc,
int height,
double xorigin,
bool invert,
- TQWidget *tqparent,
+ TQWidget *parent,
const char *name) :
- TQWidget(tqparent, name),
+ TQWidget(parent, name),
m_doc(doc),
m_height(height),
m_xorigin(xorigin),
diff --git a/src/gui/rulers/LoopRuler.h b/src/gui/rulers/LoopRuler.h
index ac397fe..1d1fb19 100644
--- a/src/gui/rulers/LoopRuler.h
+++ b/src/gui/rulers/LoopRuler.h
@@ -62,7 +62,7 @@ public:
int height = 0,
double xorigin = 0.0,
bool invert = false,
- TQWidget* tqparent = 0,
+ TQWidget* parent = 0,
const char *name = 0);
~LoopRuler();
diff --git a/src/gui/rulers/MarkerRuler.cpp b/src/gui/rulers/MarkerRuler.cpp
index f20cc73..749dfef 100644
--- a/src/gui/rulers/MarkerRuler.cpp
+++ b/src/gui/rulers/MarkerRuler.cpp
@@ -61,10 +61,10 @@ MarkerRuler::MarkerRuler(RosegardenGUIDoc *doc,
RulerScale *rulerScale,
int barHeight,
double xorigin,
- TQWidget* tqparent,
+ TQWidget* parent,
const char* name,
WFlags f)
- : TQWidget(tqparent, name, f),
+ : TQWidget(parent, name, f),
m_barHeight(barHeight),
m_xorigin(xorigin),
m_currentXOffset(0),
@@ -73,15 +73,15 @@ MarkerRuler::MarkerRuler(RosegardenGUIDoc *doc,
m_menu(0),
m_doc(doc),
m_rulerScale(rulerScale),
- m_parentMainWindow(dynamic_cast<KMainWindow*>(doc->tqparent()))
+ m_parentMainWindow(dynamic_cast<KMainWindow*>(doc->parent()))
{
- // If the tqparent window has a main window above it, we need to use
- // that as the tqparent main window, not the document's tqparent.
+ // If the parent window has a main window above it, we need to use
+ // that as the parent main window, not the document's parent.
// Otherwise we'll end up adding all actions to the same
// (document-level) action collection regardless of which window
// we're in.
- TQObject *probe = TQT_TQOBJECT(tqparent);
- while (probe && !dynamic_cast<KMainWindow *>(probe)) probe = probe->tqparent();
+ TQObject *probe = TQT_TQOBJECT(parent);
+ while (probe && !dynamic_cast<KMainWindow *>(probe)) probe = probe->parent();
if (probe) m_parentMainWindow = dynamic_cast<KMainWindow *>(probe);
// m_barFont = new TQFont("helvetica", 12);
diff --git a/src/gui/rulers/MarkerRuler.h b/src/gui/rulers/MarkerRuler.h
index 0dda828..748108c 100644
--- a/src/gui/rulers/MarkerRuler.h
+++ b/src/gui/rulers/MarkerRuler.h
@@ -57,7 +57,7 @@ public:
RulerScale *rulerScale,
int buttonHeight,
double xorigin = 0.0,
- TQWidget* tqparent = 0,
+ TQWidget* parent = 0,
const char* name = 0,
WFlags f=0);
diff --git a/src/gui/rulers/PercussionPitchRuler.cpp b/src/gui/rulers/PercussionPitchRuler.cpp
index e72cf4e..16b9558 100644
--- a/src/gui/rulers/PercussionPitchRuler.cpp
+++ b/src/gui/rulers/PercussionPitchRuler.cpp
@@ -44,10 +44,10 @@
namespace Rosegarden
{
-PercussionPitchRuler::PercussionPitchRuler(TQWidget *tqparent,
+PercussionPitchRuler::PercussionPitchRuler(TQWidget *parent,
const MidiKeyMapping *mapping,
int lineSpacing) :
- PitchRuler(tqparent),
+ PitchRuler(parent),
m_mapping(mapping),
m_lineSpacing(lineSpacing),
m_mouseDown(false),
diff --git a/src/gui/rulers/PercussionPitchRuler.h b/src/gui/rulers/PercussionPitchRuler.h
index 53d1adc..0bb05db 100644
--- a/src/gui/rulers/PercussionPitchRuler.h
+++ b/src/gui/rulers/PercussionPitchRuler.h
@@ -49,7 +49,7 @@ class PercussionPitchRuler : public PitchRuler
Q_OBJECT
TQ_OBJECT
public:
- PercussionPitchRuler(TQWidget *tqparent,
+ PercussionPitchRuler(TQWidget *parent,
const MidiKeyMapping *mapping,
int lineSpacing);
diff --git a/src/gui/rulers/PitchRuler.cpp b/src/gui/rulers/PitchRuler.cpp
index b771c18..117fb87 100644
--- a/src/gui/rulers/PitchRuler.cpp
+++ b/src/gui/rulers/PitchRuler.cpp
@@ -33,8 +33,8 @@ namespace Rosegarden
{
PitchRuler::
-PitchRuler(TQWidget *tqparent) :
- TQWidget(tqparent)
+PitchRuler(TQWidget *parent) :
+ TQWidget(parent)
{
// nothing else
}
diff --git a/src/gui/rulers/PitchRuler.h b/src/gui/rulers/PitchRuler.h
index fd07bdf..9e6bd19 100644
--- a/src/gui/rulers/PitchRuler.h
+++ b/src/gui/rulers/PitchRuler.h
@@ -42,7 +42,7 @@ class PitchRuler : public TQWidget
Q_OBJECT
TQ_OBJECT
public:
- PitchRuler(TQWidget *tqparent);
+ PitchRuler(TQWidget *parent);
virtual TQSize tqsizeHint() const;
virtual TQSize tqminimumSizeHint() const;
diff --git a/src/gui/rulers/PropertyBox.cpp b/src/gui/rulers/PropertyBox.cpp
index 1a21dcf..06880c1 100644
--- a/src/gui/rulers/PropertyBox.cpp
+++ b/src/gui/rulers/PropertyBox.cpp
@@ -38,9 +38,9 @@ namespace Rosegarden
PropertyBox::PropertyBox(TQString label,
int width,
int height,
- TQWidget *tqparent,
+ TQWidget *parent,
const char *name):
- TQWidget(tqparent, name),
+ TQWidget(parent, name),
m_label(label),
m_width(width),
m_height(height)
diff --git a/src/gui/rulers/PropertyBox.h b/src/gui/rulers/PropertyBox.h
index 2b26428..9df80aa 100644
--- a/src/gui/rulers/PropertyBox.h
+++ b/src/gui/rulers/PropertyBox.h
@@ -53,7 +53,7 @@ public:
PropertyBox(TQString label,
int width,
int height,
- TQWidget *tqparent=0,
+ TQWidget *parent=0,
const char *name = 0);
virtual TQSize tqsizeHint() const;
diff --git a/src/gui/rulers/PropertyControlRuler.cpp b/src/gui/rulers/PropertyControlRuler.cpp
index e832907..ddfe3fe 100644
--- a/src/gui/rulers/PropertyControlRuler.cpp
+++ b/src/gui/rulers/PropertyControlRuler.cpp
@@ -55,10 +55,10 @@ PropertyControlRuler::PropertyControlRuler(PropertyName propertyName,
Staff* staff,
RulerScale* rulerScale,
EditViewBase* parentView,
- TQCanvas* c, TQWidget* tqparent,
+ TQCanvas* c, TQWidget* parent,
const char* name, WFlags f) :
ControlRuler(&(staff->getSegment()), rulerScale,
- parentView, c, tqparent, name, f),
+ parentView, c, parent, name, f),
m_propertyName(propertyName),
m_staff(staff),
m_propertyLine(new TQCanvasLine(canvas())),
diff --git a/src/gui/rulers/PropertyControlRuler.h b/src/gui/rulers/PropertyControlRuler.h
index 704fabe..db1d698 100644
--- a/src/gui/rulers/PropertyControlRuler.h
+++ b/src/gui/rulers/PropertyControlRuler.h
@@ -62,7 +62,7 @@ public:
RulerScale*,
EditViewBase* parentView,
TQCanvas*,
- TQWidget* tqparent=0, const char* name=0, WFlags f=0);
+ TQWidget* parent=0, const char* name=0, WFlags f=0);
virtual ~PropertyControlRuler();
diff --git a/src/gui/rulers/PropertyViewRuler.cpp b/src/gui/rulers/PropertyViewRuler.cpp
index e871f16..8998049 100644
--- a/src/gui/rulers/PropertyViewRuler.cpp
+++ b/src/gui/rulers/PropertyViewRuler.cpp
@@ -52,9 +52,9 @@ PropertyViewRuler::PropertyViewRuler(RulerScale *rulerScale,
const PropertyName &property,
double xorigin,
int height,
- TQWidget *tqparent,
+ TQWidget *parent,
const char *name) :
- TQWidget(tqparent, name),
+ TQWidget(parent, name),
m_propertyName(property),
m_xorigin(xorigin),
m_height(height),
diff --git a/src/gui/rulers/PropertyViewRuler.h b/src/gui/rulers/PropertyViewRuler.h
index 5640bf6..ff275ed 100644
--- a/src/gui/rulers/PropertyViewRuler.h
+++ b/src/gui/rulers/PropertyViewRuler.h
@@ -59,7 +59,7 @@ public:
const PropertyName &property,
double xorigin = 0.0,
int height = 0,
- TQWidget* tqparent = 0,
+ TQWidget* parent = 0,
const char *name = 0);
~PropertyViewRuler();
diff --git a/src/gui/rulers/RawNoteRuler.cpp b/src/gui/rulers/RawNoteRuler.cpp
index ee159c1..75ddc37 100644
--- a/src/gui/rulers/RawNoteRuler.cpp
+++ b/src/gui/rulers/RawNoteRuler.cpp
@@ -50,9 +50,9 @@ RawNoteRuler::RawNoteRuler(RulerScale *rulerScale,
Segment *segment,
double xorigin,
int height,
- TQWidget *tqparent,
+ TQWidget *parent,
const char *name) :
- TQWidget(tqparent, name),
+ TQWidget(parent, name),
m_xorigin(xorigin),
m_height(height),
m_currentXOffset(0),
@@ -559,7 +559,7 @@ RawNoteRuler::paintEvent(TQPaintEvent* e)
// at a time when no other notes are playing (at least of
// those that started no earlier than the paint start time).
// Each node in that tree represents a note that starts
- // playing during its tqparent node's note, or at the same time
+ // playing during its parent node's note, or at the same time
// as it.
drawNode(paint, *DefaultVelocityColour::getInstance(), *fi, m_height - 3, 2);
diff --git a/src/gui/rulers/RawNoteRuler.h b/src/gui/rulers/RawNoteRuler.h
index fc62946..7690ad1 100644
--- a/src/gui/rulers/RawNoteRuler.h
+++ b/src/gui/rulers/RawNoteRuler.h
@@ -62,7 +62,7 @@ public:
Segment *segment,
double xorigin = 0.0,
int height = 0,
- TQWidget* tqparent = 0,
+ TQWidget* parent = 0,
const char *name = 0);
~RawNoteRuler();
diff --git a/src/gui/rulers/StandardRuler.cpp b/src/gui/rulers/StandardRuler.cpp
index 2f7dc72..4869d84 100644
--- a/src/gui/rulers/StandardRuler.cpp
+++ b/src/gui/rulers/StandardRuler.cpp
@@ -49,10 +49,10 @@ StandardRuler::StandardRuler(RosegardenGUIDoc *doc,
double xorigin,
int barHeight,
bool invert,
- TQWidget* tqparent,
+ TQWidget* parent,
const char* name,
WFlags f):
- TQVBox(tqparent, name, f),
+ TQVBox(parent, name, f),
m_invert(invert),
m_loopRulerHeight(10),
m_currentXOffset(0),
diff --git a/src/gui/rulers/StandardRuler.h b/src/gui/rulers/StandardRuler.h
index f41fc24..327abdb 100644
--- a/src/gui/rulers/StandardRuler.h
+++ b/src/gui/rulers/StandardRuler.h
@@ -55,7 +55,7 @@ public:
double xorigin,
int buttonHeight,
bool invert = false, // draw upside-down
- TQWidget* tqparent = 0,
+ TQWidget* parent = 0,
const char* name = 0,
WFlags f=0);
diff --git a/src/gui/rulers/TempoRuler.cpp b/src/gui/rulers/TempoRuler.cpp
index 9928541..8aba08b 100644
--- a/src/gui/rulers/TempoRuler.cpp
+++ b/src/gui/rulers/TempoRuler.cpp
@@ -70,9 +70,9 @@ TempoRuler::TempoRuler(RulerScale *rulerScale,
double xorigin,
int height,
bool small,
- TQWidget *tqparent,
+ TQWidget *parent,
const char *name) :
- TQWidget(tqparent, name),
+ TQWidget(parent, name),
m_xorigin(xorigin),
m_height(height),
m_currentXOffset(0),
@@ -614,12 +614,12 @@ TempoRuler::showTextFloat(tempoT tempo, tempoT target,
// std::cerr << "cp = " << cp.x() << "," << cp.y() << ", tempo = " << qpm << std::endl;
TQPoint mp = cp + pos();
- TQWidget *tqparent = parentWidget();
- while (tqparent->parentWidget() &&
- !tqparent->isTopLevel() &&
- !tqparent->isDialog()) {
- mp += tqparent->pos();
- tqparent = tqparent->parentWidget();
+ TQWidget *parent = parentWidget();
+ while (parent->parentWidget() &&
+ !parent->isTopLevel() &&
+ !parent->isDialog()) {
+ mp += parent->pos();
+ parent = parent->parentWidget();
}
int yoff = cp.y() + m_textFloat->height() + 3;
diff --git a/src/gui/rulers/TempoRuler.h b/src/gui/rulers/TempoRuler.h
index f74d695..8327b13 100644
--- a/src/gui/rulers/TempoRuler.h
+++ b/src/gui/rulers/TempoRuler.h
@@ -77,7 +77,7 @@ public:
double xorigin = 0.0,
int height = 0,
bool small = false,
- TQWidget* tqparent = 0,
+ TQWidget* parent = 0,
const char *name = 0);
~TempoRuler();
diff --git a/src/gui/rulers/TextRuler.cpp b/src/gui/rulers/TextRuler.cpp
index d5db081..a170b7a 100644
--- a/src/gui/rulers/TextRuler.cpp
+++ b/src/gui/rulers/TextRuler.cpp
@@ -46,9 +46,9 @@ namespace Rosegarden
TextRuler::TextRuler(RulerScale *rulerScale,
Segment *segment,
int height,
- TQWidget *tqparent,
+ TQWidget *parent,
const char *name)
- : TQWidget(tqparent, name),
+ : TQWidget(parent, name),
m_height(height),
m_currentXOffset(0),
m_width( -1),
diff --git a/src/gui/rulers/TextRuler.h b/src/gui/rulers/TextRuler.h
index 90b9aea..057b384 100644
--- a/src/gui/rulers/TextRuler.h
+++ b/src/gui/rulers/TextRuler.h
@@ -77,7 +77,7 @@ public:
TextRuler(RulerScale *rulerScale,
Segment *segment,
int height = 0,
- TQWidget* tqparent = 0,
+ TQWidget* parent = 0,
const char *name = 0);
~TextRuler();
diff --git a/src/gui/seqmanager/MidiFilterDialog.cpp b/src/gui/seqmanager/MidiFilterDialog.cpp
index 3a8eec0..0227eff 100644
--- a/src/gui/seqmanager/MidiFilterDialog.cpp
+++ b/src/gui/seqmanager/MidiFilterDialog.cpp
@@ -41,9 +41,9 @@
namespace Rosegarden
{
-MidiFilterDialog::MidiFilterDialog(TQWidget *tqparent,
+MidiFilterDialog::MidiFilterDialog(TQWidget *parent,
RosegardenGUIDoc *doc):
- KDialogBase(tqparent, 0, true, i18n("Modify MIDI filters..."),
+ KDialogBase(parent, 0, true, i18n("Modify MIDI filters..."),
Ok | Apply | Close | Help),
m_doc(doc),
m_modified(true)
diff --git a/src/gui/seqmanager/MidiFilterDialog.h b/src/gui/seqmanager/MidiFilterDialog.h
index 370ea14..1050e55 100644
--- a/src/gui/seqmanager/MidiFilterDialog.h
+++ b/src/gui/seqmanager/MidiFilterDialog.h
@@ -44,7 +44,7 @@ class MidiFilterDialog : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- MidiFilterDialog(TQWidget *tqparent,
+ MidiFilterDialog(TQWidget *parent,
RosegardenGUIDoc *doc);
void setModified(bool value);
diff --git a/src/gui/seqmanager/SequenceManager.cpp b/src/gui/seqmanager/SequenceManager.cpp
index 4e82b85..ec80707 100644
--- a/src/gui/seqmanager/SequenceManager.cpp
+++ b/src/gui/seqmanager/SequenceManager.cpp
@@ -114,7 +114,7 @@ SequenceManager::SequenceManager(RosegardenGUIDoc *doc,
// m_compositionMmapper->cleanup();
m_countdownDialog = new CountdownDialog(dynamic_cast<TQWidget*>
- (m_doc->tqparent())->parentWidget());
+ (m_doc->parent())->parentWidget());
// Connect these for use later
//
connect(m_countdownTimer, TQT_SIGNAL(timeout()),
@@ -180,7 +180,7 @@ void SequenceManager::setDocument(RosegardenGUIDoc* doc)
delete m_compositionMmapperResetTimer;
m_countdownDialog = new CountdownDialog(dynamic_cast<TQWidget*>
- (m_doc->tqparent())->parentWidget());
+ (m_doc->parent())->parentWidget());
// Bug 933041: no longer connect the CountdownDialog from
// SequenceManager; instead let the RosegardenGUIApp connect it to
@@ -898,7 +898,7 @@ punchin:
//m_countdownDialog->show();
} else {
- // Stop immediately - turn off buttons in tqparent
+ // Stop immediately - turn off buttons in parent
//
m_transporttqStatus = STOPPED;
@@ -1010,13 +1010,13 @@ SequenceManager::processAsynchronousMidi(const MappedComposition &mC,
} else if ((*i)->getData1() == MappedEvent::FailureJackRestartFailed) {
KMessageBox::error(
- dynamic_cast<TQWidget*>(m_doc->tqparent())->parentWidget(),
+ dynamic_cast<TQWidget*>(m_doc->parent())->parentWidget(),
i18n("The JACK Audio subsystem has failed or it has stopped Rosegarden from processing audio.\nPlease restart Rosegarden to continue working with audio.\nQuitting other running applications may improve Rosegarden's performance."));
} else if ((*i)->getData1() == MappedEvent::FailureJackRestart) {
KMessageBox::error(
- dynamic_cast<TQWidget*>(m_doc->tqparent())->parentWidget(),
+ dynamic_cast<TQWidget*>(m_doc->parent())->parentWidget(),
i18n("The JACK Audio subsystem has stopped Rosegarden from processing audio, probably because of a processing overload.\nAn attempt to restart the audio service has been made, but some problems may remain.\nQuitting other running applications may improve Rosegarden's performance."));
} else if ((*i)->getData1() == MappedEvent::FailureCPUOverload) {
@@ -1027,7 +1027,7 @@ SequenceManager::processAsynchronousMidi(const MappedComposition &mC,
stopping();
KMessageBox::error(
- dynamic_cast<TQWidget*>(m_doc->tqparent())->parentWidget(),
+ dynamic_cast<TQWidget*>(m_doc->parent())->parentWidget(),
i18n("Run out of processor power for real-time audio processing. Cannot continue."));
#endif
@@ -1146,13 +1146,13 @@ SequenceManager::processAsynchronousMidi(const MappedComposition &mC,
if ((*i)->getData1() == MappedEvent::FailureJackRestartFailed) {
KMessageBox::error(
- dynamic_cast<TQWidget*>(m_doc->tqparent()),
+ dynamic_cast<TQWidget*>(m_doc->parent()),
i18n("The JACK Audio subsystem has failed or it has stopped Rosegarden from processing audio.\nPlease restart Rosegarden to continue working with audio.\nQuitting other running applications may improve Rosegarden's performance."));
} else if ((*i)->getData1() == MappedEvent::FailureJackRestart) {
KMessageBox::error(
- dynamic_cast<TQWidget*>(m_doc->tqparent()),
+ dynamic_cast<TQWidget*>(m_doc->parent()),
i18n("The JACK Audio subsystem has stopped Rosegarden from processing audio, probably because of a processing overload.\nAn attempt to restart the audio service has been made, but some problems may remain.\nQuitting other running applications may improve Rosegarden's performance."));
} else if ((*i)->getData1() == MappedEvent::WarningImpreciseTimer &&
@@ -1166,7 +1166,7 @@ SequenceManager::processAsynchronousMidi(const MappedComposition &mC,
RosegardenGUIApp::self()->awaitDialogClearance();
KMessageBox::information(
- dynamic_cast<TQWidget*>(m_doc->tqparent()),
+ dynamic_cast<TQWidget*>(m_doc->parent()),
i18n("<h3>System timer resolution is too low</h3><p>Rosegarden was unable to find a high-resolution timing source for MIDI performance.</p><p>This may mean you are using a Linux system with the kernel timer resolution set too low. Please contact your Linux distributor for more information.</p><p>Some Linux distributors already provide low latency kernels, see <a href=\"http://rosegarden.wiki.sourceforge.net/Low+latency+kernels\">http://rosegarden.wiki.sourceforge.net/Low+latency+kernels</a> for instructions.</p>"),
NULL, NULL,
KMessageBox::Notify + KMessageBox::AllowLink);
@@ -1184,7 +1184,7 @@ SequenceManager::processAsynchronousMidi(const MappedComposition &mC,
RosegardenGUIApp::self()->awaitDialogClearance();
KMessageBox::information(
- dynamic_cast<TQWidget*>(m_doc->tqparent()),
+ dynamic_cast<TQWidget*>(m_doc->parent()),
i18n("<h3>System timer resolution is too low</h3><p>Rosegarden was unable to find a high-resolution timing source for MIDI performance.</p><p>You may be able to solve this problem by loading the RTC timer kernel module. To do this, try running <b>sudo modprobe snd-rtctimer</b> in a terminal window and then restarting Rosegarden.</p><p>Alternatively, check whether your Linux distributor provides a multimedia-optimized kernel. See <a href=\"http://rosegarden.wiki.sourceforge.net/Low+latency+kernels\">http://rosegarden.wiki.sourceforge.net/Low+latency+kernels</a> for notes about this.</p>"),
NULL, NULL,
KMessageBox::Notify + KMessageBox::AllowLink);
diff --git a/src/gui/studio/AudioMixerWindow.cpp b/src/gui/studio/AudioMixerWindow.cpp
index e95a6b1..56734dd 100644
--- a/src/gui/studio/AudioMixerWindow.cpp
+++ b/src/gui/studio/AudioMixerWindow.cpp
@@ -89,9 +89,9 @@ static const unsigned int MIXER_SHOW_UNASSIGNED_FADERS = 1 << 3;
static const unsigned int MIXER_OMIT_SYNTH_FADERS = 1 << 4;
-AudioMixerWindow::AudioMixerWindow(TQWidget *tqparent,
+AudioMixerWindow::AudioMixerWindow(TQWidget *parent,
RosegardenGUIDoc *document):
- MixerWindow(tqparent, document),
+ MixerWindow(parent, document),
m_mainBox (0)
{
populate();
diff --git a/src/gui/studio/AudioMixerWindow.h b/src/gui/studio/AudioMixerWindow.h
index e5ec815..dee3969 100644
--- a/src/gui/studio/AudioMixerWindow.h
+++ b/src/gui/studio/AudioMixerWindow.h
@@ -58,7 +58,7 @@ class AudioMixerWindow : public MixerWindow
TQ_OBJECT
public:
- AudioMixerWindow(TQWidget *tqparent, RosegardenGUIDoc *document);
+ AudioMixerWindow(TQWidget *parent, RosegardenGUIDoc *document);
~AudioMixerWindow();
void updateMeters(SequencerMapper *mapper);
diff --git a/src/gui/studio/BankEditorDialog.cpp b/src/gui/studio/BankEditorDialog.cpp
index 6103652..518260d 100644
--- a/src/gui/studio/BankEditorDialog.cpp
+++ b/src/gui/studio/BankEditorDialog.cpp
@@ -78,10 +78,10 @@
namespace Rosegarden
{
-BankEditorDialog::BankEditorDialog(TQWidget *tqparent,
+BankEditorDialog::BankEditorDialog(TQWidget *parent,
RosegardenGUIDoc *doc,
DeviceId defaultDevice):
- KMainWindow(tqparent, "bankeditordialog"),
+ KMainWindow(parent, "bankeditordialog"),
m_studio(&doc->getStudio()),
m_doc(doc),
m_copyBank(Device::NO_DEVICE, -1),
@@ -968,15 +968,15 @@ BankEditorDialog::getParentDeviceItem(TQListViewItem* item)
return 0;
if (dynamic_cast<MidiBankListViewItem*>(item))
- // go up to the tqparent device item
- item = item->tqparent();
+ // go up to the parent device item
+ item = item->parent();
if (dynamic_cast<MidiKeyMapListViewItem*>(item))
- // go up to the tqparent device item
- item = item->tqparent();
+ // go up to the parent device item
+ item = item->parent();
if (!item) {
- RG_DEBUG << "BankEditorDialog::getParentDeviceItem : missing tqparent device item for bank item - this SHOULD NOT HAPPEN" << endl;
+ RG_DEBUG << "BankEditorDialog::getParentDeviceItem : missing parent device item for bank item - this SHOULD NOT HAPPEN" << endl;
return 0;
}
diff --git a/src/gui/studio/BankEditorDialog.h b/src/gui/studio/BankEditorDialog.h
index 4ab64ea..c418c46 100644
--- a/src/gui/studio/BankEditorDialog.h
+++ b/src/gui/studio/BankEditorDialog.h
@@ -64,7 +64,7 @@ class BankEditorDialog : public KMainWindow
TQ_OBJECT
public:
- BankEditorDialog(TQWidget *tqparent,
+ BankEditorDialog(TQWidget *parent,
RosegardenGUIDoc *doc,
DeviceId defaultDevice =
Device::NO_DEVICE);
diff --git a/src/gui/studio/DeviceEditorDialog.cpp b/src/gui/studio/DeviceEditorDialog.cpp
index 66f371a..11283d6 100644
--- a/src/gui/studio/DeviceEditorDialog.cpp
+++ b/src/gui/studio/DeviceEditorDialog.cpp
@@ -55,9 +55,9 @@
namespace Rosegarden
{
-DeviceEditorDialog::DeviceEditorDialog(TQWidget *tqparent,
+DeviceEditorDialog::DeviceEditorDialog(TQWidget *parent,
RosegardenGUIDoc *document) :
- KDialogBase(tqparent, "deviceeditordialog", true,
+ KDialogBase(parent, "deviceeditordialog", true,
i18n("Manage MIDI Devices"), Ok | Apply | Close, Ok, true),
m_document(document),
m_studio(&document->getStudio()),
diff --git a/src/gui/studio/DeviceEditorDialog.h b/src/gui/studio/DeviceEditorDialog.h
index 7eea5a7..2c10b0b 100644
--- a/src/gui/studio/DeviceEditorDialog.h
+++ b/src/gui/studio/DeviceEditorDialog.h
@@ -48,7 +48,7 @@ class DeviceEditorDialog : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- DeviceEditorDialog(TQWidget *tqparent, RosegardenGUIDoc *document);
+ DeviceEditorDialog(TQWidget *parent, RosegardenGUIDoc *document);
~DeviceEditorDialog();
void setModified(bool value);
diff --git a/src/gui/studio/DeviceManagerDialog.cpp b/src/gui/studio/DeviceManagerDialog.cpp
index 84aa0ca..6f5cbb4 100644
--- a/src/gui/studio/DeviceManagerDialog.cpp
+++ b/src/gui/studio/DeviceManagerDialog.cpp
@@ -83,9 +83,9 @@ static const int RECORD_CURRENT_COL = 1;
static const int RECORD_CONNECTION_COL = 2;
-DeviceManagerDialog::DeviceManagerDialog(TQWidget *tqparent,
+DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
RosegardenGUIDoc *document) :
- KMainWindow(tqparent, "deviceeditordialog"),
+ KMainWindow(parent, "deviceeditordialog"),
m_document(document),
m_studio(&document->getStudio())
{
diff --git a/src/gui/studio/DeviceManagerDialog.h b/src/gui/studio/DeviceManagerDialog.h
index 09e908d..e284983 100644
--- a/src/gui/studio/DeviceManagerDialog.h
+++ b/src/gui/studio/DeviceManagerDialog.h
@@ -52,7 +52,7 @@ class DeviceManagerDialog : public KMainWindow
Q_OBJECT
TQ_OBJECT
public:
- DeviceManagerDialog(TQWidget *tqparent, RosegardenGUIDoc *document);
+ DeviceManagerDialog(TQWidget *parent, RosegardenGUIDoc *document);
~DeviceManagerDialog();
void setModified(bool value);
diff --git a/src/gui/studio/MidiBankListViewItem.cpp b/src/gui/studio/MidiBankListViewItem.cpp
index bb15ed4..599eb9e 100644
--- a/src/gui/studio/MidiBankListViewItem.cpp
+++ b/src/gui/studio/MidiBankListViewItem.cpp
@@ -37,10 +37,10 @@ namespace Rosegarden
MidiBankListViewItem::MidiBankListViewItem(DeviceId deviceId,
int bankNb,
- TQListViewItem* tqparent,
+ TQListViewItem* parent,
TQString name,
bool percussion, int msb, int lsb)
- : MidiDeviceListViewItem(deviceId, tqparent, name, percussion, msb, lsb),
+ : MidiDeviceListViewItem(deviceId, parent, name, percussion, msb, lsb),
m_percussion(percussion),
m_bankNb(bankNb)
{}
diff --git a/src/gui/studio/MidiBankListViewItem.h b/src/gui/studio/MidiBankListViewItem.h
index a160374..5d42160 100644
--- a/src/gui/studio/MidiBankListViewItem.h
+++ b/src/gui/studio/MidiBankListViewItem.h
@@ -44,7 +44,7 @@ class MidiBankListViewItem : public MidiDeviceListViewItem
public:
MidiBankListViewItem(DeviceId deviceId,
int bankNb,
- TQListViewItem* tqparent, TQString name,
+ TQListViewItem* parent, TQString name,
bool percussion,
int msb, int lsb);
diff --git a/src/gui/studio/MidiDeviceListViewItem.cpp b/src/gui/studio/MidiDeviceListViewItem.cpp
index 723e6fa..df64c82 100644
--- a/src/gui/studio/MidiDeviceListViewItem.cpp
+++ b/src/gui/studio/MidiDeviceListViewItem.cpp
@@ -35,24 +35,24 @@ namespace Rosegarden
{
MidiDeviceListViewItem::MidiDeviceListViewItem(DeviceId deviceId,
- TQListView* tqparent, TQString name)
- : KListViewItem(tqparent, name),
+ TQListView* parent, TQString name)
+ : KListViewItem(parent, name),
m_deviceId(deviceId)
{}
MidiDeviceListViewItem::MidiDeviceListViewItem(DeviceId deviceId,
- TQListViewItem* tqparent, TQString name,
+ TQListViewItem* parent, TQString name,
bool percussion,
int msb, int lsb)
- : KListViewItem(tqparent, name,
+ : KListViewItem(parent, name,
TQString(percussion ? i18n("Percussion Bank") : i18n("Bank")),
TQString().setNum(msb), TQString().setNum(lsb)),
m_deviceId(deviceId)
{}
MidiDeviceListViewItem::MidiDeviceListViewItem(DeviceId deviceId,
- TQListViewItem* tqparent, TQString name)
-: KListViewItem(tqparent, name, i18n("Key Mapping"), "", ""),
+ TQListViewItem* parent, TQString name)
+: KListViewItem(parent, name, i18n("Key Mapping"), "", ""),
m_deviceId(deviceId)
{}
diff --git a/src/gui/studio/MidiDeviceListViewItem.h b/src/gui/studio/MidiDeviceListViewItem.h
index 554c62e..a17a46c 100644
--- a/src/gui/studio/MidiDeviceListViewItem.h
+++ b/src/gui/studio/MidiDeviceListViewItem.h
@@ -41,17 +41,17 @@ class MidiDeviceListViewItem : public KListViewItem
public:
// Device
MidiDeviceListViewItem(DeviceId id,
- TQListView* tqparent, TQString name);
+ TQListView* parent, TQString name);
// Bank
MidiDeviceListViewItem(DeviceId id,
- TQListViewItem* tqparent, TQString name,
+ TQListViewItem* parent, TQString name,
bool percussion,
int msb, int lsb);
// Key Mapping
MidiDeviceListViewItem(DeviceId id,
- TQListViewItem* tqparent, TQString name);
+ TQListViewItem* parent, TQString name);
DeviceId getDeviceId() const { return m_deviceId; }
diff --git a/src/gui/studio/MidiKeyMapListViewItem.cpp b/src/gui/studio/MidiKeyMapListViewItem.cpp
index 93c1532..dd77055 100644
--- a/src/gui/studio/MidiKeyMapListViewItem.cpp
+++ b/src/gui/studio/MidiKeyMapListViewItem.cpp
@@ -36,9 +36,9 @@ namespace Rosegarden
{
MidiKeyMapListViewItem::MidiKeyMapListViewItem(DeviceId deviceId,
- TQListViewItem* tqparent,
+ TQListViewItem* parent,
TQString name)
- : MidiDeviceListViewItem(deviceId, tqparent, name),
+ : MidiDeviceListViewItem(deviceId, parent, name),
m_name(name)
{
setText(1, i18n("Key Mapping"));
diff --git a/src/gui/studio/MidiKeyMapListViewItem.h b/src/gui/studio/MidiKeyMapListViewItem.h
index c658e73..d29b0a6 100644
--- a/src/gui/studio/MidiKeyMapListViewItem.h
+++ b/src/gui/studio/MidiKeyMapListViewItem.h
@@ -43,7 +43,7 @@ class MidiKeyMapListViewItem : public MidiDeviceListViewItem
{
public:
MidiKeyMapListViewItem(DeviceId deviceId,
- TQListViewItem* tqparent, TQString name);
+ TQListViewItem* parent, TQString name);
virtual int compare(TQListViewItem *i, int col, bool ascending) const;
diff --git a/src/gui/studio/MidiKeyMappingEditor.cpp b/src/gui/studio/MidiKeyMappingEditor.cpp
index 93fd33f..0a607ad 100644
--- a/src/gui/studio/MidiKeyMappingEditor.cpp
+++ b/src/gui/studio/MidiKeyMappingEditor.cpp
@@ -51,11 +51,11 @@ namespace Rosegarden
{
MidiKeyMappingEditor::MidiKeyMappingEditor(BankEditorDialog* bankEditor,
- TQWidget* tqparent,
+ TQWidget* parent,
const char* name)
: NameSetEditor(bankEditor,
i18n("Key Mapping details"),
- tqparent, name, i18n("Pitches"), false),
+ parent, name, i18n("Pitches"), false),
m_device(0)
{
TQWidget *additionalWidget = makeAdditionalWidget(m_mainFrame);
@@ -65,7 +65,7 @@ MidiKeyMappingEditor::MidiKeyMappingEditor(BankEditorDialog* bankEditor,
}
TQWidget *
-MidiKeyMappingEditor::makeAdditionalWidget(TQWidget *tqparent)
+MidiKeyMappingEditor::makeAdditionalWidget(TQWidget *parent)
{
return 0;
}
diff --git a/src/gui/studio/MidiKeyMappingEditor.h b/src/gui/studio/MidiKeyMappingEditor.h
index 4f10ea6..da45b82 100644
--- a/src/gui/studio/MidiKeyMappingEditor.h
+++ b/src/gui/studio/MidiKeyMappingEditor.h
@@ -50,7 +50,7 @@ class MidiKeyMappingEditor : public NameSetEditor
public:
MidiKeyMappingEditor(BankEditorDialog *bankEditor,
- TQWidget *tqparent,
+ TQWidget *parent,
const char *name = 0);
void clearAll();
@@ -63,7 +63,7 @@ public slots:
virtual void slotEntryButtonPressed();
protected:
- virtual TQWidget *makeAdditionalWidget(TQWidget *tqparent);
+ virtual TQWidget *makeAdditionalWidget(TQWidget *parent);
void blockAllSignals(bool block);
//--------------- Data members ---------------------------------
diff --git a/src/gui/studio/MidiMixerVUMeter.cpp b/src/gui/studio/MidiMixerVUMeter.cpp
index 8f1e1e5..db4ff13 100644
--- a/src/gui/studio/MidiMixerVUMeter.cpp
+++ b/src/gui/studio/MidiMixerVUMeter.cpp
@@ -32,12 +32,12 @@
namespace Rosegarden
{
-MidiMixerVUMeter::MidiMixerVUMeter(TQWidget *tqparent,
+MidiMixerVUMeter::MidiMixerVUMeter(TQWidget *parent,
VUMeterType type,
int width,
int height,
const char *name):
- VUMeter(tqparent, type, false, false, width, height, VUMeter::Vertical, name)
+ VUMeter(parent, type, false, false, width, height, VUMeter::Vertical, name)
{
tqsetAlignment(AlignCenter);
}
diff --git a/src/gui/studio/MidiMixerVUMeter.h b/src/gui/studio/MidiMixerVUMeter.h
index 4af8e81..70622b2 100644
--- a/src/gui/studio/MidiMixerVUMeter.h
+++ b/src/gui/studio/MidiMixerVUMeter.h
@@ -40,7 +40,7 @@ namespace Rosegarden
class MidiMixerVUMeter : public VUMeter
{
public:
- MidiMixerVUMeter(TQWidget *tqparent = 0,
+ MidiMixerVUMeter(TQWidget *parent = 0,
VUMeterType type = Plain,
int width = 0,
int height = 0,
diff --git a/src/gui/studio/MidiMixerWindow.cpp b/src/gui/studio/MidiMixerWindow.cpp
index cb65b09..04de306 100644
--- a/src/gui/studio/MidiMixerWindow.cpp
+++ b/src/gui/studio/MidiMixerWindow.cpp
@@ -63,9 +63,9 @@
namespace Rosegarden
{
-MidiMixerWindow::MidiMixerWindow(TQWidget *tqparent,
+MidiMixerWindow::MidiMixerWindow(TQWidget *parent,
RosegardenGUIDoc *document):
- MixerWindow(tqparent, document),
+ MixerWindow(parent, document),
m_tabFrame(0)
{
// Initial setup
diff --git a/src/gui/studio/MidiMixerWindow.h b/src/gui/studio/MidiMixerWindow.h
index 8b98364..2738e93 100644
--- a/src/gui/studio/MidiMixerWindow.h
+++ b/src/gui/studio/MidiMixerWindow.h
@@ -54,7 +54,7 @@ class MidiMixerWindow : public MixerWindow
TQ_OBJECT
public:
- MidiMixerWindow(TQWidget *tqparent, RosegardenGUIDoc *document);
+ MidiMixerWindow(TQWidget *parent, RosegardenGUIDoc *document);
/**
* Setup the tabs on the Mixer according to the Studio
diff --git a/src/gui/studio/MidiProgramsEditor.cpp b/src/gui/studio/MidiProgramsEditor.cpp
index 08c0114..4186130 100644
--- a/src/gui/studio/MidiProgramsEditor.cpp
+++ b/src/gui/studio/MidiProgramsEditor.cpp
@@ -60,11 +60,11 @@ namespace Rosegarden
{
MidiProgramsEditor::MidiProgramsEditor(BankEditorDialog* bankEditor,
- TQWidget* tqparent,
+ TQWidget* parent,
const char* name)
: NameSetEditor(bankEditor,
i18n("Bank and Program details"),
- tqparent, name, i18n("Programs"), true),
+ parent, name, i18n("Programs"), true),
m_device(0),
m_bankList(bankEditor->getBankList()),
m_programList(bankEditor->getProgramList()),
@@ -77,9 +77,9 @@ MidiProgramsEditor::MidiProgramsEditor(BankEditorDialog* bankEditor,
}
TQWidget *
-MidiProgramsEditor::makeAdditionalWidget(TQWidget *tqparent)
+MidiProgramsEditor::makeAdditionalWidget(TQWidget *parent)
{
- TQFrame *frame = new TQFrame(tqparent);
+ TQFrame *frame = new TQFrame(parent);
m_percussion = new TQCheckBox(frame);
m_msb = new TQSpinBox(frame);
diff --git a/src/gui/studio/MidiProgramsEditor.h b/src/gui/studio/MidiProgramsEditor.h
index a71ca5a..3f27b5c 100644
--- a/src/gui/studio/MidiProgramsEditor.h
+++ b/src/gui/studio/MidiProgramsEditor.h
@@ -52,7 +52,7 @@ class MidiProgramsEditor : public NameSetEditor
TQ_OBJECT
public:
MidiProgramsEditor(BankEditorDialog *bankEditor,
- TQWidget *tqparent,
+ TQWidget *parent,
const char *name = 0);
void clearAll();
@@ -94,7 +94,7 @@ protected:
void setBankName(const TQString& s);
- virtual TQWidget *makeAdditionalWidget(TQWidget *tqparent);
+ virtual TQWidget *makeAdditionalWidget(TQWidget *parent);
void blockAllSignals(bool block);
diff --git a/src/gui/studio/MixerWindow.cpp b/src/gui/studio/MixerWindow.cpp
index e27299d..d0c233a 100644
--- a/src/gui/studio/MixerWindow.cpp
+++ b/src/gui/studio/MixerWindow.cpp
@@ -37,9 +37,9 @@
namespace Rosegarden
{
-MixerWindow::MixerWindow(TQWidget *tqparent,
+MixerWindow::MixerWindow(TQWidget *parent,
RosegardenGUIDoc *document) :
- KMainWindow(tqparent, "mixerwindow"),
+ KMainWindow(parent, "mixerwindow"),
m_document(document),
m_studio(&document->getStudio()),
m_currentId(0)
diff --git a/src/gui/studio/MixerWindow.h b/src/gui/studio/MixerWindow.h
index f4ff441..cdf36fd 100644
--- a/src/gui/studio/MixerWindow.h
+++ b/src/gui/studio/MixerWindow.h
@@ -48,7 +48,7 @@ class MixerWindow: public KMainWindow
TQ_OBJECT
public:
- MixerWindow(TQWidget *tqparent, RosegardenGUIDoc *document);
+ MixerWindow(TQWidget *parent, RosegardenGUIDoc *document);
TQAccel* getAccelerators() { return m_accelerators; }
signals:
diff --git a/src/gui/studio/NameSetEditor.cpp b/src/gui/studio/NameSetEditor.cpp
index 396112d..a4e9b97 100644
--- a/src/gui/studio/NameSetEditor.cpp
+++ b/src/gui/studio/NameSetEditor.cpp
@@ -48,11 +48,11 @@ namespace Rosegarden
NameSetEditor::NameSetEditor(BankEditorDialog* bankEditor,
TQString title,
- TQWidget* tqparent,
+ TQWidget* parent,
const char* name,
TQString headingPrefix,
bool showEntryButtons)
- : TQVGroupBox(title, tqparent, name),
+ : TQVGroupBox(title, parent, name),
m_bankEditor(bankEditor),
m_mainFrame(new TQFrame(this))
{
diff --git a/src/gui/studio/NameSetEditor.h b/src/gui/studio/NameSetEditor.h
index cef94a2..d87e428 100644
--- a/src/gui/studio/NameSetEditor.h
+++ b/src/gui/studio/NameSetEditor.h
@@ -65,7 +65,7 @@ public slots:
protected:
NameSetEditor(BankEditorDialog *bankEditor,
TQString title,
- TQWidget *tqparent,
+ TQWidget *parent,
const char *name,
TQString headingPrefix = "",
bool showEntryButtons = false);
diff --git a/src/gui/studio/RemapInstrumentDialog.cpp b/src/gui/studio/RemapInstrumentDialog.cpp
index b1aff98..a957650 100644
--- a/src/gui/studio/RemapInstrumentDialog.cpp
+++ b/src/gui/studio/RemapInstrumentDialog.cpp
@@ -50,9 +50,9 @@
namespace Rosegarden
{
-RemapInstrumentDialog::RemapInstrumentDialog(TQWidget *tqparent,
+RemapInstrumentDialog::RemapInstrumentDialog(TQWidget *parent,
RosegardenGUIDoc *doc):
- KDialogBase(tqparent, "", true, i18n("Remap Instrument assigments..."),
+ KDialogBase(parent, "", true, i18n("Remap Instrument assigments..."),
Ok | Apply | Cancel),
m_doc(doc)
{
diff --git a/src/gui/studio/RemapInstrumentDialog.h b/src/gui/studio/RemapInstrumentDialog.h
index d5999f8..4f0eef8 100644
--- a/src/gui/studio/RemapInstrumentDialog.h
+++ b/src/gui/studio/RemapInstrumentDialog.h
@@ -50,7 +50,7 @@ class RemapInstrumentDialog : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- RemapInstrumentDialog(TQWidget *tqparent,
+ RemapInstrumentDialog(TQWidget *parent,
RosegardenGUIDoc *doc);
void populateCombo(int id);
diff --git a/src/gui/studio/SynthPluginManagerDialog.cpp b/src/gui/studio/SynthPluginManagerDialog.cpp
index 9530fad..25ac584 100644
--- a/src/gui/studio/SynthPluginManagerDialog.cpp
+++ b/src/gui/studio/SynthPluginManagerDialog.cpp
@@ -54,13 +54,13 @@
namespace Rosegarden
{
-SynthPluginManagerDialog::SynthPluginManagerDialog(TQWidget *tqparent,
+SynthPluginManagerDialog::SynthPluginManagerDialog(TQWidget *parent,
RosegardenGUIDoc *doc
#ifdef HAVE_LIBLO
, AudioPluginOSCGUIManager *guiManager
#endif
) :
- KMainWindow(tqparent, "synthpluginmanagerdialog"),
+ KMainWindow(parent, "synthpluginmanagerdialog"),
m_document(doc),
m_studio(&doc->getStudio()),
m_pluginManager(doc->getPluginManager())
diff --git a/src/gui/studio/SynthPluginManagerDialog.h b/src/gui/studio/SynthPluginManagerDialog.h
index d637e7a..08cb2d7 100644
--- a/src/gui/studio/SynthPluginManagerDialog.h
+++ b/src/gui/studio/SynthPluginManagerDialog.h
@@ -52,7 +52,7 @@ class SynthPluginManagerDialog : public KMainWindow
TQ_OBJECT
public:
- SynthPluginManagerDialog(TQWidget *tqparent,
+ SynthPluginManagerDialog(TQWidget *parent,
RosegardenGUIDoc *doc
#ifdef HAVE_LIBLO
, AudioPluginOSCGUIManager *guiManager
diff --git a/src/gui/studio/TimerCallbackAssistant.cpp b/src/gui/studio/TimerCallbackAssistant.cpp
index 23534d3..7b2bc76 100644
--- a/src/gui/studio/TimerCallbackAssistant.cpp
+++ b/src/gui/studio/TimerCallbackAssistant.cpp
@@ -44,7 +44,7 @@ TimerCallbackAssistant::TimerCallbackAssistant(int ms, void (*callback)(void *da
TimerCallbackAssistant::~TimerCallbackAssistant()
{
- // nothing -- the TQTimer is deleted automatically by its tqparent TQObject (me)
+ // nothing -- the TQTimer is deleted automatically by its parent TQObject (me)
}
void
diff --git a/src/gui/widgets/AudioFaderBox.cpp b/src/gui/widgets/AudioFaderBox.cpp
index f544003..4c8e76c 100644
--- a/src/gui/widgets/AudioFaderBox.cpp
+++ b/src/gui/widgets/AudioFaderBox.cpp
@@ -57,11 +57,11 @@
namespace Rosegarden
{
-AudioFaderBox::AudioFaderBox(TQWidget *tqparent,
+AudioFaderBox::AudioFaderBox(TQWidget *parent,
TQString id,
bool haveInOut,
const char *name):
- TQFrame(tqparent, name),
+ TQFrame(parent, name),
m_signalMapper(new TQSignalMapper(TQT_TQOBJECT(this))),
m_id(id),
m_isStereo(false)
@@ -244,8 +244,8 @@ bool
AudioFaderBox::owns(const TQObject *object)
{
return (object &&
- ((TQT_BASE_OBJECT(object->tqparent()) == TQT_BASE_OBJECT(this)) ||
- (object->tqparent() && (TQT_BASE_OBJECT(object->tqparent()->tqparent()) == TQT_BASE_OBJECT(this)))));
+ ((TQT_BASE_OBJECT(object->parent()) == TQT_BASE_OBJECT(this)) ||
+ (object->parent() && (TQT_BASE_OBJECT(object->parent()->parent()) == TQT_BASE_OBJECT(this)))));
}
void
diff --git a/src/gui/widgets/AudioFaderBox.h b/src/gui/widgets/AudioFaderBox.h
index 8c4f291..caa88c8 100644
--- a/src/gui/widgets/AudioFaderBox.h
+++ b/src/gui/widgets/AudioFaderBox.h
@@ -56,7 +56,7 @@ class AudioFaderBox : public TQFrame
TQ_OBJECT
public:
- AudioFaderBox(TQWidget *tqparent,
+ AudioFaderBox(TQWidget *parent,
TQString id = "",
bool haveInOut = true,
const char *name = 0);
diff --git a/src/gui/widgets/AudioListItem.h b/src/gui/widgets/AudioListItem.h
index 7486bfa..b2bdf99 100644
--- a/src/gui/widgets/AudioListItem.h
+++ b/src/gui/widgets/AudioListItem.h
@@ -40,25 +40,25 @@ class AudioListItem : public KListViewItem
public:
- AudioListItem(KListView *tqparent):KListViewItem(tqparent),
+ AudioListItem(KListView *parent):KListViewItem(parent),
m_segment(0) {;}
- AudioListItem(KListViewItem *tqparent):KListViewItem(tqparent),
+ AudioListItem(KListViewItem *parent):KListViewItem(parent),
m_segment(0) {;}
- AudioListItem(KListView *tqparent,
+ AudioListItem(KListView *parent,
TQString label,
AudioFileId id):
- KListViewItem(tqparent,
+ KListViewItem(parent,
label,
"", "", "", "", "", "", ""),
m_id(id),
m_segment(0) {;}
- AudioListItem(KListViewItem *tqparent,
+ AudioListItem(KListViewItem *parent,
TQString label,
AudioFileId id):
- KListViewItem(tqparent,
+ KListViewItem(parent,
label,
"", "", "", "", "", "", ""),
m_id(id),
diff --git a/src/gui/widgets/AudioListView.cpp b/src/gui/widgets/AudioListView.cpp
index a840868..3c75526 100644
--- a/src/gui/widgets/AudioListView.cpp
+++ b/src/gui/widgets/AudioListView.cpp
@@ -31,8 +31,8 @@
namespace Rosegarden {
-AudioListView::AudioListView(TQWidget *tqparent, const char *name)
- : KListView(tqparent, name)
+AudioListView::AudioListView(TQWidget *parent, const char *name)
+ : KListView(parent, name)
{
setDragEnabled(true);
setAcceptDrops(true);
diff --git a/src/gui/widgets/AudioListView.h b/src/gui/widgets/AudioListView.h
index e6bbaca..04c293e 100644
--- a/src/gui/widgets/AudioListView.h
+++ b/src/gui/widgets/AudioListView.h
@@ -32,7 +32,7 @@ namespace Rosegarden {
class AudioListView : public KListView
{
public:
- AudioListView(TQWidget *tqparent = 0, const char *name = 0);
+ AudioListView(TQWidget *parent = 0, const char *name = 0);
protected:
bool acceptDrag(TQDropEvent* e) const;
diff --git a/src/gui/widgets/AudioRouteMenu.cpp b/src/gui/widgets/AudioRouteMenu.cpp
index 9af8ec3..a2f6985 100644
--- a/src/gui/widgets/AudioRouteMenu.cpp
+++ b/src/gui/widgets/AudioRouteMenu.cpp
@@ -133,7 +133,7 @@ AudioRouteMenu::slotShowMenu()
if (getNumEntries() == 0)
return ;
- RosegardenPopupMenu *menu = new RosegardenPopupMenu((TQWidget *)tqparent());
+ RosegardenPopupMenu *menu = new RosegardenPopupMenu((TQWidget *)parent());
for (int i = 0; i < getNumEntries(); ++i) {
diff --git a/src/gui/widgets/AudioRouteMenu.h b/src/gui/widgets/AudioRouteMenu.h
index 400d64e..ee54862 100644
--- a/src/gui/widgets/AudioRouteMenu.h
+++ b/src/gui/widgets/AudioRouteMenu.h
@@ -51,7 +51,7 @@ public:
enum Direction { In, Out };
enum Format { Compact, Regular };
- AudioRouteMenu(TQWidget *tqparent,
+ AudioRouteMenu(TQWidget *parent,
Direction direction,
Format format,
Studio *studio = 0,
diff --git a/src/gui/widgets/AudioVUMeter.cpp b/src/gui/widgets/AudioVUMeter.cpp
index adc8bb2..aacb7c2 100644
--- a/src/gui/widgets/AudioVUMeter.cpp
+++ b/src/gui/widgets/AudioVUMeter.cpp
@@ -37,14 +37,14 @@
namespace Rosegarden
{
-AudioVUMeter::AudioVUMeter(TQWidget *tqparent,
+AudioVUMeter::AudioVUMeter(TQWidget *parent,
VUMeter::VUMeterType type,
bool stereo,
bool hasRecord,
int width,
int height,
const char *name) :
- TQWidget(tqparent, name),
+ TQWidget(parent, name),
m_stereo(stereo)
{
setBackgroundMode(TQt::NoBackground);
@@ -90,14 +90,14 @@ AudioVUMeter::paintEvent(TQPaintEvent *e)
m_meter->paintEvent(e);
}
-AudioVUMeter::AudioVUMeterImpl::AudioVUMeterImpl(TQWidget *tqparent,
+AudioVUMeter::AudioVUMeterImpl::AudioVUMeterImpl(TQWidget *parent,
VUMeterType type,
bool stereo,
bool hasRecord,
int width,
int height,
const char *name) :
- VUMeter(tqparent, type, stereo, hasRecord, width, height, VUMeter::Vertical, name)
+ VUMeter(parent, type, stereo, hasRecord, width, height, VUMeter::Vertical, name)
{}
}
diff --git a/src/gui/widgets/AudioVUMeter.h b/src/gui/widgets/AudioVUMeter.h
index 73e406b..1868666 100644
--- a/src/gui/widgets/AudioVUMeter.h
+++ b/src/gui/widgets/AudioVUMeter.h
@@ -41,7 +41,7 @@ namespace Rosegarden
class AudioVUMeter : public TQWidget
{
public:
- AudioVUMeter(TQWidget *tqparent = 0,
+ AudioVUMeter(TQWidget *parent = 0,
VUMeter::VUMeterType type = VUMeter::AudioPeakHoldShort,
bool stereo = true,
bool hasRecord = false,
@@ -69,7 +69,7 @@ protected:
class AudioVUMeterImpl : public VUMeter
{
public:
- AudioVUMeterImpl(TQWidget *tqparent,
+ AudioVUMeterImpl(TQWidget *parent,
VUMeterType type,
bool stereo,
bool hasRecord,
diff --git a/src/gui/widgets/BigArrowButton.h b/src/gui/widgets/BigArrowButton.h
index 3a51143..eb364e1 100644
--- a/src/gui/widgets/BigArrowButton.h
+++ b/src/gui/widgets/BigArrowButton.h
@@ -32,9 +32,9 @@ namespace Rosegarden {
class BigArrowButton : public KArrowButton
{
public:
- BigArrowButton(TQWidget *tqparent = 0, Qt::ArrowType arrow = Qt::UpArrow,
+ BigArrowButton(TQWidget *parent = 0, Qt::ArrowType arrow = Qt::UpArrow,
const char *name = 0) :
- KArrowButton(tqparent, arrow, name) { }
+ KArrowButton(parent, arrow, name) { }
virtual ~BigArrowButton() { }
virtual TQSize tqsizeHint() const {
diff --git a/src/gui/widgets/CollapsingFrame.cpp b/src/gui/widgets/CollapsingFrame.cpp
index 5835045..56c530b 100644
--- a/src/gui/widgets/CollapsingFrame.cpp
+++ b/src/gui/widgets/CollapsingFrame.cpp
@@ -41,8 +41,8 @@
namespace Rosegarden
{
-CollapsingFrame::CollapsingFrame(TQString label, TQWidget *tqparent, const char *n) :
- TQFrame(tqparent, n),
+CollapsingFrame::CollapsingFrame(TQString label, TQWidget *parent, const char *n) :
+ TQFrame(parent, n),
m_widget(0),
m_fill(false),
m_collapsed(false)
diff --git a/src/gui/widgets/CollapsingFrame.h b/src/gui/widgets/CollapsingFrame.h
index 90a7887..6ae6feb 100644
--- a/src/gui/widgets/CollapsingFrame.h
+++ b/src/gui/widgets/CollapsingFrame.h
@@ -46,7 +46,7 @@ class CollapsingFrame : public TQFrame
TQ_OBJECT
public:
- CollapsingFrame(TQString label, TQWidget *tqparent = 0, const char *name = 0);
+ CollapsingFrame(TQString label, TQWidget *parent = 0, const char *name = 0);
virtual ~CollapsingFrame();
TQFont font() const;
diff --git a/src/gui/widgets/ColourTable.cpp b/src/gui/widgets/ColourTable.cpp
index cde4dbc..2cceca4 100644
--- a/src/gui/widgets/ColourTable.cpp
+++ b/src/gui/widgets/ColourTable.cpp
@@ -43,8 +43,8 @@ namespace Rosegarden
{
ColourTable::ColourTable
-(TQWidget *tqparent, ColourMap &input, ColourList &list)
- : TQTable(1, 2, tqparent, "RColourTable")
+(TQWidget *parent, ColourMap &input, ColourList &list)
+ : TQTable(1, 2, parent, "RColourTable")
{
setSorting(FALSE);
setSelectionMode(TQTable::SingleRow);
diff --git a/src/gui/widgets/ColourTable.h b/src/gui/widgets/ColourTable.h
index 3932df6..e1ddd5f 100644
--- a/src/gui/widgets/ColourTable.h
+++ b/src/gui/widgets/ColourTable.h
@@ -51,7 +51,7 @@ class ColourTable : public TQTable
public:
typedef std::map<unsigned int, unsigned int, std::less<unsigned int> > ColourList;
- ColourTable(TQWidget *tqparent, ColourMap &input, ColourList &list);
+ ColourTable(TQWidget *parent, ColourMap &input, ColourList &list);
void populate_table(ColourMap &input, ColourList &list);
diff --git a/src/gui/widgets/CurrentProgressDialog.h b/src/gui/widgets/CurrentProgressDialog.h
index 90823ea..4a1de52 100644
--- a/src/gui/widgets/CurrentProgressDialog.h
+++ b/src/gui/widgets/CurrentProgressDialog.h
@@ -65,8 +65,8 @@ public slots:
void slotCurrentProgressDialogDestroyed();
protected:
- CurrentProgressDialog(TQObject* tqparent, const char* name = 0)
- : TQObject(tqparent, name) {}
+ CurrentProgressDialog(TQObject* parent, const char* name = 0)
+ : TQObject(parent, name) {}
//--------------- Data members ---------------------------------
static CurrentProgressDialog* m_instance;
diff --git a/src/gui/widgets/DiatonicPitchChooser.cpp b/src/gui/widgets/DiatonicPitchChooser.cpp
index 13fe3b5..c1a800a 100644
--- a/src/gui/widgets/DiatonicPitchChooser.cpp
+++ b/src/gui/widgets/DiatonicPitchChooser.cpp
@@ -43,11 +43,11 @@ namespace Rosegarden
{
DiatonicPitchChooser::DiatonicPitchChooser(TQString title,
- TQWidget *tqparent,
+ TQWidget *parent,
int defaultNote,
int defaultPitch,
int defaultOctave) :
- TQGroupBox(1, Qt::Horizontal, title, tqparent),
+ TQGroupBox(1, Qt::Horizontal, title, parent),
m_defaultPitch(defaultPitch)
{
m_pitchDragLabel = new PitchDragLabel(this, defaultPitch);
diff --git a/src/gui/widgets/DiatonicPitchChooser.h b/src/gui/widgets/DiatonicPitchChooser.h
index 7992a76..26f983a 100644
--- a/src/gui/widgets/DiatonicPitchChooser.h
+++ b/src/gui/widgets/DiatonicPitchChooser.h
@@ -48,7 +48,7 @@ class DiatonicPitchChooser : public TQGroupBox
TQ_OBJECT
public:
DiatonicPitchChooser(TQString title,
- TQWidget *tqparent,
+ TQWidget *parent,
int defaultNote = 0,
int defaultPitch = 60,
int defaultOctave = 5);
diff --git a/src/gui/widgets/Fader.cpp b/src/gui/widgets/Fader.cpp
index 54c746f..022f0ca 100644
--- a/src/gui/widgets/Fader.cpp
+++ b/src/gui/widgets/Fader.cpp
@@ -45,8 +45,8 @@ Fader::PixmapCache Fader::m_pixmapCache;
Fader::Fader(AudioLevel::FaderType type,
- int w, int h, TQWidget *tqparent) :
- TQWidget(tqparent),
+ int w, int h, TQWidget *parent) :
+ TQWidget(parent),
m_integral(false),
m_vertical(h > w),
m_min(0),
@@ -83,8 +83,8 @@ Fader::Fader(AudioLevel::FaderType type,
}
Fader::Fader(int min, int max, int deflt,
- int w, int h, TQWidget *tqparent) :
- TQWidget(tqparent),
+ int w, int h, TQWidget *parent) :
+ TQWidget(parent),
m_integral(true),
m_vertical(h > w),
m_min(min),
@@ -120,8 +120,8 @@ Fader::Fader(int min, int max, int deflt,
}
Fader::Fader(int min, int max, int deflt,
- bool vertical, TQWidget *tqparent) :
- TQWidget(tqparent),
+ bool vertical, TQWidget *parent) :
+ TQWidget(parent),
m_integral(true),
m_vertical(vertical),
m_min(min),
diff --git a/src/gui/widgets/Fader.h b/src/gui/widgets/Fader.h
index dad638b..7abb3fc 100644
--- a/src/gui/widgets/Fader.h
+++ b/src/gui/widgets/Fader.h
@@ -57,21 +57,21 @@ public:
* based on the given dimensions.
*/
Fader(AudioLevel::FaderType,
- int width, int height, TQWidget *tqparent);
+ int width, int height, TQWidget *parent);
/**
* Construct a fader on an integral scale. The fader calculates
* its orientation based on the given dimensions.
*/
Fader(int min, int max, int deflt,
- int width, int height, TQWidget *tqparent);
+ int width, int height, TQWidget *parent);
/**
* Construct a fader on an integral scale, with a 1:1 ratio of
* pixel positions and values.
*/
Fader(int min, int max, int deflt,
- bool vertical, TQWidget *tqparent);
+ bool vertical, TQWidget *parent);
virtual ~Fader();
diff --git a/src/gui/widgets/HSpinBox.cpp b/src/gui/widgets/HSpinBox.cpp
index 637c010..e49cf1b 100644
--- a/src/gui/widgets/HSpinBox.cpp
+++ b/src/gui/widgets/HSpinBox.cpp
@@ -46,9 +46,9 @@ int HSpinBox::mapTextToValue( bool* ok )
return int(f * m_scaleFactor);
}
-HSpinBox::HSpinBox( int minV, int maxV, int step, TQWidget* tqparent,
+HSpinBox::HSpinBox( int minV, int maxV, int step, TQWidget* parent,
double bottom, double top, int decimals, float initialValue)
- : TQSpinBox(minV,maxV,step,tqparent)
+ : TQSpinBox(minV,maxV,step,parent)
{
setValidator(new TQDoubleValidator(bottom,top,decimals,TQT_TQOBJECT(this)));
initialize(decimals);
@@ -56,11 +56,11 @@ HSpinBox::HSpinBox( int minV, int maxV, int step, TQWidget* tqparent,
}
//constructor with default settings
-HSpinBox::HSpinBox( TQWidget* tqparent, float initialValue, int step,
+HSpinBox::HSpinBox( TQWidget* parent, float initialValue, int step,
double bottom, double top, int decimals,
const TQObject* recv, const char* mem)
: TQSpinBox((int)(bottom*pow(10.0, decimals)),
- (int)(top*pow(10.0, decimals)), step, tqparent)
+ (int)(top*pow(10.0, decimals)), step, parent)
{
setValidator(new TQDoubleValidator(bottom,top,decimals,TQT_TQOBJECT(this)));
initialize(decimals);
diff --git a/src/gui/widgets/HSpinBox.h b/src/gui/widgets/HSpinBox.h
index 584d086..52c336d 100644
--- a/src/gui/widgets/HSpinBox.h
+++ b/src/gui/widgets/HSpinBox.h
@@ -42,11 +42,11 @@ class HSpinBox : public TQSpinBox
int mapTextToValue( bool* ok );
public:
- HSpinBox( int minV, int maxV, int step, TQWidget* tqparent,
+ HSpinBox( int minV, int maxV, int step, TQWidget* parent,
double bottom, double top, int decimals, float initialValue);
//constructor with default settings
- HSpinBox( TQWidget* tqparent, float initialValue = 0.2, int step=1,
+ HSpinBox( TQWidget* parent, float initialValue = 0.2, int step=1,
double bottom=-25.0, double top=25.0, int decimals=3,
const TQObject* recv=NULL, const char* mem=NULL);
diff --git a/src/gui/widgets/Label.h b/src/gui/widgets/Label.h
index 60c98fa..e50f7f2 100644
--- a/src/gui/widgets/Label.h
+++ b/src/gui/widgets/Label.h
@@ -42,8 +42,8 @@ class Label : public TQLabel
Q_OBJECT
TQ_OBJECT
public:
- Label(TQWidget *tqparent = 0, const char *name=0):
- TQLabel(tqparent, name) {;}
+ Label(TQWidget *parent = 0, const char *name=0):
+ TQLabel(parent, name) {;}
protected:
virtual void mouseDoubleClickEvent(TQMouseEvent * /*e*/)
diff --git a/src/gui/widgets/MidiFaderWidget.h b/src/gui/widgets/MidiFaderWidget.h
index 0e24bfa..57ec254 100644
--- a/src/gui/widgets/MidiFaderWidget.h
+++ b/src/gui/widgets/MidiFaderWidget.h
@@ -49,7 +49,7 @@ class MidiFaderWidget : public TQFrame
TQ_OBJECT
public:
- MidiFaderWidget(TQWidget *tqparent,
+ MidiFaderWidget(TQWidget *parent,
TQString id = "");
AudioVUMeter *m_vuMeter;
diff --git a/src/gui/widgets/PitchChooser.cpp b/src/gui/widgets/PitchChooser.cpp
index b46efda..869d11c 100644
--- a/src/gui/widgets/PitchChooser.cpp
+++ b/src/gui/widgets/PitchChooser.cpp
@@ -40,9 +40,9 @@ namespace Rosegarden
{
PitchChooser::PitchChooser(TQString title,
- TQWidget *tqparent,
+ TQWidget *parent,
int defaultPitch) :
- TQGroupBox(1, Qt::Horizontal, title, tqparent),
+ TQGroupBox(1, Qt::Horizontal, title, parent),
m_defaultPitch(defaultPitch)
{
m_pitchDragLabel = new PitchDragLabel(this, defaultPitch);
diff --git a/src/gui/widgets/PitchChooser.h b/src/gui/widgets/PitchChooser.h
index ef6dcf5..bc8e742 100644
--- a/src/gui/widgets/PitchChooser.h
+++ b/src/gui/widgets/PitchChooser.h
@@ -47,7 +47,7 @@ class PitchChooser : public TQGroupBox
TQ_OBJECT
public:
PitchChooser(TQString title,
- TQWidget *tqparent,
+ TQWidget *parent,
int defaultPitch = 60);
int getPitch() const;
diff --git a/src/gui/widgets/PitchDragLabel.cpp b/src/gui/widgets/PitchDragLabel.cpp
index 55a06d5..b43c15f 100644
--- a/src/gui/widgets/PitchDragLabel.cpp
+++ b/src/gui/widgets/PitchDragLabel.cpp
@@ -38,10 +38,10 @@
namespace Rosegarden
{
-PitchDragLabel::PitchDragLabel(TQWidget *tqparent,
+PitchDragLabel::PitchDragLabel(TQWidget *parent,
int defaultPitch,
bool defaultSharps) :
- TQWidget(tqparent),
+ TQWidget(parent),
m_pitch(defaultPitch),
m_usingSharps(defaultSharps),
m_clickedY(0),
diff --git a/src/gui/widgets/PitchDragLabel.h b/src/gui/widgets/PitchDragLabel.h
index 1be7232..6f11b17 100644
--- a/src/gui/widgets/PitchDragLabel.h
+++ b/src/gui/widgets/PitchDragLabel.h
@@ -47,7 +47,7 @@ class PitchDragLabel : public TQWidget
Q_OBJECT
TQ_OBJECT
public:
- PitchDragLabel(TQWidget *tqparent,
+ PitchDragLabel(TQWidget *parent,
int defaultPitch = 60, bool defaultSharps = true);
~PitchDragLabel();
diff --git a/src/gui/widgets/PluginControl.cpp b/src/gui/widgets/PluginControl.cpp
index 1f546da..0c998f3 100644
--- a/src/gui/widgets/PluginControl.cpp
+++ b/src/gui/widgets/PluginControl.cpp
@@ -43,7 +43,7 @@
namespace Rosegarden
{
-PluginControl::PluginControl(TQWidget *tqparent,
+PluginControl::PluginControl(TQWidget *parent,
TQGridLayout *tqlayout,
ControlType type,
PluginPort *port,
@@ -52,7 +52,7 @@ PluginControl::PluginControl(TQWidget *tqparent,
float initialValue,
bool showBounds,
bool hidden):
- TQObject(tqparent),
+ TQObject(parent),
m_tqlayout(tqlayout),
m_type(type),
m_port(port),
@@ -63,7 +63,7 @@ PluginControl::PluginControl(TQWidget *tqparent,
plainFont.setPointSize((plainFont.pointSize() * 9 ) / 10);
TQLabel *controlTitle =
- new TQLabel(TQString("%1 ").tqarg(strtoqstr(port->getName())), tqparent);
+ new TQLabel(TQString("%1 ").tqarg(strtoqstr(port->getName())), parent);
controlTitle->setFont(plainFont);
if (type == Rotary) {
@@ -121,9 +121,9 @@ PluginControl::PluginControl(TQWidget *tqparent,
TQLabel *low;
if (port->getDisplayHint() &
(PluginPort::Integer | PluginPort::Toggled)) {
- low = new TQLabel(TQString("%1").tqarg(int(displayLower)), tqparent);
+ low = new TQLabel(TQString("%1").tqarg(int(displayLower)), parent);
} else {
- low = new TQLabel(TQString("%1").tqarg(displayLower), tqparent);
+ low = new TQLabel(TQString("%1").tqarg(displayLower), parent);
}
low->setFont(plainFont);
@@ -134,7 +134,7 @@ PluginControl::PluginControl(TQWidget *tqparent,
// << ", actual upper " << upperBound << ", step "
// << step << std::endl;
- m_dial = new ::Rosegarden::Rotary(tqparent,
+ m_dial = new ::Rosegarden::Rotary(parent,
lowerBound, // min
upperBound, // max
step, // step
@@ -154,9 +154,9 @@ PluginControl::PluginControl(TQWidget *tqparent,
TQLabel *upp;
if (port->getDisplayHint() &
(PluginPort::Integer | PluginPort::Toggled)) {
- upp = new TQLabel(TQString("%1").tqarg(int(displayUpper)), tqparent);
+ upp = new TQLabel(TQString("%1").tqarg(int(displayUpper)), parent);
} else {
- upp = new TQLabel(TQString("%1").tqarg(displayUpper), tqparent);
+ upp = new TQLabel(TQString("%1").tqarg(displayUpper), parent);
}
upp->setFont(plainFont);
diff --git a/src/gui/widgets/PluginControl.h b/src/gui/widgets/PluginControl.h
index 468bb09..de90836 100644
--- a/src/gui/widgets/PluginControl.h
+++ b/src/gui/widgets/PluginControl.h
@@ -56,7 +56,7 @@ public:
NumericSlider
} ControlType;
- PluginControl(TQWidget *tqparent,
+ PluginControl(TQWidget *parent,
TQGridLayout *tqlayout,
ControlType type,
PluginPort *port,
diff --git a/src/gui/widgets/QDeferScrollView.cpp b/src/gui/widgets/QDeferScrollView.cpp
index 35f098e..6363239 100644
--- a/src/gui/widgets/QDeferScrollView.cpp
+++ b/src/gui/widgets/QDeferScrollView.cpp
@@ -32,8 +32,8 @@
namespace Rosegarden
{
-QDeferScrollView::QDeferScrollView(TQWidget* tqparent, const char *name, WFlags f)
- : TQScrollView(tqparent, name, f)
+QDeferScrollView::QDeferScrollView(TQWidget* parent, const char *name, WFlags f)
+ : TQScrollView(parent, name, f)
{
setFocusPolicy(TQ_WheelFocus);
}
diff --git a/src/gui/widgets/QDeferScrollView.h b/src/gui/widgets/QDeferScrollView.h
index d9a1d36..f8504ff 100644
--- a/src/gui/widgets/QDeferScrollView.h
+++ b/src/gui/widgets/QDeferScrollView.h
@@ -58,7 +58,7 @@ class QDeferScrollView : public TQScrollView
Q_OBJECT
TQ_OBJECT
public:
- QDeferScrollView(TQWidget* tqparent=0, const char *name=0, WFlags f=0);
+ QDeferScrollView(TQWidget* parent=0, const char *name=0, WFlags f=0);
void setBottomMargin(int);
diff --git a/src/gui/widgets/QuantizeParameters.cpp b/src/gui/widgets/QuantizeParameters.cpp
index a00969a..132aaef 100644
--- a/src/gui/widgets/QuantizeParameters.cpp
+++ b/src/gui/widgets/QuantizeParameters.cpp
@@ -52,13 +52,13 @@
namespace Rosegarden
{
-QuantizeParameters::QuantizeParameters(TQWidget *tqparent,
+QuantizeParameters::QuantizeParameters(TQWidget *parent,
QuantizerType defaultQuantizer,
bool showNotationOption,
bool showAdvancedButton,
TQString configCategory,
TQString preamble) :
- TQFrame(tqparent),
+ TQFrame(parent),
m_configCategory(configCategory),
m_standardQuantizations
(BasicQuantizer::getStandardQuantizations())
diff --git a/src/gui/widgets/QuantizeParameters.h b/src/gui/widgets/QuantizeParameters.h
index 97a6350..c9c45b6 100644
--- a/src/gui/widgets/QuantizeParameters.h
+++ b/src/gui/widgets/QuantizeParameters.h
@@ -54,7 +54,7 @@ class QuantizeParameters : public TQFrame
public:
enum QuantizerType { Grid, Legato, Notation };
- QuantizeParameters(TQWidget *tqparent,
+ QuantizeParameters(TQWidget *parent,
QuantizerType defaultQuantizer,
bool showNotationOption,
bool showAdvancedButton,
diff --git a/src/gui/widgets/RosegardenPopupMenu.h b/src/gui/widgets/RosegardenPopupMenu.h
index f16b2f7..5385e52 100644
--- a/src/gui/widgets/RosegardenPopupMenu.h
+++ b/src/gui/widgets/RosegardenPopupMenu.h
@@ -33,7 +33,7 @@ class RosegardenPopupMenu : public TQPopupMenu
{
// just to make itemHeight public
public:
- RosegardenPopupMenu(TQWidget *tqparent) : TQPopupMenu(tqparent) { }
+ RosegardenPopupMenu(TQWidget *parent) : TQPopupMenu(parent) { }
using TQPopupMenu::itemHeight;
};
diff --git a/src/gui/widgets/Rotary.cpp b/src/gui/widgets/Rotary.cpp
index a011275..c700e54 100644
--- a/src/gui/widgets/Rotary.cpp
+++ b/src/gui/widgets/Rotary.cpp
@@ -60,7 +60,7 @@ static TQTimer *_floatTimer = 0;
Rotary::PixmapCache Rotary::m_pixmaps;
-Rotary::Rotary(TQWidget *tqparent,
+Rotary::Rotary(TQWidget *parent,
float minValue,
float maxValue,
float step,
@@ -71,7 +71,7 @@ Rotary::Rotary(TQWidget *tqparent,
bool snapToTicks,
bool centred,
bool logarithmic) :
- TQWidget(tqparent),
+ TQWidget(parent),
m_minValue(minValue),
m_maxValue(maxValue),
m_step(step),
diff --git a/src/gui/widgets/Rotary.h b/src/gui/widgets/Rotary.h
index f399eab..9cc8901 100644
--- a/src/gui/widgets/Rotary.h
+++ b/src/gui/widgets/Rotary.h
@@ -56,7 +56,7 @@ public:
StepTicks // end points plus every step interval
};
- Rotary(TQWidget *tqparent,
+ Rotary(TQWidget *parent,
float minValue = 0.0,
float maxValue = 100.0,
float step = 1.0,
diff --git a/src/gui/widgets/ScrollBox.cpp b/src/gui/widgets/ScrollBox.cpp
index 66e32e2..66ecc21 100644
--- a/src/gui/widgets/ScrollBox.cpp
+++ b/src/gui/widgets/ScrollBox.cpp
@@ -43,8 +43,8 @@
namespace Rosegarden
{
-ScrollBox::ScrollBox(TQWidget* tqparent, SizeMode sizeMode, const char* name) :
- TQFrame(tqparent, name),
+ScrollBox::ScrollBox(TQWidget* parent, SizeMode sizeMode, const char* name) :
+ TQFrame(parent, name),
m_sizeMode(sizeMode)
{
setFrameStyle(Panel | Sunken);
diff --git a/src/gui/widgets/ScrollBox.h b/src/gui/widgets/ScrollBox.h
index aeca48d..e9dab4d 100644
--- a/src/gui/widgets/ScrollBox.h
+++ b/src/gui/widgets/ScrollBox.h
@@ -52,7 +52,7 @@ class ScrollBox: public TQFrame
public:
enum SizeMode { FixWidth, FixHeight };
- ScrollBox(TQWidget *tqparent = 0,
+ ScrollBox(TQWidget *parent = 0,
SizeMode mode = FixWidth,
const char *name = 0);
diff --git a/src/gui/widgets/ScrollBoxDialog.cpp b/src/gui/widgets/ScrollBoxDialog.cpp
index f262605..008c868 100644
--- a/src/gui/widgets/ScrollBoxDialog.cpp
+++ b/src/gui/widgets/ScrollBoxDialog.cpp
@@ -38,11 +38,11 @@
namespace Rosegarden
{
-ScrollBoxDialog::ScrollBoxDialog(TQWidget *tqparent,
+ScrollBoxDialog::ScrollBoxDialog(TQWidget *parent,
ScrollBox::SizeMode sizeMode,
const char *name,
WFlags flags) :
- KDialog(tqparent, name, flags),
+ KDialog(parent, name, flags),
m_scrollbox(new ScrollBox(this, sizeMode))
{ }
diff --git a/src/gui/widgets/ScrollBoxDialog.h b/src/gui/widgets/ScrollBoxDialog.h
index 722f518..a3671bb 100644
--- a/src/gui/widgets/ScrollBoxDialog.h
+++ b/src/gui/widgets/ScrollBoxDialog.h
@@ -46,7 +46,7 @@ class ScrollBoxDialog : public KDialog
TQ_OBJECT
public:
- ScrollBoxDialog(TQWidget *tqparent = 0,
+ ScrollBoxDialog(TQWidget *parent = 0,
ScrollBox::SizeMode mode = ScrollBox::FixWidth,
const char *name = 0,
WFlags flags = 0);
diff --git a/src/gui/widgets/SpinBox.cpp b/src/gui/widgets/SpinBox.cpp
index ec77fda..1222f13 100644
--- a/src/gui/widgets/SpinBox.cpp
+++ b/src/gui/widgets/SpinBox.cpp
@@ -34,8 +34,8 @@
namespace Rosegarden
{
-SpinBox::SpinBox(TQWidget *tqparent, const char *name):
- TQSpinBox(tqparent, name), m_doubleValue(0)
+SpinBox::SpinBox(TQWidget *parent, const char *name):
+ TQSpinBox(parent, name), m_doubleValue(0)
{}
TQString
diff --git a/src/gui/widgets/SpinBox.h b/src/gui/widgets/SpinBox.h
index 25d99bb..0a9740b 100644
--- a/src/gui/widgets/SpinBox.h
+++ b/src/gui/widgets/SpinBox.h
@@ -48,7 +48,7 @@ class SpinBox : public TQSpinBox
Q_OBJECT
TQ_OBJECT
public:
- SpinBox(TQWidget *tqparent = 0, const char *name=0);
+ SpinBox(TQWidget *parent = 0, const char *name=0);
double getDoubleValue() const { return m_doubleValue; }
diff --git a/src/gui/widgets/TextFloat.cpp b/src/gui/widgets/TextFloat.cpp
index 5bc9446..d3cc9d5 100644
--- a/src/gui/widgets/TextFloat.cpp
+++ b/src/gui/widgets/TextFloat.cpp
@@ -39,8 +39,8 @@
namespace Rosegarden
{
-TextFloat::TextFloat(TQWidget *tqparent):
- TQWidget(tqparent, "TextFloat",
+TextFloat::TextFloat(TQWidget *parent):
+ TQWidget(parent, "TextFloat",
WStyle_Customize | WStyle_NoBorder | WStyle_StaysOnTop),
m_text("")
{
@@ -61,9 +61,9 @@ TextFloat::reparent(TQWidget *newParent)
position += newParent->pos();
}
- // Position this widget to the right of the tqparent
+ // Position this widget to the right of the parent
//
- //move(pos + TQPoint(tqparent->width() + 5, 5));
+ //move(pos + TQPoint(parent->width() + 5, 5));
TQWidget::reparent(newParent,
WStyle_Customize | WStyle_NoBorder | WStyle_StaysOnTop,
diff --git a/src/gui/widgets/TextFloat.h b/src/gui/widgets/TextFloat.h
index d68cd4d..5fa5448 100644
--- a/src/gui/widgets/TextFloat.h
+++ b/src/gui/widgets/TextFloat.h
@@ -41,12 +41,12 @@ namespace Rosegarden
class TextFloat : public TQWidget
{
public:
- TextFloat(TQWidget *tqparent);
+ TextFloat(TQWidget *parent);
virtual ~TextFloat() {;}
void setText(const TQString &text);
- // Retqparent the float correctly by context
+ // Reparent the float correctly by context
//
void reparent(TQWidget *newParent);
diff --git a/src/gui/widgets/TimeWidget.cpp b/src/gui/widgets/TimeWidget.cpp
index df177a4..82877f8 100644
--- a/src/gui/widgets/TimeWidget.cpp
+++ b/src/gui/widgets/TimeWidget.cpp
@@ -48,12 +48,12 @@ namespace Rosegarden
{
TimeWidget::TimeWidget(TQString title,
- TQWidget *tqparent,
+ TQWidget *parent,
Composition *composition,
timeT absTime,
bool editable,
bool constrainToCompositionDuration) :
- TQGroupBox(1, Qt::Horizontal, title, tqparent),
+ TQGroupBox(1, Qt::Horizontal, title, parent),
m_composition(composition),
m_isDuration(false),
m_constrain(constrainToCompositionDuration),
@@ -65,13 +65,13 @@ TimeWidget::TimeWidget(TQString title,
}
TimeWidget::TimeWidget(TQString title,
- TQWidget *tqparent,
+ TQWidget *parent,
Composition *composition,
timeT startTime,
timeT duration,
bool editable,
bool constrainToCompositionDuration) :
- TQGroupBox(1, Qt::Horizontal, title, tqparent),
+ TQGroupBox(1, Qt::Horizontal, title, parent),
m_composition(composition),
m_isDuration(true),
m_constrain(constrainToCompositionDuration),
diff --git a/src/gui/widgets/TimeWidget.h b/src/gui/widgets/TimeWidget.h
index 4ede052..6daa6a0 100644
--- a/src/gui/widgets/TimeWidget.h
+++ b/src/gui/widgets/TimeWidget.h
@@ -55,7 +55,7 @@ public:
* Constructor for absolute time widget
*/
TimeWidget(TQString title,
- TQWidget *tqparent,
+ TQWidget *parent,
Composition *composition, // for bar/beat/msec
timeT initialTime,
bool editable = true,
@@ -67,7 +67,7 @@ public:
* correct real-time (based on tempo at startTime) etc.
*/
TimeWidget(TQString title,
- TQWidget *tqparent,
+ TQWidget *parent,
Composition *composition, // for bar/beat/msec
timeT startTime,
timeT initialDuration,
diff --git a/src/gui/widgets/TristateCheckBox.h b/src/gui/widgets/TristateCheckBox.h
index 4d8f318..ab38db7 100644
--- a/src/gui/widgets/TristateCheckBox.h
+++ b/src/gui/widgets/TristateCheckBox.h
@@ -47,8 +47,8 @@ class TristateCheckBox : public TQCheckBox
Q_OBJECT
TQ_OBJECT
public:
- TristateCheckBox(TQWidget *tqparent=0,
- const char *name=0):TQCheckBox(tqparent, name)
+ TristateCheckBox(TQWidget *parent=0,
+ const char *name=0):TQCheckBox(parent, name)
{ setTristate(true) ;}
virtual ~TristateCheckBox();
diff --git a/src/gui/widgets/VUMeter.cpp b/src/gui/widgets/VUMeter.cpp
index d963cc6..2aa89e9 100644
--- a/src/gui/widgets/VUMeter.cpp
+++ b/src/gui/widgets/VUMeter.cpp
@@ -40,7 +40,7 @@
namespace Rosegarden
{
-VUMeter::VUMeter(TQWidget *tqparent,
+VUMeter::VUMeter(TQWidget *parent,
VUMeterType type,
bool stereo,
bool hasRecord,
@@ -48,7 +48,7 @@ VUMeter::VUMeter(TQWidget *tqparent,
int height,
VUAlignment tqalignment,
const char *name):
- TQLabel(tqparent, name),
+ TQLabel(parent, name),
m_originalHeight(height),
m_active(true),
m_type(type),
diff --git a/src/gui/widgets/VUMeter.h b/src/gui/widgets/VUMeter.h
index 610d87c..53c90b3 100644
--- a/src/gui/widgets/VUMeter.h
+++ b/src/gui/widgets/VUMeter.h
@@ -83,7 +83,7 @@ protected:
// Constructor is protected - we can only create an object
// from a sub-class of this type from a sub-class.
//
- VUMeter(TQWidget *tqparent = 0,
+ VUMeter(TQWidget *parent = 0,
VUMeterType type = Plain,
bool stereo = false,
bool hasRecord = false,
diff --git a/src/gui/widgets/ZoomSlider.h b/src/gui/widgets/ZoomSlider.h
index 9cf58ab..5d37ab8 100644
--- a/src/gui/widgets/ZoomSlider.h
+++ b/src/gui/widgets/ZoomSlider.h
@@ -60,7 +60,7 @@ public:
* to the user as a nice continuous range.
*/
ZoomSlider(const std::vector<T> &sizes, T defaultValue,
- Qt::Orientation, TQWidget * tqparent, const char * name=0);
+ Qt::Orientation, TQWidget * parent, const char * name=0);
virtual ~ZoomSlider();
@@ -85,9 +85,9 @@ protected:
template<class T>
ZoomSlider<T>::ZoomSlider(const std::vector<T> &sizes,
T initialSize, Qt::Orientation o,
- TQWidget *tqparent, const char *name) :
+ TQWidget *parent, const char *name) :
TQSlider(0, sizes.size()-1, 1,
- getIndex(sizes, initialSize), o, tqparent, name),
+ getIndex(sizes, initialSize), o, parent, name),
m_sizes(sizes),
m_defaultValue(initialSize)
{
diff --git a/src/sequencer/main.cpp b/src/sequencer/main.cpp
index 3b6daec..4c10362 100644
--- a/src/sequencer/main.cpp
+++ b/src/sequencer/main.cpp
@@ -70,7 +70,7 @@ int main(int argc, char *argv[])
srandom((unsigned int)time(0) * (unsigned int)getpid());
// Block signals during startup, so that child threads (inheriting
- // this tqmask) ignore them; then after startup we can unblock them
+ // this mask) ignore them; then after startup we can unblock them
// for this thread only. This trick picked up from the jackd code.
sigemptyset (&_signals);
sigaddset(&_signals, SIGHUP);
diff --git a/src/sound/AlsaDriver.cpp b/src/sound/AlsaDriver.cpp
index f486ac7..a0ac79c 100644
--- a/src/sound/AlsaDriver.cpp
+++ b/src/sound/AlsaDriver.cpp
@@ -347,7 +347,7 @@ AlsaDriver::getAutoTimer(bool &wantTimerChecks)
{
Audit audit;
- // Look for the aptqparent best-choice timer.
+ // Look for the apparent best-choice timer.
if (m_timers.empty())
return "";
diff --git a/src/sound/MappedStudio.cpp b/src/sound/MappedStudio.cpp
index 3d9dbb8..1bb6cec 100644
--- a/src/sound/MappedStudio.cpp
+++ b/src/sound/MappedStudio.cpp
@@ -265,7 +265,7 @@ MappedObject::destroy()
MappedStudio *studio = dynamic_cast<MappedStudio*>(studioObject);
// The destroy method on each child calls studio->clearObject,
- // which calls back on the tqparent (in this case us) to remove the
+ // which calls back on the parent (in this case us) to remove the
// child. (That's necessary for the case of destroying a plugin,
// where we need to remove it from its plugin manager -- etc.) So
// we don't want to be iterating over m_tqchildren here, as it will
@@ -387,7 +387,7 @@ MappedStudio::createObject(MappedObjectType type,
} else if (type == MappedObject::PluginPort) {
mO = new MappedPluginPort(this,
id);
- // reset the port's tqparent after creation outside this method
+ // reset the port's parent after creation outside this method
}
// Insert
@@ -597,11 +597,11 @@ MappedStudio::clearObject(MappedObjectId id)
MappedObjectCategory::iterator j = i->second.find(id);
if (j != i->second.end()) {
- // if the object has a tqparent other than the studio,
- // persuade that tqparent to abandon it
- MappedObject *tqparent = j->second->getParent();
- if (tqparent && !dynamic_cast<MappedStudio *>(tqparent)) {
- tqparent->removeChild(j->second);
+ // if the object has a parent other than the studio,
+ // persuade that parent to abandon it
+ MappedObject *parent = j->second->getParent();
+ if (parent && !dynamic_cast<MappedStudio *>(parent)) {
+ parent->removeChild(j->second);
}
i->second.erase(j);
@@ -776,11 +776,11 @@ MappedStudio::getAudioInput(int inputNumber)
// -------------- MappedConnectableObject -----------------
//
//
-MappedConnectableObject::MappedConnectableObject(MappedObject *tqparent,
+MappedConnectableObject::MappedConnectableObject(MappedObject *parent,
const std::string &name,
MappedObjectType type,
MappedObjectId id):
- MappedObject(tqparent,
+ MappedObject(parent,
name,
type,
id)
@@ -842,10 +842,10 @@ MappedConnectableObject::getConnections(ConnectionDirection dir)
// ------------ MappedAudioFader ----------------
//
-MappedAudioFader::MappedAudioFader(MappedObject *tqparent,
+MappedAudioFader::MappedAudioFader(MappedObject *parent,
MappedObjectId id,
MappedObjectValue channels):
- MappedConnectableObject(tqparent,
+ MappedConnectableObject(parent,
"MappedAudioFader",
AudioFader,
id),
@@ -987,9 +987,9 @@ MappedAudioFader::setProperty(const MappedObjectProperty &property,
// ---------------- MappedAudioBuss -------------------
//
//
-MappedAudioBuss::MappedAudioBuss(MappedObject *tqparent,
+MappedAudioBuss::MappedAudioBuss(MappedObject *parent,
MappedObjectId id) :
- MappedConnectableObject(tqparent,
+ MappedConnectableObject(parent,
"MappedAudioBuss",
AudioBuss,
id),
@@ -1133,9 +1133,9 @@ MappedAudioBuss::getInstruments()
// ---------------- MappedAudioInput -------------------
//
//
-MappedAudioInput::MappedAudioInput(MappedObject *tqparent,
+MappedAudioInput::MappedAudioInput(MappedObject *parent,
MappedObjectId id) :
- MappedConnectableObject(tqparent,
+ MappedConnectableObject(parent,
"MappedAudioInput",
AudioInput,
id)
@@ -1191,8 +1191,8 @@ MappedAudioInput::setProperty(const MappedObjectProperty &property,
}
-MappedPluginSlot::MappedPluginSlot(MappedObject *tqparent, MappedObjectId id) :
- MappedObject(tqparent, "MappedPluginSlot", PluginSlot, id)
+MappedPluginSlot::MappedPluginSlot(MappedObject *parent, MappedObjectId id) :
+ MappedObject(parent, "MappedPluginSlot", PluginSlot, id)
{
#ifdef DEBUG_MAPPEDSTUDIO
std::cerr << "MappedPluginSlot::MappedPluginSlot: id = " << id << std::endl;
@@ -1548,8 +1548,8 @@ MappedPluginSlot::getPort(unsigned long portNumber)
}
-MappedPluginPort::MappedPluginPort(MappedObject *tqparent, MappedObjectId id) :
- MappedObject(tqparent, "MappedPluginPort", PluginPort, id)
+MappedPluginPort::MappedPluginPort(MappedObject *parent, MappedObjectId id) :
+ MappedObject(parent, "MappedPluginPort", PluginPort, id)
{}
MappedPluginPort::~MappedPluginPort()
diff --git a/src/sound/MappedStudio.h b/src/sound/MappedStudio.h
index e7fa4f9..96c5639 100644
--- a/src/sound/MappedStudio.h
+++ b/src/sound/MappedStudio.h
@@ -71,14 +71,14 @@ public:
} MappedObjectType;
- MappedObject(MappedObject *tqparent,
+ MappedObject(MappedObject *parent,
const std::string &name,
MappedObjectType type,
MappedObjectId id):
m_type(type),
m_id(id),
m_name(name),
- m_tqparent(tqparent) {;}
+ m_parent(parent) {;}
virtual ~MappedObject() {;}
@@ -116,9 +116,9 @@ public:
// Ownership
//
- MappedObject* getParent() { return m_tqparent; }
- const MappedObject* getParent() const { return m_tqparent; }
- void setParent(MappedObject *tqparent) { m_tqparent = tqparent; }
+ MappedObject* getParent() { return m_parent; }
+ const MappedObject* getParent() const { return m_parent; }
+ void setParent(MappedObject *parent) { m_parent = parent; }
// Get a list of child ids - get a list of a certain type
//
@@ -143,7 +143,7 @@ protected:
MappedObjectId m_id;
std::string m_name;
- MappedObject *m_tqparent;
+ MappedObject *m_parent;
std::vector<MappedObject*> m_tqchildren;
};
@@ -261,7 +261,7 @@ private:
MappedObjectId m_runningObjectId;
// All of our mapped (virtual) studio resides in this container as
- // well as having all their tqparent/child relationships. Because
+ // well as having all their parent/child relationships. Because
// some things are just blobs with no connections we need to
// maintain both - don't forget about this.
//
@@ -298,7 +298,7 @@ public:
Out
} ConnectionDirection;
- MappedConnectableObject(MappedObject *tqparent,
+ MappedConnectableObject(MappedObject *parent,
const std::string &name,
MappedObjectType type,
MappedObjectId id);
@@ -335,7 +335,7 @@ public:
static const MappedObjectProperty Pan;
static const MappedObjectProperty InputChannel;
- MappedAudioFader(MappedObject *tqparent,
+ MappedAudioFader(MappedObject *parent,
MappedObjectId id,
MappedObjectValue channels = 2); // stereo default
~MappedAudioFader();
@@ -385,7 +385,7 @@ public:
static const MappedObjectProperty Pan;
static const MappedObjectProperty Level;
- MappedAudioBuss(MappedObject *tqparent,
+ MappedAudioBuss(MappedObject *parent,
MappedObjectId id);
~MappedAudioBuss();
@@ -418,7 +418,7 @@ public:
static const MappedObjectProperty InputNumber;
- MappedAudioInput(MappedObject *tqparent,
+ MappedAudioInput(MappedObject *parent,
MappedObjectId id);
~MappedAudioInput();
@@ -455,7 +455,7 @@ public:
static const MappedObjectProperty Bypassed;
static const MappedObjectProperty Configuration; // list property
- MappedPluginSlot(MappedObject *tqparent, MappedObjectId id);
+ MappedPluginSlot(MappedObject *parent, MappedObjectId id);
~MappedPluginSlot();
virtual MappedObjectPropertyList getPropertyList(
@@ -513,7 +513,7 @@ public:
static const MappedObjectProperty DisplayHint;
static const MappedObjectProperty Value;
- MappedPluginPort(MappedObject *tqparent, MappedObjectId id);
+ MappedPluginPort(MappedObject *parent, MappedObjectId id);
~MappedPluginPort();
virtual MappedObjectPropertyList getPropertyList(