1 files changed, 26 insertions, 26 deletions

diff --git a/src/gui/editors/segment/MarkerEditor.cpp b/src/gui/editors/segment/MarkerEditor.cpp
index 029ff9c..2eb8b3f 100644
--- a/src/gui/editors/segment/MarkerEditor.cpp
+++ b/src/gui/editors/segment/MarkerEditor.cpp
@@ -25,7 +25,7 @@
 
 #include "MarkerEditor.h"
 #include "MarkerEditorViewItem.h"
-#include <tqlayout.h>
+#include <layout.h>
 #include <kapplication.h>
 
 #include <klocale.h>
@@ -105,10 +105,10 @@ 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);
+    TQHBoxLayout* layout = new TQHBoxLayout(btnBox, 4, 10);
 
     m_addButton = new TQPushButton(i18n("Add"), btnBox);
     m_deleteButton = new TQPushButton(i18n("Delete"), btnBox);
@@ -132,14 +132,14 @@ MarkerEditor::MarkerEditor(TQWidget *parent,
         (m_closeButton,
                 i18n("Close the Marker Editor"));
 
-    tqlayout->addStretch(10);
-    tqlayout->addWidget(m_addButton);
-    tqlayout->addWidget(m_deleteButton);
-    tqlayout->addWidget(m_deleteAllButton);
-    tqlayout->addSpacing(30);
+    layout->addStretch(10);
+    layout->addWidget(m_addButton);
+    layout->addWidget(m_deleteButton);
+    layout->addWidget(m_deleteAllButton);
+    layout->addSpacing(30);
 
-    tqlayout->addWidget(m_closeButton);
-    tqlayout->addSpacing(5);
+    layout->addWidget(m_closeButton);
+    layout->addSpacing(5);
 
     connect(m_addButton, TQT_SIGNAL(released()),
             TQT_SLOT(slotAdd()));
@@ -182,7 +182,7 @@ void
 MarkerEditor::updatePosition()
 {
     timeT pos = m_doc->getComposition().getPosition();
-    m_absoluteTime->setText(TQString("%1").tqarg(pos));
+    m_absoluteTime->setText(TQString("%1").arg(pos));
 
     RealTime rT = m_doc->getComposition().getElapsedRealTime(pos);
     long hours = rT.sec / (60 * 60);
@@ -192,9 +192,9 @@ MarkerEditor::updatePosition()
 
     TQString realTime, secsStr;
     if (hours)
-        realTime += TQString("%1h ").tqarg(hours);
+        realTime += TQString("%1h ").arg(hours);
     if (mins)
-        realTime += TQString("%1m ").tqarg(mins);
+        realTime += TQString("%1m ").arg(mins);
     secsStr.sprintf("%ld.%03lds", secs, msecs);
     realTime += secsStr;
 
@@ -203,7 +203,7 @@ MarkerEditor::updatePosition()
         m_realTime->setText(realTime);
 
     TQString barTime =
-        TQString("%1").tqarg(m_doc->getComposition().getBarNumber(pos) + 1);
+        TQString("%1").arg(m_doc->getComposition().getBarNumber(pos) + 1);
 
     // again only update if needed
     if (m_barTime->text() != barTime)
@@ -542,27 +542,27 @@ MarkerEditor::makeTimeString(timeT time, int timeMode)
             (time, bar, beat, fraction, remainder);
             ++bar;
             return TQString("%1%2%3-%4%5-%6%7-%8%9   ")
-                   .tqarg(bar / 100)
-                   .tqarg((bar % 100) / 10)
-                   .tqarg(bar % 10)
-                   .tqarg(beat / 10)
-                   .tqarg(beat % 10)
-                   .tqarg(fraction / 10)
-                   .tqarg(fraction % 10)
-                   .tqarg(remainder / 10)
-                   .tqarg(remainder % 10);
+                   .arg(bar / 100)
+                   .arg((bar % 100) / 10)
+                   .arg(bar % 10)
+                   .arg(beat / 10)
+                   .arg(beat % 10)
+                   .arg(fraction / 10)
+                   .arg(fraction % 10)
+                   .arg(remainder / 10)
+                   .arg(remainder % 10);
         }
 
     case 1:  // real time
         {
             RealTime rt =
                 m_doc->getComposition().getElapsedRealTime(time);
-            //        return TQString("%1   ").tqarg(rt.toString().c_str());
-            return TQString("%1   ").tqarg(rt.toText().c_str());
+            //        return TQString("%1   ").arg(rt.toString().c_str());
+            return TQString("%1   ").arg(rt.toText().c_str());
         }
 
     default:
-        return TQString("%1   ").tqarg(time);
+        return TQString("%1   ").arg(time);
     }
 }