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

diff --git a/src/gui/editors/parameters/InstrumentParameterBox.cpp b/src/gui/editors/parameters/InstrumentParameterBox.cpp
index 1d5b99d..610f9ed 100644
--- a/src/gui/editors/parameters/InstrumentParameterBox.cpp
+++ b/src/gui/editors/parameters/InstrumentParameterBox.cpp
@@ -49,10 +49,10 @@ namespace Rosegarden
 {
 
 InstrumentParameterBox::InstrumentParameterBox(RosegardenGUIDoc *doc,
-                                               TQWidget *parent)
+                                               TQWidget *tqparent)
     : RosegardenParameterBox(i18n("Instrument"),
                              i18n("Instrument Parameters"),
-                             parent),
+                             tqparent),
       m_widgetStack(new TQWidgetStack(this)),
       m_noInstrumentParameters(new TQVBox(this)),
       m_midiInstrumentParameters(new MIDIInstrumentParameterPanel(doc, this)),
@@ -66,16 +66,16 @@ InstrumentParameterBox::InstrumentParameterBox(RosegardenGUIDoc *doc,
     m_midiInstrumentParameters->setFont(m_font);
     m_audioInstrumentParameters->setFont(m_font);
 
-    bool contains = false;
+    bool tqcontains = false;
 
     std::vector<InstrumentParameterBox*>::iterator it =
         instrumentParamBoxes.begin();
 
     for (; it != instrumentParamBoxes.end(); it++)
         if ((*it) == this)
-            contains = true;
+            tqcontains = true;
 
-    if (!contains)
+    if (!tqcontains)
         instrumentParamBoxes.push_back(this);
 
     m_widgetStack->addWidget(m_midiInstrumentParameters);
@@ -122,8 +122,8 @@ InstrumentParameterBox::InstrumentParameterBox(RosegardenGUIDoc *doc,
 
     // Layout the groups left to right.
 
-    TQBoxLayout* layout = new TQVBoxLayout(this);
-    layout->addWidget(m_widgetStack);
+    TQBoxLayout* tqlayout = new TQVBoxLayout(this);
+    tqlayout->addWidget(m_widgetStack);
 
 }
 
@@ -149,7 +149,7 @@ InstrumentParameterBox::getSelectedInstrument()
     return m_doc->getStudio().getInstrumentById(m_selectedInstrument);
 }
 
-QString
+TQString
 InstrumentParameterBox::getPreviousBox(RosegardenParameterArea::Arrangement arrangement) const
 {
     return i18n("Track");