Rename obsolete tq methods to standard names

9 files changed, 44 insertions, 44 deletions

diff --git a/kiten/configdictionariesbase.ui b/kiten/configdictionariesbase.ui
index 6ef31c7f..3ad28605 100644
--- a/kiten/configdictionariesbase.ui
+++ b/kiten/configdictionariesbase.ui
@@ -36,7 +36,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout52_2</cstring>
+                            <cstring>layout52_2</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -47,7 +47,7 @@
                             </property>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout43_2</cstring>
+                                    <cstring>layout43_2</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -82,7 +82,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout51_2</cstring>
+                                    <cstring>layout51_2</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -117,7 +117,7 @@
                                     </widget>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout50_2</cstring>
+                                            <cstring>layout50_2</cstring>
                                         </property>
                                         <vbox>
                                             <property name="name">
@@ -177,7 +177,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout52</cstring>
+                            <cstring>layout52</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -185,7 +185,7 @@
                             </property>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout43</cstring>
+                                    <cstring>layout43</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -220,7 +220,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout51</cstring>
+                                    <cstring>layout51</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -255,7 +255,7 @@
                                     </widget>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout50</cstring>
+                                            <cstring>layout50</cstring>
                                         </property>
                                         <vbox>
                                             <property name="name">
diff --git a/kiten/configlearn.ui b/kiten/configlearn.ui
index 26072ac2..03ae9d0d 100644
--- a/kiten/configlearn.ui
+++ b/kiten/configlearn.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout12</cstring>
+                <cstring>layout12</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -65,7 +65,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout13</cstring>
+                                <cstring>layout13</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
diff --git a/kiten/configsearching.ui b/kiten/configsearching.ui
index 39f7012b..82895d3c 100644
--- a/kiten/configsearching.ui
+++ b/kiten/configsearching.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout9</cstring>
+                <cstring>layout9</cstring>
             </property>
             <vbox>
                 <property name="name">
diff --git a/kiten/dict.cpp b/kiten/dict.cpp
index 0b86e906..1e605ac3 100644
--- a/kiten/dict.cpp
+++ b/kiten/dict.cpp
@@ -50,7 +50,7 @@ using namespace Dict;
 
 TextType Dict::textType(const TQString &text)
 {
-	ushort first = text.at(0).tqunicode();
+	ushort first = text.at(0).unicode();
 	
 	if (first < 0x3000)
 		return Text_Latin;
diff --git a/kiten/edict b/kiten/edict
index 55456bca..2a5ae421 100644
--- a/kiten/edict
+++ b/kiten/edict
@@ -6892,7 +6892,7 @@
 コマソン /(abbr) commercial song/commercial jingle/
 コマンド /(n) (1) (computer) command/(2) commando/(P)/
 コマンドモジュール /command module/
-コマ割り [コマわり] /panel tqlayout/
+コマ割り [コマわり] /panel layout/
 コミカル /(adj-na,n) comical/(P)/
 コミケット /(abbr) comic market/convention where amateur manga artists sell their work/
 コミック /(adj-na,n) comic books/comics/(P)/
@@ -14625,7 +14625,7 @@
 プランテーション /plantation/
 プラント /(n) plant/(P)/
 プラントリノベーション /plant renovation/
-プラントレイアウト /plant tqlayout/
+プラントレイアウト /plant layout/
 プラント輸出 [プラントゆしゅつ] /(n) export of manufacturing plant/
 プランナー /(n) planner/(P)/
 プランニング /(n) planning/(P)/
@@ -17996,8 +17996,8 @@
 レア /rare/(P)/
 レアメタル /rare metal/
 レイ /(n) (1) lei/(2) ray/(P)/
-レイアウト /(n) tqlayout/(P)/
-レイアウトシステム /tqlayout-system/
+レイアウト /(n) layout/(P)/
+レイアウトシステム /layout-system/
 レイアップ /(n,vs) lay-up/
 レイオフ /(n) layoff/(P)/
 レイシズム /racism/
@@ -29946,7 +29946,7 @@
 割り麦 [わりむぎ] /(n) ground barley/
 割り箸 [わりばし] /(n) splittable (wood) chopsticks/(P)/
 割り判 [わりばん] /(n) seal over the edges of adjacent sheets/
-割り付け [わりつけ] /(n) allotment/assignment/allocation/distribution/tqlayout/editing/
+割り付け [わりつけ] /(n) allotment/assignment/allocation/distribution/layout/editing/
 割り付ける [わりつける] /(v1) to allot/to distribute/to lay out/to divide among/to assign/
 割り普請 [わりぶしん] /dividing work among several contractors/
 割り符 [わりふ] /(n) tally/score/check/
@@ -30014,8 +30014,8 @@
 割麦 [わりむぎ] /(n) ground barley/
 割箸 [わりばし] /(n) splittable (wood) chopsticks/
 割判 [わりはん] /(n) tally impression/
-割付 [わりつけ] /(n) allotment/assignment/allocation/distribution/tqlayout/editing/
-割付け [わりつけ] /(n) allotment/assignment/allocation/distribution/tqlayout/editing/
+割付 [わりつけ] /(n) allotment/assignment/allocation/distribution/layout/editing/
+割付け [わりつけ] /(n) allotment/assignment/allocation/distribution/layout/editing/
 割付ける [わりつける] /(v1) to allot/to distribute/to lay out/to divide among/to assign/
 割付る [わりつける] /(v1) to allot/to distribute/to lay out/to divide among/to assign/
 割符 [わりふ] /(n) tally/score/check/
@@ -52182,7 +52182,7 @@
 字数 [じすう] /(n) number of characters or letters/(P)/
 字体 [じたい] /(n) type/font/lettering/(P)/
 字典 [じてん] /(n) character dictionary/
-字配り [じくばり] /(n) word or letter tqlayout/
+字配り [じくばり] /(n) word or letter layout/
 字母 [じぼ] /(n) letter (of the alphabet)/phonetic script/
 字幕 [じまく] /(n) title/subtitle/(P)/
 字面 [じづら] /(n) impression derived from or appearance of kanji/face/appearance of written words/
@@ -75370,7 +75370,7 @@
 地質図 [ちしつず] /(n) geological map/
 地質調査 [ちしつちょうさ] /geological survey/
 地主 [じぬし] /(n) landlord/(P)/
-地取り [じどり] /(n) tqlayout/obtaining land/
+地取り [じどり] /(n) layout/obtaining land/
 地酒 [じざけ] /(n) local sake/
 地所 [じしょ] /(n) estate/
 地上 [ちじょう] /(n) above ground/(P)/
@@ -93602,7 +93602,7 @@
 変曲点 [へんきょくてん] /inflection point/
 変型 [へんけい] /(n) variety/variation/
 変形 [へんけい] /(n,vs) transformation/variation/metamorphosis/modification/deformation/variety/deformity/monster/(P)/
-変形ゴマ [へんけいゴマ] /arbitrary panel tqlayout/
+変形ゴマ [へんけいゴマ] /arbitrary panel layout/
 変形規則 [へんけいきそく] /(n) transformational rule/
 変形生成統語論 [へんけいせいせいとうごろん] /(n) transformational generative syntax/
 変形虫類 [へんけいちゅうるい] /the amoeba/
diff --git a/kiten/edict_doc.html b/kiten/edict_doc.html
index 9341722a..fc52d1e4 100644
--- a/kiten/edict_doc.html
+++ b/kiten/edict_doc.html
@@ -181,7 +181,7 @@ each dictionary unique (and copyrightable) is the particular selection of
 words, the phrasing of the meanings, the presentation of the contents (a very 
 important point in the case of EDICT), and the means of publication. Of 
 course, the fact that for the most part the kanji and kana of each entry are 
-coming from public sources, and the structure and tqlayout of the entries 
+coming from public sources, and the structure and layout of the entries 
 themselves are quite unlike those in any published dictionary, adds a degree 
 of protection to EDICT. 
 </P>
diff --git a/kiten/kiten.cpp b/kiten/kiten.cpp
index 53b52a46..406554a8 100644
--- a/kiten/kiten.cpp
+++ b/kiten/kiten.cpp
@@ -257,7 +257,7 @@ void TopLevel::handleSearchResult(Dict::SearchResult results)
 
 			addAction->setEnabled(true);
 
-			_ResultView->append(TQString("<p>%1</p>").arg(i18n("HTML Entity: %1").arg(TQString("&amp;#x%1;").arg(TQString::number(toAddKanji.kanji().at(0).tqunicode(), 16))))); // show html entity
+			_ResultView->append(TQString("<p>%1</p>").arg(i18n("HTML Entity: %1").arg(TQString("&amp;#x%1;").arg(TQString::number(toAddKanji.kanji().at(0).unicode(), 16))))); // show html entity
 
 			// now show some compounds in which this kanji appears
 			TQString kanji = toAddKanji.kanji();
@@ -529,9 +529,9 @@ void TopLevel::gradeSearch()
 
 TQString TopLevel::clipBoardText() // gets text from clipboard for globalaccels
 {
-	kapp->tqclipboard()->setSelectionMode(true);
-	TQString text = kapp->tqclipboard()->text().stripWhiteSpace();
-	kapp->tqclipboard()->setSelectionMode(false);
+	kapp->clipboard()->setSelectionMode(true);
+	TQString text = kapp->clipboard()->text().stripWhiteSpace();
+	kapp->clipboard()->setSelectionMode(false);
 
 	return text;
 }
diff --git a/kiten/learn.cpp b/kiten/learn.cpp
index 16c5baeb..cc65cd35 100644
--- a/kiten/learn.cpp
+++ b/kiten/learn.cpp
@@ -138,12 +138,12 @@ Learn::Learn(Dict::Index *parentDict, TQWidget *parent, const char *name)
 	TQVBoxLayout *quizLayout = new TQVBoxLayout(quizTop, KDialog::marginHint(), KDialog::spacingHint());
 
 	quizLayout->addStretch();
-	TQHBoxLayout *htqlayout = new TQHBoxLayout(quizLayout);
+	TQHBoxLayout *hlayout = new TQHBoxLayout(quizLayout);
 	qKanji = new TQPushButton(quizTop);
 	connect(qKanji, TQT_SIGNAL(clicked()), this, TQT_SLOT(qKanjiClicked()));
-	htqlayout->addStretch();
-	htqlayout->addWidget(qKanji);
-	htqlayout->addStretch();
+	hlayout->addStretch();
+	hlayout->addWidget(qKanji);
+	hlayout->addStretch();
 	quizLayout->addStretch();
 
 	answers = new TQButtonGroup(1,Qt::Horizontal, quizTop);
diff --git a/kiten/rad.cpp b/kiten/rad.cpp
index 0d28c907..ab03e0c7 100644
--- a/kiten/rad.cpp
+++ b/kiten/rad.cpp
@@ -223,12 +223,12 @@ RadWidget::RadWidget(Rad *_rad, TQWidget *parent, const char *name) : TQWidget(p
 	hotlistNum = 3;
 
 	rad = _rad;
-	TQHBoxLayout *htqlayout = new TQHBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-	TQVBoxLayout *vtqlayout = new TQVBoxLayout(htqlayout, KDialog::spacingHint());
+	TQHBoxLayout *hlayout = new TQHBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+	TQVBoxLayout *vlayout = new TQVBoxLayout(hlayout, KDialog::spacingHint());
 
 	hotlistGroup = new TQButtonGroup(1,Qt::Horizontal, i18n("Hotlist"), this);
 	//hotlistGroup->setRadioButtonExclusive(true);
-	vtqlayout->addWidget(hotlistGroup);
+	vlayout->addWidget(hotlistGroup);
 
 	Config* config = Config::self();
 
@@ -246,13 +246,13 @@ RadWidget::RadWidget(Rad *_rad, TQWidget *parent, const char *name) : TQWidget(p
 	}
 	connect(hotlistGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(hotlistClicked(int)));
 
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(vtqlayout, KDialog::spacingHint());
+	TQVBoxLayout *layout = new TQVBoxLayout(vlayout, KDialog::spacingHint());
 
 	totalStrokes = new TQCheckBox(i18n("Search by total strokes"), this);
 	connect(totalStrokes, TQT_SIGNAL(clicked()), this, TQT_SLOT(totalClicked()));
-	tqlayout->addWidget(totalStrokes);
+	layout->addWidget(totalStrokes);
 
-	TQHBoxLayout *strokesLayout = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
+	TQHBoxLayout *strokesLayout = new TQHBoxLayout(layout, KDialog::spacingHint());
 	totalSpin = new TQSpinBox(1, 30, 1, this);
 	strokesLayout->addWidget(totalSpin);
 	strokesLayout->addStretch();
@@ -264,13 +264,13 @@ RadWidget::RadWidget(Rad *_rad, TQWidget *parent, const char *name) : TQWidget(p
 	ok = new KPushButton(i18n("&Look Up"), this);
 	ok->setEnabled(false);
 	connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(apply()));
-	tqlayout->addWidget(ok);
+	layout->addWidget(ok);
 	cancel = new KPushButton( KStdGuiItem::cancel(), this );
 
 	connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(close()));
-	tqlayout->addWidget(cancel);
+	layout->addWidget(cancel);
 
-	TQVBoxLayout *middlevLayout = new TQVBoxLayout(htqlayout, KDialog::spacingHint());
+	TQVBoxLayout *middlevLayout = new TQVBoxLayout(hlayout, KDialog::spacingHint());
 
 	strokesSpin = new TQSpinBox(1, 17, 1, this);
 	TQToolTip::add(strokesSpin, i18n("Show radicals having this number of strokes"));
@@ -281,18 +281,18 @@ RadWidget::RadWidget(Rad *_rad, TQWidget *parent, const char *name) : TQWidget(p
 	connect(List, TQT_SIGNAL(executed(TQListBoxItem *)), this, TQT_SLOT(executed(TQListBoxItem *)));
 	connect(strokesSpin, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateList(int)));
 
-	TQVBoxLayout *rightvtqlayout = new TQVBoxLayout(htqlayout, KDialog::spacingHint());
+	TQVBoxLayout *rightvlayout = new TQVBoxLayout(hlayout, KDialog::spacingHint());
 	selectedList = new KListBox(this);
-	rightvtqlayout->addWidget(selectedList);
+	rightvlayout->addWidget(selectedList);
 	connect(selectedList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged()));
 
 	remove = new KPushButton(i18n("&Remove"), this);
-	rightvtqlayout->addWidget(remove);
+	rightvlayout->addWidget(remove);
 	connect(remove, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeSelected()));
 	remove->setEnabled(false);
 
 	clear = new KPushButton(KStdGuiItem::clear(), this);
-	rightvtqlayout->addWidget(clear);
+	rightvlayout->addWidget(clear);
 	connect(clear, TQT_SIGNAL(clicked()), this, TQT_SLOT(clearSelected()));
 	clear->setEnabled(false);