TQt4 port kdevelop

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

4 files changed, 113 insertions, 111 deletions

diff --git a/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp b/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp
index 567d5c86..edcadaee 100644
--- a/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp
+++ b/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp
@@ -18,8 +18,8 @@
 
 K_EXPORT_COMPONENT_FACTORY( libkdevfpcoptions, KGenericFactory<FpcOptionsPlugin>( "kdevfpcoptions" ) )
 
-FpcOptionsPlugin::FpcOptionsPlugin(TQObject *parent, const char *name, const TQStringList& /*args*/)
-    : KDevCompilerOptions(parent, name)
+FpcOptionsPlugin::FpcOptionsPlugin(TQObject *tqparent, const char *name, const TQStringList& /*args*/)
+    : KDevCompilerOptions(tqparent, name)
 {
 }
 
@@ -27,9 +27,9 @@ FpcOptionsPlugin::~FpcOptionsPlugin()
 {
 }
 
-TQString FpcOptionsPlugin::exec(TQWidget *parent, const TQString &flags)
+TQString FpcOptionsPlugin::exec(TQWidget *tqparent, const TQString &flags)
 {
-    FpcOptionsDialog *dlg = new FpcOptionsDialog(parent, "fpc options dialog");
+    FpcOptionsDialog *dlg = new FpcOptionsDialog(tqparent, "fpc options dialog");
     TQString newFlags = flags;
     dlg->setFlags(flags);
     if (dlg->exec() == TQDialog::Accepted)
@@ -40,8 +40,8 @@ TQString FpcOptionsPlugin::exec(TQWidget *parent, const TQString &flags)
 
 
 
-FpcOptionsDialog::FpcOptionsDialog( TQWidget *parent, const char *name )
-    : KDialogBase(Tabbed, i18n("Free Pascal Compiler Options"), Ok|Cancel, Ok, parent, name, true)
+FpcOptionsDialog::FpcOptionsDialog( TQWidget *tqparent, const char *name )
+    : KDialogBase(Tabbed, i18n("Free Pascal Compiler Options"), Ok|Cancel, Ok, tqparent, name, true)
 {
     TQVBox *vbox;
 
diff --git a/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h b/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h
index 55e65321..6d450569 100644
--- a/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h
+++ b/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h
@@ -18,12 +18,13 @@
 class FpcOptionsPlugin : public KDevCompilerOptions
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    FpcOptionsPlugin( TQObject *parent, const char *name, const TQStringList &args );
+    FpcOptionsPlugin( TQObject *tqparent, const char *name, const TQStringList &args );
     ~FpcOptionsPlugin();
 
-    virtual TQString exec(TQWidget *parent, const TQString &flags);
+    virtual TQString exec(TQWidget *tqparent, const TQString &flags);
 };
 
 
@@ -35,7 +36,7 @@ class CodegenTab;
 class FpcOptionsDialog : public KDialogBase
 {
 public:
-    FpcOptionsDialog( TQWidget *parent=0, const char *name=0 );
+    FpcOptionsDialog( TQWidget *tqparent=0, const char *name=0 );
     ~FpcOptionsDialog();
 
     void setFlags(const TQString &flags);
diff --git a/languages/pascal/compiler/fpcoptions/optiontabs.cpp b/languages/pascal/compiler/fpcoptions/optiontabs.cpp
index 445ab826..5c46ac24 100644
--- a/languages/pascal/compiler/fpcoptions/optiontabs.cpp
+++ b/languages/pascal/compiler/fpcoptions/optiontabs.cpp
@@ -23,17 +23,17 @@
 
 #include "optiontabs.h"
 
-FeedbackTab::FeedbackTab(TQWidget *parent, const char *name)
-    : TQWidget(parent, name), controller(new FlagCheckBoxController(TQStringList::split(",","-v")))
+FeedbackTab::FeedbackTab(TQWidget *tqparent, const char *name)
+    : TQWidget(tqparent, name), controller(new FlagCheckBoxController(TQStringList::split(",","-v")))
 {
-    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 *output_group = new TQVButtonGroup(i18n("Output"), this);
     new FlagCheckBox(output_group, controller,
                      "-vr", i18n("Format errors like GCC does"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout->addSpacing(10);
+    tqlayout->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);
-    layout->addSpacing(10);
+    tqlayout->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);
 
-    layout->addStretch();
+    tqlayout->addStretch();
 }
 
 FeedbackTab::~FeedbackTab()
@@ -94,12 +94,12 @@ void FeedbackTab::writeFlags(TQStringList *list)
 
 
 
-FilesAndDirectoriesTab::FilesAndDirectoriesTab( TQWidget * parent, const char * name )
-    :TQWidget(parent, name), controller(new FlagCheckBoxController()),
+FilesAndDirectoriesTab::FilesAndDirectoriesTab( TQWidget * tqparent, const char * name )
+    :TQWidget(tqparent, name), controller(new FlagCheckBoxController()),
     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,
                      "-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);
-    layout->addStretch();
+    tqlayout->addStretch();
 }
 
 FilesAndDirectoriesTab::~FilesAndDirectoriesTab( )
@@ -131,12 +131,12 @@ void FilesAndDirectoriesTab::writeFlags( TQStringList * str )
     pathController->writeFlags(str);
 }
 
-FilesAndDirectoriesTab2::FilesAndDirectoriesTab2( TQWidget * parent, const char * name )
-    :TQWidget(parent, name), controller(new FlagCheckBoxController()),
+FilesAndDirectoriesTab2::FilesAndDirectoriesTab2( TQWidget * tqparent, const char * name )
+    :TQWidget(tqparent, name), controller(new FlagCheckBoxController()),
     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,
                      "-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);
-    layout->addSpacing(20);
+    tqlayout->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);
-    layout->addSpacing(20);
+    tqlayout->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);
 
-    layout->addStretch();
+    tqlayout->addStretch();
 }
 
 FilesAndDirectoriesTab2::~FilesAndDirectoriesTab2( )
@@ -182,11 +182,11 @@ void FilesAndDirectoriesTab2::writeFlags( TQStringList * str )
 }
 
 
-LanguageTab::LanguageTab( TQWidget * parent, const char * name )
-    : TQWidget(parent, name), controller(new FlagCheckBoxController(TQStringList::split(",","-v")))
+LanguageTab::LanguageTab( TQWidget * tqparent, const char * name )
+    : TQWidget(tqparent, name), controller(new FlagCheckBoxController(TQStringList::split(",","-v")))
 {
-    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 *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);
-    layout->addSpacing(10);
+    tqlayout->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);
-    layout->addSpacing(10);
+    tqlayout->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);
 
-    layout->addStretch();
+    tqlayout->addStretch();
 }
 
  LanguageTab::~ LanguageTab( )
@@ -239,14 +239,14 @@ void LanguageTab::writeFlags( TQStringList * str )
     controller->writeFlags(str);
 }
 
-AssemblerTab::AssemblerTab( TQWidget * parent, const char * name )
-    : TQWidget(parent, name), controller(new FlagCheckBoxController()),
+AssemblerTab::AssemblerTab( TQWidget * tqparent, const char * name )
+    : TQWidget(tqparent, name), controller(new FlagCheckBoxController()),
     asmController(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);
 
-    TQBoxLayout *layout2 = new TQHBoxLayout(layout, KDialog::spacingHint());
+    TQBoxLayout *tqlayout2 = new TQHBoxLayout(tqlayout, 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"));
-    layout2->addWidget(info_group);
+    tqlayout2->addWidget(info_group);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    //layout->addSpacing(10);
+    //tqlayout->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"));
-    layout2->addWidget(asmkind_group);
+    tqlayout2->addWidget(asmkind_group);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout->addSpacing(10);
+    tqlayout->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"));
-    layout->addWidget(asm_group);
+    tqlayout->addWidget(asm_group);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
-    layout->addStretch();
+    tqlayout->addStretch();
 }
 
  AssemblerTab::~ AssemblerTab( )
@@ -324,16 +324,16 @@ void AssemblerTab::writeFlags( TQStringList * str )
 
 
 
-DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name )
-    : TQWidget(parent, name), controller(new FlagCheckBoxController()),
+DebugOptimTab::DebugOptimTab( TQWidget * tqparent, const char * name )
+    : TQWidget(tqparent, name), controller(new FlagCheckBoxController()),
     optimController(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);
 
-    TQBoxLayout *layout2 = new TQHBoxLayout(layout, KDialog::spacingHint());
+    TQBoxLayout *tqlayout2 = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
 
-    TQBoxLayout *layout3 = new TQVBoxLayout(layout2, KDialog::spacingHint());
+    TQBoxLayout *tqlayout3 = new TQVBoxLayout(tqlayout2, 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");
-    layout3->addWidget(debug_group);
+    tqlayout3->addWidget(debug_group);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout3->addSpacing(10);
+    tqlayout3->addSpacing(10);
 
     TQVButtonGroup *profile_group = new TQVButtonGroup(i18n("Profiling"), this);
     new FlagCheckBox(profile_group, controller,
                      "-pg", i18n("Generate profiler code for gprof"), "-!pg");
-    layout3->addWidget(profile_group);
+    tqlayout3->addWidget(profile_group);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout3->addSpacing(10);
+    tqlayout3->addSpacing(10);
 
-    TQBoxLayout *layout4 = new TQVBoxLayout(layout2, KDialog::spacingHint());
+    TQBoxLayout *tqlayout4 = new TQVBoxLayout(tqlayout2, 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"));
-    layout4->addWidget(optim_group1);
+    tqlayout4->addWidget(optim_group1);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout4->addSpacing(10);
+    tqlayout4->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"));
-    layout4->addWidget(optim_group2);
+    tqlayout4->addWidget(optim_group2);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout4->addSpacing(10);
+    tqlayout4->addSpacing(10);
 
-    TQHBoxLayout *layout5 = new TQHBoxLayout(layout, KDialog::spacingHint());
+    TQHBoxLayout *tqlayout5 = new TQHBoxLayout(tqlayout, 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"));
-    layout5->addWidget(optim_group3);
+    tqlayout5->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");
-    layout5->addWidget(optim_group4);
+    tqlayout5->addWidget(optim_group4);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
-    TQHBoxLayout *layout6 = new TQHBoxLayout(layout, KDialog::spacingHint());
+    TQHBoxLayout *tqlayout6 = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
     TQPushButton *release = new TQPushButton(i18n("Release"), this);
     TQPushButton *debug = new TQPushButton(i18n("Debug"), this);
-    layout6->addWidget(release);
-    layout6->addWidget(debug);
+    tqlayout6->addWidget(release);
+    tqlayout6->addWidget(debug);
     connect(release, TQT_SIGNAL(clicked()), this, TQT_SLOT(setReleaseOptions()));
     connect(debug, TQT_SIGNAL(clicked()), this, TQT_SLOT(setDebugOptions()));
 
-    layout->addStretch();
+    tqlayout->addStretch();
 }
 
  DebugOptimTab::~ DebugOptimTab( )
@@ -454,12 +454,12 @@ void DebugOptimTab::setDebugOptions()
 //    m_default3->setChecked(true);
 }
 
-CodegenTab::CodegenTab( TQWidget * parent, const char * name )
-    : TQWidget(parent, name), controller(new FlagCheckBoxController()),
+CodegenTab::CodegenTab( TQWidget * tqparent, const char * name )
+    : TQWidget(tqparent, name), controller(new FlagCheckBoxController()),
     listController(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 *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);
-    layout->addSpacing(10);
+    tqlayout->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);
-    layout->addSpacing(10);
+    tqlayout->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);
-    layout->addSpacing(10);
+    tqlayout->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);
 
-    layout->addStretch();
+    tqlayout->addStretch();
 }
 
 CodegenTab::~ CodegenTab( )
@@ -515,13 +515,13 @@ void CodegenTab::writeFlags( TQStringList * str )
     listController->writeFlags(str);
 }
 
-LinkerTab::LinkerTab( TQWidget * parent, const char * name )
-    : TQWidget(parent, name), controller(new FlagCheckBoxController()),
+LinkerTab::LinkerTab( TQWidget * tqparent, const char * name )
+    : TQWidget(tqparent, name), controller(new FlagCheckBoxController()),
     listController(new FlagEditController())
 {
-    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
 
-    TQBoxLayout *layout2 = new TQHBoxLayout(layout, KDialog::spacingHint());
+    TQBoxLayout *tqlayout2 = new TQHBoxLayout(tqlayout, 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"));
-    layout2->addWidget(link_group);
+    tqlayout2->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"));
-    layout2->addWidget(exec_group);
+    tqlayout2->addWidget(exec_group);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout->addSpacing(10);
+    tqlayout->addSpacing(10);
 
     FlagListEdit *led = new FlagListEdit(this, ":", listController, "-k", i18n("Options passed to the linker (delimited by \":\"):"));
-    layout->addWidget(led);
+    tqlayout->addWidget(led);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
-    layout->addStretch();
+    tqlayout->addStretch();
 }
 
 LinkerTab::~LinkerTab( )
@@ -577,14 +577,14 @@ void LinkerTab::writeFlags( TQStringList * str )
     listController->writeFlags(str);
 }
 
-MiscTab::MiscTab( TQWidget * parent, const char * name )
-    : TQWidget(parent, name), controller(new FlagCheckBoxController()),
+MiscTab::MiscTab( TQWidget * tqparent, const char * name )
+    : TQWidget(tqparent, name), controller(new FlagCheckBoxController()),
     radioController(new FlagRadioButtonController()),
     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);
 
     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);
-    layout->addSpacing(10);
+    tqlayout->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);
-    layout->addSpacing(10);
+    tqlayout->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);
-    layout->addSpacing(10);
+    tqlayout->addSpacing(10);
 
-    layout->addStretch();
+    tqlayout->addStretch();
 }
 
 MiscTab::~ MiscTab( )
diff --git a/languages/pascal/compiler/fpcoptions/optiontabs.h b/languages/pascal/compiler/fpcoptions/optiontabs.h
index acb446b3..9d0e0f07 100644
--- a/languages/pascal/compiler/fpcoptions/optiontabs.h
+++ b/languages/pascal/compiler/fpcoptions/optiontabs.h
@@ -21,10 +21,10 @@ class FlagRadioButtonController;
 class FlagPathEditController;
 class FlagEditController;
 
-class FeedbackTab : public QWidget
+class FeedbackTab : public TQWidget
 {
 public:
-    FeedbackTab( TQWidget *parent=0, const char *name=0 );
+    FeedbackTab( TQWidget *tqparent=0, const char *name=0 );
     ~FeedbackTab();
 
     void readFlags(TQStringList *str);
@@ -34,10 +34,10 @@ private:
     FlagCheckBoxController *controller;
 };
 
-class FilesAndDirectoriesTab: public QWidget
+class FilesAndDirectoriesTab: public TQWidget
 {
 public:
-    FilesAndDirectoriesTab( TQWidget *parent = 0, const char *name = 0);
+    FilesAndDirectoriesTab( TQWidget *tqparent = 0, const char *name = 0);
     ~FilesAndDirectoriesTab();
 
     void readFlags(TQStringList *str);
@@ -48,10 +48,10 @@ private:
     FlagPathEditController *pathController;
 };
 
-class FilesAndDirectoriesTab2: public QWidget
+class FilesAndDirectoriesTab2: public TQWidget
 {
 public:
-    FilesAndDirectoriesTab2( TQWidget *parent = 0, const char *name = 0);
+    FilesAndDirectoriesTab2( TQWidget *tqparent = 0, const char *name = 0);
     ~FilesAndDirectoriesTab2();
 
     void readFlags(TQStringList *str);
@@ -62,10 +62,10 @@ private:
     FlagPathEditController *pathController;
 };
 
-class LanguageTab : public QWidget
+class LanguageTab : public TQWidget
 {
 public:
-    LanguageTab( TQWidget *parent=0, const char *name=0 );
+    LanguageTab( TQWidget *tqparent=0, const char *name=0 );
     ~LanguageTab();
 
     void readFlags(TQStringList *str);
@@ -75,10 +75,10 @@ private:
     FlagCheckBoxController *controller;
 };
 
-class AssemblerTab : public QWidget
+class AssemblerTab : public TQWidget
 {
 public:
-    AssemblerTab( TQWidget *parent=0, const char *name=0 );
+    AssemblerTab( TQWidget *tqparent=0, const char *name=0 );
     ~AssemblerTab();
 
     void readFlags(TQStringList *str);
@@ -89,11 +89,12 @@ private:
     FlagRadioButtonController *asmController;
 };
 
-class DebugOptimTab : public QWidget
+class DebugOptimTab : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    DebugOptimTab( TQWidget *parent=0, const char *name=0 );
+    DebugOptimTab( TQWidget *tqparent=0, const char *name=0 );
     ~DebugOptimTab();
 
     void readFlags(TQStringList *str);
@@ -114,10 +115,10 @@ private slots:
     void setDebugOptions();
 };
 
-class CodegenTab : public QWidget
+class CodegenTab : public TQWidget
 {
 public:
-    CodegenTab( TQWidget *parent=0, const char *name=0 );
+    CodegenTab( TQWidget *tqparent=0, const char *name=0 );
     ~CodegenTab();
 
     void readFlags(TQStringList *str);
@@ -128,10 +129,10 @@ private:
     FlagEditController *listController;
 };
 
-class LinkerTab : public QWidget
+class LinkerTab : public TQWidget
 {
 public:
-    LinkerTab( TQWidget *parent=0, const char *name=0 );
+    LinkerTab( TQWidget *tqparent=0, const char *name=0 );
     ~LinkerTab();
 
     void readFlags(TQStringList *str);
@@ -142,10 +143,10 @@ private:
     FlagEditController *listController;
 };
 
-class MiscTab : public QWidget
+class MiscTab : public TQWidget
 {
 public:
-    MiscTab( TQWidget *parent=0, const char *name=0 );
+    MiscTab( TQWidget *tqparent=0, const char *name=0 );
     ~MiscTab();
 
     void readFlags(TQStringList *str);