From 49ac048d889d9b6f48e4e9599e26a60d021342ea Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 6 Nov 2011 21:32:56 -0600
Subject: [PATCH] Rename additional instances of KDE to TDE

---
 acinclude.m4           | 24 ++++++++++++------------
 fileplugin/Makefile.am |  2 +-
 kbarcode/Makefile.am   |  6 +++---
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 1ae2d76..425fe87 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2068,8 +2068,8 @@ if test $kde_qtver = 3; then
                *) lib_kded="" ;;
        esac
    AC_SUBST(LIB_KDED, $lib_kded)
-   AC_SUBST(LIB_KDECORE, "-ltdecore")
-   AC_SUBST(LIB_KDEUI, "-ltdeui")
+   AC_SUBST(LIB_TDECORE, "-ltdecore")
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KJS, "-lkjs")
    AC_SUBST(LIB_SMB, "-lsmb")
@@ -2078,9 +2078,9 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_KHTML, "-lkhtml")
    AC_SUBST(LIB_KSPELL, "-lkspell")
    AC_SUBST(LIB_KPARTS, "-lkparts")
-   AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
    AC_SUBST(LIB_KUTILS, "-lkutils")
-   AC_SUBST(LIB_KDEPIM, "-ltdepim")
+   AC_SUBST(LIB_TDEPIM, "-ltdepim")
    AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
    AC_SUBST(LIB_KDNSSD, "-lkdnssd")
@@ -2089,8 +2089,8 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
 elif test $kde_qtver = 2; then
-   AC_SUBST(LIB_KDECORE, "-ltdecore")
-   AC_SUBST(LIB_KDEUI, "-ltdeui")
+   AC_SUBST(LIB_TDECORE, "-ltdecore")
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-lksycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
@@ -2099,13 +2099,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KHTML, "-lkhtml")
    AC_SUBST(LIB_KSPELL, "-lkspell")
    AC_SUBST(LIB_KPARTS, "-lkparts")
-   AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
 else
-   AC_SUBST(LIB_KDECORE, "-ltdecore -lXext $(LIB_QT)")
-   AC_SUBST(LIB_KDEUI, "-ltdeui $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
-   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
+   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_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
 fi
 ])
 
diff --git a/fileplugin/Makefile.am b/fileplugin/Makefile.am
index b543a67..da17f8d 100644
--- a/fileplugin/Makefile.am
+++ b/fileplugin/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kfile_kbarcode.la
 
 kfile_kbarcode_la_SOURCES = kfile_kbarcode.cpp
 kfile_kbarcode_la_LDFLAGS = -module $(KDE_PLUGIN) $(LIB_QT) $(all_libraries)
-kfile_kbarcode_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KDECORE)
+kfile_kbarcode_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDECORE)
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
diff --git a/kbarcode/Makefile.am b/kbarcode/Makefile.am
index 0d3ac5a..c883928 100644
--- a/kbarcode/Makefile.am
+++ b/kbarcode/Makefile.am
@@ -19,9 +19,9 @@ bin_PROGRAMS = kbarcode
 
 # the application source, library search path, and link libraries
 
-kbarcode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-kbarcode_LDADD = $(LIB_KABC) $(LIB_KSPELL) $(LIB_KDEPRINT) \
-	$(LIB_KDEUI) -lkjs -lpcre
+kbarcode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kbarcode_LDADD = $(LIB_KABC) $(LIB_KSPELL) $(LIB_TDEPRINT) \
+	$(LIB_TDEUI) -lkjs -lpcre
 
 noinst_HEADERS = barcodecombo.h barcodedialog.h barcodedialogs.h \
 	commands.h configdialog.h confwizard.h csvimportdlg.h databasebrowser.h \