1 files changed, 20 insertions, 20 deletions

diff --git a/src/gui/dialogs/UseOrnamentDialog.cpp b/src/gui/dialogs/UseOrnamentDialog.cpp
index b644a08..d5f7895 100644
--- a/src/gui/dialogs/UseOrnamentDialog.cpp
+++ b/src/gui/dialogs/UseOrnamentDialog.cpp
@@ -51,25 +51,25 @@
 namespace Rosegarden
 {
 
-UseOrnamentDialog::UseOrnamentDialog(TQWidget *parent,
+UseOrnamentDialog::UseOrnamentDialog(TQWidget *tqparent,
                                      Composition *composition) :
-        KDialogBase(parent, "useornamentdialog", true, i18n("Use Ornament"),
+        KDialogBase(tqparent, "useornamentdialog", true, i18n("Use Ornament"),
                     Ok | Cancel, Ok),
         m_composition(composition)
 {
     TQVBox *vbox = makeVBoxMainWidget();
     TQLabel *label;
 
-    TQGroupBox *notationBox = new TQGroupBox(1, Horizontal, i18n("Notation"), vbox);
+    TQGroupBox *notationBox = new TQGroupBox(1, Qt::Horizontal, i18n("Notation"), vbox);
 
     TQFrame *frame = new TQFrame(notationBox);
-    TQGridLayout *layout = new TQGridLayout(frame, 4, 1, 5, 5);
+    TQGridLayout *tqlayout = new TQGridLayout(frame, 4, 1, 5, 5);
 
     label = new TQLabel(i18n("Display as:  "), frame);
-    layout->addWidget(label, 0, 0);
+    tqlayout->addWidget(label, 0, 0);
 
     m_mark = new KComboBox(frame);
-    layout->addWidget(m_mark, 0, 1);
+    tqlayout->addWidget(m_mark, 0, 1);
 
     m_marks.push_back(Marks::Trill);
     m_marks.push_back(Marks::LongTrill);
@@ -87,7 +87,7 @@ UseOrnamentDialog::UseOrnamentDialog(TQWidget *parent,
                                  };
 
     for (size_t i = 0; i < m_marks.size(); ++i) {
-        m_mark->insertItem(NotePixmapFactory::toQPixmap
+        m_mark->insertItem(NotePixmapFactory::toTQPixmap
                            (NotePixmapFactory::makeMarkMenuPixmap(m_marks[i])),
                            markLabels[i]);
     }
@@ -96,35 +96,35 @@ UseOrnamentDialog::UseOrnamentDialog(TQWidget *parent,
     connect(m_mark, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMarkChanged(int)));
 
     m_textLabel = new TQLabel(i18n("   Text:  "), frame);
-    layout->addWidget(m_textLabel, 0, 2);
+    tqlayout->addWidget(m_textLabel, 0, 2);
 
     m_text = new TQLineEdit(frame);
-    layout->addWidget(m_text, 0, 3);
+    tqlayout->addWidget(m_text, 0, 3);
 
-    TQGroupBox *performBox = new TQGroupBox(1, Horizontal, i18n("Performance"), vbox);
+    TQGroupBox *performBox = new TQGroupBox(1, Qt::Horizontal, i18n("Performance"), vbox);
 
     frame = new TQFrame(performBox);
-    layout = new TQGridLayout(frame, 3, 2, 5, 5);
+    tqlayout = new TQGridLayout(frame, 3, 2, 5, 5);
 
     label = new TQLabel(i18n("Perform using triggered segment: "), frame);
-    layout->addWidget(label, 0, 0);
+    tqlayout->addWidget(label, 0, 0);
 
     m_ornament = new KComboBox(frame);
-    layout->addWidget(m_ornament, 0, 1);
+    tqlayout->addWidget(m_ornament, 0, 1);
 
     int n = 1;
     for (Composition::triggersegmentcontaineriterator i =
                 m_composition->getTriggerSegments().begin();
             i != m_composition->getTriggerSegments().end(); ++i) {
         m_ornament->insertItem
-        (TQString("%1. %2").arg(n++).arg(strtoqstr((*i)->getSegment()->getLabel())));
+        (TQString("%1. %2").tqarg(n++).tqarg(strtoqstr((*i)->getSegment()->getLabel())));
     }
 
     label = new TQLabel(i18n("Perform with timing: "), frame);
-    layout->addWidget(label, 1, 0);
+    tqlayout->addWidget(label, 1, 0);
 
     m_adjustTime = new KComboBox(frame);
-    layout->addWidget(m_adjustTime, 1, 1);
+    tqlayout->addWidget(m_adjustTime, 1, 1);
 
     m_adjustTime->insertItem(i18n("As stored"));
     m_adjustTime->insertItem(i18n("Truncate if longer than note"));
@@ -134,7 +134,7 @@ UseOrnamentDialog::UseOrnamentDialog(TQWidget *parent,
     m_retune = new TQCheckBox(i18n("Adjust pitch to note"), frame);
     m_retune->setChecked(true);
 
-    layout->addWidget(m_retune, 2, 1);
+    tqlayout->addWidget(m_retune, 2, 1);
 
     setupFromConfig();
 }
@@ -150,7 +150,7 @@ UseOrnamentDialog::setupFromConfig()
     std::string timing = qstrtostr
                          (config->readEntry
                           ("useornamenttiming",
-                           strtoqstr(BaseProperties::TRIGGER_SEGMENT_ADJUST_SQUISH)));
+                           strtoqstr(BaseProperties::TRIGGER_SEGMENT_ADJUST_STQUISH)));
     bool retune = config->readBoolEntry("useornamentretune", true);
 
     size_t i = 0;
@@ -172,7 +172,7 @@ UseOrnamentDialog::setupFromConfig()
 
     if (timing == BaseProperties::TRIGGER_SEGMENT_ADJUST_NONE) {
         m_adjustTime->setCurrentItem(0);
-    } else if (timing == BaseProperties::TRIGGER_SEGMENT_ADJUST_SQUISH) {
+    } else if (timing == BaseProperties::TRIGGER_SEGMENT_ADJUST_STQUISH) {
         m_adjustTime->setCurrentItem(3);
     } else if (timing == BaseProperties::TRIGGER_SEGMENT_ADJUST_SYNC_START) {
         m_adjustTime->setCurrentItem(1);
@@ -229,7 +229,7 @@ UseOrnamentDialog::getTimeAdjust() const
     case 2:
         return BaseProperties::TRIGGER_SEGMENT_ADJUST_SYNC_END;
     case 3:
-        return BaseProperties::TRIGGER_SEGMENT_ADJUST_SQUISH;
+        return BaseProperties::TRIGGER_SEGMENT_ADJUST_STQUISH;
 
     default:
         return BaseProperties::TRIGGER_SEGMENT_ADJUST_NONE;