rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/rosegarden@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

src/base/AnalysisTypes.cpp

@@ -109,7 +109,7 @@ AnalysisHelper::labelChords(CompositionTimeSliceAdapter &c, Segment &s,
 	if ((*i)->isa(Note::EventType)) {
 
 	    int bass = 999;
-	    int tqmask = 0;
+	    int mask = 0;
 
 	    GlobalChord chord(c, i, quantizer);
 	    if (chord.size() == 0) continue;
@@ -121,15 +121,15 @@ AnalysisHelper::labelChords(CompositionTimeSliceAdapter &c, Segment &s,
 			assert(bass == 999); // should be in ascending order already
 			bass = pitch;
 		    }
-		    tqmask |= 1 << (pitch % 12);
+		    mask |= 1 << (pitch % 12);
 		}
 	    }
 
 	    i = chord.getFinalElement();
 
-	    if (tqmask == 0) continue;
+	    if (mask == 0) continue;
 
-	    ChordLabel ch(key, tqmask, bass);
+	    ChordLabel ch(key, mask, bass);
 
 	    if (ch.isValid())
 	    {
@@ -154,15 +154,15 @@ ChordLabel::ChordLabel()
     checkMap();
 }
 
-ChordLabel::ChordLabel(Key key, int tqmask, int /* bass */) :
+ChordLabel::ChordLabel(Key key, int mask, int /* bass */) :
     m_data()
 {
     checkMap();
 
     // Look for a chord built on an unaltered scale step of the current key.
 
-    for (ChordMap::iterator i = m_chordMap.find(tqmask);
+    for (ChordMap::iterator i = m_chordMap.find(mask);
-         i != m_chordMap.end() && i->first==tqmask; ++i)
+         i != m_chordMap.end() && i->first==mask; ++i)
     {
 
         if (Pitch(i->second.m_rootPitch).isDiatonicInKey(key))
@@ -233,7 +233,7 @@ ChordLabel::checkMap()
     // What the basicChordMasks mean: each bit set in each one represents
     // a pitch class (pitch%12) in a chord. C major has three pitch
     // classes, C, E, and G natural; if you take the MIDI pitches
-    // of those notes modulo 12, you get 0, 4, and 7, so the tqmask for
+    // of those notes modulo 12, you get 0, 4, and 7, so the mask for
     // major triads is (1<<0)+(1<<4)+(1<<7). All the masks are for chords
     // built on C.
 
@@ -249,8 +249,8 @@ ChordLabel::checkMap()
         1 + (1<<3) + (1<<6) + (1<<9)	// diminished 7th
     };
 
-    // Each tqmask is inserted into the map rotated twelve ways; each
+    // Each mask is inserted into the map rotated twelve ways; each
-    // rotation is a tqmask you would get by transposing the chord
+    // rotation is a mask you would get by transposing the chord
     // to have a new root (i.e., C, C#, D, D#, E, F...)
 
     for (int i = 0; i < 8; ++i)

src/base/AnalysisTypes.h

@@ -71,7 +71,7 @@ class ChordLabel
 {
 public:
     ChordLabel();
-    ChordLabel(Key key, int tqmask, int bass);
+    ChordLabel(Key key, int mask, int bass);
     ChordLabel(ChordType type, int rootPitch, int inversion = 0) :
         m_data(type, rootPitch, inversion) { };
     int rootPitch();

src/base/Instrument.h

@@ -220,7 +220,7 @@ public:
     //
     virtual std::string toXmlString();
 
-    // Get and set the tqparent device
+    // Get and set the parent device
     //
     Device* getDevice() const { return m_device; }
     void setDevice(Device* dev) { m_device = dev; }
@@ -263,7 +263,7 @@ private:
     Device         *m_device;
 
     // Do we send at this intrument or do we leave these
-    // things up to the tqparent device and God?  These are
+    // things up to the parent device and God?  These are
     // directly relatable to GUI elements
     // 
     bool             m_sendBankSelect;

src/base/MidiProgram.h

@@ -168,7 +168,7 @@ private:
 };
 
 
-// MidiFilter is a bittqmask of MappedEvent::MappedEventType.
+// MidiFilter is a bitmask of MappedEvent::MappedEventType.
 // Look in sound/MappedEvent.h
 //
 typedef unsigned int MidiFilter;

src/document/RoseXmlHandler.cpp

@@ -1046,7 +1046,7 @@ RoseXmlHandler::startElement(const TQString& namespaceURI,
 
                 do {
 
-                    FileLocateDialog fL((RosegardenGUIApp *)m_doc->tqparent(),
+                    FileLocateDialog fL((RosegardenGUIApp *)m_doc->parent(),
                                         file,
                                         TQString(getAudioFileManager().getAudioPath().c_str()));
                     int result = fL.exec();

src/document/RosegardenGUIDoc.cpp

@@ -117,11 +117,11 @@ namespace Rosegarden
 
 using namespace BaseProperties;
 
-RosegardenGUIDoc::RosegardenGUIDoc(TQWidget *tqparent,
+RosegardenGUIDoc::RosegardenGUIDoc(TQWidget *parent,
                                    AudioPluginManager *pluginManager,
                                    bool skipAutoload,
                                    const char *name)
-        : TQObject(tqparent, name),
+        : TQObject(parent, name),
         m_modified(false),
         m_autoSaved(false),
         m_audioPreviewThread(&m_audioFileManager),
@@ -321,7 +321,7 @@ bool RosegardenGUIDoc::saveIfModified()
         return completed;
 
 
-    RosegardenGUIApp *win = (RosegardenGUIApp *)tqparent();
+    RosegardenGUIApp *win = (RosegardenGUIApp *)parent();
 
     int wantSave = KMessageBox::warningYesNoCancel
                    (win,
@@ -584,7 +584,7 @@ bool RosegardenGUIDoc::openDocument(const TQString& filename,
 
     ProgressDialog progressDlg(i18n("Reading file..."),
                                100,
-                               (TQWidget*)tqparent());
+                               (TQWidget*)parent());
 
     connect(&progressDlg, TQT_SIGNAL(cancelClicked()),
             &m_audioFileManager, TQT_SLOT(slotStopPreview()));
@@ -1224,7 +1224,7 @@ bool RosegardenGUIDoc::saveDocumentActual(const TQString& filename,
 
         progressDlg = new ProgressDialog(i18n("Saving file..."),
                                          100,
-                                         (TQWidget*)tqparent());
+                                         (TQWidget*)parent());
         progress = progressDlg->progressBar();
 
         progressDlg->setMinimumDuration(500);
@@ -1232,7 +1232,7 @@ bool RosegardenGUIDoc::saveDocumentActual(const TQString& filename,
 
     } else {
 
-        progress = ((RosegardenGUIApp *)tqparent())->getProgressBar();
+        progress = ((RosegardenGUIApp *)parent())->getProgressBar();
     }
 
     // Send out Composition (this includes Tracks, Instruments, Tempo
@@ -1556,7 +1556,7 @@ void RosegardenGUIDoc::saveSegment(TQTextStream& outStream, Segment *segment,
 
 bool RosegardenGUIDoc::isSequencerRunning()
 {
-    RosegardenGUIApp* parentApp = dynamic_cast<RosegardenGUIApp*>(tqparent());
+    RosegardenGUIApp* parentApp = dynamic_cast<RosegardenGUIApp*>(parent());
     if (!parentApp) {
         RG_DEBUG << "RosegardenGUIDoc::isSequencerRunning() : parentApp == 0\n";
         return false;
@@ -2317,7 +2317,7 @@ RosegardenGUIDoc::syncDevices()
         }
 
         delete proc;
-        RosegardenGUIApp *app = (RosegardenGUIApp*)tqparent();
+        RosegardenGUIApp *app = (RosegardenGUIApp*)parent();
         app->slotSequencerExited(0);
         return ;
     }
@@ -2786,7 +2786,7 @@ RosegardenGUIDoc::finalizeAudioFile(InstrumentId iid)
     // Create a progress dialog
     //
     ProgressDialog *progressDlg = new ProgressDialog
-                                  (i18n("Generating audio preview..."), 100, (TQWidget*)tqparent());
+                                  (i18n("Generating audio preview..."), 100, (TQWidget*)parent());
     progressDlg->setAutoClose(false);
     progressDlg->setAutoReset(false);
     progressDlg->show();
@@ -3070,7 +3070,7 @@ RosegardenGUIDoc::clearAllPlugins()
 Clipboard*
 RosegardenGUIDoc::getClipboard()
 {
-    RosegardenGUIApp *app = (RosegardenGUIApp*)tqparent();
+    RosegardenGUIApp *app = (RosegardenGUIApp*)parent();
     return app->getClipboard();
 }
 

src/document/RosegardenGUIDoc.h

@@ -96,7 +96,7 @@ public:
     /**
      * Constructor for the fileclass of the application
      */
-    RosegardenGUIDoc(TQWidget *tqparent,
+    RosegardenGUIDoc(TQWidget *parent,
                      AudioPluginManager *audioPluginManager = 0,
                      bool skipAutoload = false,
                      const char *name=0);
@@ -426,7 +426,7 @@ public:
     // Get the sequence manager from the app
     //
     SequenceManager* getSequenceManager() 
-        { return (dynamic_cast<RosegardenGUIApp*>(tqparent()))
+        { return (dynamic_cast<RosegardenGUIApp*>(parent()))
                                          ->getSequenceManager(); }
 
     //Obsolete: multitrack MIDI recording. plcl 06/2006.

src/document/io/CsoundExporter.cpp

@@ -40,10 +40,10 @@
 namespace Rosegarden
 {
 
-CsoundExporter::CsoundExporter(TQObject *tqparent,
+CsoundExporter::CsoundExporter(TQObject *parent,
                                Composition *composition,
                                std::string fileName) :
-        ProgressReporter(tqparent, "csoundExporter"),
+        ProgressReporter(parent, "csoundExporter"),
         m_composition(composition),
         m_fileName(fileName)
 {

src/document/io/CsoundExporter.h

@@ -46,7 +46,7 @@ class Composition;
 class CsoundExporter : public ProgressReporter
 {
 public:
-    CsoundExporter(TQObject *tqparent, Composition *, std::string fileName);
+    CsoundExporter(TQObject *parent, Composition *, std::string fileName);
     ~CsoundExporter();
 
     bool write();

src/document/io/HydrogenLoader.cpp

@@ -41,8 +41,8 @@ namespace Rosegarden
 {
 
 HydrogenLoader::HydrogenLoader(Studio *studio,
-                               TQObject *tqparent, const char *name):
+                               TQObject *parent, const char *name):
-        ProgressReporter(tqparent, name),
+        ProgressReporter(parent, name),
         m_studio(studio)
 {}
 

src/document/io/HydrogenLoader.h

@@ -54,7 +54,7 @@ class HydrogenLoader : public ProgressReporter
 {
 public:
     HydrogenLoader(Studio *,
-            TQObject *tqparent = 0, const char *name = 0);
+            TQObject *parent = 0, const char *name = 0);
 
     /**
       * Load and parse the Hydrogen file \a fileName, and write it into the

src/document/io/LilyPondExporter.cpp

@@ -85,26 +85,26 @@ using namespace BaseProperties;
 const PropertyName LilyPondExporter::SKIP_PROPERTY
     = "LilyPondExportSkipThisEvent";
 
-LilyPondExporter::LilyPondExporter(RosegardenGUIApp *tqparent,
+LilyPondExporter::LilyPondExporter(RosegardenGUIApp *parent,
                                    RosegardenGUIDoc *doc,
                                    std::string fileName) :
-        ProgressReporter((TQObject *)tqparent, "lilypondExporter"),
+        ProgressReporter((TQObject *)parent, "lilypondExporter"),
         m_doc(doc),
         m_fileName(fileName),
         m_lastClefFound(Clef::Treble)
 {
     m_composition = &m_doc->getComposition();
     m_studio = &m_doc->getStudio();
-    m_view = ((RosegardenGUIApp *)tqparent)->getView();
+    m_view = ((RosegardenGUIApp *)parent)->getView();
     m_notationView = NULL;
 
     readConfigVariables();
 }
 
-LilyPondExporter::LilyPondExporter(NotationView *tqparent,
+LilyPondExporter::LilyPondExporter(NotationView *parent,
                                    RosegardenGUIDoc *doc,
                                    std::string fileName) :
-        ProgressReporter((TQObject *)tqparent, "lilypondExporter"),
+        ProgressReporter((TQObject *)parent, "lilypondExporter"),
         m_doc(doc),
         m_fileName(fileName),
         m_lastClefFound(Clef::Treble)
@@ -113,7 +113,7 @@ LilyPondExporter::LilyPondExporter(NotationView *tqparent,
     m_composition = &m_doc->getComposition();
     m_studio = &m_doc->getStudio();
     m_view = NULL;
-    m_notationView = ((NotationView *)tqparent);
+    m_notationView = ((NotationView *)parent);
 
     readConfigVariables();
 }

src/document/io/LilyPondExporter.h

@@ -87,8 +87,8 @@ public:
     typedef std::multiset<Event*, Event::EventEndCmp> eventendlist;
 
 public:
-    LilyPondExporter(RosegardenGUIApp *tqparent, RosegardenGUIDoc *, std::string fileName);
+    LilyPondExporter(RosegardenGUIApp *parent, RosegardenGUIDoc *, std::string fileName);
-    LilyPondExporter(NotationView *tqparent, RosegardenGUIDoc *, std::string fileName);
+    LilyPondExporter(NotationView *parent, RosegardenGUIDoc *, std::string fileName);
     ~LilyPondExporter();
 
     bool write();

src/document/io/MupExporter.cpp

@@ -45,10 +45,10 @@ namespace Rosegarden
 {
 using namespace BaseProperties;
 
-MupExporter::MupExporter(TQObject *tqparent,
+MupExporter::MupExporter(TQObject *parent,
                          Composition *composition,
                          string fileName) :
-        ProgressReporter(tqparent, "mupExporter"),
+        ProgressReporter(parent, "mupExporter"),
         m_composition(composition),
         m_fileName(fileName)
 {

src/document/io/MupExporter.h

@@ -55,7 +55,7 @@ class Composition;
 class MupExporter : public ProgressReporter
 {
 public:
-    MupExporter(TQObject *tqparent, Composition *, std::string fileName);
+    MupExporter(TQObject *parent, Composition *, std::string fileName);
     ~MupExporter();
 
     bool write();

src/document/io/MusicXmlExporter.cpp

@@ -46,10 +46,10 @@ namespace Rosegarden
 
 using namespace BaseProperties;
 
-MusicXmlExporter::MusicXmlExporter(TQObject *tqparent,
+MusicXmlExporter::MusicXmlExporter(TQObject *parent,
                                    RosegardenGUIDoc *doc,
                                    std::string fileName) :
-        ProgressReporter(tqparent, "musicXmlExporter"),
+        ProgressReporter(parent, "musicXmlExporter"),
         m_doc(doc),
         m_fileName(fileName)
 {

src/document/io/MusicXmlExporter.h

@@ -60,7 +60,7 @@ public:
     typedef std::multiset<Event*, Event::EventCmp> eventstartlist;
     typedef std::multiset<Event*, Event::EventEndCmp> eventendlist;
 public:
-    MusicXmlExporter(TQObject *tqparent, RosegardenGUIDoc *, std::string fileName);
+    MusicXmlExporter(TQObject *parent, RosegardenGUIDoc *, std::string fileName);
     ~MusicXmlExporter();
 
     bool write();

src/document/io/RG21Loader.cpp

@@ -58,8 +58,8 @@ using namespace Accidentals;
 using namespace Marks;
 
 RG21Loader::RG21Loader(Studio *studio,
-                       TQObject *tqparent, const char* name)
+                       TQObject *parent, const char* name)
-        : ProgressReporter(tqparent, name),
+        : ProgressReporter(parent, name),
         m_stream(0),
         m_studio(studio),
         m_composition(0),

src/document/io/RG21Loader.h

@@ -58,7 +58,7 @@ class RG21Loader : public ProgressReporter
 {
 public:
     RG21Loader(Studio *,
-               TQObject *tqparent = 0, const char *name = 0);
+               TQObject *parent = 0, const char *name = 0);
     ~RG21Loader();
     
     /**

src/gui/application/RosegardenGUIApp.cpp

@@ -3105,7 +3105,7 @@ void RosegardenGUIApp::slotTempoToSegmentLength()
     slotTempoToSegmentLength(this);
 }
 
-void RosegardenGUIApp::slotTempoToSegmentLength(TQWidget* tqparent)
+void RosegardenGUIApp::slotTempoToSegmentLength(TQWidget* parent)
 {
     RG_DEBUG << "RosegardenGUIApp::slotTempoToSegmentLength" << endl;
 
@@ -3135,7 +3135,7 @@ void RosegardenGUIApp::slotTempoToSegmentLength(TQWidget* tqparent)
         int beats = 0;
 
         // Get user to tell us how many beats or bars the segment contains
-        BeatsBarsDialog dialog(tqparent);
+        BeatsBarsDialog dialog(parent);
         if (dialog.exec() == TQDialog::Accepted) {
             beats = dialog.getQuantity(); // beats (or bars)
             if (dialog.getMode() == 1)    // bars  (multiply by time sig)
@@ -5705,16 +5705,16 @@ void RosegardenGUIApp::slotEditTempo(timeT atTime)
     slotEditTempo(this, atTime);
 }
 
-void RosegardenGUIApp::slotEditTempo(TQWidget *tqparent)
+void RosegardenGUIApp::slotEditTempo(TQWidget *parent)
 {
-    slotEditTempo(tqparent, m_doc->getComposition().getPosition());
+    slotEditTempo(parent, m_doc->getComposition().getPosition());
 }
 
-void RosegardenGUIApp::slotEditTempo(TQWidget *tqparent, timeT atTime)
+void RosegardenGUIApp::slotEditTempo(TQWidget *parent, timeT atTime)
 {
     RG_DEBUG << "RosegardenGUIApp::slotEditTempo\n";
 
-    TempoDialog tempoDialog(tqparent, m_doc);
+    TempoDialog tempoDialog(parent, m_doc);
 
     connect(&tempoDialog,
             TQT_SIGNAL(changeTempo(timeT,
@@ -5740,19 +5740,19 @@ void RosegardenGUIApp::slotEditTimeSignature(timeT atTime)
     slotEditTimeSignature(this, atTime);
 }
 
-void RosegardenGUIApp::slotEditTimeSignature(TQWidget *tqparent)
+void RosegardenGUIApp::slotEditTimeSignature(TQWidget *parent)
 {
-    slotEditTimeSignature(tqparent, m_doc->getComposition().getPosition());
+    slotEditTimeSignature(parent, m_doc->getComposition().getPosition());
 }
 
-void RosegardenGUIApp::slotEditTimeSignature(TQWidget *tqparent,
+void RosegardenGUIApp::slotEditTimeSignature(TQWidget *parent,
         timeT time)
 {
     Composition &composition(m_doc->getComposition());
 
     TimeSignature sig = composition.getTimeSignatureAt(time);
 
-    TimeSignatureDialog dialog(tqparent, &composition, time, sig);
+    TimeSignatureDialog dialog(parent, &composition, time, sig);
 
     if (dialog.exec() == TQDialog::Accepted) {
 
@@ -5775,9 +5775,9 @@ void RosegardenGUIApp::slotEditTransportTime()
     slotEditTransportTime(this);
 }
 
-void RosegardenGUIApp::slotEditTransportTime(TQWidget *tqparent)
+void RosegardenGUIApp::slotEditTransportTime(TQWidget *parent)
 {
-    TimeDialog dialog(tqparent, i18n("Move playback pointer to time"),
+    TimeDialog dialog(parent, i18n("Move playback pointer to time"),
                       &m_doc->getComposition(),
                       m_doc->getComposition().getPosition(),
                       true);
@@ -6915,12 +6915,12 @@ RosegardenGUIApp::slotControlEditorClosed()
 }
 
 void
-RosegardenGUIApp::slotShowPluginDialog(TQWidget *tqparent,
+RosegardenGUIApp::slotShowPluginDialog(TQWidget *parent,
                                        InstrumentId instrumentId,
                                        int index)
 {
-    if (!tqparent)
+    if (!parent)
-        tqparent = this;
+        parent = this;
 
     int key = (index << 16) + instrumentId;
 
@@ -6954,7 +6954,7 @@ RosegardenGUIApp::slotShowPluginDialog(TQWidget *tqparent,
     // Create the plugin dialog
     //
     AudioPluginDialog *dialog =
-        new AudioPluginDialog(tqparent,
+        new AudioPluginDialog(parent,
                               m_doc->getPluginManager(),
 #ifdef HAVE_LIBLO
                               m_pluginGUIManager,

src/gui/application/RosegardenGUIApp.cpp.orig

@@ -3105,7 +3105,7 @@ void RosegardenGUIApp::slotTempoToSegmentLength()
     slotTempoToSegmentLength(this);
 }
 
-void RosegardenGUIApp::slotTempoToSegmentLength(TQWidget* tqparent)
+void RosegardenGUIApp::slotTempoToSegmentLength(TQWidget* parent)
 {
     RG_DEBUG << "RosegardenGUIApp::slotTempoToSegmentLength" << endl;
 
@@ -3135,7 +3135,7 @@ void RosegardenGUIApp::slotTempoToSegmentLength(TQWidget* tqparent)
         int beats = 0;
 
         // Get user to tell us how many beats or bars the segment contains
-        BeatsBarsDialog dialog(tqparent);
+        BeatsBarsDialog dialog(parent);
         if (dialog.exec() == TQDialog::Accepted) {
             beats = dialog.getQuantity(); // beats (or bars)
             if (dialog.getMode() == 1)    // bars  (multiply by time sig)
@@ -5705,16 +5705,16 @@ void RosegardenGUIApp::slotEditTempo(timeT atTime)
     slotEditTempo(this, atTime);
 }
 
-void RosegardenGUIApp::slotEditTempo(TQWidget *tqparent)
+void RosegardenGUIApp::slotEditTempo(TQWidget *parent)
 {
-    slotEditTempo(tqparent, m_doc->getComposition().getPosition());
+    slotEditTempo(parent, m_doc->getComposition().getPosition());
 }
 
-void RosegardenGUIApp::slotEditTempo(TQWidget *tqparent, timeT atTime)
+void RosegardenGUIApp::slotEditTempo(TQWidget *parent, timeT atTime)
 {
     RG_DEBUG << "RosegardenGUIApp::slotEditTempo\n";
 
-    TempoDialog tempoDialog(tqparent, m_doc);
+    TempoDialog tempoDialog(parent, m_doc);
 
     connect(&tempoDialog,
             TQT_SIGNAL(changeTempo(timeT,
@@ -5740,19 +5740,19 @@ void RosegardenGUIApp::slotEditTimeSignature(timeT atTime)
     slotEditTimeSignature(this, atTime);
 }
 
-void RosegardenGUIApp::slotEditTimeSignature(TQWidget *tqparent)
+void RosegardenGUIApp::slotEditTimeSignature(TQWidget *parent)
 {
-    slotEditTimeSignature(tqparent, m_doc->getComposition().getPosition());
+    slotEditTimeSignature(parent, m_doc->getComposition().getPosition());
 }
 
-void RosegardenGUIApp::slotEditTimeSignature(TQWidget *tqparent,
+void RosegardenGUIApp::slotEditTimeSignature(TQWidget *parent,
         timeT time)
 {
     Composition &composition(m_doc->getComposition());
 
     TimeSignature sig = composition.getTimeSignatureAt(time);
 
-    TimeSignatureDialog dialog(tqparent, &composition, time, sig);
+    TimeSignatureDialog dialog(parent, &composition, time, sig);
 
     if (dialog.exec() == TQDialog::Accepted) {
 
@@ -5775,9 +5775,9 @@ void RosegardenGUIApp::slotEditTransportTime()
     slotEditTransportTime(this);
 }
 
-void RosegardenGUIApp::slotEditTransportTime(TQWidget *tqparent)
+void RosegardenGUIApp::slotEditTransportTime(TQWidget *parent)
 {
-    TimeDialog dialog(tqparent, i18n("Move playback pointer to time"),
+    TimeDialog dialog(parent, i18n("Move playback pointer to time"),
                       &m_doc->getComposition(),
                       m_doc->getComposition().getPosition(),
                       true);
@@ -6915,12 +6915,12 @@ RosegardenGUIApp::slotControlEditorClosed()
 }
 
 void
-RosegardenGUIApp::slotShowPluginDialog(TQWidget *tqparent,
+RosegardenGUIApp::slotShowPluginDialog(TQWidget *parent,
                                        InstrumentId instrumentId,
                                        int index)
 {
-    if (!tqparent)
+    if (!parent)
-        tqparent = this;
+        parent = this;
 
     int key = (index << 16) + instrumentId;
 
@@ -6954,7 +6954,7 @@ RosegardenGUIApp::slotShowPluginDialog(TQWidget *tqparent,
     // Create the plugin dialog
     //
     AudioPluginDialog *dialog =
-        new AudioPluginDialog(tqparent,
+        new AudioPluginDialog(parent,
                               m_doc->getPluginManager(),
 #ifdef HAVE_LIBLO
                               m_pluginGUIManager,

src/gui/application/RosegardenGUIApp.h

@@ -813,7 +813,7 @@ public slots:
      * Tempo to Segment length
      */
     void slotTempoToSegmentLength();
-    void slotTempoToSegmentLength(TQWidget* tqparent);
+    void slotTempoToSegmentLength(TQWidget* parent);
 
     /**
      * toggle segment labels
@@ -856,22 +856,22 @@ public slots:
      */
     void slotEditTempo();
     void slotEditTempo(timeT atTime);
-    void slotEditTempo(TQWidget *tqparent);
+    void slotEditTempo(TQWidget *parent);
-    void slotEditTempo(TQWidget *tqparent, timeT atTime);
+    void slotEditTempo(TQWidget *parent, timeT atTime);
 
     /**
      * Edit the time signature - called from a Transport signal
      */
     void slotEditTimeSignature();
     void slotEditTimeSignature(timeT atTime);
-    void slotEditTimeSignature(TQWidget *tqparent);
+    void slotEditTimeSignature(TQWidget *parent);
-    void slotEditTimeSignature(TQWidget *tqparent, timeT atTime);
+    void slotEditTimeSignature(TQWidget *parent, timeT atTime);
 
     /**
      * Edit the playback pointer position - called from a Transport signal
      */
     void slotEditTransportTime();
-    void slotEditTransportTime(TQWidget *tqparent);
+    void slotEditTransportTime(TQWidget *parent);
 
     /**
      * Change the length of the composition
@@ -1465,7 +1465,7 @@ public slots:
      * Create a plugin dialog for a given instrument and slot, or
      * raise an exising one.
      */
-    void slotShowPluginDialog(TQWidget *tqparent,
+    void slotShowPluginDialog(TQWidget *parent,
                               InstrumentId instrument,
                               int index);
 

src/gui/application/RosegardenGUIView.cpp

@@ -118,9 +118,9 @@ RosegardenGUIView::RosegardenGUIView(bool showTrackLabels,
                                      SegmentParameterBox* segmentParameterBox,
                                      InstrumentParameterBox* instrumentParameterBox,
                                      TrackParameterBox* trackParameterBox,
-                                     TQWidget *tqparent,
+                                     TQWidget *parent,
                                      const char* /*name*/)
-        : TQVBox(tqparent),
+        : TQVBox(parent),
         m_rulerScale(0),
         m_trackEditor(0),
         m_segmentParameterBox(segmentParameterBox),
@@ -174,7 +174,7 @@ RosegardenGUIView::RosegardenGUIView(bool showTrackLabels,
 
     connect(m_trackEditor,
             TQT_SIGNAL(droppedDocument(TQString)),
-            tqparent,
+            parent,
             TQT_SLOT(slotOpenDroppedURL(TQString)));
 
     connect(m_trackEditor,
@@ -2028,7 +2028,7 @@ RosegardenGUIView::createEventView(std::vector<Segment *> segmentsToEdit)
 
     // create keyboard accelerators on view
     //
-    RosegardenGUIApp *par = dynamic_cast<RosegardenGUIApp*>(tqparent());
+    RosegardenGUIApp *par = dynamic_cast<RosegardenGUIApp*>(parent());
 
     if (par) {
         par->plugAccelerators(eventView, eventView->getAccelerators());

src/gui/application/RosegardenGUIView.h

@@ -87,7 +87,7 @@ public:
                       SegmentParameterBox*,
                       InstrumentParameterBox*,
                       TrackParameterBox*,
-                      TQWidget *tqparent = 0,
+                      TQWidget *parent = 0,
                       const char *name=0);
 
     /**
@@ -98,7 +98,7 @@ public:
     /**
      * returns a pointer to the document connected to the view
      * instance. Mind that this method requires a RosegardenGUIApp
-     * instance as a tqparent widget to get to the window document
+     * instance as a parent widget to get to the window document
      * pointer by calling the RosegardenGUIApp::getDocument() method.
      *
      * @see RosegardenGUIApp#getDocument

src/gui/application/main.cpp

@@ -248,7 +248,7 @@ and Events (our basic music element).  To help lift the ambiguity,
     between coordinates and staff lines: the former is especially
     complicated because of its support for page tqlayout.)\n
  -# The canvas view transmits this kind of info as a signal, which is
- connected to a slot in the tqparent EditView.
+ connected to a slot in the parent EditView.
  -# The EditView delegates action to the current tool.\n
  -# The tool performs the actual job (inserting or deleting a note,
     etc...).

src/gui/configuration/AudioConfigurationPage.cpp

@@ -67,9 +67,9 @@ namespace Rosegarden
 AudioConfigurationPage::AudioConfigurationPage(
     RosegardenGUIDoc *doc,
     KConfig *cfg,
-    TQWidget *tqparent,
+    TQWidget *parent,
     const char *name):
-    TabbedConfigurationPage(cfg, tqparent, name),
+    TabbedConfigurationPage(cfg, parent, name),
     m_externalAudioEditorPath(0)
 {
     // set the document in the super class

src/gui/configuration/AudioConfigurationPage.h

@@ -54,7 +54,7 @@ class AudioConfigurationPage : public TabbedConfigurationPage
 public:
     AudioConfigurationPage(RosegardenGUIDoc *doc,
                                KConfig *cfg,
-                               TQWidget *tqparent=0,
+                               TQWidget *parent=0,
                                const char *name=0);
 
     virtual void apply();

src/gui/configuration/AudioPropertiesPage.cpp

@@ -52,9 +52,9 @@ namespace Rosegarden
 {
 
 AudioPropertiesPage::AudioPropertiesPage(RosegardenGUIDoc *doc,
-        TQWidget *tqparent,
+        TQWidget *parent,
         const char *name)
-        : TabbedConfigurationPage(doc, tqparent, name)
+        : TabbedConfigurationPage(doc, parent, name)
 {
     AudioFileManager &afm = doc->getAudioFileManager();
 

src/gui/configuration/AudioPropertiesPage.h

@@ -53,7 +53,7 @@ class AudioPropertiesPage : public TabbedConfigurationPage
   TQ_OBJECT
 public:
     AudioPropertiesPage(RosegardenGUIDoc *doc,
-                           TQWidget *tqparent=0, const char *name=0);
+                           TQWidget *parent=0, const char *name=0);
     virtual void apply();
 
     static TQString iconLabel() { return i18n("Audio"); }

src/gui/configuration/ColourConfigurationPage.cpp

@@ -52,9 +52,9 @@ namespace Rosegarden
 {
 
 ColourConfigurationPage::ColourConfigurationPage(RosegardenGUIDoc *doc,
-        TQWidget *tqparent,
+        TQWidget *parent,
         const char *name)
-        : TabbedConfigurationPage(doc, tqparent, name)
+        : TabbedConfigurationPage(doc, parent, name)
 {
     TQFrame *frame = new TQFrame(m_tabWidget);
     TQGridLayout *tqlayout = new TQGridLayout(frame, 2, 2,

src/gui/configuration/ColourConfigurationPage.h

@@ -53,7 +53,7 @@ class ColourConfigurationPage : public TabbedConfigurationPage
   TQ_OBJECT
 public:
     ColourConfigurationPage(RosegardenGUIDoc *doc,
-                            TQWidget *tqparent=0, const char *name=0);
+                            TQWidget *parent=0, const char *name=0);
     virtual void apply();
 
     void populate_table();

src/gui/configuration/ConfigurationPage.h

@@ -52,16 +52,16 @@ class ConfigurationPage : public TQWidget
 
 public:
     ConfigurationPage(RosegardenGUIDoc *doc,
-                      TQWidget *tqparent=0, const char *name=0)
+                      TQWidget *parent=0, const char *name=0)
-        : TQWidget(tqparent, name), m_doc(doc), m_cfg(0), m_pageIndex(0) {}
+        : TQWidget(parent, name), m_doc(doc), m_cfg(0), m_pageIndex(0) {}
 
     ConfigurationPage(KConfig *cfg,
-                      TQWidget *tqparent=0, const char *name=0)
+                      TQWidget *parent=0, const char *name=0)
-        : TQWidget(tqparent, name), m_doc(0), m_cfg(cfg), m_pageIndex(0) {}
+        : TQWidget(parent, name), m_doc(0), m_cfg(cfg), m_pageIndex(0) {}
 
     ConfigurationPage(RosegardenGUIDoc *doc, KConfig *cfg,
-                      TQWidget *tqparent=0, const char *name=0)
+                      TQWidget *parent=0, const char *name=0)
-        : TQWidget(tqparent, name), m_doc(doc), m_cfg(cfg), m_pageIndex(0) {}
+        : TQWidget(parent, name), m_doc(doc), m_cfg(cfg), m_pageIndex(0) {}
 
     virtual ~ConfigurationPage() {};
 

src/gui/configuration/DocumentMetaConfigurationPage.cpp

@@ -104,9 +104,9 @@ public:
 };
 
 DocumentMetaConfigurationPage::DocumentMetaConfigurationPage(RosegardenGUIDoc *doc,
-        TQWidget *tqparent,
+        TQWidget *parent,
         const char *name) :
-        TabbedConfigurationPage(doc, tqparent, name)
+        TabbedConfigurationPage(doc, parent, name)
 {
     m_headersPage = new HeadersConfigurationPage(this, doc);
     addTab(m_headersPage, i18n("Headers"));

src/gui/configuration/DocumentMetaConfigurationPage.h

@@ -52,7 +52,7 @@ class DocumentMetaConfigurationPage : public TabbedConfigurationPage
   TQ_OBJECT
 public:
     DocumentMetaConfigurationPage(RosegardenGUIDoc *doc,
-                                  TQWidget *tqparent = 0, const char *name = 0);
+                                  TQWidget *parent = 0, const char *name = 0);
     virtual void apply();
 
     static TQString iconLabel() { return i18n("About"); }

src/gui/configuration/GeneralConfigurationPage.cpp

@@ -59,8 +59,8 @@ namespace Rosegarden
 
 GeneralConfigurationPage::GeneralConfigurationPage(RosegardenGUIDoc *doc,
         KConfig *cfg,
-        TQWidget *tqparent, const char *name)
+        TQWidget *parent, const char *name)
-        : TabbedConfigurationPage(cfg, tqparent, name),
+        : TabbedConfigurationPage(cfg, parent, name),
         m_doc(doc),
         m_client(0),
         m_countIn(0),

src/gui/configuration/GeneralConfigurationPage.h

@@ -72,7 +72,7 @@ public:
 
     GeneralConfigurationPage(RosegardenGUIDoc *doc,
                              KConfig *cfg,
-                             TQWidget *tqparent=0, const char *name=0);
+                             TQWidget *parent=0, const char *name=0);
 
     virtual void apply();
 

src/gui/configuration/HeadersConfigurationPage.cpp

@@ -50,9 +50,9 @@
 namespace Rosegarden
 {
 
-HeadersConfigurationPage::HeadersConfigurationPage(TQWidget *tqparent,
+HeadersConfigurationPage::HeadersConfigurationPage(TQWidget *parent,
 	RosegardenGUIDoc *doc) :
-	TQVBox(tqparent),
+	TQVBox(parent),
 	m_doc(doc)
 {
     //

src/gui/configuration/HeadersConfigurationPage.h

@@ -44,7 +44,7 @@ class HeadersConfigurationPage : public TQVBox
   TQ_OBJECT
 
 public:
-    HeadersConfigurationPage(TQWidget *tqparent = 0,
+    HeadersConfigurationPage(TQWidget *parent = 0,
 	       RosegardenGUIDoc *doc = 0);
 
 public slots:

src/gui/configuration/LatencyConfigurationPage.cpp

@@ -45,9 +45,9 @@ namespace Rosegarden
 
 LatencyConfigurationPage::LatencyConfigurationPage(RosegardenGUIDoc *doc,
         KConfig *cfg,
-        TQWidget *tqparent,
+        TQWidget *parent,
         const char *name)
-        : TabbedConfigurationPage(doc, cfg, tqparent, name)
+        : TabbedConfigurationPage(doc, cfg, parent, name)
 {
     //     Configuration &config = doc->getConfiguration();
     m_cfg->setGroup(LatencyOptionsConfigGroup);

src/gui/configuration/LatencyConfigurationPage.h

@@ -56,7 +56,7 @@ class LatencyConfigurationPage : public TabbedConfigurationPage
 public:
     LatencyConfigurationPage(RosegardenGUIDoc *doc,
                              KConfig *cfg,
-                             TQWidget *tqparent=0, const char *name=0);
+                             TQWidget *parent=0, const char *name=0);
 
     virtual void apply();
 

src/gui/configuration/MIDIConfigurationPage.cpp

@@ -67,9 +67,9 @@ namespace Rosegarden
 MIDIConfigurationPage::MIDIConfigurationPage(
     RosegardenGUIDoc *doc,
     KConfig *cfg,
-    TQWidget *tqparent,
+    TQWidget *parent,
     const char *name):
-        TabbedConfigurationPage(cfg, tqparent, name),
+        TabbedConfigurationPage(cfg, parent, name),
         m_midiPitchOctave(0)
 {
     // set the document in the super class

src/gui/configuration/MIDIConfigurationPage.h

@@ -55,7 +55,7 @@ class MIDIConfigurationPage : public TabbedConfigurationPage
 public:
     MIDIConfigurationPage(RosegardenGUIDoc *doc,
                                KConfig *cfg,
-                               TQWidget *tqparent=0,
+                               TQWidget *parent=0,
                                const char *name=0);
 
     virtual void apply();

src/gui/configuration/MatrixConfigurationPage.cpp

@@ -43,9 +43,9 @@ namespace Rosegarden
 {
 
 MatrixConfigurationPage::MatrixConfigurationPage(KConfig *cfg,
-        TQWidget *tqparent,
+        TQWidget *parent,
         const char *name) :
-        TabbedConfigurationPage(cfg, tqparent, name)
+        TabbedConfigurationPage(cfg, parent, name)
 {
     m_cfg->setGroup(MatrixViewConfigGroup);
 

src/gui/configuration/MatrixConfigurationPage.h

@@ -50,7 +50,7 @@ class MatrixConfigurationPage : public TabbedConfigurationPage
 
 public:
     MatrixConfigurationPage(KConfig *cfg,
-                            TQWidget *tqparent = 0, const char *name=0);
+                            TQWidget *parent = 0, const char *name=0);
 
     virtual void apply();
 

src/gui/configuration/NotationConfigurationPage.cpp

@@ -67,9 +67,9 @@ namespace Rosegarden
 {
 
 NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
-        TQWidget *tqparent,
+        TQWidget *parent,
         const char *name) :
-        TabbedConfigurationPage(cfg, tqparent, name)
+        TabbedConfigurationPage(cfg, parent, name)
 {
     m_cfg->setGroup(NotationViewConfigGroup);
 

src/gui/configuration/NotationConfigurationPage.h

@@ -58,7 +58,7 @@ class NotationConfigurationPage : public TabbedConfigurationPage
 
 public:
     NotationConfigurationPage(KConfig *cfg,
-                              TQWidget *tqparent = 0, const char *name=0);
+                              TQWidget *parent = 0, const char *name=0);
 
     virtual void apply();
 

src/gui/configuration/TabbedConfigurationPage.cpp

@@ -39,26 +39,26 @@ namespace Rosegarden
 {
 
 TabbedConfigurationPage::TabbedConfigurationPage(RosegardenGUIDoc *doc,
-                                                 TQWidget *tqparent,
+                                                 TQWidget *parent,
                                                  const char *name)
-    : ConfigurationPage(doc, tqparent, name)
+    : ConfigurationPage(doc, parent, name)
 {
     init();
 }
 
 TabbedConfigurationPage::TabbedConfigurationPage(KConfig *cfg,
-                                                 TQWidget *tqparent,
+                                                 TQWidget *parent,
                                                  const char *name)
-    : ConfigurationPage(cfg, tqparent, name)
+    : ConfigurationPage(cfg, parent, name)
 {
     init();
 }
 
 TabbedConfigurationPage::TabbedConfigurationPage(RosegardenGUIDoc *doc,
                                                  KConfig *cfg,
-                                                 TQWidget *tqparent,
+                                                 TQWidget *parent,
                                                  const char *name)
-    : ConfigurationPage(doc, cfg, tqparent, name)
+    : ConfigurationPage(doc, cfg, parent, name)
 {
     init();
 }

src/gui/configuration/TabbedConfigurationPage.h

@@ -52,14 +52,14 @@ class TabbedConfigurationPage : public ConfigurationPage
 
 public:
     TabbedConfigurationPage(RosegardenGUIDoc *doc,
-                            TQWidget *tqparent=0, const char *name=0);
+                            TQWidget *parent=0, const char *name=0);
 
     TabbedConfigurationPage(KConfig *cfg,
-                            TQWidget *tqparent=0, const char *name=0);
+                            TQWidget *parent=0, const char *name=0);
 
     TabbedConfigurationPage(RosegardenGUIDoc *doc,
                             KConfig *cfg,
-                            TQWidget *tqparent=0, const char *name=0);
+                            TQWidget *parent=0, const char *name=0);
 
     static TQString iconName() { return "misc"; }
     

src/gui/dialogs/AddTracksDialog.cpp

@@ -42,8 +42,8 @@
 namespace Rosegarden
 {
 
-AddTracksDialog::AddTracksDialog(TQWidget *tqparent, int currentTrack) :
+AddTracksDialog::AddTracksDialog(TQWidget *parent, int currentTrack) :
-    KDialogBase(tqparent, 0, true, i18n("Add Tracks"),
+    KDialogBase(parent, 0, true, i18n("Add Tracks"),
                 Ok | Cancel),
     m_currentTrack(currentTrack)
 {

src/gui/dialogs/AddTracksDialog.h

@@ -40,7 +40,7 @@ class AddTracksDialog : public KDialogBase
   TQ_OBJECT
 
 public:
-    AddTracksDialog(TQWidget *tqparent, int currentTrack = -1);
+    AddTracksDialog(TQWidget *parent, int currentTrack = -1);
     
     int getTracks();
     int getInsertPosition();

src/gui/dialogs/AudioManagerDialog.cpp

@@ -93,9 +93,9 @@ const int AudioManagerDialog::m_maxPreviewWidth            = 100;
 const int AudioManagerDialog::m_previewHeight              = 30;
 const char* const AudioManagerDialog::m_listViewLayoutName = "AudioManagerDialog Layout";
 
-AudioManagerDialog::AudioManagerDialog(TQWidget *tqparent,
+AudioManagerDialog::AudioManagerDialog(TQWidget *parent,
                                        RosegardenGUIDoc *doc):
-        KMainWindow(tqparent, "audioManagerDialog"),
+        KMainWindow(parent, "audioManagerDialog"),
         m_doc(doc),
         m_playingAudioFile(0),
         m_audioPlayingDialog(0),
@@ -558,10 +558,10 @@ AudioManagerDialog::slotRemove()
         if (newItem == 0)
             newItem = item->itemAbove();
 
-        // Or the tqparent
+        // Or the parent
         //
         if (newItem == 0)
-            newItem = item->tqparent();
+            newItem = item->parent();
 
         // Get the id and segment of the next item so that we can
         // match against it

src/gui/dialogs/AudioManagerDialog.h

@@ -62,7 +62,7 @@ class AudioManagerDialog : public KMainWindow
   TQ_OBJECT
 
 public:
-    AudioManagerDialog(TQWidget *tqparent,
+    AudioManagerDialog(TQWidget *parent,
                        RosegardenGUIDoc *doc);
     ~AudioManagerDialog();
 

src/gui/dialogs/AudioPlayingDialog.cpp

@@ -36,9 +36,9 @@
 namespace Rosegarden
 {
 
-AudioPlayingDialog::AudioPlayingDialog(TQWidget *tqparent,
+AudioPlayingDialog::AudioPlayingDialog(TQWidget *parent,
                                        const TQString &name):
-        KDialogBase(tqparent, 0, true,
+        KDialogBase(parent, 0, true,
                     i18n("Playing audio file"),
                     Cancel)
 {

src/gui/dialogs/AudioPlayingDialog.h

@@ -45,7 +45,7 @@ class AudioPlayingDialog : public KDialogBase
   TQ_OBJECT
 
 public:
-    AudioPlayingDialog(TQWidget *tqparent, const TQString &label);
+    AudioPlayingDialog(TQWidget *parent, const TQString &label);
 
 signals:
 

src/gui/dialogs/AudioPluginDialog.cpp

@@ -60,14 +60,14 @@
 namespace Rosegarden
 {
 
-AudioPluginDialog::AudioPluginDialog(TQWidget *tqparent,
+AudioPluginDialog::AudioPluginDialog(TQWidget *parent,
                                      AudioPluginManager *aPM,
 #ifdef HAVE_LIBLO
                                      AudioPluginOSCGUIManager *aGM,
 #endif
                                      PluginContainer *pluginContainer,
                                      int index):
-    KDialogBase(tqparent, "", false, i18n("Audio Plugin"),
+    KDialogBase(parent, "", false, i18n("Audio Plugin"),
 #ifdef HAVE_LIBLO
                 Close | Details | Help),
 #else
@@ -330,10 +330,10 @@ AudioPluginDialog::populatePluginList()
 }
 
 void
-AudioPluginDialog::makePluginParamsBox(TQWidget *tqparent, int portCount,
+AudioPluginDialog::makePluginParamsBox(TQWidget *parent, int portCount,
                                        int tooManyPorts)
 {
-    m_pluginParamsBox = new TQFrame(tqparent);
+    m_pluginParamsBox = new TQFrame(parent);
 
     int columns = 2;
     if (portCount > tooManyPorts) {
@@ -402,7 +402,7 @@ AudioPluginDialog::slotPluginSelected(int i)
 
     // Destroy old param widgets
     //
-    TQWidget* tqparent = dynamic_cast<TQWidget*>(m_pluginParamsBox->tqparent());
+    TQWidget* parent = dynamic_cast<TQWidget*>(m_pluginParamsBox->parent());
 
     delete m_pluginParamsBox;
     m_pluginWidgets.clear(); // The widgets are deleted with the parameter box
@@ -418,7 +418,7 @@ AudioPluginDialog::slotPluginSelected(int i)
     }
 
     int tooManyPorts = 96;
-    makePluginParamsBox(tqparent, portCount, tooManyPorts);
+    makePluginParamsBox(parent, portCount, tooManyPorts);
     bool showBounds = (portCount <= 48);
 
     if (portCount > tooManyPorts) {

src/gui/dialogs/AudioPluginDialog.h

@@ -61,7 +61,7 @@ class AudioPluginDialog : public KDialogBase
   TQ_OBJECT
 
 public:
-    AudioPluginDialog(TQWidget *tqparent,
+    AudioPluginDialog(TQWidget *parent,
                       AudioPluginManager *aPM,
 #ifdef HAVE_LIBLO
                       AudioPluginOSCGUIManager *aGM,

src/gui/dialogs/AudioSplitDialog.cpp

@@ -50,10 +50,10 @@
 namespace Rosegarden
 {
 
-AudioSplitDialog::AudioSplitDialog(TQWidget *tqparent,
+AudioSplitDialog::AudioSplitDialog(TQWidget *parent,
                                    Segment *segment,
                                    RosegardenGUIDoc *doc):
-        KDialogBase(tqparent, 0, true,
+        KDialogBase(parent, 0, true,
                     i18n("Autosplit Audio Segment"), Ok | Cancel),
         m_doc(doc),
         m_segment(segment),

src/gui/dialogs/AudioSplitDialog.h

@@ -49,7 +49,7 @@ class AudioSplitDialog : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    AudioSplitDialog(TQWidget *tqparent,
+    AudioSplitDialog(TQWidget *parent,
                      Segment *segment,
                      RosegardenGUIDoc *doc);
 

src/gui/dialogs/BeatsBarsDialog.cpp

@@ -40,8 +40,8 @@
 namespace Rosegarden
 {
 
-BeatsBarsDialog::BeatsBarsDialog(TQWidget* tqparent) :
+BeatsBarsDialog::BeatsBarsDialog(TQWidget* parent) :
-        KDialogBase(tqparent, 0, true, i18n("Audio Segment Duration"),
+        KDialogBase(parent, 0, true, i18n("Audio Segment Duration"),
                     Ok | Cancel, Ok)
 {
     TQHBox *hbox = makeHBoxMainWidget();

src/gui/dialogs/BeatsBarsDialog.h

@@ -47,7 +47,7 @@ class BeatsBarsDialog : public KDialogBase
         
 public:
     BeatsBarsDialog();
-    BeatsBarsDialog(TQWidget *tqparent);
+    BeatsBarsDialog(TQWidget *parent);
 
     int getQuantity() { return m_spinBox->value(); }
     int getMode()     { return m_comboBox->currentItem();   } 

src/gui/dialogs/ClefDialog.cpp

@@ -46,11 +46,11 @@
 namespace Rosegarden
 {
 
-ClefDialog::ClefDialog(TQWidget *tqparent,
+ClefDialog::ClefDialog(TQWidget *parent,
                        NotePixmapFactory *npf,
                        Clef defaultClef,
                        bool showConversionOptions) :
-        KDialogBase(tqparent, 0, true, i18n("Clef"), Ok | Cancel | Help),
+        KDialogBase(parent, 0, true, i18n("Clef"), Ok | Cancel | Help),
         m_notePixmapFactory(npf),
         m_clef(defaultClef)
 {

src/gui/dialogs/ClefDialog.h

@@ -54,7 +54,7 @@ public:
         Transpose,
     };
 
-    ClefDialog(TQWidget *tqparent,
+    ClefDialog(TQWidget *parent,
                NotePixmapFactory *npf,
                Clef defaultClef,
                bool showConversionOptions = true);

src/gui/dialogs/CompositionLengthDialog.cpp

@@ -39,9 +39,9 @@ namespace Rosegarden
 {
 
 CompositionLengthDialog::CompositionLengthDialog(
-    TQWidget *tqparent,
+    TQWidget *parent,
     Composition *composition):
-        KDialogBase(tqparent, 0, true, i18n("Change Composition Length"),
+        KDialogBase(parent, 0, true, i18n("Change Composition Length"),
                     Ok | Cancel),
         m_composition(composition)
 {

src/gui/dialogs/CompositionLengthDialog.h

@@ -45,7 +45,7 @@ class CompositionLengthDialog : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    CompositionLengthDialog(TQWidget *tqparent,
+    CompositionLengthDialog(TQWidget *parent,
                             Composition *composition);
 
     timeT getStartMarker();

src/gui/dialogs/ConfigureDialog.cpp

@@ -61,9 +61,9 @@ static TQPixmap loadIcon(const char *name)
 
 ConfigureDialog::ConfigureDialog(RosegardenGUIDoc *doc,
                                  KConfig* cfg,
-                                 TQWidget *tqparent,
+                                 TQWidget *parent,
                                  const char *name)
-        : ConfigureDialogBase(tqparent, i18n("Configure Rosegarden"), name)
+        : ConfigureDialogBase(parent, i18n("Configure Rosegarden"), name)
 {
     TQWidget *pageWidget = 0;
     TQVBoxLayout *vlay = 0;

src/gui/dialogs/ConfigureDialog.h

@@ -46,7 +46,7 @@ class ConfigureDialog : public ConfigureDialogBase
 public:
     ConfigureDialog(RosegardenGUIDoc *doc,
                     KConfig* cfg,
-                    TQWidget *tqparent=0,
+                    TQWidget *parent=0,
                     const char *name=0);
 signals:
     void updateAutoSaveInterval(unsigned int);

src/gui/dialogs/ConfigureDialogBase.cpp

@@ -35,11 +35,11 @@
 namespace Rosegarden
 {
 
-ConfigureDialogBase::ConfigureDialogBase(TQWidget *tqparent,
+ConfigureDialogBase::ConfigureDialogBase(TQWidget *parent,
         TQString label,
         const char *name):
         KDialogBase(IconList, label ? label : i18n("Configure"), Help | Apply | Ok | Cancel,
-                    Ok, tqparent, name, true) // modal
+                    Ok, parent, name, true) // modal
 {
     setWFlags(WDestructiveClose);
 }

src/gui/dialogs/ConfigureDialogBase.h

@@ -45,7 +45,7 @@ class ConfigureDialogBase : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    ConfigureDialogBase(TQWidget *tqparent=0,
+    ConfigureDialogBase(TQWidget *parent=0,
                         TQString label = 0,
                         const char *name=0);
     virtual ~ConfigureDialogBase();

src/gui/dialogs/CountdownBar.cpp

@@ -34,8 +34,8 @@
 namespace Rosegarden
 {
 
-CountdownBar::CountdownBar(TQWidget *tqparent, int width, int height):
+CountdownBar::CountdownBar(TQWidget *parent, int width, int height):
-        TQFrame(tqparent), m_width(width), m_height(height), m_position(0)
+        TQFrame(parent), m_width(width), m_height(height), m_position(0)
 {
     resize(m_width, m_height);
     tqrepaint();

src/gui/dialogs/CountdownBar.h

@@ -43,7 +43,7 @@ class CountdownBar : public TQFrame
     Q_OBJECT
   TQ_OBJECT
 public:
-    CountdownBar(TQWidget *tqparent, int width, int height);
+    CountdownBar(TQWidget *parent, int width, int height);
     void setPosition(int position);
 
 protected:

src/gui/dialogs/CountdownDialog.cpp

@@ -41,8 +41,8 @@
 namespace Rosegarden
 {
 
-CountdownDialog::CountdownDialog(TQWidget *tqparent, int seconds):
+CountdownDialog::CountdownDialog(TQWidget *parent, int seconds):
-        TQDialog(tqparent, "", false, WStyle_StaysOnTop | WStyle_DialogBorder),
+        TQDialog(parent, "", false, WStyle_StaysOnTop | WStyle_DialogBorder),
         m_pastEndMode(false),
         m_totalTime(seconds),
         m_progressBarWidth(150),

src/gui/dialogs/CountdownDialog.h

@@ -49,7 +49,7 @@ class CountdownDialog : public TQDialog // KDialogBase
   TQ_OBJECT
 
 public:
-    CountdownDialog(TQWidget *tqparent, int seconds = 300);
+    CountdownDialog(TQWidget *parent, int seconds = 300);
 
     void setLabel(const TQString &label);
     void setElapsedTime(int seconds);

src/gui/dialogs/DocumentConfigureDialog.cpp

@@ -59,9 +59,9 @@ static TQPixmap loadIcon(const char *name)
 
 
 DocumentConfigureDialog::DocumentConfigureDialog(RosegardenGUIDoc *doc,
-        TQWidget *tqparent,
+        TQWidget *parent,
         const char *name)
-        : ConfigureDialogBase(tqparent, i18n("Document Properties"), name)
+        : ConfigureDialogBase(parent, i18n("Document Properties"), name)
 {
     TQWidget *pageWidget = 0;
     TQVBoxLayout *vlay = 0;

src/gui/dialogs/DocumentConfigureDialog.h

@@ -42,7 +42,7 @@ class DocumentConfigureDialog : public ConfigureDialogBase
 {
 public:
     DocumentConfigureDialog(RosegardenGUIDoc *doc,
-                            TQWidget *tqparent=0,
+                            TQWidget *parent=0,
                             const char *name=0);
 
     void showAudioPage();

src/gui/dialogs/EventEditDialog.cpp

@@ -57,10 +57,10 @@
 namespace Rosegarden
 {
 
-EventEditDialog::EventEditDialog(TQWidget *tqparent,
+EventEditDialog::EventEditDialog(TQWidget *parent,
                                  const Event &event,
                                  bool editable) :
-        KDialogBase(tqparent, 0, true, i18n(editable ? "Advanced Event Edit" : "Advanced Event Viewer"),
+        KDialogBase(parent, 0, true, i18n(editable ? "Advanced Event Edit" : "Advanced Event Viewer"),
                     (editable ? (Ok | Cancel) : Ok)),
         m_durationDisplay(0),
         m_durationDisplayAux(0),

src/gui/dialogs/EventEditDialog.h

@@ -58,7 +58,7 @@ public:
      * the resulting edited version can subsequently be queried
      * through getEvent().
      */
-    EventEditDialog(TQWidget *tqparent,
+    EventEditDialog(TQWidget *parent,
                     const Event &event,
                     bool editable = true);
 

src/gui/dialogs/EventFilterDialog.cpp

@@ -61,8 +61,8 @@
 namespace Rosegarden
 {
 
-EventFilterDialog::EventFilterDialog(TQWidget* tqparent)
+EventFilterDialog::EventFilterDialog(TQWidget* parent)
-        : KDialogBase(tqparent, "eventfilerdialog", true, i18n("Event Filter"), Ok | Cancel, Ok),
+        : KDialogBase(parent, "eventfilerdialog", true, i18n("Event Filter"), Ok | Cancel, Ok),
         m_standardQuantizations(BasicQuantizer::getStandardQuantizations())
 {
     cfg = kapp->config();

src/gui/dialogs/EventFilterDialog.h

@@ -63,7 +63,7 @@ class EventFilterDialog : public KDialogBase
 
 public:
 
-    EventFilterDialog(TQWidget* tqparent);
+    EventFilterDialog(TQWidget* parent);
     ~EventFilterDialog();
 
     KConfig *cfg;

src/gui/dialogs/EventParameterDialog.cpp

@@ -42,11 +42,11 @@ namespace Rosegarden
 {
 
 EventParameterDialog::EventParameterDialog(
-    TQWidget *tqparent,
+    TQWidget *parent,
     const TQString &name,
     const PropertyName &property,
     int startValue):
-        KDialogBase(tqparent, 0, true, name, Ok | Cancel),
+        KDialogBase(parent, 0, true, name, Ok | Cancel),
         m_property(property)
 {
     TQVBox *vBox = makeVBoxMainWidget();

src/gui/dialogs/EventParameterDialog.h

@@ -47,7 +47,7 @@ class EventParameterDialog : public KDialogBase
   TQ_OBJECT
 
 public:
-    EventParameterDialog(TQWidget *tqparent,
+    EventParameterDialog(TQWidget *parent,
                          const TQString &name,                      // name
                          const PropertyName &property, // property
                          int startValue);                          // start

src/gui/dialogs/ExportDeviceDialog.cpp

@@ -38,8 +38,8 @@
 namespace Rosegarden
 {
 
-ExportDeviceDialog::ExportDeviceDialog(TQWidget *tqparent, TQString deviceName) :
+ExportDeviceDialog::ExportDeviceDialog(TQWidget *parent, TQString deviceName) :
-        KDialogBase(tqparent, "exportdevicedialog", true, i18n("Export Devices..."),
+        KDialogBase(parent, "exportdevicedialog", true, i18n("Export Devices..."),
                     Ok | Cancel, Ok)
 {
     TQVBox *vbox = makeVBoxMainWidget();

src/gui/dialogs/ExportDeviceDialog.h

@@ -44,7 +44,7 @@ class ExportDeviceDialog : public KDialogBase
 public:
     enum ExportType { ExportOne, ExportAll };
     
-    ExportDeviceDialog(TQWidget *tqparent, TQString deviceName);
+    ExportDeviceDialog(TQWidget *parent, TQString deviceName);
     
     ExportType getExportType();
 

src/gui/dialogs/FileLocateDialog.cpp

@@ -39,10 +39,10 @@
 namespace Rosegarden
 {
 
-FileLocateDialog::FileLocateDialog(TQWidget *tqparent,
+FileLocateDialog::FileLocateDialog(TQWidget *parent,
                                    const TQString &file,
                                    const TQString & /*path*/):
-        KDialogBase(tqparent, 0, true,
+        KDialogBase(parent, 0, true,
                     i18n("Locate audio file"),
                     User1 | User2 | User3,
                     Ok,

src/gui/dialogs/FileLocateDialog.h

@@ -44,7 +44,7 @@ class FileLocateDialog : public KDialogBase
   TQ_OBJECT
 
 public:
-    FileLocateDialog(TQWidget *tqparent,
+    FileLocateDialog(TQWidget *parent,
                      const TQString &file,
                      const TQString &path);
 

src/gui/dialogs/FileMergeDialog.cpp

@@ -40,10 +40,10 @@
 namespace Rosegarden
 {
 
-FileMergeDialog::FileMergeDialog(TQWidget *tqparent,
+FileMergeDialog::FileMergeDialog(TQWidget *parent,
                                  TQString /*fileName*/,
                                  bool timingsDiffer) :
-        KDialogBase(tqparent, 0, true, i18n("Merge File"), Ok | Cancel | Help)
+        KDialogBase(parent, 0, true, i18n("Merge File"), Ok | Cancel | Help)
 {
     setHelp("file-merge");
 

src/gui/dialogs/FileMergeDialog.h

@@ -46,7 +46,7 @@ class FileMergeDialog : public KDialogBase
   TQ_OBJECT
 
 public:
-    FileMergeDialog(TQWidget *tqparent, TQString fileName, bool timingsDiffer);
+    FileMergeDialog(TQWidget *parent, TQString fileName, bool timingsDiffer);
 
     int getMergeOptions();
     

src/gui/dialogs/FloatEdit.cpp

@@ -37,14 +37,14 @@
 namespace Rosegarden
 {
 
-FloatEdit::FloatEdit(TQWidget *tqparent,
+FloatEdit::FloatEdit(TQWidget *parent,
                      const TQString &title,
                      const TQString &text,
                      float min,
                      float max,
                      float value,
                      float step):
-        KDialogBase(tqparent, "rosegardenFloatEdit", true, title, Ok | Cancel, Ok)
+        KDialogBase(parent, "rosegardenFloatEdit", true, title, Ok | Cancel, Ok)
 {
     TQVBox *vbox = makeVBoxMainWidget();
     TQGroupBox *groupBox = new TQGroupBox(1, Qt::Horizontal, text, vbox);

src/gui/dialogs/FloatEdit.h

@@ -46,7 +46,7 @@ class FloatEdit : public KDialogBase
   TQ_OBJECT
 
 public:
-    FloatEdit(TQWidget *tqparent,
+    FloatEdit(TQWidget *parent,
                         const TQString &title,
                         const TQString &text,
                         float min,

src/gui/dialogs/IdentifyTextCodecDialog.cpp

@@ -41,9 +41,9 @@
 namespace Rosegarden
 {
 
-IdentifyTextCodecDialog::IdentifyTextCodecDialog(TQWidget *tqparent,
+IdentifyTextCodecDialog::IdentifyTextCodecDialog(TQWidget *parent,
         std::string text) :
-        KDialogBase(tqparent, 0, true, i18n("Choose Text Encoding"), Ok),
+        KDialogBase(parent, 0, true, i18n("Choose Text Encoding"), Ok),
         m_text(text)
 {
     TQVBox *vbox = makeVBoxMainWidget();

src/gui/dialogs/IdentifyTextCodecDialog.h

@@ -46,7 +46,7 @@ class IdentifyTextCodecDialog : public KDialogBase
   TQ_OBJECT
     
 public:
-    IdentifyTextCodecDialog(TQWidget *tqparent, std::string text);
+    IdentifyTextCodecDialog(TQWidget *parent, std::string text);
 
     std::string getCodec() const { return m_codec; }
 

src/gui/dialogs/ImportDeviceDialog.cpp

@@ -54,8 +54,8 @@
 namespace Rosegarden
 {
 
-ImportDeviceDialog::ImportDeviceDialog(TQWidget *tqparent, KURL url) :
+ImportDeviceDialog::ImportDeviceDialog(TQWidget *parent, KURL url) :
-        KDialogBase(tqparent, "importdevicedialog", true,
+        KDialogBase(parent, "importdevicedialog", true,
                     i18n("Import from Device..."),
                     Ok | Cancel, Ok),
         m_url(url),

src/gui/dialogs/ImportDeviceDialog.h

@@ -58,7 +58,7 @@ class ImportDeviceDialog : public KDialogBase
   TQ_OBJECT
 
 public:
-    ImportDeviceDialog(TQWidget *tqparent, KURL url);
+    ImportDeviceDialog(TQWidget *parent, KURL url);
     virtual ~ImportDeviceDialog();
 
     bool doImport();

src/gui/dialogs/InterpretDialog.cpp

@@ -40,8 +40,8 @@
 namespace Rosegarden
 {
 
-InterpretDialog::InterpretDialog(TQWidget *tqparent) :
+InterpretDialog::InterpretDialog(TQWidget *parent) :
-        KDialogBase(tqparent, 0, true, i18n("Interpret"), Ok | Cancel | Help)
+        KDialogBase(parent, 0, true, i18n("Interpret"), Ok | Cancel | Help)
 {
     setHelp("nv-interpret");
 

src/gui/dialogs/InterpretDialog.h

@@ -43,7 +43,7 @@ class InterpretDialog : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    InterpretDialog(TQWidget *tqparent);
+    InterpretDialog(TQWidget *parent);
 
     // an OR from InterpretCommand's constants
     int getInterpretations();

src/gui/dialogs/IntervalDialog.cpp

@@ -48,8 +48,8 @@
 namespace Rosegarden
 {
 
-IntervalDialog::IntervalDialog(TQWidget *tqparent, bool askChangeKey, bool askTransposeSegmentBack) :
+IntervalDialog::IntervalDialog(TQWidget *parent, bool askChangeKey, bool askTransposeSegmentBack) :
-        KDialogBase(tqparent, 0, true, i18n("Specify Interval"), Ok | Cancel )
+        KDialogBase(parent, 0, true, i18n("Specify Interval"), Ok | Cancel )
 {
     TQVBox *vBox = makeVBoxMainWidget();
 

src/gui/dialogs/IntervalDialog.h

@@ -49,7 +49,7 @@ class IntervalDialog : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    IntervalDialog(TQWidget *tqparent, bool askChangeKey = false, bool askTransposeSegmentBack = false);
+    IntervalDialog(TQWidget *parent, bool askChangeKey = false, bool askTransposeSegmentBack = false);
     
     // Distance in semitones
     int getChromaticDistance();

src/gui/dialogs/KeySignatureDialog.cpp

@@ -49,14 +49,14 @@
 namespace Rosegarden
 {
 
-KeySignatureDialog::KeySignatureDialog(TQWidget *tqparent,
+KeySignatureDialog::KeySignatureDialog(TQWidget *parent,
                                        NotePixmapFactory *npf,
                                        Clef clef,
                                        Rosegarden::Key defaultKey,
                                        bool showApplyToAll,
                                        bool showConversionOptions,
                                        TQString explanatoryText) :
-        KDialogBase(tqparent, 0, true, i18n("Key Change"), Ok | Cancel | Help),
+        KDialogBase(parent, 0, true, i18n("Key Change"), Ok | Cancel | Help),
         m_notePixmapFactory(npf),
         m_key(defaultKey),
         m_clef(clef),

src/gui/dialogs/KeySignatureDialog.h

@@ -58,7 +58,7 @@ public:
         Transpose
     };
 
-    KeySignatureDialog(TQWidget *tqparent,
+    KeySignatureDialog(TQWidget *parent,
                        NotePixmapFactory *npf,
                        Clef clef,
                        Rosegarden::Key defaultKey =

src/gui/dialogs/LilyPondOptionsDialog.cpp

@@ -54,11 +54,11 @@
 namespace Rosegarden
 {
 
-LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *tqparent,
+LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *parent,
 	RosegardenGUIDoc *doc,
         TQString windowCaption,
         TQString heading) :
-        KDialogBase(tqparent, 0, true,
+        KDialogBase(parent, 0, true,
                     (windowCaption = "" ? i18n("LilyPond Export/Preview") : windowCaption),
                     Apply | Ok | Cancel),
 	m_doc(doc)

src/gui/dialogs/LilyPondOptionsDialog.h

@@ -48,7 +48,7 @@ class LilyPondOptionsDialog : public KDialogBase
   TQ_OBJECT
 
 public:
-    LilyPondOptionsDialog(TQWidget *tqparent,
+    LilyPondOptionsDialog(TQWidget *parent,
 			  RosegardenGUIDoc *doc,
                           TQString windowCaption = "",
                           TQString heading = "");

src/gui/dialogs/LyricEditDialog.cpp

@@ -48,9 +48,9 @@
 namespace Rosegarden
 {
 
-LyricEditDialog::LyricEditDialog(TQWidget *tqparent,
+LyricEditDialog::LyricEditDialog(TQWidget *parent,
                                  Segment *segment) :
-    KDialogBase(tqparent, 0, true, i18n("Edit Lyrics"), Ok | Cancel | Help),
+    KDialogBase(parent, 0, true, i18n("Edit Lyrics"), Ok | Cancel | Help),
     m_segment(segment),
     m_verseCount(0)
 {

src/gui/dialogs/LyricEditDialog.h

@@ -49,7 +49,7 @@ class LyricEditDialog : public KDialogBase
   TQ_OBJECT
 
 public:
-    LyricEditDialog(TQWidget *tqparent, Segment *segment);
+    LyricEditDialog(TQWidget *parent, Segment *segment);
 
     int getVerseCount() const;
     TQString getLyricData(int verse) const;

src/gui/dialogs/MakeOrnamentDialog.cpp

@@ -40,9 +40,9 @@
 namespace Rosegarden
 {
 
-MakeOrnamentDialog::MakeOrnamentDialog(TQWidget *tqparent, TQString defaultName,
+MakeOrnamentDialog::MakeOrnamentDialog(TQWidget *parent, TQString defaultName,
                                        int defaultBasePitch) :
-        KDialogBase(tqparent, "makeornamentdialog", true, i18n("Make Ornament"),
+        KDialogBase(parent, "makeornamentdialog", true, i18n("Make Ornament"),
                     Ok | Cancel, Ok)
 {
     TQVBox *vbox = makeVBoxMainWidget();

src/gui/dialogs/MakeOrnamentDialog.h

@@ -46,7 +46,7 @@ class MakeOrnamentDialog : public KDialogBase
   TQ_OBJECT
 
 public:
-    MakeOrnamentDialog(TQWidget *tqparent, TQString defaultName, int defaultBasePitch);
+    MakeOrnamentDialog(TQWidget *parent, TQString defaultName, int defaultBasePitch);
     
     TQString getName() const;
     int getBasePitch() const;

src/gui/dialogs/ManageMetronomeDialog.cpp

@@ -58,9 +58,9 @@
 namespace Rosegarden
 {
 
-ManageMetronomeDialog::ManageMetronomeDialog(TQWidget *tqparent,
+ManageMetronomeDialog::ManageMetronomeDialog(TQWidget *parent,
         RosegardenGUIDoc *doc) :
-        KDialogBase(tqparent, 0, true, i18n("Metronome"), Ok | Apply | Close | Help),
+        KDialogBase(parent, 0, true, i18n("Metronome"), Ok | Apply | Close | Help),
         m_doc(doc)
 {
     setHelp("studio-metronome");

src/gui/dialogs/ManageMetronomeDialog.h

@@ -50,7 +50,7 @@ class ManageMetronomeDialog : public KDialogBase
   TQ_OBJECT
 
 public:
-    ManageMetronomeDialog(TQWidget *tqparent, RosegardenGUIDoc *doc);
+    ManageMetronomeDialog(TQWidget *parent, RosegardenGUIDoc *doc);
 
     void setModified(bool value);
 

src/gui/dialogs/MarkerModifyDialog.cpp

@@ -45,20 +45,20 @@
 namespace Rosegarden
 {
 
-MarkerModifyDialog::MarkerModifyDialog(TQWidget *tqparent,
+MarkerModifyDialog::MarkerModifyDialog(TQWidget *parent,
                                        Composition *composition,
                                        int time,
                                        const TQString &name,
                                        const TQString &des):
-    KDialogBase(tqparent, 0, true, i18n("Edit Marker"), Ok | Cancel)
+    KDialogBase(parent, 0, true, i18n("Edit Marker"), Ok | Cancel)
 {
     initialise(composition, time, name, des);
 }
 
-MarkerModifyDialog::MarkerModifyDialog(TQWidget *tqparent,
+MarkerModifyDialog::MarkerModifyDialog(TQWidget *parent,
                                        Composition *composition,
                                        Marker *marker) :
-    KDialogBase(tqparent, 0, true, i18n("Edit Marker"), Ok | Cancel)
+    KDialogBase(parent, 0, true, i18n("Edit Marker"), Ok | Cancel)
 {
     initialise(composition, marker->getTime(),
                strtoqstr(marker->getName()),

src/gui/dialogs/MarkerModifyDialog.h

@@ -47,13 +47,13 @@ class MarkerModifyDialog : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    MarkerModifyDialog(TQWidget *tqparent,
+    MarkerModifyDialog(TQWidget *parent,
                        Composition *composition,
                        int time,
                        const TQString &name,
                        const TQString &des);
 
-    MarkerModifyDialog(TQWidget *tqparent,
+    MarkerModifyDialog(TQWidget *parent,
                        Composition *composition,
                        Marker *marker);
 

src/gui/dialogs/PasteNotationDialog.cpp

@@ -39,9 +39,9 @@
 namespace Rosegarden
 {
 
-PasteNotationDialog::PasteNotationDialog(TQWidget *tqparent,
+PasteNotationDialog::PasteNotationDialog(TQWidget *parent,
         PasteEventsCommand::PasteType defaultType) :
-        KDialogBase(tqparent, 0, true, i18n("Paste"), Ok | Cancel | Help ),
+        KDialogBase(parent, 0, true, i18n("Paste"), Ok | Cancel | Help ),
         m_defaultType(defaultType)
 {
     setHelp("nv-paste-types");

src/gui/dialogs/PasteNotationDialog.h

@@ -47,7 +47,7 @@ class PasteNotationDialog : public KDialogBase
   TQ_OBJECT
 
 public:
-    PasteNotationDialog(TQWidget *tqparent,
+    PasteNotationDialog(TQWidget *parent,
                         PasteEventsCommand::PasteType defaultType);
 
     PasteEventsCommand::PasteType getPasteType() const;

src/gui/dialogs/PitchDialog.cpp

@@ -36,8 +36,8 @@
 namespace Rosegarden
 {
 
-PitchDialog::PitchDialog(TQWidget *tqparent, TQString title, int defaultPitch) :
+PitchDialog::PitchDialog(TQWidget *parent, TQString title, int defaultPitch) :
-        KDialogBase(tqparent, 0, true, title, User1 | Ok)
+        KDialogBase(parent, 0, true, title, User1 | Ok)
 {
     TQVBox *vbox = makeVBoxMainWidget();
     m_pitchChooser = new PitchChooser(title, vbox, defaultPitch);

src/gui/dialogs/PitchDialog.h

@@ -44,7 +44,7 @@ class PitchDialog : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    PitchDialog(TQWidget *tqparent, TQString title, int defaultPitch = 60);
+    PitchDialog(TQWidget *parent, TQString title, int defaultPitch = 60);
 
     int getPitch() const;
 

src/gui/dialogs/PitchPickerDialog.cpp

@@ -36,8 +36,8 @@
 namespace Rosegarden
 {
 
-PitchPickerDialog::PitchPickerDialog(TQWidget *tqparent, int initialPitch, TQString text) :
+PitchPickerDialog::PitchPickerDialog(TQWidget *parent, int initialPitch, TQString text) :
-        KDialogBase(tqparent, 0, true, i18n("Pitch Selector"), Ok | Cancel)
+        KDialogBase(parent, 0, true, i18n("Pitch Selector"), Ok | Cancel)
 {
     TQVBox *vBox = makeVBoxMainWidget();
 

src/gui/dialogs/PitchPickerDialog.h

@@ -43,7 +43,7 @@ class PitchPickerDialog : public KDialogBase
 
 public:
 
-    PitchPickerDialog(TQWidget* tqparent, int initialPitch, TQString text);
+    PitchPickerDialog(TQWidget* parent, int initialPitch, TQString text);
     ~PitchPickerDialog();
 
     int getPitch() { return m_pitch->getPitch(); }

src/gui/dialogs/QuantizeDialog.cpp

@@ -36,8 +36,8 @@
 namespace Rosegarden
 {
 
-QuantizeDialog::QuantizeDialog(TQWidget *tqparent, bool inNotation) :
+QuantizeDialog::QuantizeDialog(TQWidget *parent, bool inNotation) :
-        KDialogBase(tqparent, 0, true, i18n("Quantize"), Ok | Cancel | Details | Help)
+        KDialogBase(parent, 0, true, i18n("Quantize"), Ok | Cancel | Details | Help)
 {
     setHelp("quantization");
 

src/gui/dialogs/QuantizeDialog.h

@@ -45,7 +45,7 @@ class QuantizeDialog : public KDialogBase
   TQ_OBJECT
 
 public:
-    QuantizeDialog(TQWidget *tqparent, bool inNotation = false);
+    QuantizeDialog(TQWidget *parent, bool inNotation = false);
     
     /// Returned quantizer object is on heap -- caller must delete
     Quantizer *getQuantizer() const;

src/gui/dialogs/RescaleDialog.cpp

@@ -42,13 +42,13 @@
 namespace Rosegarden
 {
 
-RescaleDialog::RescaleDialog(TQWidget *tqparent,
+RescaleDialog::RescaleDialog(TQWidget *parent,
                              Composition *composition,
                              timeT startTime,
                              timeT originalDuration,
                              bool showCloseGapOption,
                              bool constrainToCompositionDuration) :
-        KDialogBase(tqparent, 0, true, i18n("Rescale"), User1 | Ok | Cancel)
+        KDialogBase(parent, 0, true, i18n("Rescale"), User1 | Ok | Cancel)
 {
     TQVBox *vbox = makeVBoxMainWidget();
 

src/gui/dialogs/RescaleDialog.h

@@ -47,7 +47,7 @@ class RescaleDialog : public KDialogBase
   TQ_OBJECT
 
 public:
-    RescaleDialog(TQWidget *tqparent,
+    RescaleDialog(TQWidget *parent,
                   Composition *composition, // for TimeWidget calculations
                   timeT startTime,
                   timeT originalDuration,

src/gui/dialogs/ShowSequencerStatusDialog.cpp

@@ -40,8 +40,8 @@
 namespace Rosegarden
 {
 
-ShowSequencerStatusDialog::ShowSequencerStatusDialog(TQWidget *tqparent) :
+ShowSequencerStatusDialog::ShowSequencerStatusDialog(TQWidget *parent) :
-        KDialogBase(tqparent, 0, true, i18n("Sequencer status"), Close)
+        KDialogBase(parent, 0, true, i18n("Sequencer status"), Close)
 {
     TQVBox *vbox = makeVBoxMainWidget();
 

src/gui/dialogs/ShowSequencerStatusDialog.h

@@ -42,7 +42,7 @@ class ShowSequencerStatusDialog : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    ShowSequencerStatusDialog(TQWidget *tqparent);
+    ShowSequencerStatusDialog(TQWidget *parent);
 };
 
 

src/gui/dialogs/SimpleEventEditDialog.cpp

@@ -56,11 +56,11 @@
 namespace Rosegarden
 {
 
-SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *tqparent,
+SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
         RosegardenGUIDoc *doc,
         const Event &event,
         bool inserting) :
-        KDialogBase(tqparent, 0, true,
+        KDialogBase(parent, 0, true,
                     i18n(inserting ? "Insert Event" : "Edit Event"), Ok | Cancel),
         m_event(event),
         m_doc(doc),

src/gui/dialogs/SimpleEventEditDialog.h

@@ -53,7 +53,7 @@ class SimpleEventEditDialog : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    SimpleEventEditDialog(TQWidget *tqparent,
+    SimpleEventEditDialog(TQWidget *parent,
                           RosegardenGUIDoc *doc,
                           const Event &event,
                           bool inserting = false); // inserting or editing

src/gui/dialogs/SplitByPitchDialog.cpp

@@ -42,8 +42,8 @@
 namespace Rosegarden
 {
 
-SplitByPitchDialog::SplitByPitchDialog(TQWidget *tqparent) :
+SplitByPitchDialog::SplitByPitchDialog(TQWidget *parent) :
-        KDialogBase(tqparent, 0, true, i18n("Split by Pitch"), Ok | Cancel)
+        KDialogBase(parent, 0, true, i18n("Split by Pitch"), Ok | Cancel)
 {
     TQVBox *vBox = makeVBoxMainWidget();
 

src/gui/dialogs/SplitByPitchDialog.h

@@ -45,7 +45,7 @@ class SplitByPitchDialog : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    SplitByPitchDialog(TQWidget *tqparent);
+    SplitByPitchDialog(TQWidget *parent);
 
     int getPitch();
 

src/gui/dialogs/SplitByRecordingSrcDialog.cpp

@@ -44,8 +44,8 @@
 namespace Rosegarden
 {
 
-SplitByRecordingSrcDialog::SplitByRecordingSrcDialog(TQWidget *tqparent, RosegardenGUIDoc *doc) :
+SplitByRecordingSrcDialog::SplitByRecordingSrcDialog(TQWidget *parent, RosegardenGUIDoc *doc) :
-        KDialogBase(tqparent, 0, true, i18n("Split by Recording Source"), Ok | Cancel )
+        KDialogBase(parent, 0, true, i18n("Split by Recording Source"), Ok | Cancel )
 {
     TQVBox *vBox = makeVBoxMainWidget();
 

src/gui/dialogs/SplitByRecordingSrcDialog.h

@@ -46,7 +46,7 @@ class SplitByRecordingSrcDialog : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    SplitByRecordingSrcDialog(TQWidget *tqparent, RosegardenGUIDoc *doc);
+    SplitByRecordingSrcDialog(TQWidget *parent, RosegardenGUIDoc *doc);
     
     int getChannel();
     int getDevice();

src/gui/dialogs/TempoDialog.cpp

@@ -51,9 +51,9 @@
 namespace Rosegarden
 {
 
-TempoDialog::TempoDialog(TQWidget *tqparent, RosegardenGUIDoc *doc,
+TempoDialog::TempoDialog(TQWidget *parent, RosegardenGUIDoc *doc,
                          bool timeEditable):
-        KDialogBase(tqparent, 0, true, i18n("Insert Tempo Change"), Ok | Cancel | Help),
+        KDialogBase(parent, 0, true, i18n("Insert Tempo Change"), Ok | Cancel | Help),
         m_doc(doc),
         m_tempoTime(0)
 {

src/gui/dialogs/TempoDialog.h

@@ -61,7 +61,7 @@ public:
         GlobalTempoWithDefault
     };
 
-    TempoDialog(TQWidget *tqparent, RosegardenGUIDoc *doc,
+    TempoDialog(TQWidget *parent, RosegardenGUIDoc *doc,
                 bool timeEditable = false);
     ~TempoDialog();
 

src/gui/dialogs/TextEventDialog.cpp

@@ -50,11 +50,11 @@
 namespace Rosegarden
 {
 
-TextEventDialog::TextEventDialog(TQWidget *tqparent,
+TextEventDialog::TextEventDialog(TQWidget *parent,
                                  NotePixmapFactory *npf,
                                  Text defaultText,
                                  int maxLength) :
-        KDialogBase(tqparent, 0, true, i18n("Text"), Ok | Cancel | Help),
+        KDialogBase(parent, 0, true, i18n("Text"), Ok | Cancel | Help),
         m_notePixmapFactory(npf),
         m_styles(Text::getUserStyles()) /*,
             //m_directives(Text::getLilyPondDirectives()) */
@@ -282,15 +282,15 @@ TextEventDialog::TextEventDialog(TQWidget *tqparent,
 
     int mapWidth = 200;
     TQPixmap map(mapWidth, ls * 5 + 1);
-    TQBitmap tqmask(mapWidth, ls * 5 + 1);
+    TQBitmap mask(mapWidth, ls * 5 + 1);
 
     map.fill();
-    tqmask.fill(TQt::color0);
+    mask.fill(TQt::color0);
 
     TQPainter p, pm;
 
     p.begin(&map);
-    pm.begin(&tqmask);
+    pm.begin(&mask);
 
     p.setPen(TQt::black);
     pm.setPen(TQt::white);
@@ -304,7 +304,7 @@ TextEventDialog::TextEventDialog(TQWidget *tqparent,
     p.end();
     pm.end();
 
-    map.setMask(tqmask);
+    map.setMask(mask);
 
     m_staffAboveLabel = new TQLabel("staff", exampleVBox);
     m_staffAboveLabel->setPixmap(map);

src/gui/dialogs/TextEventDialog.h

@@ -51,7 +51,7 @@ class TextEventDialog : public KDialogBase
   TQ_OBJECT
 
 public:
-    TextEventDialog(TQWidget *tqparent,
+    TextEventDialog(TQWidget *parent,
                     NotePixmapFactory *npf,
                     Text defaultText,
                     int maxLength = -1); // for TQt default

src/gui/dialogs/TimeDialog.cpp

@@ -37,11 +37,11 @@
 namespace Rosegarden
 {
 
-TimeDialog::TimeDialog(TQWidget *tqparent, TQString title,
+TimeDialog::TimeDialog(TQWidget *parent, TQString title,
                        Composition *composition,
                        timeT defaultTime,
                        bool constrainToCompositionDuration) :
-        KDialogBase(tqparent, 0, true, title, User1 | Ok | Cancel)
+        KDialogBase(parent, 0, true, title, User1 | Ok | Cancel)
 {
     TQVBox *vbox = makeVBoxMainWidget();
     m_timeWidget = new TimeWidget
@@ -53,12 +53,12 @@ TimeDialog::TimeDialog(TQWidget *tqparent, TQString title,
             m_timeWidget, TQT_SLOT(slotResetToDefault()));
 }
 
-TimeDialog::TimeDialog(TQWidget *tqparent, TQString title,
+TimeDialog::TimeDialog(TQWidget *parent, TQString title,
                        Composition *composition,
                        timeT startTime,
                        timeT defaultTime,
                        bool constrainToCompositionDuration) :
-        KDialogBase(tqparent, 0, true, title, User1 | Ok | Cancel)
+        KDialogBase(parent, 0, true, title, User1 | Ok | Cancel)
 {
     TQVBox *vbox = makeVBoxMainWidget();
     m_timeWidget = new TimeWidget

src/gui/dialogs/TimeDialog.h

@@ -47,11 +47,11 @@ class TimeDialog : public KDialogBase
   TQ_OBJECT
 public:
     /// for absolute times
-    TimeDialog(TQWidget *tqparent, TQString title, Composition *composition,
+    TimeDialog(TQWidget *parent, TQString title, Composition *composition,
                timeT defaultTime, bool constrainToCompositionDuration);
 
     /// for durations
-    TimeDialog(TQWidget *tqparent, TQString title, Composition *composition,
+    TimeDialog(TQWidget *parent, TQString title, Composition *composition,
                timeT startTime, timeT defaultDuration,
                bool constrainToCompositionDuration);
 

src/gui/dialogs/TimeSignatureDialog.cpp

@@ -50,13 +50,13 @@
 namespace Rosegarden
 {
 
-TimeSignatureDialog::TimeSignatureDialog(TQWidget *tqparent,
+TimeSignatureDialog::TimeSignatureDialog(TQWidget *parent,
         Composition *composition,
         timeT insertionTime,
         TimeSignature sig,
         bool timeEditable,
         TQString explanatoryText) :
-        KDialogBase(tqparent, 0, true, i18n("Time Signature"), Ok | Cancel | Help),
+        KDialogBase(parent, 0, true, i18n("Time Signature"), Ok | Cancel | Help),
         m_composition(composition),
         m_timeSignature(sig),
         m_time(insertionTime),

src/gui/dialogs/TimeSignatureDialog.h

@@ -51,7 +51,7 @@ class TimeSignatureDialog : public KDialogBase
   TQ_OBJECT
 
 public:
-    TimeSignatureDialog(TQWidget *tqparent,
+    TimeSignatureDialog(TQWidget *parent,
                         Composition *composition,
                         timeT insertionTime,
                         TimeSignature defaultSig =

src/gui/dialogs/TransportDialog.cpp

@@ -57,10 +57,10 @@
 namespace Rosegarden
 {
 
-TransportDialog::TransportDialog(TQWidget *tqparent,
+TransportDialog::TransportDialog(TQWidget *parent,
                                  const char *name,
                                  WFlags flags):
-    TQWidget(tqparent, name, WType_TopLevel | WStyle_DialogBorder | WStyle_Minimize | WStyle_SysMenu | WDestructiveClose),
+    TQWidget(parent, name, WType_TopLevel | WStyle_DialogBorder | WStyle_Minimize | WStyle_SysMenu | WDestructiveClose),
     m_transport(0),
     m_lastTenHours(0),
     m_lastUnitHours(0),

src/gui/dialogs/TransportDialog.h

@@ -53,7 +53,7 @@ class TransportDialog : public TQWidget
 Q_OBJECT
   TQ_OBJECT
 public:
-    TransportDialog(TQWidget *tqparent=0,
+    TransportDialog(TQWidget *parent=0,
                               const char *name=0,
                               WFlags flags = /*TQt::WStyle_StaysOnTop |*/
                                              TQt::WStyle_NormalBorder);

src/gui/dialogs/TriggerSegmentDialog.cpp

@@ -47,9 +47,9 @@
 namespace Rosegarden
 {
 
-TriggerSegmentDialog::TriggerSegmentDialog(TQWidget *tqparent,
+TriggerSegmentDialog::TriggerSegmentDialog(TQWidget *parent,
         Composition *composition) :
-        KDialogBase(tqparent, "triggersegmentdialog", true, i18n("Trigger Segment"),
+        KDialogBase(parent, "triggersegmentdialog", true, i18n("Trigger Segment"),
                     Ok | Cancel, Ok),
         m_composition(composition)
 {

src/gui/dialogs/TriggerSegmentDialog.h

@@ -48,7 +48,7 @@ class TriggerSegmentDialog : public KDialogBase
   TQ_OBJECT
 
 public:
-    TriggerSegmentDialog(TQWidget *tqparent, Composition *);
+    TriggerSegmentDialog(TQWidget *parent, Composition *);
 
     TriggerSegmentId getId() const;
     bool getRetune() const;

src/gui/dialogs/TupletDialog.cpp

@@ -46,9 +46,9 @@
 namespace Rosegarden
 {
 
-TupletDialog::TupletDialog(TQWidget *tqparent, Note::Type defaultUnitType,
+TupletDialog::TupletDialog(TQWidget *parent, Note::Type defaultUnitType,
                            timeT maxDuration) :
-        KDialogBase(tqparent, 0, true, i18n("Tuplet"), Ok | Cancel | Help),
+        KDialogBase(parent, 0, true, i18n("Tuplet"), Ok | Cancel | Help),
         m_maxDuration(maxDuration)
 {
     setHelp("nv-tuplets");

src/gui/dialogs/TupletDialog.h

@@ -50,7 +50,7 @@ class TupletDialog : public KDialogBase
   TQ_OBJECT
 
 public:
-    TupletDialog(TQWidget *tqparent,
+    TupletDialog(TQWidget *parent,
                  Note::Type defaultUnitType,
                  timeT maxDuration = 0);
 

src/gui/dialogs/UnusedAudioSelectionDialog.cpp

@@ -39,11 +39,11 @@
 namespace Rosegarden
 {
 
-UnusedAudioSelectionDialog::UnusedAudioSelectionDialog(TQWidget *tqparent,
+UnusedAudioSelectionDialog::UnusedAudioSelectionDialog(TQWidget *parent,
         TQString introductoryText,
         std::vector<TQString> fileNames,
         bool offerCancel) :
-        KDialogBase(tqparent, 0, true, i18n("Select Unused Audio Files"), (offerCancel ? (Ok | Cancel) : Ok))
+        KDialogBase(parent, 0, true, i18n("Select Unused Audio Files"), (offerCancel ? (Ok | Cancel) : Ok))
 {
     TQVBox *vbox = makeVBoxMainWidget();
     new TQLabel(introductoryText, vbox);

src/gui/dialogs/UseOrnamentDialog.cpp

@@ -51,9 +51,9 @@
 namespace Rosegarden
 {
 
-UseOrnamentDialog::UseOrnamentDialog(TQWidget *tqparent,
+UseOrnamentDialog::UseOrnamentDialog(TQWidget *parent,
                                      Composition *composition) :
-        KDialogBase(tqparent, "useornamentdialog", true, i18n("Use Ornament"),
+        KDialogBase(parent, "useornamentdialog", true, i18n("Use Ornament"),
                     Ok | Cancel, Ok),
         m_composition(composition)
 {

src/gui/dialogs/UseOrnamentDialog.h

@@ -52,7 +52,7 @@ class UseOrnamentDialog : public KDialogBase
   TQ_OBJECT
 
 public:
-    UseOrnamentDialog(TQWidget *tqparent, Composition *);
+    UseOrnamentDialog(TQWidget *parent, Composition *);
 
     TriggerSegmentId getId() const;
     Mark getMark() const;

src/gui/editors/eventlist/EventView.cpp

@@ -97,8 +97,8 @@ EventView::m_lastSetEventFilter = -1;
 
 EventView::EventView(RosegardenGUIDoc *doc,
                      std::vector<Segment *> segments,
-                     TQWidget *tqparent):
+                     TQWidget *parent):
-        EditViewBase(doc, segments, 2, tqparent, "eventview"),
+        EditViewBase(doc, segments, 2, parent, "eventview"),
         m_eventFilter(Note | Text | SystemExclusive | Controller |
                       ProgramChange | PitchBend | Indication | Other),
         m_menu(0)

src/gui/editors/eventlist/EventView.h

@@ -81,7 +81,7 @@ class EventView : public EditViewBase, public SegmentObserver
 public:
     EventView(RosegardenGUIDoc *doc,
               std::vector<Segment *> segments,
-              TQWidget *tqparent);
+              TQWidget *parent);
 
     virtual ~EventView();
 

src/gui/editors/eventlist/EventViewItem.h

@@ -41,21 +41,21 @@ class EventViewItem : public KListViewItem
 public:
     EventViewItem(Rosegarden::Segment *segment,
                   Rosegarden::Event *event,
-                  KListView *tqparent) : 
+                  KListView *parent) : 
-        KListViewItem(tqparent),
+        KListViewItem(parent),
         m_segment(segment),
         m_event(event) {;}
     
     EventViewItem(Rosegarden::Segment *segment,
                   Rosegarden::Event *event,
-                  KListViewItem *tqparent) : 
+                  KListViewItem *parent) : 
-        KListViewItem(tqparent),
+        KListViewItem(parent),
         m_segment(segment),
         m_event(event) {;}
 
     EventViewItem(Rosegarden::Segment *segment,
                   Rosegarden::Event *event,
-                  TQListView *tqparent, TQString label1,
+                  TQListView *parent, TQString label1,
                   TQString label2 = TQString(),
                   TQString label3 = TQString(),
                   TQString label4 = TQString(),
@@ -63,14 +63,14 @@ public:
                   TQString label6 = TQString(),
                   TQString label7 = TQString(),
                   TQString label8 = TQString()) :
-        KListViewItem(tqparent, label1, label2, label3, label4,
+        KListViewItem(parent, label1, label2, label3, label4,
                       label5, label6, label7, label8),
         m_segment(segment),
         m_event(event) {;}
 
     EventViewItem(Rosegarden::Segment *segment,
                   Rosegarden::Event *event,
-                  KListViewItem *tqparent, TQString label1,
+                  KListViewItem *parent, TQString label1,
                   TQString label2 = TQString(),
                   TQString label3 = TQString(),
                   TQString label4 = TQString(),
@@ -78,7 +78,7 @@ public:
                   TQString label6 = TQString(),
                   TQString label7 = TQString(),
                   TQString label8 = TQString()) :
-        KListViewItem(tqparent, label1, label2, label3, label4,
+        KListViewItem(parent, label1, label2, label3, label4,
                       label5, label6, label7, label8), 
         m_segment(segment),
         m_event(event) {;}

src/gui/editors/eventlist/TrivialVelocityDialog.cpp

@@ -30,8 +30,8 @@
 
 namespace Rosegarden {
  
-TrivialVelocityDialog::TrivialVelocityDialog(TQWidget *tqparent, TQString label, int deft) :
+TrivialVelocityDialog::TrivialVelocityDialog(TQWidget *parent, TQString label, int deft) :
-        KDialogBase(tqparent, 0, true, label, Ok | Cancel)
+        KDialogBase(parent, 0, true, label, Ok | Cancel)
     {
         TQHBox *hbox = makeHBoxMainWidget();
         new TQLabel(label, hbox);

src/gui/editors/eventlist/TrivialVelocityDialog.h

@@ -35,7 +35,7 @@ namespace Rosegarden {
 class TrivialVelocityDialog : public KDialogBase
 {
 public:
-    TrivialVelocityDialog(TQWidget *tqparent, TQString label, int deft);
+    TrivialVelocityDialog(TQWidget *parent, TQString label, int deft);
 
     int getVelocity();
 

src/gui/editors/guitar/FingeringBox.cpp

@@ -31,8 +31,8 @@
 namespace Rosegarden
 {
 
-FingeringBox::FingeringBox(unsigned int nbFrets, unsigned int nbStrings, bool editable, TQWidget *tqparent, const char* name)
+FingeringBox::FingeringBox(unsigned int nbFrets, unsigned int nbStrings, bool editable, TQWidget *parent, const char* name)
-    : TQFrame(tqparent, name),
+    : TQFrame(parent, name),
     m_nbFretsDisplayed(nbFrets),
     m_startFret(1),
     m_nbStrings(nbStrings),
@@ -44,8 +44,8 @@ FingeringBox::FingeringBox(unsigned int nbFrets, unsigned int nbStrings, bool ed
     init();    
 }
 
-FingeringBox::FingeringBox(bool editable, TQWidget *tqparent, const char* name)
+FingeringBox::FingeringBox(bool editable, TQWidget *parent, const char* name)
-    : TQFrame(tqparent, name),
+    : TQFrame(parent, name),
     m_nbFretsDisplayed(DEFAULT_NB_DISPLAYED_FRETS),
     m_startFret(1),
     m_nbStrings(Guitar::Fingering::DEFAULT_NB_STRINGS),

src/gui/editors/guitar/FingeringBox.h

@@ -43,8 +43,8 @@ class FingeringBox : public TQFrame
     static const unsigned int IMG_HEIGHT = 200;
     
 public:
-	FingeringBox(unsigned int nbFrets, unsigned int nbStrings, bool editable, TQWidget *tqparent, const char* name = 0);
+	FingeringBox(unsigned int nbFrets, unsigned int nbStrings, bool editable, TQWidget *parent, const char* name = 0);
-    FingeringBox(bool editable, TQWidget *tqparent, const char* name = 0);
+    FingeringBox(bool editable, TQWidget *parent, const char* name = 0);
 
     void setStartFret(unsigned int f) { m_startFret = f; update(); }
     unsigned int getStartFret() const { return m_startFret; }

src/gui/editors/guitar/FingeringListBoxItem.cpp

@@ -27,8 +27,8 @@
 
 namespace Rosegarden {
     
-FingeringListBoxItem::FingeringListBoxItem(const Guitar::Chord& chord, TQListBox* tqparent, TQPixmap pixmap, TQString fingeringString)
+FingeringListBoxItem::FingeringListBoxItem(const Guitar::Chord& chord, TQListBox* parent, TQPixmap pixmap, TQString fingeringString)
-    : TQListBoxPixmap(tqparent, pixmap, fingeringString),
+    : TQListBoxPixmap(parent, pixmap, fingeringString),
       m_chord(chord)
 {
 }

src/gui/editors/guitar/FingeringListBoxItem.h

@@ -34,7 +34,7 @@ namespace Rosegarden {
 class FingeringListBoxItem : public TQListBoxPixmap
 {
 public:
-    FingeringListBoxItem(const Guitar::Chord& chord, TQListBox* tqparent, TQPixmap pixmap, TQString fingeringString);
+    FingeringListBoxItem(const Guitar::Chord& chord, TQListBox* parent, TQPixmap pixmap, TQString fingeringString);
     
     const Guitar::Chord& getChord() { return m_chord; }
 protected:

src/gui/editors/guitar/GuitarChordEditorDialog.cpp

@@ -39,8 +39,8 @@
 namespace Rosegarden
 {
 
-GuitarChordEditorDialog::GuitarChordEditorDialog(Guitar::Chord& chord, const Guitar::ChordMap& chordMap, TQWidget *tqparent)
+GuitarChordEditorDialog::GuitarChordEditorDialog(Guitar::Chord& chord, const Guitar::ChordMap& chordMap, TQWidget *parent)
-    : KDialogBase(tqparent, "GuitarChordEditor", true, i18n("Guitar Chord Editor"), Ok|Cancel),
+    : KDialogBase(parent, "GuitarChordEditor", true, i18n("Guitar Chord Editor"), Ok|Cancel),
       m_chord(chord),
       m_chordMap(chordMap)
 {

src/gui/editors/guitar/GuitarChordEditorDialog.h

@@ -45,7 +45,7 @@ class GuitarChordEditorDialog : public KDialogBase
   TQ_OBJECT
     
 public:
-	GuitarChordEditorDialog(Guitar::Chord&, const Guitar::ChordMap& chordMap, TQWidget *tqparent=0);
+	GuitarChordEditorDialog(Guitar::Chord&, const Guitar::ChordMap& chordMap, TQWidget *parent=0);
 
 protected slots:
     void slotStartFretChanged(int);

src/gui/editors/guitar/GuitarChordSelectorDialog.cpp

@@ -41,8 +41,8 @@
 namespace Rosegarden
 {
 
-GuitarChordSelectorDialog::GuitarChordSelectorDialog(TQWidget *tqparent)
+GuitarChordSelectorDialog::GuitarChordSelectorDialog(TQWidget *parent)
-    : KDialogBase(tqparent, "GuitarChordSelector", true, i18n("Guitar Chord Selector"), Ok|Cancel)
+    : KDialogBase(parent, "GuitarChordSelector", true, i18n("Guitar Chord Selector"), Ok|Cancel)
 {
     TQWidget *page = new TQWidget(this);
     setMainWidget(page);

src/gui/editors/guitar/GuitarChordSelectorDialog.h

@@ -51,7 +51,7 @@ class GuitarChordSelectorDialog : public KDialogBase
     enum { COMPLEXITY_BEGINNER, COMPLEXITY_COMMON, COMPLEXITY_ALL };
     
 public:
-	GuitarChordSelectorDialog(TQWidget *tqparent=0);
+	GuitarChordSelectorDialog(TQWidget *parent=0);
 
     void init();
 

src/gui/editors/matrix/MatrixCanvasView.cpp

@@ -45,9 +45,9 @@ namespace Rosegarden
 MatrixCanvasView::MatrixCanvasView(MatrixStaff& staff,
                                    SnapGrid *snapGrid,
                                    bool drumMode,
-                                   TQCanvas *viewing, TQWidget *tqparent,
+                                   TQCanvas *viewing, TQWidget *parent,
                                    const char *name, WFlags f)
-        : RosegardenCanvasView(viewing, tqparent, name, f),
+        : RosegardenCanvasView(viewing, parent, name, f),
         m_staff(staff),
         m_snapGrid(snapGrid),
         m_drumMode(drumMode),

src/gui/editors/matrix/MatrixCanvasView.h

@@ -55,7 +55,7 @@ public:
                      SnapGrid *,
                      bool drumMode,
                      TQCanvas *viewing,
-                     TQWidget *tqparent=0, const char *name=0, WFlags f=0);
+                     TQWidget *parent=0, const char *name=0, WFlags f=0);
 
     ~MatrixCanvasView();
 

src/gui/editors/matrix/MatrixEraser.cpp

@@ -43,8 +43,8 @@
 namespace Rosegarden
 {
 
-MatrixEraser::MatrixEraser(MatrixView* tqparent)
+MatrixEraser::MatrixEraser(MatrixView* parent)
-        : MatrixTool("MatrixEraser", tqparent),
+        : MatrixTool("MatrixEraser", parent),
         m_currentStaff(0)
 {
     TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");

src/gui/editors/matrix/MatrixMover.cpp

@@ -54,8 +54,8 @@
 namespace Rosegarden
 {
 
-MatrixMover::MatrixMover(MatrixView* tqparent) :
+MatrixMover::MatrixMover(MatrixView* parent) :
-    MatrixTool("MatrixMover", tqparent),
+    MatrixTool("MatrixMover", parent),
     m_currentElement(0),
     m_currentStaff(0),
     m_lastPlayedPitch(-1)

src/gui/editors/matrix/MatrixPainter.cpp

@@ -53,8 +53,8 @@
 namespace Rosegarden
 {
 
-MatrixPainter::MatrixPainter(MatrixView* tqparent)
+MatrixPainter::MatrixPainter(MatrixView* parent)
-        : MatrixTool("MatrixPainter", tqparent),
+        : MatrixTool("MatrixPainter", parent),
         m_currentElement(0),
         m_currentStaff(0)
 {
@@ -83,8 +83,8 @@ MatrixPainter::MatrixPainter(MatrixView* tqparent)
     createMenu("matrixpainter.rc");
 }
 
-MatrixPainter::MatrixPainter(TQString name, MatrixView* tqparent)
+MatrixPainter::MatrixPainter(TQString name, MatrixView* parent)
-        : MatrixTool(name, tqparent),
+        : MatrixTool(name, parent),
         m_currentElement(0),
         m_currentStaff(0)
 {}

src/gui/editors/matrix/MatrixParameterBox.cpp

@@ -42,8 +42,8 @@ namespace Rosegarden
 {
 
 MatrixParameterBox::MatrixParameterBox(RosegardenGUIDoc *doc,
-                                       TQWidget *tqparent, const char* name):
+                                       TQWidget *parent, const char* name):
-        TQFrame(tqparent, name),
+        TQFrame(parent, name),
         m_quantizations(BasicQuantizer::getStandardQuantizations()),
         m_doc(doc)
 {

src/gui/editors/matrix/MatrixParameterBox.h

@@ -50,7 +50,7 @@ class MatrixParameterBox : public TQFrame
   TQ_OBJECT
 
 public:
-    MatrixParameterBox(RosegardenGUIDoc *doc=0, TQWidget *tqparent=0, const char* name=0);
+    MatrixParameterBox(RosegardenGUIDoc *doc=0, TQWidget *parent=0, const char* name=0);
     ~MatrixParameterBox();
 
     void initBox();

src/gui/editors/matrix/MatrixResizer.cpp

@@ -51,8 +51,8 @@
 namespace Rosegarden
 {
 
-MatrixResizer::MatrixResizer(MatrixView* tqparent)
+MatrixResizer::MatrixResizer(MatrixView* parent)
-        : MatrixTool("MatrixResizer", tqparent),
+        : MatrixTool("MatrixResizer", parent),
         m_currentElement(0),
         m_currentStaff(0)
 {

src/gui/editors/matrix/MatrixTool.cpp

@@ -34,9 +34,9 @@
 namespace Rosegarden
 {
 
-MatrixTool::MatrixTool(const TQString& menuName, MatrixView* tqparent)
+MatrixTool::MatrixTool(const TQString& menuName, MatrixView* parent)
-        : EditTool(menuName, tqparent),
+        : EditTool(menuName, parent),
-        m_mParentView(tqparent)
+        m_mParentView(parent)
 {}
 
 void

src/gui/editors/matrix/MatrixToolBox.cpp

@@ -40,9 +40,9 @@
 namespace Rosegarden
 {
 
-MatrixToolBox::MatrixToolBox(MatrixView* tqparent)
+MatrixToolBox::MatrixToolBox(MatrixView* parent)
-        : EditToolBox(tqparent),
+        : EditToolBox(parent),
-        m_mParentView(tqparent)
+        m_mParentView(parent)
 {}
 
 EditTool* MatrixToolBox::createTool(const TQString& toolName)

src/gui/editors/matrix/MatrixToolBox.h

@@ -44,7 +44,7 @@ class MatrixToolBox : public EditToolBox
     Q_OBJECT
   TQ_OBJECT
 public:
-    MatrixToolBox(MatrixView* tqparent);
+    MatrixToolBox(MatrixView* parent);
 
 protected:
 

src/gui/editors/matrix/MatrixView.cpp

@@ -137,9 +137,9 @@ static double xorigin = 0.0;
 
 MatrixView::MatrixView(RosegardenGUIDoc *doc,
                        std::vector<Segment *> segments,
-                       TQWidget *tqparent,
+                       TQWidget *parent,
                        bool drumMode)
-        : EditView(doc, segments, 3, tqparent, "matrixview"),
+        : EditView(doc, segments, 3, parent, "matrixview"),
         m_htqlayout(&doc->getComposition()),
         m_referenceRuler(new ZoomableMatrixHLayoutRulerScale(m_htqlayout)),
         m_vtqlayout(),
@@ -301,7 +301,7 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc,
             TQT_SIGNAL(showPluginGUI(InstrumentId, int)),
             app,
             TQT_SLOT(slotShowPluginGUI(InstrumentId, int)));
-    connect(tqparent,  // RosegardenGUIView
+    connect(parent,  // RosegardenGUIView
             TQT_SIGNAL(checkTrackAssignments()),
             this,
             TQT_SLOT(slotCheckTrackAssignments()));

src/gui/editors/matrix/MatrixView.h

@@ -89,7 +89,7 @@ class MatrixView : public EditView
 public:
     MatrixView(RosegardenGUIDoc *doc,
                std::vector<Segment *> segments,
-               TQWidget *tqparent, bool drumMode);
+               TQWidget *parent, bool drumMode);
 
     virtual ~MatrixView();
 

src/gui/editors/matrix/PianoKeyboard.cpp

@@ -46,8 +46,8 @@ namespace Rosegarden
 const unsigned int _smallWhiteKeyHeight = 14;
 const unsigned int _whiteKeyHeight = 18;
     
-PianoKeyboard::PianoKeyboard(TQWidget *tqparent, int keys)
+PianoKeyboard::PianoKeyboard(TQWidget *parent, int keys)
-        : PitchRuler(tqparent),
+        : PitchRuler(parent),
         m_keySize(48, 18),
         m_blackKeySize(24, 8),
         m_nbKeys(keys),

src/gui/editors/matrix/PianoKeyboard.h

@@ -47,7 +47,7 @@ class PianoKeyboard : public PitchRuler
     Q_OBJECT
   TQ_OBJECT
 public:
-    PianoKeyboard(TQWidget *tqparent, int keys = 88);
+    PianoKeyboard(TQWidget *parent, int keys = 88);
 
     virtual TQSize tqsizeHint() const;
     virtual TQSize tqminimumSizeHint() const;

src/gui/editors/notation/FontViewFrame.cpp

@@ -46,8 +46,8 @@
 namespace Rosegarden
 {
 
-FontViewFrame::FontViewFrame( int pixelSize, TQWidget* tqparent, const char* name ) :
+FontViewFrame::FontViewFrame( int pixelSize, TQWidget* parent, const char* name ) :
-        TQFrame(tqparent, name),
+        TQFrame(parent, name),
         m_fontSize(pixelSize),
         m_tableFont(0)
 {

src/gui/editors/notation/FontViewFrame.h

@@ -46,7 +46,7 @@ class FontViewFrame : public TQFrame
   TQ_OBJECT
 
 public:
-    FontViewFrame(int pixelSize, TQWidget *tqparent = 0, const char *name = 0);
+    FontViewFrame(int pixelSize, TQWidget *parent = 0, const char *name = 0);
     virtual ~FontViewFrame();
 
     TQSize tqsizeHint() const;

src/gui/editors/notation/HeadersGroup.cpp

@@ -43,8 +43,8 @@ namespace Rosegarden
 
 
 HeadersGroup::
-HeadersGroup(TQWidget *tqparent, NotationView * nv, Composition * comp) :
+HeadersGroup(TQWidget *parent, NotationView * nv, Composition * comp) :
-        TQVBox(tqparent),
+        TQVBox(parent),
         m_notationView(nv),
         m_composition(comp),
         m_usedHeight(0),

src/gui/editors/notation/HeadersGroup.h

@@ -59,7 +59,7 @@ public:
     /**
      * Create an empty headers group
      */
-    HeadersGroup(TQWidget *tqparent, NotationView * nv, Composition * comp);
+    HeadersGroup(TQWidget *parent, NotationView * nv, Composition * comp);
 
     void removeAllHeaders();
 

src/gui/editors/notation/NotationCanvasView.cpp

@@ -49,9 +49,9 @@ namespace Rosegarden
 {
 
 NotationCanvasView::NotationCanvasView(const LinedStaffManager &staffmgr,
-                                       TQCanvas *viewing, TQWidget *tqparent,
+                                       TQCanvas *viewing, TQWidget *parent,
                                        const char *name, WFlags f) :
-        RosegardenCanvasView(viewing, tqparent, name, f),
+        RosegardenCanvasView(viewing, parent, name, f),
         m_linedStaffManager(staffmgr),
         m_lastYPosNearStaff(0),
         m_currentStaff(0),

src/gui/editors/notation/NotationCanvasView.h

@@ -70,7 +70,7 @@ class NotationCanvasView : public RosegardenCanvasView
 
 public:
     NotationCanvasView(const LinedStaffManager &staffmgr,
-                       TQCanvas *viewing, TQWidget *tqparent=0,
+                       TQCanvas *viewing, TQWidget *parent=0,
                        const char *name=0, WFlags f=0);
 
     ~NotationCanvasView();

src/gui/editors/notation/NotationHLayout.cpp

@@ -58,8 +58,8 @@ using namespace BaseProperties;
 
 NotationHLayout::NotationHLayout(Composition *c, NotePixmapFactory *npf,
                                  const NotationProperties &properties,
-                                 TQObject* tqparent, const char* name) :
+                                 TQObject* parent, const char* name) :
-    ProgressReporter(tqparent, name),
+    ProgressReporter(parent, name),
     HorizontalLayoutEngine(c),
     m_totalWidth(0.),
     m_pageMode(false),

src/gui/editors/notation/NotationHLayout.h

@@ -68,7 +68,7 @@ public:
     NotationHLayout(Composition *c,
                     NotePixmapFactory *npf,
                     const NotationProperties &properties,
-                    TQObject* tqparent, const char* name = 0);
+                    TQObject* parent, const char* name = 0);
 
     virtual ~NotationHLayout();
 

src/gui/editors/notation/NotationSelector.h

@@ -160,7 +160,7 @@ protected:
     NotationSelector(NotationView*);
 
     /**
-     * Set the current selection on the tqparent NotationView
+     * Set the current selection on the parent NotationView
      */
     void setViewCurrentSelection(bool preview);
 

src/gui/editors/notation/NotationToolBox.cpp

@@ -42,9 +42,9 @@
 namespace Rosegarden
 {
 
-NotationToolBox::NotationToolBox(NotationView *tqparent)
+NotationToolBox::NotationToolBox(NotationView *parent)
-        : EditToolBox(tqparent),
+        : EditToolBox(parent),
-        m_nParentView(tqparent)
+        m_nParentView(parent)
 {
     //m_tools.setAutoDelete(true);
 }

src/gui/editors/notation/NotationToolBox.h

@@ -49,7 +49,7 @@ class NotationToolBox : public EditToolBox
     Q_OBJECT
   TQ_OBJECT
 public:
-    NotationToolBox(NotationView* tqparent);
+    NotationToolBox(NotationView* parent);
 
 protected:
     virtual EditTool* createTool(const TQString& toolName);

src/gui/editors/notation/NotationVLayout.cpp

@@ -55,8 +55,8 @@ using namespace BaseProperties;
 
 NotationVLayout::NotationVLayout(Composition *c, NotePixmapFactory *npf,
                                  const NotationProperties &properties,
-                                 TQObject* tqparent, const char* name) :
+                                 TQObject* parent, const char* name) :
-        ProgressReporter(tqparent, name),
+        ProgressReporter(parent, name),
         m_composition(c),
         m_npf(npf),
         m_notationQuantizer(c->getNotationQuantizer()),
@@ -490,7 +490,7 @@ NotationVLayout::positionSlur(NotationStaff &staff,
             if (!event->get
                     <Int>(m_properties.HEIGHT_ON_STAFF, h)) {
                 KMessageBox::sorry
-                ((TQWidget *)tqparent(), i18n("Spanned note at %1 has no HEIGHT_ON_STAFF property!\nThis is a bug (the program would previously have crashed by now)").tqarg((*scooter)->getViewAbsoluteTime()));
+                ((TQWidget *)parent(), i18n("Spanned note at %1 has no HEIGHT_ON_STAFF property!\nThis is a bug (the program would previously have crashed by now)").tqarg((*scooter)->getViewAbsoluteTime()));
                 event->dump(std::cerr);
             }
 

src/gui/editors/notation/NotationVLayout.h

@@ -63,7 +63,7 @@ class NotationVLayout : public ProgressReporter,
 public:
     NotationVLayout(Composition *c, NotePixmapFactory *npf,
                     const NotationProperties &properties,
-                    TQObject* tqparent, const char* name = 0);
+                    TQObject* parent, const char* name = 0);
 
     virtual ~NotationVLayout();
 

src/gui/editors/notation/NotationView.cpp

@@ -346,9 +346,9 @@ public:
 
 NotationView::NotationView(RosegardenGUIDoc *doc,
                            std::vector<Segment *> segments,
-                           TQWidget *tqparent,
+                           TQWidget *parent,
                            bool showProgressive) :
-        EditView(doc, segments, 2, tqparent, "notationview"),
+        EditView(doc, segments, 2, parent, "notationview"),
         m_properties(getViewLocalPropertyPrefix()),
         m_selectionCounter(0),
         m_insertModeLabel(0),
@@ -768,10 +768,10 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
     (this, TQT_SIGNAL(renderComplete()),
      getCanvasView(), TQT_SLOT(slotRenderComplete()));
 
-    if (tqparent)
+    if (parent)
     {
         const TrackButtons * trackLabels =
-            ((RosegardenGUIView*)tqparent)->getTrackEditor()->getTrackButtons();
+            ((RosegardenGUIView*)parent)->getTrackEditor()->getTrackButtons();
         TQObject::connect
         (trackLabels, TQT_SIGNAL(nameChanged()),
          this, TQT_SLOT(slotUpdateStaffName()));
@@ -796,7 +796,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
 
 NotationView::NotationView(RosegardenGUIDoc *doc,
                            std::vector<Segment *> segments,
-                           TQWidget *tqparent,
+                           TQWidget *parent,
                            NotationView *referenceView)
         : EditView(doc, segments, 1, 0, "printview"),
         m_properties(getViewLocalPropertyPrefix()),
@@ -907,7 +907,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
 
     ProgressDialog* progressDlg = 0;
 
-    if (tqparent)
+    if (parent)
     {
 
         ProgressDialog::processEvents();
@@ -915,7 +915,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
         NOTATION_DEBUG << "NotationView : setting up progress dialog" << endl;
 
         progressDlg = new ProgressDialog(i18n("Preparing to print..."),
-                                         100, tqparent);
+                                         100, parent);
         progressDlg->setAutoClose(false);
         progressDlg->setAutoReset(true);
         progressDlg->setMinimumDuration(1000);
@@ -3541,7 +3541,7 @@ void NotationView::print(bool previewOnly)
 
     if (previewOnly)
         printer.setPreviewOnly(true);
-    else if (!printer.setup((TQWidget *)tqparent()))
+    else if (!printer.setup((TQWidget *)parent()))
         return ;
 
     TQPaintDeviceMetrics pdm(&printer);
@@ -4613,7 +4613,7 @@ NotationView::slotFilePrint()
 
     SetWaitCursor waitCursor;
     NotationView printingView(getDocument(), m_segments,
-                              (TQWidget *)tqparent(), this);
+                              (TQWidget *)parent(), this);
 
     if (!printingView.isOK()) {
         NOTATION_DEBUG << "Print : operation cancelled\n";
@@ -4630,7 +4630,7 @@ NotationView::slotFilePrintPreview()
 
     SetWaitCursor waitCursor;
     NotationView printingView(getDocument(), m_segments,
-                              (TQWidget *)tqparent(), this);
+                              (TQWidget *)parent(), this);
 
     if (!printingView.isOK()) {
         NOTATION_DEBUG << "Print preview : operation cancelled\n";

src/gui/editors/notation/NotationView.h

@@ -114,18 +114,18 @@ class NotationView : public EditView,
 public:
     explicit NotationView(RosegardenGUIDoc *doc,
                           std::vector<Segment *> segments,
-                          TQWidget *tqparent,
+                          TQWidget *parent,
                           bool showProgressive); // update during initial render?
 
     /**
-     * Constructor for printing only.  If tqparent is provided, a
+     * Constructor for printing only.  If parent is provided, a
      * progress dialog will be shown -- otherwise not.  If another
      * NotationView is provided, the fonts and other settings used
      * for printing will be taken from that view.
      */
     explicit NotationView(RosegardenGUIDoc *doc,
                           std::vector<Segment *> segments,
-                          TQWidget *tqparent,
+                          TQWidget *parent,
                           NotationView *referenceView);
 
     ~NotationView();

src/gui/editors/notation/NoteCharacter.cpp

@@ -125,8 +125,8 @@ NoteCharacter::draw(TQPainter *painter, int x, int y) const
 void
 NoteCharacter::drawMask(TQPainter *painter, int x, int y) const
 {
-    if (!m_rep && m_pixmap->tqmask()) {
+    if (!m_rep && m_pixmap->mask()) {
-        painter->drawPixmap(x, y, *(m_pixmap->tqmask()));
+        painter->drawPixmap(x, y, *(m_pixmap->mask()));
     }
 }
 

src/gui/editors/notation/NoteFont.cpp

@@ -286,8 +286,8 @@ NoteFont::getPixmap(CharName charName, TQPixmap &pixmap, bool inverted) const
 
         if (!found->isNull()) {
 
-            if (found->tqmask() == 0) {
+            if (found->mask() == 0) {
-                std::cerr << "NoteFont::getPixmap: Warning: No automatic tqmask "
+                std::cerr << "NoteFont::getPixmap: Warning: No automatic mask "
                 << "for character \"" << charName << "\""
                 << (inverted ? " (inverted)" : "") << " in font \""
                 << m_fontMap.getName() << "-" << m_size

src/gui/editors/notation/NoteFontViewer.cpp

@@ -81,9 +81,9 @@ NoteFontViewer::slotFontChanged(const TQString &s)
     slotViewChanged(m_view->currentItem());
 }
 
-NoteFontViewer::NoteFontViewer(TQWidget *tqparent, TQString noteFontName,
+NoteFontViewer::NoteFontViewer(TQWidget *parent, TQString noteFontName,
                                TQStringList fontNames, int pixelSize) :
-        KDialogBase(tqparent, 0, true,
+        KDialogBase(parent, 0, true,
                     i18n("Note Font Viewer: %1").tqarg(noteFontName), Close)
 {
     TQVBox *box = makeVBoxMainWidget();

src/gui/editors/notation/NoteFontViewer.h

@@ -47,7 +47,7 @@ class NoteFontViewer : public KDialogBase
   TQ_OBJECT
 
 public:
-    NoteFontViewer(TQWidget *tqparent, TQString noteFontName,
+    NoteFontViewer(TQWidget *parent, TQString noteFontName,
                    TQStringList systemFontNames, int pixelSize);
 
 protected slots:

src/gui/editors/notation/NotePixmapFactory.cpp

@@ -1261,7 +1261,7 @@ NotePixmapFactory::drawFlags(int flagCount,
 
             } else {
 
-                // No problem with tqmask here
+                // No problem with mask here
                 m_p->drawNoteCharacter(m_left + s1.x() - hotspot.x(),
                                        y,
                                        flagChar);
@@ -2890,7 +2890,7 @@ NotePixmapFactory::drawOttavaAux(int length, int octavesUp,
         m_p->beginExternal(painter);
         painter->translate(x - backpedal, y - height);
     } else {
-        NOTATION_DEBUG << "NotePixmapFactory::drawOttavaAux: making pixmap and tqmask " << width << "x" << height << endl;
+        NOTATION_DEBUG << "NotePixmapFactory::drawOttavaAux: making pixmap and mask " << width << "x" << height << endl;
         createPixmapAndMask(width, height);
     }
 
@@ -3443,7 +3443,7 @@ NotePixmapFactory::createPixmapAndMask(int width, int height,
     total += width * height;
 //    NOTATION_DEBUG << "createPixmapAndMask: " << width << "x" << height << " (" << (width*height) << " px, " << total << " total)" << endl;
 
-    // clear up pixmap and tqmask
+    // clear up pixmap and mask
     m_generatedPixmap->fill();
     m_generatedMask->fill(TQt::color0);
 

src/gui/editors/notation/NotePixmapPainter.h

@@ -33,7 +33,7 @@ namespace Rosegarden {
 class NotePixmapPainter
 {
     // Just a trivial class that instructs two painters to do the
-    // same thing (one for the pixmap, one for the tqmask).  We only
+    // same thing (one for the pixmap, one for the mask).  We only
     // duplicate those methods we actually use in NotePixmapFactory
 
 public:
@@ -55,13 +55,13 @@ public:
 	}
     }
 
-    bool begin(TQPaintDevice *device, TQPaintDevice *tqmask = 0, bool unclipped = false) {
+    bool begin(TQPaintDevice *device, TQPaintDevice *mask = 0, bool unclipped = false) {
 
 	m_externalPainter = 0;
 
-	if (tqmask) {
+	if (mask) {
 	    m_useMask = true;
-	    m_maskPainter.tqbegin(tqmask, unclipped);
+	    m_maskPainter.tqbegin(mask, unclipped);
 	} else {
 	    m_useMask = false;
 	}
@@ -117,7 +117,7 @@ public:
     void drawPixmap(int x, int y, const TQPixmap &pm,
 		    int sx = 0, int sy = 0, int sw = -1, int sh = -1) {
 	m_painter->tqdrawPixmap(x, y, pm, sx, sy, sw, sh);
-	if (m_useMask) m_maskPainter.tqdrawPixmap(x, y, *(pm.tqmask()), sx, sy, sw, sh);
+	if (m_useMask) m_maskPainter.tqdrawPixmap(x, y, *(pm.mask()), sx, sy, sw, sh);
     }
 
     void drawText(int x, int y, const TQString &string) {

src/gui/editors/notation/TrackHeader.cpp

@@ -75,8 +75,8 @@ const int TrackHeader::INCONSISTENT_TRANSPOSITIONS = 1 << 5;
 const int TrackHeader::BEFORE_FIRST_SEGMENT        = 1 << 6;
 
 
-TrackHeader::TrackHeader(TQWidget *tqparent, TrackId trackId, int height, int ypos) :
+TrackHeader::TrackHeader(TQWidget *parent, TrackId trackId, int height, int ypos) :
-        TQLabel(tqparent),
+        TQLabel(parent),
         m_track(trackId),
         m_height(height),
         m_ypos(ypos),
@@ -96,7 +96,7 @@ TrackHeader::TrackHeader(TQWidget *tqparent, TrackId trackId, int height, int yp
         m_current(false)
 {
 
-    m_notationView = static_cast<HeadersGroup *>(tqparent)->getNotationView();
+    m_notationView = static_cast<HeadersGroup *>(parent)->getNotationView();
 
     setFrameStyle(TQFrame::Box | TQFrame::Plain);
     setCurrent(false);
@@ -106,7 +106,7 @@ TrackHeader::TrackHeader(TQWidget *tqparent, TrackId trackId, int height, int yp
     // Tooltip text creation
 
     Composition *comp = 
-        static_cast<HeadersGroup *>(tqparent)->getComposition();
+        static_cast<HeadersGroup *>(parent)->getComposition();
     Track *track = comp->getTrackById(m_track);
     int trackPos = comp->getTrackPositionById(m_track);
 
@@ -274,7 +274,7 @@ TrackHeader::lookAtStaff(double x, int maxWidth)
     int staff;
 
     Composition *comp = 
-        static_cast<HeadersGroup *>(TQT_TQWIDGET(tqparent()))->getComposition();
+        static_cast<HeadersGroup *>(TQT_TQWIDGET(parent()))->getComposition();
     Track *track = comp->getTrackById(m_track);
     int trackPos = comp->getTrackPositionById(m_track);
 

src/gui/editors/notation/TrackHeader.h

@@ -57,10 +57,10 @@ class TrackHeader : public TQLabel
 public:
     /**
      * Create a new track header for track of id trackId.
-     * *tqparent is the tqparent widget, height the height of staff and
+     * *parent is the parent widget, height the height of staff and
      * ypos is the staff y position on canvas.
      */
-    TrackHeader(TQWidget *tqparent, TrackId trackId, int height, int ypos);
+    TrackHeader(TQWidget *parent, TrackId trackId, int height, int ypos);
 
     /**
      * Draw a blue line around header when current is true

src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp

@@ -242,8 +242,8 @@ AudioInstrumentParameterPanel::setButtonColour(
     }
 }
 
-AudioInstrumentParameterPanel::AudioInstrumentParameterPanel(RosegardenGUIDoc* doc, TQWidget* tqparent)
+AudioInstrumentParameterPanel::AudioInstrumentParameterPanel(RosegardenGUIDoc* doc, TQWidget* parent)
-        : InstrumentParameterPanel(doc, tqparent),
+        : InstrumentParameterPanel(doc, parent),
         m_audioFader(new AudioFaderBox(this))
 {
     TQGridLayout *gridLayout = new TQGridLayout(this, 3, 2, 5, 5);

src/gui/editors/parameters/AudioInstrumentParameterPanel.h

@@ -49,7 +49,7 @@ class AudioInstrumentParameterPanel : public InstrumentParameterPanel
     Q_OBJECT
   TQ_OBJECT
 public:
-    AudioInstrumentParameterPanel(RosegardenGUIDoc* doc, TQWidget* tqparent);
+    AudioInstrumentParameterPanel(RosegardenGUIDoc* doc, TQWidget* parent);
 
     virtual void setupForInstrument(Instrument*);
 

src/gui/editors/parameters/InstrumentParameterBox.cpp

@@ -49,10 +49,10 @@ namespace Rosegarden
 {
 
 InstrumentParameterBox::InstrumentParameterBox(RosegardenGUIDoc *doc,
-                                               TQWidget *tqparent)
+                                               TQWidget *parent)
     : RosegardenParameterBox(i18n("Instrument"),
                              i18n("Instrument Parameters"),
-                             tqparent),
+                             parent),
       m_widgetStack(new TQWidgetStack(this)),
       m_noInstrumentParameters(new TQVBox(this)),
       m_midiInstrumentParameters(new MIDIInstrumentParameterPanel(doc, this)),

src/gui/editors/parameters/InstrumentParameterBox.h

@@ -57,7 +57,7 @@ Q_OBJECT
 
 public:
     InstrumentParameterBox(RosegardenGUIDoc *doc,
-                           TQWidget *tqparent = 0);
+                           TQWidget *parent = 0);
     ~InstrumentParameterBox();
 
     void useInstrument(Instrument *instrument);

src/gui/editors/parameters/InstrumentParameterPanel.cpp

@@ -38,8 +38,8 @@ namespace Rosegarden
 {
 
 InstrumentParameterPanel::InstrumentParameterPanel(RosegardenGUIDoc *doc,
-        TQWidget* tqparent)
+        TQWidget* parent)
-        : TQFrame(tqparent),
+        : TQFrame(parent),
         m_instrumentLabel(new KSqueezedTextLabel(this)),
         m_selectedInstrument(0),
         m_doc(doc)

src/gui/editors/parameters/InstrumentParameterPanel.h

@@ -52,7 +52,7 @@ class InstrumentParameterPanel : public TQFrame
     Q_OBJECT
   TQ_OBJECT
 public:
-    InstrumentParameterPanel(RosegardenGUIDoc *doc, TQWidget* tqparent);
+    InstrumentParameterPanel(RosegardenGUIDoc *doc, TQWidget* parent);
 
     virtual ~InstrumentParameterPanel() {};
 

src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp

@@ -60,8 +60,8 @@
 namespace Rosegarden
 {
 
-MIDIInstrumentParameterPanel::MIDIInstrumentParameterPanel(RosegardenGUIDoc *doc, TQWidget* tqparent):
+MIDIInstrumentParameterPanel::MIDIInstrumentParameterPanel(RosegardenGUIDoc *doc, TQWidget* parent):
-        InstrumentParameterPanel(doc, tqparent),
+        InstrumentParameterPanel(doc, parent),
         m_rotaryFrame(0),
         m_rotaryMapper(new TQSignalMapper(TQT_TQOBJECT(this)))
 {

src/gui/editors/parameters/MIDIInstrumentParameterPanel.h

@@ -55,7 +55,7 @@ class MIDIInstrumentParameterPanel : public InstrumentParameterPanel
   TQ_OBJECT
 public:
 
-    MIDIInstrumentParameterPanel(RosegardenGUIDoc *doc, TQWidget* tqparent);
+    MIDIInstrumentParameterPanel(RosegardenGUIDoc *doc, TQWidget* parent);
 
     void setupControllers(MidiDevice *); // setup ControlParameters on box
 

src/gui/editors/parameters/RosegardenParameterArea.cpp

@@ -46,9 +46,9 @@
 namespace Rosegarden
 {
 
-RosegardenParameterArea::RosegardenParameterArea(TQWidget *tqparent,
+RosegardenParameterArea::RosegardenParameterArea(TQWidget *parent,
         const char *name, WFlags f)
-        : TQWidgetStack(tqparent, name, f),
+        : TQWidgetStack(parent, name, f),
         m_style(RosegardenParameterArea::CLASSIC_STYLE),
         m_scrollView(new TQScrollView(this, 0, TQt::WStaticContents)),
         m_classic(new TQVBox(m_scrollView->viewport())),
@@ -204,7 +204,7 @@ void RosegardenParameterArea::moveWidget(TQWidget *old_container,
         m_tabBox->removePage(box);
     }
 
-    // Retqparent the parameter box, and perform any container-specific
+    // Reparent the parameter box, and perform any container-specific
     // configuration.
 
     if (new_container == m_classic) {

src/gui/editors/parameters/RosegardenParameterArea.h

@@ -57,7 +57,7 @@ public:
 
     // Create the parameter display area.
 
-    RosegardenParameterArea(TQWidget *tqparent=0, const char *name=0, WFlags f=0);
+    RosegardenParameterArea(TQWidget *parent=0, const char *name=0, WFlags f=0);
 
     // Add a rosegarden parameter box to the list that are to be displayed.
 

src/gui/editors/parameters/RosegardenParameterBox.cpp

@@ -41,9 +41,9 @@ namespace Rosegarden
 
 RosegardenParameterBox::RosegardenParameterBox(const TQString &shortLabel,
         const TQString &longLabel,
-        TQWidget *tqparent,
+        TQWidget *parent,
         const char *name) :
-        TQFrame(tqparent, name),
+        TQFrame(parent, name),
         m_shortLabel(shortLabel),
         m_longLabel(longLabel),
         m_mode(LANDSCAPE_MODE)

src/gui/editors/parameters/RosegardenParameterBox.h

@@ -55,7 +55,7 @@ class RosegardenParameterBox : public TQFrame
 public:
     RosegardenParameterBox(const TQString &shortLabel, // e.g. i18n("Track")
                            const TQString &longLabel,  // e.g. i18n("Track Parameters")
-                           TQWidget *tqparent = 0,
+                           TQWidget *parent = 0,
                            const char *name = 0);
 
     // Ask for a one-word string that can be used to label the widget.
@@ -75,8 +75,8 @@ protected:
     // List the tqlayout styles that may be requested via a call to setStyle().
 
     enum LayoutMode {
-        LANDSCAPE_MODE,  // Optimize the tqlayout for a tall and narrow tqparent.
+        LANDSCAPE_MODE,  // Optimize the tqlayout for a tall and narrow parent.
-        PORTRAIT_MODE    // Optimize the tqlayout for a short and wide tqparent.
+        PORTRAIT_MODE    // Optimize the tqlayout for a short and wide parent.
     };
 
     void setLayoutMode(LayoutMode mode);

src/gui/editors/parameters/SegmentParameterBox.cpp

@@ -84,10 +84,10 @@ namespace Rosegarden
 {
 
 SegmentParameterBox::SegmentParameterBox(RosegardenGUIDoc* doc,
-        TQWidget *tqparent)
+        TQWidget *parent)
         : RosegardenParameterBox(i18n("Segment"),
                                  i18n("Segment Parameters"),
-                                 tqparent),
+                                 parent),
         m_highestPlayable(127),
         m_lowestPlayable(0),
         m_standardQuantizations(BasicQuantizer::getStandardQuantizations()),

src/gui/editors/parameters/SegmentParameterBox.h

@@ -73,7 +73,7 @@ public:
     } Tristate;
 
     SegmentParameterBox(RosegardenGUIDoc *doc,
-                        TQWidget *tqparent=0);
+                        TQWidget *parent=0);
     ~SegmentParameterBox();
 
     // Use Segments to update GUI parameters

src/gui/editors/parameters/TrackParameterBox.cpp

@@ -88,10 +88,10 @@ namespace Rosegarden
 {
 
 TrackParameterBox::TrackParameterBox( RosegardenGUIDoc *doc,
-                                      TQWidget *tqparent)
+                                      TQWidget *parent)
         : RosegardenParameterBox(i18n("Track"),
                                  i18n("Track Parameters"),
-                                 tqparent),
+                                 parent),
         m_doc(doc),
         m_highestPlayable(127),
         m_lowestPlayable(0),

src/gui/editors/parameters/TrackParameterBox.h

@@ -61,7 +61,7 @@ Q_OBJECT
         
 public:
     TrackParameterBox( RosegardenGUIDoc *doc,
-                       TQWidget *tqparent=0);
+                       TQWidget *parent=0);
     ~TrackParameterBox();
     
     void setDocument( RosegardenGUIDoc *doc );

src/gui/editors/segment/ControlEditorDialog.cpp

@@ -72,10 +72,10 @@ namespace Rosegarden
 
 const TQString notShowing(i18n("<not showing>"));
 
-ControlEditorDialog::ControlEditorDialog(TQWidget *tqparent,
+ControlEditorDialog::ControlEditorDialog(TQWidget *parent,
         RosegardenGUIDoc *doc,
         DeviceId device):
-        KMainWindow(tqparent, "controleditordialog"),
+        KMainWindow(parent, "controleditordialog"),
         m_studio(&doc->getStudio()),
         m_doc(doc),
         m_device(device),

src/gui/editors/segment/ControlEditorDialog.h

@@ -53,7 +53,7 @@ class ControlEditorDialog : public KMainWindow
   TQ_OBJECT
 
 public:
-    ControlEditorDialog(TQWidget *tqparent,
+    ControlEditorDialog(TQWidget *parent,
                         RosegardenGUIDoc *doc,
                         DeviceId device);
 

src/gui/editors/segment/ControlParameterEditDialog.cpp

@@ -55,10 +55,10 @@ namespace Rosegarden
 const TQString notShowing(i18n("<not showing>"));
 
 ControlParameterEditDialog::ControlParameterEditDialog(
-    TQWidget *tqparent,
+    TQWidget *parent,
     ControlParameter *control,
     RosegardenGUIDoc *doc):
-        KDialogBase(tqparent, 0, true,
+        KDialogBase(parent, 0, true,
                     i18n("Edit Control Parameter"), Ok | Cancel),
         m_doc(doc),
         m_control(control)

src/gui/editors/segment/ControlParameterEditDialog.h

@@ -49,7 +49,7 @@ class ControlParameterEditDialog : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    ControlParameterEditDialog(TQWidget *tqparent,
+    ControlParameterEditDialog(TQWidget *parent,
                                ControlParameter *control,
                                RosegardenGUIDoc *doc);
 

src/gui/editors/segment/ControlParameterItem.h

@@ -38,7 +38,7 @@ class ControlParameterItem : public KListViewItem
 {
 public:
     ControlParameterItem(int id,
-                         TQListView *tqparent,
+                         TQListView *parent,
                          TQString str1,
                          TQString str2,
                          TQString str3,
@@ -48,7 +48,7 @@ public:
                          TQString str7,
                          TQString str8,
                          TQString str9):
-        KListViewItem(tqparent, str1, str2, str3, str4, str5, str6, str7, str8),
+        KListViewItem(parent, str1, str2, str3, str4, str5, str6, str7, str8),
         m_id(id) { setText(8, str9); }
 
     int getId() const { return m_id; }

src/gui/editors/segment/MarkerEditor.cpp

@@ -71,9 +71,9 @@
 namespace Rosegarden
 {
 
-MarkerEditor::MarkerEditor(TQWidget *tqparent,
+MarkerEditor::MarkerEditor(TQWidget *parent,
                                        RosegardenGUIDoc *doc):
-        KMainWindow(tqparent, "markereditordialog"),
+        KMainWindow(parent, "markereditordialog"),
         m_doc(doc),
         m_modified(false)
 {

src/gui/editors/segment/MarkerEditor.h

@@ -54,7 +54,7 @@ class MarkerEditor : public KMainWindow
   TQ_OBJECT
 
 public:
-    MarkerEditor(TQWidget *tqparent,
+    MarkerEditor(TQWidget *parent,
                        RosegardenGUIDoc *doc);
     ~MarkerEditor();
 

src/gui/editors/segment/MarkerEditorViewItem.h

@@ -35,7 +35,7 @@ namespace Rosegarden {
 class MarkerEditorViewItem : public KListViewItem
 {
 public:
-    MarkerEditorViewItem(TQListView * tqparent, int id,
+    MarkerEditorViewItem(TQListView * parent, int id,
                          TQString label1, 
                          TQString label2 = TQString(), 
                          TQString label3 = TQString(),
@@ -44,7 +44,7 @@ public:
                          TQString label6 = TQString(), 
                          TQString label7 = TQString(), 
                          TQString label8 = TQString()):
-        KListViewItem(tqparent, label1, label2, label3, label4,
+        KListViewItem(parent, label1, label2, label3, label4,
                       label5, label6, label7, label8),
 	m_rawTime(0), m_fake(false), m_id(id) { ; }
 

src/gui/editors/segment/PlayList.cpp

@@ -47,8 +47,8 @@
 namespace Rosegarden
 {
 
-PlayList::PlayList(TQWidget *tqparent, const char *name)
+PlayList::PlayList(TQWidget *parent, const char *name)
-        : TQVBox(tqparent, name),
+        : TQVBox(parent, name),
         m_listView(new PlayListView(this)),
         m_buttonBar(new TQFrame(this)),
         m_barLayout(new TQHBoxLayout(m_buttonBar)),

src/gui/editors/segment/PlayList.h

@@ -49,7 +49,7 @@ class PlayList : public TQVBox
   TQ_OBJECT
 
 public:
-    PlayList(TQWidget *tqparent = 0, const char *name = 0);
+    PlayList(TQWidget *parent = 0, const char *name = 0);
     ~PlayList();
 
     PlayListView* getListView() { return m_listView; }

src/gui/editors/segment/PlayListDialog.cpp

@@ -36,8 +36,8 @@ namespace Rosegarden
 {
 
 PlayListDialog::PlayListDialog(TQString caption,
-                               TQWidget* tqparent, const char* name)
+                               TQWidget* parent, const char* name)
-        : KDialogBase(tqparent, name, false, caption,
+        : KDialogBase(parent, name, false, caption,
                       KDialogBase::Close,  // standard buttons
                       KDialogBase::Close,  // default button
                       true),

src/gui/editors/segment/PlayListDialog.h

@@ -46,7 +46,7 @@ class PlayListDialog : public KDialogBase
   TQ_OBJECT
 
 public:
-    PlayListDialog(TQString caption, TQWidget* tqparent = 0, const char* name = 0);
+    PlayListDialog(TQString caption, TQWidget* parent = 0, const char* name = 0);
 
     PlayList* getPlayList() { return m_playList; }
 

src/gui/editors/segment/PlayListView.cpp

@@ -29,8 +29,8 @@
 
 namespace Rosegarden {
 
-PlayListView::PlayListView(TQWidget *tqparent, const char *name)
+PlayListView::PlayListView(TQWidget *parent, const char *name)
-    : KListView(tqparent, name)
+    : KListView(parent, name)
 {
     addColumn(i18n("Title"));
     addColumn(i18n("File name"));

src/gui/editors/segment/PlayListView.h

@@ -32,7 +32,7 @@ namespace Rosegarden {
 class PlayListView : public KListView
 {
 public:
-    PlayListView(TQWidget *tqparent=0, const char *name=0);
+    PlayListView(TQWidget *parent=0, const char *name=0);
 
     TQListViewItem* previousSibling(TQListViewItem*);
 

src/gui/editors/segment/PlayListViewItem.cpp

@@ -26,14 +26,14 @@
 
 namespace Rosegarden {
 
-PlayListViewItem::PlayListViewItem(KListView* tqparent, KURL kurl)
+PlayListViewItem::PlayListViewItem(KListView* parent, KURL kurl)
-    : KListViewItem(tqparent, kurl.fileName(), kurl.prettyURL()),
+    : KListViewItem(parent, kurl.fileName(), kurl.prettyURL()),
       m_kurl(kurl)
 {
 }
 
-PlayListViewItem::PlayListViewItem(KListView* tqparent, TQListViewItem* after, KURL kurl)
+PlayListViewItem::PlayListViewItem(KListView* parent, TQListViewItem* after, KURL kurl)
-    : KListViewItem(tqparent, after, kurl.fileName(), kurl.prettyURL()),
+    : KListViewItem(parent, after, kurl.fileName(), kurl.prettyURL()),
       m_kurl(kurl)
 {
 }

src/gui/editors/segment/PlayListViewItem.h

@@ -33,8 +33,8 @@ namespace Rosegarden {
 class PlayListViewItem : public KListViewItem
 {
 public:
-    PlayListViewItem(KListView* tqparent, KURL);
+    PlayListViewItem(KListView* parent, KURL);
-    PlayListViewItem(KListView* tqparent, TQListViewItem*, KURL);
+    PlayListViewItem(KListView* parent, TQListViewItem*, KURL);
 
     const KURL& getURL() { return m_kurl; }
 

src/gui/editors/segment/TrackButtons.cpp

@@ -72,10 +72,10 @@ TrackButtons::TrackButtons(RosegardenGUIDoc* doc,
                            unsigned int trackLabelWidth,
                            bool showTrackLabels,
                            int overallHeight,
-                           TQWidget* tqparent,
+                           TQWidget* parent,
                            const char* name,
                            WFlags f)
-        : TQFrame(tqparent, name, f),
+        : TQFrame(parent, name, f),
         m_doc(doc),
         m_tqlayout(new TQVBoxLayout(this)),
         m_recordSigMapper(new TQSignalMapper(TQT_TQOBJECT(this))),

src/gui/editors/segment/TrackButtons.h

@@ -62,7 +62,7 @@ public:
                  unsigned int trackLabelWidth,
                  bool showTrackLabels,
                  int overallHeight,
-                 TQWidget* tqparent = 0,
+                 TQWidget* parent = 0,
                  const char* name = 0,
                  WFlags f=0);
 

src/gui/editors/segment/TrackEditor.cpp

@@ -87,10 +87,10 @@ TrackEditor::TrackEditor(RosegardenGUIDoc* doc,
                          RulerScale *rulerScale,
                          bool showTrackLabels,
                          double initialUnitsPerPixel,
-                         TQWidget* tqparent, const char* name,
+                         TQWidget* parent, const char* name,
                          WFlags) :
         DCOPObject("TrackEditorIface"),
-        TQWidget(tqparent, name),
+        TQWidget(parent, name),
         m_doc(doc),
         m_rulerScale(rulerScale),
         m_topStandardRuler(0),
@@ -166,7 +166,7 @@ TrackEditor::init(TQWidget* rosegardenguiview)
 
     connect(rosegardenguiview, TQT_SIGNAL(instrumentParametersChanged(InstrumentId)),
             m_compositionModel, TQT_SLOT(slotInstrumentParametersChanged(InstrumentId)));
-    connect(rosegardenguiview->tqparent(), TQT_SIGNAL(instrumentParametersChanged(InstrumentId)),
+    connect(rosegardenguiview->parent(), TQT_SIGNAL(instrumentParametersChanged(InstrumentId)),
             m_compositionModel, TQT_SLOT(slotInstrumentParametersChanged(InstrumentId)));
 
     m_segmentCanvas = new CompositionView(m_doc, m_compositionModel, this);

src/gui/editors/segment/TrackEditor.h

@@ -78,7 +78,7 @@ public:
                 RulerScale *rulerScale,
                 bool showTrackLabels,
                 double initialUnitsPerPixel = 0,
-                TQWidget* tqparent = 0, const char* name = 0,
+                TQWidget* parent = 0, const char* name = 0,
                 WFlags f=0);
 
     ~TrackEditor();

src/gui/editors/segment/TrackHeader.h

@@ -43,9 +43,9 @@ class TrackHeader : public TQHeader
 
 public:
     TrackHeader(int number,
-                          TQWidget *tqparent=0,
+                          TQWidget *parent=0,
                           const char *name=0 ):
-                            TQHeader(number, tqparent, name) {;}
+                            TQHeader(number, parent, name) {;}
     ~TrackHeader();
 
 protected:

src/gui/editors/segment/TrackLabel.cpp

@@ -45,9 +45,9 @@ namespace Rosegarden
 
 TrackLabel::TrackLabel(TrackId id,
                        int position,
-                       TQWidget *tqparent,
+                       TQWidget *parent,
                        const char *name):
-        TQWidgetStack(tqparent, name),
+        TQWidgetStack(parent, name),
         m_instrumentLabel(new TQLabel(this)),
         m_trackLabel(new TQLabel(this)),
         m_id(id),

src/gui/editors/segment/TrackLabel.h

@@ -62,7 +62,7 @@ public:
 
     TrackLabel(TrackId id,
                int position,
-               TQWidget *tqparent,
+               TQWidget *parent,
                const char *name=0);
 
     ~TrackLabel();

src/gui/editors/segment/TrackVUMeter.cpp

@@ -34,13 +34,13 @@
 namespace Rosegarden
 {
 
-TrackVUMeter::TrackVUMeter(TQWidget *tqparent,
+TrackVUMeter::TrackVUMeter(TQWidget *parent,
                            VUMeterType type,
                            int width,
                            int height,
                            int position,
                            const char *name):
-        VUMeter(tqparent, type, false, false, width, height, VUMeter::Horizontal, name),
+        VUMeter(parent, type, false, false, width, height, VUMeter::Horizontal, name),
         m_position(position), m_textHeight(12)
 {
     tqsetAlignment(AlignCenter);

src/gui/editors/segment/TrackVUMeter.h

@@ -40,7 +40,7 @@ namespace Rosegarden
 class TrackVUMeter: public VUMeter
 {
 public:
-     TrackVUMeter(TQWidget *tqparent = 0,
+     TrackVUMeter(TQWidget *parent = 0,
                   VUMeterType type = Plain,
                   int width = 0,
                   int height = 0,

src/gui/editors/segment/TriggerManagerItem.h

@@ -35,7 +35,7 @@ namespace Rosegarden {
 class TriggerManagerItem : public TQListViewItem
 {
 public:
-    TriggerManagerItem(TQListView * tqparent, TQString label1, 
+    TriggerManagerItem(TQListView * parent, TQString label1, 
 		      TQString label2 = TQString(), 
 		      TQString label3 = TQString(),
 		      TQString label4 = TQString(), 
@@ -43,7 +43,7 @@ public:
 		      TQString label6 = TQString(), 
 		      TQString label7 = TQString(), 
 		      TQString label8 = TQString()):
-        TQListViewItem(tqparent, label1, label2, label3, label4,
+        TQListViewItem(parent, label1, label2, label3, label4,
                       label5, label6, label7, label8) { ; }
 
     virtual int compare(TQListViewItem * i, int col, bool ascending) const;

src/gui/editors/segment/TriggerSegmentManager.cpp

@@ -73,9 +73,9 @@
 namespace Rosegarden
 {
 
-TriggerSegmentManager::TriggerSegmentManager(TQWidget *tqparent,
+TriggerSegmentManager::TriggerSegmentManager(TQWidget *parent,
         RosegardenGUIDoc *doc):
-        KMainWindow(tqparent, "triggereditordialog"),
+        KMainWindow(parent, "triggereditordialog"),
         m_doc(doc),
         m_modified(false)
 {

src/gui/editors/segment/TriggerSegmentManager.h

@@ -53,7 +53,7 @@ class TriggerSegmentManager : public KMainWindow
   TQ_OBJECT
 
 public:
-    TriggerSegmentManager(TQWidget *tqparent,
+    TriggerSegmentManager(TQWidget *parent,
                           RosegardenGUIDoc *doc);
     ~TriggerSegmentManager();
 

src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.cpp

@@ -44,8 +44,8 @@ static int apuExtantCount = 0;
 AudioPreviewUpdater::AudioPreviewUpdater(AudioPreviewThread &thread,
         const Composition& c, const Segment* s,
         const TQRect& r,
-        CompositionModelImpl* tqparent)
+        CompositionModelImpl* parent)
-        : TQObject(tqparent),
+        : TQObject(parent),
         m_thread(thread),
         m_composition(c),
         m_segment(s),

src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.h

@@ -53,7 +53,7 @@ public:
                         const Composition &composition,
                         const Segment *segment,
                         const TQRect &displayExtent,
-                        CompositionModelImpl *tqparent);
+                        CompositionModelImpl *parent);
     ~AudioPreviewUpdater();
 
     void update();

src/gui/editors/segment/segmentcanvas/CompositionView.cpp

@@ -88,12 +88,12 @@ protected:
 
 CompositionView::CompositionView(RosegardenGUIDoc* doc,
                                  CompositionModel* model,
-                                 TQWidget * tqparent, const char * name, WFlags f)
+                                 TQWidget * parent, const char * name, WFlags f)
 #if KDE_VERSION >= KDE_MAKE_VERSION(3,2,0)
-        : RosegardenScrollView(tqparent, name, f | WNoAutoErase | WStaticContents),
+        : RosegardenScrollView(parent, name, f | WNoAutoErase | WStaticContents),
 #else
         :
-        RosegardenScrollView(tqparent, name, f | WRepaintNoErase | WResizeNoErase | WStaticContents),
+        RosegardenScrollView(parent, name, f | WRepaintNoErase | WResizeNoErase | WStaticContents),
 #endif
         m_model(model),
         m_currentItem(0),

src/gui/editors/segment/segmentcanvas/CompositionView.h

@@ -67,7 +67,7 @@ class CompositionView : public RosegardenScrollView
   TQ_OBJECT
 public:
     CompositionView(RosegardenGUIDoc*, CompositionModel*,
-                    TQWidget * tqparent=0, const char* name=0, WFlags f=0);
+                    TQWidget * parent=0, const char* name=0, WFlags f=0);
 
     void setPointerPos(int pos);
     int getPointerPos() { return m_pointerPos; }

src/gui/editors/segment/segmentcanvas/SegmentItemPreview.h

@@ -44,7 +44,7 @@ class RulerScale;
 class SegmentItemPreview 
 {
 public:
-    SegmentItemPreview(Segment& tqparent,
+    SegmentItemPreview(Segment& parent,
                        RulerScale* scale);
     virtual ~SegmentItemPreview();
 

src/gui/editors/segment/segmentcanvas/SegmentTool.cpp

@@ -42,7 +42,7 @@ namespace Rosegarden
 {
 
 SegmentTool::SegmentTool(CompositionView* canvas, RosegardenGUIDoc *doc)
-        : BaseTool("segment_tool_menu", dynamic_cast<KMainWindow*>(doc->tqparent())->factory(), TQT_TQOBJECT(canvas)),
+        : BaseTool("segment_tool_menu", dynamic_cast<KMainWindow*>(doc->parent())->factory(), TQT_TQOBJECT(canvas)),
         m_canvas(canvas),
         m_doc(doc),
         m_changeMade(false)
@@ -86,7 +86,7 @@ SegmentTool::createMenu()
     RG_DEBUG << "SegmentTool::createMenu()\n";
 
     RosegardenGUIApp *app =
-        dynamic_cast<RosegardenGUIApp*>(m_doc->tqparent());
+        dynamic_cast<RosegardenGUIApp*>(m_doc->parent());
 
     if (app) {
         m_menu = static_cast<TQPopupMenu*>

src/gui/editors/segment/segmentcanvas/SegmentTool.h

@@ -64,7 +64,7 @@ public:
     virtual ~SegmentTool();
 
     /**
-     * Is called by the tqparent View (EditView or SegmentCanvas) when
+     * Is called by the parent View (EditView or SegmentCanvas) when
      * the tool is set as current.
      * Add any setup here
      */

src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp

@@ -42,9 +42,9 @@
 namespace Rosegarden
 {
 
-SegmentToolBox::SegmentToolBox(CompositionView* tqparent, RosegardenGUIDoc* doc)
+SegmentToolBox::SegmentToolBox(CompositionView* parent, RosegardenGUIDoc* doc)
-        : BaseToolBox(tqparent),
+        : BaseToolBox(parent),
-        m_canvas(tqparent),
+        m_canvas(parent),
         m_doc(doc)
 {}
 

src/gui/editors/segment/segmentcanvas/SegmentToolBox.h

@@ -45,7 +45,7 @@ class SegmentToolBox : public BaseToolBox
     Q_OBJECT
   TQ_OBJECT
 public:
-    SegmentToolBox(CompositionView* tqparent, RosegardenGUIDoc*);
+    SegmentToolBox(CompositionView* parent, RosegardenGUIDoc*);
 
     virtual SegmentTool* getTool(const TQString& toolName);
     

src/gui/editors/tempo/TempoListItem.h

@@ -42,12 +42,12 @@ public:
 		  Type type,
 		  timeT time,
 		  int index,
-		  KListView *tqparent,
+		  KListView *parent,
 		  TQString label1,
 		  TQString label2,
 		  TQString label3,
 		  TQString label4 = TQString()) :
-	KListViewItem(tqparent, label1, label2, label3, label4),
+	KListViewItem(parent, label1, label2, label3, label4),
 	m_composition(composition),
 	m_type(type),
 	m_time(time),

src/gui/editors/tempo/TempoView.cpp

@@ -70,8 +70,8 @@ int
 TempoView::m_lastSetFilter = -1;
 
 
-TempoView::TempoView(RosegardenGUIDoc *doc, TQWidget *tqparent, timeT openTime):
+TempoView::TempoView(RosegardenGUIDoc *doc, TQWidget *parent, timeT openTime):
-        EditViewBase(doc, std::vector<Segment *>(), 2, tqparent, "tempoview"),
+        EditViewBase(doc, std::vector<Segment *>(), 2, parent, "tempoview"),
         m_filter(Tempo | TimeSignature),
         m_ignoreUpdates(true)
 {

src/gui/editors/tempo/TempoView.h

@@ -72,7 +72,7 @@ class TempoView : public EditViewBase, public CompositionObserver
     };
 
 public:
-    TempoView(RosegardenGUIDoc *doc, TQWidget *tqparent, timeT);
+    TempoView(RosegardenGUIDoc *doc, TQWidget *parent, timeT);
     virtual ~TempoView();
 
     virtual bool applyLayout(int staffNo = -1);

src/gui/general/BaseTool.cpp

@@ -36,8 +36,8 @@
 namespace Rosegarden
 {
 
-BaseTool::BaseTool(const TQString& menuName, KXMLGUIFactory* factory, TQObject* tqparent)
+BaseTool::BaseTool(const TQString& menuName, KXMLGUIFactory* factory, TQObject* parent)
-        : TQObject(tqparent),
+        : TQObject(parent),
         m_menuName(menuName),
         m_menu(0),
         m_parentFactory(factory)

src/gui/general/BaseTool.h

@@ -56,14 +56,14 @@ public:
     virtual ~BaseTool();
 
     /**
-     * Is called by the tqparent View (EditView or SegmentCanvas) when
+     * Is called by the parent View (EditView or SegmentCanvas) when
      * the tool is set as current.
      * Add any setup here (e.g. setting the mouse cursor tqshape)
      */
     virtual void ready();
 
     /**
-     * Is called by the tqparent View (EditView or SegmentCanvas) after
+     * Is called by the parent View (EditView or SegmentCanvas) after
      * the tool is put away.
      * Add any cleanup here
      */
@@ -88,7 +88,7 @@ protected:
      *
      * \a menuName : the name of the menu defined in the XML rc file
      */
-    BaseTool(const TQString& menuName, KXMLGUIFactory*, TQObject* tqparent);
+    BaseTool(const TQString& menuName, KXMLGUIFactory*, TQObject* parent);
 
     virtual void createMenu() = 0;
     virtual bool hasMenu() { return false; }

src/gui/general/BaseToolBox.cpp

@@ -34,8 +34,8 @@
 namespace Rosegarden
 {
 
-BaseToolBox::BaseToolBox(TQWidget* tqparent)
+BaseToolBox::BaseToolBox(TQWidget* parent)
-        : TQObject(tqparent),
+        : TQObject(parent),
         m_tools(17,  // default size, from the TQt docs
                 false) // but we want it to be case insensitive
 {

src/gui/general/BaseToolBox.h

@@ -51,7 +51,7 @@ class BaseToolBox : public TQObject
   TQ_OBJECT
 
 public:
-    BaseToolBox(TQWidget* tqparent);
+    BaseToolBox(TQWidget* parent);
 
     virtual BaseTool* getTool(const TQString& toolName);
 

src/gui/general/EditToolBox.cpp

@@ -35,9 +35,9 @@
 namespace Rosegarden
 {
 
-EditToolBox::EditToolBox(EditView *tqparent)
+EditToolBox::EditToolBox(EditView *parent)
-        : BaseToolBox(tqparent),
+        : BaseToolBox(parent),
-        m_parentView(tqparent)
+        m_parentView(parent)
 {
 }
 

src/gui/general/EditToolBox.h

@@ -48,7 +48,7 @@ class EditToolBox : public BaseToolBox
     Q_OBJECT
   TQ_OBJECT
 public:
-    EditToolBox(EditView* tqparent);
+    EditToolBox(EditView* parent);
 
     virtual EditTool* getTool(const TQString& toolName);
 

src/gui/general/EditView.cpp

@@ -119,8 +119,8 @@ static int FeatureShowVelocity = 0x00001; // show the velocity ruler
 EditView::EditView(RosegardenGUIDoc *doc,
                    std::vector<Segment *> segments,
                    unsigned int cols,
-                   TQWidget *tqparent, const char *name) :
+                   TQWidget *parent, const char *name) :
-        EditViewBase(doc, segments, cols, tqparent, name),
+        EditViewBase(doc, segments, cols, parent, name),
         m_currentEventSelection(0),
         m_activeItem(0),
         m_canvasView(0),

src/gui/general/EditView.h

@@ -82,7 +82,7 @@ public:
     EditView(RosegardenGUIDoc *doc,
              std::vector<Segment *> segments,
              unsigned int cols,
-             TQWidget *tqparent,
+             TQWidget *parent,
              const char *name = 0);
 
     virtual ~EditView();

src/gui/general/EditViewBase.cpp

@@ -77,8 +77,8 @@ const unsigned int EditViewBase::NbLayoutRows = 6;
 EditViewBase::EditViewBase(RosegardenGUIDoc *doc,
                            std::vector<Segment *> segments,
                            unsigned int cols,
-                           TQWidget *tqparent, const char *name) :
+                           TQWidget *parent, const char *name) :
-        KDockMainWindow(tqparent, name),
+        KDockMainWindow(parent, name),
         m_viewNumber( -1),
         m_viewLocalPropertyPrefix(makeViewLocalPropertyPrefix()),
         m_config(kapp->config()),

src/gui/general/EditViewBase.h

@@ -73,7 +73,7 @@ public:
     EditViewBase(RosegardenGUIDoc *doc,
              std::vector<Segment *> segments,
              unsigned int cols,
-             TQWidget *tqparent,
+             TQWidget *parent,
              const char *name = 0);
 
     virtual ~EditViewBase();

src/gui/general/PixmapFunctions.cpp

@@ -127,8 +127,8 @@ PixmapFunctions::colourPixmap(const TQPixmap &map, int hue, int minValue)
 
     TQPixmap rmap;
     rmap.convertFromImage(image);
-    if (map.tqmask())
+    if (map.mask())
-        rmap.setMask(*map.tqmask());
+        rmap.setMask(*map.mask());
     return rmap;
 }
 
@@ -156,8 +156,8 @@ PixmapFunctions::shadePixmap(const TQPixmap &map)
 
     TQPixmap rmap;
     rmap.convertFromImage(image);
-    if (map.tqmask())
+    if (map.mask())
-        rmap.setMask(*map.tqmask());
+        rmap.setMask(*map.mask());
     return rmap;
 }
 
@@ -168,8 +168,8 @@ PixmapFunctions::flipVertical(const TQPixmap &map)
     TQImage i(map.convertToImage());
     rmap.convertFromImage(i.mirror(false, true));
 
-    if (map.tqmask()) {
+    if (map.mask()) {
-        TQImage im(map.tqmask()->convertToImage());
+        TQImage im(map.mask()->convertToImage());
         TQBitmap newMask;
         newMask.convertFromImage(im.mirror(false, true));
         rmap.setMask(newMask);
@@ -185,8 +185,8 @@ PixmapFunctions::flipHorizontal(const TQPixmap &map)
     TQImage i(map.convertToImage());
     rmap.convertFromImage(i.mirror(true, false));
 
-    if (map.tqmask()) {
+    if (map.mask()) {
-        TQImage im(map.tqmask()->convertToImage());
+        TQImage im(map.mask()->convertToImage());
         TQBitmap newMask;
         newMask.convertFromImage(im.mirror(true, false));
         rmap.setMask(newMask);
@@ -211,7 +211,7 @@ PixmapFunctions::splitPixmap(const TQPixmap &pixmap, int x)
     paint.end();
 
     paint.begin(&leftMask);
-    paint.drawPixmap(0, 0, *pixmap.tqmask(), 0, 0, left.width(), left.height());
+    paint.drawPixmap(0, 0, *pixmap.mask(), 0, 0, left.width(), left.height());
     paint.end();
 
     left.setMask(leftMask);
@@ -221,7 +221,7 @@ PixmapFunctions::splitPixmap(const TQPixmap &pixmap, int x)
     paint.end();
 
     paint.begin(&rightMask);
-    paint.drawPixmap(0, 0, *pixmap.tqmask(), left.width(), 0, right.width(), right.height());
+    paint.drawPixmap(0, 0, *pixmap.mask(), left.width(), 0, right.width(), right.height());
     paint.end();
 
     right.setMask(rightMask);
@@ -237,7 +237,7 @@ PixmapFunctions::drawPixmapMasked(TQPixmap &dest, TQBitmap &destMask,
     TQImage idp(dest.convertToImage());
     TQImage idm(destMask.convertToImage());
     TQImage isp(src.convertToImage());
-    TQImage ism(src.tqmask()->convertToImage());
+    TQImage ism(src.mask()->convertToImage());
 
     for (int y = 0; y < isp.height(); ++y) {
         for (int x = 0; x < isp.width(); ++x) {

src/gui/general/PixmapFunctions.h

@@ -40,8 +40,8 @@ class PixmapFunctions
 {
 public:
     /**
-     * Generate a heuristic tqmask for the given pixmap.  Unlike
+     * Generate a heuristic mask for the given pixmap.  Unlike
-     * TQPixmap::createHeuristicMask, this removes from the tqmask all
+     * TQPixmap::createHeuristicMask, this removes from the mask all
      * pixels that are apparently "background" even if they appear in
      * holes in the middle of the image.  This is more usually what we
      * want than the default behaviour of createHeuristicMask.
@@ -53,8 +53,8 @@ public:
     static TQBitmap generateMask(const TQPixmap &map, const TQRgb &rgb);
 
     /**
-     * Generate a heuristic tqmask for the given pixmap.  Unlike
+     * Generate a heuristic mask for the given pixmap.  Unlike
-     * TQPixmap::createHeuristicMask, this removes from the tqmask all
+     * TQPixmap::createHeuristicMask, this removes from the mask all
      * pixels that are apparently "background" even if they appear in
      * holes in the middle of the image.  This is more usually what we
      * want than the default behaviour of createHeuristicMask.
@@ -78,10 +78,10 @@ public:
      */
     static TQPixmap shadePixmap(const TQPixmap &map);
 
-    /// Return a TQPixmap that is a mirror image of map (including tqmask)
+    /// Return a TQPixmap that is a mirror image of map (including mask)
     static TQPixmap flipVertical(const TQPixmap &map);
 
-    /// Return a TQPixmap that is a mirror image of map (including tqmask)
+    /// Return a TQPixmap that is a mirror image of map (including mask)
     static TQPixmap flipHorizontal(const TQPixmap &map);
 
     /// Return left and right parts of the TQPixmap
@@ -89,12 +89,12 @@ public:
 
     /**
      * Using TQPainter::drawPixmap to draw one pixmap on another does
-     * not appear to take the tqmask into account properly.  Background
+     * not appear to take the mask into account properly.  Background
      * pixels in the second pixmap erase foreground pixels in the
      * first one, regardless of whether they're masked or not.  This
      * function does what I expect.
      *
-     * Note that the source pixmap _must_ have a tqmask.
+     * Note that the source pixmap _must_ have a mask.
      */
     static void drawPixmapMasked(TQPixmap &dest, TQBitmap &destMask,
                                  int x, int y,

src/gui/general/PresetHandlerDialog.cpp

@@ -52,8 +52,8 @@
 namespace Rosegarden
 {
 
-PresetHandlerDialog::PresetHandlerDialog(TQWidget *tqparent, bool fromNotation)
+PresetHandlerDialog::PresetHandlerDialog(TQWidget *parent, bool fromNotation)
-        : KDialogBase(tqparent, "presethandlerdialog", true, i18n("Load track parameters preset"), Ok | Cancel, Ok),
+        : KDialogBase(parent, "presethandlerdialog", true, i18n("Load track parameters preset"), Ok | Cancel, Ok),
         m_config(kapp->config()),
         m_fromNotation(fromNotation)
 {

src/gui/general/PresetHandlerDialog.h

@@ -52,7 +52,7 @@ class PresetHandlerDialog : public KDialogBase
 
 public:
 
-    PresetHandlerDialog(TQWidget* tqparent, bool fromNotation = false);
+    PresetHandlerDialog(TQWidget* parent, bool fromNotation = false);
     ~PresetHandlerDialog();
 
     PresetGroup *m_presets;

src/gui/general/ProgressReporter.cpp

@@ -31,8 +31,8 @@
 namespace Rosegarden
 {
 
-ProgressReporter::ProgressReporter(TQObject* tqparent, const char* name)
+ProgressReporter::ProgressReporter(TQObject* parent, const char* name)
-        : TQObject(tqparent, name), m_isCancelled(false)
+        : TQObject(parent, name), m_isCancelled(false)
 {}
 
 

src/gui/general/ProgressReporter.h

@@ -41,7 +41,7 @@ class ProgressReporter : public TQObject
     Q_OBJECT
   TQ_OBJECT
 public:
-    ProgressReporter(TQObject* tqparent, const char* name = 0);
+    ProgressReporter(TQObject* parent, const char* name = 0);
 
     // exception class for cancellations
     class Cancelled { };

src/gui/general/RosegardenCanvasView.cpp

@@ -42,9 +42,9 @@ namespace Rosegarden
 {
 
 RosegardenCanvasView::RosegardenCanvasView(TQCanvas* canvas,
-        TQWidget* tqparent,
+        TQWidget* parent,
         const char* name, WFlags f)
-        : TQCanvasView(canvas, tqparent, name, f),
+        : TQCanvasView(canvas, parent, name, f),
         m_bottomWidget(0),
         m_currentBottomWidgetHeight( -1),
         m_leftWidget(0),

src/gui/general/RosegardenCanvasView.h

@@ -43,7 +43,7 @@ namespace Rosegarden
 
 /**
  * A TQCanvasView with an auxiliary horiz. scrollbar
- * That scrollbar should be provided by the tqparent widget
+ * That scrollbar should be provided by the parent widget
  * (typically an EditView). The RosegardenCanvasView keeps
  * the auxilliary horiz. scrollbar range in sync with the
  * one of its own scrollbar with slotUpdate().
@@ -55,7 +55,7 @@ class RosegardenCanvasView : public TQCanvasView
   TQ_OBJECT
 public:
     RosegardenCanvasView(TQCanvas*,
-                         TQWidget* tqparent=0, const char* name=0, WFlags f=0);
+                         TQWidget* parent=0, const char* name=0, WFlags f=0);
 
     /**
      * EditTool::handleMouseMove() returns a OR-ed combination of these

src/gui/general/RosegardenScrollView.cpp

@@ -49,9 +49,9 @@ const int RosegardenScrollView::InitialScrollAccel = 5;
 const int RosegardenScrollView::MaxScrollDelta = 100;      // max a.scroll speed
 const double RosegardenScrollView::ScrollAccelValue = 1.04;// acceleration rate
 
-RosegardenScrollView::RosegardenScrollView(TQWidget* tqparent,
+RosegardenScrollView::RosegardenScrollView(TQWidget* parent,
         const char* name, WFlags f)
-        : TQScrollView(tqparent, name, f),
+        : TQScrollView(parent, name, f),
         m_bottomWidget(0),
         m_currentBottomWidgetHeight( -1),
         m_smoothScroll(true),

src/gui/general/RosegardenScrollView.h

@@ -53,7 +53,7 @@ class RosegardenScrollView : public TQScrollView
     Q_OBJECT
   TQ_OBJECT
 public:
-    RosegardenScrollView(TQWidget* tqparent=0, const char* name=0, WFlags f=0);
+    RosegardenScrollView(TQWidget* parent=0, const char* name=0, WFlags f=0);
 
     /**
      * EditTool::handleMouseMove() returns a OR-ed combination of these

src/gui/kdeext/KLedButton.cpp

@@ -36,13 +36,13 @@
 namespace Rosegarden
 {
 
-KLedButton::KLedButton(const TQColor &col, TQWidget *tqparent, const char *name)
+KLedButton::KLedButton(const TQColor &col, TQWidget *parent, const char *name)
-        : KLed( col, tqparent, name )
+        : KLed( col, parent, name )
 {}
 
 KLedButton::KLedButton(const TQColor& col, KLed::State st, KLed::Look look,
-                       KLed::Shape tqshape, TQWidget *tqparent, const char *name)
+                       KLed::Shape tqshape, TQWidget *parent, const char *name)
-        : KLed( col, st, look, tqshape, tqparent, name )
+        : KLed( col, st, look, tqshape, parent, name )
 {}
 
 KLedButton::~KLedButton()

src/gui/kdeext/KLedButton.h

@@ -51,9 +51,9 @@ class KLedButton : public KLed  {
    Q_OBJECT
   TQ_OBJECT
   public: 
-   KLedButton(const TQColor &col=TQt::green, TQWidget *tqparent=0, const char *name=0);
+   KLedButton(const TQColor &col=TQt::green, TQWidget *parent=0, const char *name=0);
    KLedButton(const TQColor& col, KLed::State st, KLed::Look look, KLed::Shape tqshape,
-              TQWidget *tqparent=0, const char *name=0);
+              TQWidget *parent=0, const char *name=0);
    ~KLedButton();       
 
   signals:

src/gui/kdeext/KStartupLogo.cpp

@@ -36,8 +36,8 @@
 #include "KStartupLogo.h"
 #include "misc/Debug.h"
 
-KStartupLogo::KStartupLogo(TQWidget * tqparent, const char *name)
+KStartupLogo::KStartupLogo(TQWidget * parent, const char *name)
-        : TQWidget(tqparent, name,
+        : TQWidget(parent, name,
                   WStyle_Customize |
                   WStyle_Splash
                  ),

src/gui/kdeext/KStartupLogo.h

@@ -47,7 +47,7 @@ public slots:
 
 protected:
 
-    KStartupLogo(TQWidget *tqparent=0, const char *name=0);
+    KStartupLogo(TQWidget *parent=0, const char *name=0);
     ~KStartupLogo();
     
     virtual void paintEvent(TQPaintEvent*);

src/gui/kdeext/RGLed.cpp

@@ -81,7 +81,7 @@
  *
  * Revision 1.14  2000/06/03 01:04:42  gehrmab
  * * Made drawing routines available for overriding
- * * Added a tqparent/name constructor
+ * * Added a parent/name constructor
  * * Propertyfication
  *
  * Revision 1.13  2000/05/08 19:38:49  sschiman
@@ -156,8 +156,8 @@ class KLed::KLedPrivate
 
 
 
-KLed::KLed(TQWidget *tqparent, const char *name)
+KLed::KLed(TQWidget *parent, const char *name)
-        : TQWidget( tqparent, name),
+        : TQWidget( parent, name),
         led_state(On),
         led_look(Raised),
         led_tqshape(Circular)
@@ -173,8 +173,8 @@ KLed::KLed(TQWidget *tqparent, const char *name)
 }
 
 
-KLed::KLed(const TQColor& col, TQWidget *tqparent, const char *name)
+KLed::KLed(const TQColor& col, TQWidget *parent, const char *name)
-        : TQWidget( tqparent, name),
+        : TQWidget( parent, name),
         led_state(On),
         led_look(Raised),
         led_tqshape(Circular)
@@ -190,8 +190,8 @@ KLed::KLed(const TQColor& col, TQWidget *tqparent, const char *name)
 }
 
 KLed::KLed(const TQColor& col, KLed::State state,
-           KLed::Look look, KLed::Shape tqshape, TQWidget *tqparent, const char *name )
+           KLed::Look look, KLed::Shape tqshape, TQWidget *parent, const char *name )
-        : TQWidget(tqparent, name),
+        : TQWidget(parent, name),
         led_state(state),
         led_look(look),
         led_tqshape(tqshape)

src/gui/kdeext/klearlook.cpp

@@ -664,38 +664,38 @@ void KlearlookStyle::unPolish( TQWidget *widget ) {
 }
 
 bool KlearlookStyle::eventFilter( TQObject *object, TQEvent *event ) {
-    if ( object->tqparent() && 0 == qstrcmp( object->name(), kdeToolbarWidget ) ) {
+    if ( object->parent() && 0 == qstrcmp( object->name(), kdeToolbarWidget ) ) {
         // Draw background for custom widgets in the toolbar that have specified a "kde toolbar widget" name.
         if ( TQEvent::Paint == event->type() ) {
             TQWidget * widget = TQT_TQWIDGET( object ),
-                    *tqparent = TQT_TQWIDGET( object->tqparent() );
+                    *parent = TQT_TQWIDGET( object->parent() );
 #ifdef TQTC_GRADIENT_TOOLBARS_AND_MENUBARS
             // Find the top-level toolbar of this widget, since it may be nested in other
             // widgets that are on the toolbar.
             int x_offset = widget->x(),
                            y_offset = widget->y();
 
-            while ( tqparent && tqparent->tqparent() && !qstrcmp( tqparent->name(), kdeToolbarWidget ) ) {
+            while ( parent && parent->parent() && !qstrcmp( parent->name(), kdeToolbarWidget ) ) {
-                x_offset += tqparent->x();
+                x_offset += parent->x();
-                y_offset += tqparent->y();
+                y_offset += parent->y();
-                tqparent = TQT_TQWIDGET( tqparent->tqparent() );
+                parent = TQT_TQWIDGET( parent->parent() );
             }
 
-            TQRect pr( tqparent->rect() );
+            TQRect pr( parent->rect() );
             bool horiz_grad = pr.width() < pr.height();
 
-            // Check if the tqparent is a TQToolbar, and use its orientation, else guess.
+            // Check if the parent is a TQToolbar, and use its orientation, else guess.
-            TQToolBar *toolbar = dynamic_cast<TQToolBar*>( tqparent );
+            TQToolBar *toolbar = dynamic_cast<TQToolBar*>( parent );
 
             if ( toolbar )
                 horiz_grad = toolbar->orientation() == TQt::Vertical;
 
-            drawBevelGradient( tqparent->tqcolorGroup().background(), true, 1, &TQPainter( widget ),
+            drawBevelGradient( parent->tqcolorGroup().background(), true, 1, &TQPainter( widget ),
                                TQRect( x_offset, y_offset, pr.width(), pr.height() ),
                                horiz_grad, SHADE_BAR_LIGHT, SHADE_BAR_DARK );
 #else
 
-            TQPainter( widget ).fillRect( widget->rect(), tqparent->tqcolorGroup().background() );
+            TQPainter( widget ).fillRect( widget->rect(), parent->tqcolorGroup().background() );
 #endif
 
             return false;   // Now draw the contents
@@ -1478,8 +1478,8 @@ void KlearlookStyle::tqdrawPrimitive( TQ_PrimitiveElement pe, TQPainter *p, cons
                                      : lv->tqpalette().color( TQPalette::Disabled, TQColorGroup::Text ) ) );
 
                     if ( flags & Style_Selected && !lv->rootIsDecorated() &&
-                         !( ( item->tqparent() && 1 == item->tqparent() ->rtti() &&
+                         !( ( item->parent() && 1 == item->parent() ->rtti() &&
-                         TQCheckListItem::Controller == ( ( TQCheckListItem* ) item->tqparent() ) ->type() ) )) {
+                         TQCheckListItem::Controller == ( ( TQCheckListItem* ) item->parent() ) ->type() ) )) {
                             p->fillRect( 0, 0, x + marg + w + 4, item->height(),
                                 cg.brush( TQColorGroup::Highlight ) );
                             if ( item->isEnabled() )
@@ -1504,9 +1504,9 @@ void KlearlookStyle::tqdrawPrimitive( TQ_PrimitiveElement pe, TQPainter *p, cons
                     if ( flags & Style_Selected ) {
                         flags -= Style_Selected;
                         if ( !lv->rootIsDecorated() &&
-                             !( ( item->tqparent() && 1 == item->tqparent() ->rtti() &&
+                             !( ( item->parent() && 1 == item->parent() ->rtti() &&
                              TQCheckListItem::Controller ==
-                             ( ( TQCheckListItem* ) item->tqparent() ) ->type() ) ) ) {
+                             ( ( TQCheckListItem* ) item->parent() ) ->type() ) ) ) {
                             p->fillRect( 0, 0, r.x() + lv->itemMargin() + r.width() + 4, item->height(),
                                          cg.brush( TQColorGroup::Highlight ) );
                             if ( item->isEnabled() ) {
@@ -2212,8 +2212,8 @@ void KlearlookStyle::tqdrawControl(
                 bool cornerWidget = false,
                                     firstTab = 0 == tb->indexOf( data.tab() ->identifier() );
 
-                if ( ::tqqt_cast<const TQTabWidget *>( tb->tqparent() ) ) {
+                if ( ::tqqt_cast<const TQTabWidget *>( tb->parent() ) ) {
-                    const TQTabWidget * tw = ( const TQTabWidget* ) tb->tqparent();
+                    const TQTabWidget * tw = ( const TQTabWidget* ) tb->parent();
 
                     // is there a corner widget in the (top) left edge?
                     if ( tw->cornerWidget( TQt::TopLeft ) )
@@ -3127,22 +3127,22 @@ void KlearlookStyle::tqdrawComplexControl(
                               !toolbutton->parentWidget() ->backgroundPixmap() ->isNull() ) {
                         p->drawTiledPixmap( r,
                             *( toolbutton->parentWidget() ->backgroundPixmap() ), toolbutton->pos() );
-                    } else if ( widget->tqparent() ) {
+                    } else if ( widget->parent() ) {
-                        if ( ::tqqt_cast<const TQToolBar *>( widget->tqparent() ) ) {
+                        if ( ::tqqt_cast<const TQToolBar *>( widget->parent() ) ) {
-                            TQToolBar * tqparent = ( TQToolBar* ) widget->tqparent();
+                            TQToolBar * parent = ( TQToolBar* ) widget->parent();
 
 #ifdef TQTC_GRADIENT_TOOLBARS_AND_MENUBARS
 
                             if ( APPEARANCE_FLAT != appearance )
                                 drawBevelGradient( cg.background(), true, 0,
-                                    p, tqparent->rect(), true, SHADE_BAR_LIGHT, SHADE_BAR_DARK );
+                                    p, parent->rect(), true, SHADE_BAR_LIGHT, SHADE_BAR_DARK );
                             else
 #endif
 
-                                p->fillRect( tqparent->rect(), cg.background() );
+                                p->fillRect( parent->rect(), cg.background() );
-                        } else if ( widget->tqparent() ->inherits( "TQToolBarExtensionWidget" ) ) {
+                        } else if ( widget->parent() ->inherits( "TQToolBarExtensionWidget" ) ) {
-                            TQWidget * tqparent = ( TQWidget* ) widget->tqparent();
+                            TQWidget * parent = ( TQWidget* ) widget->parent();
-                            TQToolBar *toolbar = ( TQToolBar* ) tqparent->tqparent();
+                            TQToolBar *toolbar = ( TQToolBar* ) parent->parent();
 
 #ifdef TQTC_GRADIENT_TOOLBARS_AND_MENUBARS
 
@@ -3555,7 +3555,7 @@ TQSize KlearlookStyle::tqsizeFromContents( ContentsType t,
             }
 
         case CT_ToolButton: {
-                if ( widget->tqparent() && ::tqqt_cast<TQToolBar*>( widget->tqparent() ) )
+                if ( widget->parent() && ::tqqt_cast<TQToolBar*>( widget->parent() ) )
                     return TQSize( s.width() + 2 * 4, s.height() + 2 * 4 );
                 else {
                     return KStyle::tqsizeFromContents ( t, widget, s, opt );

src/gui/rulers/ChordNameRuler.cpp

@@ -62,9 +62,9 @@ ChordNameRuler::ChordNameRuler(RulerScale *rulerScale,
                                RosegardenGUIDoc *doc,
                                double xorigin,
                                int height,
-                               TQWidget *tqparent,
+                               TQWidget *parent,
                                const char *name) :
-        TQWidget(tqparent, name),
+        TQWidget(parent, name),
         m_xorigin(xorigin),
         m_height(height),
         m_currentXOffset(0),
@@ -103,9 +103,9 @@ ChordNameRuler::ChordNameRuler(RulerScale *rulerScale,
                                std::vector<Segment *> &segments,
                                double xorigin,
                                int height,
-                               TQWidget *tqparent,
+                               TQWidget *parent,
                                const char *name) :
-        TQWidget(tqparent, name),
+        TQWidget(parent, name),
         m_xorigin(xorigin),
         m_height(height),
         m_currentXOffset(0),

src/gui/rulers/ChordNameRuler.h

@@ -70,7 +70,7 @@ public:
                    RosegardenGUIDoc *doc,
                    double xorigin = 0.0,
                    int height = 0,
-                   TQWidget* tqparent = 0,
+                   TQWidget* parent = 0,
                    const char *name = 0);
 
     /**
@@ -84,7 +84,7 @@ public:
                    std::vector<Segment *> &segments,
                    double xorigin = 0.0,
                    int height = 0,
-                   TQWidget* tqparent = 0,
+                   TQWidget* parent = 0,
                    const char *name = 0);
 
     ~ChordNameRuler();

src/gui/rulers/ControlRuler.cpp

@@ -63,9 +63,9 @@ const int ControlRuler::ItemHeightRange = 64;
 ControlRuler::ControlRuler(Segment *segment,
                            RulerScale* rulerScale,
                            EditViewBase* parentView,
-                           TQCanvas* c, TQWidget* tqparent,
+                           TQCanvas* c, TQWidget* parent,
                            const char* name, WFlags f) :
-        RosegardenCanvasView(c, tqparent, name, f),
+        RosegardenCanvasView(c, parent, name, f),
         m_parentEditView(parentView),
         m_mainHorizontalScrollBar(0),
         m_rulerScale(rulerScale),
@@ -402,7 +402,7 @@ void ControlRuler::createMenu()
             RG_DEBUG << "ControlRuler::createMenu() failed\n";
         }
     } else {
-        RG_DEBUG << "ControlRuler::createMenu() failed: no tqparent factory\n";
+        RG_DEBUG << "ControlRuler::createMenu() failed: no parent factory\n";
     }
 }
 

src/gui/rulers/ControlRuler.h

@@ -72,7 +72,7 @@ public:
                  RulerScale*,
                  EditViewBase* parentView,
                  TQCanvas*,
-                 TQWidget* tqparent=0, const char* name=0, WFlags f=0);
+                 TQWidget* parent=0, const char* name=0, WFlags f=0);
     virtual ~ControlRuler();
 
     virtual TQString getName() = 0;

src/gui/rulers/ControlSelector.cpp

@@ -29,9 +29,9 @@
 
 namespace Rosegarden {
 
-ControlSelector::ControlSelector(ControlRuler* tqparent)
+ControlSelector::ControlSelector(ControlRuler* parent)
-    : TQObject(tqparent),
+    : TQObject(parent),
-      m_ruler(tqparent)
+      m_ruler(parent)
 {
 }
 

src/gui/rulers/ControlSelector.h

@@ -41,7 +41,7 @@ namespace Rosegarden {
 class ControlSelector : public TQObject
 {
 public:
-    ControlSelector(ControlRuler* tqparent);
+    ControlSelector(ControlRuler* parent);
     virtual ~ControlSelector() {};
     
     virtual void handleMouseButtonPress(TQMouseEvent *e);

src/gui/rulers/ControllerEventsRuler.cpp

@@ -59,10 +59,10 @@ ControllerEventsRuler::ControllerEventsRuler(Segment *segment,
         RulerScale* rulerScale,
         EditViewBase* parentView,
         TQCanvas* c,
-        TQWidget* tqparent,
+        TQWidget* parent,
         const ControlParameter *controller,
         const char* name, WFlags f)
-        : ControlRuler(segment, rulerScale, parentView, c, tqparent, name, f),
+        : ControlRuler(segment, rulerScale, parentView, c, parent, name, f),
         m_defaultItemWidth(20),
         m_controlLine(new TQCanvasLine(canvas())),
         m_controlLineShowing(false),

src/gui/rulers/ControllerEventsRuler.h

@@ -58,7 +58,7 @@ public:
                           RulerScale*,
                           EditViewBase* parentView,
                           TQCanvas*,
-                          TQWidget* tqparent=0,
+                          TQWidget* parent=0,
                           const ControlParameter *controller = 0,
                           const char* name=0, WFlags f=0);
 

src/gui/rulers/LoopRuler.cpp

@@ -51,9 +51,9 @@ LoopRuler::LoopRuler(RosegardenGUIDoc *doc,
                      int height,
                      double xorigin,
                      bool invert,
-                     TQWidget *tqparent,
+                     TQWidget *parent,
                      const char *name) : 
-    TQWidget(tqparent, name),
+    TQWidget(parent, name),
     m_doc(doc),
     m_height(height),
     m_xorigin(xorigin),

src/gui/rulers/LoopRuler.h

@@ -62,7 +62,7 @@ public:
               int height = 0,
               double xorigin = 0.0,
               bool invert = false,
-              TQWidget* tqparent = 0,
+              TQWidget* parent = 0,
               const char *name = 0);
 
     ~LoopRuler();

src/gui/rulers/MarkerRuler.cpp

@@ -61,10 +61,10 @@ MarkerRuler::MarkerRuler(RosegardenGUIDoc *doc,
                          RulerScale *rulerScale,
                          int barHeight,
                          double xorigin,
-                         TQWidget* tqparent,
+                         TQWidget* parent,
                          const char* name,
                          WFlags f)
-        : TQWidget(tqparent, name, f),
+        : TQWidget(parent, name, f),
         m_barHeight(barHeight),
         m_xorigin(xorigin),
         m_currentXOffset(0),
@@ -73,15 +73,15 @@ MarkerRuler::MarkerRuler(RosegardenGUIDoc *doc,
         m_menu(0),
         m_doc(doc),
         m_rulerScale(rulerScale),
-        m_parentMainWindow(dynamic_cast<KMainWindow*>(doc->tqparent()))
+        m_parentMainWindow(dynamic_cast<KMainWindow*>(doc->parent()))
 {
-    // If the tqparent window has a main window above it, we need to use
+    // If the parent window has a main window above it, we need to use
-    // that as the tqparent main window, not the document's tqparent.
+    // that as the parent main window, not the document's parent.
     // Otherwise we'll end up adding all actions to the same
     // (document-level) action collection regardless of which window
     // we're in.
-    TQObject *probe = TQT_TQOBJECT(tqparent);
+    TQObject *probe = TQT_TQOBJECT(parent);
-    while (probe && !dynamic_cast<KMainWindow *>(probe)) probe = probe->tqparent();
+    while (probe && !dynamic_cast<KMainWindow *>(probe)) probe = probe->parent();
     if (probe) m_parentMainWindow = dynamic_cast<KMainWindow *>(probe);
 
     //    m_barFont = new TQFont("helvetica", 12);

src/gui/rulers/MarkerRuler.h

@@ -57,7 +57,7 @@ public:
                      RulerScale *rulerScale,
                      int buttonHeight,
                      double xorigin = 0.0,
-                     TQWidget* tqparent = 0,
+                     TQWidget* parent = 0,
                      const char* name = 0,
                      WFlags f=0);
 

src/gui/rulers/PercussionPitchRuler.cpp

@@ -44,10 +44,10 @@
 namespace Rosegarden
 {
 
-PercussionPitchRuler::PercussionPitchRuler(TQWidget *tqparent,
+PercussionPitchRuler::PercussionPitchRuler(TQWidget *parent,
         const MidiKeyMapping *mapping,
         int lineSpacing) :
-        PitchRuler(tqparent),
+        PitchRuler(parent),
         m_mapping(mapping),
         m_lineSpacing(lineSpacing),
         m_mouseDown(false),

src/gui/rulers/PercussionPitchRuler.h

@@ -49,7 +49,7 @@ class PercussionPitchRuler : public PitchRuler
     Q_OBJECT
   TQ_OBJECT
 public:
-    PercussionPitchRuler(TQWidget *tqparent,
+    PercussionPitchRuler(TQWidget *parent,
                          const MidiKeyMapping *mapping,
                          int lineSpacing);
 

src/gui/rulers/PitchRuler.cpp

@@ -33,8 +33,8 @@ namespace Rosegarden
 {
 
 PitchRuler::
-PitchRuler(TQWidget *tqparent) :
+PitchRuler(TQWidget *parent) :
-        TQWidget(tqparent)
+        TQWidget(parent)
 {
     // nothing else
 }

src/gui/rulers/PitchRuler.h

@@ -42,7 +42,7 @@ class PitchRuler : public TQWidget
     Q_OBJECT
   TQ_OBJECT
 public:
-    PitchRuler(TQWidget *tqparent);
+    PitchRuler(TQWidget *parent);
 
     virtual TQSize tqsizeHint() const;
     virtual TQSize tqminimumSizeHint() const;

src/gui/rulers/PropertyBox.cpp

@@ -38,9 +38,9 @@ namespace Rosegarden
 PropertyBox::PropertyBox(TQString label,
                          int width,
                          int height,
-                         TQWidget *tqparent,
+                         TQWidget *parent,
                          const char *name):
-        TQWidget(tqparent, name),
+        TQWidget(parent, name),
         m_label(label),
         m_width(width),
         m_height(height)

src/gui/rulers/PropertyBox.h

@@ -53,7 +53,7 @@ public:
     PropertyBox(TQString label,
                int width,
                int height,
-               TQWidget *tqparent=0,
+               TQWidget *parent=0,
                const char *name = 0);
 
     virtual TQSize tqsizeHint() const;

src/gui/rulers/PropertyControlRuler.cpp

@@ -55,10 +55,10 @@ PropertyControlRuler::PropertyControlRuler(PropertyName propertyName,
         Staff* staff,
         RulerScale* rulerScale,
         EditViewBase* parentView,
-        TQCanvas* c, TQWidget* tqparent,
+        TQCanvas* c, TQWidget* parent,
         const char* name, WFlags f) :
         ControlRuler(&(staff->getSegment()), rulerScale,
-                     parentView, c, tqparent, name, f),
+                     parentView, c, parent, name, f),
         m_propertyName(propertyName),
         m_staff(staff),
         m_propertyLine(new TQCanvasLine(canvas())),

src/gui/rulers/PropertyControlRuler.h

@@ -62,7 +62,7 @@ public:
                          RulerScale*,
                          EditViewBase* parentView,
                          TQCanvas*,
-                         TQWidget* tqparent=0, const char* name=0, WFlags f=0);
+                         TQWidget* parent=0, const char* name=0, WFlags f=0);
 
     virtual ~PropertyControlRuler();
 

src/gui/rulers/PropertyViewRuler.cpp

@@ -52,9 +52,9 @@ PropertyViewRuler::PropertyViewRuler(RulerScale *rulerScale,
                                      const PropertyName &property,
                                      double xorigin,
                                      int height,
-                                     TQWidget *tqparent,
+                                     TQWidget *parent,
                                      const char *name) :
-        TQWidget(tqparent, name),
+        TQWidget(parent, name),
         m_propertyName(property),
         m_xorigin(xorigin),
         m_height(height),

src/gui/rulers/PropertyViewRuler.h

@@ -59,7 +59,7 @@ public:
                       const PropertyName &property,
                       double xorigin = 0.0,
                       int height = 0,
-                      TQWidget* tqparent = 0,
+                      TQWidget* parent = 0,
                       const char *name = 0);
 
     ~PropertyViewRuler();

src/gui/rulers/RawNoteRuler.cpp

@@ -50,9 +50,9 @@ RawNoteRuler::RawNoteRuler(RulerScale *rulerScale,
                            Segment *segment,
                            double xorigin,
                            int height,
-                           TQWidget *tqparent,
+                           TQWidget *parent,
                            const char *name) :
-        TQWidget(tqparent, name),
+        TQWidget(parent, name),
         m_xorigin(xorigin),
         m_height(height),
         m_currentXOffset(0),
@@ -559,7 +559,7 @@ RawNoteRuler::paintEvent(TQPaintEvent* e)
         // at a time when no other notes are playing (at least of
         // those that started no earlier than the paint start time).
         // Each node in that tree represents a note that starts
-        // playing during its tqparent node's note, or at the same time
+        // playing during its parent node's note, or at the same time
         // as it.
 
         drawNode(paint, *DefaultVelocityColour::getInstance(), *fi, m_height - 3, 2);

src/gui/rulers/RawNoteRuler.h

@@ -62,7 +62,7 @@ public:
                  Segment *segment,
                  double xorigin = 0.0,
                  int height = 0,
-                 TQWidget* tqparent = 0,
+                 TQWidget* parent = 0,
                  const char *name = 0);
 
     ~RawNoteRuler();

src/gui/rulers/StandardRuler.cpp

@@ -49,10 +49,10 @@ StandardRuler::StandardRuler(RosegardenGUIDoc *doc,
                              double xorigin,
                              int barHeight,
                              bool invert,
-                             TQWidget* tqparent,
+                             TQWidget* parent,
                              const char* name,
                              WFlags f):
-        TQVBox(tqparent, name, f),
+        TQVBox(parent, name, f),
         m_invert(invert),
         m_loopRulerHeight(10),
         m_currentXOffset(0),

src/gui/rulers/StandardRuler.h

@@ -55,7 +55,7 @@ public:
                   double xorigin,
                   int buttonHeight,
                   bool invert = false, // draw upside-down
-                  TQWidget* tqparent = 0,
+                  TQWidget* parent = 0,
                   const char* name = 0,
                   WFlags f=0);
 

src/gui/rulers/TempoRuler.cpp

@@ -70,9 +70,9 @@ TempoRuler::TempoRuler(RulerScale *rulerScale,
                        double xorigin,
                        int height,
                        bool small,
-                       TQWidget *tqparent,
+                       TQWidget *parent,
                        const char *name) :
-        TQWidget(tqparent, name),
+        TQWidget(parent, name),
         m_xorigin(xorigin),
         m_height(height),
         m_currentXOffset(0),
@@ -614,12 +614,12 @@ TempoRuler::showTextFloat(tempoT tempo, tempoT target,
     //    std::cerr << "cp = " << cp.x() << "," << cp.y() << ", tempo = " << qpm << std::endl;
     TQPoint mp = cp + pos();
 
-    TQWidget *tqparent = parentWidget();
+    TQWidget *parent = parentWidget();
-    while (tqparent->parentWidget() &&
+    while (parent->parentWidget() &&
-            !tqparent->isTopLevel() &&
+            !parent->isTopLevel() &&
-            !tqparent->isDialog()) {
+            !parent->isDialog()) {
-        mp += tqparent->pos();
+        mp += parent->pos();
-        tqparent = tqparent->parentWidget();
+        parent = parent->parentWidget();
     }
 
     int yoff = cp.y() + m_textFloat->height() + 3;

src/gui/rulers/TempoRuler.h

@@ -77,7 +77,7 @@ public:
                double xorigin = 0.0,
                int height = 0,
                bool small = false,
-               TQWidget* tqparent = 0,
+               TQWidget* parent = 0,
                const char *name = 0);
 
     ~TempoRuler();

src/gui/rulers/TextRuler.cpp

@@ -46,9 +46,9 @@ namespace Rosegarden
 TextRuler::TextRuler(RulerScale *rulerScale,
                      Segment *segment,
                      int height,
-                     TQWidget *tqparent,
+                     TQWidget *parent,
                      const char *name)
-        : TQWidget(tqparent, name),
+        : TQWidget(parent, name),
         m_height(height),
         m_currentXOffset(0),
         m_width( -1),

src/gui/rulers/TextRuler.h

@@ -77,7 +77,7 @@ public:
     TextRuler(RulerScale *rulerScale,
               Segment *segment,
               int height = 0,
-              TQWidget* tqparent = 0,
+              TQWidget* parent = 0,
               const char *name = 0);
 
     ~TextRuler();

src/gui/seqmanager/MidiFilterDialog.cpp

@@ -41,9 +41,9 @@
 namespace Rosegarden
 {
 
-MidiFilterDialog::MidiFilterDialog(TQWidget *tqparent,
+MidiFilterDialog::MidiFilterDialog(TQWidget *parent,
                                    RosegardenGUIDoc *doc):
-        KDialogBase(tqparent, 0, true, i18n("Modify MIDI filters..."),
+        KDialogBase(parent, 0, true, i18n("Modify MIDI filters..."),
                     Ok | Apply | Close | Help),
         m_doc(doc),
         m_modified(true)

src/gui/seqmanager/MidiFilterDialog.h

@@ -44,7 +44,7 @@ class MidiFilterDialog : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    MidiFilterDialog(TQWidget *tqparent,
+    MidiFilterDialog(TQWidget *parent,
                      RosegardenGUIDoc *doc);
 
     void setModified(bool value);

src/gui/seqmanager/SequenceManager.cpp

@@ -114,7 +114,7 @@ SequenceManager::SequenceManager(RosegardenGUIDoc *doc,
     //    m_compositionMmapper->cleanup();
 
     m_countdownDialog = new CountdownDialog(dynamic_cast<TQWidget*>
-                                            (m_doc->tqparent())->parentWidget());
+                                            (m_doc->parent())->parentWidget());
     // Connect these for use later
     //
     connect(m_countdownTimer, TQT_SIGNAL(timeout()),
@@ -180,7 +180,7 @@ void SequenceManager::setDocument(RosegardenGUIDoc* doc)
     delete m_compositionMmapperResetTimer;
 
     m_countdownDialog = new CountdownDialog(dynamic_cast<TQWidget*>
-                                            (m_doc->tqparent())->parentWidget());
+                                            (m_doc->parent())->parentWidget());
 
     // Bug 933041: no longer connect the CountdownDialog from
     // SequenceManager; instead let the RosegardenGUIApp connect it to
@@ -898,7 +898,7 @@ punchin:
             //m_countdownDialog->show();
 
         } else {
-            // Stop immediately - turn off buttons in tqparent
+            // Stop immediately - turn off buttons in parent
             //
             m_transporttqStatus = STOPPED;
 
@@ -1010,13 +1010,13 @@ SequenceManager::processAsynchronousMidi(const MappedComposition &mC,
                     } else if ((*i)->getData1() == MappedEvent::FailureJackRestartFailed) {
 
                         KMessageBox::error(
-                            dynamic_cast<TQWidget*>(m_doc->tqparent())->parentWidget(),
+                            dynamic_cast<TQWidget*>(m_doc->parent())->parentWidget(),
                             i18n("The JACK Audio subsystem has failed or it has stopped Rosegarden from processing audio.\nPlease restart Rosegarden to continue working with audio.\nQuitting other running applications may improve Rosegarden's performance."));
 
                     } else if ((*i)->getData1() == MappedEvent::FailureJackRestart) {
 
                         KMessageBox::error(
-                            dynamic_cast<TQWidget*>(m_doc->tqparent())->parentWidget(),
+                            dynamic_cast<TQWidget*>(m_doc->parent())->parentWidget(),
                             i18n("The JACK Audio subsystem has stopped Rosegarden from processing audio, probably because of a processing overload.\nAn attempt to restart the audio service has been made, but some problems may remain.\nQuitting other running applications may improve Rosegarden's performance."));
 
                     } else if ((*i)->getData1() == MappedEvent::FailureCPUOverload) {
@@ -1027,7 +1027,7 @@ SequenceManager::processAsynchronousMidi(const MappedComposition &mC,
                         stopping();
 
                         KMessageBox::error(
-                            dynamic_cast<TQWidget*>(m_doc->tqparent())->parentWidget(),
+                            dynamic_cast<TQWidget*>(m_doc->parent())->parentWidget(),
                             i18n("Run out of processor power for real-time audio processing.  Cannot continue."));
 
 #endif
@@ -1146,13 +1146,13 @@ SequenceManager::processAsynchronousMidi(const MappedComposition &mC,
                     if ((*i)->getData1() == MappedEvent::FailureJackRestartFailed) {
 
                         KMessageBox::error(
-                            dynamic_cast<TQWidget*>(m_doc->tqparent()),
+                            dynamic_cast<TQWidget*>(m_doc->parent()),
                             i18n("The JACK Audio subsystem has failed or it has stopped Rosegarden from processing audio.\nPlease restart Rosegarden to continue working with audio.\nQuitting other running applications may improve Rosegarden's performance."));
 
                     } else if ((*i)->getData1() == MappedEvent::FailureJackRestart) {
 
                         KMessageBox::error(
-                            dynamic_cast<TQWidget*>(m_doc->tqparent()),
+                            dynamic_cast<TQWidget*>(m_doc->parent()),
                             i18n("The JACK Audio subsystem has stopped Rosegarden from processing audio, probably because of a processing overload.\nAn attempt to restart the audio service has been made, but some problems may remain.\nQuitting other running applications may improve Rosegarden's performance."));
 
                     } else if ((*i)->getData1() == MappedEvent::WarningImpreciseTimer &&
@@ -1166,7 +1166,7 @@ SequenceManager::processAsynchronousMidi(const MappedComposition &mC,
                         RosegardenGUIApp::self()->awaitDialogClearance();
 
                         KMessageBox::information(
-                            dynamic_cast<TQWidget*>(m_doc->tqparent()),
+                            dynamic_cast<TQWidget*>(m_doc->parent()),
                             i18n("<h3>System timer resolution is too low</h3><p>Rosegarden was unable to find a high-resolution timing source for MIDI performance.</p><p>This may mean you are using a Linux system with the kernel timer resolution set too low.  Please contact your Linux distributor for more information.</p><p>Some Linux distributors already provide low latency kernels, see <a href=\"http://rosegarden.wiki.sourceforge.net/Low+latency+kernels\">http://rosegarden.wiki.sourceforge.net/Low+latency+kernels</a> for instructions.</p>"), 
 			    NULL, NULL, 
 			    KMessageBox::Notify + KMessageBox::AllowLink);
@@ -1184,7 +1184,7 @@ SequenceManager::processAsynchronousMidi(const MappedComposition &mC,
                         RosegardenGUIApp::self()->awaitDialogClearance();
 
                         KMessageBox::information(
-                            dynamic_cast<TQWidget*>(m_doc->tqparent()),
+                            dynamic_cast<TQWidget*>(m_doc->parent()),
                             i18n("<h3>System timer resolution is too low</h3><p>Rosegarden was unable to find a high-resolution timing source for MIDI performance.</p><p>You may be able to solve this problem by loading the RTC timer kernel module.  To do this, try running <b>sudo modprobe snd-rtctimer</b> in a terminal window and then restarting Rosegarden.</p><p>Alternatively, check whether your Linux distributor provides a multimedia-optimized kernel.  See <a href=\"http://rosegarden.wiki.sourceforge.net/Low+latency+kernels\">http://rosegarden.wiki.sourceforge.net/Low+latency+kernels</a> for notes about this.</p>"), 
 			    NULL, NULL, 
 			    KMessageBox::Notify + KMessageBox::AllowLink);

src/gui/studio/AudioMixerWindow.cpp

@@ -89,9 +89,9 @@ static const unsigned int MIXER_SHOW_UNASSIGNED_FADERS = 1 << 3;
 static const unsigned int MIXER_OMIT_SYNTH_FADERS      = 1 << 4;
 
 
-AudioMixerWindow::AudioMixerWindow(TQWidget *tqparent,
+AudioMixerWindow::AudioMixerWindow(TQWidget *parent,
                                    RosegardenGUIDoc *document):
-        MixerWindow(tqparent, document),
+        MixerWindow(parent, document),
         m_mainBox (0)
 {
     populate();

src/gui/studio/AudioMixerWindow.h

@@ -58,7 +58,7 @@ class AudioMixerWindow : public MixerWindow
   TQ_OBJECT
 
 public:
-    AudioMixerWindow(TQWidget *tqparent, RosegardenGUIDoc *document);
+    AudioMixerWindow(TQWidget *parent, RosegardenGUIDoc *document);
     ~AudioMixerWindow();
 
     void updateMeters(SequencerMapper *mapper);

src/gui/studio/BankEditorDialog.cpp

@@ -78,10 +78,10 @@
 namespace Rosegarden
 {
 
-BankEditorDialog::BankEditorDialog(TQWidget *tqparent,
+BankEditorDialog::BankEditorDialog(TQWidget *parent,
                                    RosegardenGUIDoc *doc,
                                    DeviceId defaultDevice):
-        KMainWindow(tqparent, "bankeditordialog"),
+        KMainWindow(parent, "bankeditordialog"),
         m_studio(&doc->getStudio()),
         m_doc(doc),
         m_copyBank(Device::NO_DEVICE, -1),
@@ -968,15 +968,15 @@ BankEditorDialog::getParentDeviceItem(TQListViewItem* item)
         return 0;
 
     if (dynamic_cast<MidiBankListViewItem*>(item))
-        // go up to the tqparent device item
+        // go up to the parent device item
-        item = item->tqparent();
+        item = item->parent();
 
     if (dynamic_cast<MidiKeyMapListViewItem*>(item))
-        // go up to the tqparent device item
+        // go up to the parent device item
-        item = item->tqparent();
+        item = item->parent();
 
     if (!item) {
-        RG_DEBUG << "BankEditorDialog::getParentDeviceItem : missing tqparent device item for bank item - this SHOULD NOT HAPPEN" << endl;
+        RG_DEBUG << "BankEditorDialog::getParentDeviceItem : missing parent device item for bank item - this SHOULD NOT HAPPEN" << endl;
         return 0;
     }
 

src/gui/studio/BankEditorDialog.h

@@ -64,7 +64,7 @@ class BankEditorDialog : public KMainWindow
   TQ_OBJECT
 
 public:
-    BankEditorDialog(TQWidget *tqparent,
+    BankEditorDialog(TQWidget *parent,
                      RosegardenGUIDoc *doc,
                      DeviceId defaultDevice =
                      Device::NO_DEVICE);

src/gui/studio/DeviceEditorDialog.cpp

@@ -55,9 +55,9 @@
 namespace Rosegarden
 {
 
-DeviceEditorDialog::DeviceEditorDialog(TQWidget *tqparent,
+DeviceEditorDialog::DeviceEditorDialog(TQWidget *parent,
                                        RosegardenGUIDoc *document) :
-        KDialogBase(tqparent, "deviceeditordialog", true,
+        KDialogBase(parent, "deviceeditordialog", true,
                     i18n("Manage MIDI Devices"), Ok | Apply | Close, Ok, true),
         m_document(document),
         m_studio(&document->getStudio()),

src/gui/studio/DeviceEditorDialog.h

@@ -48,7 +48,7 @@ class DeviceEditorDialog : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    DeviceEditorDialog(TQWidget *tqparent, RosegardenGUIDoc *document);
+    DeviceEditorDialog(TQWidget *parent, RosegardenGUIDoc *document);
     ~DeviceEditorDialog();
 
     void setModified(bool value);

src/gui/studio/DeviceManagerDialog.cpp

@@ -83,9 +83,9 @@ static const int RECORD_CURRENT_COL = 1;
 static const int RECORD_CONNECTION_COL = 2;
 
 
-DeviceManagerDialog::DeviceManagerDialog(TQWidget *tqparent,
+DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
             RosegardenGUIDoc *document) :
-            KMainWindow(tqparent, "deviceeditordialog"),
+            KMainWindow(parent, "deviceeditordialog"),
             m_document(document),
             m_studio(&document->getStudio())
     {

src/gui/studio/DeviceManagerDialog.h

@@ -52,7 +52,7 @@ class DeviceManagerDialog : public KMainWindow
     Q_OBJECT
   TQ_OBJECT
 public:
-    DeviceManagerDialog(TQWidget *tqparent, RosegardenGUIDoc *document);
+    DeviceManagerDialog(TQWidget *parent, RosegardenGUIDoc *document);
     ~DeviceManagerDialog();
 
     void setModified(bool value);

src/gui/studio/MidiBankListViewItem.cpp

@@ -37,10 +37,10 @@ namespace Rosegarden
 
 MidiBankListViewItem::MidiBankListViewItem(DeviceId deviceId,
         int bankNb,
-        TQListViewItem* tqparent,
+        TQListViewItem* parent,
         TQString name,
         bool percussion, int msb, int lsb)
-        : MidiDeviceListViewItem(deviceId, tqparent, name, percussion, msb, lsb),
+        : MidiDeviceListViewItem(deviceId, parent, name, percussion, msb, lsb),
         m_percussion(percussion),
         m_bankNb(bankNb)
 {}

src/gui/studio/MidiBankListViewItem.h

@@ -44,7 +44,7 @@ class MidiBankListViewItem : public MidiDeviceListViewItem
 public:
     MidiBankListViewItem(DeviceId deviceId,
                          int bankNb,
-                         TQListViewItem* tqparent, TQString name,
+                         TQListViewItem* parent, TQString name,
                          bool percussion,
                          int msb, int lsb);
 

src/gui/studio/MidiDeviceListViewItem.cpp

@@ -35,24 +35,24 @@ namespace Rosegarden
 {
 
 MidiDeviceListViewItem::MidiDeviceListViewItem(DeviceId deviceId,
-        TQListView* tqparent, TQString name)
+        TQListView* parent, TQString name)
-        : KListViewItem(tqparent, name),
+        : KListViewItem(parent, name),
         m_deviceId(deviceId)
 {}
 
 MidiDeviceListViewItem::MidiDeviceListViewItem(DeviceId deviceId,
-        TQListViewItem* tqparent, TQString name,
+        TQListViewItem* parent, TQString name,
         bool percussion,
         int msb, int lsb)
-        : KListViewItem(tqparent, name,
+        : KListViewItem(parent, name,
                         TQString(percussion ? i18n("Percussion Bank") : i18n("Bank")),
                         TQString().setNum(msb), TQString().setNum(lsb)),
         m_deviceId(deviceId)
 {}
 
 MidiDeviceListViewItem::MidiDeviceListViewItem(DeviceId deviceId,
-        TQListViewItem* tqparent, TQString name)
+        TQListViewItem* parent, TQString name)
-: KListViewItem(tqparent, name, i18n("Key Mapping"), "", ""),
+: KListViewItem(parent, name, i18n("Key Mapping"), "", ""),
 m_deviceId(deviceId)
 {}
 

src/gui/studio/MidiDeviceListViewItem.h

@@ -41,17 +41,17 @@ class MidiDeviceListViewItem : public KListViewItem
 public:
     // Device
     MidiDeviceListViewItem(DeviceId id,
-                           TQListView* tqparent, TQString name);
+                           TQListView* parent, TQString name);
 
     // Bank
     MidiDeviceListViewItem(DeviceId id,
-                           TQListViewItem* tqparent, TQString name,
+                           TQListViewItem* parent, TQString name,
                            bool percussion,
                            int msb, int lsb);
 
     // Key Mapping
     MidiDeviceListViewItem(DeviceId id,
-                           TQListViewItem* tqparent, TQString name);
+                           TQListViewItem* parent, TQString name);
 
     DeviceId getDeviceId() const { return m_deviceId; }
 

src/gui/studio/MidiKeyMapListViewItem.cpp

@@ -36,9 +36,9 @@ namespace Rosegarden
 {
 
 MidiKeyMapListViewItem::MidiKeyMapListViewItem(DeviceId deviceId,
-        TQListViewItem* tqparent,
+        TQListViewItem* parent,
         TQString name)
-        : MidiDeviceListViewItem(deviceId, tqparent, name),
+        : MidiDeviceListViewItem(deviceId, parent, name),
         m_name(name)
 {
     setText(1, i18n("Key Mapping"));

src/gui/studio/MidiKeyMapListViewItem.h

@@ -43,7 +43,7 @@ class MidiKeyMapListViewItem : public MidiDeviceListViewItem
 {
 public:
     MidiKeyMapListViewItem(DeviceId deviceId,
-                           TQListViewItem* tqparent, TQString name);
+                           TQListViewItem* parent, TQString name);
 
     virtual int compare(TQListViewItem *i, int col, bool ascending) const;
 

src/gui/studio/MidiKeyMappingEditor.cpp

@@ -51,11 +51,11 @@ namespace Rosegarden
 {
 
 MidiKeyMappingEditor::MidiKeyMappingEditor(BankEditorDialog* bankEditor,
-        TQWidget* tqparent,
+        TQWidget* parent,
         const char* name)
         : NameSetEditor(bankEditor,
                         i18n("Key Mapping details"),
-                        tqparent, name, i18n("Pitches"), false),
+                        parent, name, i18n("Pitches"), false),
         m_device(0)
 {
     TQWidget *additionalWidget = makeAdditionalWidget(m_mainFrame);
@@ -65,7 +65,7 @@ MidiKeyMappingEditor::MidiKeyMappingEditor(BankEditorDialog* bankEditor,
 }
 
 TQWidget *
-MidiKeyMappingEditor::makeAdditionalWidget(TQWidget *tqparent)
+MidiKeyMappingEditor::makeAdditionalWidget(TQWidget *parent)
 {
     return 0;
 }

src/gui/studio/MidiKeyMappingEditor.h

@@ -50,7 +50,7 @@ class MidiKeyMappingEditor : public NameSetEditor
 
 public:
     MidiKeyMappingEditor(BankEditorDialog *bankEditor,
-                         TQWidget *tqparent,
+                         TQWidget *parent,
                          const char *name = 0);
 
     void clearAll();
@@ -63,7 +63,7 @@ public slots:
     virtual void slotEntryButtonPressed();
 
 protected:
-    virtual TQWidget *makeAdditionalWidget(TQWidget *tqparent);
+    virtual TQWidget *makeAdditionalWidget(TQWidget *parent);
     void blockAllSignals(bool block);
 
     //--------------- Data members ---------------------------------

src/gui/studio/MidiMixerVUMeter.cpp

@@ -32,12 +32,12 @@
 namespace Rosegarden
 {
 
-MidiMixerVUMeter::MidiMixerVUMeter(TQWidget *tqparent,
+MidiMixerVUMeter::MidiMixerVUMeter(TQWidget *parent,
                                    VUMeterType type,
                                    int width,
                                    int height,
                                    const char *name):
-        VUMeter(tqparent, type, false, false, width, height, VUMeter::Vertical, name)
+        VUMeter(parent, type, false, false, width, height, VUMeter::Vertical, name)
 {
     tqsetAlignment(AlignCenter);
 }

src/gui/studio/MidiMixerVUMeter.h

@@ -40,7 +40,7 @@ namespace Rosegarden
 class MidiMixerVUMeter : public VUMeter
 {
 public:
-    MidiMixerVUMeter(TQWidget *tqparent = 0,
+    MidiMixerVUMeter(TQWidget *parent = 0,
                      VUMeterType type = Plain,
                      int width = 0,
                      int height = 0,

src/gui/studio/MidiMixerWindow.cpp

@@ -63,9 +63,9 @@
 namespace Rosegarden
 {
 
-MidiMixerWindow::MidiMixerWindow(TQWidget *tqparent,
+MidiMixerWindow::MidiMixerWindow(TQWidget *parent,
                                  RosegardenGUIDoc *document):
-        MixerWindow(tqparent, document),
+        MixerWindow(parent, document),
         m_tabFrame(0)
 {
     // Initial setup

src/gui/studio/MidiMixerWindow.h

@@ -54,7 +54,7 @@ class MidiMixerWindow : public MixerWindow
   TQ_OBJECT
 
 public:
-    MidiMixerWindow(TQWidget *tqparent, RosegardenGUIDoc *document);
+    MidiMixerWindow(TQWidget *parent, RosegardenGUIDoc *document);
 
     /**
      * Setup the tabs on the Mixer according to the Studio

src/gui/studio/MidiProgramsEditor.cpp

@@ -60,11 +60,11 @@ namespace Rosegarden
 {
 
 MidiProgramsEditor::MidiProgramsEditor(BankEditorDialog* bankEditor,
-                                       TQWidget* tqparent,
+                                       TQWidget* parent,
                                        const char* name)
         : NameSetEditor(bankEditor,
                         i18n("Bank and Program details"),
-                        tqparent, name, i18n("Programs"), true),
+                        parent, name, i18n("Programs"), true),
         m_device(0),
         m_bankList(bankEditor->getBankList()),
         m_programList(bankEditor->getProgramList()),
@@ -77,9 +77,9 @@ MidiProgramsEditor::MidiProgramsEditor(BankEditorDialog* bankEditor,
 }
 
 TQWidget *
-MidiProgramsEditor::makeAdditionalWidget(TQWidget *tqparent)
+MidiProgramsEditor::makeAdditionalWidget(TQWidget *parent)
 {
-    TQFrame *frame = new TQFrame(tqparent);
+    TQFrame *frame = new TQFrame(parent);
 
     m_percussion = new TQCheckBox(frame);
     m_msb = new TQSpinBox(frame);

src/gui/studio/MidiProgramsEditor.h

@@ -52,7 +52,7 @@ class MidiProgramsEditor : public NameSetEditor
   TQ_OBJECT
 public:
     MidiProgramsEditor(BankEditorDialog *bankEditor,
-                       TQWidget *tqparent,
+                       TQWidget *parent,
                        const char *name = 0);
 
     void clearAll();
@@ -94,7 +94,7 @@ protected:
 
     void setBankName(const TQString& s);
 
-    virtual TQWidget *makeAdditionalWidget(TQWidget *tqparent);
+    virtual TQWidget *makeAdditionalWidget(TQWidget *parent);
 
     void blockAllSignals(bool block);
 

src/gui/studio/MixerWindow.cpp

@@ -37,9 +37,9 @@
 namespace Rosegarden
 {
 
-MixerWindow::MixerWindow(TQWidget *tqparent,
+MixerWindow::MixerWindow(TQWidget *parent,
                          RosegardenGUIDoc *document) :
-        KMainWindow(tqparent, "mixerwindow"),
+        KMainWindow(parent, "mixerwindow"),
         m_document(document),
         m_studio(&document->getStudio()),
         m_currentId(0)

src/gui/studio/MixerWindow.h

@@ -48,7 +48,7 @@ class MixerWindow: public KMainWindow
   TQ_OBJECT
 
 public:
-    MixerWindow(TQWidget *tqparent, RosegardenGUIDoc *document);
+    MixerWindow(TQWidget *parent, RosegardenGUIDoc *document);
     TQAccel* getAccelerators() { return m_accelerators; }
 
 signals:

src/gui/studio/NameSetEditor.cpp

@@ -48,11 +48,11 @@ namespace Rosegarden
 
 NameSetEditor::NameSetEditor(BankEditorDialog* bankEditor,
                              TQString title,
-                             TQWidget* tqparent,
+                             TQWidget* parent,
                              const char* name,
                              TQString headingPrefix,
                              bool showEntryButtons)
-        : TQVGroupBox(title, tqparent, name),
+        : TQVGroupBox(title, parent, name),
         m_bankEditor(bankEditor),
         m_mainFrame(new TQFrame(this))
 {

src/gui/studio/NameSetEditor.h

@@ -65,7 +65,7 @@ public slots:
 protected:
     NameSetEditor(BankEditorDialog *bankEditor,
                   TQString title,
-                  TQWidget *tqparent,
+                  TQWidget *parent,
                   const char *name,
                   TQString headingPrefix = "",
                   bool showEntryButtons = false);

src/gui/studio/RemapInstrumentDialog.cpp

@@ -50,9 +50,9 @@
 namespace Rosegarden
 {
 
-RemapInstrumentDialog::RemapInstrumentDialog(TQWidget *tqparent,
+RemapInstrumentDialog::RemapInstrumentDialog(TQWidget *parent,
         RosegardenGUIDoc *doc):
-        KDialogBase(tqparent, "", true, i18n("Remap Instrument assigments..."),
+        KDialogBase(parent, "", true, i18n("Remap Instrument assigments..."),
                     Ok | Apply | Cancel),
         m_doc(doc)
 {

src/gui/studio/RemapInstrumentDialog.h

@@ -50,7 +50,7 @@ class RemapInstrumentDialog : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    RemapInstrumentDialog(TQWidget *tqparent,
+    RemapInstrumentDialog(TQWidget *parent,
                           RosegardenGUIDoc *doc);
 
     void populateCombo(int id);

src/gui/studio/SynthPluginManagerDialog.cpp

@@ -54,13 +54,13 @@
 namespace Rosegarden
 {
 
-SynthPluginManagerDialog::SynthPluginManagerDialog(TQWidget *tqparent,
+SynthPluginManagerDialog::SynthPluginManagerDialog(TQWidget *parent,
             RosegardenGUIDoc *doc
 #ifdef HAVE_LIBLO
             , AudioPluginOSCGUIManager *guiManager
 #endif
                                                       ) :
-            KMainWindow(tqparent, "synthpluginmanagerdialog"),
+            KMainWindow(parent, "synthpluginmanagerdialog"),
             m_document(doc),
             m_studio(&doc->getStudio()),
             m_pluginManager(doc->getPluginManager())

src/gui/studio/SynthPluginManagerDialog.h

@@ -52,7 +52,7 @@ class SynthPluginManagerDialog : public KMainWindow
   TQ_OBJECT
 
 public:
-    SynthPluginManagerDialog(TQWidget *tqparent,
+    SynthPluginManagerDialog(TQWidget *parent,
                              RosegardenGUIDoc *doc
 #ifdef HAVE_LIBLO
                              , AudioPluginOSCGUIManager *guiManager

src/gui/studio/TimerCallbackAssistant.cpp

@@ -44,7 +44,7 @@ TimerCallbackAssistant::TimerCallbackAssistant(int ms, void (*callback)(void *da
 
 TimerCallbackAssistant::~TimerCallbackAssistant()
 {
-    // nothing -- the TQTimer is deleted automatically by its tqparent TQObject (me)
+    // nothing -- the TQTimer is deleted automatically by its parent TQObject (me)
 }
 
 void

src/gui/widgets/AudioFaderBox.cpp

@@ -57,11 +57,11 @@
 namespace Rosegarden
 {
 
-AudioFaderBox::AudioFaderBox(TQWidget *tqparent,
+AudioFaderBox::AudioFaderBox(TQWidget *parent,
                              TQString id,
                              bool haveInOut,
                              const char *name):
-        TQFrame(tqparent, name),
+        TQFrame(parent, name),
         m_signalMapper(new TQSignalMapper(TQT_TQOBJECT(this))),
         m_id(id),
         m_isStereo(false)
@@ -244,8 +244,8 @@ bool
 AudioFaderBox::owns(const TQObject *object)
 {
     return (object &&
-            ((TQT_BASE_OBJECT(object->tqparent()) == TQT_BASE_OBJECT(this)) ||
+            ((TQT_BASE_OBJECT(object->parent()) == TQT_BASE_OBJECT(this)) ||
-             (object->tqparent() && (TQT_BASE_OBJECT(object->tqparent()->tqparent()) == TQT_BASE_OBJECT(this)))));
+             (object->parent() && (TQT_BASE_OBJECT(object->parent()->parent()) == TQT_BASE_OBJECT(this)))));
 }
 
 void

src/gui/widgets/AudioFaderBox.h

@@ -56,7 +56,7 @@ class AudioFaderBox : public TQFrame
   TQ_OBJECT
 
 public:
-    AudioFaderBox(TQWidget *tqparent,
+    AudioFaderBox(TQWidget *parent,
                   TQString id = "",
                   bool haveInOut = true,
                   const char *name = 0);

src/gui/widgets/AudioListItem.h

@@ -40,25 +40,25 @@ class AudioListItem : public KListViewItem
 
 public:
 
-    AudioListItem(KListView *tqparent):KListViewItem(tqparent),
+    AudioListItem(KListView *parent):KListViewItem(parent),
                                      m_segment(0) {;}
 
-    AudioListItem(KListViewItem *tqparent):KListViewItem(tqparent),
+    AudioListItem(KListViewItem *parent):KListViewItem(parent),
                                          m_segment(0) {;}
 
-    AudioListItem(KListView *tqparent,
+    AudioListItem(KListView *parent,
                   TQString label,
                   AudioFileId id):
-                      KListViewItem(tqparent,
+                      KListViewItem(parent,
                                     label,
                                     "", "", "", "", "", "", ""),
                                     m_id(id),
                                     m_segment(0) {;}
 
-    AudioListItem(KListViewItem *tqparent, 
+    AudioListItem(KListViewItem *parent, 
                   TQString label,
                   AudioFileId id):
-                      KListViewItem(tqparent,
+                      KListViewItem(parent,
                                     label,
                                     "", "", "", "", "", "", ""),
                                     m_id(id),

src/gui/widgets/AudioListView.cpp

@@ -31,8 +31,8 @@
 
 namespace Rosegarden {
         
-AudioListView::AudioListView(TQWidget *tqparent, const char *name)
+AudioListView::AudioListView(TQWidget *parent, const char *name)
-    : KListView(tqparent, name)
+    : KListView(parent, name)
 {
     setDragEnabled(true);
     setAcceptDrops(true);

src/gui/widgets/AudioListView.h

@@ -32,7 +32,7 @@ namespace Rosegarden {
 class AudioListView : public KListView
 {
 public:
-    AudioListView(TQWidget *tqparent = 0, const char *name = 0);
+    AudioListView(TQWidget *parent = 0, const char *name = 0);
 
 protected:
     bool acceptDrag(TQDropEvent* e) const;

src/gui/widgets/AudioRouteMenu.cpp

@@ -133,7 +133,7 @@ AudioRouteMenu::slotShowMenu()
     if (getNumEntries() == 0)
         return ;
 
-    RosegardenPopupMenu *menu = new RosegardenPopupMenu((TQWidget *)tqparent());
+    RosegardenPopupMenu *menu = new RosegardenPopupMenu((TQWidget *)parent());
 
     for (int i = 0; i < getNumEntries(); ++i) {
 

src/gui/widgets/AudioRouteMenu.h

@@ -51,7 +51,7 @@ public:
     enum Direction { In, Out };
     enum Format { Compact, Regular };
 
-    AudioRouteMenu(TQWidget *tqparent,
+    AudioRouteMenu(TQWidget *parent,
                    Direction direction,
                    Format format,
                    Studio *studio = 0,

src/gui/widgets/AudioVUMeter.cpp

@@ -37,14 +37,14 @@
 namespace Rosegarden
 {
 
-AudioVUMeter::AudioVUMeter(TQWidget *tqparent,
+AudioVUMeter::AudioVUMeter(TQWidget *parent,
                            VUMeter::VUMeterType type,
                            bool stereo,
                            bool hasRecord,
                            int width,
                            int height,
                            const char *name) :
-        TQWidget(tqparent, name),
+        TQWidget(parent, name),
         m_stereo(stereo)
 {
     setBackgroundMode(TQt::NoBackground);
@@ -90,14 +90,14 @@ AudioVUMeter::paintEvent(TQPaintEvent *e)
     m_meter->paintEvent(e);
 }
 
-AudioVUMeter::AudioVUMeterImpl::AudioVUMeterImpl(TQWidget *tqparent,
+AudioVUMeter::AudioVUMeterImpl::AudioVUMeterImpl(TQWidget *parent,
         VUMeterType type,
         bool stereo,
         bool hasRecord,
         int width,
         int height,
         const char *name) :
-        VUMeter(tqparent, type, stereo, hasRecord, width, height, VUMeter::Vertical, name)
+        VUMeter(parent, type, stereo, hasRecord, width, height, VUMeter::Vertical, name)
 {}
 
 }

src/gui/widgets/AudioVUMeter.h

@@ -41,7 +41,7 @@ namespace Rosegarden
 class AudioVUMeter : public TQWidget
 {
 public:
-    AudioVUMeter(TQWidget *tqparent = 0,
+    AudioVUMeter(TQWidget *parent = 0,
                  VUMeter::VUMeterType type = VUMeter::AudioPeakHoldShort,
                  bool stereo = true,
                  bool hasRecord = false,
@@ -69,7 +69,7 @@ protected:
     class AudioVUMeterImpl : public VUMeter
     {
     public:
-        AudioVUMeterImpl(TQWidget *tqparent,
+        AudioVUMeterImpl(TQWidget *parent,
                          VUMeterType type,
                          bool stereo,
                          bool hasRecord,

src/gui/widgets/BigArrowButton.h

@@ -32,9 +32,9 @@ namespace Rosegarden {
 class BigArrowButton : public KArrowButton
 {
 public:
-    BigArrowButton(TQWidget *tqparent = 0, Qt::ArrowType arrow = Qt::UpArrow,
+    BigArrowButton(TQWidget *parent = 0, Qt::ArrowType arrow = Qt::UpArrow,
                    const char *name = 0) :
-        KArrowButton(tqparent, arrow, name) { }
+        KArrowButton(parent, arrow, name) { }
     virtual ~BigArrowButton() { } 
 
     virtual TQSize tqsizeHint() const {

src/gui/widgets/CollapsingFrame.cpp

@@ -41,8 +41,8 @@
 namespace Rosegarden
 {
 
-CollapsingFrame::CollapsingFrame(TQString label, TQWidget *tqparent, const char *n) :
+CollapsingFrame::CollapsingFrame(TQString label, TQWidget *parent, const char *n) :
-        TQFrame(tqparent, n),
+        TQFrame(parent, n),
         m_widget(0),
         m_fill(false),
         m_collapsed(false)

src/gui/widgets/CollapsingFrame.h

@@ -46,7 +46,7 @@ class CollapsingFrame : public TQFrame
   TQ_OBJECT
 
 public:
-    CollapsingFrame(TQString label, TQWidget *tqparent = 0, const char *name = 0);
+    CollapsingFrame(TQString label, TQWidget *parent = 0, const char *name = 0);
     virtual ~CollapsingFrame();
 
     TQFont font() const;

src/gui/widgets/ColourTable.cpp

@@ -43,8 +43,8 @@ namespace Rosegarden
 {
 
 ColourTable::ColourTable
-(TQWidget *tqparent, ColourMap &input, ColourList &list)
+(TQWidget *parent, ColourMap &input, ColourList &list)
-        : TQTable(1, 2, tqparent, "RColourTable")
+        : TQTable(1, 2, parent, "RColourTable")
 {
     setSorting(FALSE);
     setSelectionMode(TQTable::SingleRow);

src/gui/widgets/ColourTable.h

@@ -51,7 +51,7 @@ class ColourTable : public TQTable
 
 public:
     typedef std::map<unsigned int, unsigned int, std::less<unsigned int> > ColourList;
-    ColourTable(TQWidget *tqparent, ColourMap &input, ColourList &list);
+    ColourTable(TQWidget *parent, ColourMap &input, ColourList &list);
     void populate_table(ColourMap &input, ColourList &list);
     
 

src/gui/widgets/CurrentProgressDialog.h

@@ -65,8 +65,8 @@ public slots:
     void slotCurrentProgressDialogDestroyed();
 
 protected:
-    CurrentProgressDialog(TQObject* tqparent, const char* name = 0)
+    CurrentProgressDialog(TQObject* parent, const char* name = 0)
-        : TQObject(tqparent, name) {}
+        : TQObject(parent, name) {}
     
     //--------------- Data members ---------------------------------
     static CurrentProgressDialog* m_instance;

src/gui/widgets/DiatonicPitchChooser.cpp

@@ -43,11 +43,11 @@ namespace Rosegarden
 {
 
 DiatonicPitchChooser::DiatonicPitchChooser(TQString title,
-                           TQWidget *tqparent,
+                           TQWidget *parent,
                            int defaultNote,
                            int defaultPitch,
                            int defaultOctave) :
-        TQGroupBox(1, Qt::Horizontal, title, tqparent),
+        TQGroupBox(1, Qt::Horizontal, title, parent),
         m_defaultPitch(defaultPitch)
 {
     m_pitchDragLabel = new PitchDragLabel(this, defaultPitch);

src/gui/widgets/DiatonicPitchChooser.h

@@ -48,7 +48,7 @@ class DiatonicPitchChooser : public TQGroupBox
   TQ_OBJECT
 public:
     DiatonicPitchChooser(TQString title,
-                           TQWidget *tqparent,
+                           TQWidget *parent,
                            int defaultNote = 0,
                            int defaultPitch = 60,
                            int defaultOctave = 5);

src/gui/widgets/Fader.cpp

@@ -45,8 +45,8 @@ Fader::PixmapCache Fader::m_pixmapCache;
 
 
 Fader::Fader(AudioLevel::FaderType type,
-             int w, int h, TQWidget *tqparent) :
+             int w, int h, TQWidget *parent) :
-        TQWidget(tqparent),
+        TQWidget(parent),
         m_integral(false),
         m_vertical(h > w),
         m_min(0),
@@ -83,8 +83,8 @@ Fader::Fader(AudioLevel::FaderType type,
 }
 
 Fader::Fader(int min, int max, int deflt,
-             int w, int h, TQWidget *tqparent) :
+             int w, int h, TQWidget *parent) :
-        TQWidget(tqparent),
+        TQWidget(parent),
         m_integral(true),
         m_vertical(h > w),
         m_min(min),
@@ -120,8 +120,8 @@ Fader::Fader(int min, int max, int deflt,
 }
 
 Fader::Fader(int min, int max, int deflt,
-             bool vertical, TQWidget *tqparent) :
+             bool vertical, TQWidget *parent) :
-        TQWidget(tqparent),
+        TQWidget(parent),
         m_integral(true),
         m_vertical(vertical),
         m_min(min),

src/gui/widgets/Fader.h

@@ -57,21 +57,21 @@ public:
      * based on the given dimensions.
      */
     Fader(AudioLevel::FaderType,
-                    int width, int height, TQWidget *tqparent);
+                    int width, int height, TQWidget *parent);
 
     /**
      * Construct a fader on an integral scale.  The fader calculates
      * its orientation based on the given dimensions.
      */
     Fader(int min, int max, int deflt,
-                    int width, int height, TQWidget *tqparent);
+                    int width, int height, TQWidget *parent);
 
     /**
      * Construct a fader on an integral scale, with a 1:1 ratio of
      * pixel positions and values.
      */
     Fader(int min, int max, int deflt,
-                    bool vertical, TQWidget *tqparent);
+                    bool vertical, TQWidget *parent);
 
     virtual ~Fader();
     

src/gui/widgets/HSpinBox.cpp

@@ -46,9 +46,9 @@ int HSpinBox::mapTextToValue( bool* ok )
     return int(f * m_scaleFactor);
 }
   
-HSpinBox::HSpinBox( int minV, int maxV, int step, TQWidget* tqparent,
+HSpinBox::HSpinBox( int minV, int maxV, int step, TQWidget* parent,
               double bottom, double top, int decimals, float initialValue)
-      : TQSpinBox(minV,maxV,step,tqparent)
+      : TQSpinBox(minV,maxV,step,parent)
 {
     setValidator(new TQDoubleValidator(bottom,top,decimals,TQT_TQOBJECT(this)));
     initialize(decimals);
@@ -56,11 +56,11 @@ HSpinBox::HSpinBox( int minV, int maxV, int step, TQWidget* tqparent,
 }
 
   //constructor with default settings
-HSpinBox::HSpinBox( TQWidget* tqparent,  float initialValue, int step, 
+HSpinBox::HSpinBox( TQWidget* parent,  float initialValue, int step, 
               double bottom, double top, int decimals,
               const TQObject* recv, const char* mem)
       : TQSpinBox((int)(bottom*pow(10.0, decimals)), 
-                 (int)(top*pow(10.0, decimals)), step, tqparent)
+                 (int)(top*pow(10.0, decimals)), step, parent)
 {
     setValidator(new TQDoubleValidator(bottom,top,decimals,TQT_TQOBJECT(this)));
     initialize(decimals);

src/gui/widgets/HSpinBox.h

@@ -42,11 +42,11 @@ class HSpinBox : public TQSpinBox
     int mapTextToValue( bool* ok );
   
 public:
-    HSpinBox( int minV, int maxV, int step, TQWidget* tqparent,
+    HSpinBox( int minV, int maxV, int step, TQWidget* parent,
               double bottom, double top, int decimals, float initialValue);
 
   //constructor with default settings
-    HSpinBox( TQWidget* tqparent,  float initialValue = 0.2, int step=1, 
+    HSpinBox( TQWidget* parent,  float initialValue = 0.2, int step=1, 
               double bottom=-25.0, double top=25.0, int decimals=3,
               const TQObject* recv=NULL, const char* mem=NULL);
   

src/gui/widgets/Label.h

@@ -42,8 +42,8 @@ class Label : public TQLabel
     Q_OBJECT
   TQ_OBJECT
 public:
-    Label(TQWidget *tqparent = 0, const char *name=0):
+    Label(TQWidget *parent = 0, const char *name=0):
-        TQLabel(tqparent, name) {;}
+        TQLabel(parent, name) {;}
 
 protected:
     virtual void mouseDoubleClickEvent(TQMouseEvent * /*e*/)

src/gui/widgets/MidiFaderWidget.h

@@ -49,7 +49,7 @@ class MidiFaderWidget : public TQFrame
   TQ_OBJECT
 
 public:
-    MidiFaderWidget(TQWidget *tqparent,
+    MidiFaderWidget(TQWidget *parent,
                     TQString id = "");
     
     AudioVUMeter              *m_vuMeter;

src/gui/widgets/PitchChooser.cpp

@@ -40,9 +40,9 @@ namespace Rosegarden
 {
 
 PitchChooser::PitchChooser(TQString title,
-                           TQWidget *tqparent,
+                           TQWidget *parent,
                            int defaultPitch) :
-        TQGroupBox(1, Qt::Horizontal, title, tqparent),
+        TQGroupBox(1, Qt::Horizontal, title, parent),
         m_defaultPitch(defaultPitch)
 {
     m_pitchDragLabel = new PitchDragLabel(this, defaultPitch);

src/gui/widgets/PitchChooser.h

@@ -47,7 +47,7 @@ class PitchChooser : public TQGroupBox
   TQ_OBJECT
 public:
     PitchChooser(TQString title,
-                           TQWidget *tqparent,
+                           TQWidget *parent,
                            int defaultPitch = 60);
     
     int getPitch() const;

src/gui/widgets/PitchDragLabel.cpp

@@ -38,10 +38,10 @@
 namespace Rosegarden
 {
 
-PitchDragLabel::PitchDragLabel(TQWidget *tqparent,
+PitchDragLabel::PitchDragLabel(TQWidget *parent,
                                int defaultPitch,
                                bool defaultSharps) :
-        TQWidget(tqparent),
+        TQWidget(parent),
         m_pitch(defaultPitch),
         m_usingSharps(defaultSharps),
         m_clickedY(0),

src/gui/widgets/PitchDragLabel.h

@@ -47,7 +47,7 @@ class PitchDragLabel : public TQWidget
     Q_OBJECT
   TQ_OBJECT
 public:
-    PitchDragLabel(TQWidget *tqparent,
+    PitchDragLabel(TQWidget *parent,
     	int defaultPitch = 60, bool defaultSharps = true);
     ~PitchDragLabel();
 

src/gui/widgets/PluginControl.cpp

@@ -43,7 +43,7 @@
 namespace Rosegarden
 {
 
-PluginControl::PluginControl(TQWidget *tqparent,
+PluginControl::PluginControl(TQWidget *parent,
                              TQGridLayout *tqlayout,
                              ControlType type,
                              PluginPort *port,
@@ -52,7 +52,7 @@ PluginControl::PluginControl(TQWidget *tqparent,
                              float initialValue,
                              bool showBounds,
                              bool hidden):
-        TQObject(tqparent),
+        TQObject(parent),
         m_tqlayout(tqlayout),
         m_type(type),
         m_port(port),
@@ -63,7 +63,7 @@ PluginControl::PluginControl(TQWidget *tqparent,
     plainFont.setPointSize((plainFont.pointSize() * 9 ) / 10);
 
     TQLabel *controlTitle =
-        new TQLabel(TQString("%1    ").tqarg(strtoqstr(port->getName())), tqparent);
+        new TQLabel(TQString("%1    ").tqarg(strtoqstr(port->getName())), parent);
     controlTitle->setFont(plainFont);
 
     if (type == Rotary) {
@@ -121,9 +121,9 @@ PluginControl::PluginControl(TQWidget *tqparent,
         TQLabel *low;
         if (port->getDisplayHint() &
             (PluginPort::Integer | PluginPort::Toggled)) {
-            low = new TQLabel(TQString("%1").tqarg(int(displayLower)), tqparent);
+            low = new TQLabel(TQString("%1").tqarg(int(displayLower)), parent);
         } else {
-            low = new TQLabel(TQString("%1").tqarg(displayLower), tqparent);
+            low = new TQLabel(TQString("%1").tqarg(displayLower), parent);
         }
         low->setFont(plainFont);
 
@@ -134,7 +134,7 @@ PluginControl::PluginControl(TQWidget *tqparent,
 //                  << ", actual upper " << upperBound << ", step "
 //                  << step << std::endl;
 
-        m_dial = new ::Rosegarden::Rotary(tqparent,
+        m_dial = new ::Rosegarden::Rotary(parent,
                                           lowerBound,    // min
                                           upperBound,    // max
                                           step,          // step
@@ -154,9 +154,9 @@ PluginControl::PluginControl(TQWidget *tqparent,
         TQLabel *upp;
         if (port->getDisplayHint() &
             (PluginPort::Integer | PluginPort::Toggled)) {
-            upp = new TQLabel(TQString("%1").tqarg(int(displayUpper)), tqparent);
+            upp = new TQLabel(TQString("%1").tqarg(int(displayUpper)), parent);
         } else {
-            upp = new TQLabel(TQString("%1").tqarg(displayUpper), tqparent);
+            upp = new TQLabel(TQString("%1").tqarg(displayUpper), parent);
         }
         upp->setFont(plainFont);
 

src/gui/widgets/PluginControl.h

@@ -56,7 +56,7 @@ public:
         NumericSlider
     } ControlType;
 
-    PluginControl(TQWidget *tqparent,
+    PluginControl(TQWidget *parent,
                   TQGridLayout *tqlayout,
                   ControlType type,
                   PluginPort *port,

src/gui/widgets/QDeferScrollView.cpp

@@ -32,8 +32,8 @@
 namespace Rosegarden
 {
 
-QDeferScrollView::QDeferScrollView(TQWidget* tqparent, const char *name, WFlags f)
+QDeferScrollView::QDeferScrollView(TQWidget* parent, const char *name, WFlags f)
-        : TQScrollView(tqparent, name, f)
+        : TQScrollView(parent, name, f)
 {
     setFocusPolicy(TQ_WheelFocus);
 }

src/gui/widgets/QDeferScrollView.h

@@ -58,7 +58,7 @@ class QDeferScrollView : public TQScrollView
     Q_OBJECT
   TQ_OBJECT
 public:
-    QDeferScrollView(TQWidget* tqparent=0, const char *name=0, WFlags f=0);
+    QDeferScrollView(TQWidget* parent=0, const char *name=0, WFlags f=0);
 
     void setBottomMargin(int);
 

src/gui/widgets/QuantizeParameters.cpp

@@ -52,13 +52,13 @@
 namespace Rosegarden
 {
 
-QuantizeParameters::QuantizeParameters(TQWidget *tqparent,
+QuantizeParameters::QuantizeParameters(TQWidget *parent,
                                        QuantizerType defaultQuantizer,
                                        bool showNotationOption,
                                        bool showAdvancedButton,
                                        TQString configCategory,
                                        TQString preamble) :
-        TQFrame(tqparent),
+        TQFrame(parent),
         m_configCategory(configCategory),
         m_standardQuantizations
         (BasicQuantizer::getStandardQuantizations())

src/gui/widgets/QuantizeParameters.h

@@ -54,7 +54,7 @@ class QuantizeParameters : public TQFrame
 public:
     enum QuantizerType { Grid, Legato, Notation };
 
-    QuantizeParameters(TQWidget *tqparent,
+    QuantizeParameters(TQWidget *parent,
                        QuantizerType defaultQuantizer,
                        bool showNotationOption,
                        bool showAdvancedButton,

src/gui/widgets/RosegardenPopupMenu.h

@@ -33,7 +33,7 @@ class RosegardenPopupMenu : public TQPopupMenu
 {
     // just to make itemHeight public
 public:
-    RosegardenPopupMenu(TQWidget *tqparent) : TQPopupMenu(tqparent) { }
+    RosegardenPopupMenu(TQWidget *parent) : TQPopupMenu(parent) { }
     using TQPopupMenu::itemHeight;
 };
 

src/gui/widgets/Rotary.cpp

@@ -60,7 +60,7 @@ static TQTimer *_floatTimer = 0;
 Rotary::PixmapCache Rotary::m_pixmaps;
 
 
-Rotary::Rotary(TQWidget *tqparent,
+Rotary::Rotary(TQWidget *parent,
                float minValue,
                float maxValue,
                float step,
@@ -71,7 +71,7 @@ Rotary::Rotary(TQWidget *tqparent,
                bool snapToTicks,
                bool centred,
                bool logarithmic) :
-        TQWidget(tqparent),
+        TQWidget(parent),
         m_minValue(minValue),
         m_maxValue(maxValue),
         m_step(step),

src/gui/widgets/Rotary.h

@@ -56,7 +56,7 @@ public:
         StepTicks       // end points plus every step interval
     };
 
-    Rotary(TQWidget *tqparent,
+    Rotary(TQWidget *parent,
            float minValue = 0.0,
            float maxValue = 100.0,
            float step = 1.0,

src/gui/widgets/ScrollBox.cpp

@@ -43,8 +43,8 @@
 namespace Rosegarden
 {
 
-ScrollBox::ScrollBox(TQWidget* tqparent, SizeMode sizeMode, const char* name) :
+ScrollBox::ScrollBox(TQWidget* parent, SizeMode sizeMode, const char* name) :
-        TQFrame(tqparent, name),
+        TQFrame(parent, name),
         m_sizeMode(sizeMode)
 {
     setFrameStyle(Panel | Sunken);

src/gui/widgets/ScrollBox.h

@@ -52,7 +52,7 @@ class ScrollBox: public TQFrame
 public:
     enum SizeMode { FixWidth, FixHeight };
 
-    ScrollBox(TQWidget *tqparent = 0,
+    ScrollBox(TQWidget *parent = 0,
               SizeMode mode = FixWidth,
               const char *name = 0);
 

src/gui/widgets/ScrollBoxDialog.cpp

@@ -38,11 +38,11 @@
 namespace Rosegarden
 {
 
-ScrollBoxDialog::ScrollBoxDialog(TQWidget *tqparent,
+ScrollBoxDialog::ScrollBoxDialog(TQWidget *parent,
                                  ScrollBox::SizeMode sizeMode,
                                  const char *name,
                                  WFlags flags) :
-        KDialog(tqparent, name, flags),
+        KDialog(parent, name, flags),
         m_scrollbox(new ScrollBox(this, sizeMode))
 { }
 

src/gui/widgets/ScrollBoxDialog.h

@@ -46,7 +46,7 @@ class ScrollBoxDialog : public KDialog
   TQ_OBJECT
 
 public:
-    ScrollBoxDialog(TQWidget *tqparent = 0,
+    ScrollBoxDialog(TQWidget *parent = 0,
                     ScrollBox::SizeMode mode = ScrollBox::FixWidth,
                     const char *name = 0,
                     WFlags flags = 0);

src/gui/widgets/SpinBox.cpp

@@ -34,8 +34,8 @@
 namespace Rosegarden
 {
 
-SpinBox::SpinBox(TQWidget *tqparent, const char *name):
+SpinBox::SpinBox(TQWidget *parent, const char *name):
-        TQSpinBox(tqparent, name), m_doubleValue(0)
+        TQSpinBox(parent, name), m_doubleValue(0)
 {}
 
 TQString

src/gui/widgets/SpinBox.h

@@ -48,7 +48,7 @@ class SpinBox : public TQSpinBox
     Q_OBJECT
   TQ_OBJECT
 public:
-    SpinBox(TQWidget *tqparent = 0, const char *name=0);
+    SpinBox(TQWidget *parent = 0, const char *name=0);
 
     double getDoubleValue() const { return m_doubleValue; }
 

src/gui/widgets/TextFloat.cpp

@@ -39,8 +39,8 @@
 namespace Rosegarden
 {
 
-TextFloat::TextFloat(TQWidget *tqparent):
+TextFloat::TextFloat(TQWidget *parent):
-        TQWidget(tqparent, "TextFloat",
+        TQWidget(parent, "TextFloat",
                 WStyle_Customize | WStyle_NoBorder | WStyle_StaysOnTop),
         m_text("")
 {
@@ -61,9 +61,9 @@ TextFloat::reparent(TQWidget *newParent)
         position += newParent->pos();
     }
 
-    // Position this widget to the right of the tqparent
+    // Position this widget to the right of the parent
     //
-    //move(pos + TQPoint(tqparent->width() + 5, 5));
+    //move(pos + TQPoint(parent->width() + 5, 5));
 
     TQWidget::reparent(newParent,
                       WStyle_Customize | WStyle_NoBorder | WStyle_StaysOnTop,

src/gui/widgets/TextFloat.h

@@ -41,12 +41,12 @@ namespace Rosegarden
 class TextFloat : public TQWidget
 {
 public:
-    TextFloat(TQWidget *tqparent);
+    TextFloat(TQWidget *parent);
     virtual ~TextFloat() {;}
 
     void setText(const TQString &text);
 
-    // Retqparent the float correctly by context
+    // Reparent the float correctly by context
     //
     void reparent(TQWidget *newParent);
 

src/gui/widgets/TimeWidget.cpp

@@ -48,12 +48,12 @@ namespace Rosegarden
 {
 
 TimeWidget::TimeWidget(TQString title,
-                       TQWidget *tqparent,
+                       TQWidget *parent,
                        Composition *composition,
                        timeT absTime,
                        bool editable,
                        bool constrainToCompositionDuration) :
-        TQGroupBox(1, Qt::Horizontal, title, tqparent),
+        TQGroupBox(1, Qt::Horizontal, title, parent),
         m_composition(composition),
         m_isDuration(false),
         m_constrain(constrainToCompositionDuration),
@@ -65,13 +65,13 @@ TimeWidget::TimeWidget(TQString title,
 }
 
 TimeWidget::TimeWidget(TQString title,
-                       TQWidget *tqparent,
+                       TQWidget *parent,
                        Composition *composition,
                        timeT startTime,
                        timeT duration,
                        bool editable,
                        bool constrainToCompositionDuration) :
-        TQGroupBox(1, Qt::Horizontal, title, tqparent),
+        TQGroupBox(1, Qt::Horizontal, title, parent),
         m_composition(composition),
         m_isDuration(true),
         m_constrain(constrainToCompositionDuration),

src/gui/widgets/TimeWidget.h

@@ -55,7 +55,7 @@ public:
      * Constructor for absolute time widget
      */
     TimeWidget(TQString title,
-               TQWidget *tqparent,
+               TQWidget *parent,
                Composition *composition, // for bar/beat/msec
                timeT initialTime,
                bool editable = true,
@@ -67,7 +67,7 @@ public:
      * correct real-time (based on tempo at startTime) etc.
      */
     TimeWidget(TQString title,
-               TQWidget *tqparent,
+               TQWidget *parent,
                Composition *composition, // for bar/beat/msec
                timeT startTime,
                timeT initialDuration,

src/gui/widgets/TristateCheckBox.h

@@ -47,8 +47,8 @@ class TristateCheckBox : public TQCheckBox
 Q_OBJECT
   TQ_OBJECT
 public:
-    TristateCheckBox(TQWidget *tqparent=0,
+    TristateCheckBox(TQWidget *parent=0,
-                               const char *name=0):TQCheckBox(tqparent, name)
+                               const char *name=0):TQCheckBox(parent, name)
         { setTristate(true) ;}
 
     virtual ~TristateCheckBox();

src/gui/widgets/VUMeter.cpp

@@ -40,7 +40,7 @@
 namespace Rosegarden
 {
 
-VUMeter::VUMeter(TQWidget *tqparent,
+VUMeter::VUMeter(TQWidget *parent,
                  VUMeterType type,
                  bool stereo,
                  bool hasRecord,
@@ -48,7 +48,7 @@ VUMeter::VUMeter(TQWidget *tqparent,
                  int height,
                  VUAlignment tqalignment,
                  const char *name):
-        TQLabel(tqparent, name),
+        TQLabel(parent, name),
         m_originalHeight(height),
         m_active(true),
         m_type(type),

src/gui/widgets/VUMeter.h

@@ -83,7 +83,7 @@ protected:
     // Constructor is protected - we can only create an object
     // from a sub-class of this type from a sub-class.
     //
-    VUMeter(TQWidget *tqparent = 0,
+    VUMeter(TQWidget *parent = 0,
             VUMeterType type = Plain,
             bool stereo = false,
             bool hasRecord = false,

src/gui/widgets/ZoomSlider.h

@@ -60,7 +60,7 @@ public:
      * to the user as a nice continuous range.
      */
     ZoomSlider(const std::vector<T> &sizes, T defaultValue,
-               Qt::Orientation, TQWidget * tqparent, const char * name=0);
+               Qt::Orientation, TQWidget * parent, const char * name=0);
 
     virtual ~ZoomSlider();
     
@@ -85,9 +85,9 @@ protected:
 template<class T>
 ZoomSlider<T>::ZoomSlider(const std::vector<T> &sizes,
                           T initialSize, Qt::Orientation o,
-                          TQWidget *tqparent, const char *name) :
+                          TQWidget *parent, const char *name) :
     TQSlider(0, sizes.size()-1, 1,
-            getIndex(sizes, initialSize), o, tqparent, name),
+            getIndex(sizes, initialSize), o, parent, name),
     m_sizes(sizes),
     m_defaultValue(initialSize)
 {

src/sequencer/main.cpp

@@ -70,7 +70,7 @@ int main(int argc, char *argv[])
     srandom((unsigned int)time(0) * (unsigned int)getpid());
 
     // Block signals during startup, so that child threads (inheriting
-    // this tqmask) ignore them; then after startup we can unblock them
+    // this mask) ignore them; then after startup we can unblock them
     // for this thread only.  This trick picked up from the jackd code.
     sigemptyset (&_signals);
     sigaddset(&_signals, SIGHUP);

src/sound/AlsaDriver.cpp

@@ -347,7 +347,7 @@ AlsaDriver::getAutoTimer(bool &wantTimerChecks)
 {
     Audit audit;
 
-    // Look for the aptqparent best-choice timer.
+    // Look for the apparent best-choice timer.
 
     if (m_timers.empty())
         return "";

src/sound/MappedStudio.cpp

@@ -265,7 +265,7 @@ MappedObject::destroy()
     MappedStudio *studio = dynamic_cast<MappedStudio*>(studioObject);
 
     // The destroy method on each child calls studio->clearObject,
-    // which calls back on the tqparent (in this case us) to remove the
+    // which calls back on the parent (in this case us) to remove the
     // child.  (That's necessary for the case of destroying a plugin,
     // where we need to remove it from its plugin manager -- etc.)  So
     // we don't want to be iterating over m_tqchildren here, as it will
@@ -387,7 +387,7 @@ MappedStudio::createObject(MappedObjectType type,
     } else if (type == MappedObject::PluginPort) {
         mO = new MappedPluginPort(this,
                                   id);
-        // reset the port's tqparent after creation outside this method
+        // reset the port's parent after creation outside this method
     }
 
     // Insert
@@ -597,11 +597,11 @@ MappedStudio::clearObject(MappedObjectId id)
 
         MappedObjectCategory::iterator j = i->second.find(id);
         if (j != i->second.end()) {
-            // if the object has a tqparent other than the studio,
+            // if the object has a parent other than the studio,
-            // persuade that tqparent to abandon it
+            // persuade that parent to abandon it
-            MappedObject *tqparent = j->second->getParent();
+            MappedObject *parent = j->second->getParent();
-            if (tqparent && !dynamic_cast<MappedStudio *>(tqparent)) {
+            if (parent && !dynamic_cast<MappedStudio *>(parent)) {
-                tqparent->removeChild(j->second);
+                parent->removeChild(j->second);
             }
 
             i->second.erase(j);
@@ -776,11 +776,11 @@ MappedStudio::getAudioInput(int inputNumber)
 // -------------- MappedConnectableObject -----------------
 //
 //
-MappedConnectableObject::MappedConnectableObject(MappedObject *tqparent,
+MappedConnectableObject::MappedConnectableObject(MappedObject *parent,
         const std::string &name,
         MappedObjectType type,
         MappedObjectId id):
-        MappedObject(tqparent,
+        MappedObject(parent,
                      name,
                      type,
                      id)
@@ -842,10 +842,10 @@ MappedConnectableObject::getConnections(ConnectionDirection dir)
 
 // ------------ MappedAudioFader ----------------
 //
-MappedAudioFader::MappedAudioFader(MappedObject *tqparent,
+MappedAudioFader::MappedAudioFader(MappedObject *parent,
                                    MappedObjectId id,
                                    MappedObjectValue channels):
-        MappedConnectableObject(tqparent,
+        MappedConnectableObject(parent,
                                 "MappedAudioFader",
                                 AudioFader,
                                 id),
@@ -987,9 +987,9 @@ MappedAudioFader::setProperty(const MappedObjectProperty &property,
 // ---------------- MappedAudioBuss -------------------
 //
 //
-MappedAudioBuss::MappedAudioBuss(MappedObject *tqparent,
+MappedAudioBuss::MappedAudioBuss(MappedObject *parent,
                                  MappedObjectId id) :
-        MappedConnectableObject(tqparent,
+        MappedConnectableObject(parent,
                                 "MappedAudioBuss",
                                 AudioBuss,
                                 id),
@@ -1133,9 +1133,9 @@ MappedAudioBuss::getInstruments()
 // ---------------- MappedAudioInput -------------------
 //
 //
-MappedAudioInput::MappedAudioInput(MappedObject *tqparent,
+MappedAudioInput::MappedAudioInput(MappedObject *parent,
                                    MappedObjectId id) :
-        MappedConnectableObject(tqparent,
+        MappedConnectableObject(parent,
                                 "MappedAudioInput",
                                 AudioInput,
                                 id)
@@ -1191,8 +1191,8 @@ MappedAudioInput::setProperty(const MappedObjectProperty &property,
 }
 
 
-MappedPluginSlot::MappedPluginSlot(MappedObject *tqparent, MappedObjectId id) :
+MappedPluginSlot::MappedPluginSlot(MappedObject *parent, MappedObjectId id) :
-        MappedObject(tqparent, "MappedPluginSlot", PluginSlot, id)
+        MappedObject(parent, "MappedPluginSlot", PluginSlot, id)
 {
 #ifdef DEBUG_MAPPEDSTUDIO
     std::cerr << "MappedPluginSlot::MappedPluginSlot: id = " << id << std::endl;
@@ -1548,8 +1548,8 @@ MappedPluginSlot::getPort(unsigned long portNumber)
 }
 
 
-MappedPluginPort::MappedPluginPort(MappedObject *tqparent, MappedObjectId id) :
+MappedPluginPort::MappedPluginPort(MappedObject *parent, MappedObjectId id) :
-        MappedObject(tqparent, "MappedPluginPort", PluginPort, id)
+        MappedObject(parent, "MappedPluginPort", PluginPort, id)
 {}
 
 MappedPluginPort::~MappedPluginPort()

src/sound/MappedStudio.h

@@ -71,14 +71,14 @@ public:
 
     } MappedObjectType;
 
-    MappedObject(MappedObject *tqparent,
+    MappedObject(MappedObject *parent,
                  const std::string &name,
                  MappedObjectType type,
                  MappedObjectId id):
         m_type(type),
         m_id(id), 
         m_name(name),
-        m_tqparent(tqparent) {;}
+        m_parent(parent) {;}
 
     virtual ~MappedObject() {;}
 
@@ -116,9 +116,9 @@ public:
 
     // Ownership
     //
-    MappedObject* getParent() { return m_tqparent; }
+    MappedObject* getParent() { return m_parent; }
-    const MappedObject* getParent() const { return m_tqparent; }
+    const MappedObject* getParent() const { return m_parent; }
-    void setParent(MappedObject *tqparent) { m_tqparent = tqparent; }
+    void setParent(MappedObject *parent) { m_parent = parent; }
 
     // Get a list of child ids - get a list of a certain type
     //
@@ -143,7 +143,7 @@ protected:
     MappedObjectId   m_id;
     std::string      m_name;
 
-    MappedObject                *m_tqparent;
+    MappedObject                *m_parent;
     std::vector<MappedObject*>   m_tqchildren;
 };
 
@@ -261,7 +261,7 @@ private:
     MappedObjectId             m_runningObjectId;
 
     // All of our mapped (virtual) studio resides in this container as
-    // well as having all their tqparent/child relationships.  Because
+    // well as having all their parent/child relationships.  Because
     // some things are just blobs with no connections we need to
     // maintain both - don't forget about this.
     //
@@ -298,7 +298,7 @@ public:
         Out
     } ConnectionDirection;
 
-    MappedConnectableObject(MappedObject *tqparent,
+    MappedConnectableObject(MappedObject *parent,
                             const std::string &name,
                             MappedObjectType type,
                             MappedObjectId id);
@@ -335,7 +335,7 @@ public:
     static const MappedObjectProperty Pan;
     static const MappedObjectProperty InputChannel;
 
-    MappedAudioFader(MappedObject *tqparent,
+    MappedAudioFader(MappedObject *parent,
                      MappedObjectId id,
                      MappedObjectValue channels = 2); // stereo default
     ~MappedAudioFader();
@@ -385,7 +385,7 @@ public:
     static const MappedObjectProperty Pan;
     static const MappedObjectProperty Level;
 
-    MappedAudioBuss(MappedObject *tqparent,
+    MappedAudioBuss(MappedObject *parent,
                     MappedObjectId id);
     ~MappedAudioBuss();
 
@@ -418,7 +418,7 @@ public:
 
     static const MappedObjectProperty InputNumber;
 
-    MappedAudioInput(MappedObject *tqparent,
+    MappedAudioInput(MappedObject *parent,
                      MappedObjectId id);
     ~MappedAudioInput();
 
@@ -455,7 +455,7 @@ public:
     static const MappedObjectProperty Bypassed;
     static const MappedObjectProperty Configuration; // list property
 
-    MappedPluginSlot(MappedObject *tqparent, MappedObjectId id);
+    MappedPluginSlot(MappedObject *parent, MappedObjectId id);
     ~MappedPluginSlot();
 
     virtual MappedObjectPropertyList getPropertyList(
@@ -513,7 +513,7 @@ public:
     static const MappedObjectProperty DisplayHint;
     static const MappedObjectProperty Value;
 
-    MappedPluginPort(MappedObject *tqparent, MappedObjectId id);
+    MappedPluginPort(MappedObject *parent, MappedObjectId id);
     ~MappedPluginPort();
 
     virtual MappedObjectPropertyList getPropertyList(