From 97f1c43c867725d49f3943a68ef08d7e71767e99 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:40:46 -0600 Subject: Remove additional unneeded tq method conversions --- src/document/RosegardenGUIDoc.cpp | 50 +++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 25 deletions(-) (limited to 'src/document/RosegardenGUIDoc.cpp') diff --git a/src/document/RosegardenGUIDoc.cpp b/src/document/RosegardenGUIDoc.cpp index 4d73c3c..3ec8e94 100644 --- a/src/document/RosegardenGUIDoc.cpp +++ b/src/document/RosegardenGUIDoc.cpp @@ -229,7 +229,7 @@ void RosegardenGUIDoc::slotUpdateAllViews(RosegardenGUIView *sender) for (w = m_viewList.first(); w != 0; w = m_viewList.next()) { if (w != sender) - w->tqrepaint(); + w->repaint(); } } @@ -349,10 +349,10 @@ bool RosegardenGUIDoc::saveIfModified() if (!completed) { if (!errMsg.isNull()) { KMessageBox::error(0, i18n(TQString("Could not save document at %1\n(%2)") - .tqarg(getAbsFilePath()).tqarg(errMsg).ascii())); + .arg(getAbsFilePath()).arg(errMsg).ascii())); } else { KMessageBox::error(0, i18n(TQString("Could not save document at %1") - .tqarg(getAbsFilePath()).ascii())); + .arg(getAbsFilePath()).ascii())); } } } @@ -463,7 +463,7 @@ RosegardenGUIDoc::deleteOrphanedAudioFiles(bool documentWillNotBeSaved) if (!file.remove()) { std::cerr << "WARNING: Failed to remove orphaned derived audio file \"" << derivedOrphans[i].ascii() << std::endl; } - TQFile peakFile(TQString("%1.pk").tqarg(derivedOrphans[i])); + TQFile peakFile(TQString("%1.pk").arg(derivedOrphans[i])); peakFile.remove(); } @@ -523,10 +523,10 @@ RosegardenGUIDoc::deleteOrphanedAudioFiles(bool documentWillNotBeSaved) TQFile file(recordedOrphans[i]); if (!file.remove()) { KMessageBox::error(0, i18n("File %1 could not be deleted.") - .tqarg(recordedOrphans[i])); + .arg(recordedOrphans[i])); } - TQFile peakFile(TQString("%1.pk").tqarg(recordedOrphans[i])); + TQFile peakFile(TQString("%1.pk").arg(recordedOrphans[i])); peakFile.remove(); } } @@ -577,7 +577,7 @@ bool RosegardenGUIDoc::openDocument(const TQString& filename, // Check if file readable with fileInfo ? if (!fileInfo.isReadable() || fileInfo.isDir()) { KStartupLogo::hideIfStillThere(); - TQString msg(i18n("Can't open file '%1'").tqarg(filename)); + TQString msg(i18n("Can't open file '%1'").arg(filename)); KMessageBox::sorry(0, msg); return false; } @@ -639,8 +639,8 @@ bool RosegardenGUIDoc::openDocument(const TQString& filename, if (!okay) { KStartupLogo::hideIfStillThere(); TQString msg(i18n("Error when parsing file '%1': \"%2\"") - .tqarg(filename) - .tqarg(errMsg)); + .arg(filename) + .arg(errMsg)); CurrentProgressDialog::freeze(); KMessageBox::sorry(0, msg); @@ -1152,7 +1152,7 @@ bool RosegardenGUIDoc::saveDocument(const TQString& filename, int status = temp.status(); if (status != 0) { - errMsg = i18n(TQString("Could not create temporary file in directory of '%1': %2").tqarg(filename).tqarg(strerror(status)).ascii()); + errMsg = i18n(TQString("Could not create temporary file in directory of '%1': %2").arg(filename).arg(strerror(status)).ascii()); return false; } @@ -1164,7 +1164,7 @@ bool RosegardenGUIDoc::saveDocument(const TQString& filename, if (!temp.close()) { status = temp.status(); errMsg = i18n(TQString("Failure in temporary file handling for file '%1': %2") - .tqarg(tempFileName).tqarg(strerror(status)).ascii()); + .arg(tempFileName).arg(strerror(status)).ascii()); return false; } @@ -1177,7 +1177,7 @@ bool RosegardenGUIDoc::saveDocument(const TQString& filename, TQDir dir(TQFileInfo(tempFileName).dir()); if (!dir.rename(tempFileName, filename)) { - errMsg = i18n(TQString("Failed to rename temporary output file '%1' to desired output file '%2'").tqarg(tempFileName).tqarg(filename).ascii()); + errMsg = i18n(TQString("Failed to rename temporary output file '%1' to desired output file '%2'").arg(tempFileName).arg(filename).ascii()); return false; } @@ -1198,7 +1198,7 @@ bool RosegardenGUIDoc::saveDocumentActual(const TQString& filename, if (!rc) { // do some error report - errMsg = i18n(TQString("Could not open file '%1' for writing").tqarg(filename).ascii()); + errMsg = i18n(TQString("Could not open file '%1' for writing").arg(filename).ascii()); delete fileCompressedDevice; return false; // couldn't open file } @@ -1283,11 +1283,11 @@ bool RosegardenGUIDoc::saveDocumentActual(const TQString& filename, TQString triggerAtts = TQString ("triggerid=\"%1\" triggerbasepitch=\"%2\" triggerbasevelocity=\"%3\" triggerretune=\"%4\" triggeradjusttimes=\"%5\" ") - .tqarg((*ci)->getId()) - .tqarg((*ci)->getBasePitch()) - .tqarg((*ci)->getBaseVelocity()) - .tqarg((*ci)->getDefaultRetune()) - .tqarg(strtoqstr((*ci)->getDefaultTimeAdjust())); + .arg((*ci)->getId()) + .arg((*ci)->getBasePitch()) + .arg((*ci)->getBaseVelocity()) + .arg((*ci)->getDefaultRetune()) + .arg(strtoqstr((*ci)->getDefaultTimeAdjust())); Segment *segment = (*ci)->getSegment(); saveSegment(outStream, segment, progress, totalEvents, eventCount, triggerAtts); @@ -1315,7 +1315,7 @@ bool RosegardenGUIDoc::saveDocumentActual(const TQString& filename, // check that all went ok // if (fileCompressedDevice->status() != IO_Ok) { - errMsg = i18n(TQString("Error while writing on '%1'").tqarg(filename).ascii()); + errMsg = i18n(TQString("Error while writing on '%1'").arg(filename).ascii()); delete fileCompressedDevice; return false; } @@ -1380,8 +1380,8 @@ void RosegardenGUIDoc::saveSegment(TQTextStream& outStream, Segment *segment, TQString time; outStream << TQString("getTrack()) - .tqarg(segment->getStartTime()); + .arg(segment->getTrack()) + .arg(segment->getStartTime()); if (!extraAttributes.isNull()) outStream << extraAttributes << " "; @@ -1662,7 +1662,7 @@ RosegardenGUIDoc::xmlParse(TQString fileContents, TQString &errMsg, KStartupLogo::hideIfStillThere(); CurrentProgressDialog::freeze(); - KMessageBox::information(0, i18n("

Incorrect audio sample rate

This composition contains audio files that were recorded or imported with the audio server running at a different sample rate (%1 Hz) from the current JACK server sample rate (%2 Hz).

Rosegarden will play this composition at the correct speed, but any audio files in it will probably sound awful.

Please consider re-starting the JACK server at the correct rate (%3 Hz) and re-loading this composition before you do any more work with it.

").tqarg(er).tqarg(sr).tqarg(er)); + KMessageBox::information(0, i18n("

Incorrect audio sample rate

This composition contains audio files that were recorded or imported with the audio server running at a different sample rate (%1 Hz) from the current JACK server sample rate (%2 Hz).

Rosegarden will play this composition at the correct speed, but any audio files in it will probably sound awful.

Please consider re-starting the JACK server at the correct rate (%3 Hz) and re-loading this composition before you do any more work with it.

").arg(er).arg(sr).arg(er)); CurrentProgressDialog::thaw(); shownWarning = true; @@ -1672,7 +1672,7 @@ RosegardenGUIDoc::xmlParse(TQString fileContents, TQString &errMsg, KStartupLogo::hideIfStillThere(); CurrentProgressDialog::freeze(); - KMessageBox::information(0, i18n("

Inconsistent audio sample rates

This composition contains audio files at more than one sample rate.

Rosegarden will play them at the correct speed, but any audio files that were recorded or imported at rates different from the current JACK server sample rate (%1 Hz) will probably sound awful.

Please see the audio file manager dialog for more details, and consider resampling any files that are at the wrong rate.

").tqarg(sr), + KMessageBox::information(0, i18n("

Inconsistent audio sample rates

This composition contains audio files at more than one sample rate.

Rosegarden will play them at the correct speed, but any audio files that were recorded or imported at rates different from the current JACK server sample rate (%1 Hz) will probably sound awful.

Please see the audio file manager dialog for more details, and consider resampling any files that are at the wrong rate.

").arg(sr), i18n("Inconsistent sample rates"), "file-load-inconsistent-samplerates"); @@ -1695,7 +1695,7 @@ RosegardenGUIDoc::xmlParse(TQString fileContents, TQString &errMsg, TQString type, soName, label; PluginIdentifier::parseIdentifier(ident, type, soName, label); TQString pluginFileName = TQFileInfo(soName).fileName(); - msg += i18n("
  • %1 (from %2)
    • ").tqarg(label).tqarg(pluginFileName); + msg += i18n("
  • %1 (from %2)
    • ").arg(label).arg(pluginFileName); } msg += ""; @@ -2557,7 +2557,7 @@ RosegardenGUIDoc::addRecordMIDISegment(TrackId tid) } else { label = track->getLabel(); } - label = qstrtostr(i18n("%1 (recorded)").tqarg(strtoqstr(label))); + label = qstrtostr(i18n("%1 (recorded)").arg(strtoqstr(label))); } recordMIDISegment->setLabel(label); -- cgit v1.2.3