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

This reverts commit b6ba5d642f3fc7d320e3d6f4650eb259a3a52b04.

1 files changed, 39 insertions, 39 deletions

diff --git a/languages/pascal/compiler/dccoptions/optiontabs.cpp b/languages/pascal/compiler/dccoptions/optiontabs.cpp
index f9af2892..58025ad6 100644
--- a/languages/pascal/compiler/dccoptions/optiontabs.cpp
+++ b/languages/pascal/compiler/dccoptions/optiontabs.cpp
@@ -12,7 +12,7 @@
 
 #include <tqspinbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvbuttongroup.h>
 #include <tqapplication.h>
 #include <tqpushbutton.h>
@@ -26,8 +26,8 @@ LinkerTab::LinkerTab( TQWidget * parent, const char * name )
     pathController(new FlagPathEditController()),
     editController(new FlagEditController())
 {
-    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    layout->setAutoAdd(true);
+    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    tqlayout->setAutoAdd(true);
 
     TQVButtonGroup *map_group = new TQVButtonGroup(i18n("Map File"), this);
     TQRadioButton *m_defaultMap = new TQRadioButton(i18n("Off"), map_group);
@@ -39,19 +39,19 @@ LinkerTab::LinkerTab( TQWidget * parent, const char * name )
     new FlagRadioButton(map_group, radioController,
                      "-GD", i18n("Detailed"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout->addSpacing(10);
+    tqlayout->addSpacing(10);
 
     new FlagPathEdit(this, "", pathController,
                      "--dynamicloader=", i18n("Default dynamic loader:"), KFile::File);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout->addSpacing(10);
+    tqlayout->addSpacing(10);
 
     new FlagSpinEdit(this, 0, 2147483647, 1024, 1048576, editController,
                      "-$M", i18n("Reserved address space:"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout->addSpacing(10);
+    tqlayout->addSpacing(10);
 
-    layout->addStretch();
+    tqlayout->addStretch();
 }
 
 LinkerTab::~LinkerTab( )
@@ -80,8 +80,8 @@ void LinkerTab::writeFlags( TQStringList * str )
 LocationsTab::LocationsTab( TQWidget * parent, const char * name )
     :TQWidget(parent, name), pathController(new FlagPathEditController())
 {
-    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    layout->setAutoAdd(true);
+    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    tqlayout->setAutoAdd(true);
 
     new FlagPathEdit(this, ":", pathController,
                      "-I", i18n("Include search path (delimited by \":\"):"));
@@ -92,7 +92,7 @@ LocationsTab::LocationsTab( TQWidget * parent, const char * name )
     new FlagPathEdit(this, ":", pathController,
                      "-O", i18n("Object search path (delimited by \":\"):"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout->addStretch();
+    tqlayout->addStretch();
 }
 
 LocationsTab::~LocationsTab( )
@@ -115,8 +115,8 @@ void LocationsTab::writeFlags( TQStringList * str )
 Locations2Tab::Locations2Tab( TQWidget * parent, const char * name )
     :TQWidget(parent, name), pathController(new FlagPathEditController())
 {
-    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    layout->setAutoAdd(true);
+    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    tqlayout->setAutoAdd(true);
 
     new FlagPathEdit(this, "", pathController,
                      "-E", i18n("Executable output directory:"));
@@ -127,7 +127,7 @@ Locations2Tab::Locations2Tab( TQWidget * parent, const char * name )
     new FlagPathEdit(this, "", pathController,
                      "-LN", i18n("Package source code directory:"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout->addStretch();
+    tqlayout->addStretch();
 }
 
 Locations2Tab::~Locations2Tab( )
@@ -151,8 +151,8 @@ GeneralTab::GeneralTab( TQWidget * parent, const char * name )
     :TQWidget(parent, name), controller(new FlagCheckBoxController()),
     editController(new FlagEditController())
 {
-    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    layout->setAutoAdd(true);
+    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    tqlayout->setAutoAdd(true);
 
     TQVButtonGroup *build_group = new TQVButtonGroup(i18n("Build"), this);
     new FlagCheckBox(build_group, controller,
@@ -165,7 +165,7 @@ GeneralTab::GeneralTab( TQWidget * parent, const char * name )
                      "-Z", i18n("Disable implicit package compilation"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
-    layout->addSpacing(10);
+    tqlayout->addSpacing(10);
 
     new FlagListEdit(this, ":", editController, "-D", i18n("Conditional defines (delimited by \":\"):"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
@@ -173,7 +173,7 @@ GeneralTab::GeneralTab( TQWidget * parent, const char * name )
     new FlagListEdit(this, ":", editController, "-A", i18n("Unit aliases in form unit=alias (delimited by \":\"):"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
-    layout->addSpacing(10);
+    tqlayout->addSpacing(10);
 
     TQVButtonGroup *message_group = new TQVButtonGroup(i18n("Messages"), this);
     new FlagCheckBox(message_group, controller,
@@ -182,12 +182,12 @@ GeneralTab::GeneralTab( TQWidget * parent, const char * name )
                      "-W", i18n("Output warning messages"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
-    layout->addSpacing(10);
+    tqlayout->addSpacing(10);
     TQVButtonGroup *package_group = new TQVButtonGroup(i18n("Packages"), this);
     new FlagListEdit(package_group, ":", editController, "-LU", i18n("Build with packages (delimited by \":\"):"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
-    layout->addStretch();
+    tqlayout->addStretch();
 }
 
 GeneralTab::~GeneralTab( )
@@ -215,10 +215,10 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name )
     listController(new FlagEditController()),
     radioController(new FlagRadioButtonController())
 {
-    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-//    layout->setAutoAdd(true);
+    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+//    tqlayout->setAutoAdd(true);
 
-    TQGridLayout *layout2 = new TQGridLayout(layout, 2, 2, KDialog::spacingHint());
+    TQGridLayout *tqlayout2 = new TQGridLayout(tqlayout, 2, 2, KDialog::spacingHint());
 
     TQVButtonGroup *align_group = new TQVButtonGroup(i18n("Code Alignment && Stack Frames"), this);
     TQRadioButton *align_def = new TQRadioButton(i18n("Default (-$A8)"), align_group);
@@ -234,7 +234,7 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name )
     new FlagCheckBox(align_group, controller,
                      "'-$W+'", i18n("Generate stack frames"), "'-$W-'");
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout2->addWidget(align_group, 0, 0);
+    tqlayout2->addWidget(align_group, 0, 0);
 
     TQVButtonGroup *enum_group = new TQVButtonGroup(i18n("Enumeration Size"), this);
     TQRadioButton *enum_def = new TQRadioButton(i18n("Default (-$Z1)"), enum_group);
@@ -246,7 +246,7 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name )
     new FlagRadioButton(enum_group, radioController,
                      "'-$Z4'", i18n("Unsigned double word (4096M values)"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout2->addWidget(enum_group, 0, 1);
+    tqlayout2->addWidget(enum_group, 0, 1);
 
     TQVButtonGroup *compile_group = new TQVButtonGroup(i18n("Compile Time Checks"), this);
     new FlagCheckBox(compile_group, controller,
@@ -266,7 +266,7 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name )
     new FlagCheckBox(compile_group, controller,
                      "'-$J+'", i18n("Writable typed constants"), "'-$J-'");
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout2->addWidget(compile_group, 1, 0);
+    tqlayout2->addWidget(compile_group, 1, 0);
 
     TQVButtonGroup *run_group = new TQVButtonGroup(i18n("Run Time Checks"), this);
     new FlagCheckBox(run_group, controller,
@@ -280,9 +280,9 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name )
     new FlagCheckBox(run_group, controller,
                      "'-$R+'", i18n("Range checking"), "'-$R-'");
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout2->addWidget(run_group, 1, 1);
+    tqlayout2->addWidget(run_group, 1, 1);
 
-    layout->addStretch();
+    tqlayout->addStretch();
 }
 
 CodegenTab::~CodegenTab( )
@@ -312,17 +312,17 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name )
     : TQWidget(parent, name), controller(new FlagCheckBoxController()),
     radioController(new FlagRadioButtonController)
 {
-    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-//    layout->setAutoAdd(true);
+    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+//    tqlayout->setAutoAdd(true);
 
     TQVButtonGroup *optim_group = new TQVButtonGroup(i18n("Optimization"), this);
     new FlagCheckBox(optim_group, controller,
                      "'-$O+'", i18n("Enable optimizations"), "'-$O-'", "'-$O+'");
-    layout->addWidget(optim_group);
+    tqlayout->addWidget(optim_group);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout->addSpacing(10);
+    tqlayout->addSpacing(10);
 
-    TQBoxLayout *layout2 = new TQHBoxLayout(layout, KDialog::spacingHint());
+    TQBoxLayout *tqlayout2 = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
 
     TQVButtonGroup *debug_group = new TQVButtonGroup(i18n("Debugging"), this);
     new FlagCheckBox(debug_group, controller,
@@ -335,7 +335,7 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name )
                      "-VN", i18n("Namespace debug info"));
     symboldb = new FlagCheckBox(debug_group, controller,
                      "-VR", i18n("Write symbol info in an .rsm file"));
-    layout2->addWidget(debug_group);
+    tqlayout2->addWidget(debug_group);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
     TQVButtonGroup *debug_add = new TQVButtonGroup(i18n("Symbol Reference Information"), this);
@@ -347,20 +347,20 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name )
                         "'-$YD'", i18n("Definition information"));
     new FlagRadioButton(debug_add, radioController,
                         "'-$Y+'", i18n("Full reference information"));
-    layout2->addWidget(debug_add);
+    tqlayout2->addWidget(debug_add);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout->addSpacing(10);
+    tqlayout->addSpacing(10);
 
-    TQHBoxLayout *layout3 = new TQHBoxLayout(layout, KDialog::spacingHint());
+    TQHBoxLayout *tqlayout3 = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
     TQPushButton *release = new TQPushButton(i18n("Release"), this);
     TQPushButton *debug = new TQPushButton(i18n("Debug"), this);
-    layout3->addWidget(release);
-    layout3->addWidget(debug);
+    tqlayout3->addWidget(release);
+    tqlayout3->addWidget(debug);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
     connect(release, TQT_SIGNAL(clicked()), this, TQT_SLOT(setReleaseOptions()));
     connect(debug, TQT_SIGNAL(clicked()), this, TQT_SLOT(setDebugOptions()));
 
-    layout->addStretch();
+    tqlayout->addStretch();
 }
 
  DebugOptimTab::~ DebugOptimTab( )