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

diff --git a/src/gui/editors/segment/ControlEditorDialog.cpp b/src/gui/editors/segment/ControlEditorDialog.cpp
index 5fb1fa1..48d0f0a 100644
--- a/src/gui/editors/segment/ControlEditorDialog.cpp
+++ b/src/gui/editors/segment/ControlEditorDialog.cpp
@@ -72,10 +72,10 @@ namespace Rosegarden
 
 const TQString notShowing(i18n("<not showing>"));
 
-ControlEditorDialog::ControlEditorDialog(TQWidget *parent,
+ControlEditorDialog::ControlEditorDialog(TQWidget *tqparent,
         RosegardenGUIDoc *doc,
         DeviceId device):
-        KMainWindow(parent, "controleditordialog"),
+        KMainWindow(tqparent, "controleditordialog"),
         m_studio(&doc->getStudio()),
         m_doc(doc),
         m_device(device),
@@ -96,7 +96,7 @@ ControlEditorDialog::ControlEditorDialog(TQWidget *parent,
 
     // spacing hack!
     new TQLabel("", mainFrame);
-    new TQLabel(i18n("  Control Events for %1 (device %2)").arg(deviceName).
+    new TQLabel(i18n("  Control Events for %1 (device %2)").tqarg(deviceName).
                arg(device), mainFrame);
     new TQLabel("", mainFrame);
 
@@ -111,20 +111,20 @@ ControlEditorDialog::ControlEditorDialog(TQWidget *parent,
     m_listView->addColumn(i18n("Color  "));
     m_listView->addColumn(i18n("Position on instrument panel"));
 
-    m_listView->setColumnAlignment(0, Qt::AlignLeft);
+    m_listView->setColumnAlignment(0, TQt::AlignLeft);
 
     // Align remaining columns centrally
     for (int i = 1; i < 9; ++i)
-        m_listView->setColumnAlignment(i, Qt::AlignHCenter);
+        m_listView->setColumnAlignment(i, TQt::AlignHCenter);
 
     m_listView->restoreLayout(kapp->config(), ControlEditorConfigGroup);
 
     TQFrame* btnBox = new TQFrame(mainFrame);
 
-    btnBox->setSizePolicy(
+    btnBox->tqsetSizePolicy(
         TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
 
-    TQHBoxLayout* layout = new TQHBoxLayout(btnBox, 4, 10);
+    TQHBoxLayout* tqlayout = new TQHBoxLayout(btnBox, 4, 10);
 
     m_addButton = new TQPushButton(i18n("Add"), btnBox);
     m_deleteButton = new TQPushButton(i18n("Delete"), btnBox);
@@ -143,13 +143,13 @@ ControlEditorDialog::ControlEditorDialog(TQWidget *parent,
         (m_closeButton,
                 i18n("Close the Control Parameter editor"));
 
-    layout->addStretch(10);
-    layout->addWidget(m_addButton);
-    layout->addWidget(m_deleteButton);
-    layout->addSpacing(30);
+    tqlayout->addStretch(10);
+    tqlayout->addWidget(m_addButton);
+    tqlayout->addWidget(m_deleteButton);
+    tqlayout->addSpacing(30);
 
-    layout->addWidget(m_closeButton);
-    layout->addSpacing(5);
+    tqlayout->addWidget(m_closeButton);
+    tqlayout->addSpacing(5);
 
     connect(m_addButton, TQT_SIGNAL(released()),
             TQT_SLOT(slotAdd()));
@@ -220,7 +220,7 @@ ControlEditorDialog::slotUpdate()
         if (colour == "")
             colour = i18n("<default>");
 
-        TQString position = TQString("%1").arg(it->getIPBPosition());
+        TQString position = TQString("%1").tqarg(it->getIPBPosition());
         if (position.toInt() == -1)
             position = notShowing;
 
@@ -235,9 +235,9 @@ ControlEditorDialog::slotUpdate()
                                             strtoqstr(it->getType()),
                                             TQString("-"),
                                             strtoqstr(it->getDescription()),
-                                            TQString("%1").arg(it->getMin()),
-                                            TQString("%1").arg(it->getMax()),
-                                            TQString("%1").arg(it->getDefault()),
+                                            TQString("%1").tqarg(it->getMin()),
+                                            TQString("%1").tqarg(it->getMax()),
+                                            TQString("%1").tqarg(it->getDefault()),
                                             colour,
                                             position);
         } else {
@@ -247,9 +247,9 @@ ControlEditorDialog::slotUpdate()
                                             strtoqstr(it->getType()),
                                             value,
                                             strtoqstr(it->getDescription()),
-                                            TQString("%1").arg(it->getMin()),
-                                            TQString("%1").arg(it->getMax()),
-                                            TQString("%1").arg(it->getDefault()),
+                                            TQString("%1").tqarg(it->getMin()),
+                                            TQString("%1").tqarg(it->getMax()),
+                                            TQString("%1").tqarg(it->getDefault()),
                                             colour,
                                             position);
         }
@@ -337,7 +337,7 @@ ControlEditorDialog::slotClose()
 void
 ControlEditorDialog::setupActions()
 {
-    KAction* close = KStdAction::close(this,
+    KAction* close = KStdAction::close(TQT_TQOBJECT(this),
                                        TQT_SLOT(slotClose()),
                                        actionCollection());