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

1 files changed, 19 insertions, 19 deletions

diff --git a/src/sound/MappedStudio.cpp b/src/sound/MappedStudio.cpp
index 3d9dbb8..1bb6cec 100644
--- a/src/sound/MappedStudio.cpp
+++ b/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,
-            // persuade that tqparent to abandon it
-            MappedObject *tqparent = j->second->getParent();
-            if (tqparent && !dynamic_cast<MappedStudio *>(tqparent)) {
-                tqparent->removeChild(j->second);
+            // if the object has a parent other than the studio,
+            // persuade that parent to abandon it
+            MappedObject *parent = j->second->getParent();
+            if (parent && !dynamic_cast<MappedStudio *>(parent)) {
+                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) :
-        MappedObject(tqparent, "MappedPluginSlot", PluginSlot, id)
+MappedPluginSlot::MappedPluginSlot(MappedObject *parent, MappedObjectId 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) :
-        MappedObject(tqparent, "MappedPluginPort", PluginPort, id)
+MappedPluginPort::MappedPluginPort(MappedObject *parent, MappedObjectId id) :
+        MappedObject(parent, "MappedPluginPort", PluginPort, id)
 {}
 
 MappedPluginPort::~MappedPluginPort()