diff options
Diffstat (limited to 'src/gui/studio')
31 files changed, 62 insertions, 62 deletions
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 |