Remove additional unneeded tq method conversions

6 files changed, 26 insertions, 26 deletions

diff --git a/kmahjongg/Editor.cpp b/kmahjongg/Editor.cpp
index 14038f5d..0c6333c5 100644
--- a/kmahjongg/Editor.cpp
+++ b/kmahjongg/Editor.cpp
@@ -209,19 +209,19 @@ void Editor::topToolbarOption(int option) {
 		break;
 	case ID_TOOL_LEFT:
 		theBoard.shiftLeft();
-		tqrepaint(false);
+		repaint(false);
 	        break;
 	case ID_TOOL_RIGHT:
 		theBoard.shiftRight();
-		tqrepaint(false);
+		repaint(false);
 	        break;
 	case ID_TOOL_UP:
 		theBoard.shiftUp();
-		tqrepaint(false);
+		repaint(false);
 	        break;
 	case ID_TOOL_DOWN:
 		theBoard.shiftDown();
-		tqrepaint(false);
+		repaint(false);
 	        break;
 	case ID_TOOL_DEL:
 			mode=remove;
@@ -260,7 +260,7 @@ TQString Editor::statusText() {
 	if (x >=BoardLayout::width || x <0 || y >=BoardLayout::height || y <0)
 		x = y = z = 0;
 
-	buf = i18n("Tiles: %1 Pos: %2,%3,%4").tqarg(numTiles).tqarg(x).tqarg(y).tqarg(z);
+	buf = i18n("Tiles: %1 Pos: %2,%3,%4").arg(numTiles).arg(x).arg(y).arg(z);
 	return buf;
 }
 
@@ -283,7 +283,7 @@ void Editor::loadBoard() {
 
     theBoard.loadBoardLayout( url.path() );
 
-    tqrepaint(false);
+    repaint(false);
 }
 
 
@@ -302,7 +302,7 @@ void Editor::newBoard() {
     clean=true;
     numTiles=0;
     statusChanged();
-    tqrepaint(false);
+    repaint(false);
 }
 
 bool Editor::saveBoard() {
@@ -386,7 +386,7 @@ void Editor::paintEvent( TQPaintEvent*  ) {
     drawTiles(&buff);
     bitBlt(dest, 0,0,&buff, 0,0,buff.width(), buff.height(), CopyROP);
 
-    drawFrame->tqrepaint(false);
+    drawFrame->repaint(false);
 }
 
 void Editor::drawBackground(TQPixmap *pixmap) {
@@ -564,7 +564,7 @@ void Editor::drawFrameMousePressEvent( TQMouseEvent* e )
 			numTiles--;
 			statusChanged();
 			drawFrameMouseMovedEvent(e);
-			tqrepaint(false);
+			repaint(false);
 		    }
 		break;
 		case insert: {
@@ -577,7 +577,7 @@ void Editor::drawFrameMousePressEvent( TQMouseEvent* e )
 			theBoard.insertTile(n);
 			numTiles++;
 			statusChanged();
-			tqrepaint(false);
+			repaint(false);
 		    }
 		  }
 		break;
@@ -599,7 +599,7 @@ void Editor::drawCursor(POSITION &p, bool visible)
     if (p.e==100 || !visible)
 	x = -1;
     drawFrame->setRect(x,y,w,h, tiles.shadowSize(), mode-remove);
-    drawFrame->tqrepaint(false);
+    drawFrame->repaint(false);
 
 
 
diff --git a/kmahjongg/HighScore.cpp b/kmahjongg/HighScore.cpp
index d0e64042..33d0d096 100644
--- a/kmahjongg/HighScore.cpp
+++ b/kmahjongg/HighScore.cpp
@@ -396,7 +396,7 @@ void HighScore::copyTableToScreen(const TQString &name) {
                 elapsedWidgets[p]->setText(buff);   
 
 	}
-	tqrepaint(false);
+	repaint(false);
 }
 
 int HighScore::exec(TQString &tqlayout) {
diff --git a/kmahjongg/Preview.cpp b/kmahjongg/Preview.cpp
index d775eda5..f6ff021a 100644
--- a/kmahjongg/Preview.cpp
+++ b/kmahjongg/Preview.cpp
@@ -52,7 +52,7 @@ void Preview::selectionChanged(int which)
 {
 	m_selectedFile = m_fileList[which];
 	drawPreview();
-	m_drawFrame->tqrepaint(0,0,-1,-1,false);
+	m_drawFrame->repaint(0,0,-1,-1,false);
 	markChanged();
 }
 
@@ -162,7 +162,7 @@ void Preview::load() {
     if ( !url.isEmpty() ) {
         m_selectedFile = url.path();
         drawPreview();
-        m_drawFrame->tqrepaint(0,0,-1,-1,false);
+        m_drawFrame->repaint(0,0,-1,-1,false);
         markChanged();
     }
 }
@@ -255,7 +255,7 @@ void Preview::drawPreview()
 }
 
 void Preview::paintEvent( TQPaintEvent*  ){
-  m_drawFrame->tqrepaint(false);
+  m_drawFrame->repaint(false);
 }
 
 // the user selected ok, or apply. This method passes the changes
diff --git a/kmahjongg/boardwidget.cpp b/kmahjongg/boardwidget.cpp
index aca8c302..7b4d8270 100644
--- a/kmahjongg/boardwidget.cpp
+++ b/kmahjongg/boardwidget.cpp
@@ -45,7 +45,7 @@ BoardWidget::BoardWidget( TQWidget* parent, const char *name )
     if (!loadTileset(tFile)){
         KMessageBox::error(this,
                            i18n("An error occurred when loading the tileset file %1\n"
-                                "KMahjongg will now terminate.").tqarg(tFile));
+                                "KMahjongg will now terminate.").arg(tFile));
         kapp->quit();
     }
 
@@ -55,7 +55,7 @@ BoardWidget::BoardWidget( TQWidget* parent, const char *name )
     if( ! loadBackground(tFile, false ) )
     {
 	KMessageBox::error(this,
-		   i18n("An error occurred when loading the background image\n%1").tqarg(tFile)+
+		   i18n("An error occurred when loading the background image\n%1").arg(tFile)+
 		   i18n("KMahjongg will now terminate."));
 	kapp->quit();
     }
@@ -65,7 +65,7 @@ BoardWidget::BoardWidget( TQWidget* parent, const char *name )
     {
 	KMessageBox::error(this,
 		   i18n("An error occurred when loading the board tqlayout %1\n"
-                "KMahjongg will now terminate.").tqarg(tFile));
+                "KMahjongg will now terminate.").arg(tFile));
 	kapp->quit();
     }
     setDisplayedWidth();
@@ -111,7 +111,7 @@ void BoardWidget::getFileOrDefault(TQString filename, TQString type, TQString &r
     if (res.isEmpty()) {
 		KMessageBox::error(this, i18n("KMahjongg could not locate the file: %1\n"
                                       "or the default file of type: %2\n"
-                                      "KMahjongg will now terminate").tqarg(filename).tqarg(type) );
+                                      "KMahjongg will now terminate").arg(filename).arg(type) );
 		kapp->quit();
 	}
 }
@@ -264,7 +264,7 @@ void BoardWidget::paintEvent( TQPaintEvent* pa )
 	return;
     }
 
-    // if the tqrepaint is because of a window redraw after a move
+    // if the repaint is because of a window redraw after a move
     // or a menu roll up, then just blit in the last rendered image
     if (!updateBackBuffer) {
     	bitBlt(this, xx,pa->rect().top(),
@@ -1804,7 +1804,7 @@ bool BoardWidget::loadBackground(
     if( ! theBackground.load( pszFileName, requiredWidth(), requiredHeight()) )
     {
         if( bShowError )
-            KMessageBox::sorry(this, i18n("Failed to load image:\n%1").tqarg(pszFileName) );
+            KMessageBox::sorry(this, i18n("Failed to load image:\n%1").arg(pszFileName) );
         return( false );
     }
     Prefs::setBackground(pszFileName);
@@ -2010,7 +2010,7 @@ void BoardWidget::shuffle() {
 	// force a redraw
 
 	updateBackBuffer=true;
-       tqrepaint(false);
+       repaint(false);
 
 
 	// I consider this s very bad cheat so, I punish the user
diff --git a/kmahjongg/boardwidget.h b/kmahjongg/boardwidget.h
index bee14b49..62907097 100644
--- a/kmahjongg/boardwidget.h
+++ b/kmahjongg/boardwidget.h
@@ -205,7 +205,7 @@ class BoardWidget : public TQWidget
 
 
 
-	bool    updateBackBuffer;	// does board need redrawing. Not if it is just a tqrepaint
+	bool    updateBackBuffer;	// does board need redrawing. Not if it is just a repaint
 
 	bool gamePaused;
 
diff --git a/kmahjongg/kmahjongg.cpp b/kmahjongg/kmahjongg.cpp
index 541a6193..536fa99b 100644
--- a/kmahjongg/kmahjongg.cpp
+++ b/kmahjongg/kmahjongg.cpp
@@ -397,7 +397,7 @@ void KMahjongg::gameOver(
 void KMahjongg::showStatusText( const TQString &msg, long board )
 {
     statusLabel->setText(msg);
-    TQString str = i18n("Game number: %1").tqarg(board);
+    TQString str = i18n("Game number: %1").arg(board);
     gameNumLabel->setText(str);
 
 }
@@ -406,8 +406,8 @@ void KMahjongg::showStatusText( const TQString &msg, long board )
 void KMahjongg::showTileNumber( int iMaximum, int iCurrent, int iLeft )
 {
     // Hmm... seems iCurrent is the number of remaining tiles, not removed ...
-    //TQString szBuffer = i18n("Removed: %1/%2").tqarg(iCurrent).tqarg(iMaximum);
-    TQString szBuffer = i18n("Removed: %1/%2  Combinations left: %3").tqarg(iMaximum-iCurrent).tqarg(iMaximum).tqarg(iLeft);
+    //TQString szBuffer = i18n("Removed: %1/%2").arg(iCurrent).arg(iMaximum);
+    TQString szBuffer = i18n("Removed: %1/%2  Combinations left: %3").arg(iMaximum-iCurrent).arg(iMaximum).arg(iLeft);
     tilesLeftLabel->setText(szBuffer);
 
     // Update here since undo allow is effected by demo mode