summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--acinclude.m4310
-rw-r--r--configure.in6
-rw-r--r--configure.in.in2
-rw-r--r--kio_ftps/Makefile.am6
-rw-r--r--kio_ftps/ftp.cc242
-rw-r--r--kio_ftps/ftp.h68
-rw-r--r--kio_ftps/ftps.protocol2
7 files changed, 318 insertions, 318 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 50bd53f..8cc298b 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -23,8 +23,8 @@ dnl IMPORTANT NOTE:
dnl Please do not modify this file unless you expect your modifications to be
dnl carried into every other module in the repository.
dnl
-dnl Single-module modifications are best placed in configure.in for kdelibs
-dnl and kdebase or configure.in.in if present.
+dnl Single-module modifications are best placed in configure.in for tdelibs
+dnl and tdebase or configure.in.in if present.
# KDE_PATH_X_DIRECT
dnl Internal subroutine of AC_PATH_X.
@@ -103,41 +103,41 @@ ac_x_libraries=],
[LIBS="$ac_save_LIBS"
# First see if replacing the include by lib works.
# Check X11 before X11Rn because it is often a symlink to the current release.
-for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
- /usr/X11/lib${kdelibsuff} \
- /usr/X11R6/lib${kdelibsuff} \
- /usr/X11R5/lib${kdelibsuff} \
- /usr/X11R4/lib${kdelibsuff} \
+for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \
+ /usr/X11/lib${tdelibsuff} \
+ /usr/X11R6/lib${tdelibsuff} \
+ /usr/X11R5/lib${tdelibsuff} \
+ /usr/X11R4/lib${tdelibsuff} \
\
- /usr/lib${kdelibsuff}/X11 \
- /usr/lib${kdelibsuff}/X11R6 \
- /usr/lib${kdelibsuff}/X11R5 \
- /usr/lib${kdelibsuff}/X11R4 \
+ /usr/lib${tdelibsuff}/X11 \
+ /usr/lib${tdelibsuff}/X11R6 \
+ /usr/lib${tdelibsuff}/X11R5 \
+ /usr/lib${tdelibsuff}/X11R4 \
\
- /usr/local/X11/lib${kdelibsuff} \
- /usr/local/X11R6/lib${kdelibsuff} \
- /usr/local/X11R5/lib${kdelibsuff} \
- /usr/local/X11R4/lib${kdelibsuff} \
+ /usr/local/X11/lib${tdelibsuff} \
+ /usr/local/X11R6/lib${tdelibsuff} \
+ /usr/local/X11R5/lib${tdelibsuff} \
+ /usr/local/X11R4/lib${tdelibsuff} \
\
- /usr/local/lib${kdelibsuff}/X11 \
- /usr/local/lib${kdelibsuff}/X11R6 \
- /usr/local/lib${kdelibsuff}/X11R5 \
- /usr/local/lib${kdelibsuff}/X11R4 \
+ /usr/local/lib${tdelibsuff}/X11 \
+ /usr/local/lib${tdelibsuff}/X11R6 \
+ /usr/local/lib${tdelibsuff}/X11R5 \
+ /usr/local/lib${tdelibsuff}/X11R4 \
\
- /usr/X386/lib${kdelibsuff} \
- /usr/x386/lib${kdelibsuff} \
- /usr/XFree86/lib${kdelibsuff}/X11 \
+ /usr/X386/lib${tdelibsuff} \
+ /usr/x386/lib${tdelibsuff} \
+ /usr/XFree86/lib${tdelibsuff}/X11 \
\
- /usr/lib${kdelibsuff} \
- /usr/local/lib${kdelibsuff} \
- /usr/unsupported/lib${kdelibsuff} \
- /usr/athena/lib${kdelibsuff} \
- /usr/local/x11r5/lib${kdelibsuff} \
- /usr/lpp/Xamples/lib${kdelibsuff} \
- /lib/usr/lib${kdelibsuff}/X11 \
+ /usr/lib${tdelibsuff} \
+ /usr/local/lib${tdelibsuff} \
+ /usr/unsupported/lib${tdelibsuff} \
+ /usr/athena/lib${tdelibsuff} \
+ /usr/local/x11r5/lib${tdelibsuff} \
+ /usr/lpp/Xamples/lib${tdelibsuff} \
+ /lib/usr/lib${tdelibsuff}/X11 \
\
- /usr/openwin/lib${kdelibsuff} \
- /usr/openwin/share/lib${kdelibsuff} \
+ /usr/openwin/lib${tdelibsuff} \
+ /usr/openwin/share/lib${tdelibsuff} \
; \
do
dnl Don't even attempt the hair of trying to link an X program!
@@ -371,24 +371,24 @@ AC_DEFUN([KDE_1_CHECK_PATHS],
fi
AC_MSG_CHECKING([for KDE libraries installed])
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
+ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
if AC_TRY_EVAL(ac_link) && test -s conftest; then
AC_MSG_RESULT(yes)
else
AC_MSG_ERROR([your system fails at linking a small KDE application!
Check, if your compiler is installed correctly and if you have used the
-same compiler to compile Qt and kdelibs as you did use now.
+same compiler to compile Qt and tdelibs as you did use now.
For more details about this problem, look at the end of config.log.])
fi
-if eval `KDEDIR= ./conftest 2>&5`; then
+if eval `TDEDIR= ./conftest 2>&5`; then
kde_result=done
else
kde_result=problems
fi
-KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
+TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
kde_have_all_paths=yes
KDE_SET_PATHS($kde_result)
@@ -547,11 +547,11 @@ Please check whether you installed aRts correctly or use
AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
[
kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
- test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
- if test -n "$KDEDIRS"; then
+ test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
+ if test -n "$TDEDIRS"; then
kde_save_IFS=$IFS
IFS=:
- for dir in $KDEDIRS; do
+ for dir in $TDEDIRS; do
kde_default_bindirs="$dir/bin $kde_default_bindirs "
done
IFS=$kde_save_IFS
@@ -597,18 +597,18 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi
if test -n "$kde32ornewer"; then
- KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+ KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
fi
if test -n "$kde33ornewer"; then
- KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)])
+ KDE_FIND_PATH(maketdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(maketdewidgets)])
AC_SUBST(MAKEKDEWIDGETS)
fi
KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then
kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
- test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
+ test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs"
AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
if test "$KDE_XSL_STYLESHEET" = "NO"; then
KDE_XSL_STYLESHEET=""
@@ -705,7 +705,7 @@ AC_SUBST(kde_templatesdir)
AC_SUBST(kde_servicesdir)
AC_SUBST(kde_servicetypesdir)
AC_SUBST(kde_moduledir)
-AC_SUBST(kdeinitdir, '$(kde_moduledir)')
+AC_SUBST(tdeinitdir, '$(kde_moduledir)')
AC_SUBST(kde_styledir)
AC_SUBST(kde_widgetdir)
if test "$kde_qtver" = 1; then
@@ -932,7 +932,7 @@ mips-sgi-irix6*)
ac_x_includes="."
fi
if test -z "$ac_x_libraries"; then
- ac_x_libraries="/usr/lib${kdelibsuff}"
+ ac_x_libraries="/usr/lib${tdelibsuff}"
fi
esac
#from now on we use our own again
@@ -1055,7 +1055,7 @@ elif test "$kde_use_qt_emb" = "yes"; then
x_includes=""
x_libraries=""
elif test "$kde_use_qt_mac" = "yes"; then
- dnl We're using QT/Mac (I use QT_MAC so that qglobal.h doesn't *have* to
+ dnl We're using QT/Mac (I use QT_MAC so that ntqglobal.h doesn't *have* to
dnl be included to get the information) --Sam
CXXFLAGS="$CXXFLAGS -DQT_MAC -no-cpp-precomp"
CFLAGS="$CFLAGS -DQT_MAC -no-cpp-precomp"
@@ -1087,19 +1087,19 @@ AC_DEFUN([KDE_PRINT_QT_PROGRAM],
AC_REQUIRE([KDE_USE_QT])
cat > conftest.$ac_ext <<EOF
#include "confdefs.h"
-#include <qglobal.h>
-#include <qapplication.h>
+#include <ntqglobal.h>
+#include <ntqapplication.h>
EOF
if test "$kde_qtver" = "2"; then
cat >> conftest.$ac_ext <<EOF
-#include <qevent.h>
-#include <qstring.h>
-#include <qstyle.h>
+#include <ntqevent.h>
+#include <ntqstring.h>
+#include <ntqstyle.h>
EOF
if test $kde_qtsubver -gt 0; then
cat >> conftest.$ac_ext <<EOF
-#if QT_VERSION < 210
+#if TQT_VERSION < 210
#error 1
#endif
EOF
@@ -1108,8 +1108,8 @@ fi
if test "$kde_qtver" = "3"; then
cat >> conftest.$ac_ext <<EOF
-#include <qcursor.h>
-#include <qstylefactory.h>
+#include <ntqcursor.h>
+#include <ntqstylefactory.h>
#include <private/qucomextra_p.h>
EOF
fi
@@ -1196,22 +1196,22 @@ fi
if test -z "$3"; then
if test $kde_qtver = 3; then
if test $kde_qtsubver -gt 0; then
- kde_qt_verstring="QT_VERSION >= 0x03@VER@00 && QT_VERSION < 0x040000"
+ kde_qt_verstring="TQT_VERSION >= 0x03@VER@00 && TQT_VERSION < 0x040000"
qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'`
kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"`
else
- kde_qt_verstring="QT_VERSION >= 300 && QT_VERSION < 0x040000"
+ kde_qt_verstring="TQT_VERSION >= 300 && TQT_VERSION < 0x040000"
fi
fi
if test $kde_qtver = 2; then
if test $kde_qtsubver -gt 0; then
- kde_qt_verstring="QT_VERSION >= 222"
+ kde_qt_verstring="TQT_VERSION >= 222"
else
- kde_qt_verstring="QT_VERSION >= 200"
+ kde_qt_verstring="TQT_VERSION >= 200"
fi
fi
if test $kde_qtver = 1; then
- kde_qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200"
+ kde_qt_verstring="TQT_VERSION >= 142 && TQT_VERSION < 200"
fi
else
kde_qt_verstring="$3"
@@ -1320,7 +1320,7 @@ AC_ARG_ENABLE(
USING_QT_MT=""
dnl ------------------------------------------------------------------------
-dnl If we not get --disable-qt-mt then adjust some vars for the host.
+dnl If we not get --disable-tqt-mt then adjust some vars for the host.
dnl ------------------------------------------------------------------------
KDE_MT_LDFLAGS=
@@ -1378,7 +1378,7 @@ dnl ------------------------------------------------------------
fi
dnl ------------------------------------------------------------------------
-dnl If we got --enable-qt-mt then adjust the Qt library name for the host.
+dnl If we got --enable-tqt-mt then adjust the Qt library name for the host.
dnl ------------------------------------------------------------------------
if test "x$kde_use_qt_mt" = "xyes"; then
@@ -1413,7 +1413,7 @@ qt_includes=""
AC_ARG_WITH(qt-dir,
AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
[ ac_qt_includes="$withval"/include
- ac_qt_libraries="$withval"/lib${kdelibsuff}
+ ac_qt_libraries="$withval"/lib${tdelibsuff}
ac_qt_bindir="$withval"/bin
])
@@ -1444,9 +1444,9 @@ if test ! "$ac_qt_includes" = "NO"; then
fi
if test "$kde_qtver" != "1"; then
- kde_qt_header=qstyle.h
+ kde_qt_header=ntqstyle.h
else
- kde_qt_header=qglobal.h
+ kde_qt_header=ntqglobal.h
fi
AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir)
@@ -1454,7 +1454,7 @@ ac_qt_includes="$qt_incdir"
qt_libdirs=""
for dir in $kde_qt_dirs; do
- qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
+ qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir"
done
qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
if test ! "$ac_qt_libraries" = "NO"; then
@@ -1639,11 +1639,11 @@ rm -f actest.ui actest.cpp
AC_MSG_RESULT([$kde_cv_uic_plugins])
if test "$kde_cv_uic_plugins" != yes; then
AC_MSG_ERROR([
-you need to install kdelibs first.
+you need to install tdelibs first.
-If you did install kdelibs, then the Qt version that is picked up by
-this configure is not the same version you used to compile kdelibs.
-The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the
+If you did install tdelibs, then the Qt version that is picked up by
+this configure is not the same version you used to compile tdelibs.
+The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the
_same Qt version_, compiled with the _same compiler_ and the same Qt
configuration settings.
])
@@ -1780,16 +1780,16 @@ AC_CACHE_VAL(ac_cv_have_kde,
if test "$kde_qtver" = 1; then
kde_check_header="ksock.h"
- kde_check_lib="libkdecore.la"
+ kde_check_lib="libtdecore.la"
else
kde_check_header="ksharedptr.h"
- kde_check_lib="libkio.la"
+ kde_check_lib="libtdeio.la"
fi
if test -z "$1"; then
-kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
-test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
+kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
+test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"
kde_incdirs="$ac_kde_includes $kde_incdirs"
AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
ac_kde_includes="$kde_incdir"
@@ -1800,8 +1800,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
So, check this please and use another prefix!])
fi
-kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
-test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
+kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
+test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs"
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
ac_kde_libraries="$kde_libdir"
@@ -1819,7 +1819,7 @@ fi
if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
AC_MSG_ERROR([
I can't find the designer plugins. These are required and should have been installed
-by kdelibs])
+by tdelibs])
fi
if test -n "$kde_widgetdir"; then
@@ -1834,7 +1834,7 @@ else
ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
fi
-else dnl test -z $1, e.g. from kdelibs
+else dnl test -z $1, e.g. from tdelibs
ac_cv_have_kde="have_kde=no"
@@ -1974,20 +1974,20 @@ cat > conftest.$ac_ext <<EOF
#include <kapp.h>
int main() {
- printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
- printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
- printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
- printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
- printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
- printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
- printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
- printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
- printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
- printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
+ printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
+ printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
+ printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
+ printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
+ printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
+ printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
+ printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
+ printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
+ printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
+ printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
printf("kde_wallpaperdir=\\"%s\\"\n",
- KApplication::kde_wallpaperdir().data());
- printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
- printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
+ TDEApplication::kde_wallpaperdir().data());
+ printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
+ printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
printf("kde_moduledir=\\"/tmp/dummy\\"\n");
@@ -2025,11 +2025,11 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
kde_cxxflags_safe="$CXXFLAGS"
LIBS="-lkde-qt-addon $LIBQT $LIBS"
- CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes"
+ CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes"
LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
AC_TRY_LINK([
- #include <qdom.h>
+ #include <ntqdom.h>
],
[
QDomDocument doc;
@@ -2059,48 +2059,48 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
if test $kde_qtver = 3; then
case $host in
- *cygwin*) lib_kded="-lkdeinit_kded" ;;
+ *cygwin*) lib_kded="-ltdeinit_kded" ;;
*) lib_kded="" ;;
esac
AC_SUBST(LIB_KDED, $lib_kded)
- AC_SUBST(LIB_KDECORE, "-lkdecore")
- AC_SUBST(LIB_KDEUI, "-lkdeui")
- AC_SUBST(LIB_KIO, "-lkio")
+ AC_SUBST(LIB_TDECORE, "-ltdecore")
+ AC_SUBST(LIB_TDEUI, "-ltdeui")
+ AC_SUBST(LIB_KIO, "-ltdeio")
AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab")
- AC_SUBST(LIB_KABC, "-lkabc")
- AC_SUBST(LIB_KHTML, "-lkhtml")
- AC_SUBST(LIB_KSPELL, "-lkspell")
- AC_SUBST(LIB_KPARTS, "-lkparts")
- AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
- AC_SUBST(LIB_KUTILS, "-lkutils")
- AC_SUBST(LIB_KDEPIM, "-lkdepim")
- AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+ AC_SUBST(LIB_KABC, "-ltdeabc")
+ AC_SUBST(LIB_TDEHTML, "-ltdehtml")
+ AC_SUBST(LIB_KSPELL, "-ltdespell")
+ AC_SUBST(LIB_KPARTS, "-ltdeparts")
+ AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
+ AC_SUBST(LIB_KUTILS, "-ltdeutils")
+ AC_SUBST(LIB_TDEPIM, "-ltdepim")
+ AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
- AC_SUBST(LIB_KDNSSD, "-lkdnssd")
- AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+ AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+ AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
# these are for backward compatibility
- AC_SUBST(LIB_KSYCOCA, "-lkio")
- AC_SUBST(LIB_KFILE, "-lkio")
+ AC_SUBST(LIB_KSYCOCA, "-ltdeio")
+ AC_SUBST(LIB_KFILE, "-ltdeio")
elif test $kde_qtver = 2; then
- AC_SUBST(LIB_KDECORE, "-lkdecore")
- AC_SUBST(LIB_KDEUI, "-lkdeui")
- AC_SUBST(LIB_KIO, "-lkio")
- AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+ AC_SUBST(LIB_TDECORE, "-ltdecore")
+ AC_SUBST(LIB_TDEUI, "-ltdeui")
+ AC_SUBST(LIB_KIO, "-ltdeio")
+ AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb")
- AC_SUBST(LIB_KFILE, "-lkfile")
+ AC_SUBST(LIB_KFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab")
- AC_SUBST(LIB_KHTML, "-lkhtml")
- AC_SUBST(LIB_KSPELL, "-lkspell")
- AC_SUBST(LIB_KPARTS, "-lkparts")
- AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
+ AC_SUBST(LIB_TDEHTML, "-ltdehtml")
+ AC_SUBST(LIB_KSPELL, "-ltdespell")
+ AC_SUBST(LIB_KPARTS, "-ltdeparts")
+ AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else
- AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
- AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
- AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
- AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
- AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
+ AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
+ AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
+ AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
+ AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
+ AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
fi
])
@@ -2165,7 +2165,7 @@ if test "x$kde_cv_func_$1" = xyes; then
else
case "$1" in
setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
- kde_cv_proto_$1="yes - in libkdefakes"
+ kde_cv_proto_$1="yes - in libtdefakes"
;;
*)
kde_cv_proto_$1=unknown
@@ -2484,7 +2484,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
AC_MSG_RESULT(yes)
AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
else
- AC_MSG_ERROR(You need giflib30. Please install the kdesupport package)
+ AC_MSG_ERROR(You need giflib30. Please install the tdesupport package)
fi
])
@@ -2548,7 +2548,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
test "x$jpeg_incdir" = xNO && jpeg_incdir=
dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
dnl if only one is missing, it means a configuration error, but we still
dnl only warn
if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -2596,7 +2596,7 @@ LIBS=`echo $LIBS | sed "s/$LIBJPEG//"`
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
AC_TRY_LINK(
-[#include <qapplication.h>],
+[#include <ntqapplication.h>],
[
int argc;
char** argv;
@@ -3302,7 +3302,7 @@ AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY],
AC_TRY_COMPILE(
[
-#include <qglobal.h>
+#include <ntqglobal.h>
#if Q_EXPORT - 0 != 0
/* if this compiles, then Q_EXPORT is undefined */
/* if Q_EXPORT is nonempty, this will break compilation */
@@ -3352,7 +3352,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
AC_SUBST(KDE_PLUGIN)
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
AC_SUBST(KDE_CHECK_PLUGIN)
@@ -3362,29 +3362,29 @@ AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch config
AC_DEFUN([KDE_CHECK_LIB64],
[
- kdelibsuff="$kde_libs_suffix"
- if test -z "$kdelibsuff"; then
- kdelibsuff=no
+ tdelibsuff="$kde_libs_suffix"
+ if test -z "$tdelibsuff"; then
+ tdelibsuff=no
fi
AC_ARG_ENABLE(libsuffix,
AC_HELP_STRING([--enable-libsuffix],
[/lib directory suffix (64,32,none[=default])]),
- kdelibsuff=$enableval)
+ tdelibsuff=$enableval)
# TODO: add an auto case that compiles a little C app to check
# where the glibc is
- if test "$kdelibsuff" = "no"; then
- kdelibsuff=
+ if test "$tdelibsuff" = "no"; then
+ tdelibsuff=
fi
- if test -z "$kdelibsuff"; then
+ if test -z "$tdelibsuff"; then
AC_MSG_RESULT([not using lib directory suffix])
AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories)
else
if test "$libdir" = '${exec_prefix}/lib'; then
- libdir="$libdir${kdelibsuff}"
+ libdir="$libdir${tdelibsuff}"
AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms
fi
- AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories)
- AC_MSG_RESULT([using lib directory suffix $kdelibsuff])
+ AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories)
+ AC_MSG_RESULT([using lib directory suffix $tdelibsuff])
fi
])
@@ -3402,7 +3402,7 @@ AC_CANONICAL_SYSTEM
AC_ARG_PROGRAM
AM_INIT_AUTOMAKE($1, $2)
AM_DISABLE_LIBRARIES
-AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
+AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
AC_CHECK_COMPILERS
KDE_PROG_LIBTOOL
AM_KDE_WITH_NLS
@@ -4411,7 +4411,7 @@ fi
PYTHONINC=-I$python_incdir
-python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
+python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs"
AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
if test ! -r $python_libdir/libpython$version.so; then
AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
@@ -4542,7 +4542,7 @@ CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
AC_TRY_RUN(dnl
[
#include <qimageio.h>
-#include <qstring.h>
+#include <ntqstring.h>
int main() {
QString t = "hallo";
t.fill('t');
@@ -4799,14 +4799,14 @@ AC_DEFUN([KDE_CONF_FILES],
AC_SUBST(CONF_FILES)
])dnl
-dnl This sets the prefix, for arts and kdelibs
+dnl This sets the prefix, for arts and tdelibs
dnl Do NOT use in any other module.
-dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde
+dnl It only looks at --prefix, TDEDIR and falls back to /usr/local/kde
AC_DEFUN([KDE_SET_PREFIX_CORE],
[
unset CDPATH
- dnl make $KDEDIR the default for the installation
- AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
+ dnl make $TDEDIR the default for the installation
+ AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
if test "x$prefix" = "xNONE"; then
prefix=$ac_default_prefix
@@ -4830,25 +4830,25 @@ AC_DEFUN([KDE_SET_PREFIX],
unset CDPATH
dnl We can't give real code to that macro, only a value.
dnl It only matters for --help, since we set the prefix in this function anyway.
- AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix})
+ AC_PREFIX_DEFAULT(${TDEDIR:-the kde prefix})
KDE_SET_DEFAULT_BINDIRS
if test "x$prefix" = "xNONE"; then
- dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it
- KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
+ dnl no prefix given: look for tde-config in the PATH and deduce the prefix from it
+ KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
else
- dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH
+ dnl prefix given: look for tde-config, preferrably in prefix, otherwise in PATH
kde_save_PATH="$PATH"
PATH="$exec_prefix/bin:$prefix/bin:$PATH"
- KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
+ KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
PATH="$kde_save_PATH"
fi
kde_libs_prefix=`$KDECONFIG --prefix`
if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
- AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
+ AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs.
This means it has been moved since you installed it.
- This won't work. Please recompile kdelibs for the new prefix.
+ This won't work. Please recompile tdelibs for the new prefix.
])
fi
kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
@@ -4857,7 +4857,7 @@ AC_DEFUN([KDE_SET_PREFIX],
AC_MSG_CHECKING([where to install])
if test "x$prefix" = "xNONE"; then
prefix=$kde_libs_prefix
- AC_MSG_RESULT([$prefix (as returned by kde-config)])
+ AC_MSG_RESULT([$prefix (as returned by tde-config)])
else
dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different
given_prefix=$prefix
@@ -5387,7 +5387,7 @@ if test "${with_qt_dir+set}" = set; then
kde_qtdir="$with_qt_dir"
fi
-AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR)
+AC_FIND_FILE(ntqsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR)
AC_MSG_RESULT($QTDOCDIR)
AC_SUBST(QTDOCDIR)
@@ -5408,7 +5408,7 @@ AC_SUBST(DOXYGEN_PROJECT_NAME)
AC_SUBST(DOXYGEN_PROJECT_NUMBER)
KDE_HAS_DOXYGEN=no
-if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/qsql.html; then
+if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/ntqsql.html; then
KDE_HAS_DOXYGEN=yes
fi
AC_SUBST(KDE_HAS_DOXYGEN)
@@ -5514,7 +5514,7 @@ ssl_includes=""
AC_ARG_WITH(ssl-dir,
AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]),
[ ac_ssl_includes="$withval"/include
- ac_ssl_libraries="$withval"/lib$kdelibsuff
+ ac_ssl_libraries="$withval"/lib$tdelibsuff
])
want_ssl=yes
@@ -5534,7 +5534,7 @@ AC_CACHE_VAL(ac_cv_have_ssl,
AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir)
ac_ssl_includes="$ssl_incdir"
- ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs"
+ ssl_libdirs="/usr/lib$tdelibsuff /usr/local/lib$tdelibsuff /usr/ssl/lib$tdelibsuff /usr/local/ssl/lib$tdelibsuff $libdir $prefix/lib$tdelibsuff $exec_prefix/lib$tdelibsuff $kde_extra_libs"
if test ! "$ac_ssl_libraries" = "NO"; then
ssl_libdirs="$ac_ssl_libraries $ssl_libdirs"
fi
diff --git a/configure.in b/configure.in
index cb0121f..eabafda 100644
--- a/configure.in
+++ b/configure.in
@@ -40,7 +40,7 @@ dnl Perform program name transformation
AC_ARG_PROGRAM
dnl Automake doc recommends to do this only here. (Janos)
-AM_INIT_AUTOMAKE(kio-ftps, 0.1) dnl searches for some needed programs
+AM_INIT_AUTOMAKE(tdeio-ftps, 0.1) dnl searches for some needed programs
KDE_SET_PREFIX
@@ -85,13 +85,13 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
# And if so, warn when they don't match
if test "$kde_libs_prefix" != "$given_prefix"; then
# And if kde doesn't know about the prefix yet
- echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
+ echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
if test $? -ne 0; then
echo ""
echo "Warning: you chose to install this package in $given_prefix,"
echo "but KDE was found in $kde_libs_prefix."
echo "For this to work, you will need to tell KDE about the new prefix, by ensuring"
- echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix"
+ echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix"
echo "Then restart KDE."
echo ""
fi
diff --git a/configure.in.in b/configure.in.in
index 1b52057..6b4b2db 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -1,4 +1,4 @@
#MIN_CONFIG
-AM_INIT_AUTOMAKE(kio-ftps, 0.1)
+AM_INIT_AUTOMAKE(tdeio-ftps, 0.1)
diff --git a/kio_ftps/Makefile.am b/kio_ftps/Makefile.am
index e8dc265..c0f74aa 100644
--- a/kio_ftps/Makefile.am
+++ b/kio_ftps/Makefile.am
@@ -11,7 +11,7 @@ kde_module_LTLIBRARIES = kio_ftps.la
# Die Quellen fr kio_hello.la (Punkt durch _ ersetzt)
kio_ftps_la_SOURCES = ftp.cc ftp.h
-# Die Bibliothek libksycoca wird fr Slaves ben�igt
+# Die Bibliothek libtdesycoca wird fr Slaves ben�igt
kio_ftps_la_LIBADD = $(LIB_KSYCOCA)
# Die Link-Pfade inklusive all_libraries (siehe oben)
@@ -19,8 +19,8 @@ kio_ftps_la_LIBADD = $(LIB_KSYCOCA)
# nicht wirklich als Bibliothek benutzt wird. $(KDE_PLUGIN) enth�t
# Standardflags fr KDE Module, z.B. um die Versionsnummern zu unter-
# drcken
-kio_ftps_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) $(LIB_KDECORE)
+kio_ftps_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE)
-# kde_services_ installiert in kde_servicesdir ($KDEDIR/share/services)
+# kde_services_ installiert in kde_servicesdir ($TDEDIR/share/services)
# _DATA sind einfache Dateien
kde_services_DATA = ftps.protocol
diff --git a/kio_ftps/ftp.cc b/kio_ftps/ftp.cc
index 2dad336..1eff60c 100644
--- a/kio_ftps/ftp.cc
+++ b/kio_ftps/ftp.cc
@@ -51,16 +51,16 @@
#include <time.h>
#endif
-#include <qdir.h>
+#include <ntqdir.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kinstance.h>
#include <kmimemagic.h>
#include <kmimetype.h>
#include <ksockaddr.h>
-#include <kio/ioslave_defaults.h>
-#include <kio/slaveconfig.h>
+#include <tdeio/ioslave_defaults.h>
+#include <tdeio/slaveconfig.h>
#include <kremoteencoding.h>
#include <klargefile.h>
@@ -71,9 +71,9 @@
#endif
// JPF: a remark on coding style (2004-03-06):
-// Some calls to QString::fromLatin1() were removed from the code. In most places
-// the KDE code relies on implicit creation of QStrings. Also Qt has a lot of
-// const char* overloads, so that using QString::fromLatin1() can be ineffectient!
+// Some calls to TQString::fromLatin1() were removed from the code. In most places
+// the KDE code relies on implicit creation of TQStrings. Also TQt has a lot of
+// const char* overloads, so that using TQString::fromLatin1() can be ineffectient!
#define FTP_LOGIN "anonymous"
#define FTP_PASSWD "anonymous@"
@@ -131,17 +131,17 @@ namespace KIO {
}
}
-KIO::filesize_t Ftp::UnknownSize = (KIO::filesize_t)-1;
+TDEIO::filesize_t Ftp::UnknownSize = (TDEIO::filesize_t)-1;
-using namespace KIO;
+using namespace TDEIO;
extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); }
int kdemain( int argc, char **argv )
{
- KLocale::setMainCatalogue("kdelibs");
- KInstance instance( "kio_ftp" );
- ( void ) KGlobal::locale();
+ TDELocale::setMainCatalogue("tdelibs");
+ TDEInstance instance( "kio_ftp" );
+ ( void ) TDEGlobal::locale();
kdDebug(7102) << "Starting " << getpid() << endl;
@@ -247,7 +247,7 @@ int FtpSocket::connectSocket(int iTimeOutSec, bool bControl)
if(iCon < 0)
{ int iErrorCode = (status() == IO_LookupError)
? ERR_UNKNOWN_HOST : ERR_COULD_NOT_CONNECT;
- QString strMsg = KExtendedSocket::strError(status(), systemError());
+ TQString strMsg = KExtendedSocket::strError(status(), systemError());
strMsg.prepend("connect failed (code %1): ");
return errorMessage(iErrorCode, strMsg.arg(iCon).latin1());
}
@@ -301,7 +301,7 @@ bool FtpSocket::sslConnect()
// Ftp
//===============================================================================
-Ftp::Ftp( const QCString &prot, const QCString &pool, const QCString &app )
+Ftp::Ftp( const TQCString &prot, const TQCString &pool, const TQCString &app )
: SlaveBase( prot, pool, app )
{
// init the socket data
@@ -424,8 +424,8 @@ void Ftp::closeConnection()
ftpCloseControlConnection();
}
-void Ftp::setHost( const QString& _host, int _port, const QString& _user,
- const QString& _pass )
+void Ftp::setHost( const TQString& _host, int _port, const TQString& _user,
+ const TQString& _pass )
{
kdDebug(7102) << "Ftp::setHost (" << getpid() << "): " << _host << endl;
@@ -463,16 +463,16 @@ bool Ftp::ftpOpenConnection (LoginMode loginMode)
if ( m_host.isEmpty() )
{
- error( ERR_UNKNOWN_HOST, QString::null );
+ error( ERR_UNKNOWN_HOST, TQString::null );
return false;
}
assert( !m_bLoggedOn );
- m_initialPath = QString::null;
- m_currentPath = QString::null;
+ m_initialPath = TQString::null;
+ m_currentPath = TQString::null;
- QString host = m_bUseProxy ? m_proxyURL.host() : m_host;
+ TQString host = m_bUseProxy ? m_proxyURL.host() : m_host;
unsigned short int port = m_bUseProxy ? m_proxyURL.port() : m_port;
if (!ftpOpenControlConnection(host, port) )
@@ -497,7 +497,7 @@ bool Ftp::ftpOpenConnection (LoginMode loginMode)
*
* @return true on success.
*/
-bool Ftp::ftpOpenControlConnection( const QString &host, unsigned short int port )
+bool Ftp::ftpOpenControlConnection( const TQString &host, unsigned short int port )
{
if ( port == 0 ) {
struct servent *pse;
@@ -510,7 +510,7 @@ bool Ftp::ftpOpenControlConnection( const QString &host, unsigned short int port
// implicitly close, then try to open a new connection ...
closeConnection();
int iErrorCode = ERR_OUT_OF_MEMORY;
- QString sErrorMsg;
+ TQString sErrorMsg;
m_control = new FtpSocket("CNTL");
if(m_control != NULL)
{
@@ -581,12 +581,12 @@ bool Ftp::ftpLogin()
assert( !m_bLoggedOn );
- QString user = m_user;
- QString pass = m_pass;
+ TQString user = m_user;
+ TQString pass = m_pass;
if ( config()->readBoolEntry("EnableAutoLogin") )
{
- QString au = config()->readEntry("autoLoginUser");
+ TQString au = config()->readEntry("autoLoginUser");
if ( !au.isEmpty() )
{
user = au;
@@ -608,7 +608,7 @@ bool Ftp::ftpLogin()
info.url.setPort( m_port );
info.url.setUser( user );
- QCString tempbuf;
+ TQCString tempbuf;
int failedAuth = 0;
do
@@ -618,7 +618,7 @@ bool Ftp::ftpLogin()
// but no password.
if ( failedAuth > 0 || (!user.isEmpty() && pass.isEmpty()) )
{
- QString errorMsg;
+ TQString errorMsg;
kdDebug(7102) << "Prompting user for login info..." << endl;
// Ask user if we should retry after when login fails!
@@ -661,7 +661,7 @@ bool Ftp::ftpLogin()
if ( m_port > 0 && m_port != DEFAULT_FTP_PORT )
{
tempbuf += ':';
- tempbuf += QString::number(m_port).latin1();
+ tempbuf += TQString::number(m_port).latin1();
}
}
@@ -731,7 +731,7 @@ bool Ftp::ftpLogin()
return false;
}
- QString sTmp = remoteEncoding()->decode( ftpResponse(3) );
+ TQString sTmp = remoteEncoding()->decode( ftpResponse(3) );
int iBeg = sTmp.find('"');
int iEnd = sTmp.findRev('"');
if(iBeg > 0 && iBeg < iEnd)
@@ -746,18 +746,18 @@ bool Ftp::ftpLogin()
void Ftp::ftpAutoLoginMacro ()
{
- QString macro = metaData( "autoLoginMacro" );
+ TQString macro = metaData( "autoLoginMacro" );
if ( macro.isEmpty() )
return;
- QStringList list = QStringList::split('\n', macro);
+ TQStringList list = TQStringList::split('\n', macro);
- for(QStringList::Iterator it = list.begin() ; it != list.end() ; ++it )
+ for(TQStringList::Iterator it = list.begin() ; it != list.end() ; ++it )
{
if ( (*it).startsWith("init") )
{
- list = QStringList::split( '\\', macro);
+ list = TQStringList::split( '\\', macro);
it = list.begin();
++it; // ignore the macro name
@@ -784,7 +784,7 @@ void Ftp::ftpAutoLoginMacro ()
*
* return true if any response received, false on error
*/
-bool Ftp::ftpSendCmd( const QCString& cmd, int maxretries )
+bool Ftp::ftpSendCmd( const TQCString& cmd, int maxretries )
{
assert(m_control != NULL); // must have control connection socket
@@ -804,7 +804,7 @@ bool Ftp::ftpSendCmd( const QCString& cmd, int maxretries )
kdDebug(7102) << "send> pass [protected]" << endl;
// Send the message...
- QCString buf = cmd;
+ TQCString buf = cmd;
buf += "\r\n"; // Yes, must use CR/LF - see http://cr.yp.to/ftp/request.html
int num = m_control->write(buf.data(), buf.length());
@@ -889,7 +889,7 @@ int Ftp::ftpOpenPASVDataConnection()
assert(m_data == NULL); // ... but no data connection
// Check that we can do PASV
- const KSocketAddress *sa = m_control->peerAddress();
+ const TDESocketAddress *sa = m_control->peerAddress();
if (sa != NULL && sa->family() != PF_INET)
return ERR_INTERNAL; // no PASV for non-PF_INET connections
@@ -928,7 +928,7 @@ int Ftp::ftpOpenPASVDataConnection()
}
// Make hostname and port number ...
- QString host;
+ TQString host;
host.sprintf("%d.%d.%d.%d", i[0], i[1], i[2], i[3]);
int port = i[4] << 8 | i[5];
@@ -947,7 +947,7 @@ int Ftp::ftpOpenEPSVDataConnection()
assert(m_control != NULL); // must have control connection socket
assert(m_data == NULL); // ... but no data connection
- const KSocketAddress *sa = m_control->peerAddress();
+ const TDESocketAddress *sa = m_control->peerAddress();
int portnum;
// we are sure sa is a KInetSocketAddress, because we asked for KExtendedSocket::inetSocket
// when we connected
@@ -1006,10 +1006,10 @@ int Ftp::ftpOpenEPRTDataConnection()
if (sin == NULL)
return ERR_INTERNAL;
- // QString command = QString::fromLatin1("eprt |%1|%2|%3|").arg(sin->ianaFamily())
+ // TQString command = TQString::fromLatin1("eprt |%1|%2|%3|").arg(sin->ianaFamily())
// .arg(sin->nodeName())
// .arg(sin->port());
- QCString command;
+ TQCString command;
command.sprintf("eprt |%d|%s|%d|", sin->ianaFamily(),
sin->nodeName().latin1(), sin->port());
@@ -1121,7 +1121,7 @@ int Ftp::ftpOpenPortDataConnection()
pAddr = static_cast<const KInetSocketAddress*>(m_data->localAddress());
struct sockaddr* psa = (struct sockaddr*)pAddr->addressV4();
unsigned char* pData = (unsigned char*)(psa->sa_data);
- QCString portCmd;
+ TQCString portCmd;
portCmd.sprintf("port %d,%d,%d,%d,%d,%d",
pData[2], pData[3], pData[4], pData[5], pData[0], pData[1]);
if( ftpSendCmd(portCmd) && (m_iRespType == 2) )
@@ -1164,8 +1164,8 @@ int Ftp::ftpAcceptConnect()
return (m_data->server() != -1);
}
-bool Ftp::ftpOpenCommand( const char *_command, const QString & _path, char _mode,
- int errorcode, KIO::fileoffset_t _offset )
+bool Ftp::ftpOpenCommand( const char *_command, const TQString & _path, char _mode,
+ int errorcode, TDEIO::fileoffset_t _offset )
{
bool encSucc = false;
if (m_prot == "ftps")
@@ -1210,8 +1210,8 @@ bool Ftp::ftpOpenCommand( const char *_command, const QString & _path, char _mod
}
}
- QCString tmp = _command;
- QString errormessage;
+ TQCString tmp = _command;
+ TQString errormessage;
if ( !_path.isEmpty() ) {
tmp += " ";
@@ -1279,13 +1279,13 @@ void Ftp::mkdir( const KURL & url, int permissions )
if( !ftpOpenConnection(loginImplicit) )
return;
- QString path = remoteEncoding()->encode(url);
- QCString buf = "mkd ";
+ TQString path = remoteEncoding()->encode(url);
+ TQCString buf = "mkd ";
buf += remoteEncoding()->encode(path);
if( !ftpSendCmd( buf ) || (m_iRespType != 2) )
{
- QString currentPath( m_currentPath );
+ TQString currentPath( m_currentPath );
// Check whether or not mkdir failed because
// the directory already exists...
@@ -1322,7 +1322,7 @@ void Ftp::rename( const KURL& src, const KURL& dst, bool overwrite )
error( ERR_CANNOT_RENAME, src.path() );
}
-bool Ftp::ftpRename( const QString & src, const QString & dst, bool /* overwrite */ )
+bool Ftp::ftpRename( const TQString & src, const TQString & dst, bool /* overwrite */ )
{
// TODO honor overwrite
assert( m_bLoggedOn );
@@ -1331,12 +1331,12 @@ bool Ftp::ftpRename( const QString & src, const QString & dst, bool /* overwrite
if( !ftpFolder(src.left(pos+1), false) )
return false;
- QCString from_cmd = "RNFR ";
+ TQCString from_cmd = "RNFR ";
from_cmd += remoteEncoding()->encode(src.mid(pos+1));
if( !ftpSendCmd( from_cmd ) || (m_iRespType != 3) )
return false;
- QCString to_cmd = "RNTO ";
+ TQCString to_cmd = "RNTO ";
to_cmd += remoteEncoding()->encode(dst);
if( !ftpSendCmd( to_cmd ) || (m_iRespType != 2) )
return false;
@@ -1354,7 +1354,7 @@ void Ftp::del( const KURL& url, bool isfile )
if ( !isfile )
ftpFolder(remoteEncoding()->directory(url), false); // ignore errors
- QCString cmd = isfile ? "DELE " : "RMD ";
+ TQCString cmd = isfile ? "DELE " : "RMD ";
cmd += remoteEncoding()->encode(url);
if( !ftpSendCmd( cmd ) || (m_iRespType != 2) )
@@ -1363,7 +1363,7 @@ void Ftp::del( const KURL& url, bool isfile )
finished();
}
-bool Ftp::ftpChmod( const QString & path, int permissions )
+bool Ftp::ftpChmod( const TQString & path, int permissions )
{
assert( m_bLoggedOn );
@@ -1372,7 +1372,7 @@ bool Ftp::ftpChmod( const QString & path, int permissions )
// we need to do bit AND 777 to get permissions, in case
// we were sent a full mode (unlikely)
- QCString cmd;
+ TQCString cmd;
cmd.sprintf("SITE CHMOD %o ", permissions & 511 );
cmd += remoteEncoding()->encode(path);
@@ -1399,7 +1399,7 @@ void Ftp::chmod( const KURL & url, int permissions )
finished();
}
-void Ftp::ftpCreateUDSEntry( const QString & filename, FtpEntry& ftpEnt, UDSEntry& entry, bool isDir )
+void Ftp::ftpCreateUDSEntry( const TQString & filename, FtpEntry& ftpEnt, UDSEntry& entry, bool isDir )
{
assert(entry.count() == 0); // by contract :-)
UDSAtom atom;
@@ -1465,20 +1465,20 @@ void Ftp::ftpCreateUDSEntry( const QString & filename, FtpEntry& ftpEnt, UDSEntr
}
-void Ftp::ftpShortStatAnswer( const QString& filename, bool isDir )
+void Ftp::ftpShortStatAnswer( const TQString& filename, bool isDir )
{
UDSEntry entry;
UDSAtom atom;
- atom.m_uds = KIO::UDS_NAME;
+ atom.m_uds = TDEIO::UDS_NAME;
atom.m_str = filename;
entry.append( atom );
- atom.m_uds = KIO::UDS_FILE_TYPE;
+ atom.m_uds = TDEIO::UDS_FILE_TYPE;
atom.m_long = isDir ? S_IFDIR : S_IFREG;
entry.append( atom );
- atom.m_uds = KIO::UDS_ACCESS;
+ atom.m_uds = TDEIO::UDS_ACCESS;
atom.m_long = S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH;
entry.append( atom );
@@ -1488,12 +1488,12 @@ void Ftp::ftpShortStatAnswer( const QString& filename, bool isDir )
finished();
}
-void Ftp::ftpStatAnswerNotFound( const QString & path, const QString & filename )
+void Ftp::ftpStatAnswerNotFound( const TQString & path, const TQString & filename )
{
// Only do the 'hack' below if we want to download an existing file (i.e. when looking at the "source")
// When e.g. uploading a file, we still need stat() to return "not found"
// when the file doesn't exist.
- QString statSide = metaData("statSide");
+ TQString statSide = metaData("statSide");
kdDebug(7102) << "Ftp::stat statSide=" << statSide << endl;
if ( statSide == "source" )
{
@@ -1517,7 +1517,7 @@ void Ftp::stat( const KURL &url)
if( !ftpOpenConnection(loginImplicit) )
return;
- QString path = QDir::cleanDirPath( url.path() );
+ TQString path = TQDir::cleanDirPath( url.path() );
kdDebug(7102) << "Ftp::stat : cleaned path='" << path << "'" << endl;
// We can't stat root, but we know it's a dir.
@@ -1526,22 +1526,22 @@ void Ftp::stat( const KURL &url)
UDSEntry entry;
UDSAtom atom;
- atom.m_uds = KIO::UDS_NAME;
- atom.m_str = QString::null;
+ atom.m_uds = TDEIO::UDS_NAME;
+ atom.m_str = TQString::null;
entry.append( atom );
- atom.m_uds = KIO::UDS_FILE_TYPE;
+ atom.m_uds = TDEIO::UDS_FILE_TYPE;
atom.m_long = S_IFDIR;
entry.append( atom );
- atom.m_uds = KIO::UDS_ACCESS;
+ atom.m_uds = TDEIO::UDS_ACCESS;
atom.m_long = S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH;
entry.append( atom );
- atom.m_uds = KIO::UDS_USER;
+ atom.m_uds = TDEIO::UDS_USER;
atom.m_str = "root";
entry.append( atom );
- atom.m_uds = KIO::UDS_GROUP;
+ atom.m_uds = TDEIO::UDS_GROUP;
entry.append( atom );
// no size
@@ -1553,18 +1553,18 @@ void Ftp::stat( const KURL &url)
KURL tempurl( url );
tempurl.setPath( path ); // take the clean one
- QString listarg; // = tempurl.directory(false /*keep trailing slash*/);
- QString parentDir;
- QString filename = tempurl.fileName();
+ TQString listarg; // = tempurl.directory(false /*keep trailing slash*/);
+ TQString parentDir;
+ TQString filename = tempurl.fileName();
Q_ASSERT(!filename.isEmpty());
- QString search = filename;
+ TQString search = filename;
// Try cwd into it, if it works it's a dir (and then we'll list the parent directory to get more info)
// if it doesn't work, it's a file (and then we'll use dir filename)
bool isDir = ftpFolder(path, false);
// if we're only interested in "file or directory", we should stop here
- QString sDetails = metaData("details");
+ TQString sDetails = metaData("details");
int details = sDetails.isEmpty() ? 2 : sDetails.toInt();
kdDebug(7102) << "Ftp::stat details=" << details << endl;
if ( details == 0 )
@@ -1593,15 +1593,15 @@ void Ftp::stat( const KURL &url)
UDSEntry entry;
UDSAtom atom;
- atom.m_uds = KIO::UDS_NAME;
+ atom.m_uds = TDEIO::UDS_NAME;
atom.m_str = filename;
entry.append( atom );
- atom.m_uds = KIO::UDS_FILE_TYPE;
+ atom.m_uds = TDEIO::UDS_FILE_TYPE;
atom.m_long = S_IFDIR;
entry.append( atom );
- atom.m_uds = KIO::UDS_ACCESS;
+ atom.m_uds = TDEIO::UDS_ACCESS;
atom.m_long = S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH;
entry.append( atom );
@@ -1713,7 +1713,7 @@ void Ftp::listDir( const KURL &url )
return;
// No path specified ?
- QString path = url.path();
+ TQString path = url.path();
if ( path.isEmpty() )
{
KURL realURL;
@@ -1777,13 +1777,13 @@ void Ftp::slave_status()
slaveStatus( m_host, m_bLoggedOn );
}
-bool Ftp::ftpOpenDir( const QString & path )
+bool Ftp::ftpOpenDir( const TQString & path )
{
- //QString path( _url.path(-1) );
+ //TQString path( _url.path(-1) );
// We try to change to this directory first to see whether it really is a directory.
// (And also to follow symlinks)
- QString tmp = path.isEmpty() ? QString("/") : path;
+ TQString tmp = path.isEmpty() ? TQString("/") : path;
// We get '550', whether it's a file or doesn't exist...
if( !ftpFolder(tmp, false) )
@@ -1795,9 +1795,9 @@ bool Ftp::ftpOpenDir( const QString & path )
// The only way to really know would be to have a metadata flag for this...
// Since some windows ftp server seems not to support the -a argument, we use a fallback here.
// In fact we have to use -la otherwise -a removes the default -l (e.g. ftp.trolltech.com)
- if( !ftpOpenCommand( "list -la", QString::null, 'I', ERR_CANNOT_ENTER_DIRECTORY ) )
+ if( !ftpOpenCommand( "list -la", TQString::null, 'I', ERR_CANNOT_ENTER_DIRECTORY ) )
{
- if ( !ftpOpenCommand( "list", QString::null, 'I', ERR_CANNOT_ENTER_DIRECTORY ) )
+ if ( !ftpOpenCommand( "list", TQString::null, 'I', ERR_CANNOT_ENTER_DIRECTORY ) )
{
kdWarning(7102) << "Can't open for listing" << endl;
return false;
@@ -1877,7 +1877,7 @@ bool Ftp::ftpReadDir(FtpEntry& de)
(p_name = strtok(NULL,"\r\n")) != 0 )
{
{
- QCString tmp( p_name );
+ TQCString tmp( p_name );
if ( p_access[0] == 'l' )
{
int i = tmp.findRev( " -> " );
@@ -1886,10 +1886,10 @@ bool Ftp::ftpReadDir(FtpEntry& de)
tmp.truncate( i );
}
else
- de.link = QString::null;
+ de.link = TQString::null;
}
else
- de.link = QString::null;
+ de.link = TQString::null;
if ( tmp[0] == '/' ) // listing on ftp://ftp.gnupg.org/ starts with '/'
tmp.remove( 0, 1 );
@@ -1968,7 +1968,7 @@ bool Ftp::ftpReadDir(FtpEntry& de)
// Get day number (always second field)
tmptr->tm_mday = atoi( p_date_2 );
// Get month from first field
- // NOTE : no, we don't want to use KLocale here
+ // NOTE : no, we don't want to use TDELocale here
// It seems all FTP servers use the English way
//kdDebug(7102) << "Looking for month " << p_date_1 << endl;
static const char * s_months[12] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun",
@@ -2029,7 +2029,7 @@ void Ftp::get( const KURL & url )
ftpCloseCommand(); // must close command!
}
-Ftp::StatusCode Ftp::ftpGet(int& iError, int iCopyFile, const KURL& url, KIO::fileoffset_t llOffset)
+Ftp::StatusCode Ftp::ftpGet(int& iError, int iCopyFile, const KURL& url, TDEIO::fileoffset_t llOffset)
{
// Calls error() by itself!
if( !ftpOpenConnection(loginImplicit) )
@@ -2049,7 +2049,7 @@ Ftp::StatusCode Ftp::ftpGet(int& iError, int iCopyFile, const KURL& url, KIO::fi
return statusServerError;
}
- QString resumeOffset = metaData("resume");
+ TQString resumeOffset = metaData("resume");
if ( !resumeOffset.isEmpty() )
{
llOffset = resumeOffset.toLongLong();
@@ -2069,14 +2069,14 @@ Ftp::StatusCode Ftp::ftpGet(int& iError, int iCopyFile, const KURL& url, KIO::fi
if(psz) m_size = charToLongLong(psz+1);
}
- KIO::filesize_t bytesLeft = 0;
+ TDEIO::filesize_t bytesLeft = 0;
if ( m_size != UnknownSize )
bytesLeft = m_size - llOffset;
kdDebug(7102) << "ftpGet: starting with offset=" << llOffset << endl;
- KIO::fileoffset_t processed_size = llOffset;
+ TDEIO::fileoffset_t processed_size = llOffset;
- QByteArray array;
+ TQByteArray array;
bool mimetypeEmitted = false;
char buffer[maximumIpcSize];
// start whith small data chunks in case of a slow data source (modem)
@@ -2164,8 +2164,8 @@ void Ftp::mimetype( const KURL& url )
return;
}
char buffer[ 2048 ];
- QByteArray array;
- // Get one chunk of data only and send it, KIO::Job will determine the
+ TQByteArray array;
+ // Get one chunk of data only and send it, TDEIO::Job will determine the
// mimetype from it using KMimeMagic
int n = m_data->read( buffer, 2048 );
array.setRawData(buffer, n);
@@ -2199,9 +2199,9 @@ void Ftp::ftpAbortTransfer()
// Send ABOR
kdDebug(7102) << "send ABOR" << endl;
- QCString buf = "ABOR\r\n";
+ TQCString buf = "ABOR\r\n";
if ( KSocks::self()->write( sControl, buf.data(), buf.length() ) <= 0 ) {
- error( ERR_COULD_NOT_WRITE, QString::null );
+ error( ERR_COULD_NOT_WRITE, TQString::null );
return;
}
@@ -2209,7 +2209,7 @@ void Ftp::ftpAbortTransfer()
kdDebug(7102) << "read resp" << endl;
if ( readresp() != '2' )
{
- error( ERR_COULD_NOT_READ, QString::null );
+ error( ERR_COULD_NOT_READ, TQString::null );
return;
}
@@ -2246,15 +2246,15 @@ Ftp::StatusCode Ftp::ftpPut(int& iError, int iCopyFile, const KURL& dest_url,
else
bMarkPartial = config()->readBoolEntry("MarkPartial", true);
- QString dest_orig = dest_url.path();
- QString dest_part( dest_orig );
+ TQString dest_orig = dest_url.path();
+ TQString dest_part( dest_orig );
dest_part += ".part";
if ( ftpSize( dest_orig, 'I' ) )
{
if ( m_size == 0 )
{ // delete files with zero size
- QCString cmd = "DELE ";
+ TQCString cmd = "DELE ";
cmd += remoteEncoding()->encode(dest_orig);
if( !ftpSendCmd( cmd ) || (m_iRespType != 2) )
{
@@ -2282,7 +2282,7 @@ Ftp::StatusCode Ftp::ftpPut(int& iError, int iCopyFile, const KURL& dest_url,
{ // file with extension .part exists
if ( m_size == 0 )
{ // delete files with zero size
- QCString cmd = "DELE ";
+ TQCString cmd = "DELE ";
cmd += remoteEncoding()->encode(dest_part);
if ( !ftpSendCmd( cmd ) || (m_iRespType != 2) )
{
@@ -2303,7 +2303,7 @@ Ftp::StatusCode Ftp::ftpPut(int& iError, int iCopyFile, const KURL& dest_url,
else
m_size = 0;
- QString dest;
+ TQString dest;
// if we are using marking of partial downloads -> add .part extension
if ( bMarkPartial ) {
@@ -2312,7 +2312,7 @@ Ftp::StatusCode Ftp::ftpPut(int& iError, int iCopyFile, const KURL& dest_url,
} else
dest = dest_orig;
- KIO::fileoffset_t offset = 0;
+ TDEIO::fileoffset_t offset = 0;
// set the mode according to offset
if( resume && m_size > 0 )
@@ -2332,9 +2332,9 @@ Ftp::StatusCode Ftp::ftpPut(int& iError, int iCopyFile, const KURL& dest_url,
return statusServerError;
kdDebug(7102) << "ftpPut: starting with offset=" << offset << endl;
- KIO::fileoffset_t processed_size = offset;
+ TDEIO::fileoffset_t processed_size = offset;
- QByteArray buffer;
+ TQByteArray buffer;
int result;
int iBlockSize = initialIpcSize;
// Loop until we got 'dataEnd'
@@ -2376,7 +2376,7 @@ Ftp::StatusCode Ftp::ftpPut(int& iError, int iCopyFile, const KURL& dest_url,
if ( ftpSize( dest, 'I' ) &&
( processed_size < (unsigned long) config()->readNumEntry("MinimumKeepSize", DEFAULT_MINIMUM_KEEP_SIZE) ) )
{
- QCString cmd = "DELE ";
+ TQCString cmd = "DELE ";
cmd += remoteEncoding()->encode(dest);
(void) ftpSendCmd( cmd );
}
@@ -2423,13 +2423,13 @@ Ftp::StatusCode Ftp::ftpPut(int& iError, int iCopyFile, const KURL& dest_url,
/** Use the SIZE command to get the file size.
Warning : the size depends on the transfer mode, hence the second arg. */
-bool Ftp::ftpSize( const QString & path, char mode )
+bool Ftp::ftpSize( const TQString & path, char mode )
{
m_size = UnknownSize;
if( !ftpDataMode(mode) )
return false;
- QCString buf;
+ TQCString buf;
buf = "SIZE ";
buf += remoteEncoding()->encode(path);
if( !ftpSendCmd( buf ) || (m_iRespType != 2) )
@@ -2460,7 +2460,7 @@ bool Ftp::ftpDataMode(char cMode)
if(m_cDataMode == cMode)
return true;
- QCString buf;
+ TQCString buf;
buf.sprintf("TYPE %c", cMode);
if( !ftpSendCmd(buf) || (m_iRespType != 2) )
return false;
@@ -2469,9 +2469,9 @@ bool Ftp::ftpDataMode(char cMode)
}
-bool Ftp::ftpFolder(const QString& path, bool bReportError)
+bool Ftp::ftpFolder(const TQString& path, bool bReportError)
{
- QString newPath = path;
+ TQString newPath = path;
int iLen = newPath.length();
if(iLen > 1 && newPath[iLen-1] == '/') newPath.truncate(iLen-1);
@@ -2479,7 +2479,7 @@ bool Ftp::ftpFolder(const QString& path, bool bReportError)
if(m_currentPath == newPath)
return true;
- QCString tmp = "cwd ";
+ TQCString tmp = "cwd ";
tmp += remoteEncoding()->encode(newPath);
if( !ftpSendCmd(tmp) )
return false; // connection failure
@@ -2495,7 +2495,7 @@ bool Ftp::ftpFolder(const QString& path, bool bReportError)
//===============================================================================
-// public: copy don't use kio data pump if one side is a local file
+// public: copy don't use tdeio data pump if one side is a local file
// helper: ftpCopyPut called from copy() on upload
// helper: ftpCopyGet called from copy() on download
//===============================================================================
@@ -2506,7 +2506,7 @@ void Ftp::copy( const KURL &src, const KURL &dest, int permissions, bool overwri
StatusCode cs = statusSuccess;
bool bSrcLocal = src.isLocalFile();
bool bDestLocal = dest.isLocalFile();
- QString sCopyFile;
+ TQString sCopyFile;
if(bSrcLocal && !bDestLocal) // File -> Ftp
{
@@ -2523,7 +2523,7 @@ void Ftp::copy( const KURL &src, const KURL &dest, int permissions, bool overwri
if( cs == statusServerError ) sCopyFile = src.url();
}
else {
- error( ERR_UNSUPPORTED_ACTION, QString::null );
+ error( ERR_UNSUPPORTED_ACTION, TQString::null );
return;
}
@@ -2536,12 +2536,12 @@ void Ftp::copy( const KURL &src, const KURL &dest, int permissions, bool overwri
}
-Ftp::StatusCode Ftp::ftpCopyPut(int& iError, int& iCopyFile, QString sCopyFile,
+Ftp::StatusCode Ftp::ftpCopyPut(int& iError, int& iCopyFile, TQString sCopyFile,
const KURL& url, int permissions, bool overwrite)
{
// check if source is ok ...
KDE_struct_stat buff;
- QCString sSrc( QFile::encodeName(sCopyFile) );
+ TQCString sSrc( TQFile::encodeName(sCopyFile) );
bool bSrcExists = (KDE_stat( sSrc.data(), &buff ) != -1);
if(bSrcExists)
{ if(S_ISDIR(buff.st_mode))
@@ -2573,12 +2573,12 @@ Ftp::StatusCode Ftp::ftpCopyPut(int& iError, int& iCopyFile, QString sCopyFile,
}
-Ftp::StatusCode Ftp::ftpCopyGet(int& iError, int& iCopyFile, const QString sCopyFile,
+Ftp::StatusCode Ftp::ftpCopyGet(int& iError, int& iCopyFile, const TQString sCopyFile,
const KURL& url, int permissions, bool overwrite)
{
// check if destination is ok ...
KDE_struct_stat buff;
- QCString sDest( QFile::encodeName(sCopyFile) );
+ TQCString sDest( TQFile::encodeName(sCopyFile) );
bool bDestExists = (KDE_stat( sDest.data(), &buff ) != -1);
if(bDestExists)
{ if(S_ISDIR(buff.st_mode))
@@ -2594,14 +2594,14 @@ Ftp::StatusCode Ftp::ftpCopyGet(int& iError, int& iCopyFile, const QString sCopy
}
// do we have a ".part" file?
- QCString sPart = QFile::encodeName(sCopyFile + ".part");
+ TQCString sPart = TQFile::encodeName(sCopyFile + ".part");
bool bResume = false;
bool bPartExists = (KDE_stat( sPart.data(), &buff ) != -1);
const bool bMarkPartial = config()->readBoolEntry("MarkPartial", true);
if(!bMarkPartial)
{
- sPart = QFile::encodeName(sCopyFile);
+ sPart = TQFile::encodeName(sCopyFile);
}
else if(bPartExists && buff.st_size > 0)
{ // must not be a folder! please fix a similar bug in kio_file!!
@@ -2635,7 +2635,7 @@ Ftp::StatusCode Ftp::ftpCopyGet(int& iError, int& iCopyFile, const QString sCopy
initialMode = 0666;
// open the output file ...
- KIO::fileoffset_t hCopyOffset = 0;
+ TDEIO::fileoffset_t hCopyOffset = 0;
if(bResume)
{
iCopyFile = KDE_open( sPart.data(), O_RDWR ); // append if resuming
diff --git a/kio_ftps/ftp.h b/kio_ftps/ftp.h
index 0ce98ec..c441fde 100644
--- a/kio_ftps/ftp.h
+++ b/kio_ftps/ftp.h
@@ -37,23 +37,23 @@
#include <sys/types.h>
#include <sys/socket.h>
-#include <qcstring.h>
-#include <qstring.h>
+#include <ntqcstring.h>
+#include <ntqstring.h>
#include <kurl.h>
-#include <kio/slavebase.h>
+#include <tdeio/slavebase.h>
#include <kextsock.h>
#include <ksocks.h>
#include <kssl.h>
struct FtpEntry
{
- QString name;
- QString owner;
- QString group;
- QString link;
+ TQString name;
+ TQString owner;
+ TQString group;
+ TQString link;
- KIO::filesize_t size;
+ TDEIO::filesize_t size;
mode_t type;
mode_t access;
time_t date;
@@ -251,15 +251,15 @@ private:
//===============================================================================
// Ftp
//===============================================================================
-class Ftp : public KIO::SlaveBase
+class Ftp : public TDEIO::SlaveBase
{
// Ftp() {}
public:
- Ftp( const QCString &prot, const QCString &pool, const QCString &app );
+ Ftp( const TQCString &prot, const TQCString &pool, const TQCString &app );
virtual ~Ftp();
- virtual void setHost( const QString& host, int port, const QString& user, const QString& pass );
+ virtual void setHost( const TQString& host, int port, const TQString& user, const TQString& pass );
/**
* Connects to a ftp server and logs us in
@@ -355,7 +355,7 @@ private:
*
* return true if any response received, false on error
*/
- bool ftpSendCmd( const QCString& cmd, int maxretries = 1 );
+ bool ftpSendCmd( const TQCString& cmd, int maxretries = 1 );
/**
* Use the SIZE command to get the file size.
@@ -363,12 +363,12 @@ private:
* @return true on success
* Gets the size into m_size.
*/
- bool ftpSize( const QString & path, char mode );
+ bool ftpSize( const TQString & path, char mode );
/**
* Set the current working directory, but only if not yet current
*/
- bool ftpFolder(const QString& path, bool bReportError);
+ bool ftpFolder(const TQString& path, bool bReportError);
/**
* Runs a command on the ftp server like "list" or "retr". In contrast to
@@ -381,8 +381,8 @@ private:
*
* @return true if the command was accepted by the server.
*/
- bool ftpOpenCommand( const char *command, const QString & path, char mode,
- int errorcode, KIO::fileoffset_t offset = 0 );
+ bool ftpOpenCommand( const char *command, const TQString & path, char mode,
+ int errorcode, TDEIO::fileoffset_t offset = 0 );
/**
* The counterpart to openCommand.
@@ -437,10 +437,10 @@ private:
*/
int ftpAcceptConnect();
- bool ftpChmod( const QString & path, int permissions );
+ bool ftpChmod( const TQString & path, int permissions );
// used by listDir
- bool ftpOpenDir( const QString & path );
+ bool ftpOpenDir( const TQString & path );
/**
* Called to parse directory listings, call this until it returns false
*/
@@ -449,25 +449,25 @@ private:
/**
* Helper to fill an UDSEntry
*/
- void ftpCreateUDSEntry( const QString & filename, FtpEntry& ftpEnt, KIO::UDSEntry& entry, bool isDir );
+ void ftpCreateUDSEntry( const TQString & filename, FtpEntry& ftpEnt, TDEIO::UDSEntry& entry, bool isDir );
- void ftpShortStatAnswer( const QString& filename, bool isDir );
+ void ftpShortStatAnswer( const TQString& filename, bool isDir );
- void ftpStatAnswerNotFound( const QString & path, const QString & filename );
+ void ftpStatAnswerNotFound( const TQString & path, const TQString & filename );
/**
* This is the internal implementation of rename() - set put().
*
* @return true on success.
*/
- bool ftpRename( const QString & src, const QString & dst, bool overwrite );
+ bool ftpRename( const TQString & src, const TQString & dst, bool overwrite );
/**
* Called by openConnection. It opens the control connection to the ftp server.
*
* @return true on success.
*/
- bool ftpOpenControlConnection( const QString & host, unsigned short int port );
+ bool ftpOpenControlConnection( const TQString & host, unsigned short int port );
/**
* closes the socket holding the control connection (see ftpOpenControlConnection)
@@ -495,7 +495,7 @@ private:
* @param hCopyOffset local file only: non-zero for resume
* @return 0 for success, -1 for server error, -2 for client error
*/
- StatusCode ftpGet(int& iError, int iCopyFile, const KURL& url, KIO::fileoffset_t hCopyOffset);
+ StatusCode ftpGet(int& iError, int iCopyFile, const KURL& url, TDEIO::fileoffset_t hCopyOffset);
/**
* This is the internal implementation of put() - see copy().
@@ -517,7 +517,7 @@ private:
* @param sCopyFile path of the local source file
* @return 0 for success, -1 for server error, -2 for client error
*/
- StatusCode ftpCopyPut(int& iError, int& iCopyFile, QString sCopyFile, const KURL& url, int permissions, bool overwrite);
+ StatusCode ftpCopyPut(int& iError, int& iCopyFile, TQString sCopyFile, const KURL& url, int permissions, bool overwrite);
/**
* helper called from copy() to implement FTP -> FILE transfers
@@ -527,7 +527,7 @@ private:
* @param sCopyFile path of the local destination file
* @return 0 for success, -1 for server error, -2 for client error
*/
- StatusCode ftpCopyGet(int& iError, int& iCopyFile, QString sCopyFile, const KURL& url, int permissions, bool overwrite);
+ StatusCode ftpCopyGet(int& iError, int& iCopyFile, TQString sCopyFile, const KURL& url, int permissions, bool overwrite);
/**
* ssl connect method
@@ -536,20 +536,20 @@ private:
private: // data members
- QString m_host;
+ TQString m_host;
unsigned short int m_port;
- QString m_user;
- QString m_pass;
+ TQString m_user;
+ TQString m_pass;
/**
* Where we end up after connecting
*/
- QString m_initialPath;
+ TQString m_initialPath;
KURL m_proxyURL;
/**
* the current working directory - see ftpFolder
*/
- QString m_currentPath;
+ TQString m_currentPath;
/**
* the status returned by the FTP protocol, set in ftpResponse()
@@ -593,8 +593,8 @@ private: // data members
bool m_bPasv;
bool m_bUseProxy;
- KIO::filesize_t m_size;
- static KIO::filesize_t UnknownSize;
+ TDEIO::filesize_t m_size;
+ static TDEIO::filesize_t UnknownSize;
enum
{
@@ -620,7 +620,7 @@ private: // data members
/**
* protocol used currently (ftp or ftps)
*/
- QString m_prot;
+ TQString m_prot;
};
#endif
diff --git a/kio_ftps/ftps.protocol b/kio_ftps/ftps.protocol
index 989354b..b54c19a 100644
--- a/kio_ftps/ftps.protocol
+++ b/kio_ftps/ftps.protocol
@@ -14,5 +14,5 @@ moving=true
ProxiedBy=http
Icon=ftps
maxInstances=2
-DocPath=kioslave/ftps.html
+DocPath=tdeioslave/ftps.html
Class=:internet
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-20 07:17:16 +0000