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

diff --git a/src/gui/dialogs/ClefDialog.cpp b/src/gui/dialogs/ClefDialog.cpp
index bfb2ee1..588e768 100644
--- a/src/gui/dialogs/ClefDialog.cpp
+++ b/src/gui/dialogs/ClefDialog.cpp
@@ -46,11 +46,11 @@
 namespace Rosegarden
 {
 
-ClefDialog::ClefDialog(TQWidget *parent,
+ClefDialog::ClefDialog(TQWidget *tqparent,
                        NotePixmapFactory *npf,
                        Clef defaultClef,
                        bool showConversionOptions) :
-        KDialogBase(parent, 0, true, i18n("Clef"), Ok | Cancel | Help),
+        KDialogBase(tqparent, 0, true, i18n("Clef"), Ok | Cancel | Help),
         m_notePixmapFactory(npf),
         m_clef(defaultClef)
 {
@@ -58,11 +58,11 @@ ClefDialog::ClefDialog(TQWidget *parent,
 
     TQVBox *vbox = makeVBoxMainWidget();
 
-    TQGroupBox *clefFrame = new QGroupBox
-                           (1, Horizontal, i18n("Clef"), vbox);
+    TQGroupBox *clefFrame = new TQGroupBox
+                           (1, Qt::Horizontal, i18n("Clef"), vbox);
 
-    TQButtonGroup *conversionFrame = new QButtonGroup
-                                    (1, Horizontal, i18n("Existing notes following clef change"), vbox);
+    TQButtonGroup *conversionFrame = new TQButtonGroup
+                                    (1, Qt::Horizontal, i18n("Existing notes following clef change"), vbox);
 
     TQHBox *clefBox = new TQHBox(clefFrame);
 
@@ -77,7 +77,7 @@ ClefDialog::ClefDialog(TQWidget *parent,
         (m_octaveUp, i18n("Up an Octave"));
 
     m_clefLabel = new TQLabel(i18n("Clef"), clefLabelBox);
-    m_clefLabel->setAlignment(AlignVCenter | AlignHCenter);
+    m_clefLabel->tqsetAlignment(AlignVCenter | AlignHCenter);
 
     m_octaveDown = new BigArrowButton(clefLabelBox, Qt::DownArrow);
     TQToolTip::add
@@ -88,20 +88,20 @@ ClefDialog::ClefDialog(TQWidget *parent,
         (clefUp, i18n("Higher clef"));
 
     m_clefNameLabel = new TQLabel(i18n("Clef"), clefLabelBox);
-    m_clefNameLabel->setAlignment(AlignVCenter | AlignHCenter);
+    m_clefNameLabel->tqsetAlignment(AlignVCenter | AlignHCenter);
 
     if (showConversionOptions) {
         m_noConversionButton =
-            new QRadioButton
+            new TQRadioButton
             (i18n("Maintain current pitches"), conversionFrame);
         m_changeOctaveButton =
-            new QRadioButton
+            new TQRadioButton
             (i18n("Transpose into appropriate octave"), conversionFrame);
         m_transposeButton = 0;
 
         //!!! why aren't we offering this option? does it not work? too difficult to describe?
         //	m_transposeButton =
-        //	    new QRadioButton
+        //	    new TQRadioButton
         //	    (i18n("Maintain current positions on the staff"), conversionFrame);
         m_changeOctaveButton->setChecked(true);
     } else {
@@ -219,7 +219,7 @@ ClefDialog::slotOctaveDown()
 void
 ClefDialog::redrawClefPixmap()
 {
-    TQPixmap pmap = NotePixmapFactory::toQPixmap
+    TQPixmap pmap = NotePixmapFactory::toTQPixmap
                    (m_notePixmapFactory->makeClefDisplayPixmap(m_clef));
     m_clefLabel->setPixmap(pmap);
 
@@ -246,25 +246,25 @@ ClefDialog::redrawClefPixmap()
 
     std::string type = m_clef.getClefType();
     if (type == Clef::Treble)
-        name = name.arg(i18n("Treble"));
+        name = name.tqarg(i18n("Treble"));
     else if (type == Clef::French)
-        name = name.arg(i18n("French violin"));
+        name = name.tqarg(i18n("French violin"));
     else if (type == Clef::Soprano)
-        name = name.arg(i18n("Soprano"));
+        name = name.tqarg(i18n("Soprano"));
     else if (type == Clef::Mezzosoprano)
-        name = name.arg(i18n("Mezzo-soprano"));
+        name = name.tqarg(i18n("Mezzo-soprano"));
     else if (type == Clef::Alto)
-        name = name.arg(i18n("Alto"));
+        name = name.tqarg(i18n("Alto"));
     else if (type == Clef::Tenor)
-        name = name.arg(i18n("Tenor"));
+        name = name.tqarg(i18n("Tenor"));
     else if (type == Clef::Baritone)
-        name = name.arg(i18n("C-baritone"));
+        name = name.tqarg(i18n("C-baritone"));
     else if (type == Clef::Varbaritone)
-        name = name.arg(i18n("F-baritone"));
+        name = name.tqarg(i18n("F-baritone"));
     else if (type == Clef::Bass)
-        name = name.arg(i18n("Bass"));
+        name = name.tqarg(i18n("Bass"));
     else if (type == Clef::Subbass)
-        name = name.arg(i18n("Sub-bass"));
+        name = name.tqarg(i18n("Sub-bass"));
 
     m_clefNameLabel->setText(name);
 }