diff options
Diffstat (limited to 'src/gui/studio')
-rw-r--r-- | src/gui/studio/AudioMixerWindow.cpp | 22 | ||||
-rw-r--r-- | src/gui/studio/AudioPluginOSCGUIManager.cpp | 20 | ||||
-rw-r--r-- | src/gui/studio/BankEditorDialog.cpp | 34 | ||||
-rw-r--r-- | src/gui/studio/DeviceEditorDialog.cpp | 2 | ||||
-rw-r--r-- | src/gui/studio/DeviceManagerDialog.cpp | 28 | ||||
-rw-r--r-- | src/gui/studio/MidiKeyMappingEditor.cpp | 2 | ||||
-rw-r--r-- | src/gui/studio/MidiMixerVUMeter.cpp | 2 | ||||
-rw-r--r-- | src/gui/studio/MidiMixerWindow.cpp | 8 | ||||
-rw-r--r-- | src/gui/studio/MidiProgramsEditor.cpp | 6 | ||||
-rw-r--r-- | src/gui/studio/NameSetEditor.cpp | 10 | ||||
-rw-r--r-- | src/gui/studio/SynthPluginManagerDialog.cpp | 14 |
11 files changed, 74 insertions, 74 deletions
diff --git a/src/gui/studio/AudioMixerWindow.cpp b/src/gui/studio/AudioMixerWindow.cpp index cb0ab64..6dced2b 100644 --- a/src/gui/studio/AudioMixerWindow.cpp +++ b/src/gui/studio/AudioMixerWindow.cpp @@ -24,7 +24,7 @@ #include "AudioMixerWindow.h" -#include <layout.h> +#include <tqlayout.h> #include <kapplication.h> #include "AudioPlugin.h" @@ -68,7 +68,7 @@ #include <tqiconset.h> #include <tqlabel.h> #include <tqobject.h> -#include <palette.h> +#include <tqpalette.h> #include <tqpixmap.h> #include <tqpushbutton.h> #include <tqstring.h> @@ -184,7 +184,7 @@ AudioMixerWindow::AudioMixerWindow(TQWidget *parent, new KRadioAction(i18n("1 Input", "%n Inputs", i), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetInputCountFromAction()), actionCollection(), - TQString("inputs_%1").arg(i).ascii()); + TQString("inputs_%1").tqarg(i).ascii()); action->setExclusiveGroup("inputs"); if (i == int(m_studio->getRecordIns().size())) action->setChecked(true); @@ -203,7 +203,7 @@ AudioMixerWindow::AudioMixerWindow(TQWidget *parent, (i18n("1 Submaster", "%n Submasters", i), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetSubmasterCountFromAction()), actionCollection(), - TQString("submasters_%1").arg(i).ascii()); + TQString("submasters_%1").tqarg(i).ascii()); action->setExclusiveGroup("submasters"); if (i == int(m_studio->getBusses().size()) - 1) action->setChecked(true); @@ -268,8 +268,8 @@ AudioMixerWindow::populate() BussList busses = m_studio->getBusses(); TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); - m_monoPixmap.load(TQString("%1/misc/mono.xpm").arg(pixmapDir)); - m_stereoPixmap.load(TQString("%1/misc/stereo.xpm").arg(pixmapDir)); + m_monoPixmap.load(TQString("%1/misc/mono.xpm").tqarg(pixmapDir)); + m_stereoPixmap.load(TQString("%1/misc/stereo.xpm").tqarg(pixmapDir)); // Total cols: is 2 for each fader, submaster or master, plus 1 // for each spacer. @@ -397,11 +397,11 @@ AudioMixerWindow::populate() TQLabel *idLabel; TQString idString; if ((*i)->getType() == Instrument::Audio) { - idString = i18n("Audio %1").arg((*i)->getId() - + idString = i18n("Audio %1").tqarg((*i)->getId() - AudioInstrumentBase + 1); idLabel = new TQLabel(idString, m_mainBox, "audioIdLabel"); } else { - idString = i18n("Synth %1").arg((*i)->getId() - + idString = i18n("Synth %1").tqarg((*i)->getId() - SoftSynthInstrumentBase + 1); idLabel = new TQLabel(idString, m_mainBox, "synthIdLabel"); } @@ -525,7 +525,7 @@ AudioMixerWindow::populate() this, TQT_SLOT(slotSelectPlugin())); } - TQLabel *idLabel = new TQLabel(i18n("Sub %1").arg(count), m_mainBox, "subMaster"); + TQLabel *idLabel = new TQLabel(i18n("Sub %1").tqarg(count), m_mainBox, "subMaster"); idLabel->setFont(boldFont); // mainLayout->addWidget(idLabel, 2, col, TQt::AlignCenter); @@ -1322,7 +1322,7 @@ AudioMixerWindow::updateMonitorMeters(SequencerMapper *mapper) // only show monitor levels when quiescent or when recording (as // record levels) if (m_document->getSequenceManager() && - m_document->getSequenceManager()->getTransportStatus() == PLAYING) { + m_document->getSequenceManager()->getTransporttqStatus() == PLAYING) { return ; } @@ -1714,7 +1714,7 @@ AudioMixerWindow::slotToggleUnassignedFaders() void AudioMixerWindow::toggleNamedWidgets(bool show, const char* const name) { - TQLayoutIterator it = m_mainBox->layout()->iterator(); + TQLayoutIterator it = m_mainBox->tqlayout()->iterator(); TQLayoutItem *child; while ( (child = it.current()) != 0 ) { TQWidget * widget = child->widget(); diff --git a/src/gui/studio/AudioPluginOSCGUIManager.cpp b/src/gui/studio/AudioPluginOSCGUIManager.cpp index 13da726..01ade9c 100644 --- a/src/gui/studio/AudioPluginOSCGUIManager.cpp +++ b/src/gui/studio/AudioPluginOSCGUIManager.cpp @@ -345,18 +345,18 @@ AudioPluginOSCGUIManager::getOSCUrl(InstrumentId instrument, int position, baseUrl += '/'; TQString url = TQString("%1%2/%3/%4/%5/%6") - .arg(baseUrl) - .arg("plugin") - .arg(type) - .arg(instrument); + .tqarg(baseUrl) + .tqarg("plugin") + .tqarg(type) + .tqarg(instrument); if (position == int(Instrument::SYNTH_PLUGIN_POSITION)) { - url = url.arg("synth"); + url = url.tqarg("synth"); } else { - url = url.arg(position); + url = url.tqarg(position); } - url = url.arg(label); + url = url.tqarg(label); return url; } @@ -444,10 +444,10 @@ AudioPluginOSCGUIManager::getFriendlyName(InstrumentId instrument, int position, return i18n("Rosegarden Plugin"); else { if (position == int(Instrument::SYNTH_PLUGIN_POSITION)) { - return i18n("Rosegarden: %1").arg(strtoqstr(container->getPresentationName())); + return i18n("Rosegarden: %1").tqarg(strtoqstr(container->getPresentationName())); } else { - return i18n("Rosegarden: %1: %2").arg(strtoqstr(container->getPresentationName())) - .arg(i18n("Plugin slot %1").arg(position)); + return i18n("Rosegarden: %1: %2").tqarg(strtoqstr(container->getPresentationName())) + .tqarg(i18n("Plugin slot %1").tqarg(position)); } } } diff --git a/src/gui/studio/BankEditorDialog.cpp b/src/gui/studio/BankEditorDialog.cpp index 096dfb9..518260d 100644 --- a/src/gui/studio/BankEditorDialog.cpp +++ b/src/gui/studio/BankEditorDialog.cpp @@ -24,7 +24,7 @@ #include "BankEditorDialog.h" -#include <layout.h> +#include <tqlayout.h> #include <kapplication.h> #include <klocale.h> @@ -100,20 +100,20 @@ BankEditorDialog::BankEditorDialog(TQWidget *parent, TQFrame* btnBox = new TQFrame(mainFrame); - btnBox->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed)); + btnBox->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed)); - TQHBoxLayout* layout = new TQHBoxLayout(btnBox, 4, 10); + TQHBoxLayout* tqlayout = new TQHBoxLayout(btnBox, 4, 10); m_closeButton = new TQPushButton(btnBox); m_applyButton = new TQPushButton(i18n("Apply"), btnBox); m_resetButton = new TQPushButton(i18n("Reset"), btnBox); - layout->addStretch(10); - layout->addWidget(m_applyButton); - layout->addWidget(m_resetButton); - layout->addSpacing(15); - layout->addWidget(m_closeButton); - layout->addSpacing(5); + tqlayout->addStretch(10); + tqlayout->addWidget(m_applyButton); + tqlayout->addWidget(m_resetButton); + tqlayout->addSpacing(15); + tqlayout->addWidget(m_closeButton); + tqlayout->addSpacing(5); connect(m_applyButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotApply())); @@ -206,8 +206,8 @@ BankEditorDialog::BankEditorDialog(TQWidget *parent, vboxLayout->addWidget(m_keyMappingEditor); m_keyMappingEditor->hide(); - m_programEditor->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred)); - m_keyMappingEditor->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred)); + m_programEditor->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred)); + m_keyMappingEditor->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred)); m_optionBox = new TQVGroupBox(i18n("Options"), vbox); vboxLayout->addWidget(m_optionBox); @@ -593,7 +593,7 @@ BankEditorDialog::updateDeviceItem(MidiDeviceListViewItem* deviceItem) // delete banks which are no longer present // - std::vector<TQListViewItem*> childrenToDelete; + std::vector<TQListViewItem*> tqchildrenToDelete; TQListViewItem* child = deviceItem->firstChild(); @@ -603,7 +603,7 @@ BankEditorDialog::updateDeviceItem(MidiDeviceListViewItem* deviceItem) dynamic_cast<MidiBankListViewItem *>(child); if (bankItem) { if (bankItem->getBank() >= int(banks.size())) - childrenToDelete.push_back(child); + tqchildrenToDelete.push_back(child); else { // update the banks MSB/LSB which might have changed bankItem->setPercussion(banks[bankItem->getBank()].isPercussion()); bankItem->setMSB(banks[bankItem->getBank()].getMSB()); @@ -615,15 +615,15 @@ BankEditorDialog::updateDeviceItem(MidiDeviceListViewItem* deviceItem) dynamic_cast<MidiKeyMapListViewItem *>(child); if (keyItem) { if (!midiDevice->getKeyMappingByName(qstrtostr(keyItem->getName()))) { - childrenToDelete.push_back(child); + tqchildrenToDelete.push_back(child); } } child = child->nextSibling(); } - for (unsigned int i = 0; i < childrenToDelete.size(); ++i) - delete childrenToDelete[i]; + for (unsigned int i = 0; i < tqchildrenToDelete.size(); ++i) + delete tqchildrenToDelete[i]; } bool @@ -1045,7 +1045,7 @@ BankEditorDialog::slotAddKeyMapping() if (n == 1) name = i18n("<new mapping>"); else - name = i18n("<new mapping %1>").arg(n); + name = i18n("<new mapping %1>").tqarg(n); } MidiKeyMapping newKeyMapping(qstrtostr(name)); diff --git a/src/gui/studio/DeviceEditorDialog.cpp b/src/gui/studio/DeviceEditorDialog.cpp index dc80ff6..79f0fbc 100644 --- a/src/gui/studio/DeviceEditorDialog.cpp +++ b/src/gui/studio/DeviceEditorDialog.cpp @@ -145,7 +145,7 @@ DeviceEditorDialog::populate() MidiDevice *md = static_cast<MidiDevice *>(*it); // if you change this string ("Device %1"), change test in slotApply - TQString deviceName = i18n("Device %1").arg(md->getId() + 1); + TQString deviceName = i18n("Device %1").tqarg(md->getId() + 1); TQString deviceLabel = strtoqstr(md->getName()); TQString connectionName = strtoqstr(md->getConnection()); diff --git a/src/gui/studio/DeviceManagerDialog.cpp b/src/gui/studio/DeviceManagerDialog.cpp index 8cc6499..6f5cbb4 100644 --- a/src/gui/studio/DeviceManagerDialog.cpp +++ b/src/gui/studio/DeviceManagerDialog.cpp @@ -62,7 +62,7 @@ #include <tqframe.h> #include <tqgrid.h> #include <tqgroupbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpushbutton.h> #include <tqsizepolicy.h> #include <tqstring.h> @@ -110,7 +110,7 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent, m_playTable->setSelectionMode(TQTable::SingleRow); TQFrame *frame = new TQFrame(groupBox); - TQVBoxLayout *vlayout = new TQVBoxLayout(frame); + TQVBoxLayout *vtqlayout = new TQVBoxLayout(frame); TQGrid *buttons = new TQGrid(2, Qt::Horizontal, frame); TQPushButton *addButton = new TQPushButton(i18n("New"), buttons); m_deletePlayButton = new TQPushButton(i18n("Delete"), buttons); @@ -118,8 +118,8 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent, m_exportButton = new TQPushButton(i18n("Export..."), buttons); m_banksButton = new TQPushButton(i18n("Banks..."), buttons); m_controllersButton = new TQPushButton(i18n("Control Events..."), buttons); - vlayout->addWidget(buttons); - vlayout->addStretch(10); + vtqlayout->addWidget(buttons); + vtqlayout->addStretch(10); TQToolTip::add (addButton, @@ -169,12 +169,12 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent, m_recordTable->setSelectionMode(TQTable::SingleRow); frame = new TQFrame(groupBox); - vlayout = new TQVBoxLayout(frame); + vtqlayout = new TQVBoxLayout(frame); buttons = new TQGrid(2, Qt::Horizontal, frame); addButton = new TQPushButton(i18n("New"), buttons); m_deleteRecordButton = new TQPushButton(i18n("Delete"), buttons); - vlayout->addWidget(buttons); - vlayout->addStretch(10); + vtqlayout->addWidget(buttons); + vtqlayout->addStretch(10); TQToolTip::add (addButton, @@ -204,15 +204,15 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent, TQFrame* btnBox = new TQFrame(mainBox); - btnBox->setSizePolicy( + btnBox->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed)); TQPushButton *closeButton = new TQPushButton(i18n("Close"), btnBox); - TQHBoxLayout* layout = new TQHBoxLayout(btnBox, 0, 10); - layout->addStretch(10); - layout->addWidget(closeButton); - layout->addSpacing(5); + TQHBoxLayout* tqlayout = new TQHBoxLayout(btnBox, 0, 10); + tqlayout->addStretch(10); + tqlayout->addWidget(closeButton); + tqlayout->addSpacing(5); KAction* close = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotClose()), @@ -326,7 +326,7 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent, m_playTable->insertRows(deviceCount, 1); - TQString deviceName = i18n("%1").arg(deviceCount + 1); + TQString deviceName = i18n("%1").tqarg(deviceCount + 1); TQString connectionName = strtoqstr((*it)->getConnection()); m_playTable->setText(deviceCount, PLAY_NAME_COL, @@ -360,7 +360,7 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent, m_recordTable->insertRows(deviceCount, 1); - TQString deviceName = i18n("%1").arg(deviceCount + 1); + TQString deviceName = i18n("%1").tqarg(deviceCount + 1); TQString connectionName = strtoqstr((*it)->getConnection()); m_recordTable->setText(deviceCount, RECORD_NAME_COL, diff --git a/src/gui/studio/MidiKeyMappingEditor.cpp b/src/gui/studio/MidiKeyMappingEditor.cpp index f3db67b..0a607ad 100644 --- a/src/gui/studio/MidiKeyMappingEditor.cpp +++ b/src/gui/studio/MidiKeyMappingEditor.cpp @@ -37,7 +37,7 @@ #include <kcompletion.h> #include <klineedit.h> #include <tqframe.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqobject.h> #include <tqobjectlist.h> diff --git a/src/gui/studio/MidiMixerVUMeter.cpp b/src/gui/studio/MidiMixerVUMeter.cpp index b882dec..db4ff13 100644 --- a/src/gui/studio/MidiMixerVUMeter.cpp +++ b/src/gui/studio/MidiMixerVUMeter.cpp @@ -39,7 +39,7 @@ MidiMixerVUMeter::MidiMixerVUMeter(TQWidget *parent, const char *name): VUMeter(parent, type, false, false, width, height, VUMeter::Vertical, name) { - setAlignment(AlignCenter); + tqsetAlignment(AlignCenter); } void diff --git a/src/gui/studio/MidiMixerWindow.cpp b/src/gui/studio/MidiMixerWindow.cpp index 89e6d32..04de306 100644 --- a/src/gui/studio/MidiMixerWindow.cpp +++ b/src/gui/studio/MidiMixerWindow.cpp @@ -24,7 +24,7 @@ #include "MidiMixerWindow.h" -#include <layout.h> +#include <tqlayout.h> #include "sound/Midi.h" #include <klocale.h> @@ -178,7 +178,7 @@ MidiMixerWindow::setupTabs() // //TQLabel *label = new TQLabel(TQString("%1 %2"). //arg(strtoqstr(dev->getName())) - //.arg(i18n("MIDI Mixer")), m_tabFrame); + //.tqarg(i18n("MIDI Mixer")), m_tabFrame); TQLabel *label = new TQLabel("", m_tabFrame); mainLayout->addMultiCellWidget(label, 0, 0, 0, 16, TQt::AlignCenter); @@ -306,8 +306,8 @@ MidiMixerWindow::setupTabs() faderCount++; } - TQString name = TQString("%1 (%2)").arg(strtoqstr(dev->getName())) - .arg(deviceCount++); + TQString name = TQString("%1 (%2)").tqarg(strtoqstr(dev->getName())) + .tqarg(deviceCount++); addTab(m_tabFrame, name); } diff --git a/src/gui/studio/MidiProgramsEditor.cpp b/src/gui/studio/MidiProgramsEditor.cpp index 6049758..4186130 100644 --- a/src/gui/studio/MidiProgramsEditor.cpp +++ b/src/gui/studio/MidiProgramsEditor.cpp @@ -43,7 +43,7 @@ #include <tqfile.h> #include <tqframe.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqobjectlist.h> #include <tqpixmap.h> #include <tqpoint.h> @@ -251,7 +251,7 @@ MidiProgramsEditor::populate(TQListViewItem* item) getEntryButton(i)->setPixmap(keyPixmap); TQToolTip::add (getEntryButton(i), - i18n("Key Mapping: %1").arg( + i18n("Key Mapping: %1").tqarg( strtoqstr(m_device->getKeyMappingForProgram(*it)->getName()))); } @@ -538,7 +538,7 @@ MidiProgramsEditor::slotEntryMenuItemSelected(int i) btn->setPixmap(TQPixmap(file)); } TQToolTip::add - (btn, i18n("Key Mapping: %1").arg(strtoqstr(newMapping))); + (btn, i18n("Key Mapping: %1").tqarg(strtoqstr(newMapping))); } btn->setEnabled(haveKeyMappings); } diff --git a/src/gui/studio/NameSetEditor.cpp b/src/gui/studio/NameSetEditor.cpp index ecf8f18..d7917bf 100644 --- a/src/gui/studio/NameSetEditor.cpp +++ b/src/gui/studio/NameSetEditor.cpp @@ -33,7 +33,7 @@ #include <tqgroupbox.h> #include <tqhbox.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpushbutton.h> #include <tqstring.h> #include <tqtabwidget.h> @@ -99,7 +99,7 @@ NameSetEditor::NameSetEditor(BankEditorDialog* bankEditor, for (unsigned int row = 0; row < 128 / (tabs*cols); ++row) { numBox = new TQHBox(v); - TQString numberText = TQString("%1").arg(labelId + 1); + TQString numberText = TQString("%1").tqarg(labelId + 1); if (tab == 0 && col == 0 && row == 0) { // Initial label; button to adjust whether labels start at 0 or 1 @@ -111,7 +111,7 @@ NameSetEditor::NameSetEditor(BankEditorDialog* bankEditor, } else { TQLabel *label = new TQLabel(numberText, numBox); label->setFixedWidth(40); - label->setAlignment(AlignCenter); + label->tqsetAlignment(AlignCenter); m_labels.push_back(label); } @@ -178,11 +178,11 @@ NameSetEditor::slotToggleInitialLabel() else index = 0; - m_initialLabel->setText(TQString("%1").arg(index++)); + m_initialLabel->setText(TQString("%1").tqarg(index++)); for (std::vector<TQLabel*>::iterator it( m_labels.begin() ); it != m_labels.end(); ++it) { - (*it)->setText(TQString("%1").arg(index++)); + (*it)->setText(TQString("%1").tqarg(index++)); } } diff --git a/src/gui/studio/SynthPluginManagerDialog.cpp b/src/gui/studio/SynthPluginManagerDialog.cpp index 17497b9..25ac584 100644 --- a/src/gui/studio/SynthPluginManagerDialog.cpp +++ b/src/gui/studio/SynthPluginManagerDialog.cpp @@ -24,7 +24,7 @@ #include "SynthPluginManagerDialog.h" -#include <layout.h> +#include <tqlayout.h> #include <klocale.h> #include "misc/Debug.h" @@ -105,7 +105,7 @@ SynthPluginManagerDialog::SynthPluginManagerDialog(TQWidget *parent, // pluginLayout->addWidget(new TQLabel(instrument->getPresentationName().c_str(), // pluginFrame), i, 0); - pluginLayout->addWidget(new TQLabel(TQString("%1").arg(i + 1), + pluginLayout->addWidget(new TQLabel(TQString("%1").tqarg(i + 1), pluginFrame), i, 0); AudioPluginInstance *plugin = instrument->getPlugin @@ -161,15 +161,15 @@ SynthPluginManagerDialog::SynthPluginManagerDialog(TQWidget *parent, TQFrame* btnBox = new TQFrame(mainBox); - btnBox->setSizePolicy( + btnBox->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed)); TQPushButton *closeButton = new TQPushButton(i18n("Close"), btnBox); - TQHBoxLayout* layout = new TQHBoxLayout(btnBox, 0, 10); - layout->addStretch(10); - layout->addWidget(closeButton); - layout->addSpacing(5); + TQHBoxLayout* tqlayout = new TQHBoxLayout(btnBox, 0, 10); + tqlayout->addStretch(10); + tqlayout->addWidget(closeButton); + tqlayout->addSpacing(5); KAction* close = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotClose()), |