7 files changed, 20 insertions, 20 deletions
diff --git a/buildtools/ada/adaglobaloptionsdlg.h b/buildtools/ada/adaglobaloptionsdlg.h
index 39e2e354..1b3d75cf 100644
--- a/buildtools/ada/adaglobaloptionsdlg.h
+++ b/buildtools/ada/adaglobaloptionsdlg.h
@@ -19,7 +19,7 @@ class AdaProjectPart;
 
 class AdaGlobalOptionsDlg : public AdaProjectOptionsDlgBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/buildtools/ada/adaproject_optionsdlgbase.ui b/buildtools/ada/adaproject_optionsdlgbase.ui
index b98bc1a3..35774d19 100644
--- a/buildtools/ada/adaproject_optionsdlgbase.ui
+++ b/buildtools/ada/adaproject_optionsdlgbase.ui
@@ -447,7 +447,7 @@
     <tabstop>addconfig_button</tabstop>
     <tabstop>removeconfig_button</tabstop>
 </tabstops>
-<Q_SLOTS>
+<slots>
     <slot access="protected">compiler_box_activated(const TQString&amp;)</slot>
     <slot access="protected">addconfig_button_clicked()</slot>
     <slot access="protected">configRemoved()</slot>
@@ -457,7 +457,7 @@
     <slot access="protected">configAdded()</slot>
     <slot access="protected">setDirty()</slot>
     <slot access="protected">setDefaultOptions()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includes>
diff --git a/buildtools/ada/adaproject_part.cpp b/buildtools/ada/adaproject_part.cpp
index 5eacf5d0..53086236 100644
--- a/buildtools/ada/adaproject_part.cpp
+++ b/buildtools/ada/adaproject_part.cpp
@@ -23,7 +23,7 @@
 #include <kdialogbase.h>
 #include <tdemessagebox.h>
 #include <klibloader.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <kservice.h>
 #include <tdeconfig.h>
 
@@ -43,28 +43,28 @@
 #include "adaglobaloptionsdlg.h"
 
 typedef KDevGenericFactory<AdaProjectPart> AdaProjectFactory;
-static const KDevPluginInfo data("kdevadaproject");
-K_EXPORT_COMPONENT_FACTORY( libkdevadaproject, AdaProjectFactory( data ) )
+static const KDevPluginInfo pluginData("kdevadaproject");
+K_EXPORT_COMPONENT_FACTORY( libkdevadaproject, AdaProjectFactory( pluginData ) )
 
 AdaProjectPart::AdaProjectPart(TQObject *parent, const char *name, const TQStringList& )
-    :KDevBuildTool(&data, parent, name ? name : "AdaProjectPart" )
+    :KDevBuildTool(&pluginData, parent, name ? name : "AdaProjectPart" )
 {
     setInstance(AdaProjectFactory::instance());
     setXMLFile("kdevadaproject.rc");
 
     TDEAction *action;
     action = new TDEAction( i18n("&Build Project"), "make_tdevelop", Key_F8,
-                          this, TQT_SLOT(slotBuild()),
+                          this, TQ_SLOT(slotBuild()),
                           actionCollection(), "build_build" );
     action = new TDEAction( i18n("Execute Program"), "application-x-executable", 0,
-                          this, TQT_SLOT(slotExecute()),
+                          this, TQ_SLOT(slotExecute()),
                           actionCollection(), "build_execute" );
 
-    connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)),
-             this, TQT_SLOT(projectConfigWidget(KDialogBase*)) );
+    connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)),
+             this, TQ_SLOT(projectConfigWidget(KDialogBase*)) );
 
-    connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)),
-             this, TQT_SLOT(configWidget(KDialogBase*)) );
+    connect( core(), TQ_SIGNAL(configWidget(KDialogBase*)),
+             this, TQ_SLOT(configWidget(KDialogBase*)) );
 
 //  m_widget = new AdaProjectWidget(this);
 
@@ -374,8 +374,8 @@ void AdaProjectPart::projectConfigWidget( KDialogBase * dlg )
     TQVBox *vbox;
     vbox = dlg->addVBoxPage(i18n("Ada Compiler"));
     AdaProjectOptionsDlg *w = new AdaProjectOptionsDlg(this, vbox);
-    connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) );
-    connect( dlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(loadProjectConfig()) );
+    connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) );
+    connect( dlg, TQ_SIGNAL(okClicked()), this, TQ_SLOT(loadProjectConfig()) );
 }
 
 void AdaProjectPart::loadProjectConfig( )
@@ -405,7 +405,7 @@ void AdaProjectPart::configWidget( KDialogBase * dlg )
     TQVBox *vbox;
     vbox = dlg->addVBoxPage(i18n("Ada Compiler"));
     AdaGlobalOptionsDlg *w = new AdaGlobalOptionsDlg(this, vbox);
-    connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) );
+    connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) );
 }
 
 KDevCompilerOptions *AdaProjectPart::createCompilerOptions(const TQString &name)
diff --git a/buildtools/ada/adaproject_part.h b/buildtools/ada/adaproject_part.h
index 5511da78..a1415344 100644
--- a/buildtools/ada/adaproject_part.h
+++ b/buildtools/ada/adaproject_part.h
@@ -19,7 +19,7 @@ class KDevCompilerOptions;
 
 class AdaProjectPart : public KDevBuildTool
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     AdaProjectPart(TQObject *parent, const char *name, const TQStringList &);
diff --git a/buildtools/ada/adaproject_widget.h b/buildtools/ada/adaproject_widget.h
index 6bbab369..f1bb5e2b 100644
--- a/buildtools/ada/adaproject_widget.h
+++ b/buildtools/ada/adaproject_widget.h
@@ -9,7 +9,7 @@ class AdaProjectPart;
 
 class AdaProjectWidget : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
     
 public:
diff --git a/buildtools/ada/adaprojectoptionsdlg.cpp b/buildtools/ada/adaprojectoptionsdlg.cpp
index 28549efc..3a0624cb 100644
--- a/buildtools/ada/adaprojectoptionsdlg.cpp
+++ b/buildtools/ada/adaprojectoptionsdlg.cpp
@@ -27,7 +27,7 @@
 AdaProjectOptionsDlg::AdaProjectOptionsDlg(AdaProjectPart *part, TQWidget* parent, const char* name, WFlags fl)
     : AdaProjectOptionsDlgBase(parent,name, fl), m_part(part)
 {
-    config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), TQT_TQOBJECT(this)));
+    config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), this));
 
     offers = TDETrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'Ada'");
 
diff --git a/buildtools/ada/adaprojectoptionsdlg.h b/buildtools/ada/adaprojectoptionsdlg.h
index 569f06c9..655b2310 100644
--- a/buildtools/ada/adaprojectoptionsdlg.h
+++ b/buildtools/ada/adaprojectoptionsdlg.h
@@ -18,7 +18,7 @@ class KDevCompilerOptions;
 
 class AdaProjectOptionsDlg : public AdaProjectOptionsDlgBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
 public: