summaryrefslogtreecommitdiffstats
path: root/kio/misc
diff options
context:
space:
mode:
Diffstat (limited to 'kio/misc')
-rw-r--r--kio/misc/CMakeLists.txt16
-rw-r--r--kio/misc/Makefile.am8
-rw-r--r--kio/misc/kdesasl/CMakeLists.txt14
-rw-r--r--kio/misc/kdesasl/Makefile.am6
-rw-r--r--kio/misc/kdesasl/kdesasl.cpp2
-rw-r--r--kio/misc/kfile/CMakeLists.txt6
-rw-r--r--kio/misc/kfile/Makefile.am2
-rw-r--r--kio/misc/kntlm/CMakeLists.txt6
-rw-r--r--kio/misc/kpac/CMakeLists.txt8
-rw-r--r--kio/misc/kpac/Makefile.am2
-rw-r--r--kio/misc/ksendbugmail/CMakeLists.txt4
-rw-r--r--kio/misc/ksendbugmail/Makefile.am2
-rw-r--r--kio/misc/kssld/CMakeLists.txt6
-rw-r--r--kio/misc/ktelnetservice.cpp2
-rw-r--r--kio/misc/kwalletd/CMakeLists.txt8
-rw-r--r--kio/misc/uiserver.cpp2
16 files changed, 47 insertions, 47 deletions
diff --git a/kio/misc/CMakeLists.txt b/kio/misc/CMakeLists.txt
index d6bc0cb16..52aa2207a 100644
--- a/kio/misc/CMakeLists.txt
+++ b/kio/misc/CMakeLists.txt
@@ -11,7 +11,7 @@
add_subdirectory( ksendbugmail )
add_subdirectory( kpac )
-add_subdirectory( kdesasl )
+add_subdirectory( tdesasl )
add_subdirectory( kssld )
add_subdirectory( kfile )
add_subdirectory( kwalletd )
@@ -24,15 +24,15 @@ add_definitions(
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_BINARY_DIR}/kio
${CMAKE_BINARY_DIR}/kio/kio
${CMAKE_BINARY_DIR}/kio/kssl
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop
- ${CMAKE_SOURCE_DIR}/kdefx
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${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/kssl
@@ -69,7 +69,7 @@ set( ${target}_SRCS
uiserver.cpp uiserver.skel
)
-tde_add_kdeinit_executable( ${target} AUTOMOC
+tde_add_tdeinit_executable( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
LINK kio-shared
DEPENDENCIES dcopidl
@@ -82,7 +82,7 @@ set( target kmailservice )
tde_add_executable( ${target}
SOURCES ${target}.cpp
- LINK kdecore-shared
+ LINK tdecore-shared
DESTINATION ${BIN_INSTALL_DIR}
)
@@ -93,7 +93,7 @@ set( target ktelnetservice )
tde_add_executable( ${target}
SOURCES ${target}.cpp
- LINK kdeui-shared
+ LINK tdeui-shared
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/kio/misc/Makefile.am b/kio/misc/Makefile.am
index 203d79878..3d05c0003 100644
--- a/kio/misc/Makefile.am
+++ b/kio/misc/Makefile.am
@@ -20,10 +20,10 @@ AM_CPPFLAGS = -D_LARGEFILE64_SOURCE
INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) -I$(srcdir)/../kssl -I../kssl $(all_includes) $(SSL_INCLUDES)
-SUBDIRS = . ksendbugmail kpac kdesasl kssld kfile kwalletd kntlm
+SUBDIRS = . ksendbugmail kpac tdesasl kssld kfile kwalletd kntlm
lib_LTLIBRARIES =
-kdeinit_LTLIBRARIES = kio_uiserver.la
+tdeinit_LTLIBRARIES = kio_uiserver.la
bin_PROGRAMS = kmailservice ktelnetservice
observer_DIR = $(top_srcdir)/kio/kio
@@ -38,11 +38,11 @@ kde_services_DATA = kio_uiserver.desktop
kmailservice_SOURCES = kmailservice.cpp
kmailservice_LDADD = $(LIB_KDECORE)
-kmailservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kmailservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
ktelnetservice_SOURCES = ktelnetservice.cpp
ktelnetservice_LDADD = $(LIB_KDEUI)
-ktelnetservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+ktelnetservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
protocol_DATA = kmailservice.protocol telnet.protocol rlogin.protocol rtsp.protocol ssh.protocol \
mms.protocol mmst.protocol mmsu.protocol pnm.protocol rtspt.protocol rtspu.protocol
diff --git a/kio/misc/kdesasl/CMakeLists.txt b/kio/misc/kdesasl/CMakeLists.txt
index 081d64799..27cacfbb9 100644
--- a/kio/misc/kdesasl/CMakeLists.txt
+++ b/kio/misc/kdesasl/CMakeLists.txt
@@ -12,8 +12,8 @@
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdecore
)
link_directories(
@@ -23,20 +23,20 @@ link_directories(
##### headers ###################################
-install(FILES kdesasl.h DESTINATION ${INCLUDE_INSTALL_DIR}/kio )
+install(FILES tdesasl.h DESTINATION ${INCLUDE_INSTALL_DIR}/kio )
-##### kdesasl ###################################
+##### tdesasl ###################################
-set( target kdesasl )
+set( target tdesasl )
set( ${target}_SRCS
- kdesasl.cpp
+ tdesasl.cpp
)
tde_add_library( ${target} SHARED
SOURCES ${${target}_SRCS}
VERSION 1.2.0
- LINK kdecore-shared
+ LINK tdecore-shared
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/kio/misc/kdesasl/Makefile.am b/kio/misc/kdesasl/Makefile.am
index 0160cdb67..d308e6770 100644
--- a/kio/misc/kdesasl/Makefile.am
+++ b/kio/misc/kdesasl/Makefile.am
@@ -3,10 +3,10 @@ INCLUDES=$(all_includes)
lib_LTLIBRARIES = libtdesasl.la
METASOURCES = AUTO
-kdesaslincludedir = $(includedir)/kio
-kdesaslinclude_HEADERS = kdesasl.h
+tdesaslincludedir = $(includedir)/kio
+tdesaslinclude_HEADERS = tdesasl.h
-libtdesasl_la_SOURCES = kdesasl.cpp
+libtdesasl_la_SOURCES = tdesasl.cpp
libtdesasl_la_LDFLAGS = $(all_libraries) -version-info 3:0:2 -no-undefined
libtdesasl_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
diff --git a/kio/misc/kdesasl/kdesasl.cpp b/kio/misc/kdesasl/kdesasl.cpp
index b547f7e6b..37195faf3 100644
--- a/kio/misc/kdesasl/kdesasl.cpp
+++ b/kio/misc/kdesasl/kdesasl.cpp
@@ -17,7 +17,7 @@
Boston, MA 02110-1301, USA.
*/
-#include "kdesasl.h"
+#include "tdesasl.h"
#include <kmdcodec.h>
#include <kurl.h>
diff --git a/kio/misc/kfile/CMakeLists.txt b/kio/misc/kfile/CMakeLists.txt
index 4a00ae286..07c2725b2 100644
--- a/kio/misc/kfile/CMakeLists.txt
+++ b/kio/misc/kfile/CMakeLists.txt
@@ -11,9 +11,9 @@
include_directories(
${TQT_INCLUDE_DIRS}
- ${CMAKE_BINARY_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_BINARY_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kio/kfile
diff --git a/kio/misc/kfile/Makefile.am b/kio/misc/kfile/Makefile.am
index c02f9eb97..c0ede6f62 100644
--- a/kio/misc/kfile/Makefile.am
+++ b/kio/misc/kfile/Makefile.am
@@ -5,6 +5,6 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio/kio $(all_includes)
bin_PROGRAMS = kfile
kfile_SOURCES = fileprops.cpp
-kfile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kfile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kfile_LDADD = $(LIB_KIO)
diff --git a/kio/misc/kntlm/CMakeLists.txt b/kio/misc/kntlm/CMakeLists.txt
index 9b4b916bc..0952f4535 100644
--- a/kio/misc/kntlm/CMakeLists.txt
+++ b/kio/misc/kntlm/CMakeLists.txt
@@ -12,9 +12,9 @@
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_SOURCE_DIR}/kdecore
+ ${CMAKE_SOURCE_DIR}/tdecore
)
link_directories(
@@ -38,6 +38,6 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED
SOURCES ${${target}_SRCS}
VERSION 0.0.0
- LINK kdecore-shared
+ LINK tdecore-shared
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/kio/misc/kpac/CMakeLists.txt b/kio/misc/kpac/CMakeLists.txt
index c3fc418c3..00ce2d357 100644
--- a/kio/misc/kpac/CMakeLists.txt
+++ b/kio/misc/kpac/CMakeLists.txt
@@ -13,12 +13,12 @@ include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_BINARY_DIR}/kjs
${CMAKE_SOURCE_DIR}
${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}/kio
${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kded
@@ -49,7 +49,7 @@ set( ${target}_SKELS
tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
- LINK kdeinit_kded-shared kjs-shared ${RESOLV_LIBRARIES}
+ LINK tdeinit_kded-shared kjs-shared ${RESOLV_LIBRARIES}
DEPENDENCIES dcopidl
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kio/misc/kpac/Makefile.am b/kio/misc/kpac/Makefile.am
index 796a9771c..65047f343 100644
--- a/kio/misc/kpac/Makefile.am
+++ b/kio/misc/kpac/Makefile.am
@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kded_proxyscout.la
bin_PROGRAMS = kpac_dhcp_helper
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/kded -I$(top_builddir)/kjs \
- -I$(top_srcdir)/kdecore/network $(all_includes)
+ -I$(top_srcdir)/tdecore/network $(all_includes)
METASOURCES = AUTO
KDE_CXXFLAGS = $(USE_EXCEPTIONS)
diff --git a/kio/misc/ksendbugmail/CMakeLists.txt b/kio/misc/ksendbugmail/CMakeLists.txt
index 133049129..f0e1b99b0 100644
--- a/kio/misc/ksendbugmail/CMakeLists.txt
+++ b/kio/misc/ksendbugmail/CMakeLists.txt
@@ -12,8 +12,8 @@
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_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/kio/misc/ksendbugmail/Makefile.am b/kio/misc/ksendbugmail/Makefile.am
index 2a9b8f3cc..a9b461159 100644
--- a/kio/misc/ksendbugmail/Makefile.am
+++ b/kio/misc/ksendbugmail/Makefile.am
@@ -20,7 +20,7 @@ bin_PROGRAMS = ksendbugmail
INCLUDES= -I$(srcdir)/.. $(all_includes)
ksendbugmail_SOURCES = main.cpp smtp.cpp
-ksendbugmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+ksendbugmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
ksendbugmail_LDADD = ../../libkio.la
METASOURCES = AUTO
diff --git a/kio/misc/kssld/CMakeLists.txt b/kio/misc/kssld/CMakeLists.txt
index ca9438817..14d2de1ac 100644
--- a/kio/misc/kssld/CMakeLists.txt
+++ b/kio/misc/kssld/CMakeLists.txt
@@ -14,10 +14,10 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/kio/kssl
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop
- ${CMAKE_SOURCE_DIR}/kdecore
+ ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kio/kssl
)
@@ -41,7 +41,7 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
- LINK kdeinit_kded-shared
+ LINK tdeinit_kded-shared
DEPENDENCIES dcopidl
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kio/misc/ktelnetservice.cpp b/kio/misc/ktelnetservice.cpp
index 9c8238f74..aa7b3b226 100644
--- a/kio/misc/ktelnetservice.cpp
+++ b/kio/misc/ktelnetservice.cpp
@@ -104,7 +104,7 @@ int main(int argc, char **argv)
cmd << TQString::number(url.port());
}
- app.kdeinitExec(terminal, cmd);
+ app.tdeinitExec(terminal, cmd);
return 0;
}
diff --git a/kio/misc/kwalletd/CMakeLists.txt b/kio/misc/kwalletd/CMakeLists.txt
index eb02085f5..db4f56cb1 100644
--- a/kio/misc/kwalletd/CMakeLists.txt
+++ b/kio/misc/kwalletd/CMakeLists.txt
@@ -12,11 +12,11 @@
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_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
${CMAKE_SOURCE_DIR}/kwallet/client
${CMAKE_SOURCE_DIR}/kwallet/backend
${CMAKE_SOURCE_DIR}/kio/kio
@@ -43,7 +43,7 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
- LINK kdeinit_kded-shared kwalletbackend-shared
+ LINK tdeinit_kded-shared kwalletbackend-shared
DEPENDENCIES dcopidl
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kio/misc/uiserver.cpp b/kio/misc/uiserver.cpp
index bf8b606dc..55da183ee 100644
--- a/kio/misc/uiserver.cpp
+++ b/kio/misc/uiserver.cpp
@@ -37,7 +37,7 @@
#include <kstatusbar.h>
#include <kdebug.h>
#include <kmessagebox.h>
-#include <kdesu/client.h>
+#include <tdesu/client.h>
#include <kwin.h>
#include <kdialog.h>
#include <ksystemtray.h>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-11 11:13:02 +0000