Revert automated changes

Sorry guys, they are just not ready for prime time
Work will continue as always


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1212481 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 files changed, 69 insertions, 69 deletions

diff --git a/kturtle/src/canvas.cpp b/kturtle/src/canvas.cpp
index b0133e82..38281956 100644
--- a/kturtle/src/canvas.cpp
+++ b/kturtle/src/canvas.cpp
@@ -18,7 +18,7 @@
 
  
 // Note on this file:
-// It tqcontains 200 lines of code just to make sure very long line are drawn correctly
+// It contains 200 lines of code just to make sure very long line are drawn correctly
 // till a certain extent... Beyond that extent the code just cuts the crap, since use user
 // it then probably not doing anything usefull anymore; so he she will not notice the code
 // is cheating a bit in order to prevent CPU hogging.
@@ -297,11 +297,11 @@ void Canvas::slotPrint(TQString text)
 void Canvas::slotFontType(TQString family, TQString extra)
 {
 	font.setFamily(family);
-	font.setBold( extra.tqcontains("bold") > 0 );
-	font.setItalic( extra.tqcontains("italic") > 0 );
-	font.setUnderline( extra.tqcontains("underline") > 0 );
-	font.setOverline( extra.tqcontains("overline") > 0 );
-	font.setStrikeOut( extra.tqcontains("strikeout") > 0 );
+	font.setBold( extra.contains("bold") > 0 );
+	font.setItalic( extra.contains("italic") > 0 );
+	font.setUnderline( extra.contains("underline") > 0 );
+	font.setOverline( extra.contains("overline") > 0 );
+	font.setStrikeOut( extra.contains("strikeout") > 0 );
 }
 
 void Canvas::slotFontSize(int px)
diff --git a/kturtle/src/dialogs.cpp b/kturtle/src/dialogs.cpp
index 23a3d6f0..fcc6322d 100644
--- a/kturtle/src/dialogs.cpp
+++ b/kturtle/src/dialogs.cpp
@@ -95,7 +95,7 @@ void ErrorMessage::slotAddError(Token& t, const TQString& s, uint c)
 }
 
 
-bool ErrorMessage::tqcontainsErrors()
+bool ErrorMessage::containsErrors()
 {
 	if (errTable->numRows() != 0) return true;
 	return false;
@@ -149,7 +149,7 @@ ColorPicker::ColorPicker(TQWidget *parent)
 	// for toggling convenience
 	connect( this, TQT_SIGNAL( finished() ), TQT_SLOT( slotEmitVisibility() ) );
     
-	// Create the top level page and its tqlayout
+	// Create the top level page and its layout
 	BaseWidget = new TQWidget(this);
 	setMainWidget(BaseWidget);
     
@@ -157,57 +157,57 @@ ColorPicker::ColorPicker(TQWidget *parent)
 	setButtonText( KDialogBase::User1, i18n("Insert Color Code at Cursor") );
 	connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( slotEmitColorCode() ) );
  
-	TQVBoxLayout *vtqlayout = new TQVBoxLayout(BaseWidget);
+	TQVBoxLayout *vlayout = new TQVBoxLayout(BaseWidget);
     
-	vtqlayout->addSpacing(5); // spacing on top
+	vlayout->addSpacing(5); // spacing on top
 
 	// the palette and value selector go into a H-box
-	TQHBoxLayout *h1tqlayout = new TQHBoxLayout(BaseWidget);
-	vtqlayout->addLayout(h1tqlayout);
+	TQHBoxLayout *h1layout = new TQHBoxLayout(BaseWidget);
+	vlayout->addLayout(h1layout);
     
-	h1tqlayout->addSpacing(10); // space on the left border
+	h1layout->addSpacing(10); // space on the left border
      
 	hsSelector = new KHSSelector(BaseWidget); // the color (SH) selector
 	hsSelector->setMinimumSize(300, 150);
-	h1tqlayout->addWidget(hsSelector);
+	h1layout->addWidget(hsSelector);
 	connect( hsSelector, TQT_SIGNAL( valueChanged(int, int) ), TQT_SLOT( slotSelectorChanged(int, int) ) );
 
-	h1tqlayout->addSpacing(5); // space in between
+	h1layout->addSpacing(5); // space in between
    
 	valuePal = new KValueSelector(BaseWidget); // the darkness (V) pal
 	valuePal->setFixedWidth(30);
-	h1tqlayout->addWidget(valuePal);
+	h1layout->addWidget(valuePal);
 	connect( valuePal, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotPalChanged(int) ) );   
     
-	vtqlayout->addSpacing(15); // space in between the top and the bottom widgets
+	vlayout->addSpacing(15); // space in between the top and the bottom widgets
 
 	// the patch and the codegenerator also go into a H-box
-	TQHBoxLayout *h2tqlayout = new TQHBoxLayout(BaseWidget);
-	vtqlayout->addLayout(h2tqlayout);
+	TQHBoxLayout *h2layout = new TQHBoxLayout(BaseWidget);
+	vlayout->addLayout(h2layout);
     
-	h2tqlayout->addSpacing(10); // space on the left border
+	h2layout->addSpacing(10); // space on the left border
    
 	patch = new KColorPatch(BaseWidget); // the patch (color previewer)
 	patch->setFixedSize(50, 50);
-	h2tqlayout->addWidget(patch);
+	h2layout->addWidget(patch);
    
-	h2tqlayout->addSpacing(10); // space in between
+	h2layout->addSpacing(10); // space in between
 
 	// the label and the codegenerator go in a V-box
-	TQVBoxLayout *v2tqlayout = new TQVBoxLayout(BaseWidget);
-	h2tqlayout->addLayout(v2tqlayout); 
+	TQVBoxLayout *v2layout = new TQVBoxLayout(BaseWidget);
+	h2layout->addLayout(v2layout); 
     
 	copyable = new TQLabel(i18n("Color code:"), BaseWidget); // tha label
-	v2tqlayout->addWidget(copyable);
+	v2layout->addWidget(copyable);
         
 	colorcode = new TQLineEdit(BaseWidget); // the code generator
 	colorcode->setReadOnly(true);
-	v2tqlayout->addWidget(colorcode);
+	v2layout->addWidget(colorcode);
 	connect( colorcode, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( slotReselect() ) );
     
-	h2tqlayout->addSpacing(5); // spacing on the right border
+	h2layout->addSpacing(5); // spacing on the right border
     
-	vtqlayout->addSpacing(10); // spacing on the bottom
+	vlayout->addSpacing(10); // spacing on the bottom
 
 	h = g = b = 0; // start with red
 	s = v = r = 255;
@@ -228,7 +228,7 @@ void ColorPicker::updatePal()
 	valuePal->setSaturation(s);
 	valuePal->setValue(v);
 	valuePal->updateContents();
-	valuePal->tqrepaint(false);
+	valuePal->repaint(false);
 }
 
 void ColorPicker::updatePatch()
diff --git a/kturtle/src/dialogs.h b/kturtle/src/dialogs.h
index ac333b19..0a421d49 100644
--- a/kturtle/src/dialogs.h
+++ b/kturtle/src/dialogs.h
@@ -58,7 +58,7 @@ class ErrorMessage : public KDialogBase
 		ErrorMessage(TQWidget *parent);
 		~ErrorMessage() {}
 	
-		bool tqcontainsErrors();
+		bool containsErrors();
 
 		void display();
 
@@ -117,9 +117,9 @@ class ColorPicker : public KDialogBase
 		TQWidget            *BaseWidget;
 		KHSSelector        *hsSelector;
 		KValueSelector     *valuePal;
-		TQVBoxLayout        *vtqlayout;
-		TQHBoxLayout        *h1tqlayout;
-		TQHBoxLayout        *h2tqlayout;
+		TQVBoxLayout        *vlayout;
+		TQHBoxLayout        *h1layout;
+		TQHBoxLayout        *h2layout;
 		KColorPatch        *patch;
 		TQLabel             *copyable;
 		TQLineEdit          *colorcode;
diff --git a/kturtle/src/executer.cpp b/kturtle/src/executer.cpp
index 8998f185..e50c64a5 100644
--- a/kturtle/src/executer.cpp
+++ b/kturtle/src/executer.cpp
@@ -329,7 +329,7 @@ void Executer::execForEach(TreeNode* node)
 	
 	bBreak = false;
 	
-	int i = expStr2.tqcontains(expStr1, false);
+	int i = expStr2.contains(expStr1, false);
 	for ( ; i > 0; i-- )
 	{
 		if (bAbort) return;
diff --git a/kturtle/src/kturtle.cpp b/kturtle/src/kturtle.cpp
index 858f727f..d90228a6 100644
--- a/kturtle/src/kturtle.cpp
+++ b/kturtle/src/kturtle.cpp
@@ -153,9 +153,9 @@ void MainWindow::setupActions()
 	KStdAction::deselect(this, TQT_SLOT(slotClearSelection()), ac);
 	new KToggleAction(i18n("Toggle Insert"), Key_Insert, this, TQT_SLOT(slotToggleInsert()), ac, "set_insert");
 	KStdAction::find(this, TQT_SLOT(slotFind()), ac);
-	KStdAction::tqfindNext(this, TQT_SLOT(slotFindNext()), ac);
-	KStdAction::tqfindPrev(this, TQT_SLOT(slotFindPrevious()), ac);
-	KStdAction::tqreplace(this, TQT_SLOT(slotReplace()), ac);
+	KStdAction::findNext(this, TQT_SLOT(slotFindNext()), ac);
+	KStdAction::findPrev(this, TQT_SLOT(slotFindPrevious()), ac);
+	KStdAction::replace(this, TQT_SLOT(slotReplace()), ac);
 	
 	// View actions
 	new KToggleAction(i18n("Show &Line Numbers"), 0, Key_F11, this, TQT_SLOT(slotToggleLineNumbers()), ac, "line_numbers");
@@ -247,7 +247,7 @@ void MainWindow::setupCanvas()
 
 void MainWindow::slotStatusBar(TQString text, int id)
 {
-	text = " " + text + " "; // help the tqlayout
+	text = " " + text + " "; // help the layout
 	statusBar()->changeItem(text, id);
 }
 
@@ -586,7 +586,7 @@ void MainWindow::slotExecute()
 	
 	delete exe; // clean-up
 
-	if ( errMsg->tqcontainsErrors() ) errMsg->display(); // if errors show them
+	if ( errMsg->containsErrors() ) errMsg->display(); // if errors show them
 }
 
 void MainWindow::slotPauseExecution()
@@ -650,7 +650,7 @@ void MainWindow::slotMessageDialog(TQString text)
 
 
 
-// BEGIN editor connections (undo, redo, cut, copy, paste, cursor, selections, find, tqreplace, linenumbers etc.)
+// BEGIN editor connections (undo, redo, cut, copy, paste, cursor, selections, find, replace, linenumbers etc.)
 
 void MainWindow::slotEditor()
 {
@@ -734,7 +734,7 @@ void MainWindow::slotFindPrevious()
 
 void MainWindow::slotReplace()
 {
-	KAction* a = editor->actionCollection()->action("edit_tqreplace");
+	KAction* a = editor->actionCollection()->action("edit_replace");
 	a->activate();
 }
 
@@ -830,7 +830,7 @@ void MainWindow::updateFullScreen()
 void MainWindow::slotFinishedFullScreenExecution()
 {
 	restartOrBackDialog = new RestartOrBack(this); // we have to make some to delete some
-	if ( errMsg->tqcontainsErrors() ) slotBackToFullScreen(); // straight back to edit if there where errors 
+	if ( errMsg->containsErrors() ) slotBackToFullScreen(); // straight back to edit if there where errors 
 	else
 	{
 		connect( restartOrBackDialog, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT( slotRestartFullScreen() ) );
@@ -877,39 +877,39 @@ void MainWindow::slotSettings()
 	TQGridLayout *generalLayout = new TQGridLayout( general, 1, 1, 11, 6, "generalLayout");
 	WidthHeightBox = new TQGroupBox( i18n("Initial Canvas Size"), general );
 	WidthHeightBox->setColumnLayout(0, Qt::Vertical );
-	WidthHeightBox->tqlayout()->setSpacing( 6 );
-	WidthHeightBox->tqlayout()->setMargin( 11 );
-	TQVBoxLayout *WidthHeightBoxLayout = new TQVBoxLayout( WidthHeightBox->tqlayout() );
-	WidthHeightBoxLayout->tqsetAlignment( Qt::AlignTop );
-	TQHBoxLayout *tqlayout3 = new TQHBoxLayout( 0, 0, 6, "tqlayout3");
-	TQVBoxLayout *tqlayout2 = new TQVBoxLayout( 0, 0, 6, "tqlayout2");
+	WidthHeightBox->layout()->setSpacing( 6 );
+	WidthHeightBox->layout()->setMargin( 11 );
+	TQVBoxLayout *WidthHeightBoxLayout = new TQVBoxLayout( WidthHeightBox->layout() );
+	WidthHeightBoxLayout->setAlignment( Qt::AlignTop );
+	TQHBoxLayout *layout3 = new TQHBoxLayout( 0, 0, 6, "layout3");
+	TQVBoxLayout *layout2 = new TQVBoxLayout( 0, 0, 6, "layout2");
 	
-	TQVBoxLayout *tqlayout1 = new TQVBoxLayout( 0, 0, 6, "tqlayout1");
+	TQVBoxLayout *layout1 = new TQVBoxLayout( 0, 0, 6, "layout1");
 
 	kcfg_CanvasWidth = new KIntNumInput( WidthHeightBox, "kcfg_CanvasWidth" );
 	kcfg_CanvasWidth->setValue( 400 );
 	kcfg_CanvasWidth->setMinValue( 1 );
 	kcfg_CanvasWidth->setReferencePoint( 1 );
-	tqlayout1->addWidget( kcfg_CanvasWidth );
+	layout1->addWidget( kcfg_CanvasWidth );
 
 	kcfg_CanvasHeight = new KIntNumInput( WidthHeightBox, "kcfg_CanvasHeight" );
 	kcfg_CanvasHeight->setValue( 300 );
 	kcfg_CanvasHeight->setMinValue( 1 );
 	kcfg_CanvasHeight->setReferencePoint( 1 );
-	tqlayout1->addWidget( kcfg_CanvasHeight );
+	layout1->addWidget( kcfg_CanvasHeight );
 
 	WidthLabel = new TQLabel( kcfg_CanvasWidth, i18n("Canvas &width:"), WidthHeightBox );
-	tqlayout2->addWidget( WidthLabel );
+	layout2->addWidget( WidthLabel );
 	HeightLabel = new TQLabel( kcfg_CanvasHeight, i18n("Ca&nvas height:"), WidthHeightBox );
-	tqlayout2->addWidget( HeightLabel );
-	tqlayout3->addLayout( tqlayout2 );
+	layout2->addWidget( HeightLabel );
+	layout3->addLayout( layout2 );
 
-	tqlayout3->addLayout( tqlayout1 );
-	WidthHeightBoxLayout->addLayout( tqlayout3 );
+	layout3->addLayout( layout1 );
+	WidthHeightBoxLayout->addLayout( layout3 );
 	TQLabel* WidthHeightLabel = new TQLabel(i18n("You need to restart before these settings have effect"), WidthHeightBox);
 	WidthHeightBoxLayout->addWidget( WidthHeightLabel );
 	generalLayout->addWidget( WidthHeightBox, 0, 0 );
-	general->resize( TQSize(234, 109).expandedTo(tqminimumSizeHint()) );
+	general->resize( TQSize(234, 109).expandedTo(minimumSizeHint()) );
 
 	dialog->addPage( general, i18n("General"), "package_settings", i18n("General Settings") );
 
@@ -918,12 +918,12 @@ void MainWindow::slotSettings()
 	TQGridLayout *languageLayout = new TQGridLayout( language, 1, 1, 11, 6, "Form1Layout");
 	TQGroupBox *groupBox1 = new TQGroupBox( language, "groupBox1" );
 	groupBox1->setColumnLayout(0, Qt::Vertical );
-	groupBox1->tqlayout()->setSpacing( 6 );
-	groupBox1->tqlayout()->setMargin( 11 );
-	TQGridLayout *groupBox1Layout = new TQGridLayout( groupBox1->tqlayout() );
-	groupBox1Layout->tqsetAlignment( Qt::AlignTop );
+	groupBox1->layout()->setSpacing( 6 );
+	groupBox1->layout()->setMargin( 11 );
+	TQGridLayout *groupBox1Layout = new TQGridLayout( groupBox1->layout() );
+	groupBox1Layout->setAlignment( Qt::AlignTop );
 
-	TQVBoxLayout *tqlayout4 = new TQVBoxLayout( 0, 0, 6, "tqlayout4");
+	TQVBoxLayout *layout4 = new TQVBoxLayout( 0, 0, 6, "layout4");
 
 	kcfg_LanguageComboBox = new KComboBox(groupBox1, "kcfg_LanguageComboBox");
 	kcfg_LanguageComboBox->setEditable(false);
@@ -935,13 +935,13 @@ void MainWindow::slotSettings()
 	kcfg_LanguageComboBox->insertStringList(LogoLanguageList);
 	
 	LanguageLabel = new TQLabel(kcfg_LanguageComboBox, i18n("&Select the language for the Logo commands:"), groupBox1);
-	tqlayout4->addWidget( LanguageLabel );
-	tqlayout4->addWidget( kcfg_LanguageComboBox );
+	layout4->addWidget( LanguageLabel );
+	layout4->addWidget( kcfg_LanguageComboBox );
 	LanguageLabel->setBuddy( kcfg_LanguageComboBox );
 
-	groupBox1Layout->addLayout( tqlayout4, 0, 0 );
+	groupBox1Layout->addLayout( layout4, 0, 0 );
 	languageLayout->addWidget( groupBox1, 0, 0 );
-	language->resize( TQSize(373, 80).expandedTo(tqminimumSizeHint()) );
+	language->resize( TQSize(373, 80).expandedTo(minimumSizeHint()) );
 
 	dialog->addPage( language, i18n("Language"), "locale", i18n("Language Settings") );
 
@@ -1071,7 +1071,7 @@ void MainWindow::slotContextHelpUpdate()
 	int start, length, pos;
 	
 	pos = 0;
-	if ( line.tqcontains('"') )
+	if ( line.contains('"') )
 	{
 		TQRegExp delimitedStrings("(\"[^\"\\\\\\r\\n]*(\\\\.[^\"\\\\\\r\\n]*)*\")");
 		while ( delimitedStrings.search(line, pos) != -1 )
diff --git a/kturtle/src/parser.cpp b/kturtle/src/parser.cpp
index ed2573f9..07a33aea 100644
--- a/kturtle/src/parser.cpp
+++ b/kturtle/src/parser.cpp
@@ -188,7 +188,7 @@ TreeNode* Parser::Factor()
 
 		case tokUnknown:
 			node = getId();
-			if (learnedFunctionList.tqcontains(rememberedToken.look) > 0) // is function call
+			if (learnedFunctionList.contains(rememberedToken.look) > 0) // is function call
 			{
 				delete node;
 				node = FunctionCall(rememberedToken);
@@ -1057,7 +1057,7 @@ TreeNode* Parser::Other()
 	matchToken(tokUnknown);
 
 	if (currentToken.type == tokAssign) return Assignment(rememberedToken);
-	else if (learnedFunctionList.tqcontains(rememberedToken.look) > 0)
+	else if (learnedFunctionList.contains(rememberedToken.look) > 0)
 	{
 		TreeNode* node;
 		node = FunctionCall(rememberedToken);