Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

1 files changed, 24 insertions, 24 deletions

diff --git a/kchart/kchartLegendConfigPage.cc b/kchart/kchartLegendConfigPage.cc
index 2c027138..39d99963 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* layout = new TQGridLayout( this, 3, 2, KDialog::marginHint(), KDialog::spacingHint() );
+  TQGridLayout* tqlayout = new TQGridLayout( this, 3, 2, KDialog::marginHint(), KDialog::spacingHint() );
 
   //1. Block: General settings
   TQButtonGroup* gb = new TQButtonGroup( 0, Qt::Vertical, i18n("General"), this );
-  gb->layout()->setSpacing(KDialog::spacingHint());
-  gb->layout()->setMargin(KDialog::marginHint());
-  layout->addWidget( gb, 0, 0 );
+  gb->tqlayout()->setSpacing(KDialog::spacingHint());
+  gb->tqlayout()->setMargin(KDialog::marginHint());
+  tqlayout->addWidget( gb, 0, 0 );
 
-  TQGridLayout *grid2 = new TQGridLayout( gb->layout(), 4, 2 );
+  TQGridLayout *grid2 = new TQGridLayout( gb->tqlayout(), 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->layout()->setSpacing(KDialog::spacingHint());
-  gb->layout()->setMargin(KDialog::marginHint());
+  gb->tqlayout()->setSpacing(KDialog::spacingHint());
+  gb->tqlayout()->setMargin(KDialog::marginHint());
   gb->setExclusive( true );
 
-  TQGridLayout *grid1 = new TQGridLayout( gb->layout(), 5, 5 );
+  TQGridLayout *grid1 = new TQGridLayout( gb->tqlayout(), 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 );
@@ -98,17 +98,17 @@ KChartLegendConfigPage::KChartLegendConfigPage( KChartParams* params,
   lBottomRightBottom= addButton( grid1, gb, i18n("Bottom-Right-Bottom"), "chart_legend_bottomrightbottom",4, 3 );
   lBottomRight      = addButton( grid1, gb, i18n("Bottom-Right"),        "chart_legend_bottomright",      4, 4 );
 
-  gb->setAlignment( TQt::AlignLeft );
-  layout->addMultiCellWidget( gb, 1,2, 0,0 );
+  gb->tqsetAlignment( TQt::AlignLeft );
+  tqlayout->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->layout()->setSpacing(KDialog::spacingHint());
-  gb->layout()->setMargin(KDialog::marginHint());
-  layout->addWidget( gb, 0, 1 );
+  gb->tqlayout()->setSpacing(KDialog::spacingHint());
+  gb->tqlayout()->setMargin(KDialog::marginHint());
+  tqlayout->addWidget( gb, 0, 1 );
 
-  TQGridLayout *grid4 = new TQGridLayout( gb->layout(), 4, 2 );
+  TQGridLayout *grid4 = new TQGridLayout( gb->tqlayout(), 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->layout()->setSpacing(KDialog::spacingHint());
-  orientationGroup->layout()->setMargin(KDialog::marginHint());
-  layout->addWidget( orientationGroup, 1, 1 );
+  orientationGroup->tqlayout()->setSpacing(KDialog::spacingHint());
+  orientationGroup->tqlayout()->setMargin(KDialog::marginHint());
+  tqlayout->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->layout()->setSpacing(KDialog::spacingHint());
-  gb->layout()->setMargin(KDialog::marginHint());
-  layout->addWidget( gb, 2, 1 );
+  gb->tqlayout()->setSpacing(KDialog::spacingHint());
+  gb->tqlayout()->setMargin(KDialog::marginHint());
+  tqlayout->addWidget( gb, 2, 1 );
 
-  TQGridLayout *grid3 = new TQGridLayout( gb->layout(), 6, 2 );
+  TQGridLayout *grid3 = new TQGridLayout( gb->tqlayout(), 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
-  layout->addColSpacing( 1, 300 );
+  tqlayout->addColSpacing( 1, 300 );
 }
 
 void KChartLegendConfigPage::init()
@@ -364,7 +364,7 @@ void KChartLegendConfigPage::apply()
         _params->setLegendFontRelSize(textLegend.pointSize());
 }
 
-TQPushButton* KChartLegendConfigPage::addButton( TQGridLayout* layout,
+TQPushButton* KChartLegendConfigPage::addButton( TQGridLayout* tqlayout,
                                                 TQButtonGroup* gb,
                                                 const TQString &toolTipText,
                                                 const TQString &icon,
@@ -378,7 +378,7 @@ TQPushButton* KChartLegendConfigPage::addButton( TQGridLayout* layout,
                               KIcon::DefaultState,
                               KChartFactory::global() ) );
   TQToolTip::add( button, toolTipText );
-  layout->addWidget( button, posY, posX );
+  tqlayout->addWidget( button, posY, posX );
   return button;
 }