3 files changed, 10 insertions, 10 deletions
diff --git a/tdeioslave/cgi/cgi.cpp b/tdeioslave/cgi/cgi.cpp
index 4f54d6668..c1e4ced35 100644
--- a/tdeioslave/cgi/cgi.cpp
+++ b/tdeioslave/cgi/cgi.cpp
@@ -23,9 +23,9 @@
 #include <tqregexp.h>
 
 #include <kdebug.h>
-#include <kprocess.h>
-#include <kstandarddirs.h>
-#include <kinstance.h>
+#include <tdeprocess.h>
+#include <tdestandarddirs.h>
+#include <tdeinstance.h>
 #include <tdelocale.h>
 #include <tdeconfig.h>
 
@@ -250,7 +250,7 @@ void CgiProtocol::get( const KURL& url )
   kdDebug(7124) << "CgiProtocol::get - done" << endl;
 }
 
-extern "C" { int KDE_EXPORT kdemain( int argc, char **argv ); }
+extern "C" { int TDE_EXPORT kdemain( int argc, char **argv ); }
 
 /*! The kdemain function generates an instance of the ioslave and starts its
  * dispatch loop. */
diff --git a/tdeioslave/cgi/kcmcgi/kcmcgi.cpp b/tdeioslave/cgi/kcmcgi/kcmcgi.cpp
index a4297969e..95da88415 100644
--- a/tdeioslave/cgi/kcmcgi/kcmcgi.cpp
+++ b/tdeioslave/cgi/kcmcgi/kcmcgi.cpp
@@ -33,7 +33,7 @@
 
 extern "C"
 {
-  KDE_EXPORT TDECModule *create_cgi( TQWidget *parent, const char * )
+  TDE_EXPORT TDECModule *create_cgi( TQWidget *parent, const char * )
   {
     TDEGlobal::locale()->insertCatalogue("kcmcgi");
     return new KCMCgi( parent, "kcmcgi" );
@@ -48,7 +48,7 @@ KCMCgi::KCMCgi(TQWidget *parent, const char *name)
 
   TQVBoxLayout *topLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 
-  TQGroupBox *topBox = new TQGroupBox( 1, Qt::Horizontal, i18n("Paths to Local CGI Programs"), this );
+  TQGroupBox *topBox = new TQGroupBox( 1, TQt::Horizontal, i18n("Paths to Local CGI Programs"), this );
   topLayout->addWidget( topBox );
 
   mListBox = new TQListBox( topBox );
@@ -57,11 +57,11 @@ KCMCgi::KCMCgi(TQWidget *parent, const char *name)
   buttonBox->setSpacing( KDialog::spacingHint() );
 
   mAddButton = new TQPushButton( i18n("Add..."), buttonBox );
-  connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addPath() ) );
+  connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addPath() ) );
 
   mRemoveButton = new TQPushButton( i18n("Remove"), buttonBox );
-  connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removePath() ) );
-  connect( mListBox, TQT_SIGNAL( clicked ( TQListBoxItem * )),this, TQT_SLOT( slotItemSelected( TQListBoxItem *)));
+  connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removePath() ) );
+  connect( mListBox, TQ_SIGNAL( clicked ( TQListBoxItem * )),this, TQ_SLOT( slotItemSelected( TQListBoxItem *)));
 
   mConfig = new TDEConfig("kcmcgirc");
 
diff --git a/tdeioslave/cgi/kcmcgi/kcmcgi.h b/tdeioslave/cgi/kcmcgi/kcmcgi.h
index ccd2f2f3d..0522fa24a 100644
--- a/tdeioslave/cgi/kcmcgi/kcmcgi.h
+++ b/tdeioslave/cgi/kcmcgi/kcmcgi.h
@@ -27,7 +27,7 @@ class TDEConfig;
 
 class KCMCgi : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     KCMCgi( TQWidget *parent = 0, const char *name = 0 );
     ~KCMCgi();