Rename old tq methods that no longer need a unique name

29 files changed, 101 insertions, 101 deletions

diff --git a/src/gui/editors/guitar/Fingering.cpp b/src/gui/editors/guitar/Fingering.cpp
index 7e5ecc4..e129296 100644
--- a/src/gui/editors/guitar/Fingering.cpp
+++ b/src/gui/editors/guitar/Fingering.cpp
@@ -69,24 +69,24 @@ Fingering::getStartFret() const
 bool
 Fingering::hasBarre() const
 {
-    int lastStringtqStatus = m_strings[getNbStrings() - 1];
+    int lastStringStatus = m_strings[getNbStrings() - 1];
     
-    return ((m_strings[0] > OPEN && m_strings[0] == lastStringtqStatus) ||
-            (m_strings[1] > OPEN && m_strings[1] == lastStringtqStatus) ||
-            (m_strings[2] > OPEN && m_strings[2] == lastStringtqStatus));
+    return ((m_strings[0] > OPEN && m_strings[0] == lastStringStatus) ||
+            (m_strings[1] > OPEN && m_strings[1] == lastStringStatus) ||
+            (m_strings[2] > OPEN && m_strings[2] == lastStringStatus));
 }
 
 Fingering::Barre
 Fingering::getBarre() const
 {
-    int lastStringtqStatus = m_strings[getNbStrings() - 1];
+    int lastStringStatus = m_strings[getNbStrings() - 1];
 
     Barre res;
     
-    res.fret = lastStringtqStatus;
+    res.fret = lastStringStatus;
     
     for(unsigned int i = 0; i < 3; ++i) {
-        if (m_strings[i] > OPEN && m_strings[i] == lastStringtqStatus)
+        if (m_strings[i] > OPEN && m_strings[i] == lastStringStatus)
             res.start = i;
             break;
     }
@@ -140,8 +140,8 @@ std::string Fingering::toString() const
 bool operator<(const Fingering& a, const Fingering& b)
 {
     for(unsigned int i = 0; i < Fingering::DEFAULT_NB_STRINGS; ++i) {
-        if (a.getStringtqStatus(i) != b.getStringtqStatus(i)) {
-            return a.getStringtqStatus(i) < b.getStringtqStatus(i);
+        if (a.getStringStatus(i) != b.getStringStatus(i)) {
+            return a.getStringStatus(i) < b.getStringStatus(i);
         }
     }
     return false;
diff --git a/src/gui/editors/guitar/Fingering.h b/src/gui/editors/guitar/Fingering.h
index b413d3b..32693dd 100644
--- a/src/gui/editors/guitar/Fingering.h
+++ b/src/gui/editors/guitar/Fingering.h
@@ -60,8 +60,8 @@ public:
      * returns the fret number on which the string is pressed, or one of MUTED and OPEN  
      * 
      */
-    int  getStringtqStatus(int stringNb) const       { return m_strings[stringNb]; } 
-    void setStringtqStatus(int stringNb, int status) { m_strings[stringNb] = status; } 
+    int  getStringStatus(int stringNb) const       { return m_strings[stringNb]; } 
+    void setStringStatus(int stringNb, int status) { m_strings[stringNb] = status; } 
     unsigned int getStartFret() const;
     unsigned int getNbStrings() const { return m_strings.size(); }
         
diff --git a/src/gui/editors/guitar/FingeringBox.cpp b/src/gui/editors/guitar/FingeringBox.cpp
index 6ca2c39..49058b2 100644
--- a/src/gui/editors/guitar/FingeringBox.cpp
+++ b/src/gui/editors/guitar/FingeringBox.cpp
@@ -219,16 +219,16 @@ FingeringBox::processMouseRelease(unsigned int release_string_num,
                 
                 if(m_press_fret_num == 0) {
                     
-                    int stringtqStatus = m_fingering.getStringtqStatus(m_press_string_num);
+                    int stringStatus = m_fingering.getStringStatus(m_press_string_num);
 
-                    if (stringtqStatus == Guitar::Fingering::OPEN)
+                    if (stringStatus == Guitar::Fingering::OPEN)
                         aVal = Guitar::Fingering::MUTED;
-                    else if (stringtqStatus > Guitar::Fingering::OPEN)
+                    else if (stringStatus > Guitar::Fingering::OPEN)
                         aVal = Guitar::Fingering::OPEN;
 
                 }
                 
-                m_fingering.setStringtqStatus(m_press_string_num, aVal);
+                m_fingering.setStringStatus(m_press_string_num, aVal);
                 
                 update();
             }
diff --git a/src/gui/editors/matrix/MatrixView.cpp b/src/gui/editors/matrix/MatrixView.cpp
index 195da46..3fcf350 100644
--- a/src/gui/editors/matrix/MatrixView.cpp
+++ b/src/gui/editors/matrix/MatrixView.cpp
@@ -205,7 +205,7 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc,
 	TQString backgroundPixmap = isDrumMode() ? "bg-paper-white.xpm" : "bg-matrix-lines.xpm";
         if (background.load(TQString("%1/misc/%2").
                             arg(pixmapDir, backgroundPixmap))) {
-            tCanvas->tqsetBackgroundPixmap(background);
+            tCanvas->setBackgroundPixmap(background);
         }
     }
 
@@ -440,7 +440,7 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc,
         for (unsigned int i = 0; i < m_staffs.size(); ++i) {
 
             m_staffs[i]->positionAllElements();
-            m_staffs[i]->getSegment().getRefreshtqStatus
+            m_staffs[i]->getSegment().getRefreshStatus
             (m_segmentsRefreshStatusIds[i]).setNeedsRefresh(false);
         }
     }
@@ -667,7 +667,7 @@ void MatrixView::setupActions()
 
     icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("chord")));
     (new KToggleAction(i18n("C&hord Insert Mode"), icon, Key_H,
-                       TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModetqStatus()),
+                       TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModeStatus()),
                        actionCollection(), "chord_mode"))->
     setChecked(false);
 
@@ -1197,7 +1197,7 @@ void MatrixView::setCurrentSelection(EventSelection* s, bool preview,
                                                     std::max(endA, endB));
             } else {
                 // mark refresh status and then request a tqrepaint
-                segment.getRefreshtqStatus
+                segment.getRefreshStatus
                 (m_segmentsRefreshStatusIds
                  [getStaff(segment)->getId()]).
                 push(std::min(startA, startB), std::max(endA, endB));
@@ -1215,12 +1215,12 @@ void MatrixView::setCurrentSelection(EventSelection* s, bool preview,
             } else {
                 // mark refresh status and then request a tqrepaint
 
-                oldSelection->getSegment().getRefreshtqStatus
+                oldSelection->getSegment().getRefreshStatus
                 (m_segmentsRefreshStatusIds
                  [getStaff(oldSelection->getSegment())->getId()]).
                 push(startA, endA);
 
-                s->getSegment().getRefreshtqStatus
+                s->getSegment().getRefreshStatus
                 (m_segmentsRefreshStatusIds
                  [getStaff(s->getSegment())->getId()]).
                 push(startB, endB);
@@ -2928,7 +2928,7 @@ MatrixView::slotToggleStepByStep()
 }
 
 void
-MatrixView::slotUpdateInsertModetqStatus()
+MatrixView::slotUpdateInsertModeStatus()
 {
     TQString message;
     if (isInChordMode()) {
@@ -3044,7 +3044,7 @@ MatrixView::slotPercussionSetChanged(Instrument * newInstr)
     m_pitchRuler = pitchRuler;
     m_pianoView->addChild(m_pitchRuler);
     m_pitchRuler->show();
-    m_pianoView->setFixedWidth(pitchRuler->tqsizeHint().width());
+    m_pianoView->setFixedWidth(pitchRuler->sizeHint().width());
 
     // Update matrix canvas
     readjustCanvasSize();
@@ -3054,7 +3054,7 @@ MatrixView::slotPercussionSetChanged(Instrument * newInstr)
     else {
         MATRIX_DEBUG << "MatrixView : rendering elements\n";
         m_staffs[0]->positionAllElements();
-        m_staffs[0]->getSegment().getRefreshtqStatus
+        m_staffs[0]->getSegment().getRefreshStatus
         (m_segmentsRefreshStatusIds[0]).setNeedsRefresh(false);
         update();
     }
diff --git a/src/gui/editors/matrix/MatrixView.h b/src/gui/editors/matrix/MatrixView.h
index 6dc6519..8fbd7b4 100644
--- a/src/gui/editors/matrix/MatrixView.h
+++ b/src/gui/editors/matrix/MatrixView.h
@@ -190,7 +190,7 @@ public:
      * Adjust an X coord by world matrix
      */
     double getXbyWorldMatrix(double value)
-    { return m_canvasView->tqworldMatrix().m11() * value; }
+    { return m_canvasView->worldMatrix().m11() * value; }
         
     double getXbyInverseWorldMatrix(double value)
     { return m_canvasView->inverseWorldMatrix().m11() * value; }
@@ -292,7 +292,7 @@ public slots:
     void slotToggleStepByStep();
 
     /// status stuff
-    void slotUpdateInsertModetqStatus();
+    void slotUpdateInsertModeStatus();
 
     /// transforms
     void slotTransformsQuantize();
@@ -600,7 +600,7 @@ protected:
 
     timeT         m_lastEndMarkerTime;
 
-    // tqStatus bar elements
+    // Status bar elements
     TQLabel* m_hoveredOverAbsoluteTime;
     TQLabel* m_hoveredOverNoteName;
     TQLabel *m_selectionCounter;
diff --git a/src/gui/editors/matrix/PianoKeyboard.cpp b/src/gui/editors/matrix/PianoKeyboard.cpp
index 7ae4a5a..0b8563e 100644
--- a/src/gui/editors/matrix/PianoKeyboard.cpp
+++ b/src/gui/editors/matrix/PianoKeyboard.cpp
@@ -65,13 +65,13 @@ PianoKeyboard::PianoKeyboard(TQWidget *parent, int keys)
     setMouseTracking(true);
 }
 
-TQSize PianoKeyboard::tqsizeHint() const
+TQSize PianoKeyboard::sizeHint() const
 {
     return TQSize(m_keySize.width(),
                  m_keySize.height() * m_nbKeys);
 }
 
-TQSize PianoKeyboard::tqminimumSizeHint() const
+TQSize PianoKeyboard::minimumSizeHint() const
 {
     return m_keySize;
 }
@@ -154,7 +154,7 @@ void PianoKeyboard::paintEvent(TQPaintEvent*)
                        label.getTQString());
     }
 
-    paint.setBrush(tqcolorGroup().foreground());
+    paint.setBrush(colorGroup().foreground());
 
     for (unsigned int i = 0; i < m_blackKeyPos.size(); ++i)
         paint.drawRect(0, m_blackKeyPos[i],
@@ -249,7 +249,7 @@ void PianoKeyboard::mouseMoveEvent(TQMouseEvent* e)
     //
     // RWB (20040220)
     //
-    MatrixView *matrixView = dynamic_cast<MatrixView*>(tqtopLevelWidget());
+    MatrixView *matrixView = dynamic_cast<MatrixView*>(topLevelWidget());
     if (matrixView) {
         MatrixStaff *staff = matrixView->getStaff(0);
 
diff --git a/src/gui/editors/matrix/PianoKeyboard.h b/src/gui/editors/matrix/PianoKeyboard.h
index 7c29c89..3d8b583 100644
--- a/src/gui/editors/matrix/PianoKeyboard.h
+++ b/src/gui/editors/matrix/PianoKeyboard.h
@@ -49,8 +49,8 @@ class PianoKeyboard : public PitchRuler
 public:
     PianoKeyboard(TQWidget *parent, int keys = 88);
 
-    virtual TQSize tqsizeHint() const;
-    virtual TQSize tqminimumSizeHint() const;
+    virtual TQSize sizeHint() const;
+    virtual TQSize minimumSizeHint() const;
 
     /* 
      * We want to be able to call this from the matrix view
diff --git a/src/gui/editors/matrix/QCanvasMatrixDiamond.cpp b/src/gui/editors/matrix/QCanvasMatrixDiamond.cpp
index d8d7b06..e44e7d5 100644
--- a/src/gui/editors/matrix/QCanvasMatrixDiamond.cpp
+++ b/src/gui/editors/matrix/QCanvasMatrixDiamond.cpp
@@ -68,7 +68,7 @@ void QCanvasMatrixDiamond::drawShape(TQPainter & p)
 
     TQPointArray pa(4);
     int q = height() / 2 + 2;
-    TQPoint mapPos = p.tqworldMatrix().map(TQPoint(int(x()), int(y())));
+    TQPoint mapPos = p.worldMatrix().map(TQPoint(int(x()), int(y())));
 
     pa[0] = TQPoint(mapPos.x(), mapPos.y() - 3);
     pa[1] = TQPoint(mapPos.x() + q, mapPos.y() - 3 + q);
diff --git a/src/gui/editors/notation/FontViewFrame.cpp b/src/gui/editors/notation/FontViewFrame.cpp
index d07ba40..0eddccd 100644
--- a/src/gui/editors/notation/FontViewFrame.cpp
+++ b/src/gui/editors/notation/FontViewFrame.cpp
@@ -125,7 +125,7 @@ void FontViewFrame::setGlyphs(bool glyphs)
     update();
 }
 
-TQSize FontViewFrame::tqsizeHint() const
+TQSize FontViewFrame::sizeHint() const
 {
     return TQSize(16 * m_fontSize * 3 / 2 + margin() + 2 * frameWidth(),
                  16 * m_fontSize * 3 / 2 + margin() + 2 * frameWidth());
diff --git a/src/gui/editors/notation/FontViewFrame.h b/src/gui/editors/notation/FontViewFrame.h
index fbfc95a..1d649c4 100644
--- a/src/gui/editors/notation/FontViewFrame.h
+++ b/src/gui/editors/notation/FontViewFrame.h
@@ -49,7 +49,7 @@ public:
     FontViewFrame(int pixelSize, TQWidget *parent = 0, const char *name = 0);
     virtual ~FontViewFrame();
 
-    TQSize tqsizeHint() const;
+    TQSize sizeHint() const;
     bool hasRow(int row) const;
 
 public slots:
diff --git a/src/gui/editors/notation/NotationStaff.h b/src/gui/editors/notation/NotationStaff.h
index bb056c0..783e3db 100644
--- a/src/gui/editors/notation/NotationStaff.h
+++ b/src/gui/editors/notation/NotationStaff.h
@@ -473,8 +473,8 @@ protected:
 
     TQPainter *m_printPainter;
 
-    enum BartqStatus { UnRendered = 0, Rendered, Positioned };
-    typedef std::map<int, BartqStatus> BarStatusMap;
+    enum BarStatus { UnRendered = 0, Rendered, Positioned };
+    typedef std::map<int, BarStatus> BarStatusMap;
     BarStatusMap m_status;
     std::pair<int, int> m_lastRenderCheck;
     bool m_ready;
diff --git a/src/gui/editors/notation/NotationView.cpp b/src/gui/editors/notation/NotationView.cpp
index bd553ee..6901135 100644
--- a/src/gui/editors/notation/NotationView.cpp
+++ b/src/gui/editors/notation/NotationView.cpp
@@ -585,7 +585,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
         setPageMode(mode);
 
         for (unsigned int i = 0; i < m_staffs.size(); ++i) {
-            m_staffs[i]->getSegment().getRefreshtqStatus
+            m_staffs[i]->getSegment().getRefreshStatus
             (m_segmentsRefreshStatusIds[i]).setNeedsRefresh(false);
         }
 
@@ -754,7 +754,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
     slotSetInsertCursorPosition(0);
     slotSetPointerPosition(doc->getComposition().getPosition());
     setCurrentSelection(0, false, true);
-    slotUpdateInsertModetqStatus();
+    slotUpdateInsertModeStatus();
     m_chordNameRuler->tqrepaint();
     m_tempoRuler->tqrepaint();
     m_rawNoteRuler->tqrepaint();
@@ -930,7 +930,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
         setPageMode(LinedStaff::MultiPageMode); // also positions and renders the staffs!
 
         for (unsigned int i = 0; i < m_staffs.size(); ++i) {
-            m_staffs[i]->getSegment().getRefreshtqStatus
+            m_staffs[i]->getSegment().getRefreshStatus
             (m_segmentsRefreshStatusIds[i]).setNeedsRefresh(false);
         }
 
@@ -1365,14 +1365,14 @@ void NotationView::positionPages()
 
     if (m_pageMode != LinedStaff::MultiPageMode) {
         if (haveBackground) {
-            canvas()->tqsetBackgroundPixmap(background);
+            canvas()->setBackgroundPixmap(background);
             getCanvasView()->setBackgroundMode(TQt::FixedPixmap);
             getCanvasView()->setPaletteBackgroundPixmap(background);
             getCanvasView()->setErasePixmap(background);
         }
     } else {
         if (haveBackground) {
-            canvas()->tqsetBackgroundPixmap(deskBackground);
+            canvas()->setBackgroundPixmap(deskBackground);
             getCanvasView()->setBackgroundMode(TQt::FixedPixmap);
             getCanvasView()->setPaletteBackgroundPixmap(background);
             getCanvasView()->setErasePixmap(background);
@@ -1482,13 +1482,13 @@ void NotationView::readOptions()
     opt = m_config->readBoolEntry("Show Annotations", true);
     m_annotationsVisible = opt;
     getToggleAction("show_annotations")->setChecked(opt);
-    slotUpdateAnnotationstqStatus();
+    slotUpdateAnnotationsStatus();
     //    slotToggleAnnotations();
 
     opt = m_config->readBoolEntry("Show LilyPond Directives", true);
     m_lilyPondDirectivesVisible = opt;
     getToggleAction("show_lilypond_directives")->setChecked(opt);
-    slotUpdateLilyPondDirectivestqStatus();
+    slotUpdateLilyPondDirectivesStatus();
 }
 
 void NotationView::setupActions()
@@ -1910,21 +1910,21 @@ void NotationView::setupActions()
     icon = TQIconSet(NotePixmapFactory::toTQPixmap
                     (NotePixmapFactory::makeToolbarPixmap("triplet")));
     (new KToggleAction(i18n("Trip&let Insert Mode"), icon, Key_G,
-                       TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModetqStatus()),
+                       TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModeStatus()),
                        actionCollection(), "triplet_mode"))->
         setChecked(false);
 
     icon = TQIconSet(NotePixmapFactory::toTQPixmap
                     (NotePixmapFactory::makeToolbarPixmap("chord")));
     (new KToggleAction(i18n("C&hord Insert Mode"), icon, Key_H,
-                       TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModetqStatus()),
+                       TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModeStatus()),
                        actionCollection(), "chord_mode"))->
         setChecked(false);
 
     icon = TQIconSet(NotePixmapFactory::toTQPixmap
                     (NotePixmapFactory::makeToolbarPixmap("group-grace")));
     (new KToggleAction(i18n("Grace Insert Mode"), icon, 0,
-                       TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModetqStatus()),
+                       TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModeStatus()),
                        actionCollection(), "grace_mode"))->
         setChecked(false);
 /*!!!
@@ -2990,12 +2990,12 @@ NotationView::paintEvent(TQPaintEvent *e)
         }
     }
 
-    slotSetOperationNameAndtqStatus(i18n("  Ready."));
+    slotSetOperationNameAndStatus(i18n("  Ready."));
 }
 
 bool NotationView::applyLayout(int staffNo, timeT startTime, timeT endTime)
 {
-    slotSetOperationNameAndtqStatus(i18n("Laying out score..."));
+    slotSetOperationNameAndStatus(i18n("Laying out score..."));
     ProgressDialog::processEvents();
 
     m_htqlayout->setStaffCount(m_staffs.size());
@@ -3008,7 +3008,7 @@ bool NotationView::applyLayout(int staffNo, timeT startTime, timeT endTime)
         if (staffNo >= 0 && (int)i != staffNo)
             continue;
 
-        slotSetOperationNameAndtqStatus(i18n("Laying out staff %1...").tqarg(i + 1));
+        slotSetOperationNameAndStatus(i18n("Laying out staff %1...").tqarg(i + 1));
         ProgressDialog::processEvents();
 
         m_htqlayout->resetStaff(*m_staffs[i], startTime, endTime);
@@ -3017,7 +3017,7 @@ bool NotationView::applyLayout(int staffNo, timeT startTime, timeT endTime)
         m_vtqlayout->scanStaff(*m_staffs[i], startTime, endTime);
     }
 
-    slotSetOperationNameAndtqStatus(i18n("Reconciling staffs..."));
+    slotSetOperationNameAndStatus(i18n("Reconciling staffs..."));
     ProgressDialog::processEvents();
 
     m_htqlayout->finishLayout(startTime, endTime);
@@ -3195,7 +3195,7 @@ void NotationView::setCurrentSelection(EventSelection* s, bool preview,
                         std::max(endA, endB));
             } else {
                 // mark refresh status and then request a tqrepaint
-                segment.getRefreshtqStatus
+                segment.getRefreshStatus
                 (m_segmentsRefreshStatusIds
                  [getLinedStaff(segment)->getId()]).
                 push(std::min(startA, startB), std::max(endA, endB));
@@ -3213,12 +3213,12 @@ void NotationView::setCurrentSelection(EventSelection* s, bool preview,
             } else {
                 // mark refresh status and then request a tqrepaint
 
-                oldSelection->getSegment().getRefreshtqStatus
+                oldSelection->getSegment().getRefreshStatus
                 (m_segmentsRefreshStatusIds
                  [getLinedStaff(oldSelection->getSegment())->getId()]).
                 push(startA, endA);
 
-                s->getSegment().getRefreshtqStatus
+                s->getSegment().getRefreshStatus
                 (m_segmentsRefreshStatusIds
                  [getLinedStaff(s->getSegment())->getId()]).
                 push(startB, endB);
@@ -3809,7 +3809,7 @@ void NotationView::refreshSegment(Segment *segment,
     }
 
     setMenuStates();
-    slotSetOperationNameAndtqStatus(i18n("  Ready."));
+    slotSetOperationNameAndStatus(i18n("  Ready."));
     NOTATION_DEBUG << "*** " << endl;
 }
 
@@ -3876,7 +3876,7 @@ void NotationView::readjustCanvasSize()
     double maxWidth = 0.0;
     int maxHeight = 0;
 
-    slotSetOperationNameAndtqStatus(i18n("Sizing and allocating canvas..."));
+    slotSetOperationNameAndStatus(i18n("Sizing and allocating canvas..."));
     ProgressDialog::processEvents();
 
     int progressTotal = m_staffs.size() + 2;
@@ -4146,7 +4146,7 @@ void NotationView::setupProgress(ProgressDialog* dialog)
 
         for (unsigned int i = 0; i < m_staffs.size(); ++i) {
             connect(m_staffs[i], TQT_SIGNAL(setOperationName(TQString)),
-                    this, TQT_SLOT(slotSetOperationNameAndtqStatus(TQString)));
+                    this, TQT_SLOT(slotSetOperationNameAndStatus(TQString)));
 
             connect(dialog, TQT_SIGNAL(cancelClicked()),
                     m_staffs[i], TQT_SLOT(slotCancel()));
@@ -4159,7 +4159,7 @@ void NotationView::setupProgress(ProgressDialog* dialog)
 
 }
 
-void NotationView::slotSetOperationNameAndtqStatus(TQString name)
+void NotationView::slotSetOperationNameAndStatus(TQString name)
 {
     emit setOperationName(name);
     statusBar()->changeItem(TQString("  %1").tqarg(name),
@@ -4230,7 +4230,7 @@ NotationView::MarkActionDataMap* NotationView::m_markActionDataMap = 0;
 
 
 void
-NotationView::slotUpdateInsertModetqStatus()
+NotationView::slotUpdateInsertModeStatus()
 {
     TQString tripletMessage = i18n("Triplet");
     TQString chordMessage = i18n("Chord");
@@ -4253,7 +4253,7 @@ NotationView::slotUpdateInsertModetqStatus()
 }
 
 void
-NotationView::slotUpdateAnnotationstqStatus()
+NotationView::slotUpdateAnnotationsStatus()
 {
     if (!areAnnotationsVisible()) {
         for (int i = 0; i < getStaffCount(); ++i) {
@@ -4273,7 +4273,7 @@ NotationView::slotUpdateAnnotationstqStatus()
 }
 
 void
-NotationView::slotUpdateLilyPondDirectivestqStatus()
+NotationView::slotUpdateLilyPondDirectivesStatus()
 {
     if (!areLilyPondDirectivesVisible()) {
         for (int i = 0; i < getStaffCount(); ++i) {
@@ -6998,7 +6998,7 @@ void NotationView::slotToggleTempoRuler()
 void NotationView::slotToggleAnnotations()
 {
     m_annotationsVisible = !m_annotationsVisible;
-    slotUpdateAnnotationstqStatus();
+    slotUpdateAnnotationsStatus();
     //!!! use refresh mechanism
     refreshSegment(0, 0, 0);
 }
@@ -7006,7 +7006,7 @@ void NotationView::slotToggleAnnotations()
 void NotationView::slotToggleLilyPondDirectives()
 {
     m_lilyPondDirectivesVisible = !m_lilyPondDirectivesVisible;
-    slotUpdateLilyPondDirectivestqStatus();
+    slotUpdateLilyPondDirectivesStatus();
     //!!! use refresh mechanism
     refreshSegment(0, 0, 0);
 }
diff --git a/src/gui/editors/notation/NotationView.h b/src/gui/editors/notation/NotationView.h
index 461d299..2e51096 100644
--- a/src/gui/editors/notation/NotationView.h
+++ b/src/gui/editors/notation/NotationView.h
@@ -494,9 +494,9 @@ public slots:
     void slotToggleStepByStep();
 
     /// status stuff
-    void slotUpdateInsertModetqStatus();
-    void slotUpdateAnnotationstqStatus();
-    void slotUpdateLilyPondDirectivestqStatus();
+    void slotUpdateInsertModeStatus();
+    void slotUpdateAnnotationsStatus();
+    void slotUpdateLilyPondDirectivesStatus();
 
     /// edit menu
     void slotPreviewSelection();
@@ -812,7 +812,7 @@ public slots:
     /// Do some background rendering work.
     void slotRenderSomething();
 
-    void slotSetOperationNameAndtqStatus(TQString);
+    void slotSetOperationNameAndStatus(TQString);
 
     // Update notation view based on track/staff name change
     void slotUpdateStaffName();
diff --git a/src/gui/editors/notation/NotePixmapPainter.h b/src/gui/editors/notation/NotePixmapPainter.h
index 9b56052..c4836f6 100644
--- a/src/gui/editors/notation/NotePixmapPainter.h
+++ b/src/gui/editors/notation/NotePixmapPainter.h
@@ -105,19 +105,19 @@ public:
 
     void drawPolygon(const TQPointArray &a, bool winding = false,
 		     int index = 0, int n = -1) {
-	m_painter->tqdrawPolygon(a, winding, index, n);
-	if (m_useMask) m_maskPainter.tqdrawPolygon(a, winding, index, n);
+	m_painter->drawPolygon(a, winding, index, n);
+	if (m_useMask) m_maskPainter.drawPolygon(a, winding, index, n);
     }
 
     void drawPolyline(const TQPointArray &a, int index = 0, int n = -1) {
-	m_painter->tqdrawPolyline(a, index, n);
-	if (m_useMask) m_maskPainter.tqdrawPolyline(a, index, n);
+	m_painter->drawPolyline(a, index, n);
+	if (m_useMask) m_maskPainter.drawPolyline(a, index, n);
     }
 
     void drawPixmap(int x, int y, const TQPixmap &pm,
 		    int sx = 0, int sy = 0, int sw = -1, int sh = -1) {
-	m_painter->tqdrawPixmap(x, y, pm, sx, sy, sw, sh);
-	if (m_useMask) m_maskPainter.tqdrawPixmap(x, y, *(pm.mask()), sx, sy, sw, sh);
+	m_painter->drawPixmap(x, y, pm, sx, sy, sw, sh);
+	if (m_useMask) m_maskPainter.drawPixmap(x, y, *(pm.mask()), sx, sy, sw, sh);
     }
 
     void drawText(int x, int y, const TQString &string) {
diff --git a/src/gui/editors/notation/TrackHeader.cpp b/src/gui/editors/notation/TrackHeader.cpp
index fa19ca5..73ac29a 100644
--- a/src/gui/editors/notation/TrackHeader.cpp
+++ b/src/gui/editors/notation/TrackHeader.cpp
@@ -65,7 +65,7 @@ namespace Rosegarden
 {
 
 
-// tqStatus bits
+// Status bits
 const int TrackHeader::SEGMENT_HERE                = 1 << 0;
 const int TrackHeader::SUPERIMPOSED_SEGMENTS       = 1 << 1;
 const int TrackHeader::INCONSISTENT_CLEFS          = 1 << 2;
diff --git a/src/gui/editors/notation/TrackHeader.h b/src/gui/editors/notation/TrackHeader.h
index 3f7029e..85ee067 100644
--- a/src/gui/editors/notation/TrackHeader.h
+++ b/src/gui/editors/notation/TrackHeader.h
@@ -169,7 +169,7 @@ private :
     void transposeValueToName(int transpose, TQString &transposeName);
 
 
-    // tqStatus bits
+    // Status bits
     static const int SEGMENT_HERE;
     static const int SUPERIMPOSED_SEGMENTS;
     static const int INCONSISTENT_CLEFS;
diff --git a/src/gui/editors/parameters/InstrumentParameterPanel.cpp b/src/gui/editors/parameters/InstrumentParameterPanel.cpp
index 9cca26d..ba91b17 100644
--- a/src/gui/editors/parameters/InstrumentParameterPanel.cpp
+++ b/src/gui/editors/parameters/InstrumentParameterPanel.cpp
@@ -48,7 +48,7 @@ InstrumentParameterPanel::InstrumentParameterPanel(RosegardenGUIDoc *doc,
     int width25 = metrics.width("1234567890123456789012345");
 
     m_instrumentLabel->setFixedWidth(width25);
-    m_instrumentLabel->tqsetAlignment(TQt::AlignCenter);
+    m_instrumentLabel->setAlignment(TQt::AlignCenter);
 }
 
 void
diff --git a/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp b/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp
index ceb2e26..e033b0c 100644
--- a/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp
+++ b/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp
@@ -98,7 +98,7 @@ MIDIInstrumentParameterPanel::MIDIInstrumentParameterPanel(RosegardenGUIDoc *doc
     m_variationValue->setMinimumWidth(width22);
 
     m_connectionLabel->setFixedWidth(width25);
-    m_connectionLabel->tqsetAlignment(TQt::AlignCenter);
+    m_connectionLabel->setAlignment(TQt::AlignCenter);
 
     // Configure the empty final row to accomodate any extra vertical space.
 
diff --git a/src/gui/editors/parameters/RosegardenParameterArea.cpp b/src/gui/editors/parameters/RosegardenParameterArea.cpp
index 5e13652..dff3f7c 100644
--- a/src/gui/editors/parameters/RosegardenParameterArea.cpp
+++ b/src/gui/editors/parameters/RosegardenParameterArea.cpp
@@ -86,7 +86,7 @@ void RosegardenParameterArea::addRosegardenParameterBox(
     m_parameterBoxes.push_back(b);
 
     m_scrollView->setMinimumWidth(std::max(m_scrollView->minimumWidth(),
-                                           b->tqsizeHint().width()) + 8);
+                                           b->sizeHint().width()) + 8);
 
     // Create a titled group box for the parameter box, parented by the
     // classic tqlayout widget, so that it can be used to provide a title
diff --git a/src/gui/editors/parameters/TrackParameterBox.cpp b/src/gui/editors/parameters/TrackParameterBox.cpp
index 94b1137..0a0a5ba 100644
--- a/src/gui/editors/parameters/TrackParameterBox.cpp
+++ b/src/gui/editors/parameters/TrackParameterBox.cpp
@@ -128,7 +128,7 @@ TrackParameterBox::TrackParameterBox( RosegardenGUIDoc *doc,
     // track label
     //
     m_trackLabel = new KSqueezedTextLabel(i18n("<untitled>"), this);
-    m_trackLabel->tqsetAlignment(TQt::AlignCenter);
+    m_trackLabel->setAlignment(TQt::AlignCenter);
     //mainLayout->addMultiCellWidget(m_trackLabel, 0, 0, 0, 5, AlignCenter);
     mainLayout->addWidget(m_trackLabel, 0, 0);
 
diff --git a/src/gui/editors/segment/ControlEditorDialog.cpp b/src/gui/editors/segment/ControlEditorDialog.cpp
index 581e065..4766aeb 100644
--- a/src/gui/editors/segment/ControlEditorDialog.cpp
+++ b/src/gui/editors/segment/ControlEditorDialog.cpp
@@ -121,7 +121,7 @@ ControlEditorDialog::ControlEditorDialog(TQWidget *parent,
 
     TQFrame* btnBox = new TQFrame(mainFrame);
 
-    btnBox->tqsetSizePolicy(
+    btnBox->setSizePolicy(
         TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
 
     TQHBoxLayout* tqlayout = new TQHBoxLayout(btnBox, 4, 10);
diff --git a/src/gui/editors/segment/MarkerEditor.cpp b/src/gui/editors/segment/MarkerEditor.cpp
index 029ff9c..3d8d11d 100644
--- a/src/gui/editors/segment/MarkerEditor.cpp
+++ b/src/gui/editors/segment/MarkerEditor.cpp
@@ -105,7 +105,7 @@ MarkerEditor::MarkerEditor(TQWidget *parent,
 
     TQFrame* btnBox = new TQFrame(mainFrame);
 
-    btnBox->tqsetSizePolicy(
+    btnBox->setSizePolicy(
         TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
 
     TQHBoxLayout* tqlayout = new TQHBoxLayout(btnBox, 4, 10);
diff --git a/src/gui/editors/segment/TrackEditor.cpp b/src/gui/editors/segment/TrackEditor.cpp
index 3fa85ba..9559bdf 100644
--- a/src/gui/editors/segment/TrackEditor.cpp
+++ b/src/gui/editors/segment/TrackEditor.cpp
@@ -360,13 +360,13 @@ int TrackEditor::getTrackCellHeight() const
 
 bool TrackEditor::isCompositionModified()
 {
-    return m_doc->getComposition().getRefreshtqStatus
+    return m_doc->getComposition().getRefreshStatus
            (m_compositionRefreshStatusId).needsRefresh();
 }
 
 void TrackEditor::setCompositionModified(bool c)
 {
-    m_doc->getComposition().getRefreshtqStatus
+    m_doc->getComposition().getRefreshStatus
     (m_compositionRefreshStatusId).setNeedsRefresh(c);
 }
 
@@ -490,7 +490,7 @@ TrackEditor::slotSetPointerPosition(timeT position)
     if (distance >= 1.0) {
 
         if (m_doc && m_doc->getSequenceManager() &&
-            (m_doc->getSequenceManager()->getTransporttqStatus() != STOPPED)) {
+            (m_doc->getSequenceManager()->getTransportStatus() != STOPPED)) {
             
             if (m_playTracking) {
                 getSegmentCanvas()->slotScrollHoriz(int(double(position) / ruler->getUnitsPerPixel()));
@@ -547,7 +547,7 @@ bool TrackEditor::handleAutoScroll(int currentPosition, timeT newTimePosition, d
     if (moveDetected) {
 
         if (m_doc && m_doc->getSequenceManager() &&
-                (m_doc->getSequenceManager()->getTransporttqStatus() != STOPPED)) {
+                (m_doc->getSequenceManager()->getTransportStatus() != STOPPED)) {
 
             if (m_playTracking) {
                 getSegmentCanvas()->slotScrollHoriz(int(double(newTimePosition) / ruler->getUnitsPerPixel()));
diff --git a/src/gui/editors/segment/TrackHeader.cpp b/src/gui/editors/segment/TrackHeader.cpp
index 84b850b..3806c6d 100644
--- a/src/gui/editors/segment/TrackHeader.cpp
+++ b/src/gui/editors/segment/TrackHeader.cpp
@@ -41,7 +41,7 @@ void
 TrackHeader::paintEvent(TQPaintEvent *e)
 {
     TQPainter p( this );
-    p.setPen( tqcolorGroup().buttonText() );
+    p.setPen( colorGroup().buttonText() );
     int pos = (orientation() == Qt::Horizontal)
               ? e->rect().left()
               : e->rect().top();
diff --git a/src/gui/editors/segment/TrackLabel.cpp b/src/gui/editors/segment/TrackLabel.cpp
index 144fcd6..49b3afc 100644
--- a/src/gui/editors/segment/TrackLabel.cpp
+++ b/src/gui/editors/segment/TrackLabel.cpp
@@ -124,18 +124,18 @@ TrackLabel::setSelected(bool on)
     if (on) {
         m_selected = true;
 
-        m_instrumentLabel->setPaletteBackgroundColor(tqcolorGroup().highlight());
-        m_instrumentLabel->setPaletteForegroundColor(tqcolorGroup().highlightedText());
-        m_trackLabel->setPaletteBackgroundColor(tqcolorGroup().highlight());
-        m_trackLabel->setPaletteForegroundColor(tqcolorGroup().highlightedText());
+        m_instrumentLabel->setPaletteBackgroundColor(colorGroup().highlight());
+        m_instrumentLabel->setPaletteForegroundColor(colorGroup().highlightedText());
+        m_trackLabel->setPaletteBackgroundColor(colorGroup().highlight());
+        m_trackLabel->setPaletteForegroundColor(colorGroup().highlightedText());
 
     } else {
         m_selected = false;
 
-        m_instrumentLabel->setPaletteBackgroundColor(tqcolorGroup().background());
-        m_trackLabel->setPaletteBackgroundColor(tqcolorGroup().background());
-        m_instrumentLabel->setPaletteForegroundColor(tqcolorGroup().text());
-        m_trackLabel->setPaletteForegroundColor(tqcolorGroup().text());
+        m_instrumentLabel->setPaletteBackgroundColor(colorGroup().background());
+        m_trackLabel->setPaletteBackgroundColor(colorGroup().background());
+        m_instrumentLabel->setPaletteForegroundColor(colorGroup().text());
+        m_trackLabel->setPaletteForegroundColor(colorGroup().text());
     }
     if (visibleWidget())
         visibleWidget()->update();
diff --git a/src/gui/editors/segment/TrackVUMeter.cpp b/src/gui/editors/segment/TrackVUMeter.cpp
index ad91278..dbf2d5d 100644
--- a/src/gui/editors/segment/TrackVUMeter.cpp
+++ b/src/gui/editors/segment/TrackVUMeter.cpp
@@ -43,7 +43,7 @@ TrackVUMeter::TrackVUMeter(TQWidget *parent,
         VUMeter(parent, type, false, false, width, height, VUMeter::Horizontal, name),
         m_position(position), m_textHeight(12)
 {
-    tqsetAlignment(AlignCenter);
+    setAlignment(AlignCenter);
 
     TQFont font;
     font.setPointSize(font.pointSize() * 95 / 100);
diff --git a/src/gui/editors/segment/TriggerSegmentManager.cpp b/src/gui/editors/segment/TriggerSegmentManager.cpp
index 29b7bf0..1dc2094 100644
--- a/src/gui/editors/segment/TriggerSegmentManager.cpp
+++ b/src/gui/editors/segment/TriggerSegmentManager.cpp
@@ -99,7 +99,7 @@ TriggerSegmentManager::TriggerSegmentManager(TQWidget *parent,
 
     TQFrame* btnBox = new TQFrame(mainFrame);
 
-    btnBox->tqsetSizePolicy(
+    btnBox->setSizePolicy(
         TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
 
     TQHBoxLayout* tqlayout = new TQHBoxLayout(btnBox, 4, 10);
diff --git a/src/gui/editors/segment/segmentcanvas/CompositionItemHelper.cpp b/src/gui/editors/segment/segmentcanvas/CompositionItemHelper.cpp
index fe4b926..9579ba2 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionItemHelper.cpp
+++ b/src/gui/editors/segment/segmentcanvas/CompositionItemHelper.cpp
@@ -60,12 +60,12 @@ timeT CompositionItemHelper::getEndTime(const CompositionItem& item, const Roseg
     timeT t = 0;
 
     if (item) {
-        TQRect tqitemRect = item->rect();
+        TQRect itemRect = item->rect();
         
-        t = std::max(grid.snapX(tqitemRect.x() + tqitemRect.width()), 0L);
+        t = std::max(grid.snapX(itemRect.x() + itemRect.width()), 0L);
 
 //         RG_DEBUG << "CompositionItemHelper::getEndTime() : rect width = "
-//                  << tqitemRect.width()
+//                  << itemRect.width()
 //                  << " - item is repeating : " << item->isRepeating()
 //                  << " - endTime = " << t
 //                  << endl;
diff --git a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
index 75216b8..178dd0e 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
+++ b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
@@ -227,7 +227,7 @@ void CompositionView::slotUpdateSize()
 
     RulerScale *ruler = grid().getRulerScale();
 
-    int minWidth = tqsizeHint().width();
+    int minWidth = sizeHint().width();
     int computedWidth = int(nearbyint(ruler->getTotalWidth()));
 
     int width = std::max(computedWidth, minWidth);