6 files changed, 16 insertions, 13 deletions
diff --git a/interfaces/tdemediaplayer/CMakeLists.txt b/interfaces/tdemediaplayer/CMakeLists.txt
index 0c9355560..549a9a794 100644
--- a/interfaces/tdemediaplayer/CMakeLists.txt
+++ b/interfaces/tdemediaplayer/CMakeLists.txt
@@ -38,9 +38,13 @@ install( FILES
 
 ##### other data ################################
 
-install( FILES
-    tdemediaplayerengine.desktop tdemediaplayer.desktop
-  DESTINATION ${SERVICETYPES_INSTALL_DIR} )
+tde_create_translated_desktop(
+  SOURCE
+    tdemediaplayerengine.desktop
+    tdemediaplayer.desktop
+  DESTINATION ${SERVICETYPES_INSTALL_DIR}
+  PO_DIR interfaces-desktops
+)
 
 
 ##### tdemediaplayer ##############################
@@ -56,5 +60,4 @@ tde_add_library( ${target} SHARED AUTOMOC
   VERSION 0.0.0
   LINK tdeparts-shared
   DESTINATION ${LIB_INSTALL_DIR}
-  DEPENDENCIES dcopidl
 )
diff --git a/interfaces/tdemediaplayer/player.h b/interfaces/tdemediaplayer/player.h
index 05582ca07..927144e5c 100644
--- a/interfaces/tdemediaplayer/player.h
+++ b/interfaces/tdemediaplayer/player.h
@@ -43,9 +43,9 @@ namespace KMediaPlayer
  * the user interface facets, for those who wish to provide their own
  * interface.
  */
-class KDE_EXPORT Player : public KParts::ReadOnlyPart, public PlayerDCOPObject
+class TDE_EXPORT Player : public KParts::ReadOnlyPart, public PlayerDCOPObject
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
 	/** This constructor is what to use when no GUI is required, as in the
diff --git a/interfaces/tdemediaplayer/playerdcopobject.h b/interfaces/tdemediaplayer/playerdcopobject.h
index 73a1cfa1d..4c2511e4a 100644
--- a/interfaces/tdemediaplayer/playerdcopobject.h
+++ b/interfaces/tdemediaplayer/playerdcopobject.h
@@ -30,7 +30,7 @@
 namespace KMediaPlayer
 {
 
-class KDE_EXPORT PlayerDCOPObject : public DCOPObject
+class TDE_EXPORT PlayerDCOPObject : public DCOPObject
 {
 K_DCOP
 
diff --git a/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp
index 370805a74..be0f92111 100644
--- a/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp
+++ b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp
@@ -25,7 +25,7 @@ protected:
     {
         Q_UNUSED(className);
         Q_UNUSED(args);
-        return TQT_TQOBJECT(new KFileAudioPreview( dynamic_cast<TQWidget*>( parent ), name ));
+        return new KFileAudioPreview( dynamic_cast<TQWidget*>( parent ), name );
     }
 };
 
@@ -41,7 +41,7 @@ class KFileAudioPreview::KFileAudioPreviewPrivate
 public:
     KFileAudioPreviewPrivate( TQWidget *parent )
     {
-        player = KParts::ComponentFactory::createInstanceFromQuery<KMediaPlayer::Player>( "KMediaPlayer/Player", TQString(), TQT_TQOBJECT(parent) );
+        player = KParts::ComponentFactory::createInstanceFromQuery<KMediaPlayer::Player>( "KMediaPlayer/Player", TQString(), parent );
     }
 
     ~KFileAudioPreviewPrivate()
@@ -93,7 +93,7 @@ KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name )
     m_autoPlay = new TQCheckBox( i18n("Play &automatically"), box );
     TDEConfigGroup config( TDEGlobal::config(), ConfigGroup );
     m_autoPlay->setChecked( config.readBoolEntry( "Autoplay sounds", true ) );
-    connect( m_autoPlay, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleAuto(bool)) );
+    connect( m_autoPlay, TQ_SIGNAL(toggled(bool)), TQ_SLOT(toggleAuto(bool)) );
 }
 
 KFileAudioPreview::~KFileAudioPreview()
diff --git a/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h
index 6eae52cf7..f67533df2 100644
--- a/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h
+++ b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h
@@ -36,7 +36,7 @@ class KFileItem;
  */
 class KFileAudioPreview : public KPreviewWidgetBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KFileAudioPreview(TQWidget *parent = 0, const char *name = 0 );
diff --git a/interfaces/tdemediaplayer/view.h b/interfaces/tdemediaplayer/view.h
index c1d9dbe41..fce17f819 100644
--- a/interfaces/tdemediaplayer/view.h
+++ b/interfaces/tdemediaplayer/view.h
@@ -31,9 +31,9 @@ namespace KMediaPlayer
 {
 
 /** View is part of the user interface of a Player. */
-class KDE_EXPORT View : public TQWidget
+class TDE_EXPORT View : public TQWidget
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
 	/** Your typical TQWidget constructor. */