1 files changed, 15 insertions, 15 deletions
diff --git a/tderesources/groupwise/tdeioslave/groupwise.cpp b/tderesources/groupwise/tdeioslave/groupwise.cpp
index 56021e68..47fbb452 100644
--- a/tderesources/groupwise/tdeioslave/groupwise.cpp
+++ b/tderesources/groupwise/tdeioslave/groupwise.cpp
@@ -33,7 +33,7 @@
 #include <tdeabc/addressee.h>
 #include <tdeabc/vcardconverter.h>
 
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdeio/global.h>
 #include <kdebug.h>
 #include <tdelocale.h>
@@ -44,7 +44,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 
-#include <tdepimmacros.h>
+#include <tdemacros.h>
 
 #include "groupwise.h"
 
@@ -64,7 +64,7 @@ class ResourceMemory : public ResourceCached
 }
 
 extern "C" {
-KDE_EXPORT int kdemain( int argc, char **argv );
+TDE_EXPORT int kdemain( int argc, char **argv );
 }
 
 int kdemain( int argc, char **argv )
@@ -295,14 +295,14 @@ void Groupwise::getAddressbook( const KURL &url )
 
     GroupwiseServer server( u, user, pass, 0 );
 
-    connect( &server, TQT_SIGNAL( readAddressBookTotalSize( int ) ),
-      TQT_SLOT( slotReadAddressBookTotalSize( int ) ) );
-    connect( &server, TQT_SIGNAL( readAddressBookProcessedSize( int ) ),
-      TQT_SLOT( slotReadAddressBookProcessedSize( int ) ) );
-    connect( &server, TQT_SIGNAL( errorMessage( const TQString &, bool ) ),
-      TQT_SLOT( slotServerErrorMessage( const TQString &, bool ) ) );
-    connect( &server, TQT_SIGNAL( gotAddressees( const TDEABC::Addressee::List ) ),
-      TQT_SLOT( slotReadReceiveAddressees( const TDEABC::Addressee::List ) ) );
+    connect( &server, TQ_SIGNAL( readAddressBookTotalSize( int ) ),
+      TQ_SLOT( slotReadAddressBookTotalSize( int ) ) );
+    connect( &server, TQ_SIGNAL( readAddressBookProcessedSize( int ) ),
+      TQ_SLOT( slotReadAddressBookProcessedSize( int ) ) );
+    connect( &server, TQ_SIGNAL( errorMessage( const TQString &, bool ) ),
+      TQ_SLOT( slotServerErrorMessage( const TQString &, bool ) ) );
+    connect( &server, TQ_SIGNAL( gotAddressees( const TDEABC::Addressee::List ) ),
+      TQ_SLOT( slotReadReceiveAddressees( const TDEABC::Addressee::List ) ) );
 
     kdDebug() << "Login" << endl;
     if ( !server.login() ) {
@@ -369,10 +369,10 @@ void Groupwise::updateAddressbook( const KURL &url )
     debugMessage( "update IDs: " + ids.join( "," ) );
 
     GroupwiseServer server( u, user, pass, 0 );
-    connect( &server, TQT_SIGNAL( errorMessage( const TQString &, bool ) ),
-      TQT_SLOT( slotServerErrorMessage( const TQString &, bool ) ) );
-    connect( &server, TQT_SIGNAL( gotAddressees( const TDEABC::Addressee::List ) ),
-      TQT_SLOT( slotReadReceiveAddressees( const TDEABC::Addressee::List ) ) );
+    connect( &server, TQ_SIGNAL( errorMessage( const TQString &, bool ) ),
+      TQ_SLOT( slotServerErrorMessage( const TQString &, bool ) ) );
+    connect( &server, TQ_SIGNAL( gotAddressees( const TDEABC::Addressee::List ) ),
+      TQ_SLOT( slotReadReceiveAddressees( const TDEABC::Addressee::List ) ) );
 
     kdDebug() << "  Login" << endl;
     if ( !server.login() ) {