Rename obsolete tq methods to standard names

3 files changed, 45 insertions, 45 deletions

diff --git a/kturtle/src/dialogs.cpp b/kturtle/src/dialogs.cpp
index ac275842..fcc6322d 100644
--- a/kturtle/src/dialogs.cpp
+++ b/kturtle/src/dialogs.cpp
@@ -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;
diff --git a/kturtle/src/dialogs.h b/kturtle/src/dialogs.h
index 4cd69d1a..7dbd041b 100644
--- a/kturtle/src/dialogs.h
+++ b/kturtle/src/dialogs.h
@@ -119,9 +119,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/kturtle.cpp b/kturtle/src/kturtle.cpp
index 7e0b773e..da6a9a28 100644
--- a/kturtle/src/kturtle.cpp
+++ b/kturtle/src/kturtle.cpp
@@ -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);
 }
 
@@ -877,35 +877,35 @@ 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() );
+	WidthHeightBox->layout()->setSpacing( 6 );
+	WidthHeightBox->layout()->setMargin( 11 );
+	TQVBoxLayout *WidthHeightBoxLayout = new TQVBoxLayout( WidthHeightBox->layout() );
 	WidthHeightBoxLayout->setAlignment( TQt::AlignTop );
-	TQHBoxLayout *tqlayout3 = new TQHBoxLayout( 0, 0, 6, "tqlayout3");
-	TQVBoxLayout *tqlayout2 = new TQVBoxLayout( 0, 0, 6, "tqlayout2");
+	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 );
@@ -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() );
+	groupBox1->layout()->setSpacing( 6 );
+	groupBox1->layout()->setMargin( 11 );
+	TQGridLayout *groupBox1Layout = new TQGridLayout( groupBox1->layout() );
 	groupBox1Layout->setAlignment( TQt::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,11 +935,11 @@ 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(minimumSizeHint()) );