Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 69e4de2f4cee257151ca13b207dc677b2d958fed)

3 files changed, 97 insertions, 97 deletions

diff --git a/kturtle/src/dialogs.cpp b/kturtle/src/dialogs.cpp
index 1690ca02..d358860c 100644
--- a/kturtle/src/dialogs.cpp
+++ b/kturtle/src/dialogs.cpp
@@ -28,8 +28,8 @@
 ErrorMessage::ErrorMessage (TQWidget *parent)
 	: KDialogBase (parent, "errorDialog", false, 0, KDialogBase::Close | KDialogBase::Help | KDialogBase::User1, KDialogBase::Close, true, i18n("Help on &Error") )
 {
-	connect( this, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT( showHelpOnError() ) );
-	connect( this, TQT_SIGNAL( helpClicked() ), this, TQT_SLOT( errorMessageHelp() ) );
+	connect( this, TQ_SIGNAL( user1Clicked() ), this, TQ_SLOT( showHelpOnError() ) );
+	connect( this, TQ_SIGNAL( helpClicked() ), this, TQ_SLOT( errorMessageHelp() ) );
 	setCaption( i18n("Error Dialog") );
 	setButtonWhatsThis( KDialogBase::Close, i18n("Closes this error dialog") );
 	setButtonWhatsThis( KDialogBase::Help, i18n("Click here to read more on this error dialog in KTurtle's Handbook.") );
@@ -107,7 +107,7 @@ void ErrorMessage::display()
 	enableButton (KDialogBase::User1, false);
 	errTable->sortColumn(0, true, true);
 	show();
-	connect( errTable, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( updateSelection() ) );
+	connect( errTable, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( updateSelection() ) );
 }
 
 void ErrorMessage::updateSelection()
@@ -144,10 +144,10 @@ ColorPicker::ColorPicker(TQWidget *parent)
 	: KDialogBase(parent, "colorpicker", false, i18n("Color Picker"), KDialogBase::Close | KDialogBase::Help | KDialogBase::User1, KDialogBase::Close, true )
 {
 	// connect to help
-	connect( this, TQT_SIGNAL( helpClicked() ), TQT_SLOT( slotColorPickerHelp() ) );
+	connect( this, TQ_SIGNAL( helpClicked() ), TQ_SLOT( slotColorPickerHelp() ) );
 	
 	// for toggling convenience
-	connect( this, TQT_SIGNAL( finished() ), TQT_SLOT( slotEmitVisibility() ) );
+	connect( this, TQ_SIGNAL( finished() ), TQ_SLOT( slotEmitVisibility() ) );
     
 	// Create the top level page and its layout
 	BaseWidget = new TQWidget(this);
@@ -155,7 +155,7 @@ ColorPicker::ColorPicker(TQWidget *parent)
     
 	// the User1 button:
 	setButtonText( KDialogBase::User1, i18n("Insert Color Code at Cursor") );
-	connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( slotEmitColorCode() ) );
+	connect( this, TQ_SIGNAL( user1Clicked() ), TQ_SLOT( slotEmitColorCode() ) );
  
 	TQVBoxLayout *vlayout = new TQVBoxLayout(BaseWidget);
     
@@ -170,14 +170,14 @@ ColorPicker::ColorPicker(TQWidget *parent)
 	hsSelector = new KHSSelector(BaseWidget); // the color (SH) selector
 	hsSelector->setMinimumSize(300, 150);
 	h1layout->addWidget(hsSelector);
-	connect( hsSelector, TQT_SIGNAL( valueChanged(int, int) ), TQT_SLOT( slotSelectorChanged(int, int) ) );
+	connect( hsSelector, TQ_SIGNAL( valueChanged(int, int) ), TQ_SLOT( slotSelectorChanged(int, int) ) );
 
 	h1layout->addSpacing(5); // space in between
    
 	valuePal = new KValueSelector(BaseWidget); // the darkness (V) pal
 	valuePal->setFixedWidth(30);
 	h1layout->addWidget(valuePal);
-	connect( valuePal, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotPalChanged(int) ) );   
+	connect( valuePal, TQ_SIGNAL( valueChanged(int) ), TQ_SLOT( slotPalChanged(int) ) );   
     
 	vlayout->addSpacing(15); // space in between the top and the bottom widgets
 
@@ -203,7 +203,7 @@ ColorPicker::ColorPicker(TQWidget *parent)
 	colorcode = new TQLineEdit(BaseWidget); // the code generator
 	colorcode->setReadOnly(true);
 	v2layout->addWidget(colorcode);
-	connect( colorcode, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( slotReselect() ) );
+	connect( colorcode, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( slotReselect() ) );
     
 	h2layout->addSpacing(5); // spacing on the right border
     
@@ -269,9 +269,9 @@ void ColorPicker::slotPalChanged(int v_)
 void ColorPicker::slotReselect()
 {
 	// reselect by selectAll(), but make sure no looping occurs
-	disconnect( colorcode, TQT_SIGNAL( selectionChanged() ), 0, 0 );
+	disconnect( colorcode, TQ_SIGNAL( selectionChanged() ), 0, 0 );
 	colorcode->selectAll();
-	connect( colorcode, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( slotReselect() ) );
+	connect( colorcode, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( slotReselect() ) );
 }
 
 void ColorPicker::slotEmitVisibility()
diff --git a/kturtle/src/executer.cpp b/kturtle/src/executer.cpp
index 9268eab1..eec03261 100644
--- a/kturtle/src/executer.cpp
+++ b/kturtle/src/executer.cpp
@@ -1015,7 +1015,7 @@ void Executer::startWaiting(int msec)
 {
 	bStopWaiting = false;
 	// call a timer that sets stopWaiting to true when it runs 
-	TQTimer::singleShot( msec, this, TQT_SLOT( slotStopWaiting() ) );
+	TQTimer::singleShot( msec, this, TQ_SLOT( slotStopWaiting() ) );
 	while (bStopWaiting == false)
 	{
 		if (bAbort) return; // waits need to be interrupted by the stop action
diff --git a/kturtle/src/kturtle.cpp b/kturtle/src/kturtle.cpp
index 81c70f2b..b62f5e4c 100644
--- a/kturtle/src/kturtle.cpp
+++ b/kturtle/src/kturtle.cpp
@@ -123,59 +123,59 @@ void MainWindow::setupActions()
 	TDEActionCollection *ac = actionCollection(); // abbreviation
 	
 	// File actions
-	KStdAction::openNew(this, TQT_SLOT(slotNewFile()), ac);
-	openExAction = new TDEAction(i18n("Open Exa&mples..."), "bookmark_folder", CTRL+Key_E, this, TQT_SLOT(slotOpenExample()), ac, "open_examples");
-	KStdAction::open(this, TQT_SLOT(slotOpenFile()), ac);
-	m_recentFiles = KStdAction::openRecent(this, TQT_SLOT(slotOpenFile(const KURL&)), ac);
-	KStdAction::save(this, TQT_SLOT(slotSaveFile()), ac);
-	KStdAction::saveAs(this, TQT_SLOT(slotSaveAs()), ac);
-	new TDEAction(i18n("Save &Canvas..."), 0, 0, this, TQT_SLOT(slotSaveCanvas()), ac, "save_canvas");
-	speed = new TDESelectAction(i18n("Execution Speed"), 0, ALT+Key_S, this, TQT_SLOT( slotChangeSpeed() ), ac, "speed");
+	KStdAction::openNew(this, TQ_SLOT(slotNewFile()), ac);
+	openExAction = new TDEAction(i18n("Open Exa&mples..."), "bookmark_folder", CTRL+Key_E, this, TQ_SLOT(slotOpenExample()), ac, "open_examples");
+	KStdAction::open(this, TQ_SLOT(slotOpenFile()), ac);
+	m_recentFiles = KStdAction::openRecent(this, TQ_SLOT(slotOpenFile(const KURL&)), ac);
+	KStdAction::save(this, TQ_SLOT(slotSaveFile()), ac);
+	KStdAction::saveAs(this, TQ_SLOT(slotSaveAs()), ac);
+	new TDEAction(i18n("Save &Canvas..."), 0, 0, this, TQ_SLOT(slotSaveCanvas()), ac, "save_canvas");
+	speed = new TDESelectAction(i18n("Execution Speed"), 0, ALT+Key_S, this, TQ_SLOT( slotChangeSpeed() ), ac, "speed");
 	TQStringList speeds; speeds << i18n("Full Speed") << i18n("Slow") << i18n("Slower") << i18n("Slowest");
 	speed->setItems(speeds);
 	speed->setCurrentItem(0);
-	run = new TDEAction(i18n("&Execute Commands"), "gear", ALT+Key_Return, this, TQT_SLOT( slotExecute() ), ac, "run");
-	pause = new TDEToggleAction(i18n("Pause E&xecution"), "media-playback-pause", Key_Pause, this, TQT_SLOT( slotPauseExecution() ), ac, "pause");
+	run = new TDEAction(i18n("&Execute Commands"), "gear", ALT+Key_Return, this, TQ_SLOT( slotExecute() ), ac, "run");
+	pause = new TDEToggleAction(i18n("Pause E&xecution"), "media-playback-pause", Key_Pause, this, TQ_SLOT( slotPauseExecution() ), ac, "pause");
 	pause->setChecked(false);
 	pause->setEnabled(false);
-	stop = new TDEAction(i18n("Stop E&xecution"), "process-stop", Key_Escape, this, TQT_SLOT( slotAbortExecution() ), ac, "stop");
+	stop = new TDEAction(i18n("Stop E&xecution"), "process-stop", Key_Escape, this, TQ_SLOT( slotAbortExecution() ), ac, "stop");
 	stop->setEnabled(false);
-	KStdAction::print(this, TQT_SLOT(slotPrint()), ac);
-	KStdAction::quit(this, TQT_SLOT(close()), ac);
+	KStdAction::print(this, TQ_SLOT(slotPrint()), ac);
+	KStdAction::quit(this, TQ_SLOT(close()), ac);
 	
 	// Edit actions
-	KStdAction::undo(this, TQT_SLOT(slotUndo()), ac);
-	KStdAction::redo(this, TQT_SLOT(slotRedo()), ac);
-	KStdAction::cut(this, TQT_SLOT(slotCut()), ac);
-	KStdAction::copy(this, TQT_SLOT(slotCopy()), ac);
-	KStdAction::paste(this, TQT_SLOT(slotPaste()), ac);
-	KStdAction::selectAll(this, TQT_SLOT(slotSelectAll()), ac);
-	KStdAction::deselect(this, TQT_SLOT(slotClearSelection()), ac);
-	new TDEToggleAction(i18n("Toggle Insert"), Key_Insert, this, TQT_SLOT(slotToggleInsert()), ac, "set_insert");
-	KStdAction::find(this, TQT_SLOT(slotFind()), ac);
-	KStdAction::findNext(this, TQT_SLOT(slotFindNext()), ac);
-	KStdAction::findPrev(this, TQT_SLOT(slotFindPrevious()), ac);
-	KStdAction::replace(this, TQT_SLOT(slotReplace()), ac);
+	KStdAction::undo(this, TQ_SLOT(slotUndo()), ac);
+	KStdAction::redo(this, TQ_SLOT(slotRedo()), ac);
+	KStdAction::cut(this, TQ_SLOT(slotCut()), ac);
+	KStdAction::copy(this, TQ_SLOT(slotCopy()), ac);
+	KStdAction::paste(this, TQ_SLOT(slotPaste()), ac);
+	KStdAction::selectAll(this, TQ_SLOT(slotSelectAll()), ac);
+	KStdAction::deselect(this, TQ_SLOT(slotClearSelection()), ac);
+	new TDEToggleAction(i18n("Toggle Insert"), Key_Insert, this, TQ_SLOT(slotToggleInsert()), ac, "set_insert");
+	KStdAction::find(this, TQ_SLOT(slotFind()), ac);
+	KStdAction::findNext(this, TQ_SLOT(slotFindNext()), ac);
+	KStdAction::findPrev(this, TQ_SLOT(slotFindPrevious()), ac);
+	KStdAction::replace(this, TQ_SLOT(slotReplace()), ac);
 	
 	// View actions
-	new TDEToggleAction(i18n("Show &Line Numbers"), 0, Key_F11, this, TQT_SLOT(slotToggleLineNumbers()), ac, "line_numbers");
-	m_fullscreen = KStdAction::fullScreen(this, TQT_SLOT(slotToggleFullscreen()), ac, this, "full_screen");
+	new TDEToggleAction(i18n("Show &Line Numbers"), 0, Key_F11, this, TQ_SLOT(slotToggleLineNumbers()), ac, "line_numbers");
+	m_fullscreen = KStdAction::fullScreen(this, TQ_SLOT(slotToggleFullscreen()), ac, this, "full_screen");
 	m_fullscreen->setChecked(b_fullscreen);
 
 	// Tools actions
-	colorpicker = new TDEToggleAction(i18n("&Color Picker"), "colorize", ALT+Key_C, this, TQT_SLOT(slotColorPicker()), ac, "color_picker");
-	new TDEAction(i18n("&Indent"), "format-indent-more", CTRL+Key_I, this, TQT_SLOT(slotIndent()), ac, "edit_indent");
-	new TDEAction(i18n("&Unindent"), "format-indent-less", CTRL+SHIFT+Key_I, this, TQT_SLOT(slotUnIndent()), ac, "edit_unindent");
-	new TDEAction(i18n("Cl&ean Indentation"), 0, 0, this, TQT_SLOT(slotCleanIndent()), ac, "edit_cleanIndent");
-	new TDEAction(i18n("Co&mment"), 0, CTRL+Key_D, this, TQT_SLOT(slotComment()), ac, "edit_comment");
-	new TDEAction(i18n("Unc&omment"), 0, CTRL+SHIFT+Key_D, this, TQT_SLOT(slotUnComment()), ac, "edit_uncomment");
+	colorpicker = new TDEToggleAction(i18n("&Color Picker"), "colorize", ALT+Key_C, this, TQ_SLOT(slotColorPicker()), ac, "color_picker");
+	new TDEAction(i18n("&Indent"), "format-indent-more", CTRL+Key_I, this, TQ_SLOT(slotIndent()), ac, "edit_indent");
+	new TDEAction(i18n("&Unindent"), "format-indent-less", CTRL+SHIFT+Key_I, this, TQ_SLOT(slotUnIndent()), ac, "edit_unindent");
+	new TDEAction(i18n("Cl&ean Indentation"), 0, 0, this, TQ_SLOT(slotCleanIndent()), ac, "edit_cleanIndent");
+	new TDEAction(i18n("Co&mment"), 0, CTRL+Key_D, this, TQ_SLOT(slotComment()), ac, "edit_comment");
+	new TDEAction(i18n("Unc&omment"), 0, CTRL+SHIFT+Key_D, this, TQ_SLOT(slotUnComment()), ac, "edit_uncomment");
 	
 	// Settings actions
-	KStdAction::preferences( this, TQT_SLOT(slotSettings()), ac );
-	new TDEAction(i18n("&Configure Editor..."), "configure", 0, this, TQT_SLOT(slotEditor()), ac, "set_confdlg");
+	KStdAction::preferences( this, TQ_SLOT(slotSettings()), ac );
+	new TDEAction(i18n("&Configure Editor..."), "configure", 0, this, TQ_SLOT(slotEditor()), ac, "set_confdlg");
 	
 	// Help actions
-	ContextHelp = new TDEAction(0, 0, Key_F2, this, TQT_SLOT(slotContextHelp()), ac, "context_help");
+	ContextHelp = new TDEAction(0, 0, Key_F2, this, TQ_SLOT(slotContextHelp()), ac, "context_help");
 	slotContextHelpUpdate(); // this sets the label of this action
 	
 	// other
@@ -204,9 +204,9 @@ void MainWindow::setupEditor()
 	slotSetHighlightstyle( Settings::logoLanguage() );
 
 	// allow the cursor position to be indicated in the statusbar
-	connect( editor, TQT_SIGNAL(cursorPositionChanged()), this, TQT_SLOT(slotCursorStatusBar()) );
+	connect( editor, TQ_SIGNAL(cursorPositionChanged()), this, TQ_SLOT(slotCursorStatusBar()) );
 	// and update the context help menu item
-	connect( editor, TQT_SIGNAL(cursorPositionChanged()), this, TQT_SLOT(slotContextHelpUpdate()) );
+	connect( editor, TQ_SIGNAL(cursorPositionChanged()), this, TQ_SLOT(slotContextHelpUpdate()) );
 	
 	translate = new Translate();
 }
@@ -236,7 +236,7 @@ void MainWindow::setupCanvas()
 	baseLayout->setColStretch(0, 1);
 	TQWhatsThis::add( canvasView, i18n("This is the canvas, here the turtle draws a picture.") );
 	canvasView->show();
-	connect( canvasView, TQT_SIGNAL( CanvasResized() ), this, TQT_SLOT( slotUpdateCanvas() ) );
+	connect( canvasView, TQ_SIGNAL( CanvasResized() ), this, TQ_SLOT( slotUpdateCanvas() ) );
 }
 
 // END
@@ -525,10 +525,10 @@ void MainWindow::slotExecute()
 	TQString txt = editorInterface->text() + "\x0a\x0a"; // parser expects input to have 2 delimiting newlines
 	TQTextIStream in(&txt); // create the stream
 	Parser parser(in); // pass the reference to the stream to the parse object
-	connect(&parser, TQT_SIGNAL( ErrorMsg(Token&, const TQString&, uint) ),
-	         errMsg, TQT_SLOT( slotAddError(Token&, const TQString&, uint) ) );
-	connect( errMsg, TQT_SIGNAL(setSelection(uint, uint, uint, uint) ),
-	           this, TQT_SLOT(slotSetSelection(uint, uint, uint, uint) ) );
+	connect(&parser, TQ_SIGNAL( ErrorMsg(Token&, const TQString&, uint) ),
+	         errMsg, TQ_SLOT( slotAddError(Token&, const TQString&, uint) ) );
+	connect( errMsg, TQ_SIGNAL(setSelection(uint, uint, uint, uint) ),
+	           this, TQ_SLOT(slotSetSelection(uint, uint, uint, uint) ) );
 	parser.parse(); // and GO!
 	TreeNode* root = parser.getTree(); // when finished parsing get the nodeTree
 	kdDebug(0)<<"############## PARSING FINISHED ##############"<<endl;
@@ -541,42 +541,42 @@ void MainWindow::slotExecute()
 	kdDebug(0)<<"############## EXECUTION STARTED ##############"<<endl;
 	exe = new Executer(root); // make Executer object, 'exe', and pass it the nodeTree
 	
-	connect(this, TQT_SIGNAL( changeSpeed(int) ), exe, TQT_SLOT(slotChangeSpeed(int) ) );
-	connect(this, TQT_SIGNAL( unpauseExecution() ), exe, TQT_SLOT( slotStopPausing() ) );
-	connect( exe, TQT_SIGNAL( setSelection(uint, uint, uint, uint) ),
-	        this, TQT_SLOT  ( slotSetSelection(uint, uint, uint, uint) ) );
-	connect( exe, TQT_SIGNAL( ErrorMsg(Token&, const TQString&, uint) ),
-	      errMsg, TQT_SLOT  ( slotAddError(Token&, const TQString&, uint) ) );
-	connect( exe, TQT_SIGNAL( InputDialog(TQString&) ), this, TQT_SLOT( slotInputDialog(TQString&) ) );
-	connect( exe, TQT_SIGNAL( MessageDialog(TQString) ), this, TQT_SLOT( slotMessageDialog(TQString) ) );
+	connect(this, TQ_SIGNAL( changeSpeed(int) ), exe, TQ_SLOT(slotChangeSpeed(int) ) );
+	connect(this, TQ_SIGNAL( unpauseExecution() ), exe, TQ_SLOT( slotStopPausing() ) );
+	connect( exe, TQ_SIGNAL( setSelection(uint, uint, uint, uint) ),
+	        this, TQ_SLOT  ( slotSetSelection(uint, uint, uint, uint) ) );
+	connect( exe, TQ_SIGNAL( ErrorMsg(Token&, const TQString&, uint) ),
+	      errMsg, TQ_SLOT  ( slotAddError(Token&, const TQString&, uint) ) );
+	connect( exe, TQ_SIGNAL( InputDialog(TQString&) ), this, TQ_SLOT( slotInputDialog(TQString&) ) );
+	connect( exe, TQ_SIGNAL( MessageDialog(TQString) ), this, TQ_SLOT( slotMessageDialog(TQString) ) );
 
 	// Connect the signals form Executer to the slots from Canvas:
-	connect( exe, TQT_SIGNAL( Clear() ), canvasView, TQT_SLOT( slotClear() ) );
-	connect( exe, TQT_SIGNAL( Go(double, double) ), canvasView, TQT_SLOT( slotGo(double, double) ) );
-	connect( exe, TQT_SIGNAL( GoX(double) ), canvasView, TQT_SLOT( slotGoX(double) ) );
-	connect( exe, TQT_SIGNAL( GoY(double) ), canvasView, TQT_SLOT( slotGoY(double) ) );
-	connect( exe, TQT_SIGNAL( Forward(double) ), canvasView, TQT_SLOT( slotForward(double) ) );
-	connect( exe, TQT_SIGNAL( Backward(double) ), canvasView, TQT_SLOT( slotBackward(double) ) );
-	connect( exe, TQT_SIGNAL( Direction(double) ), canvasView, TQT_SLOT( slotDirection(double) ) );
-	connect( exe, TQT_SIGNAL( TurnLeft(double) ), canvasView, TQT_SLOT( slotTurnLeft(double) ) );
-	connect( exe, TQT_SIGNAL( TurnRight(double) ), canvasView, TQT_SLOT( slotTurnRight(double) ) );
-	connect( exe, TQT_SIGNAL( Center() ), canvasView, TQT_SLOT( slotCenter() ) );
-	connect( exe, TQT_SIGNAL( SetPenWidth(int) ), canvasView, TQT_SLOT( slotSetPenWidth(int) ) );
-	connect( exe, TQT_SIGNAL( PenUp() ), canvasView, TQT_SLOT( slotPenUp() ) );
-	connect( exe, TQT_SIGNAL( PenDown() ), canvasView, TQT_SLOT( slotPenDown() ) );
-	connect( exe, TQT_SIGNAL( SetFgColor(int, int, int) ), canvasView, TQT_SLOT( slotSetFgColor(int, int, int) ) );
-	connect( exe, TQT_SIGNAL( SetBgColor(int, int, int) ), canvasView, TQT_SLOT( slotSetBgColor(int, int, int) ) );
-	connect( exe, TQT_SIGNAL( ResizeCanvas(int, int) ), canvasView, TQT_SLOT( slotResizeCanvas(int, int) ) );
-	connect( exe, TQT_SIGNAL( SpriteShow() ), canvasView, TQT_SLOT( slotSpriteShow() ) );
-	connect( exe, TQT_SIGNAL( SpriteHide() ), canvasView, TQT_SLOT( slotSpriteHide() ) );
-	connect( exe, TQT_SIGNAL( SpritePress() ), canvasView, TQT_SLOT( slotSpritePress() ) );
-	connect( exe, TQT_SIGNAL( SpriteChange(int) ), canvasView, TQT_SLOT( slotSpriteChange(int) ) );
-	connect( exe, TQT_SIGNAL( Print(TQString) ), canvasView, TQT_SLOT( slotPrint(TQString) ) );
-	connect( exe, TQT_SIGNAL( FontType(TQString, TQString) ), canvasView, TQT_SLOT( slotFontType(TQString, TQString) ) );
-	connect( exe, TQT_SIGNAL( FontSize(int) ), canvasView, TQT_SLOT( slotFontSize(int) ) );
-	connect( exe, TQT_SIGNAL( WrapOn() ), canvasView, TQT_SLOT( slotWrapOn() ) );
-	connect( exe, TQT_SIGNAL( WrapOff() ), canvasView, TQT_SLOT( slotWrapOff() ) );
-	connect( exe, TQT_SIGNAL( Reset() ), canvasView, TQT_SLOT( slotReset() ) );
+	connect( exe, TQ_SIGNAL( Clear() ), canvasView, TQ_SLOT( slotClear() ) );
+	connect( exe, TQ_SIGNAL( Go(double, double) ), canvasView, TQ_SLOT( slotGo(double, double) ) );
+	connect( exe, TQ_SIGNAL( GoX(double) ), canvasView, TQ_SLOT( slotGoX(double) ) );
+	connect( exe, TQ_SIGNAL( GoY(double) ), canvasView, TQ_SLOT( slotGoY(double) ) );
+	connect( exe, TQ_SIGNAL( Forward(double) ), canvasView, TQ_SLOT( slotForward(double) ) );
+	connect( exe, TQ_SIGNAL( Backward(double) ), canvasView, TQ_SLOT( slotBackward(double) ) );
+	connect( exe, TQ_SIGNAL( Direction(double) ), canvasView, TQ_SLOT( slotDirection(double) ) );
+	connect( exe, TQ_SIGNAL( TurnLeft(double) ), canvasView, TQ_SLOT( slotTurnLeft(double) ) );
+	connect( exe, TQ_SIGNAL( TurnRight(double) ), canvasView, TQ_SLOT( slotTurnRight(double) ) );
+	connect( exe, TQ_SIGNAL( Center() ), canvasView, TQ_SLOT( slotCenter() ) );
+	connect( exe, TQ_SIGNAL( SetPenWidth(int) ), canvasView, TQ_SLOT( slotSetPenWidth(int) ) );
+	connect( exe, TQ_SIGNAL( PenUp() ), canvasView, TQ_SLOT( slotPenUp() ) );
+	connect( exe, TQ_SIGNAL( PenDown() ), canvasView, TQ_SLOT( slotPenDown() ) );
+	connect( exe, TQ_SIGNAL( SetFgColor(int, int, int) ), canvasView, TQ_SLOT( slotSetFgColor(int, int, int) ) );
+	connect( exe, TQ_SIGNAL( SetBgColor(int, int, int) ), canvasView, TQ_SLOT( slotSetBgColor(int, int, int) ) );
+	connect( exe, TQ_SIGNAL( ResizeCanvas(int, int) ), canvasView, TQ_SLOT( slotResizeCanvas(int, int) ) );
+	connect( exe, TQ_SIGNAL( SpriteShow() ), canvasView, TQ_SLOT( slotSpriteShow() ) );
+	connect( exe, TQ_SIGNAL( SpriteHide() ), canvasView, TQ_SLOT( slotSpriteHide() ) );
+	connect( exe, TQ_SIGNAL( SpritePress() ), canvasView, TQ_SLOT( slotSpritePress() ) );
+	connect( exe, TQ_SIGNAL( SpriteChange(int) ), canvasView, TQ_SLOT( slotSpriteChange(int) ) );
+	connect( exe, TQ_SIGNAL( Print(TQString) ), canvasView, TQ_SLOT( slotPrint(TQString) ) );
+	connect( exe, TQ_SIGNAL( FontType(TQString, TQString) ), canvasView, TQ_SLOT( slotFontType(TQString, TQString) ) );
+	connect( exe, TQ_SIGNAL( FontSize(int) ), canvasView, TQ_SLOT( slotFontSize(int) ) );
+	connect( exe, TQ_SIGNAL( WrapOn() ), canvasView, TQ_SLOT( slotWrapOn() ) );
+	connect( exe, TQ_SIGNAL( WrapOff() ), canvasView, TQ_SLOT( slotWrapOff() ) );
+	connect( exe, TQ_SIGNAL( Reset() ), canvasView, TQ_SLOT( slotReset() ) );
 
 	// START EXECUTION on the selected speed, and use the feedbacked boolean value
 	slotChangeSpeed();
@@ -625,7 +625,7 @@ void MainWindow::finishExecution()
 	if (speed->currentItem() == 0) slotClearSelection();
 
 	// if coming from fullscreen-mode show the editor, menu- and statusbar
-	if (b_fullscreen) TQTimer::singleShot( 1000, this, TQT_SLOT( slotFinishedFullScreenExecution() ) );
+	if (b_fullscreen) TQTimer::singleShot( 1000, this, TQ_SLOT( slotFinishedFullScreenExecution() ) );
 }
 
 void MainWindow::slotChangeSpeed()
@@ -833,9 +833,9 @@ void MainWindow::slotFinishedFullScreenExecution()
 	if ( errMsg->containsErrors() ) slotBackToFullScreen(); // straight back to edit if there where errors 
 	else
 	{
-		connect( restartOrBackDialog, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT( slotRestartFullScreen() ) );
-		connect( restartOrBackDialog, TQT_SIGNAL( user2Clicked() ), this, TQT_SLOT( slotBackToFullScreen() ) );
-		connect( restartOrBackDialog, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotBackToFullScreen() ) );
+		connect( restartOrBackDialog, TQ_SIGNAL( user1Clicked() ), this, TQ_SLOT( slotRestartFullScreen() ) );
+		connect( restartOrBackDialog, TQ_SIGNAL( user2Clicked() ), this, TQ_SLOT( slotBackToFullScreen() ) );
+		connect( restartOrBackDialog, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotBackToFullScreen() ) );
 		restartOrBackDialog->show();
 		restartOrBackDialog->move(50, 50);
 	}
@@ -870,7 +870,7 @@ void MainWindow::slotSettings()
 	// Create a new dialog with the same name as the above checking code.
 	TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Settings::self() );
 	// connect the help
-	connect( dialog, TQT_SIGNAL( helpClicked() ), this, TQT_SLOT( slotSettingsHelp() ) );
+	connect( dialog, TQ_SIGNAL( helpClicked() ), this, TQ_SLOT( slotSettingsHelp() ) );
 	
 	// making the filling for the 'General' settings dept.
 	general = new TQWidget();
@@ -946,7 +946,7 @@ void MainWindow::slotSettings()
 	dialog->addPage( language, i18n("Language"), "locale", i18n("Language Settings") );
 
 	// When the user clicks OK or Apply we want to update our settings.
-	connect( dialog, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT( slotUpdateSettings() ) );
+	connect( dialog, TQ_SIGNAL( settingsChanged() ), this, TQ_SLOT( slotUpdateSettings() ) );
 
 	// Display the dialog is there where errors.
 	dialog->setInitialSize( TQSize(550, 300) );
@@ -1150,8 +1150,8 @@ void MainWindow::slotColorPicker()
 	{
 		picker = new ColorPicker(this);
 		if(picker == 0) return; // safety
-		connect( picker, TQT_SIGNAL( visible(bool) ), colorpicker, TQT_SLOT( setChecked(bool) ) );
-		connect( picker, TQT_SIGNAL( ColorCode(TQString) ), this, TQT_SLOT( slotInsertText(TQString) ) );
+		connect( picker, TQ_SIGNAL( visible(bool) ), colorpicker, TQ_SLOT( setChecked(bool) ) );
+		connect( picker, TQ_SIGNAL( ColorCode(TQString) ), this, TQ_SLOT( slotInsertText(TQString) ) );
 	}
 	// if picker is not 0, there is a colorpickerdialog which only needs to be shown OR hidden
 	if ( picker->isHidden() )