summaryrefslogtreecommitdiffstats
path: root/renamedlgplugins
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:15:08 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:15:08 -0600
commit39177c1528006932b00136d34cf022434df73d72 (patch)
treea0791bebede3e7eb454ac2268a14c4e8a157de6d /renamedlgplugins
parent2a74bca8c834c4d4f391c70de8fdfa12a7cc972c (diff)
downloadtdeaddons-39177c1528006932b00136d34cf022434df73d72.tar.gz
tdeaddons-39177c1528006932b00136d34cf022434df73d72.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'renamedlgplugins')
-rw-r--r--renamedlgplugins/audio/Makefile.am2
-rw-r--r--renamedlgplugins/audio/audiopreview.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/renamedlgplugins/audio/Makefile.am b/renamedlgplugins/audio/Makefile.am
index d9a228f..db559ae 100644
--- a/renamedlgplugins/audio/Makefile.am
+++ b/renamedlgplugins/audio/Makefile.am
@@ -6,7 +6,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = librenaudioplugin.la
librenaudioplugin_la_SOURCES = audiopreview.cpp audio_plugin.cpp
-librenaudioplugin_la_LIBADD = $(LIB_KIO) -lkmediaplayer
+librenaudioplugin_la_LIBADD = $(LIB_KIO) -ltdemediaplayer
librenaudioplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
pluginsdir = $(kde_servicesdir)
diff --git a/renamedlgplugins/audio/audiopreview.cpp b/renamedlgplugins/audio/audiopreview.cpp
index d1e1174..8c8cc49 100644
--- a/renamedlgplugins/audio/audiopreview.cpp
+++ b/renamedlgplugins/audio/audiopreview.cpp
@@ -27,8 +27,8 @@
#include <kio/netaccess.h>
#include <kurllabel.h>
#include <kmimetype.h>
-#include <kmediaplayer/player.h>
-#include <kparts/componentfactory.h>
+#include <tdemediaplayer/player.h>
+#include <tdeparts/componentfactory.h>
#include <ksqueezedtextlabel.h>
#include "audiopreview.h"