Remove additional unneeded tq method conversions

18 files changed, 155 insertions, 155 deletions

diff --git a/src/gui/editors/notation/FontViewFrame.cpp b/src/gui/editors/notation/FontViewFrame.cpp
index 0eddccd..6e24a18 100644
--- a/src/gui/editors/notation/FontViewFrame.cpp
+++ b/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());
diff --git a/src/gui/editors/notation/NotationStaff.cpp b/src/gui/editors/notation/NotationStaff.cpp
index 83575c6..37fd03f 100644
--- a/src/gui/editors/notation/NotationStaff.cpp
+++ b/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();
 
diff --git a/src/gui/editors/notation/NotationStrings.cpp b/src/gui/editors/notation/NotationStrings.cpp
index e4cae98..9bbc6e6 100644
--- a/src/gui/editors/notation/NotationStrings.cpp
+++ b/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;
         }
 
diff --git a/src/gui/editors/notation/NotationToolBox.cpp b/src/gui/editors/notation/NotationToolBox.cpp
index f2fa642..7632413 100644
--- a/src/gui/editors/notation/NotationToolBox.cpp
+++ b/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;
     }
 
diff --git a/src/gui/editors/notation/NotationVLayout.cpp b/src/gui/editors/notation/NotationVLayout.cpp
index af6a2fe..af5b0bb 100644
--- a/src/gui/editors/notation/NotationVLayout.cpp
+++ b/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);
             }
 
diff --git a/src/gui/editors/notation/NotationView.cpp b/src/gui/editors/notation/NotationView.cpp
index 6901135..ece3e36 100644
--- a/src/gui/editors/notation/NotationView.cpp
+++ b/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_tempoRuler->tqrepaint();
-    m_rawNoteRuler->tqrepaint();
+    m_chordNameRuler->repaint();
+    m_tempoRuler->repaint();
+    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())
-                   .tqarg(trackPosition + 1));
+                   .arg(getDocument()->getTitle())
+                   .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")
-             .tqarg(TQString("%1").tqarg(bar + 1).rightJustify(3, '0'))
-             .tqarg(TQString("%1").tqarg(beat).rightJustify(2, '0'))
-             .tqarg(TQString("%1").tqarg(fraction).rightJustify(2, '0'))
-             .tqarg(TQString("%1").tqarg(remainder).rightJustify(2, '0')))
-        .tqarg(rt.sec)
-        .tqarg(TQString("%1").tqarg(ms).rightJustify(3, '0'));
+        .arg(TQString("%1-%2-%3-%4")
+             .arg(TQString("%1").arg(bar + 1).rightJustify(3, '0'))
+             .arg(TQString("%1").arg(beat).rightJustify(2, '0'))
+             .arg(TQString("%1").arg(fraction).rightJustify(2, '0'))
+             .arg(TQString("%1").arg(remainder).rightJustify(2, '0')))
+        .arg(rt.sec)
+        .arg(TQString("%1").arg(ms).rightJustify(3, '0'));
 
     m_hoveredOverAbsoluteTime->setText(message);
 }
diff --git a/src/gui/editors/notation/NotationView.h b/src/gui/editors/notation/NotationView.h
index 2e51096..939cf72 100644
--- a/src/gui/editors/notation/NotationView.h
+++ b/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();
diff --git a/src/gui/editors/notation/NoteFont.cpp b/src/gui/editors/notation/NoteFont.cpp
index 18f82f7..5f84e7a 100644
--- a/src/gui/editors/notation/NoteFont.cpp
+++ b/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()))
-                                    .tqarg(m_size));
+                                    .arg(strtoqstr(m_fontMap.getName()))
+                                    .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
diff --git a/src/gui/editors/notation/NoteFontMap.cpp b/src/gui/editors/notation/NoteFontMap.cpp
index 47fc9f5..f82a263 100644
--- a/src/gui/editors/notation/NoteFontMap.cpp
+++ b/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)
-                               .tqarg(strtoqstr(name));
+                               .arg(m_fontDirectory)
+                               .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)
-                                   .tqarg(lowerName);
+                                   .arg(m_fontDirectory)
+                                   .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())
-                    .tqarg(exception.lineNumber())
-                    .tqarg(exception.columnNumber())
-                    .tqarg(m_errorString);
+                    .arg(exception.message())
+                    .arg(exception.lineNumber())
+                    .arg(exception.columnNumber())
+                    .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())
-                    .tqarg(exception.lineNumber())
-                    .tqarg(exception.columnNumber())
-                    .tqarg(m_errorString);
+                    .arg(exception.message())
+                    .arg(exception.lineNumber())
+                    .arg(exception.columnNumber())
+                    .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)
-                                  .tqarg(strtoqstr(m_srcDirectory))
-                                  .tqarg(size)
-                                  .tqarg(strtoqstr(src));
+                                  .arg(m_fontDirectory)
+                                  .arg(strtoqstr(m_srcDirectory))
+                                  .arg(size)
+                                  .arg(strtoqstr(src));
 
     TQFileInfo pixmapFileMixedInfo(pixmapFileMixedName);
 
     if (!pixmapFileMixedInfo.isReadable()) {
 
         TQString pixmapFileLowerName = TQString("%1/%2/%3/%4.xpm")
-                                      .tqarg(m_fontDirectory)
-                                      .tqarg(strtoqstr(m_srcDirectory).lower())
-                                      .tqarg(size)
-                                      .tqarg(strtoqstr(src));
+                                      .arg(m_fontDirectory)
+                                      .arg(strtoqstr(m_srcDirectory).lower())
+                                      .arg(size)
+                                      .arg(strtoqstr(src));
 
         TQFileInfo pixmapFileLowerInfo(pixmapFileLowerName);
 
diff --git a/src/gui/editors/notation/NoteFontViewer.cpp b/src/gui/editors/notation/NoteFontViewer.cpp
index d485244..d3dc2a3 100644
--- a/src/gui/editors/notation/NoteFontViewer.cpp
+++ b/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);
diff --git a/src/gui/editors/notation/NotePixmapFactory.cpp b/src/gui/editors/notation/NotePixmapFactory.cpp
index 2ff4969..9103d4e 100644
--- a/src/gui/editors/notation/NotePixmapFactory.cpp
+++ b/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);
diff --git a/src/gui/editors/notation/NotePixmapFactory.h b/src/gui/editors/notation/NotePixmapFactory.h
index 9bf32b1..2b502f1 100644
--- a/src/gui/editors/notation/NotePixmapFactory.h
+++ b/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;
diff --git a/src/gui/editors/notation/NotePixmapPainter.h b/src/gui/editors/notation/NotePixmapPainter.h
index c4836f6..ff8edae 100644
--- a/src/gui/editors/notation/NotePixmapPainter.h
+++ b/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() {
diff --git a/src/gui/editors/notation/NoteStyle.cpp b/src/gui/editors/notation/NoteStyle.cpp
index 00ce956..1e316fd 100644
--- a/src/gui/editors/notation/NoteStyle.cpp
+++ b/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
diff --git a/src/gui/editors/notation/NoteStyle.h b/src/gui/editors/notation/NoteStyle.h
index 4431c16..3959e01 100644
--- a/src/gui/editors/notation/NoteStyle.h
+++ b/src/gui/editors/notation/NoteStyle.h
@@ -99,8 +99,8 @@ public:
 
 protected:
     struct NoteDescription {
-        NoteHeadShape tqshape; // if CustomCharName, use charName
-        CharName charName; // only used if tqshape == CustomCharName
+        NoteHeadShape shape; // if CustomCharName, use charName
+        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) { }
     };
diff --git a/src/gui/editors/notation/NoteStyleFactory.cpp b/src/gui/editors/notation/NoteStyleFactory.cpp
index d5e0815..4303cc6 100644
--- a/src/gui/editors/notation/NoteStyleFactory.cpp
+++ b/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)
diff --git a/src/gui/editors/notation/NoteStyleFileReader.cpp b/src/gui/editors/notation/NoteStyleFileReader.cpp
index b8619c9..10e5f13 100644
--- a/src/gui/editors/notation/NoteStyleFileReader.cpp
+++ b/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;
 	}
diff --git a/src/gui/editors/notation/TrackHeader.cpp b/src/gui/editors/notation/TrackHeader.cpp
index 73ac29a..83dca88 100644
--- a/src/gui/editors/notation/TrackHeader.cpp
+++ b/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)
-                            .tqarg(strtoqstr(track->getLabel())));
+                            .arg(trackPos + 1)
+                            .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)
-                            .tqarg(bracketText);
+                            .arg(notationSize)
+                            .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)
-                                    .tqarg(barEnd)
-                                    .tqarg(transposeName)
-                                    .tqarg(transpose)
-                                    .tqarg(strtoqstr((*i)->getLabel()));
+                                    .arg(barStart)
+                                    .arg(barEnd)
+                                    .arg(transposeName)
+                                    .arg(transpose)
+                                    .arg(strtoqstr((*i)->getLabel()));
         } else {
             toolTipText += TQString(i18n("\nbars [%1-%2] (tr=%3) : \"%4\""))
-                                    .tqarg(barStart)
-                                    .tqarg(barEnd)
-                                    .tqarg(transpose)
-                                    .tqarg(strtoqstr((*i)->getLabel()));
+                                    .arg(barStart)
+                                    .arg(barEnd)
+                                    .arg(transpose)
+                                    .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)
-                                .tqarg(strtoqstr(track->getLabel())));
-    if (m_transpose) m_transposeText = i18n(" in %1").tqarg(noteName);
+                                .arg(trackPos + 1)
+                                .arg(strtoqstr(track->getLabel())));
+    if (m_transpose) m_transposeText = i18n(" in %1").arg(noteName);
     else             m_transposeText = TQString("");
 
     NotePixmapFactory * npf = m_notationView->getNotePixmapFactory();