summaryrefslogtreecommitdiffstats
path: root/arts/runtime
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-11 06:00:15 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-11 06:00:15 +0000
commitb1057f437bf65300831a0ccb45b920787c6b318d (patch)
treef8a73db06ca1180d0da0ba6dfbe786197b4f4bc3 /arts/runtime
parent4ddfca384ced9ad654213aef9dc2c3973720b980 (diff)
downloadtdemultimedia-b1057f437bf65300831a0ccb45b920787c6b318d.tar.gz
tdemultimedia-b1057f437bf65300831a0ccb45b920787c6b318d.zip
TQt4 port kdemultimedia
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1236079 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'arts/runtime')
-rw-r--r--arts/runtime/artsbuilder.idl16
-rw-r--r--arts/runtime/moduleinfo.cc4
-rw-r--r--arts/runtime/moduleinfo.h4
-rw-r--r--arts/runtime/structurebuilder_impl.cc12
-rw-r--r--arts/runtime/structures_impl.cc60
5 files changed, 48 insertions, 48 deletions
diff --git a/arts/runtime/artsbuilder.idl b/arts/runtime/artsbuilder.idl
index 42ff393a..17332ee5 100644
--- a/arts/runtime/artsbuilder.idl
+++ b/arts/runtime/artsbuilder.idl
@@ -42,7 +42,7 @@ module Arts {
* isMultiPort specifies if the port can take multiple incoming
* connections or not. This is only relevant/allowed for input ports,
* the output of all output ports may be connected to any amount of
- * receivers.
+ * tqreceivers.
*
* Ports which can take multiple connections are handled differently
* internally. (Also, artsbuilder needs to know whether to allow multi-
@@ -76,11 +76,11 @@ module Arts {
interface PortDesc {
// internal:
- void constructor(ModuleDesc parent, string name, PortType type);
+ void constructor(ModuleDesc tqparent, string name, PortType type);
// ID is guaranteed to be unique in the structure the port belongs to
readonly attribute long ID;
- readonly attribute ModuleDesc parent;
+ readonly attribute ModuleDesc tqparent;
// 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 parent, ModuleInfo info);
+ void constructor(StructureDesc tqparent, ModuleInfo info);
// ID is guaranteed to be unique in the structure the module belongs to
readonly attribute long ID;
- readonly attribute StructureDesc parent;
+ readonly attribute StructureDesc tqparent;
readonly attribute string name;
readonly attribute sequence<PortDesc> ports;
@@ -184,15 +184,15 @@ module Arts {
interface StructurePortDesc : PortDesc {
// internal
- void constructor(StructureDesc parent, string name, PortType type);
+ void constructor(StructureDesc tqparent, 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
readonly attribute long x, y, position;
- readonly attribute StructureDesc parentStructure;
+ readonly attribute StructureDesc tqparentStructure;
// if the port is associated with an inherited interface of the
- // parent structure, then it should be setup here
+ // tqparent 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/moduleinfo.cc b/arts/runtime/moduleinfo.cc
index 1d20b585..7bef4464 100644
--- a/arts/runtime/moduleinfo.cc
+++ b/arts/runtime/moduleinfo.cc
@@ -17,8 +17,8 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- Permission is also granted to link this program with the Qt
- library, treating Qt like a library that normally accompanies the
+ Permission is also granted to link this program with the TQt
+ library, treating TQt like a library that normally accompanies the
operating system kernel, whether or not that is in fact the case.
*/
diff --git a/arts/runtime/moduleinfo.h b/arts/runtime/moduleinfo.h
index 2e8e64bc..2caea78f 100644
--- a/arts/runtime/moduleinfo.h
+++ b/arts/runtime/moduleinfo.h
@@ -17,8 +17,8 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- Permission is also granted to link this program with the Qt
- library, treating Qt like a library that normally accompanies the
+ Permission is also granted to link this program with the TQt
+ library, treating TQt like a library that normally accompanies the
operating system kernel, whether or not that is in fact the case.
*/
diff --git a/arts/runtime/structurebuilder_impl.cc b/arts/runtime/structurebuilder_impl.cc
index 43e5485c..c2e217e8 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 parent interface, we don't need to
+ // if we inherited the port from a tqparent 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->parent().isNull()) // structureport otherwise
+ if(!ci->tqparent().isNull()) // structureport otherwise
{
- Object& dest = moduleMap[ci->parent().ID()];
+ Object& dest = moduleMap[ci->tqparent().ID()];
#ifdef STRUCTBUILDER_DEBUG
cout << "connect " << mi->name() << "." << pi->name()
- << " to " << ci->parent().name()
+ << " to " << ci->tqparent().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->parent().ID()];
+ Object& dest = moduleMap[ci->tqparent().ID()];
#ifdef STRUCTBUILDER_DEBUG
cout << "virtualize " << pi->name()
- << " to " << ci->parent().name() << "." << ci->name()
+ << " to " << ci->tqparent().name() << "." << ci->name()
<< endl;
#endif
diff --git a/arts/runtime/structures_impl.cc b/arts/runtime/structures_impl.cc
index 7c5a5e05..72de0de7 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 parent, const string& name, const PortType& type);
+ void constructor(ModuleDesc tqparent, const string& name, const PortType& type);
void disconnectAll();
long ID();
- ModuleDesc parent();
+ ModuleDesc tqparent();
string name();
PortType type();
bool isConnected();
@@ -78,7 +78,7 @@ private:
public:
long ID();
- StructureDesc parent();
+ StructureDesc tqparent();
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 parent, const ModuleInfo& info );
+ void constructor( StructureDesc tqparent, 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 parent, const string& name,
+ void constructor(StructureDesc tqparent, const string& name,
const PortType& type);
~StructurePortDesc_impl();
@@ -169,7 +169,7 @@ public:
void inheritedInterface(const string& iface);
void internalSetPosition(long position);
- StructureDesc parentStructure();
+ StructureDesc tqparentStructure();
bool moveTo( long X, long Y );
void loadFromList(const vector<string>& list);
@@ -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 parent, const string& name,
+void PortDesc_impl::constructor(ModuleDesc tqparent, const string& name,
const PortType& type)
{
#if 0
- if(parent)
+ if(tqparent)
{
- char * pname = parent->Name();
+ char * pname = tqparent->Name();
describe("PortDesc."+string(pname)+string(".")+name);
}
else
@@ -208,14 +208,14 @@ void PortDesc_impl::constructor(ModuleDesc parent, const string& name,
#endif
_name = name;
_type = type;
- _parent = parent;
+ _parent = tqparent;
_isConnected = false;
_hasValue = false;
_value.type = _type.dataType;
- if(!parent.isNull())
+ if(!tqparent.isNull())
{
- StructureDesc sd = parent.parent();
+ StructureDesc sd = tqparent.tqparent();
_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::parent()
+ModuleDesc PortDesc_impl::tqparent()
{
return _parent;
}
@@ -468,11 +468,11 @@ void PortDesc_impl::disconnectFrom( PortDesc port )
_isConnected = !_connections.empty();
- ModuleDesc parent = _parent;
- if(parent.isNull())
+ ModuleDesc tqparent = _parent;
+ if(tqparent.isNull())
artsdebug("_Parent = <some structure>, isConnected = %d\n",_isConnected);
else
- artsdebug("_Parent = %s, isConnected = %d\n",parent.name().c_str(),_isConnected);
+ artsdebug("_Parent = %s, isConnected = %d\n",tqparent.name().c_str(),_isConnected);
if(found)
port.disconnectFrom(self());
@@ -484,7 +484,7 @@ long ModuleDesc_impl::ID()
return _ID;
}
-StructureDesc ModuleDesc_impl::parent()
+StructureDesc ModuleDesc_impl::tqparent()
{
return _parent;
}
@@ -549,14 +549,14 @@ long StructureDesc_impl::height()
* Query the module for it's paramenters
*/
-void ModuleDesc_impl::constructor( StructureDesc parent,
+void ModuleDesc_impl::constructor( StructureDesc tqparent,
const Arts::ModuleInfo& info )
{
_name = info.name;
_x = -1; // no position assigned
_y = -1;
- _ID = parent.obtainID();
- _parent = parent;
+ _ID = tqparent.obtainID();
+ _parent = tqparent;
_isInterface = info.isInterface;
_isStructure = info.isStructure;
@@ -1134,12 +1134,12 @@ void StructureDesc_impl::moveStructurePortDesc(StructurePortDesc
portdesc.internalSetPosition(newposition);
}
-void StructurePortDesc_impl::constructor(StructureDesc parent,
+void StructurePortDesc_impl::constructor(StructureDesc tqparent,
const string& name, const PortType& type)
{
PortDesc_impl::constructor(ModuleDesc::null(),name,type);
- _parentStructure = parent;
- _ID = parent.obtainID();
+ _parentStructure = tqparent;
+ _ID = tqparent.obtainID();
_x = 0;
_y = 0;
_position = 0;
@@ -1167,18 +1167,18 @@ long StructurePortDesc_impl::position()
void StructurePortDesc_impl::lowerPosition()
{
- StructureDesc parent = _parentStructure; // weak reference
+ StructureDesc tqparent = _parentStructure; // weak reference
- if(!parent.isNull())
- parent.moveStructurePortDesc(self(), _position-1);
+ if(!tqparent.isNull())
+ tqparent.moveStructurePortDesc(self(), _position-1);
}
void StructurePortDesc_impl::raisePosition()
{
- StructureDesc parent = _parentStructure; // weak reference
+ StructureDesc tqparent = _parentStructure; // weak reference
- if(!parent.isNull())
- parent.moveStructurePortDesc(self(), _position+1);
+ if(!tqparent.isNull())
+ tqparent.moveStructurePortDesc(self(), _position+1);
}
void StructurePortDesc_impl::rename(const string& newname)
@@ -1202,7 +1202,7 @@ void StructurePortDesc_impl::internalSetPosition(long position)
_position = position;
}
-StructureDesc StructurePortDesc_impl::parentStructure()
+StructureDesc StructurePortDesc_impl::tqparentStructure()
{
return _parentStructure;
}