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

diff --git a/src/gui/dialogs/MarkerModifyDialog.cpp b/src/gui/dialogs/MarkerModifyDialog.cpp
index 9303b67..c1eefab 100644
--- a/src/gui/dialogs/MarkerModifyDialog.cpp
+++ b/src/gui/dialogs/MarkerModifyDialog.cpp
@@ -45,20 +45,20 @@
 namespace Rosegarden
 {
 
-MarkerModifyDialog::MarkerModifyDialog(TQWidget *parent,
+MarkerModifyDialog::MarkerModifyDialog(TQWidget *tqparent,
                                        Composition *composition,
                                        int time,
                                        const TQString &name,
                                        const TQString &des):
-    KDialogBase(parent, 0, true, i18n("Edit Marker"), Ok | Cancel)
+    KDialogBase(tqparent, 0, true, i18n("Edit Marker"), Ok | Cancel)
 {
     initialise(composition, time, name, des);
 }
 
-MarkerModifyDialog::MarkerModifyDialog(TQWidget *parent,
+MarkerModifyDialog::MarkerModifyDialog(TQWidget *tqparent,
                                        Composition *composition,
                                        Marker *marker) :
-    KDialogBase(parent, 0, true, i18n("Edit Marker"), Ok | Cancel)
+    KDialogBase(tqparent, 0, true, i18n("Edit Marker"), Ok | Cancel)
 {
     initialise(composition, marker->getTime(),
                strtoqstr(marker->getName()),
@@ -80,9 +80,9 @@ MarkerModifyDialog::initialise(Composition *composition,
 
     /*!!!
      
-        layout->addWidget(new TQLabel(i18n("Absolute Time:"), frame), 0, 0);
+        tqlayout->addWidget(new TQLabel(i18n("Absolute Time:"), frame), 0, 0);
         m_timeEdit = new TQSpinBox(frame);
-        layout->addWidget(m_timeEdit, 0, 1);
+        tqlayout->addWidget(m_timeEdit, 0, 1);
      
         m_timeEdit->setMinValue(INT_MIN);
         m_timeEdit->setMaxValue(INT_MAX);
@@ -90,20 +90,20 @@ MarkerModifyDialog::initialise(Composition *composition,
                 Note(Note::Shortest).getDuration());
         m_timeEdit->setValue(time);
     */
-    TQGroupBox *groupBox = new QGroupBox
-                          (1, Horizontal, i18n("Marker Properties"), vbox);
+    TQGroupBox *groupBox = new TQGroupBox
+                          (1, Qt::Horizontal, i18n("Marker Properties"), vbox);
 
     TQFrame *frame = new TQFrame(groupBox);
 
-    TQGridLayout *layout = new TQGridLayout(frame, 2, 2, 5, 5);
+    TQGridLayout *tqlayout = new TQGridLayout(frame, 2, 2, 5, 5);
 
-    layout->addWidget(new TQLabel(i18n("Text:"), frame), 0, 0);
+    tqlayout->addWidget(new TQLabel(i18n("Text:"), frame), 0, 0);
     m_nameEdit = new TQLineEdit(name, frame);
-    layout->addWidget(m_nameEdit, 0, 1);
+    tqlayout->addWidget(m_nameEdit, 0, 1);
 
-    layout->addWidget(new TQLabel(i18n("Description:"), frame), 1, 0);
+    tqlayout->addWidget(new TQLabel(i18n("Description:"), frame), 1, 0);
     m_desEdit = new TQLineEdit(des, frame);
-    layout->addWidget(m_desEdit, 1, 1);
+    tqlayout->addWidget(m_desEdit, 1, 1);
 
     m_nameEdit->selectAll();
     m_nameEdit->setFocus();