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, 25 insertions, 25 deletions

diff --git a/src/gui/editors/segment/ControlParameterEditDialog.cpp b/src/gui/editors/segment/ControlParameterEditDialog.cpp
index 1f4e9fd..47f01db 100644
--- a/src/gui/editors/segment/ControlParameterEditDialog.cpp
+++ b/src/gui/editors/segment/ControlParameterEditDialog.cpp
@@ -55,10 +55,10 @@ namespace Rosegarden
 const TQString notShowing(i18n("<not showing>"));
 
 ControlParameterEditDialog::ControlParameterEditDialog(
-    TQWidget *parent,
+    TQWidget *tqparent,
     ControlParameter *control,
     RosegardenGUIDoc *doc):
-        KDialogBase(parent, 0, true,
+        KDialogBase(tqparent, 0, true,
                     i18n("Edit Control Parameter"), Ok | Cancel),
         m_doc(doc),
         m_control(control)
@@ -67,52 +67,52 @@ ControlParameterEditDialog::ControlParameterEditDialog(
 
     TQVBox *vbox = makeVBoxMainWidget();
 
-    TQGroupBox *groupBox = new QGroupBox
-                          (1, Horizontal, i18n("Control Event Properties"), vbox);
+    TQGroupBox *groupBox = new TQGroupBox
+                          (1, Qt::Horizontal, i18n("Control Event Properties"), vbox);
 
     TQFrame *frame = new TQFrame(groupBox);
 
-    TQGridLayout *layout = new TQGridLayout(frame, 4, 3, 10, 5);
+    TQGridLayout *tqlayout = new TQGridLayout(frame, 4, 3, 10, 5);
 
-    layout->addWidget(new TQLabel(i18n("Name:"), frame), 0, 0);
+    tqlayout->addWidget(new TQLabel(i18n("Name:"), frame), 0, 0);
     m_nameEdit = new TQLineEdit(frame);
-    layout->addWidget(m_nameEdit, 0, 1);
+    tqlayout->addWidget(m_nameEdit, 0, 1);
 
-    layout->addWidget(new TQLabel(i18n("Type:"), frame), 1, 0);
+    tqlayout->addWidget(new TQLabel(i18n("Type:"), frame), 1, 0);
     m_typeCombo = new KComboBox(frame);
-    layout->addMultiCellWidget(m_typeCombo, 1, 1, 1, 2);
+    tqlayout->addMultiCellWidget(m_typeCombo, 1, 1, 1, 2);
 
-    layout->addWidget(new TQLabel(i18n("Description:"), frame), 2, 0);
+    tqlayout->addWidget(new TQLabel(i18n("Description:"), frame), 2, 0);
     m_description = new TQLineEdit(frame);
-    layout->addMultiCellWidget(m_description, 2, 2, 1, 2);
+    tqlayout->addMultiCellWidget(m_description, 2, 2, 1, 2);
 
     // hex value alongside decimal value
     m_hexValue = new TQLabel(frame);
-    layout->addWidget(m_hexValue, 3, 1);
+    tqlayout->addWidget(m_hexValue, 3, 1);
 
-    layout->addWidget(new TQLabel(i18n("Control Event value:"), frame), 3, 0);
+    tqlayout->addWidget(new TQLabel(i18n("Control Event value:"), frame), 3, 0);
     m_controllerBox = new TQSpinBox(frame);
-    layout->addWidget(m_controllerBox, 3, 2);
+    tqlayout->addWidget(m_controllerBox, 3, 2);
 
-    layout->addWidget(new TQLabel(i18n("Minimum value:"), frame), 4, 0);
+    tqlayout->addWidget(new TQLabel(i18n("Minimum value:"), frame), 4, 0);
     m_minBox = new TQSpinBox(frame);
-    layout->addMultiCellWidget(m_minBox, 4, 4, 1, 2);
+    tqlayout->addMultiCellWidget(m_minBox, 4, 4, 1, 2);
 
-    layout->addWidget(new TQLabel(i18n("Maximum value:"), frame), 5, 0);
+    tqlayout->addWidget(new TQLabel(i18n("Maximum value:"), frame), 5, 0);
     m_maxBox = new TQSpinBox(frame);
-    layout->addMultiCellWidget(m_maxBox, 5, 5, 1, 2);
+    tqlayout->addMultiCellWidget(m_maxBox, 5, 5, 1, 2);
 
-    layout->addWidget(new TQLabel(i18n("Default value:"), frame), 6, 0);
+    tqlayout->addWidget(new TQLabel(i18n("Default value:"), frame), 6, 0);
     m_defaultBox = new TQSpinBox(frame);
-    layout->addMultiCellWidget(m_defaultBox, 6, 6, 1, 2);
+    tqlayout->addMultiCellWidget(m_defaultBox, 6, 6, 1, 2);
 
-    layout->addWidget(new TQLabel(i18n("Color:"), frame), 7, 0);
+    tqlayout->addWidget(new TQLabel(i18n("Color:"), frame), 7, 0);
     m_colourCombo = new KComboBox(frame);
-    layout->addMultiCellWidget(m_colourCombo, 7, 7, 1, 2);
+    tqlayout->addMultiCellWidget(m_colourCombo, 7, 7, 1, 2);
 
-    layout->addWidget(new TQLabel(i18n("Instrument Parameter Box position:"), frame), 8, 0);
+    tqlayout->addWidget(new TQLabel(i18n("Instrument Parameter Box position:"), frame), 8, 0);
     m_ipbPosition = new KComboBox(frame);
-    layout->addMultiCellWidget(m_ipbPosition, 8, 8, 1, 2);
+    tqlayout->addMultiCellWidget(m_ipbPosition, 8, 8, 1, 2);
 
     connect(m_nameEdit, TQT_SIGNAL(textChanged(const TQString&)),
             TQT_SLOT(slotNameChanged(const TQString&)));
@@ -182,7 +182,7 @@ ControlParameterEditDialog::ControlParameterEditDialog(
     //
     m_ipbPosition->insertItem(notShowing);
     for (unsigned int i = 0; i < 32; i++)
-        m_ipbPosition->insertItem(TQString("%1").arg(i));
+        m_ipbPosition->insertItem(TQString("%1").tqarg(i));
 
     if (m_control->getType() == Controller::EventType)
         m_typeCombo->setCurrentItem(0);