diff options
Diffstat (limited to 'src/gui/dialogs')
95 files changed, 159 insertions, 159 deletions
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; |