Rename obsolete tq methods to standard names

20 files changed, 99 insertions, 99 deletions

diff --git a/kchart/csvimportdialogui.ui b/kchart/csvimportdialogui.ui
index 8938631e9..4e53b54dc 100644
--- a/kchart/csvimportdialogui.ui
+++ b/kchart/csvimportdialogui.ui
@@ -68,7 +68,7 @@
             </attribute>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>tqlayout5</cstring>
+                    <cstring>layout5</cstring>
                 </property>
                 <property name="geometry">
                     <rect>
@@ -84,7 +84,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout3</cstring>
+                            <cstring>layout3</cstring>
                         </property>
                         <hbox>
                             <property name="name">
diff --git a/kchart/kchartColorConfigPage.cc b/kchart/kchartColorConfigPage.cc
index a0db1ce75..30f1b2752 100644
--- a/kchart/kchartColorConfigPage.cc
+++ b/kchart/kchartColorConfigPage.cc
@@ -51,11 +51,11 @@ KChartColorConfigPage::KChartColorConfigPage( KChartParams* params,
 
     TQVBoxLayout* toplevel = new TQVBoxLayout( this, 14 );
     TQButtonGroup* gb = new TQButtonGroup( 0, Qt::Vertical, i18n("Colors"), this );
-    gb->tqlayout()->setSpacing(KDialog::spacingHint());
-    gb->tqlayout()->setMargin(KDialog::marginHint());
+    gb->layout()->setSpacing(KDialog::spacingHint());
+    gb->layout()->setMargin(KDialog::marginHint());
     toplevel->addWidget( gb);
     TQString wtstr;
-    TQGridLayout* grid = new TQGridLayout( gb->tqlayout(), 8, 3 );
+    TQGridLayout* grid = new TQGridLayout( gb->layout(), 8, 3 );
 
     const int labelAlign = AlignRight | AlignVCenter;
     int row = -1;
diff --git a/kchart/kchartComboConfigPage.cc b/kchart/kchartComboConfigPage.cc
index 4016e14ce..2444998df 100644
--- a/kchart/kchartComboConfigPage.cc
+++ b/kchart/kchartComboConfigPage.cc
@@ -40,11 +40,11 @@ KChartComboPage::KChartComboPage( KChartParams* params,
 {
     //TQVBoxLayout* toplevel = new TQVBoxLayout( this, 10 );
 
-    TQGridLayout* tqlayout = new TQGridLayout(this, 2, 2,KDialog::marginHint(), KDialog::spacingHint() );
-    //toplevel->addLayout( tqlayout );
+    TQGridLayout* layout = new TQGridLayout(this, 2, 2,KDialog::marginHint(), KDialog::spacingHint() );
+    //toplevel->addLayout( layout );
     TQButtonGroup* gb = new TQButtonGroup( i18n("HLC Style"), this );
     TQGridLayout *grid1 = new TQGridLayout(gb,7,1,KDialog::marginHint(), KDialog::spacingHint());
-    tqlayout->addWidget(gb,0,0);
+    layout->addWidget(gb,0,0);
 
     diamond=new TQRadioButton( i18n("Diamond"), gb ); ;
     grid1->addWidget(diamond,0,0);
@@ -63,7 +63,7 @@ KChartComboPage::KChartComboPage( KChartParams* params,
     grid1->activate();
     //it's not good but I don't know how
     //to reduce space
-    tqlayout->addColSpacing(1,300);
+    layout->addColSpacing(1,300);
 }
 
 void KChartComboPage::init()
diff --git a/kchart/kchartDataEditor.cc b/kchart/kchartDataEditor.cc
index d9ce65512..9c5de4f99 100644
--- a/kchart/kchartDataEditor.cc
+++ b/kchart/kchartDataEditor.cc
@@ -240,7 +240,7 @@ kchartDataEditor::kchartDataEditor(TQWidget* parent) :
     connect( m_removeColButton, TQT_SIGNAL( clicked() ),
 	     this,              TQT_SLOT( removeCurrentColumn() ) );
 
-    // Start the tqlayout.  The buttons are at the top.
+    // Start the layout.  The buttons are at the top.
     TQVBoxLayout  *topLayout = new TQVBoxLayout( page );
     
     TQHBoxLayout* insertRemoveLayout = new TQHBoxLayout( );
diff --git a/kchart/kchartHeaderFooterConfigPage.cc b/kchart/kchartHeaderFooterConfigPage.cc
index c097c381b..e6c6c99b5 100644
--- a/kchart/kchartHeaderFooterConfigPage.cc
+++ b/kchart/kchartHeaderFooterConfigPage.cc
@@ -39,64 +39,64 @@ KChartHeaderFooterConfigPage::KChartHeaderFooterConfigPage( KChartParams* params
                                                       TQWidget* parent ) :
     TQWidget( parent ),_params( params )
 {
-    TQGridLayout* tqlayout = new TQGridLayout( this, 4, 3 );
-    tqlayout->setSpacing( KDialog::spacingHint() );
-    tqlayout->setMargin( KDialog::marginHint() );
+    TQGridLayout* layout = new TQGridLayout( this, 4, 3 );
+    layout->setSpacing( KDialog::spacingHint() );
+    layout->setMargin( KDialog::marginHint() );
 
     TQLabel *lab=new TQLabel(i18n("Title:"), this);
     TQWhatsThis::add(lab, i18n("Write here the title of your chart if you want one. The title will be centered on top above your chart."));
-    tqlayout->addWidget(lab,0,0);
+    layout->addWidget(lab,0,0);
 
     titleEdit=new TQLineEdit(this);
     TQWhatsThis::add(titleEdit, i18n("Write here the title of your chart if you want one. The title will be centered on top above your chart."));
-    tqlayout->addWidget(titleEdit,0,1);
+    layout->addWidget(titleEdit,0,1);
 
     titleColorButton=new KColorButton(this);
     TQWhatsThis::add(titleColorButton, i18n("Click on this button to choose the color for the title font."));
-    tqlayout->addWidget(titleColorButton,0,2);
+    layout->addWidget(titleColorButton,0,2);
 
     titleFontButton=new TQPushButton(i18n("Font..."),this);
     TQWhatsThis::add(titleFontButton, i18n("Click on this button to choose the font family, style and size for the title."));
-    tqlayout->addWidget(titleFontButton,0,3);
+    layout->addWidget(titleFontButton,0,3);
     connect( titleFontButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeTitleFont()));
 
     lab=new TQLabel(i18n("Subtitle:"),this);
     TQWhatsThis::add(lab, i18n("Write here the subtitle of your chart if you want one. The subtitle will be centered on top just below the title."));
-    tqlayout->addWidget(lab,1,0);
+    layout->addWidget(lab,1,0);
 
     subtitleEdit=new TQLineEdit(this);
     TQWhatsThis::add(subtitleEdit, i18n("Write here the subtitle of your chart if you want one. The subtitle will be centered on top just below the title."));
-    tqlayout->addWidget(subtitleEdit,1,1);
+    layout->addWidget(subtitleEdit,1,1);
 
     subtitleColorButton=new KColorButton(this);
     TQWhatsThis::add(subtitleColorButton, i18n("Click on this button to choose the color for the subtitle font."));
-    tqlayout->addWidget(subtitleColorButton,1,2);
+    layout->addWidget(subtitleColorButton,1,2);
 
     subtitleFontButton=new TQPushButton(i18n("Font..."),this);
     TQWhatsThis::add(subtitleFontButton, i18n("Click on this button to choose the font family, style and size for the subtitle."));
-    tqlayout->addWidget(subtitleFontButton,1,3);
+    layout->addWidget(subtitleFontButton,1,3);
     connect( subtitleFontButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeSubtitleFont()));
 
     lab=new TQLabel(i18n("Footer:"),this);
     TQWhatsThis::add(lab, i18n("Write here the footer of your chart if you want one. The footer will be centered at the bottom just below your chart."));
-    tqlayout->addWidget(lab,2,0);
+    layout->addWidget(lab,2,0);
 
     footerEdit=new TQLineEdit(this);
     TQWhatsThis::add(footerEdit, i18n("Write here the subtitle of your chart if you want one. The subtitle will be centered on top just below the title."));
-    tqlayout->addWidget(footerEdit,2,1);
+    layout->addWidget(footerEdit,2,1);
 
     footerColorButton=new KColorButton(this);
     TQWhatsThis::add(footerColorButton, i18n("Click on this button to choose the color for the footer font."));
-    tqlayout->addWidget(footerColorButton,2,2);
+    layout->addWidget(footerColorButton,2,2);
 
     footerFontButton=new TQPushButton(i18n("Font..."),this);
     TQWhatsThis::add(footerFontButton, i18n("Click on this button to choose the font family, style and size for the footer."));
     connect( footerFontButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeFooterFont()));
-    tqlayout->addWidget(footerFontButton,2,3);
+    layout->addWidget(footerFontButton,2,3);
 
-    tqlayout->addItem( new TQSpacerItem( 5, 5, TQSizePolicy::Minimum, TQSizePolicy::Expanding ), 3, 0 );
+    layout->addItem( new TQSpacerItem( 5, 5, TQSizePolicy::Minimum, TQSizePolicy::Expanding ), 3, 0 );
 
-    tqlayout->activate();
+    layout->activate();
 }
 
 void KChartHeaderFooterConfigPage::init()
diff --git a/kchart/kchartLegendConfigPage.cc b/kchart/kchartLegendConfigPage.cc
index d7583a354..2c027138b 100644
--- a/kchart/kchartLegendConfigPage.cc
+++ b/kchart/kchartLegendConfigPage.cc
@@ -49,15 +49,15 @@ KChartLegendConfigPage::KChartLegendConfigPage( KChartParams* params,
     TQWidget( parent ),_params( params )
 {
   //Layout for 4 blocks
-  TQGridLayout* tqlayout = new TQGridLayout( this, 3, 2, KDialog::marginHint(), KDialog::spacingHint() );
+  TQGridLayout* layout = new TQGridLayout( this, 3, 2, KDialog::marginHint(), KDialog::spacingHint() );
 
   //1. Block: General settings
   TQButtonGroup* gb = new TQButtonGroup( 0, Qt::Vertical, i18n("General"), this );
-  gb->tqlayout()->setSpacing(KDialog::spacingHint());
-  gb->tqlayout()->setMargin(KDialog::marginHint());
-  tqlayout->addWidget( gb, 0, 0 );
+  gb->layout()->setSpacing(KDialog::spacingHint());
+  gb->layout()->setMargin(KDialog::marginHint());
+  layout->addWidget( gb, 0, 0 );
 
-  TQGridLayout *grid2 = new TQGridLayout( gb->tqlayout(), 4, 2 );
+  TQGridLayout *grid2 = new TQGridLayout( gb->layout(), 4, 2 );
 
   TQLabel* lab = new TQLabel( i18n("Title:"), gb );
   TQWhatsThis::add(lab, i18n("Write here the title of the legend, which is displayed at the top of the legend box."));
@@ -70,11 +70,11 @@ KChartLegendConfigPage::KChartLegendConfigPage( KChartParams* params,
   gb = new TQButtonGroup( 0, Qt::Vertical, i18n("Legend Position"), this );
   TQWhatsThis::add(gb, i18n("<qt>Choose the location of the legend on the chart by "
       "clicking a location button.\nUse the central button to <b>hide</b> the legend.</qt>"));
-  gb->tqlayout()->setSpacing(KDialog::spacingHint());
-  gb->tqlayout()->setMargin(KDialog::marginHint());
+  gb->layout()->setSpacing(KDialog::spacingHint());
+  gb->layout()->setMargin(KDialog::marginHint());
   gb->setExclusive( true );
 
-  TQGridLayout *grid1 = new TQGridLayout( gb->tqlayout(), 5, 5 );
+  TQGridLayout *grid1 = new TQGridLayout( gb->layout(), 5, 5 );
 
   lTopLeft          = addButton( grid1, gb, i18n("Top-Left"),      "chart_legend_topleft",     0, 0 );
   lTopLeftTop       = addButton( grid1, gb, i18n("Top-Left-Top"),  "chart_legend_toplefttop",  0, 1 );
@@ -99,16 +99,16 @@ KChartLegendConfigPage::KChartLegendConfigPage( KChartParams* params,
   lBottomRight      = addButton( grid1, gb, i18n("Bottom-Right"),        "chart_legend_bottomright",      4, 4 );
 
   gb->setAlignment( TQt::AlignLeft );
-  tqlayout->addMultiCellWidget( gb, 1,2, 0,0 );
+  layout->addMultiCellWidget( gb, 1,2, 0,0 );
 
   // 3. Block: Font
   gb = new TQButtonGroup( 0, Qt::Vertical, i18n("Font"), this );
   TQWhatsThis::add(gb, i18n("This Font box can be used to set different fonts for the legend title and the individual entries."));
-  gb->tqlayout()->setSpacing(KDialog::spacingHint());
-  gb->tqlayout()->setMargin(KDialog::marginHint());
-  tqlayout->addWidget( gb, 0, 1 );
+  gb->layout()->setSpacing(KDialog::spacingHint());
+  gb->layout()->setMargin(KDialog::marginHint());
+  layout->addWidget( gb, 0, 1 );
 
-  TQGridLayout *grid4 = new TQGridLayout( gb->tqlayout(), 4, 2 );
+  TQGridLayout *grid4 = new TQGridLayout( gb->layout(), 4, 2 );
   titleLegendFontButton = new TQPushButton( gb );
 
   lab = new TQLabel( i18n("Legend title font:"), gb );
@@ -134,9 +134,9 @@ KChartLegendConfigPage::KChartLegendConfigPage( KChartParams* params,
   orientationGroup = new TQVButtonGroup( i18n("Orientation"), this );
   TQWhatsThis::add(orientationGroup, i18n("Select, if the legend's items should be drawn next to each other, or below each other."));
   orientationGroup->setRadioButtonExclusive(true);
-  orientationGroup->tqlayout()->setSpacing(KDialog::spacingHint());
-  orientationGroup->tqlayout()->setMargin(KDialog::marginHint());
-  tqlayout->addWidget( orientationGroup, 1, 1 );
+  orientationGroup->layout()->setSpacing(KDialog::spacingHint());
+  orientationGroup->layout()->setMargin(KDialog::marginHint());
+  layout->addWidget( orientationGroup, 1, 1 );
 
   TQRadioButton* orientation = new TQRadioButton( i18n("Vertically"), orientationGroup );
   orientation = new TQRadioButton( i18n("Horizontally"), orientationGroup );
@@ -145,11 +145,11 @@ KChartLegendConfigPage::KChartLegendConfigPage( KChartParams* params,
   // 5. Block: Text Colors
   gb = new TQButtonGroup( 0, Qt::Vertical, i18n("Color"), this );
   TQWhatsThis::add(gb, i18n("This Color box can be used to set different colors for the legend title and text."));
-  gb->tqlayout()->setSpacing(KDialog::spacingHint());
-  gb->tqlayout()->setMargin(KDialog::marginHint());
-  tqlayout->addWidget( gb, 2, 1 );
+  gb->layout()->setSpacing(KDialog::spacingHint());
+  gb->layout()->setMargin(KDialog::marginHint());
+  layout->addWidget( gb, 2, 1 );
 
-  TQGridLayout *grid3 = new TQGridLayout( gb->tqlayout(), 6, 2 );
+  TQGridLayout *grid3 = new TQGridLayout( gb->layout(), 6, 2 );
 
   lab = new TQLabel( i18n("Legend title color:"), gb );
   grid3->addWidget( lab, 0, 0 );
@@ -177,7 +177,7 @@ KChartLegendConfigPage::KChartLegendConfigPage( KChartParams* params,
 
   //it's not good but I don't know how
   //to reduce space
-  tqlayout->addColSpacing( 1, 300 );
+  layout->addColSpacing( 1, 300 );
 }
 
 void KChartLegendConfigPage::init()
@@ -364,7 +364,7 @@ void KChartLegendConfigPage::apply()
         _params->setLegendFontRelSize(textLegend.pointSize());
 }
 
-TQPushButton* KChartLegendConfigPage::addButton( TQGridLayout* tqlayout,
+TQPushButton* KChartLegendConfigPage::addButton( TQGridLayout* layout,
                                                 TQButtonGroup* gb,
                                                 const TQString &toolTipText,
                                                 const TQString &icon,
@@ -378,7 +378,7 @@ TQPushButton* KChartLegendConfigPage::addButton( TQGridLayout* tqlayout,
                               KIcon::DefaultState,
                               KChartFactory::global() ) );
   TQToolTip::add( button, toolTipText );
-  tqlayout->addWidget( button, posY, posX );
+  layout->addWidget( button, posY, posX );
   return button;
 }
 
diff --git a/kchart/kchartLegendConfigPage.h b/kchart/kchartLegendConfigPage.h
index 8419baa81..a67a6b128 100644
--- a/kchart/kchartLegendConfigPage.h
+++ b/kchart/kchartLegendConfigPage.h
@@ -64,7 +64,7 @@ private:
     TQPushButton *titleLegendFontButton, *textLegendFontButton;
     TQButton::ToggleState titleLegendIsRelative, textLegendIsRelative;
 
-    TQPushButton* addButton( TQGridLayout* tqlayout, TQButtonGroup* gb,
+    TQPushButton* addButton( TQGridLayout* layout, TQButtonGroup* gb,
                             const TQString &toolTipText, const TQString &icon,
                             int posY, int posX );
 };
diff --git a/kchart/kchartLine3dConfigPage.cc b/kchart/kchartLine3dConfigPage.cc
index 7b70ccfdb..f486053bd 100644
--- a/kchart/kchartLine3dConfigPage.cc
+++ b/kchart/kchartLine3dConfigPage.cc
@@ -101,7 +101,7 @@ KChartLine3dConfigPage::KChartLine3dConfigPage( KChartParams* params,
   grid1->activate();
   //it's not good but I don't know how
   //to reduce space
-  //tqlayout->addColSpacing(1,300);
+  //layout->addColSpacing(1,300);
 }
 
 void KChartLine3dConfigPage::slotChange3DParameter(bool b)
diff --git a/kchart/kchartPageLayout.cc b/kchart/kchartPageLayout.cc
index 8fd9c9d02..9292f1f94 100644
--- a/kchart/kchartPageLayout.cc
+++ b/kchart/kchartPageLayout.cc
@@ -43,10 +43,10 @@ KChartPageLayout::KChartPageLayout( KChartParams* _params, TQWidget* parent, con
     setMainWidget(page);
 
     // FIXME: The following code is strange, since it is written to
-    // use a grid tqlayout with a standard TQWidget.  However, with the
+    // use a grid layout with a standard TQWidget.  However, with the
     // TQGroupBox, it looks better, and since it actually works, there
     // is no immediate need for rewriting.  In the sake of clarity, it
-    // should be done though, and we should use the tqlayout
+    // should be done though, and we should use the layout
     // capabilities of the groupbox instead..
 
     setButtonText( KDialogBase::User1, i18n("&Reset") );
diff --git a/kchart/kchartParameter3dConfigPage.cc b/kchart/kchartParameter3dConfigPage.cc
index b1a0b1999..9bce7b5f7 100644
--- a/kchart/kchartParameter3dConfigPage.cc
+++ b/kchart/kchartParameter3dConfigPage.cc
@@ -38,17 +38,17 @@ KChartParameter3dConfigPage::KChartParameter3dConfigPage( KChartParams* params,
                                                           TQWidget* parent ) :
     TQWidget( parent ),m_params( params )
 {
-  TQGridLayout* tqlayout = new TQGridLayout(this, 2, 2,KDialog::marginHint(),KDialog::spacingHint());
+  TQGridLayout* layout = new TQGridLayout(this, 2, 2,KDialog::marginHint(),KDialog::spacingHint());
 
 
   TQButtonGroup* gb = new TQButtonGroup( 0, Qt::Vertical, 
 				       i18n("3D Parameters"), this );
-  gb->tqlayout()->setSpacing(KDialog::spacingHint());
-  gb->tqlayout()->setMargin(KDialog::marginHint());
+  gb->layout()->setSpacing(KDialog::spacingHint());
+  gb->layout()->setMargin(KDialog::marginHint());
 
-  // The grid tqlayout inside the buttongroup.
-  TQGridLayout *grid1 = new TQGridLayout(gb->tqlayout(), 5, 3);
-  tqlayout->addWidget(gb,0,0);
+  // The grid layout inside the buttongroup.
+  TQGridLayout *grid1 = new TQGridLayout(gb->layout(), 5, 3);
+  layout->addWidget(gb,0,0);
 
   // The main on/off checkbox.
   bar3d=new TQCheckBox(i18n("3D bar"),gb);
@@ -90,7 +90,7 @@ KChartParameter3dConfigPage::KChartParameter3dConfigPage( KChartParams* params,
 
   //it's not good but I don't know how
   //to reduce space
-  //tqlayout->addColSpacing(1,300);
+  //layout->addColSpacing(1,300);
 }
 
 
diff --git a/kchart/kchartParameterConfigPage.cc b/kchart/kchartParameterConfigPage.cc
index bffa30997..2fc0b0aff 100644
--- a/kchart/kchartParameterConfigPage.cc
+++ b/kchart/kchartParameterConfigPage.cc
@@ -44,17 +44,17 @@ KChartParameterConfigPage::KChartParameterConfigPage( KChartParams* params,
                                                       TQWidget* parent ) :
     TQWidget( parent ),_params( params )
 {
-    // toplevel tqlayout
+    // toplevel layout
     TQVBoxLayout* toplevel = new TQVBoxLayout( this, 10 );
 
-    TQGridLayout* tqlayout = new TQGridLayout( 1, 3 );
-    toplevel->addLayout( tqlayout );
+    TQGridLayout* layout = new TQGridLayout( 1, 3 );
+    toplevel->addLayout( layout );
 
     // The "Parameters" button group
     TQButtonGroup* gb1 = new TQButtonGroup( 0, Qt::Vertical, i18n("Parameters"), this );
-    gb1->tqlayout()->setSpacing(KDialog::spacingHint());
-    gb1->tqlayout()->setMargin(KDialog::marginHint());
-    TQGridLayout *grid1 = new TQGridLayout(gb1->tqlayout(),9,1);
+    gb1->layout()->setSpacing(KDialog::spacingHint());
+    gb1->layout()->setMargin(KDialog::marginHint());
+    TQGridLayout *grid1 = new TQGridLayout(gb1->layout(),9,1);
 
     grid = new TQCheckBox( i18n( "Grid" ), gb1 );
     TQWhatsThis::add(grid, i18n("If this is checked, the grid is shown. If you uncheck this option, the grid will not be displayed anymore."));
@@ -93,9 +93,9 @@ KChartParameterConfigPage::KChartParameterConfigPage( KChartParams* params,
     // The "Settings" button group
     TQButtonGroup* gb2 = new TQButtonGroup( 0, Qt::Vertical, 
 					  i18n("Settings"), this );
-    gb2->tqlayout()->setSpacing(KDialog::spacingHint());
-    gb2->tqlayout()->setMargin(KDialog::marginHint());
-    TQGridLayout *grid2 = new TQGridLayout(gb2->tqlayout(),8,1);
+    gb2->layout()->setSpacing(KDialog::spacingHint());
+    gb2->layout()->setMargin(KDialog::marginHint());
+    TQGridLayout *grid2 = new TQGridLayout(gb2->layout(),8,1);
 
     TQBoxLayout * l = new TQVBoxLayout( grid2 );
 
@@ -160,8 +160,8 @@ KChartParameterConfigPage::KChartParameterConfigPage( KChartParams* params,
     ylabel2_fmt->setMaximumWidth(130);
     grid2->addWidget(ylabel2_fmt,5,1);
 #endif
-    tqlayout->addWidget(gb1,0,0);
-    tqlayout->addWidget(gb2,0,1);
+    layout->addWidget(gb1,0,0);
+    layout->addWidget(gb2,0,1);
 
 #if 0
     grid1->activate();
diff --git a/kchart/kchartPrinterDlg.cc b/kchart/kchartPrinterDlg.cc
index 9bd898d6c..a7d0e88f9 100644
--- a/kchart/kchartPrinterDlg.cc
+++ b/kchart/kchartPrinterDlg.cc
@@ -37,9 +37,9 @@ namespace KChart
   : KPrintDialogPage( parent, name )
 {
   setTitle( i18n( "KChart Options" ) );
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
-  tqlayout->setMargin( KDialog::marginHint() );
-  tqlayout->setSpacing( KDialog::spacingHint() );
+  TQVBoxLayout *layout = new TQVBoxLayout( this );
+  layout->setMargin( KDialog::marginHint() );
+  layout->setSpacing( KDialog::spacingHint() );
   txtSizex = new KIntNumInput(this );
   txtSizex->setSuffix("%");
   txtSizex->setMinValue(1);
@@ -51,12 +51,12 @@ namespace KChart
   txtSizey->setMaxValue(100);
   txtSizey->setValue(100);
   
-  tqlayout->addWidget( new TQLabel(i18n("Print Size"), this) );
-  tqlayout->addWidget( new TQLabel(i18n("Width: "), this) );
-  tqlayout->addWidget( txtSizex );
-  tqlayout->addWidget( new TQLabel(i18n("Height: "), this) );
-  tqlayout->addWidget( txtSizey );
-  tqlayout->addStretch( 1 );
+  layout->addWidget( new TQLabel(i18n("Print Size"), this) );
+  layout->addWidget( new TQLabel(i18n("Width: "), this) );
+  layout->addWidget( txtSizex );
+  layout->addWidget( new TQLabel(i18n("Height: "), this) );
+  layout->addWidget( txtSizey );
+  layout->addStretch( 1 );
 }
 
 void KChartPrinterDlg::getOptions( TQMap<TQString, TQString>& opts, bool )
diff --git a/kchart/kchartSubTypeChartPage.cc b/kchart/kchartSubTypeChartPage.cc
index 0f7b4ca59..7f8da82fe 100644
--- a/kchart/kchartSubTypeChartPage.cc
+++ b/kchart/kchartSubTypeChartPage.cc
@@ -226,7 +226,7 @@ KChartBarSubTypeChartPage::KChartBarSubTypeChartPage( KChartParams* params,
     //TQHBox   *hbox = new TQHBox( this );
     new TQLabel( i18n( "Number of lines: "), left );
     m_numLines    = new TQSpinBox( left );
-    // FIXME: Use a grid tqlayout instead
+    // FIXME: Use a grid layout instead
     new TQLabel( "", left);
     left->setStretchFactor( left, 1 );
 
diff --git a/kchart/kchartWizardSelectChartSubTypePage.cc b/kchart/kchartWizardSelectChartSubTypePage.cc
index 74804042e..2aa08afed 100644
--- a/kchart/kchartWizardSelectChartSubTypePage.cc
+++ b/kchart/kchartWizardSelectChartSubTypePage.cc
@@ -44,7 +44,7 @@ KChartWizardSelectChartSubTypePage::KChartWizardSelectChartSubTypePage( TQWidget
     TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, 
 					  i18n( "Chart Sub Type" ), this );
     grp->setRadioButtonExclusive( true );
-    grp->tqlayout();
+    grp->layout();
     lay1->addWidget(grp);
     m_normal  = new TQRadioButton( i18n( "Normal" ),  grp );
     m_stacked = new TQRadioButton( i18n( "Stacked" ), grp );
diff --git a/kchart/kdchart/KDChartAxisParams.cpp b/kchart/kdchart/KDChartAxisParams.cpp
index a6e337f2f..b24892b14 100644
--- a/kchart/kdchart/KDChartAxisParams.cpp
+++ b/kchart/kdchart/KDChartAxisParams.cpp
@@ -297,7 +297,7 @@ become wider or more narrow.
 Also the graphical representation of the date will be comparable
 since all your charts will use the same scale if you wish this.
 
-- Let the program calculate the chart tqlayout based upon the kind
+- Let the program calculate the chart layout based upon the kind
 of and width of the labels to be drawn at the axes.
 Also the program can calculate the labels for you and find the
 boundary values for start and end of the scale automatically.
diff --git a/kchart/kdchart/KDChartDataIntern.h b/kchart/kdchart/KDChartDataIntern.h
index a1d6562b3..fe8cfc8fb 100644
--- a/kchart/kdchart/KDChartDataIntern.h
+++ b/kchart/kdchart/KDChartDataIntern.h
@@ -231,7 +231,7 @@ public:
                 }
             }
             // Note: We do *not* compare the _propSetID here since it contains
-            //       no values but is used to handle some tqlayout information...
+            //       no values but is used to handle some layout information...
         }
         return bRet;
     }
@@ -289,7 +289,7 @@ public:
                 /* NOOP */;
             }
             // Note: We do *not* copy the _propSetID here since it contains
-            //       no values but is used to handle some tqlayout information...
+            //       no values but is used to handle some layout information...
         }
     }
 
diff --git a/kchart/kdchart/KDChartEnums.h b/kchart/kdchart/KDChartEnums.h
index b3fe16326..71373d561 100644
--- a/kchart/kdchart/KDChartEnums.h
+++ b/kchart/kdchart/KDChartEnums.h
@@ -53,10 +53,10 @@ class KDCHART_EXPORT KDChartEnums :public TQObject
 
 public:
     /**
-      Text tqlayout policy: what to do if text that is to be drawn would
+      Text layout policy: what to do if text that is to be drawn would
       cover neighboring text or neighboring areas.
 
-      \li \c LayoutJustOverwrite Just ignore the tqlayout collision and write the text nevertheless.
+      \li \c LayoutJustOverwrite Just ignore the layout collision and write the text nevertheless.
       \li \c LayoutPolicyRotate Try counter-clockwise rotation to make the text fit into the space.
       \li \c LayoutPolicyShiftVertically Shift the text baseline upwards (or downwards, resp.) and draw a connector line between the text and its anchor.
       \li \c LayoutPolicyShiftHorizontally Shift the text baseline to the left (or to the right, resp.) and draw a connector line between the text and its anchor.
@@ -71,11 +71,11 @@ public:
         LayoutPolicyShrinkFontSize };
 
     /**
-      Converts the specified text tqlayout policy enum to a
+      Converts the specified text layout policy enum to a
       string representation.
 
-      \param type the text tqlayout policy to convert
-      \return the string representation of the text tqlayout policy enum
+      \param type the text layout policy to convert
+      \return the string representation of the text layout policy enum
       */
     static TQString layoutPolicyToString( TextLayoutPolicy type ) {
         switch( type ) {
@@ -90,7 +90,7 @@ public:
             case LayoutPolicyShrinkFontSize:
                 return "ShrinkFontSize";
             default: // should not happen
-                qDebug( "Unknown text tqlayout policy" );
+                qDebug( "Unknown text layout policy" );
                 return "JustOverwrite";
         }
     }
@@ -150,10 +150,10 @@ public:
 
 
     /**
-      Converts the specified string to a text tqlayout policy enum value.
+      Converts the specified string to a text layout policy enum value.
 
       \param string the string to convert
-      \return the text tqlayout policy enum value
+      \return the text layout policy enum value
       */
     static TextLayoutPolicy stringToLayoutPolicy( const TQString& string ) {
         if( string ==      "JustOverwrite" )
diff --git a/kchart/kdchart/KDChartPainter.cpp b/kchart/kdchart/KDChartPainter.cpp
index 5ec610953..849d2b297 100644
--- a/kchart/kdchart/KDChartPainter.cpp
+++ b/kchart/kdchart/KDChartPainter.cpp
@@ -850,7 +850,7 @@ void KDChartPainter::paintDataValues( TQPainter* painter,
                         /*
 
 NOTE: The following will be REMOVED again once
-the tqlayout policy feature is implemented !!!
+the layout policy feature is implemented !!!
 
 */
                         TQRect textRect( region->pTextRegion->boundingRect() );
diff --git a/kchart/kdchart/KDChartParams.cpp b/kchart/kdchart/KDChartParams.cpp
index deedda9e0..e59443fb0 100644
--- a/kchart/kdchart/KDChartParams.cpp
+++ b/kchart/kdchart/KDChartParams.cpp
@@ -3807,9 +3807,9 @@ int KDChartParams::dataValuesRotation( uint chart, bool negative ) const
   a data text covers a neighboring data text (or a neighboring data
   area, resp.).
 
-  \note A tqlayout policy different from LayoutJustOverwrite from does
+  \note A layout policy different from LayoutJustOverwrite from does
   not mean that this policy is followed in any case. Rather than
-  giving up when the selected policy does not result in a good tqlayout
+  giving up when the selected policy does not result in a good layout
   the program will automatically try the next policy: if
   LayoutPolicyRotate did not succeed LayoutPolicyShiftVertically will
   be tried, if this did not succeed either
diff --git a/kchart/kdchart/KDDrawText.h b/kchart/kdchart/KDDrawText.h
index 5fb9dbfdf..7842e9b5a 100644
--- a/kchart/kdchart/KDDrawText.h
+++ b/kchart/kdchart/KDDrawText.h
@@ -53,7 +53,7 @@ class KDDrawText
                 const TQString& text,
                 const TQFont* font = 0,
                 int align = TQt::AlignLeft | TQt::AlignTop,
-                // useful for debugging of your tqlayout:
+                // useful for debugging of your layout:
                 bool showAnchor    = false,
                 const TQFontMetrics* fontMet = 0,
                 bool noFirstrotate = false,
@@ -81,7 +81,7 @@ class KDDrawText
                 const TQString& text,
                 const TQFont* font  = 0,
                 int align = TQt::AlignLeft | TQt::AlignTop,
-                // usefull for debugging of your tqlayout:
+                // usefull for debugging of your layout:
                 bool showAnchor    = false,
                 // speed-up parameters
                 // used internally by drawCircleText()