rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

34 files changed, 59 insertions, 59 deletions

diff --git a/languages/cpp/app_templates/dcopservice/dcopservice.cpp b/languages/cpp/app_templates/dcopservice/dcopservice.cpp
index 2f569f3c..32f32c65 100644
--- a/languages/cpp/app_templates/dcopservice/dcopservice.cpp
+++ b/languages/cpp/app_templates/dcopservice/dcopservice.cpp
@@ -33,7 +33,7 @@ void %{APPNAME}::add(TQString arg)
 
 bool %{APPNAME}::remove(TQString arg)
 {
-	TQStringList::Iterator it = m_List.tqfind(arg);
+	TQStringList::Iterator it = m_List.find(arg);
 	if (it != m_List.end())
 	{
 		m_List.remove(it);
diff --git a/languages/cpp/app_templates/gnome2mmapp/main_window.hh b/languages/cpp/app_templates/gnome2mmapp/main_window.hh
index 7b356a27..ae93336b 100644
--- a/languages/cpp/app_templates/gnome2mmapp/main_window.hh
+++ b/languages/cpp/app_templates/gnome2mmapp/main_window.hh
@@ -2,7 +2,7 @@
 
 // newer (non customized) versions of this file go to main_window.hh_new
 
-// you might tqreplace
+// you might replace
 //    class foo : public foo_glade { ... };
 // by
 //    typedef foo_glade foo;
diff --git a/languages/cpp/app_templates/gtk2mmapp/main_window.hh b/languages/cpp/app_templates/gtk2mmapp/main_window.hh
index 6f9405d0..640e1461 100644
--- a/languages/cpp/app_templates/gtk2mmapp/main_window.hh
+++ b/languages/cpp/app_templates/gtk2mmapp/main_window.hh
@@ -2,7 +2,7 @@
 
 // newer (non customized) versions of this file go to main_window.hh_new
 
-// you might tqreplace
+// you might replace
 //    class foo : public foo_glade { ... };
 // by
 //    typedef foo_glade foo;
diff --git a/languages/cpp/app_templates/kapp/src-Makefile.am b/languages/cpp/app_templates/kapp/src-Makefile.am
index f118ee10..318e274a 100644
--- a/languages/cpp/app_templates/kapp/src-Makefile.am
+++ b/languages/cpp/app_templates/kapp/src-Makefile.am
@@ -29,7 +29,7 @@ noinst_HEADERS = %{APPNAMELC}.h %{APPNAMELC}view.h pref.h
 METASOURCES = AUTO
 
 messages: rc.cpp
-	$(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp
+	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot
 
 KDE_ICON = AUTO
diff --git a/languages/cpp/app_templates/kateplugin/src-Makefile.am b/languages/cpp/app_templates/kateplugin/src-Makefile.am
index 42a3cec8..88ba33a8 100644
--- a/languages/cpp/app_templates/kateplugin/src-Makefile.am
+++ b/languages/cpp/app_templates/kateplugin/src-Makefile.am
@@ -16,5 +16,5 @@ plugins_DATA = plugin_%{APPNAMELC}.rc
 kde_services_DATA = %{APPNAMELC}.desktop
 
 messages: rc.cpp
-	$(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp
+	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot
diff --git a/languages/cpp/app_templates/kateplugin2/src-Makefile.am b/languages/cpp/app_templates/kateplugin2/src-Makefile.am
index 14a5dd2a..2dbd9367 100644
--- a/languages/cpp/app_templates/kateplugin2/src-Makefile.am
+++ b/languages/cpp/app_templates/kateplugin2/src-Makefile.am
@@ -16,6 +16,6 @@ plugins_DATA = plugin_%{APPNAMELC}.rc
 kde_services_DATA = %{APPNAMELC}.desktop
 
 messages: rc.cpp
-	$(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp
+	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot
 
diff --git a/languages/cpp/app_templates/kcmodule/src-Makefile.am b/languages/cpp/app_templates/kcmodule/src-Makefile.am
index 6efe685a..e5d30776 100644
--- a/languages/cpp/app_templates/kcmodule/src-Makefile.am
+++ b/languages/cpp/app_templates/kcmodule/src-Makefile.am
@@ -13,5 +13,5 @@ xdg_apps_DATA = %{APPNAMELC}.desktop
 
 
 messages: rc.cpp
-	$(EXTRACTRC) `tqfind -name \*.ui -o -name \*.rc` > rc.cpp
+	$(EXTRACTRC) `find -name \*.ui -o -name \*.rc` > rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/kcm%{APPNAMELC}.pot
diff --git a/languages/cpp/app_templates/kconfig35/src-Makefile.am b/languages/cpp/app_templates/kconfig35/src-Makefile.am
index 2a04da7e..737b7399 100644
--- a/languages/cpp/app_templates/kconfig35/src-Makefile.am
+++ b/languages/cpp/app_templates/kconfig35/src-Makefile.am
@@ -27,7 +27,7 @@ kde_kcfg_DATA = %{APPNAMELC}.kcfg
 noinst_HEADERS = %{APPNAMELC}.h %{APPNAMELC}view.h prefs.h
 
 messages: rc.cpp
-	$(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp
+	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot
 
 KDE_ICON = AUTO
diff --git a/languages/cpp/app_templates/kdedcop/src-Makefile.am b/languages/cpp/app_templates/kdedcop/src-Makefile.am
index 9b32fb8f..69cbe936 100644
--- a/languages/cpp/app_templates/kdedcop/src-Makefile.am
+++ b/languages/cpp/app_templates/kdedcop/src-Makefile.am
@@ -10,7 +10,7 @@ noinst_HEADERS = %{APPNAMELC}.h
 METASOURCES = AUTO
 
 messages: rc.cpp
-	$(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp
+	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot
 
 # this is the program that gets installed.  it's name is used for all
diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
index e6b82e21..1ca8f046 100644
--- a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
+++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
@@ -91,7 +91,7 @@ void %{APPNAME}Part::savedFile(const KURL &fileName)
 {
 
 
-	if (project()->allFiles().tqcontains(fileName.path().mid ( project()->projectDirectory().length() + 1 )))
+	if (project()->allFiles().contains(fileName.path().mid ( project()->projectDirectory().length() + 1 )))
 	{
 		kdDebug(9014) << "parse file " << fileName.path() << endl;
 		emit addedSourceInfo( fileName.path() );
diff --git a/languages/cpp/app_templates/kfileplugin/src-Makefile.am b/languages/cpp/app_templates/kfileplugin/src-Makefile.am
index 4bfee32a..a0395825 100644
--- a/languages/cpp/app_templates/kfileplugin/src-Makefile.am
+++ b/languages/cpp/app_templates/kfileplugin/src-Makefile.am
@@ -18,5 +18,5 @@ services_DATA = kfile_%{APPNAMELC}.desktop
 servicesdir = $(kde_servicesdir)
 
 messages: rc.cpp
-	$(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp
+	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/kfile_%{APPNAMELC}.pot
diff --git a/languages/cpp/app_templates/khello/src-Makefile.am b/languages/cpp/app_templates/khello/src-Makefile.am
index 820f292a..9537dc00 100644
--- a/languages/cpp/app_templates/khello/src-Makefile.am
+++ b/languages/cpp/app_templates/khello/src-Makefile.am
@@ -8,7 +8,7 @@ noinst_HEADERS = %{APPNAMELC}.h
 METASOURCES = AUTO
 
 messages: rc.cpp
-	$(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp
+	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot
 
 KDE_ICON = AUTO
diff --git a/languages/cpp/app_templates/khello2/src-Makefile.am b/languages/cpp/app_templates/khello2/src-Makefile.am
index 7f9d7125..748c54e3 100644
--- a/languages/cpp/app_templates/khello2/src-Makefile.am
+++ b/languages/cpp/app_templates/khello2/src-Makefile.am
@@ -8,7 +8,7 @@ noinst_HEADERS = %{APPNAMELC}.h
 METASOURCES = AUTO
 
 messages: rc.cpp
-	$(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp
+	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot
 
 KDE_ICON = AUTO
diff --git a/languages/cpp/app_templates/kicker/src-Makefile.am b/languages/cpp/app_templates/kicker/src-Makefile.am
index 8a46f24d..424062d1 100644
--- a/languages/cpp/app_templates/kicker/src-Makefile.am
+++ b/languages/cpp/app_templates/kicker/src-Makefile.am
@@ -11,5 +11,5 @@ kde_module_LTLIBRARIES = %{APPNAMELC}_panelapplet.la
 %{APPNAMELC}dir = $(kde_datadir)/kicker/applets
 
 messages: rc.cpp
-	$(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp
+	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot
diff --git a/languages/cpp/app_templates/kioslave/src-Makefile.am b/languages/cpp/app_templates/kioslave/src-Makefile.am
index b73354f1..957ec330 100644
--- a/languages/cpp/app_templates/kioslave/src-Makefile.am
+++ b/languages/cpp/app_templates/kioslave/src-Makefile.am
@@ -10,5 +10,5 @@ protocol_DATA = %{APPNAMELC}.protocol
 protocoldir = $(kde_servicesdir)
 
 messages: rc.cpp
-	$(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp
+	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/kio_%{APPNAMELC}.pot
diff --git a/languages/cpp/app_templates/kofficepart/src-Makefile.am b/languages/cpp/app_templates/kofficepart/src-Makefile.am
index a0f702f6..19d38267 100644
--- a/languages/cpp/app_templates/kofficepart/src-Makefile.am
+++ b/languages/cpp/app_templates/kofficepart/src-Makefile.am
@@ -37,5 +37,5 @@ rc_DATA = %{APPNAMELC}.rc
 rcdir = $(kde_datadir)/%{APPNAMELC}
 
 messages: rc.cpp
-	$(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp
+	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
 	$(XGETTEXT) *.cpp %{APPNAMELC}_aboutdata.h -o $(podir)/%{APPNAMELC}.pot
diff --git a/languages/cpp/app_templates/kpartapp/src-Makefile.am b/languages/cpp/app_templates/kpartapp/src-Makefile.am
index 9b1a14b4..cd5ee2b6 100644
--- a/languages/cpp/app_templates/kpartapp/src-Makefile.am
+++ b/languages/cpp/app_templates/kpartapp/src-Makefile.am
@@ -8,7 +8,7 @@ noinst_HEADERS = %{APPNAMELC}.h %{APPNAMELC}_part.h
 METASOURCES = AUTO
 
 messages: rc.cpp
-	$(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp
+	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot
 
 KDE_ICON = AUTO
diff --git a/languages/cpp/app_templates/kpartplugin/src-Makefile.am b/languages/cpp/app_templates/kpartplugin/src-Makefile.am
index 81242777..52e29c09 100644
--- a/languages/cpp/app_templates/kpartplugin/src-Makefile.am
+++ b/languages/cpp/app_templates/kpartplugin/src-Makefile.am
@@ -18,5 +18,5 @@ pluginsdir = $(kde_datadir)/khtml/kpartplugins
 plugins_DATA = plugin_%{APPNAMELC}.rc
 
 messages: rc.cpp
-	$(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp
+	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot
diff --git a/languages/cpp/app_templates/kscons_kmdi/SConstruct b/languages/cpp/app_templates/kscons_kmdi/SConstruct
index 238a05b8..b82de4e1 100644
--- a/languages/cpp/app_templates/kscons_kmdi/SConstruct
+++ b/languages/cpp/app_templates/kscons_kmdi/SConstruct
@@ -73,20 +73,20 @@ if 'dist' in COMMAND_LINE_TARGETS:
 	shutil.copytree(startdir, FOLDER)
 
 	## remove our object files first
-	os.popen("tqfind "+FOLDER+" -name \"*cache*\" | xargs rm -rf")
-	os.popen("tqfind "+FOLDER+" -name \"*.pyc\" | xargs rm -f")
+	os.popen("find "+FOLDER+" -name \"*cache*\" | xargs rm -rf")
+	os.popen("find "+FOLDER+" -name \"*.pyc\" | xargs rm -f")
 	#os.popen("pushd %s && scons -c " % FOLDER) # TODO
 
 	## CVS cleanup
-	os.popen("tqfind "+FOLDER+" -name \"CVS\" | xargs rm -rf")
-	os.popen("tqfind "+FOLDER+" -name \".cvsignore\" | xargs rm -rf")
+	os.popen("find "+FOLDER+" -name \"CVS\" | xargs rm -rf")
+	os.popen("find "+FOLDER+" -name \".cvsignore\" | xargs rm -rf")
 
 	## Subversion cleanup
-	os.popen("tqfind %s -name .svn -type d | xargs rm -rf" % FOLDER)
+	os.popen("find %s -name .svn -type d | xargs rm -rf" % FOLDER)
 
 	## GNU Arch cleanup
-	os.popen("tqfind "+FOLDER+" -name \"{arch}\" | xargs rm -rf")
-	os.popen("tqfind "+FOLDER+" -name \".arch-i*\" | xargs rm -rf")
+	os.popen("find "+FOLDER+" -name \"{arch}\" | xargs rm -rf")
+	os.popen("find "+FOLDER+" -name \".arch-i*\" | xargs rm -rf")
 
 	## Create the tarball (coloured output)
 	print "\033[92m"+"Writing archive "+ARCHIVE+"\033[0m"
@@ -105,7 +105,7 @@ if 'distclean' in COMMAND_LINE_TARGETS:
 	import os, shutil
 	if os.path.isdir(env['CACHEDIR']):
 		shutil.rmtree(env['CACHEDIR'])
-	os.popen("tqfind . -name \"*.pyc\" | xargs rm -rf")
+	os.popen("find . -name \"*.pyc\" | xargs rm -rf")
 
 	env.Default(None)
 	env.Exit(0)
diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp b/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp
index efb41c1d..7cc0f221 100644
--- a/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp
+++ b/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp
@@ -204,7 +204,7 @@ void %{APPNAMELC}kmdi::currentChanged( KMdiChildView *current )
 	}
 
 	// switch to the corresponding document
-	if ( m_views.tqcontains( (%{APPNAMELC}kmdiView*) current ) )
+	if ( m_views.contains( (%{APPNAMELC}kmdiView*) current ) )
 	{
 		%{APPNAMELC}kmdiView *view = (%{APPNAMELC}kmdiView*) current;
 		//view->updateCaption();
@@ -243,7 +243,7 @@ bool %{APPNAMELC}kmdi::requestClose(KMdiChildView* v)
 	}
 
 	%{APPNAMELC}kmdiView *view = (%{APPNAMELC}kmdiView*) v;
-	if ( m_views.tqcontains( view ) )
+	if ( m_views.contains( view ) )
 	{
 		m_views.remove( view );
 		if ( view->part()->queryClose() )
diff --git a/languages/cpp/app_templates/kscons_kmdi/messages.sh b/languages/cpp/app_templates/kscons_kmdi/messages.sh
index 7df00263..a36f5c93 100755
--- a/languages/cpp/app_templates/kscons_kmdi/messages.sh
+++ b/languages/cpp/app_templates/kscons_kmdi/messages.sh
@@ -34,14 +34,14 @@ fi
 echo "extracting the strings"
 
 # process the .ui and .rc files
-$EXTRACTRC `tqfind $SRCDIR -iname *.rc` >> rc.cpp
-$EXTRACTRC `tqfind $SRCDIR -iname *.ui` >> rc.cpp
+$EXTRACTRC `find $SRCDIR -iname *.rc` >> rc.cpp
+$EXTRACTRC `find $SRCDIR -iname *.ui` >> rc.cpp
 echo -e 'i18n("_: NAME OF TRANSLATORS\\n"\n"Your names")\ni18n("_: EMAIL OF TRANSLATORS\\n"\n"Your emails")' > $SRCDIR/_translatorinfo.cpp
 
 # process the tips - $SRCDIR is supposed to be where the tips are living
 pushd $TIPSDIR; preparetips >tips.cpp; popd
 
-$XGETTEXT `tqfind $SRCDIR -name "*.cpp"` -o kdissert.pot
+$XGETTEXT `find $SRCDIR -name "*.cpp"` -o kdissert.pot
 
 # remove the intermediate files
 rm -f $TIPSDIR/tips.cpp
diff --git a/languages/cpp/app_templates/kscons_kxt/SConstruct b/languages/cpp/app_templates/kscons_kxt/SConstruct
index 238a05b8..b82de4e1 100644
--- a/languages/cpp/app_templates/kscons_kxt/SConstruct
+++ b/languages/cpp/app_templates/kscons_kxt/SConstruct
@@ -73,20 +73,20 @@ if 'dist' in COMMAND_LINE_TARGETS:
 	shutil.copytree(startdir, FOLDER)
 
 	## remove our object files first
-	os.popen("tqfind "+FOLDER+" -name \"*cache*\" | xargs rm -rf")
-	os.popen("tqfind "+FOLDER+" -name \"*.pyc\" | xargs rm -f")
+	os.popen("find "+FOLDER+" -name \"*cache*\" | xargs rm -rf")
+	os.popen("find "+FOLDER+" -name \"*.pyc\" | xargs rm -f")
 	#os.popen("pushd %s && scons -c " % FOLDER) # TODO
 
 	## CVS cleanup
-	os.popen("tqfind "+FOLDER+" -name \"CVS\" | xargs rm -rf")
-	os.popen("tqfind "+FOLDER+" -name \".cvsignore\" | xargs rm -rf")
+	os.popen("find "+FOLDER+" -name \"CVS\" | xargs rm -rf")
+	os.popen("find "+FOLDER+" -name \".cvsignore\" | xargs rm -rf")
 
 	## Subversion cleanup
-	os.popen("tqfind %s -name .svn -type d | xargs rm -rf" % FOLDER)
+	os.popen("find %s -name .svn -type d | xargs rm -rf" % FOLDER)
 
 	## GNU Arch cleanup
-	os.popen("tqfind "+FOLDER+" -name \"{arch}\" | xargs rm -rf")
-	os.popen("tqfind "+FOLDER+" -name \".arch-i*\" | xargs rm -rf")
+	os.popen("find "+FOLDER+" -name \"{arch}\" | xargs rm -rf")
+	os.popen("find "+FOLDER+" -name \".arch-i*\" | xargs rm -rf")
 
 	## Create the tarball (coloured output)
 	print "\033[92m"+"Writing archive "+ARCHIVE+"\033[0m"
@@ -105,7 +105,7 @@ if 'distclean' in COMMAND_LINE_TARGETS:
 	import os, shutil
 	if os.path.isdir(env['CACHEDIR']):
 		shutil.rmtree(env['CACHEDIR'])
-	os.popen("tqfind . -name \"*.pyc\" | xargs rm -rf")
+	os.popen("find . -name \"*.pyc\" | xargs rm -rf")
 
 	env.Default(None)
 	env.Exit(0)
diff --git a/languages/cpp/app_templates/kscons_kxt/messages.sh b/languages/cpp/app_templates/kscons_kxt/messages.sh
index 7df00263..a36f5c93 100755
--- a/languages/cpp/app_templates/kscons_kxt/messages.sh
+++ b/languages/cpp/app_templates/kscons_kxt/messages.sh
@@ -34,14 +34,14 @@ fi
 echo "extracting the strings"
 
 # process the .ui and .rc files
-$EXTRACTRC `tqfind $SRCDIR -iname *.rc` >> rc.cpp
-$EXTRACTRC `tqfind $SRCDIR -iname *.ui` >> rc.cpp
+$EXTRACTRC `find $SRCDIR -iname *.rc` >> rc.cpp
+$EXTRACTRC `find $SRCDIR -iname *.ui` >> rc.cpp
 echo -e 'i18n("_: NAME OF TRANSLATORS\\n"\n"Your names")\ni18n("_: EMAIL OF TRANSLATORS\\n"\n"Your emails")' > $SRCDIR/_translatorinfo.cpp
 
 # process the tips - $SRCDIR is supposed to be where the tips are living
 pushd $TIPSDIR; preparetips >tips.cpp; popd
 
-$XGETTEXT `tqfind $SRCDIR -name "*.cpp"` -o kdissert.pot
+$XGETTEXT `find $SRCDIR -name "*.cpp"` -o kdissert.pot
 
 # remove the intermediate files
 rm -f $TIPSDIR/tips.cpp
diff --git a/languages/cpp/app_templates/kscreensaver/src-Makefile.am b/languages/cpp/app_templates/kscreensaver/src-Makefile.am
index e11ec0dc..e19ffb77 100644
--- a/languages/cpp/app_templates/kscreensaver/src-Makefile.am
+++ b/languages/cpp/app_templates/kscreensaver/src-Makefile.am
@@ -20,5 +20,5 @@ desktopdir = $(kde_appsdir)/System/ScreenSavers
 EXTRA_DIST = $(desktop_DATA)
 
 messages: rc.cpp
-	$(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp
+	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot
diff --git a/languages/cpp/app_templates/kxt/src-Makefile.am b/languages/cpp/app_templates/kxt/src-Makefile.am
index 2a04da7e..737b7399 100644
--- a/languages/cpp/app_templates/kxt/src-Makefile.am
+++ b/languages/cpp/app_templates/kxt/src-Makefile.am
@@ -27,7 +27,7 @@ kde_kcfg_DATA = %{APPNAMELC}.kcfg
 noinst_HEADERS = %{APPNAMELC}.h %{APPNAMELC}view.h prefs.h
 
 messages: rc.cpp
-	$(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp
+	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot
 
 KDE_ICON = AUTO
diff --git a/languages/cpp/app_templates/noatunui/src-Makefile.am b/languages/cpp/app_templates/noatunui/src-Makefile.am
index f7c7b349..95506569 100644
--- a/languages/cpp/app_templates/noatunui/src-Makefile.am
+++ b/languages/cpp/app_templates/noatunui/src-Makefile.am
@@ -20,5 +20,5 @@ plugins_DATA = %{APPNAMELC}.plugin
 # kde_services_DATA = %{APPNAMELC}.desktop
 
 messages: rc.cpp
-	$(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp
+	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
 	$(XGETTEXT) *.cpp *.h -o $(podir)/%{APPNAMELC}.pot
diff --git a/languages/cpp/app_templates/noatunvisual/src-Makefile.am b/languages/cpp/app_templates/noatunvisual/src-Makefile.am
index 8f649499..207fd8a8 100644
--- a/languages/cpp/app_templates/noatunvisual/src-Makefile.am
+++ b/languages/cpp/app_templates/noatunvisual/src-Makefile.am
@@ -15,5 +15,5 @@ plugins_DATA = %{APPNAMELC}.plugin
 # kde_services_DATA = %{APPNAMELC}.desktop
 
 messages: rc.cpp
-	$(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp
+	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
 	$(XGETTEXT) *.cpp *.h -o $(podir)/%{APPNAMELC}.pot
diff --git a/languages/cpp/app_templates/opieapp/app.pro b/languages/cpp/app_templates/opieapp/app.pro
index 74323c7c..f4111696 100644
--- a/languages/cpp/app_templates/opieapp/app.pro
+++ b/languages/cpp/app_templates/opieapp/app.pro
@@ -9,8 +9,8 @@ QMAKE_LIBDIR = $(OPIEDIR)/lib
 OPIE-SPEC=6
 
 QUICK_SPEC_FOO = $$(OPIE_BUILD_QUICK_APP)
-tqcontains( TEMPLATE, quick-template ){
-	tqcontains( QUICK_SPEC_FOO, quick-app-lib ){
+contains( TEMPLATE, quick-template ){
+	contains( QUICK_SPEC_FOO, quick-app-lib ){
 		message( "foo" )
 	        system( rm $$TARGET )
                 system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET)
diff --git a/languages/cpp/app_templates/opieapplet/app.pro b/languages/cpp/app_templates/opieapplet/app.pro
index 696082d0..e1cc1e3b 100644
--- a/languages/cpp/app_templates/opieapplet/app.pro
+++ b/languages/cpp/app_templates/opieapplet/app.pro
@@ -6,8 +6,8 @@ TARGET		= %{APPNAMELC}
 
 
 QUICK_SPEC_FOO = $$(OPIE_BUILD_QUICK_APP)
-tqcontains( TEMPLATE, quick-template ){
-        tqcontains( QUICK_SPEC_FOO, quick-app-lib ){
+contains( TEMPLATE, quick-template ){
+        contains( QUICK_SPEC_FOO, quick-app-lib ){
                 message( "foo" )
                 system( rm $$TARGET )
                 system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET)
diff --git a/languages/cpp/app_templates/opieinput/app.pro b/languages/cpp/app_templates/opieinput/app.pro
index 5a3a7a40..1711c78f 100644
--- a/languages/cpp/app_templates/opieinput/app.pro
+++ b/languages/cpp/app_templates/opieinput/app.pro
@@ -6,8 +6,8 @@ TARGET		= %{APPNAMELC}
 
 
 QUICK_SPEC_FOO = $$(OPIE_BUILD_QUICK_APP)
-tqcontains( TEMPLATE, quick-template ){
-        tqcontains( QUICK_SPEC_FOO, quick-app-lib ){
+contains( TEMPLATE, quick-template ){
+        contains( QUICK_SPEC_FOO, quick-app-lib ){
                 message( "foo" )
                 system( rm $$TARGET )
                 system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET)
diff --git a/languages/cpp/app_templates/opiemenu/app.pro b/languages/cpp/app_templates/opiemenu/app.pro
index f9600bf4..71bc208c 100644
--- a/languages/cpp/app_templates/opiemenu/app.pro
+++ b/languages/cpp/app_templates/opiemenu/app.pro
@@ -6,8 +6,8 @@ TARGET		= %{APPNAMELC}
 
 
 QUICK_SPEC_FOO = $$(OPIE_BUILD_QUICK_APP)
-tqcontains( TEMPLATE, quick-template ){
-        tqcontains( QUICK_SPEC_FOO, quick-app-lib ){
+contains( TEMPLATE, quick-template ){
+        contains( QUICK_SPEC_FOO, quick-app-lib ){
                 message( "foo" )
                 system( rm $$TARGET )
                 system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET)
diff --git a/languages/cpp/app_templates/opienet/app.pro b/languages/cpp/app_templates/opienet/app.pro
index df87650c..53fb6eea 100644
--- a/languages/cpp/app_templates/opienet/app.pro
+++ b/languages/cpp/app_templates/opienet/app.pro
@@ -7,8 +7,8 @@ LIBS		      += -linterfaces
 
 
 QUICK_SPEC_FOO = $$(OPIE_BUILD_QUICK_APP)
-tqcontains( TEMPLATE, quick-template ){
-        tqcontains( QUICK_SPEC_FOO, quick-app-lib ){
+contains( TEMPLATE, quick-template ){
+        contains( QUICK_SPEC_FOO, quick-app-lib ){
                 message( "foo" )
                 system( rm $$TARGET )
                 system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET)
diff --git a/languages/cpp/app_templates/opienet/simplemodule.cpp b/languages/cpp/app_templates/opienet/simplemodule.cpp
index f8e963bd..143e9f90 100644
--- a/languages/cpp/app_templates/opienet/simplemodule.cpp
+++ b/languages/cpp/app_templates/opienet/simplemodule.cpp
@@ -29,7 +29,7 @@
  */
 bool %{APPNAME}Module::isOwner(  Interface* iface ) {
  /* check if it is our device */
-    return  m_interfaces.tqfind(  iface ) != -1;
+    return  m_interfaces.find(  iface ) != -1;
 }
 
 TQWidget*  %{APPNAME}Module::configure( Interface* ) {
diff --git a/languages/cpp/app_templates/opietoday/app.pro b/languages/cpp/app_templates/opietoday/app.pro
index 73e03efb..152dc6f6 100644
--- a/languages/cpp/app_templates/opietoday/app.pro
+++ b/languages/cpp/app_templates/opietoday/app.pro
@@ -6,8 +6,8 @@ TARGET		= %{APPNAMELC}
 
 
 QUICK_SPEC_FOO = $$(OPIE_BUILD_QUICK_APP)
-tqcontains( TEMPLATE, quick-template ){
-        tqcontains( QUICK_SPEC_FOO, quick-app-lib ){
+contains( TEMPLATE, quick-template ){
+        contains( QUICK_SPEC_FOO, quick-app-lib ){
                 message( "foo" )
                 system( rm $$TARGET )
                 system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET)