diff options
Diffstat (limited to 'src/gui/dialogs')
24 files changed, 123 insertions, 123 deletions
diff --git a/src/gui/dialogs/AudioManagerDialog.cpp b/src/gui/dialogs/AudioManagerDialog.cpp index 7678473..e9a0f7c 100644 --- a/src/gui/dialogs/AudioManagerDialog.cpp +++ b/src/gui/dialogs/AudioManagerDialog.cpp @@ -343,7 +343,7 @@ AudioManagerDialog::slotPopulateFileList() // length = (*it)->getLength(); msecs.sprintf("%03d", length.nsec / 1000000); - item->setText(1, TQString("%1.%2s").tqarg(length.sec).tqarg(msecs)); + item->setText(1, TQString("%1.%2s").arg(length.sec).arg(msecs)); // set start time and duration item->setStartTime(RealTime::zeroTime); @@ -361,11 +361,11 @@ AudioManagerDialog::slotPopulateFileList() // Resolution // - item->setText(5, TQString("%1 bits").tqarg((*it)->getBitsPerSample())); + item->setText(5, TQString("%1 bits").arg((*it)->getBitsPerSample())); // Channels // - item->setText(4, TQString("%1").tqarg((*it)->getChannels())); + item->setText(4, TQString("%1").arg((*it)->getChannels())); // Sample rate // @@ -384,7 +384,7 @@ AudioManagerDialog::slotPopulateFileList() findSelection = false; } - // Add tqchildren + // Add children // for (iit = segments.begin(); iit != segments.end(); iit++) { if ((*iit)->getAudioFileId() == (*it)->getId()) { @@ -404,8 +404,8 @@ AudioManagerDialog::slotPopulateFileList() // msecs.sprintf("%03d", segmentDuration.nsec / 1000000); childItem->setText(1, TQString("%1.%2s") - .tqarg(segmentDuration.sec) - .tqarg(msecs)); + .arg(segmentDuration.sec) + .arg(msecs)); try { m_doc->getAudioFileManager(). @@ -433,7 +433,7 @@ AudioManagerDialog::slotPopulateFileList() foundSelection = true; } - // Add tqchildren + // Add children } } } @@ -607,7 +607,7 @@ AudioManagerDialog::slotRemove() if (haveSegments) { TQString question = i18n("This will unload audio file \"%1\" and remove all associated segments. Are you sure?") - .tqarg(TQString(audioFile->getFilename().c_str())); + .arg(TQString(audioFile->getFilename().c_str())); // Ask the question int reply = KMessageBox::warningContinueCancel(this, question); @@ -885,7 +885,7 @@ AudioManagerDialog::slotDeleteUnused() std::cerr << i << ": " << names[i].ascii() << std::endl; TQFile file(names[i]); if (!file.remove()) { - KMessageBox::error(this, i18n("File %1 could not be deleted.").tqarg(names[i])); + KMessageBox::error(this, i18n("File %1 could not be deleted.").arg(names[i])); } else { if (nameMap.find(names[i]) != nameMap.end()) { m_doc->getAudioFileManager().removeFile(nameMap[names[i]]); @@ -894,7 +894,7 @@ AudioManagerDialog::slotDeleteUnused() std::cerr << "WARNING: Audio file name " << names[i].ascii() << " not in name map" << std::endl; } - TQFile peakFile(TQString("%1.pk").tqarg(names[i])); + TQFile peakFile(TQString("%1.pk").arg(names[i])); peakFile.remove(); } } diff --git a/src/gui/dialogs/AudioPlayingDialog.cpp b/src/gui/dialogs/AudioPlayingDialog.cpp index af711ac..524278e 100644 --- a/src/gui/dialogs/AudioPlayingDialog.cpp +++ b/src/gui/dialogs/AudioPlayingDialog.cpp @@ -44,7 +44,7 @@ AudioPlayingDialog::AudioPlayingDialog(TQWidget *parent, { TQHBox *w = makeHBoxMainWidget(); TQLabel *label = new - TQLabel(i18n("Playing audio file \"%1\"").tqarg(name), w); + TQLabel(i18n("Playing audio file \"%1\"").arg(name), w); label->setMinimumHeight(80); diff --git a/src/gui/dialogs/AudioPluginDialog.cpp b/src/gui/dialogs/AudioPluginDialog.cpp index 469717c..9258cd7 100644 --- a/src/gui/dialogs/AudioPluginDialog.cpp +++ b/src/gui/dialogs/AudioPluginDialog.cpp @@ -383,7 +383,7 @@ AudioPluginDialog::slotPluginSelected(int i) TQString caption = strtoqstr(m_pluginContainer->getName()) + - TQString(" [ %1 ] - ").tqarg(m_index + 1); + TQString(" [ %1 ] - ").arg(m_index + 1); if (number == 0) { setCaption(caption + i18n("<no plugin>")); @@ -435,7 +435,7 @@ AudioPluginDialog::slotPluginSelected(int i) if (plugin) { setCaption(caption + plugin->getName()); - m_pluginId->setText(i18n("Id: %1").tqarg(plugin->getUniqueId())); + m_pluginId->setText(i18n("Id: %1").arg(plugin->getUniqueId())); TQString pluginInfo = plugin->getAuthor() + TQString("\n") + plugin->getCopyright(); @@ -491,7 +491,7 @@ AudioPluginDialog::slotPluginSelected(int i) else if (ins == 2 && outs == 2) m_insOuts->setText(i18n("stereo")); else - m_insOuts->setText(i18n("%1 in, %2 out").tqarg(ins).tqarg(outs)); + m_insOuts->setText(i18n("%1 in, %2 out").arg(ins).arg(outs)); TQString shortName(plugin->getName()); int parenIdx = shortName.find(" ("); diff --git a/src/gui/dialogs/AudioSplitDialog.cpp b/src/gui/dialogs/AudioSplitDialog.cpp index 171697e..74cad6a 100644 --- a/src/gui/dialogs/AudioSplitDialog.cpp +++ b/src/gui/dialogs/AudioSplitDialog.cpp @@ -212,8 +212,8 @@ AudioSplitDialog::drawPreview() char msecs[100]; sprintf(msecs, "%03d", m_segment->getAudioStartTime().msec()); TQString startText = TQString("%1.%2s") - .tqarg(m_segment->getAudioStartTime().sec) - .tqarg(msecs); + .arg(m_segment->getAudioStartTime().sec) + .arg(msecs); TQCanvasText *text = new TQCanvasText(m_canvas); text->setColor( kapp->palette().color(TQPalette::Active, TQColorGroup::Shadow)); @@ -235,8 +235,8 @@ AudioSplitDialog::drawPreview() // sprintf(msecs, "%03d", m_segment->getAudioEndTime().msec()); TQString endText = TQString("%1.%2s") - .tqarg(m_segment->getAudioEndTime().sec) - .tqarg(msecs); + .arg(m_segment->getAudioEndTime().sec) + .arg(msecs); text = new TQCanvasText(m_canvas); text->setColor( kapp->palette().color(TQPalette::Active, TQColorGroup::Shadow)); diff --git a/src/gui/dialogs/ClefDialog.cpp b/src/gui/dialogs/ClefDialog.cpp index aa439d7..c566948 100644 --- a/src/gui/dialogs/ClefDialog.cpp +++ b/src/gui/dialogs/ClefDialog.cpp @@ -246,25 +246,25 @@ ClefDialog::redrawClefPixmap() std::string type = m_clef.getClefType(); if (type == Clef::Treble) - name = name.tqarg(i18n("Treble")); + name = name.arg(i18n("Treble")); else if (type == Clef::French) - name = name.tqarg(i18n("French violin")); + name = name.arg(i18n("French violin")); else if (type == Clef::Soprano) - name = name.tqarg(i18n("Soprano")); + name = name.arg(i18n("Soprano")); else if (type == Clef::Mezzosoprano) - name = name.tqarg(i18n("Mezzo-soprano")); + name = name.arg(i18n("Mezzo-soprano")); else if (type == Clef::Alto) - name = name.tqarg(i18n("Alto")); + name = name.arg(i18n("Alto")); else if (type == Clef::Tenor) - name = name.tqarg(i18n("Tenor")); + name = name.arg(i18n("Tenor")); else if (type == Clef::Baritone) - name = name.tqarg(i18n("C-baritone")); + name = name.arg(i18n("C-baritone")); else if (type == Clef::Varbaritone) - name = name.tqarg(i18n("F-baritone")); + name = name.arg(i18n("F-baritone")); else if (type == Clef::Bass) - name = name.tqarg(i18n("Bass")); + name = name.arg(i18n("Bass")); else if (type == Clef::Subbass) - name = name.tqarg(i18n("Sub-bass")); + name = name.arg(i18n("Sub-bass")); m_clefNameLabel->setText(name); } diff --git a/src/gui/dialogs/CountdownBar.cpp b/src/gui/dialogs/CountdownBar.cpp index 5e77345..8d4d0b8 100644 --- a/src/gui/dialogs/CountdownBar.cpp +++ b/src/gui/dialogs/CountdownBar.cpp @@ -38,7 +38,7 @@ 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(); + repaint(); } void @@ -61,7 +61,7 @@ void CountdownBar::setPosition(int position) { m_position = position; - tqrepaint(); + repaint(); } } diff --git a/src/gui/dialogs/CountdownDialog.cpp b/src/gui/dialogs/CountdownDialog.cpp index 8b69eb8..d1d5fc9 100644 --- a/src/gui/dialogs/CountdownDialog.cpp +++ b/src/gui/dialogs/CountdownDialog.cpp @@ -112,10 +112,10 @@ CountdownDialog::setElapsedTime(int elapsedSeconds) if (seconds < 3600) // less than an hour { - m_time->setText(TQString("%1:%2").tqarg(m).tqarg(s)); + m_time->setText(TQString("%1:%2").arg(m).arg(s)); } else if (seconds < 86400) // less than a day { - m_time->setText(TQString("%1:%2:%3").tqarg(h).tqarg(m).tqarg(s)); + m_time->setText(TQString("%1:%2:%3").arg(h).arg(m).arg(s)); } else { m_time->setText(i18n("Just how big is your hard disk?")); } diff --git a/src/gui/dialogs/EventParameterDialog.cpp b/src/gui/dialogs/EventParameterDialog.cpp index 28beb95..98abb44 100644 --- a/src/gui/dialogs/EventParameterDialog.cpp +++ b/src/gui/dialogs/EventParameterDialog.cpp @@ -63,23 +63,23 @@ EventParameterDialog::EventParameterDialog( // create options // 0 flat - text = i18n("Flat - set %1 to value").tqarg(strtoqstr(property)); + text = i18n("Flat - set %1 to value").arg(strtoqstr(property)); m_patternCombo->insertItem(text); // 1 alternating - text = i18n("Alternating - set %1 to max and min on alternate events").tqarg(strtoqstr(property)); + text = i18n("Alternating - set %1 to max and min on alternate events").arg(strtoqstr(property)); m_patternCombo->insertItem(text); // 2 crescendo - text = i18n("Crescendo - set %1 rising from min to max").tqarg(strtoqstr(property)); + text = i18n("Crescendo - set %1 rising from min to max").arg(strtoqstr(property)); m_patternCombo->insertItem(text); // 3 diminuendo - text = i18n("Diminuendo - set %1 falling from max to min").tqarg(strtoqstr(property)); + text = i18n("Diminuendo - set %1 falling from max to min").arg(strtoqstr(property)); m_patternCombo->insertItem(text); // 4 ringing - text = i18n("Ringing - set %1 alternating from max to min with both dying to zero").tqarg(strtoqstr(property)); + text = i18n("Ringing - set %1 alternating from max to min with both dying to zero").arg(strtoqstr(property)); m_patternCombo->insertItem(text); connect(m_patternCombo, TQT_SIGNAL(activated(int)), @@ -94,8 +94,8 @@ EventParameterDialog::EventParameterDialog( m_value2Combo = new KComboBox(value2Box); for (unsigned int i = 0; i < 128; i++) { - m_value1Combo->insertItem(TQString("%1").tqarg(i)); - m_value2Combo->insertItem(TQString("%1").tqarg(i)); + m_value1Combo->insertItem(TQString("%1").arg(i)); + m_value2Combo->insertItem(TQString("%1").arg(i)); } m_value1Combo->setCurrentItem(127); diff --git a/src/gui/dialogs/ExportDeviceDialog.cpp b/src/gui/dialogs/ExportDeviceDialog.cpp index b02ff47..348a5b8 100644 --- a/src/gui/dialogs/ExportDeviceDialog.cpp +++ b/src/gui/dialogs/ExportDeviceDialog.cpp @@ -48,7 +48,7 @@ ExportDeviceDialog::ExportDeviceDialog(TQWidget *parent, TQString deviceName) : vbox); m_exportAll = new TQRadioButton(i18n("Export all devices"), bg); m_exportOne = new TQRadioButton(i18n("Export selected device only"), bg); - new TQLabel(i18n(" (\"%1\")").tqarg(deviceName), bg); + new TQLabel(i18n(" (\"%1\")").arg(deviceName), bg); m_exportOne->setChecked(true); } diff --git a/src/gui/dialogs/FileLocateDialog.cpp b/src/gui/dialogs/FileLocateDialog.cpp index 2f18f98..cd85b8d 100644 --- a/src/gui/dialogs/FileLocateDialog.cpp +++ b/src/gui/dialogs/FileLocateDialog.cpp @@ -55,7 +55,7 @@ FileLocateDialog::FileLocateDialog(TQWidget *parent, TQHBox *w = makeHBoxMainWidget(); TQString label = i18n("Can't find file \"%1\".\n" - "Would you like to try and locate this file or skip it?").tqarg(m_file); + "Would you like to try and locate this file or skip it?").arg(m_file); TQLabel *labelW = new TQLabel(label, w); labelW->setAlignment(TQt::AlignCenter); @@ -69,8 +69,8 @@ FileLocateDialog::slotUser3() m_file = KFileDialog::getOpenFileName (":WAVS", i18n("%1|Requested file (%2)\n*.wav|WAV files (*.wav)") - .tqarg(TQFileInfo(m_file).fileName()) - .tqarg(TQFileInfo(m_file).fileName()), + .arg(TQFileInfo(m_file).fileName()) + .arg(TQFileInfo(m_file).fileName()), this, i18n("Select an Audio File")); RG_DEBUG << "FileLocateDialog::slotUser3() : m_file = " << m_file << endl; diff --git a/src/gui/dialogs/FloatEdit.cpp b/src/gui/dialogs/FloatEdit.cpp index fc25fea..a73668f 100644 --- a/src/gui/dialogs/FloatEdit.cpp +++ b/src/gui/dialogs/FloatEdit.cpp @@ -59,7 +59,7 @@ FloatEdit::FloatEdit(TQWidget *parent, //std::cout << "CAL DP = " << calDP << ", dps = " << dps << std::endl; m_spin = new HSpinBox(inVbox, value, 1, min, max, dps); - new TQLabel(TQString("(min: %1, max: %2)").tqarg(min).tqarg(max), inVbox); + new TQLabel(TQString("(min: %1, max: %2)").arg(min).arg(max), inVbox); } float diff --git a/src/gui/dialogs/IdentifyTextCodecDialog.cpp b/src/gui/dialogs/IdentifyTextCodecDialog.cpp index a3d905d..2c4f179 100644 --- a/src/gui/dialogs/IdentifyTextCodecDialog.cpp +++ b/src/gui/dialogs/IdentifyTextCodecDialog.cpp @@ -120,7 +120,7 @@ IdentifyTextCodecDialog::IdentifyTextCodecDialog(TQWidget *parent, } if (description != "") { - description = i18n("%1 (%2)").tqarg(strtoqstr(name)).tqarg(description); + description = i18n("%1 (%2)").arg(strtoqstr(name)).arg(description); } else { description = strtoqstr(name); } diff --git a/src/gui/dialogs/ImportDeviceDialog.cpp b/src/gui/dialogs/ImportDeviceDialog.cpp index 6e8b494..c68bc4f 100644 --- a/src/gui/dialogs/ImportDeviceDialog.cpp +++ b/src/gui/dialogs/ImportDeviceDialog.cpp @@ -84,7 +84,7 @@ ImportDeviceDialog::doImport() TQString target; if (KIO::NetAccess::download(m_url, target) == false) { - KMessageBox::error(this, i18n("Cannot download file %1").tqarg(m_url.prettyURL())); + KMessageBox::error(this, i18n("Cannot download file %1").arg(m_url.prettyURL())); return false; } @@ -96,14 +96,14 @@ ImportDeviceDialog::doImport() } if (!fileRead) { KMessageBox::error - (this, i18n("Cannot open file %1").tqarg(m_url.prettyURL())); + (this, i18n("Cannot open file %1").arg(m_url.prettyURL())); reject(); close(); return false; } if (m_devices.size() == 0) { KMessageBox::sorry - (this, i18n("No devices found in file %1").tqarg(m_url.prettyURL())); + (this, i18n("No devices found in file %1").arg(m_url.prettyURL())); reject(); close(); return false; @@ -137,7 +137,7 @@ ImportDeviceDialog::doImport() if ((*i)->getName() != "") { showRenameOption = true; } else { - (*i)->setName(qstrtostr(i18n("Device %1").tqarg(count))); + (*i)->setName(qstrtostr(i18n("Device %1").arg(count))); } if (m_devices.size() > 1) { m_deviceCombo->insertItem(strtoqstr((*i)->getName())); @@ -364,7 +364,7 @@ ImportDeviceDialog::importFromSF2(TQString filename) MidiBank bank (msb == 1, msb, lsb, - qstrtostr(i18n("Bank %1:%2").tqarg(msb).tqarg(lsb))); + qstrtostr(i18n("Bank %1:%2").arg(msb).arg(lsb))); banks.push_back(bank); diff --git a/src/gui/dialogs/IntervalDialog.cpp b/src/gui/dialogs/IntervalDialog.cpp index 72575b1..2a9b3ec 100644 --- a/src/gui/dialogs/IntervalDialog.cpp +++ b/src/gui/dialogs/IntervalDialog.cpp @@ -61,9 +61,9 @@ IntervalDialog::IntervalDialog(TQWidget *parent, bool askChangeKey, bool askTran intervalChromatic = 0; intervalDiatonic = 0; - //m_intervalPitchLabel = new TQLabel( i18n("Pitch: %1").tqarg(intervalChromatic), hBox); - //m_intervalOctavesLabel = new TQLabel( i18n("Octaves: %1").tqarg(intervalDiatonic / 7), hBox); - //m_intervalStepsLabel = new TQLabel( i18n("Steps: %1").tqarg(intervalDiatonic % 7), hBox); + //m_intervalPitchLabel = new TQLabel( i18n("Pitch: %1").arg(intervalChromatic), hBox); + //m_intervalOctavesLabel = new TQLabel( i18n("Octaves: %1").arg(intervalDiatonic / 7), hBox); + //m_intervalStepsLabel = new TQLabel( i18n("Steps: %1").arg(intervalDiatonic % 7), hBox); m_intervalLabel = new TQLabel( i18n("a perfect unison"), vBox); m_intervalLabel->setAlignment(TQt::AlignCenter); @@ -205,7 +205,7 @@ IntervalDialog::getIntervalName(int intervalDiatonic, int intervalChromatic) else if (deviation == 0) textIntervalDeviated += i18n("a perfect"); else - textIntervalDeviated += i18n("an (unknown, %1)").tqarg(deviation); + textIntervalDeviated += i18n("an (unknown, %1)").arg(deviation); break; // Then the major/minor: case 1: // second @@ -233,7 +233,7 @@ IntervalDialog::getIntervalName(int intervalDiatonic, int intervalChromatic) else if (deviation == 0) textIntervalDeviated += i18n("a perfect"); else - textIntervalDeviated += i18n("an (unknown, %1)").tqarg(deviation); + textIntervalDeviated += i18n("an (unknown, %1)").arg(deviation); break; default: textIntervalDeviated += i18n("an (unknown)"); @@ -245,35 +245,35 @@ IntervalDialog::getIntervalName(int intervalDiatonic, int intervalChromatic) // "1 octave and a diminished octave" is better than // "2 octaves and a diminished unison" if (octaves > 0) { - textInterval += i18n("%1 octave").tqarg(textIntervalDeviated); + textInterval += i18n("%1 octave").arg(textIntervalDeviated); octaves--; } else if (octaves < 0) { - textInterval += i18n("%1 octave").tqarg(textIntervalDeviated); + textInterval += i18n("%1 octave").arg(textIntervalDeviated); octaves++; } else { - textInterval += i18n("%1 unison").tqarg(textIntervalDeviated); + textInterval += i18n("%1 unison").arg(textIntervalDeviated); } break; case 1: - textInterval += i18n("%1 second").tqarg(textIntervalDeviated); + textInterval += i18n("%1 second").arg(textIntervalDeviated); break; case 2: - textInterval += i18n("%1 third").tqarg(textIntervalDeviated); + textInterval += i18n("%1 third").arg(textIntervalDeviated); break; case 3: - textInterval += i18n("%1 fourth").tqarg(textIntervalDeviated); + textInterval += i18n("%1 fourth").arg(textIntervalDeviated); break; case 4: - textInterval += i18n("%1 fifth").tqarg(textIntervalDeviated); + textInterval += i18n("%1 fifth").arg(textIntervalDeviated); break; case 5: - textInterval += i18n("%1 sixth").tqarg(textIntervalDeviated); + textInterval += i18n("%1 sixth").arg(textIntervalDeviated); break; case 6: - textInterval += i18n("%1 seventh").tqarg(textIntervalDeviated); + textInterval += i18n("%1 seventh").arg(textIntervalDeviated); break; default: - textInterval += i18n("%1").tqarg(textIntervalDeviated); + textInterval += i18n("%1").arg(textIntervalDeviated); } } @@ -285,14 +285,14 @@ IntervalDialog::getIntervalName(int intervalDiatonic, int intervalChromatic) if (showStep) { return i18n("up 1 octave and %1", "up %n octaves and %1", - octaves).tqarg(textInterval); + octaves).arg(textInterval); } else { return i18n("up 1 octave", "up %n octaves", octaves); } } else { - return i18n("up %1").tqarg(textInterval); + return i18n("up %1").arg(textInterval); } } else @@ -301,14 +301,14 @@ IntervalDialog::getIntervalName(int intervalDiatonic, int intervalChromatic) if (showStep) { return i18n("down 1 octave and %1", "down %n octaves and %1", - octaves).tqarg(textInterval); + octaves).arg(textInterval); } else { return i18n("down 1 octave", "down %n octaves", octaves); } } else { - return i18n("down %1").tqarg(textInterval); + return i18n("down %1").arg(textInterval); } } } else { diff --git a/src/gui/dialogs/LilyPondOptionsDialog.cpp b/src/gui/dialogs/LilyPondOptionsDialog.cpp index a2ca3ef..f8e1efb 100644 --- a/src/gui/dialogs/LilyPondOptionsDialog.cpp +++ b/src/gui/dialogs/LilyPondOptionsDialog.cpp @@ -114,10 +114,10 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *parent, m_lilyLanguage = new KComboBox(frameBasic); // See also setDefaultLilyPondVersion below - m_lilyLanguage->insertItem(i18n("LilyPond %1").tqarg("2.6")); - m_lilyLanguage->insertItem(i18n("LilyPond %1").tqarg("2.8")); - m_lilyLanguage->insertItem(i18n("LilyPond %1").tqarg("2.10")); - m_lilyLanguage->insertItem(i18n("LilyPond %1").tqarg("2.12")); + m_lilyLanguage->insertItem(i18n("LilyPond %1").arg("2.6")); + m_lilyLanguage->insertItem(i18n("LilyPond %1").arg("2.8")); + m_lilyLanguage->insertItem(i18n("LilyPond %1").arg("2.10")); + m_lilyLanguage->insertItem(i18n("LilyPond %1").arg("2.12")); m_lilyLanguage->setCurrentItem(config->readUnsignedNumEntry("lilylanguage", 0)); layoutBasic->addWidget(m_lilyLanguage, 0, 1); @@ -154,7 +154,7 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *parent, m_lilyFontSize = new KComboBox(frameBasic); int sizes[] = { 11, 13, 16, 19, 20, 23, 26 }; for (int i = 0; i < sizeof(sizes)/sizeof(sizes[0]); ++i) { - m_lilyFontSize->insertItem(i18n("%1 pt").tqarg(sizes[i])); + m_lilyFontSize->insertItem(i18n("%1 pt").arg(sizes[i])); } m_lilyFontSize->setCurrentItem(config->readUnsignedNumEntry ("lilyfontsize", 4)); @@ -251,10 +251,10 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *parent, m_lilyLyricsHAlignment->insertItem(i18n("Left")); m_lilyLyricsHAlignment->insertItem(i18n("Center")); m_lilyLyricsHAlignment->insertItem(i18n("Right")); - m_lilyLyricsHAlignment->setCurrentItem(config->readUnsignedNumEntry("lilylyricshtqalignment", 0)); + m_lilyLyricsHAlignment->setCurrentItem(config->readUnsignedNumEntry("lilylyricshalignment", 0)); layoutAdvancedLayout->addWidget(new TQLabel( - i18n("Lyrics tqalignment"), frameAdvancedLayout), 0, 0); + i18n("Lyrics alignment"), frameAdvancedLayout), 0, 0); layoutAdvancedLayout->addWidget(m_lilyLyricsHAlignment, 0, 1); m_lilyRaggedBottom = new TQCheckBox( @@ -314,7 +314,7 @@ LilyPondOptionsDialog::slotApply() config->writeEntry("lilyexportbeamings", m_lilyExportBeams->isChecked()); config->writeEntry("lilyexportstaffmerge", m_lilyExportStaffMerge->isChecked()); config->writeEntry("lilyexportstaffbrackets", m_lilyExportStaffGroup->isChecked()); - config->writeEntry("lilylyricshtqalignment", m_lilyLyricsHAlignment->currentItem()); + config->writeEntry("lilylyricshalignment", m_lilyLyricsHAlignment->currentItem()); config->writeEntry("lilyexportmarkermode", m_lilyMarkerMode->currentItem()); m_headersPage->apply(); } diff --git a/src/gui/dialogs/LyricEditDialog.cpp b/src/gui/dialogs/LyricEditDialog.cpp index a10cb72..f713d11 100644 --- a/src/gui/dialogs/LyricEditDialog.cpp +++ b/src/gui/dialogs/LyricEditDialog.cpp @@ -81,7 +81,7 @@ LyricEditDialog::LyricEditDialog(TQWidget *parent, unparse(); for (int i = 0; i < m_verseCount; ++i) { - m_verseNumber->insertItem(i18n("Verse %1").tqarg(i + 1)); + m_verseNumber->insertItem(i18n("Verse %1").arg(i + 1)); } m_currentVerse = 0; if (m_verseCount == 12) m_verseAddButton->setEnabled(false); @@ -103,7 +103,7 @@ LyricEditDialog::slotAddVerse() NOTATION_DEBUG << "LyricEditDialog::slotAddVerse" << endl; m_verseCount++; m_texts.push_back(m_skeleton); - m_verseNumber->insertItem(i18n("Verse %1").tqarg(m_verseCount)); + m_verseNumber->insertItem(i18n("Verse %1").arg(m_verseCount)); m_verseNumber->setCurrentItem(m_verseCount - 1); slotVerseNumberChanged(m_verseCount - 1); if (m_verseCount == 12) m_verseAddButton->setEnabled(false); @@ -148,7 +148,7 @@ LyricEditDialog::unparse() int lastBarNo = comp->getBarNumber(lastTime); std::map<int, bool> haveLyric; - TQString fragment = TQString("[%1] ").tqarg(lastBarNo + 1); + TQString fragment = TQString("[%1] ").arg(lastBarNo + 1); m_skeleton = fragment; m_texts.clear(); @@ -192,7 +192,7 @@ LyricEditDialog::unparse() ++lastBarNo; } - fragment += TQString("\n[%1] ").tqarg(myBarNo + 1); + fragment += TQString("\n[%1] ").arg(myBarNo + 1); m_skeleton += fragment; for (size_t v = 0; v < m_verseCount; ++v) m_texts[v] += fragment; diff --git a/src/gui/dialogs/ManageMetronomeDialog.cpp b/src/gui/dialogs/ManageMetronomeDialog.cpp index 158cd07..50dcaca 100644 --- a/src/gui/dialogs/ManageMetronomeDialog.cpp +++ b/src/gui/dialogs/ManageMetronomeDialog.cpp @@ -261,7 +261,7 @@ ManageMetronomeDialog::populate(int deviceIndex) } } - // if (used) iname = i18n("%1 [used]").tqarg(iname); + // if (used) iname = i18n("%1 [used]").arg(iname); m_metronomeInstrument->insertItem(iname); diff --git a/src/gui/dialogs/TempoDialog.cpp b/src/gui/dialogs/TempoDialog.cpp index 92d7165..f55d3fd 100644 --- a/src/gui/dialogs/TempoDialog.cpp +++ b/src/gui/dialogs/TempoDialog.cpp @@ -253,17 +253,17 @@ TempoDialog::populateTempo() RealTime tempoTime = comp.getElapsedRealTime(m_tempoTime); TQString milliSeconds; milliSeconds.sprintf("%03d", tempoTime.msec()); - m_tempoTimeLabel->setText(i18n("%1.%2 s,").tqarg(tempoTime.sec) - .tqarg(milliSeconds)); + m_tempoTimeLabel->setText(i18n("%1.%2 s,").arg(tempoTime.sec) + .arg(milliSeconds)); int barNo = comp.getBarNumber(m_tempoTime); if (comp.getBarStart(barNo) == m_tempoTime) { m_tempoBarLabel->setText - (i18n("at the start of measure %1.").tqarg(barNo + 1)); + (i18n("at the start of measure %1.").arg(barNo + 1)); m_tempoChangeStartOfBar->setEnabled(false); } else { m_tempoBarLabel->setText( - i18n("in the middle of measure %1.").tqarg(barNo + 1)); + i18n("in the middle of measure %1.").arg(barNo + 1)); m_tempoChangeStartOfBar->setEnabled(true); } @@ -282,8 +282,8 @@ TempoDialog::populateTempo() lastms.sprintf("%03d", lastRT.msec()); int lastBar = comp.getBarNumber(lastTempoTime); m_tempoChangeBeforeAt->setText - (i18n(" (at %1.%2 s, in measure %3)").tqarg(lastRT.sec) - .tqarg(lastms).tqarg(lastBar + 1)); + (i18n(" (at %1.%2 s, in measure %3)").arg(lastRT.sec) + .arg(lastms).arg(lastBar + 1)); m_tempoChangeBeforeAt->show(); m_tempoChangeBefore->setEnabled(true); diff --git a/src/gui/dialogs/TimeSignatureDialog.cpp b/src/gui/dialogs/TimeSignatureDialog.cpp index c06f536..f9de575 100644 --- a/src/gui/dialogs/TimeSignatureDialog.cpp +++ b/src/gui/dialogs/TimeSignatureDialog.cpp @@ -92,9 +92,9 @@ TimeSignatureDialog::TimeSignatureDialog(TQWidget *parent, BigArrowButton *denomDown = new BigArrowButton(denomBox, Qt::LeftArrow); m_numLabel = new TQLabel - (TQString("%1").tqarg(m_timeSignature.getNumerator()), numBox); + (TQString("%1").arg(m_timeSignature.getNumerator()), numBox); m_denomLabel = new TQLabel - (TQString("%1").tqarg(m_timeSignature.getDenominator()), denomBox); + (TQString("%1").arg(m_timeSignature.getDenominator()), denomBox); m_numLabel->setAlignment(AlignHCenter | AlignVCenter); m_denomLabel->setAlignment(AlignHCenter | AlignVCenter); @@ -139,11 +139,11 @@ TimeSignatureDialog::TimeSignatureDialog(TQWidget *parent, if (atStartOfBar) { scopeText = TQString (i18n("Insertion point is at start of measure %1.")) - .tqarg(barNo + 1); + .arg(barNo + 1); } else { scopeText = TQString (i18n("Insertion point is in the middle of measure %1.")) - .tqarg(barNo + 1); + .arg(barNo + 1); } } else { scopeText = TQString @@ -152,19 +152,19 @@ TimeSignatureDialog::TimeSignatureDialog(TQWidget *parent, new TQLabel(scopeText, groupBox); m_asGivenButton = new TQRadioButton - (i18n("Start measure %1 here").tqarg(barNo + 2), groupBox); + (i18n("Start measure %1 here").arg(barNo + 2), groupBox); if (!atStartOfBar) { m_startOfBarButton = new TQRadioButton (i18n("Change time from start of measure %1") - .tqarg(barNo + 1), groupBox); + .arg(barNo + 1), groupBox); m_startOfBarButton->setChecked(true); } else { m_asGivenButton->setChecked(true); } } else { new TQLabel(i18n("Time change will take effect at the start of measure %1.") - .tqarg(barNo + 1), groupBox); + .arg(barNo + 1), groupBox); } } @@ -231,7 +231,7 @@ TimeSignatureDialog::slotNumDown() int n = m_timeSignature.getNumerator(); if (--n >= 1) { m_timeSignature = TimeSignature(n, m_timeSignature.getDenominator()); - m_numLabel->setText(TQString("%1").tqarg(n)); + m_numLabel->setText(TQString("%1").arg(n)); } slotUpdateCommonTimeButton(); } @@ -242,7 +242,7 @@ TimeSignatureDialog::slotNumUp() int n = m_timeSignature.getNumerator(); if (++n <= 99) { m_timeSignature = TimeSignature(n, m_timeSignature.getDenominator()); - m_numLabel->setText(TQString("%1").tqarg(n)); + m_numLabel->setText(TQString("%1").arg(n)); } slotUpdateCommonTimeButton(); } @@ -253,7 +253,7 @@ TimeSignatureDialog::slotDenomDown() int n = m_timeSignature.getDenominator(); if ((n /= 2) >= 1) { m_timeSignature = TimeSignature(m_timeSignature.getNumerator(), n); - m_denomLabel->setText(TQString("%1").tqarg(n)); + m_denomLabel->setText(TQString("%1").arg(n)); } slotUpdateCommonTimeButton(); } @@ -264,7 +264,7 @@ TimeSignatureDialog::slotDenomUp() int n = m_timeSignature.getDenominator(); if ((n *= 2) <= 64) { m_timeSignature = TimeSignature(m_timeSignature.getNumerator(), n); - m_denomLabel->setText(TQString("%1").tqarg(n)); + m_denomLabel->setText(TQString("%1").arg(n)); } slotUpdateCommonTimeButton(); } diff --git a/src/gui/dialogs/TransportDialog.cpp b/src/gui/dialogs/TransportDialog.cpp index 8d3b237..f3fdd70 100644 --- a/src/gui/dialogs/TransportDialog.cpp +++ b/src/gui/dialogs/TransportDialog.cpp @@ -344,7 +344,7 @@ TransportDialog::loadPixmaps() TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); for (int i = 0; i < 10; i++) { - fileName = TQString("%1/transport/led-%2.xpm").tqarg(pixmapDir).tqarg(i); + fileName = TQString("%1/transport/led-%2.xpm").arg(pixmapDir).arg(i); if (!m_lcdList[i].load(fileName)) { std::cerr << "TransportDialog - failed to load pixmap \"" << fileName.ascii() << "\"" << std::endl; @@ -353,7 +353,7 @@ TransportDialog::loadPixmaps() // Load the "negative" sign pixmap // - fileName = TQString("%1/transport/led--.xpm").tqarg(pixmapDir); + fileName = TQString("%1/transport/led--.xpm").arg(pixmapDir); m_lcdNegative.load(fileName); } @@ -479,7 +479,7 @@ TransportDialog::displayTime() case FrameMode: m_clearMetronomeTimer->stop(); - m_transport->TimeDisplayLabel->setText(TQString("%1").tqarg(m_sampleRate)); + m_transport->TimeDisplayLabel->setText(TQString("%1").arg(m_sampleRate)); m_transport->TimeDisplayLabel->show(); break; } @@ -917,7 +917,7 @@ TransportDialog::setMidiInLabel(const MappedEvent *mE) MidiPitchLabel mPL(mE->getPitch()); m_transport->InDisplay->setText (mPL.getTQString() + - TQString(" %1").tqarg(mE->getVelocity())); + TQString(" %1").arg(mE->getVelocity())); } break; @@ -977,7 +977,7 @@ TransportDialog::setMidiOutLabel(const MappedEvent *mE) MidiPitchLabel mPL(mE->getPitch()); m_transport->OutDisplay->setText (mPL.getTQString() + - TQString(" %1").tqarg(mE->getVelocity())); + TQString(" %1").arg(mE->getVelocity())); } break; @@ -1133,8 +1133,8 @@ TransportDialog::slotSetBackground(TQColor c) /* this is a bit more thorough, but too slow and flickery: - const TQObjectList *tqchildren = m_transport->LCDBoxFrame->tqchildren(); - TQObjectListIt it(*tqchildren); + const TQObjectList *children = m_transport->LCDBoxFrame->children(); + TQObjectListIt it(*children); TQObject *obj; while ((obj = it.current()) != 0) { diff --git a/src/gui/dialogs/TriggerSegmentDialog.cpp b/src/gui/dialogs/TriggerSegmentDialog.cpp index 744d628..ca97010 100644 --- a/src/gui/dialogs/TriggerSegmentDialog.cpp +++ b/src/gui/dialogs/TriggerSegmentDialog.cpp @@ -69,7 +69,7 @@ TriggerSegmentDialog::TriggerSegmentDialog(TQWidget *parent, m_composition->getTriggerSegments().begin(); i != m_composition->getTriggerSegments().end(); ++i) { m_segment->insertItem - (TQString("%1. %2").tqarg(n++).tqarg(strtoqstr((*i)->getSegment()->getLabel()))); + (TQString("%1. %2").arg(n++).arg(strtoqstr((*i)->getSegment()->getLabel()))); } label = new TQLabel(i18n("Perform with timing: "), frame); diff --git a/src/gui/dialogs/TupletDialog.cpp b/src/gui/dialogs/TupletDialog.cpp index 73dfd98..6dff628 100644 --- a/src/gui/dialogs/TupletDialog.cpp +++ b/src/gui/dialogs/TupletDialog.cpp @@ -238,7 +238,7 @@ TupletDialog::updateUntupledCombo() TQString previousText = m_untupledCombo->currentText(); if (previousText.toInt() == 0) { if (maxValue < 3) - previousText = TQString("%1").tqarg(maxValue); + previousText = TQString("%1").arg(maxValue); else previousText = "3"; } @@ -247,7 +247,7 @@ TupletDialog::updateUntupledCombo() bool setText = false; for (int i = 1; i <= maxValue; ++i) { - TQString text = TQString("%1").tqarg(i); + TQString text = TQString("%1").arg(i); m_untupledCombo->insertItem(text); if (m_hasTimingAlready->isChecked()) { if (i == (m_maxDuration * 3) / (Note(getUnitType()).getDuration()*2)) { @@ -278,7 +278,7 @@ TupletDialog::updateTupledCombo() if (previousText.toInt() == 0 || previousText.toInt() > untupled) { if (untupled < 2) - previousText = TQString("%1").tqarg(untupled); + previousText = TQString("%1").arg(untupled); else previousText = "2"; } @@ -286,7 +286,7 @@ TupletDialog::updateTupledCombo() m_tupledCombo->clear(); for (int i = 1; i < untupled; ++i) { - TQString text = TQString("%1").tqarg(i); + TQString text = TQString("%1").arg(i); m_tupledCombo->insertItem(text); if (m_hasTimingAlready->isChecked()) { if (i == m_maxDuration / Note(getUnitType()).getDuration()) { @@ -310,33 +310,33 @@ TupletDialog::updateTimingDisplays() timeT tupledDuration = unitDuration * tupledCount; if (m_selectionDurationDisplay) { - m_selectionDurationDisplay->setText(TQString("%1").tqarg(m_maxDuration)); + m_selectionDurationDisplay->setText(TQString("%1").arg(m_maxDuration)); } m_untupledDurationCalculationDisplay->setText - (TQString(" %1 x %2 = ").tqarg(untupledCount).tqarg(unitDuration)); + (TQString(" %1 x %2 = ").arg(untupledCount).arg(unitDuration)); m_untupledDurationDisplay->setText - (TQString("%1").tqarg(untupledDuration)); + (TQString("%1").arg(untupledDuration)); m_tupledDurationCalculationDisplay->setText - (TQString(" %1 x %2 = ").tqarg(tupledCount).tqarg(unitDuration)); + (TQString(" %1 x %2 = ").arg(tupledCount).arg(unitDuration)); m_tupledDurationDisplay->setText - (TQString("%1").tqarg(tupledDuration)); + (TQString("%1").arg(tupledDuration)); m_newGapDurationCalculationDisplay->setText - (TQString(" %1 - %2 = ").tqarg(untupledDuration).tqarg(tupledDuration)); + (TQString(" %1 - %2 = ").arg(untupledDuration).arg(tupledDuration)); m_newGapDurationDisplay->setText - (TQString("%1").tqarg(untupledDuration - tupledDuration)); + (TQString("%1").arg(untupledDuration - tupledDuration)); if (m_selectionDurationDisplay && m_unchangedDurationDisplay) { if (m_maxDuration != untupledDuration) { m_unchangedDurationCalculationDisplay->setText - (TQString(" %1 - %2 = ").tqarg(m_maxDuration).tqarg(untupledDuration)); + (TQString(" %1 - %2 = ").arg(m_maxDuration).arg(untupledDuration)); } else { m_unchangedDurationCalculationDisplay->setText(""); } m_unchangedDurationDisplay->setText - (TQString("%1").tqarg(m_maxDuration - untupledDuration)); + (TQString("%1").arg(m_maxDuration - untupledDuration)); } } diff --git a/src/gui/dialogs/UnusedAudioSelectionDialog.cpp b/src/gui/dialogs/UnusedAudioSelectionDialog.cpp index 9a86252..b15fe07 100644 --- a/src/gui/dialogs/UnusedAudioSelectionDialog.cpp +++ b/src/gui/dialogs/UnusedAudioSelectionDialog.cpp @@ -60,8 +60,8 @@ UnusedAudioSelectionDialog::UnusedAudioSelectionDialog(TQWidget *parent, TQString fileSize = i18n(" (not found) "); TQString fileDate; if (info.exists()) { - fileSize = TQString(" %1 ").tqarg(info.size()); - fileDate = TQString(" %1 ").tqarg(info.lastModified().toString()); + fileSize = TQString(" %1 ").arg(info.size()); + fileDate = TQString(" %1 ").arg(info.lastModified().toString()); } TQListViewItem *item = new KListViewItem (m_listView, fileName, fileSize, fileDate); diff --git a/src/gui/dialogs/UseOrnamentDialog.cpp b/src/gui/dialogs/UseOrnamentDialog.cpp index 2c8fb97..23fff16 100644 --- a/src/gui/dialogs/UseOrnamentDialog.cpp +++ b/src/gui/dialogs/UseOrnamentDialog.cpp @@ -117,7 +117,7 @@ UseOrnamentDialog::UseOrnamentDialog(TQWidget *parent, m_composition->getTriggerSegments().begin(); i != m_composition->getTriggerSegments().end(); ++i) { m_ornament->insertItem - (TQString("%1. %2").tqarg(n++).tqarg(strtoqstr((*i)->getSegment()->getLabel()))); + (TQString("%1. %2").arg(n++).arg(strtoqstr((*i)->getSegment()->getLabel()))); } label = new TQLabel(i18n("Perform with timing: "), frame); |