TQt4 port kdeedu

This enables compilation under both Qt3 and Qt4


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

1 files changed, 21 insertions, 21 deletions

diff --git a/kiten/rad.cpp b/kiten/rad.cpp
index f3c31132..1f7da303 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).contains(*kit) > 0);
+			outcomes.append((*it).tqcontains(*kit) > 0);
 		}
 
 		const bool containsBool = false;
-		if ((outcomes.contains(containsBool) < 1))
+		if ((outcomes.tqcontains(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().find(text) == -1; --it);
+	for (it = list.end(); it != list.begin() && (*it).kanji().tqfind(text) == -1; --it);
 
 	return (*it);
 }
@@ -218,17 +218,17 @@ Rad::~Rad()
 
 ///////////////////////////////////////////////
 
-RadWidget::RadWidget(Rad *_rad, TQWidget *parent, const char *name) : TQWidget(parent, name)
+RadWidget::RadWidget(Rad *_rad, TQWidget *tqparent, const char *name) : TQWidget(tqparent, name)
 {
 	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, Horizontal, i18n("Hotlist"), this);
+	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);
 
@@ -360,7 +360,7 @@ void RadWidget::addRadical(const TQString &radical)
 
 void RadWidget::addToSelected(const TQString &text)
 {
-	if (!text.isNull() && !selected.contains(text))
+	if (!text.isNull() && !selected.tqcontains(text))
 	{
 		selectedList->insertItem(text);
 		selected.append(text);
@@ -398,10 +398,10 @@ void RadWidget::apply()
 
 	for (TQStringList::Iterator it = selected.begin(); it != selected.end(); ++it)
 	{
-		if (hotlist.find(*it) == hotlist.end())
+		if (hotlist.tqfind(*it) == hotlist.end())
 		{
 			if (hotlist.size() >= hotlistNum)
-				hotlist.pop_front(); // stupid stl functions in Qt .. ;)
+				hotlist.pop_front(); // stupid stl functions in TQt .. ;)
 			hotlist.append(*it);
 
 			config->setHotlist(hotlist);