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

1 files changed, 12 insertions, 12 deletions

diff --git a/kgeography/src/kgeography.cpp b/kgeography/src/kgeography.cpp
index de850afb..6636b8de 100644
--- a/kgeography/src/kgeography.cpp
+++ b/kgeography/src/kgeography.cpp
@@ -18,7 +18,7 @@
 #include <kmenubar.h>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqvbox.h>
 #include <tqsize.h>
 #include <tqtimer.h>
@@ -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);
@@ -59,8 +59,8 @@ kgeography::kgeography() : KMainWindow(), p_firstShow(true), p_mustShowResultsDi
 	p_askDivisionFlags = new KPushButton(i18n("G&uess Flag of Division..."), p_leftWidget);
 	TQWhatsThis::add(p_askDivisionFlags, i18n("In this quiz you have to guess the flag of a division given its name"));
 	p_underLeftWidget = new TQVBox(p_leftWidget);
-	p_underLeftWidget -> tqlayout() -> setSpacing(KDialog::spacingHint());
-	p_underLeftWidget -> tqlayout() -> setMargin(KDialog::marginHint());
+	p_underLeftWidget -> layout() -> setSpacing(KDialog::spacingHint());
+	p_underLeftWidget -> layout() -> setMargin(KDialog::marginHint());
 	p_leftWidget -> setStretchFactor(p_underLeftWidget, 1);
 
 	setCentralWidget(p_bigWidget);
@@ -113,7 +113,7 @@ void kgeography::showEvent(TQShowEvent *)
 			}
 			else
 			{
-				KMessageBox::error(this, i18n("Could not open last used map. Error parsing %1: %2").tqarg(file).tqarg(reader.getError()));
+				KMessageBox::error(this, i18n("Could not open last used map. Error parsing %1: %2").arg(file).arg(reader.getError()));
 				delete reader.getMap();
 				openMap();
 			}
@@ -169,7 +169,7 @@ void kgeography::askCapitalDivisions()
 	int i;
 	bool ok;
 	showResultsDialog();
-	i = KInputDialog::getInteger(i18n("Number of Questions"), i18n("How many questions do you want? (1 to %1)").tqarg(p_map -> count(false)), 1, 1, p_map -> count(false), 1, &ok);
+	i = KInputDialog::getInteger(i18n("Number of Questions"), i18n("How many questions do you want? (1 to %1)").arg(p_map -> count(false)), 1, 1, p_map -> count(false), 1, &ok);
 	if (ok)
 	{
 		removeOldAskWidget();
@@ -185,7 +185,7 @@ void kgeography::askDivisionCapitals()
 	int i;
 	bool ok;
 	showResultsDialog();
-	i = KInputDialog::getInteger(i18n("Number of Questions"), i18n("How many questions do you want? (1 to %1)").tqarg(p_map -> count(false)), 1, 1, p_map -> count(false), 1, &ok);
+	i = KInputDialog::getInteger(i18n("Number of Questions"), i18n("How many questions do you want? (1 to %1)").arg(p_map -> count(false)), 1, 1, p_map -> count(false), 1, &ok);
 	if (ok)
 	{
 		removeOldAskWidget();
@@ -201,7 +201,7 @@ void kgeography::askMap()
 	int i;
 	bool ok;
 	showResultsDialog();
-	i = KInputDialog::getInteger(i18n("Number of Questions"), i18n("How many questions do you want? (1 to %1)").tqarg(p_map -> count(true)), 1, 1, p_map -> count(true), 1, &ok);
+	i = KInputDialog::getInteger(i18n("Number of Questions"), i18n("How many questions do you want? (1 to %1)").arg(p_map -> count(true)), 1, 1, p_map -> count(true), 1, &ok);
 	if (ok)
 	{
 		removeOldAskWidget();
@@ -219,7 +219,7 @@ void kgeography::askFlagDivisions()
 	int i;
 	bool ok;
 	showResultsDialog();
-	i = KInputDialog::getInteger(i18n("Number of Questions"), i18n("How many questions do you want? (1 to %1)").tqarg(p_map -> count(false)), 1, 1, p_map -> count(false), 1, &ok);
+	i = KInputDialog::getInteger(i18n("Number of Questions"), i18n("How many questions do you want? (1 to %1)").arg(p_map -> count(false)), 1, 1, p_map -> count(false), 1, &ok);
 	if (ok)
 	{
 		removeOldAskWidget();
@@ -235,7 +235,7 @@ void kgeography::askDivisionFlags()
 	int i;
 	bool ok;
 	showResultsDialog();
-	i = KInputDialog::getInteger(i18n("Number of Questions"), i18n("How many questions do you want? (1 to %1)").tqarg(p_map -> count(false)), 1, 1, p_map -> count(false), 1, &ok);
+	i = KInputDialog::getInteger(i18n("Number of Questions"), i18n("How many questions do you want? (1 to %1)").arg(p_map -> count(false)), 1, 1, p_map -> count(false), 1, &ok);
 	if (ok)
 	{
 		removeOldAskWidget();
@@ -292,11 +292,11 @@ void kgeography::setMap(KGmap *m)
 	{
 		TQString mapName = i18n(p_map -> getFileName().utf8(), p_map -> getName().utf8());
 		TQString text = i18n("<qt>Current map:<br><b>%1<b></qt>");
-		p_currentMap -> setText(text.tqarg(mapName));
+		p_currentMap -> setText(text.arg(mapName));
 	}
 	else
 	{
-		TQString s = TQString("<qt>Current map:<br><b>%1</b></qt>").tqarg(p_map -> getName());
+		TQString s = TQString("<qt>Current map:<br><b>%1</b></qt>").arg(p_map -> getName());
 		p_currentMap -> setText(i18n(p_map -> getFileName().utf8(), s.utf8()));
 	}
 	p_consult -> setEnabled(true);