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

---
 kdewidgets/CMakeLists.txt     | 4 ++--
 kdewidgets/Makefile.am        | 2 +-
 kdewidgets/makekdewidgets.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'kdewidgets')

diff --git a/kdewidgets/CMakeLists.txt b/kdewidgets/CMakeLists.txt
index d68fbd3d6..a0a6f29df 100644
--- a/kdewidgets/CMakeLists.txt
+++ b/kdewidgets/CMakeLists.txt
@@ -23,8 +23,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
 )
 
 link_directories(
diff --git a/kdewidgets/Makefile.am b/kdewidgets/Makefile.am
index dc30a767a..3afb3947b 100644
--- a/kdewidgets/Makefile.am
+++ b/kdewidgets/Makefile.am
@@ -21,7 +21,7 @@
 SUBDIRS=. pics tests
 AM_CXXFLAGS = -DQT_PLUGIN
 
-INCLUDES = -I$(top_srcdir)/kfile $(all_includes)
+INCLUDES = -I$(top_srcdir)/tdefile $(all_includes)
 
 bin_PROGRAMS = makekdewidgets
 makekdewidgets_SOURCES = makekdewidgets.cpp
diff --git a/kdewidgets/makekdewidgets.cpp b/kdewidgets/makekdewidgets.cpp
index 8e2856c53..ea84c61b7 100644
--- a/kdewidgets/makekdewidgets.cpp
+++ b/kdewidgets/makekdewidgets.cpp
@@ -2,7 +2,7 @@
 #include <kaboutdata.h>
 #include <kinstance.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmacroexpander.h>
 #include <kdebug.h>
 
-- 
cgit v1.2.3