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/rendering | |
| 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/rendering')
| -rw-r--r-- | tdehtml/rendering/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | tdehtml/rendering/Makefile.am | 4 | ||||
| -rw-r--r-- | tdehtml/rendering/render_form.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tdehtml/rendering/CMakeLists.txt b/tdehtml/rendering/CMakeLists.txt index 757e9a72a..b8346501f 100644 --- a/tdehtml/rendering/CMakeLists.txt +++ b/tdehtml/rendering/CMakeLists.txt @@ -19,9 +19,9 @@ 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}/kio/kfile + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdefile ${CMAKE_SOURCE_DIR}/tdeutils ) diff --git a/tdehtml/rendering/Makefile.am b/tdehtml/rendering/Makefile.am index 605788764..16d30da53 100644 --- a/tdehtml/rendering/Makefile.am +++ b/tdehtml/rendering/Makefile.am @@ -41,8 +41,8 @@ noinst_HEADERS = \ render_br.h render_applet.h font.h table_layout.h render_line.h \ render_generated.h enumerate.h -INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop \ - -I$(top_srcdir)/kfile -I$(top_srcdir)/tdehtml -I$(top_srcdir)/tdeutils -I$(top_srcdir) $(all_includes) +INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/tdeio -I$(top_srcdir)/dcop \ + -I$(top_srcdir)/tdefile -I$(top_srcdir)/tdehtml -I$(top_srcdir)/tdeutils -I$(top_srcdir) $(all_includes) SRCDOC_DEST=$(kde_htmldir)/en/tdelibs/tdehtml diff --git a/tdehtml/rendering/render_form.cpp b/tdehtml/rendering/render_form.cpp index 7fe009a7f..2872a0e6c 100644 --- a/tdehtml/rendering/render_form.cpp +++ b/tdehtml/rendering/render_form.cpp @@ -26,7 +26,7 @@ #include <kcompletionbox.h> #include <kcursor.h> #include <kdebug.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kfind.h> #include <kfinddialog.h> #include <kiconloader.h> |