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

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

diff --git a/acinclude.m4 b/acinclude.m4
index 354bd9f..f8bfbf2 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -597,7 +597,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$trinity2ornewer"; 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 "$trinity3ornewer"; then
@@ -1789,7 +1789,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libtdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2089,7 +2089,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")
@@ -2099,7 +2099,7 @@ else
    AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
 fi
 ])
diff --git a/src/tdmtheme.cpp b/src/tdmtheme.cpp
index e7d4e33..78091af 100644
--- a/src/tdmtheme.cpp
+++ b/src/tdmtheme.cpp
@@ -22,8 +22,8 @@
 
 #include <kdialog.h>
 #include <kglobal.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kprogress.h>
diff --git a/src/tdmtheme.desktop b/src/tdmtheme.desktop
index 05e7ede..cbc88cf 100644
--- a/src/tdmtheme.desktop
+++ b/src/tdmtheme.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Exec=kcmshell tdmtheme
+Exec=tdecmshell tdmtheme
 Icon=tdmconfig
 Type=Application
 
diff --git a/src/tdmtheme.h b/src/tdmtheme.h
index 73c958d..6bfdeb8 100644
--- a/src/tdmtheme.h
+++ b/src/tdmtheme.h
@@ -21,7 +21,7 @@
 #ifndef _TDMTHEME_H_
 #define _TDMTHEME_H_
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdecmodule.h>
 
 #include <tqwidget.h>