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/misc | |
| 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/misc')
| -rw-r--r-- | tdehtml/misc/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | tdehtml/misc/Makefile.am | 2 | ||||
| -rw-r--r-- | tdehtml/misc/helper.cpp | 2 | ||||
| -rw-r--r-- | tdehtml/misc/loader.cpp | 6 | ||||
| -rw-r--r-- | tdehtml/misc/loader.h | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/tdehtml/misc/CMakeLists.txt b/tdehtml/misc/CMakeLists.txt index da1f0dfd3..0babd6567 100644 --- a/tdehtml/misc/CMakeLists.txt +++ b/tdehtml/misc/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}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio ${CMAKE_SOURCE_DIR}/tdeutils - ${CMAKE_SOURCE_DIR}/kio/kfile + ${CMAKE_SOURCE_DIR}/tdeio/tdefile ) diff --git a/tdehtml/misc/Makefile.am b/tdehtml/misc/Makefile.am index 670fd5a1f..a26247035 100644 --- a/tdehtml/misc/Makefile.am +++ b/tdehtml/misc/Makefile.am @@ -31,7 +31,7 @@ noinst_HEADERS = \ decoder.h tdehtmllayout.h loader_jpeg.h loader.h guess_ja.h\ stringit.h htmlhashes.h helper.h shared.h arena.h knsplugininstaller.h -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/dcop -I$(top_srcdir)/kio -I$(top_srcdir)/libltdl \ +INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/dcop -I$(top_srcdir)/tdeio -I$(top_srcdir)/libltdl \ -I$(top_srcdir)/tdehtml -I$(top_srcdir)/tdeutils $(all_includes) SRCDOC_DEST=$(kde_htmldir)/en/tdelibs/tdehtml diff --git a/tdehtml/misc/helper.cpp b/tdehtml/misc/helper.cpp index f759a9957..047a278fa 100644 --- a/tdehtml/misc/helper.cpp +++ b/tdehtml/misc/helper.cpp @@ -30,7 +30,7 @@ #include <tqptrlist.h> #include <kstaticdeleter.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqtooltip.h> using namespace DOM; diff --git a/tdehtml/misc/loader.cpp b/tdehtml/misc/loader.cpp index 60a75f856..5cd18f29b 100644 --- a/tdehtml/misc/loader.cpp +++ b/tdehtml/misc/loader.cpp @@ -57,8 +57,8 @@ #include <tqwidget.h> #include <kapplication.h> -#include <kio/job.h> -#include <kio/jobclasses.h> +#include <tdeio/job.h> +#include <tdeio/jobclasses.h> #include <kglobal.h> #include <kimageio.h> #include <kcharsets.h> @@ -70,7 +70,7 @@ #ifdef IMAGE_TITLES #include <tqfile.h> -#include <kfilemetainfo.h> +#include <tdefilemetainfo.h> #include <ktempfile.h> #endif diff --git a/tdehtml/misc/loader.h b/tdehtml/misc/loader.h index 97e637120..fa00b4ffb 100644 --- a/tdehtml/misc/loader.h +++ b/tdehtml/misc/loader.h @@ -49,7 +49,7 @@ #include <tqtimer.h> #include <kurl.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <tdehtml_settings.h> #include <dom/dom_string.h> |