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

---
 acinclude.m4                        | 8 ++++----
 po/lt/filelight.po                  | 4 ++--
 src/app/historyAction.cpp           | 2 +-
 src/app/mainWindow.cpp              | 2 +-
 src/part/Config.cpp                 | 8 ++++----
 src/part/Config.h                   | 2 +-
 src/part/progressBox.cpp            | 2 +-
 src/part/radialMap/widgetEvents.cpp | 2 +-
 8 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 54a6443..12458e5 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
@@ -1788,7 +1788,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
@@ -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_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/po/lt/filelight.po b/po/lt/filelight.po
index abda7f2..723e9f5 100644
--- a/po/lt/filelight.po
+++ b/po/lt/filelight.po
@@ -58,7 +58,7 @@ msgid "&Add..."
 msgstr ""
 "#-#-#-#-#  kcmbackground.po (kcmbackground)  #-#-#-#-#\n"
 "&Įdėti...\n"
-"#-#-#-#-#  knetworkconf.po (knetworkconf)  #-#-#-#-#\n"
+"#-#-#-#-#  knetwortdeconf.po (knetwortdeconf)  #-#-#-#-#\n"
 "&Įdėti...\n"
 "#-#-#-#-#  tdelibs.po (tdelibs)  #-#-#-#-#\n"
 "&Pridėti...\n"
@@ -397,7 +397,7 @@ msgstr ""
 "At&verti\n"
 "#-#-#-#-#  quanta.po (quanta)  #-#-#-#-#\n"
 "&Atverti\n"
-"#-#-#-#-#  kfilereplace.po (kfilereplace)  #-#-#-#-#\n"
+"#-#-#-#-#  tdefilereplace.po (tdefilereplace)  #-#-#-#-#\n"
 "&Atverti\n"
 "#-#-#-#-#  ksysv.po (ksysv)  #-#-#-#-#\n"
 "&Atverti\n"
diff --git a/src/app/historyAction.cpp b/src/app/historyAction.cpp
index f0864a9..4b47721 100644
--- a/src/app/historyAction.cpp
+++ b/src/app/historyAction.cpp
@@ -4,7 +4,7 @@
 #include "historyAction.h"
 
 #include <kaccel.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 
 
diff --git a/src/app/mainWindow.cpp b/src/app/mainWindow.cpp
index b7f99ec..5bd35bf 100644
--- a/src/app/mainWindow.cpp
+++ b/src/app/mainWindow.cpp
@@ -10,7 +10,7 @@
 #include <kaction.h>
 #include <kapplication.h>     //setupActions()
 #include <kcombobox.h>        //locationbar
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdirselectdialog.h> //slotScanDirectory
 #include <kedittoolbar.h>     //for editToolbar dialog
 #include <kkeydialog.h>
diff --git a/src/part/Config.cpp b/src/part/Config.cpp
index 3b4a925..9564b7e 100644
--- a/src/part/Config.cpp
+++ b/src/part/Config.cpp
@@ -1,6 +1,6 @@
 
 #include "Config.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 
@@ -18,7 +18,7 @@ TQStringList Config::skipList;
 
 
 inline TDEConfig&
-Filelight::Config::kconfig()
+Filelight::Config::tdeconfig()
 {
     TDEConfig *config = TDEGlobal::config();
     config->setGroup( "filelight_part" );
@@ -28,7 +28,7 @@ Filelight::Config::kconfig()
 void
 Filelight::Config::read()
 {
-    const TDEConfig &config = kconfig();
+    const TDEConfig &config = tdeconfig();
 
     scanAcrossMounts   = config.readBoolEntry( "scanAcrossMounts", false );
     scanRemoteMounts   = config.readBoolEntry( "scanRemoteMounts", false );
@@ -47,7 +47,7 @@ Filelight::Config::read()
 void
 Filelight::Config::write()
 {
-    TDEConfig &config = kconfig();
+    TDEConfig &config = tdeconfig();
 
     config.writeEntry( "scanAcrossMounts", scanAcrossMounts );
     config.writeEntry( "scanRemoteMounts", scanRemoteMounts );
diff --git a/src/part/Config.h b/src/part/Config.h
index 47e6cf5..88f13b6 100644
--- a/src/part/Config.h
+++ b/src/part/Config.h
@@ -13,7 +13,7 @@ namespace Filelight
 
     class Config
     {
-        static TDEConfig& kconfig();
+        static TDEConfig& tdeconfig();
 
     public:
         static void read();
diff --git a/src/part/progressBox.cpp b/src/part/progressBox.cpp
index 03c4275..cd4f789 100644
--- a/src/part/progressBox.cpp
+++ b/src/part/progressBox.cpp
@@ -3,7 +3,7 @@
 
 #include <kglobal.h>
 #include <kglobalsettings.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klocale.h>
 
 #include "scan.h"
diff --git a/src/part/radialMap/widgetEvents.cpp b/src/part/radialMap/widgetEvents.cpp
index 44214c1..c95d822 100644
--- a/src/part/radialMap/widgetEvents.cpp
+++ b/src/part/radialMap/widgetEvents.cpp
@@ -9,7 +9,7 @@
 #include <kcursor.h>     //::mouseMoveEvent()
 #include <kiconeffect.h> //::mousePressEvent()
 #include <kiconloader.h> //::mousePressEvent()
-#include <kio/job.h>     //::mousePressEvent()
+#include <tdeio/job.h>     //::mousePressEvent()
 #include <klocale.h>
 #include <kmessagebox.h> //::mousePressEvent()
 #include <kpopupmenu.h>  //::mousePressEvent()