8 files changed, 15 insertions, 15 deletions
diff --git a/kgeography/src/answer.cpp b/kgeography/src/answer.cpp
index 428ceb20..43cf45d1 100644
--- a/kgeography/src/answer.cpp
+++ b/kgeography/src/answer.cpp
@@ -93,7 +93,7 @@ void userAnswer::putWidgets(TQWidget *w, TQGridLayout *lay, int row) const
 			TQLabel *l;
 			l = new TQLabel(w);
 			l -> setPixmap(v -> toImage());
-			l -> tqsetAlignment(TQt::AlignHCenter);
+			l -> setAlignment(TQt::AlignHCenter);
 			l -> setMargin(KDialog::marginHint() / 2);
 			widgets[i] = l;
 		}
@@ -104,8 +104,8 @@ void userAnswer::putWidgets(TQWidget *w, TQGridLayout *lay, int row) const
 	if (!p_correct)
 	{
 		TQColor back, fore;
-		back = widgets[0] -> tqcolorGroup().highlight();
-		fore = widgets[0] -> tqcolorGroup().highlightedText();
+		back = widgets[0] -> colorGroup().highlight();
+		fore = widgets[0] -> colorGroup().highlightedText();
 		for (int i = 0; i < 3; i++)
 		{
 			widgets[i] -> setPaletteBackgroundColor(back);
diff --git a/kgeography/src/answersdialog.cpp b/kgeography/src/answersdialog.cpp
index 7ff19bde..63756c70 100644
--- a/kgeography/src/answersdialog.cpp
+++ b/kgeography/src/answersdialog.cpp
@@ -40,7 +40,7 @@ answersDialog::answersDialog(TQWidget *parent, const TQValueVector<userAnswer> &
 	bigFont.setPointSize(24);
 	l1 = new TQLabel(question, p_container);
 	l1 -> setFont(bigFont);
-	l1 -> tqsetAlignment(TQt::AlignCenter);
+	l1 -> setAlignment(TQt::AlignCenter);
 	lay->addMultiCellWidget(l1, 0, 0, 0, 4);
 	
 	// Headers
@@ -68,7 +68,7 @@ answersDialog::answersDialog(TQWidget *parent, const TQValueVector<userAnswer> &
 	lay -> addItem(new TQSpacerItem(20, 20, TQSizePolicy::Fixed, TQSizePolicy::Fixed), totalAnswers + 3, 2);
 	
 	l1 = new TQLabel(i18n("You answered correctly %1 out of %2 questions.").tqarg(correctAnswers).tqarg(totalAnswers), p_container);
-	l1 -> tqsetAlignment(TQt::AlignCenter);
+	l1 -> setAlignment(TQt::AlignCenter);
 	lay->addMultiCellWidget(l1, totalAnswers + 4, totalAnswers + 4, 0, 4);
 	
 	p_sv -> addChild(p_container);
diff --git a/kgeography/src/askwidget.cpp b/kgeography/src/askwidget.cpp
index 95ca4fcd..ddf21ec1 100644
--- a/kgeography/src/askwidget.cpp
+++ b/kgeography/src/askwidget.cpp
@@ -21,7 +21,7 @@ askWidget::askWidget(TQWidget *parent, KGmap *m, TQWidget *w, uint count, bool s
 	if (showLabel)
 	{
 		p_answers = new TQLabel(w);
-		p_answers -> tqsetAlignment(AlignTop | AlignHCenter);
+		p_answers -> setAlignment(AlignTop | AlignHCenter);
 		resetAnswers();
 		p_answers -> show();
 	}
diff --git a/kgeography/src/kgeography.cpp b/kgeography/src/kgeography.cpp
index de850afb..46dd58bb 100644
--- a/kgeography/src/kgeography.cpp
+++ b/kgeography/src/kgeography.cpp
@@ -45,7 +45,7 @@ kgeography::kgeography() : KMainWindow(), p_firstShow(true), p_mustShowResultsDi
 
 	TQVBox *p_leftWidget = new TQVBox(p_bigWidget);
 	p_currentMap = new TQLabel(p_leftWidget);
-	p_currentMap -> tqsetAlignment(AlignCenter);
+	p_currentMap -> setAlignment(AlignCenter);
 	p_consult = new KPushButton(i18n("&Browse Map"), p_leftWidget);
 	TQWhatsThis::add(p_consult, i18n("In this section left click on any part of the map to learn about the divisions" ));
 	p_askMap = new KPushButton(i18n("&Click Division in Map..."), p_leftWidget);
diff --git a/kgeography/src/mapasker.cpp b/kgeography/src/mapasker.cpp
index 47de1dff..bafbcfed 100644
--- a/kgeography/src/mapasker.cpp
+++ b/kgeography/src/mapasker.cpp
@@ -53,7 +53,7 @@ mapAsker::mapAsker(TQWidget *parent, KGmap *m, TQWidget *w, bool asker, uint cou
 	{
 		TQBoxLayout *vbl = dynamic_cast<TQBoxLayout*>(w -> tqlayout());
 		p_next = new TQLabel(w);
-		p_next -> tqsetAlignment(AlignTop | AlignHCenter);
+		p_next -> setAlignment(AlignTop | AlignHCenter);
 		p_fill = new TQWidget(w);
 		p_fill -> show();
 		vbl -> setStretchFactor(p_fill, 1);
diff --git a/kgeography/src/mapwidget.cpp b/kgeography/src/mapwidget.cpp
index e039952c..c40a6dbd 100644
--- a/kgeography/src/mapwidget.cpp
+++ b/kgeography/src/mapwidget.cpp
@@ -61,9 +61,9 @@ void mapWidget::setMapZoom(bool b)
 	}
 }
 
-TQSize mapWidget::tqsizeHint() const
+TQSize mapWidget::sizeHint() const
 {
-	return tqmaximumSize();
+	return maximumSize();
 }
 
 void mapWidget::updateHPosition(int value)
diff --git a/kgeography/src/mapwidget.h b/kgeography/src/mapwidget.h
index a54463b1..5b024bb0 100644
--- a/kgeography/src/mapwidget.h
+++ b/kgeography/src/mapwidget.h
@@ -27,7 +27,7 @@ Q_OBJECT
 		void setMapMove(bool b);
 		void setMapZoom(bool b);
 		
-		TQSize tqsizeHint() const;
+		TQSize sizeHint() const;
 		TQSize mapSize() const;
 	
 	public slots:
diff --git a/kgeography/src/mypopup.cpp b/kgeography/src/mypopup.cpp
index b37264df..154da915 100644
--- a/kgeography/src/mypopup.cpp
+++ b/kgeography/src/mypopup.cpp
@@ -33,7 +33,7 @@ myPopup::myPopup(TQWidget *parent, const TQString &text, const TQString &text2,
 	if (!text2.isNull())
 	{
 		TQLabel *l2 = new TQLabel(text2, vbox);
-		l2 -> tqsetAlignment(TQt::AlignCenter);
+		l2 -> setAlignment(TQt::AlignCenter);
 		vboxLayout -> addWidget(l2);
 	}
 	
@@ -43,10 +43,10 @@ myPopup::myPopup(TQWidget *parent, const TQString &text, const TQString &text2,
 		lay -> addWidget(flag);
 		TQImage flagImg(flagFile);
 		flag -> setPixmap(flagImg.smoothScale(flagImg.width() / 5, flagImg. height() / 5));
-		flag -> tqsetAlignment(TQt::AlignCenter);
+		flag -> setAlignment(TQt::AlignCenter);
 	}
 	
-	l -> tqsetAlignment(TQt::AlignCenter);
+	l -> setAlignment(TQt::AlignCenter);
 	TQFont f = l -> font();
 	f.setBold(true);
 	l -> setFont(f);
@@ -55,7 +55,7 @@ myPopup::myPopup(TQWidget *parent, const TQString &text, const TQString &text2,
 	setFrameStyle(TQFrame::Box | TQFrame::Plain);
 	setLineWidth(2);
 	
-	setFixedSize(tqsizeHint());
+	setFixedSize(sizeHint());
 }
 
 void myPopup::mousePressEvent(TQMouseEvent *)