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/java | |
| 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/java')
| -rw-r--r-- | tdehtml/java/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | tdehtml/java/Makefile.am | 2 | ||||
| -rw-r--r-- | tdehtml/java/kjavaappletserver.cpp | 6 | ||||
| -rw-r--r-- | tdehtml/java/kjavaappletviewer.cpp | 4 | ||||
| -rw-r--r-- | tdehtml/java/kjavadownloader.cpp | 4 | ||||
| -rw-r--r-- | tdehtml/java/kjavaprocess.cpp | 2 |
6 files changed, 12 insertions, 12 deletions
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> |