From eb570158698cf61dad4f77d950ef908160f6c3cc Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: rename the following methods: tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kiten/configdictionaries.cpp | 4 +- kiten/configdictionaries.h | 2 +- kiten/edict | 154 +++++++++++++++++++++---------------------- kiten/edict_doc.html | 2 +- kiten/kanjidic | 8 +-- kiten/kiten.cpp | 2 +- kiten/kiten.h | 2 +- kiten/kromajiedit.cpp | 4 +- kiten/kromajiedit.h | 2 +- kiten/learn.cpp | 8 +-- kiten/learn.h | 4 +- kiten/optiondialog.cpp | 2 +- kiten/optiondialog.h | 2 +- kiten/rad.cpp | 2 +- kiten/rad.h | 2 +- kiten/widgets.cpp | 12 ++-- kiten/widgets.h | 6 +- 17 files changed, 109 insertions(+), 109 deletions(-) (limited to 'kiten') diff --git a/kiten/configdictionaries.cpp b/kiten/configdictionaries.cpp index df1d4d87..cb81b13f 100644 --- a/kiten/configdictionaries.cpp +++ b/kiten/configdictionaries.cpp @@ -26,8 +26,8 @@ #include "configdictionaries.moc" -ConfigDictionaries::ConfigDictionaries(TQWidget *tqparent, const char* name, WFlags f) : - ConfigDictionariesBase(tqparent, name, f) +ConfigDictionaries::ConfigDictionaries(TQWidget *parent, const char* name, WFlags f) : + ConfigDictionariesBase(parent, name, f) { changed = false; config = Config::self(); diff --git a/kiten/configdictionaries.h b/kiten/configdictionaries.h index 5340ea0b..9806ff2e 100644 --- a/kiten/configdictionaries.h +++ b/kiten/configdictionaries.h @@ -29,7 +29,7 @@ class ConfigDictionaries : public ConfigDictionariesBase Q_OBJECT TQ_OBJECT public: - ConfigDictionaries(TQWidget *tqparent = 0, const char* name = 0, WFlags f = 0); + ConfigDictionaries(TQWidget *parent = 0, const char* name = 0, WFlags f = 0); void readDictionaries(); // KConfig stuff diff --git a/kiten/edict b/kiten/edict index 75f799f4..b97f749e 100644 --- a/kiten/edict +++ b/kiten/edict @@ -1335,7 +1335,7 @@ ちょぼちょぼ /(adj-na,adv,n) sparsely/drop-by-drop/ ちょろい /(adj) easy/simple/ ちょろちょろ /(adv,n,vs) in trickles/ -ちょんぼ /(n,vs) aptqparent and grievous error/mistake/blunder/goof/ +ちょんぼ /(n,vs) apparent and grievous error/mistake/blunder/goof/ ちょんまげ /(n) topknot (hair style)/ ちょん切る [ちょんぎる] /(v5r) to chop something off (e.g. head)/to snip off/to fire/ ちらちら /(adv,n,vs) fluttering/flickering/intermittently/(P)/ @@ -5521,7 +5521,7 @@ ガストロノミック /gastronomic/ ガスパイプライン /(n) gas pipeline/ ガスボンベ /gas bomb/(P)/ -ガスマスク /(n) gas tqmask/(P)/ +ガスマスク /(n) gas mask/(P)/ ガスマット /aluminum-foil burner liner (trans: gas mat)/ ガス液 [ガスえき] /(n) gas liquor/ ガス化学工業 [ガスかがくこうぎょう] /(n) gas chemical industry/ @@ -10792,7 +10792,7 @@ デスビキャップ /(abbr) (engine) distributor cap/ デスペレート /(adj-na) desperate/ デスポティズム /despotism/ -デスマスク /(n) death tqmask/ +デスマスク /(n) death mask/ デスマッチ /fight to a finish (trans: death match)/desperate struggle/ デタッチトコート /detached coat/ デタレントギャップ /deterrent gap/ @@ -11934,7 +11934,7 @@ ネットプライス /net price/ ネットプレー /(n) net play/(P)/ ネットボール /net ball/ -ネットマスク /net-tqmask/ +ネットマスク /net-mask/ ネットワーカー /networker/ ネットワーキング /(n) networking/ ネットワーク /(n) network/(P)/ @@ -13985,7 +13985,7 @@ フォアマン /foreman/(P)/ フォグ /fog/ フォスターチャイルド /(n) foster child/(P)/ -フォスターペアレント /foster tqparent/ +フォスターペアレント /foster parent/ フォックス /(n) fox/ フォックストロット /(n) fox-trot/(P)/ フォッグライト /fog light/ @@ -15180,7 +15180,7 @@ ペアスケーティング /pair skating/ ペアリング /(1) pairing/(2) unmarried couple living together/(P)/ ペアルック /(n) matching clothing worn by couples (trans: pair look)/ -ペアレント /tqparent/ +ペアレント /parent/ ペアワイズ /pair-wise/ ペイ /pay/(P)/ ペイテレビ /(n) pay TV/ @@ -16028,7 +16028,7 @@ マスカラ /mascara/ マスキュリン /masculine/ マスキング /(n) masking/ -マスク /(n) tqmask/(P)/ +マスク /(n) mask/(P)/ マスゲーム /(n) mass game/(P)/ マスコット /(n) mascot/(P)/ マスコミ /(n) (abbr) mass communication/(P)/ @@ -19233,7 +19233,7 @@ 圧粉磁心 [あっぷんじしん] /(n) dust core/ 圧密 [あつみつ] /(n) consolidation/ 圧密降伏応力 [あつみつこうふくおうりょく] /consolidation yield stress/ -圧面 [べしみ] /(n) beshimi/type of Noh tqmask with a slanted mouth, bulging eyes and large nostrils/ +圧面 [べしみ] /(n) beshimi/type of Noh mask with a slanted mouth, bulging eyes and large nostrils/ 圧力 [あつりょく] /(n,vs) stress/pressure/(P)/ 圧力を加える [あつりょくをくわえる] /(exp) to apply pressure to/to press/ 圧力釜 [あつりょくがま] /(n) pressure vessel/ @@ -19294,9 +19294,9 @@ 絢文 [けんぶん] /colorful pattern/ 絢爛 [けんらん] /(adj-na,n) gorgeous/brilliant/dazzling/gaudy/ 絢爛たる [けんらんたる] /(adj-t) dazzling/gorgeous/flowery (speech)/ -絢緞子 [あやどんす] /datqmask/ +絢緞子 [あやどんす] /damask/ 綾を成して [あやをなして] /in beautiful patterns/ -綾錦 [あやにしき] /(n) twill datqmask and brocade/ +綾錦 [あやにしき] /(n) twill damask and brocade/ 綾絹 [あやぎぬ] /(n) twilled silk fabric/ 綾子 [りんず] /(n) figured satin/ 綾糸 [あやいと] /(n) colored thread/thread of cat's cradle/heddle thread/ @@ -19305,7 +19305,7 @@ 綾織 [あやおり] /(n) twill (fabric)/ 綾織り [あやおり] /(n) twill (fabric)/ 綾織物 [あやおりもの] /(n) figured cloth/twill fabric/ -綾布 [あやぬの] /(n) twill datqmask and brocade/ +綾布 [あやぬの] /(n) twill damask and brocade/ 綾羅 [りょうら] /(n) elaborated cloth/figured silk and thin silk/ 鮎 [あゆ] /(n) sweetfish (freshwater trout)/ 鮎魚女 [あいなめ] /(n) greenling (fish)/ @@ -20582,7 +20582,7 @@ 育ての親 [そだてのおや] /(n) foster parents/ 育てる [そだてる] /(v1,vt) to raise/to rear/to bring up/(P)/ 育て上げる [そだてあげる] /(v1) to raise (to maturity)/to rear/to train/to educate/ -育て親 [そだておや] /foster tqparent/ +育て親 [そだておや] /foster parent/ 育て方 [そだてかた] /method of bringing up/method of raising/ 育む [はぐくむ] /(v5m) to raise/to rear/to bring up/(P)/ 育英 [いくえい] /(n) education/(P)/ @@ -21601,7 +21601,7 @@ 一目散 [いちもくさん] /(n) at full speed/as fast as one can go/ 一目散に [いちもくさんに] /(adv) at full speed/ 一目置く [いちもくおく] /(v5k) to take off one's hat to a person/to acknowledge anothers superiority/to give a piece or stone/ -一目瞭然 [いちもくりょうぜん] /(adj-na,n) aptqparent/obvious/very clear/ +一目瞭然 [いちもくりょうぜん] /(adj-na,n) apparent/obvious/very clear/ 一問 [いちもん] /(n) a question/(P)/ 一問一答 [いちもんいっとう] /(n) answering question by question/ 一門 [いちもん] /(n) the family/dependents/household/kin/clan/(P)/ @@ -24584,7 +24584,7 @@ 王立 [おうりつ] /(n) royal/(P)/ 翁 [おう] /(n) old man/venerable/(P)/ 翁 [おきな] /(n) old man/venerable/ -翁の面 [おきなのめん] /old mans tqmask/ +翁の面 [おきなのめん] /old mans mask/ 翁貝 [おきながい] /lantern shell/ 襖 [ふすま] /(n) sliding screen/(P)/ 鴬 [うぐいす] /(n) (Japanese) nightingale/ @@ -25443,7 +25443,7 @@ 化けの皮 [ばけのかわ] /(n) masking one's true character/disguise/sheep's clothing/ 化けの皮を現す [ばけのかわをあらわす] /(exp) to expose one's true colors (character)/ 化けの皮を現わす [ばけのかわをあらわす] /(exp) to expose one's true colors (character)/ -化けの皮を剥ぐ [ばけのかわをはぐ] /(exp) to untqmask/ +化けの皮を剥ぐ [ばけのかわをはぐ] /(exp) to unmask/ 化ける [ばける] /(v1) to appear in disguise/to take the form of/to change for the worse/(P)/ 化ける [ふける] /(v1) to change with age/to spoil from weathering/ 化けチェック [ばけチェック] /parity check (data, memory, etc.)/ @@ -25552,7 +25552,7 @@ 仮に [かりに] /(adv) temporarily/provisionally/for example/for argument's sake/(P)/ 仮にも [かりにも] /(adv) even for an instant/even as a joke/ 仮の宿り [かりのやどり] /temporary dwelling/this transient world/ -仮の親 [かりのおや] /foster tqparent/expedient tqparent/ +仮の親 [かりのおや] /foster parent/expedient parent/ 仮の世 [かりのよ] /(n) this transient world/ 仮の名 [かりのな] /alias/assumed name/ 仮の命 [かりのいのち] /this transient life/ @@ -25574,7 +25574,7 @@ 仮採用 [かりさいよう] /(n) appointment on trial (probation)/provisional appointment/ 仮作 [かさく] /(n) a fiction/ 仮刷り [かりずり] /(n) proof printing/ -仮死 [かし] /(n) asphyxiation/aptqparent death/ +仮死 [かし] /(n) asphyxiation/apparent death/ 仮歯 [かし] /(n) false tooth/ 仮字 [かな] /(n) (uk) Japanese syllabary (alphabets)/kana/ 仮執行 [かりしっこう] /(n) provisional execution/ @@ -25686,7 +25686,7 @@ 仮免 [かりめん] /(n) temporary licence/provisional licence/ 仮免許 [かりめんきょ] /(n) temporary license/ 仮免状 [かりめんじょう] /(n) temporary certificate/ -仮面 [かめん] /(n) (1) tqmask/(2) disguise/(P)/ +仮面 [かめん] /(n) (1) mask/(2) disguise/(P)/ 仮面劇 [かめんげき] /(n) masque/ 仮面舞踏会 [かめんぶとうかい] /masquerade ball/ 仮役 [かりやく] /temporary post/ @@ -33544,7 +33544,7 @@ 鬼百合 [おにゆり] /(n) tiger lily/ 鬼武者 [おにむしゃ] /daredevil warrior/ 鬼兵隊 [きへいたい] /cavalry/ -鬼面 [きめん] /(n) tqmask of a devil/startling appearance/devil's face/ +鬼面 [きめん] /(n) mask of a devil/startling appearance/devil's face/ 鬼面伝心 [きめんでんしん] /of a fearsome countenance, but kind as a Buddha/ 鬼門 [きもん] /(n) the northeastern (unlucky) direction/person or thing to be avoided/ 鬼蓮 [おにばす] /(n) prickly water lily/ @@ -34090,7 +34090,7 @@ 逆らう [さからう] /(v5u) to go against/to oppose/to disobey/to defy/(P)/ 逆ポーランド式 [ぎゃくポーランドしき] /reverse Polish notation/RPN/ 逆運 [ぎゃくうん] /(n) a twist of fate/ -逆縁 [ぎゃくえん] /(n) (1) (Buddh) bad deed which ultimately results in the creation of a good Buddhist/(2) older person conducting a funeral service for a younger relative, in particular, a tqparent for a child/ +逆縁 [ぎゃくえん] /(n) (1) (Buddh) bad deed which ultimately results in the creation of a good Buddhist/(2) older person conducting a funeral service for a younger relative, in particular, a parent for a child/ 逆回転 [ぎゃくかいてん] /(n) spinning the opposite way/backspin (tennis, baseball)/counter/ 逆巻く [さかまく] /(v5k) surging water or waves/ 逆関数 [ぎゃくかんすう] /(n) (math) the inverse function/ @@ -38941,7 +38941,7 @@ 継室 [けいしつ] /(n) second wife/ 継承 [けいしょう] /(n,vs) inheritance/succession/accession/(P)/ 継承者 [けいしょうしゃ] /successor/ -継親 [ままおや] /(n) steptqparent/ +継親 [ままおや] /(n) stepparent/ 継走 [けいそう] /(n) relay race/ 継息子 [ままむすこ] /(n) stepson/ 継続 [けいぞく] /(n,vs) continuation/(P)/ @@ -40527,7 +40527,7 @@ 見え透く [みえすく] /(v5k) to be transparent/ 見かけ [みかけ] /(n) outward appearance/ 見かける [みかける] /(v1) to (happen to) see/to notice/to catch sight of/ -見かけ上 [みかけじょう] /(adj-no) aptqparent/ +見かけ上 [みかけじょう] /(adj-no) apparent/ 見くびる [みくびる] /(v5r) to underrate/to belittle/to look down on/to despise/ 見すぼらしい [みすぼらしい] /(adj) shabby/seedy/ 見す見す [みすみす] /(adv) (uk) before one's own eyes/from under one's very nose/(P)/ @@ -42181,7 +42181,7 @@ 狐 [きつね] /(n) fox/(P)/ 狐に化かされる [きつねにばかされる] /(exp) to be deceived by a fox/ 狐の嫁入り [きつねのよめいり] /(n) rain shower while the sun shines/ -狐の面 [きつねのめん] /tqmask of the fox/ +狐の面 [きつねのめん] /mask of the fox/ 狐を落とす [きつねをおとす] /(exp) to exorcise a fox spirit (from a person)/ 狐猿 [きつねざる] /(n) lemur/ 狐火 [きつねび] /(n) St. Elmo's fire/will-o'-the-wisp/ @@ -46624,7 +46624,7 @@ 黒焼け [くろやけ] /(n) charring/something charred/ 黒焦げ [くろこげ] /(n) something burnt black/ 黒色 [こくしょく] /(n) black colour/(P)/ -黒色尉 [こくしきじょう] /Old Black Joe (a noh tqmask)/ +黒色尉 [こくしきじょう] /Old Black Joe (a noh mask)/ 黒色火薬 [こくしょくかやく] /black powder/gunpowder/ 黒色癌 [こくしょくがん] /melanocarcinoma/melanotic carcinoma/ 黒色腫 [こくしょくしゅ] /melanoma/ @@ -50539,8 +50539,8 @@ 子ども達 [こどもたち] /(n) tqchildren/ 子の刻 [ねのこく] /midnight/ 子の時 [ねのとき] /midnight/ -子を見ること親に如かず [こをみることおやにしかず] /(exp) The tqparent is the best judge of the child/ -子を見る事親に如かず [こをみることおやにしかず] /(exp) The tqparent is the best judge of the child/ +子を見ること親に如かず [こをみることおやにしかず] /(exp) The parent is the best judge of the child/ +子を見る事親に如かず [こをみることおやにしかず] /(exp) The parent is the best judge of the child/ 子を宿す [こをやどす] /(exp) to be pregnant with a child/ 子マダム [こマダム] /wealthy women who strive to follow the fashions exactly and be seen in all the right place/ 子安貝 [こやすかい] /cowrie shell/ @@ -50590,7 +50590,7 @@ 子殺し [こごろし] /(n) infanticide/ 子子孫孫 [ししそんそん] /(n) posterity/one's descendants/ 子飼い [こがい] /(n) protege/ -子持ち [こもち] /(n) person with kid(s)/tqparent/ +子持ち [こもち] /(n) person with kid(s)/parent/ 子持昆布 [こもちこんぶ] /kelp with herring roe (sushi type)/ 子鹿 [こじか] /(n) fawn/ 子爵 [ししゃく] /(n) viscount/ @@ -51310,7 +51310,7 @@ 獅子身中の虫 [しししんちゅうのむし] /(n) treacherous friend/ 獅子唐 [ししとう] /(n) green pepper/ 獅子唐辛子 [ししとうがらし] /small sweet green pepper/ -獅子頭 [ししがしら] /(n) lion tqmask/ +獅子頭 [ししがしら] /(n) lion mask/ 獅子鼻 [ししばな] /(n) pug nose/ 獅子舞 [ししまい] /(n) lion dance/ 獅子舞い [ししまい] /(n) lion dance/ @@ -51619,7 +51619,7 @@ 視神経 [ししんけい] /(n) optic nerve/ 視診 [ししん] /(n) visual examination/ 視線 [しせん] /(n) one's eyes/glance/look/(P)/ -視地平 [しちへい] /aptqparent horizon/ +視地平 [しちへい] /apparent horizon/ 視聴 [しちょう] /(n) attention/(P)/ 視聴覚 [しちょうかく] /(n) the senses of seeing and hearing/audiovisual/ 視聴覚機器 [しちょうかくきき] /audiovisual aids/ @@ -52120,7 +52120,7 @@ 似非事 [えせごと] /laughable affair/unlaudable affair/something unreliable/ 似非者 [えせもの] /(n) sham/fraud/counterfeit/impostor/pretender/ 似非笑い [えせわらい] /(n) smirk/affected smile/ -似非親 [えせおや] /(n) distant disinterested tqparent/ +似非親 [えせおや] /(n) distant disinterested parent/ 似非理屈 [えせりくつ] /sophistry/ 似付かわしい [につかわしい] /(adj) suitable/appropriate/becoming/ 似付く [につく] /(v5k) to become/to suit/to be like/to match well/ @@ -53534,7 +53534,7 @@ 実情 [じつじょう] /(n) real condition/actual circumstances/actual state of affairs/(P)/ 実情調査委員会 [じつじょうちょうさいいんかい] /(n) fact-finding committee/ 実状 [じつじょう] /(n) real condition/actual circumstances/actual state of affairs/ -実親 [じつおや] /(n) true tqparent(s) (as opposed to foster parents, etc.)/ +実親 [じつおや] /(n) true parent(s) (as opposed to foster parents, etc.)/ 実数 [じっすう] /(n) real number/(P)/ 実数体 [じっすうたい] /(n) real number field/ 実勢 [じっせい] /(adj-no,n) actual/real/true/(P)/ @@ -56925,11 +56925,11 @@ 銃猟 [じゅうりょう] /(n) shooting/hunting/ 銃連射 [じゅうれんしゃ] /rapid (weapons) fire/hail of bullets/ 叔世 [しゅくせい] /age of decline (said of a nation)/ -叔父 [おじ] /(n) uncle (younger than one's tqparent)/(P)/ -叔父 [しゅくふ] /(n) uncle (younger than one's tqparent)/ +叔父 [おじ] /(n) uncle (younger than one's parent)/(P)/ +叔父 [しゅくふ] /(n) uncle (younger than one's parent)/ 叔父さん [おじさん] /(n) (hon) (uk) middle-aged gentleman/uncle/(P)/ -叔母 [おば] /(n) aunt (younger than one's tqparent)/(P)/ -叔母 [しゅくぼ] /(n) aunt (younger than one's tqparent)/ +叔母 [おば] /(n) aunt (younger than one's parent)/(P)/ +叔母 [しゅくぼ] /(n) aunt (younger than one's parent)/ 叔母さん [おばさん] /(n) (1) aunt/(2) middle-aged lady/(P)/ 夙 [しゅく] /bright and early/early in life/long ago/for a long time/ 夙に [つとに] /(adv) bright and early/early in life/long ago/for a long time/ @@ -58482,7 +58482,7 @@ 女振り [おんなぶり] /(n) woman-like/feminine/ 女神 [じょしん] /(n) goddess/(P)/ 女神 [めがみ] /(n) goddess/ -女親 [おんなおや] /(n) female tqparent/ +女親 [おんなおや] /(n) female parent/ 女人 [にょにん] /(n) women/ 女人禁制 [にょにんきんせい] /prohibited to women/ 女垂らし [おんなたらし] /(n) guy who knows how to play the ladies/skillful playboy/lady-killer/philanderer/Don Juan/ @@ -62910,11 +62910,11 @@ 親しむ [したしむ] /(v5m) to be intimate with/to befriend/(P)/ 親に逆らう [おやにさからう] /(exp) to disobey one's parents/ 親に早く死なれる [おやにはやくしなれる] /(exp) to be orphaned while still young/ -親に叛く [おやにそむく] /(exp) to disobey one's tqparent(s)/ +親に叛く [おやにそむく] /(exp) to disobey one's parent(s)/ 親に迄見放される [おやにまでみはなされる] /(exp) to be the despair of one's parents/ 親の気質を承ける [おやのきしつをうける] /(exp) to inherit one's parents disposition/ 親の言う事を聞く [おやのいうことをきく] /(exp) to obey one's parents/ -親の七光 [おやのななひかり] /(exp) capitalizing on the fame of a tqparent/riding a tqparent's coat-tails/ +親の七光 [おやのななひかり] /(exp) capitalizing on the fame of a parent/riding a parent's coat-tails/ 親の情 [おやのじょう] /parental love/ 親の代 [おやのだい] /one's parents' generation/ 親を苦しめる [おやをくるしめる] /(exp) to cause one's parents distress/ @@ -62926,9 +62926,9 @@ 親王 [しんのう] /(n) prince of royal blood/Imperial prince/ 親王妃 [しんのうひ] /Imperial princess/ 親画面 [おやがめん] /main screen/ -親会社 [おやがいしゃ] /(n) tqparent company/(P)/ +親会社 [おやがいしゃ] /(n) parent company/(P)/ 親掛かり [おやがかり] /(adj-no,n) dependent on one's parents/ -親株 [おやかぶ] /(n) tqparent root or stock/pre-split stock or share/ +親株 [おやかぶ] /(n) parent root or stock/pre-split stock or share/ 親機 [おやき] /(n) main telephone (esp. when there are extensions)/ 親許 [おやもと] /(n) one's parents/one's parents' home/one's home/ 親局 [おやきょく] /(n) (computer) master station/ @@ -62939,7 +62939,7 @@ 親権 [しんけん] /(n) parental authority/ 親権者 [しんけんしゃ] /person exercising parental authority/ 親元 [おやもと] /(n) one's parents/one's parents' home/one's home/ -親御 [おやご] /(n) another's tqparent(s)/ +親御 [おやご] /(n) another's parent(s)/ 親交 [しんこう] /(n) intimacy/(P)/ 親好 [しんこう] /(n) friendship/good fellowship/ 親孝行 [おやこうこう] /(adj-na,n) filial piety/(P)/ @@ -62948,19 +62948,19 @@ 親骨 [おやぼね] /(n) ribs of a folding fan/ 親祭 [しんさい] /(n) rites conducted by the emperor/ 親裁 [しんさい] /(n) matter personally decided by the emperor/ -親子 [おやこ] /(n) tqparent and child/(P)/ -親子 [しんし] /(n) tqparent and child/ -親子関係 [おやこかんけい] /(n) tqparent-child relationship/ +親子 [おやこ] /(n) parent and child/(P)/ +親子 [しんし] /(n) parent and child/ +親子関係 [おやこかんけい] /(n) parent-child relationship/ 親子電話 [おやこでんわ] /extension phone (and its main line)/ -親子丼 [おやこどん] /(n) chicken and egg on rice/tqparent and child donburi/ -親子丼 [おやこどんぶり] /(n) chicken and egg on rice/tqparent and child donburi/ +親子丼 [おやこどん] /(n) chicken and egg on rice/parent and child donburi/ +親子丼 [おやこどんぶり] /(n) chicken and egg on rice/parent and child donburi/ 親思い [おやおもい] /(n) love or affection for one's parents/ 親指 [おやゆび] /(n) thumb/(P)/ 親字 [おやじ] /(n) first character (of a dictionary entry)/ 親署 [しんしょ] /(n) signature of an emperor or noble/ 親書 [しんしょ] /(n) handwritten or autograph letter/(P)/ 親勝り [おやまさり] /(adj-na,n) surpassing one's parents/ -親譲り [おやゆずり] /(n) inheritance from a tqparent/(P)/ +親譲り [おやゆずり] /(n) inheritance from a parent/(P)/ 親心 [おやごころ] /(n) parental love or affection/ 親身 [しんみ] /(adj-na,n) relative/kind/cordial/ 親政 [しんせい] /(n) direct Imperial rule/ @@ -62977,11 +62977,11 @@ 親疎 [しんそ] /(n) degree of intimacy/ 親族 [しんぞく] /(n) relatives/(P)/ 親族関係 [しんぞくかんけい] /(n) kinship/ -親代わり [おやがわり] /(n) (one acting as a) foster tqparent/ +親代わり [おやがわり] /(n) (one acting as a) foster parent/ 親知らず [おやしらず] /(n) wisdom tooth/ 親柱 [おやばしら] /(n) main pillar/ 親潮 [おやしお] /(n) the Kurile Current/ -親鳥 [おやどり] /(n) tqparent bird/ +親鳥 [おやどり] /(n) parent bird/ 親展 [しんてん] /(n) confidential/ 親展書 [しんてんしょ] /confidential letter/ 親電 [しんでん] /(n) telegram sent by an emperor or head of state/ @@ -69778,7 +69778,7 @@ 礎石 [そせき] /(n) foundation stone/cornerstone/(P)/ 祖 [そ] /(n) ancestor/forefather/progenitor/(P)/ 祖型 [そけい] /(n) prototype/ -祖語 [そご] /(n) a tqparent language/ +祖語 [そご] /(n) a parent language/ 祖国 [そこく] /(n) fatherland/native country/(P)/ 祖国愛 [そこくあい] /patriotism/ 祖国復帰 [そこくふっき] /returning to one's fatherland/ @@ -69926,7 +69926,7 @@ 素敵 [すてき] /(adj-na,n) lovely/dreamy/beautiful/great/fantastic/superb/cool/capital/(P)/ 素読 [そどく] /(n) reading without comprehending/ 素読み [すよみ] /(n) reading without comprehending/reading a second draft without checking it against the original/ -素破抜く [すっぱぬく] /(v5k) to disclose/to expose/to untqmask/ +素破抜く [すっぱぬく] /(v5k) to disclose/to expose/to unmask/ 素泊まり [すどまり] /(n) staying overnight without board/ 素泊り [すどまり] /(n) staying overnight without meals/ 素肌 [すはだ] /(n) bare (naked) body/complexion (e.g., face)/ @@ -73319,7 +73319,7 @@ 台無しにする [だいなしにする] /(exp) to spoil/to ruin/to destroy/to make a mess of/ 台無しになる [だいなしになる] /(exp) to come to nothing/to be spoiled/ 台名 [たいめい] /command of a shogun or a high official/ -台木 [だいぎ] /(n) (gun) stock/unworked block of wood/tqparent-tree stock (in grafting)/ +台木 [だいぎ] /(n) (gun) stock/unworked block of wood/parent-tree stock (in grafting)/ 台覧 [たいらん] /(n) inspection by the empress or the crown prince/ 台臨 [たいりん] /(n) visit by the empress or the crown prince/ 台輪 [だいわ] /(n) architrave/ @@ -75097,7 +75097,7 @@ 男色 [なんしょく] /(n) sodomy/male homosexuality/ 男心 [おとこごころ] /(n) male instincts/male frivolity/ 男振り [おとこぶり] /(n) manliness/good-looking/ -男親 [おとこおや] /(n) father/male tqparent/ +男親 [おとこおや] /(n) father/male parent/ 男性 [だんせい] /(n) male/man/(P)/ 男性ホルモン [だんせいホルモン] /(n) male hormone/ 男性的 [だんせいてき] /(adj-na) manly/(P)/ @@ -78730,7 +78730,7 @@ 弟子 [ていし] /(n) pupil/disciple/adherent/follower/apprentice/young person/teacher's student-helper/ 弟子 [でし] /(n) pupil/disciple/adherent/follower/apprentice/young person/teacher's student-helper/(P)/ 弟子入り [でしいり] /(n) apprenticeship/enrolling/(P)/ -弟小父 [おとおじ] /tqparent's younger brother/uncle/ +弟小父 [おとおじ] /parent's younger brother/uncle/ 弟息子 [おとうとむすこ] /(n) younger sons/ 弟息子 [おとむすこ] /(n) younger sons/ 弟弟子 [おとうとでし] /(n) pupil/new disciple/ @@ -85471,7 +85471,7 @@ 能弁 [のうべん] /(adj-na,n) eloquence/oratory/ 能弁家 [のうべんか] /orator/ 能無し [のうなし] /(n) incompetence/ne'er-do-well/ -能面 [のうめん] /(n) Noh tqmask/(P)/ +能面 [のうめん] /(n) Noh mask/(P)/ 能役者 [のうやくしゃ] /(n) noh actor/ 能吏 [のうり] /(n) able official/capable official/ 能率 [のうりつ] /(n) efficiency/(P)/ @@ -86475,12 +86475,12 @@ 伯仲 [はくちゅう] /(n,vs) match someone/be equal with/(P)/ 伯備線 [はくびせん] /Hakubi Line (West Tottori-Okayama Railway)/ 伯夫人 [はくふじん] /(n) countess/ -伯父 [おじ] /(n) (hum) uncle (older than one's tqparent)/(P)/ -伯父 [はくふ] /(n) (hum) uncle (older than one's tqparent)/ +伯父 [おじ] /(n) (hum) uncle (older than one's parent)/(P)/ +伯父 [はくふ] /(n) (hum) uncle (older than one's parent)/ 伯父さん [おじさん] /(n) (hon) (uk) middle-aged gentleman/uncle/(P)/ 伯父貴 [おじき] /(n) uncle/ -伯母 [おば] /(n) (hum) aunt (older than one's tqparent)/(P)/ -伯母 [はくぼ] /(n) (hum) aunt (older than one's tqparent)/ +伯母 [おば] /(n) (hum) aunt (older than one's parent)/(P)/ +伯母 [はくぼ] /(n) (hum) aunt (older than one's parent)/ 伯母さん [おばさん] /(n) (hon) aunt/(P)/ 伯林 [べるりん] /Berlin/ 伯剌西爾 [ぶらじる] /Brazil/ @@ -91241,7 +91241,7 @@ 舞う [まう] /(v5u,vi) to dance/to flutter about/to revolve/(P)/ 舞を舞う [まいをまう] /(exp) to dance/to perform a dance/ 舞楽 [ぶがく] /(n) court dance and music/(P)/ -舞楽面 [ぶがくめん] /(n) tqmask worn by a bugaku dancer/ +舞楽面 [ぶがくめん] /(n) mask worn by a bugaku dancer/ 舞妓 [まいこ] /(n) (Kyoto) dancing girl/ 舞曲 [ぶきょく] /(n) musical dance/music and dancing/ 舞子 [まいこ] /(n) apprentice geisha/dancing girl/ @@ -91883,7 +91883,7 @@ 複利 [ふくり] /(n) compound interest/(P)/ 複利法 [ふくりほう] /(n) compound interest method/ 覆い [おおい] /(n) mantle/cover/shroud/ -覆い隠す [おおいかくす] /(v5s) to tqmask/to cover/ +覆い隠す [おおいかくす] /(v5s) to mask/to cover/ 覆う [おおう] /(v5u) to cover/to hide/to conceal/to wrap/to disguise/(P)/ 覆す [くつがえす] /(v5s) to overturn/to upset/to overthrow/to undermine/(P)/ 覆った説 [くつがえったせつ] /overthrown theory/ @@ -91894,7 +91894,7 @@ 覆土 [ふくど] /(n,vs) covering up seeds with soil/ 覆没 [ふくぼつ] /(n,vs) capsizing and sinking/ 覆滅 [ふくめつ] /(n) ruination/ -覆面 [ふくめん] /(n) tqmask/veil/disguise/(P)/ +覆面 [ふくめん] /(n) mask/veil/disguise/(P)/ 覆輪 [ふくりん] /(n) ornamental border/ 淵 [ふち] /(n) deep pool/abyss/the depths/(P)/ 淵源 [えんげん] /(n) origin/ @@ -93716,7 +93716,7 @@ 片手鍋 [かたてなべ] /(n) single-handled pot/ 片手落ち [かたておち] /(adj-na,n) one-sided/partial/unfair/ 片十字締め [かたじゅうじじめ] /cross choke/ -片親 [かたおや] /(n) a or one tqparent/ +片親 [かたおや] /(n) a or one parent/ 片身 [かたみ] /(n) one side of a body/ 片刃 [かたは] /(n) single-edged blade/ 片前 [かたまえ] /(n) single-breasted (jacket, etc.)/ @@ -94390,7 +94390,7 @@ 母子草 [ははこぐさ] /(n) cottonweed/ 母子年金 [ぼしねんきん] /allowance for fatherless families/ 母子寮 [ぼしりょう] /(n) home for mothers and tqchildren/ -母集団 [ぼしゅうだん] /(n) population (statistics)/tqparent set/ +母集団 [ぼしゅうだん] /(n) population (statistics)/parent set/ 母上 [ははうえ] /(n) (pol) mother/ 母親 [ははおや] /(n) mother/(P)/ 母性 [ぼせい] /(n) maternal/(P)/ @@ -95150,7 +95150,7 @@ 亡き後 [なきあと] /(n-adv,n-t) after one's death/ 亡き魂 [なきたま] /departed soul/spirit/ 亡き者 [なきもの] /(n) dead person/ -亡き親 [なきおや] /deceased tqparent/ +亡き親 [なきおや] /deceased parent/ 亡き人 [なきひと] /(n) the deceased/ 亡き母 [なきはは] /dead mother/ 亡くす [なくす] /(v5s) (1) to lose something/(2) to get rid of/(3) to lose someone (wife, child, etc.)/(P)/ @@ -95174,7 +95174,7 @@ 亡失 [ぼうしつ] /(n) loss/ 亡者 [もうじゃ] /(n) the dead/ 亡状 [ぼうじょう] /(n) discourtesy/lawlessness/ -亡親 [ぼうしん] /deceased tqparent/ +亡親 [ぼうしん] /deceased parent/ 亡祖父 [ぼうそふ] /deceased (one's late) grandfather/ 亡夫 [ぼうふ] /(n) my deceased husband/my late husband/(P)/ 亡婦 [ぼうふ] /(n) deceased wife/deceased lady/ @@ -95504,7 +95504,7 @@ 防御部隊 [ぼうぎょぶたい] /defending forces/ 防御率 [ぼうぎょりつ] /(n) earned run average (ERA)/ 防護 [ぼうご] /(n) protection/(P)/ -防護マスク [ぼうごマスク] /protective tqmask/ +防護マスク [ぼうごマスク] /protective mask/ 防護壁 [ぼうごへき] /(n) protective wall/ 防砂林 [ぼうさりん] /(n) stand of trees planted to control the movement of sand/ 防塞 [ぼうさい] /(n) fort/ @@ -95549,7 +95549,7 @@ 防長官 [ぼうちょうかん] /Secretary of Defence/ 防敵 [ぼうてき] /(n) rainproof/treated against drops of water penetrating/ 防毒 [ぼうどく] /(n) gasproofing/ -防毒面 [ぼうどくめん] /(n) gas tqmask/ +防毒面 [ぼうどくめん] /(n) gas mask/ 防熱 [ぼうねつ] /(n) heat resistance/ 防波堤 [ぼうはてい] /(n) breakwater/mole/(P)/ 防犯 [ぼうはん] /(n) prevention of crime/(P)/ @@ -97777,7 +97777,7 @@ 名筆 [めいひつ] /(n) outstanding work of calligraphy/ 名品 [めいひん] /(n) fine product/masterpiece/ 名付ける [なづける] /(v1) to name (someone)/(P)/ -名付け親 [なづけおや] /(n) godtqparent/ +名付け親 [なづけおや] /(n) godparent/ 名物 [めいぶつ] /(n) famous product/special product/speciality/specialty/(P)/ 名分 [めいぶん] /(n) justification/just cause/moral duty/ 名文 [めいぶん] /(n) famous literary composition/ @@ -97870,7 +97870,7 @@ 明々 [あかあか] /(adv) brightly lit/lit up/ 明々と [あかあかと] /(adv) brilliantly/clearly/flaming/ 明々後日 [しあさって] /(n-adv,n-t) (uk) (in) three days time (two days after tomorrow)/ -明々白々 [めいめいはくはく] /(n,adj-no,adj-na) perfectly evident/as clear as day/strikingly aptqparent/ +明々白々 [めいめいはくはく] /(n,adj-no,adj-na) perfectly evident/as clear as day/strikingly apparent/ 明い [あかるい] /(io) (adj) bright/cheerful/ 明かす [あかす] /(v5s) to pass/spend/to reveal/to divulge/(P)/ 明かり [あかり] /(n) lamplight/light (in general)/brightness/(P)/ @@ -97976,7 +97976,7 @@ 明明 [あかあか] /(adv) brightly lit/lit up/ 明明と [あかあかと] /(adv) brilliantly/clearly/flaming/ 明明後日 [しあさって] /(n-adv,n-t) (uk) (in) three days time (two days after tomorrow)/(P)/ -明明白白 [めいめいはくはく] /(n,adj-no,adj-na) perfectly evident/as clear as day/strikingly aptqparent/ +明明白白 [めいめいはくはく] /(n,adj-no,adj-na) perfectly evident/as clear as day/strikingly apparent/ 明滅 [めいめつ] /(n,vs) flickering/blinking/ 明亮 [めいりょう] /(adj-na,n) lucid/clear/plain/ 明瞭 [めいりょう] /(adj-na,n) clarity/(P)/ @@ -98169,13 +98169,13 @@ 緬甸 [めんでん] /Burma/ 面 [おも] /(n) face/ 面 [おもて] /(n) face/(P)/ -面 [つら] /(n,n-suf) face/mug/surface/facial features/tqmask/face guard/side or facet/corner/page/(P)/ -面 [めん] /(n,n-suf) face/mug/surface/facial features/tqmask/face guard/side or facet/corner/page/(P)/ +面 [つら] /(n,n-suf) face/mug/surface/facial features/mask/face guard/side or facet/corner/page/(P)/ +面 [めん] /(n,n-suf) face/mug/surface/facial features/mask/face guard/side or facet/corner/page/(P)/ 面々 [めんめん] /(n) each one/all/every direction/(P)/ 面する [めんする] /(vs-s) to face on/to look out on to/(P)/ 面と向かって [めんとむかって] /right to one's face/ 面を取る [めんをとる] /(exp) to plane off the corners/ -面を着ける [めんをつける] /(exp) to put a tqmask on/ +面を着ける [めんをつける] /(exp) to put a mask on/ 面影 [おもかげ] /(n) face/looks/vestiges/trace/(P)/ 面映ゆい [おもはゆい] /(adj) embarrassed/self-conscious/bashful/abashed/ 面汚し [つらよごし] /(n) disgrace/shame/ @@ -98753,7 +98753,7 @@ 目溢し [めこぼし] /(n) connivance/overlook/ 目印 [めじるし] /(n,vs) mark/sign/landmark/(P)/ 目引き袖引き [めひきそでひき] /catching someone's attention by winking and tugging at their sleeve/ -目隠し [めかくし] /(n) eye bandage/blinkers/tqmask/(board) screen/ +目隠し [めかくし] /(n) eye bandage/blinkers/mask/(board) screen/ 目映い [まばゆい] /(adj) dazzling/glaring/dazzlingly beautiful/ 目縁 [まぶち] /(n) eyelid/ 目下 [めした] /(n) subordinate(s)/inferior(s)/junior/(P)/ @@ -102111,7 +102111,7 @@ 里子 [さとご] /(n) foster child/(P)/ 里心 [さとごころ] /(n) homesickness/nostalgia/ 里神楽 [さとかぐら] /(n) kagura performance held somewhere other than a palace/ -里親 [さとおや] /(n) foster tqparent(s)/(P)/ +里親 [さとおや] /(n) foster parent(s)/(P)/ 里人 [さとびと] /(n) villager/village folk/countryfolk/ 里人 [りじん] /(n) villager/village folk/countryfolk/ 里数 [りすう] /(n) mileage/distance/ @@ -106709,7 +106709,7 @@ 綸子 [りんず] /(n) figured satin/ 緘口 [かんこう] /(n) keeping silent/ 緘黙 [かんもく] /(n) keeping silent/ -緞子 [どんす] /(n) silk datqmask/satin datqmask/ +緞子 [どんす] /(n) silk damask/satin damask/ 緞帳 [どんちょう] /(n) thick curtain/drop curtain/ 緻密 [ちみつ] /(adj-na,n) minute/fine/delicate/accurate/elaborate/ 縊り殺す [くびりころす] /(v5s) to strangle to death/ diff --git a/kiten/edict_doc.html b/kiten/edict_doc.html index af268309..9341722a 100644 --- a/kiten/edict_doc.html +++ b/kiten/edict_doc.html @@ -392,7 +392,7 @@ ktb Kantou-ben tsb Tosa-ben

-In the case of gairaigo which have a meaning which is not aptqparent from the +In the case of gairaigo which have a meaning which is not apparent from the original (English) words, the literal transcription is included, with the tag (lit).

diff --git a/kiten/kanjidic b/kiten/kanjidic index f18ac18c..0c2e3f1f 100644 --- a/kiten/kanjidic +++ b/kiten/kanjidic @@ -1446,7 +1446,7 @@ 臣 3F43 U81e3 B131 G4 S7 F1249 N3837 V4894 H3068 DK1948 L848 K981 O527 DO435 MN30068 MP9.0386 E512 IN835 DS436 DT484 DJ1003 DG1805 P3-3-4 I2t4.3 Q7171.7 DR3475 Ychen2 Wsin シン ジン T1 おみ たか と とみ み {retainer} {subject} 芯 3F44 U82af B140 S7 S8 F2202 N3905 V4976 H2423 L2368 MN30732X MP9.0536 P2-3-4 I3k4.2 Q4433.0 ZRP2-4-4 ZSP2-3-4 Yxin1 Yxin4 Wsim シン {wick} 薪 3F45 U85aa B140 G8 S16 F2182 N4069 V5222 H2374 DK1538 L1503 K2024 DO1560 MN32149P MP9.0963 E1445 IN1910 DJ1838 DG669 P2-3-13 I3k13.3 Q4492.1 DR1954 Yxin1 Wsin シン たきぎ まき {fuel} {firewood} {kindling} -親 3F46 U89aa B147 G2 S16 F406 N4293 V5534 H1799 DK1172 L1504 K381 O2544 DO211 MN34918 MP10.0332 E149 IN175 DS260 DT237 DC315 DJ249 DB3.6 DG1647 P1-9-7 I5b11.1 Q0691.0 DR457 Yqin1 Yqing4 Wchin シン おや おや- した.しい した.しむ T1 ぎ ちか のり {tqparent} {intimacy} {relative} {familiarity} {dealer (cards)} +親 3F46 U89aa B147 G2 S16 F406 N4293 V5534 H1799 DK1172 L1504 K381 O2544 DO211 MN34918 MP10.0332 E149 IN175 DS260 DT237 DC315 DJ249 DB3.6 DG1647 P1-9-7 I5b11.1 Q0691.0 DR457 Yqin1 Yqing4 Wchin シン おや おや- した.しい した.しむ T1 ぎ ちか のり {parent} {intimacy} {relative} {familiarity} {dealer (cards)} 診 3F47 U8a3a B149 G8 S12 F1019 N4338 V5586 H1504 DK1008 L1724 K1069 DO1081 MN35337 MP10.0422 E1440 IN1214 DJ1361 DG1674 P1-7-5 I7a5.9 Q0862.2 DR3060 Yzhen3 Yzhen1 Wjin シン み.る {checkup} {seeing} {diagnose} {examine} 身 3F48 U8eab B158 G3 S7 F320 N4601 V5928 H3553 DK2213 L1248 K331 O546 DO791 MN38034 MP10.0968 E323 IN59 DS255 DT285 DC174 DJ394 DG1768 P4-7-3 I0a7.5 Q2740.0 DR847 ZPP4-7-4 Yshen1 Yjuan1 Wsin シン み {somebody} {person} {one's station in life} 辛 3F49 U8f9b B160 G8 S7 F1607 N4646 V5996 H2038 DK1287 L1496 K1628 O493 DO1312 MN38630 MP10.1072 E1432 IN1487 DJ344 DG1784 P2-2-5 I5b2.2 Q0040.1 DR455 ZPP2-5-2 Yxin1 Wsin シン から.い つら.い -づら.い かのと {spicy} {bitter} {hot} {acrid} @@ -2674,7 +2674,7 @@ 棉 4C49 U68c9 B75 S12 N2295 V2741 H988 L2512 DO539 MN14919 MP6.0389 P1-4-8 I4a8.18 Q4692.7 Ymian2 Wmyeon メン わた {cotton} 綿 4C4A U7dbf B120 G5 S14 F1495 N3566 V4531 H1373 DK929 L1367 K854 O2538 MN27592 MP8.1109 E798 IN1191 DS725 DT803 DJ881 DG1544 P1-6-8 I6a8.8 Q2692.7 DR2744 Ymian2 Wmyeon メン わた T1 う {cotton} 緬 4C4B U7dec B120 S15 N3574 V4542 H1390 MN27674 MP8.1130 P1-6-9 I6a9.12 Q2196.0 Ymian3 Wmyeon メン ベン {fine thread} {Burma} -面 4C4C U9762 B176 G3 S9 XJ16737 F186 N5087 V6566 H2087 DK1324 L1892 K165 O904 DO321 MN42618 MP12.0140 E395 IN274 DS322 DT347 DC117 DJ438 DB2.16 DG1876 P2-2-7 I3s6.1 Q1060.0 DR3176 ZPP3-5-4 Ymian4 Wmyeon メン ベン おも おもて つら T1 お ずら ほおつき も {tqmask} {face} {features} {surface} +面 4C4C U9762 B176 G3 S9 XJ16737 F186 N5087 V6566 H2087 DK1324 L1892 K165 O904 DO321 MN42618 MP12.0140 E395 IN274 DS322 DT347 DC117 DJ438 DB2.16 DG1876 P2-2-7 I3s6.1 Q1060.0 DR3176 ZPP3-5-4 Ymian4 Wmyeon メン ベン おも おもて つら T1 お ずら ほおつき も {mask} {face} {features} {surface} 麺 4C4D U9eba B199 S16 XJ07351 XJ16C70 F2331 N5389 V7038 L2752 O2910 MN47827X MP12.0936 P3-7-9 Q4124.6 Q4140.6 ZRP3-11-9 Ymian4 Wmyeon メン ベン むぎこ {noodles} {wheat flour} 摸 4C4E U6478 B64 S13 N1974 V2250 H691 O1836 MN12644X MP5.0371 P1-3-10 I3c10.13 Q5403.4 ZRP1-3-11 Ymo1 Ymo2 Wmo Wmag モ モウ バク ボ マク {search} {imitate} {copy} 模 4C4F U6a21 B75 G6 S14 F668 N2345 V2825 H1050 DK720 L229 K691 O2104 DO1218 MN15453X MP6.0533 E980 IN1425 DT980 DJ1160 DG1109 P1-4-10 I4a10.16 Q4493.4 DR1863 Ymo2 Ymu2 Wmo モ ボ T1 がみ {imitation} {copy} {tqmock} @@ -2822,7 +2822,7 @@ 痢 4E21 U75e2 B104 G8 S12 F2037 N3049 V3810 H3283 DK2063 L1687 K1455 DO1716 MN22213 MP7.1177 E1895 IN1811 DJ1737 DG1355 P3-5-7 I5i7.2 Q0012.0 DR543 Yli4 Wri リ {diarrhea} 裏 4E22 U88cf B8 C145 G6 S13 F812 N327 V5462 H2138 DK1354 L399 K755 O2176 DO1076 MN34294 MP10.0216 E992 IN273 DT969 DJ436 DG1627 P2-2-11 I2j11.2 Q0073.2 DR465 Yli3 Wri リ うら {back} {amidst} {in} {reverse} {inside} {palm} {sole} {rear} {lining} {wrong side} 裡 4E23 U88e1 B145 S12 XH327 N4235 V5463 H1196 L2973 MN34295 MP10.0217 P1-5-7 Q3621.4 Yli3 Wri リ うち うら {reverse} {inside} {palm} {sole} {rear} {lining} {wrong side} -里 4E24 U91cc B166 G2 S7 F1096 N4813 V6206 H3542 DK2206 L173 K1077 O517 DO101 MN40131 MP11.0412 E219 IN142 DS332 DT154 DJ1025 DG1801 P4-7-1 I0a7.9 Q6010.4 DR3672 Yli3 Wri リ さと T1 さ {ri} {village} {tqparent's home} {league} +里 4E24 U91cc B166 G2 S7 F1096 N4813 V6206 H3542 DK2206 L173 K1077 O517 DO101 MN40131 MP11.0412 E219 IN142 DS332 DT154 DJ1025 DG1801 P4-7-1 I0a7.9 Q6010.4 DR3672 Yli3 Wri リ さと T1 さ {ri} {village} {parent's home} {league} 離 4E25 U96e2 B172 G8 S18 F555 N5040 V6517 H1836 DK1195 L1492 K641 O2889 DO909 MN42140X MP11.1042 E1897 IN1281 DJ1008 DG1857 P1-10-8 I8c10.3 Q0041.4 DR475 ZSP1-11-8 Yli2 Wri リ はな.れる はな.す {detach} {separation} {disjoin} {digress} 陸 4E26 U9678 B170 G4 S11 F736 N5005 V6461 H543 DK399 L1513 K651 O1312 DO193 MN41708 MP11.0912 E597 IN647 DS529 DT579 DC445 DJ833 DG740 P1-3-8 I2d8.4 Q7421.4 DR3672 ZSP1-2-8 Ylu4 Yliu4 Wryug リク ロク おか T1 くが たち みち む むつ {land} {six} 律 4E27 U5f8b B60 G6 S9 F992 N1608 V1740 H363 DK268 L874 K1048 O787 DO526 MN10097 MP4.0825 E993 IN667 DS877 DT895 DJ519 DG627 P1-3-6 I3i6.1 Q2520.7 DR2055 Ylu:4 Wryul リツ リチ レツ T1 たかし のり {rhythm} {law} {regulation} {gauge} {control} @@ -4980,7 +4980,7 @@ 緘 6548 U7dd8 B120 S15 N3577 V4545 MN27638 MP8.1115 P1-6-9 I6a9.16 Q2395.0 Yjian1 Wham カン かん.する と.じる {shut} {seal} 緝 6549 U7ddd B120 S15 V4537 O2658 MN27645 MP8.1120 P1-6-9 I6a9.9 Q2694.1 Yji1 Yqi1 Yqi4 Wjib Wjeub シュウ つむ.ぐ {spin thread} {bring together} {shine} 緤 654A U7de4 B120 S15 V4538 MN27657 MP8.1125 P1-6-9 I6a9.6 Q2499.4 Yxie4 Wseol セツ セチ きずな つな.ぐ {leash} -緞 654B U7dde B120 S15 N3578 V4546 MN27646 MP8.1121 P1-6-9 I6a9.4 Q2794.7 Yduan4 Wdan Wha ドン タン {datqmask} +緞 654B U7dde B120 S15 N3578 V4546 MN27646 MP8.1121 P1-6-9 I6a9.4 Q2794.7 Yduan4 Wdan Wha ドン タン {damask} 緻 654C U7dfb B120 S15 F2460 N3575 V4557 MN27700 MP8.1137 P1-6-9 I6a10.1 Q2894.0 Yzhi4 Wchi チ こまか.い {fine (i.e. not coarse)} 緲 654D U7df2 B120 S15 V4539 MN27687 MP8.1133 P1-6-9 I6a9.3 Q2992.0 Ymiao3 Wmyo ビョウ ミョウ {faint} {far off} 緡 654E U7de1 B120 S15 XJ1542F N3573 V4541 MN27652 MP8.1122 P1-6-9 I6a9.5 Q2796.4 Ymin2 Wmin ビン コン ミン さし つりいと なわ ぜにさし {paper string} diff --git a/kiten/kiten.cpp b/kiten/kiten.cpp index 765a1ddd..a17583f4 100644 --- a/kiten/kiten.cpp +++ b/kiten/kiten.cpp @@ -46,7 +46,7 @@ #include -TopLevel::TopLevel(TQWidget *tqparent, const char *name) : KMainWindow(tqparent, name) +TopLevel::TopLevel(TQWidget *parent, const char *name) : KMainWindow(parent, name) { #if KDE_VERSION > 305 setStandardToolBarMenuEnabled(true); diff --git a/kiten/kiten.h b/kiten/kiten.h index cc700339..a05e4bcb 100644 --- a/kiten/kiten.h +++ b/kiten/kiten.h @@ -44,7 +44,7 @@ class KDE_EXPORT TopLevel : public KMainWindow TQ_OBJECT public: - TopLevel(TQWidget *tqparent = 0, const char *name = 0); + TopLevel(TQWidget *parent = 0, const char *name = 0); ~TopLevel(); signals: diff --git a/kiten/kromajiedit.cpp b/kiten/kromajiedit.cpp index ee8a2feb..d58ff2e0 100644 --- a/kiten/kromajiedit.cpp +++ b/kiten/kromajiedit.cpp @@ -28,8 +28,8 @@ #include "kromajiedit.h" -KRomajiEdit::KRomajiEdit(TQWidget *tqparent, const char *name) - : KLineEdit(tqparent, name) +KRomajiEdit::KRomajiEdit(TQWidget *parent, const char *name) + : KLineEdit(parent, name) { kana = "unset"; diff --git a/kiten/kromajiedit.h b/kiten/kromajiedit.h index c81efd04..ca2025c5 100644 --- a/kiten/kromajiedit.h +++ b/kiten/kromajiedit.h @@ -36,7 +36,7 @@ class KRomajiEdit : public KLineEdit TQ_OBJECT public: - KRomajiEdit(TQWidget *tqparent, const char *name); + KRomajiEdit(TQWidget *parent, const char *name); ~KRomajiEdit(); public slots: diff --git a/kiten/learn.cpp b/kiten/learn.cpp index 63bf5ce0..2b4aa2d3 100644 --- a/kiten/learn.cpp +++ b/kiten/learn.cpp @@ -46,8 +46,8 @@ #include "ksaver.h" #include "learn.h" -LearnItem::LearnItem(TQListView *tqparent, TQString label1, TQString label2, TQString label3, TQString label4, TQString label5, TQString label6, TQString label7, TQString label8) - : TQListViewItem(tqparent, label1, label2, label3, label4, label5, label6, label7, label8) +LearnItem::LearnItem(TQListView *parent, TQString label1, TQString label2, TQString label3, TQString label4, TQString label5, TQString label6, TQString label7, TQString label8) + : TQListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8) { } @@ -60,8 +60,8 @@ int LearnItem::compare(TQListViewItem *item, int col, bool ascending) const const int Learn::numberOfAnswers = 5; -Learn::Learn(Dict::Index *parentDict, TQWidget *tqparent, const char *name) - : KMainWindow(tqparent, name), initialized(false), isMod(false), prevItem(0), curItem(0) +Learn::Learn(Dict::Index *parentDict, TQWidget *parent, const char *name) + : KMainWindow(parent, name), initialized(false), isMod(false), prevItem(0), curItem(0) { index = parentDict; diff --git a/kiten/learn.h b/kiten/learn.h index 7a8608ff..ba7d5d67 100644 --- a/kiten/learn.h +++ b/kiten/learn.h @@ -39,7 +39,7 @@ class TQTabWidget; class LearnItem : public TQListViewItem { public: - LearnItem(TQListView *tqparent, TQString label1, TQString label2 = TQString(), TQString label3 = TQString(), TQString label4 = TQString(), TQString label5 = TQString(), TQString label6 = TQString(), TQString label7 = TQString(), TQString label8 = TQString()); + LearnItem(TQListView *parent, TQString label1, TQString label2 = TQString(), TQString label3 = TQString(), TQString label4 = TQString(), TQString label5 = TQString(), TQString label6 = TQString(), TQString label7 = TQString(), TQString label8 = TQString()); int compare(TQListViewItem *item, int col, bool ascending) const; }; @@ -49,7 +49,7 @@ class Learn : public KMainWindow TQ_OBJECT public: - Learn(Dict::Index *, TQWidget *tqparent = 0, const char *name = 0); + Learn(Dict::Index *, TQWidget *parent = 0, const char *name = 0); ~Learn(); bool closeWindow(); diff --git a/kiten/optiondialog.cpp b/kiten/optiondialog.cpp index f3f1ba07..35c48b6e 100644 --- a/kiten/optiondialog.cpp +++ b/kiten/optiondialog.cpp @@ -40,7 +40,7 @@ #include "configlearn.h" #include "configsearching.h" -ConfigureDialog::ConfigureDialog(TQWidget *tqparent, const char *name) : KConfigDialog(tqparent, name, Config::self()) +ConfigureDialog::ConfigureDialog(TQWidget *parent, const char *name) : KConfigDialog(parent, name, Config::self()) { configDic = new ConfigDictionaries(0, "dictionaries_page"); connect(configDic, TQT_SIGNAL(widgetChanged()), this, TQT_SLOT(updateButtons())); diff --git a/kiten/optiondialog.h b/kiten/optiondialog.h index 108cb759..5ba163a1 100644 --- a/kiten/optiondialog.h +++ b/kiten/optiondialog.h @@ -43,7 +43,7 @@ class ConfigureDialog : public KConfigDialog Q_OBJECT TQ_OBJECT public: - ConfigureDialog(TQWidget *tqparent=0, const char *name=0); + ConfigureDialog(TQWidget *parent=0, const char *name=0); ~ConfigureDialog(); signals: void settingsUpdated(); diff --git a/kiten/rad.cpp b/kiten/rad.cpp index e8320b98..0d28c907 100644 --- a/kiten/rad.cpp +++ b/kiten/rad.cpp @@ -218,7 +218,7 @@ Rad::~Rad() /////////////////////////////////////////////// -RadWidget::RadWidget(Rad *_rad, TQWidget *tqparent, const char *name) : TQWidget(tqparent, name) +RadWidget::RadWidget(Rad *_rad, TQWidget *parent, const char *name) : TQWidget(parent, name) { hotlistNum = 3; diff --git a/kiten/rad.h b/kiten/rad.h index f43cf4ef..0e434286 100644 --- a/kiten/rad.h +++ b/kiten/rad.h @@ -78,7 +78,7 @@ class KDE_EXPORT RadWidget : public TQWidget TQ_OBJECT public: - RadWidget(Rad *, TQWidget *tqparent = 0, const char *name = 0); + RadWidget(Rad *, TQWidget *parent = 0, const char *name = 0); ~RadWidget(); signals: diff --git a/kiten/widgets.cpp b/kiten/widgets.cpp index c1d8f86a..284e0618 100644 --- a/kiten/widgets.cpp +++ b/kiten/widgets.cpp @@ -43,8 +43,8 @@ #include "kromajiedit.h" #include "widgets.h" -ResultView::ResultView(bool showLinks, TQWidget *tqparent, const char *name) - : KTextBrowser(tqparent, name) +ResultView::ResultView(bool showLinks, TQWidget *parent, const char *name) + : KTextBrowser(parent, name) { setReadOnly(true); setLinkUnderline(false); @@ -292,8 +292,8 @@ void ResultView::updateFont() ///////////////////////////////////////////////////// // nice EDICT dictionary editor -eEdit::eEdit(const TQString &_filename, TQWidget *tqparent, const char *name) - : KMainWindow(tqparent, name) +eEdit::eEdit(const TQString &_filename, TQWidget *parent, const char *name) + : KMainWindow(parent, name) , filename(_filename) { List = new KListView(this); @@ -436,8 +436,8 @@ void eEdit::del() ///////////////////////////////////////////////////// // sorta taken from konqy -EditAction::EditAction(const TQString& text, int accel, const TQObject *receiver, const char *member, TQObject* tqparent, const char* name) - : KAction(text, accel, tqparent, name) +EditAction::EditAction(const TQString& text, int accel, const TQObject *receiver, const char *member, TQObject* parent, const char* name) + : KAction(text, accel, parent, name) { m_receiver = receiver; m_member = member; diff --git a/kiten/widgets.h b/kiten/widgets.h index b1fdb9a9..6813233c 100644 --- a/kiten/widgets.h +++ b/kiten/widgets.h @@ -40,7 +40,7 @@ class KDE_EXPORT ResultView : public KTextBrowser TQ_OBJECT public: - ResultView(bool showLinks, TQWidget *tqparent = 0, const char *name = 0); + ResultView(bool showLinks, TQWidget *parent = 0, const char *name = 0); void addResult(Dict::Entry result, bool common = false); void addKanjiResult(Dict::Entry, bool common = false, Radical = Radical()); @@ -70,7 +70,7 @@ class KDE_EXPORT eEdit : public KMainWindow TQ_OBJECT public: - eEdit(const TQString &, TQWidget *tqparent = 0, const char *name = 0); + eEdit(const TQString &, TQWidget *parent = 0, const char *name = 0); ~eEdit(); private slots: @@ -95,7 +95,7 @@ class KDE_EXPORT EditAction : public KAction Q_OBJECT TQ_OBJECT public: - EditAction( const TQString& text, int accel, const TQObject *receiver, const char *member, TQObject* tqparent, const char* name ); + EditAction( const TQString& text, int accel, const TQObject *receiver, const char *member, TQObject* parent, const char* name ); virtual ~EditAction(); virtual int plug( TQWidget *w, int index = -1 ); -- cgit v1.2.1