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

23 files changed, 93 insertions, 84 deletions

diff --git a/arts/modules/README.environments b/arts/modules/README.environments
index 0ac64df5..5dc6c66e 100644
--- a/arts/modules/README.environments
+++ b/arts/modules/README.environments
@@ -155,7 +155,7 @@ to tell the Item in which environment it lives. It also uses setContainer(
 Container::null()) once the Item gets removed. Which container the Item
 is in can be seen in the
 
-    readonly attribute Container parent;
+    readonly attribute Container tqparent;
 
 Upon serialization, the container uses
 
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
diff --git a/arts/modules/effects/fivebandmonocomplexeq_impl.cc b/arts/modules/effects/fivebandmonocomplexeq_impl.cc
index 56ca6037..0891458c 100644
--- a/arts/modules/effects/fivebandmonocomplexeq_impl.cc
+++ b/arts/modules/effects/fivebandmonocomplexeq_impl.cc
@@ -110,7 +110,7 @@ public:
 
 		Arts::LayoutBox hbox;
 		hbox.direction( Arts::LeftToRight );
-		hbox.layoutmargin( 5 ); hbox.spacing( 5 );
+		hbox.tqlayoutmargin( 5 ); hbox.spacing( 5 );
 
 		Arts::Poti lowgain; lowgain.caption( i18n( "Low Gain" ).utf8().data() );
 		lowgain.min( -24 ); lowgain.max( 24 );
@@ -123,11 +123,11 @@ public:
 		Arts::Poti lowfreq; lowfreq.color( "grey" ); lowfreq.caption( i18n( "Low Freq" ).utf8().data() );
 		lowfreq.min( 20 ); lowfreq.max( 1000 );
 		lowfreq.value( ch.lowfreq() ); connect( lowfreq, "value_changed", ch, "lowfreq" );
-		lowfreq.parent( lowbox ); lowbox._addChild( lowfreq , "" );
+		lowfreq.tqparent( lowbox ); lowbox._addChild( lowfreq , "" );
 		Arts::Poti lowq; lowq.color( "grey" ); lowq.caption( i18n( "Low Q" ).utf8().data() );
 		lowq.min( 0.01 ); lowq.max( 10 );
 		lowq.value( ch.lowq() ); connect( lowq, "value_changed", ch, "lowq" );
-		lowq.parent( lowbox ); lowbox._addChild( lowq , "" );
+		lowq.tqparent( lowbox ); lowbox._addChild( lowq , "" );
 
 		Arts::Poti mid1gain; mid1gain.caption( i18n( "Mid1 Gain" ).utf8().data() );
 		mid1gain.min( -24 ); mid1gain.max( 24 );
@@ -140,11 +140,11 @@ public:
 		Arts::Poti mid1freq; mid1freq.color( "grey" ); mid1freq.caption( i18n( "Mid1 Freq" ).utf8().data() );
 		mid1freq.min( 20 ); mid1freq.max( 5000 );
 		mid1freq.value( ch.mid1freq() ); connect( mid1freq, "value_changed", ch, "mid1freq" );
-		mid1freq.parent( mid1box ); mid1box._addChild( mid1freq , "" );
+		mid1freq.tqparent( mid1box ); mid1box._addChild( mid1freq , "" );
 		Arts::Poti mid1q; mid1q.color(  "grey" ); mid1q.caption( i18n( "Mid1 Q" ).utf8().data() );
 		mid1q.min( 0.01 ); mid1q.max( 10 );
 		mid1q.value( ch.mid1q() ); connect( mid1q, "value_changed", ch, "mid1q" );
-		mid1q.parent( mid1box ); mid1box._addChild( mid1q , "" );
+		mid1q.tqparent( mid1box ); mid1box._addChild( mid1q , "" );
 
 		Arts::Poti mid2gain; mid2gain.caption( i18n( "Mid2 Gain" ).utf8().data() );
 		mid2gain.min( -24 ); mid2gain.max( 24 );
@@ -157,11 +157,11 @@ public:
 		Arts::Poti mid2freq; mid2freq.color( "grey" ); mid2freq.caption( i18n( "Mid2 Freq" ).utf8().data() );
 		mid2freq.min( 20 ); mid2freq.max( 10000 );
 		mid2freq.value( ch.mid2freq() ); connect( mid2freq, "value_changed", ch, "mid2freq" );
-		mid2freq.parent( mid2box ); mid2box._addChild( mid2freq , "" );
+		mid2freq.tqparent( mid2box ); mid2box._addChild( mid2freq , "" );
 		Arts::Poti mid2q; mid2q.color( "grey" ); mid2q.caption( i18n( "Mid2 Q" ).utf8().data() );
 		mid2q.min( 0.01 ); mid2q.max( 10 );
 		mid2q.value( ch.mid2q() ); connect( mid2q, "value_changed", ch, "mid2q" );
-		mid2q.parent( mid2box ); mid2box._addChild( mid2q , "" );
+		mid2q.tqparent( mid2box ); mid2box._addChild( mid2q , "" );
 
 		Arts::Poti mid3gain; mid3gain.caption( i18n( "Mid3 Gain" ).utf8().data() );
 		mid3gain.min( -24 ); mid3gain.max( 24 );
@@ -174,11 +174,11 @@ public:
 		Arts::Poti mid3freq; mid3freq.color( "grey" ); mid3freq.caption( i18n( "Mid3 Freq" ).utf8().data() );
 		mid3freq.min( 1000 ); mid3freq.max( 10000 );
 		mid3freq.value( ch.mid3freq() ); connect( mid3freq, "value_changed", ch, "mid3freq" );
-		mid3freq.parent( mid3box ); mid3box._addChild( mid3freq , "" );
+		mid3freq.tqparent( mid3box ); mid3box._addChild( mid3freq , "" );
 		Arts::Poti mid3q; mid3q.color( "grey" ); mid3q.caption( i18n( "Mid3 Q" ).utf8().data() );
 		mid3q.min( 0.01 ); mid3q.max( 10 );
 		mid3q.value( ch.mid3q() ); connect( mid3q, "value_changed", ch, "mid3q" );
-		mid3q.parent( mid3box ); mid3box._addChild( mid3q , "" );
+		mid3q.tqparent( mid3box ); mid3box._addChild( mid3q , "" );
 
 		Arts::Poti highgain; highgain.caption( i18n( "High Gain" ).utf8().data() );
 		highgain.min( -24 ); highgain.max( 24 );
@@ -191,11 +191,11 @@ public:
 		Arts::Poti highfreq; highfreq.color( "grey" ); highfreq.caption( i18n( "High Freq" ).utf8().data() );
 		highfreq.min( 5000 ); highfreq.max( 16000 );
 		highfreq.value( ch.highfreq() ); connect( highfreq, "value_changed", ch, "highfreq" );
-		highfreq.parent( highbox ); highbox._addChild( highfreq , "" );
+		highfreq.tqparent( highbox ); highbox._addChild( highfreq , "" );
 		Arts::Poti highq; highq.color( "grey" ); highq.caption( i18n( "High Q" ).utf8().data() );
 		highq.min( 0.01 ); highq.max( 10 );
 		highq.value( ch.highq() ); connect( highq, "value_changed", ch, "highq" );
-		highq.parent( highbox ); highbox._addChild( highq , "" );
+		highq.tqparent( highbox ); highbox._addChild( highq , "" );
 
 		hbox.addStretch( 100 );
 
diff --git a/arts/modules/effects/freeverb/Makefile.am b/arts/modules/effects/freeverb/Makefile.am
index 42d70f20..bb2d6fac 100644
--- a/arts/modules/effects/freeverb/Makefile.am
+++ b/arts/modules/effects/freeverb/Makefile.am
@@ -1,3 +1,11 @@
+INCLUDES = \
+	-I$(top_builddir)/arts/modules \
+	-I$(top_srcdir)/arts/modules \
+	-I$(top_builddir)/arts/gui/common \
+	-I$(top_builddir)/arts/midi \
+	-I$(top_builddir)/arts/runtime \
+	-I$(arts_includes) \
+	$(ARTSC_INCLUDE) $(all_includes)
 
 noinst_LTLIBRARIES = libfreeverb.la
 
diff --git a/arts/modules/effects/freeverb/revmodel.cpp b/arts/modules/effects/freeverb/revmodel.cpp
index 23a766cc..feacaf64 100644
--- a/arts/modules/effects/freeverb/revmodel.cpp
+++ b/arts/modules/effects/freeverb/revmodel.cpp
@@ -73,7 +73,7 @@ void revmodel::mute()
 	}
 }
 
-void revmodel::processreplace(float *inputL, float *inputR, float *outputL, float *outputR, long numsamples, int skip)
+void revmodel::processtqreplace(float *inputL, float *inputR, float *outputL, float *outputR, long numsamples, int skip)
 {
 	float outL,outR,input;
 
diff --git a/arts/modules/effects/freeverb/revmodel.hpp b/arts/modules/effects/freeverb/revmodel.hpp
index ca6c89a0..8fb37cd6 100644
--- a/arts/modules/effects/freeverb/revmodel.hpp
+++ b/arts/modules/effects/freeverb/revmodel.hpp
@@ -17,7 +17,7 @@ public:
 					revmodel();
 			void	mute();
 			void	processmix(float *inputL, float *inputR, float *outputL, float *outputR, long numsamples, int skip);
-			void	processreplace(float *inputL, float *inputR, float *outputL, float *outputR, long numsamples, int skip);
+			void	processtqreplace(float *inputL, float *inputR, float *outputL, float *outputR, long numsamples, int skip);
 			void	setroomsize(float value);
 			float	getroomsize();
 			void	setdamp(float value);
diff --git a/arts/modules/effects/freeverbguifactory_impl.cc b/arts/modules/effects/freeverbguifactory_impl.cc
index 7af1f471..17878daa 100644
--- a/arts/modules/effects/freeverbguifactory_impl.cc
+++ b/arts/modules/effects/freeverbguifactory_impl.cc
@@ -58,7 +58,7 @@ Widget FreeverbGuiFactory_impl::createGui(Object object)
 	roomsize.color("red"); roomsize.min(0); roomsize.max(1);
 	roomsize.value(freeverb.roomsize());
 	roomsize.range(100);
-	roomsize.parent(hbox);
+	roomsize.tqparent(hbox);
 	roomsize.show();
 	connect(roomsize,"value_changed", freeverb, "roomsize");
 	hbox._addChild(roomsize,"roomsizeWidget");
@@ -68,7 +68,7 @@ Widget FreeverbGuiFactory_impl::createGui(Object object)
 	damp.color("red"); damp.min(0); damp.max(1);
 	damp.value(freeverb.damp());
 	damp.range(100);
-	damp.parent(hbox);
+	damp.tqparent(hbox);
 	damp.show();
 	connect(damp,"value_changed", freeverb, "damp");
 	hbox._addChild(damp,"dampWidget");
@@ -78,7 +78,7 @@ Widget FreeverbGuiFactory_impl::createGui(Object object)
 	wet.color("red"); wet.min(0); wet.max(1);
 	wet.value(freeverb.wet());
 	wet.range(100);
-	wet.parent(hbox);
+	wet.tqparent(hbox);
 	wet.show();
 	connect(wet,"value_changed", freeverb, "wet");
 	hbox._addChild(wet,"wetWidget");
@@ -88,7 +88,7 @@ Widget FreeverbGuiFactory_impl::createGui(Object object)
 	dry.color("red"); dry.min(0); dry.max(1);
 	dry.value(freeverb.dry());
 	dry.range(100);
-	dry.parent(hbox);
+	dry.tqparent(hbox);
 	dry.show();
 	connect(dry,"value_changed", freeverb, "dry");
 	hbox._addChild(dry,"dryWidget");
@@ -98,7 +98,7 @@ Widget FreeverbGuiFactory_impl::createGui(Object object)
 	width.color("red"); width.min(0); width.max(1);
 	width.value(freeverb.width());
 	width.range(100);
-	width.parent(hbox);
+	width.tqparent(hbox);
 	width.show();
 	connect(width,"value_changed", freeverb, "width");
 	hbox._addChild(width,"widthWidget");
diff --git a/arts/modules/effects/kstereovolumecontrolgui_impl.cpp b/arts/modules/effects/kstereovolumecontrolgui_impl.cpp
index b4db259a..f0fa3690 100644
--- a/arts/modules/effects/kstereovolumecontrolgui_impl.cpp
+++ b/arts/modules/effects/kstereovolumecontrolgui_impl.cpp
@@ -30,7 +30,7 @@ using namespace Arts;
 KStereoVolumeControlGui_impl::KStereoVolumeControlGui_impl( TQFrame* w ) : KLayoutBox_impl( w ? w : new TQFrame( 0 ) )
 {
 	//kdDebug()<<"KStereoVolumeControlGui_impl::KStereoVolumeControlGui_impl( TQFrame* "<<w<<" )"<<endl;
-	_mapper = new KStereoVolumeControlGui_EventMapper( this, _qframe );
+	_mapper = new KStereoVolumeControlGui_EventMapper( this, TQT_TQOBJECT(_qframe) );
 	this->addWidget( _label, -100 );
 	_label.bottom( Arts::East );
 	_label.text( "Volume" );
@@ -47,7 +47,7 @@ KStereoVolumeControlGui_impl::KStereoVolumeControlGui_impl( TQFrame* w ) : KLayo
 	this->dbmax( 6 );
 	_left.framestyle( Arts::Raised|Arts::Panel ); _left.linewidth( 4 );
 	_right.framestyle( Arts::Raised|Arts::Panel ); _right.linewidth( 4 );
-	this->layoutmargin( 1 ); this->linewidth( 1 ); this->framestyle( Arts::Panel|Arts::Raised );
+	this->tqlayoutmargin( 1 ); this->linewidth( 1 ); this->framestyle( Arts::Panel|Arts::Raised );
 }
 
 void KStereoVolumeControlGui_impl::constructor( Arts::StereoVolumeControl svc ) {
diff --git a/arts/modules/effects/kstereovolumecontrolgui_impl.h b/arts/modules/effects/kstereovolumecontrolgui_impl.h
index 8729232f..855c979c 100644
--- a/arts/modules/effects/kstereovolumecontrolgui_impl.h
+++ b/arts/modules/effects/kstereovolumecontrolgui_impl.h
@@ -81,11 +81,12 @@ private:
 
 class KStereoVolumeControlGui_EventMapper : public TQObject {
    Q_OBJECT
+  TQ_OBJECT
 public:
 	TQTimer* _timer;
 	Arts::KStereoVolumeControlGui_impl* _impl;
 public:
-	KStereoVolumeControlGui_EventMapper( Arts::KStereoVolumeControlGui_impl* impl, TQObject* parent, const char* name=0 ) : TQObject( parent,name ), _impl( impl ) {
+	KStereoVolumeControlGui_EventMapper( Arts::KStereoVolumeControlGui_impl* impl, TQObject* tqparent, const char* name=0 ) : TQObject( tqparent,name ), _impl( impl ) {
 		_timer = new TQTimer( this );
 		connect( _timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotTimerSignal() ) );
 	}
diff --git a/arts/modules/effects/stereocompressorguifactory_impl.cc b/arts/modules/effects/stereocompressorguifactory_impl.cc
index e5a985fc..d5209ebd 100644
--- a/arts/modules/effects/stereocompressorguifactory_impl.cc
+++ b/arts/modules/effects/stereocompressorguifactory_impl.cc
@@ -85,7 +85,7 @@ public:
 		connect( bon, "pressed_changed", comp, "thru" );
 
 		LayoutBox hbox;
-		hbox.direction( LeftToRight ); hbox.layoutmargin( 5 ); hbox.spacing( 5 );
+		hbox.direction( LeftToRight ); hbox.tqlayoutmargin( 5 ); hbox.spacing( 5 );
 		PopupBox timesbox;
 		timesbox.name( "Timings" ); timesbox.direction( LeftToRight );
 		LayoutBox times;
diff --git a/arts/modules/effects/synth_freeverb_impl.cc b/arts/modules/effects/synth_freeverb_impl.cc
index a1f35d06..e6cb1b07 100644
--- a/arts/modules/effects/synth_freeverb_impl.cc
+++ b/arts/modules/effects/synth_freeverb_impl.cc
@@ -57,7 +57,7 @@ public:
 
 	void calculateBlock(unsigned long samples)
 	{
-		model->processreplace(inleft, inright, outleft, outright, samples,1);
+		model->processtqreplace(inleft, inright, outleft, outright, samples,1);
 		// don't add the original signal - that's what the "dry" argument is for
 		//for(unsigned long i = 0;i < samples; i++)
 		//{
diff --git a/arts/modules/effects/synth_stereo_fir_equalizer_impl.cc b/arts/modules/effects/synth_stereo_fir_equalizer_impl.cc
index ece106c2..86f7c1bb 100644
--- a/arts/modules/effects/synth_stereo_fir_equalizer_impl.cc
+++ b/arts/modules/effects/synth_stereo_fir_equalizer_impl.cc
@@ -186,7 +186,7 @@ Widget StereoFirEqualizerGuiFactory_impl::createGui(Object object)
 	vbox.show();
 
 	Graph g;
-	g.parent(vbox);
+	g.tqparent(vbox);
 	g.width(400);
 	g.height(230);
 	g.caption(i18n("a graph").utf8().data());
@@ -211,7 +211,7 @@ Widget StereoFirEqualizerGuiFactory_impl::createGui(Object object)
 	spinbox.caption(i18n("channels").utf8().data());
 	spinbox.min(3); spinbox.max(255);
 	spinbox.value(equalizer.taps());
-	spinbox.parent(vbox);
+	spinbox.tqparent(vbox);
 	spinbox.show();
 	connect(spinbox,"value_changed", equalizer, "taps");
 	vbox._addChild(spinbox,"spinbox");
diff --git a/arts/modules/effects/voiceremovalguifactory_impl.cc b/arts/modules/effects/voiceremovalguifactory_impl.cc
index d4879b87..4a4011be 100644
--- a/arts/modules/effects/voiceremovalguifactory_impl.cc
+++ b/arts/modules/effects/voiceremovalguifactory_impl.cc
@@ -53,7 +53,7 @@ Widget VoiceRemovalGuiFactory_impl::createGui( Object object )
 	position.color( "grey" ); position.min( -1 ); position.max( 1 );
 	position.value( voiceremoval.position() );
 	position.range( 100 );
-	position.parent( hbox );
+	position.tqparent( hbox );
 	position.show();
 	connect( position, "value_changed", voiceremoval, "position" );
 	hbox._addChild( position, "positionWidget" );
@@ -64,7 +64,7 @@ Widget VoiceRemovalGuiFactory_impl::createGui( Object object )
 	freq.value( voiceremoval.frequency() );
 	freq.range( 400 );
 	freq.logarithmic( 2.0 );
-	freq.parent( hbox );
+	freq.tqparent( hbox );
 	freq.show();
 	connect( freq, "value_changed", voiceremoval, "frequency" );
 	hbox._addChild( freq, "freqWidget" );
diff --git a/arts/modules/synth/Makefile.am b/arts/modules/synth/Makefile.am
index 3995f402..c9922aaa 100644
--- a/arts/modules/synth/Makefile.am
+++ b/arts/modules/synth/Makefile.am
@@ -31,10 +31,10 @@ libartsmodulessynth_la_COMPILE_FIRST = artsmodulessynth.h ../../midi/artsmidi.h
 libartsmodulessynth_la_LIBADD = \
 	$(top_builddir)/arts/runtime/libartsbuilder.la \
 	$(top_builddir)/arts/midi/libartsmidi_idl.la \
-	-lartsflow -lartsflow_idl -lmcop
+	-lartsflow -lgsl -lartsflow_idl -lmcop
 
 #libartsmodulessynth_la_LIBADD = $(top_builddir)/arts/gui/common/libartsgui_idl.la $(top_builddir)/arts/midi/libartsmidi_idl.la -lartsflow -lartsflow_idl -lmcop $(LIBDL) $(LIB_KDEUI) $(LIB_KDECORE)
-libartsmodulessynth_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -no-undefined
+libartsmodulessynth_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -lartsflow -lgsl -no-undefined
 
 artsmodulessynth.cc artsmodulessynth.h artsmodulessynth.mcoptype artsmodulessynth.mcopclass: $(srcdir)/artsmodulessynth.idl $(MCOPIDL)
 	$(MCOPIDL) -t $(MCOP_INCLUDES) $(srcdir)/artsmodulessynth.idl
diff --git a/arts/modules/synth/c_filter_stuff.h b/arts/modules/synth/c_filter_stuff.h
index edd7a4af..89e93de3 100644
--- a/arts/modules/synth/c_filter_stuff.h
+++ b/arts/modules/synth/c_filter_stuff.h
@@ -150,12 +150,12 @@ typedef struct {
   int buflen;
 } ty_afmethod;
 
-#define C_FLOWOUQT_METHOD 0
-#define C_RBQT_METHOD 1
-#define C_SWAPROQT_METHOD 2
-#define C_SWAPRWQT_METHOD 3
-#define C_AIMROQT_METHOD 4
-#define C_AIMRWQT_METHOD 5
+#define C_FLOWOUTQT_METHOD 0
+#define C_RBTQT_METHOD 1
+#define C_SWAPROTQT_METHOD 2
+#define C_SWAPRWTQT_METHOD 3
+#define C_AIMROTQT_METHOD 4
+#define C_AIMRWTQT_METHOD 5
 
 typedef struct {
   char *filename;
diff --git a/arts/modules/synth/synth_cdelay_impl.cc b/arts/modules/synth/synth_cdelay_impl.cc
index 28f4d12f..267daab8 100644
--- a/arts/modules/synth/synth_cdelay_impl.cc
+++ b/arts/modules/synth/synth_cdelay_impl.cc
@@ -43,14 +43,14 @@ class Synth_CDELAY_impl : virtual public Synth_CDELAY_skel,
 {
 protected:
 	unsigned long _buffersize;
-	unsigned long _bitmask;
+	unsigned long _bittqmask;
 	float *_buffer; // holds the data to be delayed (variable size)
 	float _delaytime;
 	unsigned int _readpos;
 	unsigned int _writepos;
  
 public:
-	Synth_CDELAY_impl() : _buffersize( 0 ), _bitmask( 0 ), _buffer( 0 ), _delaytime( 0 ), _readpos( 0 ), _writepos( 0 )
+	Synth_CDELAY_impl() : _buffersize( 0 ), _bittqmask( 0 ), _buffer( 0 ), _delaytime( 0 ), _readpos( 0 ), _writepos( 0 )
 	{
 	}
 	
@@ -66,7 +66,7 @@ public:
 		_delaytime = newTime;
 		double n = ceil( log( double(_delaytime * samplingRateFloat )) / log( 2. ) );
 		unsigned long newbuffersize = (unsigned long)( pow( 2, n ) );
-		unsigned long newbitmask = newbuffersize - 1;
+		unsigned long newbittqmask = newbuffersize - 1;
 		if( newbuffersize != _buffersize )
 		{
 			float *newbuffer = new float[newbuffersize];
@@ -74,24 +74,24 @@ public:
 				for( unsigned long i = 0; i < _buffersize; i++ ) {
 					newbuffer[i] = _buffer[_writepos];
 					_writepos++;
-					_writepos &= newbitmask;
+					_writepos &= newbittqmask;
 				}
 				for( unsigned long i = _buffersize; i < newbuffersize; i++ )
 					newbuffer[i] = 0;
 			} else {
 				_writepos -= newbuffersize;
-				_writepos &= newbitmask;
+				_writepos &= newbittqmask;
 				for( unsigned long i = 0; i < newbuffersize; i++ ) {
 					newbuffer[i] = _buffer[_writepos];
 					_writepos++;
-					_writepos &= newbitmask;
+					_writepos &= newbittqmask;
 				}
 			}
 			_buffer = newbuffer;
 			_buffersize = newbuffersize;
-			_bitmask = newbitmask;
+			_bittqmask = newbittqmask;
 		}
-		_readpos = (unsigned long)rint( _writepos - _delaytime * samplingRateFloat ) & _bitmask;
+		_readpos = (unsigned long)rint( _writepos - _delaytime * samplingRateFloat ) & _bittqmask;
 		time_changed( _delaytime );
 	}
 
@@ -113,9 +113,9 @@ public:
 			_buffer[_writepos] = invalue[i];
 			outvalue[i] = _buffer[_readpos];
 			_readpos++;
-			_readpos &= _bitmask;
+			_readpos &= _bittqmask;
 			_writepos++;
-			_writepos &= _bitmask;
+			_writepos &= _bittqmask;
 		}
 	}
 };
diff --git a/arts/modules/synth/synth_delay_impl.cc b/arts/modules/synth/synth_delay_impl.cc
index 92c23fd1..57285118 100644
--- a/arts/modules/synth/synth_delay_impl.cc
+++ b/arts/modules/synth/synth_delay_impl.cc
@@ -56,13 +56,13 @@ class Synth_DELAY_impl : virtual public Synth_DELAY_skel,
 {
 protected:
 	unsigned long _buffersize;
-	unsigned long _bitmask;
+	unsigned long _bittqmask;
 	float * _buffer;
 	float _maxdelay;
 	unsigned int _writepos;
  
 public:
-	Synth_DELAY_impl() : _buffersize( 0 ), _bitmask( 0 ), _buffer( 0 ), _maxdelay( 0 ), _writepos( 0 )
+	Synth_DELAY_impl() : _buffersize( 0 ), _bittqmask( 0 ), _buffer( 0 ), _maxdelay( 0 ), _writepos( 0 )
 	{
 		maxdelay( 1 ); // take a one second buffer if nothing else is specified
 	}
@@ -85,15 +85,15 @@ public:
 		{
 			double int_pos;
 			double error = modf( time[i] * samplingRateFloat, &int_pos );
-			unsigned long readpos1 = ( _writepos - (unsigned long)(int_pos) ) & _bitmask;
-			unsigned long readpos2 = ( readpos1 - 1 ) & _bitmask; // Shouldn't this be +1? (mkretz)
+			unsigned long readpos1 = ( _writepos - (unsigned long)(int_pos) ) & _bittqmask;
+			unsigned long readpos2 = ( readpos1 - 1 ) & _bittqmask; // Shouldn't this be +1? (mkretz)
 			// No, it's right this way:
 			// ( 1 - error ) needs to be multiplied with the second
 			// sample; error with the first
 			_buffer[_writepos] = invalue[i];
 			outvalue[i] = _buffer[readpos1] * ( 1 - error ) + _buffer[readpos2] * error;
 			_writepos++;
-			_writepos &= _bitmask;
+			_writepos &= _bittqmask;
 		}
 	}
 
@@ -106,7 +106,7 @@ public:
 		_maxdelay = newmaxdelay;
 		double n = ceil( log( double(_maxdelay * samplingRateFloat) ) / log( 2. ) );
 		unsigned long newbuffersize = (unsigned long)( pow( 2, n ) );
-		unsigned long newbitmask = newbuffersize - 1;
+		unsigned long newbittqmask = newbuffersize - 1;
 		if( newbuffersize != _buffersize )
 		{
 			float *newbuffer = new float[newbuffersize];
@@ -114,22 +114,22 @@ public:
 				for( unsigned long i = 0; i < _buffersize; i++ ) {
 					newbuffer[i] = _buffer[_writepos];
 					_writepos++;
-					_writepos &= newbitmask;
+					_writepos &= newbittqmask;
 				}
 				for( unsigned long i = _buffersize; i < newbuffersize; i++ )
 					newbuffer[i] = 0;
 			} else {
 				_writepos -= newbuffersize;
-				_writepos &= newbitmask;
+				_writepos &= newbittqmask;
 				for( unsigned long i = 0; i < newbuffersize; i++ ) {
 					newbuffer[i] = _buffer[_writepos];
 					_writepos++;
-					_writepos &= newbitmask;
+					_writepos &= newbittqmask;
 				}
 			}
 			_buffer = newbuffer;
 			_buffersize = newbuffersize;
-			_bitmask = newbitmask;
+			_bittqmask = newbittqmask;
 		}
 		maxdelay_changed( _maxdelay );
 	}