1 files changed, 15 insertions, 15 deletions

diff --git a/src/gui/editors/segment/TrackLabel.cpp b/src/gui/editors/segment/TrackLabel.cpp
index 9df485f..53795a7 100644
--- a/src/gui/editors/segment/TrackLabel.cpp
+++ b/src/gui/editors/segment/TrackLabel.cpp
@@ -45,9 +45,9 @@ namespace Rosegarden
 
 TrackLabel::TrackLabel(TrackId id,
                        int position,
-                       TQWidget *parent,
+                       TQWidget *tqparent,
                        const char *name):
-        TQWidgetStack(parent, name),
+        TQWidgetStack(tqparent, name),
         m_instrumentLabel(new TQLabel(this)),
         m_trackLabel(new TQLabel(this)),
         m_id(id),
@@ -124,18 +124,18 @@ TrackLabel::setSelected(bool on)
     if (on) {
         m_selected = true;
 
-        m_instrumentLabel->setPaletteBackgroundColor(colorGroup().highlight());
-        m_instrumentLabel->setPaletteForegroundColor(colorGroup().highlightedText());
-        m_trackLabel->setPaletteBackgroundColor(colorGroup().highlight());
-        m_trackLabel->setPaletteForegroundColor(colorGroup().highlightedText());
+        m_instrumentLabel->setPaletteBackgroundColor(tqcolorGroup().highlight());
+        m_instrumentLabel->setPaletteForegroundColor(tqcolorGroup().highlightedText());
+        m_trackLabel->setPaletteBackgroundColor(tqcolorGroup().highlight());
+        m_trackLabel->setPaletteForegroundColor(tqcolorGroup().highlightedText());
 
     } else {
         m_selected = false;
 
-        m_instrumentLabel->setPaletteBackgroundColor(colorGroup().background());
-        m_trackLabel->setPaletteBackgroundColor(colorGroup().background());
-        m_instrumentLabel->setPaletteForegroundColor(colorGroup().text());
-        m_trackLabel->setPaletteForegroundColor(colorGroup().text());
+        m_instrumentLabel->setPaletteBackgroundColor(tqcolorGroup().background());
+        m_trackLabel->setPaletteBackgroundColor(tqcolorGroup().background());
+        m_instrumentLabel->setPaletteForegroundColor(tqcolorGroup().text());
+        m_trackLabel->setPaletteForegroundColor(tqcolorGroup().text());
     }
     if (visibleWidget())
         visibleWidget()->update();
@@ -144,12 +144,12 @@ TrackLabel::setSelected(bool on)
 void
 TrackLabel::mousePressEvent(TQMouseEvent *e)
 {
-    if (e->button() == RightButton) {
+    if (e->button() == Qt::RightButton) {
 
         emit clicked();
         emit changeToInstrumentList();
 
-    } else if (e->button() == LeftButton) {
+    } else if (e->button() == Qt::LeftButton) {
 
         // start a timer on this hold
         m_pressTimer->start(200, true); // 200ms, single shot
@@ -163,7 +163,7 @@ TrackLabel::mouseReleaseEvent(TQMouseEvent *e)
     if (m_pressTimer->isActive())
         m_pressTimer->stop();
 
-    if (e->button() == LeftButton) {
+    if (e->button() == Qt::LeftButton) {
         emit clicked();
     }
 }
@@ -171,7 +171,7 @@ TrackLabel::mouseReleaseEvent(TQMouseEvent *e)
 void
 TrackLabel::mouseDoubleClickEvent(TQMouseEvent *e)
 {
-    if (e->button() != LeftButton)
+    if (e->button() != Qt::LeftButton)
         return ;
 
     // Highlight this label alone and cheat using
@@ -186,7 +186,7 @@ TrackLabel::mouseDoubleClickEvent(TQMouseEvent *e)
 
     bool ok = false;
 
-    TQRegExpValidator validator(TQRegExp(".*"), this); // empty is OK
+    TQRegExpValidator validator(TQRegExp(".*"), TQT_TQOBJECT(this)); // empty is OK
 
     TQString newText = KLineEditDlg::getText(i18n("Change track name"),
                                             i18n("Enter new track name"),