Initial TQt4 port of Rosegarden

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/rosegarden@1230242 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 12 insertions, 12 deletions

diff --git a/src/gui/dialogs/TriggerSegmentDialog.cpp b/src/gui/dialogs/TriggerSegmentDialog.cpp
index 85035df..1e92c95 100644
--- a/src/gui/dialogs/TriggerSegmentDialog.cpp
+++ b/src/gui/dialogs/TriggerSegmentDialog.cpp
@@ -47,36 +47,36 @@
 namespace Rosegarden
 {
 
-TriggerSegmentDialog::TriggerSegmentDialog(TQWidget *parent,
+TriggerSegmentDialog::TriggerSegmentDialog(TQWidget *tqparent,
         Composition *composition) :
-        KDialogBase(parent, "triggersegmentdialog", true, i18n("Trigger Segment"),
+        KDialogBase(tqparent, "triggersegmentdialog", true, i18n("Trigger Segment"),
                     Ok | Cancel, Ok),
         m_composition(composition)
 {
     TQVBox *vbox = makeVBoxMainWidget();
 
     TQFrame *frame = new TQFrame(vbox);
-    TQGridLayout *layout = new TQGridLayout(frame, 3, 2, 5, 5);
+    TQGridLayout *tqlayout = new TQGridLayout(frame, 3, 2, 5, 5);
 
     TQLabel *label = new TQLabel(i18n("Trigger segment: "), frame);
-    layout->addWidget(label, 0, 0);
+    tqlayout->addWidget(label, 0, 0);
 
     m_segment = new KComboBox(frame);
-    layout->addWidget(m_segment, 0, 1);
+    tqlayout->addWidget(m_segment, 0, 1);
 
     int n = 1;
     for (Composition::triggersegmentcontaineriterator i =
                 m_composition->getTriggerSegments().begin();
             i != m_composition->getTriggerSegments().end(); ++i) {
         m_segment->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"));
@@ -86,7 +86,7 @@ TriggerSegmentDialog::TriggerSegmentDialog(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();
 }
@@ -101,7 +101,7 @@ TriggerSegmentDialog::setupFromConfig()
     std::string timing = qstrtostr
                          (config->readEntry
                           ("triggersegmenttiming",
-                           strtoqstr(BaseProperties::TRIGGER_SEGMENT_ADJUST_SQUISH)));
+                           strtoqstr(BaseProperties::TRIGGER_SEGMENT_ADJUST_STQUISH)));
     bool retune = config->readBoolEntry("triggersegmentretune", true);
 
     if (seg >= 0 && seg < m_segment->count())
@@ -109,7 +109,7 @@ TriggerSegmentDialog::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);
@@ -157,7 +157,7 @@ TriggerSegmentDialog::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;