Remove additional unneeded tq method conversions

src/base/SegmentNotationHelper.cpp

@@ -1767,7 +1767,7 @@ SegmentNotationHelper::removeRests(timeT time, timeT &duration, bool testOnly)
     segment().erase(from, to);
 
     // we must defer calling makeRestViable() until after erase,
-    // because it will tqinvalidate 'to'
+    // because it will invalidate 'to'
     //
     if (checkLastRest) makeRestViable(lastEvent);
 

src/commands/edit/CopyCommand.cpp

@@ -61,7 +61,7 @@ CopyCommand::CopyCommand(SegmentSelection &selection,
             m_sourceClipboard->newSegment(*i);
         } else {
             m_sourceClipboard->newSegment(*i)->
-            setLabel(qstrtostr(i18n("%1 (copied)").tqarg(newLabel)));
+            setLabel(qstrtostr(i18n("%1 (copied)").arg(newLabel)));
         }
     }
 }

src/commands/notation/AddFingeringMarkCommand.cpp

@@ -46,7 +46,7 @@ AddFingeringMarkCommand::getGlobalName(TQString fingering)
     else if (fingering == "0")
         return i18n("Add Fingering &0 (Thumb)");
     else
-        return i18n("Add Fingering &%1").tqarg(fingering);
+        return i18n("Add Fingering &%1").arg(fingering);
 }
 
 void

src/commands/notation/AddIndicationCommand.cpp

@@ -164,7 +164,7 @@ AddIndicationCommand::getGlobalName(std::string indicationType)
         return i18n("Add &Glissando");
     }
 
-    TQString n = i18n("Add &%1%2").tqarg((char)toupper(indicationType[0])).tqarg(strtoqstr(indicationType.substr(1)));
+    TQString n = i18n("Add &%1%2").arg((char)toupper(indicationType[0])).arg(strtoqstr(indicationType.substr(1)));
     return n;
 }
 

src/commands/notation/AddMarkCommand.cpp

@@ -81,12 +81,12 @@ AddMarkCommand::getGlobalName(Mark markType)
     else if (markType == Marks::MordentLongInverted)
         m = i18n("Lon&g Inverted Mordent");
     else
-        m = i18n("&%1%2").tqarg(m[0].upper()).tqarg(m.right(m.length() - 1));
+        m = i18n("&%1%2").arg(m[0].upper()).arg(m.right(m.length() - 1));
     // FIXME: That last i18n has very little chance of working, unless
     // by some miracle the exact same string was translated elsewhere already
     // but we'll leave it as a warning
 
-    m = i18n("Add %1").tqarg(m);
+    m = i18n("Add %1").arg(m);
     return m;
 }
 

src/commands/notation/ClefInsertionCommand.cpp

@@ -68,7 +68,7 @@ ClefInsertionCommand::getGlobalName(Clef *)
         if (clef) {
     	TQString name(strtoqstr(clef->getClefType()));
     	name = name.left(1).upper() + name.right(name.length()-1);
-    	return i18n("Change to %1 Cle&f...").tqarg(name);
+    	return i18n("Change to %1 Cle&f...").arg(name);
         } else {
     */ 
     return i18n("Add Cle&f Change...");

src/commands/notation/KeyInsertionCommand.h

@@ -62,7 +62,7 @@ public:
 
     static TQString getGlobalName(Key *key = 0) {
         if (key) {
-            return i18n("Change to &Key %1...").tqarg(strtoqstr(key->getName()));
+            return i18n("Change to &Key %1...").arg(strtoqstr(key->getName()));
         } else {
             return i18n("Add &Key Change...");
         }

src/commands/notation/MultiKeyInsertionCommand.h

@@ -60,7 +60,7 @@ public:
 
     static TQString getGlobalName(Key *key = 0) {
         if (key) {
-            return i18n("Change all to &Key %1...").tqarg(strtoqstr(key->getName()));
+            return i18n("Change all to &Key %1...").arg(strtoqstr(key->getName()));
         } else {
             return i18n("Add &Key Change...");
         }

src/commands/notation/RespellCommand.cpp

@@ -47,17 +47,17 @@ RespellCommand::getGlobalName(Type type, Accidental accidental)
             TQString s(i18n("Respell with %1"));
             //!!! should be in notationstrings:
             if (accidental == DoubleSharp) {
-                s = s.tqarg(i18n("Do&uble Sharp"));
+                s = s.arg(i18n("Do&uble Sharp"));
             } else if (accidental == Sharp) {
-                s = s.tqarg(i18n("&Sharp"));
+                s = s.arg(i18n("&Sharp"));
             } else if (accidental == Flat) {
-                s = s.tqarg(i18n("&Flat"));
+                s = s.arg(i18n("&Flat"));
             } else if (accidental == DoubleFlat) {
-                s = s.tqarg(i18n("Dou&ble Flat"));
+                s = s.arg(i18n("Dou&ble Flat"));
             } else if (accidental == Natural) {
-                s = s.tqarg(i18n("&Natural"));
+                s = s.arg(i18n("&Natural"));
             } else {
-                s = s.tqarg(i18n("N&one"));
+                s = s.arg(i18n("N&one"));
             }
             return s;
         }

src/commands/segment/AudioSegmentSplitCommand.cpp

@@ -101,7 +101,7 @@ AudioSegmentSplitCommand::execute()
         m_segmentLabel = m_segment->getLabel();
         TQString newLabel = strtoqstr(m_segmentLabel);
         if (!newLabel.endsWith(i18n(" (split)"))) {
-            newLabel = i18n("%1 (split)").tqarg(newLabel);
+            newLabel = i18n("%1 (split)").arg(newLabel);
         }
         m_segment->setLabel(qstrtostr(newLabel));
         m_newSegment->setLabel(m_segment->getLabel());

src/commands/segment/SegmentChangePlayableRangeCommand.cpp

@@ -70,7 +70,7 @@ SegmentChangePlayableRangeCommand::getGlobalName(int low, int high)
     if (!unit) {
         return "Undo change playable range";
     } else {
-        return TQString("Change playable range to %1-%2").tqarg(low, high);
+        return TQString("Change playable range to %1-%2").arg(low, high);
     }
 }
 

src/commands/segment/SegmentChangeQuantizationCommand.cpp

@@ -108,7 +108,7 @@ SegmentChangeQuantizationCommand::getGlobalName(timeT unit)
     } else {
         timeT error = 0;
         TQString label = NotationStrings::makeNoteMenuLabel(unit, true, error);
-        return TQString("Quantize to %1").tqarg(label);
+        return TQString("Quantize to %1").arg(label);
     }
 }
 

src/commands/segment/SegmentChangeTransposeCommand.cpp

@@ -65,7 +65,7 @@ SegmentChangeTransposeCommand::getGlobalName(int unit)
     if (!unit) {
         return "Undo change transposition";
     } else {
-        return TQString("Change transposition to %1").tqarg(unit);
+        return TQString("Change transposition to %1").arg(unit);
     }
 }
 

src/commands/segment/SegmentSplitCommand.cpp

@@ -133,7 +133,7 @@ SegmentSplitCommand::execute()
     m_segmentLabel = m_segment->getLabel();
     TQString newLabel = strtoqstr(m_segmentLabel);
     if (!newLabel.endsWith(i18n(" (split)"))) {
-        newLabel = i18n("%1 (split)").tqarg(newLabel);
+        newLabel = i18n("%1 (split)").arg(newLabel);
     }
     m_newSegmentA->setLabel(newLabel.ascii());
     m_newSegmentB->setLabel(newLabel.ascii());

src/document/MultiViewCommandHistory.cpp

@@ -325,9 +325,9 @@ MultiViewCommandHistory::updateButton(bool undo,
             commandName.replace(TQRegExp("&"), "");
             commandName.replace(TQRegExp("\\.\\.\\.$"), "");
             if (undo)
-                text = i18n("Und&o %1").tqarg(commandName);
+                text = i18n("Und&o %1").arg(commandName);
             else
-                text = i18n("Re&do %1").tqarg(commandName);
+                text = i18n("Re&do %1").arg(commandName);
             action->setText(text);
         }
     }
@@ -369,9 +369,9 @@ MultiViewCommandHistory::updateMenu(bool undo,
 
             TQString text;
             if (undo)
-                text = i18n("Und&o %1").tqarg(commandName);
+                text = i18n("Und&o %1").arg(commandName);
             else
-                text = i18n("Re&do %1").tqarg(commandName);
+                text = i18n("Re&do %1").arg(commandName);
             menu->insertItem(text, j++);
         }
 

src/document/MultiViewCommandHistory.h

@@ -113,7 +113,7 @@ signals:
      * (whether by addCommand, undo or redo).
      *
      * It should be connected to the update() slot of widgets
-     * which need to tqrepaint after a command
+     * which need to repaint after a command
      */
     void commandExecuted();
 

src/document/RoseXmlHandler.cpp

@@ -439,7 +439,7 @@ RoseXmlHandler::startElement(const TQString& namespaceURI,
             int minor = sminor.toInt();
 
             if (major > RosegardenGUIDoc::FILE_FORMAT_VERSION_MAJOR) {
-                m_errorString = i18n("This file was written by Rosegarden %1, and it uses\na different file format that cannot be read by this version.").tqarg(version);
+                m_errorString = i18n("This file was written by Rosegarden %1, and it uses\na different file format that cannot be read by this version.").arg(version);
                 return false;
             }
 
@@ -449,7 +449,7 @@ RoseXmlHandler::startElement(const TQString& namespaceURI,
                 CurrentProgressDialog::freeze();
                 KStartupLogo::hideIfStillThere();
 
-                KMessageBox::information(0, i18n("This file was written by Rosegarden %1, which is more recent than this version.\nThere may be some incompatibilities with the file format.").tqarg(version));
+                KMessageBox::information(0, i18n("This file was written by Rosegarden %1, which is more recent than this version.\nThere may be some incompatibilities with the file format.").arg(version));
 
                 CurrentProgressDialog::thaw();
             }
@@ -2200,9 +2200,9 @@ bool
 RoseXmlHandler::error(const TQXmlParseException& exception)
 {
     m_errorString = TQString("%1 at line %2, column %3")
-                    .tqarg(exception.message())
+                    .arg(exception.message())
-                    .tqarg(exception.lineNumber())
+                    .arg(exception.lineNumber())
-                    .tqarg(exception.columnNumber());
+                    .arg(exception.columnNumber());
     return TQXmlDefaultHandler::error( exception );
 }
 
@@ -2210,9 +2210,9 @@ bool
 RoseXmlHandler::fatalError(const TQXmlParseException& exception)
 {
     m_errorString = TQString("%1 at line %2, column %3")
-                    .tqarg(exception.message())
+                    .arg(exception.message())
-                    .tqarg(exception.lineNumber())
+                    .arg(exception.lineNumber())
-                    .tqarg(exception.columnNumber());
+                    .arg(exception.columnNumber());
     return TQXmlDefaultHandler::fatalError( exception );
 }
 

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)
+                    .arg(filename)
-                    .tqarg(errMsg));
+                    .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())
+                              .arg((*ci)->getId())
-                              .tqarg((*ci)->getBasePitch())
+                              .arg((*ci)->getBasePitch())
-                              .tqarg((*ci)->getBaseVelocity())
+                              .arg((*ci)->getBaseVelocity())
-                              .tqarg((*ci)->getDefaultRetune())
+                              .arg((*ci)->getDefaultRetune())
-                              .tqarg(strtoqstr((*ci)->getDefaultTimeAdjust()));
+                              .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("<segment track=\"%1\" start=\"%2\" ")
-    .tqarg(segment->getTrack())
+    .arg(segment->getTrack())
-    .tqarg(segment->getStartTime());
+    .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("<h3>Incorrect audio sample rate</h3><p>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).</p><p>Rosegarden will play this composition at the correct speed, but any audio files in it will probably sound awful.</p><p>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.</p>").tqarg(er).tqarg(sr).tqarg(er));
+                KMessageBox::information(0, i18n("<h3>Incorrect audio sample rate</h3><p>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).</p><p>Rosegarden will play this composition at the correct speed, but any audio files in it will probably sound awful.</p><p>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.</p>").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("<h3>Inconsistent audio sample rates</h3><p>This composition contains audio files at more than one sample rate.</p><p>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.</p><p>Please see the audio file manager dialog for more details, and consider resampling any files that are at the wrong rate.</p>").tqarg(sr),
+                KMessageBox::information(0, i18n("<h3>Inconsistent audio sample rates</h3><p>This composition contains audio files at more than one sample rate.</p><p>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.</p><p>Please see the audio file manager dialog for more details, and consider resampling any files that are at the wrong rate.</p>").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("<li>%1 (from %2)</li>").tqarg(label).tqarg(pluginFileName);
+                    msg += i18n("<li>%1 (from %2)</li>").arg(label).arg(pluginFileName);
                 }
                 msg += "</ul>";
                 
@@ -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);

src/document/RosegardenGUIDoc.h

@@ -447,7 +447,7 @@ public:
 
 public slots:
     /**
-     * calls tqrepaint() on all views connected to the document object
+     * calls repaint() on all views connected to the document object
      * and is called by the view by which the document has been
      * changed.  As this view normally repaints itself, it is excluded
      * from the paintEvent.

src/document/io/HydrogenXMLHandler.cpp

@@ -272,9 +272,9 @@ HydrogenXMLHandler::endElement(const TQString& /*namespaceURI*/,
             // whole bar unit segment.
             //
             m_segment->setEndMarkerTime(m_composition->getBarEnd(m_currentBar));
-            TQString label = TQString("%1 - %2 %3 %4").tqarg(strtoqstr(m_patternName))
+            TQString label = TQString("%1 - %2 %3 %4").arg(strtoqstr(m_patternName))
-                            .tqarg(strtoqstr(m_sequenceName))
+                            .arg(strtoqstr(m_sequenceName))
-                            .tqarg(i18n(" imported from Hydrogen ")).tqarg(strtoqstr(m_version));
+                            .arg(i18n(" imported from Hydrogen ")).arg(strtoqstr(m_version));
             m_segment->setLabel(qstrtostr(label));
 
             m_composition->addTrack(track);

src/document/io/LilyPondExporter.cpp

@@ -137,7 +137,7 @@ LilyPondExporter::readConfigVariables(void)
     m_exportBeams = cfg->readBoolEntry("lilyexportbeamings", false);
     m_exportStaffMerge = cfg->readBoolEntry("lilyexportstaffmerge", false);
     m_exportStaffGroup = cfg->readBoolEntry("lilyexportstaffbrackets", true);
-    m_lyricsHAlignment = cfg->readBoolEntry("lilylyricshtqalignment", LEFT_ALIGN);
+    m_lyricsHAlignment = cfg->readBoolEntry("lilylyricshalignment", LEFT_ALIGN);
 
     m_languageLevel = cfg->readUnsignedNumEntry("lilylanguage", LILYPOND_VERSION_2_6);
     m_exportMarkerMode = cfg->readUnsignedNumEntry("lilyexportmarkermode", EXPORT_NO_MARKERS );
@@ -402,7 +402,7 @@ LilyPondExporter::write()
         CurrentProgressDialog::freeze();
         int reply = KMessageBox::warningContinueCancel(
                         0, i18n("LilyPond does not allow spaces or backslashes in filenames.\n\n"
-                                "Would you like to use\n\n %1\n\n instead?").tqarg(baseName));
+                                "Would you like to use\n\n %1\n\n instead?").arg(baseName));
         if (reply != KMessageBox::Continue)
             return false;
     }
@@ -1202,13 +1202,13 @@ LilyPondExporter::write()
 			    str << indent(col) << "\\lyricsto \"" << voiceNumber.str() << "\""
 			        << " \\new Lyrics \\lyricmode {" << std::endl;
 			    if (m_lyricsHAlignment == RIGHT_ALIGN) {
-				str << indent(++col) << "\\override LyricText #'self-tqalignment-X = #RIGHT"
+				str << indent(++col) << "\\override LyricText #'self-alignment-X = #RIGHT"
 				    << std::endl;
 			    } else if (m_lyricsHAlignment == CENTER_ALIGN) {
-				str << indent(++col) << "\\override LyricText #'self-tqalignment-X = #CENTER"
+				str << indent(++col) << "\\override LyricText #'self-alignment-X = #CENTER"
 				    << std::endl;
 			    } else {
-				str << indent(++col) << "\\override LyricText #'self-tqalignment-X = #LEFT"
+				str << indent(++col) << "\\override LyricText #'self-alignment-X = #LEFT"
 				    << std::endl;
 			    }
 			    str << indent(col) << "\\set ignoreMelismata = ##t" << std::endl;
@@ -1430,7 +1430,7 @@ LilyPondExporter::writeBar(Segment *s,
         writtenDuration += note.getDuration();
         durationRatio = writeSkip(timeSignature, 0, note.getDuration(), true, str);
 	durationRatioSum = fractionSum(durationRatioSum,durationRatio);
-        // str << qstrtostr(TQString(" %{ %1/%2 %} ").tqarg(durationRatio.first).tqarg(durationRatio.second)); // DEBUG
+        // str << qstrtostr(TQString(" %{ %1/%2 %} ").arg(durationRatio.first).arg(durationRatio.second)); // DEBUG
     }
 
     timeT prevDuration = -1;
@@ -1496,7 +1496,7 @@ LilyPondExporter::writeBar(Segment *s,
                             groupId = -1;
                             groupType = "";
                         } else {
-                            startGroupBeamingsStr += TQString("\\times %1/%2 { ").tqarg(numerator).tqarg(denominator);
+                            startGroupBeamingsStr += TQString("\\times %1/%2 { ").arg(numerator).arg(denominator);
                             tupletRatio = std::pair<int, int>(numerator, denominator);
 			    // Require explicit beamed groups,
 			    // fixes bug #1683205.
@@ -1688,7 +1688,7 @@ LilyPondExporter::writeBar(Segment *s,
             writtenDuration += soundingDuration;
 	    std::pair<int,int> ratio = fractionProduct(durationRatio,tupletRatio);
 	    durationRatioSum = fractionSum(durationRatioSum, ratio);
-	    // str << qstrtostr(TQString(" %{ %1/%2 * %3/%4 = %5/%6 %} ").tqarg(durationRatio.first).tqarg(durationRatio.second).tqarg(tupletRatio.first).tqarg(tupletRatio.second).tqarg(ratio.first).tqarg(ratio.second)); // DEBUG
+	    // str << qstrtostr(TQString(" %{ %1/%2 * %3/%4 = %5/%6 %} ").arg(durationRatio.first).arg(durationRatio.second).arg(tupletRatio.first).arg(tupletRatio.second).arg(ratio.first).arg(ratio.second)); // DEBUG
 
             std::vector<Mark> marks(chord.getMarksForChord());
             // problem here: stem direction unavailable (it's a view-local property)
@@ -1869,7 +1869,7 @@ LilyPondExporter::writeBar(Segment *s,
             writtenDuration += soundingDuration;
 	    std::pair<int,int> ratio = fractionProduct(durationRatio,tupletRatio);
 	    durationRatioSum = fractionSum(durationRatioSum, ratio);
-	    // str << qstrtostr(TQString(" %{ %1/%2 * %3/%4 = %5/%6 %} ").tqarg(durationRatio.first).tqarg(durationRatio.second).tqarg(tupletRatio.first).tqarg(tupletRatio.second).tqarg(ratio.first).tqarg(ratio.second)); // DEBUG
+	    // str << qstrtostr(TQString(" %{ %1/%2 * %3/%4 = %5/%6 %} ").arg(durationRatio.first).arg(durationRatio.second).arg(tupletRatio.first).arg(tupletRatio.second).arg(ratio.first).arg(ratio.second)); // DEBUG
         } else if ((*i)->isa(Clef::EventType)) {
 
             try {

src/document/io/RG21Loader.cpp

@@ -106,8 +106,8 @@ bool RG21Loader::parseKey()
     }
 
     TQString keyName = TQString("%1 %2or")
-                      .tqarg(keyBase)
+                      .arg(keyBase)
-                      .tqarg(m_tokens[3].lower());
+                      .arg(m_tokens[3].lower());
 
     m_currentKey = Rosegarden::Key(qstrtostr(keyName));
     Event *keyEvent = m_currentKey.getAsEvent(m_currentSegmentTime);
@@ -484,7 +484,7 @@ void RG21Loader::closeGroup()
 
                 // To change the time of an event, we need to erase &
                 // re-insert it.  But erasure will delete the event, and
-                // if it's an indication event that will tqinvalidate our
+                // if it's an indication event that will invalidate our
                 // indicationsExtant entry.  Hence this unpleasantness:
 
                 if ((*i)->isa(Indication::EventType)) {

src/gui/application/RosegardenApplication.cpp

@@ -101,7 +101,7 @@ void RosegardenApplication::sfxLoadExited(KProcess *proc)
         config()->setGroup(configGroup);
 
         KMessageBox::error(mainWidget(),
-                           i18n("Failed to load soundfont %1").tqarg(soundFontPath));
+                           i18n("Failed to load soundfont %1").arg(soundFontPath));
     } else {
         RG_DEBUG << "RosegardenApplication::sfxLoadExited() : sfxload exited normally\n";
     }
@@ -114,7 +114,7 @@ void RosegardenApplication::slotSetStatusMessage(TQString msg)
     if (mainWindow) {
         if (msg.isEmpty())
             msg = KTmpStatusMsg::getDefaultMsg();
-        mainWindow->statusBar()->changeItem(TQString("  %1").tqarg(msg), KTmpStatusMsg::getDefaultId());
+        mainWindow->statusBar()->changeItem(TQString("  %1").arg(msg), KTmpStatusMsg::getDefaultId());
     }
 
 }

src/gui/application/RosegardenGUIApp.cpp

@@ -1293,8 +1293,8 @@ void RosegardenGUIApp::initZoomToolbar()
     }
 
     // zoom labels
-    TQString minZoom = TQString("%1%").tqarg(factors[0] * 100.0);
+    TQString minZoom = TQString("%1%").arg(factors[0] * 100.0);
-    TQString maxZoom = TQString("%1%").tqarg(factors[(sizeof(factors) / sizeof(factors[0])) - 1] * 100.0);
+    TQString maxZoom = TQString("%1%").arg(factors[(sizeof(factors) / sizeof(factors[0])) - 1] * 100.0);
 
     m_zoomSlider = new ZoomSlider<double>
                    (zoomSizes, -1, Qt::Horizontal, zoomToolbar, "kde toolbar widget");
@@ -1716,7 +1716,7 @@ RosegardenGUIApp::createDocument(TQString filePath, ImportType importType)
     if (!info.exists()) {
         // can happen with command-line arg, so...
         KStartupLogo::hideIfStillThere();
-        KMessageBox::sorry(this, i18n("File \"%1\" does not exist").tqarg(filePath));
+        KMessageBox::sorry(this, i18n("File \"%1\" does not exist").arg(filePath));
         return 0;
     }
 
@@ -1731,7 +1731,7 @@ RosegardenGUIApp::createDocument(TQString filePath, ImportType importType)
     if (!file.open(IO_ReadOnly)) {
         KStartupLogo::hideIfStillThere();
         TQString errStr =
-            i18n("You do not have read permission for \"%1\"").tqarg(filePath);
+            i18n("You do not have read permission for \"%1\"").arg(filePath);
 
         KMessageBox::sorry(this, errStr);
         return 0;
@@ -1850,8 +1850,8 @@ void RosegardenGUIApp::slotSaveOptions()
 
 #ifdef SETTING_LOG_DEBUG
 
-    _settingLog(TQString("SETTING 2 : transport flap extended = %1").tqarg(getTransport()->isExpanded()));
+    _settingLog(TQString("SETTING 2 : transport flap extended = %1").arg(getTransport()->isExpanded()));
-    _settingLog(TQString("SETTING 2 : show track labels = %1").tqarg(m_viewTrackLabels->isChecked()));
+    _settingLog(TQString("SETTING 2 : show track labels = %1").arg(m_viewTrackLabels->isChecked()));
 #endif
 
     kapp->config()->setGroup(GeneralOptionsConfigGroup);
@@ -1893,13 +1893,13 @@ void RosegardenGUIApp::setupFileDialogSpeedbar()
 
         unsigned int n = config->readUnsignedNumEntry("Number of Entries", 0);
 
-        config->writeEntry(TQString("Description_%1").tqarg(n), i18n("Example Files"));
+        config->writeEntry(TQString("Description_%1").arg(n), i18n("Example Files"));
-        config->writeEntry(TQString("IconGroup_%1").tqarg(n), 4);
+        config->writeEntry(TQString("IconGroup_%1").arg(n), 4);
-        config->writeEntry(TQString("Icon_%1").tqarg(n), "folder");
+        config->writeEntry(TQString("Icon_%1").arg(n), "folder");
-        config->writeEntry(TQString("URL_%1").tqarg(n),
+        config->writeEntry(TQString("URL_%1").arg(n),
                            KGlobal::dirs()->findResource("appdata", "examples/"));
 
-        RG_DEBUG << "wrote url " << config->readEntry(TQString("URL_%1").tqarg(n)) << endl;
+        RG_DEBUG << "wrote url " << config->readEntry(TQString("URL_%1").arg(n)) << endl;
 
         config->writeEntry("Examples Set", true);
         config->writeEntry("Number of Entries", n + 1);
@@ -1936,7 +1936,7 @@ void RosegardenGUIApp::readOptions()
 
 #ifdef SETTING_LOG_DEBUG
 
-    _settingLog(TQString("SETTING 3 : transport flap extended = %1").tqarg(opt));
+    _settingLog(TQString("SETTING 3 : transport flap extended = %1").arg(opt));
 #endif
 
     if (opt)
@@ -1948,7 +1948,7 @@ void RosegardenGUIApp::readOptions()
 
 #ifdef SETTING_LOG_DEBUG
 
-    _settingLog(TQString("SETTING 3 : show track labels = %1").tqarg(opt));
+    _settingLog(TQString("SETTING 3 : show track labels = %1").arg(opt));
 #endif
 
     m_viewTrackLabels->setChecked(opt);
@@ -2010,10 +2010,10 @@ void RosegardenGUIApp::saveGlobalProperties(KConfig *cfg)
         if (!res) {
             if (!errMsg.isNull())
                 KMessageBox::error(this, i18n(TQString("Could not save document at %1\nError was : %2")
-                                              .tqarg(tempname).tqarg(errMsg).ascii()));
+                                              .arg(tempname).arg(errMsg).ascii()));
             else
                 KMessageBox::error(this, i18n(TQString("Could not save document at %1")
-                                              .tqarg(tempname).ascii()));
+                                              .arg(tempname).ascii()));
         }
     }
 }
@@ -2061,8 +2061,8 @@ bool RosegardenGUIApp::queryClose()
     RG_DEBUG << "RosegardenGUIApp::queryClose" << endl;
 #ifdef SETTING_LOG_DEBUG
 
-    _settingLog(TQString("SETTING 1 : transport flap extended = %1").tqarg(getTransport()->isExpanded()));
+    _settingLog(TQString("SETTING 1 : transport flap extended = %1").arg(getTransport()->isExpanded()));
-    _settingLog(TQString("SETTING 1 : show track labels = %1").tqarg(m_viewTrackLabels->isChecked()));
+    _settingLog(TQString("SETTING 1 : show track labels = %1").arg(m_viewTrackLabels->isChecked()));
 #endif
 
     TQString errMsg;
@@ -2151,7 +2151,7 @@ void RosegardenGUIApp::openURL(const KURL& url)
 
     if (!url.isValid()) {
         TQString string;
-        string = i18n( "Malformed URL\n%1").tqarg(netFile);
+        string = i18n( "Malformed URL\n%1").arg(netFile);
 
         KMessageBox::sorry(this, string);
         return ;
@@ -2160,7 +2160,7 @@ void RosegardenGUIApp::openURL(const KURL& url)
     TQString target, caption(url.path());
 
     if (KIO::NetAccess::download(url, target, this) == false) {
-        KMessageBox::error(this, i18n("Cannot download file %1").tqarg(url.prettyURL()));
+        KMessageBox::error(this, i18n("Cannot download file %1").arg(url.prettyURL()));
         return ;
     }
 
@@ -2192,7 +2192,7 @@ void RosegardenGUIApp::slotFileOpen()
         kapp->config()->setGroup("Recent Dirs");
         TQString recentString = kapp->config()->readEntry("ROSEGARDEN", "");
         kapp->config()->writeEntry
-        ("ROSEGARDEN", TQString("file:%1,%2").tqarg(examplesDir).tqarg(recentString));
+        ("ROSEGARDEN", TQString("file:%1,%2").arg(examplesDir).arg(recentString));
     }
 
     KURL url = KFileDialog::getOpenURL
@@ -2226,7 +2226,7 @@ void RosegardenGUIApp::slotMerge()
     TQString target;
 
     if (KIO::NetAccess::download(url, target, this) == false) {
-        KMessageBox::error(this, i18n("Cannot download file %1").tqarg(url.prettyURL()));
+        KMessageBox::error(this, i18n("Cannot download file %1").arg(url.prettyURL()));
         return ;
     }
 
@@ -2273,10 +2273,10 @@ void RosegardenGUIApp::slotFileSave()
         if (!res) {
             if (!errMsg.isNull())
                 KMessageBox::error(this, i18n(TQString("Could not save document at %1\nError was : %2")
-                                              .tqarg(docFilePath).tqarg(errMsg).ascii()));
+                                              .arg(docFilePath).arg(errMsg).ascii()));
             else
                 KMessageBox::error(this, i18n(TQString("Could not save document at %1")
-                                              .tqarg(docFilePath).ascii()));
+                                              .arg(docFilePath).ascii()));
         }
     }
 }
@@ -2376,10 +2376,10 @@ bool RosegardenGUIApp::slotFileSaveAs()
     if (!res) {
         if (!errMsg.isNull())
             KMessageBox::error(this, i18n(TQString("Could not save document at %1\nError was : %2")
-                                          .tqarg(newName).tqarg(errMsg).ascii()));
+                                          .arg(newName).arg(errMsg).ascii()));
         else
             KMessageBox::error(this, i18n(TQString("Could not save document at %1")
-                                          .tqarg(newName).ascii()));
+                                          .arg(newName).ascii()));
 
     } else {
 
@@ -2764,7 +2764,7 @@ RosegardenGUIApp::testAudioPath(TQString op)
     } catch (AudioFileManager::BadAudioPathException) {
         if (KMessageBox::warningContinueCancel
             (this,
-	     i18n("The audio file path does not exist or is not writable.\nYou must set the audio file path to a valid directory in Document Properties before %1.\nWould you like to set it now?").tqarg(op),
+	     i18n("The audio file path does not exist or is not writable.\nYou must set the audio file path to a valid directory in Document Properties before %1.\nWould you like to set it now?").arg(op),
              i18n("Warning"),
              i18n("Set audio file path")) == KMessageBox::Continue) {
             slotOpenAudioPathSettings();
@@ -3714,7 +3714,7 @@ void RosegardenGUIApp::importProject(TQString filePath)
 
     if (!proc->normalExit() || proc->exitStatus()) {
         CurrentProgressDialog::freeze();
-        KMessageBox::sorry(this, i18n("Failed to import project file \"%1\"").tqarg(filePath));
+        KMessageBox::sorry(this, i18n("Failed to import project file \"%1\"").arg(filePath));
         CurrentProgressDialog::thaw();
         delete proc;
         return ;
@@ -4530,7 +4530,7 @@ void RosegardenGUIApp::slotTestStartupTester()
         } else {
             for (int i = 0; i < missing.count(); ++i) {
 //                if (missingFeatures.count() > 1) {
-                    allMissing.push_back(i18n("%1 - for project file support").tqarg(missing[i]));
+                    allMissing.push_back(i18n("%1 - for project file support").arg(missing[i]));
 //                } else {
 //                    allMissing.push_back(missing[i]);
 //                }
@@ -4551,7 +4551,7 @@ void RosegardenGUIApp::slotTestStartupTester()
         } else {
             for (int i = 0; i < missing.count(); ++i) {
                 if (missingFeatures.count() > 1) {
-                    allMissing.push_back(i18n("%1 - for LilyPond preview support").tqarg(missing[i]));
+                    allMissing.push_back(i18n("%1 - for LilyPond preview support").arg(missing[i]));
                 } else {
                     allMissing.push_back(missing[i]);
                 }
@@ -4571,7 +4571,7 @@ void RosegardenGUIApp::slotTestStartupTester()
             } else {
                 for (int i = 0; i < missing.count(); ++i) {
                     if (missingFeatures.count() > 1) {
-                        allMissing.push_back(i18n("%1 - for audio file import").tqarg(missing[i]));
+                        allMissing.push_back(i18n("%1 - for audio file import").arg(missing[i]));
                     } else {
                         allMissing.push_back(missing[i]);
                     }
@@ -4585,13 +4585,13 @@ void RosegardenGUIApp::slotTestStartupTester()
         TQString message = i18n("<h3>Helper programs not found</h3><p>Rosegarden could not find one or more helper programs which it needs to provide some features.  The following features will not be available:</p>");
         message += i18n("<ul>");
         for (int i = 0; i < missingFeatures.count(); ++i) {
-            message += i18n("<li>%1</li>").tqarg(missingFeatures[i]);
+            message += i18n("<li>%1</li>").arg(missingFeatures[i]);
         }
         message += i18n("</ul>");
         message += i18n("<p>To fix this, you should install the following additional programs:</p>");
         message += i18n("<ul>");
         for (int i = 0; i < allMissing.count(); ++i) {
-            message += i18n("<li>%1</li>").tqarg(allMissing[i]);
+            message += i18n("<li>%1</li>").arg(allMissing[i]);
         }
         message += i18n("</ul>");
 
@@ -4872,7 +4872,7 @@ void RosegardenGUIApp::slotExportProject()
     TQString errMsg;
     if (!m_doc->saveDocument(rgFile, errMsg,
                              true)) { // pretend it's autosave
-        KMessageBox::sorry(this, i18n("Saving Rosegarden file to package failed: %1").tqarg(errMsg));
+        KMessageBox::sorry(this, i18n("Saving Rosegarden file to package failed: %1").arg(errMsg));
         CurrentProgressDialog::thaw();
         return ;
     }
@@ -4886,7 +4886,7 @@ void RosegardenGUIApp::slotExportProject()
     proc->start(KProcess::Block, KProcess::All);
 
     if (!proc->normalExit() || proc->exitStatus()) {
-        KMessageBox::sorry(this, i18n("Failed to export to project file \"%1\"").tqarg(fileName));
+        KMessageBox::sorry(this, i18n("Failed to export to project file \"%1\"").arg(fileName));
         CurrentProgressDialog::thaw();
         delete proc;
         return ;
@@ -5790,7 +5790,7 @@ void RosegardenGUIApp::slotChangeZoom(int)
 {
     double duration44 = TimeSignature(4, 4).getBarDuration();
     double value = double(m_zoomSlider->getCurrentSize());
-    m_zoomLabel->setText(i18n("%1%").tqarg(duration44 / value));
+    m_zoomLabel->setText(i18n("%1%").arg(duration44 / value));
 
     RG_DEBUG << "RosegardenGUIApp::slotChangeZoom : zoom size = "
     << m_zoomSlider->getCurrentSize() << endl;
@@ -5858,7 +5858,7 @@ RosegardenGUIApp::slotChangeTempo(timeT time,
         timeT prevTime = comp.getTempoChange(index).first;
 
         KMacroCommand *macro =
-            new KMacroCommand(i18n("Replace Tempo Change at %1").tqarg(time));
+            new KMacroCommand(i18n("Replace Tempo Change at %1").arg(time));
 
         macro->addCommand(new RemoveTempoChangeCommand(&comp, index));
         macro->addCommand(new AddTempoChangeCommand(&comp, prevTime, value,
@@ -6360,7 +6360,7 @@ RosegardenGUIApp::slotAddAudioFile(unsigned int id)
         int result;
         streamIn >> result;
         if (!result) {
-            KMessageBox::error(this, i18n("Sequencer failed to add audio file %1").tqarg(aF->getFilename().c_str()));
+            KMessageBox::error(this, i18n("Sequencer failed to add audio file %1").arg(aF->getFilename().c_str()));
         }
     }
 }
@@ -6385,7 +6385,7 @@ RosegardenGUIApp::slotDeleteAudioFile(unsigned int id)
         int result;
         streamIn >> result;
         if (!result) {
-            KMessageBox::error(this, i18n("Sequencer failed to remove audio file id %1").tqarg(id));
+            KMessageBox::error(this, i18n("Sequencer failed to remove audio file id %1").arg(id));
         }
     }
 }
@@ -7753,10 +7753,10 @@ RosegardenGUIApp::slotSaveDefaultStudio()
     if (!res) {
         if (!errMsg.isNull())
             KMessageBox::error(this, i18n(TQString("Could not auto-save document at %1\nError was : %2")
-                                          .tqarg(autoloadFile).tqarg(errMsg).ascii()));
+                                          .arg(autoloadFile).arg(errMsg).ascii()));
         else
             KMessageBox::error(this, i18n(TQString("Could not auto-save document at %1")
-                                          .tqarg(autoloadFile).ascii()));
+                                          .arg(autoloadFile).ascii()));
 
     }
 }
@@ -7808,7 +7808,7 @@ RosegardenGUIApp::slotImportStudio()
     TQString target;
     if (KIO::NetAccess::download(url, target, this) == false) {
         KMessageBox::error(this, i18n("Cannot download file %1")
-                           .tqarg(url.prettyURL()));
+                           .arg(url.prettyURL()));
         return ;
     }
 
@@ -8044,7 +8044,7 @@ RosegardenGUIApp::slotNewerVersionAvailable(TQString v)
         (this,
          i18n("<h3>Newer version available</h3><p>A newer version of Rosegarden may be available.<br>Please consult the <a href=\"http://www.rosegardenmusic.com/getting/\">Rosegarden website</a> for more information.</p>"),
          i18n("Newer version available"),
-         TQString("version-%1-available-show").tqarg(v),
+         TQString("version-%1-available-show").arg(v),
          KMessageBox::AllowLink);
     CurrentProgressDialog::thaw();
 }

src/gui/application/RosegardenGUIApp.cpp.orig

@@ -1293,8 +1293,8 @@ void RosegardenGUIApp::initZoomToolbar()
     }
 
     // zoom labels
-    TQString minZoom = TQString("%1%").tqarg(factors[0] * 100.0);
+    TQString minZoom = TQString("%1%").arg(factors[0] * 100.0);
-    TQString maxZoom = TQString("%1%").tqarg(factors[(sizeof(factors) / sizeof(factors[0])) - 1] * 100.0);
+    TQString maxZoom = TQString("%1%").arg(factors[(sizeof(factors) / sizeof(factors[0])) - 1] * 100.0);
 
     m_zoomSlider = new ZoomSlider<double>
                    (zoomSizes, -1, TQSlider::Horizontal, zoomToolbar, "kde toolbar widget");
@@ -1716,7 +1716,7 @@ RosegardenGUIApp::createDocument(TQString filePath, ImportType importType)
     if (!info.exists()) {
         // can happen with command-line arg, so...
         KStartupLogo::hideIfStillThere();
-        KMessageBox::sorry(this, i18n("File \"%1\" does not exist").tqarg(filePath));
+        KMessageBox::sorry(this, i18n("File \"%1\" does not exist").arg(filePath));
         return 0;
     }
 
@@ -1731,7 +1731,7 @@ RosegardenGUIApp::createDocument(TQString filePath, ImportType importType)
     if (!file.open(IO_ReadOnly)) {
         KStartupLogo::hideIfStillThere();
         TQString errStr =
-            i18n("You do not have read permission for \"%1\"").tqarg(filePath);
+            i18n("You do not have read permission for \"%1\"").arg(filePath);
 
         KMessageBox::sorry(this, errStr);
         return 0;
@@ -1850,8 +1850,8 @@ void RosegardenGUIApp::slotSaveOptions()
 
 #ifdef SETTING_LOG_DEBUG
 
-    _settingLog(TQString("SETTING 2 : transport flap extended = %1").tqarg(getTransport()->isExpanded()));
+    _settingLog(TQString("SETTING 2 : transport flap extended = %1").arg(getTransport()->isExpanded()));
-    _settingLog(TQString("SETTING 2 : show track labels = %1").tqarg(m_viewTrackLabels->isChecked()));
+    _settingLog(TQString("SETTING 2 : show track labels = %1").arg(m_viewTrackLabels->isChecked()));
 #endif
 
     kapp->config()->setGroup(GeneralOptionsConfigGroup);
@@ -1893,13 +1893,13 @@ void RosegardenGUIApp::setupFileDialogSpeedbar()
 
         unsigned int n = config->readUnsignedNumEntry("Number of Entries", 0);
 
-        config->writeEntry(TQString("Description_%1").tqarg(n), i18n("Example Files"));
+        config->writeEntry(TQString("Description_%1").arg(n), i18n("Example Files"));
-        config->writeEntry(TQString("IconGroup_%1").tqarg(n), 4);
+        config->writeEntry(TQString("IconGroup_%1").arg(n), 4);
-        config->writeEntry(TQString("Icon_%1").tqarg(n), "folder");
+        config->writeEntry(TQString("Icon_%1").arg(n), "folder");
-        config->writeEntry(TQString("URL_%1").tqarg(n),
+        config->writeEntry(TQString("URL_%1").arg(n),
                            KGlobal::dirs()->findResource("appdata", "examples/"));
 
-        RG_DEBUG << "wrote url " << config->readEntry(TQString("URL_%1").tqarg(n)) << endl;
+        RG_DEBUG << "wrote url " << config->readEntry(TQString("URL_%1").arg(n)) << endl;
 
         config->writeEntry("Examples Set", true);
         config->writeEntry("Number of Entries", n + 1);
@@ -1936,7 +1936,7 @@ void RosegardenGUIApp::readOptions()
 
 #ifdef SETTING_LOG_DEBUG
 
-    _settingLog(TQString("SETTING 3 : transport flap extended = %1").tqarg(opt));
+    _settingLog(TQString("SETTING 3 : transport flap extended = %1").arg(opt));
 #endif
 
     if (opt)
@@ -1948,7 +1948,7 @@ void RosegardenGUIApp::readOptions()
 
 #ifdef SETTING_LOG_DEBUG
 
-    _settingLog(TQString("SETTING 3 : show track labels = %1").tqarg(opt));
+    _settingLog(TQString("SETTING 3 : show track labels = %1").arg(opt));
 #endif
 
     m_viewTrackLabels->setChecked(opt);
@@ -2010,10 +2010,10 @@ void RosegardenGUIApp::saveGlobalProperties(KConfig *cfg)
         if (!res) {
             if (errMsg)
                 KMessageBox::error(this, i18n(TQString("Could not save document at %1\nError was : %2")
-                                              .tqarg(tempname).tqarg(errMsg)));
+                                              .arg(tempname).arg(errMsg)));
             else
                 KMessageBox::error(this, i18n(TQString("Could not save document at %1")
-                                              .tqarg(tempname)));
+                                              .arg(tempname)));
         }
     }
 }
@@ -2061,8 +2061,8 @@ bool RosegardenGUIApp::queryClose()
     RG_DEBUG << "RosegardenGUIApp::queryClose" << endl;
 #ifdef SETTING_LOG_DEBUG
 
-    _settingLog(TQString("SETTING 1 : transport flap extended = %1").tqarg(getTransport()->isExpanded()));
+    _settingLog(TQString("SETTING 1 : transport flap extended = %1").arg(getTransport()->isExpanded()));
-    _settingLog(TQString("SETTING 1 : show track labels = %1").tqarg(m_viewTrackLabels->isChecked()));
+    _settingLog(TQString("SETTING 1 : show track labels = %1").arg(m_viewTrackLabels->isChecked()));
 #endif
 
     TQString errMsg;
@@ -2151,7 +2151,7 @@ void RosegardenGUIApp::openURL(const KURL& url)
 
     if (!url.isValid()) {
         TQString string;
-        string = i18n( "Malformed URL\n%1").tqarg(netFile);
+        string = i18n( "Malformed URL\n%1").arg(netFile);
 
         KMessageBox::sorry(this, string);
         return ;
@@ -2160,7 +2160,7 @@ void RosegardenGUIApp::openURL(const KURL& url)
     TQString target, caption(url.path());
 
     if (KIO::NetAccess::download(url, target, this) == false) {
-        KMessageBox::error(this, i18n("Cannot download file %1").tqarg(url.prettyURL()));
+        KMessageBox::error(this, i18n("Cannot download file %1").arg(url.prettyURL()));
         return ;
     }
 
@@ -2192,7 +2192,7 @@ void RosegardenGUIApp::slotFileOpen()
         kapp->config()->setGroup("Recent Dirs");
         TQString recentString = kapp->config()->readEntry("ROSEGARDEN", "");
         kapp->config()->writeEntry
-        ("ROSEGARDEN", TQString("file:%1,%2").tqarg(examplesDir).tqarg(recentString));
+        ("ROSEGARDEN", TQString("file:%1,%2").arg(examplesDir).arg(recentString));
     }
 
     KURL url = KFileDialog::getOpenURL
@@ -2226,7 +2226,7 @@ void RosegardenGUIApp::slotMerge()
     TQString target;
 
     if (KIO::NetAccess::download(url, target, this) == false) {
-        KMessageBox::error(this, i18n("Cannot download file %1").tqarg(url.prettyURL()));
+        KMessageBox::error(this, i18n("Cannot download file %1").arg(url.prettyURL()));
         return ;
     }
 
@@ -2273,10 +2273,10 @@ void RosegardenGUIApp::slotFileSave()
         if (!res) {
             if (errMsg)
                 KMessageBox::error(this, i18n(TQString("Could not save document at %1\nError was : %2")
-                                              .tqarg(docFilePath).tqarg(errMsg)));
+                                              .arg(docFilePath).arg(errMsg)));
             else
                 KMessageBox::error(this, i18n(TQString("Could not save document at %1")
-                                              .tqarg(docFilePath)));
+                                              .arg(docFilePath)));
         }
     }
 }
@@ -2376,10 +2376,10 @@ bool RosegardenGUIApp::slotFileSaveAs()
     if (!res) {
         if (errMsg)
             KMessageBox::error(this, i18n(TQString("Could not save document at %1\nError was : %2")
-                                          .tqarg(newName).tqarg(errMsg)));
+                                          .arg(newName).arg(errMsg)));
         else
             KMessageBox::error(this, i18n(TQString("Could not save document at %1")
-                                          .tqarg(newName)));
+                                          .arg(newName)));
 
     } else {
 
@@ -2764,7 +2764,7 @@ RosegardenGUIApp::testAudioPath(TQString op)
     } catch (AudioFileManager::BadAudioPathException) {
         if (KMessageBox::warningContinueCancel
             (this,
-	     i18n("The audio file path does not exist or is not writable.\nYou must set the audio file path to a valid directory in Document Properties before %1.\nWould you like to set it now?").tqarg(op),
+	     i18n("The audio file path does not exist or is not writable.\nYou must set the audio file path to a valid directory in Document Properties before %1.\nWould you like to set it now?").arg(op),
              i18n("Warning"),
              i18n("Set audio file path")) == KMessageBox::Continue) {
             slotOpenAudioPathSettings();
@@ -3714,7 +3714,7 @@ void RosegardenGUIApp::importProject(TQString filePath)
 
     if (!proc->normalExit() || proc->exitStatus()) {
         CurrentProgressDialog::freeze();
-        KMessageBox::sorry(this, i18n("Failed to import project file \"%1\"").tqarg(filePath));
+        KMessageBox::sorry(this, i18n("Failed to import project file \"%1\"").arg(filePath));
         CurrentProgressDialog::thaw();
         delete proc;
         return ;
@@ -4530,7 +4530,7 @@ void RosegardenGUIApp::slotTestStartupTester()
         } else {
             for (int i = 0; i < missing.count(); ++i) {
 //                if (missingFeatures.count() > 1) {
-                    allMissing.push_back(i18n("%1 - for project file support").tqarg(missing[i]));
+                    allMissing.push_back(i18n("%1 - for project file support").arg(missing[i]));
 //                } else {
 //                    allMissing.push_back(missing[i]);
 //                }
@@ -4551,7 +4551,7 @@ void RosegardenGUIApp::slotTestStartupTester()
         } else {
             for (int i = 0; i < missing.count(); ++i) {
                 if (missingFeatures.count() > 1) {
-                    allMissing.push_back(i18n("%1 - for LilyPond preview support").tqarg(missing[i]));
+                    allMissing.push_back(i18n("%1 - for LilyPond preview support").arg(missing[i]));
                 } else {
                     allMissing.push_back(missing[i]);
                 }
@@ -4571,7 +4571,7 @@ void RosegardenGUIApp::slotTestStartupTester()
             } else {
                 for (int i = 0; i < missing.count(); ++i) {
                     if (missingFeatures.count() > 1) {
-                        allMissing.push_back(i18n("%1 - for audio file import").tqarg(missing[i]));
+                        allMissing.push_back(i18n("%1 - for audio file import").arg(missing[i]));
                     } else {
                         allMissing.push_back(missing[i]);
                     }
@@ -4585,13 +4585,13 @@ void RosegardenGUIApp::slotTestStartupTester()
         TQString message = i18n("<h3>Helper programs not found</h3><p>Rosegarden could not find one or more helper programs which it needs to provide some features.  The following features will not be available:</p>");
         message += i18n("<ul>");
         for (int i = 0; i < missingFeatures.count(); ++i) {
-            message += i18n("<li>%1</li>").tqarg(missingFeatures[i]);
+            message += i18n("<li>%1</li>").arg(missingFeatures[i]);
         }
         message += i18n("</ul>");
         message += i18n("<p>To fix this, you should install the following additional programs:</p>");
         message += i18n("<ul>");
         for (int i = 0; i < allMissing.count(); ++i) {
-            message += i18n("<li>%1</li>").tqarg(allMissing[i]);
+            message += i18n("<li>%1</li>").arg(allMissing[i]);
         }
         message += i18n("</ul>");
 
@@ -4872,7 +4872,7 @@ void RosegardenGUIApp::slotExportProject()
     TQString errMsg;
     if (!m_doc->saveDocument(rgFile, errMsg,
                              true)) { // pretend it's autosave
-        KMessageBox::sorry(this, i18n("Saving Rosegarden file to package failed: %1").tqarg(errMsg));
+        KMessageBox::sorry(this, i18n("Saving Rosegarden file to package failed: %1").arg(errMsg));
         CurrentProgressDialog::thaw();
         return ;
     }
@@ -4886,7 +4886,7 @@ void RosegardenGUIApp::slotExportProject()
     proc->start(KProcess::Block, KProcess::All);
 
     if (!proc->normalExit() || proc->exitStatus()) {
-        KMessageBox::sorry(this, i18n("Failed to export to project file \"%1\"").tqarg(fileName));
+        KMessageBox::sorry(this, i18n("Failed to export to project file \"%1\"").arg(fileName));
         CurrentProgressDialog::thaw();
         delete proc;
         return ;
@@ -5790,7 +5790,7 @@ void RosegardenGUIApp::slotChangeZoom(int)
 {
     double duration44 = TimeSignature(4, 4).getBarDuration();
     double value = double(m_zoomSlider->getCurrentSize());
-    m_zoomLabel->setText(i18n("%1%").tqarg(duration44 / value));
+    m_zoomLabel->setText(i18n("%1%").arg(duration44 / value));
 
     RG_DEBUG << "RosegardenGUIApp::slotChangeZoom : zoom size = "
     << m_zoomSlider->getCurrentSize() << endl;
@@ -5858,7 +5858,7 @@ RosegardenGUIApp::slotChangeTempo(timeT time,
         timeT prevTime = comp.getTempoChange(index).first;
 
         KMacroCommand *macro =
-            new KMacroCommand(i18n("Replace Tempo Change at %1").tqarg(time));
+            new KMacroCommand(i18n("Replace Tempo Change at %1").arg(time));
 
         macro->addCommand(new RemoveTempoChangeCommand(&comp, index));
         macro->addCommand(new AddTempoChangeCommand(&comp, prevTime, value,
@@ -6360,7 +6360,7 @@ RosegardenGUIApp::slotAddAudioFile(unsigned int id)
         int result;
         streamIn >> result;
         if (!result) {
-            KMessageBox::error(this, i18n("Sequencer failed to add audio file %1").tqarg(aF->getFilename().c_str()));
+            KMessageBox::error(this, i18n("Sequencer failed to add audio file %1").arg(aF->getFilename().c_str()));
         }
     }
 }
@@ -6385,7 +6385,7 @@ RosegardenGUIApp::slotDeleteAudioFile(unsigned int id)
         int result;
         streamIn >> result;
         if (!result) {
-            KMessageBox::error(this, i18n("Sequencer failed to remove audio file id %1").tqarg(id));
+            KMessageBox::error(this, i18n("Sequencer failed to remove audio file id %1").arg(id));
         }
     }
 }
@@ -7723,10 +7723,10 @@ RosegardenGUIApp::slotSaveDefaultStudio()
     if (!res) {
         if (errMsg)
             KMessageBox::error(this, i18n(TQString("Could not auto-save document at %1\nError was : %2")
-                                          .tqarg(autoloadFile).tqarg(errMsg)));
+                                          .arg(autoloadFile).arg(errMsg)));
         else
             KMessageBox::error(this, i18n(TQString("Could not auto-save document at %1")
-                                          .tqarg(autoloadFile)));
+                                          .arg(autoloadFile)));
 
     }
 }
@@ -7778,7 +7778,7 @@ RosegardenGUIApp::slotImportStudio()
     TQString target;
     if (KIO::NetAccess::download(url, target, this) == false) {
         KMessageBox::error(this, i18n("Cannot download file %1")
-                           .tqarg(url.prettyURL()));
+                           .arg(url.prettyURL()));
         return ;
     }
 
@@ -7982,7 +7982,7 @@ RosegardenGUIApp::awaitDialogClearance()
     
     while (haveDialog) {
 
-        const TQObjectList *c = tqchildren();
+        const TQObjectList *c = children();
         if (!c) return;
 
         haveDialog = false;
@@ -8014,7 +8014,7 @@ RosegardenGUIApp::slotNewerVersionAvailable(TQString v)
         (this,
          i18n("<h3>Newer version available</h3><p>A newer version of Rosegarden may be available.<br>Please consult the <a href=\"http://www.rosegardenmusic.com/getting/\">Rosegarden website</a> for more information.</p>"),
          i18n("Newer version available"),
-         TQString("version-%1-available-show").tqarg(v),
+         TQString("version-%1-available-show").arg(v),
          KMessageBox::AllowLink);
     CurrentProgressDialog::thaw();
 }

src/gui/application/RosegardenGUIApp.h

@@ -1240,7 +1240,7 @@ public slots:
     
     /**
      * save general Options like all bar positions and status as well
-     * as the tqgeometry and the recent file list to the configuration
+     * as the geometry and the recent file list to the configuration
      * file
      */         
     void slotSaveOptions();

src/gui/application/RosegardenGUIView.cpp

@@ -907,19 +907,19 @@ void RosegardenGUIView::setZoomSize(double size)
     m_trackEditor->getSegmentCanvas()->slotUpdateSegmentsDrawBuffer();
 
     if (m_trackEditor->getTempoRuler()) {
-        m_trackEditor->getTempoRuler()->tqrepaint();
+        m_trackEditor->getTempoRuler()->repaint();
     }
 
     if (m_trackEditor->getChordNameRuler()) {
-        m_trackEditor->getChordNameRuler()->tqrepaint();
+        m_trackEditor->getChordNameRuler()->repaint();
     }
 
     if (m_trackEditor->getTopStandardRuler()) {
-        m_trackEditor->getTopStandardRuler()->tqrepaint();
+        m_trackEditor->getTopStandardRuler()->repaint();
     }
 
     if (m_trackEditor->getBottomStandardRuler()) {
-        m_trackEditor->getBottomStandardRuler()->tqrepaint();
+        m_trackEditor->getBottomStandardRuler()->repaint();
     }
 }
 

src/gui/application/SetWaitCursor.cpp

@@ -79,7 +79,7 @@ SetWaitCursor::~SetWaitCursor()
         m_guiApp->setCursor(m_saveCursor);
 
         if (viewport) {
-            if (currentSegmentCanvasCursor.tqshape() == KCursor::waitCursor().tqshape()) {
+            if (currentSegmentCanvasCursor.shape() == KCursor::waitCursor().shape()) {
                 viewport->setCursor(m_saveSegmentCanvasCursor);
             } else {
                 viewport->setCursor(currentSegmentCanvasCursor); // because m_guiApp->setCursor() has replaced it

src/gui/application/main.cpp

@@ -379,7 +379,7 @@ void testInstalledVersion()
               " 2. The upgrade was installed in a non-standard directory,\n"
               "     and an old version was found in a standard directory.  If so,\n"
               "     you will need to add the correct directory to your TDEDIRS\n"
-              "     environment variable before you can run it.").tqarg(VERSION).tqarg(installedVersion),
+              "     environment variable before you can run it.").arg(VERSION).arg(installedVersion),
          i18n("Installation problem"));
 
     } else {
@@ -531,8 +531,8 @@ int main(int argc, char *argv[])
 	    startupSize = TQSize((desktopRect.width() * 4) / 5,
 				(desktopRect.height() * 4) / 5);
 	}
-	TQString widthKey = TQString("Width %1").tqarg(totalRect.width());
+	TQString widthKey = TQString("Width %1").arg(totalRect.width());
-	TQString heightKey = TQString("Height %1").tqarg(totalRect.height());
+	TQString heightKey = TQString("Height %1").arg(totalRect.height());
 	windowWidth = config->readUnsignedNumEntry
 	    (widthKey, startupSize.width());
 	windowHeight = config->readUnsignedNumEntry

src/gui/configuration/AudioConfigurationPage.cpp

@@ -259,7 +259,7 @@ AudioConfigurationPage::apply()
     if (extpath != "") {
         TQFileInfo info(extpath);
         if (!info.exists() || !info.isExecutable()) {
-            KMessageBox::error(0, i18n("External audio editor \"%1\" not found or not executable").tqarg(extpath));
+            KMessageBox::error(0, i18n("External audio editor \"%1\" not found or not executable").arg(extpath));
             m_cfg->writeEntry("externalaudioeditor", "");
         } else {
             m_cfg->writeEntry("externalaudioeditor", externalAudioEditor);
@@ -306,7 +306,7 @@ AudioConfigurationPage::getBestAvailableAudioEditor()
 
             if (fi.exists() && fi.isExecutable()) {
                 if (n == "rezound") {
-                    result = TQString("%1 --audio-method=jack").tqarg(fp);
+                    result = TQString("%1 --audio-method=jack").arg(fp);
                 } else {
                     result = fp;
                 }

src/gui/configuration/AudioPropertiesPage.cpp

@@ -111,9 +111,9 @@ AudioPropertiesPage::slotFoundMountPoint(const TQString&,
         unsigned long kBAvail )
 {
     m_diskSpace->setText(i18n("%1 out of %2 (%3% used)")
-                         .tqarg(KIO::convertSizeFromKB(kBAvail))
+                         .arg(KIO::convertSizeFromKB(kBAvail))
-                         .tqarg(KIO::convertSizeFromKB(kBSize))
+                         .arg(KIO::convertSizeFromKB(kBSize))
-                         .tqarg( 100 - (int)(100.0 * kBAvail / kBSize) ));
+                         .arg( 100 - (int)(100.0 * kBAvail / kBSize) ));
 
 
     AudioPluginManager *apm = m_doc->getPluginManager();
@@ -140,9 +140,9 @@ AudioPropertiesPage::slotFoundMountPoint(const TQString&,
     minsStr.sprintf("%8.1f", stereoMins);
 
     m_minutesAtStereo->
-    setText(TQString("%1 %2 %3Hz").tqarg(minsStr)
+    setText(TQString("%1 %2 %3Hz").arg(minsStr)
-            .tqarg(i18n("minutes at"))
+            .arg(i18n("minutes at"))
-            .tqarg(sampleRate));
+            .arg(sampleRate));
 }
 
 void

src/gui/configuration/DocumentMetaConfigurationPage.cpp

@@ -65,9 +65,9 @@ static TQString durationToString(Rosegarden::Composition &comp,
 				Rosegarden::RealTime rt)
 {
     return i18n("%1 minutes %2.%3%4 seconds (%5 units, %6 measures)") // TODO - PLURAL
-	.tqarg(rt.sec / 60).tqarg(rt.sec % 60)
+	.arg(rt.sec / 60).arg(rt.sec % 60)
-	.tqarg(rt.msec() / 100).tqarg((rt.msec() / 10) % 10)
+	.arg(rt.msec() / 100).arg((rt.msec() / 10) % 10)
-	.tqarg(duration).tqarg(comp.getBarNumber(absTime + duration) -
+	.arg(duration).arg(comp.getBarNumber(absTime + duration) -
 			   comp.getBarNumber(absTime));
 }
 
@@ -76,7 +76,7 @@ class SegmentDataItem : public TQTableItem
 public:
     SegmentDataItem(TQTable *t, TQString s) :
 	TQTableItem(t, TQTableItem::Never, s) { }
-    virtual int tqalignment() const { return TQt::AlignCenter; }
+    virtual int alignment() const { return TQt::AlignCenter; }
 
     virtual TQString key() const {
 
@@ -96,7 +96,7 @@ public:
 
 	TQString s(text());
 	if (s[0].digitValue() >= 0) {
-	    return TQString("%1%2").tqarg(s.length()).tqarg(s);
+	    return TQString("%1%2").arg(s.length()).arg(s);
 	} else {
 	    return s;
 	}
@@ -145,15 +145,15 @@ DocumentMetaConfigurationPage::DocumentMetaConfigurationPage(RosegardenGUIDoc *d
 
     tqlayout->addWidget(new TQLabel(i18n("Tracks:"), frame), 3, 0);
     tqlayout->addWidget(new TQLabel(i18n("%1 used, %2 total")
-                                 .tqarg(usedTracks.size())
+                                 .arg(usedTracks.size())
-                                 .tqarg(comp.getNbTracks()),
+                                 .arg(comp.getNbTracks()),
                                  frame), 3, 1);
 
     tqlayout->addWidget(new TQLabel(i18n("Segments:"), frame), 4, 0);
     tqlayout->addWidget(new TQLabel(i18n("%1 MIDI, %2 audio, %3 total")
-                                 .tqarg(internalSegments)
+                                 .arg(internalSegments)
-                                 .tqarg(audioSegments)
+                                 .arg(audioSegments)
-                                 .tqarg(internalSegments + audioSegments),
+                                 .arg(internalSegments + audioSegments),
                                  frame), 4, 1);
 
     tqlayout->setRowStretch(5, 2);
@@ -205,7 +205,7 @@ DocumentMetaConfigurationPage::DocumentMetaConfigurationPage(RosegardenGUIDoc *d
 
         table->setItem(i, 1, new SegmentDataItem
                        (table,
-                        TQString("%1").tqarg(s->getTrack() + 1)));
+                        TQString("%1").arg(s->getTrack() + 1)));
 
         TQPixmap colourPixmap(16, 16);
         Colour colour =
@@ -219,11 +219,11 @@ DocumentMetaConfigurationPage::DocumentMetaConfigurationPage(RosegardenGUIDoc *d
 
         table->setItem(i, 3, new SegmentDataItem
                        (table,
-                        TQString("%1").tqarg(s->getStartTime())));
+                        TQString("%1").arg(s->getStartTime())));
 
         table->setItem(i, 4, new SegmentDataItem
                        (table,
-                        TQString("%1").tqarg(s->getEndMarkerTime() -
+                        TQString("%1").arg(s->getEndMarkerTime() -
                                           s->getStartTime())));
 
         std::set<long> notesOn;
@@ -254,11 +254,11 @@ DocumentMetaConfigurationPage::DocumentMetaConfigurationPage(RosegardenGUIDoc *d
 
         table->setItem(i, 5, new SegmentDataItem
                        (table,
-                        TQString("%1").tqarg(events)));
+                        TQString("%1").arg(events)));
 
         table->setItem(i, 6, new SegmentDataItem
                        (table,
-                        TQString("%1").tqarg(maxPoly)));
+                        TQString("%1").arg(maxPoly)));
 
         table->setItem(i, 7, new SegmentDataItem
                        (table,
@@ -280,16 +280,16 @@ DocumentMetaConfigurationPage::DocumentMetaConfigurationPage(RosegardenGUIDoc *d
 
         table->setItem(i, 9, new SegmentDataItem
                        (table,
-                        TQString("%1").tqarg(s->getTranspose())));
+                        TQString("%1").arg(s->getTranspose())));
 
         if (s->getDelay() != 0) {
             if (s->getRealTimeDelay() != RealTime::zeroTime) {
                 table->setItem(i, 10, new SegmentDataItem
                                (table,
                                 TQString("%1 + %2 ms")
-                                .tqarg(NotationStrings::makeNoteMenuLabel
+                                .arg(NotationStrings::makeNoteMenuLabel
                                      (s->getDelay(), true, discard, false))
-                                .tqarg(s->getRealTimeDelay().sec * 1000 +
+                                .arg(s->getRealTimeDelay().sec * 1000 +
                                      s->getRealTimeDelay().msec())));
             } else {
                 table->setItem(i, 10, new SegmentDataItem
@@ -301,7 +301,7 @@ DocumentMetaConfigurationPage::DocumentMetaConfigurationPage(RosegardenGUIDoc *d
             table->setItem(i, 10, new SegmentDataItem
                            (table,
                             TQString("%2 ms")
-                            .tqarg(s->getRealTimeDelay().sec * 1000 +
+                            .arg(s->getRealTimeDelay().sec * 1000 +
                                  s->getRealTimeDelay().msec())));
         } else {
             table->setItem(i, 10, new SegmentDataItem

src/gui/configuration/HeadersConfigurationPage.cpp

@@ -233,7 +233,7 @@ HeadersConfigurationPage::slotAddNewProperty()
 
     while (1) {
         propertyName =
-            (i > 0 ? i18n("{new property %1}").tqarg(i) : i18n("{new property}"));
+            (i > 0 ? i18n("{new property %1}").arg(i) : i18n("{new property}"));
         if (!m_doc->getComposition().getMetadata().has(qstrtostr(propertyName)) &&
 	    m_metadata->findItem(propertyName,0) == 0)
             break;

src/gui/configuration/LatencyConfigurationPage.cpp

@@ -82,7 +82,7 @@ LatencyConfigurationPage::LatencyConfigurationPage(RosegardenGUIDoc *doc,
     m_jackPlayback->setTickmarks(TQSlider::Below);
     tqlayout->addMultiCellWidget(m_jackPlayback, 3, 3, 2, 3);
 
-    TQLabel *jackPlaybackLabel = new TQLabel(TQString("%1").tqarg(jackPlaybackValue),
+    TQLabel *jackPlaybackLabel = new TQLabel(TQString("%1").arg(jackPlaybackValue),
                                            frame);
     tqlayout->addWidget(jackPlaybackLabel, 2, 2, TQt::AlignHCenter);
     connect(m_jackPlayback, TQT_SIGNAL(valueChanged(int)),
@@ -105,7 +105,7 @@ LatencyConfigurationPage::LatencyConfigurationPage(RosegardenGUIDoc *doc,
     m_jackRecord->setTickmarks(TQSlider::Below);
     tqlayout->addMultiCellWidget(m_jackRecord, 5, 5, 2, 3);
 
-    TQLabel *jackRecordLabel = new TQLabel(TQString("%1").tqarg(jackRecordValue),
+    TQLabel *jackRecordLabel = new TQLabel(TQString("%1").arg(jackRecordValue),
                                          frame);
     tqlayout->addWidget(jackRecordLabel, 4, 2, TQt::AlignHCenter);
     connect(m_jackRecord, TQT_SIGNAL(valueChanged(int)),

src/gui/configuration/NotationConfigurationPage.cpp

@@ -111,7 +111,7 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
         TQString text("%1 %");
         if (*i == 100)
             text = "%1 % (normal)";
-        m_spacing->insertItem(text.tqarg(*i));
+        m_spacing->insertItem(text.arg(*i));
 
         if (*i == defaultSpacing) {
             m_spacing->setCurrentItem(m_spacing->count() - 1);
@@ -132,7 +132,7 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
 
     for (std::vector<int>::iterator i = s.begin(); i != s.end(); ++i) {
 
-        TQString text = TQString("%1 %").tqarg(*i);
+        TQString text = TQString("%1 %").arg(*i);
         if (*i == 40)
             text = "40 % (normal)";
         else if (*i == 0)
@@ -646,7 +646,7 @@ NotationConfigurationPage::slotFontComboChanged(int index)
 
     int printpt = m_cfg->readUnsignedNumEntry("printingnotesize", 5);
     for (int i = 2; i < 16; ++i) {
-        m_printingSize->insertItem(TQString("%1").tqarg(i));
+        m_printingSize->insertItem(TQString("%1").arg(i));
         if (i == printpt) {
             m_printingSize->setCurrentItem(m_printingSize->count() - 1);
         }
@@ -661,10 +661,10 @@ NotationConfigurationPage::slotFontComboChanged(int index)
         m_fontMappedByLabel->setText(i18n(strtoqstr(map.getMappedBy()).ascii()));
         if (map.isSmooth()) {
             m_fontTypeLabel->setText(
-                i18n("%1 (smooth)").tqarg(i18n(strtoqstr(map.getType()).ascii())));
+                i18n("%1 (smooth)").arg(i18n(strtoqstr(map.getType()).ascii())));
         } else {
             m_fontTypeLabel->setText(
-                i18n("%1 (jaggy)").tqarg(i18n(strtoqstr(map.getType()).ascii())));
+                i18n("%1 (jaggy)").arg(i18n(strtoqstr(map.getType()).ascii())));
         }
         if (m_viewButton) {
             m_viewButton->setEnabled(map.getSystemFontNames().count() > 0);
@@ -683,7 +683,7 @@ NotationConfigurationPage::populateSizeCombo(TQComboBox *combo,
     combo->clear();
 
     for (std::vector<int>::iterator i = sizes.begin(); i != sizes.end(); ++i) {
-        combo->insertItem(TQString("%1").tqarg(*i));
+        combo->insertItem(TQString("%1").arg(*i));
         if (*i == defaultSize)
             combo->setCurrentItem(combo->count() - 1);
     }

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)
+                                   .arg(segmentDuration.sec)
-                                   .tqarg(msecs));
+                                   .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();
                 }
             }

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);
 

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(" (");

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)
+                        .arg(m_segment->getAudioStartTime().sec)
-                        .tqarg(msecs);
+                        .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)
+                      .arg(m_segment->getAudioEndTime().sec)
-                      .tqarg(msecs);
+                      .arg(msecs);
     text = new TQCanvasText(m_canvas);
     text->setColor(
         kapp->palette().color(TQPalette::Active, TQColorGroup::Shadow));

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);
 }

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();
 }
 
 }

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?"));
     }

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_value1Combo->insertItem(TQString("%1").arg(i));
-        m_value2Combo->insertItem(TQString("%1").tqarg(i));
+        m_value2Combo->insertItem(TQString("%1").arg(i));
     }
     m_value1Combo->setCurrentItem(127);
 

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);
 }

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())
+                  .arg(TQFileInfo(m_file).fileName())
-                  .tqarg(TQFileInfo(m_file).fileName()),
+                  .arg(TQFileInfo(m_file).fileName()),
                   this, i18n("Select an Audio File"));
 
         RG_DEBUG << "FileLocateDialog::slotUser3() : m_file = " << m_file << endl;

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

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);
         }

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);
 

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_intervalPitchLabel = new TQLabel( i18n("Pitch: %1").arg(intervalChromatic), hBox);
-    //m_intervalOctavesLabel = new TQLabel( i18n("Octaves: %1").tqarg(intervalDiatonic / 7), hBox);
+    //m_intervalOctavesLabel = new TQLabel( i18n("Octaves: %1").arg(intervalDiatonic / 7), hBox);
-    //m_intervalStepsLabel = new TQLabel( i18n("Steps: %1").tqarg(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 {

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").arg("2.6"));
-    m_lilyLanguage->insertItem(i18n("LilyPond %1").tqarg("2.8"));
+    m_lilyLanguage->insertItem(i18n("LilyPond %1").arg("2.8"));
-    m_lilyLanguage->insertItem(i18n("LilyPond %1").tqarg("2.10"));
+    m_lilyLanguage->insertItem(i18n("LilyPond %1").arg("2.10"));
-    m_lilyLanguage->insertItem(i18n("LilyPond %1").tqarg("2.12"));
+    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();
 }

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;

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);
 

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)
+    m_tempoTimeLabel->setText(i18n("%1.%2 s,").arg(tempoTime.sec)
-                              .tqarg(milliSeconds));
+                              .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)
+            (i18n("        (at %1.%2 s, in measure %3)").arg(lastRT.sec)
-             .tqarg(lastms).tqarg(lastBar + 1));
+             .arg(lastms).arg(lastBar + 1));
             m_tempoChangeBeforeAt->show();
 
             m_tempoChangeBefore->setEnabled(true);

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();
 }

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();
+    const TQObjectList *children = m_transport->LCDBoxFrame->children();
-    TQObjectListIt it(*tqchildren);
+    TQObjectListIt it(*children);
     TQObject *obj;
      
     while ((obj = it.current()) != 0) {

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);

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));
     }
 }
 

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());
+            fileSize = TQString(" %1 ").arg(info.size());
-            fileDate = TQString(" %1 ").tqarg(info.lastModified().toString());
+            fileDate = TQString(" %1 ").arg(info.lastModified().toString());
         }
         TQListViewItem *item = new KListViewItem
                               (m_listView, fileName, fileSize, fileDate);

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);

src/gui/editors/eventlist/EventView.cpp

@@ -174,14 +174,14 @@ EventView::EventView(RosegardenGUIDoc *doc,
         connect(editButton, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotEditTriggerName()));
 
         tqlayout->addWidget(new TQLabel(i18n("Base pitch:  "), frame), 1, 0);
-        m_triggerPitch = new TQLabel(TQString("%1").tqarg(rec->getBasePitch()), frame);
+        m_triggerPitch = new TQLabel(TQString("%1").arg(rec->getBasePitch()), frame);
         tqlayout->addWidget(m_triggerPitch, 1, 1);
         editButton = new TQPushButton(i18n("edit"), frame);
         tqlayout->addWidget(editButton, 1, 2);
         connect(editButton, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotEditTriggerPitch()));
 
         tqlayout->addWidget(new TQLabel(i18n("Base velocity:  "), frame), 2, 0);
-        m_triggerVelocity = new TQLabel(TQString("%1").tqarg(rec->getBaseVelocity()), frame);
+        m_triggerVelocity = new TQLabel(TQString("%1").arg(rec->getBaseVelocity()), frame);
         tqlayout->addWidget(m_triggerVelocity, 2, 1);
         editButton = new TQPushButton(i18n("edit"), frame);
         tqlayout->addWidget(editButton, 2, 2);
@@ -387,7 +387,7 @@ EventView::applyLayout(int /*staffNo*/)
                 int p = (*it)->get
                         <Int>(BaseProperties::PITCH);
                 pitchStr = TQString("%1 %2  ")
-                           .tqarg(p).tqarg(MidiPitchLabel(p).getTQString());
+                           .arg(p).arg(MidiPitchLabel(p).getTQString());
             } else if ((*it)->isa(Note::EventType)) {
                 pitchStr = "<not set>";
             }
@@ -613,27 +613,27 @@ EventView::makeTimeString(timeT time, int timeMode)
             (time, bar, beat, fraction, remainder);
             ++bar;
             return TQString("%1%2%3-%4%5-%6%7-%8%9   ")
-                   .tqarg(bar / 100)
+                   .arg(bar / 100)
-                   .tqarg((bar % 100) / 10)
+                   .arg((bar % 100) / 10)
-                   .tqarg(bar % 10)
+                   .arg(bar % 10)
-                   .tqarg(beat / 10)
+                   .arg(beat / 10)
-                   .tqarg(beat % 10)
+                   .arg(beat % 10)
-                   .tqarg(fraction / 10)
+                   .arg(fraction / 10)
-                   .tqarg(fraction % 10)
+                   .arg(fraction % 10)
-                   .tqarg(remainder / 10)
+                   .arg(remainder / 10)
-                   .tqarg(remainder % 10);
+                   .arg(remainder % 10);
         }
 
     case 1:  // real time
         {
             RealTime rt =
                 getDocument()->getComposition().getElapsedRealTime(time);
-            //	return TQString("%1  ").tqarg(rt.toString().c_str());
+            //	return TQString("%1  ").arg(rt.toString().c_str());
-            return TQString("%1  ").tqarg(rt.toText().c_str());
+            return TQString("%1  ").arg(rt.toText().c_str());
         }
 
     default:
-        return TQString("%1  ").tqarg(time);
+        return TQString("%1  ").arg(time);
     }
 }
 
@@ -649,15 +649,15 @@ EventView::makeDurationString(timeT time,
             getDocument()->getComposition().getMusicalTimeForDuration
             (time, duration, bar, beat, fraction, remainder);
             return TQString("%1%2%3-%4%5-%6%7-%8%9   ")
-                   .tqarg(bar / 100)
+                   .arg(bar / 100)
-                   .tqarg((bar % 100) / 10)
+                   .arg((bar % 100) / 10)
-                   .tqarg(bar % 10)
+                   .arg(bar % 10)
-                   .tqarg(beat / 10)
+                   .arg(beat / 10)
-                   .tqarg(beat % 10)
+                   .arg(beat % 10)
-                   .tqarg(fraction / 10)
+                   .arg(fraction / 10)
-                   .tqarg(fraction % 10)
+                   .arg(fraction % 10)
-                   .tqarg(remainder / 10)
+                   .arg(remainder / 10)
-                   .tqarg(remainder % 10);
+                   .arg(remainder % 10);
         }
 
     case 1:  // real time
@@ -665,12 +665,12 @@ EventView::makeDurationString(timeT time,
             RealTime rt =
                 getDocument()->getComposition().getRealTimeDifference
                 (time, time + duration);
-            //	return TQString("%1  ").tqarg(rt.toString().c_str());
+            //	return TQString("%1  ").arg(rt.toString().c_str());
-            return TQString("%1  ").tqarg(rt.toText().c_str());
+            return TQString("%1  ").arg(rt.toText().c_str());
         }
 
     default:
-        return TQString("%1  ").tqarg(duration);
+        return TQString("%1  ").arg(duration);
     }
 }
 
@@ -719,7 +719,7 @@ EventView::slotEditTriggerPitch()
     if (dlg->exec() == TQDialog::Accepted) {
         addCommandToHistory(new SetTriggerSegmentBasePitchCommand
                             (&getDocument()->getComposition(), id, dlg->getPitch()));
-        m_triggerPitch->setText(TQString("%1").tqarg(dlg->getPitch()));
+        m_triggerPitch->setText(TQString("%1").arg(dlg->getPitch()));
     }
 }
 
@@ -737,7 +737,7 @@ EventView::slotEditTriggerVelocity()
     if (dlg->exec() == TQDialog::Accepted) {
         addCommandToHistory(new SetTriggerSegmentBaseVelocityCommand
                             (&getDocument()->getComposition(), id, dlg->getVelocity()));
-        m_triggerVelocity->setText(TQString("%1").tqarg(dlg->getVelocity()));
+        m_triggerVelocity->setText(TQString("%1").arg(dlg->getVelocity()));
     }
 }
 
@@ -1575,8 +1575,8 @@ EventView::updateViewCaption()
     if (m_isTriggerSegment) {
 
         setCaption(i18n("%1 - Triggered Segment: %2")
-                   .tqarg(getDocument()->getTitle())
+                   .arg(getDocument()->getTitle())
-                   .tqarg(strtoqstr(m_segments[0]->getLabel())));
+                   .arg(strtoqstr(m_segments[0]->getLabel())));
 
 
     } else if (m_segments.size() == 1) {
@@ -1590,14 +1590,14 @@ EventView::updateViewCaption()
             trackPosition = track->getPosition();
 
         setCaption(i18n("%1 - Segment Track #%2 - Event List")
-                   .tqarg(getDocument()->getTitle())
+                   .arg(getDocument()->getTitle())
-                   .tqarg(trackPosition + 1));
+                   .arg(trackPosition + 1));
 
     } else {
 
         setCaption(i18n("%1 - %2 Segments - Event List")
-                   .tqarg(getDocument()->getTitle())
+                   .arg(getDocument()->getTitle())
-                   .tqarg(m_segments.size()));
+                   .arg(m_segments.size()));
     }
 
 }

src/gui/editors/guitar/ChordMap.cpp

@@ -201,7 +201,7 @@ bool ChordMap::saveDocument(const TQString& filename, bool userChordsOnly, TQStr
     outStream << "</chords>\n";    
     outStream << "</rosegarden-chord-data>\n";
   
-    return outStream.tqdevice()->status() == IO_Ok;
+    return outStream.device()->status() == IO_Ok;
 }
 
 int ChordMap::FILE_FORMAT_VERSION_MAJOR = 1;

src/gui/editors/guitar/ChordXmlHandler.cpp

@@ -134,9 +134,9 @@ bool
 ChordXmlHandler::error(const TQXmlParseException& exception)
 {
     m_errorString = TQString("%1 at line %2, column %3")
-                    .tqarg(exception.message())
+                    .arg(exception.message())
-                    .tqarg(exception.lineNumber())
+                    .arg(exception.lineNumber())
-                    .tqarg(exception.columnNumber());
+                    .arg(exception.columnNumber());
     return TQXmlDefaultHandler::error( exception );
 }
 
@@ -144,9 +144,9 @@ bool
 ChordXmlHandler::fatalError(const TQXmlParseException& exception)
 {
     m_errorString = TQString("%1 at line %2, column %3")
-                    .tqarg(exception.message())
+                    .arg(exception.message())
-                    .tqarg(exception.lineNumber())
+                    .arg(exception.lineNumber())
-                    .tqarg(exception.columnNumber());
+                    .arg(exception.columnNumber());
     return TQXmlDefaultHandler::fatalError( exception );
 }
 

src/gui/editors/guitar/Fingering.cpp

@@ -115,7 +115,7 @@ Fingering::parseFingering(const TQString& ch, TQString& errorString)
 //            NOTATION_DEBUG << "Fingering::parseFingering : '" << t << "' = MUTED\n";  
             fingering[idx] = MUTED;
         } else {
-            errorString = i18n("couldn't parse fingering '%1' in '%2'").tqarg(t).tqarg(ch);            
+            errorString = i18n("couldn't parse fingering '%1' in '%2'").arg(t).arg(ch);            
         }
     }
 

src/gui/editors/guitar/GuitarChordSelectorDialog.cpp

@@ -416,7 +416,7 @@ GuitarChordSelectorDialog::parseChordFile(const TQString& chordFileName)
     TQFile chordFile(chordFileName);
     bool ok = chordFile.open(IO_ReadOnly);    
     if (!ok)
-        KMessageBox::error(0, i18n("couldn't open file '%1'").tqarg(handler.errorString()));
+        KMessageBox::error(0, i18n("couldn't open file '%1'").arg(handler.errorString()));
 
     TQXmlInputSource source(chordFile);
     TQXmlSimpleReader reader;
@@ -425,7 +425,7 @@ GuitarChordSelectorDialog::parseChordFile(const TQString& chordFileName)
     NOTATION_DEBUG << "GuitarChordSelectorDialog::parseChordFile() parsing " << chordFileName << endl;
     reader.parse(source);
     if (!ok)
-        KMessageBox::error(0, i18n("couldn't parse chord dictionnary : %1").tqarg(handler.errorString()));
+        KMessageBox::error(0, i18n("couldn't parse chord dictionnary : %1").arg(handler.errorString()));
     
 }
 

src/gui/editors/matrix/MatrixToolBox.cpp

@@ -73,7 +73,7 @@ EditTool* MatrixToolBox::createTool(const TQString& toolName)
 
     else {
         KMessageBox::error(0, TQString("MatrixToolBox::createTool : unrecognised toolname %1 (%2)")
-                           .tqarg(toolName).tqarg(toolNamelc));
+                           .arg(toolName).arg(toolNamelc));
         return 0;
     }
 

src/gui/editors/matrix/MatrixView.cpp

@@ -903,9 +903,9 @@ void MatrixView::setupActions()
             else if (d == crotchetDuration) cut = Key_4;
             else if (d == crotchetDuration * 2) cut = Key_2;
 
-            TQString actionName = TQString("snap_%1").tqarg(int((crotchetDuration * 4) / d));
+            TQString actionName = TQString("snap_%1").arg(int((crotchetDuration * 4) / d));
             if (d == (crotchetDuration * 3) / 2) actionName = "snap_3";
-            new KAction(i18n("Snap to %1").tqarg(label), pixmap, cut, TQT_TQOBJECT(this),
+            new KAction(i18n("Snap to %1").arg(label), pixmap, cut, TQT_TQOBJECT(this),
                         TQT_SLOT(slotSetSnapFromAction()), actionCollection(),
                         actionName.ascii());
         }
@@ -1099,7 +1099,7 @@ void MatrixView::setViewSize(TQSize s)
 void MatrixView::repaintRulers()
 {
     for (unsigned int i = 0; i != m_propertyViewRulers.size(); i++)
-        m_propertyViewRulers[i].first->tqrepaint();
+        m_propertyViewRulers[i].first->repaint();
 }
 
 void MatrixView::updateView()
@@ -1196,7 +1196,7 @@ void MatrixView::setCurrentSelection(EventSelection* s, bool preview,
                 getStaff(segment)->positionElements(std::min(startA, startB),
                                                     std::max(endA, endB));
             } else {
-                // mark refresh status and then request a tqrepaint
+                // mark refresh status and then request a repaint
                 segment.getRefreshStatus
                 (m_segmentsRefreshStatusIds
                  [getStaff(segment)->getId()]).
@@ -1213,7 +1213,7 @@ void MatrixView::setCurrentSelection(EventSelection* s, bool preview,
 
                 getStaff(s->getSegment())->positionElements(startB, endB);
             } else {
-                // mark refresh status and then request a tqrepaint
+                // mark refresh status and then request a repaint
 
                 oldSelection->getSegment().getRefreshStatus
                 (m_segmentsRefreshStatusIds
@@ -1474,13 +1474,13 @@ MatrixView::slotHoveredOverNoteChanged(int evPitch,
         long ms = rt.msec();
 
         TQString msg = i18n("Note: %1 (%2.%3s)")
-                  .tqarg(TQString("%1-%2-%3-%4")
+                  .arg(TQString("%1-%2-%3-%4")
-                       .tqarg(TQString("%1").tqarg(bar + 1).rightJustify(3, '0'))
+                       .arg(TQString("%1").arg(bar + 1).rightJustify(3, '0'))
-                       .tqarg(TQString("%1").tqarg(beat).rightJustify(2, '0'))
+                       .arg(TQString("%1").arg(beat).rightJustify(2, '0'))
-                       .tqarg(TQString("%1").tqarg(fraction).rightJustify(2, '0'))
+                       .arg(TQString("%1").arg(fraction).rightJustify(2, '0'))
-                       .tqarg(TQString("%1").tqarg(remainder).rightJustify(2, '0')))
+                       .arg(TQString("%1").arg(remainder).rightJustify(2, '0')))
-                  .tqarg(rt.sec)
+                  .arg(rt.sec)
-                  .tqarg(TQString("%1").tqarg(ms).rightJustify(3, '0'));
+                  .arg(TQString("%1").arg(ms).rightJustify(3, '0'));
 
         m_hoveredOverAbsoluteTime->setText(msg);
     }
@@ -1488,8 +1488,8 @@ MatrixView::slotHoveredOverNoteChanged(int evPitch,
     m_haveHoveredOverNote = false;
 
     m_hoveredOverNoteName->setText(i18n("%1 (%2)")
-                                   .tqarg(label.getTQString())
+                                   .arg(label.getTQString())
-                                   .tqarg(evPitch));
+                                   .arg(evPitch));
 
     m_pitchRuler->drawHoverNote(evPitch);
 }
@@ -1504,7 +1504,7 @@ MatrixView::slotHoveredOverKeyChanged(unsigned int y)
     if (evPitch != m_previousEvPitch) {
         MidiPitchLabel label(evPitch);
         m_hoveredOverNoteName->setText(TQString("%1 (%2)").
-                                       tqarg(label.getTQString()).tqarg(evPitch));
+                                       arg(label.getTQString()).arg(evPitch));
         m_previousEvPitch = evPitch;
     }
 }
@@ -1529,13 +1529,13 @@ MatrixView::slotHoveredOverAbsoluteTimeChanged(unsigned int time)
     // to support Unicode
 
     TQString message = i18n("Time: %1 (%2.%3s)")
-                      .tqarg(TQString("%1-%2-%3-%4")
+                      .arg(TQString("%1-%2-%3-%4")
-                           .tqarg(TQString("%1").tqarg(bar + 1).rightJustify(3, '0'))
+                           .arg(TQString("%1").arg(bar + 1).rightJustify(3, '0'))
-                           .tqarg(TQString("%1").tqarg(beat).rightJustify(2, '0'))
+                           .arg(TQString("%1").arg(beat).rightJustify(2, '0'))
-                           .tqarg(TQString("%1").tqarg(fraction).rightJustify(2, '0'))
+                           .arg(TQString("%1").arg(fraction).rightJustify(2, '0'))
-                           .tqarg(TQString("%1").tqarg(remainder).rightJustify(2, '0')))
+                           .arg(TQString("%1").arg(remainder).rightJustify(2, '0')))
-                      .tqarg(rt.sec)
+                      .arg(rt.sec)
-                      .tqarg(TQString("%1").tqarg(ms).rightJustify(3, '0'));
+                      .arg(TQString("%1").arg(ms).rightJustify(3, '0'));
 
     m_hoveredOverAbsoluteTime->setText(message);
 }
@@ -1830,7 +1830,7 @@ void MatrixView::slotInsertNoteFromAction()
     } catch (...) {
 
         KMessageBox::sorry
-        (this, i18n("Unknown note insert action %1").tqarg(name));
+        (this, i18n("Unknown note insert action %1").arg(name));
         return ;
     }
 
@@ -2161,7 +2161,7 @@ MatrixView::initActionsToolbar()
     
     m_velocityCombo = new KComboBox(actionsToolbar);
     for (int i = 0; i <= 127; ++i) {
-        m_velocityCombo->insertItem(TQString("%1").tqarg(i));
+        m_velocityCombo->insertItem(TQString("%1").arg(i));
     }
     m_velocityCombo->setCurrentItem(100); //!!! associate with segment
 
@@ -2236,8 +2236,8 @@ MatrixView::slotChangeHorizontalZoom(int)
 {
     double zoomValue = m_hZoomSlider->getCurrentSize();
 
-    //     m_zoomLabel->setText(i18n("%1%").tqarg(zoomValue*100.0 * 2)); // GROSS HACK - see in matrixstaff.h - BREAKS MATRIX VIEW, see bug 1000595
+    //     m_zoomLabel->setText(i18n("%1%").arg(zoomValue*100.0 * 2)); // GROSS HACK - see in matrixstaff.h - BREAKS MATRIX VIEW, see bug 1000595
-    m_zoomLabel->setText(i18n("%1%").tqarg(zoomValue*100.0));
+    m_zoomLabel->setText(i18n("%1%").arg(zoomValue*100.0));
 
     MATRIX_DEBUG << "MatrixView::slotChangeHorizontalZoom() : zoom factor = "
     << zoomValue << endl;
@@ -2245,9 +2245,9 @@ MatrixView::slotChangeHorizontalZoom(int)
     m_referenceRuler->setHScaleFactor(zoomValue);
     
     if (m_tempoRuler)
-        m_tempoRuler->tqrepaint();
+        m_tempoRuler->repaint();
     if (m_chordNameRuler)
-        m_chordNameRuler->tqrepaint();
+        m_chordNameRuler->repaint();
 
     // Set zoom matrix
     //
@@ -2266,7 +2266,7 @@ MatrixView::slotChangeHorizontalZoom(int)
 
     for (unsigned int i = 0; i < m_propertyViewRulers.size(); ++i) {
         m_propertyViewRulers[i].first->setHScaleFactor(zoomValue);
-        m_propertyViewRulers[i].first->tqrepaint();
+        m_propertyViewRulers[i].first->repaint();
     }
 
     if (m_topStandardRuler)
@@ -2721,23 +2721,23 @@ MatrixView::updateViewCaption()
             trackPosition = track->getPosition();
 
         setCaption(i18n("%1 - Segment Track #%2 - %3")
-                   .tqarg(getDocument()->getTitle())
+                   .arg(getDocument()->getTitle())
-                   .tqarg(trackPosition + 1)
+                   .arg(trackPosition + 1)
-                   .tqarg(view));
+                   .arg(view));
 
     } else if (m_segments.size() == getDocument()->getComposition().getNbSegments()) {
 
         setCaption(i18n("%1 - All Segments - %2")
-                   .tqarg(getDocument()->getTitle())
+                   .arg(getDocument()->getTitle())
-                   .tqarg(view));
+                   .arg(view));
 
     } else {
 
         setCaption(i18n("%1 - 1 Segment - %2",
                         "%1 - %n Segments - %2",
                         m_segments.size())
-                   .tqarg(getDocument()->getTitle())
+                   .arg(getDocument()->getTitle())
-                   .tqarg(view));
+                   .arg(view));
     }
 }
 

src/gui/editors/matrix/MatrixView.h

@@ -520,7 +520,7 @@ protected:
 
     /**
      * save general Options like all bar positions and status as well
-     * as the tqgeometry and the recent file list to the configuration
+     * as the geometry and the recent file list to the configuration
      * file
      */
     virtual void slotSaveOptions();

src/gui/editors/matrix/QCanvasMatrixDiamond.h

@@ -41,7 +41,7 @@ class MatrixElement;
 
 
 /**
- * A TQCanvas diamond tqshape referencing a MatrixElement
+ * A TQCanvas diamond shape referencing a MatrixElement
  */
 class QCanvasMatrixDiamond : public QCanvasMatrixRectangle
 {

src/gui/editors/notation/FontViewFrame.cpp

@@ -97,7 +97,7 @@ FontViewFrame::loadFont()
     FcPatternDestroy(pattern);
 
     if (!match || result != FcResultMatch) {
-        KMessageBox::error(this, i18n("Error: Unable to match font name %1").tqarg(m_fontName));
+        KMessageBox::error(this, i18n("Error: Unable to match font name %1").arg(m_fontName));
         return ;
     }
 
@@ -106,7 +106,7 @@ FontViewFrame::loadFont()
 
     if (TQString((const char *)matchFamily).lower() != m_fontName.lower()) {
         KMessageBox::sorry(this, i18n("Warning: No good match for font name %1 (best is %2)").
-                           tqarg(m_fontName).tqarg(TQString((const char *)matchFamily)));
+                           arg(m_fontName).arg(TQString((const char *)matchFamily)));
         m_fontName = (const char *)matchFamily;
     }
 
@@ -186,7 +186,7 @@ void FontViewFrame::paintEvent( TQPaintEvent* e )
                     continue;
                 p.setFont(kapp->font());
                 TQFontMetrics afm(kapp->font());
-                TQString s = TQString("%1").tqarg(m_row * 256 + (j - 1) * 16);
+                TQString s = TQString("%1").arg(m_row * 256 + (j - 1) * 16);
                 p.drawText(x - afm.width(s), y, s);
                 p.setPen(TQColor(190, 190, 255));
                 p.drawLine(0, y, width(), y);
@@ -194,7 +194,7 @@ void FontViewFrame::paintEvent( TQPaintEvent* e )
                 continue;
             } else if (j == 0) {
                 p.setFont(kapp->font());
-                TQString s = TQString("%1").tqarg(i - 1);
+                TQString s = TQString("%1").arg(i - 1);
                 p.drawText(x, y, s);
                 p.setPen(TQColor(190, 190, 255));
                 p.drawLine(x, 0, x, height());

src/gui/editors/notation/NotationStaff.cpp

@@ -449,7 +449,7 @@ NotationStaff::renderElements(NotationElementList::iterator from,
     //    NOTATION_DEBUG << "NotationStaff " << this << "::renderElements()" << endl;
     Profiler profiler("NotationStaff::renderElements");
 
-    emit setOperationName(i18n("Rendering staff %1...").tqarg(getId() + 1));
+    emit setOperationName(i18n("Rendering staff %1...").arg(getId() + 1));
     emit setProgress(0);
 
     throwIfCancelled();
@@ -512,7 +512,7 @@ NotationStaff::renderPrintable(timeT from, timeT to)
 
     Profiler profiler("NotationStaff::renderElements");
 
-    emit setOperationName(i18n("Rendering notes on staff %1...").tqarg(getId() + 1));
+    emit setOperationName(i18n("Rendering notes on staff %1...").arg(getId() + 1));
     emit setProgress(0);
 
     throwIfCancelled();
@@ -580,7 +580,7 @@ NotationStaff::positionElements(timeT from, timeT to)
     if (to < startTime) to = startTime;
     if (to == from) return;
 
-    emit setOperationName(i18n("Positioning staff %1...").tqarg(getId() + 1));
+    emit setOperationName(i18n("Positioning staff %1...").arg(getId() + 1));
     emit setProgress(0);
     throwIfCancelled();
 

src/gui/editors/notation/NotationStrings.cpp

@@ -49,26 +49,26 @@ NotationStrings::addDots(TQString s, int dots,
     if (internationalize) {
         if (dots > 1) {
             if (hyphenate)
-                return i18n("%1-dotted-%2").tqarg(dots).tqarg(s);
+                return i18n("%1-dotted-%2").arg(dots).arg(s);
             else
-                return i18n("%1-dotted %2").tqarg(dots).tqarg(s);
+                return i18n("%1-dotted %2").arg(dots).arg(s);
         } else {
             if (hyphenate)
-                return i18n("dotted-%1").tqarg(s);
+                return i18n("dotted-%1").arg(s);
             else
-                return i18n("dotted %1").tqarg(s);
+                return i18n("dotted %1").arg(s);
         }
     } else {
         if (dots > 1) {
             if (hyphenate)
-                return TQString("%1-dotted-%2").tqarg(dots).tqarg(s);
+                return TQString("%1-dotted-%2").arg(dots).arg(s);
             else
-                return TQString("%1-dotted %2").tqarg(dots).tqarg(s);
+                return TQString("%1-dotted %2").arg(dots).arg(s);
         } else {
             if (hyphenate)
-                return TQString("dotted-%1").tqarg(s);
+                return TQString("dotted-%1").arg(s);
             else
-                return TQString("dotted %1").tqarg(s);
+                return TQString("dotted %1").arg(s);
         }
     }
 }
@@ -93,11 +93,11 @@ NotationStrings::getNoteName(Note note, bool plural, bool triplet)
                                          };
 
     if (plural && triplet) {
-        return addDots(i18n("%1 triplets").tqarg(names[type]), dots, false, true); // TODO PLURAL - this is broken because it assumes there's only 1 plural form
+        return addDots(i18n("%1 triplets").arg(names[type]), dots, false, true); // TODO PLURAL - this is broken because it assumes there's only 1 plural form
     } else if (plural) {
         return addDots(pluralnames[type], dots, false, true);
     } else if (triplet) {
-        return addDots(i18n("%1 triplet").tqarg(names[type]), dots, false, true);
+        return addDots(i18n("%1 triplet").arg(names[type]), dots, false, true);
     } else {
         return addDots(names[type], dots, false, true);
     }
@@ -123,11 +123,11 @@ NotationStrings::getAmericanName(Note note, bool plural, bool triplet)
                                          };
 
     if (plural && triplet) {
-        return addDots(TQString("%1 triplets").tqarg(names[type]), dots, false, false);
+        return addDots(TQString("%1 triplets").arg(names[type]), dots, false, false);
     } else if (plural) {
         return addDots(pluralnames[type], dots, false, false);
     } else if (triplet) {
-        return addDots(TQString("%1 triplet").tqarg(names[type]), dots, false, false);
+        return addDots(TQString("%1 triplet").arg(names[type]), dots, false, false);
     } else {
         return addDots(names[type], dots, false, false);
     }
@@ -151,11 +151,11 @@ NotationStrings::getShortNoteName(Note note, bool plural, bool triplet)
                                          };
 
     if (plural && triplet) {
-        return addDots(i18n("%1 triplets").tqarg(names[type]), dots, false, true); // TODO - this is broken because it assumes there's only 1 plural form
+        return addDots(i18n("%1 triplets").arg(names[type]), dots, false, true); // TODO - this is broken because it assumes there's only 1 plural form
     } else if (plural) {
         return addDots(pluralnames[type], dots, false, true);
     } else if (triplet) {
-        return addDots(i18n("%1 triplet").tqarg(names[type]), dots, false, true);
+        return addDots(i18n("%1 triplet").arg(names[type]), dots, false, true);
     } else {
         return addDots(names[type], dots, false, true);
     }
@@ -271,11 +271,11 @@ NotationStrings::makeNoteMenuLabel(timeT duration,
 
         timeT wholeNote = Note(Note::Semibreve).getDuration();
         if ((wholeNote / duration) * duration == wholeNote) {
-            return TQString("1/%1").tqarg(wholeNote / duration);
+            return TQString("1/%1").arg(wholeNote / duration);
         } else if ((duration / wholeNote) * wholeNote == duration) {
-            return TQString("%1/1").tqarg(duration / wholeNote);
+            return TQString("%1/1").arg(duration / wholeNote);
         } else {
-            return i18n("%1 ticks").tqarg(duration);
+            return i18n("%1 ticks").arg(duration);
             plural = false;
         }
 

src/gui/editors/notation/NotationToolBox.cpp

@@ -89,7 +89,7 @@ EditTool* NotationToolBox::createTool(const TQString& toolName)
 
     else {
         KMessageBox::error(0, TQString("NotationToolBox::createTool : unrecognised toolname %1 (%2)")
-                           .tqarg(toolName).tqarg(toolNamelc));
+                           .arg(toolName).arg(toolNamelc));
         return 0;
     }
 

src/gui/editors/notation/NotationVLayout.cpp

@@ -236,7 +236,7 @@ NotationVLayout::scanStaff(Staff &staffBase, timeT, timeT)
                 if (!(*chord[j])->event()->get
                         <Int>
                         (m_properties.HEIGHT_ON_STAFF, height)) {
-                    std::cerr << TQString("ERROR: Event in chord at %1 has no HEIGHT_ON_STAFF property!\nThis is a bug (the program would previously have crashed by now)").tqarg((*chord[j])->getViewAbsoluteTime()).ascii() << std::endl;
+                    std::cerr << TQString("ERROR: Event in chord at %1 has no HEIGHT_ON_STAFF property!\nThis is a bug (the program would previously have crashed by now)").arg((*chord[j])->getViewAbsoluteTime()).ascii() << std::endl;
                     (*chord[j])->event()->dump(std::cerr);
                 }
                 h.push_back(height);
@@ -490,7 +490,7 @@ NotationVLayout::positionSlur(NotationStaff &staff,
             if (!event->get
                     <Int>(m_properties.HEIGHT_ON_STAFF, h)) {
                 KMessageBox::sorry
-                ((TQWidget *)parent(), i18n("Spanned note at %1 has no HEIGHT_ON_STAFF property!\nThis is a bug (the program would previously have crashed by now)").tqarg((*scooter)->getViewAbsoluteTime()));
+                ((TQWidget *)parent(), i18n("Spanned note at %1 has no HEIGHT_ON_STAFF property!\nThis is a bug (the program would previously have crashed by now)").arg((*scooter)->getViewAbsoluteTime()));
                 event->dump(std::cerr);
             }
 

src/gui/editors/notation/NotationView.cpp

@@ -755,9 +755,9 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
     slotSetPointerPosition(doc->getComposition().getPosition());
     setCurrentSelection(0, false, true);
     slotUpdateInsertModeStatus();
-    m_chordNameRuler->tqrepaint();
+    m_chordNameRuler->repaint();
-    m_tempoRuler->tqrepaint();
+    m_tempoRuler->repaint();
-    m_rawNoteRuler->tqrepaint();
+    m_rawNoteRuler->repaint();
     m_inhibitRefresh = false;
 
     //    slotCheckRendered(0, getCanvasView()->visibleWidth());
@@ -1341,7 +1341,7 @@ void NotationView::positionPages()
             haveBackground = true;
         }
         // we're happy to ignore errors from this one:
-        deskBackground.load(TQString("%1/misc/bg-desktop.xpm").tqarg(pixmapDir));
+        deskBackground.load(TQString("%1/misc/bg-desktop.xpm").arg(pixmapDir));
     }
 
     int pageWidth = getPageWidth();
@@ -1389,7 +1389,7 @@ void NotationView::positionPages()
             int w = pageWidth - leftMargin / 2;
             int h = pageHeight;
 
-            TQString str = TQString("%1").tqarg(page + 1);
+            TQString str = TQString("%1").arg(page + 1);
             TQCanvasText *text = new TQCanvasText(str, pageNumberFont, canvas());
             text->setX(m_leftGutter + pageWidth * page + pageWidth - pageNumberMetrics.width(str) - leftMargin);
             text->setY(y + h - pageNumberMetrics.descent() - topMargin);
@@ -1557,9 +1557,9 @@ void NotationView::setupActions()
 
         KToggleAction *spacingAction =
             new KToggleAction
-            (TQString("%1%").tqarg(*i), 0, TQT_TQOBJECT(this),
+            (TQString("%1%").arg(*i), 0, TQT_TQOBJECT(this),
              TQT_SLOT(slotChangeSpacingFromAction()),
-             actionCollection(), TQString("spacing_%1").tqarg(*i).ascii());
+             actionCollection(), TQString("spacing_%1").arg(*i).ascii());
 
         spacingAction->setExclusiveGroup("spacing");
         spacingAction->setChecked(*i == defaultSpacing);
@@ -1577,7 +1577,7 @@ void NotationView::setupActions()
     for (std::vector<int>::iterator i = proportions.begin();
             i != proportions.end(); ++i) {
 
-        TQString name = TQString("%1%").tqarg(*i);
+        TQString name = TQString("%1%").arg(*i);
         if (*i == 0)
             name = i18n("None");
 
@@ -1585,7 +1585,7 @@ void NotationView::setupActions()
             new KToggleAction
             (name, 0, TQT_TQOBJECT(this),
              TQT_SLOT(slotChangeProportionFromAction()),
-             actionCollection(), TQString("proportion_%1").tqarg(*i).ascii());
+             actionCollection(), TQString("proportion_%1").arg(*i).ascii());
 
         proportionAction->setExclusiveGroup("proportion");
         proportionAction->setChecked(*i == defaultProportion);
@@ -2263,7 +2263,7 @@ void NotationView::setupActions()
     for (int i = 0; i <= 5; ++i) {
         new KAction(slashTitles[i], 0, TQT_TQOBJECT(this),
                     TQT_SLOT(slotAddSlashes()), actionCollection(),
-                    TQString("slashes_%1").tqarg(i).ascii());
+                    TQString("slashes_%1").arg(i).ascii());
     }
 
     new KAction(ClefInsertionCommand::getGlobalName(), 0, TQT_TQOBJECT(this),
@@ -2546,7 +2546,7 @@ NotationView::setupFontSizeMenu(std::string oldFontName)
         for (unsigned int i = 0; i < sizes.size(); ++i) {
             KAction *action =
                 actionCollection()->action
-                (TQString("note_font_size_%1").tqarg(sizes[i]).ascii());
+                (TQString("note_font_size_%1").arg(sizes[i]).ascii());
             m_fontSizeActionMenu->remove
             (action);
 
@@ -2560,7 +2560,7 @@ NotationView::setupFontSizeMenu(std::string oldFontName)
 
     for (unsigned int i = 0; i < sizes.size(); ++i) {
 
-        TQString actionName = TQString("note_font_size_%1").tqarg(sizes[i]);
+        TQString actionName = TQString("note_font_size_%1").arg(sizes[i]);
 
         KToggleAction *sizeAction = dynamic_cast<KToggleAction *>
                                     (actionCollection()->action(actionName.ascii()));
@@ -3008,7 +3008,7 @@ bool NotationView::applyLayout(int staffNo, timeT startTime, timeT endTime)
         if (staffNo >= 0 && (int)i != staffNo)
             continue;
 
-        slotSetOperationNameAndStatus(i18n("Laying out staff %1...").tqarg(i + 1));
+        slotSetOperationNameAndStatus(i18n("Laying out staff %1...").arg(i + 1));
         ProgressDialog::processEvents();
 
         m_htqlayout->resetStaff(*m_staffs[i], startTime, endTime);
@@ -3194,7 +3194,7 @@ void NotationView::setCurrentSelection(EventSelection* s, bool preview,
                 getLinedStaff(segment)->positionElements(std::min(startA, startB),
                         std::max(endA, endB));
             } else {
-                // mark refresh status and then request a tqrepaint
+                // mark refresh status and then request a repaint
                 segment.getRefreshStatus
                 (m_segmentsRefreshStatusIds
                  [getLinedStaff(segment)->getId()]).
@@ -3211,7 +3211,7 @@ void NotationView::setCurrentSelection(EventSelection* s, bool preview,
 
                 getLinedStaff(s->getSegment())->positionElements(startB, endB);
             } else {
-                // mark refresh status and then request a tqrepaint
+                // mark refresh status and then request a repaint
 
                 oldSelection->getSegment().getRefreshStatus
                 (m_segmentsRefreshStatusIds
@@ -3745,7 +3745,7 @@ NotationView::updateThumbnails(bool complete)
             int w = pageWidth - leftMargin / 2;
             int h = pageHeight;
 
-            TQString str = TQString("%1").tqarg(page + 1);
+            TQString str = TQString("%1").arg(page + 1);
 
             thumbPainter.drawRect(x / thumbScale, y / thumbScale,
                                   w / thumbScale, h / thumbScale);
@@ -3944,7 +3944,7 @@ void NotationView::readjustCanvasSize()
         }
     }
 
-    // Give a correct vertical tqalignment to track headers
+    // Give a correct vertical alignment to track headers
     if ((m_pageMode == LinedStaff::LinearMode) && m_showHeadersGroup) {
         m_headersGroupView->setContentsPos(0, getCanvasView()->contentsY());
     }
@@ -4067,7 +4067,7 @@ void NotationView::initActionDataMaps()
             (NotationStrings::getReferenceName(Note(type, 0), false));
 
             TQString shortName(TQString("change_%1%2")
-                              .tqarg(notationOnly ? "notation_" : "").tqarg(refName));
+                              .arg(notationOnly ? "notation_" : "").arg(refName));
             shortName.replace(TQRegExp("-"), "_");
 
             TQString titleName
@@ -4095,7 +4095,7 @@ void NotationView::initActionDataMaps()
 
         Mark mark = marks[i];
         TQString markName(strtoqstr(mark));
-        TQString actionName = TQString("add_%1").tqarg(markName);
+        TQString actionName = TQString("add_%1").arg(markName);
 
         m_markActionDataMap->insert
             (actionName, new MarkActionData
@@ -4162,7 +4162,7 @@ void NotationView::setupProgress(ProgressDialog* dialog)
 void NotationView::slotSetOperationNameAndStatus(TQString name)
 {
     emit setOperationName(name);
-    statusBar()->changeItem(TQString("  %1").tqarg(name),
+    statusBar()->changeItem(TQString("  %1").arg(name),
                             KTmpStatusMsg::getDefaultId());
 }
 
@@ -4203,18 +4203,18 @@ void NotationView::updateViewCaption()
             trackPosition = track->getPosition();
         //	std::cout << std::endl << std::endl << std::endl << "DEBUG TITLE BAR: " << getDocument()->getTitle() << std::endl << std::endl << std::endl;
         setCaption(i18n("%1 - Segment Track #%2 - Notation")
-                   .tqarg(getDocument()->getTitle())
+                   .arg(getDocument()->getTitle())
-                   .tqarg(trackPosition + 1));
+                   .arg(trackPosition + 1));
 
     } else if (m_segments.size() == getDocument()->getComposition().getNbSegments()) {
 
         setCaption(i18n("%1 - All Segments - Notation")
-                   .tqarg(getDocument()->getTitle()));
+                   .arg(getDocument()->getTitle()));
 
     } else {
 
         setCaption(i18n("%1 - Segment - Notation", "%1 - %n Segments - Notation", m_segments.size())
-                   .tqarg(getDocument()->getTitle()));
+                   .arg(getDocument()->getTitle()));
 
     }
 }
@@ -4238,15 +4238,15 @@ NotationView::slotUpdateInsertModeStatus()
     TQString message;
 
     if (isInTripletMode()) {
-        message = i18n("%1 %2").tqarg(message).tqarg(tripletMessage);
+        message = i18n("%1 %2").arg(message).arg(tripletMessage);
     }
 
     if (isInChordMode()) {
-        message = i18n("%1 %2").tqarg(message).tqarg(chordMessage);
+        message = i18n("%1 %2").arg(message).arg(chordMessage);
     }
 
     if (isInGraceMode()) {
-        message = i18n("%1 %2").tqarg(message).tqarg(graceMessage);
+        message = i18n("%1 %2").arg(message).arg(graceMessage);
     }
 
     m_insertModeLabel->setText(message);
@@ -4317,7 +4317,7 @@ NotationView::slotChangeSpacingFromAction()
 
     } else {
         KMessageBox::sorry
-        (this, i18n("Unknown spacing action %1").tqarg(name));
+        (this, i18n("Unknown spacing action %1").arg(name));
     }
 }
 
@@ -4332,7 +4332,7 @@ NotationView::slotChangeSpacing(int spacing)
     //     m_spacingSlider->setSize(spacing);
 
     KToggleAction *action = dynamic_cast<KToggleAction *>
-                            (actionCollection()->action(TQString("spacing_%1").tqarg(spacing).ascii()));
+                            (actionCollection()->action(TQString("spacing_%1").arg(spacing).ascii()));
     if (action)
         action->setChecked(true);
     else {
@@ -4375,7 +4375,7 @@ NotationView::slotChangeProportionFromAction()
 
     } else {
         KMessageBox::sorry
-        (this, i18n("Unknown proportion action %1").tqarg(name));
+        (this, i18n("Unknown proportion action %1").arg(name));
     }
 }
 
@@ -4390,7 +4390,7 @@ NotationView::slotChangeProportion(int proportion)
     //    m_proportionSlider->setSize(proportion);
 
     KToggleAction *action = dynamic_cast<KToggleAction *>
-                            (actionCollection()->action(TQString("proportion_%1").tqarg(proportion).ascii()));
+                            (actionCollection()->action(TQString("proportion_%1").arg(proportion).ascii()));
     if (action)
         action->setChecked(true);
     else {
@@ -4422,7 +4422,7 @@ NotationView::slotChangeFontFromAction()
         slotChangeFont(name);
     } else {
         KMessageBox::sorry
-        (this, i18n("Unknown font action %1").tqarg(name));
+        (this, i18n("Unknown font action %1").arg(name));
     }
 }
 
@@ -4440,11 +4440,11 @@ NotationView::slotChangeFontSizeFromAction()
             slotChangeFont(m_fontName, size);
         else {
             KMessageBox::sorry
-            (this, i18n("Unknown font size %1").tqarg(name));
+            (this, i18n("Unknown font size %1").arg(name));
         }
     } else {
         KMessageBox::sorry
-        (this, i18n("Unknown font size action %1").tqarg(name));
+        (this, i18n("Unknown font size action %1").arg(name));
     }
 }
 
@@ -5357,7 +5357,7 @@ void NotationView::slotAddIndication(std::string type, TQString desc)
         setSingleSelectedEvent(m_currentEventSelection->getSegment(),
                                command->getLastInsertedEvent());
     } else {
-        KMessageBox::sorry(this, i18n("Can't add overlapping %1 indications").tqarg(desc)); // TODO PLURAL - how many 'indications' ?
+        KMessageBox::sorry(this, i18n("Can't add overlapping %1 indications").arg(desc)); // TODO PLURAL - how many 'indications' ?
         delete command;
     }
 }
@@ -5568,7 +5568,7 @@ void NotationView::slotSetStyleFromAction()
     if (name.left(6) == "style_") {
         name = name.right(name.length() - 6);
 
-        KTmpStatusMsg msg(i18n("Changing to %1 style...").tqarg(name),
+        KTmpStatusMsg msg(i18n("Changing to %1 style...").arg(name),
                           this);
 
         addCommandToHistory(new ChangeStyleCommand
@@ -5576,7 +5576,7 @@ void NotationView::slotSetStyleFromAction()
                              *m_currentEventSelection));
     } else {
         KMessageBox::sorry
-            (this, i18n("Unknown style action %1").tqarg(name));
+            (this, i18n("Unknown style action %1").arg(name));
     }
 }
 
@@ -5608,7 +5608,7 @@ void NotationView::slotInsertNoteFromAction()
     } catch (...) {
 
         KMessageBox::sorry
-            (this, i18n("Unknown note insert action %1").tqarg(name));
+            (this, i18n("Unknown note insert action %1").arg(name));
         return ;
     }
 
@@ -6027,9 +6027,9 @@ NotationView::slotMakeOrnament()
     TQString name;
     int barNo = segment.getComposition()->getBarNumber(absTime);
     if (track) {
-        name = TQString(i18n("Ornament track %1 bar %2").tqarg(track->getPosition() + 1).tqarg(barNo + 1));
+        name = TQString(i18n("Ornament track %1 bar %2").arg(track->getPosition() + 1).arg(barNo + 1));
     } else {
-        name = TQString(i18n("Ornament bar %1").tqarg(barNo + 1));
+        name = TQString(i18n("Ornament bar %1").arg(barNo + 1));
     }
 
     MakeOrnamentDialog dialog(this, name, basePitch);
@@ -6536,7 +6536,7 @@ NotationView::slotSetCurrentStaff(int staffNo)
 
         m_chordNameRuler->setCurrentSegment(segment);
         m_rawNoteRuler->setCurrentSegment(segment);
-        m_rawNoteRuler->tqrepaint();
+        m_rawNoteRuler->repaint();
         setControlRulersCurrentSegment();
 
         updateView();
@@ -7194,17 +7194,17 @@ NotationView::slotHoveredOverAbsoluteTimeChanged(unsigned int time)
 
     //    TQString message;
     //    TQString format("%ld (%ld.%03lds)");
-    //    format = i18n("Time: %1").tqarg(format);
+    //    format = i18n("Time: %1").arg(format);
     //    message.sprintf(format, t, rt.sec, ms);
 
     TQString message = i18n("Time: %1 (%2.%3s)")
-        .tqarg(TQString("%1-%2-%3-%4")
+        .arg(TQString("%1-%2-%3-%4")
-             .tqarg(TQString("%1").tqarg(bar + 1).rightJustify(3, '0'))
+             .arg(TQString("%1").arg(bar + 1).rightJustify(3, '0'))
-             .tqarg(TQString("%1").tqarg(beat).rightJustify(2, '0'))
+             .arg(TQString("%1").arg(beat).rightJustify(2, '0'))
-             .tqarg(TQString("%1").tqarg(fraction).rightJustify(2, '0'))
+             .arg(TQString("%1").arg(fraction).rightJustify(2, '0'))
-             .tqarg(TQString("%1").tqarg(remainder).rightJustify(2, '0')))
+             .arg(TQString("%1").arg(remainder).rightJustify(2, '0')))
-        .tqarg(rt.sec)
+        .arg(rt.sec)
-        .tqarg(TQString("%1").tqarg(ms).rightJustify(3, '0'));
+        .arg(TQString("%1").arg(ms).rightJustify(3, '0'));
 
     m_hoveredOverAbsoluteTime->setText(message);
 }

src/gui/editors/notation/NotationView.h

@@ -876,7 +876,7 @@ protected:
 protected slots:
     /**
      * save general Options like all bar positions and status as well
-     * as the tqgeometry and the recent file list to the configuration
+     * as the geometry and the recent file list to the configuration
      * file
      */
     virtual void slotSaveOptions();

src/gui/editors/notation/NoteFont.cpp

@@ -66,7 +66,7 @@ NoteFont::NoteFont(std::string fontName, int size) :
 
     if (size > 0) {
         if (sizes.find(size) == sizes.end()) {
-            throw BadNoteFont(qstrtostr(TQString("Font \"%1\" not available in size %2").tqarg(strtoqstr(fontName)).tqarg(size)));
+            throw BadNoteFont(qstrtostr(TQString("Font \"%1\" not available in size %2").arg(strtoqstr(fontName)).arg(size)));
         } else {
             m_size = size;
         }
@@ -86,8 +86,8 @@ NoteFont::NoteFont(std::string fontName, int size) :
     // Locate our font's pixmap map in the font map, create if necessary
 
     std::string fontKey = qstrtostr(TQString("__%1__%2__")
-                                    .tqarg(strtoqstr(m_fontMap.getName()))
+                                    .arg(strtoqstr(m_fontMap.getName()))
-                                    .tqarg(m_size));
+                                    .arg(m_size));
 
     FontPixmapMap::iterator i = m_fontPixmapMap->find(fontKey);
     if (i == m_fontPixmapMap->end()) {
@@ -444,13 +444,13 @@ NoteFont::getShadedPixmap(CharName baseCharName, TQPixmap &pixmap,
 CharName
 NoteFont::getNameWithColour(CharName base, int hue) const
 {
-    return qstrtostr(TQString("%1__%2").tqarg(hue).tqarg(strtoqstr(base)));
+    return qstrtostr(TQString("%1__%2").arg(hue).arg(strtoqstr(base)));
 }
 
 CharName
 NoteFont::getNameShaded(CharName base) const
 {
-    return qstrtostr(TQString("shaded__%1").tqarg(strtoqstr(base)));
+    return qstrtostr(TQString("shaded__%1").arg(strtoqstr(base)));
 }
 
 bool

src/gui/editors/notation/NoteFontMap.cpp

@@ -57,8 +57,8 @@ NoteFontMap::NoteFontMap(std::string name) :
     TQString mapFileName;
 
     TQString mapFileMixedName = TQString("%1/mappings/%2.xml")
-                               .tqarg(m_fontDirectory)
+                               .arg(m_fontDirectory)
-                               .tqarg(strtoqstr(name));
+                               .arg(strtoqstr(name));
 
     TQFileInfo mapFileMixedInfo(mapFileMixedName);
 
@@ -67,8 +67,8 @@ NoteFontMap::NoteFontMap(std::string name) :
         TQString lowerName = strtoqstr(name).lower();
         lowerName.replace(TQRegExp(" "), "_");
         TQString mapFileLowerName = TQString("%1/mappings/%2.xml")
-                                   .tqarg(m_fontDirectory)
+                                   .arg(m_fontDirectory)
-                                   .tqarg(lowerName);
+                                   .arg(lowerName);
 
         TQFileInfo mapFileLowerInfo(mapFileLowerName);
 
@@ -76,11 +76,11 @@ NoteFontMap::NoteFontMap(std::string name) :
             if (mapFileLowerName != mapFileMixedName) {
                 throw MappingFileReadFailed
                 (qstrtostr(i18n("Can't open font mapping file %1 or %2").
-                           tqarg(mapFileMixedName).tqarg(mapFileLowerName)));
+                           arg(mapFileMixedName).arg(mapFileLowerName)));
             } else {
                 throw MappingFileReadFailed
                 (qstrtostr(i18n("Can't open font mapping file %1").
-                           tqarg(mapFileMixedName)));
+                           arg(mapFileMixedName)));
             }
         } else {
             mapFileName = mapFileLowerName;
@@ -595,7 +595,7 @@ NoteFontMap::startElement(const TQString &, const TQString &,
                 m_systemFontNames[n] = name;
                 delete font;
             } else {
-                std::cerr << TQString("Warning: Unable to load font \"%1\"").tqarg(name).ascii() << std::endl;
+                std::cerr << TQString("Warning: Unable to load font \"%1\"").arg(name).ascii() << std::endl;
                 m_ok = false;
             }
 
@@ -615,7 +615,7 @@ NoteFontMap::startElement(const TQString &, const TQString &,
             }
             if (!have) {
                 std::cerr << TQString("Warning: Unable to load any of the fonts in \"%1\"").
-                tqarg(names).ascii() << std::endl;
+                arg(names).ascii() << std::endl;
                 m_ok = false;
             }
 
@@ -657,10 +657,10 @@ bool
 NoteFontMap::error(const TQXmlParseException& exception)
 {
     m_errorString = TQString("%1 at line %2, column %3: %4")
-                    .tqarg(exception.message())
+                    .arg(exception.message())
-                    .tqarg(exception.lineNumber())
+                    .arg(exception.lineNumber())
-                    .tqarg(exception.columnNumber())
+                    .arg(exception.columnNumber())
-                    .tqarg(m_errorString);
+                    .arg(m_errorString);
     return TQXmlDefaultHandler::error(exception);
 }
 
@@ -668,10 +668,10 @@ bool
 NoteFontMap::fatalError(const TQXmlParseException& exception)
 {
     m_errorString = TQString("%1 at line %2, column %3: %4")
-                    .tqarg(exception.message())
+                    .arg(exception.message())
-                    .tqarg(exception.lineNumber())
+                    .arg(exception.lineNumber())
-                    .tqarg(exception.columnNumber())
+                    .arg(exception.columnNumber())
-                    .tqarg(m_errorString);
+                    .arg(m_errorString);
     return TQXmlDefaultHandler::fatalError(exception);
 }
 
@@ -705,20 +705,20 @@ bool
 NoteFontMap::checkFile(int size, std::string &src) const
 {
     TQString pixmapFileMixedName = TQString("%1/%2/%3/%4.xpm")
-                                  .tqarg(m_fontDirectory)
+                                  .arg(m_fontDirectory)
-                                  .tqarg(strtoqstr(m_srcDirectory))
+                                  .arg(strtoqstr(m_srcDirectory))
-                                  .tqarg(size)
+                                  .arg(size)
-                                  .tqarg(strtoqstr(src));
+                                  .arg(strtoqstr(src));
 
     TQFileInfo pixmapFileMixedInfo(pixmapFileMixedName);
 
     if (!pixmapFileMixedInfo.isReadable()) {
 
         TQString pixmapFileLowerName = TQString("%1/%2/%3/%4.xpm")
-                                      .tqarg(m_fontDirectory)
+                                      .arg(m_fontDirectory)
-                                      .tqarg(strtoqstr(m_srcDirectory).lower())
+                                      .arg(strtoqstr(m_srcDirectory).lower())
-                                      .tqarg(size)
+                                      .arg(size)
-                                      .tqarg(strtoqstr(src));
+                                      .arg(strtoqstr(src));
 
         TQFileInfo pixmapFileLowerInfo(pixmapFileLowerName);
 

src/gui/editors/notation/NoteFontViewer.cpp

@@ -50,7 +50,7 @@ NoteFontViewer::slotViewChanged(int i)
 
     for (int r = 0; r < 256; ++r) {
         if (m_frame->hasRow(r)) {
-            m_rows->insertItem(TQString("%1").tqarg(r));
+            m_rows->insertItem(TQString("%1").arg(r));
             if (firstRow < 0)
                 firstRow = r;
         }
@@ -84,7 +84,7 @@ NoteFontViewer::slotFontChanged(const TQString &s)
 NoteFontViewer::NoteFontViewer(TQWidget *parent, TQString noteFontName,
                                TQStringList fontNames, int pixelSize) :
         KDialogBase(parent, 0, true,
-                    i18n("Note Font Viewer: %1").tqarg(noteFontName), Close)
+                    i18n("Note Font Viewer: %1").arg(noteFontName), Close)
 {
     TQVBox *box = makeVBoxMainWidget();
     KToolBar* controls = new KToolBar(box);

src/gui/editors/notation/NotePixmapFactory.cpp

@@ -1880,7 +1880,7 @@ NotePixmapFactory::makeClefPixmap(const Clef &clef)
     else if (adjustedOctave < 8)
         adjustedOctave++;
 
-    TQString text = TQString("%1").tqarg(adjustedOctave);
+    TQString text = TQString("%1").arg(adjustedOctave);
     TQRect rect = m_clefOttavaFontMetrics.boundingRect(text);
 
     createPixmapAndMask(plain.getWidth(),
@@ -2228,7 +2228,7 @@ NotePixmapFactory::makeTrackHeaderPixmap(
             else if (adjustedOctave < 8)
                 adjustedOctave++;
 
-            TQString text = TQString("%1").tqarg(adjustedOctave);
+            TQString text = TQString("%1").arg(adjustedOctave);
             TQRect rect = m_clefOttavaFontMetrics.boundingRect(text);
 
             m_p->painter().setPen(colour);

src/gui/editors/notation/NotePixmapFactory.h

@@ -140,7 +140,7 @@ public:
     TQCanvasPixmap* makeTrackHeaderPixmap(int width, int height,
                                             TrackHeader *header);
 
-    // Bounding box and other tqgeometry methods:
+    // Bounding box and other geometry methods:
 
     int getNoteBodyWidth (Note::Type =
                           Note::Crotchet) const;

src/gui/editors/notation/NotePixmapPainter.h

@@ -61,13 +61,13 @@ public:
 
 	if (mask) {
 	    m_useMask = true;
-	    m_maskPainter.tqbegin(mask, unclipped);
+	    m_maskPainter.begin(mask, unclipped);
 	} else {
 	    m_useMask = false;
 	}
 
 	m_painter = &m_myPainter;
-	return m_painter->tqbegin(device, unclipped);
+	return m_painter->begin(device, unclipped);
     }
 
     bool end() {

src/gui/editors/notation/NoteStyle.cpp

@@ -70,12 +70,12 @@ NoteStyle::getShape(Note::Type type)
         if (m_baseStyle)
             return m_baseStyle->getShape(type);
         std::cerr
-        << "WARNING: NoteStyle::getShape: No tqshape defined for note type "
+        << "WARNING: NoteStyle::getShape: No shape defined for note type "
         << type << ", defaulting to AngledOval" << std::endl;
         return AngledOval;
     }
 
-    return i->second.tqshape;
+    return i->second.shape;
 }
 
 bool
@@ -183,57 +183,57 @@ NoteStyle::getNoteHeadCharName(Note::Type type)
     CharName name = NoteCharacterNames::UNKNOWN;
     bool inverted = false;
 
-    if (desc.tqshape == AngledOval) {
+    if (desc.shape == AngledOval) {
 
         name = desc.filled ? NoteCharacterNames::NOTEHEAD_BLACK
                : NoteCharacterNames::VOID_NOTEHEAD;
 
-    } else if (desc.tqshape == LevelOval) {
+    } else if (desc.shape == LevelOval) {
 
         if (desc.filled) {
             std::cerr << "WARNING: NoteStyle::getNoteHeadCharName: No filled level oval head" << std::endl;
         }
         name = NoteCharacterNames::WHOLE_NOTE;
 
-    } else if (desc.tqshape == Breve) {
+    } else if (desc.shape == Breve) {
 
         if (desc.filled) {
             std::cerr << "WARNING: NoteStyle::getNoteHeadCharName: No filled breve head" << std::endl;
         }
         name = NoteCharacterNames::BREVE;
 
-    } else if (desc.tqshape == Cross) {
+    } else if (desc.shape == Cross) {
 
         name = desc.filled ? NoteCharacterNames::X_NOTEHEAD
                : NoteCharacterNames::CIRCLE_X_NOTEHEAD;
 
-    } else if (desc.tqshape == TriangleUp) {
+    } else if (desc.shape == TriangleUp) {
 
         name = desc.filled ? NoteCharacterNames::TRIANGLE_NOTEHEAD_UP_BLACK
                : NoteCharacterNames::TRIANGLE_NOTEHEAD_UP_WHITE;
 
-    } else if (desc.tqshape == TriangleDown) {
+    } else if (desc.shape == TriangleDown) {
 
         name = desc.filled ? NoteCharacterNames::TRIANGLE_NOTEHEAD_UP_BLACK
                : NoteCharacterNames::TRIANGLE_NOTEHEAD_UP_WHITE;
         inverted = true;
 
-    } else if (desc.tqshape == Diamond) {
+    } else if (desc.shape == Diamond) {
 
         name = desc.filled ? NoteCharacterNames::SEMIBREVIS_BLACK
                : NoteCharacterNames::SEMIBREVIS_WHITE;
 
-    } else if (desc.tqshape == Rectangle) {
+    } else if (desc.shape == Rectangle) {
 
         name = desc.filled ? NoteCharacterNames::STQUARE_NOTEHEAD_BLACK
                : NoteCharacterNames::STQUARE_NOTEHEAD_WHITE;
 
-    } else if (desc.tqshape == Number) {
+    } else if (desc.shape == Number) {
 
         std::cerr << "WARNING: NoteStyle::getNoteHeadCharName: Number not yet implemented" << std::endl;
         name = NoteCharacterNames::UNKNOWN; //!!!
 
-    } else if (desc.tqshape == CustomCharName) {
+    } else if (desc.shape == CustomCharName) {
 
         name = desc.charName;
 
@@ -433,10 +433,10 @@ NoteStyle::checkDescription(Note::Type note)
 }
 
 void
-NoteStyle::setShape(Note::Type note, NoteHeadShape tqshape)
+NoteStyle::setShape(Note::Type note, NoteHeadShape shape)
 {
     checkDescription(note);
-    m_notes[note].tqshape = tqshape;
+    m_notes[note].shape = shape;
 }
 
 void

src/gui/editors/notation/NoteStyle.h

@@ -99,8 +99,8 @@ public:
 
 protected:
     struct NoteDescription {
-        NoteHeadShape tqshape; // if CustomCharName, use charName
+        NoteHeadShape shape; // if CustomCharName, use charName
-        CharName charName; // only used if tqshape == CustomCharName
+        CharName charName; // only used if shape == CustomCharName
         bool filled;
         bool stem;
         int flags;
@@ -109,14 +109,14 @@ protected:
         VFixPoint vfix;
 
         NoteDescription() :
-            tqshape(AngledOval), charName(NoteCharacterNames::UNKNOWN),
+            shape(AngledOval), charName(NoteCharacterNames::UNKNOWN),
             filled(true), stem(true), flags(0), slashes(0),
             hfix(Normal), vfix(Middle) { }
 
-        NoteDescription(NoteHeadShape _tqshape, CharName _charName,
+        NoteDescription(NoteHeadShape _shape, CharName _charName,
                         bool _filled, bool _stem, int _flags, int _slashes,
                         HFixPoint _hfix, VFixPoint _vfix) :
-            tqshape(_tqshape), charName(_charName),
+            shape(_shape), charName(_charName),
             filled(_filled), stem(_stem), flags(_flags), slashes(_slashes),
             hfix(_hfix), vfix(_vfix) { }
     };

src/gui/editors/notation/NoteStyleFactory.cpp

@@ -63,7 +63,7 @@ NoteStyleFactory::getAvailableStyleNames()
 
     for (TQStringList::Iterator i = files.begin(); i != files.end(); ++i) {
         if ((*i).length() > 4 && (*i).right(4) == ".xml") {
-            TQFileInfo fileInfo(TQString("%1/%2").tqarg(styleDir).tqarg(*i));
+            TQFileInfo fileInfo(TQString("%1/%2").arg(styleDir).arg(*i));
             if (fileInfo.exists() && fileInfo.isReadable()) {
                 std::string styleName = qstrtostr((*i).left((*i).length() - 4));
                 if (styleName == DefaultStyle)

src/gui/editors/notation/NoteStyleFileReader.cpp

@@ -48,13 +48,13 @@ NoteStyleFileReader::NoteStyleFileReader(std::string name) :
 	KGlobal::dirs()->findResource("appdata", "styles/");
 
     TQString styleFileName =
-	TQString("%1/%2.xml").tqarg(styleDirectory).tqarg(strtoqstr(name));
+	TQString("%1/%2.xml").arg(styleDirectory).arg(strtoqstr(name));
 
     TQFileInfo fileInfo(styleFileName);
 
     if (!fileInfo.isReadable()) {
         throw StyleFileReadFailed
-	    (qstrtostr(i18n("Can't open style file %1").tqarg(styleFileName)));
+	    (qstrtostr(i18n("Can't open style file %1").arg(styleFileName)));
     }
 
     TQFile styleFile(styleFileName);
@@ -98,7 +98,7 @@ NoteStyleFileReader::startElement(const TQString &, const TQString &,
 	    if (!setFromAttributes(type, attributes)) return false;
 
 	} catch (NotationStrings::MalformedNoteName n) {
-	    m_errorString = i18n("Unrecognised note name %1").tqarg(s);
+	    m_errorString = i18n("Unrecognised note name %1").arg(s);
 	    return false;
 	}
 
@@ -125,7 +125,7 @@ NoteStyleFileReader::setFromAttributes(Note::Type type,
     TQString s;
     bool haveShape = false;
 
-    s = attributes.value("tqshape");
+    s = attributes.value("shape");
     if (!s.isNull()) {
 	m_style->setShape(type, qstrtostr(s.lower()));
 	haveShape = true;
@@ -134,7 +134,7 @@ NoteStyleFileReader::setFromAttributes(Note::Type type,
     s = attributes.value("charname");
     if (!s.isNull()) {
 	if (haveShape) {
-	    m_errorString = i18n("global and note elements may have tqshape "
+	    m_errorString = i18n("global and note elements may have shape "
 				 "or charname attribute, but not both");
 	    return false;
 	}

src/gui/editors/notation/TrackHeader.cpp

@@ -111,12 +111,12 @@ TrackHeader::TrackHeader(TQWidget *parent, TrackId trackId, int height, int ypos
     int trackPos = comp->getTrackPositionById(m_track);
 
     TQString toolTipText = TQString(i18n("Track %1 : \"%2\"")
-                            .tqarg(trackPos + 1)
+                            .arg(trackPos + 1)
-                            .tqarg(strtoqstr(track->getLabel())));
+                            .arg(strtoqstr(track->getLabel())));
 
     TQString preset = track->getPresetLabel().c_str();
     if (preset != TQString(""))
-        toolTipText += TQString(i18n("\nNotate for: %1").tqarg(preset));
+        toolTipText += TQString(i18n("\nNotate for: %1").arg(preset));
 
     TQString notationSize = i18n("normal");
     switch (track->getStaffSize()) {
@@ -154,8 +154,8 @@ TrackHeader::TrackHeader(TQWidget *parent, TrackId trackId, int height, int ypos
     }
 
     toolTipText += TQString(i18n("\nSize: %1,  Bracket: %2 "))
-                            .tqarg(notationSize)
+                            .arg(notationSize)
-                            .tqarg(bracketText);
+                            .arg(bracketText);
 
     // Sort segments by position on the track
     SortedSegments segments;
@@ -181,17 +181,17 @@ TrackHeader::TrackHeader(TQWidget *parent, TrackId trackId, int height, int ypos
             TQString transposeName;
             transposeValueToName(transpose, transposeName);
             toolTipText += TQString(i18n("\nbars [%1-%2] in %3 (tr=%4) : \"%5\""))
-                                    .tqarg(barStart)
+                                    .arg(barStart)
-                                    .tqarg(barEnd)
+                                    .arg(barEnd)
-                                    .tqarg(transposeName)
+                                    .arg(transposeName)
-                                    .tqarg(transpose)
+                                    .arg(transpose)
-                                    .tqarg(strtoqstr((*i)->getLabel()));
+                                    .arg(strtoqstr((*i)->getLabel()));
         } else {
             toolTipText += TQString(i18n("\nbars [%1-%2] (tr=%3) : \"%4\""))
-                                    .tqarg(barStart)
+                                    .arg(barStart)
-                                    .tqarg(barEnd)
+                                    .arg(barEnd)
-                                    .tqarg(transpose)
+                                    .arg(transpose)
-                                    .tqarg(strtoqstr((*i)->getLabel()));
+                                    .arg(strtoqstr((*i)->getLabel()));
         }
     }
 
@@ -350,9 +350,9 @@ TrackHeader::lookAtStaff(double x, int maxWidth)
     transposeValueToName(m_transpose, noteName);
 
     m_upperText = TQString(i18n("%1: %2")
-                                .tqarg(trackPos + 1)
+                                .arg(trackPos + 1)
-                                .tqarg(strtoqstr(track->getLabel())));
+                                .arg(strtoqstr(track->getLabel())));
-    if (m_transpose) m_transposeText = i18n(" in %1").tqarg(noteName);
+    if (m_transpose) m_transposeText = i18n(" in %1").arg(noteName);
     else             m_transposeText = TQString("");
 
     NotePixmapFactory * npf = m_notationView->getNotePixmapFactory();

src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp

@@ -131,7 +131,7 @@ MIDIInstrumentParameterPanel::MIDIInstrumentParameterPanel(RosegardenGUIDoc *doc
     // Populate channel lists
     //
     for (int i = 0; i < 16; i++) {
-        m_channelValue->insertItem(TQString("%1").tqarg(i + 1));
+        m_channelValue->insertItem(TQString("%1").arg(i + 1));
     }
 
     m_channelValue->setSizeLimit(16);
@@ -212,13 +212,13 @@ MIDIInstrumentParameterPanel::setupForInstrument(Instrument *instrument)
     //
     TQString connection(strtoqstr(md->getConnection()));
     if (connection == "") {
-        m_connectionLabel->setText(i18n("[ %1 ]").tqarg(i18n("No connection")));
+        m_connectionLabel->setText(i18n("[ %1 ]").arg(i18n("No connection")));
     } else {
 
         // remove trailing "(duplex)", "(read only)", "(write only)" etc
         connection.replace(TQRegExp("\\s*\\([^)0-9]+\\)\\s*$"), "");
 
-        TQString text = i18n("[ %1 ]").tqarg(connection);
+        TQString text = i18n("[ %1 ]").arg(connection);
         /*TQString origText(text);
 
         TQFontMetrics metrics(m_connectionLabel->fontMetrics());
@@ -361,7 +361,7 @@ MIDIInstrumentParameterPanel::setupControllers(MidiDevice *md)
                     redraw = 0;
             }
             if (redraw == 2) {
-                rotary->tqrepaint();
+                rotary->repaint();
             }
 
             // Update the controller name that is associated with
@@ -641,8 +641,8 @@ MIDIInstrumentParameterPanel::populateProgramList()
         std::string programName = programs[i].getName();
         if (programName != "") {
             m_programValue->insertItem(TQString("%1. %2")
-                                       .tqarg(programs[i].getProgram() + 1)
+                                       .arg(programs[i].getProgram() + 1)
-                                       .tqarg(strtoqstr(programName)));
+                                       .arg(strtoqstr(programName)));
             if (m_selectedInstrument->getProgram() == programs[i]) {
                 currentProgram = m_programs.size();
             }
@@ -763,8 +763,8 @@ MIDIInstrumentParameterPanel::populateVariationList()
             					 strtoqstr(programName));
             */
             m_variationValue->insertItem(TQString("%1. %2")
-                                         .tqarg(variations[i] + 1)
+                                         .arg(variations[i] + 1)
-                                         .tqarg(strtoqstr(programName)));
+                                         .arg(strtoqstr(programName)));
             if (m_selectedInstrument->getProgram() == program) {
                 currentVariation = m_variations.size();
             }

src/gui/editors/parameters/SegmentParameterBox.cpp

@@ -333,7 +333,7 @@ SegmentParameterBox::initBox()
     // populate the transpose combo
     //
     for (int i = -m_transposeRange; i < m_transposeRange + 1; i++) {
-        m_transposeValue->insertItem(noMap, TQString("%1").tqarg(i));
+        m_transposeValue->insertItem(noMap, TQString("%1").arg(i));
         if (i == 0)
             m_transposeValue->setCurrentItem(m_transposeValue->count() - 1);
     }
@@ -363,7 +363,7 @@ SegmentParameterBox::initBox()
     for (int i = 0; i < 10; i++) {
         int rtd = (i < 5 ? ((i + 1) * 10) : ((i - 3) * 50));
         m_realTimeDelays.push_back(rtd);
-        m_delayValue->insertItem(i18n("%1 ms").tqarg(rtd));
+        m_delayValue->insertItem(i18n("%1 ms").arg(rtd));
     }
 
     // set delay blank initially
@@ -666,7 +666,7 @@ SegmentParameterBox::populateBoxFromSegments()
         // 2nd arg of "true" means "add if necessary"
     case All:
         m_transposeValue->
-        setCurrentItem(TQString("%1").tqarg(transposeLevel), true);
+        setCurrentItem(TQString("%1").arg(transposeLevel), true);
         break;
 
     case Some:
@@ -694,7 +694,7 @@ SegmentParameterBox::populateBoxFromSegments()
 
         } else if (delayLevel < 0) {
 
-            m_delayValue->setCurrentItem(i18n("%1 ms").tqarg( -delayLevel),
+            m_delayValue->setCurrentItem(i18n("%1 ms").arg( -delayLevel),
                                          true);
         }
 
@@ -1019,8 +1019,8 @@ SegmentParameterBox::updateHighLow()
     //!!! FIXME this code is broken, and needs to be fixed after the fashion of
     //the TPB, but I'm not bothering with that at this time, because they are
     //going to be hidden for 1.3 anyway
-//    m_highButton->setText(TQString("&High:   %1%2").tqarg(highest.getNoteName(key)).tqarg(highest.getOctave(base)));
+//    m_highButton->setText(TQString("&High:   %1%2").arg(highest.getNoteName(key)).arg(highest.getOctave(base)));
-//    m_lowButton->setText(TQString("&Low:   %1%2").tqarg(lowest.getNoteName(key)).tqarg(lowest.getOctave(base)));
+//    m_lowButton->setText(TQString("&Low:   %1%2").arg(lowest.getNoteName(key)).arg(lowest.getOctave(base)));
 }
 
 void

src/gui/editors/parameters/TrackParameterBox.cpp

@@ -311,7 +311,7 @@ TrackParameterBox::TrackParameterBox( RosegardenGUIDoc *doc,
 
     int transposeRange = 48;
     for (int i = -transposeRange; i < transposeRange + 1; i++) {
-        m_defTranspose->insertItem(TQString("%1").tqarg(i));
+        m_defTranspose->insertItem(TQString("%1").arg(i));
         if (i == 0)
             m_defTranspose->setCurrentItem(m_defTranspose->count() - 1);
     }
@@ -468,7 +468,7 @@ TrackParameterBox::populatePlaybackDeviceList()
                         pname = strtoqstr(plugin->getDistinctiveConfigurationText());
                     }
                     if (pname != "") {
-                        pname = TQString("%1: %2").tqarg(label).tqarg(pname);
+                        pname = TQString("%1: %2").arg(label).arg(pname);
                     } else {
                         pname = label;
                     }
@@ -601,10 +601,10 @@ TrackParameterBox::updateHighLow()
     bool useSharps = true;
     bool includeOctave = true;
 
-//    m_highButton->setText(i18n("High: %1").tqarg(highest.getAsString(useSharps, includeOctave, base)));
+//    m_highButton->setText(i18n("High: %1").arg(highest.getAsString(useSharps, includeOctave, base)));
-//    m_lowButton->setText(i18n("Low: %1").tqarg(lowest.getAsString(useSharps, includeOctave, base)));
+//    m_lowButton->setText(i18n("Low: %1").arg(lowest.getAsString(useSharps, includeOctave, base)));
-    m_highButton->setText(TQString("%1").tqarg(highest.getAsString(useSharps, includeOctave, base).c_str()));
+    m_highButton->setText(TQString("%1").arg(highest.getAsString(useSharps, includeOctave, base).c_str()));
-    m_lowButton->setText(TQString("%1").tqarg(lowest.getAsString(useSharps, includeOctave, base).c_str()));
+    m_lowButton->setText(TQString("%1").arg(lowest.getAsString(useSharps, includeOctave, base).c_str()));
 
     m_presetLbl->setEnabled(false);
 }
@@ -624,7 +624,7 @@ TrackParameterBox::slotUpdateControls(int /*dummy*/)
         return ;
 
     m_defClef->setCurrentItem(trk->getClef());
-    m_defTranspose->setCurrentItem(TQString("%1").tqarg(trk->getTranspose()), true);
+    m_defTranspose->setCurrentItem(TQString("%1").arg(trk->getTranspose()), true);
     m_defColor->setCurrentItem(trk->getColor());
     m_highestPlayable = trk->getHighestPlayable();
     m_lowestPlayable = trk->getLowestPlayable();
@@ -663,7 +663,7 @@ TrackParameterBox::slotSelectedTrackNameChanged()
     else
         m_trackName.truncate(20);
     int trackNum = trk->getPosition() + 1;
-    m_trackLabel->setText(i18n("[ Track %1 - %2 ]").tqarg(trackNum).tqarg(m_trackName));
+    m_trackLabel->setText(i18n("[ Track %1 - %2 ]").arg(trackNum).arg(m_trackName));
 }
 
 void

src/gui/editors/segment/ControlEditorDialog.cpp

@@ -96,7 +96,7 @@ ControlEditorDialog::ControlEditorDialog(TQWidget *parent,
 
     // spacing hack!
     new TQLabel("", mainFrame);
-    new TQLabel(i18n("  Control Events for %1 (device %2)").tqarg(deviceName).
+    new TQLabel(i18n("  Control Events for %1 (device %2)").arg(deviceName).
                arg(device), mainFrame);
     new TQLabel("", mainFrame);
 
@@ -220,7 +220,7 @@ ControlEditorDialog::slotUpdate()
         if (colour == "")
             colour = i18n("<default>");
 
-        TQString position = TQString("%1").tqarg(it->getIPBPosition());
+        TQString position = TQString("%1").arg(it->getIPBPosition());
         if (position.toInt() == -1)
             position = notShowing;
 
@@ -235,9 +235,9 @@ ControlEditorDialog::slotUpdate()
                                             strtoqstr(it->getType()),
                                             TQString("-"),
                                             strtoqstr(it->getDescription()),
-                                            TQString("%1").tqarg(it->getMin()),
+                                            TQString("%1").arg(it->getMin()),
-                                            TQString("%1").tqarg(it->getMax()),
+                                            TQString("%1").arg(it->getMax()),
-                                            TQString("%1").tqarg(it->getDefault()),
+                                            TQString("%1").arg(it->getDefault()),
                                             colour,
                                             position);
         } else {
@@ -247,9 +247,9 @@ ControlEditorDialog::slotUpdate()
                                             strtoqstr(it->getType()),
                                             value,
                                             strtoqstr(it->getDescription()),
-                                            TQString("%1").tqarg(it->getMin()),
+                                            TQString("%1").arg(it->getMin()),
-                                            TQString("%1").tqarg(it->getMax()),
+                                            TQString("%1").arg(it->getMax()),
-                                            TQString("%1").tqarg(it->getDefault()),
+                                            TQString("%1").arg(it->getDefault()),
                                             colour,
                                             position);
         }

src/gui/editors/segment/ControlParameterEditDialog.cpp

@@ -182,7 +182,7 @@ ControlParameterEditDialog::ControlParameterEditDialog(
     //
     m_ipbPosition->insertItem(notShowing);
     for (unsigned int i = 0; i < 32; i++)
-        m_ipbPosition->insertItem(TQString("%1").tqarg(i));
+        m_ipbPosition->insertItem(TQString("%1").arg(i));
 
     if (m_control->getType() == Controller::EventType)
         m_typeCombo->setCurrentItem(0);

src/gui/editors/segment/MarkerEditor.cpp

@@ -182,7 +182,7 @@ void
 MarkerEditor::updatePosition()
 {
     timeT pos = m_doc->getComposition().getPosition();
-    m_absoluteTime->setText(TQString("%1").tqarg(pos));
+    m_absoluteTime->setText(TQString("%1").arg(pos));
 
     RealTime rT = m_doc->getComposition().getElapsedRealTime(pos);
     long hours = rT.sec / (60 * 60);
@@ -192,9 +192,9 @@ MarkerEditor::updatePosition()
 
     TQString realTime, secsStr;
     if (hours)
-        realTime += TQString("%1h ").tqarg(hours);
+        realTime += TQString("%1h ").arg(hours);
     if (mins)
-        realTime += TQString("%1m ").tqarg(mins);
+        realTime += TQString("%1m ").arg(mins);
     secsStr.sprintf("%ld.%03lds", secs, msecs);
     realTime += secsStr;
 
@@ -203,7 +203,7 @@ MarkerEditor::updatePosition()
         m_realTime->setText(realTime);
 
     TQString barTime =
-        TQString("%1").tqarg(m_doc->getComposition().getBarNumber(pos) + 1);
+        TQString("%1").arg(m_doc->getComposition().getBarNumber(pos) + 1);
 
     // again only update if needed
     if (m_barTime->text() != barTime)
@@ -542,27 +542,27 @@ MarkerEditor::makeTimeString(timeT time, int timeMode)
             (time, bar, beat, fraction, remainder);
             ++bar;
             return TQString("%1%2%3-%4%5-%6%7-%8%9   ")
-                   .tqarg(bar / 100)
+                   .arg(bar / 100)
-                   .tqarg((bar % 100) / 10)
+                   .arg((bar % 100) / 10)
-                   .tqarg(bar % 10)
+                   .arg(bar % 10)
-                   .tqarg(beat / 10)
+                   .arg(beat / 10)
-                   .tqarg(beat % 10)
+                   .arg(beat % 10)
-                   .tqarg(fraction / 10)
+                   .arg(fraction / 10)
-                   .tqarg(fraction % 10)
+                   .arg(fraction % 10)
-                   .tqarg(remainder / 10)
+                   .arg(remainder / 10)
-                   .tqarg(remainder % 10);
+                   .arg(remainder % 10);
         }
 
     case 1:  // real time
         {
             RealTime rt =
                 m_doc->getComposition().getElapsedRealTime(time);
-            //        return TQString("%1   ").tqarg(rt.toString().c_str());
+            //        return TQString("%1   ").arg(rt.toString().c_str());
-            return TQString("%1   ").tqarg(rt.toText().c_str());
+            return TQString("%1   ").arg(rt.toText().c_str());
         }
 
     default:
-        return TQString("%1   ").tqarg(time);
+        return TQString("%1   ").arg(time);
     }
 }
 

src/gui/editors/segment/TrackButtons.cpp

@@ -647,17 +647,17 @@ TrackButtons::populateInstrumentPopup(Instrument *thisTrackInstr, TQPopupMenu* i
             KGlobal::dirs()->findResource("appdata", "pixmaps/");
 
         connectedPixmap.load
-            (TQString("%1/misc/connected.xpm").tqarg(pixmapDir));
+            (TQString("%1/misc/connected.xpm").arg(pixmapDir));
         connectedUsedPixmap.load
-            (TQString("%1/misc/connected-used.xpm").tqarg(pixmapDir));
+            (TQString("%1/misc/connected-used.xpm").arg(pixmapDir));
         connectedSelectedPixmap.load
-            (TQString("%1/misc/connected-selected.xpm").tqarg(pixmapDir));
+            (TQString("%1/misc/connected-selected.xpm").arg(pixmapDir));
         unconnectedPixmap.load
-            (TQString("%1/misc/unconnected.xpm").tqarg(pixmapDir));
+            (TQString("%1/misc/unconnected.xpm").arg(pixmapDir));
         unconnectedUsedPixmap.load
-            (TQString("%1/misc/unconnected-used.xpm").tqarg(pixmapDir));
+            (TQString("%1/misc/unconnected-used.xpm").arg(pixmapDir));
         unconnectedSelectedPixmap.load
-            (TQString("%1/misc/unconnected-selected.xpm").tqarg(pixmapDir));
+            (TQString("%1/misc/unconnected-selected.xpm").arg(pixmapDir));
 
         havePixmaps = true;
     }
@@ -706,7 +706,7 @@ TrackButtons::populateInstrumentPopup(Instrument *thisTrackInstr, TQPopupMenu* i
                         pname = strtoqstr(plugin->getDistinctiveConfigurationText());
                     }
                     if (pname != "") {
-                        pname = TQString("%1: %2").tqarg(label).tqarg(pname);
+                        pname = TQString("%1: %2").arg(label).arg(pname);
                     } else {
                         pname = label;
                     }

src/gui/editors/segment/TrackEditor.cpp

@@ -331,7 +331,7 @@ void TrackEditor::slotReadjustCanvasSize()
 
 void TrackEditor::slotTrackButtonsWidthChanged()
 {
-    // We need to make sure the trackButtons tqgeometry is fully updated
+    // We need to make sure the trackButtons geometry is fully updated
     //
     ProgressDialog::processEvents();
 
@@ -444,7 +444,7 @@ void TrackEditor::addSegment(int track, int time, unsigned int duration)
 void TrackEditor::slotSegmentOrderChanged(int section, int fromIdx, int toIdx)
 {
     RG_DEBUG << TQString("TrackEditor::segmentOrderChanged(section : %1, from %2, to %3)")
-    .tqarg(section).tqarg(fromIdx).tqarg(toIdx) << endl;
+    .arg(section).arg(fromIdx).arg(toIdx) << endl;
 
     //!!! how do we get here? need to involve a command
     emit needUpdate();

src/gui/editors/segment/TrackVUMeter.cpp

@@ -67,7 +67,7 @@ TrackVUMeter::meterStop()
 {
     setMinimumHeight(m_textHeight);
     setMaximumHeight(m_textHeight);
-    setText(TQString("%1").tqarg(m_position + 1));
+    setText(TQString("%1").arg(m_position + 1));
     if (m_active) {
         m_active = false;
         update();

src/gui/editors/segment/TriggerSegmentManager.cpp

@@ -246,16 +246,16 @@ TriggerSegmentManager::slotUpdate()
 
         TQString used = i18n("%1 on 1 track",
                             "%1 on %n tracks",
-                            tracks.size()).tqarg(uses);
+                            tracks.size()).arg(uses);
 
         TQString pitch = TQString("%1 (%2)")
-                        .tqarg(MidiPitchLabel((*it)->getBasePitch()).getTQString())
+                        .arg(MidiPitchLabel((*it)->getBasePitch()).getTQString())
-                        .tqarg((*it)->getBasePitch());
+                        .arg((*it)->getBasePitch());
 
-        TQString velocity = TQString("%1").tqarg((*it)->getBaseVelocity());
+        TQString velocity = TQString("%1").arg((*it)->getBaseVelocity());
 
         item = new TriggerManagerItem
-               (m_listView, TQString("%1").tqarg(i + 1), TQString("%1").tqarg((*it)->getId()),
+               (m_listView, TQString("%1").arg(i + 1), TQString("%1").arg((*it)->getId()),
                 label, timeString, pitch, velocity, used);
 
         item->setRawDuration(duration);
@@ -523,15 +523,15 @@ TriggerSegmentManager::makeDurationString(timeT time,
             m_doc->getComposition().getMusicalTimeForDuration
             (time, duration, bar, beat, fraction, remainder);
             return TQString("%1%2%3-%4%5-%6%7-%8%9   ")
-                   .tqarg(bar / 100)
+                   .arg(bar / 100)
-                   .tqarg((bar % 100) / 10)
+                   .arg((bar % 100) / 10)
-                   .tqarg(bar % 10)
+                   .arg(bar % 10)
-                   .tqarg(beat / 10)
+                   .arg(beat / 10)
-                   .tqarg(beat % 10)
+                   .arg(beat % 10)
-                   .tqarg(fraction / 10)
+                   .arg(fraction / 10)
-                   .tqarg(fraction % 10)
+                   .arg(fraction % 10)
-                   .tqarg(remainder / 10)
+                   .arg(remainder / 10)
-                   .tqarg(remainder % 10);
+                   .arg(remainder % 10);
         }
 
     case 1:  // real time
@@ -539,12 +539,12 @@ TriggerSegmentManager::makeDurationString(timeT time,
             RealTime rt =
                 m_doc->getComposition().getRealTimeDifference
                 (time, time + duration);
-            //	return TQString("%1  ").tqarg(rt.toString().c_str());
+            //	return TQString("%1  ").arg(rt.toString().c_str());
-            return TQString("%1  ").tqarg(rt.toText().c_str());
+            return TQString("%1  ").arg(rt.toText().c_str());
         }
 
     default:
-        return TQString("%1  ").tqarg(duration);
+        return TQString("%1  ").arg(duration);
     }
 }
 

src/gui/editors/segment/segmentcanvas/CompositionView.cpp

@@ -327,7 +327,7 @@ void CompositionView::slotSetTool(const TQString& toolName)
     if (m_tool)
         m_tool->ready();
     else {
-        KMessageBox::error(0, TQString("CompositionView::slotSetTool() : unknown tool name %1").tqarg(toolName));
+        KMessageBox::error(0, TQString("CompositionView::slotSetTool() : unknown tool name %1").arg(toolName));
     }
 }
 
@@ -495,7 +495,7 @@ void CompositionView::resizeEvent(TQResizeEvent* e)
 
 void CompositionView::viewportPaintEvent(TQPaintEvent* e)
 {
-    TQMemArray<TQRect> rects = TQRegion(e->region()).tqrects();
+    TQMemArray<TQRect> rects = TQRegion(e->region()).rects();
 
     for (unsigned int i = 0; i < rects.size(); ++i) {
         viewportPaintRect(rects[i]);
@@ -682,7 +682,7 @@ void CompositionView::refreshArtifactsDrawBuffer(const TQRect& rect)
     //               << rect << endl;
 
     TQPainter p;
-    p.tqbegin(&m_artifactsDrawBuffer, viewport());
+    p.begin(&m_artifactsDrawBuffer, viewport());
     p.translate( -contentsX(), -contentsY());
     //     TQRect r(contentsX(), contentsY(), m_artifactsDrawBuffer.width(), m_artifactsDrawBuffer.height());
     drawAreaArtifacts(&p, rect);

src/gui/editors/segment/segmentcanvas/SegmentItemPreview.h

@@ -59,7 +59,7 @@ public:
     PreviewState getPreviewState() const { return m_previewState; }
 
     /**
-     * Sets whether the preview tqshape shown in the segment needs
+     * Sets whether the preview shape shown in the segment needs
      * to be refreshed
      */
     void setPreviewCurrent(bool c)

src/gui/editors/segment/segmentcanvas/SegmentMover.cpp

@@ -328,8 +328,8 @@ int SegmentMover::handleMouseMove(TQMouseEvent *e)
     comp.getMusicalTimeForAbsoluteTime(currentItemStartTime, bar, beat, fraction, remainder);
 
     TQString posString = TQString("%1.%2s (%3, %4, %5)")
-        .tqarg(time.sec).tqarg(ms)
+        .arg(time.sec).arg(ms)
-        .tqarg(bar + 1).tqarg(beat).tqarg(fraction);
+        .arg(bar + 1).arg(beat).arg(fraction);
 
     m_canvas->setTextFloat(guideX + 10, guideY - 30, posString);
     m_canvas->updateContents();

src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp

@@ -466,8 +466,8 @@ SegmentSelector::handleMouseMove(TQMouseEvent *e)
         comp.getMusicalTimeForAbsoluteTime(currentItemStartTime, bar, beat, fraction, remainder);
 
         TQString posString = TQString("%1.%2s (%3, %4, %5)")
-                            .tqarg(time.sec).tqarg(ms)
+                            .arg(time.sec).arg(ms)
-                            .tqarg(bar + 1).tqarg(beat).tqarg(fraction);
+                            .arg(bar + 1).arg(beat).arg(fraction);
 
         m_canvas->setTextFloat(guideX + 10, guideY - 30, posString);
         m_canvas->updateContents();

src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp

@@ -84,7 +84,7 @@ SegmentTool* SegmentToolBox::createTool(const TQString& toolName)
 
     else {
         KMessageBox::error(0, TQString("SegmentToolBox::createTool : unrecognised toolname %1 (%2)")
-                           .tqarg(toolName).tqarg(toolNamelc));
+                           .arg(toolName).arg(toolNamelc));
         return 0;
     }
 

src/gui/editors/tempo/TempoView.cpp

@@ -218,7 +218,7 @@ TempoView::applyLayout(int /*staffNo*/)
             new TempoListItem(comp, TempoListItem::TimeSignature,
                               sig.first, i, m_list, timeString,
                               i18n("Time Signature   "),
-                              TQString("%1/%2   ").tqarg(sig.second.getNumerator()).
+                              TQString("%1/%2   ").arg(sig.second.getNumerator()).
                               arg(sig.second.getDenominator()),
                               properties);
         }
@@ -243,7 +243,7 @@ TempoView::applyLayout(int /*staffNo*/)
             if (sig.getBeatDuration() ==
                     Note(Note::Crotchet).getDuration()) {
                 desc = i18n("%1.%2%3").
-                       tqarg(qpmUnits).tqarg(qpmTenths).tqarg(qpmHundredths);
+                       arg(qpmUnits).arg(qpmTenths).arg(qpmHundredths);
             } else {
                 float bpm = (qpm *
                              Note(Note::Crotchet).getDuration()) /
@@ -253,8 +253,8 @@ TempoView::applyLayout(int /*staffNo*/)
                 int bpmHundredths = int((bpm - bpmUnits - bpmTenths / 10.0) * 100 + 0.001);
 
                 desc = i18n("%1.%2%3 qpm (%4.%5%6 bpm)   ").
-                       tqarg(qpmUnits).tqarg(qpmTenths).tqarg(qpmHundredths).
+                       arg(qpmUnits).arg(qpmTenths).arg(qpmHundredths).
-                       tqarg(bpmUnits).tqarg(bpmTenths).tqarg(bpmHundredths);
+                       arg(bpmUnits).arg(bpmTenths).arg(bpmHundredths);
             }
 
             TQString timeString = makeTimeString(tempo.first, timeMode);
@@ -354,27 +354,27 @@ TempoView::makeTimeString(timeT time, int timeMode)
             (time, bar, beat, fraction, remainder);
             ++bar;
             return TQString("%1%2%3-%4%5-%6%7-%8%9   ")
-                   .tqarg(bar / 100)
+                   .arg(bar / 100)
-                   .tqarg((bar % 100) / 10)
+                   .arg((bar % 100) / 10)
-                   .tqarg(bar % 10)
+                   .arg(bar % 10)
-                   .tqarg(beat / 10)
+                   .arg(beat / 10)
-                   .tqarg(beat % 10)
+                   .arg(beat % 10)
-                   .tqarg(fraction / 10)
+                   .arg(fraction / 10)
-                   .tqarg(fraction % 10)
+                   .arg(fraction % 10)
-                   .tqarg(remainder / 10)
+                   .arg(remainder / 10)
-                   .tqarg(remainder % 10);
+                   .arg(remainder % 10);
         }
 
     case 1:  // real time
         {
             RealTime rt =
                 getDocument()->getComposition().getElapsedRealTime(time);
-            //	return TQString("%1   ").tqarg(rt.toString().c_str());
+            //	return TQString("%1   ").arg(rt.toString().c_str());
-            return TQString("%1   ").tqarg(rt.toText().c_str());
+            return TQString("%1   ").arg(rt.toText().c_str());
         }
 
     default:
-        return TQString("%1   ").tqarg(time);
+        return TQString("%1   ").arg(time);
     }
 }
 
@@ -832,7 +832,7 @@ void
 TempoView::updateViewCaption()
 {
     setCaption(i18n("%1 - Tempo and Time Signature Editor")
-               .tqarg(getDocument()->getTitle()));
+               .arg(getDocument()->getTitle()));
 }
 
 }

src/gui/general/BaseTool.h

@@ -58,7 +58,7 @@ public:
     /**
      * Is called by the parent View (EditView or SegmentCanvas) when
      * the tool is set as current.
-     * Add any setup here (e.g. setting the mouse cursor tqshape)
+     * Add any setup here (e.g. setting the mouse cursor shape)
      */
     virtual void ready();
 

src/gui/general/CanvasItemGC.h

@@ -52,10 +52,10 @@ namespace Rosegarden
  *
  * However, if the SegmentItem deletes its repeat rectangle, then when
  * the SegmentCanvas destruction occurs, the SegmentCanvas dtor will
- * get a list of all its tqchildren (TQCanvas::allItems()), containing
+ * get a list of all its children (TQCanvas::allItems()), containing
  * both SegmentItems and their repeat rectangles. Deleting a
  * SegmentItem will delete its repeat rectangle, which will still be
- * present in the all tqchildren list which the SegmentCanvas dtor is
+ * present in the all children list which the SegmentCanvas dtor is
  * iterating over.
  * 
  * So a solution is simply to push to-be-deleted repeat rectangles on

src/gui/general/EditView.cpp

@@ -169,7 +169,7 @@ EditView::~EditView()
 
 void EditView::updateBottomWidgetGeometry()
 {
-    getBottomWidget()->tqlayout()->tqinvalidate();
+    getBottomWidget()->tqlayout()->invalidate();
     getBottomWidget()->updateGeometry();
     getCanvasView()->updateBottomWidgetGeometry();
 }
@@ -891,9 +891,9 @@ EditView::setupAddControlRulerMenu()
                 TQString hexValue;
                 hexValue.sprintf("(0x%x)", it->getControllerValue());
 
-                itemStr = i18n("%1 Controller %2 %3").tqarg(strtoqstr(it->getName()))
+                itemStr = i18n("%1 Controller %2 %3").arg(strtoqstr(it->getName()))
-                          .tqarg(it->getControllerValue())
+                          .arg(it->getControllerValue())
-                          .tqarg(hexValue);
+                          .arg(hexValue);
 
             } else if (it->getType() == PitchBend::EventType)
                 itemStr = i18n("Pitch Bend");
@@ -1114,10 +1114,10 @@ EditView::createInsertPitchActionMenu()
 
                 insertPitchAction =
                     new KAction
-                    (flat.tqarg(notePitchNames[i]),
+                    (flat.arg(notePitchNames[i]),
                      CTRL + SHIFT + notePitchKeys[octave][i],
                      TQT_TQOBJECT(this), TQT_SLOT(slotInsertNoteFromAction()), actionCollection(),
-                     TQString("insert_%1_flat%2").tqarg(i).tqarg(octaveSuffix).ascii());
+                     TQString("insert_%1_flat%2").arg(i).arg(octaveSuffix).ascii());
 
                 menu->insert(insertPitchAction);
             }
@@ -1127,7 +1127,7 @@ EditView::createInsertPitchActionMenu()
                 (notePitchNames[i],
                  notePitchKeys[octave][i],
                  TQT_TQOBJECT(this), TQT_SLOT(slotInsertNoteFromAction()), actionCollection(),
-                 TQString("insert_%1%2").tqarg(i).tqarg(octaveSuffix).ascii());
+                 TQString("insert_%1%2").arg(i).arg(octaveSuffix).ascii());
 
             menu->insert(insertPitchAction);
 
@@ -1137,10 +1137,10 @@ EditView::createInsertPitchActionMenu()
 
                 insertPitchAction =
                     new KAction
-                    (sharp.tqarg(notePitchNames[i]),
+                    (sharp.arg(notePitchNames[i]),
                      SHIFT + notePitchKeys[octave][i],
                      TQT_TQOBJECT(this), TQT_SLOT(slotInsertNoteFromAction()), actionCollection(),
-                     TQString("insert_%1_sharp%2").tqarg(i).tqarg(octaveSuffix).ascii());
+                     TQString("insert_%1_sharp%2").arg(i).arg(octaveSuffix).ascii());
 
                 menu->insert(insertPitchAction);
             }

src/gui/general/EditViewBase.h

@@ -311,7 +311,7 @@ protected:
 protected slots:
     /**
      * save general Options like all bar positions and status as well
-     * as the tqgeometry and the recent file list to the configuration
+     * as the geometry and the recent file list to the configuration
      * file
      */
     virtual void slotSaveOptions();

src/gui/general/LinedStaff.cpp

@@ -782,7 +782,7 @@ LinedStaff::insertBar(double layoutX, double width, bool isCorrect,
         TQFont font;
         font.setPixelSize(m_resolution * 3 / 2);
         TQFontMetrics metrics(font);
-        TQString text = TQString("%1").tqarg(barNo + 1);
+        TQString text = TQString("%1").arg(barNo + 1);
 
         TQCanvasItem *barNoText = new TQCanvasText(text, font, m_canvas);
         barNoText->setX(x);

src/gui/general/MidiPitchLabel.cpp

@@ -55,7 +55,7 @@ MidiPitchLabel::MidiPitchLabel(int pitch)
         int baseOctave = config->readNumEntry("midipitchoctave", -2);
 
         int octave = (int)(((float)pitch) / 12.0) + baseOctave;
-        m_midiNote = notes[pitch % 12].tqarg(octave);
+        m_midiNote = notes[pitch % 12].arg(octave);
     }
 }
 

src/gui/general/PresetGroup.cpp

@@ -70,7 +70,7 @@ PresetGroup::PresetGroup() :
     TQString language = KGlobal::locale()->language();
 
     TQString presetFileName = TQString("%1/presets-%2.xml")
-                             .tqarg(m_presetDirectory).tqarg(language);
+                             .arg(m_presetDirectory).arg(language);
 
     if (!TQFileInfo(presetFileName).isReadable()) {
 
@@ -78,14 +78,14 @@ PresetGroup::PresetGroup() :
 
         language.replace(TQRegExp("_.*$"), "");
         presetFileName = TQString("%1/presets-%2.xml")
-                         .tqarg(m_presetDirectory).tqarg(language);
+                         .arg(m_presetDirectory).arg(language);
 
         if (!TQFileInfo(presetFileName).isReadable()) {
 
             RG_DEBUG << "Failed to open " << presetFileName << endl;
 
             presetFileName = TQString("%1/presets.xml")
-                             .tqarg(m_presetDirectory);
+                             .arg(m_presetDirectory);
 
             if (!TQFileInfo(presetFileName).isReadable()) {
 
@@ -247,10 +247,10 @@ PresetGroup::error(const TQXmlParseException& exception)
     RG_DEBUG << "PresetGroup::error(): jubilation and glee, we have an error, whee!" << endl;
 
     m_errorString = TQString("%1 at line %2, column %3: %4")
-                    .tqarg(exception.message())
+                    .arg(exception.message())
-                    .tqarg(exception.lineNumber())
+                    .arg(exception.lineNumber())
-                    .tqarg(exception.columnNumber())
+                    .arg(exception.columnNumber())
-                    .tqarg(m_errorString);
+                    .arg(m_errorString);
     return TQXmlDefaultHandler::error(exception);
 }
 
@@ -259,10 +259,10 @@ PresetGroup::fatalError(const TQXmlParseException& exception)
 {
     RG_DEBUG << "PresetGroup::fatalError(): double your jubilation, and triple your glee, a fatal error doth it be!" << endl;
     m_errorString = TQString("%1 at line %2, column %3: %4")
-                    .tqarg(exception.message())
+                    .arg(exception.message())
-                    .tqarg(exception.lineNumber())
+                    .arg(exception.lineNumber())
-                    .tqarg(exception.columnNumber())
+                    .arg(exception.columnNumber())
-                    .tqarg(m_errorString);
+                    .arg(m_errorString);
     return TQXmlDefaultHandler::fatalError(exception);
 }
 

src/gui/kdeext/KLedButton.cpp

@@ -41,8 +41,8 @@ KLedButton::KLedButton(const TQColor &col, TQWidget *parent, const char *name)
 {}
 
 KLedButton::KLedButton(const TQColor& col, KLed::State st, KLed::Look look,
-                       KLed::Shape tqshape, TQWidget *parent, const char *name)
+                       KLed::Shape shape, TQWidget *parent, const char *name)
-        : KLed( col, st, look, tqshape, parent, name )
+        : KLed( col, st, look, shape, parent, name )
 {}
 
 KLedButton::~KLedButton()

src/gui/kdeext/KLedButton.h

@@ -52,7 +52,7 @@ class KLedButton : public KLed  {
   TQ_OBJECT
   public: 
    KLedButton(const TQColor &col=TQt::green, TQWidget *parent=0, const char *name=0);
-   KLedButton(const TQColor& col, KLed::State st, KLed::Look look, KLed::Shape tqshape,
+   KLedButton(const TQColor& col, KLed::State st, KLed::Look look, KLed::Shape shape,
               TQWidget *parent=0, const char *name=0);
    ~KLedButton();       
 

src/gui/kdeext/KStartupLogo.cpp

@@ -92,7 +92,7 @@ void KStartupLogo::paintEvent(TQPaintEvent*)
     //TQString version(VERSION);
     //int sepIdx = version.find("-");
     TQString versionLabel(VERSION);
-    //TQString("R%1 v%2").tqarg(version.left(sepIdx)).tqarg(version.mid(sepIdx + 1));
+    //TQString("R%1 v%2").arg(version.left(sepIdx)).arg(version.mid(sepIdx + 1));
     int versionWidth = metrics.width(versionLabel);
 
     paint.drawText(m_pixmap.width() - versionWidth - 18,

src/gui/kdeext/KTmpStatusMsg.cpp

@@ -33,7 +33,7 @@ KTmpStatusMsg::KTmpStatusMsg(const TQString& msg, KMainWindow* window, int id)
         : m_mainWindow(window),
         m_id(id)
 {
-    m_mainWindow->statusBar()->changeItem(TQString("  %1").tqarg(msg), m_id);
+    m_mainWindow->statusBar()->changeItem(TQString("  %1").arg(msg), m_id);
     Rosegarden::rgapp->refreshGUI(50);
 }
 

src/gui/kdeext/QCanvasGroupableItem.h

@@ -27,7 +27,7 @@
 class TQCanvasItemGroup;
 
 /**
- * This class is meant to be inherited by TQCanvasItem tqchildren to make
+ * This class is meant to be inherited by TQCanvasItem children to make
  * them groupable.
  *
  * On destruction, the item will remove itself from the group it's

src/gui/kdeext/RGLed.cpp

@@ -160,7 +160,7 @@ KLed::KLed(TQWidget *parent, const char *name)
         : TQWidget( parent, name),
         led_state(On),
         led_look(Raised),
-        led_tqshape(Circular)
+        led_shape(Circular)
 {
     TQColor col(green);
     d = new KLed::KLedPrivate;
@@ -177,7 +177,7 @@ KLed::KLed(const TQColor& col, TQWidget *parent, const char *name)
         : TQWidget( parent, name),
         led_state(On),
         led_look(Raised),
-        led_tqshape(Circular)
+        led_shape(Circular)
 {
     d = new KLed::KLedPrivate;
     d->dark_factor = 300;
@@ -190,11 +190,11 @@ KLed::KLed(const TQColor& col, TQWidget *parent, const char *name)
 }
 
 KLed::KLed(const TQColor& col, KLed::State state,
-           KLed::Look look, KLed::Shape tqshape, TQWidget *parent, const char *name )
+           KLed::Look look, KLed::Shape shape, TQWidget *parent, const char *name )
         : TQWidget(parent, name),
         led_state(state),
         led_look(look),
-        led_tqshape(tqshape)
+        led_shape(shape)
 {
     d = new KLed::KLedPrivate;
     d->dark_factor = 300;
@@ -202,7 +202,7 @@ KLed::KLed(const TQColor& col, KLed::State state,
     d->off_map = 0;
     d->on_map = 0;
 
-    //setShape(tqshape);
+    //setShape(shape);
     setColor(col);
 }
 
@@ -223,7 +223,7 @@ KLed::paintEvent(TQPaintEvent *)
     t.start();
     for (int i = 0; i < rounds; i++) {
 #endif
-        switch (led_tqshape) {
+        switch (led_shape) {
         case Rectangular:
             switch (led_look) {
             case Sunken :
@@ -612,9 +612,9 @@ KLed::state() const
 }
 
 KLed::Shape
-KLed::tqshape() const
+KLed::shape() const
 {
-    return led_tqshape;
+    return led_shape;
 }
 
 TQColor
@@ -649,8 +649,8 @@ KLed::toggleState()
 void
 KLed::setShape(KLed::Shape s)
 {
-    if (led_tqshape != s) {
+    if (led_shape != s) {
-        led_tqshape = s;
+        led_shape = s;
         update();
     }
 }

src/gui/kdeext/klearlook.cpp

@@ -722,7 +722,7 @@ bool KlearlookStyle::eventFilter( TQObject *object, TQEvent *event ) {
                 hoverWidget = ( TQWidget * ) object;
                 if ( hoverWidget && hoverWidget->isEnabled() ) {
                     if ( redrawHoverWidget() ) {
-                        hoverWidget->tqrepaint( false );
+                        hoverWidget->repaint( false );
                         if ( APP_KICKER == themedApp )
                             hover = HOVER_NONE;
                     }
@@ -736,13 +736,13 @@ bool KlearlookStyle::eventFilter( TQObject *object, TQEvent *event ) {
                 oldCursor.setX( -1 );
                 oldCursor.setY( -1 );
                 hoverWidget = NULL;
-                ( ( TQWidget * ) object ) ->tqrepaint( false );
+                ( ( TQWidget * ) object ) ->repaint( false );
             }
             break;
         case TQEvent::MouseMove:
             if ( hoverWidget && object->isWidgetType() ) {
                 if ( redrawHoverWidget() ) {
-                    hoverWidget->tqrepaint( false );
+                    hoverWidget->repaint( false );
                     if ( APP_KICKER == themedApp )
                         hover = HOVER_NONE;
                 }
@@ -2225,7 +2225,7 @@ void KlearlookStyle::drawControl(
                     fr( r );
                     int offset = rounded ? 2 : 0;
 
-                    switch ( tb->tqshape() ) {
+                    switch ( tb->shape() ) {
                         case TQTabBar::TriangularAbove:
                         case TQTabBar::RoundedAbove:
                             if ( flags & Style_Selected ) {
@@ -2380,7 +2380,7 @@ void KlearlookStyle::drawControl(
                 } else {
                     TQRect br( r );
 
-                    switch ( tb->tqshape() ) {
+                    switch ( tb->shape() ) {
                         case TQTabBar::TriangularAbove:
                         case TQTabBar::RoundedAbove:
                             if ( flags & Style_Selected ) {
@@ -2465,10 +2465,10 @@ void KlearlookStyle::drawControl(
                 TQRect tr = r;
 
                 if ( t->identifier() == tb->currentTab() ) {
-                    if ( TQTabBar::RoundedAbove == tb->tqshape() || TQTabBar::TriangularAbove == tb->tqshape() )
+                    if ( TQTabBar::RoundedAbove == tb->shape() || TQTabBar::TriangularAbove == tb->shape() )
                         tr.setBottom( tr.bottom() - pixelMetric( TQStyle::PM_TabBarTabShiftVertical, tb ) );
                 } else
-                    if ( TQTabBar::RoundedBelow == tb->tqshape() || TQTabBar::TriangularBelow == tb->tqshape() )
+                    if ( TQTabBar::RoundedBelow == tb->shape() || TQTabBar::TriangularBelow == tb->shape() )
                         tr.setTop( tr.top() + pixelMetric( TQStyle::PM_TabBarTabShiftVertical, tb ) );
 
                 drawItem( p, tr, AlignCenter | ShowPrefix, cg, flags & Style_Enabled, 0, t->text() );
@@ -2922,9 +2922,9 @@ void KlearlookStyle::drawControl(
                     p->fillRect( checkbox->rect(), cg.background().light( TQTC_HIGHLIGHT_FACTOR ) );
                     p->setClipping( false );
                 }
-                int tqalignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft;
+                int alignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft;
 
-                drawItem( p, r, tqalignment | AlignVCenter | ShowPrefix, cg,
+                drawItem( p, r, alignment | AlignVCenter | ShowPrefix, cg,
                     flags & Style_Enabled, checkbox->pixmap(), checkbox->text() );
 
                 if ( checkbox->hasFocus() )
@@ -2956,9 +2956,9 @@ void KlearlookStyle::drawControl(
                     p->setClipping( false );
                 }
 
-                int tqalignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft;
+                int alignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft;
 
-                drawItem( p, r, tqalignment | AlignVCenter | ShowPrefix, cg,
+                drawItem( p, r, alignment | AlignVCenter | ShowPrefix, cg,
                     flags & Style_Enabled, radiobutton->pixmap(), radiobutton->text() );
 
                 if ( radiobutton->hasFocus() )
@@ -3408,7 +3408,7 @@ int KlearlookStyle::pixelMetric( PixelMetric metric, const TQWidget *widget ) co
         case PM_TabBarTabShiftVertical: {
                 const TQTabBar *tb = ::tqqt_cast<const TQTabBar *>( widget );
 
-                return TQTabBar::RoundedAbove == tb->tqshape() || TQTabBar::TriangularAbove == tb->tqshape()
+                return TQTabBar::RoundedAbove == tb->shape() || TQTabBar::TriangularAbove == tb->shape()
                        ? 1
                        : -1;
             }
@@ -3417,8 +3417,8 @@ int KlearlookStyle::pixelMetric( PixelMetric metric, const TQWidget *widget ) co
 
         case PM_TabBarTabVSpace: {
                 const TQTabBar * tb = ( const TQTabBar * ) widget;
-                if ( tb->tqshape() == TQTabBar::RoundedAbove ||
+                if ( tb->shape() == TQTabBar::RoundedAbove ||
-                        tb->tqshape() == TQTabBar::RoundedBelow )
+                        tb->shape() == TQTabBar::RoundedBelow )
                     return 12;
                 else
                     return 4;

src/gui/rulers/ChordNameRuler.cpp

@@ -182,10 +182,10 @@ ChordNameRuler::slotScrollHoriz(int x)
 
     if (dx > 0) { // moving right, so the existing stuff moves left
         bitBlt(this, 0, 0, this, dx, 0, w - dx, h);
-        tqrepaint(w - dx, 0, dx, h);
+        repaint(w - dx, 0, dx, h);
     } else {      // moving left, so the existing stuff moves right
         bitBlt(this, -dx, 0, this, 0, 0, w + dx, h);
-        tqrepaint(0, 0, -dx, h);
+        repaint(0, 0, -dx, h);
     }
 }
 

src/gui/rulers/ControlItem.h

@@ -54,7 +54,7 @@ public:
 
     virtual void setSelected(bool yes);
 
-    /// recompute height according to represented value prior to a canvas tqrepaint
+    /// recompute height according to represented value prior to a canvas repaint
     virtual void updateFromValue();
 
     /// update value according to height after a user edit

src/gui/rulers/ControlRuler.cpp

@@ -113,7 +113,7 @@ void ControlRuler::slotUpdate()
     canvas()->setAllChanged(); // TODO: be a bit more subtle, call setChanged(<time area>)
 
     canvas()->update();
-    tqrepaint();
+    repaint();
 }
 
 void ControlRuler::slotUpdateElementsHPos()
@@ -335,7 +335,7 @@ void ControlRuler::contentsMouseMoveEvent(TQMouseEvent* e)
             // set value to highest in selection
             if (item->getValue() >= value) {
                 value = item->getValue();
-                m_numberFloat->setText(TQString("%1").tqarg(value));
+                m_numberFloat->setText(TQString("%1").arg(value));
             }
         }
     }

src/gui/rulers/ControllerEventsRuler.cpp

@@ -191,9 +191,9 @@ TQString ControllerEventsRuler::getName()
             TQString hexValue;
             hexValue.sprintf("0x%x", m_controller->getControllerValue());
 
-            name = TQString("%1 (%2 / %3)").tqarg(strtoqstr(m_controller->getName()))
+            name = TQString("%1 (%2 / %3)").arg(strtoqstr(m_controller->getName()))
-                   .tqarg(int(m_controller->getControllerValue()))
+                   .arg(int(m_controller->getControllerValue()))
-                   .tqarg(hexValue);
+                   .arg(hexValue);
         } else if (m_controller->getType() == PitchBend::EventType) {
             name = i18n("Pitch Bend");
         }

src/gui/rulers/LoopRuler.cpp

@@ -103,7 +103,7 @@ void LoopRuler::scrollHoriz(int x)
 {
     if (getHScaleFactor() != 1.0) {
         m_currentXOffset = static_cast<int>( -x / getHScaleFactor());
-        tqrepaint();
+        repaint();
         return;
     }
 
@@ -118,10 +118,10 @@ void LoopRuler::scrollHoriz(int x)
 
     if (dx > 0) { // moving right, so the existing stuff moves left
         bitBlt(this, 0, 0, this, dx, 0, w - dx, h);
-        tqrepaint(w - dx, 0, dx, h);
+        repaint(w - dx, 0, dx, h);
     } else {      // moving left, so the existing stuff moves right
         bitBlt(this, -dx, 0, this, 0, 0, w + dx, h);
-        tqrepaint(0, 0, -dx, h);
+        repaint(0, 0, -dx, h);
     }
 }
 

src/gui/rulers/MarkerRuler.cpp

@@ -156,7 +156,7 @@ void
 MarkerRuler::scrollHoriz(int x)
 {
     m_currentXOffset = static_cast<int>( -x / getHScaleFactor());
-    tqrepaint();
+    repaint();
 }
 
 TQSize 
@@ -366,7 +366,7 @@ MarkerRuler::paintEvent(TQPaintEvent*)
             painter.setWorldXForm(false);
 
             if (i >= 0)
-                painter.drawText(textDrawPoint, TQString("%1").tqarg(i + 1));
+                painter.drawText(textDrawPoint, TQString("%1").arg(i + 1));
 
             painter.setWorldXForm(enableXForm);
         } else {

src/gui/rulers/PropertyViewRuler.cpp

@@ -69,7 +69,7 @@ PropertyViewRuler::PropertyViewRuler(RulerScale *rulerScale,
 
     setBackgroundColor(GUIPalette::getColour(GUIPalette::SegmentCanvas));
 
-    TQString tip = i18n("%1 controller").tqarg(strtoqstr(property));
+    TQString tip = i18n("%1 controller").arg(strtoqstr(property));
     TQToolTip::add
         (this, tip);
 }
@@ -94,10 +94,10 @@ PropertyViewRuler::slotScrollHoriz(int x)
 
     if (dx > 0) { // moving right, so the existing stuff moves left
         bitBlt(this, 0, 0, this, dx, 0, w - dx, h);
-        tqrepaint(w - dx, 0, dx, h);
+        repaint(w - dx, 0, dx, h);
     } else {      // moving left, so the existing stuff moves right
         bitBlt(this, -dx, 0, this, 0, 0, w + dx, h);
-        tqrepaint(0, 0, -dx, h);
+        repaint(0, 0, -dx, h);
     }
 }
 

src/gui/rulers/RawNoteRuler.cpp

@@ -86,10 +86,10 @@ RawNoteRuler::slotScrollHoriz(int x)
 
     if (dx > 0) { // moving right, so the existing stuff moves left
         bitBlt(this, 0, 0, this, dx, 0, w - dx, h);
-        tqrepaint(w - dx, 0, dx, h);
+        repaint(w - dx, 0, dx, h);
     } else {      // moving left, so the existing stuff moves right
         bitBlt(this, -dx, 0, this, 0, 0, w + dx, h);
-        tqrepaint(0, 0, -dx, h);
+        repaint(0, 0, -dx, h);
     }
 }
 
@@ -182,7 +182,7 @@ RawNoteRuler::addChildren(Segment *s,
         else
             rightmost = j;
 
-        node->tqchildren.push_back(subnode);
+        node->children.push_back(subnode);
         j = s->findTime(jex.second);
     }
 
@@ -263,8 +263,8 @@ RawNoteRuler::dumpSubtree(EventTreeNode *node, int depth)
     else {
         std::cerr << "no-pitch]" << std::endl;
     }
-    for (EventTreeNode::NodeList::iterator i = node->tqchildren.begin();
+    for (EventTreeNode::NodeList::iterator i = node->children.begin();
-            i != node->tqchildren.end(); ++i) {
+            i != node->children.end(); ++i) {
         dumpSubtree(*i, depth + 1);
     }
 #endif
@@ -292,14 +292,14 @@ RawNoteRuler::dumpForest(EventTreeNode::NodeList *forest)
 int
 RawNoteRuler::EventTreeNode::getDepth()
 {
-    int subtqchildrenDepth = 0;
+    int subchildrenDepth = 0;
-    for (NodeList::iterator i = tqchildren.begin();
+    for (NodeList::iterator i = children.begin();
-            i != tqchildren.end(); ++i) {
+            i != children.end(); ++i) {
         int subchildDepth = (*i)->getDepth();
-        if (subchildDepth > subtqchildrenDepth)
+        if (subchildDepth > subchildrenDepth)
-            subtqchildrenDepth = subchildDepth;
+            subchildrenDepth = subchildDepth;
     }
-    return subtqchildrenDepth + 1;
+    return subchildrenDepth + 1;
 }
 
 int
@@ -312,8 +312,8 @@ RawNoteRuler::EventTreeNode::getChildrenAboveOrBelow(bool below, int p)
 
     int max = 0;
 
-    for (NodeList::iterator i = tqchildren.begin();
+    for (NodeList::iterator i = children.begin();
-            i != tqchildren.end(); ++i) {
+            i != children.end(); ++i) {
         int forThisChild = (*i)->getChildrenAboveOrBelow(below, pitch);
         long thisChildPitch = pitch;
         (*(*i)->node)->get
@@ -339,7 +339,7 @@ RawNoteRuler::drawNode(TQPainter &paint, DefaultVelocityColour &vc,
 
     int below = node->getChildrenAboveOrBelow(true);
 
-    NOTATION_DEBUG << "RawNoteRuler::drawNode: tqchildren above: "
+    NOTATION_DEBUG << "RawNoteRuler::drawNode: children above: "
     << above << ", below: " << below << endl;
 #endif
 
@@ -414,8 +414,8 @@ RawNoteRuler::drawNode(TQPainter &paint, DefaultVelocityColour &vc,
     paint.drawLine(ui0, iy + 1, ui0, iy + ih - 1);
     paint.drawLine(ui1 - 1, iy + 1, ui1 - 1, iy + ih - 1);
 
-    for (EventTreeNode::NodeList::iterator i = node->tqchildren.begin();
+    for (EventTreeNode::NodeList::iterator i = node->children.begin();
-            i != node->tqchildren.end(); ++i) {
+            i != node->children.end(); ++i) {
 
         long nodePitch = myPitch;
         (*(*i)->node)->get
@@ -451,9 +451,9 @@ RawNoteRuler::paintEvent(TQPaintEvent* e)
             trackPosition = track->getPosition();
 
 	TQToolTip::add(this,i18n("Track #%1, Segment \"%2\" (runtime id %3)")
-		           .tqarg(trackPosition + 1)
+		           .arg(trackPosition + 1)
-		           .tqarg(m_segment->getLabel().c_str())
+		           .arg(m_segment->getLabel().c_str())
-		           .tqarg(m_segment->getRuntimeId()));
+		           .arg(m_segment->getRuntimeId()));
     }
 
     //    START_TIMING;

src/gui/rulers/RawNoteRuler.h

@@ -97,8 +97,8 @@ private:
         
         EventTreeNode(Segment::iterator n) : node(n) { }
         ~EventTreeNode() {
-            for (NodeList::iterator i = tqchildren.begin();
+            for (NodeList::iterator i = children.begin();
-                 i != tqchildren.end(); ++i) {
+                 i != children.end(); ++i) {
                 delete *i;
             }
         }
@@ -107,7 +107,7 @@ private:
         int getChildrenAboveOrBelow(bool below = false, int pitch = -1);
         
         Segment::iterator node;
-        NodeList tqchildren;
+        NodeList children;
     };
 
     std::pair<timeT, timeT> getExtents(Segment::iterator);

src/gui/rulers/TempoRuler.cpp

@@ -231,10 +231,10 @@ TempoRuler::slotScrollHoriz(int x)
 
     if (dx > 0) { // moving right, so the existing stuff moves left
         bitBlt(this, 0, 0, this, dx, 0, w - dx, h);
-        tqrepaint(w - dx, 0, dx, h);
+        repaint(w - dx, 0, dx, h);
     } else {      // moving left, so the existing stuff moves right
         bitBlt(this, -dx, 0, this, 0, 0, w + dx, h);
-        tqrepaint(0, 0, -dx, h);
+        repaint(0, 0, -dx, h);
     }
 }
 
@@ -555,20 +555,20 @@ TempoRuler::showTextFloat(tempoT tempo, tempoT target,
 
             // blargh -- duplicated with TempoView::makeTimeString
             timeText = TQString("%1%2%3-%4%5-%6%7-%8%9")
-                       .tqarg(bar / 100)
+                       .arg(bar / 100)
-                       .tqarg((bar % 100) / 10)
+                       .arg((bar % 100) / 10)
-                       .tqarg(bar % 10)
+                       .arg(bar % 10)
-                       .tqarg(beat / 10)
+                       .arg(beat / 10)
-                       .tqarg(beat % 10)
+                       .arg(beat % 10)
-                       .tqarg(fraction / 10)
+                       .arg(fraction / 10)
-                       .tqarg(fraction % 10)
+                       .arg(fraction % 10)
-                       .tqarg(remainder / 10)
+                       .arg(remainder / 10)
-                       .tqarg(remainder % 10);
+                       .arg(remainder % 10);
 
             timeText = TQString("%1\n%2")
-                       .tqarg(timeText)
+                       .arg(timeText)
-                       //		.tqarg(rt.toString().c_str());
+                       //		.arg(rt.toString().c_str());
-                       .tqarg(rt.toText(true).c_str());
+                       .arg(rt.toText(true).c_str());
         }
 
         TimeSignature sig =
@@ -586,14 +586,14 @@ TempoRuler::showTextFloat(tempoT tempo, tempoT target,
             int b00 = int(bpm * 100 + 0.0001) % 10;
 
             tempoText = i18n("%1.%2%3 (%4.%5%6 bpm)")
-                        .tqarg(qi).tqarg(q0).tqarg(q00)
+                        .arg(qi).arg(q0).arg(q00)
-                        .tqarg(bi).tqarg(b0).tqarg(b00);
+                        .arg(bi).arg(b0).arg(b00);
             haveSet = true;
         }
     }
 
     if (!haveSet) {
-        tempoText = i18n("%1.%2%3 bpm").tqarg(qi).tqarg(q0).tqarg(q00);
+        tempoText = i18n("%1.%2%3 bpm").arg(qi).arg(q0).arg(q00);
     }
 
     if (target > 0 && target != tempo) {
@@ -601,11 +601,11 @@ TempoRuler::showTextFloat(tempoT tempo, tempoT target,
         int tqi = int(tq + 0.0001);
         int tq0 = int(tq * 10 + 0.0001) % 10;
         int tq00 = int(tq * 100 + 0.0001) % 10;
-        tempoText = i18n("%1 - %2.%3%4").tqarg(tempoText).tqarg(tqi).tqarg(tq0).tqarg(tq00);
+        tempoText = i18n("%1 - %2.%3%4").arg(tempoText).arg(tqi).arg(tq0).arg(tq00);
     }
 
     if (showTime && time >= 0) {
-        m_textFloat->setText(TQString("%1\n%2").tqarg(timeText).tqarg(tempoText));
+        m_textFloat->setText(TQString("%1\n%2").arg(timeText).arg(tempoText));
     } else {
         m_textFloat->setText(tempoText);
     }
@@ -917,8 +917,8 @@ TempoRuler::paintEvent(TQPaintEvent* e)
                 m_composition->getTimeSignatureAt(time);
 
             TQString str = TQString("%1/%2")
-                          .tqarg(sig.getNumerator())
+                          .arg(sig.getNumerator())
-                          .tqarg(sig.getDenominator());
+                          .arg(sig.getDenominator());
 
             paint.setFont(m_boldFont);
             paint.drawText(static_cast<int>(x) + 2, m_height - 2, str);
@@ -930,7 +930,7 @@ TempoRuler::paintEvent(TQPaintEvent* e)
             long bpm = long(tempo);
             //	    long frac = long(tempo * 100 + 0.001) - 100 * bpm;
 
-            TQString tempoString = TQString("%1").tqarg(bpm);
+            TQString tempoString = TQString("%1").arg(bpm);
 
             if (tempo == prevTempo) {
                 if (m_small)

src/gui/rulers/TextRuler.cpp

@@ -84,10 +84,10 @@ TextRuler::slotScrollHoriz(int x)
 
     if (dx > 0) { // moving right, so the existing stuff moves left
         bitBlt(this, 0, 0, this, dx, 0, w - dx, h);
-        tqrepaint(w - dx, 0, dx, h);
+        repaint(w - dx, 0, dx, h);
     } else {      // moving left, so the existing stuff moves right
         bitBlt(this, -dx, 0, this, 0, 0, w + dx, h);
-        tqrepaint(0, 0, -dx, h);
+        repaint(0, 0, -dx, h);
     }
 }
 

src/gui/seqmanager/CompositionMmapper.cpp

@@ -147,8 +147,8 @@ TQString CompositionMmapper::makeFileName(Segment* segment)
     TQStringList tmpDirs = KGlobal::dirs()->resourceDirs("tmp");
 
     return TQString("%1/segment_%2")
-           .tqarg(tmpDirs.last())
+           .arg(tmpDirs.last())
-           .tqarg((uintptr_t)segment, 0, 16);
+           .arg((uintptr_t)segment, 0, 16);
 }
 
 TQString CompositionMmapper::getSegmentFileName(Segment* s)

src/gui/seqmanager/ControlBlockMmapper.cpp

@@ -76,7 +76,7 @@ ControlBlockMmapper::ControlBlockMmapper(RosegardenGUIDoc* doc)
                              MAP_SHARED, m_fd, 0);
 
     if (m_mmappedBuffer == (void*) - 1) {
-        SETQMAN_DEBUG << TQString("mmap failed : (%1) %2\n").tqarg(errno).tqarg(strerror(errno));
+        SETQMAN_DEBUG << TQString("mmap failed : (%1) %2\n").arg(errno).arg(strerror(errno));
         throw Exception("mmap failed");
     }
 

src/gui/seqmanager/SegmentMmapper.cpp

@@ -234,7 +234,7 @@ void SegmentMmapper::remap(size_t newsize)
 #endif
 
         if (m_mmappedRegion == (void*) - 1) {
-            SETQMAN_DEBUG << TQString("mremap failed : (%1) %2\n").tqarg(errno).tqarg(strerror(errno));
+            SETQMAN_DEBUG << TQString("mremap failed : (%1) %2\n").arg(errno).arg(strerror(errno));
             throw Exception("mremap failed");
         }
 
@@ -253,7 +253,7 @@ void SegmentMmapper::doMmap()
     m_mmappedEventBuffer = (MappedEvent *)((size_t *)m_mmappedRegion + 1);
 
     if (m_mmappedRegion == (void*) - 1) {
-        SETQMAN_DEBUG << TQString("mmap failed : (%1) %2\n").tqarg(errno).tqarg(strerror(errno));
+        SETQMAN_DEBUG << TQString("mmap failed : (%1) %2\n").arg(errno).arg(strerror(errno));
         throw Exception("mmap failed");
     }
 

src/gui/seqmanager/SequenceManager.cpp

@@ -1319,7 +1319,7 @@ SequenceManager::checkSoundDriverStatus(bool warnUser)
     if (text != "") {
         RosegardenGUIApp::self()->awaitDialogClearance();
         KMessageBox::error(RosegardenGUIApp::self(),
-                           i18n("<h3>Sequencer startup failed</h3>%1").tqarg(text));
+                           i18n("<h3>Sequencer startup failed</h3>%1").arg(text));
         CurrentProgressDialog::thaw();
         return;
     }

src/gui/seqmanager/SequencerMapper.cpp

@@ -83,7 +83,7 @@ SequencerMapper::map()
     if (m_mmappedBuffer == (void*) - 1) {
 
         RG_DEBUG << TQString("mmap failed : (%1) %2\n").
-        tqarg(errno).tqarg(strerror(errno));
+        arg(errno).arg(strerror(errno));
 
         throw Exception("mmap failed");
     }

src/gui/studio/AudioMixerWindow.cpp

@@ -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").tqarg(i).ascii());
+                             TQString("inputs_%1").arg(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").tqarg(i).ascii());
+                  TQString("submasters_%1").arg(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").tqarg(pixmapDir));
+    m_monoPixmap.load(TQString("%1/misc/mono.xpm").arg(pixmapDir));
-    m_stereoPixmap.load(TQString("%1/misc/stereo.xpm").tqarg(pixmapDir));
+    m_stereoPixmap.load(TQString("%1/misc/stereo.xpm").arg(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").tqarg((*i)->getId() -
+            idString = i18n("Audio %1").arg((*i)->getId() -
                                             AudioInstrumentBase + 1);
             idLabel = new TQLabel(idString, m_mainBox, "audioIdLabel");
         } else {
-            idString = i18n("Synth %1").tqarg((*i)->getId() -
+            idString = i18n("Synth %1").arg((*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").tqarg(count), m_mainBox, "subMaster");
+        TQLabel *idLabel = new TQLabel(i18n("Sub %1").arg(count), m_mainBox, "subMaster");
         idLabel->setFont(boldFont);
 
         //	mainLayout->addWidget(idLabel, 2, col, TQt::AlignCenter);

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")
-                  .tqarg(baseUrl)
+                  .arg(baseUrl)
-                  .tqarg("plugin")
+                  .arg("plugin")
-                  .tqarg(type)
+                  .arg(type)
-                  .tqarg(instrument);
+                  .arg(instrument);
 
     if (position == int(Instrument::SYNTH_PLUGIN_POSITION)) {
-        url = url.tqarg("synth");
+        url = url.arg("synth");
     } else {
-        url = url.tqarg(position);
+        url = url.arg(position);
     }
 
-    url = url.tqarg(label);
+    url = url.arg(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").tqarg(strtoqstr(container->getPresentationName()));
+            return i18n("Rosegarden: %1").arg(strtoqstr(container->getPresentationName()));
         } else {
-            return i18n("Rosegarden: %1: %2").tqarg(strtoqstr(container->getPresentationName()))
+            return i18n("Rosegarden: %1: %2").arg(strtoqstr(container->getPresentationName()))
-                   .tqarg(i18n("Plugin slot %1").tqarg(position));
+                   .arg(i18n("Plugin slot %1").arg(position));
         }
     }
 }

src/gui/studio/BankEditorDialog.cpp

@@ -593,7 +593,7 @@ BankEditorDialog::updateDeviceItem(MidiDeviceListViewItem* deviceItem)
 
     // delete banks which are no longer present
     //
-    std::vector<TQListViewItem*> tqchildrenToDelete;
+    std::vector<TQListViewItem*> childrenToDelete;
 
     TQListViewItem* child = deviceItem->firstChild();
 
@@ -603,7 +603,7 @@ BankEditorDialog::updateDeviceItem(MidiDeviceListViewItem* deviceItem)
             dynamic_cast<MidiBankListViewItem *>(child);
         if (bankItem) {
             if (bankItem->getBank() >= int(banks.size()))
-                tqchildrenToDelete.push_back(child);
+                childrenToDelete.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()))) {
-                tqchildrenToDelete.push_back(child);
+                childrenToDelete.push_back(child);
             }
         }
 
         child = child->nextSibling();
     }
 
-    for (unsigned int i = 0; i < tqchildrenToDelete.size(); ++i)
+    for (unsigned int i = 0; i < childrenToDelete.size(); ++i)
-        delete tqchildrenToDelete[i];
+        delete childrenToDelete[i];
 }
 
 bool
@@ -1045,7 +1045,7 @@ BankEditorDialog::slotAddKeyMapping()
             if (n == 1)
                 name = i18n("<new mapping>");
             else
-                name = i18n("<new mapping %1>").tqarg(n);
+                name = i18n("<new mapping %1>").arg(n);
         }
 
         MidiKeyMapping newKeyMapping(qstrtostr(name));

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").tqarg(md->getId() + 1);
+        TQString deviceName = i18n("Device %1").arg(md->getId() + 1);
         TQString deviceLabel = strtoqstr(md->getName());
         TQString connectionName = strtoqstr(md->getConnection());
 

src/gui/studio/DeviceManagerDialog.cpp

@@ -326,7 +326,7 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
 
             m_playTable->insertRows(deviceCount, 1);
 
-            TQString deviceName = i18n("%1").tqarg(deviceCount + 1);
+            TQString deviceName = i18n("%1").arg(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").tqarg(deviceCount + 1);
+            TQString deviceName = i18n("%1").arg(deviceCount + 1);
             TQString connectionName = strtoqstr((*it)->getConnection());
 
             m_recordTable->setText(deviceCount, RECORD_NAME_COL,

src/gui/studio/MidiMixerWindow.cpp

@@ -178,7 +178,7 @@ MidiMixerWindow::setupTabs()
             //
             //TQLabel *label = new TQLabel(TQString("%1 %2").
             //arg(strtoqstr(dev->getName()))
-            //.tqarg(i18n("MIDI Mixer")), m_tabFrame);
+            //.arg(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)").tqarg(strtoqstr(dev->getName()))
+            TQString name = TQString("%1 (%2)").arg(strtoqstr(dev->getName()))
-                           .tqarg(deviceCount++);
+                           .arg(deviceCount++);
 
             addTab(m_tabFrame, name);
         }

src/gui/studio/MidiProgramsEditor.cpp

@@ -251,7 +251,7 @@ MidiProgramsEditor::populate(TQListViewItem* item)
                     getEntryButton(i)->setPixmap(keyPixmap);
                     TQToolTip::add
                         (getEntryButton(i),
-                                i18n("Key Mapping: %1").tqarg(
+                                i18n("Key Mapping: %1").arg(
                                     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").tqarg(strtoqstr(newMapping)));
+            (btn, i18n("Key Mapping: %1").arg(strtoqstr(newMapping)));
     }
     btn->setEnabled(haveKeyMappings);
 }

src/gui/studio/NameSetEditor.cpp

@@ -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").tqarg(labelId + 1);
+                TQString numberText = TQString("%1").arg(labelId + 1);
 
                 if (tab == 0 && col == 0 && row == 0) {
                     // Initial label; button to adjust whether labels start at 0 or 1
@@ -178,11 +178,11 @@ NameSetEditor::slotToggleInitialLabel()
     else
         index = 0;
 
-    m_initialLabel->setText(TQString("%1").tqarg(index++));
+    m_initialLabel->setText(TQString("%1").arg(index++));
     for (std::vector<TQLabel*>::iterator it( m_labels.begin() );
             it != m_labels.end();
             ++it) {
-        (*it)->setText(TQString("%1").tqarg(index++));
+        (*it)->setText(TQString("%1").arg(index++));
     }
 }
 

src/gui/studio/SynthPluginManagerDialog.cpp

@@ -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").tqarg(i + 1),
+            pluginLayout->addWidget(new TQLabel(TQString("%1").arg(i + 1),
                                                pluginFrame), i, 0);
 
             AudioPluginInstance *plugin = instrument->getPlugin

src/gui/ui/RosegardenTransport.ui

@@ -2968,7 +2968,7 @@
                 <property name="text">
                     <string>/16</string>
                 </property>
-                <property name="tqalignment">
+                <property name="alignment">
                     <set>AlignVCenter|AlignRight</set>
                 </property>
                 <property name="hAlign" stdset="0">
@@ -3530,7 +3530,7 @@
                 <property name="text">
                     <string>END</string>
                 </property>
-                <property name="tqalignment">
+                <property name="alignment">
                     <set>AlignVCenter|AlignRight</set>
                 </property>
                 <property name="hAlign" stdset="0">
@@ -3807,7 +3807,7 @@
                 <property name="text">
                     <string>BAR</string>
                 </property>
-                <property name="tqalignment">
+                <property name="alignment">
                     <set>AlignVCenter|AlignRight</set>
                 </property>
                 <property name="hAlign" stdset="0">

src/gui/widgets/AudioFaderBox.cpp

@@ -116,8 +116,8 @@ AudioFaderBox::AudioFaderBox(TQWidget *parent,
     m_fader->setOutlineColour(GUIPalette::getColour(GUIPalette::PlaybackFaderOutline));
 
     TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
-    m_monoPixmap.load(TQString("%1/misc/mono.xpm").tqarg(pixmapDir));
+    m_monoPixmap.load(TQString("%1/misc/mono.xpm").arg(pixmapDir));
-    m_stereoPixmap.load(TQString("%1/misc/stereo.xpm").tqarg(pixmapDir));
+    m_stereoPixmap.load(TQString("%1/misc/stereo.xpm").arg(pixmapDir));
 
     m_pan = new Rotary(this, -100.0, 100.0, 1.0, 5.0, 0.0, 22,
                        Rotary::NoTicks, false, true);

src/gui/widgets/AudioRouteMenu.cpp

@@ -231,24 +231,24 @@ AudioRouteMenu::getEntryText(int entry)
 
             if (stereo) {
                 if (entry < recordIns) {
-                    return i18n("In %1").tqarg(entry + 1);
+                    return i18n("In %1").arg(entry + 1);
                 } else if (entry == recordIns) {
                     return i18n("Master");
                 } else {
-                    return i18n("Sub %1").tqarg(entry - recordIns);
+                    return i18n("Sub %1").arg(entry - recordIns);
                 }
             } else {
                 int channel = entry % 2;
                 entry /= 2;
                 if (entry < recordIns) {
                     return (channel ? i18n("In %1 R") :
-                            i18n("In %1 L")).tqarg(entry + 1);
+                            i18n("In %1 L")).arg(entry + 1);
                 } else if (entry == recordIns) {
                     return (channel ? i18n("Master R") :
                             i18n("Master L"));
                 } else {
                     return (channel ? i18n("Sub %1 R") :
-                            i18n("Sub %1 L")).tqarg(entry - recordIns);
+                            i18n("Sub %1 L")).arg(entry - recordIns);
                 }
             }
             break;
@@ -258,7 +258,7 @@ AudioRouteMenu::getEntryText(int entry)
         if (entry == 0)
             return i18n("Master");
         else
-            return i18n("Sub %1").tqarg(entry);
+            return i18n("Sub %1").arg(entry);
     }
 
     return TQString();

src/gui/widgets/DiatonicPitchChooser.cpp

@@ -87,7 +87,7 @@ DiatonicPitchChooser::DiatonicPitchChooser(TQString title,
     m_accidental->insertItem(i18n("double sharp"));
     m_accidental->setCurrentItem(2); // default: natural
 
-    m_pitchLabel = new TQLabel(TQString("%1").tqarg(getPitch()), hbox);
+    m_pitchLabel = new TQLabel(TQString("%1").arg(getPitch()), hbox);
     
     m_pitchLabel->setMinimumWidth(40);
 
@@ -157,7 +157,7 @@ DiatonicPitchChooser::slotSetPitch(int pitch)
     
     m_accidental->setCurrentItem(pitchChange + 2);
 
-    m_pitchLabel->setText(TQString("%1").tqarg(pitch));
+    m_pitchLabel->setText(TQString("%1").arg(pitch));
     
     update();
 }
@@ -199,7 +199,7 @@ DiatonicPitchChooser::setLabelsIfNeeded()
     //{
        m_pitchDragLabel->slotSetPitch(getPitch(), m_octave->currentItem(), m_step->currentItem());
     //}
-    m_pitchLabel->setText(TQString("%1").tqarg(getPitch()));
+    m_pitchLabel->setText(TQString("%1").arg(getPitch()));
 }
 
 void
@@ -217,7 +217,7 @@ DiatonicPitchChooser::slotSetNote(int pitch, int octave, int step)
     m_accidental->setCurrentItem(pitchOffset + 2);
 
     //MidiPitchLabel pl(p);
-    m_pitchLabel->setText(TQString("%1").tqarg(pitch));
+    m_pitchLabel->setText(TQString("%1").arg(pitch));
     update();
 }
 

src/gui/widgets/Fader.cpp

@@ -397,17 +397,17 @@ Fader::showFloatText()
     TQString text;
 
     if (m_integral) {
-        text = TQString("%1").tqarg(int(m_value));
+        text = TQString("%1").arg(int(m_value));
     } else if (m_value == AudioLevel::DB_FLOOR) {
         text = "Off";
     } else {
         float v = fabs(m_value);
         text = TQString("%1%2.%3%4%5 dB")
-               .tqarg(m_value < 0 ? '-' : '+')
+               .arg(m_value < 0 ? '-' : '+')
-               .tqarg(int(v))
+               .arg(int(v))
-               .tqarg(int(v * 10) % 10)
+               .arg(int(v * 10) % 10)
-               .tqarg(int(v * 100) % 10)
+               .arg(int(v * 100) % 10)
-               .tqarg(int(v * 1000) % 10);
+               .arg(int(v * 1000) % 10);
     }
 
     m_float->setText(text);

src/gui/widgets/PluginControl.cpp

@@ -63,7 +63,7 @@ PluginControl::PluginControl(TQWidget *parent,
     plainFont.setPointSize((plainFont.pointSize() * 9 ) / 10);
 
     TQLabel *controlTitle =
-        new TQLabel(TQString("%1    ").tqarg(strtoqstr(port->getName())), parent);
+        new TQLabel(TQString("%1    ").arg(strtoqstr(port->getName())), parent);
     controlTitle->setFont(plainFont);
 
     if (type == Rotary) {
@@ -121,9 +121,9 @@ PluginControl::PluginControl(TQWidget *parent,
         TQLabel *low;
         if (port->getDisplayHint() &
             (PluginPort::Integer | PluginPort::Toggled)) {
-            low = new TQLabel(TQString("%1").tqarg(int(displayLower)), parent);
+            low = new TQLabel(TQString("%1").arg(int(displayLower)), parent);
         } else {
-            low = new TQLabel(TQString("%1").tqarg(displayLower), parent);
+            low = new TQLabel(TQString("%1").arg(displayLower), parent);
         }
         low->setFont(plainFont);
 
@@ -154,9 +154,9 @@ PluginControl::PluginControl(TQWidget *parent,
         TQLabel *upp;
         if (port->getDisplayHint() &
             (PluginPort::Integer | PluginPort::Toggled)) {
-            upp = new TQLabel(TQString("%1").tqarg(int(displayUpper)), parent);
+            upp = new TQLabel(TQString("%1").arg(int(displayUpper)), parent);
         } else {
-            upp = new TQLabel(TQString("%1").tqarg(displayUpper), parent);
+            upp = new TQLabel(TQString("%1").arg(displayUpper), parent);
         }
         upp->setFont(plainFont);
 

src/gui/widgets/QuantizeParameters.cpp

@@ -286,8 +286,8 @@ QuantizeParameters::QuantizeParameters(TQWidget *parent,
             m_gridUnitCombo->insertItem(pmap, label);
             m_notationUnitCombo->insertItem(pmap, label);
         } else {
-            m_gridUnitCombo->insertItem(noMap, TQString("%1").tqarg(time));
+            m_gridUnitCombo->insertItem(noMap, TQString("%1").arg(time));
-            m_notationUnitCombo->insertItem(noMap, TQString("%1").tqarg(time));
+            m_notationUnitCombo->insertItem(noMap, TQString("%1").arg(time));
         }
 
         if (m_standardQuantizations[i] == defaultUnit) {
@@ -298,14 +298,14 @@ QuantizeParameters::QuantizeParameters(TQWidget *parent,
     }
 
     for (int i = -100; i <= 200; i += 10) {
-        m_swingCombo->insertItem(i == 0 ? i18n("None") : TQString("%1%").tqarg(i));
+        m_swingCombo->insertItem(i == 0 ? i18n("None") : TQString("%1%").arg(i));
         if (i == defaultSwing)
             m_swingCombo->setCurrentItem(m_swingCombo->count() - 1);
     }
 
     for (int i = 10; i <= 100; i += 10) {
         m_iterativeCombo->insertItem(i == 100 ? i18n("Full quantize") :
-                                     TQString("%1%").tqarg(i));
+                                     TQString("%1%").arg(i));
         if (i == defaultIterate)
             m_iterativeCombo->setCurrentItem(m_iterativeCombo->count() - 1);
     }

src/gui/widgets/Rotary.cpp

@@ -133,7 +133,7 @@ void
 Rotary::setKnobColour(const TQColor &colour)
 {
     m_knobColour = colour;
-    tqrepaint();
+    repaint();
 }
 
 void
@@ -398,9 +398,9 @@ Rotary::mousePressEvent(TQMouseEvent *e)
     _float->reparent(this);
     _float->move(totalPos + TQPoint(width() + 2, -height() / 2));
     if (m_logarithmic) {
-        _float->setText(TQString("%1").tqarg(powf(10, m_position)));
+        _float->setText(TQString("%1").arg(powf(10, m_position)));
     } else {
-        _float->setText(TQString("%1").tqarg(m_position));
+        _float->setText(TQString("%1").arg(m_position));
     }        
     _float->show();
 
@@ -498,9 +498,9 @@ Rotary::mouseMoveEvent(TQMouseEvent *e)
 
         // draw on the float text
         if (m_logarithmic) {
-            _float->setText(TQString("%1").tqarg(powf(10, m_snapPosition)));
+            _float->setText(TQString("%1").arg(powf(10, m_snapPosition)));
         } else {
-            _float->setText(TQString("%1").tqarg(m_snapPosition));
+            _float->setText(TQString("%1").arg(m_snapPosition));
         }
     }
 }
@@ -527,9 +527,9 @@ Rotary::wheelEvent(TQWheelEvent *e)
 
     // draw on the float text
     if (m_logarithmic) {
-        _float->setText(TQString("%1").tqarg(powf(10, m_snapPosition)));
+        _float->setText(TQString("%1").arg(powf(10, m_snapPosition)));
     } else {
-        _float->setText(TQString("%1").tqarg(m_snapPosition));
+        _float->setText(TQString("%1").arg(m_snapPosition));
     }
 
     // Reposition - we need to sum the relative positions up to the

src/gui/widgets/ScrollBox.cpp

@@ -123,31 +123,31 @@ void ScrollBox::setPageSize(const TQSize& s)
         setFixedWidth(width);
     }
 
-    tqrepaint();
+    repaint();
 }
 
 void ScrollBox::setViewSize(const TQSize& s)
 {
     m_viewsize = s;
-    tqrepaint();
+    repaint();
 }
 
 void ScrollBox::setViewPos(const TQPoint& pos)
 {
     m_viewpos = pos;
-    tqrepaint();
+    repaint();
 }
 
 void ScrollBox::setViewX(int x)
 {
     m_viewpos = TQPoint(x, m_viewpos.y());
-    tqrepaint();
+    repaint();
 }
 
 void ScrollBox::setViewY(int y)
 {
     m_viewpos = TQPoint(m_viewpos.x(), y);
-    tqrepaint();
+    repaint();
 }
 
 void ScrollBox::setThumbnail(TQPixmap img)

src/gui/widgets/TextFloat.cpp

@@ -106,7 +106,7 @@ void
 TextFloat::setText(const TQString &text)
 {
     m_text = text;
-    tqrepaint();
+    repaint();
 }
 
 }

src/gui/widgets/TimeWidget.cpp

@@ -161,7 +161,7 @@ TimeWidget::init(bool editable)
             tqlayout->addWidget(m_timeT, 0, 5);
         } else {
             m_timeT = 0;
-            TQLineEdit *le = new TQLineEdit(TQString("%1").tqarg(m_time), frame);
+            TQLineEdit *le = new TQLineEdit(TQString("%1").arg(m_time), frame);
             le->setReadOnly(true);
             tqlayout->addWidget(le, 0, 5);
         }
@@ -184,7 +184,7 @@ TimeWidget::init(bool editable)
             tqlayout->addWidget(new TQLabel(i18n("units"), frame), 0, 2);
         } else {
             m_timeT = 0;
-            TQLineEdit *le = new TQLineEdit(TQString("%1").tqarg(m_time), frame);
+            TQLineEdit *le = new TQLineEdit(TQString("%1").arg(m_time), frame);
             le->setReadOnly(true);
             tqlayout->addWidget(le, 0, 2);
         }
@@ -227,7 +227,7 @@ TimeWidget::init(bool editable)
         tqlayout->addWidget(m_beatLabel, 1, 3);
     }
 
-    label = new TQLabel(i18n("%1:").tqarg(NotationStrings::getShortNoteName
+    label = new TQLabel(i18n("%1:").arg(NotationStrings::getShortNoteName
                                        (Note
                                         (Note::Shortest), true)),
                        frame);
@@ -383,7 +383,7 @@ TimeWidget::populate()
             }
             m_bar->setValue(bars);
         } else {
-            m_barLabel->setText(TQString("%1").tqarg(bars));
+            m_barLabel->setText(TQString("%1").arg(bars));
         }
 
         if (m_beat) {
@@ -391,7 +391,7 @@ TimeWidget::populate()
             m_beat->setMaxValue(timeSig.getBeatsPerBar() - 1);
             m_beat->setValue(beats);
         } else {
-            m_beatLabel->setText(TQString("%1").tqarg(beats));
+            m_beatLabel->setText(TQString("%1").arg(beats));
         }
 
         if (m_fraction) {
@@ -401,10 +401,10 @@ TimeWidget::populate()
                                     getDuration() - 1);
             m_fraction->setValue(hemidemis);
         } else {
-            m_fractionLabel->setText(TQString("%1").tqarg(hemidemis));
+            m_fractionLabel->setText(TQString("%1").arg(hemidemis));
         }
 
-        m_timeSig->setText(i18n("(%1/%2 time)").tqarg(timeSig.getNumerator()).
+        m_timeSig->setText(i18n("(%1/%2 time)").arg(timeSig.getNumerator()).
                            arg(timeSig.getDenominator()));
 
         timeT endTime = m_startTime + m_time;
@@ -422,7 +422,7 @@ TimeWidget::populate()
             }
             m_sec->setValue(rt.sec);
         } else {
-            m_secLabel->setText(TQString("%1").tqarg(rt.sec));
+            m_secLabel->setText(TQString("%1").arg(rt.sec));
         }
 
         if (m_msec) {
@@ -430,7 +430,7 @@ TimeWidget::populate()
             m_msec->setMaxValue(999);
             m_msec->setValue(rt.msec());
         } else {
-            m_msecLabel->setText(TQString("%1").tqarg(rt.msec()));
+            m_msecLabel->setText(TQString("%1").arg(rt.msec()));
         }
 
         bool change = (m_composition->getTempoChangeNumberAt(endTime) !=
@@ -507,7 +507,7 @@ TimeWidget::populate()
             }
             m_bar->setValue(bar + 1);
         } else {
-            m_barLabel->setText(TQString("%1").tqarg(bar + 1));
+            m_barLabel->setText(TQString("%1").arg(bar + 1));
         }
 
         if (m_beat) {
@@ -515,7 +515,7 @@ TimeWidget::populate()
             m_beat->setMaxValue(timeSig.getBeatsPerBar());
             m_beat->setValue(beat);
         } else {
-            m_beatLabel->setText(TQString("%1").tqarg(beat));
+            m_beatLabel->setText(TQString("%1").arg(beat));
         }
 
         if (m_fraction) {
@@ -525,10 +525,10 @@ TimeWidget::populate()
                                     getDuration() - 1);
             m_fraction->setValue(hemidemis);
         } else {
-            m_fractionLabel->setText(TQString("%1").tqarg(hemidemis));
+            m_fractionLabel->setText(TQString("%1").arg(hemidemis));
         }
 
-        m_timeSig->setText(i18n("(%1/%2 time)").tqarg(timeSig.getNumerator()).
+        m_timeSig->setText(i18n("(%1/%2 time)").arg(timeSig.getNumerator()).
                            arg(timeSig.getDenominator()));
 
         RealTime rt = m_composition->getElapsedRealTime(m_time);
@@ -543,7 +543,7 @@ TimeWidget::populate()
             }
             m_sec->setValue(rt.sec);
         } else {
-            m_secLabel->setText(TQString("%1").tqarg(rt.sec));
+            m_secLabel->setText(TQString("%1").arg(rt.sec));
         }
 
         if (m_msec) {
@@ -551,7 +551,7 @@ TimeWidget::populate()
             m_msec->setMaxValue(999);
             m_msec->setValue(rt.msec());
         } else {
-            m_msecLabel->setText(TQString("%1").tqarg(rt.msec()));
+            m_msecLabel->setText(TQString("%1").arg(rt.msec()));
         }
     }
 

src/gui/widgets/VUMeter.cpp

@@ -46,13 +46,13 @@ VUMeter::VUMeter(TQWidget *parent,
                  bool hasRecord,
                  int width,
                  int height,
-                 VUAlignment tqalignment,
+                 VUAlignment alignment,
                  const char *name):
         TQLabel(parent, name),
         m_originalHeight(height),
         m_active(true),
         m_type(type),
-        m_tqalignment(tqalignment),
+        m_alignment(alignment),
         m_levelLeft(0),
         m_recordLevelLeft(0),
         m_peakLevelLeft(0),
@@ -121,7 +121,7 @@ VUMeter::VUMeter(TQWidget *parent,
     setMinimumSize(width, m_originalHeight);
     setMaximumSize(width, m_originalHeight);
 
-    if (m_tqalignment == Vertical)
+    if (m_alignment == Vertical)
         m_maxLevel = height;
     else
         m_maxLevel = width;
@@ -381,7 +381,7 @@ VUMeter::drawColouredBar(TQPainter *paint, int channel,
         int medium = m_velocityColour->getMediumKnee(),
                      loud = m_velocityColour->getLoudKnee();
 
-        if (m_tqalignment == Vertical) {
+        if (m_alignment == Vertical) {
             if (h > loud) {
                 paint->setPen(m_velocityColour->getLoudColour());
                 paint->setBrush(TQBrush(m_velocityColour->getLoudColour(),
@@ -397,7 +397,7 @@ VUMeter::drawColouredBar(TQPainter *paint, int channel,
             }
         }
 
-        if (m_tqalignment == Vertical) {
+        if (m_alignment == Vertical) {
             if (h > medium) {
                 paint->setPen(m_velocityColour->getMediumColour());
                 paint->setBrush(TQBrush(m_velocityColour->getMediumColour(),
@@ -415,7 +415,7 @@ VUMeter::drawColouredBar(TQPainter *paint, int channel,
             }
         }
 
-        if (m_tqalignment == Vertical) {
+        if (m_alignment == Vertical) {
             paint->setPen(m_velocityColour->getQuietColour());
             paint->setBrush(TQBrush(m_velocityColour->getQuietColour(),
                                    style));
@@ -458,7 +458,7 @@ VUMeter::drawMeterLevel(TQPainter* paint)
                  loud = m_velocityColour->getLoudKnee();
 
     if (m_stereo) {
-        if (m_tqalignment == VUMeter::Vertical) {
+        if (m_alignment == VUMeter::Vertical) {
             int hW = width() / 2;
 
             int midWidth = 1;
@@ -561,7 +561,7 @@ VUMeter::drawMeterLevel(TQPainter* paint)
     } else {
         // Paint a vertical meter according to type
         //
-        if (m_tqalignment == VUMeter::Vertical) {
+        if (m_alignment == VUMeter::Vertical) {
             int y = height() - (m_levelLeft * height()) / m_maxLevel;
             drawColouredBar(paint, 0, 0, y, width(), height());
 

src/gui/widgets/VUMeter.h

@@ -89,7 +89,7 @@ protected:
             bool hasRecord = false,
             int width = 0,
             int height = 0,
-            VUAlignment tqalignment = Horizontal,
+            VUAlignment alignment = Horizontal,
             const char *name = 0);
     ~VUMeter();
 
@@ -115,7 +115,7 @@ private:
                          int x, int y, int w, int h);
 
     VUMeterType m_type;
-    VUAlignment m_tqalignment;
+    VUAlignment m_alignment;
     TQColor      m_background;
 
     short       m_maxLevel;

src/misc/Debug.cpp

@@ -307,8 +307,8 @@ operator<<(kdbgstream &dbg, const TQRegion& reg )
 
     TQMemArray<TQRect>rs = reg.rects();
     for (uint i = 0;i < rs.size();++i)
-        dbg << TQString("[%1,%2 - %3x%4] ").tqarg(rs[i].x()).tqarg(rs[i].y())
+        dbg << TQString("[%1,%2 - %3x%4] ").arg(rs[i].x()).arg(rs[i].y())
-        .tqarg(rs[i].width()).tqarg(rs[i].height() ) ;
+        .arg(rs[i].width()).arg(rs[i].height() ) ;
 
     dbg << "]";
     return dbg;

src/sequencer/ControlBlockMmapper.cpp

@@ -60,7 +60,7 @@ ControlBlockMmapper::ControlBlockMmapper(TQString fileName)
     if (m_mmappedBuffer == (void*) - 1) {
 
         SEQUENCER_DEBUG << TQString("mmap failed : (%1) %2\n").
-        tqarg(errno).tqarg(strerror(errno));
+        arg(errno).arg(strerror(errno));
 
         throw Exception("mmap failed");
     }

src/sequencer/MmappedSegment.cpp

@@ -71,7 +71,7 @@ void MmappedSegment::map()
     if (m_mmappedRegion == (void*) - 1) {
 
         SEQUENCER_DEBUG << TQString("mmap failed : (%1) %2\n").
-        tqarg(errno).tqarg(strerror(errno));
+        arg(errno).arg(strerror(errno));
 
         throw Exception("mmap failed");
     }
@@ -146,7 +146,7 @@ bool MmappedSegment::remap(size_t newSize)
     if (m_mmappedRegion == (void*) - 1) {
 
         SEQUENCER_DEBUG << TQString("mremap failed : (%1) %2\n").
-        tqarg(errno).tqarg(strerror(errno));
+        arg(errno).arg(strerror(errno));
 
         throw Exception("mremap failed");
     }

src/sequencer/SequencerMmapper.cpp

@@ -81,7 +81,7 @@ SequencerMmapper::SequencerMmapper():
 
     if (m_mmappedBuffer == (void*) - 1) {
         SEQUENCER_DEBUG <<
-        TQString("mmap failed : (%1) %2\n").tqarg(errno).tqarg(strerror(errno));
+        TQString("mmap failed : (%1) %2\n").arg(errno).arg(strerror(errno));
         throw Exception("mmap failed");
     }
 

src/sound/AlsaDriver.cpp

@@ -973,11 +973,11 @@ AlsaDriver::createMidiDevice(AlsaPortDescription *port,
 
         if (TQString(deviceName).startsWith("Anonymous MIDI device ")) {
             portName = TQString("out %1")
-                       .tqarg(m_outputPorts.size() + 1);
+                       .arg(m_outputPorts.size() + 1);
         } else {
             portName = TQString("out %1 - %2")
-                       .tqarg(m_outputPorts.size() + 1)
+                       .arg(m_outputPorts.size() + 1)
-                       .tqarg(deviceName);
+                       .arg(deviceName);
         }
 
         int outputPort = checkAlsaError(snd_seq_create_simple_port

src/sound/AudioFileManager.cpp

@@ -537,8 +537,8 @@ AudioFileManager::createRecordingAudioFile()
     while (fileName == "") {
 
         fileName = TQString("rg-%1-%2.wav")
-                   .tqarg(TQDateTime::currentDateTime().toString("yyyyMMdd-hhmmss"))
+                   .arg(TQDateTime::currentDateTime().toString("yyyyMMdd-hhmmss"))
-                   .tqarg(newId + 1);
+                   .arg(newId + 1);
 
         if (TQFile(m_audioPath.c_str() + fileName).exists()) {
             fileName = "";
@@ -622,10 +622,10 @@ AudioFileManager::createDerivedAudioFile(AudioFileId source,
     while (fileName == "") {
 
         fileName = TQString("%1-%2-%3-%4.wav")
-	    .tqarg(prefix)
+	    .arg(prefix)
-	    .tqarg(sourceBase.c_str())
+	    .arg(sourceBase.c_str())
-	    .tqarg(TQDateTime::currentDateTime().toString("yyyyMMdd-hhmmss"))
+	    .arg(TQDateTime::currentDateTime().toString("yyyyMMdd-hhmmss"))
-	    .tqarg(newId + 1);
+	    .arg(newId + 1);
 
         if (TQFile(m_audioPath.c_str() + fileName).exists()) {
             fileName = "";
@@ -657,11 +657,11 @@ AudioFileManager::importURL(const KURL &url, int sampleRate)
 
     std::cerr << "AudioFileManager::importURL("<< url.prettyURL().ascii() << ", " << sampleRate << ")" << std::endl;
 
-    emit setOperationName(i18n("Downloading file %1").tqarg(url.prettyURL()));
+    emit setOperationName(i18n("Downloading file %1").arg(url.prettyURL()));
 
     TQString localPath = "";
     if (!KIO::NetAccess::download(url, localPath)) {
-	KMessageBox::error(0, i18n("Cannot download file %1").tqarg(url.prettyURL()));
+	KMessageBox::error(0, i18n("Cannot download file %1").arg(url.prettyURL()));
 	throw SoundFile::BadSoundFileException(url.prettyURL().ascii());
     }
     
@@ -688,7 +688,7 @@ AudioFileManager::fileNeedsConversion(const std::string &fileName,
     *proc << "rosegarden-audiofile-importer";
     if (sampleRate > 0) {
         *proc << "-r";
-        *proc << TQString("%1").tqarg(sampleRate);
+        *proc << TQString("%1").arg(sampleRate);
     }
     *proc << "-w";
     *proc << fileName.c_str();
@@ -715,7 +715,7 @@ AudioFileManager::importFile(const std::string &fileName, int sampleRate)
     *proc << "rosegarden-audiofile-importer";
     if (sampleRate > 0) {
 	*proc << "-r";
-	*proc << TQString("%1").tqarg(sampleRate);
+	*proc << TQString("%1").arg(sampleRate);
     }
     *proc << "-w";
     *proc << fileName.c_str();
@@ -753,9 +753,9 @@ AudioFileManager::importFile(const std::string &fileName, int sampleRate)
     while (targetName == "") {
 
         targetName = TQString("conv-%2-%3-%4.wav")
-	    .tqarg(sourceBase)
+	    .arg(sourceBase)
-	    .tqarg(TQDateTime::currentDateTime().toString("yyyyMMdd-hhmmss"))
+	    .arg(TQDateTime::currentDateTime().toString("yyyyMMdd-hhmmss"))
-	    .tqarg(newId + 1);
+	    .arg(newId + 1);
 
         if (TQFile(m_audioPath.c_str() + targetName).exists()) {
             targetName = "";
@@ -768,7 +768,7 @@ AudioFileManager::importFile(const std::string &fileName, int sampleRate)
     *m_importProcess << "rosegarden-audiofile-importer";
     if (sampleRate > 0) {
 	*m_importProcess << "-r";
-	*m_importProcess << TQString("%1").tqarg(sampleRate);
+	*m_importProcess << TQString("%1").arg(sampleRate);
     }
     *m_importProcess << "-c";
     *m_importProcess << fileName.c_str();

src/sound/AudioTimeStretcher.h

@@ -159,7 +159,7 @@ protected:
     /**
      * Resynthesise from m_freq[channel] adding in to "out",
      * adjusting phases on the basis of a prior step size of lastStep.
-     * Also add the window tqshape in to the modulation array (if
+     * Also add the window shape in to the modulation array (if
      * present) -- for use in ensuring the output has the correct
      * magnitude afterwards.
      */

src/sound/DSSIPluginFactory.cpp

@@ -67,14 +67,14 @@ DSSIPluginFactory::enumeratePlugins(MappedObjectPropertyList &list)
 
         list.push_back(*i);
         list.push_back(descriptor->Name);
-        list.push_back(TQString("%1").tqarg(descriptor->UniqueID));
+        list.push_back(TQString("%1").arg(descriptor->UniqueID));
         list.push_back(descriptor->Label);
         list.push_back(descriptor->Maker);
         list.push_back(descriptor->Copyright);
         list.push_back((ddesc->run_synth || ddesc->run_multiple_synths) ? "true" : "false");
         list.push_back(ddesc->run_multiple_synths ? "true" : "false");
         list.push_back(m_taxonomy[descriptor->UniqueID]);
-        list.push_back(TQString("%1").tqarg(descriptor->PortCount));
+        list.push_back(TQString("%1").arg(descriptor->PortCount));
 
         for (unsigned long p = 0; p < descriptor->PortCount; ++p) {
 
@@ -90,13 +90,13 @@ DSSIPluginFactory::enumeratePlugins(MappedObjectPropertyList &list)
                 type |= PluginPort::Output;
             }
 
-            list.push_back(TQString("%1").tqarg(p));
+            list.push_back(TQString("%1").arg(p));
             list.push_back(descriptor->PortNames[p]);
-            list.push_back(TQString("%1").tqarg(type));
+            list.push_back(TQString("%1").arg(type));
-            list.push_back(TQString("%1").tqarg(getPortDisplayHint(descriptor, p)));
+            list.push_back(TQString("%1").arg(getPortDisplayHint(descriptor, p)));
-            list.push_back(TQString("%1").tqarg(getPortMinimum(descriptor, p)));
+            list.push_back(TQString("%1").arg(getPortMinimum(descriptor, p)));
-            list.push_back(TQString("%1").tqarg(getPortMaximum(descriptor, p)));
+            list.push_back(TQString("%1").arg(getPortMaximum(descriptor, p)));
-            list.push_back(TQString("%1").tqarg(getPortDefault(descriptor, p)));
+            list.push_back(TQString("%1").arg(getPortDefault(descriptor, p)));
         }
     }
 

src/sound/DSSIPluginInstance.cpp

@@ -451,7 +451,7 @@ DSSIPluginInstance::checkProgramCache()
         ProgramDescriptor d;
         d.bank = programDescriptor->Bank;
         d.program = programDescriptor->Program;
-        d.name = TQString("%1. %2").tqarg(index).tqarg(programDescriptor->Name);
+        d.name = TQString("%1. %2").arg(index).arg(programDescriptor->Name);
         m_cachedPrograms.push_back(d);
     }
 

src/sound/LADSPAPluginFactory.cpp

@@ -81,7 +81,7 @@ LADSPAPluginFactory::enumeratePlugins(MappedObjectPropertyList &list)
 
         list.push_back(*i);
         list.push_back(descriptor->Name);
-        list.push_back(TQString("%1").tqarg(descriptor->UniqueID));
+        list.push_back(TQString("%1").arg(descriptor->UniqueID));
         list.push_back(descriptor->Label);
         list.push_back(descriptor->Maker);
         list.push_back(descriptor->Copyright);
@@ -104,7 +104,7 @@ LADSPAPluginFactory::enumeratePlugins(MappedObjectPropertyList &list)
 
         }
 
-        list.push_back(TQString("%1").tqarg(descriptor->PortCount));
+        list.push_back(TQString("%1").arg(descriptor->PortCount));
 
         for (unsigned long p = 0; p < descriptor->PortCount; ++p) {
 
@@ -120,13 +120,13 @@ LADSPAPluginFactory::enumeratePlugins(MappedObjectPropertyList &list)
                 type |= PluginPort::Output;
             }
 
-            list.push_back(TQString("%1").tqarg(p));
+            list.push_back(TQString("%1").arg(p));
             list.push_back(descriptor->PortNames[p]);
-            list.push_back(TQString("%1").tqarg(type));
+            list.push_back(TQString("%1").arg(type));
-            list.push_back(TQString("%1").tqarg(getPortDisplayHint(descriptor, p)));
+            list.push_back(TQString("%1").arg(getPortDisplayHint(descriptor, p)));
-            list.push_back(TQString("%1").tqarg(getPortMinimum(descriptor, p)));
+            list.push_back(TQString("%1").arg(getPortMinimum(descriptor, p)));
-            list.push_back(TQString("%1").tqarg(getPortMaximum(descriptor, p)));
+            list.push_back(TQString("%1").arg(getPortMaximum(descriptor, p)));
-            list.push_back(TQString("%1").tqarg(getPortDefault(descriptor, p)));
+            list.push_back(TQString("%1").arg(getPortDefault(descriptor, p)));
         }
     }
 
@@ -664,7 +664,7 @@ LADSPAPluginFactory::discoverPlugins()
         TQDir pluginDir(*i, "*.so");
 
         for (unsigned int j = 0; j < pluginDir.count(); ++j) {
-            discoverPlugins(TQString("%1/%2").tqarg(*i).tqarg(pluginDir[j]));
+            discoverPlugins(TQString("%1/%2").arg(*i).arg(pluginDir[j]));
         }
     }
 

src/sound/MappedEvent.cpp

@@ -390,7 +390,7 @@ protected:
 };
 
 DataBlockFile::DataBlockFile(DataBlockRepository::blockid id)
-        : m_fileName(KGlobal::dirs()->resourceDirs("tmp").first() + TQString("/rosegarden_datablock_%1").tqarg(id)),
+        : m_fileName(KGlobal::dirs()->resourceDirs("tmp").first() + TQString("/rosegarden_datablock_%1").arg(id)),
         m_file(m_fileName),
         m_cleared(false)
 {

src/sound/MappedStudio.cpp

@@ -185,21 +185,21 @@ const MappedObjectProperty MappedPluginPort::Value = "value";
 void
 MappedObject::addChild(MappedObject *object)
 {
-    std::vector<MappedObject*>::iterator it = m_tqchildren.begin();
+    std::vector<MappedObject*>::iterator it = m_children.begin();
-    for (; it != m_tqchildren.end(); it++)
+    for (; it != m_children.end(); it++)
         if ((*it) == object)
             return ;
 
-    m_tqchildren.push_back(object);
+    m_children.push_back(object);
 }
 
 void
 MappedObject::removeChild(MappedObject *object)
 {
-    std::vector<MappedObject*>::iterator it = m_tqchildren.begin();
+    std::vector<MappedObject*>::iterator it = m_children.begin();
-    for (; it != m_tqchildren.end(); it++) {
+    for (; it != m_children.end(); it++) {
         if ((*it) == object) {
-            m_tqchildren.erase(it);
+            m_children.erase(it);
             return ;
         }
     }
@@ -211,9 +211,9 @@ MappedObjectPropertyList
 MappedObject::getChildren()
 {
     MappedObjectPropertyList list;
-    std::vector<MappedObject*>::iterator it = m_tqchildren.begin();
+    std::vector<MappedObject*>::iterator it = m_children.begin();
-    for (; it != m_tqchildren.end(); it++)
+    for (; it != m_children.end(); it++)
-        list.push_back(TQString("%1").tqarg((*it)->getId()));
+        list.push_back(TQString("%1").arg((*it)->getId()));
 
     return list;
 }
@@ -225,10 +225,10 @@ MappedObjectPropertyList
 MappedObject::getChildren(MappedObjectType type)
 {
     MappedObjectPropertyList list;
-    std::vector<MappedObject*>::iterator it = m_tqchildren.begin();
+    std::vector<MappedObject*>::iterator it = m_children.begin();
-    for (; it != m_tqchildren.end(); it++) {
+    for (; it != m_children.end(); it++) {
         if ((*it)->getType() == type)
-            list.push_back(TQString("%1").tqarg((*it)->getId()));
+            list.push_back(TQString("%1").arg((*it)->getId()));
     }
 
     return list;
@@ -244,16 +244,16 @@ MappedObject::destroyChildren()
 
     // see note in destroy() below
 
-    std::vector<MappedObject *> tqchildren = m_tqchildren;
+    std::vector<MappedObject *> children = m_children;
-    m_tqchildren.clear();
+    m_children.clear();
 
-    std::vector<MappedObject *>::iterator it = tqchildren.begin();
+    std::vector<MappedObject *>::iterator it = children.begin();
-    for (; it != tqchildren.end(); it++)
+    for (; it != children.end(); it++)
         (*it)->destroy(); // remove from studio and destroy
 }
 
 // Destroy this object and remove it from the studio and
-// do the same for all its tqchildren.
+// do the same for all its children.
 //
 void
 MappedObject::destroy()
@@ -268,14 +268,14 @@ MappedObject::destroy()
     // which calls back on the parent (in this case us) to remove the
     // child.  (That's necessary for the case of destroying a plugin,
     // where we need to remove it from its plugin manager -- etc.)  So
-    // we don't want to be iterating over m_tqchildren here, as it will
+    // we don't want to be iterating over m_children here, as it will
     // change from under us.
 
-    std::vector<MappedObject *> tqchildren = m_tqchildren;
+    std::vector<MappedObject *> children = m_children;
-    m_tqchildren.clear();
+    m_children.clear();
 
-    std::vector<MappedObject *>::iterator it = tqchildren.begin();
+    std::vector<MappedObject *>::iterator it = children.begin();
-    for (; it != tqchildren.end(); it++) {
+    for (; it != children.end(); it++) {
         (*it)->destroy();
     }
 
@@ -875,30 +875,30 @@ MappedAudioFader::getPropertyList(const MappedObjectProperty &property)
         list.push_back(MappedConnectableObject::ConnectionsIn);
         list.push_back(MappedConnectableObject::ConnectionsOut);
     } else if (property == MappedObject::Instrument) {
-        list.push_back(MappedObjectProperty("%1").tqarg(m_instrumentId));
+        list.push_back(MappedObjectProperty("%1").arg(m_instrumentId));
     } else if (property == MappedAudioFader::FaderLevel) {
-        list.push_back(MappedObjectProperty("%1").tqarg(m_level));
+        list.push_back(MappedObjectProperty("%1").arg(m_level));
     } else if (property == MappedAudioFader::FaderRecordLevel) {
-        list.push_back(MappedObjectProperty("%1").tqarg(m_recordLevel));
+        list.push_back(MappedObjectProperty("%1").arg(m_recordLevel));
     } else if (property == MappedAudioFader::Channels) {
-        list.push_back(MappedObjectProperty("%1").tqarg(m_channels));
+        list.push_back(MappedObjectProperty("%1").arg(m_channels));
     } else if (property == MappedAudioFader::InputChannel) {
-        list.push_back(MappedObjectProperty("%1").tqarg(m_inputChannel));
+        list.push_back(MappedObjectProperty("%1").arg(m_inputChannel));
     } else if (property == MappedAudioFader::Pan) {
-        list.push_back(MappedObjectProperty("%1").tqarg(m_pan));
+        list.push_back(MappedObjectProperty("%1").arg(m_pan));
     } else if (property == MappedConnectableObject::ConnectionsIn) {
         MappedObjectValueList::const_iterator
         it = m_connectionsIn.begin();
 
         for ( ; it != m_connectionsIn.end(); ++it) {
-            list.push_back(TQString("%1").tqarg(*it));
+            list.push_back(TQString("%1").arg(*it));
         }
     } else if (property == MappedConnectableObject::ConnectionsOut) {
         MappedObjectValueList::const_iterator
         it = m_connectionsOut.begin();
 
         for ( ; it != m_connectionsOut.end(); ++it) {
-            list.push_back(TQString("%1").tqarg(*it));
+            list.push_back(TQString("%1").arg(*it));
         }
     }
 
@@ -1013,22 +1013,22 @@ MappedAudioBuss::getPropertyList(const MappedObjectProperty &property)
         list.push_back(MappedConnectableObject::ConnectionsIn);
         list.push_back(MappedConnectableObject::ConnectionsOut);
     } else if (property == BussId) {
-        list.push_back(MappedObjectProperty("%1").tqarg(m_bussId));
+        list.push_back(MappedObjectProperty("%1").arg(m_bussId));
     } else if (property == Level) {
-        list.push_back(MappedObjectProperty("%1").tqarg(m_level));
+        list.push_back(MappedObjectProperty("%1").arg(m_level));
     } else if (property == MappedConnectableObject::ConnectionsIn) {
         MappedObjectValueList::const_iterator
         it = m_connectionsIn.begin();
 
         for ( ; it != m_connectionsIn.end(); ++it) {
-            list.push_back(TQString("%1").tqarg(*it));
+            list.push_back(TQString("%1").arg(*it));
         }
     } else if (property == MappedConnectableObject::ConnectionsOut) {
         MappedObjectValueList::const_iterator
         it = m_connectionsOut.begin();
 
         for ( ; it != m_connectionsOut.end(); ++it) {
-            list.push_back(TQString("%1").tqarg(*it));
+            list.push_back(TQString("%1").arg(*it));
         }
     }
 
@@ -1152,7 +1152,7 @@ MappedAudioInput::getPropertyList(const MappedObjectProperty &property)
     if (property == "") {
         list.push_back(MappedAudioInput::InputNumber);
     } else if (property == InputNumber) {
-        list.push_back(MappedObjectProperty("%1").tqarg(m_inputNumber));
+        list.push_back(MappedObjectProperty("%1").arg(m_inputNumber));
     }
 
     return list;

src/sound/MappedStudio.h

@@ -135,7 +135,7 @@ public:
     void destroy();
     void destroyChildren();
 
-    std::vector<MappedObject*> getChildObjects() { return m_tqchildren; }
+    std::vector<MappedObject*> getChildObjects() { return m_children; }
 
 protected:
 
@@ -144,7 +144,7 @@ protected:
     std::string      m_name;
 
     MappedObject                *m_parent;
-    std::vector<MappedObject*>   m_tqchildren;
+    std::vector<MappedObject*>   m_children;
 };
 
 

src/sound/RIFFAudioFile.cpp

@@ -154,7 +154,7 @@ RIFFAudioFile::scanTo(std::ifstream *file, const RealTime &time)
     if (file == 0)
         return false;
 
-    // whatever we do here we tqinvalidate the read buffer
+    // whatever we do here we invalidate the read buffer
     //
     m_loseBuffer = true;