6 files changed, 23 insertions, 23 deletions
diff --git a/knetwalk/src/cell.cpp b/knetwalk/src/cell.cpp
index d3ce0906..b02ad5ff 100644
--- a/knetwalk/src/cell.cpp
+++ b/knetwalk/src/cell.cpp
@@ -17,7 +17,7 @@
 
 #include <tdeglobal.h>
 #include <kiconloader.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "cell.h"
 
@@ -203,11 +203,11 @@ void Cell::paintEvent(TQPaintEvent*)
 
 void Cell::mousePressEvent(TQMouseEvent* e)
 {
-	if(e->button() == Qt::LeftButton)
+	if(e->button() == TQt::LeftButton)
 		emit lClicked(iindex);
-	else if(e->button() == Qt::RightButton)
+	else if(e->button() == TQt::RightButton)
 		emit rClicked(iindex);
-	else if(e->button() == Qt::MidButton)
+	else if(e->button() == TQt::MidButton)
 		emit mClicked(iindex);
 }
 
diff --git a/knetwalk/src/cell.h b/knetwalk/src/cell.h
index 2e5b9b36..d4b46456 100644
--- a/knetwalk/src/cell.h
+++ b/knetwalk/src/cell.h
@@ -20,7 +20,7 @@
 
 class Cell : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 	public:
 		enum Dirs { Free = 0, U = 1, R = 2, D = 4, L = 8, None = 16 };
diff --git a/knetwalk/src/highscores.cpp b/knetwalk/src/highscores.cpp
index a3ef3f3c..adc9a7d3 100644
--- a/knetwalk/src/highscores.cpp
+++ b/knetwalk/src/highscores.cpp
@@ -63,7 +63,7 @@ namespace KExtHighscore
 			default: Q_ASSERT(false);
 		}
 
-		TDEConfigGroupSaver cg(kapp->config(), group);
+		TDEConfigGroupSaver cg(tdeApp->config(), group);
 		TQString name = cg.config()->readEntry("Name", TQString());
 		if ( name.isNull() ) return;
 		if ( name.isEmpty() ) name = i18n("anonymous");
diff --git a/knetwalk/src/highscores.h b/knetwalk/src/highscores.h
index 0a5d30ac..e0c1f303 100644
--- a/knetwalk/src/highscores.h
+++ b/knetwalk/src/highscores.h
@@ -16,12 +16,12 @@
 #define HIGHSCORES_H
 
 #include <highscore/kexthighscore.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KExtHighscore
 {
 
-	class KDE_EXPORT ExtManager : public Manager
+	class TDE_EXPORT ExtManager : public Manager
 	{
 		public:
 			ExtManager();
diff --git a/knetwalk/src/mainwindow.cpp b/knetwalk/src/mainwindow.cpp
index 13007ea6..1806a248 100644
--- a/knetwalk/src/mainwindow.cpp
+++ b/knetwalk/src/mainwindow.cpp
@@ -64,11 +64,11 @@ MainWindow::MainWindow(TQWidget *parent, const char* name, WFlags /*fl*/) :
 
 	KNotifyClient::startDaemon();
 	
-	KStdGameAction::gameNew(TQT_TQOBJECT(this), TQT_SLOT(slotNewGame()), actionCollection());
+	KStdGameAction::gameNew(this, TQ_SLOT(slotNewGame()), actionCollection());
 	
-	KStdGameAction::highscores(TQT_TQOBJECT(this), TQT_SLOT(showHighscores()), actionCollection());
-	KStdGameAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
-	KStdGameAction::configureHighscores(TQT_TQOBJECT(this), TQT_SLOT(configureHighscores()), actionCollection());
+	KStdGameAction::highscores(this, TQ_SLOT(showHighscores()), actionCollection());
+	KStdGameAction::quit(this, TQ_SLOT(close()), actionCollection());
+	KStdGameAction::configureHighscores(this, TQ_SLOT(configureHighscores()), actionCollection());
 
 	m_levels = KStdGameAction::chooseGameType(0, 0, actionCollection());
 	TQStringList lst;
@@ -83,7 +83,7 @@ MainWindow::MainWindow(TQWidget *parent, const char* name, WFlags /*fl*/) :
 	statusBar()->insertItem("abcdefghijklmnopqrst: 0  ",1);
 	setAutoSaveSettings();
 	createGUI();
-	connect(m_levels, TQT_SIGNAL(activated(int)), this, TQT_SLOT(newGame(int)));
+	connect(m_levels, TQ_SIGNAL(activated(int)), this, TQ_SLOT(newGame(int)));
 	
 
 	TQWhatsThis::add(this, i18n("<h3>Rules of the Game</h3>"
@@ -108,9 +108,9 @@ MainWindow::MainWindow(TQWidget *parent, const char* name, WFlags /*fl*/) :
 	{
 		board[i] = new Cell(grid, i);
 		board[i]->setFixedSize(cellsize, cellsize);
-		connect(board[i], TQT_SIGNAL(lClicked(int)), TQT_SLOT(lClicked(int)));
-		connect(board[i], TQT_SIGNAL(rClicked(int)), TQT_SLOT(rClicked(int)));
-		connect(board[i], TQT_SIGNAL(mClicked(int)), TQT_SLOT(mClicked(int)));
+		connect(board[i], TQ_SIGNAL(lClicked(int)), TQ_SLOT(lClicked(int)));
+		connect(board[i], TQ_SIGNAL(rClicked(int)), TQ_SLOT(rClicked(int)));
+		connect(board[i], TQ_SIGNAL(mClicked(int)), TQ_SLOT(mClicked(int)));
 	}
 	srand(time(0));
 
@@ -359,9 +359,9 @@ void MainWindow::rotate(int index, bool toleft)
 		updateConnections();
 		for(int i = 0; i < 14; i++)
 		{
-			kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput);
-			TQTimer::singleShot(20, board[index], TQT_SLOT(update()));
-			kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::WaitForMore);
+			tdeApp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput);
+			TQTimer::singleShot(20, board[index], TQ_SLOT(update()));
+			tdeApp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::WaitForMore);
 			board[index]->rotate(toleft ? -6 : 6);
 		}
 
@@ -388,9 +388,9 @@ void MainWindow::blink(int index)
 {
 	for(int i = 0; i < board[index]->width() * 2; i += 2)
 	{
-		kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput);
-		TQTimer::singleShot(20, board[index], TQT_SLOT(update()));
-		kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput |
+		tdeApp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput);
+		TQTimer::singleShot(20, board[index], TQ_SLOT(update()));
+		tdeApp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput |
 				TQEventLoop::WaitForMore);
 		board[index]->setLight(i);
 	}
diff --git a/knetwalk/src/mainwindow.h b/knetwalk/src/mainwindow.h
index 1962aba8..fe133719 100644
--- a/knetwalk/src/mainwindow.h
+++ b/knetwalk/src/mainwindow.h
@@ -26,7 +26,7 @@ class TDESelectAction;
 
 class MainWindow : public TDEMainWindow
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 	public:
 		MainWindow(TQWidget *parent=0, const char* name=0, WFlags fl=0);