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

1 files changed, 30 insertions, 30 deletions

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;
 }