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

3 files changed, 33 insertions, 33 deletions

diff --git a/src/sound/AlsaDriver.cpp b/src/sound/AlsaDriver.cpp
index f486ac7..a0ac79c 100644
--- a/src/sound/AlsaDriver.cpp
+++ b/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 "";
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()
diff --git a/src/sound/MappedStudio.h b/src/sound/MappedStudio.h
index e7fa4f9..96c5639 100644
--- a/src/sound/MappedStudio.h
+++ b/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; }
-    const MappedObject* getParent() const { return m_tqparent; }
-    void setParent(MappedObject *tqparent) { m_tqparent = tqparent; }
+    MappedObject* getParent() { return m_parent; }
+    const MappedObject* getParent() const { return m_parent; }
+    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(