summaryrefslogtreecommitdiffstats
path: root/tdehtml
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:04:16 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:04:16 -0600
commit5159cd2beb2e87806a5b54e9991b7895285c9d3e (patch)
tree9b70e8be47a390f8f4d56ead812ab0c9dad88709 /tdehtml
parentc17cb900dcf52b8bd6dc300d4f103392900ec2b4 (diff)
downloadtdelibs-5159cd2beb2e87806a5b54e9991b7895285c9d3e.tar.gz
tdelibs-5159cd2beb2e87806a5b54e9991b7895285c9d3e.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'tdehtml')
-rw-r--r--tdehtml/CMakeLists.txt10
-rw-r--r--tdehtml/Makefile.am2
-rw-r--r--tdehtml/css/CMakeLists.txt4
-rw-r--r--tdehtml/css/Makefile.am2
-rw-r--r--tdehtml/css/cssstyleselector.cpp2
-rw-r--r--tdehtml/dom/CMakeLists.txt2
-rw-r--r--tdehtml/dom/Makefile.am2
-rw-r--r--tdehtml/ecma/CMakeLists.txt6
-rw-r--r--tdehtml/ecma/Makefile.am2
-rw-r--r--tdehtml/ecma/kjs_debugwin.cpp4
-rw-r--r--tdehtml/ecma/kjs_navigator.cpp10
-rw-r--r--tdehtml/ecma/xmlhttprequest.cpp6
-rw-r--r--tdehtml/ecma/xmlhttprequest.h2
-rw-r--r--tdehtml/ecma/xmlserializer.h2
-rw-r--r--tdehtml/html/CMakeLists.txt8
-rw-r--r--tdehtml/html/Makefile.am2
-rw-r--r--tdehtml/html/html_formimpl.cpp2
-rw-r--r--tdehtml/java/CMakeLists.txt6
-rw-r--r--tdehtml/java/Makefile.am2
-rw-r--r--tdehtml/java/kjavaappletserver.cpp6
-rw-r--r--tdehtml/java/kjavaappletviewer.cpp4
-rw-r--r--tdehtml/java/kjavadownloader.cpp4
-rw-r--r--tdehtml/java/kjavaprocess.cpp2
-rw-r--r--tdehtml/misc/CMakeLists.txt6
-rw-r--r--tdehtml/misc/Makefile.am2
-rw-r--r--tdehtml/misc/helper.cpp2
-rw-r--r--tdehtml/misc/loader.cpp6
-rw-r--r--tdehtml/misc/loader.h2
-rw-r--r--tdehtml/rendering/CMakeLists.txt6
-rw-r--r--tdehtml/rendering/Makefile.am4
-rw-r--r--tdehtml/rendering/render_form.cpp2
-rw-r--r--tdehtml/tdehtml_ext.cpp4
-rw-r--r--tdehtml/tdehtml_ext.h2
-rw-r--r--tdehtml/tdehtml_iface.cc2
-rw-r--r--tdehtml/tdehtml_part.cpp12
-rw-r--r--tdehtml/tdehtml_run.cpp2
-rw-r--r--tdehtml/tdehtml_settings.cc2
-rw-r--r--tdehtml/tdehtmlimage.cpp2
-rw-r--r--tdehtml/tdemultipart/CMakeLists.txt4
-rw-r--r--tdehtml/tdemultipart/Makefile.am4
-rw-r--r--tdehtml/tdemultipart/tdemultipart.cpp2
-rw-r--r--tdehtml/test_regression.cpp2
-rw-r--r--tdehtml/testtdehtml.cpp2
-rw-r--r--tdehtml/xml/CMakeLists.txt4
-rw-r--r--tdehtml/xml/Makefile.am2
-rw-r--r--tdehtml/xml/dom_docimpl.cpp2
46 files changed, 85 insertions, 85 deletions
diff --git a/tdehtml/CMakeLists.txt b/tdehtml/CMakeLists.txt
index bab7d78e2..de151a6e3 100644
--- a/tdehtml/CMakeLists.txt
+++ b/tdehtml/CMakeLists.txt
@@ -27,7 +27,7 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/kjs
- ${CMAKE_BINARY_DIR}/kio/kssl
+ ${CMAKE_BINARY_DIR}/tdeio/kssl
${CMAKE_BINARY_DIR}/tdecore
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}
@@ -35,10 +35,10 @@ include_directories(
${CMAKE_SOURCE_DIR}/tdefx
${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
${CMAKE_SOURCE_DIR}/tdeprint
diff --git a/tdehtml/Makefile.am b/tdehtml/Makefile.am
index 3c9cb05c5..924b3db27 100644
--- a/tdehtml/Makefile.am
+++ b/tdehtml/Makefile.am
@@ -83,7 +83,7 @@ INCLUDES = -I$(top_srcdir)/kjs -I$(top_builddir)/kjs -I$(top_srcdir)/kimgio \
-I$(srcdir)/java -I$(top_srcdir)/dcop -I$(srcdir)/misc \
-I$(srcdir)/dom -I$(srcdir)/xml -I$(srcdir)/html -I$(srcdir)/css \
-I$(top_srcdir)/libltdl \
- -I$(top_srcdir)/kio/kssl -I$(top_builddir)/kio/kssl \
+ -I$(top_srcdir)/tdeio/kssl -I$(top_builddir)/tdeio/kssl \
-I$(top_srcdir)/tdeprint \
-I$(top_srcdir)/interfaces \
-I$(top_srcdir)/interfaces/kregexpeditor \
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>
diff --git a/tdehtml/dom/CMakeLists.txt b/tdehtml/dom/CMakeLists.txt
index dd637f7bd..e781a62a8 100644
--- a/tdehtml/dom/CMakeLists.txt
+++ b/tdehtml/dom/CMakeLists.txt
@@ -18,7 +18,7 @@ include_directories(
${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdehtml
${CMAKE_SOURCE_DIR}/tdecore
- ${CMAKE_SOURCE_DIR}/kio
+ ${CMAKE_SOURCE_DIR}/tdeio
)
diff --git a/tdehtml/dom/Makefile.am b/tdehtml/dom/Makefile.am
index 6a33de62d..0b9f587f1 100644
--- a/tdehtml/dom/Makefile.am
+++ b/tdehtml/dom/Makefile.am
@@ -46,7 +46,7 @@ myinclude_HEADERS = \
dom2_views.h
# css_extensions.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) $(all_includes)
SRCDOC_DEST=$(kde_htmldir)/en/tdelibs/tdehtml
diff --git a/tdehtml/ecma/CMakeLists.txt b/tdehtml/ecma/CMakeLists.txt
index eddd99f1e..2d7366e28 100644
--- a/tdehtml/ecma/CMakeLists.txt
+++ b/tdehtml/ecma/CMakeLists.txt
@@ -21,9 +21,9 @@ include_directories(
${CMAKE_SOURCE_DIR}/tdefx
${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdeui
- ${CMAKE_SOURCE_DIR}/kio
- ${CMAKE_SOURCE_DIR}/kio/kio
- ${CMAKE_SOURCE_DIR}/kio/bookmarks
+ ${CMAKE_SOURCE_DIR}/tdeio
+ ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+ ${CMAKE_SOURCE_DIR}/tdeio/bookmarks
${CMAKE_SOURCE_DIR}/kjs
${CMAKE_SOURCE_DIR}/tdewallet/client
${CMAKE_SOURCE_DIR}/tdeutils
diff --git a/tdehtml/ecma/Makefile.am b/tdehtml/ecma/Makefile.am
index d69ff807b..ee3334668 100644
--- a/tdehtml/ecma/Makefile.am
+++ b/tdehtml/ecma/Makefile.am
@@ -16,7 +16,7 @@
# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kio -I$(top_srcdir)/kio/bookmarks -I$(top_srcdir)/tdehtml -I$(top_srcdir)/tdehtml/java -I$(top_srcdir)/tdewallet/client -I$(top_srcdir)/tdeutils -I$(top_builddir)/kjs $(all_includes)
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tdeio -I$(top_srcdir)/tdeio/bookmarks -I$(top_srcdir)/tdehtml -I$(top_srcdir)/tdehtml/java -I$(top_srcdir)/tdewallet/client -I$(top_srcdir)/tdeutils -I$(top_builddir)/kjs $(all_includes)
KDE_CXXFLAGS = $(USE_EXCEPTIONS)
diff --git a/tdehtml/ecma/kjs_debugwin.cpp b/tdehtml/ecma/kjs_debugwin.cpp
index 4830c1108..47921fb2a 100644
--- a/tdehtml/ecma/kjs_debugwin.cpp
+++ b/tdehtml/ecma/kjs_debugwin.cpp
@@ -53,8 +53,8 @@
#include <kactioncollection.h>
#include <kglobalsettings.h>
#include <kshortcut.h>
-#include <kconfig.h>
-#include <kconfigbase.h>
+#include <tdeconfig.h>
+#include <tdeconfigbase.h>
#include <kapplication.h>
#include <dcop/dcopclient.h>
#include <kstringhandler.h>
diff --git a/tdehtml/ecma/kjs_navigator.cpp b/tdehtml/ecma/kjs_navigator.cpp
index 222ef7902..22d5f9cb7 100644
--- a/tdehtml/ecma/kjs_navigator.cpp
+++ b/tdehtml/ecma/kjs_navigator.cpp
@@ -24,13 +24,13 @@
#include <klocale.h>
#include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdebug.h>
-#include <kio/kprotocolmanager.h>
-#include <kio/kmimetype.h>
-#include <kio/kservice.h>
-#include <kio/ktrader.h>
+#include <tdeio/kprotocolmanager.h>
+#include <tdeio/kmimetype.h>
+#include <tdeio/kservice.h>
+#include <tdeio/ktrader.h>
#include "kjs_navigator.h"
#include "kjs/lookup.h"
#include "kjs_binding.h"
diff --git a/tdehtml/ecma/xmlhttprequest.cpp b/tdehtml/ecma/xmlhttprequest.cpp
index f3aec5492..bfaa91231 100644
--- a/tdehtml/ecma/xmlhttprequest.cpp
+++ b/tdehtml/ecma/xmlhttprequest.cpp
@@ -33,15 +33,15 @@
#include "tdehtml_part.h"
#include "tdehtmlview.h"
-#include <kio/scheduler.h>
-#include <kio/job.h>
+#include <tdeio/scheduler.h>
+#include <tdeio/job.h>
#include <tqobject.h>
#include <kdebug.h>
#ifdef APPLE_CHANGES
#include "KWQLoader.h"
#else
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
using TDEIO::NetAccess;
#endif
diff --git a/tdehtml/ecma/xmlhttprequest.h b/tdehtml/ecma/xmlhttprequest.h
index 2dc89e227..95a7c9cc2 100644
--- a/tdehtml/ecma/xmlhttprequest.h
+++ b/tdehtml/ecma/xmlhttprequest.h
@@ -24,7 +24,7 @@
#include "ecma/kjs_binding.h"
#include "ecma/kjs_dom.h"
#include "misc/decoder.h"
-#include "kio/jobclasses.h"
+#include "tdeio/jobclasses.h"
namespace KJS {
diff --git a/tdehtml/ecma/xmlserializer.h b/tdehtml/ecma/xmlserializer.h
index 629d09afe..a86df3ed4 100644
--- a/tdehtml/ecma/xmlserializer.h
+++ b/tdehtml/ecma/xmlserializer.h
@@ -24,7 +24,7 @@
#include "ecma/kjs_binding.h"
#include "ecma/kjs_dom.h"
#include "misc/decoder.h"
-#include "kio/jobclasses.h"
+#include "tdeio/jobclasses.h"
namespace KJS {
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>
diff --git a/tdehtml/java/CMakeLists.txt b/tdehtml/java/CMakeLists.txt
index 994763c09..e1958d320 100644
--- a/tdehtml/java/CMakeLists.txt
+++ b/tdehtml/java/CMakeLists.txt
@@ -16,14 +16,14 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/tdecore
- ${CMAKE_BINARY_DIR}/kio/kssl
+ ${CMAKE_BINARY_DIR}/tdeio/kssl
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/tdehtml
${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdeui
- ${CMAKE_SOURCE_DIR}/kio
- ${CMAKE_SOURCE_DIR}/kio/kssl
+ ${CMAKE_SOURCE_DIR}/tdeio
+ ${CMAKE_SOURCE_DIR}/tdeio/kssl
)
link_directories(
diff --git a/tdehtml/java/Makefile.am b/tdehtml/java/Makefile.am
index a5e46a0d5..00eeca230 100644
--- a/tdehtml/java/Makefile.am
+++ b/tdehtml/java/Makefile.am
@@ -15,7 +15,7 @@ libkjava_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined
libkjava_la_LIBADD = $(LIB_KPARTS)
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tdehtml \
- -I$(top_srcdir)/kio/kssl -I$(top_builddir)/kio/kssl \
+ -I$(top_srcdir)/tdeio/kssl -I$(top_builddir)/tdeio/kssl \
$(all_includes)
kjavadata_DATA = kjava.jar kjava.policy pluginsinfo
diff --git a/tdehtml/java/kjavaappletserver.cpp b/tdehtml/java/kjavaappletserver.cpp
index b125bcc1a..7ad046b9a 100644
--- a/tdehtml/java/kjavaappletserver.cpp
+++ b/tdehtml/java/kjavaappletserver.cpp
@@ -26,14 +26,14 @@
#include "kjavadownloader.h"
#include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <klocale.h>
#include <tdeparts/browserextension.h>
#include <kapplication.h>
#include <kstandarddirs.h>
-#include <kio/job.h>
-#include <kio/kprotocolmanager.h>
+#include <tdeio/job.h>
+#include <tdeio/kprotocolmanager.h>
#include <ksslcertificate.h>
#include <ksslcertchain.h>
#include <kssl.h>
diff --git a/tdehtml/java/kjavaappletviewer.cpp b/tdehtml/java/kjavaappletviewer.cpp
index fce5195ff..194a6324a 100644
--- a/tdehtml/java/kjavaappletviewer.cpp
+++ b/tdehtml/java/kjavaappletviewer.cpp
@@ -37,8 +37,8 @@
#include <kiconloader.h>
#include <kapplication.h>
#include <kdebug.h>
-#include <kconfig.h>
-#include <kio/authinfo.h>
+#include <tdeconfig.h>
+#include <tdeio/authinfo.h>
#include <dcopclient.h>
#include "kjavaappletwidget.h"
diff --git a/tdehtml/java/kjavadownloader.cpp b/tdehtml/java/kjavadownloader.cpp
index a0a8abdd2..5b1c55324 100644
--- a/tdehtml/java/kjavadownloader.cpp
+++ b/tdehtml/java/kjavadownloader.cpp
@@ -23,8 +23,8 @@
#include "kjavaappletserver.h"
#include <kurl.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
#include <kdebug.h>
#include <tqfile.h>
diff --git a/tdehtml/java/kjavaprocess.cpp b/tdehtml/java/kjavaprocess.cpp
index dbe80305e..1ff68dd74 100644
--- a/tdehtml/java/kjavaprocess.cpp
+++ b/tdehtml/java/kjavaprocess.cpp
@@ -22,7 +22,7 @@
#include "kjavaprocess.h"
#include <kdebug.h>
-#include <kio/kprotocolmanager.h>
+#include <tdeio/kprotocolmanager.h>
#include <tqtextstream.h>
#include <tqmap.h>
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>
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>
diff --git a/tdehtml/tdehtml_ext.cpp b/tdehtml/tdehtml_ext.cpp
index 62a5293c1..4127e7762 100644
--- a/tdehtml/tdehtml_ext.cpp
+++ b/tdehtml/tdehtml_ext.cpp
@@ -45,8 +45,8 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kfiledialog.h>
-#include <kio/job.h>
+#include <tdefiledialog.h>
+#include <tdeio/job.h>
#include <kprocess.h>
#include <ktoolbarbutton.h>
#include <ktoolbar.h>
diff --git a/tdehtml/tdehtml_ext.h b/tdehtml/tdehtml_ext.h
index 5e2eafa9e..5a8f00e70 100644
--- a/tdehtml/tdehtml_ext.h
+++ b/tdehtml/tdehtml_ext.h
@@ -32,7 +32,7 @@
#include <tqguardedptr.h>
#include <kaction.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
/**
* This is the BrowserExtension for a KHTMLPart document. Please see the KParts documentation for
diff --git a/tdehtml/tdehtml_iface.cc b/tdehtml/tdehtml_iface.cc
index e42562c51..1ceb6b5d4 100644
--- a/tdehtml/tdehtml_iface.cc
+++ b/tdehtml/tdehtml_iface.cc
@@ -22,7 +22,7 @@
#include "tdehtml_part.h"
#include "tdehtmlview.h"
#include "tdehtml_ext.h"
-#include <kio/global.h>
+#include <tdeio/global.h>
#include <tqapplication.h>
#include <tqvariant.h>
diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp
index 185ded02d..2ebd55df8 100644
--- a/tdehtml/tdehtml_part.cpp
+++ b/tdehtml/tdehtml_part.cpp
@@ -75,9 +75,9 @@ using namespace DOM;
#include <dcopref.h>
#include <kstandarddirs.h>
#include <kstringhandler.h>
-#include <kio/job.h>
-#include <kio/global.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/global.h>
+#include <tdeio/netaccess.h>
#include <kprotocolmanager.h>
#include <kdebug.h>
#include <kiconloader.h>
@@ -85,7 +85,7 @@ using namespace DOM;
#include <kcharsets.h>
#include <kmessagebox.h>
#include <kstdaction.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <ktrader.h>
#include <kdatastream.h>
#include <ktempfile.h>
@@ -102,7 +102,7 @@ using namespace DOM;
#include <ksslcertchain.h>
#include <ksslinfodlg.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
#include <kurifilter.h>
#include <kstatusbar.h>
#include <kurllabel.h>
@@ -1136,7 +1136,7 @@ void KHTMLPart::launchJSErrorDialog() {
void KHTMLPart::launchJSConfigDialog() {
TQStringList args;
args << "tdehtml_java_js";
- TDEApplication::tdeinitExec( "kcmshell", args );
+ TDEApplication::tdeinitExec( "tdecmshell", args );
}
TQVariant KHTMLPart::executeScript(const TQString& filename, int baseLine, const DOM::Node& n, const TQString& script)
diff --git a/tdehtml/tdehtml_run.cpp b/tdehtml/tdehtml_run.cpp
index e1c34915a..6ae958d67 100644
--- a/tdehtml/tdehtml_run.cpp
+++ b/tdehtml/tdehtml_run.cpp
@@ -22,7 +22,7 @@
*/
#include "tdehtmlpart_p.h"
#include "tdehtml_run.h"
-#include <kio/job.h>
+#include <tdeio/job.h>
#include <kdebug.h>
#include <klocale.h>
#include "tdehtml_ext.h"
diff --git a/tdehtml/tdehtml_settings.cc b/tdehtml/tdehtml_settings.cc
index 4d65aa99b..5675b2105 100644
--- a/tdehtml/tdehtml_settings.cc
+++ b/tdehtml/tdehtml_settings.cc
@@ -22,7 +22,7 @@
#include "tdehtml_settings.h"
#include "tdehtmldefaults.h"
#include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kglobal.h>
#include <klocale.h>
#include <kdebug.h>
diff --git a/tdehtml/tdehtmlimage.cpp b/tdehtml/tdehtmlimage.cpp
index cc244ed80..a2b73db5c 100644
--- a/tdehtml/tdehtmlimage.cpp
+++ b/tdehtml/tdehtmlimage.cpp
@@ -29,7 +29,7 @@
#include <tqvbox.h>
#include <tqtimer.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
#include <kinstance.h>
#include <kmimetype.h>
#include <klocale.h>
diff --git a/tdehtml/tdemultipart/CMakeLists.txt b/tdehtml/tdemultipart/CMakeLists.txt
index f0d03953e..6ae8c8d0e 100644
--- a/tdehtml/tdemultipart/CMakeLists.txt
+++ b/tdehtml/tdemultipart/CMakeLists.txt
@@ -18,8 +18,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}/tdeutils
)
diff --git a/tdehtml/tdemultipart/Makefile.am b/tdehtml/tdemultipart/Makefile.am
index f02b5931e..f2e119c3f 100644
--- a/tdehtml/tdemultipart/Makefile.am
+++ b/tdehtml/tdemultipart/Makefile.am
@@ -1,11 +1,11 @@
-INCLUDES = -I$(top_srcdir)/tdehtml -I$(top_srcdir)/kio/httpfilter -I$(top_srcdir)/tdeutils $(all_includes)
+INCLUDES = -I$(top_srcdir)/tdehtml -I$(top_srcdir)/tdeio/httpfilter -I$(top_srcdir)/tdeutils $(all_includes)
# These are not really libraries, but modules dynamically opened.
# So they should be installed in kde_module_dir, which is usually $kde_prefix/lib/trinity
kde_module_LTLIBRARIES = libtdemultipart.la
libtdemultipart_la_SOURCES = tdemultipart.cpp
-libtdemultipart_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/kio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE) $(LIBZ)
+libtdemultipart_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/tdeio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE) $(LIBZ)
libtdemultipart_la_DEPENDENCIES = $(LIB_KPARTS)
libtdemultipart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
diff --git a/tdehtml/tdemultipart/tdemultipart.cpp b/tdehtml/tdemultipart/tdemultipart.cpp
index d5195186d..82e94a4c0 100644
--- a/tdehtml/tdemultipart/tdemultipart.cpp
+++ b/tdehtml/tdemultipart/tdemultipart.cpp
@@ -23,7 +23,7 @@
#include <kinstance.h>
#include <kmimetype.h>
#include <klocale.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
#include <tqfile.h>
#include <ktempfile.h>
#include <kmessagebox.h>
diff --git a/tdehtml/test_regression.cpp b/tdehtml/test_regression.cpp
index 233ac8402..497126d8c 100644
--- a/tdehtml/test_regression.cpp
+++ b/tdehtml/test_regression.cpp
@@ -62,7 +62,7 @@
#include <kaction.h>
#include <kcmdlineargs.h>
#include "tdehtml_factory.h"
-#include <kio/job.h>
+#include <tdeio/job.h>
#include <kmainwindow.h>
#include <ksimpleconfig.h>
#include <kglobalsettings.h>
diff --git a/tdehtml/testtdehtml.cpp b/tdehtml/testtdehtml.cpp
index 84ace61fe..1da21be1f 100644
--- a/tdehtml/testtdehtml.cpp
+++ b/tdehtml/testtdehtml.cpp
@@ -30,7 +30,7 @@
#include <kcmdlineargs.h>
#include <kaction.h>
#include "domtreeview.h"
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
static KCmdLineOptions options[] = { { "+file", "url to open", 0 } , KCmdLineLastOption };
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"