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, 4 insertions, 4 deletions

diff --git a/kgeography/src/boxasker.cpp b/kgeography/src/boxasker.cpp
index dc6d526d..5774ba10 100644
--- a/kgeography/src/boxasker.cpp
+++ b/kgeography/src/boxasker.cpp
@@ -23,7 +23,7 @@
 #include "boxasker.h"
 #include "map.h"
 
-boxAsker::boxAsker(TQWidget *parent, KGmap *m, TQWidget *w, uint count) : askWidget(parent, m, w, count)
+boxAsker::boxAsker(TQWidget *tqparent, KGmap *m, TQWidget *w, uint count) : askWidget(tqparent, m, w, count)
 {
 	p_lay = new TQVBoxLayout(this);
 	
@@ -33,7 +33,7 @@ boxAsker::boxAsker(TQWidget *parent, KGmap *m, TQWidget *w, uint count) : askWid
 	for(int i = 0; i < 4; i++)
 	{
 		p_rb[i] = new TQRadioButton(bg);
-		p_rb[i]->setFocusPolicy(TQWidget::StrongFocus);
+		p_rb[i]->setFocusPolicy(TQ_StrongFocus);
 	}
 	p_accept = new KPushButton(this);
 
@@ -55,7 +55,7 @@ void boxAsker::setQuestion(const TQString &q)
 
 void boxAsker::keyReleaseEvent(TQKeyEvent *e)
 {
-	if (e -> key() == Qt::Key_Return || e -> key() == Qt::Key_Enter) checkAnswer();
+	if (e -> key() == TQt::Key_Return || e -> key() == TQt::Key_Enter) checkAnswer();
 	else askWidget::keyReleaseEvent(e);
 }
 
@@ -80,7 +80,7 @@ void boxAsker::nextQuestionHook(const TQString &division)
 	{
 		// false because boxaskers never are clickOnDivision
 		otherDivision = p_map -> getRandomDivision(false);
-		while (auxList.find(otherDivision) != auxList.end()) otherDivision = p_map -> getRandomDivision(false);
+		while (auxList.tqfind(otherDivision) != auxList.end()) otherDivision = p_map -> getRandomDivision(false);
 		if (i == p_position) i++;
 		if (i < 4 && nextBoxAskerQuestionHook(otherDivision, i, false)) i++;
 		auxList << otherDivision;