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

10 files changed, 80 insertions, 80 deletions

diff --git a/kgoldrunner/src/kgoldrunner.cpp b/kgoldrunner/src/kgoldrunner.cpp
index da4c73b3..949f30d6 100644
--- a/kgoldrunner/src/kgoldrunner.cpp
+++ b/kgoldrunner/src/kgoldrunner.cpp
@@ -572,10 +572,10 @@ void KGoldrunner::gameFreeze (bool on_off)
 {
     if (on_off)
 	statusBar()->changeItem
-		    (i18n("Press \"%1\" to RESUME").tqarg(pauseKeys), ID_MSG);
+		    (i18n("Press \"%1\" to RESUME").arg(pauseKeys), ID_MSG);
     else
 	statusBar()->changeItem
-		    (i18n("Press \"%1\" to PAUSE").tqarg(pauseKeys), ID_MSG);
+		    (i18n("Press \"%1\" to PAUSE").arg(pauseKeys), ID_MSG);
 }
 
 void KGoldrunner::adjustHintAction (bool hintAvailable)
@@ -849,7 +849,7 @@ bool KGoldrunner::getDirectories()
 	KGrMessage::information (this, i18n("Get Folders"),
 	i18n("Cannot find documentation sub-folder 'en/%1/' "
 	"in area '%2' of the KDE folder ($TDEDIRS).")
-	.tqarg(myDir).tqarg(dirs->kde_default ("html")));
+	.arg(myDir).arg(dirs->kde_default ("html")));
 	// result = FALSE;		// Don't abort if the doc is missing.
     }
     else
@@ -861,7 +861,7 @@ bool KGoldrunner::getDirectories()
 	KGrMessage::information (this, i18n("Get Folders"),
 	i18n("Cannot find system games sub-folder '%1/system/' "
 	"in area '%2' of the KDE folder ($TDEDIRS).")
-	.tqarg(myDir).tqarg(dirs->kde_default ("data")));
+	.arg(myDir).arg(dirs->kde_default ("data")));
 	result = FALSE;			// ABORT if the games data is missing.
     }
     else
@@ -874,7 +874,7 @@ bool KGoldrunner::getDirectories()
 	KGrMessage::information (this, i18n("Get Folders"),
 	i18n("Cannot find or create user games sub-folder '%1/user/' "
 	"in area '%2' of the KDE user area ($TDEHOME).")
-	.tqarg(myDir).tqarg(dirs->kde_default ("data")));
+	.arg(myDir).arg(dirs->kde_default ("data")));
 	// result = FALSE;		// Don't abort if user area is missing.
     }
     else {
@@ -882,7 +882,7 @@ bool KGoldrunner::getDirectories()
 	if (! create) {
 	    KGrMessage::information (this, i18n("Get Folders"),
 	    i18n("Cannot find or create 'levels/' folder in "
-	    "sub-folder '%1/user/' in the KDE user area ($TDEHOME).").tqarg(myDir));
+	    "sub-folder '%1/user/' in the KDE user area ($TDEHOME).").arg(myDir));
 	    // result = FALSE;		// Don't abort if user area is missing.
 	}
     }
diff --git a/kgoldrunner/src/kgoldrunner.h b/kgoldrunner/src/kgoldrunner.h
index 2959b3d0..e346cce1 100644
--- a/kgoldrunner/src/kgoldrunner.h
+++ b/kgoldrunner/src/kgoldrunner.h
@@ -9,7 +9,7 @@
 #include <config.h>
 #endif
 
-// tqStatus bar
+// Status bar
 const int ID_LIVES      = 0;            // Field IDs in KDE status bar.
 const int ID_SCORE      = 1;
 const int ID_LEVEL      = 2;
@@ -137,7 +137,7 @@ private slots:
     void showLevel (int);		// Show the current level number.
     void showLives (long);		// Show how many lives are remaining.
     void showScore (long);		// Show the player's score.
-    void gameFreeze (bool);		// tqStatus feedback on freeze/unfreeze.
+    void gameFreeze (bool);		// Status feedback on freeze/unfreeze.
 
     void adjustHintAction (bool);	// Enable/disable "Hint" action.
     void markRuleType (char ruleType);	// Check game's rule type in the menu.
diff --git a/kgoldrunner/src/kgrcanvas.cpp b/kgoldrunner/src/kgrcanvas.cpp
index b56c2453..cd364d15 100644
--- a/kgoldrunner/src/kgrcanvas.cpp
+++ b/kgoldrunner/src/kgrcanvas.cpp
@@ -117,7 +117,7 @@ bool KGrCanvas::changeSize (int d)
 	return FALSE;
     }
 
-    TQWMatrix wm = tqworldMatrix();
+    TQWMatrix wm = worldMatrix();
     double   wmScale = 1.0;
 
     // Set the scale back to 1:1 and calculate the new scale factor.
@@ -210,7 +210,7 @@ void KGrCanvas::makeTitle ()
     title->setPaletteForegroundColor (textColor);
     title->setFont (TQFont (fontInfo().family(),
 		 (baseFontSize * scaleStep) / baseScale, TQFont::Bold));
-    title->tqsetAlignment (TQt::AlignCenter);
+    title->setAlignment (TQt::AlignCenter);
     title->raise();
     title->show();
 }
@@ -257,12 +257,12 @@ void KGrCanvas::makeHeroSprite (int i, int j, int startFrame)
     i++; j++;
     heroSprite->move (i * 4 * STEP, j * 4 * STEP, startFrame);
     heroSprite->setZ (1);
-    heroSprite->tqsetVisible (TRUE);
+    heroSprite->setVisible (TRUE);
 }
 
 void KGrCanvas::setHeroVisible (bool newState)
 {
-    heroSprite->tqsetVisible (newState);		// Show or hide the hero.
+    heroSprite->setVisible (newState);		// Show or hide the hero.
 }
 
 void KGrCanvas::makeEnemySprite (int i, int j, int startFrame)
diff --git a/kgoldrunner/src/kgrconsts.h b/kgoldrunner/src/kgrconsts.h
index ce5ada47..2006648a 100644
--- a/kgoldrunner/src/kgrconsts.h
+++ b/kgoldrunner/src/kgrconsts.h
@@ -70,7 +70,7 @@ enum Position		{RIGHTWALK1,RIGHTWALK2,RIGHTWALK3,RIGHTWALK4,
 			 LEFTCLIMB1,LEFTCLIMB2,LEFTCLIMB3,LEFTCLIMB4,
 			 CLIMB1,CLIMB2,
 			 FALL1,FALL2};
-enum tqStatus		{STANDING,FALLING,WALKING,CLIMBING,CAPTIVE};
+enum Status		{STANDING,FALLING,WALKING,CLIMBING,CAPTIVE};
 enum Direction		{RIGHT,LEFT,UP,DOWN,STAND};
 enum SearchStrategy	{LOW,MEDIUM,HIGH};
 
diff --git a/kgoldrunner/src/kgrdialog.cpp b/kgoldrunner/src/kgrdialog.cpp
index 9a5ecb44..4a58b235 100644
--- a/kgoldrunner/src/kgrdialog.cpp
+++ b/kgoldrunner/src/kgrdialog.cpp
@@ -132,7 +132,7 @@ KGrSLDialog::KGrSLDialog (int action, int requestedLevel, int collnIndex,
 
     TQPoint p  = parent->mapToGlobal (TQPoint (0,0));
 
-    // Base the tqgeometry of the dialog box on the playing area.
+    // Base the geometry of the dialog box on the playing area.
     int cell = parent->width() / (FIELDWIDTH + 4);
     dad->	move (p.x()+2*cell, p.y()+2*cell);
     dad->	setMinimumSize ((FIELDWIDTH*cell/2), (FIELDHEIGHT-1)*cell);
@@ -357,7 +357,7 @@ void KGrSLDialog::slAboutColln ()
 {
     // User clicked the "About" button ...
     int		n = slCollnIndex;
-    TQString	title = i18n("About \"%1\"").tqarg(collections.at(n)->name);
+    TQString	title = i18n("About \"%1\"").arg(collections.at(n)->name);
 
     if (collections.at(n)->about.length() > 0) {
 	// Convert game description to ASCII and UTF-8 codes, then translate it.
@@ -404,7 +404,7 @@ void KGrSLDialog::slPaintLevel ()
     TQString	filePath = game->getFilePath
 		(collections.at(n)->owner, collections.at(n), number->value());
     thumbNail->setFilePath (filePath, slName);
-    thumbNail->tqrepaint();			// Will call "drawContents (p)".
+    thumbNail->repaint();			// Will call "drawContents (p)".
 }
 
 void KGrSLDialog::slotHelp ()
@@ -537,14 +537,14 @@ KGrNHDialog::KGrNHDialog(const TQString & levelName, const TQString & levelHint,
     dad->		setCaption (i18n("Edit Name & Hint"));
 #endif
 
-    // Base the tqgeometry of the text box on the playing area.
+    // Base the geometry of the text box on the playing area.
     TQPoint		p = parent->mapToGlobal (TQPoint (0,0));
     int			c = parent->width() / (FIELDWIDTH + 4);
     dad->		move (p.x()+4*c, p.y()+4*c);
     mle->		setMinimumSize ((FIELDWIDTH*c/2), (FIELDHEIGHT/2)*c);
 
     // Configure the text box.
-    mle->		tqsetAlignment (AlignLeft);
+    mle->		setAlignment (AlignLeft);
 #ifndef QT3
     mle->		setWordWrap (TQMultiLineEdit::WidgetWidth);
     mle->		setFixedVisibleLines (9);
@@ -642,7 +642,7 @@ KGrECDialog::KGrECDialog (int action, int collnIndex,
 
     TQPoint p = parent->mapToGlobal (TQPoint (0,0));
 
-    // Base the tqgeometry of the dialog box on the playing area.
+    // Base the geometry of the dialog box on the playing area.
     int cell = parent->width() / (FIELDWIDTH + 4);
     dad->	move (p.x()+2*cell, p.y()+2*cell);
     dad->	setMinimumSize ((FIELDWIDTH*cell/2), (FIELDHEIGHT-1)*cell);
@@ -669,7 +669,7 @@ KGrECDialog::KGrECDialog (int action, int collnIndex,
 					collections.at(defaultGame)->nLevels));
 #else
 	nLevL->		setText (i18n("%1 levels")
-				.tqarg(collections.at(defaultGame)->nLevels));
+				.arg(collections.at(defaultGame)->nLevels));
 #endif
 	OKText = i18n("Save Changes");
     }
@@ -694,7 +694,7 @@ KGrECDialog::KGrECDialog (int action, int collnIndex,
     }
 
     // Configure the edit box.
-    mle->		tqsetAlignment (AlignLeft);
+    mle->		setAlignment (AlignLeft);
 #ifndef QT3
     mle->		setWordWrap (TQMultiLineEdit::WidgetWidth);
     mle->		setFixedVisibleLines (8);
@@ -802,7 +802,7 @@ KGrLGDialog::KGrLGDialog (TQFile * savedGames,
 
     dad->		setCaption (i18n("Select Saved Game"));
 
-    // Base the tqgeometry of the list box on the playing area.
+    // Base the geometry of the list box on the playing area.
     TQPoint		p = parent->mapToGlobal (TQPoint (0,0));
     int			c = parent->width() / (FIELDWIDTH + 4);
     dad->		move (p.x()+2*c, p.y()+2*c);
@@ -942,7 +942,7 @@ void KGrMessage::wrapped (TQWidget * parent, TQString title, TQString contents)
 
     mm->		setCaption (title);
 
-    // Base the tqgeometry of the text box on the playing area.
+    // Base the geometry of the text box on the playing area.
     TQPoint		p = parent->mapToGlobal (TQPoint (0,0));
     int			c = parent->width() / (FIELDWIDTH + 4);
     mm->		move (p.x()+4*c, p.y()+4*c);
@@ -950,7 +950,7 @@ void KGrMessage::wrapped (TQWidget * parent, TQString title, TQString contents)
     OK->		setMaximumWidth (3*c);
 
     mle->		setFrameStyle (TQFrame::NoFrame);
-    mle->		tqsetAlignment (AlignLeft);
+    mle->		setAlignment (AlignLeft);
     mle->		setReadOnly (TRUE);
     mle->		setText (contents);
 
diff --git a/kgoldrunner/src/kgrdialog.h b/kgoldrunner/src/kgrdialog.h
index cfa65de6..7d24e865 100644
--- a/kgoldrunner/src/kgrdialog.h
+++ b/kgoldrunner/src/kgrdialog.h
@@ -25,7 +25,7 @@
 #include <kmessagebox.h>
 #endif
 
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <tqlistbox.h>
 #include <tqscrollbar.h>
@@ -35,7 +35,7 @@
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
 #ifdef QT3
-#include <tqtextedit.h>
+#include <textedit.h>
 #else
 #include <tqmultilineedit.h>
 #endif
@@ -187,7 +187,7 @@ private:
 *******************************************************************************/
 
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 class KGrLGDialog : public KGR_DIALOG	// KGR_PORTABLE sets TQDialog/KDialogBase
 {
diff --git a/kgoldrunner/src/kgrfigure.cpp b/kgoldrunner/src/kgrfigure.cpp
index 7c640e88..272c571e 100644
--- a/kgoldrunner/src/kgrfigure.cpp
+++ b/kgoldrunner/src/kgrfigure.cpp
@@ -76,7 +76,7 @@ int KGrFigure::gety()
   return absy;
 }
 
-tqStatus KGrFigure::gettqStatus()
+Status KGrFigure::getStatus()
 {
     return status;
 }
@@ -733,7 +733,7 @@ bool KGrHero::standOnEnemy()
 		(((absx - 16) <  enemy->getx()) &&
 		 ((absx + 16) >  enemy->getx()))) {
                 if (((absy + 12) == enemy->gety()) &&
-                    (enemy->gettqStatus() != FALLING)) {
+                    (enemy->getStatus() != FALLING)) {
                     absy = absy - rely; // Bounce back from overlap, to avoid
                     rely = 0;           // hero-enemy mid-cycle deadlock.
                     walkCounter = 1;
@@ -807,7 +807,7 @@ KGrEnemy :: KGrEnemy (KGrCanvas * view, int x, int y)
   walkCounter = 1;
   captiveCounter = 0;
 
-  searchtqStatus = HORIZONTAL;
+  searchStatus = HORIZONTAL;
 
   birthX=x;
   birthY=y;
@@ -849,7 +849,7 @@ void KGrEnemy::showState(char option)
       case 's': printf (" nuggets %02d status %d walk-ctr %d ",
 			nuggets, status, walkCounter);
 	    printf ("dirn %d search %d capt-ctr %d\n",
-			direction, searchtqStatus, captiveCounter);
+			direction, searchStatus, captiveCounter);
 	    printf ("                     rel (%02d,%02d) abs (%03d,%03d)",
 			relx, rely, absx, absy);
 	    printf (" pix %02d", actualPixmap);
@@ -907,7 +907,7 @@ void KGrEnemy::walkTimeDone ()
       case RIGHT:	walkRight (WALKDELAY, FALLDELAY); break;
       case LEFT:	walkLeft (WALKDELAY, FALLDELAY); break;
       default:		// Switch search direction in KGoldrunner search (only).
-			searchtqStatus = (searchtqStatus==VERTIKAL) ?
+			searchStatus = (searchStatus==VERTIKAL) ?
 					HORIZONTAL : VERTIKAL;
 
                         // In KGoldrunner rules, if a hole opens under an enemy
@@ -942,7 +942,7 @@ void KGrEnemy::walkTimeDone ()
 
     // In KGoldrunner rules, change the search strategy,
     // to avoid enemy-enemy deadlock.
-    searchtqStatus = (searchtqStatus==VERTIKAL) ? HORIZONTAL : VERTIKAL;
+    searchStatus = (searchStatus==VERTIKAL) ? HORIZONTAL : VERTIKAL;
 
     dirn = searchbestway (x, y, herox, heroy);
     if ((dirn != direction) && ((*playfield)[x][y]->whatIam() != USEDHOLE)) {
@@ -1221,7 +1221,7 @@ Direction KGrEnemy::searchbestway(int ew,int eh,int hw,int hh)
   // KGoldrunner search strategy.
   case MEDIUM:
   case HIGH:
-  if(searchtqStatus==VERTIKAL){
+  if(searchStatus==VERTIKAL){
     if (eh > hh)
       return searchupway(ew,eh);
     if (eh < hh)
diff --git a/kgoldrunner/src/kgrfigure.h b/kgoldrunner/src/kgrfigure.h
index fd7de606..ab49ceb9 100644
--- a/kgoldrunner/src/kgrfigure.h
+++ b/kgoldrunner/src/kgrfigure.h
@@ -54,7 +54,7 @@ public:
 					// dependent on number of enemies.
   int getx();
   int gety();
-  tqStatus gettqStatus();
+  Status getStatus();
 
   int getnuggets();
   void setNuggets(int n);
@@ -81,7 +81,7 @@ protected:
   TQTimer *fallTimer;
 
   KGrObject *(*playfield)[30][22];
-  tqStatus status;
+  Status status;
   Direction direction;
   bool canWalkRight();
   bool canWalkLeft();
@@ -185,7 +185,7 @@ public:
 private:
   KGrCanvas * enemyView;
   int birthX, birthY;
-  int searchtqStatus;
+  int searchStatus;
   int captiveCounter;
   TQTimer *captiveTimer;
   bool canWalkUp();
diff --git a/kgoldrunner/src/kgrgame.cpp b/kgoldrunner/src/kgrgame.cpp
index a52abe01..6962d7a1 100644
--- a/kgoldrunner/src/kgrgame.cpp
+++ b/kgoldrunner/src/kgrgame.cpp
@@ -190,7 +190,7 @@ void KGrGame::goUpOneLevel()
 	KGrMessage::information (view, collection->name,
 	    i18n("<b>CONGRATULATIONS !!!!</b>"
 	    "<p>You have conquered the last level in the %1 game !!</p>")
-	    .tqarg("<b>\"" + collection->name + "\"</b>"));
+	    .arg("<b>\"" + collection->name + "\"</b>"));
 	checkHighScore();	// Check if there is a high score for this game.
 
 	unfreeze();
@@ -384,7 +384,7 @@ void KGrGame::startTutorial()
 	KGrMessage::information (view, i18n("Start Tutorial"),
 	    i18n("Cannot find the tutorial game (file-prefix %1) in "
 	    "the %2 files.")
-	    .tqarg("'tute'").tqarg("'games.dat'"));
+	    .arg("'tute'").arg("'games.dat'"));
     }
 }
 
@@ -514,14 +514,14 @@ bool KGrGame::openLevelFile (int levelNo, TQFile & openlevel)
       KGrMessage::information (view, i18n("Load Level"),
 	    i18n("Cannot find file '%1'. Please make sure '%2' has been "
 	    "run in the '%3' folder.")
-	    .tqarg(filePath).tqarg("tar xf levels.tar").tqarg(systemDataDir.myStr()));
+	    .arg(filePath).arg("tar xf levels.tar").arg(systemDataDir.myStr()));
       return (FALSE);
   }
 
   // �ffne Level zum lesen
   if (! openlevel.open (IO_ReadOnly)) {
       KGrMessage::information (view, i18n("Load Level"),
-	    i18n("Cannot open file '%1' for read-only.").tqarg(filePath));
+	    i18n("Cannot open file '%1' for read-only.").arg(filePath));
       return (FALSE);
   }
 
@@ -769,7 +769,7 @@ void KGrGame::saveGame()		// Save game ID, score and level.
 {
     if (editMode) {myMessage (view, i18n("Save Game"),
 	i18n("Sorry, you cannot save your game play while you are editing. "
-	"Please try menu item %1.").tqarg("\"" + i18n("&Save Edits...") + "\""));
+	"Please try menu item %1.").arg("\"" + i18n("&Save Edits...") + "\""));
 	return;
     }
     if (hero->started) {myMessage (view, i18n("Save Game"),
@@ -778,7 +778,7 @@ void KGrGame::saveGame()		// Save game ID, score and level.
 	"level, not as they are now."));
     }
 
-    TQDate today = TQDate::tqcurrentDate();
+    TQDate today = TQDate::currentDate();
     TQTime now =   TQTime::currentTime();
     TQString saved;
     TQString day;
@@ -800,7 +800,7 @@ void KGrGame::saveGame()		// Save game ID, score and level.
     if (! file2.open (IO_WriteOnly)) {
 	KGrMessage::information (view, i18n("Save Game"),
 		i18n("Cannot open file '%1' for output.")
-		.tqarg(userDataDir + "savegame.tmp"));
+		.arg(userDataDir + "savegame.tmp"));
 	return;
     }
     TQTextStream text2 (&file2);
@@ -810,7 +810,7 @@ void KGrGame::saveGame()		// Save game ID, score and level.
 	if (! file1.open (IO_ReadOnly)) {
 	    KGrMessage::information (view, i18n("Save Game"),
 		i18n("Cannot open file '%1' for read-only.")
-		.tqarg(userDataDir + "savegame.dat"));
+		.arg(userDataDir + "savegame.dat"));
 	    return;
 	}
 
@@ -848,7 +848,7 @@ void KGrGame::loadGame()		// Re-load game, score and level.
     if (! savedGames.open (IO_ReadOnly)) {
 	KGrMessage::information (view, i18n("Load Game"),
 	    i18n("Cannot open file '%1' for read-only.")
-	    .tqarg(userDataDir + "savegame.dat"));
+	    .arg(userDataDir + "savegame.dat"));
 	return;
     }
 
@@ -899,7 +899,7 @@ void KGrGame::loadGame()		// Re-load game, score and level.
 	}
 	else {
 	    KGrMessage::information (view, i18n("Load Game"),
-		i18n("Cannot find the game with prefix '%1'.").tqarg(pr));
+		i18n("Cannot find the game with prefix '%1'.").arg(pr));
 	}
     }
 
@@ -947,7 +947,7 @@ void KGrGame::checkHighScore()
 	if (! high1.open (IO_ReadOnly)) {
 	    TQString high1_name = high1.name();
 	    KGrMessage::information (view, i18n("Check for High Score"),
-		i18n("Cannot open file '%1' for read-only.").tqarg(high1_name));
+		i18n("Cannot open file '%1' for read-only.").arg(high1_name));
 	    return;
 	}
 
@@ -987,7 +987,7 @@ void KGrGame::checkHighScore()
     if (! high2.open (IO_WriteOnly)) {
 	KGrMessage::information (view, i18n("Check for High Score"),
 		i18n("Cannot open file '%1' for output.")
-		.tqarg(userDataDir + "hi_" + collection->prefix + ".tmp"));
+		.arg(userDataDir + "hi_" + collection->prefix + ".tmp"));
 	return;
     }
 
@@ -1034,7 +1034,7 @@ void KGrGame::checkHighScore()
 
     delete hsn;
 
-    TQDate today = TQDate::tqcurrentDate();
+    TQDate today = TQDate::currentDate();
     TQString hsDate;
 #ifdef QT3
     TQString day = today.shortDayName(today.dayOfWeek());
@@ -1132,7 +1132,7 @@ void KGrGame::showHighScores()
 	if (! high1.exists()) {
 	    KGrMessage::information (view, i18n("Show High Scores"),
 		    i18n("Sorry, there are no high scores for the %1 game yet.")
-		    .tqarg("\"" + collection->name + "\""));
+		    .arg("\"" + collection->name + "\""));
 	    return;
 	}
     }
@@ -1140,7 +1140,7 @@ void KGrGame::showHighScores()
     if (! high1.open (IO_ReadOnly)) {
 	TQString high1_name = high1.name();
 	KGrMessage::information (view, i18n("Show High Scores"),
-	    i18n("Cannot open file '%1' for read-only.").tqarg(high1_name));
+	    i18n("Cannot open file '%1' for read-only.").arg(high1_name));
 	return;
     }
 
@@ -1154,7 +1154,7 @@ void KGrGame::showHighScores()
     TQLabel *		hsHeader = new TQLabel (i18n (
 					"<center><h2>KGoldrunner Hall of Fame</h2></center><br>"
 					"<center><h3>\"%1\" Game</h3></center>")
-					.tqarg(collection->name),
+					.arg(collection->name),
 			hs);
     TQLabel *		hsColHeader  = new TQLabel (
 				i18n("    Name                          "
@@ -1584,7 +1584,7 @@ bool KGrGame::saveLevelFile()
     // Open the output file.
     if (! levelFile.open (IO_WriteOnly)) {
 	KGrMessage::information (view, i18n("Save Level"),
-		i18n("Cannot open file '%1' for output.").tqarg(filePath));
+		i18n("Cannot open file '%1' for output.").arg(filePath));
 	return (FALSE);
     }
 
@@ -1642,8 +1642,8 @@ void KGrGame::moveLevelFile ()
 	KGrMessage::information (view, i18n("Move Level"),
 		i18n("You must first load a level to be moved. Use "
 		"the %1 or %2 menu.")
-		.tqarg("\"" + i18n("Game") + "\"")
-		.tqarg("\"" + i18n("Editor") + "\""));
+		.arg("\"" + i18n("Game") + "\"")
+		.arg("\"" + i18n("Editor") + "\""));
 	return;
     }
 
@@ -1780,7 +1780,7 @@ void KGrGame::deleteLevelFile ()
     }
     else {
 	KGrMessage::information (view, i18n("Delete Level"),
-		i18n("Cannot find file '%1' to be deleted.").tqarg(filePath));
+		i18n("Cannot find file '%1' to be deleted.").arg(filePath));
 	return;
     }
 
@@ -1883,7 +1883,7 @@ void KGrGame::editCollection (int action)
 	    if (duplicatePrefix) {
 		KGrMessage::information (view, i18n("Save Game Info"),
 		    i18n("The filename prefix '%1' is already in use.")
-		    .tqarg(ecPrefix));
+		    .arg(ecPrefix));
 		continue;
 	    }
 	}
@@ -2061,7 +2061,7 @@ bool KGrGame::reNumberLevels (int cIndex, int first, int last, int inc)
 	if (! dir.rename (file1, file2, TRUE)) {	// Allow absolute paths.
 	    KGrMessage::information (view, i18n("Save Level"),
 		i18n("Cannot rename file '%1' to '%2'.")
-		.tqarg(file1).tqarg(file2));
+		.arg(file1).arg(file2));
 	    return (FALSE);
 	}
 	i = i + step;
@@ -2181,8 +2181,8 @@ int KGrGame::selectLevel (int action, int requestedLevel)
 	    KGrMessage::information (view, i18n("Select Level"),
 		i18n("There is no level %1 in %2, "
 		"so you cannot play or edit it.")
-		.tqarg(selectedLevel)
-		.tqarg("\"" + collections.at(selectedGame)->name + "\""));
+		.arg(selectedLevel)
+		.arg("\"" + collections.at(selectedGame)->name + "\""));
 	    selectedLevel = 0;			// Set an invalid selection.
 	    continue;				// Re-run the dialog box.
 	}
@@ -2372,10 +2372,10 @@ void KGrGame::mapCollections()
 			i18n("There is no folder '%1' to hold levels for"
 			" the '%2' game. Please make sure '%3' "
 			"has been run in the '%4' folder.")
-			.tqarg(d_path)
-			.tqarg(colln->name)
-			.tqarg("tar xf levels.tar")
-			.tqarg(systemDataDir));
+			.arg(d_path)
+			.arg(colln->name)
+			.arg("tar xf levels.tar")
+			.arg(systemDataDir));
 	    }
 	    continue;
 	}
@@ -2388,9 +2388,9 @@ void KGrGame::mapCollections()
 	if ((files->count() <= 0) && (colln->nLevels > 0)) {
 	    KGrMessage::information (view, i18n("Check Games & Levels"),
 		i18n("There are no files '%1/%2???.grl' for the %3 game.")
-		.tqarg(d_path)
-		.tqarg(colln->prefix)
-		.tqarg("\"" + colln->name + "\""));
+		.arg(d_path)
+		.arg(colln->prefix)
+		.arg("\"" + colln->name + "\""));
 	    continue;
 	}
 
@@ -2413,8 +2413,8 @@ void KGrGame::mapCollections()
 			i18n("Check Games & Levels"),
 			i18n("File '%1' is beyond the highest level for "
 			"the %2 game and cannot be played.")
-			.tqarg(fileName1)
-			.tqarg("\"" + colln->name + "\""));
+			.arg(fileName1)
+			.arg("\"" + colln->name + "\""));
 		    break;
 		}
 		else if (fileName1 == fileName2) {
@@ -2426,16 +2426,16 @@ void KGrGame::mapCollections()
 			i18n("Check Games & Levels"),
 			i18n("File '%1' is before the lowest level for "
 			"the %2 game and cannot be played.")
-			.tqarg(fileName1)
-			.tqarg("\"" + colln->name + "\""));
+			.arg(fileName1)
+			.arg("\"" + colln->name + "\""));
 		    break;
 		}
 		else {
 		    KGrMessage::information (view,
 			i18n("Check Games & Levels"),
 			i18n("Cannot find file '%1' for the %2 game.")
-			.tqarg(fileName2)
-			.tqarg("\"" + colln->name + "\""));
+			.arg(fileName2)
+			.arg("\"" + colln->name + "\""));
 		    lev++;
 		}
 	    }
@@ -2457,14 +2457,14 @@ bool KGrGame::loadCollections (Owner o)
 	if (o == SYSTEM) {
 	    KGrMessage::information (view, i18n("Load Game Info"),
 		i18n("Cannot find game info file '%1'.")
-		.tqarg(filePath));
+		.arg(filePath));
 	}
 	return (FALSE);
     }
 
     if (! c.open (IO_ReadOnly)) {
 	KGrMessage::information (view, i18n("Load Game Info"),
-	    i18n("Cannot open file '%1' for read-only.").tqarg(filePath));
+	    i18n("Cannot open file '%1' for read-only.").arg(filePath));
 	return (FALSE);
     }
 
@@ -2513,7 +2513,7 @@ bool KGrGame::loadCollections (Owner o)
 		// Not EOF: it's an empty line or out-of-context "about" line.
 		KGrMessage::information (view, i18n("Load Game Info"),
 		    i18n("Format error in game info file '%1'.")
-		    .tqarg(filePath));
+		    .arg(filePath));
 		c.close();
 		return (FALSE);
 	    }
@@ -2542,7 +2542,7 @@ bool KGrGame::saveCollections (Owner o)
     // Open the output file.
     if (! c.open (IO_WriteOnly)) {
 	KGrMessage::information (view, i18n("Save Game Info"),
-		i18n("Cannot open file '%1' for output.").tqarg(filePath));
+		i18n("Cannot open file '%1' for output.").arg(filePath));
 	return (FALSE);
     }
 
diff --git a/kgoldrunner/src/kgrgame.h b/kgoldrunner/src/kgrgame.h
index 2b0f26c8..5940d20c 100644
--- a/kgoldrunner/src/kgrgame.h
+++ b/kgoldrunner/src/kgrgame.h
@@ -17,7 +17,7 @@
 // "endData" checks for an end-of-file condition.
 //
 #define myStr		latin1
-#define myChar(i)	tqat((i)).latin1()
+#define myChar(i)	at((i)).latin1()
 #define endData		atEnd
 
 #include <tqobject.h>
@@ -31,7 +31,7 @@
 
 #include <tqdir.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqdatastream.h>
 
 #include <tqcolor.h>