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

7 files changed, 28 insertions, 28 deletions

diff --git a/arts/modules/common/artsmodulescommon.idl b/arts/modules/common/artsmodulescommon.idl
index 10ccd218..7f657568 100644
--- a/arts/modules/common/artsmodulescommon.idl
+++ b/arts/modules/common/artsmodulescommon.idl
@@ -72,7 +72,7 @@ module Environment {
 		/**
 		 * the container the item lives in
 		 */
-		readonly attribute Container parent;
+		readonly attribute Container tqparent;
 
 		/**
 		 * called by the container to insert/remove item from/to the
@@ -150,7 +150,7 @@ interface EffectRackItemGui {
 };
 
 interface EffectRackSlot {
-	void constructor( Widget parent, Widget effect, EffectRackItemGui effectrackgui );
+	void constructor( Widget tqparent, Widget effect, EffectRackItemGui effectrackgui );
 	/*writeonly*/ attribute boolean removeslot;
 	/*writeonly*/ attribute boolean tomaster;
 };
diff --git a/arts/modules/common/effectrackslot_impl.cc b/arts/modules/common/effectrackslot_impl.cc
index 8e7e48e8..359c40a3 100644
--- a/arts/modules/common/effectrackslot_impl.cc
+++ b/arts/modules/common/effectrackslot_impl.cc
@@ -42,23 +42,23 @@ class EffectRackSlot_impl : virtual public EffectRackSlot_skel
 		{
 		}
 
-		void constructor( Widget parent, Widget effect, EffectRackItemGui effectrackgui )
+		void constructor( Widget tqparent, Widget effect, EffectRackItemGui effectrackgui )
 		{
 			_effectrackgui = effectrackgui;
 
-			_hbox.parent( parent );
+			_hbox.tqparent( tqparent );
 			_hbox.margin( 0 );
 			_hbox.spacing( 0 );
 			_hbox.framestyle( Sunken | Panel );
 			_hbox.linewidth( 1 );
 			_hbox.show();
 
-			_buttonbox.parent( _hbox );
+			_buttonbox.tqparent( _hbox );
 			_buttonbox.margin( 0 );
 			_buttonbox.spacing( 0 );
 			_buttonbox.show();
 
-			_removeButton.parent( _buttonbox );
+			_removeButton.tqparent( _buttonbox );
 			_removeButton.text( "x" );
 			_removeButton.hSizePolicy( spFixed );
 			_removeButton.width( 20 );
@@ -66,7 +66,7 @@ class EffectRackSlot_impl : virtual public EffectRackSlot_skel
 			connect( _removeButton, "clicked_changed", self(), "removeslot" );
 			_removeButton.show();
 
-			_masterButton.parent( _buttonbox );
+			_masterButton.tqparent( _buttonbox );
 			_masterButton.text( "MM" );
 			_masterButton.toggle( true );
 			_masterButton.hSizePolicy( spFixed );
@@ -75,7 +75,7 @@ class EffectRackSlot_impl : virtual public EffectRackSlot_skel
 			connect( _masterButton, "pressed_changed", self(), "tomaster" );
 			_masterButton.show();
 
-			_frame.parent( _hbox );
+			_frame.tqparent( _hbox );
 			_frame.margin( 5 );
 			_frame.spacing( 0 );
 			_frame.framestyle( Raised | Panel );
@@ -85,10 +85,10 @@ class EffectRackSlot_impl : virtual public EffectRackSlot_skel
 			_frame.show();
 
 			_effect = effect;
-			_effect.parent( _frame );
+			_effect.tqparent( _frame );
 			_effect.show();
 
-			_spacer.parent( _frame );
+			_spacer.tqparent( _frame );
 			_spacer.hSizePolicy( spExpanding );
 			_spacer.show();
 		}
diff --git a/arts/modules/common/env_effectrackitem_impl.cc b/arts/modules/common/env_effectrackitem_impl.cc
index 50fb116e..ac76db70 100644
--- a/arts/modules/common/env_effectrackitem_impl.cc
+++ b/arts/modules/common/env_effectrackitem_impl.cc
@@ -226,7 +226,7 @@ public:
 			name = LineEdit();
 			name.caption("name");
 			name.text(_effectRack.name());
-			name.parent(hbox);
+			name.tqparent(hbox);
 			connect(name,"text_changed", _effectRack, "name");
 #endif
 
@@ -248,7 +248,7 @@ public:
 			typebox = ComboBox();
 			typebox.choices(choices);
 			typebox.value(_type);
-			typebox.parent(hbox);
+			typebox.tqparent(hbox);
 			connect(typebox,"value_changed", self(), "type");
 
 			addbutton = Button( "add", hbox );
@@ -260,7 +260,7 @@ public:
 			effect_vbox.show();
 
 			Frame spacer;
-			spacer.parent( effect_vbox );
+			spacer.tqparent( effect_vbox );
 			spacer.vSizePolicy( spExpanding );
 			spacer.show();
 			effect_vbox._addChild( spacer, "spacer" );
diff --git a/arts/modules/common/env_instrumentitem_impl.cc b/arts/modules/common/env_instrumentitem_impl.cc
index 17959ca0..0b979b6c 100644
--- a/arts/modules/common/env_instrumentitem_impl.cc
+++ b/arts/modules/common/env_instrumentitem_impl.cc
@@ -98,7 +98,7 @@ public:
 		LineEdit edit;
 		edit.x(20); edit.y(10); edit.width(120); edit.height(40);
 		edit.text(instrument.filename());
-		edit.parent(panel);
+		edit.tqparent(panel);
 		edit.show();
 		connect(edit,"text_changed", instrument, "filename");
 		panel._addChild(edit,"editWidget");
diff --git a/arts/modules/common/env_item_impl.cc b/arts/modules/common/env_item_impl.cc
index 6bc960d8..da3a6941 100644
--- a/arts/modules/common/env_item_impl.cc
+++ b/arts/modules/common/env_item_impl.cc
@@ -16,7 +16,7 @@ Environment::Item_impl::~Item_impl()
 	arts_assert(_active == false);
 }
 
-Environment::Container Environment::Item_impl::parent()
+Environment::Container Environment::Item_impl::tqparent()
 {
 	Container p = _parent;
 	return p;
diff --git a/arts/modules/common/env_item_impl.h b/arts/modules/common/env_item_impl.h
index dbdca1f9..4fcd1fc8 100644
--- a/arts/modules/common/env_item_impl.h
+++ b/arts/modules/common/env_item_impl.h
@@ -18,7 +18,7 @@ public:
 	~Item_impl();
 
 	bool active();
-	Container parent();
+	Container tqparent();
 	void setContainer(Container container);
 };
 }
diff --git a/arts/modules/common/env_mixeritem_impl.cc b/arts/modules/common/env_mixeritem_impl.cc
index 0f4db5e8..db4bc18c 100644
--- a/arts/modules/common/env_mixeritem_impl.cc
+++ b/arts/modules/common/env_mixeritem_impl.cc
@@ -49,7 +49,7 @@ public:
 		if(newName != _name)
 		{
 			_name = newName;
-		  	amClient.title(i18n("Mixer (\"%1\")").arg(TQString::fromUtf8(_name.c_str())).utf8().data());
+		  	amClient.title(i18n("Mixer (\"%1\")").tqarg(TQString::fromUtf8(_name.c_str())).utf8().data());
 		  	amClient.autoRestoreID("mixer_"+_name);
 			for(unsigned int i = 0; i < _inputs.size(); i++)
 				_inputs[i].busname(channelName(i));
@@ -165,7 +165,7 @@ public:
 				Widget w = guiFactory.createGui((*channels)[i]);
 				if(!w.isNull())
 				{
-					w.parent(channel_hbox);
+					w.tqparent(channel_hbox);
 					w.show();
 					channelWidgets.push_back(w);
 				}
@@ -183,21 +183,21 @@ public:
 		if(!_item.isNull() && !vbox.isNull())
 		{
 			hbox = HBox();
-			hbox.parent(vbox);
+			hbox.tqparent(vbox);
 			hbox.show();
 
 			spinbox = SpinBox();
 			spinbox.caption(i18n("channels").utf8().data());
 			spinbox.min(0); spinbox.max(32);
 			spinbox.value(_item.channelCount());
-			spinbox.parent(hbox);
+			spinbox.tqparent(hbox);
 			spinbox.show();
 			connect(spinbox,"value_changed", _item, "channelCount");
 
 			name = LineEdit();
 			name.caption(i18n("name").utf8().data());
 			name.text(_item.name());
-			name.parent(hbox);
+			name.tqparent(hbox);
 			name.show();
 			connect(name,"text_changed", _item, "name");
 
@@ -212,12 +212,12 @@ public:
 			delete queryResults;
 			typebox.choices(choices);
 			typebox.value(_type);
-			typebox.parent(hbox);
+			typebox.tqparent(hbox);
 			typebox.show();
 			connect(typebox,"value_changed", _item, "type");
 
 			channel_hbox = HBox();
-			channel_hbox.parent(vbox);
+			channel_hbox.tqparent(vbox);
 			channel_hbox.show();
 
 			channelWidgets.clear();
@@ -320,14 +320,14 @@ public:
 			HBox hbox;
 			hbox.show();
 			hbox.width(330); hbox.height(50);
-			hbox.parent(vbox);
+			hbox.tqparent(vbox);
 			vbox._addChild(hbox,"hbox");
 
 			SpinBox spinbox;
 			spinbox.caption(i18n("channels").utf8().data());
 			spinbox.min(0); spinbox.max(32);
 			spinbox.value(mixerItem.channelCount());
-			spinbox.parent(hbox);
+			spinbox.tqparent(hbox);
 			spinbox.show();
 			connect(spinbox,"value_changed", mixerItem, "channelCount");
 			hbox._addChild(spinbox,"channelsWidget");
@@ -335,7 +335,7 @@ public:
 			LineEdit name;
 			name.caption(i18n("name").utf8().data());
 			name.caption(mixerItem.name());
-			name.parent(hbox);
+			name.tqparent(hbox);
 			name.show();
 			connect(name,"caption_changed", mixerItem, "name");
 			hbox._addChild(name,"nameWidget");
@@ -343,7 +343,7 @@ public:
 			HBox channel_hbox;
 			channel_hbox.show();
 			channel_hbox.width(330); hbox.height(450);
-			channel_hbox.parent(vbox);
+			channel_hbox.tqparent(vbox);
 			vbox._addChild(channel_hbox,"channel_hbox");
 
 			GenericGuiFactory gf;
@@ -353,7 +353,7 @@ public:
 			for(i = channels->begin(); i != channels->end(); i++)
 			{
 				Widget w = gf.createGui(*i);
-				w.parent(channel_hbox);
+				w.tqparent(channel_hbox);
 				channel_hbox._addChild(w,"channel");
 			}
 #endif