rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

12 files changed, 79 insertions, 79 deletions

diff --git a/kiten/deinf.cpp b/kiten/deinf.cpp
index 3f9585a9..52d1f8f2 100644
--- a/kiten/deinf.cpp
+++ b/kiten/deinf.cpp
@@ -74,7 +74,7 @@ void Deinf::Index::load()
 
 			Conjugation conj;
 			conj.ending = things.first();
-			conj.tqreplace = (*things.at(1));
+			conj.replace = (*things.at(1));
 			conj.num = things.last().toUInt();
 
 			list.append(conj);
@@ -110,10 +110,10 @@ TQStringList Deinf::Index::deinflect(const TQString &text, TQStringList &name)
 		{
 			name.append(names[(*it).num]);
 
-			//kdDebug() << "match ending: " << (*it).ending << "; tqreplace: " << (*it).tqreplace << "; name: " << names[(*it).num] << endl;
+			//kdDebug() << "match ending: " << (*it).ending << "; replace: " << (*it).replace << "; name: " << names[(*it).num] << endl;
 
 			TQString tmp(text);
-			tmp.tqreplace(TQRegExp((*it).ending + "*", false, true), (*it).tqreplace);
+			tmp.replace(TQRegExp((*it).ending + "*", false, true), (*it).replace);
 			ret.append(tmp);
 		}
 	}
diff --git a/kiten/deinf.h b/kiten/deinf.h
index 28e18d1f..ca776289 100644
--- a/kiten/deinf.h
+++ b/kiten/deinf.h
@@ -30,7 +30,7 @@ namespace Deinf
 struct Conjugation
 {
 	TQString ending;
-	TQString tqreplace;
+	TQString replace;
 	unsigned int num;
 };
 
diff --git a/kiten/dict.cpp b/kiten/dict.cpp
index 7d01fbd2..90af2878 100644
--- a/kiten/dict.cpp
+++ b/kiten/dict.cpp
@@ -342,7 +342,7 @@ SearchResult Index::scanResults(TQRegExp regexp, TQStringList results, bool comm
 		if (found >= 0)
 		{
 			++fullNum;
-			if ((*itr).tqfind(TQString("(P)")) >= 0 || !common)
+			if ((*itr).find(TQString("(P)")) >= 0 || !common)
 			{
 				// we append HERE, so we get the exact
 				// results we have in ret.list
@@ -398,7 +398,7 @@ SearchResult Index::scanKanjiResults(TQRegExp regexp, TQStringList results, bool
 			++fullNum;
 			// common entries have G[1-8] (jouyou)
 			TQRegExp comregexp(jmyCount ? "G[1-9]" : "G[1-8]");
-			if ((*itr).tqfind(comregexp) >= 0 || !common)
+			if ((*itr).find(comregexp) >= 0 || !common)
 			{
 				ret.list.append(kanjiParse(*itr));
 				++num;
diff --git a/kiten/edict b/kiten/edict
index 6817cfb8..75f799f4 100644
--- a/kiten/edict
+++ b/kiten/edict
@@ -17776,7 +17776,7 @@
 リプリケート /(n) replicate/
 リプリント /reprint/
 リプル /(n) ripple/
-リプレース /tqreplace/
+リプレース /replace/
 リプレッション /repression/
 リプロタクション /reproduction/
 リベート /(n) (1) rebate/(2) commission/kickback/(P)/
@@ -19778,7 +19778,7 @@
 囲郭村 [いかくそん] /(n) walled settlement/walled town/
 囲碁 [いご] /(n) Go (board game of capturing territory)/(P)/
 囲碁三級 [いごさんきゅう] /third rank in the game of go/
-囲炉裏 [いろり] /(n) hearth/fitqreplace/
+囲炉裏 [いろり] /(n) hearth/fireplace/
 囲繞 [いじょう] /(n,vs) surrounding/enclosure/
 囲繞 [いにょう] /(n,vs) surrounding/enclosure/
 夷 [えびす] /(n) barbarian/savage/Ainu/
@@ -29853,7 +29853,7 @@
 掛け接 [かけはぎ] /invisible mending (of clothes)/
 掛け替え [かけがえ] /(n) replacement/
 掛け替えのない [かけがえのない] /(adj-pn) thing with no substitute/money can't buy/
-掛け替える [かけかえる] /(v1) to tqreplace/to substitute/
+掛け替える [かけかえる] /(v1) to replace/to substitute/
 掛け値 [かけね] /(n) inflated price/exaggeration/
 掛け渡す [かけわたす] /(v5s) to build (a bridge) over a river/
 掛け倒れ [かけだおれ] /(n) loss on a credit sale/
@@ -31056,7 +31056,7 @@
 憾み [うらみ] /(n) matter for regret/regret/
 憾む [うらむ] /(v5m) to curse/to feel bitter/
 換え [かえ] /(n) rate of exchange/
-換える [かえる] /(v1) to exchange/to interchange/to substitute/to tqreplace/(P)/
+換える [かえる] /(v1) to exchange/to interchange/to substitute/to replace/(P)/
 換わり [かわり] /an exchange transaction/
 換わる [かわる] /(v5r,vi) to take the place of/to relieve/to be substituted for/to be exchanged/to change places with/to take turns/to be replaced/
 換羽 [かんう] /(n) molting/
@@ -37954,9 +37954,9 @@
 掘り割り [ほりわり] /(n) canal/
 掘り起こす [ほりおこす] /(v5s) to dig up/
 掘り起す [ほりおこす] /(v5s) to reclaim/to dig up/
-掘り出し物 [ほりだしもの] /(n) (lucky) tqfind/bargain/good buy/treasure trove/
+掘り出し物 [ほりだしもの] /(n) (lucky) find/bargain/good buy/treasure trove/
 掘り出す [ほりだす] /(v5s) to dig out/to pick up/
-掘り当てる [ほりあてる] /(v1) to strike/to tqfind/to dig up/
+掘り当てる [ほりあてる] /(v1) to strike/to find/to dig up/
 掘り抜き井戸 [ほりぬきいど] /(n) artesian well/
 掘り抜く [ほりぬく] /(v5k) to dig through/to drill into/to excavate/
 掘り返す [ほりかえす] /(v5s) to dig up/to turn up/to tear up/
@@ -47371,7 +47371,7 @@
 差し掛かる [さしかかる] /(v5r) to come near to/to approach/(P)/
 差し掛ける [さしかける] /(v1) to hold (umbrella) over/
 差し掛け小屋 [さしかけごや] /a lean-to/
-差し換える [さしかえる] /(v1) to change/to tqreplace/
+差し換える [さしかえる] /(v1) to change/to replace/
 差し詰め [さしずめ] /(adv) for the time being/after all/
 差し許す [さしゆるす] /(v5s) to allow/to forgive/
 差し挟む [さしはさむ] /(v5m) to insert/to harbor/to slip in a word/
@@ -47411,7 +47411,7 @@
 差し前 [さしまえ] /(n) sword worn at one's side/
 差し足 [さしあし] /(n) stealthy steps/kick when one (horse) overtakes another/
 差し替え [さしかえ] /(n,vs) replacement/
-差し替える [さしかえる] /(v1) to change/to tqreplace/
+差し替える [さしかえる] /(v1) to change/to replace/
 差し担い [さしにない] /(n) carrying upon two persons' shoulders/
 差し置く [さしおく] /(v5k) to leave as is/to let alone/to disregard/
 差し潮 [さししお] /(n) rising tide/
@@ -48325,7 +48325,7 @@
 在りし日 [ありしひ] /(n-t) (1) days of yore/the olden days/(2) during one's lifetime/(P)/
 在り処 [ありか] /(n) location/whereabouts/hiding place/
 在り所 [ありか] /(n) location/whereabouts/hiding place/
-在り付く [ありつく] /(v5k) to get/to obtain/to come by/to tqfind/
+在り付く [ありつく] /(v5k) to get/to obtain/to come by/to find/
 在り方 [ありかた] /(n) the way something ought to be/
 在り来たり [ありきたり] /(adj-na) common/ordinary/
 在る [ある] /(v5r-i) to live/to be/(P)/
@@ -54618,7 +54618,7 @@
 取り巻き [とりまき] /(n) followers/hangers-on/
 取り巻き連 [とりまきれん] /(abbr) one's followers or hangers-on/
 取り巻く [とりまく] /(v5k) to surround/to circle/to enclose/(P)/
-取り換える [とりかえる] /(v1) to exchange/to tqreplace/
+取り換える [とりかえる] /(v1) to exchange/to replace/
 取り敢えず [とりあえず] /(adv,n) at once/first of all/for the time being/(P)/
 取り寄せる [とりよせる] /(v1) to order/to send away for/(P)/
 取り急ぎ [とりいそぎ] /(adv) in haste/
@@ -54685,7 +54685,7 @@
 取り舵 [とりかじ] /(n) port (side of a ship)/
 取り舵を取る [とりかじをとる] /(exp) steering to port/
 取り替え [とりかえ] /(n) swap/exchange/
-取り替える [とりかえる] /(v1) to exchange/to tqreplace/(P)/
+取り替える [とりかえる] /(v1) to exchange/to replace/(P)/
 取り代 [とりしろ] /portion/one's share/
 取り調べ [とりしらべ] /(n) investigation (e.g. by police or prosecutors)/examination/inquiry/(P)/
 取り調べる [とりしらべる] /(v1) to investigate/to examine/
@@ -54755,7 +54755,7 @@
 取引先 [とりひきさき] /(n) customer/client/
 取引日 [とりひきひ] /(n) trading day/
 取下げ [とりさげ] /(n) withdrawal/
-取換る [とりかえる] /(v1) to exchange/to tqreplace/
+取換る [とりかえる] /(v1) to exchange/to replace/
 取敢えず [とりあえず] /(adv,n) at once/first of all/for the time being/(P)/
 取極め [とりきめ] /(n) decision/agreement/
 取計らい [とりはからい] /(n) arrangement/
@@ -56015,8 +56015,8 @@
 拾い出す [ひろいだす] /(v5s) to single out/to select/
 拾い上げる [ひろいあげる] /(v1) to pick up/to pick out/
 拾い読み [ひろいよみ] /(n,vs) reading here and there/skimming through/
-拾い物 [ひろいもの] /(n) (1) a tqfind/(2) windfall/bargain/(P)/
-拾う [ひろう] /(v5u) to pick up/to tqfind/to gather/(P)/
+拾い物 [ひろいもの] /(n) (1) a find/(2) windfall/bargain/(P)/
+拾う [ひろう] /(v5u) to pick up/to find/to gather/(P)/
 拾遺 [しゅうい] /(n) gleaning(s)/
 拾集 [しゅうしゅう] /(n,vs) gathering up/collection/accumulation/
 拾得 [しゅうとく] /(n,vs) picking up/finding/(P)/
@@ -57381,7 +57381,7 @@
 出展者 [しゅってんしゃ] /exhibitors (at a trade show, etc.)/
 出店 [でみせ] /(n) food stand/branch store/(P)/
 出度 [しゅつど] /frequency/
-出土 [しゅつど] /(n) appearance of an archeological tqfind/(P)/
+出土 [しゅつど] /(n) appearance of an archeological find/(P)/
 出土品 [しゅつどひん] /(n) artifacts/
 出湯 [いでゆ] /(n) hot springs/
 出頭 [しゅっとう] /(n,vs) appearance/presence/(P)/
@@ -67247,7 +67247,7 @@
 切り株 [きりかぶ] /(n) stump/stubble/
 切り干し [きりぼし] /(n) dried daikon strips/
 切り換え [きりかえ] /(n) exchange/conversion/replacement/switching (to)/switchover/
-切り換える [きりかえる] /(v1) to change/to exchange/to convert/to renew/to throw a switch/to tqreplace/to switch over/
+切り換える [きりかえる] /(v1) to change/to exchange/to convert/to renew/to throw a switch/to replace/to switch over/
 切り換え時 [きりかえとき] /response time/time to switch over/
 切り換え時 [きりかえどき] /response time/time to switch over/
 切り岸 [きりぎし] /(n) steep bank/cliff/
@@ -67310,7 +67310,7 @@
 切り窓 [きりまど] /(n) windows cut out of a wall/
 切り揃える [きりそろえる] /(v1) to cut and even up/to cut several pieces to the same size/
 切り替え [きりかえ] /(n) exchange/conversion/replacement/switching (to)/switchover/(P)/
-切り替える [きりかえる] /(v1) to change/to exchange/to convert/to renew/to throw a switch/to tqreplace/to switch over/
+切り替える [きりかえる] /(v1) to change/to exchange/to convert/to renew/to throw a switch/to replace/to switch over/
 切り替え時 [きりかえとき] /response time/time to switch over/
 切り替え時 [きりかえどき] /response time/time to switch over/
 切り替わる [きりかわる] /(v5r) to change completely/
@@ -70359,7 +70359,7 @@
 掃滅 [そうめつ] /(n,vs) wiping out/annihilation/
 挿し花 [さしばな] /(n) flowers in a vase or lapel/
 挿し絵 [さしえ] /(n) (book) illustration/
-挿し替える [さしかえる] /(v1) to change/to tqreplace/
+挿し替える [さしかえる] /(v1) to change/to replace/
 挿し木 [さしき] /(n) cutting/planting/
 挿す [さす] /(v5s) to insert/to put in/to graft/to wear in belt/
 挿花 [そうか] /(n) flower arrangement/
@@ -72366,7 +72366,7 @@
 堕力 [だりょく] /inertia/momentum/force of habit/
 妥協 [だきょう] /(n,vs) compromise/giving in/(P)/
 妥協案 [だきょうあん] /compromise plan/
-妥協点 [だきょうてん] /(n) (tqfind) common (meeting) ground/
+妥協点 [だきょうてん] /(n) (find) common (meeting) ground/
 妥結 [だけつ] /(n) agreement/(P)/
 妥当 [だとう] /(adj-na,n) valid/proper/right/appropriate/(P)/
 妥当性 [だとうせい] /(n) validity/verification/propriety/
@@ -72915,7 +72915,7 @@
 戴冠式 [たいかんしき] /(n) coronation/
 戴白 [たいはく] /old people/becoming gray haired/
 替え [かえ] /(n) change/alteration/substitute/(P)/
-替える [かえる] /(v1) to exchange/to interchange/to substitute/to tqreplace/(P)/
+替える [かえる] /(v1) to exchange/to interchange/to substitute/to replace/(P)/
 替え歌 [かえうた] /(n) parody (of a song)/
 替え玉 [かえだま] /(n) substitute/double/(P)/
 替え心 [かえしん] /(n) spare lead/
@@ -73139,7 +73139,7 @@
 代々 [だいだい] /(n-adv,n-t) for generations/hereditary/generation after generation/
 代々 [よよ] /(n-adv,n-t) for generations/hereditary/generation after generation/
 代え [かえ] /(n) substitute/proxy/
-代える [かえる] /(v1) to exchange/to interchange/to substitute/to tqreplace/(P)/
+代える [かえる] /(v1) to exchange/to interchange/to substitute/to replace/(P)/
 代が変わる [だいがかわる] /(exp) to change hands/to be succeeded/
 代り [かわり] /(n) substitute/deputy/proxy/alternate/relief/compensation/second helping/
 代りに [かわりに] /instead of/
@@ -73228,7 +73228,7 @@
 代代 [よよ] /(n-adv,n-t) for generations/hereditary/generation after generation/
 代代伝わる [だいだいつたわる] /to be transmitted (handed down) from generation to generation/
 代地 [だいち] /(n) substitute land/
-代置 [だいち] /(n,vs) tqreplace/
+代置 [だいち] /(n,vs) replace/
 代読 [だいどく] /(n,vs) reading for another/
 代入 [だいにゅう] /(n) substitution/
 代任 [だいにん] /(n) agency/acting official/
@@ -75020,7 +75020,7 @@
 暖房器具 [だんぼうきぐ] /(n) home heater/
 暖流 [だんりゅう] /(n) warm current/(P)/
 暖簾 [のれん] /(n) (uk) (short) sign curtain hung at shop entrance/reputation (of a store)/(P)/
-暖炉 [だんろ] /(n) fitqreplace/hearth/stove/(P)/
+暖炉 [だんろ] /(n) fireplace/hearth/stove/(P)/
 檀家 [だんか] /(n) family which supports a temple/parishioner/
 檀家 [だんけ] /(n) family which supports a temple/parishioner/
 檀君 [だんくん] /mythical founder of Korea/
@@ -75572,7 +75572,7 @@
 置き引き [おきびき] /(n) walking away with another's baggage/
 置き屋 [おきや] /(n) geisha dwelling/
 置き火燵 [おきごたつ] /(n) portable brazier/
-置き換える [おきかえる] /(v1) to tqreplace/to move/to change the position of/
+置き換える [おきかえる] /(v1) to replace/to move/to change the position of/
 置き去り [おきざり] /(n) desertion/leaving behind or in the lurch/(P)/
 置き傘 [おきがさ] /(n) spare umbrella kept (at work) in the event of a sudden shower/
 置き字 [おきじ] /(n) kanji left unpronounced when reading Chinese/
@@ -84609,7 +84609,7 @@
 入れ違う [いれちがう] /(v5u) to pass each other/to cross paths/
 入れ違える [いれちがえる] /(v1) to misplace/
 入れ換え [いれかえ] /(n) replacement/substitution/change/
-入れ換える [いれかえる] /(v1) to tqreplace/to substitute/to shift/to change places/
+入れ換える [いれかえる] /(v1) to replace/to substitute/to shift/to change places/
 入れ交ぜる [いれまぜる] /(v1,vt) to mix/
 入れ合わせる [いれあわせる] /(v1) to make up for/
 入れ込む [いれこむ] /(v5m) to put forth (effort)/
@@ -84621,11 +84621,11 @@
 入れ質 [いれじち] /pawning/
 入れ食い [いれぐい] /(exp) (fish) biting at every cast/
 入れ替え [いれかえ] /(n) replacement/substitution/change/(P)/
-入れ替える [いれかえる] /(v1) to tqreplace/to substitute/to shift/to change places/
+入れ替える [いれかえる] /(v1) to replace/to substitute/to shift/to change places/
 入れ替わり [いれかわり] /(n) substitution/replacement/shifting/change/
 入れ替わり立ち替わり [いれかわりたちかわり] /(adv) by turns/
 入れ替わる [いれかわる] /(v5r,vi) to change places/to relieve one another/
-入れ代える [いれかえる] /(v1) to tqreplace/to substitute/to shift/to change places/
+入れ代える [いれかえる] /(v1) to replace/to substitute/to shift/to change places/
 入れ代わり立ち代わり [いれかわりたちかわり] /(adv) by turns/
 入れ代わる [いれかわる] /(v5r,vi) to change places/to relieve one another/
 入れ知恵 [いれぢえ] /(n) suggestion/hint/
@@ -90548,7 +90548,7 @@
 付け回す [つけまわす] /(v5s) to follow/to shadow/to hanker after/to hover around/
 付け回る [つけまわる] /(v5r) to follow/to shadow/to hanker after/to hover around/
 付け掛け [つけかけ] /(n) overcharge/
-付け換える [つけかえる] /(v1) to renew/to tqreplace/to change for/to attach anew/
+付け換える [つけかえる] /(v1) to renew/to replace/to change for/to attach anew/
 付け景気 [つけげいき] /(n) borrowed prosperity/
 付け元気 [つけげんき] /(n) show of courage/
 付け合わせ [つけあわせ] /(n) perfect occlusion/vegetable relish with meat/
@@ -90571,7 +90571,7 @@
 付け足す [つけたす] /(v5s) to add to/(P)/
 付け足り [つけたり] /addition/pretext/
 付け替え [つけかえ] /(n) replacement/
-付け替える [つけかえる] /(v1) to renew/to tqreplace/to change for/to attach anew/
+付け替える [つけかえる] /(v1) to renew/to replace/to change for/to attach anew/
 付け値 [つけね] /(n) the bid/the offer/
 付け知恵 [つけじえ] /hint suggestion/
 付け直す [つけなおす] /(v5s) to repair again/to join again/
@@ -95798,7 +95798,7 @@
 殆ど [ほとんど] /(n-adv,n-t) (uk) mostly/almost/(P)/
 殆んど [ほとんど] /(n-adv,n-t) (uk) mostly/almost/
 堀 [ほり] /(n) moat/canal/(P)/
-堀り出し物 [ほりだしもの] /(n) (lucky) tqfind/bargain/good buy/treasure trove/
+堀り出し物 [ほりだしもの] /(n) (lucky) find/bargain/good buy/treasure trove/
 堀り鼠 [ほりねずみ] /gopher/
 堀り抜く [ほりぬく] /(iK) (v5k) to dig through/to drill into/to excavate/
 堀り返す [ほりかえす] /(iK) (v5s) to dig up/to turn up/to tear up/
@@ -98489,13 +98489,13 @@
 儲け口 [もうけぐち] /(n) profitable job/way to make a fast buck/
 儲け主義 [もうけしゅぎ] /moneymaking orientation/
 儲け付くで [もうけづくで] /for investment/to make money/
-儲け物 [もうけもの] /(n) good bargain/a tqfind/godsend/
+儲け物 [もうけもの] /(n) good bargain/a find/godsend/
 儲け役 [もうけやく] /(n) lucrative position/
 儲位 [ちょい] /(n) heirship/
 儲口 [もうけぐち] /(n) profitable job/way to make a fast buck/
 儲蓄 [ちょちく] /(n) savings/
 儲付くで [もうけづくで] /for investment/to make money/
-儲物 [もうけもの] /(n) good bargain/a tqfind/godsend/
+儲物 [もうけもの] /(n) good bargain/a find/godsend/
 儲役 [もうけやく] /(n) lucrative position/
 木 [き] /(n) tree/wood/timber/(P)/
 木々 [きぎ] /(n) every tree/many trees/all kinds of trees/(P)/
@@ -98700,7 +98700,7 @@
 目くじら [めくじら] /(n) corner of one's eye/
 目ざとい [めざとい] /(adj) (1) sharp sighted/(2) easily awakened/
 目ざわり [めざわり] /(adj-na,n) eyesore/
-目っけ物 [めっけもの] /(n) bargain/tqfind/
+目っけ物 [めっけもの] /(n) bargain/find/
 目つぶし [めつぶし] /(n) thing thrown in someone's eyes in order to blind/
 目にあう [めにあう] /(exp) to go through/to suffer/
 目につく [めにつく] /(v5k) to be noticeable/
@@ -99974,7 +99974,7 @@
 有り難味 [ありがたみ] /(n) value/worth/virtue/
 有り難迷惑 [ありがためいわく] /(adj-na,n) an unwelcome favor/
 有り難涙 [ありがたなみだ] /(n) tears of gratitude/
-有り付く [ありつく] /(v5k) to get/to obtain/to come by/to tqfind/
+有り付く [ありつく] /(v5k) to get/to obtain/to come by/to find/
 有り布 [ありぎれ] /(n) remnants/
 有り明け [ありあけ] /(n) dawn or daybreak (with the moon still visible)/all night/
 有り余っている [ありあまっている] /to be in excess/
@@ -106313,7 +106313,7 @@
 煌煌と [こうこうと] /brilliantly/brightly/
 煖気 [だんき] /(n) warmth/warm weather/
 煖房 [だんぼう] /(n) heating/
-煖炉 [だんろ] /(n) fitqreplace/hearth/stove/
+煖炉 [だんろ] /(n) fireplace/hearth/stove/
 熏し銀 [いぶしぎん] /(n) (1) oxidized silver/(2) refined (aesthetic) taste/
 熏蒸 [くんじょう] /fumigation/
 熏蒸剤 [くんじょうざい] /fumigant/
diff --git a/kiten/kanjidic b/kiten/kanjidic
index 602f2f17..f18ac18c 100644
--- a/kiten/kanjidic
+++ b/kiten/kanjidic
@@ -325,7 +325,7 @@
 格 334A U683c B75 G5 S10 F281 N2259 V2668 H926 DK627 L292 K334 O1099 DO716 MN14749 MP6.0309 E633 IN643 DS569 DT710 DC403 DJ852 DG1088 P1-4-6 I4a6.17 Q4796.4 DR1877 Yge2 Yge1 Wgyeog Wnag カク コウ キャク ゴウ T1 いたる のり {status} {rank} {capacity} {character} {case (law, grammar)} 
 核 334B U6838 B75 G8 S10 F475 N2254 V2660 H927 DK628 L1520 K577 DO1608 MN14743 MP6.0305 E1074 IN1212 DJ986 DG1089 P1-4-6 I4a6.22 Q4098.2 DR1862 Yhe2 Yhu2 Whaeg カク {nucleus} {core} {kernel} 
 殻 334C U6bbb B79 G8 S11 XJ05D57 XJ1385E F1892 N2456 V2996 H1490 DK1000 L710 K1869 DO1832 E1075 IN1728 DJ1626 DG1141 P1-7-4 I3p8.1 Q4724.7 DR1468 Yke2 Yqiao4 Wgag カク コク バイ から がら {husk} {nut shell} 
-獲 334D U7372 B94 G8 S16 XH1622 F964 N2912 V3609 H779 DK537 L701 K1234 DO1364 MN20758X MP7.0752 E1079 IN1313 DJ1408 DG1310 P1-3-13 I3g13.1 Q4424.7 DR2967 Yhuo4 Whoeg カク え.る {seize} {get} {tqfind} {earn} {acquire} {can} {may} {able to} 
+獲 334D U7372 B94 G8 S16 XH1622 F964 N2912 V3609 H779 DK537 L701 K1234 DO1364 MN20758X MP7.0752 E1079 IN1313 DJ1408 DG1310 P1-3-13 I3g13.1 Q4424.7 DR2967 Yhuo4 Whoeg カク え.る {seize} {get} {find} {earn} {acquire} {can} {may} {able to} 
 確 334E U78ba B112 G5 S15 XJ15021 F252 N3217 V4039 H1228 DK830 L567 K395 O2305 DO661 MN24366 MP8.0388 E634 IN603 DS570 DT805 DC343 DJ803 DG1409 P1-5-10 I5a10.3 Q1461.4 DR3375 Yque4 Whwag カク コウ たし.か たし.かめる {assurance} {firm} {tight} {hard} {solid} {confirm} {clear} {evident} 
 穫 334F U7a6b B115 G8 S18 F1642 N3309 V4180 H1251 DK844 L908 K1683 O2729 DO1807 MN25334P MP8.0635 E1081 IN1314 DJ1409 DG1449 P1-5-13 I5d13.4 Q2494.7 DR2267 Yhuo4 Whwag カク {harvest} {reap} 
 覚 3350 U899a B147 G4 S12 XJ06B34 XJ15D26 XH1700 F710 N4288 V5529 H2604 DK1668 L325 K896 O1752 DO397 MN34846 MP10.0328 E439 IN605 DS363 DT581 DJ208 DB3.15 DG1646 P2-5-7 I3n9.3 Q3221.6 Q9021.6 DR957 Yjue2 Yjiao4 Wgag Wgyo カク おぼ.える さ.ます さ.める さと.る {memorize} {learn} {remember} {awake} {sober up} 
@@ -1226,7 +1226,7 @@
 州 3D23 U5dde B2 G3 S6 XDR0354 F386 N99 V1529 H57 DK39 L128 K542 O224 DO445 MN8678 MP4.0331 E304 IN195 DS424 DT271 DJ553 DG549 P1-2-4 I2f4.1 Q3200.0 DR1254 ZPP1-1-5 Yzhou1 Wju シュウ ス す T1 くに {state} {province} 
 修 3D24 U4fee B9 G5 S10 XJ13143 F603 N491 V260 H123 DK92 L1722 K644 O1038 DO563 MN721 MP1.0805 E704 IN945 DS633 DT715 DJ1175 DG107 P1-2-8 I2a8.11 Q2822.2 Q2722.2 DR2160 ZPP1-3-7 Yxiu1 Wsu シュウ シュ おさ.める おさ.まる T1 おき なが のぶ おさむ {discipline} {conduct oneself well} {study} {master} 
 愁 3D25 U6101 B61 G8 S13 F2171 N1729 V1923 H2829 DK1811 L901 K1737 DO1778 MN10885 MP4.1107 E1357 IN1601 DJ1700 DG795 P2-9-4 I4k9.16 Q2933.8 DR2258 Ychou2 Wsu シュウ うれ.える うれ.い {distress} {grieve} {lament} {be anxious} 
-拾 3D26 U62fe B64 G3 S9 F1479 N1901 V2149 H379 DK279 L667 K1599 O802 DO625 MN12014 MP5.0209 E305 IN1445 DS425 DT329 DJ273 DG890 P1-3-6 I3c6.14 Q5806.1 DR1377 Yshi2 Yshe4 Wseub Wsib シュウ ジュウ ひろ.う {pick up} {gather} {tqfind} {go on foot} {ten} 
+拾 3D26 U62fe B64 G3 S9 F1479 N1901 V2149 H379 DK279 L667 K1599 O802 DO625 MN12014 MP5.0209 E305 IN1445 DS425 DT329 DJ273 DG890 P1-3-6 I3c6.14 Q5806.1 DR1377 Yshi2 Yshe4 Wseub Wsib シュウ ジュウ ひろ.う {pick up} {gather} {find} {go on foot} {ten} 
 洲 3D27 U6d32 B85 G9 S9 F1979 N2539 V3120 H391 DK291 L2289 O820 MN17413 MP6.1116 IN2138 P1-3-6 I3a6.10 Q3210.0 Yzhou1 Wju シュウ ス しま {continent} {sandbar} {island} {country} 
 秀 3D28 U79c0 B115 G8 S7 F848 N3263 V4123 H2545 DK1616 L914 K859 O726 DO973 MN24911 MP8.0523 E1355 IN1683 DJ1171 DG1429 P2-5-2 I5d2.4 Q2022.7 DR2245 ZPP2-1-6 ZSP2-5-3 ZBP2-1-7 Yxiu4 Wsu シュウ ひい.でる T1 しゅ しょう ひで ひでし ほ {excel} {excellence} {beauty} {surpass} 
 秋 3D29 U79cb B115 G2 S9 XJ0302C XJ06354 F635 N3273 V4131 H1139 DK776 L900 K540 O878 DO164 MN24940 MP8.0537 E140 IN462 DS89 DT178 DJ98 DB2.20 DG1431 P1-5-4 I5d4.1 Q2998.0 DR2262 Yqiu1 Wchu シュウ あき とき T1 あい {autumn} 
@@ -1759,7 +1759,7 @@
 隊 4262 U968a B170 G4 S12 F605 N5010 V6468 H625 DK452 L1306 K470 DO366 MN41750X MP11.0945 E540 IN795 DS462 DT593 DC225 DJ779 DG746 P1-3-9 I2d9.7 Q7823.2 DR3651 Ydui4 Wdae タイ {regiment} {party} {company} {squad} 
 黛 4263 U9edb B203 G9 S16 F2254 N5408 V7060 DK1678 L2864 MN48075X MP12.1022 IN2283 P2-5-11 I4d13.7 Q2333.1 Ydai4 Wdae タイ まゆずみ {blackened eyebrows} 
 鯛 4264 U9bdb B195 G9 S19 XJ16A57 F2446 N5305 V6884 H1881 DK1213 L2812 O2832 DO1971 MN46226P MP12.0752 IN2272 P1-11-8 I11a8.11 Q2732.0 Ydiao1 Wjo チョウ たい {sea bream} {red snapper} 
-代 4265 U4ee3 B9 G3 S5 F66 N364 V125 H30 DK18 L1005 K68 O125 DO85 MN386 MP1.0611 E338 IN256 DS463 DT257 DC87 DJ413 DB2.10 DB3.3 DG61 P1-2-3 I2a3.3 Q2324.0 DR2156 Ydai4 Wdae ダイ タイ か.わる かわ.る かわ.り -がわ.り か.える よ しろ T1 す {substitute} {change} {convert} {tqreplace} {period} {age} {generation} {charge} {rate} {fee} 
+代 4265 U4ee3 B9 G3 S5 F66 N364 V125 H30 DK18 L1005 K68 O125 DO85 MN386 MP1.0611 E338 IN256 DS463 DT257 DC87 DJ413 DB2.10 DB3.3 DG61 P1-2-3 I2a3.3 Q2324.0 DR2156 Ydai4 Wdae ダイ タイ か.わる かわ.る かわ.り -がわ.り か.える よ しろ T1 す {substitute} {change} {convert} {replace} {period} {age} {generation} {charge} {rate} {fee} 
 台 4266 U53f0 B28 C30 G2 S5 XJ0674A XJ13747 F262 N848 V699 H2005 DK1265 L744 K216 O276 DO290 MN3246 MP2.0757 E166 IN492 DS272 DT111 DC436 DJ532 DB3.2 DG280 P2-2-3 I3d2.11 Q2360.0 DR2777 Ytai2 Ytai1 Wtae Wi ダイ タイ うてな われ つかさ {pedestal} {a stand} {counter for machines and vehicles} 
 大 4267 U5927 B37 G1 S3 F7 N1171 V1133 H3416 DK2133 L107 K7 O48 DO32 MN5831 MP3.0367 E53 IN26 DS22 DT14 DC5 DJ87 DB2.2 DG408 P4-3-4 I0a3.18 Q4003.0 DR1463 Yda4 Ydai4 Wdae Wda Wtae ダイ タイ おお- おお.きい -おお.いに T1 うふ お おう た たかし とも はじめ ひろ ひろし まさ まさる もと わ {large} {big} 
 第 4268 U7b2c B118 G3 S11 F160 N3385 V4272 H2660 DK1706 L1239 K76 O1768 DO360 MN25943 MP8.0760 E339 IN404 DS273 DT380 DC83 DJ354 DG1473 P2-6-5 I6f5.5 Q8822.7 DR2344 Ydi4 Wje ダイ テイ {No.} {residence} 
@@ -2098,7 +2098,7 @@
 峠 463D U5ce0 B46 G8 S9 F1941 N1416 V1464 H358 DK265 L773 K1751 O1081 DO1473 MN8068 MP4.0247 E1663 IN1351 DJ1849 DG542 P1-3-6 I3o6.3 Q2173.1 DR1254 Wsang とうげ {mountain peak} {mountain pass} {climax} {crest} {(kokuji)} 
 鴇 463E U9d07 B196 S15 V6943 O2280 MN46730 MP12.0807 P1-4-11 I11b4.3 Q4742.7 Ybao3 Wbo ホウ とき のがん {wild goose} {madam of a brothel} {crested ibis} 
 匿 463F U533f B22 C23 G8 S10 F2024 N764 V591 H3011 DK1911 L1692 K1693 DO1766 MN2690 MP2.0475 E1664 IN1771 DJ1716 DG238 P3-2-8 I2t8.2 Q7171.6 DR3475 Yni4 Wnig トク かくま.う {hide} {shelter} {shield} 
-得 4640 U5f97 B60 G4 S11 F175 N1622 V1755 H477 DK351 L876 K358 O1299 DO340 MN10137 MP4.0873 E761 IN374 DS850 DT574 DC167 DJ643 DG631 P1-3-8 I3i8.4 Q2624.1 DR2048 Yde2 Yde5 Ydei3 Wdeug トク え.る う.る T1 あつ てろ {gain} {get} {tqfind} {earn} {acquire} {can} {may} {able to} {profit} {advantage} {benefit} 
+得 4640 U5f97 B60 G4 S11 F175 N1622 V1755 H477 DK351 L876 K358 O1299 DO340 MN10137 MP4.0873 E761 IN374 DS850 DT574 DC167 DJ643 DG631 P1-3-8 I3i8.4 Q2624.1 DR2048 Yde2 Yde5 Ydei3 Wdeug トク え.る う.る T1 あつ てろ {gain} {get} {find} {earn} {acquire} {can} {may} {able to} {profit} {advantage} {benefit} 
 徳 4641 U5fb3 B60 G5 S14 F1091 N1633 V1767 H684 DK486 L885 K839 O2063 DO592 MN10237P MP4.0918 E762 IN1038 DS851 DT801 DJ644 DG637 P1-3-11 I3i11.3 Q2423.6 DR2058 Yde2 Wdeog トク T1 あつ なる のり ゆき よし {benevolence} {virtue} {goodness} {commanding respect} 
 涜 4642 U6d9c B85 S10 XJ1492C V3134 L2297 MN18591X MP7.0331 P1-3-7 Q3418.6 Ydu2 Wdog トク トウ けが.す けが.れ みぞ {defile} {blaspheme} {ditch} 
 特 4643 U7279 B93 G4 S10 F234 N2860 V3541 H945 DK641 L246 K153 DO411 MN20013 MP7.0644 E760 IN282 DS685 DT554 DC186 DJ398 DB2.18 DG1293 P1-4-6 I4g6.1 Q2454.1 DR2448 Yte4 Wteug トク {special} 
@@ -4471,7 +4471,7 @@
 燹 6021 U71f9 B86 S18 N2815 V3501 MN19508 MP7.0552 P2-14-4 I4d14.5 Q1180.9 Yxian3 Wheui Wseon セン のび {prairie fire} 
 燿 6022 U71ff B86 G9 S18 XJ04D54 N2814 V3500 DK750 L2534 O2721 MN19520X MP7.0553 IN2152 P1-4-14 I4d14.3 Q9781.4 Yyao4 Wyo ヨウ かがや.く ひかり {shine} 
 爍 6023 U720d B86 S19 V3504 MN19549 MP7.0555 P1-4-15 I4d15.1 Q9289.4 Yshuo4 Wsag シャク とか.す ひか.る {shine} {melt} 
-爐 6024 U7210 B86 S20 XJ04F27 XH2750 N2819 V3506 H1104 MN19566 MP7.0556 P1-4-16 Q9181.7 Ylu2 Wro ロ いろり {fitqreplace} {stove} {oven} {furnace} 
+爐 6024 U7210 B86 S20 XJ04F27 XH2750 N2819 V3506 H1104 MN19566 MP7.0556 P1-4-16 Q9181.7 Ylu2 Wro ロ いろり {fireplace} {stove} {oven} {furnace} 
 爛 6025 U721b B86 S21 XJ14A47 N2820 V3507 H1110 O2913 MN19604 MP7.0559 P1-4-17 I4d17.1 Q9782.0 ZPP1-1-20 Ylan4 Wran ラン ただ.れる {be sore} {inflamed} {bleary} {fester} 
 爨 6026 U7228 B86 S29 N2821 V3508 MN19648 MP7.0562 P2-14-15 I4d26.1 Q7780.9 Ycuan4 Wchan サン かし.ぐ かまど {cook} {boil} 
 爭 6027 U722d B87 S8 XJ04168 XH186 V3510 H2422 O706 MN19663 MP7.0566 P2-4-4 Q2050.7 Yzheng1 Wjaeng ソウ あらそ.う いか.でか {to dispute} {fight} {contend} {strive} 
@@ -5923,8 +5923,8 @@
 鑠 6F4B U9460 B167 S23 XH3124 N4928 V6366 MN41019 MP11.0654 P1-8-15 I8a15.1 Q8219.4 Yshuo4 Wsag シャク とろ.かす と.かす {melt} {be charmed} {captivated} 
 鑢 6F4C U9462 B167 S23 N4927 V6365 MN41021 MP11.0655 P1-8-15 I8a15.5 Q8113.6 Ylu:4 Wryeo ロ リョ やすり {file} {rasp} 
 鑞 6F4D U945e B167 S23 N4929 V6367 MN41014 MP11.0654 P1-8-15 I8a15.4 Q8211.6 Yla4 Wrab ロウ {solder} 
-鑪 6F4E U946a B167 S24 XJ06F4F XH4822 N4931 V6369 MN41038 MP11.0656 P1-8-16 I8a16.1 Q8111.7 Ylu2 Wro ロ いろり T1 たたら {hearth} {fitqreplace} {furnace} 
-鈩 6F4F U9229 B167 S12 XJ06F4E N4822 V6228 P1-8-4 Q8312.7 Ylu2 Wro ロ いろり {hearth} {fitqreplace} {furnace} 
+鑪 6F4E U946a B167 S24 XJ06F4F XH4822 N4931 V6369 MN41038 MP11.0656 P1-8-16 I8a16.1 Q8111.7 Ylu2 Wro ロ いろり T1 たたら {hearth} {fireplace} {furnace} 
+鈩 6F4F U9229 B167 S12 XJ06F4E N4822 V6228 P1-8-4 Q8312.7 Ylu2 Wro ロ いろり {hearth} {fireplace} {furnace} 
 鑰 6F50 U9470 B167 S25 N4933 V6371 O2998 MN41051 MP11.0657 P1-8-17 I8a17.1 Q8812.7 Q8317.7 Yyao4 Yyue4 Wyag ヤク かぎ {lock} 
 鑵 6F51 U9475 B167 S25 XH3634 XI2k4.6 N4932 V6370 MN41064X MP11.0658 P1-8-17 Q8411.4 Yguan4 Wgwan カン かま {steam boiler} 
 鑷 6F52 U9477 B167 S26 V6373 MN41069 MP11.0658 P1-8-18 I8a18.1 Q8114.1 Ynie4 Wseob セツ ジョウ ニョウ けぬき T1 けぬ {pluck hair} {tweezers} 
diff --git a/kiten/kiten.cpp b/kiten/kiten.cpp
index beb56a31..765a1ddd 100644
--- a/kiten/kiten.cpp
+++ b/kiten/kiten.cpp
@@ -80,8 +80,8 @@ TopLevel::TopLevel(TQWidget *tqparent, const char *name) : KMainWindow(tqparent,
 	kanjiCB = new KToggleAction(i18n("&Kanjidic"), "kanjidic", CTRL+Key_K, TQT_TQOBJECT(this), TQT_SLOT(kanjiDictChange()), actionCollection(), "kanji_toggle");
 	deinfCB = new KToggleAction(i18n("&Deinflect Verbs in Regular Search"), 0, TQT_TQOBJECT(this), TQT_SLOT(kanjiDictChange()), actionCollection(), "deinf_toggle");
 	comCB = new KToggleAction(i18n("&Filter Rare"), "filter", CTRL+Key_F, TQT_TQOBJECT(this), TQT_SLOT(toggleCom()), actionCollection(), "common");
-	autoSearchToggle = new KToggleAction(i18n("&Automatically Search Clipboard Selections"), "tqfind", 0, TQT_TQOBJECT(this), TQT_SLOT(kanjiDictChange()), actionCollection(), "autosearch_toggle");
-	irAction =  new KAction(i18n("Search &in Results"), "tqfind", CTRL+Key_I, TQT_TQOBJECT(this), TQT_SLOT(resultSearch()), actionCollection(), "search_in_results");
+	autoSearchToggle = new KToggleAction(i18n("&Automatically Search Clipboard Selections"), "find", 0, TQT_TQOBJECT(this), TQT_SLOT(kanjiDictChange()), actionCollection(), "autosearch_toggle");
+	irAction =  new KAction(i18n("Search &in Results"), "find", CTRL+Key_I, TQT_TQOBJECT(this), TQT_SLOT(resultSearch()), actionCollection(), "search_in_results");
 	(void) KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolBars()), actionCollection());
 	addAction = new KAction(i18n("Add &Kanji to Learning List"), 0, TQT_TQOBJECT(this), TQT_SLOT(addToList()), actionCollection(), "add");
 	addAction->setEnabled(false);
@@ -396,7 +396,7 @@ void TopLevel::search(bool inResults)
 				TQStringList::Iterator nit = names.begin();
 				for (TQStringList::Iterator it = res.begin(); it != res.end(); ++it, ++nit)
 				{
-					if (done.tqcontains(*it) > 0)
+					if (done.contains(*it) > 0)
 						continue;
 
 					//kdDebug() << "currently on deinflection " << *it << endl;
@@ -442,7 +442,7 @@ void TopLevel::strokeSearch()
 	if (!ok)
 	{
 		/*
-		if (text.tqfind("-") < 0)
+		if (text.find("-") < 0)
 		{
 			StatusBar->message(i18n("For a range between 4 and 8 strokes, use '4-8'"));
 			return;
@@ -540,7 +540,7 @@ TQString TopLevel::filteredClipboardText()
 {
 	TQString newText = clipBoardText();
 	TQString currentText = Edit->text();
-	if (newText.length() < 80 && newText.tqfind(':') < 0 && newText.tqfind('#') < 0 && newText.tqfind("-") != 0 && newText.tqfind("+") < 0 && currentText.tqfind(newText) < 0)
+	if (newText.length() < 80 && newText.find(':') < 0 && newText.find('#') < 0 && newText.find("-") != 0 && newText.find("+") < 0 && currentText.find(newText) < 0)
 		return newText;
 	else
 		return TQString();
@@ -711,8 +711,8 @@ TQRegExp TopLevel::searchItems()
 	if (text.isEmpty())
 		return TQRegExp(); //empty
 
-	unsigned int tqcontains = text.tqcontains(TQRegExp("[A-Za-z0-9_:]"));
-	if (Config::wholeWord() && tqcontains == text.length())
+	unsigned int contains = text.contains(TQRegExp("[A-Za-z0-9_:]"));
+	if (Config::wholeWord() && contains == text.length())
 		regexp = "\\W%1\\W";
 	else
 		regexp = "%1";
diff --git a/kiten/kromajiedit.cpp b/kiten/kromajiedit.cpp
index f75f2238..ee8a2feb 100644
--- a/kiten/kromajiedit.cpp
+++ b/kiten/kromajiedit.cpp
@@ -163,21 +163,21 @@ void KRomajiEdit::keyPressEvent(TQKeyEvent *e)
 	ji = ji.lower();
 	//kdDebug() << "ji = " << ji << endl;
 
-	TQString tqreplace;
+	TQString replace;
 
 	//kdDebug () << "kana is " << kana << endl;
 	if (kana == "hiragana")
-		tqreplace = hiragana[ji];
+		replace = hiragana[ji];
 	else if (kana == "katakana")
-		tqreplace = katakana[ji];
+		replace = katakana[ji];
 
-	//kdDebug() << "tqreplace = " << tqreplace << endl;
+	//kdDebug() << "replace = " << replace << endl;
 
-	if (!!tqreplace) // if (replace has something in it)
+	if (!!replace) // if (replace has something in it)
 	{
 		//kdDebug() << "replace isn't empty\n";
 
-		setText(curKana + tqreplace);
+		setText(curKana + replace);
 
 		if (kana == "katakana")
 			kana = "hiragana";
diff --git a/kiten/learn.cpp b/kiten/learn.cpp
index ecdc011b..63bf5ce0 100644
--- a/kiten/learn.cpp
+++ b/kiten/learn.cpp
@@ -473,8 +473,8 @@ void Learn::add(Dict::Entry toAdd, bool noEmit)
 {
 	// Remove peripheral readings: This is a study mode, not a reference mode
 	TQRegExp inNames (",\\s*[A-Za-z ]+:.*");
-	TQString readings = Dict::prettyKanjiReading(toAdd.readings()).tqreplace(inNames, "");
-	TQString meanings = shortenString(Dict::prettyMeaning(toAdd.meanings()).tqreplace(inNames, ""));
+	TQString readings = Dict::prettyKanjiReading(toAdd.readings()).replace(inNames, "");
+	TQString meanings = shortenString(Dict::prettyMeaning(toAdd.meanings()).replace(inNames, ""));
 	TQString kanji = toAdd.kanji();
 
 	// here's a dirty rotten cheat (well, not really)
@@ -730,7 +730,7 @@ TQString Learn::randomMeaning(TQStringList &oldMeanings)
 		}
 		//kdDebug() << "curMeaning: " << curItem->text(guessOn) << endl;
 	}
-	while (oldMeanings.tqcontains(meaning) || meaning == curItem->text(guessOn));
+	while (oldMeanings.contains(meaning) || meaning == curItem->text(guessOn));
 
 	oldMeanings.append(meaning);
 	meaning = shortenString(meaning);
@@ -755,9 +755,9 @@ void Learn::qupdate()
 
 	TQStringList oldMeanings;
 	for (int i = 0; i < numberOfAnswers; ++i)
-		answers->tqfind(i)->setText(randomMeaning(oldMeanings));
+		answers->find(i)->setText(randomMeaning(oldMeanings));
 
-	answers->tqfind(seikai)->setText(curItem->text(guessOn));
+	answers->find(seikai)->setText(curItem->text(guessOn));
 }
 
 struct Learn::scoreCompare 
@@ -834,7 +834,7 @@ void Learn::qnew() // new quiz kanji
 
 void Learn::cheat()
 {
-	answers->tqfind(seikai)->setFocus();
+	answers->find(seikai)->setFocus();
 	statusBar()->message(i18n("Better luck next time"));
 	nogood = true;
 }
diff --git a/kiten/optiondialog.cpp b/kiten/optiondialog.cpp
index 94d0428e..f3f1ba07 100644
--- a/kiten/optiondialog.cpp
+++ b/kiten/optiondialog.cpp
@@ -45,7 +45,7 @@ ConfigureDialog::ConfigureDialog(TQWidget *tqparent, const char *name) : KConfig
 	configDic = new ConfigDictionaries(0, "dictionaries_page");
 	connect(configDic, TQT_SIGNAL(widgetChanged()), this, TQT_SLOT(updateButtons()));
 	addPage(configDic, i18n("Dictionaries"), "contents");
-	addPage(new ConfigSearching(0, "searching_page"), i18n("Searching"), "tqfind");
+	addPage(new ConfigSearching(0, "searching_page"), i18n("Searching"), "find");
 	addPage(new ConfigLearn(0, "learn_page"), i18n("Learn"), "pencil");
 	ConfigFont* configFont = new ConfigFont(0, "font_page");
 	configFont->kcfg_font->setSampleText(i18n("Result View Font")+TQString::fromUtf8(" - ��������������祉�吾�� 羲√��"));
diff --git a/kiten/rad.cpp b/kiten/rad.cpp
index 1f7da303..e8320b98 100644
--- a/kiten/rad.cpp
+++ b/kiten/rad.cpp
@@ -174,11 +174,11 @@ TQStringList Rad::kanjiByRad(const TQStringList &list)
 		for (TQValueList<TQStringList>::Iterator it = lists.begin(); it != lists.end(); ++it)
 		{
 			//kdDebug() << "looping through lists\n";
-			outcomes.append((*it).tqcontains(*kit) > 0);
+			outcomes.append((*it).contains(*kit) > 0);
 		}
 
 		const bool containsBool = false;
-		if ((outcomes.tqcontains(containsBool) < 1))
+		if ((outcomes.contains(containsBool) < 1))
 		{
 			//kdDebug() << "appending " << *kit << endl;
 			ret.append(*kit);
@@ -198,7 +198,7 @@ Radical Rad::radByKanji(const TQString &text)
 	TQString ret;
 
 	TQValueListIterator<Radical> it;
-	for (it = list.end(); it != list.begin() && (*it).kanji().tqfind(text) == -1; --it);
+	for (it = list.end(); it != list.begin() && (*it).kanji().find(text) == -1; --it);
 
 	return (*it);
 }
@@ -360,7 +360,7 @@ void RadWidget::addRadical(const TQString &radical)
 
 void RadWidget::addToSelected(const TQString &text)
 {
-	if (!text.isNull() && !selected.tqcontains(text))
+	if (!text.isNull() && !selected.contains(text))
 	{
 		selectedList->insertItem(text);
 		selected.append(text);
@@ -398,7 +398,7 @@ void RadWidget::apply()
 
 	for (TQStringList::Iterator it = selected.begin(); it != selected.end(); ++it)
 	{
-		if (hotlist.tqfind(*it) == hotlist.end())
+		if (hotlist.find(*it) == hotlist.end())
 		{
 			if (hotlist.size() >= hotlistNum)
 				hotlist.pop_front(); // stupid stl functions in TQt .. ;)
diff --git a/kiten/widgets.cpp b/kiten/widgets.cpp
index 94d61b83..c1d8f86a 100644
--- a/kiten/widgets.cpp
+++ b/kiten/widgets.cpp
@@ -78,7 +78,7 @@ void ResultView::addResult(Dict::Entry result, bool common)
 	TQStringList Meanings = result.meanings();
 	for (it = Meanings.begin(); it != Meanings.end(); ++it)
 	{
-		if ((*it).tqfind("(P)") >= 0)
+		if ((*it).find("(P)") >= 0)
 		{
 			if (common)
 				continue;
@@ -357,9 +357,9 @@ void eEdit::openFile(const TQString &file)
 			continue;
 		Dict::Entry entry = Dict::parse(s);
 		TQString meanings = Dict::prettyMeaning(entry.meanings());
-		bool common = meanings.tqfind(TQString("(P)")) >= 0;
-		meanings.tqreplace(TQRegExp("; "), "/");
-		meanings.tqreplace(TQRegExp("/\\(P\\)"), "");
+		bool common = meanings.find(TQString("(P)")) >= 0;
+		meanings.replace(TQRegExp("; "), "/");
+		meanings.replace(TQRegExp("/\\(P\\)"), "");
 		new TQListViewItem(List, entry.kanji(), Dict::prettyKanjiReading(entry.readings()), meanings, common? i18n("yes") : i18n("no"));
 	}
 }
diff --git a/kiten/xjdic.h b/kiten/xjdic.h
index c000cba9..1e9ae68a 100644
--- a/kiten/xjdic.h
+++ b/kiten/xjdic.h
@@ -58,8 +58,8 @@
 
 #define XJ_FIND         1	/* find entry				*/
 #define XJ_ENTRY        2	/* get this entry according to index	*/
-#define XJ_OK           3	/* tqfind/entry_get succeeded		*/
-#define XJ_NBG          4	/* tqfind/entry_get failed		*/
+#define XJ_OK           3	/* find/entry_get succeeded		*/
+#define XJ_NBG          4	/* find/entry_get failed		*/
 #define XJ_PROTERR      5	/* protocol error - server only		*/
 #define XJ_HULLO        6	/* just send back an XJ_OK and # dics   */
 #define XJ_GET          7	/* get this entry, wo checking any match*/