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

---
 libkonq/favicons/Makefile.am  | 2 +-
 libkonq/favicons/favicons.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'libkonq/favicons')

diff --git a/libkonq/favicons/Makefile.am b/libkonq/favicons/Makefile.am
index a53c7faf1..6676fd54f 100644
--- a/libkonq/favicons/Makefile.am
+++ b/libkonq/favicons/Makefile.am
@@ -12,4 +12,4 @@ services_DATA = favicons.desktop
 
 update_DATA = favicons.upd
 update_SCRIPTS = move_favicons.sh
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
diff --git a/libkonq/favicons/favicons.cpp b/libkonq/favicons/favicons.cpp
index 1bf9feb83..7bc0bbc22 100644
--- a/libkonq/favicons/favicons.cpp
+++ b/libkonq/favicons/favicons.cpp
@@ -31,7 +31,7 @@
 #include <kimageio.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include "favicons.moc"
 
-- 
cgit v1.2.3