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/tdemultipart | |
| 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/tdemultipart')
| -rw-r--r-- | tdehtml/tdemultipart/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tdehtml/tdemultipart/Makefile.am | 4 | ||||
| -rw-r--r-- | tdehtml/tdemultipart/tdemultipart.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
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> |