From c2aef3206f9e6732f7cd53f0e7d70a9661c3ede6 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 00:52:37 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 acinclude.m4          | 8 ++++----
 src/autostart.cpp     | 2 +-
 src/autostart.desktop | 2 +-
 src/autostart.h       | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index d540d21..402260f 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/src/autostart.cpp b/src/autostart.cpp
index b31832c..43aa25f 100644
--- a/src/autostart.cpp
+++ b/src/autostart.cpp
@@ -32,7 +32,7 @@
 #include <klistview.h>
 #include <kopenwith.h>
 #include <kpropertiesdialog.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <tqdir.h>
 #include <tqheader.h>
 
diff --git a/src/autostart.desktop b/src/autostart.desktop
index 4021978..4249bca 100644
--- a/src/autostart.desktop
+++ b/src/autostart.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Exec=kcmshell autostart
+Exec=tdecmshell autostart
 Icon=launch
 Type=Application
 
diff --git a/src/autostart.h b/src/autostart.h
index 9988243..e7a55fb 100644
--- a/src/autostart.h
+++ b/src/autostart.h
@@ -28,7 +28,7 @@
 #include <kaboutdata.h>
 #include <kpushbutton.h>
 #include <klistview.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kglobalsettings.h>
 #include <tqpushbutton.h>
 #include <tqcombobox.h>
-- 
cgit v1.2.3