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

6 files changed, 28 insertions, 28 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index f1f50d2..e54961d 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2033,13 +2033,13 @@ 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")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2047,13 +2047,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)")
@@ -2495,7 +2495,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
diff --git a/aclocal.m4 b/aclocal.m4
index 0b3b20b..6e8c0a5 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -2045,13 +2045,13 @@ 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")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2059,13 +2059,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)")
@@ -2507,7 +2507,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
diff --git a/kiosktool/Makefile.am b/kiosktool/Makefile.am
index 3a19511..8b1eb30 100644
--- a/kiosktool/Makefile.am
+++ b/kiosktool/Makefile.am
@@ -12,7 +12,7 @@ bin_PROGRAMS = kiosktool kiosktool-tdedirs
 INCLUDES         = $(all_includes)
 
 # the library search path. 
-kiosktool_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kiosktool_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 # the libraries to link against.
 kiosktool_LDADD   = $(LIB_KFILE) -ltdeprint
@@ -32,7 +32,7 @@ kiosktool_SOURCES =	main.cpp kioskgui.cpp kioskdata.cpp kioskrun.cpp \
 	kiosksync.cpp
 
 # the library search path. 
-kiosktool_tdedirs_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kiosktool_tdedirs_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 # the libraries to link against.
 kiosktool_tdedirs_LDADD   = $(LIB_TDECORE)
diff --git a/kiosktool/kiosk_data.xml b/kiosktool/kiosk_data.xml
index 89522f0..cb4b141 100644
--- a/kiosktool/kiosk_data.xml
+++ b/kiosktool/kiosk_data.xml
@@ -177,7 +177,7 @@
        </action>
     </actions>
   </group>
-  <group name="screensaver" icon="kscreensaver">
+  <group name="screensaver" icon="tdescreensaver">
     <caption>Screen Saver</caption>
     <description>
       Set up Screen Saver
diff --git a/kiosktool/kioskrun.cpp b/kiosktool/kioskrun.cpp
index 2930bf4..543bc91 100644
--- a/kiosktool/kioskrun.cpp
+++ b/kiosktool/kioskrun.cpp
@@ -192,7 +192,7 @@ void
 KioskRun::updateSycoca()
 {
    // Force update
-   TQString sycocaUpdateFile = KioskRun::self()->locateLocal("services", "update_ksycoca");
+   TQString sycocaUpdateFile = KioskRun::self()->locateLocal("services", "update_tdesycoca");
    TQFile file(sycocaUpdateFile);
    file.remove();
    file.open(IO_WriteOnly);
@@ -1589,10 +1589,10 @@ KioskRun::setUserProfileMappings( const ProfileMapping &groups, const ProfileMap
 void
 KioskRun::forceSycocaUpdate()
 {
-   // Touch $TDEDIR/share/services/update_ksycoca
+   // Touch $TDEDIR/share/services/update_tdesycoca
    KTempFile tempFile;
    tempFile.close();
-   TQString sycocaUpdateFile = locateSave("services", "update_ksycoca");
+   TQString sycocaUpdateFile = locateSave("services", "update_tdesycoca");
    remove(sycocaUpdateFile);
    install(tempFile.name(), sycocaUpdateFile);
 }
diff --git a/po/lt/kiosktool.po b/po/lt/kiosktool.po
index 9072277..622c5c1 100644
--- a/po/lt/kiosktool.po
+++ b/po/lt/kiosktool.po
@@ -142,7 +142,7 @@ msgstr ""
 "Ričardas Čepas, Donatas Glodenis\n"
 "#-#-#-#-#  kio_audiocd.po (kio_audiocd)  #-#-#-#-#\n"
 "Donatas Glodenis\n"
-"#-#-#-#-#  kmid.po (kmid)  #-#-#-#-#\n"
+"#-#-#-#-#  tdemid.po (tdemid)  #-#-#-#-#\n"
 "Eugenijus Paulauskas\n"
 "#-#-#-#-#  kmix.po (kmix)  #-#-#-#-#\n"
 "Nerijus Kislauskas\n"
@@ -359,7 +359,7 @@ msgstr ""
 "[email protected], [email protected]\n"
 "#-#-#-#-#  kio_audiocd.po (kio_audiocd)  #-#-#-#-#\n"
 "[email protected]\n"
-"#-#-#-#-#  kmid.po (kmid)  #-#-#-#-#\n"
+"#-#-#-#-#  tdemid.po (tdemid)  #-#-#-#-#\n"
 "[email protected]\n"
 "#-#-#-#-#  kmix.po (kmix)  #-#-#-#-#\n"
 "[email protected]\n"