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

4 files changed, 21 insertions, 21 deletions

diff --git a/blinken/src/blinken.h b/blinken/src/blinken.h
index 6994de20..a266b934 100644
--- a/blinken/src/blinken.h
+++ b/blinken/src/blinken.h
@@ -74,7 +74,7 @@ Q_OBJECT
 		// Preferences setting handling
 		bool m_showPreferences;
 		
-		// if should update the highlighting after the next tqrepaint
+		// if should update the highlighting after the next repaint
 		bool m_updateButtonHighlighting;
 		
 		// use always the non-cool font?
diff --git a/blinken/src/button.cpp b/blinken/src/button.cpp
index 052ef6ed..b8eef48a 100644
--- a/blinken/src/button.cpp
+++ b/blinken/src/button.cpp
@@ -20,7 +20,7 @@ button::button(blinkenGame::color c) : m_selected(false), m_color(c)
 	KConfig *kc = kapp->config();
 	kc->setGroup("General");
 	TQString cs = getColorString();
-	TQString pixmap = TQString("images/%1h.png").tqarg(cs);
+	TQString pixmap = TQString("images/%1h.png").arg(cs);
 	
 	switch (c)
 	{
diff --git a/blinken/src/highscoredialog.cpp b/blinken/src/highscoredialog.cpp
index 4fb63e93..46588f5f 100644
--- a/blinken/src/highscoredialog.cpp
+++ b/blinken/src/highscoredialog.cpp
@@ -119,7 +119,7 @@ class myTabWidget : public TQTabWidget
 		
 		TQSize tabBarSizeHint() const
 		{
-			return tabBar() -> tqsizeHint();
+			return tabBar() -> sizeHint();
 		}
 };
 
@@ -133,10 +133,10 @@ highScoreDialog::highScoreDialog(TQWidget *parent) : KDialogBase(parent, 0, true
 	KConfig *cfg = kapp -> config();
 	for (int i = 1; i <= 3; i++)
 	{
-		cfg -> setGroup(TQString("Level%1").tqarg(i));
+		cfg -> setGroup(TQString("Level%1").arg(i));
 		for (int j = 1; j <= 5; j++)
 		{
-			m_scores[i-1].append(tqMakePair(cfg->readNumEntry(TQString("Score%1").tqarg(j)), cfg->readEntry(TQString("Name%1").tqarg(j))));
+			m_scores[i-1].append(tqMakePair(cfg->readNumEntry(TQString("Score%1").arg(j)), cfg->readEntry(TQString("Name%1").arg(j))));
 		}
 	}
 	
@@ -170,12 +170,12 @@ void highScoreDialog::addScore(int level, int score, const TQString &name)
 		m_scores[level].remove(--m_scores[level].end());
 		
 		KConfig *cfg = kapp -> config();
-		cfg -> setGroup(TQString("Level%1").tqarg(level + 1));
+		cfg -> setGroup(TQString("Level%1").arg(level + 1));
 		int j;
 		for (it = m_scores[level].begin(), j = 1; it != m_scores[level].end(); ++it, j++)
 		{
-			cfg->writeEntry(TQString("Score%1").tqarg(j), (*it).first);
-			cfg->writeEntry(TQString("Name%1").tqarg(j), (*it).second);
+			cfg->writeEntry(TQString("Score%1").arg(j), (*it).first);
+			cfg->writeEntry(TQString("Name%1").arg(j), (*it).second);
 		}
 		cfg -> sync();
 	}
diff --git a/blinken/src/number.cpp b/blinken/src/number.cpp
index 27621ee8..d5fbd539 100644
--- a/blinken/src/number.cpp
+++ b/blinken/src/number.cpp
@@ -7,7 +7,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqcolor.h>
 #include <tqpainter.h>
 
@@ -100,7 +100,7 @@ void number::paintDigit(TQPainter &p, int number) const
 {
 	// make gcc  happy
 	const int *n = m_number0;
-	int tqshape;
+	int shape;
 	
 	switch (number)
 	{
@@ -147,25 +147,25 @@ void number::paintDigit(TQPainter &p, int number) const
 	{
 		for (int j = 0; j < 4; j++)
 		{
-			tqshape = n[j + i * 4];
-			if (tqshape == 0)
+			shape = n[j + i * 4];
+			if (shape == 0)
 			{
 				p.fillRect(7 * (j-1), 7 * (i-1), 6, 6, TQt::red);
 			}
-			else if (tqshape != 5)
+			else if (shape != 5)
 			{
-				if (tqshape == 1) p.translate(7 * (j-1), 7 * (i-1));
-				else if (tqshape == 2)
+				if (shape == 1) p.translate(7 * (j-1), 7 * (i-1));
+				else if (shape == 2)
 				{
 					p.translate(7 * j - 2, 7 * (i-1));
 					p.rotate(90);
 				}
-				else if (tqshape == 3)
+				else if (shape == 3)
 				{
 					p.translate(7 * j - 2, 7 * i - 2);
 					p.rotate(180);
 				}
-				else if (tqshape == 4)
+				else if (shape == 4)
 				{
 					p.translate(7 * (j-1), 7 * i - 2);
 					p.rotate(270);
@@ -173,19 +173,19 @@ void number::paintDigit(TQPainter &p, int number) const
 				
 				p.drawPie(0, 0, 11, 11, 90 * 16, 16 * 90);
 				
-				if (tqshape == 1) p.translate(-7 * (j-1), -7 * (i-1));
-				else if (tqshape == 2)
+				if (shape == 1) p.translate(-7 * (j-1), -7 * (i-1));
+				else if (shape == 2)
 				{
 					p.rotate(-90);
 					p.translate(-(7 * j - 2), -7 * (i-1));
 
 				}
-				else if (tqshape == 3)
+				else if (shape == 3)
 				{
 					p.rotate(-180);
 					p.translate(-(7 * j - 2), -(7 * i - 2));
 				}
-				else if (tqshape == 4)
+				else if (shape == 4)
 				{
 					p.rotate(-270);
 					p.translate(- (7 * (j-1)), -(7 * i - 2));