Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 6c3f7a55fb7888efc80a7350ef0c2f46ee02baa3.

1 files changed, 15 insertions, 15 deletions

diff --git a/kiten/rad.cpp b/kiten/rad.cpp
index 09e2fcd8..0d28c907 100644
--- a/kiten/rad.cpp
+++ b/kiten/rad.cpp
@@ -33,9 +33,9 @@
 #include <tqcheckbox.h>
 #include <tqfile.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqspinbox.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqtooltip.h>
 
 #include "kitenconfig.h"
@@ -223,12 +223,12 @@ RadWidget::RadWidget(Rad *_rad, TQWidget *parent, const char *name) : TQWidget(p
 	hotlistNum = 3;
 
 	rad = _rad;
-	TQHBoxLayout *hlayout = new TQHBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-	TQVBoxLayout *vlayout = new TQVBoxLayout(hlayout, KDialog::spacingHint());
+	TQHBoxLayout *htqlayout = new TQHBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+	TQVBoxLayout *vtqlayout = new TQVBoxLayout(htqlayout, KDialog::spacingHint());
 
 	hotlistGroup = new TQButtonGroup(1,Qt::Horizontal, i18n("Hotlist"), this);
 	//hotlistGroup->setRadioButtonExclusive(true);
-	vlayout->addWidget(hotlistGroup);
+	vtqlayout->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 *layout = new TQVBoxLayout(vlayout, KDialog::spacingHint());
+	TQVBoxLayout *tqlayout = new TQVBoxLayout(vtqlayout, KDialog::spacingHint());
 
 	totalStrokes = new TQCheckBox(i18n("Search by total strokes"), this);
 	connect(totalStrokes, TQT_SIGNAL(clicked()), this, TQT_SLOT(totalClicked()));
-	layout->addWidget(totalStrokes);
+	tqlayout->addWidget(totalStrokes);
 
-	TQHBoxLayout *strokesLayout = new TQHBoxLayout(layout, KDialog::spacingHint());
+	TQHBoxLayout *strokesLayout = new TQHBoxLayout(tqlayout, 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()));
-	layout->addWidget(ok);
+	tqlayout->addWidget(ok);
 	cancel = new KPushButton( KStdGuiItem::cancel(), this );
 
 	connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(close()));
-	layout->addWidget(cancel);
+	tqlayout->addWidget(cancel);
 
-	TQVBoxLayout *middlevLayout = new TQVBoxLayout(hlayout, KDialog::spacingHint());
+	TQVBoxLayout *middlevLayout = new TQVBoxLayout(htqlayout, 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 *rightvlayout = new TQVBoxLayout(hlayout, KDialog::spacingHint());
+	TQVBoxLayout *rightvtqlayout = new TQVBoxLayout(htqlayout, KDialog::spacingHint());
 	selectedList = new KListBox(this);
-	rightvlayout->addWidget(selectedList);
+	rightvtqlayout->addWidget(selectedList);
 	connect(selectedList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged()));
 
 	remove = new KPushButton(i18n("&Remove"), this);
-	rightvlayout->addWidget(remove);
+	rightvtqlayout->addWidget(remove);
 	connect(remove, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeSelected()));
 	remove->setEnabled(false);
 
 	clear = new KPushButton(KStdGuiItem::clear(), this);
-	rightvlayout->addWidget(clear);
+	rightvtqlayout->addWidget(clear);
 	connect(clear, TQT_SIGNAL(clicked()), this, TQT_SLOT(clearSelected()));
 	clear->setEnabled(false);