Replace various '#define' strings - part 6

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

1 files changed, 31 insertions, 31 deletions

diff --git a/atlantikdesigner/designer/designer.cpp b/atlantikdesigner/designer/designer.cpp
index 11cb218..23cdf2c 100644
--- a/atlantikdesigner/designer/designer.cpp
+++ b/atlantikdesigner/designer/designer.cpp
@@ -48,25 +48,25 @@ AtlanticDesigner::AtlanticDesigner(TQWidget *parent, const char *name)
 	board = 0;
 	layout = 0;
 
-	(void) KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
-	(void) KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(open()), actionCollection());
-	(void) KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(openNew()), actionCollection());
-	(void) KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection());
-	(void) KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), actionCollection());
-	(void) new TDEAction(i18n("&Edit Gameboard Info..."), CTRL+Key_I, TQT_TQOBJECT(this), TQT_SLOT(info()), actionCollection(), "boardinfo");
-	(void) new TDEAction(i18n("&Edit Groups..."), CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT(editGroups()), actionCollection(), "groupeditor");
-
-	(void) new TDEAction(i18n("&Add 4 Squares"), "zoom-in", 0, TQT_TQOBJECT(this), TQT_SLOT(larger()), actionCollection(), "larger");
-	(void) new TDEAction(i18n("&Remove 4 Squares"), "zoom-out", 0, TQT_TQOBJECT(this), TQT_SLOT(smaller()), actionCollection(), "smaller");
-	(void) KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copy()), actionCollection());
-	(void) KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(paste()), actionCollection());
-	(void) new TDEAction(i18n("&Up"), Key_Up, TQT_TQOBJECT(this), TQT_SLOT(up()), actionCollection(), "up");
-	(void) new TDEAction(i18n("&Down"), Key_Down, TQT_TQOBJECT(this), TQT_SLOT(down()), actionCollection(), "down");
-	(void) new TDEAction(i18n("&Left"), Key_Left, TQT_TQOBJECT(this), TQT_SLOT(left()), actionCollection(), "left");
-	(void) new TDEAction(i18n("&Right"), Key_Right, TQT_TQOBJECT(this), TQT_SLOT(right()), actionCollection(), "right");
+	(void) KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
+	(void) KStdAction::open(this, TQT_SLOT(open()), actionCollection());
+	(void) KStdAction::openNew(this, TQT_SLOT(openNew()), actionCollection());
+	(void) KStdAction::save(this, TQT_SLOT(save()), actionCollection());
+	(void) KStdAction::saveAs(this, TQT_SLOT(saveAs()), actionCollection());
+	(void) new TDEAction(i18n("&Edit Gameboard Info..."), CTRL+Key_I, this, TQT_SLOT(info()), actionCollection(), "boardinfo");
+	(void) new TDEAction(i18n("&Edit Groups..."), CTRL+Key_G, this, TQT_SLOT(editGroups()), actionCollection(), "groupeditor");
+
+	(void) new TDEAction(i18n("&Add 4 Squares"), "zoom-in", 0, this, TQT_SLOT(larger()), actionCollection(), "larger");
+	(void) new TDEAction(i18n("&Remove 4 Squares"), "zoom-out", 0, this, TQT_SLOT(smaller()), actionCollection(), "smaller");
+	(void) KStdAction::copy(this, TQT_SLOT(copy()), actionCollection());
+	(void) KStdAction::paste(this, TQT_SLOT(paste()), actionCollection());
+	(void) new TDEAction(i18n("&Up"), Key_Up, this, TQT_SLOT(up()), actionCollection(), "up");
+	(void) new TDEAction(i18n("&Down"), Key_Down, this, TQT_SLOT(down()), actionCollection(), "down");
+	(void) new TDEAction(i18n("&Left"), Key_Left, this, TQT_SLOT(left()), actionCollection(), "left");
+	(void) new TDEAction(i18n("&Right"), Key_Right, this, TQT_SLOT(right()), actionCollection(), "right");
 
 	recentAct = KStdAction::openRecent(0, 0, actionCollection());
-	connect(recentAct, TQT_SIGNAL(urlSelected(const KURL &)), TQT_TQOBJECT(this), TQT_SLOT(openRecent(const KURL &)));
+	connect(recentAct, TQT_SIGNAL(urlSelected(const KURL &)), this, TQT_SLOT(openRecent(const KURL &)));
 	recentAct->loadEntries(TDEGlobal::config(), "Designer recent files");
 
 	estateAct = new TDEListAction(i18n("Change Estate"), 0, 0, 0, actionCollection(), "estate_num");
@@ -137,8 +137,8 @@ void AtlanticDesigner::initBoard()
 	setCentralWidget(board);
 	layout = new TQVBoxLayout(board->centerWidget());
 	editor = new EstateEdit(&groups, &estates, &cards, board->centerWidget(), "Estate Editor");
-	connect(editor, TQT_SIGNAL(goChecked(int)), TQT_TQOBJECT(this), TQT_SLOT(goChanged(int)));
-	connect(editor, TQT_SIGNAL(updateBackground()), TQT_TQOBJECT(this), TQT_SLOT(updateBackground()));
+	connect(editor, TQT_SIGNAL(goChecked(int)), this, TQT_SLOT(goChanged(int)));
+	connect(editor, TQT_SIGNAL(updateBackground()), this, TQT_SLOT(updateBackground()));
 	connect(editor, TQT_SIGNAL(resized()), board, TQT_SLOT(slotResizeAftermath()));
 	layout->addWidget(editor);
 
@@ -184,7 +184,7 @@ void AtlanticDesigner::openNew()
 	groupsChanged();
 	updateBackground();
 
-	TQTimer::singleShot(500, TQT_TQOBJECT(this), TQT_SLOT(setPlayerAtBeginning()));
+	TQTimer::singleShot(500, this, TQT_SLOT(setPlayerAtBeginning()));
 	doCaption(false);
 }
 
@@ -198,8 +198,8 @@ ConfigEstate *AtlanticDesigner::newEstate(int i)
 	estate->setChanged(false);
 	estates.insert(i, estate);
 
-	connect(estate, TQT_SIGNAL(LMBClicked(Estate *)), TQT_TQOBJECT(this), TQT_SLOT(changeEstate(Estate *)));
-	connect(estate, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(modified()));
+	connect(estate, TQT_SIGNAL(LMBClicked(Estate *)), this, TQT_SLOT(changeEstate(Estate *)));
+	connect(estate, TQT_SIGNAL(changed()), this, TQT_SLOT(modified()));
 
 	board->addEstateView(estate);
 
@@ -486,8 +486,8 @@ void AtlanticDesigner::openFile(const TQString &filename)
 			estate->setPassMoney(passMoney);
 			estates.append(estate);
 
-			connect(estate, TQT_SIGNAL(LMBClicked(Estate *)), TQT_TQOBJECT(this), TQT_SLOT(changeEstate(Estate *)));
-			connect(estate, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(modified()));
+			connect(estate, TQT_SIGNAL(LMBClicked(Estate *)), this, TQT_SLOT(changeEstate(Estate *)));
+			connect(estate, TQT_SIGNAL(changed()), this, TQT_SLOT(modified()));
 			i++;
 		}
 		else if (parseMode == Parse_Cards)
@@ -545,7 +545,7 @@ void AtlanticDesigner::openFile(const TQString &filename)
 	updateBackground();
 	updateJumpMenu();
 
-	TQTimer::singleShot(500, TQT_TQOBJECT(this), TQT_SLOT(setPlayerAtBeginning()));
+	TQTimer::singleShot(500, this, TQT_SLOT(setPlayerAtBeginning()));
 	doCaption(false);
 }
 
@@ -895,7 +895,7 @@ void AtlanticDesigner::larger()
 	groupsChanged();
 	updateBackground();
 
-	TQTimer::singleShot(500, TQT_TQOBJECT(this), TQT_SLOT(setPlayerAtBeginning()));
+	TQTimer::singleShot(500, this, TQT_SLOT(setPlayerAtBeginning()));
 	doCaption(true);
 }
 
@@ -934,7 +934,7 @@ void AtlanticDesigner::smaller()
 	updateJumpMenu();
 	groupsChanged();
 	updateBackground();
-	TQTimer::singleShot(500, TQT_TQOBJECT(this), TQT_SLOT(setPlayerAtBeginning()));
+	TQTimer::singleShot(500, this, TQT_SLOT(setPlayerAtBeginning()));
 
 	doCaption(true);
 }
@@ -957,8 +957,8 @@ void AtlanticDesigner::editGroups()
 		groupEditor = new GroupEditor(&groups, this);
 		groupEditor->show();
 
-		connect(groupEditor, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(modified()));
-		connect(groupEditor, TQT_SIGNAL(update()), TQT_TQOBJECT(this), TQT_SLOT(groupsChanged()));
+		connect(groupEditor, TQT_SIGNAL(changed()), this, TQT_SLOT(modified()));
+		connect(groupEditor, TQT_SIGNAL(update()), this, TQT_SLOT(groupsChanged()));
 		connect(groupEditor, TQT_SIGNAL(update()), editor, TQT_SLOT(groupsChanged()));
 	}
 	else
@@ -1019,8 +1019,8 @@ void AtlanticDesigner::info()
 		boardInfoDlg = new BoardInfoDlg(true, &boardInfo, this, "Board Information", false);
 		boardInfoDlg->show();
 
-		connect(boardInfoDlg, TQT_SIGNAL(okClicked()), TQT_TQOBJECT(this), TQT_SLOT(updateBackground()));
-		connect(boardInfoDlg, TQT_SIGNAL(okClicked()), TQT_TQOBJECT(this), TQT_SLOT(modified()));
+		connect(boardInfoDlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(updateBackground()));
+		connect(boardInfoDlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(modified()));
 	}
 	else
 		boardInfoDlg->raise();