1 files changed, 27 insertions, 27 deletions

diff --git a/src/gui/editors/notation/TrackHeader.cpp b/src/gui/editors/notation/TrackHeader.cpp
index f2793ab..de5bf5f 100644
--- a/src/gui/editors/notation/TrackHeader.cpp
+++ b/src/gui/editors/notation/TrackHeader.cpp
@@ -65,7 +65,7 @@ namespace Rosegarden
 {
 
 
-// Status bits
+// tqStatus bits
 const int TrackHeader::SEGMENT_HERE                = 1 << 0;
 const int TrackHeader::SUPERIMPOSED_SEGMENTS       = 1 << 1;
 const int TrackHeader::INCONSISTENT_CLEFS          = 1 << 2;
@@ -75,8 +75,8 @@ const int TrackHeader::INCONSISTENT_TRANSPOSITIONS = 1 << 5;
 const int TrackHeader::BEFORE_FIRST_SEGMENT        = 1 << 6;
 
 
-TrackHeader::TrackHeader(TQWidget *parent, TrackId trackId, int height, int ypos) :
-        TQLabel(parent),
+TrackHeader::TrackHeader(TQWidget *tqparent, TrackId trackId, int height, int ypos) :
+        TQLabel(tqparent),
         m_track(trackId),
         m_height(height),
         m_ypos(ypos),
@@ -96,7 +96,7 @@ TrackHeader::TrackHeader(TQWidget *parent, TrackId trackId, int height, int ypos
         m_current(false)
 {
 
-    m_notationView = static_cast<HeadersGroup *>(parent)->getNotationView();
+    m_notationView = static_cast<HeadersGroup *>(tqparent)->getNotationView();
 
     setFrameStyle(TQFrame::Box | TQFrame::Plain);
     setCurrent(false);
@@ -106,17 +106,17 @@ TrackHeader::TrackHeader(TQWidget *parent, TrackId trackId, int height, int ypos
     // Tooltip text creation
 
     Composition *comp = 
-        static_cast<HeadersGroup *>(parent)->getComposition();
+        static_cast<HeadersGroup *>(tqparent)->getComposition();
     Track *track = comp->getTrackById(m_track);
     int trackPos = comp->getTrackPositionById(m_track);
 
     TQString toolTipText = TQString(i18n("Track %1 : \"%2\"")
-                            .arg(trackPos + 1)
-                            .arg(strtoqstr(track->getLabel())));
+                            .tqarg(trackPos + 1)
+                            .tqarg(strtoqstr(track->getLabel())));
 
-    TQString preset = track->getPresetLabel();
+    TQString preset = track->getPresetLabel().c_str();
     if (preset != TQString(""))
-        toolTipText += TQString(i18n("\nNotate for: %1").arg(preset));
+        toolTipText += TQString(i18n("\nNotate for: %1").tqarg(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 "))
-                            .arg(notationSize)
-                            .arg(bracketText);
+                            .tqarg(notationSize)
+                            .tqarg(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\""))
-                                    .arg(barStart)
-                                    .arg(barEnd)
-                                    .arg(transposeName)
-                                    .arg(transpose)
-                                    .arg(strtoqstr((*i)->getLabel()));
+                                    .tqarg(barStart)
+                                    .tqarg(barEnd)
+                                    .tqarg(transposeName)
+                                    .tqarg(transpose)
+                                    .tqarg(strtoqstr((*i)->getLabel()));
         } else {
             toolTipText += TQString(i18n("\nbars [%1-%2] (tr=%3) : \"%4\""))
-                                    .arg(barStart)
-                                    .arg(barEnd)
-                                    .arg(transpose)
-                                    .arg(strtoqstr((*i)->getLabel()));
+                                    .tqarg(barStart)
+                                    .tqarg(barEnd)
+                                    .tqarg(transpose)
+                                    .tqarg(strtoqstr((*i)->getLabel()));
         }
     }
 
@@ -274,7 +274,7 @@ TrackHeader::lookAtStaff(double x, int maxWidth)
     int staff;
 
     Composition *comp = 
-        static_cast<HeadersGroup *>(parent())->getComposition();
+        static_cast<HeadersGroup *>(TQT_TQWIDGET(tqparent()))->getComposition();
     Track *track = comp->getTrackById(m_track);
     int trackPos = comp->getTrackPositionById(m_track);
 
@@ -350,9 +350,9 @@ TrackHeader::lookAtStaff(double x, int maxWidth)
     transposeValueToName(m_transpose, noteName);
 
     m_upperText = TQString(i18n("%1: %2")
-                                .arg(trackPos + 1)
-                                .arg(strtoqstr(track->getLabel())));
-    if (m_transpose) m_transposeText = i18n(" in %1").arg(noteName);
+                                .tqarg(trackPos + 1)
+                                .tqarg(strtoqstr(track->getLabel())));
+    if (m_transpose) m_transposeText = i18n(" in %1").tqarg(noteName);
     else             m_transposeText = TQString("");
 
     NotePixmapFactory * npf = m_notationView->getNotePixmapFactory();
@@ -414,15 +414,15 @@ TrackHeader::updateHeader(int width)
         TQColor clefColour;
         if (m_status & (SEGMENT_HERE | BEFORE_FIRST_SEGMENT)) {
             if (m_status & (INCONSISTENT_CLEFS | INCONSISTENT_KEYS))
-                clefColour = Qt::red;
+                clefColour = TQt::red;
             else
-                clefColour = Qt::black;
+                clefColour = TQt::black;
         } else {
             drawClef = false;
         }
 
         NotePixmapFactory * npf = m_notationView->getNotePixmapFactory();
-        TQPixmap pmap = NotePixmapFactory::toQPixmap(
+        TQPixmap pmap = NotePixmapFactory::toTQPixmap(
                   npf->makeTrackHeaderPixmap(width, m_height, this));
 
         setPixmap(pmap);