summaryrefslogtreecommitdiffstats
path: root/kioslave
diff options
context:
space:
mode:
Diffstat (limited to 'kioslave')
-rw-r--r--kioslave/bzip2/CMakeLists.txt4
-rw-r--r--kioslave/file/CMakeLists.txt4
-rw-r--r--kioslave/ftp/CMakeLists.txt6
-rw-r--r--kioslave/gzip/CMakeLists.txt4
-rw-r--r--kioslave/gzip/Makefile.am2
-rw-r--r--kioslave/http/CMakeLists.txt8
-rw-r--r--kioslave/http/Makefile.am4
-rw-r--r--kioslave/http/http.cc2
-rw-r--r--kioslave/http/kcookiejar/CMakeLists.txt12
-rw-r--r--kioslave/http/kcookiejar/Makefile.am2
-rw-r--r--kioslave/http/kcookiejar/tests/Makefile.am2
-rw-r--r--kioslave/iso/CMakeLists.txt4
-rw-r--r--kioslave/metainfo/CMakeLists.txt4
-rw-r--r--kioslave/metainfo/Makefile.am2
14 files changed, 30 insertions, 30 deletions
diff --git a/kioslave/bzip2/CMakeLists.txt b/kioslave/bzip2/CMakeLists.txt
index 054d87fdf..a2354d6b0 100644
--- a/kioslave/bzip2/CMakeLists.txt
+++ b/kioslave/bzip2/CMakeLists.txt
@@ -12,8 +12,8 @@
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kio/kio
)
diff --git a/kioslave/file/CMakeLists.txt b/kioslave/file/CMakeLists.txt
index fef6c2224..2cf415745 100644
--- a/kioslave/file/CMakeLists.txt
+++ b/kioslave/file/CMakeLists.txt
@@ -17,9 +17,9 @@ include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/dcop
- ${CMAKE_SOURCE_DIR}/kdecore
+ ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
)
diff --git a/kioslave/ftp/CMakeLists.txt b/kioslave/ftp/CMakeLists.txt
index 0220acd40..e0287639b 100644
--- a/kioslave/ftp/CMakeLists.txt
+++ b/kioslave/ftp/CMakeLists.txt
@@ -12,9 +12,9 @@
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdecore/network
+ ${CMAKE_BINARY_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdecore/network
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
)
diff --git a/kioslave/gzip/CMakeLists.txt b/kioslave/gzip/CMakeLists.txt
index 3426fef09..e71908c31 100644
--- a/kioslave/gzip/CMakeLists.txt
+++ b/kioslave/gzip/CMakeLists.txt
@@ -11,8 +11,8 @@
include_directories(
${TQT_INCLUDE_DIRS}
- ${CMAKE_BINARY_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kio/kio
)
diff --git a/kioslave/gzip/Makefile.am b/kioslave/gzip/Makefile.am
index e8cda96ef..578ec1b17 100644
--- a/kioslave/gzip/Makefile.am
+++ b/kioslave/gzip/Makefile.am
@@ -1,5 +1,5 @@
INCLUDES = -I$(top_srcdir)/kio $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
METASOURCES = AUTO
kde_module_LTLIBRARIES = kgzipfilter.la
diff --git a/kioslave/http/CMakeLists.txt b/kioslave/http/CMakeLists.txt
index a043a8a8d..51bcfe092 100644
--- a/kioslave/http/CMakeLists.txt
+++ b/kioslave/http/CMakeLists.txt
@@ -15,10 +15,10 @@ include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/dcop
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdecore/network
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdecore/network
${CMAKE_SOURCE_DIR}/interfaces
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
@@ -46,7 +46,7 @@ set( ${target}_SRCS
http_cache_cleaner.cpp
)
-tde_add_kdeinit_executable( ${target} AUTOMOC
+tde_add_tdeinit_executable( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
LINK kio-shared
)
diff --git a/kioslave/http/Makefile.am b/kioslave/http/Makefile.am
index 3a185f356..117867715 100644
--- a/kioslave/http/Makefile.am
+++ b/kioslave/http/Makefile.am
@@ -3,14 +3,14 @@
SUBDIRS = kcookiejar
-INCLUDES= -I$(top_srcdir)/interfaces -I$(top_srcdir)/kio/httpfilter -I$(top_srcdir)/kdecore/network $(all_includes) $(GSSAPI_INCS)
+INCLUDES= -I$(top_srcdir)/interfaces -I$(top_srcdir)/kio/httpfilter -I$(top_srcdir)/tdecore/network $(all_includes) $(GSSAPI_INCS)
AM_LDFLAGS = $(all_libraries) $(GSSAPI_RPATH)
####### Files
bin_PROGRAMS=
lib_LTLIBRARIES=
-kdeinit_LTLIBRARIES = kio_http_cache_cleaner.la
+tdeinit_LTLIBRARIES = kio_http_cache_cleaner.la
kde_module_LTLIBRARIES = kio_http.la
kio_http_la_SOURCES = http.cc
diff --git a/kioslave/http/http.cc b/kioslave/http/http.cc
index 3d957aaef..a37fe27ca 100644
--- a/kioslave/http/http.cc
+++ b/kioslave/http/http.cc
@@ -5082,7 +5082,7 @@ void HTTPProtocol::configAuth( char *p, bool isForProxy )
((m_iProxyAuthCount > 0) && (f < ProxyAuthentication)))
{
// Since I purposefully made the Proxy-Authentication settings
- // persistent to reduce the number of round-trips to kdesud we
+ // persistent to reduce the number of round-trips to tdesud we
// have to take special care when an unknown/unsupported auth-
// scheme is received. This check accomplishes just that...
if ( m_iProxyAuthCount == 0)
diff --git a/kioslave/http/kcookiejar/CMakeLists.txt b/kioslave/http/kcookiejar/CMakeLists.txt
index 9ae76c0d4..eef5e9654 100644
--- a/kioslave/http/kcookiejar/CMakeLists.txt
+++ b/kioslave/http/kcookiejar/CMakeLists.txt
@@ -13,11 +13,11 @@ include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdeui
)
link_directories(
@@ -40,9 +40,9 @@ set( ${target}_SRCS
main.cpp
)
-tde_add_kdeinit_executable( ${target} AUTOMOC
+tde_add_tdeinit_executable( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
- LINK kdecore-shared
+ LINK tdecore-shared
)
@@ -57,7 +57,7 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
- LINK kdeui-shared kdeinit_kded-shared
+ LINK tdeui-shared tdeinit_kded-shared
DEPENDENCIES dcopidl
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kioslave/http/kcookiejar/Makefile.am b/kioslave/http/kcookiejar/Makefile.am
index 7478e09e3..163d618e1 100644
--- a/kioslave/http/kcookiejar/Makefile.am
+++ b/kioslave/http/kcookiejar/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES= $(all_includes)
bin_PROGRAMS =
lib_LTLIBRARIES =
-kdeinit_LTLIBRARIES = kcookiejar.la
+tdeinit_LTLIBRARIES = kcookiejar.la
kde_module_LTLIBRARIES = kded_kcookiejar.la
kcookiejar_la_SOURCES = main.cpp
diff --git a/kioslave/http/kcookiejar/tests/Makefile.am b/kioslave/http/kcookiejar/tests/Makefile.am
index 32540d3f2..9ac6cb000 100644
--- a/kioslave/http/kcookiejar/tests/Makefile.am
+++ b/kioslave/http/kcookiejar/tests/Makefile.am
@@ -9,7 +9,7 @@ check_PROGRAMS = kcookiejartest
kcookiejartest_SOURCES = kcookiejartest.cpp
kcookiejartest_LDADD = $(LIB_KIO)
-kcookiejartest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kcookiejartest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
check-local: kcookiejartest
./kcookiejartest $(srcdir)/cookie.test
diff --git a/kioslave/iso/CMakeLists.txt b/kioslave/iso/CMakeLists.txt
index 2d445b520..da6315b77 100644
--- a/kioslave/iso/CMakeLists.txt
+++ b/kioslave/iso/CMakeLists.txt
@@ -16,8 +16,8 @@ include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
)
diff --git a/kioslave/metainfo/CMakeLists.txt b/kioslave/metainfo/CMakeLists.txt
index 2eb466d9a..9c5fcdf20 100644
--- a/kioslave/metainfo/CMakeLists.txt
+++ b/kioslave/metainfo/CMakeLists.txt
@@ -11,9 +11,9 @@
include_directories(
${TQT_INCLUDE_DIRS}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/dcop
- ${CMAKE_SOURCE_DIR}/kdecore
+ ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
)
diff --git a/kioslave/metainfo/Makefile.am b/kioslave/metainfo/Makefile.am
index dae0b9180..98b5632f6 100644
--- a/kioslave/metainfo/Makefile.am
+++ b/kioslave/metainfo/Makefile.am
@@ -2,7 +2,7 @@
## Makefile.am of kdebase/kioslave/metainfo
INCLUDES = $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
METASOURCES = AUTO
kde_module_LTLIBRARIES = kio_metainfo.la
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-05 12:20:19 +0000