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/css | |
| 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/css')
| -rw-r--r-- | tdehtml/css/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tdehtml/css/Makefile.am | 2 | ||||
| -rw-r--r-- | tdehtml/css/cssstyleselector.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tdehtml/css/CMakeLists.txt b/tdehtml/css/CMakeLists.txt index 4d0b52df1..37a5fccf3 100644 --- a/tdehtml/css/CMakeLists.txt +++ b/tdehtml/css/CMakeLists.txt @@ -19,8 +19,8 @@ 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}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio ${CMAKE_SOURCE_DIR}/tdewallet/client ${CMAKE_SOURCE_DIR}/tdeutils ) diff --git a/tdehtml/css/Makefile.am b/tdehtml/css/Makefile.am index 6c43675ed..fadf66961 100644 --- a/tdehtml/css/Makefile.am +++ b/tdehtml/css/Makefile.am @@ -36,7 +36,7 @@ noinst_HEADERS = \ cssstyleselector.h csshelper.h parser.h \ css_renderstyledeclarationimpl.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)/libltdl -I$(top_srcdir) \ -I$(top_srcdir)/tdewallet/client -I$(top_srcdir)/tdeutils \ $(all_includes) diff --git a/tdehtml/css/cssstyleselector.cpp b/tdehtml/css/cssstyleselector.cpp index f2c5703c1..04b66e40a 100644 --- a/tdehtml/css/cssstyleselector.cpp +++ b/tdehtml/css/cssstyleselector.cpp @@ -58,7 +58,7 @@ using namespace DOM; #include <kstandarddirs.h> #include <kcharsets.h> #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqfile.h> #include <tqvaluelist.h> #include <tqstring.h> |