From 27edf28be2772229a7974a007313ea30d92c3ffd Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: rename the following methods: tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- arts/runtime/structures_impl.cc | 56 ++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'arts/runtime/structures_impl.cc') diff --git a/arts/runtime/structures_impl.cc b/arts/runtime/structures_impl.cc index 5c392e91..7c5a5e05 100644 --- a/arts/runtime/structures_impl.cc +++ b/arts/runtime/structures_impl.cc @@ -32,11 +32,11 @@ public: ~PortDesc_impl(); inline PortDesc self() { return PortDesc::_from_base(_copy()); } - void constructor(ModuleDesc tqparent, const string& name, const PortType& type); + void constructor(ModuleDesc parent, const string& name, const PortType& type); void disconnectAll(); long ID(); - ModuleDesc tqparent(); + ModuleDesc parent(); string name(); PortType type(); bool isConnected(); @@ -78,7 +78,7 @@ private: public: long ID(); - StructureDesc tqparent(); + StructureDesc parent(); string name(); vector *ports(); long height(); @@ -86,7 +86,7 @@ public: long x(); long y(); bool moveTo( long x, long y ); - void constructor( StructureDesc tqparent, const ModuleInfo& info ); + void constructor( StructureDesc parent, const ModuleInfo& info ); void loadFromList(const vector& list); vector *saveToList(); @@ -155,7 +155,7 @@ protected: return StructurePortDesc::_from_base(_copy()); } public: - void constructor(StructureDesc tqparent, const string& name, + void constructor(StructureDesc parent, const string& name, const PortType& type); ~StructurePortDesc_impl(); @@ -192,13 +192,13 @@ REGISTER_IMPLEMENTATION(StructurePortDesc_impl); #define pstat \ printf("port name %s, direction %s, id %d\n",_Name.c_str(),dname(_Type.direction),_ID); -void PortDesc_impl::constructor(ModuleDesc tqparent, const string& name, +void PortDesc_impl::constructor(ModuleDesc parent, const string& name, const PortType& type) { #if 0 - if(tqparent) + if(parent) { - char * pname = tqparent->Name(); + char * pname = parent->Name(); describe("PortDesc."+string(pname)+string(".")+name); } else @@ -208,14 +208,14 @@ void PortDesc_impl::constructor(ModuleDesc tqparent, const string& name, #endif _name = name; _type = type; - _parent = tqparent; + _parent = parent; _isConnected = false; _hasValue = false; _value.type = _type.dataType; - if(!tqparent.isNull()) + if(!parent.isNull()) { - StructureDesc sd = tqparent.tqparent(); + StructureDesc sd = parent.parent(); _ID = sd.obtainID(); } // else: assume that some smart object which derives from us will set the ID accordingly @@ -276,7 +276,7 @@ long PortDesc_impl::ID() return _ID; } -ModuleDesc PortDesc_impl::tqparent() +ModuleDesc PortDesc_impl::parent() { return _parent; } @@ -468,11 +468,11 @@ void PortDesc_impl::disconnectFrom( PortDesc port ) _isConnected = !_connections.empty(); - ModuleDesc tqparent = _parent; - if(tqparent.isNull()) + ModuleDesc parent = _parent; + if(parent.isNull()) artsdebug("_Parent = , isConnected = %d\n",_isConnected); else - artsdebug("_Parent = %s, isConnected = %d\n",tqparent.name().c_str(),_isConnected); + artsdebug("_Parent = %s, isConnected = %d\n",parent.name().c_str(),_isConnected); if(found) port.disconnectFrom(self()); @@ -484,7 +484,7 @@ long ModuleDesc_impl::ID() return _ID; } -StructureDesc ModuleDesc_impl::tqparent() +StructureDesc ModuleDesc_impl::parent() { return _parent; } @@ -549,14 +549,14 @@ long StructureDesc_impl::height() * Query the module for it's paramenters */ -void ModuleDesc_impl::constructor( StructureDesc tqparent, +void ModuleDesc_impl::constructor( StructureDesc parent, const Arts::ModuleInfo& info ) { _name = info.name; _x = -1; // no position assigned _y = -1; - _ID = tqparent.obtainID(); - _parent = tqparent; + _ID = parent.obtainID(); + _parent = parent; _isInterface = info.isInterface; _isStructure = info.isStructure; @@ -1134,12 +1134,12 @@ void StructureDesc_impl::moveStructurePortDesc(StructurePortDesc portdesc.internalSetPosition(newposition); } -void StructurePortDesc_impl::constructor(StructureDesc tqparent, +void StructurePortDesc_impl::constructor(StructureDesc parent, const string& name, const PortType& type) { PortDesc_impl::constructor(ModuleDesc::null(),name,type); - _parentStructure = tqparent; - _ID = tqparent.obtainID(); + _parentStructure = parent; + _ID = parent.obtainID(); _x = 0; _y = 0; _position = 0; @@ -1167,18 +1167,18 @@ long StructurePortDesc_impl::position() void StructurePortDesc_impl::lowerPosition() { - StructureDesc tqparent = _parentStructure; // weak reference + StructureDesc parent = _parentStructure; // weak reference - if(!tqparent.isNull()) - tqparent.moveStructurePortDesc(self(), _position-1); + if(!parent.isNull()) + parent.moveStructurePortDesc(self(), _position-1); } void StructurePortDesc_impl::raisePosition() { - StructureDesc tqparent = _parentStructure; // weak reference + StructureDesc parent = _parentStructure; // weak reference - if(!tqparent.isNull()) - tqparent.moveStructurePortDesc(self(), _position+1); + if(!parent.isNull()) + parent.moveStructurePortDesc(self(), _position+1); } void StructurePortDesc_impl::rename(const string& newname) -- cgit v1.2.1