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

This reverts commit d1248617107f659af9d03cf1ef6d783571a0cba8.

1 files changed, 12 insertions, 12 deletions

diff --git a/kcron/ktvariable.cpp b/kcron/ktvariable.cpp
index 6e7ff60..474d22c 100644
--- a/kcron/ktvariable.cpp
+++ b/kcron/ktvariable.cpp
@@ -11,7 +11,7 @@
 
 #include "ktvariable.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kapplication.h>     // kapp
 #include <klocale.h>  // i18n()
@@ -27,18 +27,18 @@ KTVariable::KTVariable(CTVariable* _ctvar,const TQString &_caption) :
   ctvar( _ctvar)
 {
   TQFrame *page = makeMainWidget();
-  TQGridLayout *layout = new TQGridLayout( page, 5, 3, 0, spacingHint() );
-  layout->setRowStretch(3, 1);
-  layout->setColStretch(1, 1);
+  TQGridLayout *tqlayout = new TQGridLayout( page, 5, 3, 0, spacingHint() );
+  tqlayout->setRowStretch(3, 1);
+  tqlayout->setColStretch(1, 1);
 
   setIcon(KTIcon::application(true));
 
   // variable
   labVariable = new TQLabel(i18n("&Variable:"), page, "labVariable");
-  layout->addWidget(labVariable, 1, 0, TQt::AlignLeft | TQt::AlignTop);
+  tqlayout->addWidget(labVariable, 1, 0, TQt::AlignLeft | TQt::AlignTop);
 
   cmbVariable = new TQComboBox(true, page, "cmbVariable");
-  layout->addWidget(cmbVariable, 1, 1);
+  tqlayout->addWidget(cmbVariable, 1, 1);
 
   cmbVariable->insertItem("HOME");
   cmbVariable->insertItem("MAILTO");
@@ -49,30 +49,30 @@ KTVariable::KTVariable(CTVariable* _ctvar,const TQString &_caption) :
 
   // icon
   labIcon = new TQLabel(page, "labIcon");
-  layout->addMultiCellWidget(labIcon, 0, 1, 2, 2);
+  tqlayout->addMultiCellWidget(labIcon, 0, 1, 2, 2);
 
   // value
   labValue = new TQLabel(i18n("Va&lue:"), page, "labValue");
-  layout->addWidget(labValue, 2, 0, TQt::AlignLeft | TQt::AlignTop);
+  tqlayout->addWidget(labValue, 2, 0, TQt::AlignLeft | TQt::AlignTop);
 
   leValue = new TQLineEdit(page, "leValue");
-  layout->addMultiCellWidget(leValue, 2, 2, 1, 2);
+  tqlayout->addMultiCellWidget(leValue, 2, 2, 1, 2);
   leValue->setMaxLength(255);
   labValue->setBuddy(leValue);
 
   // comment
   labComment = new TQLabel(i18n("Co&mment:"), page, "labComment");
-  layout->addWidget(labComment, 3, 0, TQt::AlignLeft | TQt::AlignTop);
+  tqlayout->addWidget(labComment, 3, 0, TQt::AlignLeft | TQt::AlignTop);
 
   teComment = new KTextEdit(page, "teComment");
   teComment->setTextFormat(TQt::PlainText);
-  layout->addMultiCellWidget(teComment, 3, 3, 1, 2);
+  tqlayout->addMultiCellWidget(teComment, 3, 3, 1, 2);
 
   labComment->setBuddy(teComment);
 
   // enabled
   chkEnabled = new TQCheckBox(i18n("&Enabled"), page, "chkEnabled");
-  layout->addWidget(chkEnabled, 4, 0);
+  tqlayout->addWidget(chkEnabled, 4, 0);
 
   // set starting field values
   cmbVariable->setEditText(TQString::fromLocal8Bit(ctvar->variable.c_str()));