diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:04:16 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:04:16 -0600 |
| commit | 5159cd2beb2e87806a5b54e9991b7895285c9d3e (patch) | |
| tree | 9b70e8be47a390f8f4d56ead812ab0c9dad88709 /tdehtml/xml | |
| parent | c17cb900dcf52b8bd6dc300d4f103392900ec2b4 (diff) | |
| download | tdelibs-5159cd2beb2e87806a5b54e9991b7895285c9d3e.tar.gz tdelibs-5159cd2beb2e87806a5b54e9991b7895285c9d3e.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'tdehtml/xml')
| -rw-r--r-- | tdehtml/xml/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tdehtml/xml/Makefile.am | 2 | ||||
| -rw-r--r-- | tdehtml/xml/dom_docimpl.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tdehtml/xml/CMakeLists.txt b/tdehtml/xml/CMakeLists.txt index 904d8ba09..c32e139dc 100644 --- a/tdehtml/xml/CMakeLists.txt +++ b/tdehtml/xml/CMakeLists.txt @@ -20,8 +20,8 @@ include_directories( ${CMAKE_SOURCE_DIR}/tdehtml ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kio - ${CMAKE_SOURCE_DIR}/kio/kio + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio ${CMAKE_SOURCE_DIR}/tdewallet/client ${CMAKE_SOURCE_DIR}/tdeutils ) diff --git a/tdehtml/xml/Makefile.am b/tdehtml/xml/Makefile.am index 257f63813..febb3ef71 100644 --- a/tdehtml/xml/Makefile.am +++ b/tdehtml/xml/Makefile.am @@ -35,7 +35,7 @@ noinst_HEADERS = \ dom2_traversalimpl.h xml_tokenizer.h dom_xmlimpl.h \ dom2_eventsimpl.h dom2_viewsimpl.h dom_restyler.h -INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop \ +INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/tdeio -I$(top_srcdir)/dcop \ -I$(top_srcdir)/tdehtml -I$(top_srcdir) -I$(top_srcdir)/tdewallet/client \ -I$(top_srcdir)/tdeutils -I$(top_builddir)/kjs $(all_includes) diff --git a/tdehtml/xml/dom_docimpl.cpp b/tdehtml/xml/dom_docimpl.cpp index 3ab639867..5614dbf2e 100644 --- a/tdehtml/xml/dom_docimpl.cpp +++ b/tdehtml/xml/dom_docimpl.cpp @@ -78,7 +78,7 @@ #include "html/html_objectimpl.h" #include <kapplication.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <stdlib.h> #include "dom_docimpl.h" |