summaryrefslogtreecommitdiffstats
path: root/arts/runtime
diff options
context:
space:
mode:
Diffstat (limited to 'arts/runtime')
-rw-r--r--arts/runtime/artsbuilder.idl12
-rw-r--r--arts/runtime/structurebuilder_impl.cc12
-rw-r--r--arts/runtime/structures_impl.cc56
3 files changed, 40 insertions, 40 deletions
diff --git a/arts/runtime/artsbuilder.idl b/arts/runtime/artsbuilder.idl
index 7fe75949..2da25a68 100644
--- a/arts/runtime/artsbuilder.idl
+++ b/arts/runtime/artsbuilder.idl
@@ -76,11 +76,11 @@ module Arts {
interface PortDesc {
// internal:
- void constructor(ModuleDesc tqparent, string name, PortType type);
+ void constructor(ModuleDesc parent, string name, PortType type);
// ID is guaranteed to be unique in the structure the port belongs to
readonly attribute long ID;
- readonly attribute ModuleDesc tqparent;
+ readonly attribute ModuleDesc parent;
// Name is guaranteed to be unique for each module (no two in/out-
// ports with the same name allowed)
@@ -123,11 +123,11 @@ module Arts {
interface ModuleDesc {
// internal
- void constructor(StructureDesc tqparent, ModuleInfo info);
+ void constructor(StructureDesc parent, ModuleInfo info);
// ID is guaranteed to be unique in the structure the module belongs to
readonly attribute long ID;
- readonly attribute StructureDesc tqparent;
+ readonly attribute StructureDesc parent;
readonly attribute string name;
readonly attribute sequence<PortDesc> ports;
@@ -184,7 +184,7 @@ module Arts {
interface StructurePortDesc : PortDesc {
// internal
- void constructor(StructureDesc tqparent, string name, PortType type);
+ void constructor(StructureDesc parent, string name, PortType type);
// Position: how the port is positioned when the structure is used
// as module - 0 is leftmost, higher numbers are more right
@@ -192,7 +192,7 @@ module Arts {
readonly attribute StructureDesc parentStructure;
// if the port is associated with an inherited interface of the
- // tqparent structure, then it should be setup here
+ // parent structure, then it should be setup here
attribute string inheritedInterface;
boolean moveTo(long x, long y); // returns true when successful
diff --git a/arts/runtime/structurebuilder_impl.cc b/arts/runtime/structurebuilder_impl.cc
index c2e217e8..43e5485c 100644
--- a/arts/runtime/structurebuilder_impl.cc
+++ b/arts/runtime/structurebuilder_impl.cc
@@ -96,7 +96,7 @@ ModuleDef StructureBuilder_impl::createTypeInfo(StructureDesc structure)
{
const Arts::PortType& type = pi->type();
- // if we inherited the port from a tqparent interface, we don't need to
+ // if we inherited the port from a parent interface, we don't need to
// list it in our interface description
if(pi->inheritedInterface().empty())
{
@@ -236,12 +236,12 @@ Structure_impl::Structure_impl(StructureDesc structureDesc,
for(ci = connections->begin(); ci != connections->end(); ci++)
{
- if(!ci->tqparent().isNull()) // structureport otherwise
+ if(!ci->parent().isNull()) // structureport otherwise
{
- Object& dest = moduleMap[ci->tqparent().ID()];
+ Object& dest = moduleMap[ci->parent().ID()];
#ifdef STRUCTBUILDER_DEBUG
cout << "connect " << mi->name() << "." << pi->name()
- << " to " << ci->tqparent().name()
+ << " to " << ci->parent().name()
<< "." << ci->name() << endl;
#endif
connect(object,pd.name(),dest,ci->name());
@@ -271,10 +271,10 @@ Structure_impl::Structure_impl(StructureDesc structureDesc,
for(ci = connections->begin(); ci != connections->end(); ci++)
{
- Object& dest = moduleMap[ci->tqparent().ID()];
+ Object& dest = moduleMap[ci->parent().ID()];
#ifdef STRUCTBUILDER_DEBUG
cout << "virtualize " << pi->name()
- << " to " << ci->tqparent().name() << "." << ci->name()
+ << " to " << ci->parent().name() << "." << ci->name()
<< endl;
#endif
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<PortDesc> *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<string>& list);
vector<string> *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 = <some structure>, 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)
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 08:19:56 +0000