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

---
 acinclude.m4                                            | 8 ++++----
 katapult/common/imagedisplay.cpp                        | 2 +-
 katapult/katapult/katapultconfigdlg.cpp                 | 2 +-
 katapult/katapult/katapultsettings.cpp                  | 2 +-
 katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h | 2 +-
 katapult/plugins/catalogs/documentcatalog/document.cpp  | 2 +-
 katapult/plugins/catalogs/documentcatalog/document.h    | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 28598a6..0c8cb43 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -602,7 +602,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
@@ -1779,7 +1779,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
@@ -2085,7 +2085,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")
@@ -2095,7 +2095,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/katapult/common/imagedisplay.cpp b/katapult/common/imagedisplay.cpp
index a1ba512..7ae95f7 100644
--- a/katapult/common/imagedisplay.cpp
+++ b/katapult/common/imagedisplay.cpp
@@ -26,7 +26,7 @@
 #include <twin.h>
 #include <kimageeffect.h>
 #include <kgenericfactory.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kfontcombo.h>
 #include <klocale.h>
 
diff --git a/katapult/katapult/katapultconfigdlg.cpp b/katapult/katapult/katapultconfigdlg.cpp
index 99e4c68..0cffd2c 100644
--- a/katapult/katapult/katapultconfigdlg.cpp
+++ b/katapult/katapult/katapultconfigdlg.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <kactionselector.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kcombobox.h>
 #include <klocale.h>
diff --git a/katapult/katapult/katapultsettings.cpp b/katapult/katapult/katapultsettings.cpp
index 522592c..7188c48 100644
--- a/katapult/katapult/katapultsettings.cpp
+++ b/katapult/katapult/katapultsettings.cpp
@@ -22,7 +22,7 @@
  ***************************************************************************/
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdeparts/componentfactory.h>
 #include <klocale.h>
 
diff --git a/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h b/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h
index 0e2b527..888fb57 100644
--- a/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h
+++ b/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h
@@ -22,7 +22,7 @@
 
 #include <katapultcatalog.h>
 #include <kgenericfactory.h>
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include "song.h"
 
 class TQWidget;
diff --git a/katapult/plugins/catalogs/documentcatalog/document.cpp b/katapult/plugins/catalogs/documentcatalog/document.cpp
index 3c0f703..ca89717 100644
--- a/katapult/plugins/catalogs/documentcatalog/document.cpp
+++ b/katapult/plugins/catalogs/documentcatalog/document.cpp
@@ -21,7 +21,7 @@
 #include <tqfileinfo.h>
 #include <kmimetype.h>
 #include <kiconloader.h>
-#include <kio/previewjob.h>
+#include <tdeio/previewjob.h>
 
 #include "document.h"
 
diff --git a/katapult/plugins/catalogs/documentcatalog/document.h b/katapult/plugins/catalogs/documentcatalog/document.h
index c46610f..b36661c 100644
--- a/katapult/plugins/catalogs/documentcatalog/document.h
+++ b/katapult/plugins/catalogs/documentcatalog/document.h
@@ -21,7 +21,7 @@
 #define DOCUMENT_H
 
 #include <katapultitem.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 /**
 @author Joe Ferris
-- 
cgit v1.2.3