diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-06 02:31:13 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-06 02:31:13 -0600 |
commit | 0ae5679aa160245af248836e1d7743aeff63f2e1 (patch) | |
tree | 64608dccc9bfd57800995a414f6287b7605ca637 /kioslave/http | |
parent | d3b5575f31f14629dbd3fd900665e1a69aa7bcd5 (diff) | |
download | tdelibs-0ae5679aa160245af248836e1d7743aeff63f2e1.tar.gz tdelibs-0ae5679aa160245af248836e1d7743aeff63f2e1.zip |
Additional kde to tde renaming
Diffstat (limited to 'kioslave/http')
-rw-r--r-- | kioslave/http/CMakeLists.txt | 8 | ||||
-rw-r--r-- | kioslave/http/Makefile.am | 4 | ||||
-rw-r--r-- | kioslave/http/http.cc | 2 | ||||
-rw-r--r-- | kioslave/http/kcookiejar/CMakeLists.txt | 12 | ||||
-rw-r--r-- | kioslave/http/kcookiejar/Makefile.am | 2 | ||||
-rw-r--r-- | kioslave/http/kcookiejar/tests/Makefile.am | 2 |
6 files changed, 15 insertions, 15 deletions
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 |