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

---
 acinclude.m4              | 8 ++++----
 src/src/configure.cpp     | 2 +-
 src/src/interface.cpp     | 2 +-
 src/src/knetstats.cpp     | 2 +-
 src/src/knetstatsview.cpp | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 569eecd..0ea8007 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/src/src/configure.cpp b/src/src/configure.cpp
index 25a7842..948c109 100644
--- a/src/src/configure.cpp
+++ b/src/src/configure.cpp
@@ -32,7 +32,7 @@
 #include <kapplication.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kfontrequester.h>
 #include <knuminput.h>
 #include <kcolorbutton.h>
diff --git a/src/src/interface.cpp b/src/src/interface.cpp
index 5a19876..4a8501b 100644
--- a/src/src/interface.cpp
+++ b/src/src/interface.cpp
@@ -12,7 +12,7 @@
 #include "interface.h"
 #include <kapplication.h>
 #include <kapp.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 Interface::Interface(KNetStats* parent, const TQString& name) : mName(name), mView(0), mParent(parent) {
 	update();
diff --git a/src/src/knetstats.cpp b/src/src/knetstats.cpp
index 0452bf4..7f101f9 100644
--- a/src/src/knetstats.cpp
+++ b/src/src/knetstats.cpp
@@ -28,7 +28,7 @@
 #include <tqdir.h>
 #include <tqtimer.h>
 // KDE includes
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
diff --git a/src/src/knetstatsview.cpp b/src/src/knetstatsview.cpp
index eb9d276..c1257e3 100644
--- a/src/src/knetstatsview.cpp
+++ b/src/src/knetstatsview.cpp
@@ -26,7 +26,7 @@
 #include <kpopupmenu.h>
 #include <kmessagebox.h>
 #include <kaboutapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>