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

2 files changed, 106 insertions, 106 deletions

diff --git a/languages/pascal/compiler/dccoptions/optiontabs.cpp b/languages/pascal/compiler/dccoptions/optiontabs.cpp
index 58025ad6..f9af2892 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 <tqlayout.h>
+#include <layout.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 *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    tqlayout->setAutoAdd(true);
+    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    layout->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);
-    tqlayout->addSpacing(10);
+    layout->addSpacing(10);
 
     new FlagPathEdit(this, "", pathController,
                      "--dynamicloader=", i18n("Default dynamic loader:"), KFile::File);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addSpacing(10);
+    layout->addSpacing(10);
 
     new FlagSpinEdit(this, 0, 2147483647, 1024, 1048576, editController,
                      "-$M", i18n("Reserved address space:"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addSpacing(10);
+    layout->addSpacing(10);
 
-    tqlayout->addStretch();
+    layout->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 *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    tqlayout->setAutoAdd(true);
+    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    layout->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);
-    tqlayout->addStretch();
+    layout->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 *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    tqlayout->setAutoAdd(true);
+    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    layout->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);
-    tqlayout->addStretch();
+    layout->addStretch();
 }
 
 Locations2Tab::~Locations2Tab( )
@@ -151,8 +151,8 @@ GeneralTab::GeneralTab( TQWidget * parent, const char * name )
     :TQWidget(parent, name), controller(new FlagCheckBoxController()),
     editController(new FlagEditController())
 {
-    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    tqlayout->setAutoAdd(true);
+    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    layout->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);
 
-    tqlayout->addSpacing(10);
+    layout->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);
 
-    tqlayout->addSpacing(10);
+    layout->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);
 
-    tqlayout->addSpacing(10);
+    layout->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);
 
-    tqlayout->addStretch();
+    layout->addStretch();
 }
 
 GeneralTab::~GeneralTab( )
@@ -215,10 +215,10 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name )
     listController(new FlagEditController()),
     radioController(new FlagRadioButtonController())
 {
-    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-//    tqlayout->setAutoAdd(true);
+    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+//    layout->setAutoAdd(true);
 
-    TQGridLayout *tqlayout2 = new TQGridLayout(tqlayout, 2, 2, KDialog::spacingHint());
+    TQGridLayout *layout2 = new TQGridLayout(layout, 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);
-    tqlayout2->addWidget(align_group, 0, 0);
+    layout2->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);
-    tqlayout2->addWidget(enum_group, 0, 1);
+    layout2->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);
-    tqlayout2->addWidget(compile_group, 1, 0);
+    layout2->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);
-    tqlayout2->addWidget(run_group, 1, 1);
+    layout2->addWidget(run_group, 1, 1);
 
-    tqlayout->addStretch();
+    layout->addStretch();
 }
 
 CodegenTab::~CodegenTab( )
@@ -312,17 +312,17 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name )
     : TQWidget(parent, name), controller(new FlagCheckBoxController()),
     radioController(new FlagRadioButtonController)
 {
-    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-//    tqlayout->setAutoAdd(true);
+    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+//    layout->setAutoAdd(true);
 
     TQVButtonGroup *optim_group = new TQVButtonGroup(i18n("Optimization"), this);
     new FlagCheckBox(optim_group, controller,
                      "'-$O+'", i18n("Enable optimizations"), "'-$O-'", "'-$O+'");
-    tqlayout->addWidget(optim_group);
+    layout->addWidget(optim_group);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addSpacing(10);
+    layout->addSpacing(10);
 
-    TQBoxLayout *tqlayout2 = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
+    TQBoxLayout *layout2 = new TQHBoxLayout(layout, 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"));
-    tqlayout2->addWidget(debug_group);
+    layout2->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"));
-    tqlayout2->addWidget(debug_add);
+    layout2->addWidget(debug_add);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addSpacing(10);
+    layout->addSpacing(10);
 
-    TQHBoxLayout *tqlayout3 = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
+    TQHBoxLayout *layout3 = new TQHBoxLayout(layout, KDialog::spacingHint());
     TQPushButton *release = new TQPushButton(i18n("Release"), this);
     TQPushButton *debug = new TQPushButton(i18n("Debug"), this);
-    tqlayout3->addWidget(release);
-    tqlayout3->addWidget(debug);
+    layout3->addWidget(release);
+    layout3->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()));
 
-    tqlayout->addStretch();
+    layout->addStretch();
 }
 
  DebugOptimTab::~ DebugOptimTab( )
diff --git a/languages/pascal/compiler/fpcoptions/optiontabs.cpp b/languages/pascal/compiler/fpcoptions/optiontabs.cpp
index 5dd69349..9ff3ea3c 100644
--- a/languages/pascal/compiler/fpcoptions/optiontabs.cpp
+++ b/languages/pascal/compiler/fpcoptions/optiontabs.cpp
@@ -13,7 +13,7 @@
 
 #include <tqspinbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqvbuttongroup.h>
 #include <tqapplication.h>
 #include <tqframe.h>
@@ -26,14 +26,14 @@
 FeedbackTab::FeedbackTab(TQWidget *parent, const char *name)
     : TQWidget(parent, name), controller(new FlagCheckBoxController(TQStringList::split(",","-v")))
 {
-    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    tqlayout->setAutoAdd(true);
+    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    layout->setAutoAdd(true);
 
     TQVButtonGroup *output_group = new TQVButtonGroup(i18n("Output"), this);
     new FlagCheckBox(output_group, controller,
                      "-vr", i18n("Format errors like GCC does"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addSpacing(10);
+    layout->addSpacing(10);
 
     TQVButtonGroup *verbose_group = new TQVButtonGroup(i18n("Verbose"), this);
     new FlagCheckBox(verbose_group, controller,
@@ -54,7 +54,7 @@ FeedbackTab::FeedbackTab(TQWidget *parent, const char *name)
                      "-vd", i18n("Write other debugging info"));
 
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addSpacing(10);
+    layout->addSpacing(10);
 
     TQVButtonGroup *other_group = new TQVButtonGroup(i18n("Other Information"), this);
     new FlagCheckBox(other_group, controller,
@@ -74,7 +74,7 @@ FeedbackTab::FeedbackTab(TQWidget *parent, const char *name)
 
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
-    tqlayout->addStretch();
+    layout->addStretch();
 }
 
 FeedbackTab::~FeedbackTab()
@@ -98,8 +98,8 @@ FilesAndDirectoriesTab::FilesAndDirectoriesTab( TQWidget * parent, const char *
     :TQWidget(parent, name), controller(new FlagCheckBoxController()),
     pathController(new FlagPathEditController())
 {
-    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    tqlayout->setAutoAdd(true);
+    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    layout->setAutoAdd(true);
 
     new FlagPathEdit(this, ":", pathController,
                      "-Fu", i18n("Unit search path (delimited by \":\"):"));
@@ -110,7 +110,7 @@ FilesAndDirectoriesTab::FilesAndDirectoriesTab( TQWidget * parent, const char *
     new FlagPathEdit(this, ":", pathController,
                      "-Fl", i18n("Library search path (delimited by \":\"):"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addStretch();
+    layout->addStretch();
 }
 
 FilesAndDirectoriesTab::~FilesAndDirectoriesTab( )
@@ -135,8 +135,8 @@ FilesAndDirectoriesTab2::FilesAndDirectoriesTab2( TQWidget * parent, const char
     :TQWidget(parent, name), controller(new FlagCheckBoxController()),
     pathController(new FlagPathEditController())
 {
-    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    tqlayout->setAutoAdd(true);
+    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    layout->setAutoAdd(true);
 
     new FlagPathEdit(this, "", pathController,
                      "-FE", i18n("Write executables and units in:"));
@@ -145,14 +145,14 @@ FilesAndDirectoriesTab2::FilesAndDirectoriesTab2( TQWidget * parent, const char
     new FlagPathEdit(this, "", pathController,
                      "-o", i18n("Executable name:"), KFile::File);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addSpacing(20);
+    layout->addSpacing(20);
 
     new FlagPathEdit(this, "", pathController,
                      "-e", i18n("Location of as and ld programs:"));
     new FlagPathEdit(this, "", pathController,
                      "-FL", i18n("Dynamic linker executable:"), KFile::File);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addSpacing(20);
+    layout->addSpacing(20);
 
     new FlagPathEdit(this, "", pathController,
                      "-Fr", i18n("Compiler messages file:"), KFile::File);
@@ -160,7 +160,7 @@ FilesAndDirectoriesTab2::FilesAndDirectoriesTab2( TQWidget * parent, const char
                      "-Fe", i18n("Write compiler messages to file:"), KFile::File);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
-    tqlayout->addStretch();
+    layout->addStretch();
 }
 
 FilesAndDirectoriesTab2::~FilesAndDirectoriesTab2( )
@@ -185,8 +185,8 @@ void FilesAndDirectoriesTab2::writeFlags( TQStringList * str )
 LanguageTab::LanguageTab( TQWidget * parent, const char * name )
     : TQWidget(parent, name), controller(new FlagCheckBoxController(TQStringList::split(",","-v")))
 {
-    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    tqlayout->setAutoAdd(true);
+    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    layout->setAutoAdd(true);
 
     TQVButtonGroup *compat_group = new TQVButtonGroup(i18n("Pascal Compatibility"), this);
     new FlagCheckBox(compat_group, controller,
@@ -198,7 +198,7 @@ LanguageTab::LanguageTab( TQWidget * parent, const char * name )
     new FlagCheckBox(compat_group, controller,
                      "-Sp", i18n("GNU Pascal compatibility mode"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addSpacing(10);
+    layout->addSpacing(10);
 
     TQVButtonGroup *ccompat_group = new TQVButtonGroup(i18n("C/C++ Compatibility"), this);
     new FlagCheckBox(ccompat_group, controller,
@@ -208,7 +208,7 @@ LanguageTab::LanguageTab( TQWidget * parent, const char * name )
     new FlagCheckBox(ccompat_group, controller,
                      "-Sm", i18n("Support C style macros"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addSpacing(10);
+    layout->addSpacing(10);
 
     TQVButtonGroup *lang_group = new TQVButtonGroup(i18n("Language"), this);
     new FlagCheckBox(lang_group, controller,
@@ -221,7 +221,7 @@ LanguageTab::LanguageTab( TQWidget * parent, const char * name )
                      "-St", i18n("Allow the static keyword in objects"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
-    tqlayout->addStretch();
+    layout->addStretch();
 }
 
  LanguageTab::~ LanguageTab( )
@@ -243,10 +243,10 @@ AssemblerTab::AssemblerTab( TQWidget * parent, const char * name )
     : TQWidget(parent, name), controller(new FlagCheckBoxController()),
     asmController(new FlagRadioButtonController)
 {
-    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-//    tqlayout->setAutoAdd(true);
+    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+//    layout->setAutoAdd(true);
 
-    TQBoxLayout *tqlayout2 = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
+    TQBoxLayout *layout2 = new TQHBoxLayout(layout, KDialog::spacingHint());
 
     TQVButtonGroup *info_group = new TQVButtonGroup(i18n("Assembler Info"), this);
     new FlagCheckBox(info_group, controller,
@@ -257,9 +257,9 @@ AssemblerTab::AssemblerTab( TQWidget * parent, const char * name )
                      "-ar", i18n("List register allocation and release info"));
     new FlagCheckBox(info_group, controller,
                      "-at", i18n("List temporary allocations and deallocations"));
-    tqlayout2->addWidget(info_group);
+    layout2->addWidget(info_group);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    //tqlayout->addSpacing(10);
+    //layout->addSpacing(10);
 
     TQVButtonGroup *asmkind_group = new TQVButtonGroup(i18n("Assembler Reader"), this);
     TQRadioButton *m_defaultkind = new TQRadioButton(i18n("Use default reader"), asmkind_group);
@@ -270,9 +270,9 @@ AssemblerTab::AssemblerTab( TQWidget * parent, const char * name )
                         "-Rintel", i18n("Intel style assembler"));
     new FlagRadioButton(asmkind_group, asmController,
                         "-Rdirect", i18n("Direct assembler"));
-    tqlayout2->addWidget(asmkind_group);
+    layout2->addWidget(asmkind_group);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addSpacing(10);
+    layout->addSpacing(10);
 
 
     TQVButtonGroup *asm_group = new TQVButtonGroup(i18n("Assembler Output"), this);
@@ -298,10 +298,10 @@ AssemblerTab::AssemblerTab( TQWidget * parent, const char * name )
                         "-Acoff", i18n("Use coff"));
     new FlagRadioButton(asm_group, asmController,
                         "-Apecoff", i18n("Use pecoff"));
-    tqlayout->addWidget(asm_group);
+    layout->addWidget(asm_group);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
-    tqlayout->addStretch();
+    layout->addStretch();
 }
 
  AssemblerTab::~ AssemblerTab( )
@@ -328,12 +328,12 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name )
     : TQWidget(parent, name), controller(new FlagCheckBoxController()),
     optimController(new FlagRadioButtonController)
 {
-    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-//    tqlayout->setAutoAdd(true);
+    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+//    layout->setAutoAdd(true);
 
-    TQBoxLayout *tqlayout2 = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
+    TQBoxLayout *layout2 = new TQHBoxLayout(layout, KDialog::spacingHint());
 
-    TQBoxLayout *tqlayout3 = new TQVBoxLayout(tqlayout2, KDialog::spacingHint());
+    TQBoxLayout *layout3 = new TQVBoxLayout(layout2, KDialog::spacingHint());
 
     TQVButtonGroup *debug_group = new TQVButtonGroup(i18n("Debugging"), this);
     new FlagCheckBox(debug_group, controller,
@@ -346,18 +346,18 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name )
                      "-gh", i18n("Use heaptrc unit"), "-!gh");
     new FlagCheckBox(debug_group, controller,
                      "-gc", i18n("Generate checks for pointers"), "-!gc");
-    tqlayout3->addWidget(debug_group);
+    layout3->addWidget(debug_group);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout3->addSpacing(10);
+    layout3->addSpacing(10);
 
     TQVButtonGroup *profile_group = new TQVButtonGroup(i18n("Profiling"), this);
     new FlagCheckBox(profile_group, controller,
                      "-pg", i18n("Generate profiler code for gprof"), "-!pg");
-    tqlayout3->addWidget(profile_group);
+    layout3->addWidget(profile_group);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout3->addSpacing(10);
+    layout3->addSpacing(10);
 
-    TQBoxLayout *tqlayout4 = new TQVBoxLayout(tqlayout2, KDialog::spacingHint());
+    TQBoxLayout *layout4 = new TQVBoxLayout(layout2, KDialog::spacingHint());
 
     TQVButtonGroup *optim_group1 = new TQVButtonGroup(i18n("General Optimization"), this);
     m_default = new TQRadioButton(i18n("Default"), optim_group1);
@@ -366,9 +366,9 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name )
                         "-Og", i18n("Generate smaller code"));
     optim1 = new FlagRadioButton(optim_group1, optimController,
                         "-OG", i18n("Generate faster code"));
-    tqlayout4->addWidget(optim_group1);
+    layout4->addWidget(optim_group1);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout4->addSpacing(10);
+    layout4->addSpacing(10);
 
     TQVButtonGroup *optim_group2 = new TQVButtonGroup(i18n("Optimization Levels"), this);
     m_default2 = new TQRadioButton(i18n("Default"), optim_group2);
@@ -379,11 +379,11 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name )
                         "-O2", i18n("Level 2"));
     optim2 = new FlagRadioButton(optim_group2, optimController,
                         "-O3", i18n("Level 3"));
-    tqlayout4->addWidget(optim_group2);
+    layout4->addWidget(optim_group2);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout4->addSpacing(10);
+    layout4->addSpacing(10);
 
-    TQHBoxLayout *tqlayout5 = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
+    TQHBoxLayout *layout5 = new TQHBoxLayout(layout, KDialog::spacingHint());
 
     TQVButtonGroup *optim_group3 = new TQVButtonGroup(i18n("Architecture"), this);
     m_default3 = new TQRadioButton(i18n("Default"), optim_group3);
@@ -394,7 +394,7 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name )
                      "-Op2", i18n("Pentium/PentiumMMX"));
     new FlagRadioButton(optim_group3, optimController,
                      "-Op2", i18n("PentiumPro/PII/Cyrix 6x86/K6"));
-    tqlayout5->addWidget(optim_group3);
+    layout5->addWidget(optim_group3);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
     TQVButtonGroup *optim_group4 = new TQVButtonGroup(i18n("Another Optimization"), this);
@@ -402,18 +402,18 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name )
                      "-Or", i18n("Use register variables"), "-!Or");
     new FlagCheckBox(optim_group4, controller,
                      "-Ou", i18n("Uncertain optimizations"), "-!Ou");
-    tqlayout5->addWidget(optim_group4);
+    layout5->addWidget(optim_group4);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
-    TQHBoxLayout *tqlayout6 = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
+    TQHBoxLayout *layout6 = new TQHBoxLayout(layout, KDialog::spacingHint());
     TQPushButton *release = new TQPushButton(i18n("Release"), this);
     TQPushButton *debug = new TQPushButton(i18n("Debug"), this);
-    tqlayout6->addWidget(release);
-    tqlayout6->addWidget(debug);
+    layout6->addWidget(release);
+    layout6->addWidget(debug);
     connect(release, TQT_SIGNAL(clicked()), this, TQT_SLOT(setReleaseOptions()));
     connect(debug, TQT_SIGNAL(clicked()), this, TQT_SLOT(setDebugOptions()));
 
-    tqlayout->addStretch();
+    layout->addStretch();
 }
 
  DebugOptimTab::~ DebugOptimTab( )
@@ -458,8 +458,8 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name )
     : TQWidget(parent, name), controller(new FlagCheckBoxController()),
     listController(new FlagEditController())
 {
-    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    tqlayout->setAutoAdd(true);
+    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    layout->setAutoAdd(true);
 
     TQVButtonGroup *compile_group = new TQVButtonGroup(i18n("Compile Time Checks"), this);
     new FlagCheckBox(compile_group, controller,
@@ -467,7 +467,7 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name )
     new FlagCheckBox(compile_group, controller,
                      "-Un", i18n("Do not check the unit name for being the same as the file name"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addSpacing(10);
+    layout->addSpacing(10);
 
     TQVButtonGroup *run_group = new TQVButtonGroup(i18n("Run Time Checks"), this);
     new FlagCheckBox(run_group, controller,
@@ -479,14 +479,14 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name )
     new FlagCheckBox(run_group, controller,
                      "-Co", i18n("Integer overflow checking"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addSpacing(10);
+    layout->addSpacing(10);
 
     new FlagListEdit(this, ":", listController, "-d", i18n("Conditional defines (delimited by \":\"):"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
     new FlagListEdit(this, ":", listController, "-u", i18n("Undefine conditional defines (delimited by \":\"):"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addSpacing(10);
+    layout->addSpacing(10);
 
     new FlagSpinEdit(this, 1024, 67107840, 1, 131072, listController,
                     "-Cs", i18n("Stack size:"));
@@ -494,7 +494,7 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name )
                     "-Ch", i18n("Heap size:"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
-    tqlayout->addStretch();
+    layout->addStretch();
 }
 
 CodegenTab::~ CodegenTab( )
@@ -519,9 +519,9 @@ LinkerTab::LinkerTab( TQWidget * parent, const char * name )
     : TQWidget(parent, name), controller(new FlagCheckBoxController()),
     listController(new FlagEditController())
 {
-    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
 
-    TQBoxLayout *tqlayout2 = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
+    TQBoxLayout *layout2 = new TQHBoxLayout(layout, KDialog::spacingHint());
 
     TQVButtonGroup *link_group = new TQVButtonGroup(i18n("Linking Stage"), this);
     new FlagCheckBox(link_group, controller,
@@ -534,7 +534,7 @@ LinkerTab::LinkerTab( TQWidget * parent, const char * name )
                      "-Cn", i18n("Omit the linking stage"));
     new FlagCheckBox(link_group, controller,
                      "-s",  i18n("Create assembling and linking script"));
-    tqlayout2->addWidget(link_group);
+    layout2->addWidget(link_group);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
     TQVButtonGroup *exec_group = new TQVButtonGroup(i18n("Executable Generation"), this);
@@ -548,15 +548,15 @@ LinkerTab::LinkerTab( TQWidget * parent, const char * name )
                      "-XD",  i18n("Link with dynamic libraries"));
     new FlagCheckBox(exec_group, controller,
                      "-Xc",  i18n("Link with the C library"));
-    tqlayout2->addWidget(exec_group);
+    layout2->addWidget(exec_group);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addSpacing(10);
+    layout->addSpacing(10);
 
     FlagListEdit *led = new FlagListEdit(this, ":", listController, "-k", i18n("Options passed to the linker (delimited by \":\"):"));
-    tqlayout->addWidget(led);
+    layout->addWidget(led);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
-    tqlayout->addStretch();
+    layout->addStretch();
 }
 
 LinkerTab::~LinkerTab( )
@@ -583,8 +583,8 @@ MiscTab::MiscTab( TQWidget * parent, const char * name )
     pathController(new FlagPathEditController()),
     editController(new FlagEditController())
 {
-    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    tqlayout->setAutoAdd(true);
+    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    layout->setAutoAdd(true);
 
     new FlagCheckBox(this, controller,
                      "-B", i18n("Recompile all used units"));
@@ -595,7 +595,7 @@ MiscTab::MiscTab( TQWidget * parent, const char * name )
     new FlagSpinEdit(this, 1, 1000, 1, 50, editController,
                     "-Se", i18n("Stop after the error:"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addSpacing(10);
+    layout->addSpacing(10);
 
     TQVButtonGroup *browser_group = new TQVButtonGroup(i18n("Browser Info"), this);
     TQRadioButton *m_defaultBrowser = new TQRadioButton(i18n("No browser info"), browser_group);
@@ -605,7 +605,7 @@ MiscTab::MiscTab( TQWidget * parent, const char * name )
     new FlagRadioButton(browser_group, radioController,
                      "-bl", i18n("Global and local browser info"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addSpacing(10);
+    layout->addSpacing(10);
 
     TQVButtonGroup *target_group = new TQVButtonGroup(i18n("Target OS"), this);
     TQRadioButton *m_defaultTarget = new TQRadioButton(i18n("Default"), target_group);
@@ -625,9 +625,9 @@ MiscTab::MiscTab( TQWidget * parent, const char * name )
     new FlagRadioButton(target_group, radioController,
                      "-TBEOS", i18n("BeOS"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addSpacing(10);
+    layout->addSpacing(10);
 
-    tqlayout->addStretch();
+    layout->addStretch();
 }
 
 MiscTab::~ MiscTab( )