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

6 files changed, 20 insertions, 20 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index d979bc5..54a6443 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
@@ -3489,7 +3489,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/po/lt/filelight.po b/po/lt/filelight.po
index 2475bdb..abda7f2 100644
--- a/po/lt/filelight.po
+++ b/po/lt/filelight.po
@@ -62,7 +62,7 @@ msgstr ""
 "&Įdėti...\n"
 "#-#-#-#-#  tdelibs.po (tdelibs)  #-#-#-#-#\n"
 "&Pridėti...\n"
-"#-#-#-#-#  kpartsaver.po (kpartsaver)  #-#-#-#-#\n"
+"#-#-#-#-#  tdepartsaver.po (tdepartsaver)  #-#-#-#-#\n"
 "&Įdėti...\n"
 "#-#-#-#-#  kuser.po (kuser)  #-#-#-#-#\n"
 "&Pridėti...\n"
diff --git a/src/app/Makefile.am b/src/app/Makefile.am
index 5476a43..5e0465c 100644
--- a/src/app/Makefile.am
+++ b/src/app/Makefile.am
@@ -5,4 +5,4 @@ METASOURCES = AUTO
 bin_PROGRAMS = filelight
 filelight_SOURCES = historyAction.cpp mainWindow.cpp main.cpp
 filelight_LDADD = $(LIB_KPARTS) $(LIB_TDEUI)
-filelight_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+filelight_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
diff --git a/src/app/mainWindow.h b/src/app/mainWindow.h
index 68314aa..8562aa8 100644
--- a/src/app/mainWindow.h
+++ b/src/app/mainWindow.h
@@ -18,7 +18,7 @@
 #ifndef FILELIGHT_H
 #define FILELIGHT_H
 
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
 
 class KSqueezedTextLabel;
 class KHistoryCombo;
diff --git a/src/part/part.cpp b/src/part/part.cpp
index b519044..609da9a 100644
--- a/src/part/part.cpp
+++ b/src/part/part.cpp
@@ -17,7 +17,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>  //::start()
 //#include <konq_operations.h>
-#include <kparts/genericfactory.h>
+#include <tdeparts/genericfactory.h>
 #include <kstatusbar.h>
 #include <kstdaction.h>
 #include <tqfile.h>        //encodeName()
diff --git a/src/part/part.h b/src/part/part.h
index 809b133..2555ea7 100644
--- a/src/part/part.h
+++ b/src/part/part.h
@@ -4,9 +4,9 @@
 #ifndef FILELIGHTPART_H
 #define FILELIGHTPART_H
 
-#include <kparts/browserextension.h>
-#include <kparts/statusbarextension.h>
-#include <kparts/part.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/statusbarextension.h>
+#include <tdeparts/part.h>
 #include <kurl.h>
 
 class TDEAboutData;