Rename a number of libraries and executables to avoid conflicts with KDE4

7 files changed, 28 insertions, 28 deletions

diff --git a/interfaces/tdemediaplayer/CMakeLists.txt b/interfaces/tdemediaplayer/CMakeLists.txt
index 00ab7f3d9..0c9355560 100644
--- a/interfaces/tdemediaplayer/CMakeLists.txt
+++ b/interfaces/tdemediaplayer/CMakeLists.txt
@@ -10,7 +10,7 @@
 #################################################
 
 if( ARTS_FOUND )
-  add_subdirectory( kfileaudiopreview )
+  add_subdirectory( tdefileaudiopreview )
 endif( ARTS_FOUND )
 
 include_directories(
diff --git a/interfaces/tdemediaplayer/Makefile.am b/interfaces/tdemediaplayer/Makefile.am
index 0b7aded07..91ed342bd 100644
--- a/interfaces/tdemediaplayer/Makefile.am
+++ b/interfaces/tdemediaplayer/Makefile.am
@@ -1,8 +1,8 @@
 if include_ARTS
-kfileaudiopreview_subdir = kfileaudiopreview
+tdefileaudiopreview_subdir = tdefileaudiopreview
 endif
 
-SUBDIRS = . $(kfileaudiopreview_subdir)
+SUBDIRS = . $(tdefileaudiopreview_subdir)
 INCLUDES = -I$(srcdir)/.. $(all_includes)
 
 lib_LTLIBRARIES = libtdemediaplayer.la
diff --git a/interfaces/tdemediaplayer/kfileaudiopreview/Makefile.am b/interfaces/tdemediaplayer/kfileaudiopreview/Makefile.am
deleted file mode 100644
index 4f88a0c87..000000000
--- a/interfaces/tdemediaplayer/kfileaudiopreview/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-INCLUDES = -I$(top_srcdir)/interfaces/ -I$(top_srcdir)/arts/kde -I$(includedir)/arts $(all_includes)
-METASOURCES = AUTO
-
-kde_module_LTLIBRARIES = kfileaudiopreview.la
-
-kfileaudiopreview_la_SOURCES = kfileaudiopreview.cpp
-kfileaudiopreview_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined
-kfileaudiopreview_la_LIBADD = $(top_builddir)/interfaces/tdemediaplayer/libtdemediaplayer.la $(top_builddir)/arts/kde/libartskde.la $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE)
-
-noinst_HEADERS = kfileaudiopreview.h
-
-messages:
-	$(XGETTEXT) $(kfileaudiopreview_la_SOURCES) -o $(podir)/kfileaudiopreview.pot
diff --git a/interfaces/tdemediaplayer/kfileaudiopreview/CMakeLists.txt b/interfaces/tdemediaplayer/tdefileaudiopreview/CMakeLists.txt
index 17485b65a..8e561e1f3 100644
--- a/interfaces/tdemediaplayer/kfileaudiopreview/CMakeLists.txt
+++ b/interfaces/tdemediaplayer/tdefileaudiopreview/CMakeLists.txt
@@ -19,9 +19,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/interfaces
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
   ${CMAKE_SOURCE_DIR}/arts/kde
 )
 
@@ -31,12 +31,12 @@ link_directories(
 )
 
 
-##### kfileaudiopreview #########################
+##### tdefileaudiopreview #########################
 
-set( target kfileaudiopreview )
+set( target tdefileaudiopreview )
 
 set( ${target}_SRCS
-  kfileaudiopreview.cpp
+  tdefileaudiopreview.cpp
 )
 
 tde_add_kpart( ${target} AUTOMOC
diff --git a/interfaces/tdemediaplayer/tdefileaudiopreview/Makefile.am b/interfaces/tdemediaplayer/tdefileaudiopreview/Makefile.am
new file mode 100644
index 000000000..d73cf545f
--- /dev/null
+++ b/interfaces/tdemediaplayer/tdefileaudiopreview/Makefile.am
@@ -0,0 +1,13 @@
+INCLUDES = -I$(top_srcdir)/interfaces/ -I$(top_srcdir)/arts/kde -I$(includedir)/arts $(all_includes)
+METASOURCES = AUTO
+
+kde_module_LTLIBRARIES = tdefileaudiopreview.la
+
+tdefileaudiopreview_la_SOURCES = tdefileaudiopreview.cpp
+tdefileaudiopreview_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined
+tdefileaudiopreview_la_LIBADD = $(top_builddir)/interfaces/tdemediaplayer/libtdemediaplayer.la $(top_builddir)/arts/kde/libartskde.la $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE)
+
+noinst_HEADERS = tdefileaudiopreview.h
+
+messages:
+	$(XGETTEXT) $(tdefileaudiopreview_la_SOURCES) -o $(podir)/tdefileaudiopreview.pot
diff --git a/interfaces/tdemediaplayer/kfileaudiopreview/kfileaudiopreview.cpp b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp
index 1d83fc590..7dd746c4f 100644
--- a/interfaces/tdemediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
+++ b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp
@@ -1,4 +1,4 @@
-#include "kfileaudiopreview.h"
+#include "tdefileaudiopreview.h"
 
 #include <tqcheckbox.h>
 #include <tqhbox.h>
@@ -6,7 +6,7 @@
 #include <tqvgroupbox.h>
 
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klibloader.h>
 #include <klocale.h>
 #include <tdemediaplayer/player.h>
@@ -15,7 +15,7 @@
 
 #include <kplayobjectfactory.h>
 
-#include <config-kfile.h>
+#include <config-tdefile.h>
 
 class KFileAudioPreviewFactory : public KLibFactory
 {
@@ -29,7 +29,7 @@ protected:
     }
 };
 
-K_EXPORT_COMPONENT_FACTORY( kfileaudiopreview, KFileAudioPreviewFactory )
+K_EXPORT_COMPONENT_FACTORY( tdefileaudiopreview, KFileAudioPreviewFactory )
 
 
 ///////////////////////////////////////////////////////////////////
@@ -56,7 +56,7 @@ public:
 KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name )
     : KPreviewWidgetBase( parent, name )
 {
-    TDEGlobal::locale()->insertCatalogue("kfileaudiopreview");    
+    TDEGlobal::locale()->insertCatalogue("tdefileaudiopreview");    
 
     TQStringList formats = KDE::PlayObjectFactory::mimeTypes();
     // ###
@@ -143,4 +143,4 @@ void KFileAudioPreview::toggleAuto( bool on )
 void KFileAudioPreview::virtual_hook( int, void* )
 {}
 
-#include "kfileaudiopreview.moc"
+#include "tdefileaudiopreview.moc"
diff --git a/interfaces/tdemediaplayer/kfileaudiopreview/kfileaudiopreview.h b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h
index de48e4712..de48e4712 100644
--- a/interfaces/tdemediaplayer/kfileaudiopreview/kfileaudiopreview.h
+++ b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h