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/html | |
| 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/html')
| -rw-r--r-- | tdehtml/html/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | tdehtml/html/Makefile.am | 2 | ||||
| -rw-r--r-- | tdehtml/html/html_formimpl.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tdehtml/html/CMakeLists.txt b/tdehtml/html/CMakeLists.txt index a7a3bf466..a108b11f6 100644 --- a/tdehtml/html/CMakeLists.txt +++ b/tdehtml/html/CMakeLists.txt @@ -19,10 +19,10 @@ include_directories( ${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kio - ${CMAKE_SOURCE_DIR}/kio/kio - ${CMAKE_SOURCE_DIR}/kio/kfile - ${CMAKE_SOURCE_DIR}/kio/kssl + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdefile + ${CMAKE_SOURCE_DIR}/tdeio/kssl ${CMAKE_SOURCE_DIR}/tdeutils ${CMAKE_SOURCE_DIR}/tdewallet/client ) diff --git a/tdehtml/html/Makefile.am b/tdehtml/html/Makefile.am index 0a3286243..ed6ca0114 100644 --- a/tdehtml/html/Makefile.am +++ b/tdehtml/html/Makefile.am @@ -40,7 +40,7 @@ noinst_HEADERS = \ html_formimpl.h html_objectimpl.h INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/dcop \ - -I$(top_srcdir)/kio/kssl \ + -I$(top_srcdir)/tdeio/kssl \ -I$(top_srcdir)/kjs -I$(top_srcdir)/tdehtml -I$(top_srcdir) \ -I$(top_srcdir)/tdewallet/client -I$(top_srcdir)/tdeutils \ $(all_includes) diff --git a/tdehtml/html/html_formimpl.cpp b/tdehtml/html/html_formimpl.cpp index f8c566511..7e2776ad5 100644 --- a/tdehtml/html/html_formimpl.cpp +++ b/tdehtml/html/html_formimpl.cpp @@ -57,7 +57,7 @@ #include <tdewallet.h> #endif #include <netaccess.h> -#include <kfileitem.h> +#include <tdefileitem.h> #include <tqfile.h> #include <tqdir.h> #include <tqtextcodec.h> |