Revert automated changes

Sorry guys, they are just not ready for prime time
Work will continue as always


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

16 files changed, 84 insertions, 84 deletions

diff --git a/kiten/configdictionariesbase.ui b/kiten/configdictionariesbase.ui
index 7e247fe6..faf52680 100644
--- a/kiten/configdictionariesbase.ui
+++ b/kiten/configdictionariesbase.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>ConfigDictionariesBase</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -36,7 +36,7 @@
                     </property>
                     <widget class="QLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout52_2</cstring>
+                            <cstring>layout52_2</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -47,7 +47,7 @@
                             </property>
                             <widget class="QLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout43_2</cstring>
+                                    <cstring>layout43_2</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -71,7 +71,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>40</width>
                                                 <height>20</height>
@@ -82,7 +82,7 @@
                             </widget>
                             <widget class="QLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout51_2</cstring>
+                                    <cstring>layout51_2</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -117,7 +117,7 @@
                                     </widget>
                                     <widget class="QLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout50_2</cstring>
+                                            <cstring>layout50_2</cstring>
                                         </property>
                                         <vbox>
                                             <property name="name">
@@ -149,7 +149,7 @@
                                                 <property name="sizeType">
                                                     <enum>Expanding</enum>
                                                 </property>
-                                                <property name="tqsizeHint">
+                                                <property name="sizeHint">
                                                     <size>
                                                         <width>20</width>
                                                         <height>120</height>
@@ -177,7 +177,7 @@
                     </property>
                     <widget class="QLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout52</cstring>
+                            <cstring>layout52</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -185,7 +185,7 @@
                             </property>
                             <widget class="QLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout43</cstring>
+                                    <cstring>layout43</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -209,7 +209,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>40</width>
                                                 <height>20</height>
@@ -220,7 +220,7 @@
                             </widget>
                             <widget class="QLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout51</cstring>
+                                    <cstring>layout51</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -255,7 +255,7 @@
                                     </widget>
                                     <widget class="QLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout50</cstring>
+                                            <cstring>layout50</cstring>
                                         </property>
                                         <vbox>
                                             <property name="name">
@@ -287,7 +287,7 @@
                                                 <property name="sizeType">
                                                     <enum>Expanding</enum>
                                                 </property>
-                                                <property name="tqsizeHint">
+                                                <property name="sizeHint">
                                                     <size>
                                                         <width>20</width>
                                                         <height>120</height>
@@ -305,7 +305,7 @@
         </widget>
     </hbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>klistview.h</includehint>
diff --git a/kiten/configfont.ui b/kiten/configfont.ui
index 522befb1..9ad6936c 100644
--- a/kiten/configfont.ui
+++ b/kiten/configfont.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>ConfigFont</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -26,7 +26,7 @@
         </widget>
     </hbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kfontdialog.h</includehint>
 </includehints>
diff --git a/kiten/configlearn.ui b/kiten/configlearn.ui
index edc1a8b2..b101de38 100644
--- a/kiten/configlearn.ui
+++ b/kiten/configlearn.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>ConfigLearn</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -21,7 +21,7 @@
         </property>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>tqlayout12</cstring>
+                <cstring>layout12</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -45,7 +45,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>40</height>
@@ -65,7 +65,7 @@
                         </property>
                         <widget class="QLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout13</cstring>
+                                <cstring>layout13</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -141,7 +141,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>40</height>
@@ -157,5 +157,5 @@
     <tabstop>kcfg_QuizOn</tabstop>
     <tabstop>kcfg_GuessOn</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kiten/configsearching.ui b/kiten/configsearching.ui
index 9b9b9175..c11665c1 100644
--- a/kiten/configsearching.ui
+++ b/kiten/configsearching.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>ConfigSearching</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -21,7 +21,7 @@
         </property>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>tqlayout9</cstring>
+                <cstring>layout9</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -53,7 +53,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>40</height>
@@ -64,5 +64,5 @@
         </widget>
     </hbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
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 c80158d6..23da1a9e 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;
@@ -769,8 +769,8 @@ TQString Dict::firstEntryText(Dict::SearchResult result)
 ///////////////////////////////////////////////////////////////
 
 Entry::Entry(const TQString & kanji, const TQString & reading, const TQStringList &meanings)
-	: DictName(TQString::tqfromLatin1("__NOTSET"))
-	, Header(TQString::tqfromLatin1("__NOTSET"))
+	: DictName(TQString::fromLatin1("__NOTSET"))
+	, Header(TQString::fromLatin1("__NOTSET"))
 	, Meanings(meanings)
 	, Kanji(kanji)
 	, KanaOnly(reading.isEmpty())
@@ -784,8 +784,8 @@ Entry::Entry(const TQString & kanji, const TQString & reading, const TQStringLis
 }
 
 Entry::Entry(const TQString &kanji, TQStringList &readings, TQStringList &meanings, unsigned int grade, unsigned int freq, unsigned int strokes, unsigned int miscount)
-	: DictName(TQString::tqfromLatin1("__NOTSET"))
-	, Header(TQString::tqfromLatin1("__NOTSET"))
+	: DictName(TQString::fromLatin1("__NOTSET"))
+	, Header(TQString::fromLatin1("__NOTSET"))
 	, Meanings(meanings)
 	, Kanji(kanji)
 	, KanaOnly(false)
@@ -806,7 +806,7 @@ Entry::Entry(const TQString &dictname)
 }
 
 Entry::Entry(const TQString &headername, bool)
-	: DictName(TQString::tqfromLatin1("__NOTSET"))
+	: DictName(TQString::fromLatin1("__NOTSET"))
 	, Header(headername)
 	, KanaOnly(true)
 	, ExtendedKanjiInfo(false)
diff --git a/kiten/dict.h b/kiten/dict.h
index ded50112..f510d0c1 100644
--- a/kiten/dict.h
+++ b/kiten/dict.h
@@ -89,7 +89,7 @@ public:
 	int dictLength(void);
 	int indexLength(void);
 
-	// tqreplacement for exceptions thrown in the constructor
+	// replacement for exceptions thrown in the constructor
 	bool isValid(void);
 
 	unsigned char lookup(unsigned i, int offset);
diff --git a/kiten/edict_doc.html b/kiten/edict_doc.html
index ad5aee8e..fc52d1e4 100644
--- a/kiten/edict_doc.html
+++ b/kiten/edict_doc.html
@@ -64,7 +64,7 @@ as up-to-date. The easy way to check if the version you have is the latest is
 from the size/date. 
 </P>
 <P>
-As of V96-001, the EDICT file no longer tqcontains proper names. These have
+As of V96-001, the EDICT file no longer contains proper names. These have
 been moved to a separate file called "ENAMDICT".
 From V99-002, the EDICT file has been generated from an extended dictionary 
 database which includes additional fields and information. See the later
@@ -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>
@@ -486,7 +486,7 @@ latest version, as others may have already made the same comments.
 </P>
 <P>
 The preferred format for submissions is a JIS, EUC or Shift-JIS file (uuencoded 
-for safety) containing tqreplacement/new entries. This can be emailed to me at
+for safety) containing replacement/new entries. This can be emailed to me at
 the address at the end of this file.
 </P>
 <P>
@@ -499,8 +499,8 @@ NEW: KANJI1 [kana1] /new entry #1/
 
 NEW: KANJI2 [kana2] /new entry #2/
 
-old: KANJI3 [kana3] /old entry to be tqreplaced/
-new: KANJI3 [kana3] /tqreplacement entry/
+old: KANJI3 [kana3] /old entry to be replaced/
+new: KANJI3 [kana3] /replacement entry/
 
 DEL: KANJI4 [kana4] /entry to be deleted/
 </PRE>
diff --git a/kiten/edict_kanjidic_licence.html b/kiten/edict_kanjidic_licence.html
index ede3fa90..999357fe 100644
--- a/kiten/edict_kanjidic_licence.html
+++ b/kiten/edict_kanjidic_licence.html
@@ -37,7 +37,7 @@ electronic dictionaries.
 </P>
 <P ALIGN="JUSTIFY">
 This document outlines the licence arrangement put in place by The
-Group for usage of the files. It tqreplaces all previous copyright and
+Group for usage of the files. It replaces all previous copyright and
 licence statements applying to the files.
 </P>
 <P ALIGN="JUSTIFY">
diff --git a/kiten/kiten.cpp b/kiten/kiten.cpp
index 7dd11934..5e54a9af 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();
@@ -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;
@@ -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 ff6f49fd..d58ff2e0 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 (tqreplace has something in it)
+	if (!!replace) // if (replace has something in it)
 	{
-		//kdDebug() << "tqreplace isn't empty\n";
+		//kdDebug() << "replace isn't empty\n";
 
-		setText(curKana + tqreplace);
+		setText(curKana + replace);
 
 		if (kana == "katakana")
 			kana = "hiragana";
@@ -185,7 +185,7 @@ void KRomajiEdit::keyPressEvent(TQKeyEvent *e)
 	}
 	else
 	{
-		//kdDebug() << "tqreplace is empty\n";
+		//kdDebug() << "replace is empty\n";
 		TQString farRight(ji.right(ji.length() - 1));
 		//kdDebug() << "ji = " << ji << endl;
 		//kdDebug() << "farRight = " << farRight << endl;
diff --git a/kiten/learn.cpp b/kiten/learn.cpp
index 548f87d0..02b21618 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, Horizontal, quizTop);
@@ -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);
diff --git a/kiten/main.cpp b/kiten/main.cpp
index d55f46b6..8d013d15 100644
--- a/kiten/main.cpp
+++ b/kiten/main.cpp
@@ -39,7 +39,7 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char *argv[])
 {
-	tqInstallMsgHandler(noMessageOutput);
+	qInstallMsgHandler(noMessageOutput);
 	KAboutData aboutData( "kiten", I18N_NOOP("Kiten"),
 	  "1.2", I18N_NOOP("Japanese Reference Tool"), KAboutData::License_GPL,
 	  "(c) 2001-2004, Jason Katz-Brown", 0, "http://www.katzbrown.com/kiten");
diff --git a/kiten/rad.cpp b/kiten/rad.cpp
index 2c8c7a48..f3c31132 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 tqcontainsBool = false;
-		if ((outcomes.tqcontains(tqcontainsBool) < 1))
+		const bool containsBool = false;
+		if ((outcomes.contains(containsBool) < 1))
 		{
 			//kdDebug() << "appending " << *kit << endl;
 			ret.append(*kit);
@@ -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, 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);
 
@@ -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);
diff --git a/kiten/widgets.cpp b/kiten/widgets.cpp
index d8f576d0..cfe4c18a 100644
--- a/kiten/widgets.cpp
+++ b/kiten/widgets.cpp
@@ -256,7 +256,7 @@ void ResultView::print(TQString title)
 		TQRect view(body);
 		int page = 1;
 
-		TQColorGroup goodColorGroup = TQColorGroup(tqcolorGroup());
+		TQColorGroup goodColorGroup = TQColorGroup(colorGroup());
 		goodColorGroup.setColor(TQColorGroup::Link, Qt::black);
 
 		do
@@ -358,8 +358,8 @@ void eEdit::openFile(const TQString &file)
 		Dict::Entry entry = Dict::parse(s);
 		TQString meanings = Dict::prettyMeaning(entry.meanings());
 		bool common = meanings.find(TQString("(P)")) >= 0;
-		meanings.tqreplace(TQRegExp("; "), "/");
-		meanings.tqreplace(TQRegExp("/\\(P\\)"), "");
+		meanings.replace(TQRegExp("; "), "/");
+		meanings.replace(TQRegExp("/\\(P\\)"), "");
 		new TQListViewItem(List, entry.kanji(), Dict::prettyKanjiReading(entry.readings()), meanings, common? i18n("yes") : i18n("no"));
 	}
 }
@@ -482,7 +482,7 @@ void EditAction::unplug( TQWidget *w )
 
 	KToolBar *toolBar = (KToolBar *)w;
 
-	int idx = tqfindContainer( w );
+	int idx = findContainer( w );
 
 	toolBar->removeItem( itemId( idx ) );