Remove additional unneeded tq method conversions

7 files changed, 26 insertions, 26 deletions

diff --git a/src/gui/general/BaseTool.h b/src/gui/general/BaseTool.h
index 2c1eab1..fa3027b 100644
--- a/src/gui/general/BaseTool.h
+++ b/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();
 
diff --git a/src/gui/general/CanvasItemGC.h b/src/gui/general/CanvasItemGC.h
index 50bd21f..681e021 100644
--- a/src/gui/general/CanvasItemGC.h
+++ b/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
diff --git a/src/gui/general/EditView.cpp b/src/gui/general/EditView.cpp
index 0ab943b..4694e02 100644
--- a/src/gui/general/EditView.cpp
+++ b/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()))
-                          .tqarg(it->getControllerValue())
-                          .tqarg(hexValue);
+                itemStr = i18n("%1 Controller %2 %3").arg(strtoqstr(it->getName()))
+                          .arg(it->getControllerValue())
+                          .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);
             }
diff --git a/src/gui/general/EditViewBase.h b/src/gui/general/EditViewBase.h
index aaf6dbe..ef70384 100644
--- a/src/gui/general/EditViewBase.h
+++ b/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();
diff --git a/src/gui/general/LinedStaff.cpp b/src/gui/general/LinedStaff.cpp
index ffaa28c..bb6bf59 100644
--- a/src/gui/general/LinedStaff.cpp
+++ b/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);
diff --git a/src/gui/general/MidiPitchLabel.cpp b/src/gui/general/MidiPitchLabel.cpp
index a103234..51742c3 100644
--- a/src/gui/general/MidiPitchLabel.cpp
+++ b/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);
     }
 }
 
diff --git a/src/gui/general/PresetGroup.cpp b/src/gui/general/PresetGroup.cpp
index cb8efca..2c39256 100644
--- a/src/gui/general/PresetGroup.cpp
+++ b/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())
-                    .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);
 }
 
@@ -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())
-                    .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);
 }