rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

14 files changed, 19 insertions, 19 deletions

diff --git a/arts/builder/drawutils.cpp b/arts/builder/drawutils.cpp
index 74dac440..c2c0ef3f 100644
--- a/arts/builder/drawutils.cpp
+++ b/arts/builder/drawutils.cpp
@@ -26,7 +26,7 @@ TQString DrawUtils::cropText(TQPainter *p, TQString text, int maxlen, int& textw
 	TQString label = text;
 
 	while(p->fontMetrics().width(label) > maxlen && label.length() > 0) {
-		int i = label.tqfind('_');
+		int i = label.find('_');
 
 		if(i != -1)
 			label = label.mid(i+1);
diff --git a/arts/builder/menumaker.cpp b/arts/builder/menumaker.cpp
index dd08589d..38f28ace 100644
--- a/arts/builder/menumaker.cpp
+++ b/arts/builder/menumaker.cpp
@@ -148,7 +148,7 @@ TQString MenuMaker::basename(const TQString& name)
 {
 	TQString result = "";
 
-	int i = name.tqfindRev('/');
+	int i = name.findRev('/');
 	if(i != -1)
 		result = name.left(i);
 
@@ -159,7 +159,7 @@ TQString MenuMaker::basename(const TQString& name)
 
 TQString MenuMaker::catname(const TQString& name)
 {
-	int i = name.tqfindRev('/');
+	int i = name.findRev('/');
 	if(i >= 0)
 		return name.mid(i+1);
 
diff --git a/arts/builder/module.cpp b/arts/builder/module.cpp
index 7d9581bf..099f01e7 100644
--- a/arts/builder/module.cpp
+++ b/arts/builder/module.cpp
@@ -128,7 +128,7 @@ void Module::initModule()
 		_pixmap = new TQPixmap(iconloader.loadIcon(iconname, KIcon::User));
 		if(!_pixmap->height())
 		{
-			iconname.tqreplace( iconname.length() - 4, 3, "png" );
+			iconname.replace( iconname.length() - 4, 3, "png" );
 			delete _pixmap;
 			_pixmap = new TQPixmap(iconloader.loadIcon(iconname, KIcon::User));
 			if( !_pixmap->height() )
@@ -413,7 +413,7 @@ ModulePort *Module::portAt(int segment, int x, int y)
 		if(port)
 		{
 			TQPoint clickpoint(x, y);
-			if(port->clickrect.tqcontains(clickpoint)) return port;
+			if(port->clickrect.contains(clickpoint)) return port;
 		}
 	}
 	return 0;
diff --git a/arts/builder/propertypanel.cpp b/arts/builder/propertypanel.cpp
index 8e543a5f..ed3df208 100644
--- a/arts/builder/propertypanel.cpp
+++ b/arts/builder/propertypanel.cpp
@@ -156,7 +156,7 @@ void PropertyPanel::setSelectedPort( ModulePort *port )
 		// select port in combobox - bah, should be easier ;-)
 		portCombo->setCurrentItem(
 			portCombo->listBox()->index(
-				portCombo->listBox()->tqfindItem( port->description + " (" ) ) );
+				portCombo->listBox()->findItem( port->description + " (" ) ) );
 	}
 	else
 	{
diff --git a/arts/builder/qttableview.cpp b/arts/builder/qttableview.cpp
index 41c4eb43..bfb5539c 100644
--- a/arts/builder/qttableview.cpp
+++ b/arts/builder/qttableview.cpp
@@ -1280,7 +1280,7 @@ void QtTableView::paintEvent( TQPaintEvent *e )
 
     TQPainter paint( this );
 
-    if ( !contentsRect().tqcontains( updateR, TRUE  ) ) {// update frame ?
+    if ( !contentsRect().contains( updateR, TRUE  ) ) {// update frame ?
 	drawFrame( &paint );
 	if ( updateR.left() < frameWidth() ) 		//###
 	    updateR.setLeft( frameWidth() );
@@ -1343,7 +1343,7 @@ void QtTableView::paintEvent( TQPaintEvent *e )
 		matrix.translate( xPos, yPos );
 		paint.setWorldMatrix( matrix );
 		if ( testTableFlags(Tbl_clipCellPainting) ||
-		     frameWidth() > 0 && !winR.tqcontains( cellR ) ) { //##arnt
+		     frameWidth() > 0 && !winR.contains( cellR ) ) { //##arnt
 		    paint.setClipRect( cellUR );
 		    paintCell( &paint, row, col );
 		    paint.setClipping( FALSE );
@@ -1355,7 +1355,7 @@ void QtTableView::paintEvent( TQPaintEvent *e )
 #else
 		paint.translate( xPos, yPos );
 		if ( testTableFlags(Tbl_clipCellPainting) ||
-		     frameWidth() > 0 && !winR.tqcontains( cellR ) ) { //##arnt
+		     frameWidth() > 0 && !winR.contains( cellR ) ) { //##arnt
 		    paint.setClipRect( cellUR );
 		    paintCell( &paint, row, col );
 		    paint.setClipping( FALSE );
diff --git a/arts/builder/structureport.cpp b/arts/builder/structureport.cpp
index 55c15211..e61fa2a9 100644
--- a/arts/builder/structureport.cpp
+++ b/arts/builder/structureport.cpp
@@ -224,7 +224,7 @@ ModulePort *StructurePort::portAt(int segment, int x, int y)
 	assert(segment == 0);
 
 	TQPoint clickpoint(x,y);
-	if(_port->clickrect.tqcontains(clickpoint)) return _port;
+	if(_port->clickrect.contains(clickpoint)) return _port;
 	return 0;
 }
 
diff --git a/arts/midi/audiosync_impl.cc b/arts/midi/audiosync_impl.cc
index a75992c6..20f089df 100644
--- a/arts/midi/audiosync_impl.cc
+++ b/arts/midi/audiosync_impl.cc
@@ -188,7 +188,7 @@ void AudioSync_impl::synchronizeTo(const TimeStamp& time)
 #endif
 }
 
-AudioSync_impl *AudioSync_impl::tqfind(AudioSync audioSync)
+AudioSync_impl *AudioSync_impl::find(AudioSync audioSync)
 {
 	list<AudioSync_impl *>::iterator i;
 
diff --git a/arts/midi/audiosync_impl.h b/arts/midi/audiosync_impl.h
index dde1aed0..302c93cb 100644
--- a/arts/midi/audiosync_impl.h
+++ b/arts/midi/audiosync_impl.h
@@ -67,7 +67,7 @@ public:
 	void updateTime();
 
 	// interface to MidiSyncGroup
-	static AudioSync_impl *tqfind(AudioSync audioSync);
+	static AudioSync_impl *find(AudioSync audioSync);
 
 	void synchronizeTo(const TimeStamp& time);
 	void setSyncGroup(MidiSyncGroup_impl *syncGroup);
diff --git a/arts/midi/midisyncgroup_impl.cc b/arts/midi/midisyncgroup_impl.cc
index f446899f..5d5305dd 100644
--- a/arts/midi/midisyncgroup_impl.cc
+++ b/arts/midi/midisyncgroup_impl.cc
@@ -68,7 +68,7 @@ void MidiSyncGroup_impl::removeClient(MidiClient client)
 
 void MidiSyncGroup_impl::addAudioSync(AudioSync audioSync)
 {
-	AudioSync_impl *impl = AudioSync_impl::tqfind(audioSync);
+	AudioSync_impl *impl = AudioSync_impl::find(audioSync);
 	impl->setSyncGroup(this);
 	audioSyncs.push_back(impl);
 
@@ -77,7 +77,7 @@ void MidiSyncGroup_impl::addAudioSync(AudioSync audioSync)
 
 void MidiSyncGroup_impl::removeAudioSync(AudioSync audioSync)
 {
-	AudioSync_impl *impl = AudioSync_impl::tqfind(audioSync);
+	AudioSync_impl *impl = AudioSync_impl::find(audioSync);
 	impl->setSyncGroup(0);
 	audioSyncs.remove(impl);
 }
diff --git a/arts/modules/effects/freeverb/revmodel.cpp b/arts/modules/effects/freeverb/revmodel.cpp
index feacaf64..23a766cc 100644
--- a/arts/modules/effects/freeverb/revmodel.cpp
+++ b/arts/modules/effects/freeverb/revmodel.cpp
@@ -73,7 +73,7 @@ void revmodel::mute()
 	}
 }
 
-void revmodel::processtqreplace(float *inputL, float *inputR, float *outputL, float *outputR, long numsamples, int skip)
+void revmodel::processreplace(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 8fb37cd6..ca6c89a0 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	processtqreplace(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	setroomsize(float value);
 			float	getroomsize();
 			void	setdamp(float value);
diff --git a/arts/modules/effects/synth_freeverb_impl.cc b/arts/modules/effects/synth_freeverb_impl.cc
index e6cb1b07..a1f35d06 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->processtqreplace(inleft, inright, outleft, outright, samples,1);
+		model->processreplace(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/tools/environmentview.cpp b/arts/tools/environmentview.cpp
index acbb2083..0ba42a7f 100644
--- a/arts/tools/environmentview.cpp
+++ b/arts/tools/environmentview.cpp
@@ -68,7 +68,7 @@ EnvironmentView::EnvironmentView( Container container, TQWidget* tqparent, const
 	TQVBoxLayout* _layout = new TQVBoxLayout( this );
 	_layout->setAutoAdd( true );
         defaultEnvFileName = DEFAULT_ENV_FILENAME;
-        defaultEnvFileName.tqreplace('~', TQDir::homeDirPath());
+        defaultEnvFileName.replace('~', TQDir::homeDirPath());
         listBox = new KListBox(this);
 	update();
 	connect(listBox,TQT_SIGNAL(executed(TQListBoxItem*)),
diff --git a/arts/tools/midiinstdlg.cpp b/arts/tools/midiinstdlg.cpp
index 87cc2ea3..339cafa6 100644
--- a/arts/tools/midiinstdlg.cpp
+++ b/arts/tools/midiinstdlg.cpp
@@ -98,7 +98,7 @@ MidiInstDlg::MidiInstDlg(TQWidget *tqparent)
         TQString prefix = TQString::tqfromLatin1("instrument_");
         if (modname.length() > 5)
             modname.truncate(modname.length()-5);  // kill .arts extension
-        if ( (modname.startsWith(prefix)) && (!modname.tqcontains("_GUI")) )
+        if ( (modname.startsWith(prefix)) && (!modname.contains("_GUI")) )
             box->insertItem(modname.mid(prefix.length()));
             //kdDebug() << "inserted instrument: " << modname.mid(prefix.length()) << endl;
     }