3 files changed, 13 insertions, 11 deletions
diff --git a/tderesources/scalix/tdeioslave/CMakeLists.txt b/tderesources/scalix/tdeioslave/CMakeLists.txt
index d1ae3844..717e5cb1 100644
--- a/tderesources/scalix/tdeioslave/CMakeLists.txt
+++ b/tderesources/scalix/tdeioslave/CMakeLists.txt
@@ -23,9 +23,11 @@ link_directories(
 
 ##### other data ################################
 
-install(
-  FILES scalix.protocol scalixs.protocol
-  DESTINATION ${SERVICES_INSTALL_DIR} )
+tde_create_translated_desktop(
+  SOURCE scalix.protocol scalixs.protocol
+  DESTINATION ${SERVICES_INSTALL_DIR}
+  PO_DIR tderesources-desktops
+)
 
 
 ##### tdeio_scalix (module) #######################
diff --git a/tderesources/scalix/tdeioslave/scalix.cpp b/tderesources/scalix/tdeioslave/scalix.cpp
index 5ce8dca1..8dbb8651 100644
--- a/tderesources/scalix/tdeioslave/scalix.cpp
+++ b/tderesources/scalix/tdeioslave/scalix.cpp
@@ -28,7 +28,7 @@
 #include <tdeio/global.h>
 #include <tdelocale.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include <stdlib.h>
 
@@ -116,10 +116,10 @@ void Scalix::retrieveFreeBusy( const KURL &url )
   mFreeBusyData = TQString();
 
   TDEIO::SimpleJob *job = TDEIO::special( imapUrl, packedArgs, false );
-  connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
-           this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) );
-  connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
-           this, TQT_SLOT( slotRetrieveResult( TDEIO::Job* ) ) );
+  connect( job, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
+           this, TQ_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) );
+  connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+           this, TQ_SLOT( slotRetrieveResult( TDEIO::Job* ) ) );
 
   tqApp->eventLoop()->enterLoop();
 }
@@ -182,8 +182,8 @@ void Scalix::publishFreeBusy( const KURL &url )
                                                 .arg( url.host() );
 
   TDEIO::SimpleJob *job = TDEIO::special( imapUrl, packedArgs, false );
-  connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
-           this, TQT_SLOT( slotPublishResult( TDEIO::Job* ) ) );
+  connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+           this, TQ_SLOT( slotPublishResult( TDEIO::Job* ) ) );
 
   tqApp->eventLoop()->enterLoop();
 }
diff --git a/tderesources/scalix/tdeioslave/scalix.h b/tderesources/scalix/tdeioslave/scalix.h
index f4dbdead..78a71447 100644
--- a/tderesources/scalix/tdeioslave/scalix.h
+++ b/tderesources/scalix/tdeioslave/scalix.h
@@ -28,7 +28,7 @@
 
 class Scalix : public TQObject, public TDEIO::SlaveBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public: