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

diff --git a/src/gui/widgets/DiatonicPitchChooser.cpp b/src/gui/widgets/DiatonicPitchChooser.cpp
index 6a1b8ab..13fe3b5 100644
--- a/src/gui/widgets/DiatonicPitchChooser.cpp
+++ b/src/gui/widgets/DiatonicPitchChooser.cpp
@@ -43,11 +43,11 @@ namespace Rosegarden
 {
 
 DiatonicPitchChooser::DiatonicPitchChooser(TQString title,
-                           TQWidget *parent,
+                           TQWidget *tqparent,
                            int defaultNote,
                            int defaultPitch,
                            int defaultOctave) :
-        TQGroupBox(1, Horizontal, title, parent),
+        TQGroupBox(1, Qt::Horizontal, title, tqparent),
         m_defaultPitch(defaultPitch)
 {
     m_pitchDragLabel = new PitchDragLabel(this, defaultPitch);
@@ -87,7 +87,7 @@ DiatonicPitchChooser::DiatonicPitchChooser(TQString title,
     m_accidental->insertItem(i18n("double sharp"));
     m_accidental->setCurrentItem(2); // default: natural
 
-    m_pitchLabel = new TQLabel(TQString("%1").arg(getPitch()), hbox);
+    m_pitchLabel = new TQLabel(TQString("%1").tqarg(getPitch()), hbox);
     
     m_pitchLabel->setMinimumWidth(40);
 
@@ -157,7 +157,7 @@ DiatonicPitchChooser::slotSetPitch(int pitch)
     
     m_accidental->setCurrentItem(pitchChange + 2);
 
-    m_pitchLabel->setText(TQString("%1").arg(pitch));
+    m_pitchLabel->setText(TQString("%1").tqarg(pitch));
     
     update();
 }
@@ -199,7 +199,7 @@ DiatonicPitchChooser::setLabelsIfNeeded()
     //{
        m_pitchDragLabel->slotSetPitch(getPitch(), m_octave->currentItem(), m_step->currentItem());
     //}
-    m_pitchLabel->setText(TQString("%1").arg(getPitch()));
+    m_pitchLabel->setText(TQString("%1").tqarg(getPitch()));
 }
 
 void
@@ -217,7 +217,7 @@ DiatonicPitchChooser::slotSetNote(int pitch, int octave, int step)
     m_accidental->setCurrentItem(pitchOffset + 2);
 
     //MidiPitchLabel pl(p);
-    m_pitchLabel->setText(TQString("%1").arg(pitch));
+    m_pitchLabel->setText(TQString("%1").tqarg(pitch));
     update();
 }