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, 41 insertions, 39 deletions

diff --git a/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp b/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp
index 66a12fbb..f6c3465e 100644
--- a/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp
+++ b/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp
@@ -25,8 +25,8 @@ extern "C" {
 }
 
 
-PgiOptionsFactory::PgiOptionsFactory(TQObject *parent, const char *name)
-    : KLibFactory(parent, name)
+PgiOptionsFactory::PgiOptionsFactory(TQObject *tqparent, const char *name)
+    : KLibFactory(tqparent, name)
 {
     instance();
 }
@@ -39,15 +39,15 @@ PgiOptionsFactory::~PgiOptionsFactory()
 }
 
 
-TQObject *PgiOptionsFactory::createObject(TQObject *parent, const char *name,
+TQObject *PgiOptionsFactory::createObject(TQObject *tqparent, const char *name,
                                          const char * /*classname*/, const TQStringList &args)
 {
     if (args.count() > 0 && qstrcmp(args[0].latin1(), "pghpf") == 0) {
         kdDebug(9021) << "Building PgiOptions for PGHPF" << endl;
-        return new PgiOptionsPlugin(PgiOptionsPlugin::PGHPF, parent, name);
+        return new PgiOptionsPlugin(PgiOptionsPlugin::PGHPF, tqparent, name);
     } else if (args.count() > 0 && qstrcmp(args[0].latin1(), "pgf77") == 0) {
         kdDebug(9021) << "Building PgiOptions for PGF77" << endl;
-        return new PgiOptionsPlugin(PgiOptionsPlugin::PGF77, parent, name);
+        return new PgiOptionsPlugin(PgiOptionsPlugin::PGF77, tqparent, name);
     } else {
         kdDebug(9021) << "Wrong args for kdevpgioptions library" << endl;
         if (args.count() > 0)
diff --git a/languages/fortran/compiler/pgioptions/pgioptionsfactory.h b/languages/fortran/compiler/pgioptions/pgioptionsfactory.h
index 4fd73b7f..e66e0cf2 100644
--- a/languages/fortran/compiler/pgioptions/pgioptionsfactory.h
+++ b/languages/fortran/compiler/pgioptions/pgioptionsfactory.h
@@ -18,12 +18,13 @@
 class PgiOptionsFactory : public KLibFactory
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    PgiOptionsFactory( TQObject *parent=0, const char *name=0 );
+    PgiOptionsFactory( TQObject *tqparent=0, const char *name=0 );
     ~PgiOptionsFactory();
 
-    virtual TQObject* createObject( TQObject *parent, const char *name,
+    virtual TQObject* createObject( TQObject *tqparent, const char *name,
                                    const char *classname, const TQStringList &args);
     static KInstance *instance();
 
diff --git a/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp b/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp
index 8f22453a..267c67f0 100644
--- a/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp
+++ b/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp
@@ -72,10 +72,10 @@ const char * const hpf_flags[] = {
 
 
 
-class GeneralTab : public QWidget
+class GeneralTab : public TQWidget
 {
 public:
-    GeneralTab( TQWidget *parent=0, const char *name=0 );
+    GeneralTab( TQWidget *tqparent=0, const char *name=0 );
     ~GeneralTab();
 
     void readFlags(TQStringList *str);
@@ -83,10 +83,10 @@ public:
 };
 
 
-class OptimizationTab : public QWidget
+class OptimizationTab : public TQWidget
 {
 public:
-    OptimizationTab( PgiOptionsPlugin::Type type, TQWidget *parent=0, const char *name=0 );
+    OptimizationTab( PgiOptionsPlugin::Type type, TQWidget *tqparent=0, const char *name=0 );
     ~OptimizationTab();
 
     void readFlags(TQStringList *str);
@@ -98,10 +98,10 @@ private:
 };
 
 
-class HpfTab : public QWidget
+class HpfTab : public TQWidget
 {
 public:
-    HpfTab( TQWidget *parent=0, const char *name=0 );
+    HpfTab( TQWidget *tqparent=0, const char *name=0 );
     ~HpfTab();
 
     void readFlags(TQStringList *str);
@@ -112,11 +112,11 @@ private:
 };
 
 
-OptimizationTab::OptimizationTab(PgiOptionsPlugin::Type type, TQWidget *parent, const char *name)
-    : TQWidget(parent, name)
+OptimizationTab::OptimizationTab(PgiOptionsPlugin::Type type, TQWidget *tqparent, const char *name)
+    : TQWidget(tqparent, name)
 {
-    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 *group = new TQVButtonGroup(i18n("Optimization Level"), this);
     Odefault = new TQRadioButton(i18n("Default"), group);
@@ -127,7 +127,7 @@ OptimizationTab::OptimizationTab(PgiOptionsPlugin::Type type, TQWidget *parent,
 
     if (type == PgiOptionsPlugin::PGHPF) {
         optBox = new TQListView(this);
-        optBox->addColumn(TQString::null);
+        optBox->addColumn(TQString());
         optBox->header()->hide();
         for (const char * const *p = optimization_flags; *p; ++p) {
             new TQCheckListItem(optBox, *p, TQCheckListItem::CheckBox);
@@ -137,7 +137,7 @@ OptimizationTab::OptimizationTab(PgiOptionsPlugin::Type type, TQWidget *parent,
         optBox = 0;
 
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout->addStretch();
+    tqlayout->addStretch();
 }
 
 
@@ -150,7 +150,7 @@ void OptimizationTab::readFlags(TQStringList *list)
     if (optBox) {
         TQListViewItem *item = optBox->firstChild();
         for (; item; item = item->nextSibling()) {
-            TQStringList::Iterator sli = list->find(item->text(0));
+            TQStringList::Iterator sli = list->tqfind(item->text(0));
             if (sli != list->end()) {
                 static_cast<TQCheckListItem*>(item)->setOn(true);
                 list->remove(sli);
@@ -159,17 +159,17 @@ void OptimizationTab::readFlags(TQStringList *list)
     }
     
     TQStringList::Iterator sli;
-    sli = list->find("-O0");
+    sli = list->tqfind("-O0");
     if (sli != list->end()) {
         O0->setChecked(true);
         list->remove(sli);
     }
-    sli = list->find("-O1");
+    sli = list->tqfind("-O1");
     if (sli != list->end()) {
         O1->setChecked(true);
         list->remove(sli);
     }
-    sli = list->find("-O2");
+    sli = list->tqfind("-O2");
     if (sli != list->end()) {
         O2->setChecked(true);
         list->remove(sli);
@@ -195,20 +195,20 @@ void OptimizationTab::writeFlags(TQStringList *list)
 }
 
 
-HpfTab::HpfTab(TQWidget *parent, const char *name)
-    : TQWidget(parent, name)
+HpfTab::HpfTab(TQWidget *tqparent, const char *name)
+    : TQWidget(tqparent, name)
 {
-    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    layout->setAutoAdd(true);
+    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    tqlayout->setAutoAdd(true);
 
     hpfBox = new TQListView(this);
-    hpfBox->addColumn(TQString::null);
+    hpfBox->addColumn(TQString());
     hpfBox->header()->hide();
     for (const char * const *p = hpf_flags; *p; ++p)
         new TQCheckListItem(hpfBox, *p, TQCheckListItem::CheckBox);
 
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout->addStretch();
+    tqlayout->addStretch();
 }
 
 
@@ -220,7 +220,7 @@ void HpfTab::readFlags(TQStringList *list)
 {
     TQListViewItem *item = hpfBox->firstChild();
     for (; item; item = item->nextSibling()) {
-        TQStringList::Iterator sli = list->find(item->text(0));
+        TQStringList::Iterator sli = list->tqfind(item->text(0));
         if (sli != list->end()) {
             static_cast<TQCheckListItem*>(item)->setOn(true);
             list->remove(sli);
@@ -239,9 +239,9 @@ void HpfTab::writeFlags(TQStringList *list)
 }
 
 
-PgiOptionsDialog::PgiOptionsDialog(PgiOptionsPlugin::Type type, TQWidget *parent, const char *name)
+PgiOptionsDialog::PgiOptionsDialog(PgiOptionsPlugin::Type type, TQWidget *tqparent, const char *name)
     : KDialogBase(Tabbed, (type == PgiOptionsPlugin::PGHPF)? i18n("PGHPF Compiler Options") : i18n("PGF77 Compiler Options"),
-                  Ok|Cancel, Ok, parent, name, true)
+                  Ok|Cancel, Ok, tqparent, name, true)
 {
     TQVBox *vbox;
 
@@ -299,8 +299,8 @@ TQString PgiOptionsDialog::flags() const
 }
 
 
-PgiOptionsPlugin::PgiOptionsPlugin(Type type, TQObject *parent, const char *name)
-    : KDevCompilerOptions(parent, name)
+PgiOptionsPlugin::PgiOptionsPlugin(Type type, TQObject *tqparent, const char *name)
+    : KDevCompilerOptions(tqparent, name)
 {
     pgitype = type;
 }
@@ -310,9 +310,9 @@ PgiOptionsPlugin::~PgiOptionsPlugin()
 {}
 
 
-TQString PgiOptionsPlugin::exec(TQWidget *parent, const TQString &flags)
+TQString PgiOptionsPlugin::exec(TQWidget *tqparent, const TQString &flags)
 {
-    PgiOptionsDialog *dlg = new PgiOptionsDialog(pgitype, parent, "pgi options dialog");
+    PgiOptionsDialog *dlg = new PgiOptionsDialog(pgitype, tqparent, "pgi options dialog");
     TQString newFlags = flags;
     dlg->setFlags(flags);
     if (dlg->exec() == TQDialog::Accepted)
diff --git a/languages/fortran/compiler/pgioptions/pgioptionsplugin.h b/languages/fortran/compiler/pgioptions/pgioptionsplugin.h
index aba83fbc..28392c0d 100644
--- a/languages/fortran/compiler/pgioptions/pgioptionsplugin.h
+++ b/languages/fortran/compiler/pgioptions/pgioptionsplugin.h
@@ -24,14 +24,15 @@ class HpfTab;
 class PgiOptionsPlugin : public KDevCompilerOptions
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     enum Type { PGHPF, PGF77 };
     
-    PgiOptionsPlugin( Type type, TQObject *parent=0, const char *name=0 );
+    PgiOptionsPlugin( Type type, TQObject *tqparent=0, const char *name=0 );
     ~PgiOptionsPlugin();
 
-    virtual TQString exec(TQWidget *parent, const TQString &flags);
+    virtual TQString exec(TQWidget *tqparent, const TQString &flags);
 
 private:
     Type pgitype;
@@ -41,7 +42,7 @@ private:
 class PgiOptionsDialog : public KDialogBase
 {
 public:
-    PgiOptionsDialog(PgiOptionsPlugin::Type type, TQWidget *parent=0, const char *name=0 );
+    PgiOptionsDialog(PgiOptionsPlugin::Type type, TQWidget *tqparent=0, const char *name=0 );
     ~PgiOptionsDialog();
 
     void setFlags(const TQString &flags);