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

10 files changed, 25 insertions, 25 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index c10ae93..891bebd 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_TDEPIM, "-ltdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_TDECORE, "-ltdecore")
    AC_SUBST(LIB_TDEUI, "-ltdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
 else
    AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3447,7 +3447,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
diff --git a/configure.in b/configure.in
index 2ce1597..5b23570 100644
--- a/configure.in
+++ b/configure.in
@@ -213,7 +213,7 @@ AC_CONFIG_FILES([ doc/Makefile ])
 AC_CONFIG_FILES([ doc/en/Makefile ])
 AC_CONFIG_FILES([ po/Makefile ])
 AC_CONFIG_FILES([ src/Makefile ])
-AC_CONFIG_FILES([ src/amarokscript/Makefile ])
+AC_CONFIG_FILES([ src/amarotdescript/Makefile ])
 AC_CONFIG_FILES([ src/metadata/Makefile ])
 AC_CONFIG_FILES([ src/metadata/aac/Makefile ])
 AC_CONFIG_FILES([ src/metadata/ape/Makefile ])
diff --git a/src/Makefile.am b/src/Makefile.am
index 61820f7..afbee85 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,7 +36,7 @@ soundkonverter_SOURCES = cddb.cpp cdmanager.cpp cdopener.cpp combobutton.cpp \
 	optionseditor.cpp optionsrequester.cpp optionssimple.cpp outputdirectory.cpp paranoia.cpp \
 	progressindicator.cpp replaygain.cpp replaygainfilelist.cpp replaygainscanner.cpp \
 	soundkonverter.cpp soundkonverterapp.cpp
-soundkonverter_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+soundkonverter_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 soundkonverter_LDADD = $(LIB_TDEUI) $(LIB_KFILE) metadata/libmetadata.la \
 	pluginloader/libpluginloader.la -lcdda_interface -lcdda_paranoia
 
@@ -46,13 +46,13 @@ xdg_apps_DATA = soundkonverter.desktop
 shellrcdir = $(kde_datadir)/soundkonverter
 shellrc_DATA = soundkonverterui.rc
 
-SUBDIRS = amarokscript metadata pics pluginloader plugins
+SUBDIRS = amarotdescript metadata pics pluginloader plugins
 soundkonverter_DEPENDENCIES = metadata/libmetadata.la \
 	pluginloader/libpluginloader.la
-amarokscriptsdir = $(kde_datadir)/amarok/scripts
+amarotdescriptsdir = $(kde_datadir)/amarok/scripts
 servicemenusdir = $(kde_datadir)/konqueror/servicemenus
 servicemenus_DATA = audiocd_extract_with_soundkonverter.desktop
-amarokscriptdir = $(kde_datadir)/soundkonverter/amarokscript
+amarotdescriptdir = $(kde_datadir)/soundkonverter/amarotdescript
 bin_SCRIPTS = userscript.sh
 userscriptdir = $(kde_datadir)/soundkonverter
 userscript_SCRIPTS = userscript.sh
diff --git a/src/amarokscript/Makefile.am b/src/amarokscript/Makefile.am
deleted file mode 100755
index b8049a7..0000000
--- a/src/amarokscript/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-amarokscriptdir = $(kde_datadir)/soundkonverter/amarokscript
-amarokscript_DATA = README \
-                    soundKonverter.rb
diff --git a/src/amarotdescript/Makefile.am b/src/amarotdescript/Makefile.am
new file mode 100755
index 0000000..7797a6e
--- /dev/null
+++ b/src/amarotdescript/Makefile.am
@@ -0,0 +1,3 @@
+amarotdescriptdir = $(kde_datadir)/soundkonverter/amarotdescript
+amarotdescript_DATA = README \
+                    soundKonverter.rb
diff --git a/src/amarokscript/README b/src/amarotdescript/README
index 1186231..1186231 100644
--- a/src/amarokscript/README
+++ b/src/amarotdescript/README
diff --git a/src/amarokscript/soundKonverter.rb b/src/amarotdescript/soundKonverter.rb
index 144c0c8..144c0c8 100755
--- a/src/amarokscript/soundKonverter.rb
+++ b/src/amarotdescript/soundKonverter.rb
diff --git a/src/config.cpp b/src/config.cpp
index 4ec463b..bc635b8 100755
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -640,10 +640,10 @@ void Config::writeAmarokScript()
 
     KStandardDirs* stdDirs = new KStandardDirs();
     if( !TQFile::exists(locateLocal("data","amarok/scripts/soundKonverter/soundKonverter.rb")) ) {
-        TDEIO::NetAccess::file_copy( stdDirs->findResource("data","soundkonverter/amarokscript/soundKonverter.rb"), locateLocal("data","amarok/scripts/soundKonverter/soundKonverter.rb"), 0755, true );
+        TDEIO::NetAccess::file_copy( stdDirs->findResource("data","soundkonverter/amarotdescript/soundKonverter.rb"), locateLocal("data","amarok/scripts/soundKonverter/soundKonverter.rb"), 0755, true );
     }
     if( !TQFile::exists(locateLocal("data","amarok/scripts/soundKonverter/README")) ) {
-        TDEIO::NetAccess::file_copy( stdDirs->findResource("data","soundkonverter/amarokscript/README"), locateLocal("data","amarok/scripts/soundKonverter/README"), -1, true );
+        TDEIO::NetAccess::file_copy( stdDirs->findResource("data","soundkonverter/amarotdescript/README"), locateLocal("data","amarok/scripts/soundKonverter/README"), -1, true );
     }
     delete stdDirs;
 }
diff --git a/src/cuesheeteditor.cpp b/src/cuesheeteditor.cpp
index 812e916..bb07fa6 100755
--- a/src/cuesheeteditor.cpp
+++ b/src/cuesheeteditor.cpp
@@ -10,7 +10,7 @@
 #include <kmessagebox.h>
 //#include <ktextedit.h>
 
-/*#include <kparts/factory.h> // KPart Factory
+/*#include <tdeparts/factory.h> // KPart Factory
 #include <klibloader.h>     // LibLoader, contains factories
 #include <kate/document.h>  // Katepart document
 #include <kate/view.h>      // Katepart view
diff --git a/src/paranoia.cpp b/src/paranoia.cpp
index fba3d83..6031e84 100755
--- a/src/paranoia.cpp
+++ b/src/paranoia.cpp
@@ -36,7 +36,7 @@
 #include <kpushbutton.h>
 #include <kiconloader.h>
 #include <kfiledialog.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 
 
 #include "paranoia.h"