1 files changed, 19 insertions, 19 deletions

diff --git a/src/gui/dialogs/TupletDialog.cpp b/src/gui/dialogs/TupletDialog.cpp
index d9d528b..e4a1e00 100644
--- a/src/gui/dialogs/TupletDialog.cpp
+++ b/src/gui/dialogs/TupletDialog.cpp
@@ -24,7 +24,7 @@
 
 
 #include "TupletDialog.h"
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klocale.h>
 #include "base/NotationTypes.h"
@@ -120,7 +120,7 @@ TupletDialog::TupletDialog(TQWidget *parent, Note::Type defaultUnitType,
         new TQLabel(i18n("Selected region:"), timingDisplayGrid);
         new TQLabel("", timingDisplayGrid);
         m_selectionDurationDisplay = new TQLabel("x", timingDisplayGrid);
-        m_selectionDurationDisplay->tqsetAlignment(int(TQLabel::AlignVCenter |
+        m_selectionDurationDisplay->setAlignment(int(TQLabel::AlignVCenter |
                 TQLabel::AlignRight));
     } else {
         m_selectionDurationDisplay = 0;
@@ -129,19 +129,19 @@ TupletDialog::TupletDialog(TQWidget *parent, Note::Type defaultUnitType,
     new TQLabel(i18n("Group with current timing:"), timingDisplayGrid);
     m_untupledDurationCalculationDisplay = new TQLabel("x", timingDisplayGrid);
     m_untupledDurationDisplay = new TQLabel("x", timingDisplayGrid);
-    m_untupledDurationDisplay->tqsetAlignment(int(TQLabel::AlignVCenter |
+    m_untupledDurationDisplay->setAlignment(int(TQLabel::AlignVCenter |
                                             TQLabel::AlignRight));
 
     new TQLabel(i18n("Group with new timing:"), timingDisplayGrid);
     m_tupledDurationCalculationDisplay = new TQLabel("x", timingDisplayGrid);
     m_tupledDurationDisplay = new TQLabel("x", timingDisplayGrid);
-    m_tupledDurationDisplay->tqsetAlignment(int(TQLabel::AlignVCenter |
+    m_tupledDurationDisplay->setAlignment(int(TQLabel::AlignVCenter |
                                           TQLabel::AlignRight));
 
     new TQLabel(i18n("Gap created by timing change:"), timingDisplayGrid);
     m_newGapDurationCalculationDisplay = new TQLabel("x", timingDisplayGrid);
     m_newGapDurationDisplay = new TQLabel("x", timingDisplayGrid);
-    m_newGapDurationDisplay->tqsetAlignment(int(TQLabel::AlignVCenter |
+    m_newGapDurationDisplay->setAlignment(int(TQLabel::AlignVCenter |
                                           TQLabel::AlignRight));
 
     if (maxDuration > 0) {
@@ -150,7 +150,7 @@ TupletDialog::TupletDialog(TQWidget *parent, Note::Type defaultUnitType,
         m_unchangedDurationCalculationDisplay = new TQLabel
                                                 ("x", timingDisplayGrid);
         m_unchangedDurationDisplay = new TQLabel("x", timingDisplayGrid);
-        m_unchangedDurationDisplay->tqsetAlignment(int(TQLabel::AlignVCenter |
+        m_unchangedDurationDisplay->setAlignment(int(TQLabel::AlignVCenter |
                 TQLabel::AlignRight));
 
     } else {
@@ -238,7 +238,7 @@ TupletDialog::updateUntupledCombo()
     TQString previousText = m_untupledCombo->currentText();
     if (previousText.toInt() == 0) {
         if (maxValue < 3)
-            previousText = TQString("%1").tqarg(maxValue);
+            previousText = TQString("%1").arg(maxValue);
         else
             previousText = "3";
     }
@@ -247,7 +247,7 @@ TupletDialog::updateUntupledCombo()
     bool setText = false;
 
     for (int i = 1; i <= maxValue; ++i) {
-        TQString text = TQString("%1").tqarg(i);
+        TQString text = TQString("%1").arg(i);
         m_untupledCombo->insertItem(text);
         if (m_hasTimingAlready->isChecked()) {
             if (i == (m_maxDuration * 3) / (Note(getUnitType()).getDuration()*2)) {
@@ -278,7 +278,7 @@ TupletDialog::updateTupledCombo()
     if (previousText.toInt() == 0 ||
             previousText.toInt() > untupled) {
         if (untupled < 2)
-            previousText = TQString("%1").tqarg(untupled);
+            previousText = TQString("%1").arg(untupled);
         else
             previousText = "2";
     }
@@ -286,7 +286,7 @@ TupletDialog::updateTupledCombo()
     m_tupledCombo->clear();
 
     for (int i = 1; i < untupled; ++i) {
-        TQString text = TQString("%1").tqarg(i);
+        TQString text = TQString("%1").arg(i);
         m_tupledCombo->insertItem(text);
         if (m_hasTimingAlready->isChecked()) {
             if (i == m_maxDuration / Note(getUnitType()).getDuration()) {
@@ -310,33 +310,33 @@ TupletDialog::updateTimingDisplays()
     timeT tupledDuration = unitDuration * tupledCount;
 
     if (m_selectionDurationDisplay) {
-        m_selectionDurationDisplay->setText(TQString("%1").tqarg(m_maxDuration));
+        m_selectionDurationDisplay->setText(TQString("%1").arg(m_maxDuration));
     }
 
     m_untupledDurationCalculationDisplay->setText
-    (TQString("  %1 x %2 = ").tqarg(untupledCount).tqarg(unitDuration));
+    (TQString("  %1 x %2 = ").arg(untupledCount).arg(unitDuration));
     m_untupledDurationDisplay->setText
-    (TQString("%1").tqarg(untupledDuration));
+    (TQString("%1").arg(untupledDuration));
 
     m_tupledDurationCalculationDisplay->setText
-    (TQString("  %1 x %2 = ").tqarg(tupledCount).tqarg(unitDuration));
+    (TQString("  %1 x %2 = ").arg(tupledCount).arg(unitDuration));
     m_tupledDurationDisplay->setText
-    (TQString("%1").tqarg(tupledDuration));
+    (TQString("%1").arg(tupledDuration));
 
     m_newGapDurationCalculationDisplay->setText
-    (TQString("  %1 - %2 = ").tqarg(untupledDuration).tqarg(tupledDuration));
+    (TQString("  %1 - %2 = ").arg(untupledDuration).arg(tupledDuration));
     m_newGapDurationDisplay->setText
-    (TQString("%1").tqarg(untupledDuration - tupledDuration));
+    (TQString("%1").arg(untupledDuration - tupledDuration));
 
     if (m_selectionDurationDisplay && m_unchangedDurationDisplay) {
         if (m_maxDuration != untupledDuration) {
             m_unchangedDurationCalculationDisplay->setText
-            (TQString("  %1 - %2 = ").tqarg(m_maxDuration).tqarg(untupledDuration));
+            (TQString("  %1 - %2 = ").arg(m_maxDuration).arg(untupledDuration));
         } else {
             m_unchangedDurationCalculationDisplay->setText("");
         }
         m_unchangedDurationDisplay->setText
-        (TQString("%1").tqarg(m_maxDuration - untupledDuration));
+        (TQString("%1").arg(m_maxDuration - untupledDuration));
     }
 }