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

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

1 files changed, 18 insertions, 18 deletions

diff --git a/kchart/kchartHeaderFooterConfigPage.cc b/kchart/kchartHeaderFooterConfigPage.cc
index 89ef02f4..c097c381 100644
--- a/kchart/kchartHeaderFooterConfigPage.cc
+++ b/kchart/kchartHeaderFooterConfigPage.cc
@@ -23,7 +23,7 @@
 #include <kapplication.h>
 #include <kdialog.h>
 #include <klocale.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
 #include <tqbuttongroup.h>
@@ -39,64 +39,64 @@ KChartHeaderFooterConfigPage::KChartHeaderFooterConfigPage( KChartParams* params
                                                       TQWidget* parent ) :
     TQWidget( parent ),_params( params )
 {
-    TQGridLayout* layout = new TQGridLayout( this, 4, 3 );
-    layout->setSpacing( KDialog::spacingHint() );
-    layout->setMargin( KDialog::marginHint() );
+    TQGridLayout* tqlayout = new TQGridLayout( this, 4, 3 );
+    tqlayout->setSpacing( KDialog::spacingHint() );
+    tqlayout->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."));
-    layout->addWidget(lab,0,0);
+    tqlayout->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."));
-    layout->addWidget(titleEdit,0,1);
+    tqlayout->addWidget(titleEdit,0,1);
 
     titleColorButton=new KColorButton(this);
     TQWhatsThis::add(titleColorButton, i18n("Click on this button to choose the color for the title font."));
-    layout->addWidget(titleColorButton,0,2);
+    tqlayout->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."));
-    layout->addWidget(titleFontButton,0,3);
+    tqlayout->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."));
-    layout->addWidget(lab,1,0);
+    tqlayout->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."));
-    layout->addWidget(subtitleEdit,1,1);
+    tqlayout->addWidget(subtitleEdit,1,1);
 
     subtitleColorButton=new KColorButton(this);
     TQWhatsThis::add(subtitleColorButton, i18n("Click on this button to choose the color for the subtitle font."));
-    layout->addWidget(subtitleColorButton,1,2);
+    tqlayout->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."));
-    layout->addWidget(subtitleFontButton,1,3);
+    tqlayout->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."));
-    layout->addWidget(lab,2,0);
+    tqlayout->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."));
-    layout->addWidget(footerEdit,2,1);
+    tqlayout->addWidget(footerEdit,2,1);
 
     footerColorButton=new KColorButton(this);
     TQWhatsThis::add(footerColorButton, i18n("Click on this button to choose the color for the footer font."));
-    layout->addWidget(footerColorButton,2,2);
+    tqlayout->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()));
-    layout->addWidget(footerFontButton,2,3);
+    tqlayout->addWidget(footerFontButton,2,3);
 
-    layout->addItem( new TQSpacerItem( 5, 5, TQSizePolicy::Minimum, TQSizePolicy::Expanding ), 3, 0 );
+    tqlayout->addItem( new TQSpacerItem( 5, 5, TQSizePolicy::Minimum, TQSizePolicy::Expanding ), 3, 0 );
 
-    layout->activate();
+    tqlayout->activate();
 }
 
 void KChartHeaderFooterConfigPage::init()