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

14 files changed, 35 insertions, 35 deletions

diff --git a/ksnake/appearance.ui b/ksnake/appearance.ui
index 7696fc19..d5f49530 100644
--- a/ksnake/appearance.ui
+++ b/ksnake/appearance.ui
@@ -71,7 +71,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>21</width>
                     <height>40</height>
diff --git a/ksnake/ball.cpp b/ksnake/ball.cpp
index dc86d7a0..2881beb9 100644
--- a/ksnake/ball.cpp
+++ b/ksnake/ball.cpp
@@ -73,7 +73,7 @@ void Ball::nextMove()
     }
 }
 
-void Ball::tqrepaint()
+void Ball::repaint()
 {
     static int i = 0;
     static bool rotate = true;
diff --git a/ksnake/ball.h b/ksnake/ball.h
index 609eef95..e7796354 100644
--- a/ksnake/ball.h
+++ b/ksnake/ball.h
@@ -33,7 +33,7 @@ public:
     Ball(Board *b, PixServer *p);
     virtual ~Ball(){}
     virtual void nextMove();
-    void tqrepaint();
+    void repaint();
     void zero();
 protected:
     Board   *board;
diff --git a/ksnake/basket.cpp b/ksnake/basket.cpp
index 8d124a45..138336cd 100644
--- a/ksnake/basket.cpp
+++ b/ksnake/basket.cpp
@@ -81,7 +81,7 @@ void Basket::newApples()
     }
 }
 
-void Basket::tqrepaint(bool dirty )
+void Basket::repaint(bool dirty )
 {
     Kaffee *g;
     for ( g  = list->first(); g != 0; g = list->next()) {
diff --git a/ksnake/basket.h b/ksnake/basket.h
index 18386acc..5275d8a8 100644
--- a/ksnake/basket.h
+++ b/ksnake/basket.h
@@ -56,7 +56,7 @@ class Basket : public TQObject
 public:
     Basket(Board *b, PixServer *p);
     ~Basket();
-    void tqrepaint(bool);
+    void repaint(bool);
     void newApples();
     void clear();
     Fruits eaten( int i);
diff --git a/ksnake/game.cpp b/ksnake/game.cpp
index 29e8b5df..dfae1a4b 100644
--- a/ksnake/game.cpp
+++ b/ksnake/game.cpp
@@ -88,17 +88,17 @@ Game::~Game()
 }
 
 void Game::scoreChanged(int score){
-	statusBar()->changeItem(i18n("Score: %1").tqarg(score), SCORE);
+	statusBar()->changeItem(i18n("Score: %1").arg(score), SCORE);
 }
 
 void Game::setTrys(int tries){
-	statusBar()->changeItem(i18n("Lives: %1").tqarg(tries), LIVES);
+	statusBar()->changeItem(i18n("Lives: %1").arg(tries), LIVES);
 }
 
 void Game::gameEnd(int score){
 	KScoreDialog di(KScoreDialog::Name | KScoreDialog::Score | KScoreDialog::Date, this);
 	KScoreDialog::FieldInfo scoreInfo;
-	TQString date = TQDateTime::tqcurrentDateTime().toString();
+	TQString date = TQDateTime::currentDateTime().toString();
 	scoreInfo.insert(KScoreDialog::Date, date);
 	if (di.addScore(score, scoreInfo, true))
 		di.exec();
diff --git a/ksnake/general.ui b/ksnake/general.ui
index 39e3f45b..9d1eff19 100644
--- a/ksnake/general.ui
+++ b/ksnake/general.ui
@@ -59,7 +59,7 @@
                     <property name="text">
                         <string>Fast</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -189,7 +189,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>70</height>
diff --git a/ksnake/pixServer.cpp b/ksnake/pixServer.cpp
index ed9a2113..244ff17d 100644
--- a/ksnake/pixServer.cpp
+++ b/ksnake/pixServer.cpp
@@ -181,7 +181,7 @@ void PixServer::initBrickPixmap()
 {
     TQPixmap pm = TQPixmap(locate("appdata", "pics/brick.png"));
     if (pm.isNull()) {
-	kdFatal() << i18n("error loading %1, aborting\n").tqarg("brick.png");
+	kdFatal() << i18n("error loading %1, aborting\n").arg("brick.png");
     }
     int pw = pm.width();
     int ph = pm.height();
diff --git a/ksnake/rattler.cpp b/ksnake/rattler.cpp
index 4c68f316..86ab1528 100644
--- a/ksnake/rattler.cpp
+++ b/ksnake/rattler.cpp
@@ -114,7 +114,7 @@ void Rattler::paintEvent( TQPaintEvent *e)
 	  return;
 	TQPixmap levelPix = pix->levelPix();
 
-	basket->tqrepaint(true);
+	basket->repaint(true);
 	
 	bitBlt(this, rect.x(), rect.y(),
 			  &levelPix, rect.x(), rect.y(), rect.width(), rect.height());
@@ -130,14 +130,14 @@ void Rattler::timerEvent( TQTimerEvent * )
 	for (CompuSnake *c = computerSnakes->first(); c != 0; c = computerSnakes->next()){
 		if(c) {
 				c->nextMove();
-				c->tqrepaint(false);
+				c->repaint(false);
 				}
 	}
 
 	for (Ball *b = balls->first(); b != 0; b = balls->next()){
 		if (b) {
 			b->nextMove();
-			b->tqrepaint();
+			b->repaint();
 		}
 	}
 
@@ -147,10 +147,10 @@ void Rattler::timerEvent( TQTimerEvent * )
 	if(!gameState.testBit(Demo))
 	{
 		state = samy->nextMove(direction);
-		samy->tqrepaint( false );
+		samy->repaint( false );
 	}
 
-	basket->tqrepaint( false);
+	basket->repaint( false);
 
 	if (state == ko)
 		newTry();
@@ -313,8 +313,8 @@ void Rattler::pause()
 		label = new TQLabel(this);
 		label->setFont( TQFont( "Times", 14, TQFont::Bold ) );
 		label->setText(i18n("Game Paused\n Press %1 to resume\n")
-							.tqarg(tempPauseAction->shortcutText()));
-		label->tqsetAlignment( AlignCenter );
+							.arg(tempPauseAction->shortcutText()));
+		label->setAlignment( AlignCenter );
 		label->setFrameStyle( TQFrame::Panel | TQFrame::Raised );
 		label->setGeometry(182, 206, 198, 80);
 		label->show();
@@ -351,7 +351,7 @@ void Rattler::restartDemo()
 	level->create(Intro);
 	pix->initRoomPixmap();
 	init(false);
-	tqrepaint();
+	repaint();
 	start();
 }
 
@@ -374,7 +374,7 @@ void Rattler::demo()
 	level->create(Intro);
 	pix->initRoomPixmap();
 	}
-	tqrepaint(rect(), false);
+	repaint(rect(), false);
 	init(false);
 	run();
 	first_time = false;
@@ -413,7 +413,7 @@ void Rattler::restart()
 
 	cleanLabel();
 
-	tqrepaint();
+	repaint();
 	TQTimer::singleShot( 2000, this, TQT_SLOT(showRoom()) );
 }
 
@@ -426,7 +426,7 @@ void Rattler::newTry()
 		gameState.setBit(Over);
 		level->create(GameOver);
 		pix->initRoomPixmap();
-		tqrepaint();
+		repaint();
 		TQTimer::singleShot( 5000, this, TQT_SLOT(demo()) );
 		emit setScore(points);
 		return;
@@ -439,7 +439,7 @@ void Rattler::newTry()
 	level->create(Room);
 	pix->initRoomPixmap();
 	init(true);
-	tqrepaint();
+	repaint();
 	TQTimer::singleShot( 1000, this, TQT_SLOT(run()) );
 }
 
@@ -456,7 +456,7 @@ void Rattler::levelUp()
 	level->nextLevel();
 	level->create(Banner);
 	pix->initRoomPixmap();
-	tqrepaint();
+	repaint();
 
 	TQTimer::singleShot( 2000, this, TQT_SLOT(showRoom()) );
 }
@@ -493,7 +493,7 @@ void Rattler::showRoom()
 	level->create(Room);
 	pix->initRoomPixmap();
 	init(true);
-	tqrepaint();
+	repaint();
 	TQTimer::singleShot( 1000, this, TQT_SLOT(run()) );
 }
 
diff --git a/ksnake/snake.cpp b/ksnake/snake.cpp
index 2d6337ac..c892452b 100644
--- a/ksnake/snake.cpp
+++ b/ksnake/snake.cpp
@@ -143,7 +143,7 @@ void Snake::reset(int index, int border)
 	}
 }
 
-void Snake::tqrepaint( bool dirty)
+void Snake::repaint( bool dirty)
 {
 	int x = 0;
 	for ( Samy *sam = list.first(); sam != 0; sam = list.next(), x++) {
diff --git a/ksnake/snake.h b/ksnake/snake.h
index 206ea126..9b5c1087 100644
--- a/ksnake/snake.h
+++ b/ksnake/snake.h
@@ -46,7 +46,7 @@ signals:
 public:
 	Snake(Board *b, PixServer *p, Gate g, PixMap x);
 	~Snake() {}
-	void tqrepaint( bool );
+	void repaint( bool );
 	void zero();
 
 protected:
diff --git a/ksnake/startroom.cpp b/ksnake/startroom.cpp
index 9792ee4b..b1eb3b8d 100644
--- a/ksnake/startroom.cpp
+++ b/ksnake/startroom.cpp
@@ -29,7 +29,7 @@
 #include <tqwmatrix.h>
 #include <tqspinbox.h>
 #include <klocale.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include "levels.h"
 
@@ -40,16 +40,16 @@ StartRoom::StartRoom( TQWidget *parent, const char *name)
     TQSpacerItem* spacer = new TQSpacerItem( 20, 61, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
     Form1Layout->addItem( spacer, 2, 1 );
 
-    TQHBoxLayout *tqlayout1 = new TQHBoxLayout( 0, 0, 6, "tqlayout1"); 
+    TQHBoxLayout *layout1 = new TQHBoxLayout( 0, 0, 6, "layout1"); 
     TQSpacerItem* spacer_2 = new TQSpacerItem( 91, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
-    tqlayout1->addItem( spacer_2 );
+    layout1->addItem( spacer_2 );
 
     picture = new TQLabel( this, "picture" );
-    tqlayout1->addWidget( picture );
+    layout1->addWidget( picture );
     TQSpacerItem* spacer_3 = new TQSpacerItem( 41, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
-    tqlayout1->addItem( spacer_3 );
+    layout1->addItem( spacer_3 );
 
-    Form1Layout->addMultiCellLayout( tqlayout1, 0, 0, 0, 1 );
+    Form1Layout->addMultiCellLayout( layout1, 0, 0, 0, 1 );
 
     roomRange = new TQSpinBox( this, "kcfg_StartingRoom" );
     roomRange->setMaxValue( 25 );
diff --git a/ksnake/view.cpp b/ksnake/view.cpp
index add5cf16..a8503700 100644
--- a/ksnake/view.cpp
+++ b/ksnake/view.cpp
@@ -51,7 +51,7 @@ void View::resizeEvent( TQResizeEvent * )
     rattler->setGeometry(0, BAR_HEIGHT, width(),   height()-BAR_HEIGHT);
 }
 
-TQSize View::tqsizeHint() const
+TQSize View::sizeHint() const
 {
 	return TQSize(490,502);
 }
diff --git a/ksnake/view.h b/ksnake/view.h
index 9e05da9f..871cd7a1 100644
--- a/ksnake/view.h
+++ b/ksnake/view.h
@@ -42,7 +42,7 @@ public:
 
 protected:
 	void resizeEvent( TQResizeEvent * );
-	virtual TQSize tqsizeHint() const;
+	virtual TQSize sizeHint() const;
 };
 
 #endif // VIEW_H