diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-07-24 15:27:17 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-07-24 15:27:17 -0500 |
| commit | 883a1fc629f00e9a41efad8514afd1ccf259d8c2 (patch) | |
| tree | 53191c33748f9cd949a2eb86a64fbedc86c5ac75 | |
| parent | 1385303ea163214e30825730ac0fbcc27f9634aa (diff) | |
| download | kftpgrabber-883a1fc629f00e9a41efad8514afd1ccf259d8c2.tar.gz kftpgrabber-883a1fc629f00e9a41efad8514afd1ccf259d8c2.zip | |
Convert to TDE R14 API
212 files changed, 3900 insertions, 3900 deletions
@@ -61,7 +61,7 @@ In order to compile and install KFTPGrabber on your system, type the following in the base directory of the KFTPGrabber distribution: - % ./configure --prefix=`kde-config --prefix` + % ./configure --prefix=`tde-config --prefix` % make % make install diff --git a/acinclude.m4 b/acinclude.m4 index ffda7a5..8c81d33 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 @@ -602,18 +602,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" -a "$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="" @@ -710,7 +710,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 @@ -937,7 +937,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 @@ -1060,7 +1060,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" @@ -1092,19 +1092,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 @@ -1113,8 +1113,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 @@ -1201,22 +1201,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" @@ -1325,7 +1325,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= @@ -1383,7 +1383,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 @@ -1418,7 +1418,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 ]) @@ -1449,9 +1449,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) @@ -1459,7 +1459,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 @@ -1644,11 +1644,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. ]) @@ -1785,16 +1785,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" @@ -1805,8 +1805,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" @@ -1824,7 +1824,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 @@ -1839,7 +1839,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" @@ -1979,20 +1979,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"); @@ -2030,11 +2030,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; @@ -2064,48 +2064,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 ]) @@ -2170,7 +2170,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 @@ -2489,7 +2489,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 ]) @@ -2547,7 +2547,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 @@ -2595,7 +2595,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; @@ -3439,7 +3439,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 */ @@ -3489,7 +3489,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) @@ -3502,9 +3502,9 @@ AC_DEFUN([KDE_CHECK_LIB64], AC_ARG_ENABLE(libsuffix, AC_HELP_STRING([--enable-libsuffix], [/lib directory suffix (64,32,none,auto[=default])]), - kdelibsuff=$enableval, kdelibsuff="auto") + tdelibsuff=$enableval, tdelibsuff="auto") - if test "$kdelibsuff" = "auto"; then + if test "$tdelibsuff" = "auto"; then cat > conftest.c << EOF #include <stdio.h> @@ -3512,26 +3512,26 @@ int main() { return 0; } EOF - kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ + tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ s,.*/lib\([[^\/]]*\)/.*,\1, p }'` rm -rf conftest.* fi - if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then - kdelibsuff= + if test "$tdelibsuff" = "no" || test "$tdelibsuff" = "none"; 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 ]) @@ -3549,7 +3549,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 @@ -4556,7 +4556,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) @@ -4689,7 +4689,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'); @@ -4946,14 +4946,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 @@ -4977,25 +4977,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` @@ -5003,7 +5003,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 @@ -5534,7 +5534,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) @@ -5555,7 +5555,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) @@ -5661,7 +5661,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 @@ -5681,7 +5681,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 @@ -5918,9 +5918,9 @@ dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page dnl also defines KSTUFF_PKG_ERRORS on error AC_DEFUN([KDE_PKG_CHECK_MODULES], [ - PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" if test "$prefix" != "$kde_libs_prefix"; then - PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" fi export PKG_CONFIG_PATH PKG_CHECK_MODULES([$1],[$2],[$3],[$4]) diff --git a/configure.in b/configure.in index 6b8ac3d..c833f2d 100644 --- a/configure.in +++ b/configure.in @@ -82,11 +82,11 @@ dnl ======================================================= dnl PACKAGE set before -dnl Check for the 3.4 kde version (for kdnssd) +dnl Check for the 3.4 kde version (for tdednssd) AC_DEFUN([CHECK_KDNSSD], [ AC_MSG_CHECKING(for KDNSSD support) - AC_CACHE_VAL(ac_cv_kdnssd, + AC_CACHE_VAL(ac_cv_tdednssd, [ AC_LANG_SAVE AC_LANG_CPLUSPLUS @@ -96,23 +96,23 @@ AC_DEFUN([CHECK_KDNSSD], CXXFLAGS="$CXXFLAGS $all_includes" AC_TRY_LINK([ - #include <kdeversion.h> + #include <tdeversion.h> ], [ #if ! KDE_IS_VERSION(3,4,0) KDE_choke me #endif ], - ac_cv_kdnssd=yes, - ac_cv_kdnssd=no + ac_cv_tdednssd=yes, + ac_cv_tdednssd=no ) CXXFLAGS="$save_CXXFLAGS" AC_LANG_RESTORE ]) - if test "$ac_cv_kdnssd" = "yes"; then + if test "$ac_cv_tdednssd" = "yes"; then AC_MSG_RESULT(yes) - LIB_KDNSSD="-lkdnssd" + LIB_KDNSSD="-ltdednssd" else AC_MSG_RESULT(no) LIB_KDNSSD="" @@ -136,7 +136,7 @@ AC_DEFUN([CHECK_KDEVERSION], CXXFLAGS="$CXXFLAGS $all_includes" AC_TRY_LINK([ - #include <kdeversion.h> + #include <tdeversion.h> ], [ #if ! KDE_IS_VERSION(3,3,0) @@ -280,13 +280,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/kftpgrabber/configure.in.in b/kftpgrabber/configure.in.in index f8aaff2..7cac83d 100644 --- a/kftpgrabber/configure.in.in +++ b/kftpgrabber/configure.in.in @@ -2,11 +2,11 @@ AM_INIT_AUTOMAKE(kftpgrabber, 0.8.0) -dnl Check for the 3.4 kde version (for kdnssd) +dnl Check for the 3.4 kde version (for tdednssd) AC_DEFUN([CHECK_KDNSSD], [ AC_MSG_CHECKING(for KDNSSD support) - AC_CACHE_VAL(ac_cv_kdnssd, + AC_CACHE_VAL(ac_cv_tdednssd, [ AC_LANG_SAVE AC_LANG_CPLUSPLUS @@ -16,23 +16,23 @@ AC_DEFUN([CHECK_KDNSSD], CXXFLAGS="$CXXFLAGS $all_includes" AC_TRY_LINK([ - #include <kdeversion.h> + #include <tdeversion.h> ], [ #if ! KDE_IS_VERSION(3,4,0) KDE_choke me #endif ], - ac_cv_kdnssd=yes, - ac_cv_kdnssd=no + ac_cv_tdednssd=yes, + ac_cv_tdednssd=no ) CXXFLAGS="$save_CXXFLAGS" AC_LANG_RESTORE ]) - if test "$ac_cv_kdnssd" = "yes"; then + if test "$ac_cv_tdednssd" = "yes"; then AC_MSG_RESULT(yes) - LIB_KDNSSD="-lkdnssd" + LIB_KDNSSD="-ltdednssd" else AC_MSG_RESULT(no) LIB_KDNSSD="" @@ -56,7 +56,7 @@ AC_DEFUN([CHECK_KDEVERSION], CXXFLAGS="$CXXFLAGS $all_includes" AC_TRY_LINK([ - #include <kdeversion.h> + #include <tdeversion.h> ], [ #if ! KDE_IS_VERSION(3,3,0) diff --git a/kftpgrabber/src/Makefile.am b/kftpgrabber/src/Makefile.am index 957278b..211c0c5 100644 --- a/kftpgrabber/src/Makefile.am +++ b/kftpgrabber/src/Makefile.am @@ -46,8 +46,8 @@ kftpgrabber_LDADD = \ ui/libui.a \ misc/interfaces/libkftpinterfaces.la \ misc/libs/ssh/libssh.a \ - $(LIB_KDNSSD) -lkwalletclient $(LIBSSL) $(LIB_KPARTS) \ - $(LIB_KIO) $(LIB_KDEUI) -lz + $(LIB_KDNSSD) -ltdewalletclient $(LIBSSL) $(LIB_KPARTS) \ + $(LIB_KIO) $(LIB_TDEUI) -lz # this is where the desktop file will go xdg_apps_DATA = kftpgrabber.desktop diff --git a/kftpgrabber/src/checksumverifier.cpp b/kftpgrabber/src/checksumverifier.cpp index 022e79c..5d8080e 100644 --- a/kftpgrabber/src/checksumverifier.cpp +++ b/kftpgrabber/src/checksumverifier.cpp @@ -36,9 +36,9 @@ #include "checksumverifier.h" -#include <qfile.h> -#include <qdir.h> -#include <qapplication.h> +#include <ntqfile.h> +#include <ntqdir.h> +#include <ntqapplication.h> #include <stdio.h> @@ -48,7 +48,7 @@ namespace KFTPCore { ChecksumVerifierThread::ChecksumVerifierThread(ChecksumVerifier *verifier) - : QThread(), + : TQThread(), m_verifier(verifier) { } @@ -62,21 +62,21 @@ void ChecksumVerifierThread::run() } -void ChecksumVerifierThread::checkSFV(const QString &sfvfile, const QString &fileToCheck) +void ChecksumVerifierThread::checkSFV(const TQString &sfvfile, const TQString &fileToCheck) { - QString fileDir = KURL(sfvfile).directory(false); - QDir fileSystem; - QFile file(sfvfile); + TQString fileDir = KURL(sfvfile).directory(false); + TQDir fileSystem; + TQFile file(sfvfile); if (!file.open(IO_ReadOnly)) { // Dispatch the event that we have failed the verification ChecksumVerifierThreadEvent *e = new ChecksumVerifierThreadEvent(2); - qApp->postEvent(m_verifier, e); + tqApp->postEvent(m_verifier, e); return; } - QValueList<QPair<QString, QString> > fileList; + TQValueList<TQPair<TQString, TQString> > fileList; while (!file.atEnd()) { - QString line; + TQString line; file.readLine(line, 1024); line = line.simplifyWhiteSpace(); @@ -85,51 +85,51 @@ void ChecksumVerifierThread::checkSFV(const QString &sfvfile, const QString &fil continue; // filename.r00 C46D96FF - QString fileName = line.section(' ', 0, 0); - QString checksum = line.section(' ', 1, 1); + TQString fileName = line.section(' ', 0, 0); + TQString checksum = line.section(' ', 1, 1); checksum = checksum.lower(); if (checksum.length() != 8) { // Dispatch the event that we have failed the verification ChecksumVerifierThreadEvent *e = new ChecksumVerifierThreadEvent(2); - qApp->postEvent(m_verifier, e); + tqApp->postEvent(m_verifier, e); file.close(); return; } - if (fileToCheck != QString::null && fileName != fileToCheck) + if (fileToCheck != TQString::null && fileName != fileToCheck) continue; - fileList.append(QPair<QString, QString>(fileName, checksum)); + fileList.append(TQPair<TQString, TQString>(fileName, checksum)); } file.close(); // Dispatch the event that we have the list ChecksumVerifierThreadEvent *e = new ChecksumVerifierThreadEvent(fileList); - qApp->postEvent(m_verifier, e); + tqApp->postEvent(m_verifier, e); // Check the obtained checksums int done = 0; - for (QValueList<QPair<QString, QString> >::iterator i = fileList.begin(); i != fileList.end(); ++i) { + for (TQValueList<TQPair<TQString, TQString> >::iterator i = fileList.begin(); i != fileList.end(); ++i) { if (!fileSystem.exists(fileDir + (*i).first)) { ChecksumVerifierThreadEvent *e = new ChecksumVerifierThreadEvent((*i).first, ChecksumVerifier::NotFound); - qApp->postEvent(m_verifier, e); + tqApp->postEvent(m_verifier, e); e = new ChecksumVerifierThreadEvent(3, (++done * 100) / fileList.count()); - qApp->postEvent(m_verifier, e); + tqApp->postEvent(m_verifier, e); continue; } - long l_fileCRC = getFileCRC(QString(fileDir + (*i).first).ascii()); - QString fileCRC; + long l_fileCRC = getFileCRC(TQString(fileDir + (*i).first).ascii()); + TQString fileCRC; fileCRC.sprintf("%08lX", l_fileCRC); fileCRC = fileCRC.lower(); ChecksumVerifierThreadEvent *e = new ChecksumVerifierThreadEvent((*i).first, fileCRC == (*i).second ? ChecksumVerifier::Ok : ChecksumVerifier::Error); - qApp->postEvent(m_verifier, e); + tqApp->postEvent(m_verifier, e); e = new ChecksumVerifierThreadEvent(3, (++done * 100) / fileList.count()); - qApp->postEvent(m_verifier, e); + tqApp->postEvent(m_verifier, e); } } @@ -228,8 +228,8 @@ long ChecksumVerifierThread::getFileCRC(const char *filename) #undef BUFFERSIZE } -ChecksumVerifier::ChecksumVerifier(const QString &filename, Type type) - : QObject(), +ChecksumVerifier::ChecksumVerifier(const TQString &filename, Type type) + : TQObject(), m_filename(filename), m_type(type), m_thread(0) @@ -252,7 +252,7 @@ void ChecksumVerifier::verify() m_thread->start(); } -void ChecksumVerifier::customEvent(QCustomEvent *e) +void ChecksumVerifier::customEvent(TQCustomEvent *e) { if (e->type() == CV_THR_EVENT_ID) { ChecksumVerifierThreadEvent *ev = static_cast<ChecksumVerifierThreadEvent*>(e); diff --git a/kftpgrabber/src/checksumverifier.h b/kftpgrabber/src/checksumverifier.h index c2a5e14..c56abfb 100644 --- a/kftpgrabber/src/checksumverifier.h +++ b/kftpgrabber/src/checksumverifier.h @@ -37,11 +37,11 @@ #ifndef KFTPCORE_CHECKSUMVERIFIER_H #define KFTPCORE_CHECKSUMVERIFIER_H -#include <qstring.h> -#include <qthread.h> -#include <qobject.h> -#include <qvaluelist.h> -#include <qpair.h> +#include <ntqstring.h> +#include <ntqthread.h> +#include <ntqobject.h> +#include <ntqvaluelist.h> +#include <ntqpair.h> namespace KFTPCore { @@ -50,7 +50,7 @@ class ChecksumVerifierThread; /** * @author Jernej Kos */ -class ChecksumVerifier : public QObject +class ChecksumVerifier : public TQObject { friend class ChecksumVerifierThread; Q_OBJECT @@ -66,57 +66,57 @@ public: Error }; - ChecksumVerifier(const QString &filename, Type type = CheckSfv); + ChecksumVerifier(const TQString &filename, Type type = CheckSfv); ~ChecksumVerifier(); void verify(); protected: - void customEvent(QCustomEvent *e); + void customEvent(TQCustomEvent *e); private: - QString m_filename; + TQString m_filename; Type m_type; ChecksumVerifierThread *m_thread; signals: void progress(int percent); - void fileDone(const QString &filename, KFTPCore::ChecksumVerifier::Result result); - void fileList(QValueList<QPair<QString, QString> > list); + void fileDone(const TQString &filename, KFTPCore::ChecksumVerifier::Result result); + void fileList(TQValueList<TQPair<TQString, TQString> > list); void error(); }; #define CV_THR_EVENT_ID 65300 -class ChecksumVerifierThreadEvent : public QCustomEvent +class ChecksumVerifierThreadEvent : public TQCustomEvent { friend class ChecksumVerifier; public: - ChecksumVerifierThreadEvent(const QString &filename, ChecksumVerifier::Result result) - : QCustomEvent((QEvent::Type) CV_THR_EVENT_ID), + ChecksumVerifierThreadEvent(const TQString &filename, ChecksumVerifier::Result result) + : TQCustomEvent((TQEvent::Type) CV_THR_EVENT_ID), m_type(0), m_filename(filename), m_result(result) {} - ChecksumVerifierThreadEvent(QValueList<QPair<QString, QString> > list) - : QCustomEvent((QEvent::Type) CV_THR_EVENT_ID), + ChecksumVerifierThreadEvent(TQValueList<TQPair<TQString, TQString> > list) + : TQCustomEvent((TQEvent::Type) CV_THR_EVENT_ID), m_type(1), m_list(list) {} ChecksumVerifierThreadEvent(int type, int progress = 0) - : QCustomEvent((QEvent::Type) CV_THR_EVENT_ID), + : TQCustomEvent((TQEvent::Type) CV_THR_EVENT_ID), m_type(type), m_progress(progress) {} private: int m_type; int m_progress; - QString m_filename; + TQString m_filename; ChecksumVerifier::Result m_result; - QValueList<QPair<QString, QString> > m_list; + TQValueList<TQPair<TQString, TQString> > m_list; }; -class ChecksumVerifierThread : public QThread +class ChecksumVerifierThread : public TQThread { public: ChecksumVerifierThread(ChecksumVerifier *verifier); @@ -125,7 +125,7 @@ protected: private: ChecksumVerifier *m_verifier; - void checkSFV(const QString &sfvfile, const QString &fileToCheck = QString::null); + void checkSFV(const TQString &sfvfile, const TQString &fileToCheck = TQString::null); static inline long UpdateCRC(register unsigned long CRC, register char *buffer, register long count); static long getFileCRC(const char *filename); diff --git a/kftpgrabber/src/directoryscanner.cpp b/kftpgrabber/src/directoryscanner.cpp index 5adaf45..6c64b1d 100644 --- a/kftpgrabber/src/directoryscanner.cpp +++ b/kftpgrabber/src/directoryscanner.cpp @@ -39,10 +39,10 @@ #include "misc/config.h" #include "misc/filter.h" -#include <kfileitem.h> +#include <tdefileitem.h> -#include <qapplication.h> -#include <qdir.h> +#include <ntqapplication.h> +#include <ntqdir.h> using namespace KFTPQueue; using namespace KFTPCore::Filter; @@ -58,9 +58,9 @@ DirectoryScanner::DirectoryScanner(Transfer *transfer) thread->start(); } -void DirectoryScanner::customEvent(QCustomEvent *e) +void DirectoryScanner::customEvent(TQCustomEvent *e) { - if (e->type() == QS_THR_EVENT_ID) { + if (e->type() == TQS_THR_EVENT_ID) { KFTPQueue::Transfer *transfer = static_cast<KFTPQueue::Transfer*>(e->data()); transfer->unlock(); emit completed(); @@ -70,8 +70,8 @@ void DirectoryScanner::customEvent(QCustomEvent *e) } } -DirectoryScanner::ScannerThread::ScannerThread(QObject *parent, Transfer *item) - : QThread(), +DirectoryScanner::ScannerThread::ScannerThread(TQObject *parent, Transfer *item) + : TQThread(), m_parent(parent), m_item(item) { @@ -84,19 +84,19 @@ void DirectoryScanner::ScannerThread::run() // We are done, post event to notify the GUI ScannerThreadEvent *e = new ScannerThreadEvent(m_item); - qApp->postEvent(m_parent, e); + tqApp->postEvent(m_parent, e); } void DirectoryScanner::ScannerThread::scanFolder(Transfer *parent) { - QDir fs(parent->getSourceUrl().path()); - fs.setFilter(QDir::Readable | QDir::Hidden | QDir::All); + TQDir fs(parent->getSourceUrl().path()); + fs.setFilter(TQDir::Readable | TQDir::Hidden | TQDir::All); - const QFileInfoList *p_list = fs.entryInfoList(); - QFileInfoListIterator i(*p_list); - QFileInfo *file; + const TQFileInfoList *p_list = fs.entryInfoList(); + TQFileInfoListIterator i(*p_list); + TQFileInfo *file; - QValueList<DirectoryEntry> list; + TQValueList<DirectoryEntry> list; while ((file = i.current()) != 0) { ++i; @@ -107,7 +107,7 @@ void DirectoryScanner::ScannerThread::scanFolder(Transfer *parent) KURL sourceUrl; sourceUrl.setPath(file->absFilePath()); - // This is needed, since QFileInfo works with uint for the filesize + // This is needed, since TQFileInfo works with uint for the filesize filesize_t realSize = KFileItem(KFileItem::Unknown, KFileItem::Unknown, sourceUrl, true).size(); // Check if we should skip this entry @@ -127,8 +127,8 @@ void DirectoryScanner::ScannerThread::scanFolder(Transfer *parent) // Sort by priority qHeapSort(list); - QValueList<DirectoryEntry>::ConstIterator listEnd = list.end(); - for (QValueList<DirectoryEntry>::ConstIterator j = list.begin(); j != listEnd; ++j) { + TQValueList<DirectoryEntry>::ConstIterator listEnd = list.end(); + for (TQValueList<DirectoryEntry>::ConstIterator j = list.begin(); j != listEnd; ++j) { // Spawn transfer KURL destUrlBase = parent->getDestUrl(); KURL sourceUrlBase = parent->getSourceUrl(); @@ -138,7 +138,7 @@ void DirectoryScanner::ScannerThread::scanFolder(Transfer *parent) if ((*j).isDirectory()) { // Directory - qApp->lock(); + tqApp->lock(); KFTPQueue::TransferDir *transfer = new KFTPQueue::TransferDir(parent); transfer->setSourceUrl(sourceUrlBase); transfer->setDestUrl(destUrlBase); @@ -147,19 +147,19 @@ void DirectoryScanner::ScannerThread::scanFolder(Transfer *parent) transfer->setId(KFTPQueue::Manager::self()->nextTransferId()); emit KFTPQueue::Manager::self()->newTransfer(transfer); - qApp->unlock(); + tqApp->unlock(); // Call this function in recursion scanFolder(transfer); if (KFTPCore::Config::skipEmptyDirs() && !transfer->hasChildren()) { - qApp->lock(); + tqApp->lock(); KFTPQueue::Manager::self()->removeTransfer(transfer, false); - qApp->unlock(); + tqApp->unlock(); } } else { // File - qApp->lock(); + tqApp->lock(); KFTPQueue::TransferFile *transfer = new KFTPQueue::TransferFile(parent); transfer->setSourceUrl(sourceUrlBase); transfer->setDestUrl(destUrlBase); @@ -168,7 +168,7 @@ void DirectoryScanner::ScannerThread::scanFolder(Transfer *parent) transfer->setId(KFTPQueue::Manager::self()->nextTransferId()); emit KFTPQueue::Manager::self()->newTransfer(transfer); - qApp->unlock(); + tqApp->unlock(); } } } diff --git a/kftpgrabber/src/directoryscanner.h b/kftpgrabber/src/directoryscanner.h index 68e05d0..5f3452a 100644 --- a/kftpgrabber/src/directoryscanner.h +++ b/kftpgrabber/src/directoryscanner.h @@ -36,10 +36,10 @@ #ifndef DIRECTORYSCANNER_H #define DIRECTORYSCANNER_H -#define QS_THR_EVENT_ID 65200 +#define TQS_THR_EVENT_ID 65200 -#include <qobject.h> -#include <qthread.h> +#include <ntqobject.h> +#include <ntqthread.h> namespace KFTPQueue { class Transfer; @@ -52,7 +52,7 @@ namespace KFTPQueue { * * @author Jernej Kos <kostko@jweb-network.net> */ -class DirectoryScanner : public QObject { +class DirectoryScanner : public TQObject { Q_OBJECT friend class KFTPQueue::Manager; public: @@ -63,31 +63,31 @@ public: */ DirectoryScanner(KFTPQueue::Transfer *transfer); protected: - void customEvent(QCustomEvent *e); + void customEvent(TQCustomEvent *e); private: /** * An event posted by the scanner thread. */ - class ScannerThreadEvent : public QCustomEvent + class ScannerThreadEvent : public TQCustomEvent { public: ScannerThreadEvent(void *data) - : QCustomEvent((QEvent::Type) QS_THR_EVENT_ID, data) {} + : TQCustomEvent((TQEvent::Type) TQS_THR_EVENT_ID, data) {} }; /** * The actual thread that does the scanning. */ - class ScannerThread : public QThread { + class ScannerThread : public TQThread { public: - ScannerThread(QObject *parent, KFTPQueue::Transfer *item); + ScannerThread(TQObject *parent, KFTPQueue::Transfer *item); protected: /** * Thread entry point. */ void run(); private: - QObject *m_parent; + TQObject *m_parent; KFTPQueue::Transfer *m_item; /** diff --git a/kftpgrabber/src/engine/cache.cpp b/kftpgrabber/src/engine/cache.cpp index 1b28dd6..c79c70d 100644 --- a/kftpgrabber/src/engine/cache.cpp +++ b/kftpgrabber/src/engine/cache.cpp @@ -91,13 +91,13 @@ void Cache::updateDirectoryEntry(Socket *socket, KURL &path, filesize_t filesize } } -void Cache::addPath(KURL &url, const QString &target) +void Cache::addPath(KURL &url, const TQString &target) { url.adjustPath(-1); m_pathCache[url] = target; } -void Cache::addPath(Socket *socket, const QString &target) +void Cache::addPath(Socket *socket, const TQString &target) { KURL url = socket->getCurrentUrl(); url.setPath(socket->getCurrentDirectory()); @@ -111,7 +111,7 @@ void Cache::invalidateEntry(KURL &url) m_listingCache.remove(url); } -void Cache::invalidateEntry(Socket *socket, const QString &path) +void Cache::invalidateEntry(Socket *socket, const TQString &path) { KURL url = socket->getCurrentUrl(); url.setPath(path); @@ -125,7 +125,7 @@ void Cache::invalidatePath(KURL &url) m_pathCache.remove(url); } -void Cache::invalidatePath(Socket *socket, const QString &path) +void Cache::invalidatePath(Socket *socket, const TQString &path) { KURL url = socket->getCurrentUrl(); url.setPath(path); @@ -146,7 +146,7 @@ DirectoryListing Cache::findCached(KURL &url) return invalid; } -DirectoryListing Cache::findCached(Socket *socket, const QString &path) +DirectoryListing Cache::findCached(Socket *socket, const TQString &path) { KURL url = socket->getCurrentUrl(); url.setPath(path); @@ -154,17 +154,17 @@ DirectoryListing Cache::findCached(Socket *socket, const QString &path) return findCached(url); } -QString Cache::findCachedPath(KURL &url) +TQString Cache::findCachedPath(KURL &url) { url.adjustPath(-1); if (m_pathCache.contains(url)) return m_pathCache[url]; - return QString::null; + return TQString::null; } -QString Cache::findCachedPath(Socket *socket, const QString &path) +TQString Cache::findCachedPath(Socket *socket, const TQString &path) { KURL url = socket->getCurrentUrl(); url.setPath(path); diff --git a/kftpgrabber/src/engine/cache.h b/kftpgrabber/src/engine/cache.h index 7b6cf21..b995db2 100644 --- a/kftpgrabber/src/engine/cache.h +++ b/kftpgrabber/src/engine/cache.h @@ -37,7 +37,7 @@ #ifndef KFTPENGINECACHE_H #define KFTPENGINECACHE_H -#include <qmap.h> +#include <ntqmap.h> #include <kurl.h> #include "directorylisting.h" @@ -89,7 +89,7 @@ public: * @param url The url (including host information) * @param target Actual target directory */ - void addPath(KURL &url, const QString &target); + void addPath(KURL &url, const TQString &target); /** * Cache path information, extracting the host information from the @@ -98,7 +98,7 @@ public: * @param socket The socket to extract the host info from * @param target Actual target directory */ - void addPath(Socket *socket, const QString &target); + void addPath(Socket *socket, const TQString &target); /** * Invalidate a cached entry. @@ -113,7 +113,7 @@ public: * @param socket The socket to extract the host info from * @param path Path of the entry */ - void invalidateEntry(Socket *socket, const QString &path); + void invalidateEntry(Socket *socket, const TQString &path); /** * Invalidate a cached path. @@ -128,7 +128,7 @@ public: * @param socket The socket to extract the host info from * @param path Path of the entry */ - void invalidatePath(Socket *socket, const QString &path); + void invalidatePath(Socket *socket, const TQString &path); /** * Retrieve a cached directory listing. @@ -145,30 +145,30 @@ public: * @param path Path of the entry * @return A valid DirectoryListing if found, an empty DirectoryListing otherwise */ - DirectoryListing findCached(Socket *socket, const QString &path); + DirectoryListing findCached(Socket *socket, const TQString &path); /** * Retrieve a cached path. * * @param url Url of the entry - * @return A target path if found, QString::null otherwise + * @return A target path if found, TQString::null otherwise */ - QString findCachedPath(KURL &url); + TQString findCachedPath(KURL &url); /** * Retrieve a cached path. * * @param socket The socket to extract the host info from * @param path Path of the entry - * @return A target path if found, QString::null otherwise + * @return A target path if found, TQString::null otherwise */ - QString findCachedPath(Socket *socket, const QString &path); + TQString findCachedPath(Socket *socket, const TQString &path); protected: Cache(); static Cache *m_self; private: - QMap<KURL, DirectoryListing> m_listingCache; - QMap<KURL, QString> m_pathCache; + TQMap<KURL, DirectoryListing> m_listingCache; + TQMap<KURL, TQString> m_pathCache; }; } diff --git a/kftpgrabber/src/engine/connectionretry.cpp b/kftpgrabber/src/engine/connectionretry.cpp index e93a1b9..d682fbe 100644 --- a/kftpgrabber/src/engine/connectionretry.cpp +++ b/kftpgrabber/src/engine/connectionretry.cpp @@ -38,18 +38,18 @@ #include "thread.h" #include "event.h" -#include <klocale.h> +#include <tdelocale.h> namespace KFTPEngine { ConnectionRetry::ConnectionRetry(Socket *socket) - : QObject(), + : TQObject(), m_socket(socket), m_delay(socket->getConfigInt("retry_delay")), m_max(socket->getConfigInt("max_retries")), m_iteration(0) { - m_timer = new QTimer(this); + m_timer = new TQTimer(this); connect(m_timer, SIGNAL(timeout()), this, SLOT(slotShouldRetry())); connect(m_socket->thread()->eventHandler(), SIGNAL(engineEvent(KFTPEngine::Event*)), this, SLOT(slotEngineEvent(KFTPEngine::Event*))); @@ -96,7 +96,7 @@ void ConnectionRetry::abortRetry() m_socket->emitError(ConnectFailed); // This object should be automagicly removed - QObject::deleteLater(); + TQObject::deleteLater(); } void ConnectionRetry::slotEngineEvent(KFTPEngine::Event *event) @@ -105,7 +105,7 @@ void ConnectionRetry::slotEngineEvent(KFTPEngine::Event *event) m_socket->emitEvent(Event::EventRetrySuccess); // This object should be automagicly removed - QObject::deleteLater(); + TQObject::deleteLater(); } } diff --git a/kftpgrabber/src/engine/connectionretry.h b/kftpgrabber/src/engine/connectionretry.h index 59a351d..5b9f83e 100644 --- a/kftpgrabber/src/engine/connectionretry.h +++ b/kftpgrabber/src/engine/connectionretry.h @@ -36,8 +36,8 @@ #ifndef KFTPENGINECONNECTIONRETRY_H #define KFTPENGINECONNECTIONRETRY_H -#include <qobject.h> -#include <qtimer.h> +#include <ntqobject.h> +#include <ntqtimer.h> namespace KFTPEngine { @@ -50,7 +50,7 @@ class Event; * * @author Jernej Kos <kostko@jweb-network.net> */ -class ConnectionRetry : public QObject +class ConnectionRetry : public TQObject { Q_OBJECT public: @@ -75,7 +75,7 @@ private: int m_max; int m_iteration; - QTimer *m_timer; + TQTimer *m_timer; private slots: void slotShouldRetry(); void slotEngineEvent(KFTPEngine::Event *event); diff --git a/kftpgrabber/src/engine/directorylisting.cpp b/kftpgrabber/src/engine/directorylisting.cpp index 1647bb2..17473fe 100644 --- a/kftpgrabber/src/engine/directorylisting.cpp +++ b/kftpgrabber/src/engine/directorylisting.cpp @@ -37,16 +37,16 @@ #include "directorylisting.h" #include "misc/filter.h" -#include <qdatetime.h> +#include <ntqdatetime.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kmimetype.h> #include <sys/stat.h> using namespace KFTPCore::Filter; -using namespace KIO; +using namespace TDEIO; namespace KFTPEngine { @@ -54,7 +54,7 @@ DirectoryEntry::DirectoryEntry() { } -KIO::UDSEntry DirectoryEntry::toUdsEntry() const +TDEIO::UDSEntry DirectoryEntry::toUdsEntry() const { bool directory = m_type == 'd'; UDSAtom atom; @@ -106,12 +106,12 @@ KIO::UDSEntry DirectoryEntry::toUdsEntry() const return entry; } -QString DirectoryEntry::timeAsString() +TQString DirectoryEntry::timeAsString() { - QDateTime dt; + TQDateTime dt; dt.setTime_t(time()); - return KGlobal::locale()->formatDateTime(dt); + return TDEGlobal::locale()->formatDateTime(dt); } bool DirectoryEntry::operator<(const DirectoryEntry &entry) const @@ -167,10 +167,10 @@ void DirectoryListing::addEntry(DirectoryEntry entry) m_list.append(entry); } -void DirectoryListing::updateEntry(const QString &filename, ::filesize_t size) +void DirectoryListing::updateEntry(const TQString &filename, ::filesize_t size) { - QValueList<DirectoryEntry>::iterator listEnd = m_list.end(); - for (QValueList<DirectoryEntry>::iterator i = m_list.begin(); i != listEnd; i++) { + TQValueList<DirectoryEntry>::iterator listEnd = m_list.end(); + for (TQValueList<DirectoryEntry>::iterator i = m_list.begin(); i != listEnd; i++) { if ((*i).filename() == filename) { (*i).setSize(size); return; diff --git a/kftpgrabber/src/engine/directorylisting.h b/kftpgrabber/src/engine/directorylisting.h index b332d37..51112f5 100644 --- a/kftpgrabber/src/engine/directorylisting.h +++ b/kftpgrabber/src/engine/directorylisting.h @@ -37,11 +37,11 @@ #ifndef KFTPNETWORKDIRECTORYLISTING_H #define KFTPNETWORKDIRECTORYLISTING_H -#include <kio/global.h> +#include <tdeio/global.h> #include <kurl.h> -#include <qvaluelist.h> -#include <qptrlist.h> +#include <ntqvaluelist.h> +#include <ntqptrlist.h> #include <time.h> #include <sys/time.h> @@ -54,40 +54,40 @@ class DirectoryEntry { public: DirectoryEntry(); - void setFilename(const QString &filename) { m_filename = filename; } - void setOwner(const QString &owner) { m_owner = owner; } - void setGroup(const QString &group) { m_group = group; } - void setLink(const QString &link) { m_link = link; } + void setFilename(const TQString &filename) { m_filename = filename; } + void setOwner(const TQString &owner) { m_owner = owner; } + void setGroup(const TQString &group) { m_group = group; } + void setLink(const TQString &link) { m_link = link; } void setPermissions(int permissions) { m_permissions = permissions; } void setSize(filesize_t size) { m_size = size; } void setType(char type) { m_type = type; } void setTime(time_t time) { m_time = time; } - QString filename() const { return m_filename; } - QString owner() const { return m_owner; } - QString group() const { return m_group; } - QString link() const { return m_link; } + TQString filename() const { return m_filename; } + TQString owner() const { return m_owner; } + TQString group() const { return m_group; } + TQString link() const { return m_link; } int permissions() const { return m_permissions; } filesize_t size() const { return m_size; } char type() const { return m_type; } time_t time() const { return m_time; } - QString timeAsString(); + TQString timeAsString(); bool isDirectory() const { return m_type == 'd'; } bool isFile() const { return m_type == 'f'; } bool isDevice() const { return m_type == 'c' || m_type == 'b'; } bool isSymlink() const { return !m_link.isEmpty(); } - KIO::UDSEntry toUdsEntry() const; + TDEIO::UDSEntry toUdsEntry() const; struct tm timeStruct; bool operator<(const DirectoryEntry &entry) const; private: - QString m_filename; - QString m_owner; - QString m_group; - QString m_link; + TQString m_filename; + TQString m_owner; + TQString m_group; + TQString m_link; int m_permissions; filesize_t m_size; @@ -97,8 +97,8 @@ private: class DirectoryTree { public: - typedef QValueList<DirectoryEntry>::ConstIterator FileIterator; - typedef QPtrList<DirectoryTree>::ConstIterator DirIterator; + typedef TQValueList<DirectoryEntry>::ConstIterator FileIterator; + typedef TQPtrList<DirectoryTree>::ConstIterator DirIterator; DirectoryTree() {} DirectoryTree(DirectoryEntry entry); @@ -108,12 +108,12 @@ public: DirectoryEntry info() { return m_entry; } - QValueList<DirectoryEntry> *files() { return &m_files; } - QPtrList<DirectoryTree> *directories() { return &m_directories; } + TQValueList<DirectoryEntry> *files() { return &m_files; } + TQPtrList<DirectoryTree> *directories() { return &m_directories; } private: DirectoryEntry m_entry; - QValueList<DirectoryEntry> m_files; - QPtrList<DirectoryTree> m_directories; + TQValueList<DirectoryEntry> m_files; + TQPtrList<DirectoryTree> m_directories; }; /** @@ -125,15 +125,15 @@ public: ~DirectoryListing(); void addEntry(DirectoryEntry entry); - void updateEntry(const QString &filename, filesize_t size); - QValueList<DirectoryEntry> list() { return m_list; } + void updateEntry(const TQString &filename, filesize_t size); + TQValueList<DirectoryEntry> list() { return m_list; } void setValid(bool value) { m_valid = value; } bool isValid() { return m_valid; } private: bool m_valid; KURL m_path; - QValueList<DirectoryEntry> m_list; + TQValueList<DirectoryEntry> m_list; }; } diff --git a/kftpgrabber/src/engine/event.cpp b/kftpgrabber/src/engine/event.cpp index bfbf6f6..844bffc 100644 --- a/kftpgrabber/src/engine/event.cpp +++ b/kftpgrabber/src/engine/event.cpp @@ -43,7 +43,7 @@ EventParameter::EventParameter() { } -EventParameter::EventParameter(const QString &string) +EventParameter::EventParameter(const TQString &string) { m_type = ParamString; m_string = string; @@ -85,7 +85,7 @@ EventParameter::EventParameter(void *data) m_data = data; } -QString EventParameter::asString() const +TQString EventParameter::asString() const { return m_string; } @@ -125,8 +125,8 @@ void *EventParameter::asData() const return m_data; } -Event::Event(Type type, QValueList<EventParameter> params) - : QCustomEvent(65123), +Event::Event(Type type, TQValueList<EventParameter> params) + : TQCustomEvent(65123), m_type(type), m_params(params) { @@ -137,12 +137,12 @@ Event::~Event() } EventHandler::EventHandler(Thread *thread) - : QObject(), + : TQObject(), m_thread(thread) { } -void EventHandler::customEvent(QCustomEvent *e) +void EventHandler::customEvent(TQCustomEvent *e) { if (e->type() == 65123) { Event *ev = static_cast<Event*>(e); diff --git a/kftpgrabber/src/engine/event.h b/kftpgrabber/src/engine/event.h index e21a45e..0e05f5f 100644 --- a/kftpgrabber/src/engine/event.h +++ b/kftpgrabber/src/engine/event.h @@ -37,9 +37,9 @@ #ifndef KFTPNETWORKEVENT_H #define KFTPNETWORKEVENT_H -#include <qobject.h> -#include <qevent.h> -#include <qshared.h> +#include <ntqobject.h> +#include <ntqevent.h> +#include <ntqshared.h> #include "directorylisting.h" @@ -94,9 +94,9 @@ public: /** * Constructs a new string parameter. * - * @param string The QString value + * @param string The TQString value */ - EventParameter(const QString &string); + EventParameter(const TQString &string); /** * Construct a new url parameter. @@ -145,7 +145,7 @@ public: * * @return Parameter's string value */ - QString asString() const; + TQString asString() const; /** * Returns the parameter's url value. @@ -198,7 +198,7 @@ public: private: Type m_type; - QString m_string; + TQString m_string; KURL m_url; DirectoryListing m_directoryListing; DirectoryTree m_directoryTree; @@ -259,7 +259,7 @@ public: FileExistsWakeupEvent() : WakeupEvent(WakeupFileExists), action(Skip) {} Action action; - QString newFileName; + TQString newFileName; }; /** @@ -274,7 +274,7 @@ public: */ PubkeyWakeupEvent() : WakeupEvent(WakeupPubkey) {} - QString password; + TQString password; }; /** @@ -283,7 +283,7 @@ public: * * @author Jernej Kos <kostko@jweb-network.net> */ -class Event : public QCustomEvent { +class Event : public TQCustomEvent { public: enum Type { EventMessage, @@ -315,7 +315,7 @@ public: * * @param params Parameter list */ - Event(Type type, QValueList<EventParameter> params); + Event(Type type, TQValueList<EventParameter> params); ~Event(); /** @@ -334,18 +334,18 @@ public: EventParameter getParameter(int index) { return m_params[index]; } protected: Type m_type; - QValueList<EventParameter> m_params; + TQValueList<EventParameter> m_params; }; class Thread; /** * This class handles events receieved from the thread and passes them - * on to the GUI as normal Qt signals. + * on to the GUI as normal TQt signals. * * @author Jernej Kos <kostko@jweb-network.net> */ -class EventHandler : public QObject { +class EventHandler : public TQObject { Q_OBJECT public: /** @@ -355,7 +355,7 @@ public: */ EventHandler(Thread *thread); protected: - void customEvent(QCustomEvent *e); + void customEvent(TQCustomEvent *e); protected: Thread *m_thread; signals: @@ -363,8 +363,8 @@ signals: void connected(); void disconnected(); - void gotResponse(const QString &text); - void gotRawResponse(const QString &text); + void gotResponse(const TQString &text); + void gotRawResponse(const TQString &text); }; } diff --git a/kftpgrabber/src/engine/ftpdirectoryparser.cpp b/kftpgrabber/src/engine/ftpdirectoryparser.cpp index 074328c..981d0b6 100644 --- a/kftpgrabber/src/engine/ftpdirectoryparser.cpp +++ b/kftpgrabber/src/engine/ftpdirectoryparser.cpp @@ -36,9 +36,9 @@ #include "ftpdirectoryparser.h" #include "ftpsocket.h" -#include <qvaluevector.h> -#include <qstringlist.h> -#include <qdatetime.h> +#include <ntqvaluevector.h> +#include <ntqstringlist.h> +#include <ntqdatetime.h> #include <time.h> #include <sys/stat.h> @@ -54,12 +54,12 @@ public: }; DToken() - : m_token(QString::null), + : m_token(TQString::null), m_valid(false) { } - DToken(const QString &token, int start = 0) + DToken(const TQString &token, int start = 0) : m_token(token), m_length(token.length()), m_start(start), @@ -75,7 +75,7 @@ public: return m_start; } - QString getToken() + TQString getToken() { return m_token; } @@ -85,13 +85,13 @@ public: return m_length; } - QString getString(int type = 0) + TQString getString(int type = 0) { switch (type) { case 0: return m_token; break; case 1: { if (!isRightNumeric() || isNumeric()) - return QString::null; + return TQString::null; int pos = m_length - 1; while (m_token[pos] >= '0' && m_token[pos] <= '9') @@ -102,7 +102,7 @@ public: } case 2: { if (!isLeftNumeric() || isNumeric()) - return QString::null; + return TQString::null; int len = 0; while (m_token[len] >= '0' && m_token[len] <= '9') @@ -113,7 +113,7 @@ public: } } - return QString::null; + return TQString::null; } int find(const char *chr, unsigned int start = 0) const @@ -199,12 +199,12 @@ public: return m_rightNumeric == Yes; } - QChar operator[](unsigned int n) const + TQChar operator[](unsigned int n) const { return m_token[n]; } private: - QString m_token; + TQString m_token; unsigned int m_length; int m_start; bool m_valid; @@ -216,7 +216,7 @@ private: class DLine { public: - DLine(const QString &line) + DLine(const TQString &line) : m_line(line.stripWhiteSpace()), m_parsePos(0) { @@ -277,10 +277,10 @@ public: } } private: - QStringList m_stringList; - QValueVector<DToken> m_tokens; - QValueVector<DToken> m_endLineTokens; - QString m_line; + TQStringList m_stringList; + TQValueVector<DToken> m_tokens; + TQValueVector<DToken> m_endLineTokens; + TQString m_line; unsigned int m_parsePos; }; @@ -328,9 +328,9 @@ FtpDirectoryParser::FtpDirectoryParser(FtpSocket *socket) m_monthNameMap["12"] = 12; } -void FtpDirectoryParser::addDataLine(const QString &line) +void FtpDirectoryParser::addDataLine(const TQString &line) { - QString tmp(line); + TQString tmp(line); tmp.append("\n"); addData(tmp.ascii(), tmp.length()); } @@ -338,13 +338,13 @@ void FtpDirectoryParser::addDataLine(const QString &line) void FtpDirectoryParser::addData(const char *data, int len) { // Append new data to the buffer and check for any new lines - m_buffer.append(QString::fromAscii(data, len)); + m_buffer.append(TQString::fromAscii(data, len)); int pos; while ((pos = m_buffer.find('\n')) > -1) { DirectoryEntry entry; - QString line = m_buffer.mid(0, pos).stripWhiteSpace(); - line = m_socket->remoteEncoding()->decode(QCString(line.ascii())); + TQString line = m_buffer.mid(0, pos).stripWhiteSpace(); + line = m_socket->remoteEncoding()->decode(TQCString(line.ascii())); if (parseLine(line, entry) && !entry.filename().isEmpty()) { if (entry.type() == '-') @@ -358,15 +358,15 @@ void FtpDirectoryParser::addData(const char *data, int len) } } -bool FtpDirectoryParser::parseMlsd(const QString &line, DirectoryEntry &entry) +bool FtpDirectoryParser::parseMlsd(const TQString &line, DirectoryEntry &entry) { - QStringList facts = QStringList::split(';', line); - QStringList::Iterator end = facts.end(); + TQStringList facts = TQStringList::split(';', line); + TQStringList::Iterator end = facts.end(); - for (QStringList::Iterator i = facts.begin(); i != end; ++i) { + for (TQStringList::Iterator i = facts.begin(); i != end; ++i) { if ((*i).contains('=')) { - QString key = (*i).section('=', 0, 0).lower(); - QString value = (*i).section('=', 1, 1); + TQString key = (*i).section('=', 0, 0).lower(); + TQString value = (*i).section('=', 1, 1); if (key == "type") { if (value == "file") @@ -400,7 +400,7 @@ bool FtpDirectoryParser::parseMlsd(const QString &line, DirectoryEntry &entry) return true; } -bool FtpDirectoryParser::parseUnixPermissions(const QString &permissions, DirectoryEntry &entry) +bool FtpDirectoryParser::parseUnixPermissions(const TQString &permissions, DirectoryEntry &entry) { int p = 0; @@ -423,7 +423,7 @@ bool FtpDirectoryParser::parseUnixPermissions(const QString &permissions, Direct entry.setPermissions(p); } -bool FtpDirectoryParser::parseLine(const QString &line, DirectoryEntry &entry) +bool FtpDirectoryParser::parseLine(const TQString &line, DirectoryEntry &entry) { DLine *tLine = new DLine(line); bool done = false; @@ -478,7 +478,7 @@ bool FtpDirectoryParser::parseLine(const QString &line, DirectoryEntry &entry) // Remove unwanted names if (entry.filename() == "." || entry.filename() == "..") { - entry.setFilename(QString::null); + entry.setFilename(TQString::null); } } @@ -505,7 +505,7 @@ bool FtpDirectoryParser::parseUnix(DLine *line, DirectoryEntry &entry) chr != '-') return false; - QString permissions = token.getString(); + TQString permissions = token.getString(); entry.setType(chr); // Check for netware servers, which split the permissions into two parts @@ -536,7 +536,7 @@ bool FtpDirectoryParser::parseUnix(DLine *line, DirectoryEntry &entry) // Reset index index = startindex; - entry.setOwner(QString::null); + entry.setOwner(TQString::null); for (int i = 0; i < numOwnerGroup; i++) { if (!line->getToken(++index, token)) return false; @@ -597,7 +597,7 @@ bool FtpDirectoryParser::parseUnixDateTime(DLine *line, int &index, DirectoryEnt DToken token; // Get the month date field - QString dateMonth; + TQString dateMonth; if (!line->getToken(++index, token)) return false; @@ -664,7 +664,7 @@ bool FtpDirectoryParser::parseUnixDateTime(DLine *line, int &index, DirectoryEnt dateMonth = dateMonth.lower(); - QMap<QString, int>::iterator iter = m_monthNameMap.find(dateMonth); + TQMap<TQString, int>::iterator iter = m_monthNameMap.find(dateMonth); if (iter == m_monthNameMap.end()) return false; @@ -681,7 +681,7 @@ bool FtpDirectoryParser::parseUnixDateTime(DLine *line, int &index, DirectoryEnt if (!pos || static_cast<size_t>(pos) == (token.getLength() - 1)) return false; - QString str = token.getString(); + TQString str = token.getString(); bool tmp; int hour = str.left(pos).toInt(&tmp); if (!tmp) @@ -701,8 +701,8 @@ bool FtpDirectoryParser::parseUnixDateTime(DLine *line, int &index, DirectoryEnt entry.timeStruct.tm_min = minute; // Some servers use times only for files nweer than 6 months, - int year = QDate::currentDate().year(); - int now = QDate::currentDate().day() + 31 * QDate::currentDate().month(); + int year = TQDate::currentDate().year(); + int now = TQDate::currentDate().day() + 31 * TQDate::currentDate().month(); int file = entry.timeStruct.tm_mon * 31 + entry.timeStruct.tm_mday; if (now >= file) @@ -734,7 +734,7 @@ bool FtpDirectoryParser::parseUnixDateTime(DLine *line, int &index, DirectoryEnt if (!pos || static_cast<size_t>(pos) == (token.getLength() - 1)) return false; - QString str = token.getString(); + TQString str = token.getString(); bool tmp; long hour = str.left(pos).toInt(&tmp); if (!tmp) @@ -783,10 +783,10 @@ bool FtpDirectoryParser::parseShortDate(DToken &token, DirectoryEntry &entry) // Seems to be monthname-dd-yy // Check month name - QString dateMonth = token.getString().mid(0, pos); + TQString dateMonth = token.getString().mid(0, pos); dateMonth = dateMonth.lower(); - QMap<QString, int>::iterator iter = m_monthNameMap.find(dateMonth); + TQMap<TQString, int>::iterator iter = m_monthNameMap.find(dateMonth); if (iter == m_monthNameMap.end()) return false; @@ -859,10 +859,10 @@ bool FtpDirectoryParser::parseShortDate(DToken &token, DirectoryEntry &entry) if (gotYear || gotDay) { // Month field in yyyy-mm-dd or dd-mm-yyyy // Check month name - QString dateMonth = token.getString().mid(pos + 1, pos2 - pos - 1); + TQString dateMonth = token.getString().mid(pos + 1, pos2 - pos - 1); dateMonth = dateMonth.lower(); - QMap<QString, int>::iterator iter = m_monthNameMap.find(dateMonth); + TQMap<TQString, int>::iterator iter = m_monthNameMap.find(dateMonth); if (iter == m_monthNameMap.end()) return false; diff --git a/kftpgrabber/src/engine/ftpdirectoryparser.h b/kftpgrabber/src/engine/ftpdirectoryparser.h index 1b56831..0c02fa0 100644 --- a/kftpgrabber/src/engine/ftpdirectoryparser.h +++ b/kftpgrabber/src/engine/ftpdirectoryparser.h @@ -37,7 +37,7 @@ #ifndef KFTPENGINEFTPDIRECTORYPARSER_H #define KFTPENGINEFTPDIRECTORYPARSER_H -#include <qmap.h> +#include <ntqmap.h> #include "directorylisting.h" @@ -51,7 +51,7 @@ class DLine; /** * This class can parse multiple directory formats. Some code portions have * been taken from a windows FTP client "FileZilla by Tim Kosse" - the - * logic is mostly the same, the code has just been ported so it is more Qt + * logic is mostly the same, the code has just been ported so it is more TQt * and so it integrates nicely with the rest of the engine. * * @author Jernej Kos <kostko@jweb-network.net> @@ -62,18 +62,18 @@ public: FtpDirectoryParser(FtpSocket *socket); void addData(const char *data, int len); - void addDataLine(const QString &line); + void addDataLine(const TQString &line); - bool parseLine(const QString &line, DirectoryEntry &entry); + bool parseLine(const TQString &line, DirectoryEntry &entry); DirectoryListing getListing() { return m_listing; } private: FtpSocket *m_socket; - QString m_buffer; + TQString m_buffer; DirectoryListing m_listing; - QMap<QString, int> m_monthNameMap; + TQMap<TQString, int> m_monthNameMap; - bool parseMlsd(const QString &line, DirectoryEntry &entry); + bool parseMlsd(const TQString &line, DirectoryEntry &entry); bool parseUnix(DLine *line, DirectoryEntry &entry); bool parseDos(DLine *line, DirectoryEntry &entry); bool parseVms(DLine *line, DirectoryEntry &entry); @@ -84,7 +84,7 @@ private: bool parseComplexFileSize(DToken &token, filesize_t &size); - bool parseUnixPermissions(const QString &permissions, DirectoryEntry &entry); + bool parseUnixPermissions(const TQString &permissions, DirectoryEntry &entry); }; } diff --git a/kftpgrabber/src/engine/ftpsocket.cpp b/kftpgrabber/src/engine/ftpsocket.cpp index b0cb9ae..dce9f99 100644 --- a/kftpgrabber/src/engine/ftpsocket.cpp +++ b/kftpgrabber/src/engine/ftpsocket.cpp @@ -44,11 +44,11 @@ #include "misc/kftpotpgenerator.h" #include "misc/config.h" -#include <qdir.h> +#include <ntqdir.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> -#include <ksocketdevice.h> +#include <tdesocketdevice.h> #include <utime.h> #include <stdlib.h> @@ -133,15 +133,15 @@ void FtpSocket::poll() } // Check for timeouts - // NOTE This should be moved to a QTimer's slot when ported to Qt 4 + // NOTE This should be moved to a TQTimer's slot when ported to TQt 4 timeoutCheck(); keepaliveCheck(); } void FtpSocket::slotControlTryRead() { - QString tmpStr; - Q_LONG size = 0; + TQString tmpStr; + TQ_LONG size = 0; // Read what we can if (getConfigInt("ssl") && m_controlSsl) { @@ -178,8 +178,8 @@ void FtpSocket::processBuffer() // Parse any lines we might have int pos; while ((pos = m_buffer.find('\n')) > -1) { - QString line = m_buffer.mid(0, pos); - line = m_remoteEncoding->decode(QCString(line.ascii())); + TQString line = m_buffer.mid(0, pos); + line = m_remoteEncoding->decode(TQCString(line.ascii())); parseLine(line); // Remove what we just parsed @@ -187,7 +187,7 @@ void FtpSocket::processBuffer() } } -void FtpSocket::parseLine(const QString &line) +void FtpSocket::parseLine(const TQString &line) { // Is this the end of multiline response ? if (!m_multiLineCode.isEmpty() && line.left(4) == m_multiLineCode) { @@ -210,9 +210,9 @@ void FtpSocket::parseLine(const QString &line) nextCommand(); } -bool FtpSocket::isResponse(const QString &code) +bool FtpSocket::isResponse(const TQString &code) { - QString ref; + TQString ref; if (isMultiline()) ref = m_multiLineCode; @@ -222,10 +222,10 @@ bool FtpSocket::isResponse(const QString &code) return ref.left(code.length()) == code; } -void FtpSocket::sendCommand(const QString &command) +void FtpSocket::sendCommand(const TQString &command) { emitEvent(Event::EventCommand, command); - QCString buffer(m_remoteEncoding->encode(command) + "\r\n"); + TQCString buffer(m_remoteEncoding->encode(command) + "\r\n"); if (getConfigInt("ssl") && m_controlSsl) m_controlSsl->write(buffer.data(), buffer.length()); @@ -340,7 +340,7 @@ public: if (socket()->isResponse("331 Response to otp-") || socket()->isResponse("331 Response to s/key")) { // OTP: 331 Response to otp-md5 41 or4828 ext required for foo. - QString tmp = socket()->getResponse(); + TQString tmp = socket()->getResponse(); tmp = tmp.section(' ', 3, 5); KFTPOTPGenerator otp(tmp, socket()->getCurrentUrl().pass()); @@ -392,7 +392,7 @@ public: } case SentPbsz: { currentState = SentProt; - QString prot = "PROT "; + TQString prot = "PROT "; if (socket()->getConfigInt("ssl.prot_mode") == 0) prot.append('P'); @@ -430,7 +430,7 @@ public: // Parse the current working directory if (socket()->isResponse("2")) { // 257 "/home/default/path" - QString tmp = socket()->getResponse(); + TQString tmp = socket()->getResponse(); int first = tmp.find('"') + 1; tmp = tmp.mid(first, tmp.findRev('"') - first); @@ -453,7 +453,7 @@ public: void parseFeat() { - QString feat = socket()->getResponse().stripWhiteSpace().upper(); + TQString feat = socket()->getResponse().stripWhiteSpace().upper(); if (feat.left(3).toInt() > 0 && feat[3] == '-') feat.remove(0, 4); @@ -492,7 +492,7 @@ void FtpSocket::protoConnect(const KURL &url) // Start the connect procedure m_controlConnecting = true; setCurrentUrl(url); - KNetwork::KStreamSocket::connect(url.host(), QString::number(url.port())); + KNetwork::KStreamSocket::connect(url.host(), TQString::number(url.port())); } void FtpSocket::slotConnected() @@ -618,7 +618,7 @@ public: currentState = SentType; socket()->resetTransferStart(); - QString type = "TYPE "; + TQString type = "TYPE "; type.append(socket()->getConfigInt("params.data_type")); socket()->sendCommand(type); break; @@ -673,7 +673,7 @@ public: // We have the connection if (socket()->getConfigInt("params.data_rest_do")) { currentState = SentRest; - socket()->sendCommand("REST " + QString::number(socket()->getConfigFs("params.data_rest"))); + socket()->sendCommand("REST " + TQString::number(socket()->getConfigFs("params.data_rest"))); } else { currentState = SentDataCmd; socket()->sendCommand(socket()->getConfig("params.data_command")); @@ -771,7 +771,7 @@ public: // We have the address, let's setup the transfer socket and then // we are done. currentState = HaveConnection; - socket()->setupPassiveTransferSocket(QString::null, port); + socket()->setupPassiveTransferSocket(TQString::null, port); } else { // Just send the EPSV command currentState = NegotiateEpsv; @@ -810,7 +810,7 @@ public: } // Convert to string - QString host; + TQString host; int port; host.sprintf("%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]); @@ -856,19 +856,19 @@ public: // Setup the socket and set the apropriate port command currentState = NegotiateActive; - KNetwork::KSocketAddress address = socket()->setupActiveTransferSocket(); + KNetwork::TDESocketAddress address = socket()->setupActiveTransferSocket(); if (address.address()) { if (socket()->getConfigInt("feat.eprt")) { - QString ianaFamily = QString::number(address.ianaFamily()); + TQString ianaFamily = TQString::number(address.ianaFamily()); socket()->sendCommand("EPRT |" + ianaFamily + "|" + address.nodeName() + "|" + address.serviceName() + "|"); } else if (address.ianaFamily() == 1) { - QString format = address.nodeName().replace(".", ","); + TQString format = address.nodeName().replace(".", ","); format.append(","); - format.append(QString::number((unsigned char) address.address()->sa_data[0])); + format.append(TQString::number((unsigned char) address.address()->sa_data[0])); format.append(","); - format.append(QString::number((unsigned char) address.address()->sa_data[1])); + format.append(TQString::number((unsigned char) address.address()->sa_data[1])); socket()->sendCommand("PORT " + format); } else { @@ -902,10 +902,10 @@ void FtpSocket::initializeTransferSocket() m_transferSocket->setAddressReuseable(true); } -void FtpSocket::setupPassiveTransferSocket(const QString &host, int port) +void FtpSocket::setupPassiveTransferSocket(const TQString &host, int port) { // Use the host from control connection if empty - QString realHost = host; + TQString realHost = host; if (host.isEmpty() || getConfigInt("pasv.use_site_ip")) realHost = peerAddress().nodeName(); @@ -916,13 +916,13 @@ void FtpSocket::setupPassiveTransferSocket(const QString &host, int port) m_transferSocket = new KNetwork::KStreamSocket(); initializeTransferSocket(); - m_transferSocket->connect(realHost, QString::number(port)); + m_transferSocket->connect(realHost, TQString::number(port)); } -KNetwork::KSocketAddress FtpSocket::setupActiveTransferSocket() +KNetwork::TDESocketAddress FtpSocket::setupActiveTransferSocket() { if (!m_serverSocket) - m_serverSocket = new KNetwork::KServerSocket(); + m_serverSocket = new KNetwork::TDEServerSocket(); m_serverSocket->setAcceptBuffered(false); m_serverSocket->setFamily(KNetwork::KResolver::InetFamily); @@ -934,10 +934,10 @@ KNetwork::KSocketAddress FtpSocket::setupActiveTransferSocket() unsigned int min = KFTPCore::Config::activeMinPort(); for (unsigned int port = min + rand() % (max - min + 1); port <= max; port++) { - m_serverSocket->setAddress(QString::number(port)); + m_serverSocket->setAddress(TQString::number(port)); bool success = m_serverSocket->listen(); - if (found = (success && m_serverSocket->error() == KSocketBase::NoError)) + if (found = (success && m_serverSocket->error() == TDESocketBase::NoError)) break; m_serverSocket->close(); @@ -946,7 +946,7 @@ KNetwork::KSocketAddress FtpSocket::setupActiveTransferSocket() if (!found) { emitEvent(Event::EventMessage, i18n("Unable to establish a listening socket.")); resetCommandClass(Failed); - return KNetwork::KSocketAddress(); + return KNetwork::TDESocketAddress(); } } else { m_serverSocket->setAddress("0"); @@ -954,16 +954,16 @@ KNetwork::KSocketAddress FtpSocket::setupActiveTransferSocket() if (!m_serverSocket->listen()) { emitEvent(Event::EventMessage, i18n("Unable to establish a listening socket.")); resetCommandClass(Failed); - return KNetwork::KSocketAddress(); + return KNetwork::TDESocketAddress(); } } - KNetwork::KSocketAddress serverAddr = m_serverSocket->localAddress(); - KNetwork::KSocketAddress controlAddr = localAddress(); - KNetwork::KSocketAddress request; + KNetwork::TDESocketAddress serverAddr = m_serverSocket->localAddress(); + KNetwork::TDESocketAddress controlAddr = localAddress(); + KNetwork::TDESocketAddress request; if (KFTPCore::Config::portForceIp() && !getConfigInt("active.no_force_ip")) { - QString remoteIp = peerAddress().nodeName(); + TQString remoteIp = peerAddress().nodeName(); if (KFTPCore::Config::ignoreExternalIpForLan() && (remoteIp.startsWith("192.168.") || remoteIp.startsWith("10.") || remoteIp.startsWith("172.16."))) { @@ -1069,7 +1069,7 @@ void FtpSocket::slotDataConnected() nextCommand(); } -void FtpSocket::variableBufferUpdate(Q_LONG size) +void FtpSocket::variableBufferUpdate(TQ_LONG size) { if (size > m_transferBufferSize - 64) { if (m_transferBufferSize + 512 <= 32768) { @@ -1113,10 +1113,10 @@ void FtpSocket::slotDataTryWrite() return; } - QFile::Offset tmpOffset = getTransferFile()->at(); - Q_LONG readSize = getTransferFile()->readBlock(m_transferBuffer, m_transferBufferSize); + TQFile::Offset tmpOffset = getTransferFile()->at(); + TQ_LONG readSize = getTransferFile()->readBlock(m_transferBuffer, m_transferBufferSize); - Q_LONG size = 0; + TQ_LONG size = 0; if (m_dataSsl) size = m_dataSsl->write(m_transferBuffer, readSize); @@ -1163,7 +1163,7 @@ void FtpSocket::slotDataTryRead() m_transferBuffer = (char*) realloc(m_transferBuffer, m_transferBufferSize); } - Q_LONG size = 0; + TQ_LONG size = 0; if (m_dataSsl) { size = m_dataSsl->read(m_transferBuffer, m_transferBufferSize); @@ -1208,7 +1208,7 @@ void FtpSocket::slotDataTryRead() break; } default: { - qDebug("WARNING: slotDataReadActivity called for an invalid command!"); + tqDebug("WARNING: slotDataReadActivity called for an invalid command!"); return; } } @@ -1232,7 +1232,7 @@ public: ENGINE_STANDARD_COMMAND_CONSTRUCTOR(FtpCommandList, FtpSocket, CmdList) - QString path; + TQString path; void process() { @@ -1312,7 +1312,7 @@ public: return; } else if (socket()->isMultiline()) { // Some servers put the response code into the multiline reply - QString response = socket()->getResponse(); + TQString response = socket()->getResponse(); if (response.left(3) == "211") response = response.mid(4); @@ -1408,7 +1408,7 @@ public: } else { // Parse MDTM response struct tm dt = {0,0,0,0,0,0,0,0,0,0,0}; - QString tmp(socket()->getResponse()); + TQString tmp(socket()->getResponse()); tmp.remove(0, 4); dt.tm_year = tmp.left(4).toInt() - 1900; @@ -1422,12 +1422,12 @@ public: } // Check if the local file exists and stat the remote file if so - if (QDir::root().exists(destinationFile.path())) { + if (TQDir::root().exists(destinationFile.path())) { socket()->protoStat(sourceFile); currentState = StatDone; return; } else { - KStandardDirs::makeDir(destinationFile.directory()); + TDEStandardDirs::makeDir(destinationFile.directory()); // Don't break so we will get on to initiating the data connection } @@ -1556,9 +1556,9 @@ public: ENGINE_STANDARD_COMMAND_CONSTRUCTOR(FtpCommandCwd, FtpSocket, CmdNone) - QString targetDirectory; - QString currentPathPart; - QString cached; + TQString targetDirectory; + TQString currentPathPart; + TQString cached; int currentPart; int numParts; bool shouldCreate; @@ -1626,7 +1626,7 @@ public: case SentPwd: { // Parse the current working directory if (socket()->isResponse("2")) { - QString tmp = socket()->getResponse(); + TQString tmp = socket()->getResponse(); int first = tmp.find('"') + 1; tmp = tmp.mid(first, tmp.findRev('"') - first); @@ -1674,7 +1674,7 @@ public: } }; -void FtpSocket::changeWorkingDirectory(const QString &path, bool shouldCreate) +void FtpSocket::changeWorkingDirectory(const TQString &path, bool shouldCreate) { // Set the path to cwd to setConfig("params.cwd.path", path); @@ -1721,7 +1721,7 @@ public: fetchedSize = false; // Check if the local file exists - if (!QDir::root().exists(sourceFile.path())) { + if (!TQDir::root().exists(sourceFile.path())) { socket()->emitError(FileNotFound); socket()->resetCommandClass(Failed); return; @@ -1898,8 +1898,8 @@ public: ENGINE_STANDARD_COMMAND_CONSTRUCTOR(FtpCommandRemove, FtpSocket, CmdNone) - QString destinationPath; - QString parentDirectory; + TQString destinationPath; + TQString parentDirectory; void process() { @@ -1982,8 +1982,8 @@ public: ENGINE_STANDARD_COMMAND_CONSTRUCTOR(FtpCommandRename, FtpSocket, CmdRename) - QString sourcePath; - QString destinationPath; + TQString sourcePath; + TQString destinationPath; void process() { @@ -2053,7 +2053,7 @@ public: case None: { currentState = SentChmod; - QString chmod; + TQString chmod; chmod.sprintf("SITE CHMOD %.3d %s", socket()->getConfigInt("params.chmod.mode"), socket()->getConfig("params.chmod.path").ascii()); socket()->sendCommand(chmod); @@ -2140,7 +2140,7 @@ public: ENGINE_STANDARD_COMMAND_CONSTRUCTOR(FtpCommandRaw, FtpSocket, CmdRaw) - QString response; + TQString response; void process() { @@ -2163,7 +2163,7 @@ public: } }; -void FtpSocket::protoRaw(const QString &raw) +void FtpSocket::protoRaw(const TQString &raw) { setConfig("params.raw.command", raw); activateCommandClass(FtpCommandRaw); @@ -2346,7 +2346,7 @@ public: // Change type currentState = SourceSentType; - QString type = "TYPE "; + TQString type = "TYPE "; type.append(KFTPCore::Config::self()->ftpMode(sourceFile.path())); socket()->sendCommand(type); break; @@ -2452,7 +2452,7 @@ public: if (!socket()->isResponse("2")) { socket()->resetCommandClass(Failed); } else { - QString tmp = socket()->getResponse(); + TQString tmp = socket()->getResponse(); int pos = tmp.find('(') + 1; tmp = tmp.mid(pos, tmp.find(')') - pos); @@ -2464,7 +2464,7 @@ public: } case SourceDoRest: { currentState = SourceSentRest; - socket()->sendCommand("REST " + QString::number(resumeOffset)); + socket()->sendCommand("REST " + TQString::number(resumeOffset)); break; } case SourceSentRest: { @@ -2499,7 +2499,7 @@ public: if (socket()->getConfigInt("params.fxp.changed_prot")) { currentState = SourceResetProt; - QString prot = "PROT "; + TQString prot = "PROT "; if (socket()->getConfigInt("ssl.prot_mode") == 0) prot.append('P'); @@ -2554,7 +2554,7 @@ public: case DestDoType: { currentState = DestSentType; - QString type = "TYPE "; + TQString type = "TYPE "; type.append(KFTPCore::Config::self()->ftpMode(sourceFile.path())); socket()->sendCommand(type); break; @@ -2666,7 +2666,7 @@ public: if (socket()->getConfigInt("params.fxp.changed_prot")) { currentState = DestResetProt; - QString prot = "PROT "; + TQString prot = "PROT "; if (socket()->getConfigInt("ssl.prot_mode") == 0) prot.append('P'); diff --git a/kftpgrabber/src/engine/ftpsocket.h b/kftpgrabber/src/engine/ftpsocket.h index 1762bfd..8088b56 100644 --- a/kftpgrabber/src/engine/ftpsocket.h +++ b/kftpgrabber/src/engine/ftpsocket.h @@ -41,8 +41,8 @@ #include <kserversocket.h> #include <kssl.h> -#include <qguardedptr.h> -#include <qfile.h> +#include <ntqguardedptr.h> +#include <ntqfile.h> #include "speedlimiter.h" #include "socket.h" @@ -76,11 +76,11 @@ public: void protoChmodSingle(const KURL &path, int mode); void protoMkdir(const KURL &path); void protoList(const KURL &path); - void protoRaw(const QString &raw); + void protoRaw(const TQString &raw); void protoSiteToSite(Socket *socket, const KURL &source, const KURL &destination); void protoKeepAlive(); - void changeWorkingDirectory(const QString &path, bool shouldCreate = false); + void changeWorkingDirectory(const TQString &path, bool shouldCreate = false); void poll(); @@ -91,42 +91,42 @@ public: void setSslClientCertificate(KSSLPKCS12 *certificate) { m_clientCert = certificate; } - bool isResponse(const QString &code); - QString getResponse() { return m_response; } + bool isResponse(const TQString &code); + TQString getResponse() { return m_response; } bool isMultiline() { return !m_multiLineCode.isEmpty(); } - void sendCommand(const QString &command); + void sendCommand(const TQString &command); void resetCommandClass(ResetCode code = Ok); - void setupPassiveTransferSocket(const QString &host, int port); - KNetwork::KSocketAddress setupActiveTransferSocket(); + void setupPassiveTransferSocket(const TQString &host, int port); + KNetwork::TDESocketAddress setupActiveTransferSocket(); - QFile *getTransferFile() { return &m_transferFile; } + TQFile *getTransferFile() { return &m_transferFile; } void checkTransferEnd(); void checkTransferStart(); void resetTransferStart() { m_transferStart = 0; } protected: void processBuffer(); - void parseLine(const QString &line); - void variableBufferUpdate(Q_LONG size); + void parseLine(const TQString &line); + void variableBufferUpdate(TQ_LONG size); void closeDataTransferSocket(); void initializeTransferSocket(); void transferCompleted(); private: bool m_login; - QString m_buffer; - QString m_multiLineCode; - QString m_response; + TQString m_buffer; + TQString m_multiLineCode; + TQString m_response; - QGuardedPtr<KNetwork::KStreamSocket> m_transferSocket; - QGuardedPtr<KNetwork::KServerSocket> m_serverSocket; + TQGuardedPtr<KNetwork::KStreamSocket> m_transferSocket; + TQGuardedPtr<KNetwork::TDEServerSocket> m_serverSocket; FtpDirectoryParser *m_directoryParser; char m_controlBuffer[1024]; - QFile m_transferFile; + TQFile m_transferFile; char *m_transferBuffer; int m_transferBufferSize; int m_transferStart; diff --git a/kftpgrabber/src/engine/sftpsocket.cpp b/kftpgrabber/src/engine/sftpsocket.cpp index a683723..33443de 100644 --- a/kftpgrabber/src/engine/sftpsocket.cpp +++ b/kftpgrabber/src/engine/sftpsocket.cpp @@ -38,12 +38,12 @@ #include "cache.h" #include "misc/config.h" -#include <qdir.h> +#include <ntqdir.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> -#include <kio/job.h> -#include <kio/renamedlg.h> +#include <tdeio/job.h> +#include <tdeio/renamedlg.h> #include <sys/stat.h> #include <fcntl.h> @@ -73,7 +73,7 @@ int addPermInt(int &x, int n, int add) int SftpSocket::intToPosix(int permissions) { int posix = 0; - QString str = QString::number(permissions); + TQString str = TQString::number(permissions); int user = str.mid(0, 1).toInt(); int group = str.mid(1, 1).toInt(); @@ -138,7 +138,7 @@ public: } case ConnectComplete: { SSH_SESSION *sshSession = socket()->sshSession(); - QString password; + TQString password; // Check if a public key password was supplied using the wakeup event if (isWakeup()) { @@ -412,7 +412,7 @@ public: return; } - if (QDir::root().exists(destinationFile.path())) { + if (TQDir::root().exists(destinationFile.path())) { DirectoryListing list; list.addEntry(socket()->getStatResponse()); @@ -420,10 +420,10 @@ public: socket()->emitEvent(Event::EventFileExists, list); return; } else - KStandardDirs::makeDir(destinationFile.directory()); + TDEStandardDirs::makeDir(destinationFile.directory()); } case DestChecked: { - QFile file; + TQFile file; if (isWakeup()) { // We have been waken up because a decision has been made @@ -542,7 +542,7 @@ public: sourceFile.setPath(socket()->getConfig("params.get.source")); destinationFile.setPath(socket()->getConfig("params.get.destination")); - if (!QDir::root().exists(sourceFile.path())) { + if (!TQDir::root().exists(sourceFile.path())) { socket()->emitError(FileNotFound); socket()->resetCommandClass(Failed); return; @@ -566,8 +566,8 @@ public: // Create destination directories socket()->setErrorReporting(false); - QString destinationDir = destinationFile.directory(); - QString fullPath; + TQString destinationDir = destinationFile.directory(); + TQString fullPath; for (register int i = 1; i <= destinationDir.contains('/'); i++) { fullPath += "/" + destinationDir.section('/', i, i); @@ -578,7 +578,7 @@ public: } } case DestChecked: { - QFile file; + TQFile file; if (isWakeup()) { // We have been waken up because a decision has been made diff --git a/kftpgrabber/src/engine/sftpsocket.h b/kftpgrabber/src/engine/sftpsocket.h index f34a896..ab1b0e7 100644 --- a/kftpgrabber/src/engine/sftpsocket.h +++ b/kftpgrabber/src/engine/sftpsocket.h @@ -78,7 +78,7 @@ public: SSH_SESSION *sshSession() { return m_sshSession; } SFTP_SESSION *sftpSession() { return m_sftpSession; } private: - QString posixToString(int permissions); + TQString posixToString(int permissions); int intToPosix(int permissions); private: SSH_SESSION *m_sshSession; diff --git a/kftpgrabber/src/engine/socket.cpp b/kftpgrabber/src/engine/socket.cpp index 370de1b..afc5341 100644 --- a/kftpgrabber/src/engine/socket.cpp +++ b/kftpgrabber/src/engine/socket.cpp @@ -41,11 +41,11 @@ #include "misc/config.h" -#include <klocale.h> +#include <tdelocale.h> namespace KFTPEngine { -Socket::Socket(Thread *thread, const QString &protocol) +Socket::Socket(Thread *thread, const TQString &protocol) : m_remoteEncoding(new KRemoteEncoding()), m_cmdData(0), m_thread(thread), @@ -82,7 +82,7 @@ void Socket::initConfig() setConfig("keepalive.timeout", 60); } -void Socket::emitError(ErrorCode code, const QString ¶m1) +void Socket::emitError(ErrorCode code, const TQString ¶m1) { // Intercept connect and login errors and pass them on to the ConnectionRetry class (if enabled) if (getConfigInt("retry") && (code == ConnectFailed || code == LoginFailed)) { @@ -93,7 +93,7 @@ void Socket::emitError(ErrorCode code, const QString ¶m1) return; } - QValueList<EventParameter> params; + TQValueList<EventParameter> params; params.append(EventParameter(code)); params.append(EventParameter(param1)); @@ -101,9 +101,9 @@ void Socket::emitError(ErrorCode code, const QString ¶m1) m_thread->event(Event::EventError, params); } -void Socket::emitEvent(Event::Type type, const QString ¶m1, const QString ¶m2) +void Socket::emitEvent(Event::Type type, const TQString ¶m1, const TQString ¶m2) { - QValueList<EventParameter> params; + TQValueList<EventParameter> params; params.append(EventParameter(param1)); params.append(EventParameter(param2)); @@ -113,7 +113,7 @@ void Socket::emitEvent(Event::Type type, const QString ¶m1, const QString &p void Socket::emitEvent(Event::Type type, DirectoryListing param1) { - QValueList<EventParameter> params; + TQValueList<EventParameter> params; params.append(EventParameter(param1)); // Dispatch the event via socket thread @@ -122,7 +122,7 @@ void Socket::emitEvent(Event::Type type, DirectoryListing param1) void Socket::emitEvent(Event::Type type, filesize_t param1) { - QValueList<EventParameter> params; + TQValueList<EventParameter> params; params.append(EventParameter(param1)); // Dispatch the event via socket thread @@ -131,14 +131,14 @@ void Socket::emitEvent(Event::Type type, filesize_t param1) void Socket::emitEvent(Event::Type type, void *param1) { - QValueList<EventParameter> params; + TQValueList<EventParameter> params; params.append(EventParameter(param1)); // Dispatch the event via socket thread m_thread->event(type, params); } -void Socket::changeEncoding(const QString &encoding) +void Socket::changeEncoding(const TQString &encoding) { // Alter encoding and change socket config m_remoteEncoding->setEncoding(encoding.ascii()); @@ -158,7 +158,7 @@ void Socket::timeoutWait(bool start) if (start) { m_timeoutCounter.start(); } else { - m_timeoutCounter = QTime(); + m_timeoutCounter = TQTime(); } } @@ -219,8 +219,8 @@ void Socket::keepaliveCheck() Commands::Type Socket::getCurrentCommand() { if (m_commandChain.count() > 0) { - QPtrList<Commands::Base>::iterator chainEnd = m_commandChain.end(); - for (QPtrList<Commands::Base>::iterator i = m_commandChain.begin(); i != chainEnd; i++) { + TQPtrList<Commands::Base>::iterator chainEnd = m_commandChain.end(); + for (TQPtrList<Commands::Base>::iterator i = m_commandChain.begin(); i != chainEnd; i++) { if ((*i)->command() != Commands::CmdNone) return (*i)->command(); } @@ -332,7 +332,7 @@ void Socket::wakeup(WakeupEvent *event) Commands::Base *current = m_commandChain.current(); if (current->isProcessing()) { - qDebug("WARNING: Attempted to wakeup a processing socket!"); + tqDebug("WARNING: Attempted to wakeup a processing socket!"); return; } @@ -344,7 +344,7 @@ void Socket::wakeup(WakeupEvent *event) resetCommandClass(current->resetCode()); } else if (m_cmdData) { if (m_cmdData->isProcessing()) { - qDebug("WARNING: Attempted to wakeup a processing socket!"); + tqDebug("WARNING: Attempted to wakeup a processing socket!"); return; } @@ -410,9 +410,9 @@ public: } case WaitList: { // Now just extract what we need - QValueList<DirectoryEntry> list = socket()->getLastDirectoryListing().list(); - QValueList<DirectoryEntry>::iterator listEnd = list.end(); - for (QValueList<DirectoryEntry>::iterator i = list.begin(); i != listEnd; i++) { + TQValueList<DirectoryEntry> list = socket()->getLastDirectoryListing().list(); + TQValueList<DirectoryEntry>::iterator listEnd = list.end(); + for (TQValueList<DirectoryEntry>::iterator i = list.begin(); i != listEnd; i++) { if ((*i).filename() == path.fileName()) { socket()->m_lastStatResponse = *i; socket()->resetCommandClass(); @@ -434,9 +434,9 @@ void Socket::protoStat(const KURL &path) // Lookup the cache first and don't even try to list if cached DirectoryListing cached = Cache::self()->findCached(this, path.directory()); if (cached.isValid()) { - QValueList<DirectoryEntry> list = cached.list(); - QValueList<DirectoryEntry>::iterator listEnd = list.end(); - for (QValueList<DirectoryEntry>::iterator i = list.begin(); i != listEnd; i++) { + TQValueList<DirectoryEntry> list = cached.list(); + TQValueList<DirectoryEntry>::iterator listEnd = list.end(); + for (TQValueList<DirectoryEntry>::iterator i = list.begin(); i != listEnd; i++) { if ((*i).filename() == path.fileName()) { m_lastStatResponse = *i; nextCommandAsync(); @@ -472,10 +472,10 @@ public: ENGINE_STANDARD_COMMAND_CONSTRUCTOR(FtpCommandScan, Socket, CmdNone) - QValueList<DirectoryEntry> currentList; - QValueList<DirectoryEntry>::const_iterator currentEntry; + TQValueList<DirectoryEntry> currentList; + TQValueList<DirectoryEntry>::const_iterator currentEntry; - QString currentDirectory; + TQString currentDirectory; DirectoryTree *currentTree; void cleanup() @@ -593,8 +593,8 @@ public: ENGINE_STANDARD_COMMAND_CONSTRUCTOR(FtpCommandDelete, Socket, CmdDelete) - QValueList<DirectoryEntry> currentList; - QValueList<DirectoryEntry>::const_iterator currentEntry; + TQValueList<DirectoryEntry> currentList; + TQValueList<DirectoryEntry>::const_iterator currentEntry; KURL destinationPath; @@ -737,8 +737,8 @@ public: ENGINE_STANDARD_COMMAND_CONSTRUCTOR(FtpCommandRecursiveChmod, Socket, CmdChmod) - QValueList<DirectoryEntry> currentList; - QValueList<DirectoryEntry>::const_iterator currentEntry; + TQValueList<DirectoryEntry> currentList; + TQValueList<DirectoryEntry>::const_iterator currentEntry; KURL destinationPath; int mode; diff --git a/kftpgrabber/src/engine/socket.h b/kftpgrabber/src/engine/socket.h index 3c2296a..01b1807 100644 --- a/kftpgrabber/src/engine/socket.h +++ b/kftpgrabber/src/engine/socket.h @@ -39,9 +39,9 @@ #include <kurl.h> #include <kremoteencoding.h> -#include <qptrlist.h> -#include <qguardedptr.h> -#include <qdatetime.h> +#include <ntqptrlist.h> +#include <ntqguardedptr.h> +#include <ntqdatetime.h> #include "commands.h" @@ -72,7 +72,7 @@ public: * @param thread The thread that created this socket * @param protocol The protocol name */ - Socket(Thread *thread, const QString &protocol); + Socket(Thread *thread, const TQString &protocol); ~Socket(); /** @@ -81,7 +81,7 @@ public: * @param key Key * @param value Value */ - void setConfig(const QString &key, const QString &value) { m_config[key] = value; } + void setConfig(const TQString &key, const TQString &value) { m_config[key] = value; } /** * Set an internal config value. @@ -89,7 +89,7 @@ public: * @param key Key * @param value Value */ - void setConfig(const QString &key, int value) { m_config[key] = QString::number(value); } + void setConfig(const TQString &key, int value) { m_config[key] = TQString::number(value); } /** * Set an internal config value. @@ -97,7 +97,7 @@ public: * @param key Key * @param value Value */ - void setConfig(const QString &key, filesize_t value) { m_config[key] = QString::number(value); } + void setConfig(const TQString &key, filesize_t value) { m_config[key] = TQString::number(value); } /** * Get an internal config value as string. @@ -105,7 +105,7 @@ public: * @param key Key * @return The key's value or an empty string if the key doesn't exist */ - QString getConfig(const QString &key) { return m_config[key]; } + TQString getConfig(const TQString &key) { return m_config[key]; } /** * Get an internal config value as an integer. @@ -113,7 +113,7 @@ public: * @param key Key * @return The key's value or 0 if the key doesn't exist */ - int getConfigInt(const QString &key) { return m_config[key].toInt(); } + int getConfigInt(const TQString &key) { return m_config[key].toInt(); } /** * Get an internal config value as filesize. @@ -121,7 +121,7 @@ public: * @param key Key * @return The key's value or 0 if the key doesn't exist */ - filesize_t getConfigFs(const QString &key) { return m_config[key].toULongLong(); } + filesize_t getConfigFs(const TQString &key) { return m_config[key].toULongLong(); } /** * This method should initialize the configuration map. @@ -223,7 +223,7 @@ public: * * @param command The command to send */ - virtual void protoRaw(const QString&) {} + virtual void protoRaw(const TQString&) {} /** * This method should initiate a site to site transfer in case the protocol @@ -278,7 +278,7 @@ public: * * @return This socket's protocol name */ - QString protocolName() { return m_protocol; } + TQString protocolName() { return m_protocol; } /** * This method should return the socket's features by or-ing the values in @@ -315,7 +315,7 @@ public: * @param code The error code * @param param1 Optional string parameter */ - void emitError(ErrorCode code, const QString ¶m1 = 0); + void emitError(ErrorCode code, const TQString ¶m1 = 0); /** * Emit an engine event. @@ -324,7 +324,7 @@ public: * @param param1 Optional string parameter * @param param2 Optional string parameter */ - void emitEvent(Event::Type type, const QString ¶m1 = 0, const QString ¶m2 = 0); + void emitEvent(Event::Type type, const TQString ¶m1 = 0, const TQString ¶m2 = 0); /** * Emit an engine event containing a directory listing. @@ -356,7 +356,7 @@ public: * * @param encoding A valid encoding name */ - virtual void changeEncoding(const QString &encoding); + virtual void changeEncoding(const TQString &encoding); /** * Retrieve the KRemoteEncoding object for this socket set to the appropriate @@ -371,28 +371,28 @@ public: * * @param path The current directory path */ - void setCurrentDirectory(const QString &path) { m_currentDirectory = path; } + void setCurrentDirectory(const TQString &path) { m_currentDirectory = path; } /** * Get the current directory path. * * @return The current directory path. */ - virtual QString getCurrentDirectory() { return m_currentDirectory; } + virtual TQString getCurrentDirectory() { return m_currentDirectory; } /** * Sets the default directory path (like a remote home directory). * * @param path The default directory path */ - void setDefaultDirectory(const QString &path) { m_defaultDirectory = path; } + void setDefaultDirectory(const TQString &path) { m_defaultDirectory = path; } /** * Get the default directory path. * * @return The default directory path */ - virtual QString getDefaultDirectory() { return m_defaultDirectory; } + virtual TQString getDefaultDirectory() { return m_defaultDirectory; } /** * Sets the url this socket is connected to. @@ -576,7 +576,7 @@ protected: KRemoteEncoding *m_remoteEncoding; Commands::Base *m_cmdData; - QPtrList<Commands::Base> m_commandChain; + TQPtrList<Commands::Base> m_commandChain; Thread *m_thread; DirectoryListing m_lastDirectoryListing; @@ -586,18 +586,18 @@ protected: time_t m_speedLastTime; filesize_t m_speedLastBytes; - QTime m_timeoutCounter; - QTime m_keepaliveCounter; + TQTime m_timeoutCounter; + TQTime m_keepaliveCounter; private: - QMap<QString, QString> m_config; - QString m_currentDirectory; - QString m_defaultDirectory; + TQMap<TQString, TQString> m_config; + TQString m_currentDirectory; + TQString m_defaultDirectory; KURL m_currentUrl; - QString m_protocol; + TQString m_protocol; Commands::Type m_currentCommand; bool m_errorReporting; bool m_shouldAbort; - QGuardedPtr<ConnectionRetry> m_connectionRetry; + TQGuardedPtr<ConnectionRetry> m_connectionRetry; }; } diff --git a/kftpgrabber/src/engine/speedlimiter.cpp b/kftpgrabber/src/engine/speedlimiter.cpp index 85f2b72..fba03c0 100644 --- a/kftpgrabber/src/engine/speedlimiter.cpp +++ b/kftpgrabber/src/engine/speedlimiter.cpp @@ -140,9 +140,9 @@ void SpeedLimiter::remove(SpeedLimiterItem *item, Type type) item->m_availableBytes = -1; } -void SpeedLimiter::timerEvent(QTimerEvent*) +void SpeedLimiter::timerEvent(TQTimerEvent*) { - QPtrList<SpeedLimiterItem> pendingWakeup; + TQPtrList<SpeedLimiterItem> pendingWakeup; for (int i = 0; i < 2; i++) { m_tokenDebt[i] = 0; @@ -174,7 +174,7 @@ void SpeedLimiter::timerEvent(QTimerEvent*) tokens = 0; - QPtrList<SpeedLimiterItem> unsaturatedObjects; + TQPtrList<SpeedLimiterItem> unsaturatedObjects; for (SpeedLimiterItem *item = m_objects[i].first(); item; item = m_objects[i].next()) { if (item->m_availableBytes == -1) { diff --git a/kftpgrabber/src/engine/speedlimiter.h b/kftpgrabber/src/engine/speedlimiter.h index 789cb19..3cc5594 100644 --- a/kftpgrabber/src/engine/speedlimiter.h +++ b/kftpgrabber/src/engine/speedlimiter.h @@ -36,8 +36,8 @@ #ifndef KFTPENGINESPEEDLIMITER_H #define KFTPENGINESPEEDLIMITER_H -#include <qobject.h> -#include <qptrlist.h> +#include <ntqobject.h> +#include <ntqptrlist.h> namespace KFTPEngine { @@ -49,7 +49,7 @@ class SpeedLimiterItem; * * @author Jernej Kos <kostko@unimatrix-one.org> */ -class SpeedLimiter : public QObject { +class SpeedLimiter : public TQObject { Q_OBJECT public: /** @@ -114,12 +114,12 @@ protected: /** * Timer event. */ - void timerEvent(QTimerEvent*); + void timerEvent(TQTimerEvent*); private: bool m_timer; int m_limits[2]; - QPtrList<SpeedLimiterItem> m_objects[2]; + TQPtrList<SpeedLimiterItem> m_objects[2]; int m_tokenDebt[2]; private slots: diff --git a/kftpgrabber/src/engine/ssl.cpp b/kftpgrabber/src/engine/ssl.cpp index c0a0109..64bfcb2 100644 --- a/kftpgrabber/src/engine/ssl.cpp +++ b/kftpgrabber/src/engine/ssl.cpp @@ -35,7 +35,7 @@ */ #include "ssl.h" -#include <ksocketdevice.h> +#include <tdesocketdevice.h> #include <kmdcodec.h> #include <ksslx509v3.h> @@ -139,9 +139,9 @@ bool Ssl::setClientCertificate(KSSLPKCS12 *pkcs) int ret; X509 *x; EVP_PKEY *k = pkcs->getPrivateKey(); - QCString cert = QCString(pkcs->getCertificate()->toString().ascii()); + TQCString cert = TQCString(pkcs->getCertificate()->toString().ascii()); - QByteArray qba, qbb = cert.copy(); + TQByteArray qba, qbb = cert.copy(); KCodecs::base64Decode(qbb, qba); #if OPENSSL_VERSION_NUMBER > 0x009070afL const unsigned char *qbap = reinterpret_cast<unsigned char *>(qba.data()); diff --git a/kftpgrabber/src/engine/ssl.h b/kftpgrabber/src/engine/ssl.h index e0933ed..6aeb0a2 100644 --- a/kftpgrabber/src/engine/ssl.h +++ b/kftpgrabber/src/engine/ssl.h @@ -54,17 +54,17 @@ public: /** * Get the cipher in use. */ - const QString &getCipher() const { return m_cipherName; } + const TQString &getCipher() const { return m_cipherName; } /** * Describe the cipher in use. */ - const QString &getCipherDescription() const { return m_cipherDescription; } + const TQString &getCipherDescription() const { return m_cipherDescription; } /** * Get the version of the cipher in use. */ - const QString &getCipherVersion() const { return m_cipherVersion; } + const TQString &getCipherVersion() const { return m_cipherVersion; } /** * Get the number of bits of the cipher that are actually used. @@ -84,9 +84,9 @@ protected: int m_cipherUsedBits; int m_cipherBits; - QString m_cipherName; - QString m_cipherDescription; - QString m_cipherVersion; + TQString m_cipherName; + TQString m_cipherDescription; + TQString m_cipherVersion; }; /** diff --git a/kftpgrabber/src/engine/thread.cpp b/kftpgrabber/src/engine/thread.cpp index 3e151b5..500d7bf 100644 --- a/kftpgrabber/src/engine/thread.cpp +++ b/kftpgrabber/src/engine/thread.cpp @@ -37,12 +37,12 @@ #include "ftpsocket.h" #include "sftpsocket.h" -#include <qapplication.h> +#include <ntqapplication.h> namespace KFTPEngine { Thread::Thread() - : QThread(), + : TQThread(), m_eventHandler(new EventHandler(this)), m_socket(0), m_wakeupEvent(0), @@ -76,7 +76,7 @@ Thread::~Thread() void Thread::run() { while (!m_abortLoop) { - QThread::usleep(100); + TQThread::usleep(100); // "Poll" the socket m_socket->poll(); @@ -96,8 +96,8 @@ void Thread::run() if (!m_commandQueue.empty()) { m_queueMutex.lock(); - QValueList<Commands::Type>::iterator queueEnd = m_commandQueue.end(); - for (QValueList<Commands::Type>::iterator i = m_commandQueue.begin(); i != queueEnd; ++i) { + TQValueList<Commands::Type>::iterator queueEnd = m_commandQueue.end(); + for (TQValueList<Commands::Type>::iterator i = m_commandQueue.begin(); i != queueEnd; ++i) { Commands::Type cmdType = *i; // Execute the command @@ -179,7 +179,7 @@ void Thread::run() void Thread::wakeup(WakeupEvent *event) { - QMutexLocker locker(&m_wakeupMutex); + TQMutexLocker locker(&m_wakeupMutex); m_wakeupEvent = event; m_wakeUpPending = true; @@ -189,7 +189,7 @@ void Thread::abort() { // Clear any pending wakeup events if (m_wakeUpPending) { - QMutexLocker locker(&m_wakeupMutex); + TQMutexLocker locker(&m_wakeupMutex); m_wakeupEvent = 0; m_wakeUpPending = false; @@ -198,11 +198,11 @@ void Thread::abort() m_socket->protoAbort(); } -void Thread::event(Event::Type type, QValueList<EventParameter> params) +void Thread::event(Event::Type type, TQValueList<EventParameter> params) { if (m_eventHandler) { Event *e = new Event(type, params); - qApp->postEvent(m_eventHandler, e); + tqApp->postEvent(m_eventHandler, e); } } @@ -219,7 +219,7 @@ void Thread::selectSocketForProtocol(const KURL &url) EventParameter Thread::nextCommandParameter() { - QMutexLocker locker(&m_paramsMutex); + TQMutexLocker locker(&m_paramsMutex); EventParameter param = m_commandParams.front(); m_commandParams.pop_front(); @@ -228,8 +228,8 @@ EventParameter Thread::nextCommandParameter() void Thread::connect(const KURL &url) { - QMutexLocker locker(&m_paramsMutex); - QMutexLocker lockerq(&m_queueMutex); + TQMutexLocker locker(&m_paramsMutex); + TQMutexLocker lockerq(&m_queueMutex); // Setup the correct socket to use for connection selectSocketForProtocol(url); @@ -240,16 +240,16 @@ void Thread::connect(const KURL &url) void Thread::disconnect() { - QMutexLocker locker(&m_paramsMutex); - QMutexLocker lockerq(&m_queueMutex); + TQMutexLocker locker(&m_paramsMutex); + TQMutexLocker lockerq(&m_queueMutex); m_commandQueue.append(Commands::CmdDisconnect); } void Thread::list(const KURL &url) { - QMutexLocker locker(&m_paramsMutex); - QMutexLocker lockerq(&m_queueMutex); + TQMutexLocker locker(&m_paramsMutex); + TQMutexLocker lockerq(&m_queueMutex); m_commandQueue.append(Commands::CmdList); m_commandParams.append(EventParameter(url)); @@ -257,8 +257,8 @@ void Thread::list(const KURL &url) void Thread::scan(const KURL &url) { - QMutexLocker locker(&m_paramsMutex); - QMutexLocker lockerq(&m_queueMutex); + TQMutexLocker locker(&m_paramsMutex); + TQMutexLocker lockerq(&m_queueMutex); m_commandQueue.append(Commands::CmdScan); m_commandParams.append(EventParameter(url)); @@ -266,8 +266,8 @@ void Thread::scan(const KURL &url) void Thread::get(const KURL &source, const KURL &destination) { - QMutexLocker locker(&m_paramsMutex); - QMutexLocker lockerq(&m_queueMutex); + TQMutexLocker locker(&m_paramsMutex); + TQMutexLocker lockerq(&m_queueMutex); m_commandQueue.append(Commands::CmdGet); m_commandParams.append(EventParameter(destination)); @@ -276,8 +276,8 @@ void Thread::get(const KURL &source, const KURL &destination) void Thread::put(const KURL &source, const KURL &destination) { - QMutexLocker locker(&m_paramsMutex); - QMutexLocker lockerq(&m_queueMutex); + TQMutexLocker locker(&m_paramsMutex); + TQMutexLocker lockerq(&m_queueMutex); m_commandQueue.append(Commands::CmdPut); m_commandParams.append(EventParameter(destination)); @@ -286,8 +286,8 @@ void Thread::put(const KURL &source, const KURL &destination) void Thread::remove(const KURL &url) { - QMutexLocker locker(&m_paramsMutex); - QMutexLocker lockerq(&m_queueMutex); + TQMutexLocker locker(&m_paramsMutex); + TQMutexLocker lockerq(&m_queueMutex); m_commandQueue.append(Commands::CmdDelete); m_commandParams.append(EventParameter(url)); @@ -295,8 +295,8 @@ void Thread::remove(const KURL &url) void Thread::rename(const KURL &source, const KURL &destination) { - QMutexLocker locker(&m_paramsMutex); - QMutexLocker lockerq(&m_queueMutex); + TQMutexLocker locker(&m_paramsMutex); + TQMutexLocker lockerq(&m_queueMutex); m_commandQueue.append(Commands::CmdRename); m_commandParams.append(EventParameter(destination)); @@ -305,8 +305,8 @@ void Thread::rename(const KURL &source, const KURL &destination) void Thread::chmod(const KURL &url, int mode, bool recursive) { - QMutexLocker locker(&m_paramsMutex); - QMutexLocker lockerq(&m_queueMutex); + TQMutexLocker locker(&m_paramsMutex); + TQMutexLocker lockerq(&m_queueMutex); m_commandQueue.append(Commands::CmdChmod); m_commandParams.append(EventParameter(recursive)); @@ -316,17 +316,17 @@ void Thread::chmod(const KURL &url, int mode, bool recursive) void Thread::mkdir(const KURL &url) { - QMutexLocker locker(&m_paramsMutex); - QMutexLocker lockerq(&m_queueMutex); + TQMutexLocker locker(&m_paramsMutex); + TQMutexLocker lockerq(&m_queueMutex); m_commandQueue.append(Commands::CmdMkdir); m_commandParams.append(EventParameter(url)); } -void Thread::raw(const QString &raw) +void Thread::raw(const TQString &raw) { - QMutexLocker locker(&m_paramsMutex); - QMutexLocker lockerq(&m_queueMutex); + TQMutexLocker locker(&m_paramsMutex); + TQMutexLocker lockerq(&m_queueMutex); m_commandQueue.append(Commands::CmdRaw); m_commandParams.append(EventParameter(raw)); @@ -334,8 +334,8 @@ void Thread::raw(const QString &raw) void Thread::siteToSite(Thread *thread, const KURL &source, const KURL &destination) { - QMutexLocker locker(&m_paramsMutex); - QMutexLocker lockerq(&m_queueMutex); + TQMutexLocker locker(&m_paramsMutex); + TQMutexLocker lockerq(&m_queueMutex); m_commandQueue.append(Commands::CmdFxp); m_commandParams.append(EventParameter(destination)); diff --git a/kftpgrabber/src/engine/thread.h b/kftpgrabber/src/engine/thread.h index 62a36c4..c2977c3 100644 --- a/kftpgrabber/src/engine/thread.h +++ b/kftpgrabber/src/engine/thread.h @@ -36,10 +36,10 @@ #ifndef KFTPENGINETHREAD_H #define KFTPENGINETHREAD_H -#include <qthread.h> -#include <qmutex.h> -#include <qvaluelist.h> -#include <qdict.h> +#include <ntqthread.h> +#include <ntqmutex.h> +#include <ntqvaluelist.h> +#include <ntqdict.h> #include "event.h" #include "directorylisting.h" @@ -55,7 +55,7 @@ namespace KFTPEngine { * * @author Jernej Kos <kostko@jweb-network.net> */ -class Thread : public QThread +class Thread : public TQThread { friend class EventHandler; friend class Socket; @@ -103,25 +103,25 @@ public: void rename(const KURL &source, const KURL &destination); void chmod(const KURL &url, int mode, bool recursive = false); void mkdir(const KURL &url); - void raw(const QString &raw); + void raw(const TQString &raw); void siteToSite(Thread *thread, const KURL &source, const KURL &destination); protected: void run(); - void event(Event::Type type, QValueList<EventParameter> params); + void event(Event::Type type, TQValueList<EventParameter> params); EventParameter nextCommandParameter(); protected: EventHandler *m_eventHandler; Socket *m_socket; - QMutex m_eventMutex; - QMutex m_wakeupMutex; - QMutex m_paramsMutex; - QMutex m_queueMutex; + TQMutex m_eventMutex; + TQMutex m_wakeupMutex; + TQMutex m_paramsMutex; + TQMutex m_queueMutex; - QDict<Socket> m_protocolMap; - QValueList<Commands::Type> m_commandQueue; - QValueList<EventParameter> m_commandParams; + TQDict<Socket> m_protocolMap; + TQValueList<Commands::Type> m_commandQueue; + TQValueList<EventParameter> m_commandParams; WakeupEvent *m_wakeupEvent; bool m_abortLoop; diff --git a/kftpgrabber/src/kftpbookmarkaction.cpp b/kftpgrabber/src/kftpbookmarkaction.cpp index 60d4904..c988ae7 100644 --- a/kftpgrabber/src/kftpbookmarkaction.cpp +++ b/kftpgrabber/src/kftpbookmarkaction.cpp @@ -35,13 +35,13 @@ #include "kftpbookmarkaction.h" -KFTPWalletAction::KFTPWalletAction(const QString &text, const QString &pix, const KShortcut &cut, const QObject *receiver, const char *slot, KActionCollection *parent, const char *name) - : KAction(text, pix, cut, receiver, slot, parent, name) +KFTPWalletAction::KFTPWalletAction(const TQString &text, const TQString &pix, const TDEShortcut &cut, const TQObject *receiver, const char *slot, TDEActionCollection *parent, const char *name) + : TDEAction(text, pix, cut, receiver, slot, parent, name) { } -KFTPZeroconfAction::KFTPZeroconfAction(const QString &text, const QString &pix, const KShortcut &cut, const QObject *receiver, const char *slot, KActionCollection *parent, const char *name) - : KAction(text, pix, cut, receiver, slot, parent, name) +KFTPZeroconfAction::KFTPZeroconfAction(const TQString &text, const TQString &pix, const TDEShortcut &cut, const TQObject *receiver, const char *slot, TDEActionCollection *parent, const char *name) + : TDEAction(text, pix, cut, receiver, slot, parent, name) { } @@ -52,8 +52,8 @@ void KFTPZeroconfAction::setSite(DNSSD::RemoteService::Ptr service) } #endif -KFTPBookmarkAction::KFTPBookmarkAction(const QString &text, const QString &pix, const KShortcut &cut, const QObject *receiver, const char *slot, KActionCollection *parent, const char *name) - : KAction(text, pix, cut, receiver, slot, parent, name) +KFTPBookmarkAction::KFTPBookmarkAction(const TQString &text, const TQString &pix, const TDEShortcut &cut, const TQObject *receiver, const char *slot, TDEActionCollection *parent, const char *name) + : TDEAction(text, pix, cut, receiver, slot, parent, name) { m_data = 0L; } diff --git a/kftpgrabber/src/kftpbookmarkaction.h b/kftpgrabber/src/kftpbookmarkaction.h index 91b245c..9d7bd70 100644 --- a/kftpgrabber/src/kftpbookmarkaction.h +++ b/kftpgrabber/src/kftpbookmarkaction.h @@ -36,11 +36,11 @@ #ifndef KFTPBOOKMARKACTION_H #define KFTPBOOKMARKACTION_H -#include <kaction.h> +#include <tdeaction.h> #include <kurl.h> -#include <kdeversion.h> +#include <tdeversion.h> -#include <qdom.h> +#include <ntqdom.h> #if KDE_IS_VERSION(3,4,0) #include "kftpzeroconf.h" @@ -51,16 +51,16 @@ namespace KFTPBookmarks { } /** - * This class represents a bookmark KAction that executes a connection to + * This class represents a bookmark TDEAction that executes a connection to * the bookmarked site. * * @author Jernej Kos */ -class KFTPWalletAction : public KAction +class KFTPWalletAction : public TDEAction { Q_OBJECT public: - KFTPWalletAction(const QString &text, const QString &pix, const KShortcut &cut, const QObject *receiver, const char *slot, KActionCollection *parent, const char *name = 0); + KFTPWalletAction(const TQString &text, const TQString &pix, const TDEShortcut &cut, const TQObject *receiver, const char *slot, TDEActionCollection *parent, const char *name = 0); void setSite(const KURL &site) { m_site = site; }; KURL getSite() { return m_site; } @@ -69,16 +69,16 @@ private: }; /** - * This class represents a zeroconf KAction that executes a connection to + * This class represents a zeroconf TDEAction that executes a connection to * the zeroconf resolved site. * * @author Jernej Kos */ -class KFTPZeroconfAction : public KAction +class KFTPZeroconfAction : public TDEAction { Q_OBJECT public: - KFTPZeroconfAction(const QString &text, const QString &pix, const KShortcut &cut, const QObject *receiver, const char *slot, KActionCollection *parent, const char *name = 0); + KFTPZeroconfAction(const TQString &text, const TQString &pix, const TDEShortcut &cut, const TQObject *receiver, const char *slot, TDEActionCollection *parent, const char *name = 0); #if KDE_IS_VERSION(3,4,0) void setSite(DNSSD::RemoteService::Ptr service); @@ -89,25 +89,25 @@ private: }; /** - * This class represents a bookmark KAction that executes a connection to + * This class represents a bookmark TDEAction that executes a connection to * the bookmarked site. * * @author Jernej Kos */ -class KFTPBookmarkAction : public KAction +class KFTPBookmarkAction : public TDEAction { Q_OBJECT public: - KFTPBookmarkAction(const QString &text, const QString &pix, const KShortcut &cut, const QObject *receiver, const char *slot, KActionCollection *parent, const char *name = 0); + KFTPBookmarkAction(const TQString &text, const TQString &pix, const TDEShortcut &cut, const TQObject *receiver, const char *slot, TDEActionCollection *parent, const char *name = 0); - void setSiteId(const QString &id) { m_siteId = id; } - void setData(QObject *data) { m_data = data; } + void setSiteId(const TQString &id) { m_siteId = id; } + void setData(TQObject *data) { m_data = data; } - QObject *data() { return m_data; } - QString siteId() { return m_siteId; } + TQObject *data() { return m_data; } + TQString siteId() { return m_siteId; } private: - QObject *m_data; - QString m_siteId; + TQObject *m_data; + TQString m_siteId; }; #endif diff --git a/kftpgrabber/src/kftpbookmarks.cpp b/kftpgrabber/src/kftpbookmarks.cpp index 0211ac6..424dd85 100644 --- a/kftpgrabber/src/kftpbookmarks.cpp +++ b/kftpgrabber/src/kftpbookmarks.cpp @@ -48,16 +48,16 @@ #include "engine/thread.h" #include "engine/ftpsocket.h" -#include <qfile.h> +#include <ntqfile.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kpassdlg.h> -#include <kmessagebox.h> -#include <kdeversion.h> -#include <kapplication.h> -#include <kio/passdlg.h> +#include <tdemessagebox.h> +#include <tdeversion.h> +#include <tdeapplication.h> +#include <tdeio/passdlg.h> #include <kstaticdeleter.h> /* KSSL includes */ @@ -67,7 +67,7 @@ using namespace KFTPGrabberBase; namespace KFTPBookmarks { -Site::Site(QDomNode node) +Site::Site(TQDomNode node) : m_element(node.toElement()) { // generate id if it is not present! @@ -75,12 +75,12 @@ Site::Site(QDomNode node) m_type = ST_CATEGORY; if (getAttribute("id").isEmpty()) - setAttribute("id", QString("cat-%1").arg(KApplication::randomString(7))); + setAttribute("id", TQString("cat-%1").arg(TDEApplication::randomString(7))); } else if (m_element.tagName() == "server") { m_type = ST_SITE; if (getAttribute("id").isEmpty()) - setAttribute("id", QString("site-%1").arg(KApplication::randomString(7))); + setAttribute("id", TQString("site-%1").arg(TDEApplication::randomString(7))); } // Set the id @@ -97,7 +97,7 @@ Site *Site::duplicate() site->setAttribute("name", i18n("Copy of") + " " + getAttribute("name")); // Assign a new id - site->setAttribute("id", QString("site-%1").arg(KApplication::randomString(7))); + site->setAttribute("id", TQString("site-%1").arg(TDEApplication::randomString(7))); site->m_id = site->getAttribute("id"); m_element.parentNode().appendChild(site->m_element); @@ -111,7 +111,7 @@ void Site::reparentSite(Site *site) m_element.appendChild(site->m_element); } -Site *Site::addSite(QDomNode node) +Site *Site::addSite(TQDomNode node) { if (node.isNull()) { // If there was no node specified, create a new one @@ -124,12 +124,12 @@ Site *Site::addSite(QDomNode node) return site; } -void Site::addCategory(const QString &name) +void Site::addCategory(const TQString &name) { - QDomElement cat = m_element.ownerDocument().createElement("category"); + TQDomElement cat = m_element.ownerDocument().createElement("category"); // Assign a new id and name - cat.setAttribute("id", QString("cat-%1").arg(KApplication::randomString(7))); + cat.setAttribute("id", TQString("cat-%1").arg(TDEApplication::randomString(7))); cat.setAttribute("name", name); m_element.appendChild(cat); @@ -151,7 +151,7 @@ KURL Site::getUrl() Site *Site::getParentSite() { // Get parent's site id, then search for it - QDomElement parent = m_element.parentNode().toElement(); + TQDomElement parent = m_element.parentNode().toElement(); if (parent.isNull()) return NULL; @@ -159,12 +159,12 @@ Site *Site::getParentSite() return KFTPBookmarks::Manager::self()->findCategory(parent.attribute("id")); } -QString Site::getProperty(const QString &name) +TQString Site::getProperty(const TQString &name) { - QDomNodeList nodes = m_element.elementsByTagName(name); + TQDomNodeList nodes = m_element.elementsByTagName(name); if (nodes.length() > 0) { - QString property = nodes.item(0).toElement().text(); + TQString property = nodes.item(0).toElement().text(); property.stripWhiteSpace(); // Automagicly decode passwords from BASE64 @@ -173,42 +173,42 @@ QString Site::getProperty(const QString &name) return property; } else { - return QString::null; + return TQString::null; } } -int Site::getIntProperty(const QString &name) +int Site::getIntProperty(const TQString &name) { return getProperty(name).toInt(); } -void Site::setProperty(const QString &name, const QString &value) +void Site::setProperty(const TQString &name, const TQString &value) { // First delete the old property if it exists - QDomNodeList nodes = m_element.elementsByTagName(name); + TQDomNodeList nodes = m_element.elementsByTagName(name); if (nodes.length() > 0) m_element.removeChild(nodes.item(0)); // Now add a new one - QDomElement property = m_element.ownerDocument().createElement(name); + TQDomElement property = m_element.ownerDocument().createElement(name); m_element.appendChild(property); - QDomText text = m_element.ownerDocument().createTextNode(value); + TQDomText text = m_element.ownerDocument().createTextNode(value); property.appendChild(text); } -void Site::setProperty(const QString &name, int value) +void Site::setProperty(const TQString &name, int value) { - setProperty(name, QString::number(value)); + setProperty(name, TQString::number(value)); } -void Site::setAttribute(const QString &name, const QString &value) +void Site::setAttribute(const TQString &name, const TQString &value) { m_element.setAttribute(name, value); } -QString Site::getAttribute(const QString &name) +TQString Site::getAttribute(const TQString &name) { return m_element.attribute(name); } @@ -229,26 +229,26 @@ Manager *Manager::self() } Manager::Manager() - : QObject() + : TQObject() { // Init the cache m_siteCache.setAutoDelete(true); // Init the DOM document - m_document = QDomDocument("KFTPGrabber"); + m_document = TQDomDocument("KFTPGrabber"); } Manager::Manager(const Manager &bookmarks) - : QObject() + : TQObject() { // Init the cache m_siteCache.setAutoDelete(true); // Init the DOM document - m_document = QDomDocument("KFTPGrabber"); + m_document = TQDomDocument("KFTPGrabber"); // Copy the bookmarks - QDomNode tmp = m_document.importNode(bookmarks.m_document.documentElement(), true); + TQDomNode tmp = m_document.importNode(bookmarks.m_document.documentElement(), true); m_document.appendChild(tmp); } @@ -261,9 +261,9 @@ Manager::~Manager() void Manager::setBookmarks(KFTPBookmarks::Manager *bookmarks) { // Init the DOM document - m_document = QDomDocument("KFTPGrabber"); + m_document = TQDomDocument("KFTPGrabber"); - QDomNode tmp = m_document.importNode(bookmarks->m_document.documentElement(), true); + TQDomNode tmp = m_document.importNode(bookmarks->m_document.documentElement(), true); m_document.appendChild(tmp); // Clear the cache @@ -272,37 +272,37 @@ void Manager::setBookmarks(KFTPBookmarks::Manager *bookmarks) emit update(); } -void Manager::importSites(QDomNode node) +void Manager::importSites(TQDomNode node) { - QDomNode import = m_document.importNode(node, true); + TQDomNode import = m_document.importNode(node, true); m_document.documentElement().appendChild(import); // Run sanity checks to generate missing ids Manager::validate(); } -void Manager::load(const QString &filename) +void Manager::load(const TQString &filename) { m_filename = filename; - QFile file(filename); + TQFile file(filename); if (!file.open(IO_ReadOnly)) { // Create a new empty XML - m_document.setContent(QString("<sites version=\"%1\"></sites>").arg(KFTP_BOOKMARKS_VERSION)); + m_document.setContent(TQString("<sites version=\"%1\"></sites>").arg(KFTP_BOOKMARKS_VERSION)); return; } // Check if the file is encrpyted - QCString content(file.readAll()); + TQCString content(file.readAll()); if (KFTPCore::Config::encryptBookmarks()) { // File is encrypted pwd_entry: int saveToWallet = 1; - QCString p_pass(KFTPAPI::getInstance()->walletConnection()->getPassword("bookmarkDecryptPwd").ascii()); - if (QString(p_pass).isNull()) { + TQCString p_pass(KFTPAPI::getInstance()->walletConnection()->getPassword("bookmarkDecryptPwd").ascii()); + if (TQString(p_pass).isNull()) { // Ask the user for a password int ret = KPasswordDialog::getPassword(p_pass, i18n("This bookmark file is encrypted. Please enter key for decryption."), &saveToWallet); @@ -319,7 +319,7 @@ pwd_entry: if (des.output().left(6) != "<sites" && des.output().left(9) != "<!DOCTYPE") { // Clear any saved passwords - KFTPAPI::getInstance()->walletConnection()->setPassword("bookmarkDecryptPwd", QString::null); + KFTPAPI::getInstance()->walletConnection()->setPassword("bookmarkDecryptPwd", TQString::null); if (KMessageBox::warningContinueCancel( KFTPAPI::getInstance()->mainWindow(), @@ -333,7 +333,7 @@ pwd_entry: } // Create new empty XML - m_document.setContent(QString("<sites version=\"%1\"></sites>").arg(KFTP_BOOKMARKS_VERSION)); + m_document.setContent(TQString("<sites version=\"%1\"></sites>").arg(KFTP_BOOKMARKS_VERSION)); file.close(); return; @@ -349,7 +349,7 @@ pwd_entry: } } - m_document.setContent(QString::fromLocal8Bit(content)); + m_document.setContent(TQString::fromLocal8Bit(content)); file.close(); // Check for XML document version updates @@ -366,18 +366,18 @@ void Manager::save() { // Save the new XML file if (m_filename.isEmpty()) { - qDebug("WARNING: No open XML file, will NOT save."); + tqDebug("WARNING: No open XML file, will NOT save."); return; } - QFile file(m_filename); + TQFile file(m_filename); if (!file.open(IO_WriteOnly)) { - qDebug("WARNING: Unable to open xml for writing!"); + tqDebug("WARNING: Unable to open xml for writing!"); return; } // Should we encrypt the data ? - QString content = m_document.toString(); + TQString content = m_document.toString(); if (KFTPCore::Config::encryptBookmarks()) { DESEncryptor des; @@ -393,28 +393,28 @@ void Manager::save() } // Write the XML data to the stream - QTextStream fileStream(&file); + TQTextStream fileStream(&file); fileStream << content; file.flush(); file.close(); } -void Manager::validate(QDomNode node) +void Manager::validate(TQDomNode node) { if (node.isNull()) node = m_document.documentElement(); - QDomNode n = node.firstChild(); + TQDomNode n = node.firstChild(); while (!n.isNull()) { if (n.toElement().tagName() == "category") { if (!n.toElement().hasAttribute("id")) - n.toElement().setAttribute("id", QString("cat-%1").arg(KApplication::randomString(7))); + n.toElement().setAttribute("id", TQString("cat-%1").arg(TDEApplication::randomString(7))); Manager::validate(n); } else if (n.toElement().tagName() == "server") { if (!n.toElement().hasAttribute("id")) - n.toElement().setAttribute("id", QString("site-%1").arg(KApplication::randomString(7))); + n.toElement().setAttribute("id", TQString("site-%1").arg(TDEApplication::randomString(7))); } n = n.nextSibling(); @@ -427,7 +427,7 @@ void Manager::versionUpdate() if (version < KFTP_BOOKMARKS_VERSION) { // Conversion from an old bookmark file - qDebug("Detected an old (version %d, new version %d) bookmarks file. Starting conversion process...", version, KFTP_BOOKMARKS_VERSION); + tqDebug("Detected an old (version %d, new version %d) bookmarks file. Starting conversion process...", version, KFTP_BOOKMARKS_VERSION); // NOTE: There are no breaks here, since every update method updates to a specific // version. So in order to convert to the most current from the oldest version, all @@ -442,7 +442,7 @@ void Manager::versionUpdate() } } -void Manager::versionFrom1Update(QDomNode parent) +void Manager::versionFrom1Update(TQDomNode parent) { // The original format had no site ids, so we have to generate them. Also the old // format used something wierd called "options", we have to convert them as well. @@ -451,30 +451,30 @@ void Manager::versionFrom1Update(QDomNode parent) if (parent.isNull()) parent = m_document.documentElement(); - QDomNode n = parent.firstChild(); + TQDomNode n = parent.firstChild(); while (!n.isNull()) { if (n.toElement().tagName() == "category") { // Update the category id and all children - n.toElement().setAttribute("id", QString("cat-%1").arg(KApplication::randomString(7))); + n.toElement().setAttribute("id", TQString("cat-%1").arg(TDEApplication::randomString(7))); versionFrom1Update(n); } else if (n.toElement().tagName() == "server") { // Update the server id - n.toElement().setAttribute("id", QString("site-%1").arg(KApplication::randomString(7))); + n.toElement().setAttribute("id", TQString("site-%1").arg(TDEApplication::randomString(7))); // Convert the "options" - QDomNodeList nodes = n.toElement().elementsByTagName("option"); + TQDomNodeList nodes = n.toElement().elementsByTagName("option"); if (nodes.length() > 0) { for (unsigned int i = 0; i < nodes.count(); i++) { - QDomNode node = nodes.item(i); + TQDomNode node = nodes.item(i); // Add a new standard property - QDomElement property = m_document.createElement(node.toElement().attribute("name")); + TQDomElement property = m_document.createElement(node.toElement().attribute("name")); n.appendChild(property); - QDomText text = m_document.createTextNode(node.toElement().attribute("value")); + TQDomText text = m_document.createTextNode(node.toElement().attribute("value")); property.appendChild(text); // And remove the option :> @@ -487,7 +487,7 @@ void Manager::versionFrom1Update(QDomNode parent) nodes = n.toElement().elementsByTagName("downuser"); if (nodes.length() > 0) { for (unsigned int i = 0; i < nodes.count(); i++) { - QDomNode node = nodes.item(i); + TQDomNode node = nodes.item(i); node.toElement().setTagName("username"); } } @@ -495,7 +495,7 @@ void Manager::versionFrom1Update(QDomNode parent) nodes = n.toElement().elementsByTagName("downpass"); if (nodes.length() > 0) { for (unsigned int i = 0; i < nodes.count(); i++) { - QDomNode node = nodes.item(i); + TQDomNode node = nodes.item(i); node.toElement().setTagName("password"); } } @@ -508,7 +508,7 @@ void Manager::versionFrom1Update(QDomNode parent) Site *Manager::findSite(const KURL &url) { // Find the node, then see if it is already present in the cache - QDomNode siteElement = findSiteElementByUrl(url); + TQDomNode siteElement = findSiteElementByUrl(url); if (!siteElement.isNull()) { // Try to get a cached version @@ -525,7 +525,7 @@ Site *Manager::findSite(const KURL &url) } } -Site *Manager::findSite(const QString &id) +Site *Manager::findSite(const TQString &id) { if (id.isNull()) return NULL; @@ -536,10 +536,10 @@ Site *Manager::findSite(const QString &id) if (!site) { // The site was not found, search in the DOM tree and add it to the // cache if found. - QDomNode siteElement = findSiteElementById(id); + TQDomNode siteElement = findSiteElementById(id); if (siteElement.isNull()) { - qDebug("WARNING: Unable to find site with id '%s'!", id.ascii()); + tqDebug("WARNING: Unable to find site with id '%s'!", id.ascii()); return NULL; } @@ -551,17 +551,17 @@ Site *Manager::findSite(const QString &id) return site; } -QDomNode Manager::findSiteElementByUrl(const KURL &url, QDomNode parent) +TQDomNode Manager::findSiteElementByUrl(const KURL &url, TQDomNode parent) { if (parent.isNull()) parent = m_document.documentElement(); - QDomNode n = parent.firstChild(); + TQDomNode n = parent.firstChild(); while (!n.isNull()) { if (n.toElement().tagName() == "category") { // Check the category - QDomNode site = findSiteElementByUrl(url, n); + TQDomNode site = findSiteElementByUrl(url, n); if (!site.isNull()) return site; @@ -584,20 +584,20 @@ QDomNode Manager::findSiteElementByUrl(const KURL &url, QDomNode parent) n = n.nextSibling(); } - return QDomNode(); + return TQDomNode(); } -QDomNode Manager::findSiteElementById(const QString &id, QDomNode parent) +TQDomNode Manager::findSiteElementById(const TQString &id, TQDomNode parent) { if (parent.isNull()) parent = m_document.documentElement(); - QDomNode n = parent.firstChild(); + TQDomNode n = parent.firstChild(); while (!n.isNull()) { if (n.toElement().tagName() == "category") { // Check the category - QDomNode site = findSiteElementById(id, n); + TQDomNode site = findSiteElementById(id, n); if (!site.isNull()) return site; @@ -610,10 +610,10 @@ QDomNode Manager::findSiteElementById(const QString &id, QDomNode parent) n = n.nextSibling(); } - return QDomNode(); + return TQDomNode(); } -QDomNode Manager::findCategoryElementById(const QString &id, QDomNode parent) +TQDomNode Manager::findCategoryElementById(const TQString &id, TQDomNode parent) { if (id == "root") return m_document.documentElement(); @@ -621,7 +621,7 @@ QDomNode Manager::findCategoryElementById(const QString &id, QDomNode parent) if (parent.isNull()) parent = m_document.documentElement(); - QDomNode n = parent.firstChild(); + TQDomNode n = parent.firstChild(); while (!n.isNull()) { if (n.toElement().tagName() == "category") { @@ -629,7 +629,7 @@ QDomNode Manager::findCategoryElementById(const QString &id, QDomNode parent) return n; // Check the category - QDomNode site = findCategoryElementById(id, n); + TQDomNode site = findCategoryElementById(id, n); if (!site.isNull()) return site; @@ -638,10 +638,10 @@ QDomNode Manager::findCategoryElementById(const QString &id, QDomNode parent) n = n.nextSibling(); } - return QDomNode(); + return TQDomNode(); } -Site *Manager::findCategory(const QString &id) +Site *Manager::findCategory(const TQString &id) { // Try the cache first Site *site = m_siteCache.find(id); @@ -649,10 +649,10 @@ Site *Manager::findCategory(const QString &id) if (!site) { // The site was not found, search in the DOM tree and add it to the // cache if found. - QDomNode siteElement = findCategoryElementById(id); + TQDomNode siteElement = findCategoryElementById(id); if (siteElement.isNull()) { - qDebug("WARNING: Unable to find category with id '%s'!", id.ascii()); + tqDebug("WARNING: Unable to find category with id '%s'!", id.ascii()); return NULL; } @@ -664,7 +664,7 @@ Site *Manager::findCategory(const QString &id) return site; } -Site *Manager::addSite(Site *category, QDomNode node) +Site *Manager::addSite(Site *category, TQDomNode node) { if (category) return category->addSite(node); @@ -687,7 +687,7 @@ void Manager::setupClient(Site *site, KFTPEngine::Thread *client) { if (site) { // First activate the correct socket and reset the old flags - client->selectSocketForProtocol(KURL(QString("%1://test/").arg(site->getProperty("protocol")))); + client->selectSocketForProtocol(KURL(TQString("%1://test/").arg(site->getProperty("protocol")))); client->socket()->initConfig(); int retryTime = site->getIntProperty("retrytime"); @@ -717,7 +717,7 @@ void Manager::setupClient(Site *site, KFTPEngine::Thread *client) // Should we use a X509 certificate ? if (site->getIntProperty("use_cert") && site->getProperty("protocol") == "ftp") { // Ask the user for the decryption password - QCString certPass; + TQCString certPass; KPasswordDialog::getPassword(certPass, i18n("Please provide your X509 certificate decryption password.")); static_cast<KFTPEngine::FtpSocket*>(client->socket())->setSslClientCertificate(KSSLPKCS12::loadCertFile(site->getProperty("tls_cert_path"), certPass)); @@ -728,7 +728,7 @@ void Manager::setupClient(Site *site, KFTPEngine::Thread *client) } } -void Manager::guiPopulateBookmarksTree(KFTPWidgets::Bookmarks::ListView *tree, QDomNode parent, KFTPWidgets::Bookmarks::ListViewItem *item) +void Manager::guiPopulateBookmarksTree(KFTPWidgets::Bookmarks::ListView *tree, TQDomNode parent, KFTPWidgets::Bookmarks::ListViewItem *item) { if (parent.isNull()) { // Clear the tree and set the parent @@ -736,7 +736,7 @@ void Manager::guiPopulateBookmarksTree(KFTPWidgets::Bookmarks::ListView *tree, Q parent = m_document.documentElement(); } - QDomNode n = parent.firstChild(); + TQDomNode n = parent.firstChild(); while (!n.isNull()) { if (n.toElement().tagName() == "category") { @@ -773,26 +773,26 @@ void Manager::guiPopulateBookmarksTree(KFTPWidgets::Bookmarks::ListView *tree, Q } } -void Manager::guiPopulateBookmarksMenu(KActionMenu *parentMenu, QDomNode parentNode, bool base, QObject *data) +void Manager::guiPopulateBookmarksMenu(TDEActionMenu *parentMenu, TQDomNode parentNode, bool base, TQObject *data) { if (parentNode.isNull()) parentNode = m_document.documentElement(); - QDomNode n = parentNode.firstChild(); - KActionMenu *menu = 0L; + TQDomNode n = parentNode.firstChild(); + TDEActionMenu *menu = 0L; KFTPBookmarkAction *action = 0L; while (!n.isNull()) { - QString name = n.toElement().attribute("name"); + TQString name = n.toElement().attribute("name"); if (n.toElement().tagName() == "category") { - menu = new KActionMenu(name, "bookmark_folder", parentMenu); + menu = new TDEActionMenu(name, "bookmark_folder", parentMenu); parentMenu->insert(menu, base ? 5 : 0); // Fill the menu guiPopulateBookmarksMenu(menu, n, false, data); } else if (n.toElement().tagName() == "server") { - action = new KFTPBookmarkAction(name, "ftp", KShortcut(), this, SLOT(slotBookmarkExecuted()), KFTPAPI::getInstance()->mainWindow()->actionCollection()); + action = new KFTPBookmarkAction(name, "ftp", TDEShortcut(), this, SLOT(slotBookmarkExecuted()), KFTPAPI::getInstance()->mainWindow()->actionCollection()); action->setSiteId(n.toElement().attribute("id")); action->setData(data); @@ -803,62 +803,62 @@ void Manager::guiPopulateBookmarksMenu(KActionMenu *parentMenu, QDomNode parentN } } -void Manager::guiPopulateZeroconfMenu(KActionMenu *parentMenu) +void Manager::guiPopulateZeroconfMenu(TDEActionMenu *parentMenu) { // Clear the menu parentMenu->popupMenu()->clear(); #if KDE_IS_VERSION(3,4,0) // Populate - QValueList<DNSSD::RemoteService::Ptr> list = KFTPAPI::getInstance()->zeroConfInterface()->getServiceList(); + TQValueList<DNSSD::RemoteService::Ptr> list = KFTPAPI::getInstance()->zeroConfInterface()->getServiceList(); if (!list.empty()) { - QValueList<DNSSD::RemoteService::Ptr>::iterator end(list.end()); + TQValueList<DNSSD::RemoteService::Ptr>::iterator end(list.end()); - for (QValueList<DNSSD::RemoteService::Ptr>::iterator i(list.begin()); i != end; ++i) { - KFTPZeroconfAction *newService = new KFTPZeroconfAction((*i)->serviceName(), "lan", KShortcut(), this, SLOT(slotZeroconfExecuted()), KFTPAPI::getInstance()->mainWindow()->actionCollection()); + for (TQValueList<DNSSD::RemoteService::Ptr>::iterator i(list.begin()); i != end; ++i) { + KFTPZeroconfAction *newService = new KFTPZeroconfAction((*i)->serviceName(), "lan", TDEShortcut(), this, SLOT(slotZeroconfExecuted()), KFTPAPI::getInstance()->mainWindow()->actionCollection()); newService->setSite(*i); parentMenu->insert(newService); } } else { - KAction *disabledAction = new KAction(i18n("<No Services Published>")); + TDEAction *disabledAction = new TDEAction(i18n("<No Services Published>")); disabledAction->setEnabled(false); parentMenu->insert(disabledAction); } #else - KAction *disabledAction = new KAction(i18n("<DNSSD Not Available>")); + TDEAction *disabledAction = new TDEAction(i18n("<DNSSD Not Available>")); disabledAction->setEnabled(false); parentMenu->insert(disabledAction); #endif } -void Manager::guiPopulateWalletMenu(KActionMenu *parentMenu) +void Manager::guiPopulateWalletMenu(TDEActionMenu *parentMenu) { // Clear the menu parentMenu->popupMenu()->clear(); // Populate - QValueList<KURL> list = KFTPAPI::getInstance()->walletConnection()->getSiteList(); + TQValueList<KURL> list = KFTPAPI::getInstance()->walletConnection()->getSiteList(); if (!list.empty()) { - QValueList<KURL>::iterator end(list.end()); + TQValueList<KURL>::iterator end(list.end()); - for (QValueList<KURL>::iterator i(list.begin()); i != end; ++i) { - QString desc; + for (TQValueList<KURL>::iterator i(list.begin()); i != end; ++i) { + TQString desc; if ((*i).port() != 21) - desc = QString("%1@%2:%3").arg((*i).user()).arg((*i).host()).arg((*i).port()); + desc = TQString("%1@%2:%3").arg((*i).user()).arg((*i).host()).arg((*i).port()); else - desc = QString("%1@%2").arg((*i).user()).arg((*i).host()); + desc = TQString("%1@%2").arg((*i).user()).arg((*i).host()); - KFTPWalletAction *newSite = new KFTPWalletAction(desc, "ftp", KShortcut(), this, SLOT(slotWalletExecuted()), KFTPAPI::getInstance()->mainWindow()->actionCollection()); + KFTPWalletAction *newSite = new KFTPWalletAction(desc, "ftp", TDEShortcut(), this, SLOT(slotWalletExecuted()), KFTPAPI::getInstance()->mainWindow()->actionCollection()); newSite->setSite(*i); parentMenu->insert(newSite); } } else { - KAction *disabledAction = new KAction(i18n("<No Sites In KWallet>")); + TDEAction *disabledAction = new TDEAction(i18n("<No Sites In KWallet>")); disabledAction->setEnabled(false); parentMenu->insert(disabledAction); } @@ -867,7 +867,7 @@ void Manager::guiPopulateWalletMenu(KActionMenu *parentMenu) void Manager::slotBookmarkExecuted() { // Get the sender - KFTPBookmarkAction *action = (KFTPBookmarkAction*) QObject::sender(); + KFTPBookmarkAction *action = (KFTPBookmarkAction*) TQObject::sender(); Site *site = findSite(action->siteId()); // Get the node data from bookmarks @@ -875,8 +875,8 @@ void Manager::slotBookmarkExecuted() // Handle empty usernames and passwords for non-anonymous sites if (!siteUrl.hasUser() || !siteUrl.hasPass() && siteUrl.user() != "anonymous") { - KIO::PasswordDialog *dlg = new KIO::PasswordDialog(i18n("Please provide your username and password for connecting to this site."), siteUrl.user(), true); - dlg->addCommentLine(i18n("Site:"), QString("%1:%2").arg(siteUrl.host()).arg(siteUrl.port())); + TDEIO::PasswordDialog *dlg = new TDEIO::PasswordDialog(i18n("Please provide your username and password for connecting to this site."), siteUrl.user(), true); + dlg->addCommentLine(i18n("Site:"), TQString("%1:%2").arg(siteUrl.host()).arg(siteUrl.port())); if (dlg->exec() == KDialogBase::Accepted) { siteUrl.setUser(dlg->username()); @@ -924,7 +924,7 @@ void Manager::slotBookmarkExecuted() void Manager::slotWalletExecuted() { // Get the sender - KFTPWalletAction *action = (KFTPWalletAction*) QObject::sender(); + KFTPWalletAction *action = (KFTPWalletAction*) TQObject::sender(); KURL siteUrl = action->getSite(); // Just spawn a new session @@ -935,7 +935,7 @@ void Manager::slotZeroconfExecuted() { #if KDE_IS_VERSION(3,4,0) // Get the sender - KFTPZeroconfAction *action = (KFTPZeroconfAction*) QObject::sender(); + KFTPZeroconfAction *action = (KFTPZeroconfAction*) TQObject::sender(); DNSSD::RemoteService::Ptr service = action->getSite(); KFTPAPI::getInstance()->mainWindow()->slotQuickConnect(service->serviceName(), service->hostName(), service->port()); diff --git a/kftpgrabber/src/kftpbookmarks.h b/kftpgrabber/src/kftpbookmarks.h index 769bb72..5e82d47 100644 --- a/kftpgrabber/src/kftpbookmarks.h +++ b/kftpgrabber/src/kftpbookmarks.h @@ -36,13 +36,13 @@ #ifndef KFTPBOOKMARKS_H #define KFTPBOOKMARKS_H -#include <qstring.h> -#include <qdom.h> -#include <qvaluelist.h> -#include <qcache.h> +#include <ntqstring.h> +#include <ntqdom.h> +#include <ntqvaluelist.h> +#include <ntqcache.h> -#include <kpopupmenu.h> -#include <kaction.h> +#include <tdepopupmenu.h> +#include <tdeaction.h> #include <kurl.h> namespace KFTPEngine { @@ -68,37 +68,37 @@ enum SiteType { class Site { friend class Manager; public: - Site(QDomNode node); + Site(TQDomNode node); ~Site(); void reparentSite(Site *site); - Site *addSite(QDomNode node = QDomNode()); - void addCategory(const QString &name); + Site *addSite(TQDomNode node = TQDomNode()); + void addCategory(const TQString &name); KURL getUrl(); Site *getParentSite(); Site *duplicate(); - QString getProperty(const QString &name); - int getIntProperty(const QString &name); + TQString getProperty(const TQString &name); + int getIntProperty(const TQString &name); - void setProperty(const QString &name, const QString &value); - void setProperty(const QString &name, int value); + void setProperty(const TQString &name, const TQString &value); + void setProperty(const TQString &name, int value); - void setAttribute(const QString &name, const QString &value); - QString getAttribute(const QString &name); + void setAttribute(const TQString &name, const TQString &value); + TQString getAttribute(const TQString &name); SiteType type() { return m_type; } - QString id() { return m_id; } + TQString id() { return m_id; } private: SiteType m_type; - QString m_id; - QDomElement m_element; + TQString m_id; + TQDomElement m_element; }; -class Manager : public QObject { +class Manager : public TQObject { Q_OBJECT public: static Manager *self(); @@ -107,46 +107,46 @@ public: ~Manager(); void setBookmarks(KFTPBookmarks::Manager *bookmarks); - void importSites(QDomNode node); + void importSites(TQDomNode node); - void load(const QString &filename); + void load(const TQString &filename); void save(); - Site *findSite(const QString &id); + Site *findSite(const TQString &id); Site *findSite(const KURL &url) KDE_DEPRECATED; - Site *findCategory(const QString &id); + Site *findCategory(const TQString &id); - Site *addSite(Site *category, QDomNode node); + Site *addSite(Site *category, TQDomNode node); void delSite(Site *site); void setupClient(Site *site, KFTPEngine::Thread *client); - void guiPopulateBookmarksMenu(KActionMenu *parentMenu, QDomNode parentNode = QDomNode(), bool base = true, QObject *data = 0); - void guiPopulateBookmarksTree(KFTPWidgets::Bookmarks::ListView *tree, QDomNode parent = QDomNode(), KFTPWidgets::Bookmarks::ListViewItem *item = 0); - void guiPopulateZeroconfMenu(KActionMenu *parentMenu); - void guiPopulateWalletMenu(KActionMenu *parentMenu); + void guiPopulateBookmarksMenu(TDEActionMenu *parentMenu, TQDomNode parentNode = TQDomNode(), bool base = true, TQObject *data = 0); + void guiPopulateBookmarksTree(KFTPWidgets::Bookmarks::ListView *tree, TQDomNode parent = TQDomNode(), KFTPWidgets::Bookmarks::ListViewItem *item = 0); + void guiPopulateZeroconfMenu(TDEActionMenu *parentMenu); + void guiPopulateWalletMenu(TDEActionMenu *parentMenu); void emitUpdate() { emit update(); } protected: static Manager *m_self; private: - QCache<Site> m_siteCache; - QDomDocument m_document; + TQCache<Site> m_siteCache; + TQDomDocument m_document; - QCString m_decryptKey; - QString m_filename; + TQCString m_decryptKey; + TQString m_filename; - QDomNode findSiteElementByUrl(const KURL &url, QDomNode parent = QDomNode()); - QDomNode findSiteElementById(const QString &id, QDomNode parent = QDomNode()); - QDomNode findCategoryElementById(const QString &id, QDomNode parent = QDomNode()); + TQDomNode findSiteElementByUrl(const KURL &url, TQDomNode parent = TQDomNode()); + TQDomNode findSiteElementById(const TQString &id, TQDomNode parent = TQDomNode()); + TQDomNode findCategoryElementById(const TQString &id, TQDomNode parent = TQDomNode()); // Validation - void validate(QDomNode node = QDomNode()); + void validate(TQDomNode node = TQDomNode()); // XML conversion methods void versionUpdate(); - void versionFrom1Update(QDomNode parent = QDomNode()); + void versionFrom1Update(TQDomNode parent = TQDomNode()); private slots: void slotBookmarkExecuted(); void slotZeroconfExecuted(); diff --git a/kftpgrabber/src/kftpfileexistsactions.cpp b/kftpgrabber/src/kftpfileexistsactions.cpp index d9e7e69..5ebf588 100644 --- a/kftpgrabber/src/kftpfileexistsactions.cpp +++ b/kftpgrabber/src/kftpfileexistsactions.cpp @@ -35,29 +35,29 @@ #include "kftpfileexistsactions.h" -#include <qlayout.h> -#include <qgroupbox.h> -#include <qlabel.h> +#include <ntqlayout.h> +#include <ntqgroupbox.h> +#include <ntqlabel.h> #include <kdialog.h> #include <kcombobox.h> -#include <klocale.h> +#include <tdelocale.h> namespace KFTPQueue { -QString &operator<<(QString &s, const FileExistsActions &a) +TQString &operator<<(TQString &s, const FileExistsActions &a) { s.truncate(0); ActionMap::ConstIterator end( a.m_actions.end() ); for (ActionMap::ConstIterator i( a.m_actions.begin() ); i != end; ++i) { - s.append(QString("%1;").arg(i.data())); + s.append(TQString("%1;").arg(i.data())); } return s; } -QString &operator>>(QString &s, FileExistsActions &a) +TQString &operator>>(TQString &s, FileExistsActions &a) { for (unsigned int i = 0; i < 9; i++) { a.m_actions[i+1] = static_cast<FEAction>(s.section(';', i, i).toInt()); @@ -66,33 +66,33 @@ QString &operator>>(QString &s, FileExistsActions &a) return s; } -QWidget *FileExistsActions::getConfigWidget(QWidget *parent) +TQWidget *FileExistsActions::getConfigWidget(TQWidget *parent) { - QGroupBox *gb = new QGroupBox(0, Qt::Vertical, i18n("On File Exists Actions (%1)").arg(m_type), parent); + TQGroupBox *gb = new TQGroupBox(0, TQt::Vertical, i18n("On File Exists Actions (%1)").arg(m_type), parent); gb->layout()->setSpacing(KDialog::spacingHint()); gb->layout()->setMargin(KDialog::marginHint()); - QGridLayout *gl = new QGridLayout(gb->layout(), 5, 4, 5); + TQGridLayout *gl = new TQGridLayout(gb->layout(), 5, 4, 5); - QLabel *l = new QLabel(i18n("Size/Timestamp"), gb); + TQLabel *l = new TQLabel(i18n("Size/Timestamp"), gb); gl->addWidget(l, 1, 0); - l = new QLabel(i18n("Same"), gb); + l = new TQLabel(i18n("Same"), gb); gl->addWidget(l, 1, 1); - l = new QLabel(i18n("Older"), gb); + l = new TQLabel(i18n("Older"), gb); gl->addWidget(l, 1, 2); - l = new QLabel(i18n("Newer"), gb); + l = new TQLabel(i18n("Newer"), gb); gl->addWidget(l, 1, 3); - l = new QLabel(i18n("Same"), gb); + l = new TQLabel(i18n("Same"), gb); gl->addWidget(l, 2, 0); - l = new QLabel(i18n("Smaller"), gb); + l = new TQLabel(i18n("Smaller"), gb); gl->addWidget(l, 3, 0); - l = new QLabel(i18n("Bigger"), gb); + l = new TQLabel(i18n("Bigger"), gb); gl->addWidget(l, 4, 0); for (int row = 0; row < 3; row++) { diff --git a/kftpgrabber/src/kftpfileexistsactions.h b/kftpgrabber/src/kftpfileexistsactions.h index be2fdfe..54d2b28 100644 --- a/kftpgrabber/src/kftpfileexistsactions.h +++ b/kftpgrabber/src/kftpfileexistsactions.h @@ -38,8 +38,8 @@ #include <sys/types.h> -#include <qwidget.h> -#include <qmap.h> +#include <ntqwidget.h> +#include <ntqmap.h> typedef unsigned long long int filesize_t; @@ -56,7 +56,7 @@ enum FEAction { FE_USER_ACT = 4 }; -typedef QMap<int, FEAction> ActionMap; +typedef TQMap<int, FEAction> ActionMap; /** * This class provides configurable "on file exists" actions. They are @@ -80,9 +80,9 @@ public: * change the values. * * @param parent Widget's parent - * @return A new @ref QWidget + * @return A new @ref TQWidget */ - QWidget *getConfigWidget(QWidget *parent = 0); + TQWidget *getConfigWidget(TQWidget *parent = 0); /** * Set action for a specific file exists situation. @@ -109,7 +109,7 @@ public: * * @param text The text */ - void setTypeText(const QString &text) { m_type = text; } + void setTypeText(const TQString &text) { m_type = text; } /** * Update the current GUI widget with new settings. @@ -123,15 +123,15 @@ public: void updateConfig(); private: ActionMap m_actions; - QString m_type; + TQString m_type; KComboBox *m_combos[3][3]; - friend QString &operator<<(QString &s, const FileExistsActions &a); - friend QString &operator>>(QString &s, FileExistsActions &a); + friend TQString &operator<<(TQString &s, const FileExistsActions &a); + friend TQString &operator>>(TQString &s, FileExistsActions &a); }; -QString &operator<<(QString &s, const FileExistsActions &a); -QString &operator>>(QString &s, FileExistsActions &a); +TQString &operator<<(TQString &s, const FileExistsActions &a); +TQString &operator>>(TQString &s, FileExistsActions &a); } diff --git a/kftpgrabber/src/kftpgrabber.desktop b/kftpgrabber/src/kftpgrabber.desktop index b26bc06..a8b51ea 100644 --- a/kftpgrabber/src/kftpgrabber.desktop +++ b/kftpgrabber/src/kftpgrabber.desktop @@ -70,4 +70,4 @@ Comment[zh_CN]=图形化 FTP 客户端 Exec=kftpgrabber Icon=kftpgrabber Type=Application -Categories=Qt;KDE;Network;FileTransfer; +Categories=Qt;TDE;Network;FileTransfer; diff --git a/kftpgrabber/src/kftpqueue.cpp b/kftpgrabber/src/kftpqueue.cpp index 0186c4e..3d0f7ff 100644 --- a/kftpgrabber/src/kftpqueue.cpp +++ b/kftpgrabber/src/kftpqueue.cpp @@ -44,11 +44,11 @@ #include "misc/config.h" #include "misc/filter.h" -#include <kmessagebox.h> -#include <klocale.h> -#include <kio/renamedlg.h> +#include <tdemessagebox.h> +#include <tdelocale.h> +#include <tdeio/renamedlg.h> #include <kdiskfreesp.h> -#include <kfileitem.h> +#include <tdefileitem.h> #include <kopenwith.h> #include <kstaticdeleter.h> #include <kservice.h> @@ -57,10 +57,10 @@ #include <krun.h> #include <kmdcodec.h> -#include <qapplication.h> -#include <qregexp.h> -#include <qobjectlist.h> -#include <qfile.h> +#include <ntqapplication.h> +#include <ntqregexp.h> +#include <ntqobjectlist.h> +#include <ntqfile.h> using namespace KFTPEngine; using namespace KFTPCore::Filter; @@ -70,32 +70,32 @@ namespace KFTPQueue { OpenedFile::OpenedFile(TransferFile *transfer) : m_source(transfer->getSourceUrl()), m_dest(transfer->getDestUrl()), - m_hash(QString::null) + m_hash(TQString::null) { // Calculate the file's MD5 hash - QFile file(m_dest.path()); + TQFile file(m_dest.path()); if (!file.open(IO_ReadOnly)) { return; } KMD5 context; if (context.update(file)) - m_hash = QString(context.hexDigest()); + m_hash = TQString(context.hexDigest()); file.close(); } bool OpenedFile::hasChanged() { // Compare the file's MD5 hash with stored value - QFile file(m_dest.path()); + TQFile file(m_dest.path()); if (!file.open(IO_ReadOnly)) { return false; } - QString tmp = QString::null; + TQString tmp = TQString::null; KMD5 context; if (context.update(file)) - tmp = QString(context.hexDigest()); + tmp = TQString(context.hexDigest()); file.close(); return tmp != m_hash; @@ -137,7 +137,7 @@ Manager::Manager() { m_topLevel->setId(0); - m_lastQID = 1; + m_lastTQID = 1; m_curDownSpeed = 0; m_curUpSpeed = 0; @@ -165,14 +165,14 @@ void Manager::stopAllTransfers() abort(); } else { QueueObject *i; - QPtrList<QueueObject> sites = topLevelObject()->getChildrenList(); + TQPtrList<QueueObject> sites = topLevelObject()->getChildrenList(); for (i = sites.first(); i; i = sites.next()) { if (i->isRunning()) { i->abort(); } else { QueueObject *t; - QPtrList<QueueObject> list = i->getChildrenList(); + TQPtrList<QueueObject> list = i->getChildrenList(); for (t = list.first(); t; t = list.next()) { if (t->isRunning()) @@ -186,11 +186,11 @@ void Manager::stopAllTransfers() Transfer *Manager::findTransfer(long id) { // First try the cache - QueueObject *object = m_queueObjectCache[QString::number(id)]; + QueueObject *object = m_queueObjectCache[TQString::number(id)]; if (!object) { object = m_topLevel->findChildObject(id); - m_queueObjectCache.insert(QString::number(id), object); + m_queueObjectCache.insert(TQString::number(id), object); } return static_cast<Transfer*>(object); @@ -206,7 +206,7 @@ Site *Manager::findSite(KURL url, bool noCreate) // Find the appropriate site and if one doesn't exist create a new one QueueObject *i; - QPtrList<QueueObject> sites = topLevelObject()->getChildrenList(); + TQPtrList<QueueObject> sites = topLevelObject()->getChildrenList(); for (i = sites.first(); i; i = sites.next()) { if (i->getType() == QueueObject::Site) { @@ -220,7 +220,7 @@ Site *Manager::findSite(KURL url, bool noCreate) // The site doesn't exist, let's create one if (!noCreate) { Site *site = new Site(topLevelObject(), url); - site->setId(m_lastQID++); + site->setId(m_lastTQID++); emit newSite(site); return site; @@ -232,7 +232,7 @@ Site *Manager::findSite(KURL url, bool noCreate) void Manager::insertTransfer(Transfer *transfer) { // Set id - transfer->setId(m_lastQID++); + transfer->setId(m_lastTQID++); // Reparent transfer filesize_t size = transfer->getSize(); @@ -265,7 +265,7 @@ void Manager::insertTransfer(Transfer *transfer) void Manager::insertTransfer(KURLDrag *drag) { // Decode the drag - KIO::MetaData p_meta; + TDEIO::MetaData p_meta; KURL::List p_urls; KURLDrag::decode(drag, p_urls, p_meta); @@ -279,8 +279,8 @@ void Manager::insertTransfer(KURLDrag *drag) KURL::List::iterator end(p_urls.end()); for (KURL::List::iterator i(p_urls.begin()); i != end; ++i) { - QString p_data = p_meta[(*i).htmlURL().local8Bit()]; - QChar type = p_data.at(0); + TQString p_data = p_meta[(*i).htmlURL().local8Bit()]; + TQChar type = p_data.at(0); filesize_t size = p_data.section(':', 1, 1).toULongLong(); KURL sourceUrl = (*i); KURL destinationUrl = KURL(p_meta["DestURL"]); @@ -299,7 +299,7 @@ void Manager::insertTransfer(KURLDrag *drag) } Transfer *Manager::spawnTransfer(KURL sourceUrl, KURL destinationUrl, filesize_t size, bool dir, bool ignoreSkip, - bool insertToQueue, QObject *parent, bool noScan) + bool insertToQueue, TQObject *parent, bool noScan) { const ActionChain *actionChain = Filters::self()->process(sourceUrl, size, dir); @@ -342,7 +342,7 @@ Transfer *Manager::spawnTransfer(KURL sourceUrl, KURL destinationUrl, filesize_t if (insertToQueue) { insertTransfer(transfer); } else { - transfer->setId(m_lastQID++); + transfer->setId(m_lastTQID++); emit newTransfer(transfer); } @@ -366,7 +366,7 @@ void Manager::removeTransfer(Transfer *transfer, bool abortSession) long sid = transfer->parentObject()->getId(); // Remove transfer from cache - m_queueObjectCache.remove(QString::number(id)); + m_queueObjectCache.remove(TQString::number(id)); // Should the site be removed as well ? QueueObject *site = 0; @@ -440,7 +440,7 @@ void Manager::clearFailedTransferList() { // Clear the failed transfers list FailedTransfer *transfer; - QPtrListIterator<KFTPQueue::FailedTransfer> i(m_failedTransfers); + TQPtrListIterator<KFTPQueue::FailedTransfer> i(m_failedTransfers); while ((transfer = i.current()) != 0) { ++i; @@ -499,11 +499,11 @@ void Manager::doEmitUpdate() // Get download/upload speeds QueueObject *i; - QPtrList<QueueObject> sites = topLevelObject()->getChildrenList(); + TQPtrList<QueueObject> sites = topLevelObject()->getChildrenList(); for (i = sites.first(); i; i = sites.next()) { QueueObject *t; - QPtrList<QueueObject> list = i->getChildrenList(); + TQPtrList<QueueObject> list = i->getChildrenList(); for (t = list.first(); t; t = list.next()) { KFTPQueue::Transfer *tmp = static_cast<Transfer*>(t); @@ -565,11 +565,11 @@ void Manager::slotQueueProcessingAborted() void Manager::clearQueue() { QueueObject *i; - QPtrList<QueueObject> sites = topLevelObject()->getChildrenList(); + TQPtrList<QueueObject> sites = topLevelObject()->getChildrenList(); for (i = sites.first(); i; i = sites.next()) { QueueObject *t; - QPtrList<QueueObject> list = i->getChildrenList(); + TQPtrList<QueueObject> list = i->getChildrenList(); for (t = list.first(); t; t = list.next()) removeTransfer(static_cast<Transfer*>(t)); @@ -586,11 +586,11 @@ int Manager::getNumRunning(bool onlyDirs) int running = 0; QueueObject *i; - QPtrList<QueueObject> sites = topLevelObject()->getChildrenList(); + TQPtrList<QueueObject> sites = topLevelObject()->getChildrenList(); for (i = sites.first(); i; i = sites.next()) { QueueObject *t; - QPtrList<QueueObject> list = i->getChildrenList(); + TQPtrList<QueueObject> list = i->getChildrenList(); for (t = list.first(); t; t = list.next()) { if (t->isRunning() && (!onlyDirs || t->isDir())) @@ -611,7 +611,7 @@ int Manager::getNumRunning(const KURL &remoteUrl) if (site) { QueueObject *i; - QPtrList<QueueObject> transfers = site->getChildrenList(); + TQPtrList<QueueObject> transfers = site->getChildrenList(); for (i = transfers.first(); i; i = transfers.next()) { if (i->isRunning()) @@ -623,7 +623,7 @@ int Manager::getNumRunning(const KURL &remoteUrl) } KFTPEngine::FileExistsWakeupEvent *Manager::fileExistsAction(TransferFile *transfer, - QValueList<KFTPEngine::DirectoryEntry> stat) + TQValueList<KFTPEngine::DirectoryEntry> stat) { FileExistsWakeupEvent *event = new FileExistsWakeupEvent(); FileExistsActions *fa = NULL; @@ -643,7 +643,7 @@ KFTPEngine::FileExistsWakeupEvent *Manager::fileExistsAction(TransferFile *trans case KFTPQueue::Download: { KFileItem info(KFileItem::Unknown, KFileItem::Unknown, transfer->getDestUrl()); dstSize = info.size(); - dstTime = info.time(KIO::UDS_MODIFICATION_TIME); + dstTime = info.time(TDEIO::UDS_MODIFICATION_TIME); srcSize = stat[0].size(); srcTime = stat[0].time(); @@ -654,7 +654,7 @@ KFTPEngine::FileExistsWakeupEvent *Manager::fileExistsAction(TransferFile *trans case KFTPQueue::Upload: { KFileItem info(KFileItem::Unknown, KFileItem::Unknown, transfer->getSourceUrl()); srcSize = info.size(); - srcTime = info.time(KIO::UDS_MODIFICATION_TIME); + srcTime = info.time(TDEIO::UDS_MODIFICATION_TIME); dstSize = stat[0].size(); dstTime = stat[0].time(); @@ -718,12 +718,12 @@ void Manager::processUserDialogRequest() // A dialog really needs to be displayed TransferFile *transfer = request->getTransfer(); - QString newDestPath; - KIO::RenameDlg_Result r = KIO::open_RenameDlg( + TQString newDestPath; + TDEIO::RenameDlg_Result r = TDEIO::open_RenameDlg( i18n("File Exists"), transfer->getSourceUrl().prettyURL(), transfer->getDestUrl().prettyURL(), - (KIO::RenameDlg_Mode) (KIO::M_OVERWRITE | KIO::M_RESUME | KIO::M_SKIP | KIO::M_MULTI), + (TDEIO::RenameDlg_Mode) (TDEIO::M_OVERWRITE | TDEIO::M_RESUME | TDEIO::M_SKIP | TDEIO::M_MULTI), newDestPath, request->sourceSize(), request->destinationSize(), @@ -732,7 +732,7 @@ void Manager::processUserDialogRequest() ); switch (r) { - case KIO::R_RENAME: { + case TDEIO::R_RENAME: { KURL url = transfer->getDestUrl(); url.setPath(newDestPath); transfer->setDestUrl(url); @@ -741,7 +741,7 @@ void Manager::processUserDialogRequest() event->newFileName = newDestPath; break; } - case KIO::R_CANCEL: { + case TDEIO::R_CANCEL: { // Abort queue processing abort(); transfer->abort(); @@ -751,11 +751,11 @@ void Manager::processUserDialogRequest() event = 0; break; } - case KIO::R_AUTO_SKIP: setDefaultFileExistsAction(FE_SKIP_ACT); - case KIO::R_SKIP: event->action = FileExistsWakeupEvent::Skip; break; - case KIO::R_RESUME_ALL: setDefaultFileExistsAction(FE_RESUME_ACT); - case KIO::R_RESUME: event->action = FileExistsWakeupEvent::Resume; break; - case KIO::R_OVERWRITE_ALL: setDefaultFileExistsAction(FE_OVERWRITE_ACT); + case TDEIO::R_AUTO_SKIP: setDefaultFileExistsAction(FE_SKIP_ACT); + case TDEIO::R_SKIP: event->action = FileExistsWakeupEvent::Skip; break; + case TDEIO::R_RESUME_ALL: setDefaultFileExistsAction(FE_RESUME_ACT); + case TDEIO::R_RESUME: event->action = FileExistsWakeupEvent::Resume; break; + case TDEIO::R_OVERWRITE_ALL: setDefaultFileExistsAction(FE_OVERWRITE_ACT); default: event->action = FileExistsWakeupEvent::Overwrite; break; } } else { @@ -778,13 +778,13 @@ void Manager::processUserDialogRequest() void Manager::openAfterTransfer(TransferFile *transfer) { - QString mimeType = KMimeType::findByURL(transfer->getDestUrl(), 0, true, true)->name(); + TQString mimeType = KMimeType::findByURL(transfer->getDestUrl(), 0, true, true)->name(); KService::Ptr offer = KServiceTypeProfile::preferredService(mimeType, "Application"); if (!offer) { KOpenWithDlg dialog(KURL::List(transfer->getDestUrl())); - if (dialog.exec() == QDialog::Accepted) { + if (dialog.exec() == TQDialog::Accepted) { offer = dialog.service(); if (!offer) @@ -794,11 +794,11 @@ void Manager::openAfterTransfer(TransferFile *transfer) } } - QStringList params = KRun::processDesktopExec(*offer, KURL::List(transfer->getDestUrl()), false); - KProcess *p = new KProcess(this); + TQStringList params = KRun::processDesktopExec(*offer, KURL::List(transfer->getDestUrl()), false); + TDEProcess *p = new TDEProcess(this); *p << params; - connect(p, SIGNAL(processExited(KProcess*)), this, SLOT(slotEditProcessTerminated(KProcess*))); + connect(p, SIGNAL(processExited(TDEProcess*)), this, SLOT(slotEditProcessTerminated(TDEProcess*))); p->start(); @@ -806,7 +806,7 @@ void Manager::openAfterTransfer(TransferFile *transfer) m_editProcessList.insert(p->pid(), OpenedFile(transfer)); } -void Manager::slotEditProcessTerminated(KProcess *p) +void Manager::slotEditProcessTerminated(TDEProcess *p) { // A process has terminated, we should reupload OpenedFile file = m_editProcessList[p->pid()]; diff --git a/kftpgrabber/src/kftpqueue.h b/kftpgrabber/src/kftpqueue.h index d20d817..fc47572 100644 --- a/kftpgrabber/src/kftpqueue.h +++ b/kftpgrabber/src/kftpqueue.h @@ -36,12 +36,12 @@ #ifndef KFTPQUEUE_H #define KFTPQUEUE_H -#include <qstring.h> -#include <qvaluelist.h> -#include <qtimer.h> -#include <qcache.h> -#include <qmap.h> -#include <qpair.h> +#include <ntqstring.h> +#include <ntqvaluelist.h> +#include <ntqtimer.h> +#include <ntqcache.h> +#include <ntqmap.h> +#include <ntqpair.h> #include <kurl.h> #include <kurldrag.h> @@ -70,7 +70,7 @@ namespace KFTPSession { class KFTPQueueConverter; -typedef QPtrList<KFTPQueue::Transfer> KFTPQueueTransfers; +typedef TQPtrList<KFTPQueue::Transfer> KFTPQueueTransfers; namespace KFTPQueue { @@ -117,7 +117,7 @@ private: KURL m_source; KURL m_dest; - QString m_hash; + TQString m_hash; }; /** @@ -181,7 +181,7 @@ private: * * @author Jernej Kos <kostko@unimatrix-one.org> */ -class Manager : public QObject { +class Manager : public TQObject { Q_OBJECT friend class KFTPSession::Session; friend class KFTPSession::Connection; @@ -329,9 +329,9 @@ public: /** * Returns the list of failed transfers. * - * @return The QPtrList of FailedTransfer objects + * @return The TQPtrList of FailedTransfer objects */ - QPtrList<KFTPQueue::FailedTransfer> *getFailedTransferList() { return &m_failedTransfers; } + TQPtrList<KFTPQueue::FailedTransfer> *getFailedTransferList() { return &m_failedTransfers; } /** * Return the queue converter (exporter). @@ -421,7 +421,7 @@ public: * * @return The next available transfer id */ - long nextTransferId() { return m_lastQID++; } + long nextTransferId() { return m_lastTQID++; } /** * Set a default action to take when encountering an existing file situation. Note that @@ -449,7 +449,7 @@ public: * @return A FileExistsWakeupEvent that will be sent to the engine */ KFTPEngine::FileExistsWakeupEvent *fileExistsAction(KFTPQueue::TransferFile *transfer, - QValueList<KFTPEngine::DirectoryEntry> stat); + TQValueList<KFTPEngine::DirectoryEntry> stat); /** * Spawn a new transfer. @@ -465,7 +465,7 @@ public: * @return A valid KFTPQueue::Transfer instance */ KFTPQueue::Transfer *spawnTransfer(KURL sourceUrl, KURL destinationUrl, filesize_t size, bool dir, - bool ignoreSkip = false, bool insertToQueue = true, QObject *parent = 0L, bool noScan = false); + bool ignoreSkip = false, bool insertToQueue = true, TQObject *parent = 0L, bool noScan = false); protected: /** * Global class instance. @@ -491,14 +491,14 @@ protected: void processUserDialogRequest(); private: QueueObject *m_topLevel; - QCache<QueueObject> m_queueObjectCache; + TQCache<QueueObject> m_queueObjectCache; - QMap<pid_t, OpenedFile> m_editProcessList; - QPtrList<KFTPQueue::FailedTransfer> m_failedTransfers; + TQMap<pid_t, OpenedFile> m_editProcessList; + TQPtrList<KFTPQueue::FailedTransfer> m_failedTransfers; KFTPQueueProcessor *m_queueProc; KFTPQueueConverter *m_converter; - long m_lastQID; + long m_lastTQID; bool m_emitUpdate; bool m_processingQueue; @@ -507,12 +507,12 @@ private: bool m_feDialogOpen; FEAction m_defaultFeAction; - QPtrList<UserDialogRequest> m_userDialogRequests; + TQPtrList<UserDialogRequest> m_userDialogRequests; private slots: void slotQueueProcessingComplete(); void slotQueueProcessingAborted(); - void slotEditProcessTerminated(KProcess *p); + void slotEditProcessTerminated(TDEProcess *p); signals: void newSite(KFTPQueue::Site*); void newTransfer(KFTPQueue::Transfer*); diff --git a/kftpgrabber/src/kftpqueueconverter.cpp b/kftpgrabber/src/kftpqueueconverter.cpp index 700ad2f..24f7941 100644 --- a/kftpgrabber/src/kftpqueueconverter.cpp +++ b/kftpgrabber/src/kftpqueueconverter.cpp @@ -36,29 +36,29 @@ #include "kftpqueueconverter.h" #include "kftpqueue.h" -#include <qfile.h> -#include <qobjectlist.h> +#include <ntqfile.h> +#include <ntqobjectlist.h> #include <kfilterdev.h> -KFTPQueueConverter::KFTPQueueConverter(QObject *parent, const char *name) - : QObject(parent, name) +KFTPQueueConverter::KFTPQueueConverter(TQObject *parent, const char *name) + : TQObject(parent, name) { } -void KFTPQueueConverter::importQueue(const QString &filename) +void KFTPQueueConverter::importQueue(const TQString &filename) { - m_xml = QDomDocument("KFTPGrabberQueue"); + m_xml = TQDomDocument("KFTPGrabberQueue"); KFTPQueue::Manager::self()->clearQueue(); // Load from file - QIODevice *file = KFilterDev::deviceForFile(filename); + TQIODevice *file = KFilterDev::deviceForFile(filename); m_xml.setContent(file); file->close(); delete file; // Parse XML and create KFTPQueueTransfers - QDomNode n = m_xml.documentElement().firstChild(); + TQDomNode n = m_xml.documentElement().firstChild(); while (!n.isNull()) { importNode(n); @@ -68,63 +68,63 @@ void KFTPQueueConverter::importQueue(const QString &filename) KFTPQueue::Manager::self()->doEmitUpdate(); } -void KFTPQueueConverter::exportQueue(const QString &filename) +void KFTPQueueConverter::exportQueue(const TQString &filename) { - m_xml = QDomDocument("KFTPGrabberQueue"); - m_xml.setContent(QString("<queue></queue>")); + m_xml = TQDomDocument("KFTPGrabberQueue"); + m_xml.setContent(TQString("<queue></queue>")); // Go trough all KFTPQueueTransfers and generate XML KFTPQueue::QueueObject *i; - QPtrList<KFTPQueue::QueueObject> sites = KFTPQueue::Manager::self()->topLevelObject()->getChildrenList(); + TQPtrList<KFTPQueue::QueueObject> sites = KFTPQueue::Manager::self()->topLevelObject()->getChildrenList(); for (i = sites.first(); i; i = sites.next()) { KFTPQueue::QueueObject *t; - QPtrList<KFTPQueue::QueueObject> list = i->getChildrenList(); + TQPtrList<KFTPQueue::QueueObject> list = i->getChildrenList(); for (t = list.first(); t; t = list.next()) generateXML(static_cast<KFTPQueue::Transfer*>(t), m_xml.documentElement()); } // Save to file - QIODevice *file = KFilterDev::deviceForFile(filename, "application/x-gzip"); + TQIODevice *file = KFilterDev::deviceForFile(filename, "application/x-gzip"); if (!file->open(IO_WriteOnly)) { - qDebug("WARNING: Unable to open xml for writing!"); + tqDebug("WARNING: Unable to open xml for writing!"); return; } - QTextStream fileStream(file); + TQTextStream fileStream(file); m_xml.save(fileStream, 2); file->flush(); file->close(); delete file; } -void KFTPQueueConverter::generateXML(KFTPQueue::Transfer *transfer, QDomNode parent) +void KFTPQueueConverter::generateXML(KFTPQueue::Transfer *transfer, TQDomNode parent) { // Create the item - QDomElement item = m_xml.createElement("item"); + TQDomElement item = m_xml.createElement("item"); parent.appendChild(item); // Create text nodes createTextNode("source", transfer->getSourceUrl().url(), item); createTextNode("dest", transfer->getDestUrl().url(), item); - createTextNode("size", QString::number(transfer->getSize()), item); + createTextNode("size", TQString::number(transfer->getSize()), item); createTextNode("type", transfer->isDir() ? "directory" : "file", item); if (transfer->isDir() && transfer->children()) { // Transfer has children, add them as well - QDomElement tag = m_xml.createElement("children"); + TQDomElement tag = m_xml.createElement("children"); item.appendChild(tag); KFTPQueue::QueueObject *i; - QPtrList<KFTPQueue::QueueObject> list = transfer->getChildrenList(); + TQPtrList<KFTPQueue::QueueObject> list = transfer->getChildrenList(); for (i = list.first(); i; i = list.next()) { generateXML(static_cast<KFTPQueue::Transfer*>(i), tag); } } } -void KFTPQueueConverter::importNode(QDomNode node, QObject *parent) +void KFTPQueueConverter::importNode(TQDomNode node, TQObject *parent) { // Get node data KURL srcUrl = KURL(getTextNode("source", node)); @@ -160,14 +160,14 @@ void KFTPQueueConverter::importNode(QDomNode node, QObject *parent) if (parent == KFTPQueue::Manager::self()->topLevelObject()) { KFTPQueue::Manager::self()->insertTransfer(transfer); } else { - transfer->setId(KFTPQueue::Manager::self()->m_lastQID++); + transfer->setId(KFTPQueue::Manager::self()->m_lastTQID++); emit KFTPQueue::Manager::self()->newTransfer(transfer); } - QDomNodeList tagNodes = node.toElement().elementsByTagName("children"); + TQDomNodeList tagNodes = node.toElement().elementsByTagName("children"); if (dir && tagNodes.length() > 0) { // Import all child nodes - QDomNode n = node.firstChild(); + TQDomNode n = node.firstChild(); while (!n.isNull()) { if (n.toElement().tagName() == "children") { n = n.firstChild(); @@ -185,26 +185,26 @@ void KFTPQueueConverter::importNode(QDomNode node, QObject *parent) } } -void KFTPQueueConverter::createTextNode(const QString &name, const QString &value, QDomNode parent) +void KFTPQueueConverter::createTextNode(const TQString &name, const TQString &value, TQDomNode parent) { - QDomElement tag = m_xml.createElement(name); + TQDomElement tag = m_xml.createElement(name); parent.appendChild(tag); - QDomText textNode = m_xml.createTextNode(value); + TQDomText textNode = m_xml.createTextNode(value); tag.appendChild(textNode); } -QString KFTPQueueConverter::getTextNode(const QString &name, QDomNode parent) +TQString KFTPQueueConverter::getTextNode(const TQString &name, TQDomNode parent) { - QDomNodeList tagNodes = parent.toElement().elementsByTagName(name); + TQDomNodeList tagNodes = parent.toElement().elementsByTagName(name); if (tagNodes.length() > 0) { - QString prop = tagNodes.item(0).toElement().text(); + TQString prop = tagNodes.item(0).toElement().text(); prop.stripWhiteSpace(); return prop; } else { - return QString::null; + return TQString::null; } } diff --git a/kftpgrabber/src/kftpqueueconverter.h b/kftpgrabber/src/kftpqueueconverter.h index 345439f..3ec925b 100644 --- a/kftpgrabber/src/kftpqueueconverter.h +++ b/kftpgrabber/src/kftpqueueconverter.h @@ -36,8 +36,8 @@ #ifndef KFTPQUEUECONVERTER_H #define KFTPQUEUECONVERTER_H -#include <qobject.h> -#include <qdom.h> +#include <ntqobject.h> +#include <ntqdom.h> namespace KFTPQueue { class Transfer; @@ -48,11 +48,11 @@ This class provides queue export/import to XML files. @author Jernej Kos */ -class KFTPQueueConverter : public QObject +class KFTPQueueConverter : public TQObject { Q_OBJECT public: - KFTPQueueConverter(QObject *parent = 0, const char *name = 0); + KFTPQueueConverter(TQObject *parent = 0, const char *name = 0); /** * Import queue from XML file. When called, this function will create @@ -60,7 +60,7 @@ public: * * @param filename XML file that contains the queue */ - void importQueue(const QString &filename); + void importQueue(const TQString &filename); /** * Export queue to XML file. It will take all current KFTPQueueTransfers @@ -68,15 +68,15 @@ public: * * @param filename File where queue will be exported */ - void exportQueue(const QString &filename); + void exportQueue(const TQString &filename); private: - QDomDocument m_xml; + TQDomDocument m_xml; - void generateXML(KFTPQueue::Transfer *transfer, QDomNode parent); - void createTextNode(const QString &name, const QString &value, QDomNode parent); + void generateXML(KFTPQueue::Transfer *transfer, TQDomNode parent); + void createTextNode(const TQString &name, const TQString &value, TQDomNode parent); - void importNode(QDomNode node, QObject *parent = 0); - QString getTextNode(const QString &name, QDomNode parent); + void importNode(TQDomNode node, TQObject *parent = 0); + TQString getTextNode(const TQString &name, TQDomNode parent); }; #endif diff --git a/kftpgrabber/src/kftpqueueprocessor.cpp b/kftpgrabber/src/kftpqueueprocessor.cpp index f6051a2..1c500c7 100644 --- a/kftpgrabber/src/kftpqueueprocessor.cpp +++ b/kftpgrabber/src/kftpqueueprocessor.cpp @@ -40,8 +40,8 @@ using namespace KFTPGrabberBase; -KFTPQueueProcessor::KFTPQueueProcessor(QObject *parent) - : QObject(parent) +KFTPQueueProcessor::KFTPQueueProcessor(TQObject *parent) + : TQObject(parent) { m_running = false; } @@ -64,7 +64,7 @@ bool KFTPQueueProcessor::nextSite() { // Select the first server (should be next) if there is none, we are done :) //KFTPQueueTransfers *transfers = FTPQueueManager->getQueueTransferList(); - QPtrList<KFTPQueue::QueueObject> sites = KFTPQueue::Manager::self()->topLevelObject()->getChildrenList(); + TQPtrList<KFTPQueue::QueueObject> sites = KFTPQueue::Manager::self()->topLevelObject()->getChildrenList(); if (sites.count() > 0 && m_running) { if (m_activeSite && m_activeSite->getId() == sites.at(0)->getId()) { @@ -80,7 +80,7 @@ bool KFTPQueueProcessor::nextSite() if (m_activeSite) { // Connect the signals - connect(m_activeSite, SIGNAL(destroyed(QObject*)), this, SLOT(slotSiteComplete())); + connect(m_activeSite, SIGNAL(destroyed(TQObject*)), this, SLOT(slotSiteComplete())); connect(m_activeSite, SIGNAL(siteAborted()), this, SLOT(slotSiteAborted())); return true; @@ -112,7 +112,7 @@ void KFTPQueueProcessor::stopProcessing() // Abort current transfer if (m_activeSite) { // Disconnect signals - m_activeSite->QObject::disconnect(this); + m_activeSite->TQObject::disconnect(this); m_activeSite->abort(); } diff --git a/kftpgrabber/src/kftpqueueprocessor.h b/kftpgrabber/src/kftpqueueprocessor.h index 90de1fd..ddc00e4 100644 --- a/kftpgrabber/src/kftpqueueprocessor.h +++ b/kftpgrabber/src/kftpqueueprocessor.h @@ -36,10 +36,10 @@ #ifndef KFTPQUEUEPROCESSOR_H #define KFTPQUEUEPROCESSOR_H -#include <qobject.h> -#include <qthread.h> -#include <qapplication.h> -#include <qguardedptr.h> +#include <ntqobject.h> +#include <ntqthread.h> +#include <ntqapplication.h> +#include <ntqguardedptr.h> namespace KFTPQueue { class Site; @@ -48,19 +48,19 @@ namespace KFTPQueue { /** @author Jernej Kos */ -class KFTPQueueProcessor : public QObject +class KFTPQueueProcessor : public TQObject { friend class KFTPQueueManager; Q_OBJECT public: - KFTPQueueProcessor(QObject *parent); + KFTPQueueProcessor(TQObject *parent); void startProcessing(); void stopProcessing(); bool isRunning(); private: - QGuardedPtr<KFTPQueue::Site> m_activeSite; + TQGuardedPtr<KFTPQueue::Site> m_activeSite; bool m_running; void processActiveSite(); diff --git a/kftpgrabber/src/kftpsession.cpp b/kftpgrabber/src/kftpsession.cpp index 126eb3e..4a7c433 100644 --- a/kftpgrabber/src/kftpsession.cpp +++ b/kftpgrabber/src/kftpsession.cpp @@ -46,11 +46,11 @@ #include "misc/config.h" #include "misc/filter.h" -#include <qdir.h> -#include <qobjectlist.h> +#include <ntqdir.h> +#include <ntqobjectlist.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kdebug.h> #include <kpassdlg.h> #include <kstaticdeleter.h> @@ -66,7 +66,7 @@ namespace KFTPSession { ////////////////////////////////////////////////////////////////// Connection::Connection(Session *session, bool primary) - : QObject(session), + : TQObject(session), m_primary(primary), m_busy(false), m_aborting(false), @@ -115,7 +115,7 @@ void Connection::remove() { // Disconnect all signals from the transfer if (m_curTransfer) - m_curTransfer->QObject::disconnect(this); + m_curTransfer->TQObject::disconnect(this); m_curTransfer = 0L; m_busy = false; @@ -276,7 +276,7 @@ void Connection::reconnect() //////////////////////////////////////////////////////// Session::Session(Side side) - : QObject(), + : TQObject(), m_side(side), m_remote(false), m_aborting(false), @@ -317,7 +317,7 @@ void Session::slotClientEngineEvent(KFTPEngine::Event *event) m_aborting = false; m_lastUrl = getClient()->socket()->getCurrentUrl(); - QString siteName; + TQString siteName; if (m_site) siteName = m_site->getAttribute("name"); else @@ -341,7 +341,7 @@ void Session::slotClientEngineEvent(KFTPEngine::Event *event) Session *opposite = Manager::self()->getActive(oppositeSide(m_side)); if (m_site && !opposite->isRemote()) { - QString localPath = m_site->getProperty("deflocalpath"); + TQString localPath = m_site->getProperty("deflocalpath"); if (!localPath.isEmpty()) opposite->getFileView()->openUrl(KURL(localPath)); @@ -384,7 +384,7 @@ void Session::slotClientEngineEvent(KFTPEngine::Event *event) } case Event::EventPubkeyPassword: { // A public-key authentication password was requested - QCString pass; + TQCString pass; int ret = KPasswordDialog::getPassword(pass, i18n("Please provide your private key decryption password.")); if (ret == KPasswordDialog::Accepted) { @@ -567,8 +567,8 @@ Manager *Manager::self() return m_self; } -Manager::Manager(QObject *parent, QTabWidget *stat, KFTPTabWidget *left, KFTPTabWidget *right) - : QObject(parent), +Manager::Manager(TQObject *parent, TQTabWidget *stat, KFTPTabWidget *left, KFTPTabWidget *right) + : TQObject(parent), m_statTabs(stat), m_leftTabs(left), m_rightTabs(right), @@ -579,11 +579,11 @@ Manager::Manager(QObject *parent, QTabWidget *stat, KFTPTabWidget *left, KFTPTab Manager::m_self = this; // Connect some signals - connect(left, SIGNAL(currentChanged(QWidget*)), this, SLOT(slotActiveChanged(QWidget*))); - connect(right, SIGNAL(currentChanged(QWidget*)), this, SLOT(slotActiveChanged(QWidget*))); + connect(left, SIGNAL(currentChanged(TQWidget*)), this, SLOT(slotActiveChanged(TQWidget*))); + connect(right, SIGNAL(currentChanged(TQWidget*)), this, SLOT(slotActiveChanged(TQWidget*))); - connect(left, SIGNAL(closeRequest(QWidget*)), this, SLOT(slotSessionCloseRequest(QWidget*))); - connect(right, SIGNAL(closeRequest(QWidget*)), this, SLOT(slotSessionCloseRequest(QWidget*))); + connect(left, SIGNAL(closeRequest(TQWidget*)), this, SLOT(slotSessionCloseRequest(TQWidget*))); + connect(right, SIGNAL(closeRequest(TQWidget*)), this, SLOT(slotSessionCloseRequest(TQWidget*))); } void Manager::registerSession(Session *session) @@ -601,8 +601,8 @@ void Manager::registerSession(Session *session) session->getFileView()->m_toolBarFirst->installEventFilter(this); session->getFileView()->m_toolBarSecond->installEventFilter(this); - connect(session->getFileView()->getDetailsView(), SIGNAL(clicked(QListViewItem*)), this, SLOT(slotSwitchFocus())); - connect(session->getFileView()->getTreeView(), SIGNAL(clicked(QListViewItem*)), this, SLOT(slotSwitchFocus())); + connect(session->getFileView()->getDetailsView(), SIGNAL(clicked(TQListViewItem*)), this, SLOT(slotSwitchFocus())); + connect(session->getFileView()->getTreeView(), SIGNAL(clicked(TQListViewItem*)), this, SLOT(slotSwitchFocus())); connect(session->getFileView()->m_toolBarFirst, SIGNAL(clicked(int)), this, SLOT(slotSwitchFocus())); connect(session->getFileView()->m_toolBarSecond, SIGNAL(clicked(int)), this, SLOT(slotSwitchFocus())); @@ -631,9 +631,9 @@ Session *Manager::getActiveSession() return m_active; } -bool Manager::eventFilter(QObject *object, QEvent *event) +bool Manager::eventFilter(TQObject *object, TQEvent *event) { - if (event->type() == QEvent::FocusIn || event->type() == QEvent::MouseButtonPress) { + if (event->type() == TQEvent::FocusIn || event->type() == TQEvent::MouseButtonPress) { switchFocusToObject(object); } @@ -642,10 +642,10 @@ bool Manager::eventFilter(QObject *object, QEvent *event) void Manager::slotSwitchFocus() { - switchFocusToObject(QObject::sender()); + switchFocusToObject(TQObject::sender()); } -void Manager::switchFocusToObject(const QObject *object) +void Manager::switchFocusToObject(const TQObject *object) { if (!object) return; @@ -857,7 +857,7 @@ void Manager::setActive(Session *session) switch (session->m_side) { case LeftSide: m_leftActive = session; break; case RightSide: m_rightActive = session; break; - case IgnoreSide: qDebug("Invalid side specified!"); return; + case IgnoreSide: tqDebug("Invalid side specified!"); return; } // Refresh the GUI @@ -869,7 +869,7 @@ Session *Manager::getActive(Side side) switch (side) { case LeftSide: return m_leftActive; case RightSide: return m_rightActive; - case IgnoreSide: qDebug("Invalid side specified!"); break; + case IgnoreSide: tqDebug("Invalid side specified!"); break; } return NULL; @@ -880,19 +880,19 @@ KFTPTabWidget *Manager::getTabs(Side side) switch (side) { case LeftSide: return m_leftTabs; case RightSide: return m_rightTabs; - case IgnoreSide: qDebug("Invalid side specified!"); break; + case IgnoreSide: tqDebug("Invalid side specified!"); break; } return NULL; } -void Manager::slotActiveChanged(QWidget *page) +void Manager::slotActiveChanged(TQWidget *page) { Session *session = find(static_cast<KFTPWidgets::Browser::View*>(page)); setActive(session); } -void Manager::slotSessionCloseRequest(QWidget *page) +void Manager::slotSessionCloseRequest(TQWidget *page) { Session *session = find(static_cast<KFTPWidgets::Browser::View*>(page)); diff --git a/kftpgrabber/src/kftpsession.h b/kftpgrabber/src/kftpsession.h index 9e95213..e1f943d 100644 --- a/kftpgrabber/src/kftpsession.h +++ b/kftpgrabber/src/kftpsession.h @@ -36,11 +36,11 @@ #ifndef KFTPSESSION_H #define KFTPSESSION_H -#include <qobject.h> -#include <qguardedptr.h> -#include <qdom.h> +#include <ntqobject.h> +#include <ntqguardedptr.h> +#include <ntqdom.h> -#include <qlistview.h> +#include <ntqlistview.h> #include "kftpqueue.h" #include "logview.h" @@ -82,7 +82,7 @@ enum Side { * * @author Jernej Kos */ -class Connection : public QObject +class Connection : public TQObject { Q_OBJECT public: @@ -181,7 +181,7 @@ private: bool m_aborting; bool m_scanning; - QGuardedPtr<KFTPQueue::Transfer> m_curTransfer; + TQGuardedPtr<KFTPQueue::Transfer> m_curTransfer; KFTPEngine::Thread *m_client; private slots: void slotTransferCompleted(); @@ -231,7 +231,7 @@ signals: * * @author Jernej Kos */ -class Session : public QObject +class Session : public TQObject { Q_OBJECT friend class KFTPWidgets::Browser::Actions; @@ -349,7 +349,7 @@ public: * * @return A list of current connections. */ - QPtrList<Connection> *getConnectionList() { return &m_connections; } + TQPtrList<Connection> *getConnectionList() { return &m_connections; } /** * Reconnect to a new URL. The current connections will be droped and reconnected @@ -390,7 +390,7 @@ private: KURL m_reconnectUrl; // Connection list - QPtrList<Connection> m_connections; + TQPtrList<Connection> m_connections; int getMaxThreadCount(); private slots: @@ -403,14 +403,14 @@ signals: void freeConnectionAvailable(); }; -typedef QPtrList<Session> SessionList; +typedef TQPtrList<Session> SessionList; /** * The Manager class provides access to sessions, their registration and deletion. * * @author Jernej Kos */ -class Manager : public QObject +class Manager : public TQObject { Q_OBJECT public: @@ -427,7 +427,7 @@ public: * @param left A widget that contains sessions on the left side * @param right A widget that contains sessions on the right side */ - Manager(QObject *parent, QTabWidget *stat, KFTPTabWidget *left, KFTPTabWidget *right); + Manager(TQObject *parent, TQTabWidget *stat, KFTPTabWidget *left, KFTPTabWidget *right); /** * Spawn a new local (=unconnected) session. This method may reuse an old local session. @@ -537,9 +537,9 @@ public: /** * Returns the tab widget that holds the log widgets. * - * @return Returns a QTabWidget that holds the log widgets. + * @return Returns a TQTabWidget that holds the log widgets. */ - QTabWidget *getStatTabs() const { return m_statTabs; } + TQTabWidget *getStatTabs() const { return m_statTabs; } /** * Returns the tab widget that holds the sessions on a specific side. @@ -581,7 +581,7 @@ protected: /** * Event filter handler. */ - bool eventFilter(QObject *object, QEvent *event); + bool eventFilter(TQObject *object, TQEvent *event); /** * Change the currently active session to the browser view inheriting @@ -589,12 +589,12 @@ protected: * * @param object The object that has browser view as some parent */ - void switchFocusToObject(const QObject *object); + void switchFocusToObject(const TQObject *object); private: SessionList m_sessionList; // These variables should be assigned right after construction - QTabWidget *m_statTabs; + TQTabWidget *m_statTabs; KFTPTabWidget *m_leftTabs; KFTPTabWidget *m_rightTabs; @@ -603,10 +603,10 @@ private: Session *m_leftActive; Session *m_rightActive; private slots: - void slotActiveChanged(QWidget *page); + void slotActiveChanged(TQWidget *page); void slotSwitchFocus(); public slots: - void slotSessionCloseRequest(QWidget *page); + void slotSessionCloseRequest(TQWidget *page); signals: void update(); }; diff --git a/kftpgrabber/src/kftptransfer.cpp b/kftpgrabber/src/kftptransfer.cpp index 3c127ba..ba23c3d 100644 --- a/kftpgrabber/src/kftptransfer.cpp +++ b/kftpgrabber/src/kftptransfer.cpp @@ -41,14 +41,14 @@ #include "misc/config.h" -#include <klocale.h> +#include <tdelocale.h> using namespace KFTPSession; namespace KFTPQueue { -FailedTransfer::FailedTransfer(QObject *parent, TransferFile *transfer, const QString &error) - : QObject(parent), +FailedTransfer::FailedTransfer(TQObject *parent, TransferFile *transfer, const TQString &error) + : TQObject(parent), m_transfer(transfer), m_error(error) { @@ -98,7 +98,7 @@ TransferFile *FailedTransfer::restore() return m_transfer; } -void FailedTransfer::fail(TransferFile *transfer, const QString &error) +void FailedTransfer::fail(TransferFile *transfer, const TQString &error) { // Should the transfer be retried if (KFTPCore::Config::failedAutoRetry() && transfer->m_retryCount < KFTPCore::Config::failedAutoRetryCount()) { @@ -121,7 +121,7 @@ void FailedTransfer::fail(TransferFile *transfer, const QString &error) transfer->abort(); transfer->blockSignals(false); - QGuardedPtr<QueueObject> transferParent(transfer->parentObject()); + TQGuardedPtr<QueueObject> transferParent(transfer->parentObject()); // Create a new failed transfer (will automaticly reparent the transfer) FailedTransfer *ft = new FailedTransfer(KFTPQueue::Manager::self(), transfer, error); @@ -140,7 +140,7 @@ void FailedTransfer::fail(TransferFile *transfer, const QString &error) } } -Transfer::Transfer(QObject *parent, Type type) +Transfer::Transfer(TQObject *parent, Type type) : QueueObject(parent, type), m_deleteMe(false), m_openAfterTransfer(false), @@ -242,10 +242,10 @@ void Transfer::slotConnectionAvailable() return; if (m_srcSession) - m_srcSession->QObject::disconnect(this, SLOT(slotConnectionAvailable())); + m_srcSession->TQObject::disconnect(this, SLOT(slotConnectionAvailable())); if (m_dstSession) - m_dstSession->QObject::disconnect(this, SLOT(slotConnectionAvailable())); + m_dstSession->TQObject::disconnect(this, SLOT(slotConnectionAvailable())); // Connection has become available, grab it now execute(); @@ -291,10 +291,10 @@ void Transfer::resetTransfer() // Disconnect signals if (getStatus() != Waiting) { if (m_srcConnection) - m_srcConnection->getClient()->eventHandler()->QObject::disconnect(this, SLOT(slotConnectionConnected())); + m_srcConnection->getClient()->eventHandler()->TQObject::disconnect(this, SLOT(slotConnectionConnected())); if (m_dstConnection) - m_dstConnection->getClient()->eventHandler()->QObject::disconnect(this, SLOT(slotConnectionConnected())); + m_dstConnection->getClient()->eventHandler()->TQObject::disconnect(this, SLOT(slotConnectionConnected())); } // Reset connections & session pointers @@ -342,7 +342,7 @@ void Transfer::showTransCompleteBalloon() // Show a balloon :P if (KFTPCore::Config::showBalloons() && !KFTPQueue::Manager::self()->isProcessing()) { if (!KFTPCore::Config::showBalloonWhenQueueEmpty() || (KFTPQueue::Manager::self()->topLevelObject()->getChildrenList().count() == 1 && !hasParentTransfer())) { - QString transCompleteStr = i18n("Transfer of the following files is complete:"); + TQString transCompleteStr = i18n("Transfer of the following files is complete:"); transCompleteStr += "<br><i>"; transCompleteStr += getSourceUrl().fileName(); transCompleteStr += "</i>"; diff --git a/kftpgrabber/src/kftptransfer.h b/kftpgrabber/src/kftptransfer.h index 78573a2..5abc35f 100644 --- a/kftpgrabber/src/kftptransfer.h +++ b/kftpgrabber/src/kftptransfer.h @@ -38,9 +38,9 @@ #include "queueobject.h" -#include <qobject.h> -#include <qtimer.h> -#include <qguardedptr.h> +#include <ntqobject.h> +#include <ntqtimer.h> +#include <ntqguardedptr.h> #include <kurl.h> @@ -66,7 +66,7 @@ class TransferFile; * * @author Jernej Kos */ -class FailedTransfer : public QObject +class FailedTransfer : public TQObject { Q_OBJECT public: @@ -75,7 +75,7 @@ public: * will be reparented (the FailedTransfer object will become its * parent). */ - FailedTransfer(QObject *parent, TransferFile *transfer, const QString &error); + FailedTransfer(TQObject *parent, TransferFile *transfer, const TQString &error); ~FailedTransfer(); /** @@ -83,7 +83,7 @@ public: * * @return The error message. */ - QString getError() const { return m_error; } + TQString getError() const { return m_error; } /** * Add this transfer back to the queue. The FailedTransfer object @@ -109,10 +109,10 @@ public: * @param transfer Pointer to the transfer object that failed. * @param error The error that ocurred. */ - static void fail(TransferFile *transfer, const QString &error); + static void fail(TransferFile *transfer, const TQString &error); private: - QGuardedPtr<TransferFile> m_transfer; - QString m_error; + TQGuardedPtr<TransferFile> m_transfer; + TQString m_error; }; /** @@ -131,7 +131,7 @@ friend class KFTPSession::Session; friend class KFTPSession::Connection; Q_OBJECT public: - Transfer(QObject *parent, Type type); + Transfer(TQObject *parent, Type type); ~Transfer(); /** diff --git a/kftpgrabber/src/kftptransferdir.cpp b/kftpgrabber/src/kftptransferdir.cpp index c5359c4..9aaa408 100644 --- a/kftpgrabber/src/kftptransferdir.cpp +++ b/kftpgrabber/src/kftptransferdir.cpp @@ -45,7 +45,7 @@ using namespace KFTPSession; namespace KFTPQueue { -TransferDir::TransferDir(QObject *parent) +TransferDir::TransferDir(TQObject *parent) : Transfer(parent, Transfer::Directory), m_scanned(false), m_group(new QueueGroup(this)) @@ -85,7 +85,7 @@ void TransferDir::execute() // If the directory is empty, create it anyway if (m_children.count() == 0) { if (m_destUrl.isLocalFile()) { - KStandardDirs::makeDir(m_destUrl.path()); + TDEStandardDirs::makeDir(m_destUrl.path()); } else { m_dstSession->getClient()->mkdir(m_destUrl); } diff --git a/kftpgrabber/src/kftptransferdir.h b/kftpgrabber/src/kftptransferdir.h index 1f0e7ff..9637a20 100644 --- a/kftpgrabber/src/kftptransferdir.h +++ b/kftpgrabber/src/kftptransferdir.h @@ -59,7 +59,7 @@ public: * * @param parent The parent object */ - TransferDir(QObject *parent); + TransferDir(TQObject *parent); /** * @overload diff --git a/kftpgrabber/src/kftptransferfile.cpp b/kftpgrabber/src/kftptransferfile.cpp index 9f49ae5..bbc2b5d 100644 --- a/kftpgrabber/src/kftptransferfile.cpp +++ b/kftpgrabber/src/kftptransferfile.cpp @@ -42,20 +42,20 @@ #include "misc/config.h" -#include <kmessagebox.h> -#include <klocale.h> -#include <kio/renamedlg.h> +#include <tdemessagebox.h> +#include <tdelocale.h> +#include <tdeio/renamedlg.h> #include <kdiskfreesp.h> -#include <qtimer.h> -#include <qfileinfo.h> +#include <ntqtimer.h> +#include <ntqfileinfo.h> using namespace KFTPEngine; using namespace KFTPSession; namespace KFTPQueue { -TransferFile::TransferFile(QObject *parent) +TransferFile::TransferFile(TQObject *parent) : Transfer(parent, Transfer::File), m_updateTimer(0), m_dfTimer(0) @@ -107,14 +107,14 @@ void TransferFile::execute() // Init timer to follow the update if (!m_updateTimer) { - m_updateTimer = new QTimer(this); + m_updateTimer = new TQTimer(this); connect(m_updateTimer, SIGNAL(timeout()), this, SLOT(slotTimerUpdate())); m_updateTimer->start(1000); } // Should we check for free space ? if (KFTPCore::Config::diskCheckSpace() && !m_dfTimer) { - m_dfTimer = new QTimer(this); + m_dfTimer = new TQTimer(this); connect(m_dfTimer, SIGNAL(timeout()), this, SLOT(slotTimerDiskFree())); m_dfTimer->start(KFTPCore::Config::diskCheckInterval() * 1000); } @@ -184,7 +184,7 @@ void TransferFile::slotEngineEvent(KFTPEngine::Event *event) addCompleted(m_size - m_completed); m_updateTimer->stop(); - m_updateTimer->QObject::disconnect(); + m_updateTimer->TQObject::disconnect(); if (m_openAfterTransfer && m_transferType == Download) { // Set status to stopped, so the view gets reloaded @@ -274,7 +274,7 @@ void TransferFile::slotTimerUpdate() // Update the current stats if (!m_srcSession && !m_dstSession) { m_updateTimer->stop(); - m_updateTimer->QObject::disconnect(); + m_updateTimer->TQObject::disconnect(); return; } @@ -305,16 +305,16 @@ void TransferFile::slotTimerDiskFree() // Check for disk usage if (KFTPCore::Config::diskCheckSpace()) { KDiskFreeSp *df = KDiskFreeSp::findUsageInfo((getDestUrl().path())); - connect(df, SIGNAL(foundMountPoint(const QString&, unsigned long, unsigned long, unsigned long)), this, SLOT(slotDiskFree(const QString&, unsigned long, unsigned long, unsigned long))); + connect(df, SIGNAL(foundMountPoint(const TQString&, unsigned long, unsigned long, unsigned long)), this, SLOT(slotDiskFree(const TQString&, unsigned long, unsigned long, unsigned long))); } } -void TransferFile::slotDiskFree(const QString &mountPoint, unsigned long, unsigned long, unsigned long kBAvail) +void TransferFile::slotDiskFree(const TQString &mountPoint, unsigned long, unsigned long, unsigned long kBAvail) { if (KFTPCore::Config::diskCheckSpace()) { // Is there enough free space ? if (kBAvail < (unsigned long) KFTPCore::Config::diskMinFreeSpace()) { - QString transAbortStr = i18n("Transfer of the following files <b>has been aborted</b> because there is not enough free space left on '%1':").arg(mountPoint); + TQString transAbortStr = i18n("Transfer of the following files <b>has been aborted</b> because there is not enough free space left on '%1':").arg(mountPoint); transAbortStr += "<br><i>"; transAbortStr += getSourceUrl().fileName(); transAbortStr += "</i>"; @@ -334,17 +334,17 @@ void TransferFile::resetTransfer() if (getStatus() != Waiting) { // Disconnect signals if (m_srcConnection) { - m_srcConnection->getClient()->eventHandler()->QObject::disconnect(this, SLOT(slotEngineEvent(KFTPEngine::Event*))); - m_srcConnection->QObject::disconnect(this, SLOT(slotSessionAborting())); - m_srcConnection->QObject::disconnect(this, SLOT(slotConnectionLost(KFTPSession::Connection*))); + m_srcConnection->getClient()->eventHandler()->TQObject::disconnect(this, SLOT(slotEngineEvent(KFTPEngine::Event*))); + m_srcConnection->TQObject::disconnect(this, SLOT(slotSessionAborting())); + m_srcConnection->TQObject::disconnect(this, SLOT(slotConnectionLost(KFTPSession::Connection*))); m_srcConnection->remove(); } if (m_dstConnection) { - m_dstConnection->getClient()->eventHandler()->QObject::disconnect(this, SLOT(slotEngineEvent(KFTPEngine::Event*))); - m_dstConnection->QObject::disconnect(this, SLOT(slotSessionAborting())); - m_dstConnection->QObject::disconnect(this, SLOT(slotConnectionLost(KFTPSession::Connection*))); + m_dstConnection->getClient()->eventHandler()->TQObject::disconnect(this, SLOT(slotEngineEvent(KFTPEngine::Event*))); + m_dstConnection->TQObject::disconnect(this, SLOT(slotSessionAborting())); + m_dstConnection->TQObject::disconnect(this, SLOT(slotConnectionLost(KFTPSession::Connection*))); m_dstConnection->remove(); } @@ -368,15 +368,15 @@ void TransferFile::abort() if (getStatus() == Waiting) { if (m_srcSession) - m_srcSession->QObject::disconnect(this, SLOT(slotConnectionAvailable())); + m_srcSession->TQObject::disconnect(this, SLOT(slotConnectionAvailable())); if (m_dstSession) - m_dstSession->QObject::disconnect(this, SLOT(slotConnectionAvailable())); + m_dstSession->TQObject::disconnect(this, SLOT(slotConnectionAvailable())); } if (m_updateTimer) { m_updateTimer->stop(); - m_updateTimer->QObject::disconnect(); + m_updateTimer->TQObject::disconnect(); delete m_updateTimer; m_updateTimer = 0L; @@ -384,7 +384,7 @@ void TransferFile::abort() if (m_dfTimer) { m_dfTimer->stop(); - m_dfTimer->QObject::disconnect(); + m_dfTimer->TQObject::disconnect(); delete m_dfTimer; m_dfTimer = 0L; diff --git a/kftpgrabber/src/kftptransferfile.h b/kftpgrabber/src/kftptransferfile.h index da47339..f8f98ac 100644 --- a/kftpgrabber/src/kftptransferfile.h +++ b/kftpgrabber/src/kftptransferfile.h @@ -36,7 +36,7 @@ #ifndef KFTPQUEUEKFTPTRANSFERFILE_H #define KFTPQUEUEKFTPTRANSFERFILE_H -#include <qdatetime.h> +#include <ntqdatetime.h> #include "kftptransfer.h" @@ -66,7 +66,7 @@ public: * * @param parent The parent object */ - TransferFile(QObject *parent); + TransferFile(TQObject *parent); /** * Wakes this transfer up after the action for the file exists situation @@ -99,11 +99,11 @@ public: bool assignSessions(KFTPSession::Session *source = 0, KFTPSession::Session *destination = 0); private: /* Update timers */ - QTimer *m_updateTimer; - QTimer *m_dfTimer; + TQTimer *m_updateTimer; + TQTimer *m_dfTimer; /* FXP */ - QTime m_elapsedTime; + TQTime m_elapsedTime; /** * @overload @@ -114,7 +114,7 @@ private slots: void slotTimerUpdate(); void slotTimerDiskFree(); - void slotDiskFree(const QString &mountPoint, unsigned long kBSize, unsigned long kBUsed, unsigned long kBAvail); + void slotDiskFree(const TQString &mountPoint, unsigned long kBSize, unsigned long kBUsed, unsigned long kBAvail); void slotEngineEvent(KFTPEngine::Event *event); void slotSessionAborting(); diff --git a/kftpgrabber/src/main.cpp b/kftpgrabber/src/main.cpp index ea7482b..faef8a8 100644 --- a/kftpgrabber/src/main.cpp +++ b/kftpgrabber/src/main.cpp @@ -38,9 +38,9 @@ #include "misc/config.h" #include <kuniqueapplication.h> -#include <kaboutdata.h> -#include <kcmdlineargs.h> -#include <klocale.h> +#include <tdeaboutdata.h> +#include <tdecmdlineargs.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <ksplashscreen.h> @@ -51,16 +51,16 @@ static const char description[] = static const char version[] = "0.8.1"; -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+[url]", I18N_NOOP("An optional URL to connect to"), 0}, - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char **argv) { - KAboutData about("kftpgrabber", I18N_NOOP("KFTPGrabber"), version, description, - KAboutData::License_GPL, "(C) 2007, The KFTPGrabber developers", 0, "http://www.kftp.org"); + TDEAboutData about("kftpgrabber", I18N_NOOP("KFTPGrabber"), version, description, + TDEAboutData::License_GPL, "(C) 2007, The KFTPGrabber developers", 0, "http://www.kftp.org"); about.addAuthor("Jernej Kos", I18N_NOOP("Lead developer"), "kostko@unimatrix-one.org"); about.addAuthor("Markus Brüffer", I18N_NOOP("Developer"), "markus@brueffer.de"); @@ -74,22 +74,22 @@ int main(int argc, char **argv) about.addCredit("Tim Kosse", I18N_NOOP("Directory parser code"), "tim.kosse@gmx.de"); about.addCredit("Peter Penz", I18N_NOOP("Listview column handling code"), "peter.penz@gmx.at"); - KCmdLineArgs::init(argc, argv, &about); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc, argv, &about); + TDECmdLineArgs::addCmdLineOptions(options); KUniqueApplication app; if (app.isRestored()) { RESTORE(MainWindow); } else { MainWindow *mainWindow = 0; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); KSplashScreen *splash = 0L; - QString splashPath = locate("appdata", "kftpgrabber-logo.png"); + TQString splashPath = locate("appdata", "kftpgrabber-logo.png"); if (!KFTPCore::Config::startMinimized() && KFTPCore::Config::showSplash()) { // Show the splash screen if (!splashPath.isNull()) { - QPixmap splashImage = QPixmap(splashPath); + TQPixmap splashImage = TQPixmap(splashPath); splash = new KSplashScreen(splashImage); splash->setMaximumWidth(400); splash->show(); diff --git a/kftpgrabber/src/mainactions.cpp b/kftpgrabber/src/mainactions.cpp index d694ab1..217a710 100644 --- a/kftpgrabber/src/mainactions.cpp +++ b/kftpgrabber/src/mainactions.cpp @@ -51,34 +51,34 @@ #include "misc/config.h" #include "misc/filter.h" -#include <kmainwindow.h> -#include <kmessagebox.h> -#include <klocale.h> -#include <kaboutapplication.h> +#include <tdemainwindow.h> +#include <tdemessagebox.h> +#include <tdelocale.h> +#include <tdeaboutapplication.h> #include <kkeydialog.h> #include <kedittoolbar.h> #include <kpropertiesdialog.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <kshred.h> #include <klineedit.h> -#include <qclipboard.h> +#include <ntqclipboard.h> using namespace KFTPGrabberBase; using namespace KFTPWidgets::Browser; using namespace KFTPCore::Filter; MainActions::MainActions(MainWindow *parent) - : QObject(parent), + : TQObject(parent), m_configDialog(0), m_closeApp(false) { // setup File menu - m_fileConnectAction = new KAction(i18n("Quick &Connect..."), "connect_creating", KShortcut(), mainWidget(), SLOT(slotQuickConnect()), actionCollection(), "file_quick_connect"); - m_newSessionAction = new KActionMenu(i18n("&New Session"), "filenew", actionCollection(), "file_newsession"); + m_fileConnectAction = new TDEAction(i18n("Quick &Connect..."), "connect_creating", TDEShortcut(), mainWidget(), SLOT(slotQuickConnect()), actionCollection(), "file_quick_connect"); + m_newSessionAction = new TDEActionMenu(i18n("&New Session"), "filenew", actionCollection(), "file_newsession"); - KAction *leftSide = new KAction(i18n("&Left Side"), KShortcut(), this, SLOT(slotNewSessionLeft()), actionCollection()); - KAction *rightSide = new KAction(i18n("&Right Side"), KShortcut(), this, SLOT(slotNewSessionRight()), actionCollection()); + TDEAction *leftSide = new TDEAction(i18n("&Left Side"), TDEShortcut(), this, SLOT(slotNewSessionLeft()), actionCollection()); + TDEAction *rightSide = new TDEAction(i18n("&Right Side"), TDEShortcut(), this, SLOT(slotNewSessionRight()), actionCollection()); m_newSessionAction->insert(leftSide); m_newSessionAction->insert(rightSide); m_newSessionAction->setStickyMenu(true); @@ -94,10 +94,10 @@ MainActions::MainActions(MainWindow *parent) mainWidget()->setStandardToolBarMenuEnabled(true); // setup transfermode actions - m_transModeAction = new KActionMenu(i18n("&Transfer Mode (Auto)"), "binary", actionCollection(), "transfermode"); - m_modeAscii = new KRadioAction(i18n("ASCII"), "ascii", KShortcut(), this, SLOT(slotModeAscii()), actionCollection()); - m_modeBinary = new KRadioAction(i18n("Binary"), "binary", KShortcut(), this, SLOT(slotModeBinary()), actionCollection()); - m_modeAuto = new KRadioAction(i18n("Auto"), KShortcut(), this, SLOT(slotModeAuto()), actionCollection()); + m_transModeAction = new TDEActionMenu(i18n("&Transfer Mode (Auto)"), "binary", actionCollection(), "transfermode"); + m_modeAscii = new TDERadioAction(i18n("ASCII"), "ascii", TDEShortcut(), this, SLOT(slotModeAscii()), actionCollection()); + m_modeBinary = new TDERadioAction(i18n("Binary"), "binary", TDEShortcut(), this, SLOT(slotModeBinary()), actionCollection()); + m_modeAuto = new TDERadioAction(i18n("Auto"), TDEShortcut(), this, SLOT(slotModeAuto()), actionCollection()); // Set grouping so only one action can be selected m_modeAscii->setExclusiveGroup("Transfer mode"); @@ -113,12 +113,12 @@ MainActions::MainActions(MainWindow *parent) m_transModeAction->setDelayed(false); } -KActionCollection *MainActions::actionCollection() +TDEActionCollection *MainActions::actionCollection() { return KFTPAPI::getInstance()->mainWindow()->actionCollection(); } -KMainWindow *MainActions::mainWidget() +TDEMainWindow *MainActions::mainWidget() { return KFTPAPI::getInstance()->mainWindow(); } diff --git a/kftpgrabber/src/mainactions.h b/kftpgrabber/src/mainactions.h index 908f1ce..26dec6b 100644 --- a/kftpgrabber/src/mainactions.h +++ b/kftpgrabber/src/mainactions.h @@ -37,11 +37,11 @@ #ifndef MAINACTIONS_H #define MAINACTIONS_H -#include <qobject.h> -#include <kaction.h> +#include <ntqobject.h> +#include <tdeaction.h> class MainWindow; -class KMainWindow; +class TDEMainWindow; namespace KFTPWidgets { class SystemTray; @@ -54,7 +54,7 @@ namespace KFTPWidgets { * * @author Jernej Kos */ -class MainActions : public QObject +class MainActions : public TQObject { Q_OBJECT friend class MainWindow; @@ -68,32 +68,32 @@ public: MainActions(MainWindow *parent); private: // File menu - KAction *m_fileConnectAction; - KActionMenu *m_newSessionAction; + TDEAction *m_fileConnectAction; + TDEActionMenu *m_newSessionAction; // Edit menu - KAction *m_renameAction; - KAction *m_deleteAction; - KAction *m_propsAction; - KAction *m_shredAction; + TDEAction *m_renameAction; + TDEAction *m_deleteAction; + TDEAction *m_propsAction; + TDEAction *m_shredAction; - KAction *m_copyAction; - KAction *m_pasteAction; + TDEAction *m_copyAction; + TDEAction *m_pasteAction; - KActionMenu *m_filterActions; - KAction *m_alwaysSkipAction; - KAction *m_topPriorityAction; - KAction *m_lowPriorityAction; + TDEActionMenu *m_filterActions; + TDEAction *m_alwaysSkipAction; + TDEAction *m_topPriorityAction; + TDEAction *m_lowPriorityAction; // Other - KActionMenu *m_transModeAction; - KRadioAction *m_modeAscii; - KRadioAction *m_modeBinary; - KRadioAction *m_modeAuto; + TDEActionMenu *m_transModeAction; + TDERadioAction *m_modeAscii; + TDERadioAction *m_modeBinary; + TDERadioAction *m_modeAuto; KFTPWidgets::ConfigDialog *m_configDialog; - KActionCollection *actionCollection(); - KMainWindow *mainWidget(); + TDEActionCollection *actionCollection(); + TDEMainWindow *mainWidget(); bool m_closeApp; public slots: diff --git a/kftpgrabber/src/mainwindow.cpp b/kftpgrabber/src/mainwindow.cpp index b77f0ea..a98d5f2 100644 --- a/kftpgrabber/src/mainwindow.cpp +++ b/kftpgrabber/src/mainwindow.cpp @@ -34,29 +34,29 @@ * files in the program, then also delete it here. */ -#include <qlabel.h> -#include <qlayout.h> -#include <qpainter.h> -#include <qtextedit.h> -#include <qtabwidget.h> -#include <qhbox.h> -#include <qvbox.h> -#include <qthread.h> - -#include <kapplication.h> -#include <kmdimainfrm.h> -#include <kmdichildview.h> -#include <kmenubar.h> -#include <kpopupmenu.h> -#include <ktoolbar.h> +#include <ntqlabel.h> +#include <ntqlayout.h> +#include <ntqpainter.h> +#include <ntqtextedit.h> +#include <ntqtabwidget.h> +#include <ntqhbox.h> +#include <ntqvbox.h> +#include <ntqthread.h> + +#include <tdeapplication.h> +#include <tdemdimainfrm.h> +#include <tdemdichildview.h> +#include <tdemenubar.h> +#include <tdepopupmenu.h> +#include <tdetoolbar.h> #include <kiconloader.h> #include <kdialogbase.h> -#include <kfiledetailview.h> -#include <kmessagebox.h> +#include <tdefiledetailview.h> +#include <tdemessagebox.h> #include <klineeditdlg.h> #include <kstatusbar.h> -#include <klocale.h> -#include <kio/job.h> +#include <tdelocale.h> +#include <tdeio/job.h> #include <kpassdlg.h> #include <ksslpkcs12.h> #include <kstandarddirs.h> @@ -98,14 +98,14 @@ using namespace KFTPGrabberBase; MainWindow::MainWindow() - : KMainWindow() + : TDEMainWindow() { // Init the API KFTPAPI::getInstance()->m_mainWindow = this; // Set the shell's ui resource file setXMLFile("kftpgrabberui.rc"); - connect(KApplication::kApplication(), SIGNAL(shutDown()), this, SLOT(appShutdown())); + connect(TDEApplication::kApplication(), SIGNAL(shutDown()), this, SLOT(appShutdown())); // Restore size and position resize(KFTPCore::Config::size()); @@ -146,17 +146,17 @@ MainWindow::MainWindow() KFTPSession::Manager::self()->spawnLocalSession(KFTPSession::RightSide); // Load bookmarks - QTimer::singleShot(500, this, SLOT(slotReadBookmarks())); + TQTimer::singleShot(500, this, SLOT(slotReadBookmarks())); // Check for the uirc file - if (KGlobal::dirs()->findResource("appdata", xmlFile()) == QString::null) { + if (TDEGlobal::dirs()->findResource("appdata", xmlFile()) == TQString::null) { KMessageBox::error(0, i18n("<qt>Unable to find %1 XML GUI descriptor file. Please check that you have installed the application correctly! If you have any questions please ask on %2.<br><br><b>Warning:</b> Current GUI will be incomplete!</qt>").arg(xmlFile()).arg("irc.freenode.net/#kftpgrabber")); } createGUI(0); // Auto-save toolbar/menubar/statusbar settings - setAutoSaveSettings(QString::fromLatin1("MainWindow"), false); + setAutoSaveSettings(TQString::fromLatin1("MainWindow"), false); } void MainWindow::slotReadBookmarks() @@ -188,7 +188,7 @@ void MainWindow::appShutdown() bool MainWindow::queryClose() { - if(KApplication::kApplication()->sessionSaving()) { + if(TDEApplication::kApplication()->sessionSaving()) { m_actions->m_closeApp = true; } @@ -200,7 +200,7 @@ bool MainWindow::queryClose() */ // Compute size and position of the pixmap to be grabbed: - QPoint g = KFTPWidgets::SystemTray::self()->mapToGlobal(KFTPWidgets::SystemTray::self()->pos()); + TQPoint g = KFTPWidgets::SystemTray::self()->mapToGlobal(KFTPWidgets::SystemTray::self()->pos()); int desktopWidth = kapp->desktop()->width(); int desktopHeight = kapp->desktop()->height(); int tw = KFTPWidgets::SystemTray::self()->width(); @@ -215,18 +215,18 @@ bool MainWindow::queryClose() if ( y + h > desktopHeight ) y = desktopHeight - h; // Grab the desktop and draw a circle arround the icon: - QPixmap shot = QPixmap::grabWindow( qt_xrootwin(), x, y, w, h ); - QPainter painter( &shot ); + TQPixmap shot = TQPixmap::grabWindow( tqt_xrootwin(), x, y, w, h ); + TQPainter painter( &shot ); const int MARGINS = 6; const int WIDTH = 3; int ax = g.x() - x - MARGINS -1; int ay = g.y() - y - MARGINS -1; - painter.setPen( QPen( Qt::red, WIDTH ) ); + painter.setPen( TQPen( TQt::red, WIDTH ) ); painter.drawArc( ax, ay, tw + 2*MARGINS, th + 2*MARGINS, 0, 16*360 ); painter.end(); // Associate source to image and show the dialog: - QMimeSourceFactory::defaultFactory()->setPixmap( "systray_shot", shot ); + TQMimeSourceFactory::defaultFactory()->setPixmap( "systray_shot", shot ); KMessageBox::information( this, i18n( "<p>Closing the main window will keep KFTPGrabber running in the system tray. " "Use <b>Quit</b> from the <b>KFTPGrabber</b> menu to quit the application.</p>" @@ -263,7 +263,7 @@ MainWindow::~MainWindow() void MainWindow::initTrafficGraph() { // Setup traffic graph - m_graphTimer = new QTimer(this); + m_graphTimer = new TQTimer(this); connect(m_graphTimer, SIGNAL(timeout()), this, SLOT(slotUpdateTrafficGraph())); m_graphTimer->start(1000); @@ -271,8 +271,8 @@ void MainWindow::initTrafficGraph() m_trafficGraph = new KFTPWidgets::TrafficGraph(0, "graph"); m_trafficGraph->setShowLabels(true); - m_trafficGraph->addBeam(QColor(255, 0, 0)); - m_trafficGraph->addBeam(QColor(0, 0, 255)); + m_trafficGraph->addBeam(TQColor(255, 0, 0)); + m_trafficGraph->addBeam(TQColor(0, 0, 255)); m_trafficGraph->repaint(); } @@ -291,17 +291,17 @@ void MainWindow::initBookmarkMenu() { // Bookmarks menu if (!m_bookmarkMenu) - m_bookmarkMenu = new KActionMenu(i18n("Bookmarks"), 0, actionCollection(), "bookmarks"); + m_bookmarkMenu = new TDEActionMenu(i18n("Bookmarks"), 0, actionCollection(), "bookmarks"); else m_bookmarkMenu->popupMenu()->clear(); // Zeroconf menu if (!m_zeroconfMenu) - m_zeroconfMenu = new KActionMenu(i18n("FTP Sites Near Me")); + m_zeroconfMenu = new TDEActionMenu(i18n("FTP Sites Near Me")); // Wallet menu if (!m_walletMenu) - m_walletMenu = new KActionMenu(i18n("Sites In KWallet"), loadSmallIcon("wallet_open")); + m_walletMenu = new TDEActionMenu(i18n("Sites In KWallet"), loadSmallIcon("wallet_open")); m_bookmarkMenu->popupMenu()->insertItem(loadSmallIcon("bookmark"), i18n("Edit Bookmarks..."), 1); m_bookmarkMenu->popupMenu()->connectItem(1, this, SLOT(showBookmarkEditor())); @@ -323,10 +323,10 @@ void MainWindow::initBookmarkMenu() void MainWindow::initStatusBar() { statusBar()->insertItem(i18n("idle"), 1, 1); - statusBar()->setItemAlignment(1, Qt::AlignLeft); + statusBar()->setItemAlignment(1, TQt::AlignLeft); - statusBar()->insertItem(i18n("Download: %1/s").arg(KIO::convertSize(KFTPQueue::Manager::self()->getDownloadSpeed())), 2); - statusBar()->insertItem(i18n("Upload: %1/s").arg(KIO::convertSize(KFTPQueue::Manager::self()->getUploadSpeed())), 3); + statusBar()->insertItem(i18n("Download: %1/s").arg(TDEIO::convertSize(KFTPQueue::Manager::self()->getDownloadSpeed())), 2); + statusBar()->insertItem(i18n("Upload: %1/s").arg(TDEIO::convertSize(KFTPQueue::Manager::self()->getUploadSpeed())), 3); } void MainWindow::initSidebars() @@ -361,23 +361,23 @@ void MainWindow::initSidebars() void MainWindow::initMainView() { - setCentralWidget(new QWidget(this, "qt_central_widget")); + setCentralWidget(new TQWidget(this, "qt_central_widget")); - QHBoxLayout *mainLayout = new QHBoxLayout(centralWidget(), 0, 0, "tLayout"); + TQHBoxLayout *mainLayout = new TQHBoxLayout(centralWidget(), 0, 0, "tLayout"); // Create the sidebars initSidebars(); mainLayout->addWidget(m_bottomSidebar); - QSplitter *splitter = new QSplitter(m_leftSidebar->content()); + TQSplitter *splitter = new TQSplitter(m_leftSidebar->content()); // Session layouts - QWidget *box_1 = new QWidget(splitter); - QWidget *box_2 = new QWidget(splitter); + TQWidget *box_1 = new TQWidget(splitter); + TQWidget *box_2 = new TQWidget(splitter); - QHBoxLayout *lay_1 = new QHBoxLayout(box_1); - QHBoxLayout *lay_2 = new QHBoxLayout(box_2); + TQHBoxLayout *lay_1 = new TQHBoxLayout(box_1); + TQHBoxLayout *lay_2 = new TQHBoxLayout(box_2); KFTPTabWidget *leftTabs = new KFTPTabWidget(box_1, "TabWidgetLeft"); KFTPTabWidget *rightTabs = new KFTPTabWidget(box_2, "TabWidgetRight"); @@ -389,7 +389,7 @@ void MainWindow::initMainView() lay_2->addWidget(rightTabs); // Create the session manager - new KFTPSession::Manager(this, new QTabWidget(0, "logs"), leftTabs, rightTabs); + new KFTPSession::Manager(this, new TQTabWidget(0, "logs"), leftTabs, rightTabs); // Add some sidebars that can't be added before the session manager is created m_bottomSidebar->addSidebar(new KFTPWidgets::ThreadView(0, "threads"), i18n("Threads"), "socket"); @@ -400,15 +400,15 @@ void MainWindow::initMainView() void MainWindow::slotUpdateStatusBar() { // Status bar - statusBar()->changeItem(i18n("Download: %1/s").arg(KIO::convertSize(KFTPQueue::Manager::self()->getDownloadSpeed())), 2); - statusBar()->changeItem(i18n("Upload: %1/s").arg(KIO::convertSize(KFTPQueue::Manager::self()->getUploadSpeed())), 3); + statusBar()->changeItem(i18n("Download: %1/s").arg(TDEIO::convertSize(KFTPQueue::Manager::self()->getDownloadSpeed())), 2); + statusBar()->changeItem(i18n("Upload: %1/s").arg(TDEIO::convertSize(KFTPQueue::Manager::self()->getUploadSpeed())), 3); } void MainWindow::slotUpdateTrafficGraph() { // Update the traffic graph if (m_trafficGraph) { - QValueList<double> trafficList; + TQValueList<double> trafficList; trafficList.append((double) KFTPQueue::Manager::self()->getDownloadSpeed() / 1024); trafficList.append((double) KFTPQueue::Manager::self()->getUploadSpeed() / 1024); @@ -416,7 +416,7 @@ void MainWindow::slotUpdateTrafficGraph() } } -void MainWindow::slotQuickConnect(const QString &title, const QString &host, int port) +void MainWindow::slotQuickConnect(const TQString &title, const TQString &host, int port) { // Create/get the new dialog KFTPWidgets::QuickConnectDialog *quickConnect = new KFTPWidgets::QuickConnectDialog(this); diff --git a/kftpgrabber/src/mainwindow.h b/kftpgrabber/src/mainwindow.h index c173a42..ac860a6 100644 --- a/kftpgrabber/src/mainwindow.h +++ b/kftpgrabber/src/mainwindow.h @@ -41,10 +41,10 @@ #include <config.h> #endif -#include <qtimer.h> +#include <ntqtimer.h> -#include <kmainwindow.h> -#include <kaction.h> +#include <tdemainwindow.h> +#include <tdeaction.h> class KFTPZeroConfListView; class MainActions; @@ -63,7 +63,7 @@ namespace Bookmarks { * @short Application Main Window * @author Jernej Kos <kostko@jweb-network.net> */ -class MainWindow : public KMainWindow +class MainWindow : public TDEMainWindow { Q_OBJECT public: @@ -110,12 +110,12 @@ protected: */ bool queryClose(); private: - QTimer *m_graphTimer; + TQTimer *m_graphTimer; MainActions *m_actions; - KActionMenu *m_bookmarkMenu; - KActionMenu *m_zeroconfMenu; - KActionMenu *m_walletMenu; + TDEActionMenu *m_bookmarkMenu; + TDEActionMenu *m_zeroconfMenu; + TDEActionMenu *m_walletMenu; KFTPWidgets::Sidebar *m_leftSidebar; KFTPWidgets::Sidebar *m_bottomSidebar; @@ -128,7 +128,7 @@ private: KFTPWidgets::QueueView *m_queueView; public slots: void initBookmarkMenu(); - void slotQuickConnect(const QString &title = QString::null, const QString &host = QString::null, int port = 21); + void slotQuickConnect(const TQString &title = TQString::null, const TQString &host = TQString::null, int port = 21); private slots: void appShutdown(); void showBookmarkEditor(); diff --git a/kftpgrabber/src/misc/configbase.cpp b/kftpgrabber/src/misc/configbase.cpp index 39d58e4..e2a81f4 100644 --- a/kftpgrabber/src/misc/configbase.cpp +++ b/kftpgrabber/src/misc/configbase.cpp @@ -39,18 +39,18 @@ #include "kftpapi.h" #include "filter.h" -#include <qregexp.h> +#include <ntqregexp.h> -#include <kapplication.h> -#include <kconfig.h> -#include <kemailsettings.h> -#include <klocale.h> +#include <tdeapplication.h> +#include <tdeconfig.h> +#include <tdeemailsettings.h> +#include <tdelocale.h> namespace KFTPCore { -ConfigBase::ConfigBase(const QString &fileName) - : QObject(), - KConfigSkeleton(fileName) +ConfigBase::ConfigBase(const TQString &fileName) + : TQObject(), + TDEConfigSkeleton(fileName) { m_fileExistsDownActions.setTypeText(i18n("Download")); m_fileExistsUpActions.setTypeText(i18n("Upload")); @@ -62,7 +62,7 @@ ConfigBase::ConfigBase(const QString &fileName) void ConfigBase::postInit() { // Restore the actions - QString tmp = Config::downloadActions(); + TQString tmp = Config::downloadActions(); tmp >> m_fileExistsDownActions; tmp = Config::uploadActions(); @@ -75,7 +75,7 @@ void ConfigBase::postInit() void ConfigBase::saveConfig() { // Save actions before writing - QString tmp; + TQString tmp; tmp << m_fileExistsDownActions; Config::setDownloadActions(tmp); @@ -101,7 +101,7 @@ void ConfigBase::emitChange() emit configChanged(); } -char ConfigBase::ftpMode(const QString &filename) +char ConfigBase::ftpMode(const TQString &filename) { // Get FTP mode (binary/ascii) switch (m_transMode) { @@ -110,12 +110,12 @@ char ConfigBase::ftpMode(const QString &filename) case 'X': default: { char mode = 'I'; - QRegExp e; + TQRegExp e; e.setWildcard(true); - QStringList list = Config::asciiList(); - QStringList::iterator end(list.end()); - for (QStringList::iterator i(list.begin()); i != end; ++i) { + TQStringList list = Config::asciiList(); + TQStringList::iterator end(list.end()); + for (TQStringList::iterator i(list.begin()); i != end; ++i) { e.setPattern((*i)); if (e.exactMatch(filename)) { @@ -129,7 +129,7 @@ char ConfigBase::ftpMode(const QString &filename) } } -QString ConfigBase::getGlobalMail() +TQString ConfigBase::getGlobalMail() { KEMailSettings kes; kes.setProfile(kes.defaultProfileName()); diff --git a/kftpgrabber/src/misc/configbase.h b/kftpgrabber/src/misc/configbase.h index 50e1d7a..9946351 100644 --- a/kftpgrabber/src/misc/configbase.h +++ b/kftpgrabber/src/misc/configbase.h @@ -37,9 +37,9 @@ #ifndef KFTPCORECONFIGBASE_H #define KFTPCORECONFIGBASE_H -#include <qobject.h> +#include <ntqobject.h> -#include <kconfigskeleton.h> +#include <tdeconfigskeleton.h> #include "kftpfileexistsactions.h" @@ -50,16 +50,16 @@ namespace KFTPCore { /** * This is a base class for KFTPGrabber's configuration. It is inherited by - * auto-generated KConfigXT class KFTPCore::Config that adds all the configuration + * auto-generated TDEConfigXT class KFTPCore::Config that adds all the configuration * options. * * @author Jernej Kos */ -class ConfigBase : public QObject, public KConfigSkeleton +class ConfigBase : public TQObject, public TDEConfigSkeleton { Q_OBJECT public: - ConfigBase(const QString &fileName); + ConfigBase(const TQString &fileName); /** * Does some post initialization stuff that couldn't be done in the constructor due @@ -79,7 +79,7 @@ public: * @param filename The filename for which the mode should be returned * @return A valid FTP transfer mode */ - char ftpMode(const QString &filename); + char ftpMode(const TQString &filename); /** * Set the global transfer mode. @@ -121,7 +121,7 @@ public slots: */ void emitChange(); protected: - QString getGlobalMail(); + TQString getGlobalMail(); private: KFTPQueue::FileExistsActions m_fileExistsDownActions; KFTPQueue::FileExistsActions m_fileExistsUpActions; diff --git a/kftpgrabber/src/misc/customcommands/entry.cpp b/kftpgrabber/src/misc/customcommands/entry.cpp index 346f3cf..4f9d0fb 100644 --- a/kftpgrabber/src/misc/customcommands/entry.cpp +++ b/kftpgrabber/src/misc/customcommands/entry.cpp @@ -40,25 +40,25 @@ #include "parameterentrydialog.h" #include "responsedialog.h" -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> namespace KFTPCore { namespace CustomCommands { -Entry::Entry(QObject *parent, const QString &name) - : QObject(parent), +Entry::Entry(TQObject *parent, const TQString &name) + : TQObject(parent), m_name(name) { } -void Entry::appendParameter(ParameterType type, const QString &name) +void Entry::appendParameter(ParameterType type, const TQString &name) { m_params.append(Parameter(type, name)); } -void Entry::setResponseHandler(const QString &handler, QDomNode args) +void Entry::setResponseHandler(const TQString &handler, TQDomNode args) { m_handler = handler; m_handlerArguments = args; @@ -67,11 +67,11 @@ void Entry::setResponseHandler(const QString &handler, QDomNode args) void Entry::execute(KFTPSession::Session *session) { // Create a dialog for parameter input - QString command = m_command; + TQString command = m_command; if (m_params.count() > 0) { ParameterEntryDialog *dialog = new ParameterEntryDialog(this, m_params); - if (dialog->exec() != QDialog::Accepted) { + if (dialog->exec() != TQDialog::Accepted) { delete dialog; return; } @@ -83,20 +83,20 @@ void Entry::execute(KFTPSession::Session *session) // Execute the command with proper parameters m_lastSession = session; - connect(session->getClient()->eventHandler(), SIGNAL(gotRawResponse(const QString&)), this, SLOT(handleResponse(const QString&))); + connect(session->getClient()->eventHandler(), SIGNAL(gotRawResponse(const TQString&)), this, SLOT(handleResponse(const TQString&))); session->getClient()->raw(command); } -void Entry::handleResponse(const QString &response) +void Entry::handleResponse(const TQString &response) { if (!m_lastSession) return; - m_lastSession->getClient()->eventHandler()->QObject::disconnect(this); + m_lastSession->getClient()->eventHandler()->TQObject::disconnect(this); m_lastSession = 0; // Invoke the proper handler - QString expectedReturn = m_handlerArguments.namedItem("expected").toElement().attribute("code"); + TQString expectedReturn = m_handlerArguments.namedItem("expected").toElement().attribute("code"); if (!response.startsWith(expectedReturn)) { KMessageBox::error(0, i18n("<qt>Requested operation has failed! Response from server is:<br/><br /><b>%1</b></qt>").arg(response)); @@ -110,7 +110,7 @@ void Entry::handleResponse(const QString &response) return; } - QString parsed = handler->handleResponse(response, m_handlerArguments); + TQString parsed = handler->handleResponse(response, m_handlerArguments); // Find the proper way to display the parsed response switch (m_displayType) { @@ -134,14 +134,14 @@ Entry::Parameter::Parameter() { } -Entry::Parameter::Parameter(ParameterType type, const QString &name) +Entry::Parameter::Parameter(ParameterType type, const TQString &name) : m_type(type), m_name(name) { } EntryAction::EntryAction(Entry *entry, KFTPSession::Session *session) - : KAction(entry->name(), entry->icon()), + : TDEAction(entry->name(), entry->icon()), m_entryInfo(entry), m_session(session) { diff --git a/kftpgrabber/src/misc/customcommands/entry.h b/kftpgrabber/src/misc/customcommands/entry.h index e7c82c4..85a97af 100644 --- a/kftpgrabber/src/misc/customcommands/entry.h +++ b/kftpgrabber/src/misc/customcommands/entry.h @@ -36,10 +36,10 @@ #ifndef KFTPCORE_CUSTOMCOMMANDSENTRY_H #define KFTPCORE_CUSTOMCOMMANDSENTRY_H -#include <qdom.h> -#include <qvaluelist.h> +#include <ntqdom.h> +#include <ntqvaluelist.h> -#include <kaction.h> +#include <tdeaction.h> namespace KFTPSession { class Session; @@ -55,7 +55,7 @@ namespace CustomCommands { * * @author Jernej Kos */ -class Entry : public QObject { +class Entry : public TQObject { Q_OBJECT public: /** @@ -92,7 +92,7 @@ public: * @param type Parameter type * @param name Parameter name */ - Parameter(ParameterType type, const QString &name); + Parameter(ParameterType type, const TQString &name); /** * Returns the parameter type. @@ -102,10 +102,10 @@ public: /** * Returns the parameter name. */ - QString name() const { return m_name; } + TQString name() const { return m_name; } private: ParameterType m_type; - QString m_name; + TQString m_name; }; /** @@ -113,43 +113,43 @@ public: * * @param name Short entry name */ - Entry(QObject *parent, const QString &name); + Entry(TQObject *parent, const TQString &name); /** * Returns entry's name. */ - QString name() const { return m_name; } + TQString name() const { return m_name; } /** * Returns entry's description. */ - QString description() const { return m_description; } + TQString description() const { return m_description; } /** * Returns entry's icon name. */ - QString icon() const { return m_icon; } + TQString icon() const { return m_icon; } /** * Sets entry's description. * * @param description A longer entry description; can be rich text */ - void setDescription(const QString &description) { m_description = description; } + void setDescription(const TQString &description) { m_description = description; } /** * Set entry's icon. * * @param icon An icon name */ - void setIcon(const QString &icon) { m_icon = icon; } + void setIcon(const TQString &icon) { m_icon = icon; } /** * Sets the raw command to be sent. * * @param command A valid FTP command with optional parameter placeholders */ - void setCommand(const QString &command) { m_command = command; } + void setCommand(const TQString &command) { m_command = command; } /** * Appends a command parameter. @@ -157,7 +157,7 @@ public: * @param type Parameter type * @param name Human readable parameter name */ - void appendParameter(ParameterType type, const QString &name); + void appendParameter(ParameterType type, const TQString &name); /** * Sets response display type. @@ -172,7 +172,7 @@ public: * @param handler Handler name * @param args Optional argument node */ - void setResponseHandler(const QString &handler, QDomNode args); + void setResponseHandler(const TQString &handler, TQDomNode args); /** * Executes this entry. This will actually generate and show a proper @@ -184,17 +184,17 @@ public: */ void execute(KFTPSession::Session *session); private slots: - void handleResponse(const QString &response); + void handleResponse(const TQString &response); private: - QString m_name; - QString m_description; - QString m_icon; - QString m_command; - QString m_handler; + TQString m_name; + TQString m_description; + TQString m_icon; + TQString m_command; + TQString m_handler; DisplayType m_displayType; - QValueList<Parameter> m_params; - QDomNode m_handlerArguments; + TQValueList<Parameter> m_params; + TQDomNode m_handlerArguments; KFTPSession::Session *m_lastSession; }; @@ -205,7 +205,7 @@ private: * * @author Jernej Kos */ -class EntryAction : public KAction { +class EntryAction : public TDEAction { public: /** * Class constructor. diff --git a/kftpgrabber/src/misc/customcommands/handlers.cpp b/kftpgrabber/src/misc/customcommands/handlers.cpp index 8cf5349..86f64b3 100644 --- a/kftpgrabber/src/misc/customcommands/handlers.cpp +++ b/kftpgrabber/src/misc/customcommands/handlers.cpp @@ -35,8 +35,8 @@ */ #include "handlers.h" -#include <qdom.h> -#include <qregexp.h> +#include <ntqdom.h> +#include <ntqregexp.h> namespace KFTPCore { @@ -44,7 +44,7 @@ namespace CustomCommands { namespace Handlers { -Handler::Handler(const QString &name) +Handler::Handler(const TQString &name) : m_name(name) { } @@ -59,9 +59,9 @@ SubstituteHandler::SubstituteHandler() { } -QString SubstituteHandler::handleResponse(const QString &raw, QDomNode arguments) const +TQString SubstituteHandler::handleResponse(const TQString &raw, TQDomNode arguments) const { - QString text = arguments.namedItem("text").toElement().text(); + TQString text = arguments.namedItem("text").toElement().text(); if (text.contains("%1")) return text.arg(raw); @@ -74,16 +74,16 @@ RegexpHandler::RegexpHandler() { } -QString RegexpHandler::handleResponse(const QString &raw, QDomNode arguments) const +TQString RegexpHandler::handleResponse(const TQString &raw, TQDomNode arguments) const { - QString result; - QRegExp e(arguments.namedItem("match").toElement().text()); + TQString result; + TQRegExp e(arguments.namedItem("match").toElement().text()); if (e.exactMatch(raw.stripWhiteSpace())) { result = arguments.namedItem("display").toElement().text(); for (int i = 1; i <= e.numCaptures(); i++) { - result.replace(QString("\\%1").arg(i), e.cap(i)); + result.replace(TQString("\\%1").arg(i), e.cap(i)); } } diff --git a/kftpgrabber/src/misc/customcommands/handlers.h b/kftpgrabber/src/misc/customcommands/handlers.h index f41a3de..3bcb486 100644 --- a/kftpgrabber/src/misc/customcommands/handlers.h +++ b/kftpgrabber/src/misc/customcommands/handlers.h @@ -36,8 +36,8 @@ #ifndef KFTPCORE_CUSTOMCOMMANDS_HANDLERSHANDLERS_H #define KFTPCORE_CUSTOMCOMMANDS_HANDLERSHANDLERS_H -#include <qstring.h> -#include <qdom.h> +#include <ntqstring.h> +#include <ntqdom.h> namespace KFTPCore { @@ -58,12 +58,12 @@ public: * * @param name Handler name */ - Handler(const QString &name); + Handler(const TQString &name); /** * Returns the handler's name. */ - QString name() const { return m_name; } + TQString name() const { return m_name; } /** * This method should be implemented by actual handlers to handler the @@ -73,9 +73,9 @@ public: * @param arguments Any argument nodes supplied in the XML file * @return This method should return a formatted string */ - virtual QString handleResponse(const QString &raw, QDomNode arguments) const = 0; + virtual TQString handleResponse(const TQString &raw, TQDomNode arguments) const = 0; private: - QString m_name; + TQString m_name; }; /** @@ -94,7 +94,7 @@ public: * @overload * Reimplemented from Handler. */ - QString handleResponse(const QString &raw, QDomNode) const { return raw; } + TQString handleResponse(const TQString &raw, TQDomNode) const { return raw; } }; /** @@ -115,7 +115,7 @@ public: * @overload * Reimplemented from Handler. */ - QString handleResponse(const QString &raw, QDomNode arguments) const; + TQString handleResponse(const TQString &raw, TQDomNode arguments) const; }; /** @@ -135,7 +135,7 @@ public: * @overload * Reimplemented from Handler. */ - QString handleResponse(const QString &raw, QDomNode arguments) const; + TQString handleResponse(const TQString &raw, TQDomNode arguments) const; }; } diff --git a/kftpgrabber/src/misc/customcommands/manager.cpp b/kftpgrabber/src/misc/customcommands/manager.cpp index 1cda06a..029e5c3 100644 --- a/kftpgrabber/src/misc/customcommands/manager.cpp +++ b/kftpgrabber/src/misc/customcommands/manager.cpp @@ -36,13 +36,13 @@ #include "manager.h" #include "entry.h" -#include <qfile.h> +#include <ntqfile.h> #include <kstandarddirs.h> #include <kstaticdeleter.h> -#include <kpopupmenu.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdepopupmenu.h> +#include <tdemessagebox.h> +#include <tdelocale.h> namespace KFTPCore { @@ -61,7 +61,7 @@ Manager *Manager::self() } Manager::Manager() - : QObject() + : TQObject() { // Populate the handlers list m_handlers["Raw"] = new Handlers::RawHandler(); @@ -84,12 +84,12 @@ Manager::~Manager() void Manager::load() { - QString filename = locateLocal("appdata", "commands.xml"); + TQString filename = locateLocal("appdata", "commands.xml"); - if (!QFile::exists(filename)) { + if (!TQFile::exists(filename)) { // Copy the default command set over - QFile source(locate("appdata", "commands.xml")); - QFile destination(filename); + TQFile source(locate("appdata", "commands.xml")); + TQFile destination(filename); source.open(IO_ReadOnly); destination.open(IO_WriteOnly | IO_Truncate); @@ -99,7 +99,7 @@ void Manager::load() destination.close(); } - QFile file(filename); + TQFile file(filename); if (!file.open(IO_ReadOnly)) return; @@ -107,18 +107,18 @@ void Manager::load() file.close(); } -void Manager::parseEntries(KActionMenu *parentMenu, const QDomNode &parentNode, KFTPSession::Session *session) const +void Manager::parseEntries(TDEActionMenu *parentMenu, const TQDomNode &parentNode, KFTPSession::Session *session) const { - QDomNode n = parentNode.firstChild(); + TQDomNode n = parentNode.firstChild(); while (!n.isNull()) { if (n.isElement()) { - QDomElement e = n.toElement(); - QString tagName = e.tagName(); - QString name = e.attribute("name"); + TQDomElement e = n.toElement(); + TQString tagName = e.tagName(); + TQString name = e.attribute("name"); if (tagName == "category") { - KActionMenu *menu = new KActionMenu(name, "folder", parentMenu); + TDEActionMenu *menu = new TDEActionMenu(name, "folder", parentMenu); parentMenu->insert(menu); // Recurse into this category @@ -129,12 +129,12 @@ void Manager::parseEntries(KActionMenu *parentMenu, const QDomNode &parentNode, entry->setIcon(e.attribute("icon")); entry->setCommand(n.namedItem("command").toElement().text()); - QDomNode p = n.namedItem("params").firstChild(); + TQDomNode p = n.namedItem("params").firstChild(); while (!p.isNull()) { - QDomElement pElement = p.toElement(); + TQDomElement pElement = p.toElement(); if (pElement.tagName() == "param") { - QString typeString = pElement.attribute("type"); + TQString typeString = pElement.attribute("type"); Entry::ParameterType type = Entry::String; if (typeString == "String") @@ -150,10 +150,10 @@ void Manager::parseEntries(KActionMenu *parentMenu, const QDomNode &parentNode, p = p.nextSibling(); } - QDomElement rElement = n.namedItem("response").toElement(); + TQDomElement rElement = n.namedItem("response").toElement(); entry->setResponseHandler(rElement.attribute("handler"), rElement); - QString displayString = rElement.attribute("display"); + TQString displayString = rElement.attribute("display"); Entry::DisplayType displayType = Entry::None; if (displayString == "None") @@ -181,7 +181,7 @@ void Manager::parseEntries(KActionMenu *parentMenu, const QDomNode &parentNode, } } -Handlers::Handler *Manager::handler(const QString &name) const +Handlers::Handler *Manager::handler(const TQString &name) const { if (m_handlers.contains(name)) return m_handlers[name]; @@ -189,9 +189,9 @@ Handlers::Handler *Manager::handler(const QString &name) const return 0; } -KActionMenu *Manager::categories(const QString &name, KFTPSession::Session *session) const +TDEActionMenu *Manager::categories(const TQString &name, KFTPSession::Session *session) const { - KActionMenu *actionMenu = new KActionMenu(name); + TDEActionMenu *actionMenu = new TDEActionMenu(name); parseEntries(actionMenu, m_document.documentElement(), session); return actionMenu; @@ -199,7 +199,7 @@ KActionMenu *Manager::categories(const QString &name, KFTPSession::Session *sess void Manager::slotActionActivated() { - EntryAction *action = (EntryAction*) QObject::sender(); + EntryAction *action = (EntryAction*) TQObject::sender(); action->entryInfo()->execute(action->session()); } diff --git a/kftpgrabber/src/misc/customcommands/manager.h b/kftpgrabber/src/misc/customcommands/manager.h index db5dd6d..3e017ad 100644 --- a/kftpgrabber/src/misc/customcommands/manager.h +++ b/kftpgrabber/src/misc/customcommands/manager.h @@ -36,11 +36,11 @@ #ifndef KFTPCORE_CUSTOMCOMMANDSMANAGER_H #define KFTPCORE_CUSTOMCOMMANDSMANAGER_H -#include <qobject.h> -#include <qdom.h> -#include <qmap.h> +#include <ntqobject.h> +#include <ntqdom.h> +#include <ntqmap.h> -#include <kaction.h> +#include <tdeaction.h> #include "handlers.h" @@ -58,7 +58,7 @@ namespace CustomCommands { * * @author Jernej Kos */ -class Manager : public QObject { +class Manager : public TQObject { Q_OBJECT public: /** @@ -76,13 +76,13 @@ public: * * @param name Handler string identifier */ - Handlers::Handler *handler(const QString &name) const; + Handlers::Handler *handler(const TQString &name) const; /** - * Returns a KActionMenu that can be used for displaying categories of + * Returns a TDEActionMenu that can be used for displaying categories of * entries to the user. */ - KActionMenu *categories(const QString &name, KFTPSession::Session *session) const; + TDEActionMenu *categories(const TQString &name, KFTPSession::Session *session) const; public slots: /** * Loads a valid commands XML file. @@ -99,16 +99,16 @@ protected: /** * Recursive entry parser. */ - void parseEntries(KActionMenu *parentMenu, const QDomNode &parentNode, KFTPSession::Session *session) const; + void parseEntries(TDEActionMenu *parentMenu, const TQDomNode &parentNode, KFTPSession::Session *session) const; protected slots: /** * This slot gets called when an EntryAction is activated. */ void slotActionActivated(); private: - KActionMenu *m_categories; - QDomDocument m_document; - QMap<QString, Handlers::Handler*> m_handlers; + TDEActionMenu *m_categories; + TQDomDocument m_document; + TQMap<TQString, Handlers::Handler*> m_handlers; }; } diff --git a/kftpgrabber/src/misc/customcommands/parameterentrydialog.cpp b/kftpgrabber/src/misc/customcommands/parameterentrydialog.cpp index 808b400..3bb1d9a 100644 --- a/kftpgrabber/src/misc/customcommands/parameterentrydialog.cpp +++ b/kftpgrabber/src/misc/customcommands/parameterentrydialog.cpp @@ -36,9 +36,9 @@ #include "parameterentrydialog.h" #include "entry.h" -#include <qvbox.h> -#include <qlayout.h> -#include <qlabel.h> +#include <ntqvbox.h> +#include <ntqlayout.h> +#include <ntqlabel.h> #include <kiconloader.h> #include <klineedit.h> @@ -49,39 +49,39 @@ namespace KFTPCore { namespace CustomCommands { -ParameterEntryDialog::ParameterEntryDialog(Entry *entry, QValueList<Entry::Parameter> params) +ParameterEntryDialog::ParameterEntryDialog(Entry *entry, TQValueList<Entry::Parameter> params) : KDialogBase(0, "", true, entry->name(), Ok|Cancel, Ok), m_params(params) { - QFrame *mainWidget = makeMainWidget(); - QVBoxLayout *mainLayout = new QVBoxLayout(mainWidget); + TQFrame *mainWidget = makeMainWidget(); + TQVBoxLayout *mainLayout = new TQVBoxLayout(mainWidget); - QHBoxLayout *headerLayout = new QHBoxLayout(mainWidget); - QLabel *icon = new QLabel(mainWidget); + TQHBoxLayout *headerLayout = new TQHBoxLayout(mainWidget); + TQLabel *icon = new TQLabel(mainWidget); icon->setPixmap(DesktopIcon(entry->icon(), 32)); headerLayout->addWidget(icon); - QVBoxLayout *headerTextLayout = new QVBoxLayout(mainWidget); - headerTextLayout->addWidget(new QLabel(QString("<b>%1</b>").arg(entry->name()), mainWidget)); - headerTextLayout->addWidget(new QLabel(entry->description(), mainWidget)); + TQVBoxLayout *headerTextLayout = new TQVBoxLayout(mainWidget); + headerTextLayout->addWidget(new TQLabel(TQString("<b>%1</b>").arg(entry->name()), mainWidget)); + headerTextLayout->addWidget(new TQLabel(entry->description(), mainWidget)); headerLayout->addLayout(headerTextLayout, 1); mainLayout->addLayout(headerLayout); mainLayout->addSpacing(5); - QFrame *frame = new QFrame(mainWidget); - frame->setFrameStyle(QFrame::StyledPanel | QFrame::Raised); + TQFrame *frame = new TQFrame(mainWidget); + frame->setFrameStyle(TQFrame::StyledPanel | TQFrame::Raised); - QVBoxLayout *frameLayout = new QVBoxLayout(frame); + TQVBoxLayout *frameLayout = new TQVBoxLayout(frame); frameLayout->setMargin(10); mainLayout->addWidget(frame); int num = 0; - QValueList<Entry::Parameter>::ConstIterator lend = params.end(); - for (QValueList<Entry::Parameter>::ConstIterator i = params.begin(); i != lend; ++i) { - QHBoxLayout *layout = new QHBoxLayout(frame); - QWidget *entryWidget = 0; - QString name = QString("param_%1").arg(num++); + TQValueList<Entry::Parameter>::ConstIterator lend = params.end(); + for (TQValueList<Entry::Parameter>::ConstIterator i = params.begin(); i != lend; ++i) { + TQHBoxLayout *layout = new TQHBoxLayout(frame); + TQWidget *entryWidget = 0; + TQString name = TQString("param_%1").arg(num++); switch ((*i).type()) { case Entry::String: entryWidget = new KLineEdit(frame, name.ascii()); break; @@ -93,7 +93,7 @@ ParameterEntryDialog::ParameterEntryDialog(Entry *entry, QValueList<Entry::Param if (num == 1) entryWidget->setFocus(); - layout->addWidget(new QLabel((*i).name() + ":", frame)); + layout->addWidget(new TQLabel((*i).name() + ":", frame)); layout->addStretch(1); layout->addWidget(entryWidget); frameLayout->addLayout(layout); @@ -104,14 +104,14 @@ ParameterEntryDialog::ParameterEntryDialog(Entry *entry, QValueList<Entry::Param resize(350, minimumHeight()); } -QString ParameterEntryDialog::formatCommand(const QString &command) +TQString ParameterEntryDialog::formatCommand(const TQString &command) { - QString tmp = command; + TQString tmp = command; int num = 0; - QValueList<Entry::Parameter>::ConstIterator lend = m_params.end(); - for (QValueList<Entry::Parameter>::ConstIterator i = m_params.begin(); i != lend; ++i) { - QObject *entryWidget = child(QString("param_%1").arg(num++).ascii()); + TQValueList<Entry::Parameter>::ConstIterator lend = m_params.end(); + for (TQValueList<Entry::Parameter>::ConstIterator i = m_params.begin(); i != lend; ++i) { + TQObject *entryWidget = child(TQString("param_%1").arg(num++).ascii()); switch ((*i).type()) { case Entry::String: tmp = tmp.arg(static_cast<KLineEdit*>(entryWidget)->text()); break; diff --git a/kftpgrabber/src/misc/customcommands/parameterentrydialog.h b/kftpgrabber/src/misc/customcommands/parameterentrydialog.h index 3a7d242..29e863a 100644 --- a/kftpgrabber/src/misc/customcommands/parameterentrydialog.h +++ b/kftpgrabber/src/misc/customcommands/parameterentrydialog.h @@ -37,7 +37,7 @@ #define KFTPCORE_CUSTOMCOMMANDSPARAMETERENTRYDIALOG_H #include <kdialogbase.h> -#include <qvaluelist.h> +#include <ntqvaluelist.h> #include "entry.h" @@ -59,7 +59,7 @@ public: * @param entry An entry instance * @param params Parameter list */ - ParameterEntryDialog(Entry *entry, QValueList<Entry::Parameter> params); + ParameterEntryDialog(Entry *entry, TQValueList<Entry::Parameter> params); /** * Properly replaces the parameter placeholders with actual user @@ -67,9 +67,9 @@ public: * * @param command A command string with placeholders */ - QString formatCommand(const QString &command); + TQString formatCommand(const TQString &command); private: - QValueList<Entry::Parameter> m_params; + TQValueList<Entry::Parameter> m_params; }; } diff --git a/kftpgrabber/src/misc/customcommands/responsedialog.cpp b/kftpgrabber/src/misc/customcommands/responsedialog.cpp index 11970f9..35c9877 100644 --- a/kftpgrabber/src/misc/customcommands/responsedialog.cpp +++ b/kftpgrabber/src/misc/customcommands/responsedialog.cpp @@ -41,13 +41,13 @@ namespace KFTPCore { namespace CustomCommands { -ResponseDialog::ResponseDialog(const QString &caption, const QString &response) +ResponseDialog::ResponseDialog(const TQString &caption, const TQString &response) : KDialogBase(0, "", true, caption, Ok) { KTextEdit *contents = new KTextEdit(this); setMainWidget(contents); - contents->setTextFormat(Qt::LogText); + contents->setTextFormat(TQt::LogText); contents->unsetPalette(); contents->append(response); diff --git a/kftpgrabber/src/misc/customcommands/responsedialog.h b/kftpgrabber/src/misc/customcommands/responsedialog.h index ab370ee..37067c4 100644 --- a/kftpgrabber/src/misc/customcommands/responsedialog.h +++ b/kftpgrabber/src/misc/customcommands/responsedialog.h @@ -55,7 +55,7 @@ public: * @param caption Dialog caption * @param response Response text (can be rich-text) */ - ResponseDialog(const QString &caption, const QString &response); + ResponseDialog(const TQString &caption, const TQString &response); }; } diff --git a/kftpgrabber/src/misc/desencryptor.cpp b/kftpgrabber/src/misc/desencryptor.cpp index d53fd5e..126fad7 100644 --- a/kftpgrabber/src/misc/desencryptor.cpp +++ b/kftpgrabber/src/misc/desencryptor.cpp @@ -36,7 +36,7 @@ #include "desencryptor.h" #include <kmdcodec.h> -#include <qfile.h> +#include <ntqfile.h> namespace KFTPGrabberBase { @@ -44,13 +44,13 @@ DESEncryptor::DESEncryptor() { } -void DESEncryptor::DESExec(const QString &str, int mode) +void DESEncryptor::DESExec(const TQString &str, int mode) { - QCString string(str.ascii()); + TQCString string(str.ascii()); m_output = ""; - QByteArray in; - QByteArray out; + TQByteArray in; + TQByteArray out; if (mode == DES_DECRYPT) { // Base64 decode the output @@ -90,28 +90,28 @@ void DESEncryptor::DESExec(const QString &str, int mode) // Base64 encode the output m_output = KCodecs::base64Encode(out).data(); } else { - m_output = QCString(out).data(); + m_output = TQCString(out).data(); } } -void DESEncryptor::setKey(const QString &key) +void DESEncryptor::setKey(const TQString &key) { // Setup our DES key DES_string_to_key(key.ascii(), &m_key); DES_set_key_checked(&m_key, &m_schedule); } -void DESEncryptor::encrypt(const QString &string) +void DESEncryptor::encrypt(const TQString &string) { DESExec(string, DES_ENCRYPT); } -void DESEncryptor::decrypt(const QString &string) +void DESEncryptor::decrypt(const TQString &string) { DESExec(string, DES_DECRYPT); } -QString DESEncryptor::output() +TQString DESEncryptor::output() { return m_output; } diff --git a/kftpgrabber/src/misc/desencryptor.h b/kftpgrabber/src/misc/desencryptor.h index bf9ab68..682331b 100644 --- a/kftpgrabber/src/misc/desencryptor.h +++ b/kftpgrabber/src/misc/desencryptor.h @@ -39,7 +39,7 @@ /* OpenSSL includes */ #include <openssl/des.h> -#include <qstring.h> +#include <ntqstring.h> namespace KFTPGrabberBase { @@ -52,18 +52,18 @@ class DESEncryptor{ public: DESEncryptor(); - void setKey(const QString &key); - void encrypt(const QString &string); - void decrypt(const QString &string); + void setKey(const TQString &key); + void encrypt(const TQString &string); + void decrypt(const TQString &string); - QString output(); + TQString output(); private: DES_cblock m_key; DES_key_schedule m_schedule; - QString m_output; + TQString m_output; - void DESExec(const QString &str, int mode); + void DESExec(const TQString &str, int mode); }; } diff --git a/kftpgrabber/src/misc/filter.cpp b/kftpgrabber/src/misc/filter.cpp index 605eba7..8e27d45 100644 --- a/kftpgrabber/src/misc/filter.cpp +++ b/kftpgrabber/src/misc/filter.cpp @@ -35,18 +35,18 @@ */ #include "filter.h" -#include <qregexp.h> +#include <ntqregexp.h> -#include <kapplication.h> -#include <klocale.h> +#include <tdeapplication.h> +#include <tdelocale.h> #include <kstaticdeleter.h> -#include <kconfig.h> +#include <tdeconfig.h> namespace KFTPCore { namespace Filter { -Condition::Condition(Field field, Type type, const QVariant &value) +Condition::Condition(Field field, Type type, const TQVariant &value) : m_field(field), m_type(type), m_value(value) @@ -56,13 +56,13 @@ Condition::Condition(Field field, Type type, const QVariant &value) bool Condition::matches(const KFTPEngine::DirectoryEntry &entry) const { bool result = false; - QString check; + TQString check; switch (m_field) { default: case Filename: check = entry.filename(); break; case EntryType: check = entry.type(); break; - case Size: check = QString::number(entry.size()); break; + case Size: check = TQString::number(entry.size()); break; } switch (m_type) { @@ -75,12 +75,12 @@ bool Condition::matches(const KFTPEngine::DirectoryEntry &entry) const case IsNot: result = (check != m_value.toString()); break; case Matches: { - QRegExp r(m_value.toString()); + TQRegExp r(m_value.toString()); result = (r.search(check) > -1); break; } case MatchesNot: { - QRegExp r(m_value.toString()); + TQRegExp r(m_value.toString()); result = (r.search(check) == -1); break; } @@ -93,14 +93,14 @@ bool Condition::matches(const KFTPEngine::DirectoryEntry &entry) const } ConditionChain::ConditionChain() - : QPtrList<Condition>(), + : TQPtrList<Condition>(), m_type(All) { setAutoDelete(true); } ConditionChain::ConditionChain(Type type) - : QPtrList<Condition>(), + : TQPtrList<Condition>(), m_type(type) { setAutoDelete(true); @@ -111,8 +111,8 @@ bool ConditionChain::matches(const KFTPEngine::DirectoryEntry &entry) const if (isEmpty()) return false; - QPtrList<Condition>::ConstIterator le = end(); - for (QPtrList<Condition>::ConstIterator i = begin(); i != le; ++i) { + TQPtrList<Condition>::ConstIterator le = end(); + for (TQPtrList<Condition>::ConstIterator i = begin(); i != le; ++i) { bool match = (*i)->matches(entry); if (match && m_type == Any) @@ -132,7 +132,7 @@ Action::Action() { } -Action::Action(Type type, const QVariant &value) +Action::Action(Type type, const TQVariant &value) : m_valid(true), m_type(type), m_value(value) @@ -140,7 +140,7 @@ Action::Action(Type type, const QVariant &value) } ActionChain::ActionChain() - : QPtrList<Action>() + : TQPtrList<Action>() { setAutoDelete(true); } @@ -156,7 +156,7 @@ const Action *ActionChain::getAction(Action::Type type) const } Rule::Rule() - : m_name(QString::null), + : m_name(TQString::null), m_enabled(false) { } @@ -187,13 +187,13 @@ Rule::Rule(const Rule *rule) } } -Rule::Rule(const QString &name) +Rule::Rule(const TQString &name) : m_name(name), m_enabled(true) { // Add a simple condition and a simple action - m_conditionChain.append(new Condition(Filename, Condition::Contains, QVariant(""))); - m_actionChain.append(new Action(Action::None, QVariant())); + m_conditionChain.append(new Condition(Filename, Condition::Contains, TQVariant(""))); + m_actionChain.append(new Action(Action::None, TQVariant())); } Filters *Filters::m_self = 0; @@ -209,7 +209,7 @@ Filters *Filters::self() } Filters::Filters() - : QPtrList<Rule>(), + : TQPtrList<Rule>(), m_enabled(true) { setAutoDelete(true); @@ -239,14 +239,14 @@ Filters::~Filters() void Filters::save() { int num = 0; - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("Filters"); config->writeEntry("count", count()); // Remove any existing sections for (int i = 0; ; i++) { - QString groupName = QString("Filter #%1").arg(i); + TQString groupName = TQString("Filter #%1").arg(i); if (config->hasGroup(groupName)) config->deleteGroup(groupName); @@ -258,7 +258,7 @@ void Filters::save() for (Filters::ConstIterator i = begin(); i != le; ++i, num++) { const Rule *rule = (*i); - config->setGroup(QString("Filter #%1").arg(num)); + config->setGroup(TQString("Filter #%1").arg(num)); config->writeEntry("name", rule->name()); config->writeEntry("enabled", rule->isEnabled()); @@ -271,7 +271,7 @@ void Filters::save() ConditionChain::ConstIterator cle = conditions->end(); for (ConditionChain::ConstIterator j = conditions->begin(); j != cle; ++j, cnum++) { const Condition *c = (*j); - QString prefix = QString("condition%1-").arg(cnum); + TQString prefix = TQString("condition%1-").arg(cnum); config->writeEntry(prefix + "field", (int) c->field()); config->writeEntry(prefix + "type", (int) c->type()); @@ -287,7 +287,7 @@ void Filters::save() ActionChain::ConstIterator ale = actions->end(); for (ActionChain::ConstIterator j = actions->begin(); j != ale; ++j, anum++) { const Action *a = (*j); - QString prefix = QString("action%1-").arg(anum); + TQString prefix = TQString("action%1-").arg(anum); config->writeEntry(prefix + "type", (int) a->type()); config->writeEntry(prefix + "value", a->value()); @@ -299,7 +299,7 @@ void Filters::save() void Filters::load() { int num = 0; - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("Filters"); num = config->readNumEntry("count"); @@ -307,7 +307,7 @@ void Filters::load() for (int i = 0; i < num; i++) { Rule *rule = new Rule(); - config->setGroup(QString("Filter #%1").arg(i)); + config->setGroup(TQString("Filter #%1").arg(i)); rule->setName(config->readEntry("name", i18n("Unnamed Rule"))); rule->setEnabled(config->readBoolEntry("enabled", true)); @@ -317,12 +317,12 @@ void Filters::load() conditions->setType((ConditionChain::Type) config->readNumEntry("conditions-type")); for (int j = 0; j < cnum; j++) { - QString prefix = QString("condition%1-").arg(j); + TQString prefix = TQString("condition%1-").arg(j); conditions->append(new Condition((Field) config->readNumEntry(prefix + "field"), (Condition::Type) config->readNumEntry(prefix + "type"), config->readPropertyEntry(prefix + "value", - (QVariant::Type) config->readNumEntry(prefix + "valueType")))); + (TQVariant::Type) config->readNumEntry(prefix + "valueType")))); } // Read actions @@ -330,11 +330,11 @@ void Filters::load() int anum = config->readNumEntry("actions"); for (int j = 0; j < anum; j++) { - QString prefix = QString("action%1-").arg(j); + TQString prefix = TQString("action%1-").arg(j); actions->append(new Action((Action::Type) config->readNumEntry(prefix + "type"), config->readPropertyEntry(prefix + "value", - (QVariant::Type) config->readNumEntry(prefix + "valueType")))); + (TQVariant::Type) config->readNumEntry(prefix + "valueType")))); } append(rule); @@ -344,8 +344,8 @@ void Filters::load() const ActionChain *Filters::process(const KFTPEngine::DirectoryEntry &entry) const { if (m_enabled) { - QPtrList<Rule>::ConstIterator le = end(); - for (QPtrList<Rule>::ConstIterator i = begin(); i != le; ++i) { + TQPtrList<Rule>::ConstIterator le = end(); + for (TQPtrList<Rule>::ConstIterator i = begin(); i != le; ++i) { const Rule *rule = (*i); if (rule->isEnabled() && rule->conditions()->matches(entry)) @@ -357,7 +357,7 @@ const ActionChain *Filters::process(const KFTPEngine::DirectoryEntry &entry) con return 0; } -const Action *Filters::process(const KFTPEngine::DirectoryEntry &entry, QValueList<Action::Type> types) const +const Action *Filters::process(const KFTPEngine::DirectoryEntry &entry, TQValueList<Action::Type> types) const { const ActionChain *chain = process(entry); diff --git a/kftpgrabber/src/misc/filter.h b/kftpgrabber/src/misc/filter.h index 8c7ac36..4281edf 100644 --- a/kftpgrabber/src/misc/filter.h +++ b/kftpgrabber/src/misc/filter.h @@ -36,8 +36,8 @@ #ifndef KFTPCORE_FILTERFILTERS_H #define KFTPCORE_FILTERFILTERS_H -#include <qvariant.h> -#include <qvaluelist.h> +#include <ntqvariant.h> +#include <ntqvaluelist.h> #include "engine/directorylisting.h" @@ -99,7 +99,7 @@ public: * @param type Condition type * @param value Value to check against */ - Condition(Field field, Type type, const QVariant &value); + Condition(Field field, Type type, const TQVariant &value); /** * Returns the field this condition operates on. @@ -128,14 +128,14 @@ public: /** * Returns the value this condition validates the field with. */ - QVariant value() const { return m_value; } + TQVariant value() const { return m_value; } /** * Set condition validation value. * * @param value A valid validation value */ - void setValue(const QVariant &value) { m_value = value; } + void setValue(const TQVariant &value) { m_value = value; } /** * Does the specified entry match this condition ? @@ -147,7 +147,7 @@ public: private: Field m_field; Type m_type; - QVariant m_value; + TQVariant m_value; }; /** @@ -155,7 +155,7 @@ private: * * @author Jernej Kos */ -class ConditionChain : public QPtrList<Condition> { +class ConditionChain : public TQPtrList<Condition> { public: /** * Chain type. @@ -238,7 +238,7 @@ public: * @param type Action type * @param value Action parameters */ - Action(Type type, const QVariant &value); + Action(Type type, const TQVariant &value); /** * Returns true if the action is valid. @@ -260,18 +260,18 @@ public: /** * Get action's parameters. */ - QVariant value() const { return m_value; } + TQVariant value() const { return m_value; } /** * Set action parameter. * * @param value Parameter value */ - void setValue(const QVariant &value) { m_value = value; } + void setValue(const TQVariant &value) { m_value = value; } private: bool m_valid; Type m_type; - QVariant m_value; + TQVariant m_value; }; /** @@ -279,7 +279,7 @@ private: * * @author Jernej Kos */ -class ActionChain : public QPtrList<Action> { +class ActionChain : public TQPtrList<Action> { public: /** * Class constructor. @@ -321,17 +321,17 @@ public: * * @param name Human readable rule name */ - Rule(const QString &name); + Rule(const TQString &name); /** * Get rule's name. */ - QString name() const { return m_name; } + TQString name() const { return m_name; } /** * Set rule's name. */ - void setName(const QString &name) { m_name = name; } + void setName(const TQString &name) { m_name = name; } /** * Is this rule enabled or not ? @@ -357,7 +357,7 @@ public: */ const ActionChain *actions() const { return &m_actionChain; } private: - QString m_name; + TQString m_name; bool m_enabled; ConditionChain m_conditionChain; ActionChain m_actionChain; @@ -368,7 +368,7 @@ private: * * @author Jernej Kos */ -class Filters : public QPtrList<Rule> { +class Filters : public TQPtrList<Rule> { public: /** * Get the global rule chain. @@ -422,7 +422,7 @@ public: * @param types Only return the action of this type * @return An Action reference (might be invalid if nothing matched) */ - const Action *process(const KFTPEngine::DirectoryEntry &entry, QValueList<Action::Type> types) const; + const Action *process(const KFTPEngine::DirectoryEntry &entry, TQValueList<Action::Type> types) const; /** * Process the specified entry and return an action to use. This will @@ -474,16 +474,16 @@ public: /** * Get a human readable list of possible field names. * - * @return A QStringList representing the field names + * @return A TQStringList representing the field names */ - const QStringList &getFieldNames() { return m_fieldNames; } + const TQStringList &getFieldNames() { return m_fieldNames; } /** * Get a human readable list of possible action names * - * @return A QStringList representing the action names + * @return A TQStringList representing the action names */ - const QStringList &getActionNames() { return m_actionNames; } + const TQStringList &getActionNames() { return m_actionNames; } protected: /** * Class constructor. @@ -495,8 +495,8 @@ private: bool m_enabled; ActionChain m_emptyActionChain; - QStringList m_fieldNames; - QStringList m_actionNames; + TQStringList m_fieldNames; + TQStringList m_actionNames; }; } diff --git a/kftpgrabber/src/misc/filterwidgethandler.cpp b/kftpgrabber/src/misc/filterwidgethandler.cpp index 6fa368d..585c453 100644 --- a/kftpgrabber/src/misc/filterwidgethandler.cpp +++ b/kftpgrabber/src/misc/filterwidgethandler.cpp @@ -35,10 +35,10 @@ */ #include "filterwidgethandler.h" -#include <qcombobox.h> -#include <qlabel.h> +#include <ntqcombobox.h> +#include <ntqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstaticdeleter.h> #include <klineedit.h> #include <knuminput.h> @@ -72,9 +72,9 @@ public: { } - QWidget *createTypeWidget(QWidget *parent, const QObject *receiver) const + TQWidget *createTypeWidget(TQWidget *parent, const TQObject *receiver) const { - QComboBox *combo = new QComboBox(parent); + TQComboBox *combo = new TQComboBox(parent); for (int i = 0; i < TextTypeCount; i++) { combo->insertItem(i18n(TextTypes[i].name)); @@ -83,37 +83,37 @@ public: combo->adjustSize(); // Connect the signal - QObject::connect(combo, SIGNAL(activated(int)), receiver, SLOT(slotTypeChanged())); + TQObject::connect(combo, SIGNAL(activated(int)), receiver, SLOT(slotTypeChanged())); return combo; } - Condition::Type getConditionType(QWidget *widget) const + Condition::Type getConditionType(TQWidget *widget) const { - QComboBox *combo = static_cast<QComboBox*>(widget); + TQComboBox *combo = static_cast<TQComboBox*>(widget); return TextTypes[combo->currentItem()].type; } - void createValueWidgets(QWidgetStack *stack, const QObject *receiver) const + void createValueWidgets(TQWidgetStack *stack, const TQObject *receiver) const { KLineEdit *lineEdit = new KLineEdit(stack, "textWidgetHandler_LineEdit"); - QObject::connect(lineEdit, SIGNAL(textChanged(const QString&)), receiver, SLOT(slotValueChanged())); + TQObject::connect(lineEdit, SIGNAL(textChanged(const TQString&)), receiver, SLOT(slotValueChanged())); stack->addWidget(lineEdit); } - QVariant getConditionValue(QWidgetStack *values) const + TQVariant getConditionValue(TQWidgetStack *values) const { KLineEdit *lineEdit = static_cast<KLineEdit*>(values->child("textWidgetHandler_LineEdit")); - return QVariant(lineEdit->text()); + return TQVariant(lineEdit->text()); } - void update(int field, QWidgetStack *types, QWidgetStack *values) const + void update(int field, TQWidgetStack *types, TQWidgetStack *values) const { types->raiseWidget(field); - values->raiseWidget((QWidget*) values->child("textWidgetHandler_LineEdit")); + values->raiseWidget((TQWidget*) values->child("textWidgetHandler_LineEdit")); } - void setCondition(QWidgetStack *types, QWidgetStack *values, const Condition *condition) + void setCondition(TQWidgetStack *types, TQWidgetStack *values, const Condition *condition) { // Set condition type const Condition::Type type = condition->type(); @@ -123,7 +123,7 @@ public: if (type == TextTypes[typeIndex].type) break; - QComboBox *combo = static_cast<QComboBox*>(types->widget(((int) condition->field()))); + TQComboBox *combo = static_cast<TQComboBox*>(types->widget(((int) condition->field()))); combo->blockSignals(true); combo->setCurrentItem(typeIndex); combo->blockSignals(false); @@ -160,9 +160,9 @@ public: { } - QWidget *createTypeWidget(QWidget *parent, const QObject *receiver) const + TQWidget *createTypeWidget(TQWidget *parent, const TQObject *receiver) const { - QComboBox *combo = new QComboBox(parent); + TQComboBox *combo = new TQComboBox(parent); for (int i = 0; i < EntryTypeCount; i++) { combo->insertItem(i18n(EntryTypes[i].name)); @@ -171,47 +171,47 @@ public: combo->adjustSize(); // Connect the signal - QObject::connect(combo, SIGNAL(activated(int)), receiver, SLOT(slotTypeChanged())); + TQObject::connect(combo, SIGNAL(activated(int)), receiver, SLOT(slotTypeChanged())); return combo; } - Condition::Type getConditionType(QWidget *widget) const + Condition::Type getConditionType(TQWidget *widget) const { - QComboBox *combo = static_cast<QComboBox*>(widget); + TQComboBox *combo = static_cast<TQComboBox*>(widget); return EntryTypes[combo->currentItem()].type; } - void createValueWidgets(QWidgetStack *stack, const QObject *receiver) const + void createValueWidgets(TQWidgetStack *stack, const TQObject *receiver) const { - QComboBox *combo = new QComboBox(stack, "entryWidgetHandler_Combo"); + TQComboBox *combo = new TQComboBox(stack, "entryWidgetHandler_Combo"); combo->insertItem(i18n("File"), 0); combo->insertItem(i18n("Directory"), 1); - QObject::connect(combo, SIGNAL(activated(int)), receiver, SLOT(slotValueChanged())); + TQObject::connect(combo, SIGNAL(activated(int)), receiver, SLOT(slotValueChanged())); stack->addWidget(combo); } - QVariant getConditionValue(QWidgetStack *values) const + TQVariant getConditionValue(TQWidgetStack *values) const { - QComboBox *combo = static_cast<QComboBox*>(values->child("entryWidgetHandler_Combo")); - QVariant value; + TQComboBox *combo = static_cast<TQComboBox*>(values->child("entryWidgetHandler_Combo")); + TQVariant value; if (combo->currentItem() == 0) - value = QVariant(QString("f")); + value = TQVariant(TQString("f")); else - value = QVariant(QString("d")); + value = TQVariant(TQString("d")); return value; } - void update(int field, QWidgetStack *types, QWidgetStack *values) const + void update(int field, TQWidgetStack *types, TQWidgetStack *values) const { types->raiseWidget(field); - values->raiseWidget((QWidget*) values->child("entryWidgetHandler_Combo")); + values->raiseWidget((TQWidget*) values->child("entryWidgetHandler_Combo")); } - void setCondition(QWidgetStack *types, QWidgetStack *values, const Condition *condition) + void setCondition(TQWidgetStack *types, TQWidgetStack *values, const Condition *condition) { // Set condition type const Condition::Type type = condition->type(); @@ -221,14 +221,14 @@ public: if (type == EntryTypes[typeIndex].type) break; - QComboBox *combo = static_cast<QComboBox*>(types->widget(((int) condition->field()))); + TQComboBox *combo = static_cast<TQComboBox*>(types->widget(((int) condition->field()))); combo->blockSignals(true); combo->setCurrentItem(typeIndex); combo->blockSignals(false); types->raiseWidget(combo); // Set condition value - combo = static_cast<QComboBox*>(values->child("entryWidgetHandler_Combo")); + combo = static_cast<TQComboBox*>(values->child("entryWidgetHandler_Combo")); combo->blockSignals(true); combo->setCurrentItem(condition->value().toString() == "f" ? 0 : 1); combo->blockSignals(false); @@ -260,9 +260,9 @@ public: { } - QWidget *createTypeWidget(QWidget *parent, const QObject *receiver) const + TQWidget *createTypeWidget(TQWidget *parent, const TQObject *receiver) const { - QComboBox *combo = new QComboBox(parent); + TQComboBox *combo = new TQComboBox(parent); for (int i = 0; i < SizeTypeCount; i++) { combo->insertItem(i18n(SizeTypes[i].name)); @@ -271,40 +271,40 @@ public: combo->adjustSize(); // Connect the signal - QObject::connect(combo, SIGNAL(activated(int)), receiver, SLOT(slotTypeChanged())); + TQObject::connect(combo, SIGNAL(activated(int)), receiver, SLOT(slotTypeChanged())); return combo; } - Condition::Type getConditionType(QWidget *widget) const + Condition::Type getConditionType(TQWidget *widget) const { - QComboBox *combo = static_cast<QComboBox*>(widget); + TQComboBox *combo = static_cast<TQComboBox*>(widget); return SizeTypes[combo->currentItem()].type; } - void createValueWidgets(QWidgetStack *stack, const QObject *receiver) const + void createValueWidgets(TQWidgetStack *stack, const TQObject *receiver) const { KIntNumInput *numInput = new KIntNumInput(stack, "sizeWidgetHandler_NumInput"); numInput->setMinValue(0); numInput->setSuffix(" " + i18n("bytes")); - QObject::connect(numInput, SIGNAL(valueChanged(int)), receiver, SLOT(slotValueChanged())); + TQObject::connect(numInput, SIGNAL(valueChanged(int)), receiver, SLOT(slotValueChanged())); stack->addWidget(numInput); } - QVariant getConditionValue(QWidgetStack *values) const + TQVariant getConditionValue(TQWidgetStack *values) const { KIntNumInput *numInput = static_cast<KIntNumInput*>(values->child("sizeWidgetHandler_NumInput")); - return QVariant(numInput->value()); + return TQVariant(numInput->value()); } - void update(int field, QWidgetStack *types, QWidgetStack *values) const + void update(int field, TQWidgetStack *types, TQWidgetStack *values) const { types->raiseWidget(field); - values->raiseWidget((QWidget*) values->child("sizeWidgetHandler_NumInput")); + values->raiseWidget((TQWidget*) values->child("sizeWidgetHandler_NumInput")); } - void setCondition(QWidgetStack *types, QWidgetStack *values, const Condition *condition) + void setCondition(TQWidgetStack *types, TQWidgetStack *values, const Condition *condition) { // Set condition type const Condition::Type type = condition->type(); @@ -314,7 +314,7 @@ public: if (type == SizeTypes[typeIndex].type) break; - QComboBox *combo = static_cast<QComboBox*>(types->widget(((int) condition->field()))); + TQComboBox *combo = static_cast<TQComboBox*>(types->widget(((int) condition->field()))); combo->blockSignals(true); combo->setCurrentItem(typeIndex); combo->blockSignals(false); @@ -339,21 +339,21 @@ public: { } - virtual QWidget *createWidget(QWidget *parent, const QObject *receiver) const + virtual TQWidget *createWidget(TQWidget *parent, const TQObject *receiver) const { Q_UNUSED(receiver); - return new QWidget(parent); + return new TQWidget(parent); } - QVariant getActionValue(QWidget *widget) const + TQVariant getActionValue(TQWidget *widget) const { Q_UNUSED(widget); - return QVariant(QString()); + return TQVariant(TQString()); } - void setAction(QWidgetStack *stack, const Action *action) const + void setAction(TQWidgetStack *stack, const Action *action) const { stack->raiseWidget((int) action->type()); } @@ -367,11 +367,11 @@ public: { } - QWidget *createWidget(QWidget *parent, const QObject *receiver) const + TQWidget *createWidget(TQWidget *parent, const TQObject *receiver) const { Q_UNUSED(receiver); - return new QLabel(i18n("Please select an action."), parent); + return new TQLabel(i18n("Please select an action."), parent); } }; @@ -383,22 +383,22 @@ public: { } - QWidget *createWidget(QWidget *parent, const QObject *receiver) const + TQWidget *createWidget(TQWidget *parent, const TQObject *receiver) const { KIntNumInput *numInput = new KIntNumInput(parent); numInput->setPrefix(i18n("Priority:") + " "); - QObject::connect(numInput, SIGNAL(valueChanged(int)), receiver, SLOT(slotValueChanged())); + TQObject::connect(numInput, SIGNAL(valueChanged(int)), receiver, SLOT(slotValueChanged())); return numInput; } - QVariant getActionValue(QWidget *widget) const + TQVariant getActionValue(TQWidget *widget) const { KIntNumInput *numInput = static_cast<KIntNumInput*>(widget); - return QVariant(numInput->value()); + return TQVariant(numInput->value()); } - void setAction(QWidgetStack *stack, const Action *action) const + void setAction(TQWidgetStack *stack, const Action *action) const { stack->raiseWidget((int) action->type()); KIntNumInput *numInput = static_cast<KIntNumInput*>(stack->visibleWidget()); @@ -414,21 +414,21 @@ public: { } - QWidget *createWidget(QWidget *parent, const QObject *receiver) const + TQWidget *createWidget(TQWidget *parent, const TQObject *receiver) const { KColorButton *colorButton = new KColorButton(parent); - QObject::connect(colorButton, SIGNAL(changed(const QColor&)), receiver, SLOT(slotValueChanged())); + TQObject::connect(colorButton, SIGNAL(changed(const TQColor&)), receiver, SLOT(slotValueChanged())); return colorButton; } - QVariant getActionValue(QWidget *widget) const + TQVariant getActionValue(TQWidget *widget) const { KColorButton *colorButton = static_cast<KColorButton*>(widget); - return QVariant(colorButton->color()); + return TQVariant(colorButton->color()); } - void setAction(QWidgetStack *stack, const Action *action) const + void setAction(TQWidgetStack *stack, const Action *action) const { stack->raiseWidget((int) action->type()); KColorButton *colorButton = static_cast<KColorButton*>(stack->visibleWidget()); @@ -480,7 +480,7 @@ void WidgetHandlerManager::registerActionHandler(Action::Type type, ActionWidget m_actionHandlers[type] = handler; } -void WidgetHandlerManager::createConditionWidgets(QWidgetStack *types, QWidgetStack *values, const QObject *receiver) +void WidgetHandlerManager::createConditionWidgets(TQWidgetStack *types, TQWidgetStack *values, const TQObject *receiver) { ConditionHandlerMap::ConstIterator le = m_conditionHandlers.end(); for (ConditionHandlerMap::ConstIterator i = m_conditionHandlers.begin(); i != le; ++i) { @@ -492,7 +492,7 @@ void WidgetHandlerManager::createConditionWidgets(QWidgetStack *types, QWidgetSt } } -void WidgetHandlerManager::createActionWidgets(QWidgetStack *stack, const QObject *receiver) +void WidgetHandlerManager::createActionWidgets(TQWidgetStack *stack, const TQObject *receiver) { ActionHandlerMap::ConstIterator le = m_actionHandlers.end(); for (ActionHandlerMap::ConstIterator i = m_actionHandlers.begin(); i != le; ++i) { @@ -503,34 +503,34 @@ void WidgetHandlerManager::createActionWidgets(QWidgetStack *stack, const QObjec } } -void WidgetHandlerManager::update(Field field, QWidgetStack *types, QWidgetStack *values) +void WidgetHandlerManager::update(Field field, TQWidgetStack *types, TQWidgetStack *values) { m_conditionHandlers[field]->update((int) field, types, values); } -void WidgetHandlerManager::setCondition(QWidgetStack *types, QWidgetStack *values, const Condition *condition) +void WidgetHandlerManager::setCondition(TQWidgetStack *types, TQWidgetStack *values, const Condition *condition) { m_conditionHandlers[condition->field()]->setCondition(types, values, condition); } -Condition::Type WidgetHandlerManager::getConditionType(Field field, QWidgetStack *types) +Condition::Type WidgetHandlerManager::getConditionType(Field field, TQWidgetStack *types) { return m_conditionHandlers[field]->getConditionType(types->widget((int) field)); } -QVariant WidgetHandlerManager::getConditionValue(Field field, QWidgetStack *values) +TQVariant WidgetHandlerManager::getConditionValue(Field field, TQWidgetStack *values) { return m_conditionHandlers[field]->getConditionValue(values); } -void WidgetHandlerManager::setAction(QWidgetStack *stack, const Action *action) +void WidgetHandlerManager::setAction(TQWidgetStack *stack, const Action *action) { m_actionHandlers[action->type()]->setAction(stack, action); } -QVariant WidgetHandlerManager::getActionValue(QWidgetStack *stack) +TQVariant WidgetHandlerManager::getActionValue(TQWidgetStack *stack) { - QWidget *widget = stack->visibleWidget(); + TQWidget *widget = stack->visibleWidget(); return m_actionHandlers[(Action::Type) stack->id(widget)]->getActionValue(widget); } diff --git a/kftpgrabber/src/misc/filterwidgethandler.h b/kftpgrabber/src/misc/filterwidgethandler.h index 5ea6376..5b3d41e 100644 --- a/kftpgrabber/src/misc/filterwidgethandler.h +++ b/kftpgrabber/src/misc/filterwidgethandler.h @@ -38,9 +38,9 @@ #include "filter.h" -#include <qmap.h> -#include <qwidget.h> -#include <qwidgetstack.h> +#include <ntqmap.h> +#include <ntqwidget.h> +#include <ntqwidgetstack.h> namespace KFTPCore { @@ -62,9 +62,9 @@ public: * * @param parent Widget to be used as parent for the newly created widget * @param receiver Object that receives type change notifications - * @return A valid QWidget instance + * @return A valid TQWidget instance */ - virtual QWidget *createTypeWidget(QWidget *parent, const QObject *receiver) const = 0; + virtual TQWidget *createTypeWidget(TQWidget *parent, const TQObject *receiver) const = 0; /** * This method has to create one or several input widgets for different @@ -76,7 +76,7 @@ public: * @param stack Value widget stack * @param receiver Object that receives value change notifications */ - virtual void createValueWidgets(QWidgetStack *stack, const QObject *receiver) const = 0; + virtual void createValueWidgets(TQWidgetStack *stack, const TQObject *receiver) const = 0; /** * Update the status of all widgets. @@ -85,7 +85,7 @@ public: * @param types Type widget stack to use * @param values Value widget stack to use */ - virtual void update(int field, QWidgetStack *types, QWidgetStack *values) const = 0; + virtual void update(int field, TQWidgetStack *types, TQWidgetStack *values) const = 0; /** * Extract data from internal condition representation and show it to the @@ -95,7 +95,7 @@ public: * @param values Value widget stack to use * @param condition The condition representation */ - virtual void setCondition(QWidgetStack *types, QWidgetStack *values, const Condition *condition) = 0; + virtual void setCondition(TQWidgetStack *types, TQWidgetStack *values, const Condition *condition) = 0; /** * This method should return the currently selected condition type. @@ -103,7 +103,7 @@ public: * @param widget The type widget previously created * @return A valid Condition::Type */ - virtual Condition::Type getConditionType(QWidget *widget) const = 0; + virtual Condition::Type getConditionType(TQWidget *widget) const = 0; /** * This method should return the current condition value. @@ -111,7 +111,7 @@ public: * @param values Value widget stack to use * @return A valid condition value */ - virtual QVariant getConditionValue(QWidgetStack *values) const = 0; + virtual TQVariant getConditionValue(TQWidgetStack *values) const = 0; }; /** @@ -130,9 +130,9 @@ public: * * @param parent Widget to be used as parent for the newly created widget * @param receiver Object that receives type change notifications - * @return A valid QWidget instance + * @return A valid TQWidget instance */ - virtual QWidget *createWidget(QWidget *parent, const QObject *receiver) const = 0; + virtual TQWidget *createWidget(TQWidget *parent, const TQObject *receiver) const = 0; /** * Extract data from internal action representation and show it to the @@ -141,7 +141,7 @@ public: * @param stack Value widget stack to use * @param action The action representation */ - virtual void setAction(QWidgetStack *stack, const Action *action) const = 0; + virtual void setAction(TQWidgetStack *stack, const Action *action) const = 0; /** * This method should return the current action value. @@ -149,7 +149,7 @@ public: * @param values Value widget stack to use * @return A valid action value */ - virtual QVariant getActionValue(QWidget *widget) const = 0; + virtual TQVariant getActionValue(TQWidget *widget) const = 0; }; /** @@ -178,7 +178,7 @@ public: * @param value Value widget stack to use * @param receiver Object that receives change notifications */ - void createConditionWidgets(QWidgetStack *types, QWidgetStack *values, const QObject *receiver); + void createConditionWidgets(TQWidgetStack *types, TQWidgetStack *values, const TQObject *receiver); /** * Create widgets for all currently registred action handlers. @@ -186,7 +186,7 @@ public: * @param stack Value widget stack to use * @param receiver Object that receives change notifications */ - void createActionWidgets(QWidgetStack *stack, const QObject *receiver); + void createActionWidgets(TQWidgetStack *stack, const TQObject *receiver); /** * Update the specified condition widget handler. @@ -195,7 +195,7 @@ public: * @param types Type widget stack to use * @param values Value widget stack to use */ - void update(Field field, QWidgetStack *types, QWidgetStack *values); + void update(Field field, TQWidgetStack *types, TQWidgetStack *values); /** * Extract data from internal condition representation and show it to the @@ -205,7 +205,7 @@ public: * @param values Value widget stack to use * @param condition The condition representation */ - void setCondition(QWidgetStack *types, QWidgetStack *values, const Condition *condition); + void setCondition(TQWidgetStack *types, TQWidgetStack *values, const Condition *condition); /** * Get the currently selected condition type. @@ -214,7 +214,7 @@ public: * @param types Type widget stack to use * @return A valid Condition::Type */ - Condition::Type getConditionType(Field field, QWidgetStack *types); + Condition::Type getConditionType(Field field, TQWidgetStack *types); /** * Get the current condition value. @@ -223,7 +223,7 @@ public: * @param values Value widget stack to use * @return A valid condition value */ - QVariant getConditionValue(Field field, QWidgetStack *values); + TQVariant getConditionValue(Field field, TQWidgetStack *values); /** * Extract data from internal action representation and show it to the @@ -232,7 +232,7 @@ public: * @param stack Value widget stack to use * @param action The action representation */ - void setAction(QWidgetStack *stack, const Action *action); + void setAction(TQWidgetStack *stack, const Action *action); /** * Get the current action value. @@ -240,7 +240,7 @@ public: * @param stack Value widget stack to use * @return A valid action value */ - QVariant getActionValue(QWidgetStack *stack); + TQVariant getActionValue(TQWidgetStack *stack); /** * Register a new condition handler with the manager. @@ -265,10 +265,10 @@ protected: private: static WidgetHandlerManager *m_self; - typedef QMap<Field, ConditionWidgetHandler*> ConditionHandlerMap; + typedef TQMap<Field, ConditionWidgetHandler*> ConditionHandlerMap; ConditionHandlerMap m_conditionHandlers; - typedef QMap<Action::Type, ActionWidgetHandler*> ActionHandlerMap; + typedef TQMap<Action::Type, ActionWidgetHandler*> ActionHandlerMap; ActionHandlerMap m_actionHandlers; }; diff --git a/kftpgrabber/src/misc/interfaces/Makefile.am b/kftpgrabber/src/misc/interfaces/Makefile.am index 8d88141..461e48c 100644 --- a/kftpgrabber/src/misc/interfaces/Makefile.am +++ b/kftpgrabber/src/misc/interfaces/Makefile.am @@ -7,7 +7,7 @@ METASOURCES = AUTO lib_LTLIBRARIES = libkftpinterfaces.la libkftpinterfaces_la_SOURCES = kftpbookmarkimportplugin.cpp libkftpinterfaces_la_LDFLAGS = $(all_libraries) -version-info 0:0:0 -no-undefined -libkftpinterfaces_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) +libkftpinterfaces_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) kftpgrabberincludedir = $(includedir)/kftpgrabber kftpgrabberinclude_HEADERS = kftpbookmarkimportplugin.h diff --git a/kftpgrabber/src/misc/interfaces/kftpbookmarkimportplugin.cpp b/kftpgrabber/src/misc/interfaces/kftpbookmarkimportplugin.cpp index 49a7322..01b6c69 100644 --- a/kftpgrabber/src/misc/interfaces/kftpbookmarkimportplugin.cpp +++ b/kftpgrabber/src/misc/interfaces/kftpbookmarkimportplugin.cpp @@ -35,9 +35,9 @@ #include "kftpbookmarkimportplugin.h" -#include <qdir.h> +#include <ntqdir.h> -KFTPBookmarkImportPlugin::KFTPBookmarkImportPlugin(QObject *parent, const char *name) +KFTPBookmarkImportPlugin::KFTPBookmarkImportPlugin(TQObject *parent, const char *name) : KParts::Plugin(parent, name) { } @@ -47,9 +47,9 @@ KFTPBookmarkImportPlugin::~KFTPBookmarkImportPlugin() { } -QString KFTPBookmarkImportPlugin::userPath(const QString &path) +TQString KFTPBookmarkImportPlugin::userPath(const TQString &path) { - return QDir::homeDirPath() + "/" + path; + return TQDir::homeDirPath() + "/" + path; } #include "kftpbookmarkimportplugin.moc" diff --git a/kftpgrabber/src/misc/interfaces/kftpbookmarkimportplugin.desktop b/kftpgrabber/src/misc/interfaces/kftpbookmarkimportplugin.desktop index 48d124e..c92b938 100644 --- a/kftpgrabber/src/misc/interfaces/kftpbookmarkimportplugin.desktop +++ b/kftpgrabber/src/misc/interfaces/kftpbookmarkimportplugin.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=ServiceType -X-KDE-ServiceType=KFTPGrabber/BookmarkImportPlugin +X-TDE-ServiceType=KFTPGrabber/BookmarkImportPlugin Comment=A KFTPGrabber plugin for importing bookmarks Comment[ar]=قابس KFTPGrabber لإستيراد علامات المواقع Comment[bg]=Приставка за импортиране на отметки в KFTPGrabber diff --git a/kftpgrabber/src/misc/interfaces/kftpbookmarkimportplugin.h b/kftpgrabber/src/misc/interfaces/kftpbookmarkimportplugin.h index e82a718..5f42ccf 100644 --- a/kftpgrabber/src/misc/interfaces/kftpbookmarkimportplugin.h +++ b/kftpgrabber/src/misc/interfaces/kftpbookmarkimportplugin.h @@ -36,7 +36,7 @@ #ifndef KFTPBOOKMARKIMPORTPLUGIN_H #define KFTPBOOKMARKIMPORTPLUGIN_H -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> /** * This class is the base class for all bookmark import plugins. @@ -46,23 +46,23 @@ class KFTPBookmarkImportPlugin : public KParts::Plugin { Q_OBJECT public: - KFTPBookmarkImportPlugin(QObject *parent, const char *name = 0); + KFTPBookmarkImportPlugin(TQObject *parent, const char *name = 0); virtual ~KFTPBookmarkImportPlugin(); /** * This method should return the properly formated XML for KFTPGrabber * bookmarks that is generated from the import. * - * @return The @ref QDomDocument representation of XML + * @return The @ref TQDomDocument representation of XML */ - virtual QDomDocument getImportedXml() = 0; + virtual TQDomDocument getImportedXml() = 0; /** * This method should start the import procedure. * * @param fileName is the path to the file that will be imported */ - virtual void import(const QString &fileName) = 0; + virtual void import(const TQString &fileName) = 0; /** * This method should return the default path where the bookmarks could @@ -70,9 +70,9 @@ public: * * @return The default path where bookmarks are located */ - virtual QString getDefaultPath() = 0; + virtual TQString getDefaultPath() = 0; protected: - QString userPath(const QString &path); + TQString userPath(const TQString &path); signals: /** * Progress of bookmark importing (in percent). diff --git a/kftpgrabber/src/misc/kftpapi.h b/kftpgrabber/src/misc/kftpapi.h index 3a77ab4..0c2768b 100644 --- a/kftpgrabber/src/misc/kftpapi.h +++ b/kftpgrabber/src/misc/kftpapi.h @@ -37,7 +37,7 @@ #define KFTPAPI_H #include <config.h> -#include <qobject.h> +#include <ntqobject.h> #include "mainwindow.h" @@ -48,7 +48,7 @@ class KFTPZeroConf; /** @author Jernej Kos */ -class KFTPAPI : public QObject +class KFTPAPI : public TQObject { Q_OBJECT friend class MainWindow; diff --git a/kftpgrabber/src/misc/kftpgrabber.kcfg b/kftpgrabber/src/misc/kftpgrabber.kcfg index b7ee305..0a3c0ad 100644 --- a/kftpgrabber/src/misc/kftpgrabber.kcfg +++ b/kftpgrabber/src/misc/kftpgrabber.kcfg @@ -4,19 +4,19 @@ <kcfgfile name="kftpgrabberrc"/> <!-- Includes --> - <include>qsize.h</include> - <include>qpoint.h</include> - <include>qdir.h</include> + <include>ntqsize.h</include> + <include>ntqpoint.h</include> + <include>ntqdir.h</include> <include>configbase.h</include> <!-- Config groups --> <group name="MainWindow"> <entry name="size" type="Size"> - <default code="true">QSize(800, 500)</default> + <default code="true">TQSize(800, 500)</default> <label>The size of the main window.</label> </entry> <entry name="position" type="Point"> - <default code="true">QPoint(0, 0)</default> + <default code="true">TQPoint(0, 0)</default> <label>The position of the main window on the screen.</label> </entry> </group> @@ -60,7 +60,7 @@ </entry> <entry name="defLocalDir" type="Path"> - <default code="true">QDir::homeDirPath()</default> + <default code="true">TQDir::homeDirPath()</default> <label>Default local directory.</label> </entry> @@ -133,31 +133,31 @@ <group name="Log"> <entry name="logFont" type="Font"> <label>The font that should be used for the log widget.</label> - <default code="true">KGlobalSettings::generalFont()</default> + <default code="true">TDEGlobalSettings::generalFont()</default> </entry> <entry name="logCommandsColor" type="Color"> - <default code="true">QColor(67, 170, 23)</default> + <default code="true">TQColor(67, 170, 23)</default> <label>The color of the commands sent to the server.</label> </entry> <entry name="logResponsesColor" type="Color"> - <default code="true">QColor(0, 0, 255)</default> + <default code="true">TQColor(0, 0, 255)</default> <label>The color of the responses from the server.</label> </entry> <entry name="logMultilineColor" type="Color"> - <default code="true">QColor(148, 188, 22)</default> + <default code="true">TQColor(148, 188, 22)</default> <label>The color of the multiline responses from the server.</label> </entry> <entry name="logErrorColor" type="Color"> - <default code="true">QColor(255, 0, 0)</default> + <default code="true">TQColor(255, 0, 0)</default> <label>The color of the error messages.</label> </entry> <entry name="logStatusColor" type="Color"> - <default code="true">QColor(0, 0, 0)</default> + <default code="true">TQColor(0, 0, 0)</default> <label>The color of the status messages.</label> </entry> diff --git a/kftpgrabber/src/misc/kftpotpgenerator.cpp b/kftpgrabber/src/misc/kftpotpgenerator.cpp index ea6bb73..1768830 100644 --- a/kftpgrabber/src/misc/kftpotpgenerator.cpp +++ b/kftpgrabber/src/misc/kftpotpgenerator.cpp @@ -44,13 +44,13 @@ #include <openssl/ripemd.h> #include <openssl/sha.h> -KFTPOTPGenerator::KFTPOTPGenerator(const QString &challenge, const QString &password) +KFTPOTPGenerator::KFTPOTPGenerator(const TQString &challenge, const TQString &password) { m_password = password; /* Parse the string and set the alg */ //otp-md5 498 gr4542 - QString alg = challenge.section(' ', 0, 0); + TQString alg = challenge.section(' ', 0, 0); if (alg == "otp-md4" || alg == "s/key") m_alg = ALG_MD4; else if (alg == "otp-md5") @@ -75,19 +75,19 @@ void KFTPOTPGenerator::genDigest(char *msg, unsigned int len) case ALG_RMD160: genDigestRS(0, msg, len); break; case ALG_SHA1: genDigestRS(1, msg, len); break; default: { - qDebug("[OTP] Unknown algorythm!"); + tqDebug("[OTP] Unknown algorythm!"); } } } -QString KFTPOTPGenerator::generateOTP() +TQString KFTPOTPGenerator::generateOTP() { if (m_alg == ALG_NONE) - return QString::null; + return TQString::null; unsigned char results[9]; char *tmp = (char*) malloc(m_seed.length() + m_password.length()); - strcpy(tmp, QString(m_seed + m_password).ascii()); + strcpy(tmp, TQString(m_seed + m_password).ascii()); genDigest(tmp, strlen(tmp)); memcpy(results, tmp, 8); @@ -101,7 +101,7 @@ QString KFTPOTPGenerator::generateOTP() char *response = (char*) malloc(31); sixWords(results, response); - return QString(response); + return TQString(response); } void KFTPOTPGenerator::genDigestMD(int type, char *msg, unsigned int len) @@ -226,7 +226,7 @@ unsigned char *KFTPOTPGenerator::sixWords(unsigned char *msg, char *response) "PAP", "PAR", "PAT", "PAW", "PAY", "PEA", "PEG", "PEN", "PEP", "PER", "PET", "PEW", "PHI", "PI", "PIE", "PIN", "PIT", "PLY", "PO", "POD", "POE", "POP", "POT", "POW", - "PRO", "PRY", "PUB", "PUG", "PUN", "PUP", "PUT", "QUO", + "PRO", "PRY", "PUB", "PUG", "PUN", "PUP", "PUT", "TQUO", "RAG", "RAM", "RAN", "RAP", "RAT", "RAW", "RAY", "REB", "RED", "REP", "RET", "RIB", "RID", "RIG", "RIM", "RIO", "RIP", "ROB", "ROD", "ROE", "RON", "ROT", "ROW", "ROY", @@ -394,7 +394,7 @@ unsigned char *KFTPOTPGenerator::sixWords(unsigned char *msg, char *response) "OLAF", "OLDY", "OLGA", "OLIN", "OMAN", "OMEN", "OMIT", "ONCE", "ONES", "ONLY", "ONTO", "ONUS", "ORAL", "ORGY", "OSLO", "OTIS", "OTTO", "OUCH", "OUST", "OUTS", "OVAL", - "OVEN", "OVER", "OWLY", "OWNS", "QUAD", "QUIT", "QUOD", + "OVEN", "OVER", "OWLY", "OWNS", "TQUAD", "QUIT", "TQUOD", "RACE", "RACK", "RACY", "RAFT", "RAGE", "RAID", "RAIL", "RAIN", "RAKE", "RANK", "RANT", "RARE", "RASH", "RATE", "RAVE", "RAYS", "READ", "REAL", "REAM", "REAR", "RECK", diff --git a/kftpgrabber/src/misc/kftpotpgenerator.h b/kftpgrabber/src/misc/kftpotpgenerator.h index 5292ead..ebccb5f 100644 --- a/kftpgrabber/src/misc/kftpotpgenerator.h +++ b/kftpgrabber/src/misc/kftpotpgenerator.h @@ -36,7 +36,7 @@ #ifndef KFTPOTPGENERATOR_H #define KFTPOTPGENERATOR_H -#include <qstring.h> +#include <ntqstring.h> enum AlgType { ALG_MD4, @@ -56,11 +56,11 @@ enum AlgType { */ class KFTPOTPGenerator{ public: - KFTPOTPGenerator(const QString &challenge, const QString &password); - QString generateOTP(); + KFTPOTPGenerator(const TQString &challenge, const TQString &password); + TQString generateOTP(); private: - QString m_seed; - QString m_password; + TQString m_seed; + TQString m_password; AlgType m_alg; int m_seq; diff --git a/kftpgrabber/src/misc/kftppluginmanager.cpp b/kftpgrabber/src/misc/kftppluginmanager.cpp index fc9dbb0..60c15f2 100644 --- a/kftpgrabber/src/misc/kftppluginmanager.cpp +++ b/kftpgrabber/src/misc/kftppluginmanager.cpp @@ -46,8 +46,8 @@ KFTPPluginManager *KFTPPluginManager::getInstance() return m_instance; } -KFTPPluginManager::KFTPPluginManager(QObject *parent, const char *name) - : QObject(parent, name) +KFTPPluginManager::KFTPPluginManager(TQObject *parent, const char *name) + : TQObject(parent, name) { } @@ -55,19 +55,19 @@ void KFTPPluginManager::loadPlugins() { } -KTrader::OfferList KFTPPluginManager::getImportPlugins() +TDETrader::OfferList KFTPPluginManager::getImportPlugins() { - return KTrader::self()->query("KFTPGrabber/BookmarkImportPlugin"); + return TDETrader::self()->query("KFTPGrabber/BookmarkImportPlugin"); } KFTPBookmarkImportPlugin *KFTPPluginManager::loadImportPlugin(KService::Ptr service) { int errCode = 0; - KFTPBookmarkImportPlugin *plugin = KParts::ComponentFactory::createInstanceFromService<KFTPBookmarkImportPlugin>(service, this, 0, QStringList(), &errCode); + KFTPBookmarkImportPlugin *plugin = KParts::ComponentFactory::createInstanceFromService<KFTPBookmarkImportPlugin>(service, this, 0, TQStringList(), &errCode); if (plugin) { - qDebug("[PLUGIN MANAGER] Loaded '%s' plugin for bookmark import.", service->name().ascii()); + tqDebug("[PLUGIN MANAGER] Loaded '%s' plugin for bookmark import.", service->name().ascii()); } return plugin; diff --git a/kftpgrabber/src/misc/kftppluginmanager.h b/kftpgrabber/src/misc/kftppluginmanager.h index b377a62..c411580 100644 --- a/kftpgrabber/src/misc/kftppluginmanager.h +++ b/kftpgrabber/src/misc/kftppluginmanager.h @@ -36,10 +36,10 @@ #ifndef KFTPPLUGINMANAGER_H #define KFTPPLUGINMANAGER_H -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> -#include <qobject.h> -#include <qptrlist.h> +#include <ntqobject.h> +#include <ntqptrlist.h> class KFTPBookmarkImportPlugin; @@ -49,11 +49,11 @@ class KFTPBookmarkImportPlugin; * * @author Jernej Kos */ -class KFTPPluginManager : public QObject +class KFTPPluginManager : public TQObject { Q_OBJECT public: - KFTPPluginManager(QObject *parent = 0, const char *name = 0); + KFTPPluginManager(TQObject *parent = 0, const char *name = 0); static KFTPPluginManager *getInstance(); /** @@ -74,7 +74,7 @@ public: * * @return List of all laoded import plugins */ - KTrader::OfferList getImportPlugins(); + TDETrader::OfferList getImportPlugins(); private: static KFTPPluginManager *m_instance; }; diff --git a/kftpgrabber/src/misc/kftpwalletconnection.cpp b/kftpgrabber/src/misc/kftpwalletconnection.cpp index 242b00d..ca91a54 100644 --- a/kftpgrabber/src/misc/kftpwalletconnection.cpp +++ b/kftpgrabber/src/misc/kftpwalletconnection.cpp @@ -48,7 +48,7 @@ KFTPWalletConnection *KFTPWalletConnection::getInstance() } KFTPWalletConnection::KFTPWalletConnection() - : QObject() + : TQObject() { m_wallet = 0L; m_walletRefCount = 0; @@ -70,9 +70,9 @@ void KFTPWalletConnection::slotWalletClosed() } } -QValueList<KURL> KFTPWalletConnection::getSiteList() +TQValueList<KURL> KFTPWalletConnection::getSiteList() { - QValueList<KURL> sites; + TQValueList<KURL> sites; if (!KWallet::Wallet::folderDoesNotExist(KWallet::Wallet::NetworkWallet(), KWallet::Wallet::PasswordFolder())) { if (!m_wallet) { @@ -85,19 +85,19 @@ QValueList<KURL> KFTPWalletConnection::getSiteList() } if (!m_wallet) - return QValueList<KURL>(); + return TQValueList<KURL>(); // Get the site list from our wallet m_wallet->setFolder(KWallet::Wallet::PasswordFolder()); - QStringList list = m_wallet->entryList(); - QStringList::iterator i; + TQStringList list = m_wallet->entryList(); + TQStringList::iterator i; for (i = list.begin(); i != list.end(); ++i) { - QMap<QString, QString> map; + TQMap<TQString, TQString> map; if ((*i).startsWith("ftp-") && m_wallet->readMap(*i, map) == 0) { - QString name = *i; + TQString name = *i; name.replace("ftp-", "ftp://"); KURL siteUrl(name); @@ -116,9 +116,9 @@ QValueList<KURL> KFTPWalletConnection::getSiteList() return sites; } -QString KFTPWalletConnection::getPassword(const QString &whatFor) +TQString KFTPWalletConnection::getPassword(const TQString &whatFor) { - if (!KWallet::Wallet::folderDoesNotExist(KWallet::Wallet::NetworkWallet(), QString::fromLatin1("KFTPGrabber"))) { + if (!KWallet::Wallet::folderDoesNotExist(KWallet::Wallet::NetworkWallet(), TQString::fromLatin1("KFTPGrabber"))) { // We have our own folder if (!m_wallet) { m_wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), 0, KWallet::Wallet::Synchronous); @@ -130,16 +130,16 @@ QString KFTPWalletConnection::getPassword(const QString &whatFor) } // Try to read the password from the wallet - QString pass; - if (m_wallet && m_wallet->setFolder(QString::fromLatin1("KFTPGrabber")) && m_wallet->readPassword(whatFor, pass) == 0) { + TQString pass; + if (m_wallet && m_wallet->setFolder(TQString::fromLatin1("KFTPGrabber")) && m_wallet->readPassword(whatFor, pass) == 0) { return pass; } } - return QString::null; + return TQString::null; } -void KFTPWalletConnection::setPassword(const QString &whatFor, const QString &password) +void KFTPWalletConnection::setPassword(const TQString &whatFor, const TQString &password) { if (KWallet::Wallet::isEnabled()) { if (!m_wallet) { @@ -153,11 +153,11 @@ void KFTPWalletConnection::setPassword(const QString &whatFor, const QString &pa if (m_wallet) { // Create our folder - if (!m_wallet->hasFolder(QString::fromLatin1("KFTPGrabber"))) { - m_wallet->createFolder(QString::fromLatin1("KFTPGrabber")); + if (!m_wallet->hasFolder(TQString::fromLatin1("KFTPGrabber"))) { + m_wallet->createFolder(TQString::fromLatin1("KFTPGrabber")); } - m_wallet->setFolder(QString::fromLatin1("KFTPGrabber")); + m_wallet->setFolder(TQString::fromLatin1("KFTPGrabber")); m_wallet->writePassword(whatFor, password); } } diff --git a/kftpgrabber/src/misc/kftpwalletconnection.h b/kftpgrabber/src/misc/kftpwalletconnection.h index 782d0d3..34e5a4f 100644 --- a/kftpgrabber/src/misc/kftpwalletconnection.h +++ b/kftpgrabber/src/misc/kftpwalletconnection.h @@ -36,25 +36,25 @@ #ifndef KFTPWALLETCONNECTION_H #define KFTPWALLETCONNECTION_H -#include <kwallet.h> -#include <qobject.h> +#include <tdewallet.h> +#include <ntqobject.h> /** Enables communication of KFTPGrabber with KDE's wallet system (KWallet) @author Jernej Kos */ -class KFTPWalletConnection : public QObject +class KFTPWalletConnection : public TQObject { Q_OBJECT public: KFTPWalletConnection(); ~KFTPWalletConnection(); - QValueList<KURL> getSiteList(); + TQValueList<KURL> getSiteList(); - QString getPassword(const QString &whatFor); - void setPassword(const QString &whatFor, const QString &password); + TQString getPassword(const TQString &whatFor); + void setPassword(const TQString &whatFor, const TQString &password); static KFTPWalletConnection *getInstance(); private: diff --git a/kftpgrabber/src/misc/kftpzeroconf.cpp b/kftpgrabber/src/misc/kftpzeroconf.cpp index 39d1f63..d49f5d6 100644 --- a/kftpgrabber/src/misc/kftpzeroconf.cpp +++ b/kftpgrabber/src/misc/kftpzeroconf.cpp @@ -35,8 +35,8 @@ */ #include "kftpzeroconf.h" -KFTPZeroConf::KFTPZeroConf(QObject *parent, const char *name) - : QObject(parent, name) +KFTPZeroConf::KFTPZeroConf(TQObject *parent, const char *name) + : TQObject(parent, name) { #if KDE_IS_VERSION(3,4,0) m_browser = new DNSSD::ServiceBrowser("_ftp._tcp", 0, true); @@ -53,7 +53,7 @@ KFTPZeroConf::~KFTPZeroConf() } #if KDE_IS_VERSION(3,4,0) -const QValueList<DNSSD::RemoteService::Ptr> &KFTPZeroConf::getServiceList() const +const TQValueList<DNSSD::RemoteService::Ptr> &KFTPZeroConf::getServiceList() const { return m_browser->services(); } diff --git a/kftpgrabber/src/misc/kftpzeroconf.h b/kftpgrabber/src/misc/kftpzeroconf.h index 68c9ca2..36ad946 100644 --- a/kftpgrabber/src/misc/kftpzeroconf.h +++ b/kftpgrabber/src/misc/kftpzeroconf.h @@ -36,9 +36,9 @@ #ifndef KFTPZEROCONF_H #define KFTPZEROCONF_H -#include <qobject.h> +#include <ntqobject.h> -#include <kdeversion.h> +#include <tdeversion.h> #if KDE_IS_VERSION(3,4,0) #include <dnssd/servicebrowser.h> @@ -49,15 +49,15 @@ * * @author Jernej Kos */ -class KFTPZeroConf : public QObject +class KFTPZeroConf : public TQObject { Q_OBJECT public: - KFTPZeroConf(QObject *parent = 0, const char *name = 0); + KFTPZeroConf(TQObject *parent = 0, const char *name = 0); ~KFTPZeroConf(); #if KDE_IS_VERSION(3,4,0) - const QValueList<DNSSD::RemoteService::Ptr> &getServiceList() const; + const TQValueList<DNSSD::RemoteService::Ptr> &getServiceList() const; private: DNSSD::ServiceBrowser *m_browser; #endif diff --git a/kftpgrabber/src/misc/misc.cpp b/kftpgrabber/src/misc/misc.cpp index c4e3bfa..9fafd5f 100644 --- a/kftpgrabber/src/misc/misc.cpp +++ b/kftpgrabber/src/misc/misc.cpp @@ -37,61 +37,61 @@ #include <kurl.h> #include <kmdcodec.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kstandarddirs.h> -#include <kconfig.h> +#include <tdeconfig.h> -#include <qcolor.h> -#include <qpixmapcache.h> +#include <ntqcolor.h> +#include <ntqpixmapcache.h> #include <X11/Xlib.h> namespace KFTPGrabberBase { -QPixmap loadPanelPixmap(const QString &name) +TQPixmap loadPanelPixmap(const TQString &name) { - return KGlobal::iconLoader()->loadIcon(name, KIcon::Panel, 0, true); + return TDEGlobal::iconLoader()->loadIcon(name, TDEIcon::Panel, 0, true); } -QIconSet loadToolbarIcon(const QString &name, int state) +TQIconSet loadToolbarIcon(const TQString &name, int state) { - return KGlobal::iconLoader()->loadIconSet(name, KIcon::Toolbar,0,state); + return TDEGlobal::iconLoader()->loadIconSet(name, TDEIcon::Toolbar,0,state); } -QIconSet loadSmallIcon(const QString &name, int state) +TQIconSet loadSmallIcon(const TQString &name, int state) { - return KGlobal::iconLoader()->loadIconSet(name, KIcon::Small,0,state); + return TDEGlobal::iconLoader()->loadIconSet(name, TDEIcon::Small,0,state); } -QPixmap loadToolbarPixmap(const QString &name) +TQPixmap loadToolbarPixmap(const TQString &name) { - return KGlobal::iconLoader()->loadIcon(name, KIcon::Toolbar,0, true); + return TDEGlobal::iconLoader()->loadIcon(name, TDEIcon::Toolbar,0, true); } -QPixmap loadSmallPixmap(const QString &name) +TQPixmap loadSmallPixmap(const TQString &name) { - return KGlobal::iconLoader()->loadIcon(name, KIcon::Small,0, true); + return TDEGlobal::iconLoader()->loadIcon(name, TDEIcon::Small,0, true); } -QPixmap createColorPixmap(QString color) +TQPixmap createColorPixmap(TQString color) { - QPixmap tmp(28, 12); - tmp.fill(QColor(color)); + TQPixmap tmp(28, 12); + tmp.fill(TQColor(color)); - QPixmap pixmap(32, 16); - pixmap.fill(QColor(0, 0, 0)); + TQPixmap pixmap(32, 16); + pixmap.fill(TQColor(0, 0, 0)); copyBlt(&pixmap, 2, 2, &tmp, 0, 0, 28, 12); return pixmap; } -QString getStoreDir(const QString &filename) +TQString getStoreDir(const TQString &filename) { return locateLocal("appdata", filename); } -QPixmap createProgressPixmap(int progress, int current) +TQPixmap createProgressPixmap(int progress, int current) { if (progress > 100) progress = 100; @@ -99,25 +99,25 @@ QPixmap createProgressPixmap(int progress, int current) if (current > 100) current = 100; - QPixmap pixmap; - QString key = QString("%1:%2").arg(progress).arg(current); + TQPixmap pixmap; + TQString key = TQString("%1:%2").arg(progress).arg(current); - if(!QPixmapCache::find(key, pixmap)) { - QPixmap tmp(100, 16); - tmp.fill(QColor(237, 237, 237)); + if(!TQPixmapCache::find(key, pixmap)) { + TQPixmap tmp(100, 16); + tmp.fill(TQColor(237, 237, 237)); if (progress > 0) { - QPixmap p_pix(progress, 16); - p_pix.fill(QColor(0, 115, 255)); + TQPixmap p_pix(progress, 16); + p_pix.fill(TQColor(0, 115, 255)); - QPixmap c_pix(current, 16); - c_pix.fill(QColor(0, 88, 192)); + TQPixmap c_pix(current, 16); + c_pix.fill(TQColor(0, 88, 192)); copyBlt(&tmp, 0, 0, &p_pix, 0, 0, progress, 16); copyBlt(&tmp, 0, 0, &c_pix, 0, 0, current, 16); } - QPixmapCache::insert(key, tmp); + TQPixmapCache::insert(key, tmp); return tmp; } @@ -130,12 +130,12 @@ bool isModifierKeysPressed(unsigned int mask) Window child; int root_x, root_y, win_x, win_y; unsigned int keybstate; - XQueryPointer(qt_xdisplay(), qt_xrootwin(), &root, &child, &root_x, &root_y, &win_x, &win_y, &keybstate); + XQueryPointer(tqt_xdisplay(), tqt_xrootwin(), &root, &child, &root_x, &root_y, &win_x, &win_y, &keybstate); return keybstate & mask; } -QString appendPath(const QString &path, const QString &what) +TQString appendPath(const TQString &path, const TQString &what) { if (path.right(1) == "/") return path + what; @@ -143,42 +143,42 @@ QString appendPath(const QString &path, const QString &what) return path + "/" + what; } -QString path2Name(const QString &path) +TQString path2Name(const TQString &path) { // Convert full path to filename - return (path == "/") ? QString("/") : path.mid(path.findRev('/')+1); + return (path == "/") ? TQString("/") : path.mid(path.findRev('/')+1); } -QString path2Dir(const QString &path) +TQString path2Dir(const TQString &path) { // Convert full path to path return path.mid(0, path.findRev('/')); } -QString genID() +TQString genID() { return kapp->randomString(5); } -QString encodePassword(const QString& password) +TQString encodePassword(const TQString& password) { return KCodecs::base64Encode(password.ascii(), true).data(); } -QString decodePassword(const QString& password) +TQString decodePassword(const TQString& password) { return KCodecs::base64Decode(password.ascii()).data(); } -KConfig *config(const QString §ion) +TDEConfig *config(const TQString §ion) { - KConfig *conf = kapp->config(); + TDEConfig *conf = kapp->config(); conf->setGroup(section); return conf; } -KURL remoteUrl(const QString &path, KURL url) +KURL remoteUrl(const TQString &path, KURL url) { if (path.isEmpty()) return KURL(); diff --git a/kftpgrabber/src/misc/misc.h b/kftpgrabber/src/misc/misc.h index 654804c..032e10b 100644 --- a/kftpgrabber/src/misc/misc.h +++ b/kftpgrabber/src/misc/misc.h @@ -36,38 +36,38 @@ #ifndef MISC_H #define MISC_H -#include <qiconset.h> -#include <qptrlist.h> +#include <ntqiconset.h> +#include <ntqptrlist.h> #include <kiconloader.h> class KURL; -class KConfig; +class TDEConfig; namespace KFTPGrabberBase { // Icon loading stuff - QPixmap loadPanelPixmap(const QString &name); - QIconSet loadToolbarIcon(const QString &name, int state = 0); - QIconSet loadSmallIcon(const QString &name, int state = 0); - QPixmap loadToolbarPixmap(const QString &name); - QPixmap loadSmallPixmap(const QString &name); + TQPixmap loadPanelPixmap(const TQString &name); + TQIconSet loadToolbarIcon(const TQString &name, int state = 0); + TQIconSet loadSmallIcon(const TQString &name, int state = 0); + TQPixmap loadToolbarPixmap(const TQString &name); + TQPixmap loadSmallPixmap(const TQString &name); // Other stuff - QPixmap createColorPixmap(QString color); - QPixmap createProgressPixmap(int progress, int current = 0); - QString appendPath(const QString &path, const QString &what); - QString path2Name(const QString &path); - QString path2Dir(const QString &path); + TQPixmap createColorPixmap(TQString color); + TQPixmap createProgressPixmap(int progress, int current = 0); + TQString appendPath(const TQString &path, const TQString &what); + TQString path2Name(const TQString &path); + TQString path2Dir(const TQString &path); bool isModifierKeysPressed(unsigned int mask); - QString genID(); - QString getStoreDir(const QString &filename = 0); + TQString genID(); + TQString getStoreDir(const TQString &filename = 0); - KConfig *config(const QString §ion); - KURL remoteUrl(const QString &path, KURL url); + TDEConfig *config(const TQString §ion); + KURL remoteUrl(const TQString &path, KURL url); // For "safer" password storage - QString encodePassword(const QString& password); - QString decodePassword(const QString& password); + TQString encodePassword(const TQString& password); + TQString decodePassword(const TQString& password); } #endif diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/filezilla3/Makefile.am b/kftpgrabber/src/misc/plugins/bookmarkimport/filezilla3/Makefile.am index 737df95..a9c2338 100644 --- a/kftpgrabber/src/misc/plugins/bookmarkimport/filezilla3/Makefile.am +++ b/kftpgrabber/src/misc/plugins/bookmarkimport/filezilla3/Makefile.am @@ -4,7 +4,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = kftpimportplugin_filezilla3.la kftpimportplugin_filezilla3_la_SOURCES = kftpimportfz3plugin.cpp -kftpimportplugin_filezilla3_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) ../../../interfaces/libkftpinterfaces.la +kftpimportplugin_filezilla3_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) ../../../interfaces/libkftpinterfaces.la kftpimportplugin_filezilla3_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) kde_services_DATA = kftpimportplugin_filezilla3.desktop diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/filezilla3/kftpimportfz3plugin.cpp b/kftpgrabber/src/misc/plugins/bookmarkimport/filezilla3/kftpimportfz3plugin.cpp index 0928c79..d52c41f 100644 --- a/kftpgrabber/src/misc/plugins/bookmarkimport/filezilla3/kftpimportfz3plugin.cpp +++ b/kftpgrabber/src/misc/plugins/bookmarkimport/filezilla3/kftpimportfz3plugin.cpp @@ -35,33 +35,33 @@ #include "kftpimportfz3plugin.h" -#include <qdir.h> -#include <qfile.h> +#include <ntqdir.h> +#include <ntqfile.h> #include <kgenericfactory.h> -#include <klocale.h> -#include <kconfig.h> +#include <tdelocale.h> +#include <tdeconfig.h> #include <kmdcodec.h> K_EXPORT_COMPONENT_FACTORY(kftpimportplugin_filezilla3, KGenericFactory<KFTPImportFz3Plugin>("kftpimportplugin_filezilla3")) -KFTPImportFz3Plugin::KFTPImportFz3Plugin(QObject *parent, const char *name, const QStringList&) +KFTPImportFz3Plugin::KFTPImportFz3Plugin(TQObject *parent, const char *name, const TQStringList&) : KFTPBookmarkImportPlugin(parent, name) { - KGlobal::locale()->insertCatalogue("kftpgrabber"); + TDEGlobal::locale()->insertCatalogue("kftpgrabber"); } -QDomDocument KFTPImportFz3Plugin::getImportedXml() +TQDomDocument KFTPImportFz3Plugin::getImportedXml() { return m_domDocument; } -void KFTPImportFz3Plugin::import(const QString &fileName) +void KFTPImportFz3Plugin::import(const TQString &fileName) { - m_domDocument.setContent(QString("<category name=\"%1\"/>").arg(i18n("FileZilla 3 import"))); + m_domDocument.setContent(TQString("<category name=\"%1\"/>").arg(i18n("FileZilla 3 import"))); - QFile file(fileName); + TQFile file(fileName); if (!file.open(IO_ReadOnly)) { emit progress(100); return; @@ -76,9 +76,9 @@ void KFTPImportFz3Plugin::import(const QString &fileName) emit progress(100); } -void KFTPImportFz3Plugin::importCategory(QDomNode parent, const QDomNode &node) +void KFTPImportFz3Plugin::importCategory(TQDomNode parent, const TQDomNode &node) { - QDomNode n = node.firstChild(); + TQDomNode n = node.firstChild(); while (!n.isNull()) { if (!n.isElement()) { @@ -86,31 +86,31 @@ void KFTPImportFz3Plugin::importCategory(QDomNode parent, const QDomNode &node) continue; } - QDomElement e = n.toElement(); + TQDomElement e = n.toElement(); if (e.tagName() == "Folder") { - QDomElement categoryElement = m_domDocument.createElement("category"); + TQDomElement categoryElement = m_domDocument.createElement("category"); categoryElement.setAttribute("name", e.firstChild().nodeValue().stripWhiteSpace()); parent.appendChild(categoryElement); importCategory(categoryElement, n); } else if (e.tagName() == "Server") { - QString name = e.lastChild().nodeValue().stripWhiteSpace(); - QString host = e.namedItem("Host").toElement().text(); - QString port = e.namedItem("Port").toElement().text(); - QString localDir = e.namedItem("LocalDir").toElement().text(); - QString remoteDir = e.namedItem("RemoteDir").toElement().text(); - QString username = e.namedItem("User").toElement().text(); - QString password = e.namedItem("Pass").toElement().text(); + TQString name = e.lastChild().nodeValue().stripWhiteSpace(); + TQString host = e.namedItem("Host").toElement().text(); + TQString port = e.namedItem("Port").toElement().text(); + TQString localDir = e.namedItem("LocalDir").toElement().text(); + TQString remoteDir = e.namedItem("RemoteDir").toElement().text(); + TQString username = e.namedItem("User").toElement().text(); + TQString password = e.namedItem("Pass").toElement().text(); // Set name - QDomElement siteElement = m_domDocument.createElement("server"); + TQDomElement siteElement = m_domDocument.createElement("server"); siteElement.setAttribute("name", name); parent.appendChild(siteElement); // Set host - QDomElement tmpElement = m_domDocument.createElement("host"); - QDomText txtNode = m_domDocument.createTextNode(host); + TQDomElement tmpElement = m_domDocument.createElement("host"); + TQDomText txtNode = m_domDocument.createTextNode(host); tmpElement.appendChild(txtNode); siteElement.appendChild(tmpElement); @@ -158,9 +158,9 @@ void KFTPImportFz3Plugin::importCategory(QDomNode parent, const QDomNode &node) } } -QString KFTPImportFz3Plugin::getDefaultPath() +TQString KFTPImportFz3Plugin::getDefaultPath() { - return QString(".filezilla/sitemanager.xml"); + return TQString(".filezilla/sitemanager.xml"); } #include "kftpimportfz3plugin.moc" diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/filezilla3/kftpimportfz3plugin.h b/kftpgrabber/src/misc/plugins/bookmarkimport/filezilla3/kftpimportfz3plugin.h index c340ef5..210430b 100644 --- a/kftpgrabber/src/misc/plugins/bookmarkimport/filezilla3/kftpimportfz3plugin.h +++ b/kftpgrabber/src/misc/plugins/bookmarkimport/filezilla3/kftpimportfz3plugin.h @@ -36,7 +36,7 @@ #ifndef KFTPIMPORTFZ3PLUGIN_H #define KFTPIMPORTFZ3PLUGIN_H -#include <qdom.h> +#include <ntqdom.h> #include <kftpbookmarkimportplugin.h> /** @@ -48,22 +48,22 @@ class KFTPImportFz3Plugin : public KFTPBookmarkImportPlugin { Q_OBJECT public: - KFTPImportFz3Plugin(QObject *parent, const char *name, const QStringList&); + KFTPImportFz3Plugin(TQObject *parent, const char *name, const TQStringList&); /** * This method should return the properly formated XML for KFTPGrabber * bookmarks that is generated from the import. * - * @return The @ref QDomDocument representation of XML + * @return The @ref TQDomDocument representation of XML */ - QDomDocument getImportedXml(); + TQDomDocument getImportedXml(); /** * This method should start the import procedure. * * @param fileName is the path to the file that will be imported */ - void import(const QString &fileName); + void import(const TQString &fileName); /** * This method should return the default path where the bookmarks could @@ -71,12 +71,12 @@ public: * * @return The default path where bookmarks are located */ - QString getDefaultPath(); + TQString getDefaultPath(); private: - QDomDocument m_domDocument; - QDomDocument m_workDocument; + TQDomDocument m_domDocument; + TQDomDocument m_workDocument; - void importCategory(QDomNode parent, const QDomNode &node); + void importCategory(TQDomNode parent, const TQDomNode &node); }; #endif diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/filezilla3/kftpimportplugin_filezilla3.desktop b/kftpgrabber/src/misc/plugins/bookmarkimport/filezilla3/kftpimportplugin_filezilla3.desktop index f3b91ae..4518e23 100644 --- a/kftpgrabber/src/misc/plugins/bookmarkimport/filezilla3/kftpimportplugin_filezilla3.desktop +++ b/kftpgrabber/src/misc/plugins/bookmarkimport/filezilla3/kftpimportplugin_filezilla3.desktop @@ -34,5 +34,5 @@ Comment[sv]=Insticksprogram för FileZilla 3-bokmärkesimport Comment[uk]=Втулок імпортування закладок FileZilla 3 ServiceTypes=KFTPGrabber/BookmarkImportPlugin Type=Service -X-KDE-Library=kftpimportplugin_filezilla3 +X-TDE-Library=kftpimportplugin_filezilla3 diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/gftp/Makefile.am b/kftpgrabber/src/misc/plugins/bookmarkimport/gftp/Makefile.am index 15a7928..7e48ed4 100644 --- a/kftpgrabber/src/misc/plugins/bookmarkimport/gftp/Makefile.am +++ b/kftpgrabber/src/misc/plugins/bookmarkimport/gftp/Makefile.am @@ -4,7 +4,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = kftpimportplugin_gftp.la kftpimportplugin_gftp_la_SOURCES = kftpimportgftpplugin.cpp -kftpimportplugin_gftp_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) ../../../interfaces/libkftpinterfaces.la +kftpimportplugin_gftp_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) ../../../interfaces/libkftpinterfaces.la kftpimportplugin_gftp_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) kde_services_DATA = kftpimportplugin_gftp.desktop diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/gftp/kftpimportgftpplugin.cpp b/kftpgrabber/src/misc/plugins/bookmarkimport/gftp/kftpimportgftpplugin.cpp index 9bd5e56..c48247f 100644 --- a/kftpgrabber/src/misc/plugins/bookmarkimport/gftp/kftpimportgftpplugin.cpp +++ b/kftpgrabber/src/misc/plugins/bookmarkimport/gftp/kftpimportgftpplugin.cpp @@ -35,40 +35,40 @@ #include "kftpimportgftpplugin.h" -#include <qdir.h> +#include <ntqdir.h> #include <kgenericfactory.h> -#include <klocale.h> -#include <kconfig.h> +#include <tdelocale.h> +#include <tdeconfig.h> #include <kmdcodec.h> K_EXPORT_COMPONENT_FACTORY(kftpimportplugin_gftp, KGenericFactory<KFTPImportGftpPlugin>("kftpimportplugin_gftp")) -KFTPImportGftpPlugin::KFTPImportGftpPlugin(QObject *parent, const char *name, const QStringList&) +KFTPImportGftpPlugin::KFTPImportGftpPlugin(TQObject *parent, const char *name, const TQStringList&) : KFTPBookmarkImportPlugin(parent, name) { - KGlobal::locale()->insertCatalogue("kftpgrabber"); - m_domDocument.setContent(QString("<category name=\"%1\"/>").arg(i18n("gFTP import"))); + TDEGlobal::locale()->insertCatalogue("kftpgrabber"); + m_domDocument.setContent(TQString("<category name=\"%1\"/>").arg(i18n("gFTP import"))); } -QDomDocument KFTPImportGftpPlugin::getImportedXml() +TQDomDocument KFTPImportGftpPlugin::getImportedXml() { return m_domDocument; } -void KFTPImportGftpPlugin::import(const QString &fileName) +void KFTPImportGftpPlugin::import(const TQString &fileName) { // First we fetch some global settings - KConfig tmpConfig(userPath(".gftp/gftprc"), true, false, "HOME"); - QString email = tmpConfig.readEntry("email", "anonymous@"); + TDEConfig tmpConfig(userPath(".gftp/gftprc"), true, false, "HOME"); + TQString email = tmpConfig.readEntry("email", "anonymous@"); int numRetries = tmpConfig.readNumEntry("retries", -1); int sleepTime = tmpConfig.readNumEntry("sleep_time", -1); - // Open the bookmarks file (it has INI-like file format, so we can use the KConfig + // Open the bookmarks file (it has INI-like file format, so we can use the TDEConfig // class to do the parsing and converting) - KConfig config(fileName, true, false, "HOME"); - QStringList groupList = config.groupList(); + TDEConfig config(fileName, true, false, "HOME"); + TQStringList groupList = config.groupList(); float size = (float) groupList.count(); if (size == 0) { @@ -79,16 +79,16 @@ void KFTPImportGftpPlugin::import(const QString &fileName) } int counter = 0; - QStringList::Iterator end( groupList.end() ); - for( QStringList::Iterator it( groupList.begin() ); it != end; ++it ) { + TQStringList::Iterator end( groupList.end() ); + for( TQStringList::Iterator it( groupList.begin() ); it != end; ++it ) { // gFTP bookmarks can have subgroups - QString groupName = *it; - QStringList groupNames = QStringList::split("/", groupName); + TQString groupName = *it; + TQStringList groupNames = TQStringList::split("/", groupName); - QDomNode groupNode; - QDomElement parentElement = m_domDocument.documentElement(); + TQDomNode groupNode; + TQDomElement parentElement = m_domDocument.documentElement(); config.setGroup(groupName); - QString tmp = config.readEntry("hostname"); + TQString tmp = config.readEntry("hostname"); for (unsigned int i = 0; ! tmp.isNull() && i < groupNames.count() - 1; ++i ) { // First see if parenElement has any sub group @@ -97,7 +97,7 @@ void KFTPImportGftpPlugin::import(const QString &fileName) if( groupNode.isNull() ) { // No, it has no subgroup, let's create one while (i < groupNames.count() -1) { - QDomElement tmpElement = m_domDocument.createElement("category"); + TQDomElement tmpElement = m_domDocument.createElement("category"); tmpElement.setAttribute("name", groupNames[i]); parentElement.appendChild(tmpElement); parentElement = tmpElement; @@ -113,21 +113,21 @@ void KFTPImportGftpPlugin::import(const QString &fileName) // Now group tree is updated so lets create the site (if it has hostname) if (!tmp.isNull()) { // Set name - QDomElement siteElement = m_domDocument.createElement("server"); + TQDomElement siteElement = m_domDocument.createElement("server"); siteElement.setAttribute("name", groupNames.last()); parentElement.appendChild(siteElement); // Set host tmp = config.readEntry("hostname"); - QDomElement tmpElement = m_domDocument.createElement("host"); - QDomText txtNode = m_domDocument.createTextNode(tmp); + TQDomElement tmpElement = m_domDocument.createElement("host"); + TQDomText txtNode = m_domDocument.createTextNode(tmp); tmpElement.appendChild(txtNode); siteElement.appendChild(tmpElement); // Set port int p = config.readNumEntry("port", 21); tmpElement = m_domDocument.createElement("port"); - txtNode = m_domDocument.createTextNode(QString::number(p)); + txtNode = m_domDocument.createTextNode(TQString::number(p)); tmpElement.appendChild(txtNode); siteElement.appendChild(tmpElement); @@ -139,7 +139,7 @@ void KFTPImportGftpPlugin::import(const QString &fileName) siteElement.appendChild(tmpElement); // Set local directory - tmp = config.readEntry("local directory", QDir::homeDirPath()); + tmp = config.readEntry("local directory", TQDir::homeDirPath()); tmpElement = m_domDocument.createElement("deflocalpath"); txtNode = m_domDocument.createTextNode(tmp); tmpElement.appendChild(txtNode); @@ -177,12 +177,12 @@ void KFTPImportGftpPlugin::import(const QString &fileName) // Set retries if (numRetries >= 0) { tmpElement = m_domDocument.createElement("retrytime"); - txtNode = m_domDocument.createTextNode(QString::number(sleepTime)); + txtNode = m_domDocument.createTextNode(TQString::number(sleepTime)); tmpElement.appendChild(txtNode); siteElement.appendChild(tmpElement); tmpElement = m_domDocument.createElement("retrycount"); - txtNode = m_domDocument.createTextNode(QString::number(numRetries)); + txtNode = m_domDocument.createTextNode(TQString::number(numRetries)); tmpElement.appendChild(txtNode); siteElement.appendChild(tmpElement); } @@ -195,16 +195,16 @@ void KFTPImportGftpPlugin::import(const QString &fileName) emit progress(100); } -QString KFTPImportGftpPlugin::decodePassword(const QString &password) +TQString KFTPImportGftpPlugin::decodePassword(const TQString &password) { // Leave unencoded passwords as they are if (password[0] != '$') return password; - QString work = password; + TQString work = password; work.remove(0, 1); - QString result; + TQString result; for (uint i = 0; i < work.length() - 1; i += 2) { char c = work.at(i).latin1(); @@ -216,21 +216,21 @@ QString KFTPImportGftpPlugin::decodePassword(const QString &password) return result; } -QDomNode KFTPImportGftpPlugin::findSubGroup(QDomElement parent, const QString& name) +TQDomNode KFTPImportGftpPlugin::findSubGroup(TQDomElement parent, const TQString& name) { - QDomNodeList nodeList = parent.childNodes(); + TQDomNodeList nodeList = parent.childNodes(); for(unsigned int i = 0; i < nodeList.count(); ++i) { if(nodeList.item(i).toElement().attribute("name") == name) return nodeList.item(i); } - return QDomNode(); + return TQDomNode(); } -QString KFTPImportGftpPlugin::getDefaultPath() +TQString KFTPImportGftpPlugin::getDefaultPath() { - return QString(".gftp/bookmarks"); + return TQString(".gftp/bookmarks"); } #include "kftpimportgftpplugin.moc" diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/gftp/kftpimportgftpplugin.h b/kftpgrabber/src/misc/plugins/bookmarkimport/gftp/kftpimportgftpplugin.h index af2bceb..6a48523 100644 --- a/kftpgrabber/src/misc/plugins/bookmarkimport/gftp/kftpimportgftpplugin.h +++ b/kftpgrabber/src/misc/plugins/bookmarkimport/gftp/kftpimportgftpplugin.h @@ -36,7 +36,7 @@ #ifndef KFTPIMPORTGFTPPLUGIN_H #define KFTPIMPORTGFTPPLUGIN_H -#include <qdom.h> +#include <ntqdom.h> #include <kftpbookmarkimportplugin.h> /** @@ -49,22 +49,22 @@ class KFTPImportGftpPlugin : public KFTPBookmarkImportPlugin { Q_OBJECT public: - KFTPImportGftpPlugin(QObject *parent, const char *name, const QStringList&); + KFTPImportGftpPlugin(TQObject *parent, const char *name, const TQStringList&); /** * This method should return the properly formated XML for KFTPGrabber * bookmarks that is generated from the import. * - * @return The @ref QDomDocument representation of XML + * @return The @ref TQDomDocument representation of XML */ - QDomDocument getImportedXml(); + TQDomDocument getImportedXml(); /** * This method should start the import procedure. * * @param fileName is the path to the file that will be imported */ - void import(const QString &fileName); + void import(const TQString &fileName); /** * This method should return the default path where the bookmarks could @@ -72,12 +72,12 @@ public: * * @return The default path where bookmarks are located */ - QString getDefaultPath(); + TQString getDefaultPath(); private: - QDomDocument m_domDocument; + TQDomDocument m_domDocument; - QDomNode findSubGroup(QDomElement parent, const QString& name); - QString decodePassword(const QString &password); + TQDomNode findSubGroup(TQDomElement parent, const TQString& name); + TQString decodePassword(const TQString &password); }; #endif diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/gftp/kftpimportplugin_gftp.desktop b/kftpgrabber/src/misc/plugins/bookmarkimport/gftp/kftpimportplugin_gftp.desktop index 815f1d4..3b00951 100644 --- a/kftpgrabber/src/misc/plugins/bookmarkimport/gftp/kftpimportplugin_gftp.desktop +++ b/kftpgrabber/src/misc/plugins/bookmarkimport/gftp/kftpimportplugin_gftp.desktop @@ -57,5 +57,5 @@ Comment[uk]=Втулок імпортування закладок gFTP для K Comment[xx]=xxgFTP bookmarks import plugin for KFTPGrabberxx ServiceTypes=KFTPGrabber/BookmarkImportPlugin Type=Service -X-KDE-Library=kftpimportplugin_gftp +X-TDE-Library=kftpimportplugin_gftp diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/kftp/Makefile.am b/kftpgrabber/src/misc/plugins/bookmarkimport/kftp/Makefile.am index 572413c..655e86b 100644 --- a/kftpgrabber/src/misc/plugins/bookmarkimport/kftp/Makefile.am +++ b/kftpgrabber/src/misc/plugins/bookmarkimport/kftp/Makefile.am @@ -4,7 +4,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = kftpimportplugin_kftp.la kftpimportplugin_kftp_la_SOURCES = kftpimportkftpplugin.cpp -kftpimportplugin_kftp_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) ../../../interfaces/libkftpinterfaces.la +kftpimportplugin_kftp_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) ../../../interfaces/libkftpinterfaces.la kftpimportplugin_kftp_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) kde_services_DATA = kftpimportplugin_kftp.desktop diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/kftp/kftpimportkftpplugin.cpp b/kftpgrabber/src/misc/plugins/bookmarkimport/kftp/kftpimportkftpplugin.cpp index 3ea06d8..c376501 100644 --- a/kftpgrabber/src/misc/plugins/bookmarkimport/kftp/kftpimportkftpplugin.cpp +++ b/kftpgrabber/src/misc/plugins/bookmarkimport/kftp/kftpimportkftpplugin.cpp @@ -35,35 +35,35 @@ #include "kftpimportkftpplugin.h" -#include <qdir.h> -#include <qfile.h> +#include <ntqdir.h> +#include <ntqfile.h> #include <kgenericfactory.h> -#include <klocale.h> -#include <kconfig.h> +#include <tdelocale.h> +#include <tdeconfig.h> #include <kmdcodec.h> K_EXPORT_COMPONENT_FACTORY(kftpimportplugin_kftp, KGenericFactory<KFTPImportKftpPlugin>("kftpimportplugin_kftp")) -KFTPImportKftpPlugin::KFTPImportKftpPlugin(QObject *parent, const char *name, const QStringList&) +KFTPImportKftpPlugin::KFTPImportKftpPlugin(TQObject *parent, const char *name, const TQStringList&) : KFTPBookmarkImportPlugin(parent, name) { - KGlobal::locale()->insertCatalogue("kftpgrabber"); + TDEGlobal::locale()->insertCatalogue("kftpgrabber"); } -QDomDocument KFTPImportKftpPlugin::getImportedXml() +TQDomDocument KFTPImportKftpPlugin::getImportedXml() { return m_domDocument; } -void KFTPImportKftpPlugin::import(const QString &fileName) +void KFTPImportKftpPlugin::import(const TQString &fileName) { - m_domDocument.setContent(QString("<category name=\"%1\"/>").arg(i18n("KFTPGrabber import"))); + m_domDocument.setContent(TQString("<category name=\"%1\"/>").arg(i18n("KFTPGrabber import"))); // There is actually nothing to import, we just have to read the existing XML and // remove site ids. - QFile file(fileName); + TQFile file(fileName); if (!file.open(IO_ReadOnly)) { emit progress(100); return; @@ -76,10 +76,10 @@ void KFTPImportKftpPlugin::import(const QString &fileName) stripIds(); // Now append the bookmarks - QDomNode n = m_workDocument.documentElement().firstChild(); + TQDomNode n = m_workDocument.documentElement().firstChild(); while (!n.isNull()) { - QDomNode import = m_domDocument.importNode(n, true); + TQDomNode import = m_domDocument.importNode(n, true); m_domDocument.documentElement().appendChild(import); n = n.nextSibling(); @@ -88,12 +88,12 @@ void KFTPImportKftpPlugin::import(const QString &fileName) emit progress(100); } -void KFTPImportKftpPlugin::stripIds(QDomNode node) +void KFTPImportKftpPlugin::stripIds(TQDomNode node) { if (node.isNull()) node = m_workDocument.documentElement(); - QDomNode n = node.firstChild(); + TQDomNode n = node.firstChild(); while (!n.isNull()) { if (n.toElement().tagName() == "category") { @@ -110,9 +110,9 @@ void KFTPImportKftpPlugin::stripIds(QDomNode node) } } -QString KFTPImportKftpPlugin::getDefaultPath() +TQString KFTPImportKftpPlugin::getDefaultPath() { - return QString(""); + return TQString(""); } #include "kftpimportkftpplugin.moc" diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/kftp/kftpimportkftpplugin.h b/kftpgrabber/src/misc/plugins/bookmarkimport/kftp/kftpimportkftpplugin.h index 9f2e593..f4a166b 100644 --- a/kftpgrabber/src/misc/plugins/bookmarkimport/kftp/kftpimportkftpplugin.h +++ b/kftpgrabber/src/misc/plugins/bookmarkimport/kftp/kftpimportkftpplugin.h @@ -36,7 +36,7 @@ #ifndef KFTPIMPORTKFTPPLUGIN_H #define KFTPIMPORTKFTPPLUGIN_H -#include <qdom.h> +#include <ntqdom.h> #include <kftpbookmarkimportplugin.h> /** @@ -49,22 +49,22 @@ class KFTPImportKftpPlugin : public KFTPBookmarkImportPlugin { Q_OBJECT public: - KFTPImportKftpPlugin(QObject *parent, const char *name, const QStringList&); + KFTPImportKftpPlugin(TQObject *parent, const char *name, const TQStringList&); /** * This method should return the properly formated XML for KFTPGrabber * bookmarks that is generated from the import. * - * @return The @ref QDomDocument representation of XML + * @return The @ref TQDomDocument representation of XML */ - QDomDocument getImportedXml(); + TQDomDocument getImportedXml(); /** * This method should start the import procedure. * * @param fileName is the path to the file that will be imported */ - void import(const QString &fileName); + void import(const TQString &fileName); /** * This method should return the default path where the bookmarks could @@ -72,12 +72,12 @@ public: * * @return The default path where bookmarks are located */ - QString getDefaultPath(); + TQString getDefaultPath(); private: - QDomDocument m_domDocument; - QDomDocument m_workDocument; + TQDomDocument m_domDocument; + TQDomDocument m_workDocument; - void stripIds(QDomNode node = QDomNode()); + void stripIds(TQDomNode node = TQDomNode()); }; #endif diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/kftp/kftpimportplugin_kftp.desktop b/kftpgrabber/src/misc/plugins/bookmarkimport/kftp/kftpimportplugin_kftp.desktop index 0cb42ba..e735a6b 100644 --- a/kftpgrabber/src/misc/plugins/bookmarkimport/kftp/kftpimportplugin_kftp.desktop +++ b/kftpgrabber/src/misc/plugins/bookmarkimport/kftp/kftpimportplugin_kftp.desktop @@ -53,5 +53,5 @@ Comment[xx]=xxKFTPGrabber XML bookmarks import pluginxx Comment[zh_CN]=KFTPGrabber XML 书签导入插件 ServiceTypes=KFTPGrabber/BookmarkImportPlugin Type=Service -X-KDE-Library=kftpimportplugin_kftp +X-TDE-Library=kftpimportplugin_kftp diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/ncftp/Makefile.am b/kftpgrabber/src/misc/plugins/bookmarkimport/ncftp/Makefile.am index feb557e..d6fa948 100644 --- a/kftpgrabber/src/misc/plugins/bookmarkimport/ncftp/Makefile.am +++ b/kftpgrabber/src/misc/plugins/bookmarkimport/ncftp/Makefile.am @@ -4,7 +4,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = kftpimportplugin_ncftp.la kftpimportplugin_ncftp_la_SOURCES = kftpimportncftpplugin.cpp -kftpimportplugin_ncftp_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) ../../../interfaces/libkftpinterfaces.la +kftpimportplugin_ncftp_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) ../../../interfaces/libkftpinterfaces.la kftpimportplugin_ncftp_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) kde_services_DATA = kftpimportplugin_ncftp.desktop diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/ncftp/kftpimportncftpplugin.cpp b/kftpgrabber/src/misc/plugins/bookmarkimport/ncftp/kftpimportncftpplugin.cpp index e146f88..abf8ba8 100644 --- a/kftpgrabber/src/misc/plugins/bookmarkimport/ncftp/kftpimportncftpplugin.cpp +++ b/kftpgrabber/src/misc/plugins/bookmarkimport/ncftp/kftpimportncftpplugin.cpp @@ -34,44 +34,44 @@ */ #include "kftpimportncftpplugin.h" -#include <qdir.h> -#include <qfile.h> +#include <ntqdir.h> +#include <ntqfile.h> #include <kgenericfactory.h> -#include <klocale.h> -#include <kconfig.h> +#include <tdelocale.h> +#include <tdeconfig.h> #include <kmdcodec.h> K_EXPORT_COMPONENT_FACTORY(kftpimportplugin_ncftp, KGenericFactory<KFTPImportNcftpPlugin>("kftpimportplugin_ncftp")) -KFTPImportNcftpPlugin::KFTPImportNcftpPlugin(QObject *parent, const char *name, const QStringList&) +KFTPImportNcftpPlugin::KFTPImportNcftpPlugin(TQObject *parent, const char *name, const TQStringList&) : KFTPBookmarkImportPlugin(parent, name) { - KGlobal::locale()->insertCatalogue("kftpgrabber"); - m_domDocument.setContent(QString("<category name=\"%1\"/>").arg(i18n("NcFtp import"))); + TDEGlobal::locale()->insertCatalogue("kftpgrabber"); + m_domDocument.setContent(TQString("<category name=\"%1\"/>").arg(i18n("NcFtp import"))); } -QDomDocument KFTPImportNcftpPlugin::getImportedXml() +TQDomDocument KFTPImportNcftpPlugin::getImportedXml() { return m_domDocument; } -void KFTPImportNcftpPlugin::import(const QString &fileName) +void KFTPImportNcftpPlugin::import(const TQString &fileName) { /* ARNES FTP serve,ftp.arnes.si,username,*encoded*cGFzc3dvcmQA,,/remote,I,21,4294967295,1,1,-1,1,193.2.1.79,Komentar,,,,,S,-1,/local Redhat,ftp.redhat.com,,,,,I,21,1102099812,-1,-1,-1,1,66.187.224.30,,,,,,S,-1, */ - QFile f(fileName); + TQFile f(fileName); if (!f.open(IO_ReadOnly)) { emit progress(100); return; } - QTextStream stream(&f); - QString line; + TQTextStream stream(&f); + TQString line; int lineNum = 0; while (!stream.atEnd()) { @@ -79,17 +79,17 @@ void KFTPImportNcftpPlugin::import(const QString &fileName) if (++lineNum <= 2) continue; // Add the imported bookmark - QDomElement parentElement = m_domDocument.documentElement(); + TQDomElement parentElement = m_domDocument.documentElement(); // Set name - QDomElement siteElement = m_domDocument.createElement("server"); + TQDomElement siteElement = m_domDocument.createElement("server"); siteElement.setAttribute("name", subSection(line, 0)); parentElement.appendChild(siteElement); // Set host - QString tmp = subSection(line, 1); - QDomElement tmpElement = m_domDocument.createElement("host"); - QDomText txtNode = m_domDocument.createTextNode(tmp); + TQString tmp = subSection(line, 1); + TQDomElement tmpElement = m_domDocument.createElement("host"); + TQDomText txtNode = m_domDocument.createTextNode(tmp); tmpElement.appendChild(txtNode); siteElement.appendChild(tmpElement); @@ -108,7 +108,7 @@ void KFTPImportNcftpPlugin::import(const QString &fileName) siteElement.appendChild(tmpElement); // Set local directory - tmp = subSection(line, 21, QDir::homeDirPath()); + tmp = subSection(line, 21, TQDir::homeDirPath()); tmpElement = m_domDocument.createElement("deflocalpath"); txtNode = m_domDocument.createTextNode(tmp); tmpElement.appendChild(txtNode); @@ -150,16 +150,16 @@ void KFTPImportNcftpPlugin::import(const QString &fileName) emit progress(100); } -QString KFTPImportNcftpPlugin::subSection(const QString &text, int section, const QString &def) +TQString KFTPImportNcftpPlugin::subSection(const TQString &text, int section, const TQString &def) { - QString tmp = text.section(',', section, section); + TQString tmp = text.section(',', section, section); return tmp.isEmpty() ? def : tmp; } -QString KFTPImportNcftpPlugin::getDefaultPath() +TQString KFTPImportNcftpPlugin::getDefaultPath() { - return QString(".ncftp/bookmarks"); + return TQString(".ncftp/bookmarks"); } #include "kftpimportncftpplugin.moc" diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/ncftp/kftpimportncftpplugin.h b/kftpgrabber/src/misc/plugins/bookmarkimport/ncftp/kftpimportncftpplugin.h index 7a58d0e..f78fbb5 100644 --- a/kftpgrabber/src/misc/plugins/bookmarkimport/ncftp/kftpimportncftpplugin.h +++ b/kftpgrabber/src/misc/plugins/bookmarkimport/ncftp/kftpimportncftpplugin.h @@ -35,7 +35,7 @@ #ifndef KFTPIMPORTNCFTPPLUGIN_H #define KFTPIMPORTNCFTPPLUGIN_H -#include <qdom.h> +#include <ntqdom.h> #include <kftpbookmarkimportplugin.h> /** @@ -47,22 +47,22 @@ class KFTPImportNcftpPlugin : public KFTPBookmarkImportPlugin { Q_OBJECT public: - KFTPImportNcftpPlugin(QObject *parent, const char *name, const QStringList&); + KFTPImportNcftpPlugin(TQObject *parent, const char *name, const TQStringList&); /** * This method should return the properly formated XML for KFTPGrabber * bookmarks that is generated from the import. * - * @return The @ref QDomDocument representation of XML + * @return The @ref TQDomDocument representation of XML */ - QDomDocument getImportedXml(); + TQDomDocument getImportedXml(); /** * This method should start the import procedure. * * @param fileName is the path to the file that will be imported */ - void import(const QString &fileName); + void import(const TQString &fileName); /** * This method should return the default path where the bookmarks could @@ -70,11 +70,11 @@ public: * * @return The default path where bookmarks are located */ - QString getDefaultPath(); + TQString getDefaultPath(); private: - QDomDocument m_domDocument; + TQDomDocument m_domDocument; - QString subSection(const QString &text, int section, const QString &def = QString::null); + TQString subSection(const TQString &text, int section, const TQString &def = TQString::null); }; #endif diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/ncftp/kftpimportplugin_ncftp.desktop b/kftpgrabber/src/misc/plugins/bookmarkimport/ncftp/kftpimportplugin_ncftp.desktop index 226f2cc..9854ee4 100644 --- a/kftpgrabber/src/misc/plugins/bookmarkimport/ncftp/kftpimportplugin_ncftp.desktop +++ b/kftpgrabber/src/misc/plugins/bookmarkimport/ncftp/kftpimportplugin_ncftp.desktop @@ -58,5 +58,5 @@ Comment[xx]=xxNcFTP bookmarks import plugin for KFTPGrabberxx Comment[zh_CN]=KFTPGrabber 的 NcFTP 书签导入插件 ServiceTypes=KFTPGrabber/BookmarkImportPlugin Type=Service -X-KDE-Library=kftpimportplugin_ncftp +X-TDE-Library=kftpimportplugin_ncftp diff --git a/kftpgrabber/src/queuegroup.cpp b/kftpgrabber/src/queuegroup.cpp index f9e49e4..d13da15 100644 --- a/kftpgrabber/src/queuegroup.cpp +++ b/kftpgrabber/src/queuegroup.cpp @@ -43,9 +43,9 @@ using namespace KFTPSession; namespace KFTPQueue { QueueGroup::QueueGroup(QueueObject *object) - : QObject(object), + : TQObject(object), m_object(object), - m_childIterator(QPtrListIterator<QueueObject>(m_object->m_children)), + m_childIterator(TQPtrListIterator<QueueObject>(m_object->m_children)), m_directories(true) { } @@ -85,7 +85,7 @@ int QueueGroup::executeNextTransfer() } // Get the transfer instance and schedule it's execution - transfer->QObject::disconnect(this); + transfer->TQObject::disconnect(this); connect(transfer, SIGNAL(transferComplete(long)), this, SLOT(incrementAndExecute())); connect(transfer, SIGNAL(transferAbort(long)), this, SIGNAL(interrupted())); @@ -100,8 +100,8 @@ int QueueGroup::executeNextTransfer() void QueueGroup::incrementAndExecute() { - if (QObject::sender()) { - const Transfer *transfer = static_cast<const Transfer*>(QObject::sender()); + if (TQObject::sender()) { + const Transfer *transfer = static_cast<const Transfer*>(TQObject::sender()); if (!transfer->isDir()) m_directories = false; diff --git a/kftpgrabber/src/queuegroup.h b/kftpgrabber/src/queuegroup.h index a8c3562..35efb3d 100644 --- a/kftpgrabber/src/queuegroup.h +++ b/kftpgrabber/src/queuegroup.h @@ -36,8 +36,8 @@ #ifndef KFTPQUEUEQUEUEGROUP_H #define KFTPQUEUEQUEUEGROUP_H -#include <qguardedptr.h> -#include <qptrlist.h> +#include <ntqguardedptr.h> +#include <ntqptrlist.h> namespace KFTPQueue { @@ -54,7 +54,7 @@ class Transfer; * * @author Jernej Kos */ -class QueueGroup : public QObject { +class QueueGroup : public TQObject { Q_OBJECT public: /** @@ -82,8 +82,8 @@ public slots: void incrementAndExecute(); private: QueueObject *m_object; - QPtrListIterator<QueueObject> m_childIterator; - QGuardedPtr<Transfer> m_lastTransfer; + TQPtrListIterator<QueueObject> m_childIterator; + TQGuardedPtr<Transfer> m_lastTransfer; bool m_directories; signals: /** diff --git a/kftpgrabber/src/queueobject.cpp b/kftpgrabber/src/queueobject.cpp index 454da84..daf3e87 100644 --- a/kftpgrabber/src/queueobject.cpp +++ b/kftpgrabber/src/queueobject.cpp @@ -36,12 +36,12 @@ #include "queueobject.h" #include "kftpqueue.h" -#include <qtimer.h> +#include <ntqtimer.h> namespace KFTPQueue { -QueueObject::QueueObject(QObject *parent, Type type) - : QObject(parent), +QueueObject::QueueObject(TQObject *parent, Type type) + : TQObject(parent), m_aborting(false), m_status(Stopped), m_type(type), @@ -66,7 +66,7 @@ QueueObject::~QueueObject() void QueueObject::delayedExecute(int msec) { - /* Execute the transfer with delay - using a QTimer */ + /* Execute the transfer with delay - using a TQTimer */ if (msec > 1000) msec = 1000; @@ -126,7 +126,7 @@ void QueueObject::setSpeed(filesize_t speed) m_speed = speed; - QPtrListIterator<QueueObject> it(m_children); + TQPtrListIterator<QueueObject> it(m_children); QueueObject *i; while ((i = it.current()) != 0) { @@ -154,7 +154,7 @@ void QueueObject::addChildObject(QueueObject *object) { m_children.append(object); - connect(object, SIGNAL(destroyed(QObject*)), this, SLOT(slotChildDestroyed(QObject*))); + connect(object, SIGNAL(destroyed(TQObject*)), this, SLOT(slotChildDestroyed(TQObject*))); } void QueueObject::delChildObject(QueueObject *object) @@ -162,7 +162,7 @@ void QueueObject::delChildObject(QueueObject *object) m_children.removeRef(object); } -void QueueObject::slotChildDestroyed(QObject *child) +void QueueObject::slotChildDestroyed(TQObject *child) { // Remove the transfer delChildObject(static_cast<QueueObject*>(child)); @@ -170,7 +170,7 @@ void QueueObject::slotChildDestroyed(QObject *child) QueueObject *QueueObject::findChildObject(long id) { - QPtrListIterator<QueueObject> it(m_children); + TQPtrListIterator<QueueObject> it(m_children); QueueObject *i; while ((i = it.current()) != 0) { @@ -192,7 +192,7 @@ QueueObject *QueueObject::findChildObject(long id) void QueueObject::removeMarkedTransfers() { - QPtrListIterator<QueueObject> it(m_children); + TQPtrListIterator<QueueObject> it(m_children); QueueObject *i; while ((i = it.current()) != 0) { diff --git a/kftpgrabber/src/queueobject.h b/kftpgrabber/src/queueobject.h index a8e7088..3431774 100644 --- a/kftpgrabber/src/queueobject.h +++ b/kftpgrabber/src/queueobject.h @@ -36,9 +36,9 @@ #ifndef KFTPQUEUEQUEUEOBJECT_H #define KFTPQUEUEQUEUEOBJECT_H -#include <qobject.h> -#include <qptrlist.h> -#include <qtimer.h> +#include <ntqobject.h> +#include <ntqptrlist.h> +#include <ntqtimer.h> #include "engine/directorylisting.h" @@ -51,7 +51,7 @@ class QueueGroup; * * @author Jernej Kos */ -class QueueObject : public QObject +class QueueObject : public TQObject { friend class QueueGroup; Q_OBJECT @@ -78,7 +78,7 @@ public: * @param parent Parent object * @param type Object type */ - QueueObject(QObject *parent, Type type); + QueueObject(TQObject *parent, Type type); /** * Class destructor. @@ -322,7 +322,7 @@ public: * * @return A QueueObject list */ - QPtrList<QueueObject> getChildrenList() const { return m_children; } + TQPtrList<QueueObject> getChildrenList() const { return m_children; } public slots: /** * Execute this queue object. @@ -334,9 +334,9 @@ protected: long m_id; Type m_type; - QPtrList<QueueObject> m_children; + TQPtrList<QueueObject> m_children; - QTimer m_delayedExecuteTimer; + TQTimer m_delayedExecuteTimer; /* Statistical information */ filesize_t m_size; @@ -358,7 +358,7 @@ protected: */ virtual bool canMove(); private slots: - void slotChildDestroyed(QObject *child); + void slotChildDestroyed(TQObject *child); signals: /** * This signal gets emitted when the object's state has changed in diff --git a/kftpgrabber/src/statistics.h b/kftpgrabber/src/statistics.h index 1f0f309..47533e4 100644 --- a/kftpgrabber/src/statistics.h +++ b/kftpgrabber/src/statistics.h @@ -37,11 +37,11 @@ #ifndef KFTPQUEUESTATISTICS_H #define KFTPQUEUESTATISTICS_H -#include <qobject.h> -#include <qdict.h> +#include <ntqobject.h> +#include <ntqdict.h> #include <kurl.h> -#include <kio/global.h> +#include <tdeio/global.h> namespace KFTPQueue { @@ -76,7 +76,7 @@ private: * * @author Jernej Kos <kostko@unimatrix-one.org> */ -class Statistics : public QObject +class Statistics : public TQObject { Q_OBJECT public: @@ -109,7 +109,7 @@ protected: */ Statistics(); private: - QDict<StatisticsSite> m_sites; + TQDict<StatisticsSite> m_sites; }; } diff --git a/kftpgrabber/src/ui/bookmark_properties.ui b/kftpgrabber/src/ui/bookmark_properties.ui index a41d18a..7afe0a7 100644 --- a/kftpgrabber/src/ui/bookmark_properties.ui +++ b/kftpgrabber/src/ui/bookmark_properties.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>BookmarkProperties</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>BookmarkProperties</cstring> </property> @@ -22,7 +22,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabList</cstring> </property> @@ -34,7 +34,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>general</cstring> </property> @@ -45,7 +45,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout23</cstring> </property> @@ -53,7 +53,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -61,7 +61,7 @@ <string>Hostname:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel4_2</cstring> </property> @@ -69,7 +69,7 @@ <string>Protocol:</string> </property> </widget> - <widget class="QLayoutWidget" row="2" column="1"> + <widget class="TQLayoutWidget" row="2" column="1"> <property name="name"> <cstring>layout22</cstring> </property> @@ -120,7 +120,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -133,7 +133,7 @@ <cstring>defRemoteDir</cstring> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -141,7 +141,7 @@ <string>Username:</string> </property> </widget> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> <cstring>layout21</cstring> </property> @@ -154,7 +154,7 @@ <cstring>serverAddress</cstring> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -162,7 +162,7 @@ <string>Port:</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>serverPort</cstring> </property> @@ -175,7 +175,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -188,7 +188,7 @@ <cstring>serverName</cstring> </property> </widget> - <widget class="QLabel" row="7" column="0"> + <widget class="TQLabel" row="7" column="0"> <property name="name"> <cstring>textLabel7</cstring> </property> @@ -196,7 +196,7 @@ <string>Remote directory:</string> </property> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -219,7 +219,7 @@ <cstring>downPass</cstring> </property> </widget> - <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>anonLogin</cstring> </property> @@ -229,7 +229,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox5_2</cstring> </property> @@ -240,7 +240,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTextEdit"> + <widget class="TQTextEdit"> <property name="name"> <cstring>description</cstring> </property> @@ -249,7 +249,7 @@ </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>advanced</cstring> </property> @@ -260,7 +260,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>disableEPSV</cstring> </property> @@ -268,7 +268,7 @@ <string>Disa&ble use of extended passive mode</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>disablePASV</cstring> </property> @@ -276,7 +276,7 @@ <string>Disable use of passive mode</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>pasvSiteIp</cstring> </property> @@ -284,7 +284,7 @@ <string>Use site IP for passive mode connections</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>disableForceIp</cstring> </property> @@ -292,7 +292,7 @@ <string>Disable "force active mode to use this IP" for this site</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>statListings</cstring> </property> @@ -303,7 +303,7 @@ <string></string> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox4</cstring> </property> @@ -314,7 +314,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>threadsDisable</cstring> </property> @@ -324,14 +324,14 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox8</cstring> </property> <property name="title"> <string>Server Encoding</string> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -388,7 +388,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>keepalive</cstring> </property> @@ -399,7 +399,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>doRetry</cstring> </property> @@ -407,7 +407,7 @@ <string>Retr&y to connect on failure</string> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>retryGroup</cstring> </property> @@ -426,7 +426,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel12</cstring> </property> @@ -434,7 +434,7 @@ <string>Number of retries (0 = infinite):</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel11</cstring> </property> @@ -442,7 +442,7 @@ <string>Retry delay:</string> </property> </widget> - <widget class="QSpinBox" row="1" column="3"> + <widget class="TQSpinBox" row="1" column="3"> <property name="name"> <cstring>retryCount</cstring> </property> @@ -484,7 +484,7 @@ </size> </property> </spacer> - <widget class="QSpinBox" row="0" column="3"> + <widget class="TQSpinBox" row="0" column="3"> <property name="name"> <cstring>retryDelay</cstring> </property> @@ -497,7 +497,7 @@ </widget> </grid> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>doKeepalive</cstring> </property> @@ -505,7 +505,7 @@ <string>Use keepalive packets to keep the connection open</string> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>keepaliveGroup</cstring> </property> @@ -516,7 +516,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout4</cstring> </property> @@ -524,7 +524,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -549,7 +549,7 @@ </size> </property> </spacer> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>keepaliveTimeout</cstring> </property> diff --git a/kftpgrabber/src/ui/checksum_verifier.ui b/kftpgrabber/src/ui/checksum_verifier.ui index be2f8af..e755bbb 100644 --- a/kftpgrabber/src/ui/checksum_verifier.ui +++ b/kftpgrabber/src/ui/checksum_verifier.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>VerifierLayout</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>VerifierLayout</cstring> </property> @@ -28,7 +28,7 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox23</cstring> </property> @@ -44,7 +44,7 @@ <cstring>checkProgress</cstring> </property> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>layout57</cstring> </property> @@ -52,7 +52,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -68,7 +68,7 @@ <string><b>File:</b></string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>currentFile</cstring> </property> @@ -88,7 +88,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox24</cstring> </property> @@ -99,7 +99,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="KListView" row="0" column="1" rowspan="2" colspan="1"> + <widget class="TDEListView" row="0" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>fileList</cstring> </property> @@ -112,7 +112,7 @@ </sizepolicy> </property> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>layout68</cstring> </property> @@ -120,7 +120,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout64</cstring> </property> @@ -128,7 +128,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel11</cstring> </property> @@ -149,7 +149,7 @@ <string></string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel7</cstring> </property> @@ -167,7 +167,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout65</cstring> </property> @@ -175,7 +175,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel11_2</cstring> </property> @@ -196,7 +196,7 @@ <string></string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel8</cstring> </property> @@ -214,7 +214,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout66</cstring> </property> @@ -222,7 +222,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel11_3</cstring> </property> @@ -243,7 +243,7 @@ <string></string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel9</cstring> </property> @@ -261,7 +261,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout67</cstring> </property> @@ -269,7 +269,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel11_4</cstring> </property> @@ -290,7 +290,7 @@ <string></string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel10</cstring> </property> diff --git a/kftpgrabber/src/ui/config_display.ui b/kftpgrabber/src/ui/config_display.ui index 1734bf1..9c4766a 100644 --- a/kftpgrabber/src/ui/config_display.ui +++ b/kftpgrabber/src/ui/config_display.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>DisplaySettings</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DisplaySettings</cstring> </property> @@ -22,11 +22,11 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>tabWidget6</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -37,7 +37,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox32</cstring> </property> @@ -48,7 +48,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_showHiddenFiles</cstring> </property> @@ -56,7 +56,7 @@ <string>Show &hidden files and directories</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_showTree</cstring> </property> @@ -64,7 +64,7 @@ <string>Show &directory tree</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_showSizeInBytes</cstring> </property> @@ -72,7 +72,7 @@ <string>Show filesi&ze in bytes (toggle for "human readable" format)</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_showOwnerGroup</cstring> </property> @@ -80,7 +80,7 @@ <string>Show &owner and group for each file</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_showDirectorySize</cstring> </property> @@ -90,7 +90,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -101,7 +101,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_showLeftSidebar</cstring> </property> diff --git a/kftpgrabber/src/ui/config_filters.ui b/kftpgrabber/src/ui/config_filters.ui index f9ac803..ba7e8ca 100644 --- a/kftpgrabber/src/ui/config_filters.ui +++ b/kftpgrabber/src/ui/config_filters.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>ConfigFilterLayout</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ConfigFilterLayout</cstring> </property> @@ -22,11 +22,11 @@ <property name="margin"> <number>0</number> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>tabWidget</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -54,7 +54,7 @@ </size> </property> </spacer> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> <cstring>layout4</cstring> </property> @@ -80,7 +80,7 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget" row="0" column="0" rowspan="2" colspan="1"> + <widget class="TQLayoutWidget" row="0" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>layout4</cstring> </property> @@ -88,7 +88,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -101,7 +101,7 @@ <cstring>newExtension</cstring> </property> </widget> - <widget class="KListView"> + <widget class="TDEListView"> <column> <property name="text"> <string>Extension</string> @@ -132,6 +132,6 @@ <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>klineedit.h</includehint> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> </includehints> </UI> diff --git a/kftpgrabber/src/ui/config_general.ui b/kftpgrabber/src/ui/config_general.ui index 9fd4f94..81af736 100644 --- a/kftpgrabber/src/ui/config_general.ui +++ b/kftpgrabber/src/ui/config_general.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>GeneralSettings</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>GeneralSettings</cstring> </property> @@ -22,11 +22,11 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>tabWidget3</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -37,7 +37,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox22</cstring> </property> @@ -48,7 +48,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_globalMail</cstring> </property> @@ -56,7 +56,7 @@ <string>&Use e-mail address from control center</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout26</cstring> </property> @@ -64,7 +64,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel8</cstring> </property> @@ -81,7 +81,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox13</cstring> </property> @@ -92,7 +92,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_confirmExit</cstring> </property> @@ -100,7 +100,7 @@ <string>Confirm program e&xit if there are active transfers</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_startMinimized</cstring> </property> @@ -108,7 +108,7 @@ <string>Start the program minimi&zed to systray</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_showSplash</cstring> </property> @@ -116,7 +116,7 @@ <string>Show &splash screen on startup</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_showSystrayIcon</cstring> </property> @@ -124,7 +124,7 @@ <string>Show the s&ystray icon</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_exitOnClose</cstring> </property> @@ -153,7 +153,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -164,7 +164,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox10</cstring> </property> @@ -183,7 +183,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout13</cstring> </property> @@ -191,7 +191,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -206,7 +206,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout12</cstring> </property> @@ -214,7 +214,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -237,7 +237,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout11</cstring> </property> @@ -245,7 +245,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -268,7 +268,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout13</cstring> </property> @@ -276,7 +276,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -301,7 +301,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox11</cstring> </property> @@ -320,7 +320,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_encryptBookmarks</cstring> </property> @@ -328,7 +328,7 @@ <string>Encr&ypt bookmark file</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_showWalletSites</cstring> </property> @@ -357,7 +357,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -368,7 +368,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox12</cstring> </property> @@ -379,7 +379,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_showBalloons</cstring> </property> @@ -387,7 +387,7 @@ <string>&Show balloon when transfer completes</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_showBalloonWhenQueueEmpty</cstring> </property> @@ -395,7 +395,7 @@ <string>Only show when &queue is empty after transfer</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_showRetrySuccessBalloon</cstring> </property> diff --git a/kftpgrabber/src/ui/config_log.ui b/kftpgrabber/src/ui/config_log.ui index 9424672..c2490db 100644 --- a/kftpgrabber/src/ui/config_log.ui +++ b/kftpgrabber/src/ui/config_log.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>LogSettings</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>LogSettings</cstring> </property> @@ -22,11 +22,11 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>tabWidget5</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -37,7 +37,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox27</cstring> </property> @@ -48,7 +48,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout37</cstring> </property> @@ -56,7 +56,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel10</cstring> </property> @@ -64,14 +64,14 @@ <string>Font:</string> </property> </widget> - <widget class="KFontRequester"> + <widget class="TDEFontRequester"> <property name="name"> <cstring>kcfg_logFont</cstring> </property> </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout32</cstring> </property> @@ -79,7 +79,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel11</cstring> </property> @@ -105,7 +105,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout33</cstring> </property> @@ -113,7 +113,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel12</cstring> </property> @@ -139,7 +139,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout34</cstring> </property> @@ -147,7 +147,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel13</cstring> </property> @@ -173,7 +173,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout35</cstring> </property> @@ -181,7 +181,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel14</cstring> </property> @@ -207,7 +207,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout36</cstring> </property> @@ -215,7 +215,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel15</cstring> </property> @@ -262,7 +262,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -273,7 +273,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox28</cstring> </property> @@ -284,7 +284,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_saveToFile</cstring> </property> @@ -292,7 +292,7 @@ <string>&Save log to file</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout38</cstring> </property> @@ -300,7 +300,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel16</cstring> </property> @@ -343,7 +343,7 @@ </customwidgets> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>kfontrequester.h</includehint> + <includehint>tdefontrequester.h</includehint> <includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint> diff --git a/kftpgrabber/src/ui/config_transfers.ui b/kftpgrabber/src/ui/config_transfers.ui index 22c5b48..0ab693b 100644 --- a/kftpgrabber/src/ui/config_transfers.ui +++ b/kftpgrabber/src/ui/config_transfers.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>TransferSettings</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>TransferSettings</cstring> </property> @@ -22,11 +22,11 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>tabWidget4</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -37,7 +37,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox19</cstring> </property> @@ -48,7 +48,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_portForceIp</cstring> </property> @@ -56,7 +56,7 @@ <string>Force PORT/EPRT to &use configured IP</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout23</cstring> </property> @@ -64,7 +64,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -87,7 +87,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_ignoreExternalIpForLan</cstring> </property> @@ -97,7 +97,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox5</cstring> </property> @@ -108,7 +108,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_activeForcePort</cstring> </property> @@ -116,7 +116,7 @@ <string>Onl&y use ports from the specified port range</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout5</cstring> </property> @@ -124,7 +124,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -153,7 +153,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout6</cstring> </property> @@ -161,7 +161,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -192,7 +192,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox6</cstring> </property> @@ -203,7 +203,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout7</cstring> </property> @@ -211,7 +211,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -243,7 +243,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout8</cstring> </property> @@ -251,7 +251,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -285,7 +285,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox7</cstring> </property> @@ -296,7 +296,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout9</cstring> </property> @@ -304,7 +304,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -336,7 +336,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout10</cstring> </property> @@ -344,7 +344,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_3</cstring> </property> @@ -397,7 +397,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -408,7 +408,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox20</cstring> </property> @@ -419,7 +419,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_diskCheckSpace</cstring> </property> @@ -427,7 +427,7 @@ <string>Stop transfer if there is &not enough free space</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout24</cstring> </property> @@ -435,7 +435,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -458,7 +458,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout25</cstring> </property> @@ -466,7 +466,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel7</cstring> </property> @@ -513,7 +513,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -524,7 +524,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox23</cstring> </property> @@ -535,7 +535,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout27</cstring> </property> @@ -543,7 +543,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel9</cstring> </property> @@ -566,7 +566,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_threadUsePrimary</cstring> </property> @@ -595,7 +595,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -606,7 +606,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox8</cstring> </property> @@ -617,7 +617,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_failedAutoRetry</cstring> </property> @@ -625,7 +625,7 @@ <string>Automatically retry failed transfers</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout11</cstring> </property> @@ -633,7 +633,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_4</cstring> </property> @@ -658,7 +658,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox24</cstring> </property> @@ -669,7 +669,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_queueOnDND</cstring> </property> @@ -677,7 +677,7 @@ <string>&Queue files (instead of transferring) when "dragged && dropped"</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_skipEmptyDirs</cstring> </property> @@ -685,7 +685,7 @@ <string>Skip &empty directories when queueing</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_confirmDisconnects</cstring> </property> diff --git a/kftpgrabber/src/ui/kftpbookmarkeditortlswidget.ui b/kftpgrabber/src/ui/kftpbookmarkeditortlswidget.ui index 56ed590..bfbc56d 100644 --- a/kftpgrabber/src/ui/kftpbookmarkeditortlswidget.ui +++ b/kftpgrabber/src/ui/kftpbookmarkeditortlswidget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KFTPBookmarkEditorTLSWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KFTPBookmarkEditorTLSWidget</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -44,7 +44,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout5</cstring> </property> @@ -52,7 +52,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -100,7 +100,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox5</cstring> </property> @@ -111,7 +111,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>useCert</cstring> </property> @@ -119,7 +119,7 @@ <string>Use the following SSL certificate when connecting</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout4</cstring> </property> @@ -127,7 +127,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3</cstring> </property> diff --git a/kftpgrabber/src/ui/kftpbookmarkimportlayout.ui b/kftpgrabber/src/ui/kftpbookmarkimportlayout.ui index e181881..8c771cd 100644 --- a/kftpgrabber/src/ui/kftpbookmarkimportlayout.ui +++ b/kftpgrabber/src/ui/kftpbookmarkimportlayout.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KFTPBookmarkImportLayout</class> -<widget class="QWizard"> +<widget class="TQWizard"> <property name="name"> <cstring>KFTPBookmarkImportLayout</cstring> </property> @@ -15,7 +15,7 @@ <property name="caption"> <string>Bookmark Import Wizard</string> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>Step1</cstring> </property> @@ -26,7 +26,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>m_wizardPixmap</cstring> </property> @@ -40,7 +40,7 @@ <string>Image</string> </property> </widget> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> <cstring>layout6</cstring> </property> @@ -48,7 +48,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -76,7 +76,7 @@ </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -84,7 +84,7 @@ <string>Available import plugins:</string> </property> </widget> - <widget class="KListView"> + <widget class="TDEListView"> <column> <property name="text"> <string>Name</string> @@ -115,7 +115,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>Step2</cstring> </property> @@ -126,7 +126,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>m_wizardPixmap_2</cstring> </property> @@ -140,7 +140,7 @@ <string>Image</string> </property> </widget> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> <cstring>layout8</cstring> </property> @@ -148,7 +148,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -159,7 +159,7 @@ <set>WordBreak|AlignVCenter</set> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -193,7 +193,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>Step3</cstring> </property> @@ -204,7 +204,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>m_wizardPixmap_3</cstring> </property> @@ -218,7 +218,7 @@ <string>Image</string> </property> </widget> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> <cstring>layout9</cstring> </property> @@ -226,7 +226,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -234,7 +234,7 @@ <string>Please wait while the bookmarks are being imported.</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_2</cstring> </property> diff --git a/kftpgrabber/src/ui/kftpfilteraddpatternlayout.ui b/kftpgrabber/src/ui/kftpfilteraddpatternlayout.ui index fe02996..29190f2 100644 --- a/kftpgrabber/src/ui/kftpfilteraddpatternlayout.ui +++ b/kftpgrabber/src/ui/kftpfilteraddpatternlayout.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KFTPFilterAddPatternLayout</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KFTPFilterAddPatternLayout</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -44,7 +44,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>layout9</cstring> </property> @@ -52,7 +52,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout8</cstring> </property> @@ -60,7 +60,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -68,7 +68,7 @@ <string>Filename pattern:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -78,7 +78,7 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout7</cstring> </property> diff --git a/kftpgrabber/src/ui/kftpqueueeditorlayout.ui b/kftpgrabber/src/ui/kftpqueueeditorlayout.ui index 83ee815..a6ac5bd 100644 --- a/kftpgrabber/src/ui/kftpqueueeditorlayout.ui +++ b/kftpgrabber/src/ui/kftpqueueeditorlayout.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KFTPQueueEditorLayout</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KFTPQueueEditorLayout</cstring> </property> @@ -29,11 +29,11 @@ <cstring>srcPath</cstring> </property> </widget> - <widget class="QTabWidget" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQTabWidget" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>serverTab</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -44,7 +44,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -55,7 +55,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -63,7 +63,7 @@ <string>Server name:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -71,7 +71,7 @@ <string>Host:</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel7</cstring> </property> @@ -79,7 +79,7 @@ <string>Password:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -107,7 +107,7 @@ <cstring>srcPass</cstring> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>textLabel8</cstring> </property> @@ -115,7 +115,7 @@ <string>Port:</string> </property> </widget> - <widget class="QSpinBox" row="1" column="3"> + <widget class="TQSpinBox" row="1" column="3"> <property name="name"> <cstring>srcPort</cstring> </property> @@ -133,7 +133,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -144,7 +144,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox1_2</cstring> </property> @@ -155,7 +155,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel4_2</cstring> </property> @@ -163,7 +163,7 @@ <string>Server name:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel5_2</cstring> </property> @@ -171,7 +171,7 @@ <string>Host:</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel7_2</cstring> </property> @@ -179,7 +179,7 @@ <string>Password:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel6_2</cstring> </property> @@ -207,7 +207,7 @@ <cstring>dstPass</cstring> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>textLabel8_2</cstring> </property> @@ -215,7 +215,7 @@ <string>Port:</string> </property> </widget> - <widget class="QSpinBox" row="1" column="3"> + <widget class="TQSpinBox" row="1" column="3"> <property name="name"> <cstring>dstPort</cstring> </property> @@ -234,7 +234,7 @@ </grid> </widget> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -242,7 +242,7 @@ <string><b>Source:</b></string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -250,7 +250,7 @@ <string><b>Destination:</b></string> </property> </widget> - <widget class="QLabel" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -312,7 +312,7 @@ <verstretch>0</verstretch> </sizepolicy> <pixmap>image0</pixmap> - <signal>serverChanged(QDomNode server)</signal> + <signal>serverChanged(TQDomNode server)</signal> </customwidget> </customwidgets> <images> diff --git a/kftpgrabber/src/ui/kftpquickconnectlayout.ui b/kftpgrabber/src/ui/kftpquickconnectlayout.ui index 03648e6..1888c34 100644 --- a/kftpgrabber/src/ui/kftpquickconnectlayout.ui +++ b/kftpgrabber/src/ui/kftpquickconnectlayout.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KFTPQuickConnectLayout</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KFTPQuickConnectLayout</cstring> </property> @@ -33,11 +33,11 @@ <property name="margin"> <number>0</number> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>tabWidget7</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -48,7 +48,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -67,7 +67,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout8</cstring> </property> @@ -75,7 +75,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -116,7 +116,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -141,7 +141,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout6</cstring> </property> @@ -149,7 +149,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -181,7 +181,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout7</cstring> </property> @@ -189,7 +189,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -219,7 +219,7 @@ <string>Enter ftp's hostname</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -227,7 +227,7 @@ <string>Port:</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>portBox</cstring> </property> @@ -240,7 +240,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout8</cstring> </property> @@ -248,7 +248,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel4_2</cstring> </property> @@ -313,7 +313,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>anonLogin</cstring> </property> @@ -324,7 +324,7 @@ <string>Check for anonymous login</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout9</cstring> </property> @@ -332,7 +332,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -364,7 +364,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout10</cstring> </property> @@ -372,7 +372,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -404,7 +404,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>addBookmark</cstring> </property> @@ -433,7 +433,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -444,7 +444,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox14</cstring> </property> @@ -455,7 +455,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>layout23</cstring> </property> @@ -463,7 +463,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2</cstring> </property> diff --git a/kftpgrabber/src/ui/kftpsearchlayout.ui b/kftpgrabber/src/ui/kftpsearchlayout.ui index 8c25300..ef1402a 100644 --- a/kftpgrabber/src/ui/kftpsearchlayout.ui +++ b/kftpgrabber/src/ui/kftpsearchlayout.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KFTPSearchLayout</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KFTPSearchLayout</cstring> </property> @@ -28,7 +28,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -36,7 +36,7 @@ <string>Using this dialog, you can do massive replacing of source/destination paths of the queued transfers. <b>Changes cannot be undone.</b></string> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -47,7 +47,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -55,7 +55,7 @@ <string>Destination:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -63,7 +63,7 @@ <string>Source:</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>searchServer</cstring> </property> @@ -71,7 +71,7 @@ <string>Search only for transfers on specific server</string> </property> </widget> - <widget class="QGroupBox" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -85,7 +85,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel4_2</cstring> </property> @@ -93,7 +93,7 @@ <string>Server name:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -101,7 +101,7 @@ <string>Host:</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel7</cstring> </property> @@ -109,7 +109,7 @@ <string>Password:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -137,7 +137,7 @@ <cstring>searchServerPass</cstring> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>textLabel8</cstring> </property> @@ -145,7 +145,7 @@ <string>Port:</string> </property> </widget> - <widget class="QSpinBox" row="1" column="3"> + <widget class="TQSpinBox" row="1" column="3"> <property name="name"> <cstring>searchServerPort</cstring> </property> @@ -173,7 +173,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox3_2</cstring> </property> @@ -184,7 +184,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3_2</cstring> </property> @@ -192,7 +192,7 @@ <string>Destination:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -230,7 +230,7 @@ <verstretch>0</verstretch> </sizepolicy> <pixmap>image0</pixmap> - <signal>serverChanged(QDomNode server)</signal> + <signal>serverChanged(TQDomNode server)</signal> </customwidget> </customwidgets> <images> diff --git a/kftpgrabber/src/widgets/balloon.cpp b/kftpgrabber/src/widgets/balloon.cpp index eb10432..e2b135f 100644 --- a/kftpgrabber/src/widgets/balloon.cpp +++ b/kftpgrabber/src/widgets/balloon.cpp @@ -34,18 +34,18 @@ * files in the program, then also delete it here.
*/
-#include <qpointarray.h>
-#include <qpushbutton.h>
-#include <qtooltip.h>
-#include <qlayout.h>
-#include <qlabel.h>
+#include <ntqpointarray.h>
+#include <ntqpushbutton.h>
+#include <ntqtooltip.h>
+#include <ntqlayout.h>
+#include <ntqlabel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <kactivelabel.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include "widgets/balloon.h"
#include "misc.h"
@@ -54,21 +54,21 @@ using namespace KFTPGrabberBase; namespace KFTPWidgets {
-Balloon::Balloon(const QString &text, const QString &pix)
- : QWidget(0L, "KFTPBalloon", WStyle_StaysOnTop | WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WX11BypassWM)
+Balloon::Balloon(const TQString &text, const TQString &pix)
+ : TQWidget(0L, "KFTPBalloon", WStyle_StaysOnTop | WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WX11BypassWM)
{
setCaption("");
- QVBoxLayout *BalloonLayout = new QVBoxLayout(this, 22, KDialog::spacingHint(), "BalloonLayout");
+ TQVBoxLayout *BalloonLayout = new TQVBoxLayout(this, 22, KDialog::spacingHint(), "BalloonLayout");
// BEGIN Layout1
- QHBoxLayout *Layout1 = new QHBoxLayout(BalloonLayout, KDialog::spacingHint(), "Layout1");
+ TQHBoxLayout *Layout1 = new TQHBoxLayout(BalloonLayout, KDialog::spacingHint(), "Layout1");
KActiveLabel *caption = new KActiveLabel(text, this, "caption");
- caption->setPalette(QToolTip::palette());
- caption->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
+ caption->setPalette(TQToolTip::palette());
+ caption->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
if (!pix.isEmpty()) {
- QLabel *image = new QLabel(this, "mImage");
+ TQLabel *image = new TQLabel(this, "mImage");
image->setScaledContents(FALSE);
image->setPixmap(loadSmallPixmap(pix));
@@ -78,21 +78,21 @@ Balloon::Balloon(const QString &text, const QString &pix) Layout1->addWidget(caption);
// END Layout1
- setPalette(QToolTip::palette());
+ setPalette(TQToolTip::palette());
setAutoMask(true);
connect(caption, SIGNAL(clicked(int, int)), this, SIGNAL(signalBalloonClicked()));
- connect(caption, SIGNAL(linkClicked(const QString &)), this, SIGNAL(signalIgnoreButtonClicked()));
- connect(caption, SIGNAL(linkClicked(const QString &)), this, SLOT(deleteLater()));
+ connect(caption, SIGNAL(linkClicked(const TQString &)), this, SIGNAL(signalIgnoreButtonClicked()));
+ connect(caption, SIGNAL(linkClicked(const TQString &)), this, SLOT(deleteLater()));
}
-void Balloon::mousePressEvent(QMouseEvent *e)
+void Balloon::mousePressEvent(TQMouseEvent *e)
{
emit signalBalloonClicked();
e->accept();
}
-void Balloon::setAnchor(const QPoint &anchor)
+void Balloon::setAnchor(const TQPoint &anchor)
{
m_anchor = anchor;
updateMask();
@@ -100,21 +100,21 @@ void Balloon::setAnchor(const QPoint &anchor) void Balloon::updateMask()
{
- QRegion mask(10, 10, width() - 20, height() - 20);
-
- QPoint corners[8] = {
- QPoint(width() - 50, 10),
- QPoint(10, 10),
- QPoint(10, height() - 50),
- QPoint(width() - 50, height() - 50),
- QPoint(width() - 10, 10),
- QPoint(10, 10),
- QPoint(10, height() - 10),
- QPoint(width() - 10, height() - 10)
+ TQRegion mask(10, 10, width() - 20, height() - 20);
+
+ TQPoint corners[8] = {
+ TQPoint(width() - 50, 10),
+ TQPoint(10, 10),
+ TQPoint(10, height() - 50),
+ TQPoint(width() - 50, height() - 50),
+ TQPoint(width() - 10, 10),
+ TQPoint(10, 10),
+ TQPoint(10, height() - 10),
+ TQPoint(width() - 10, height() - 10)
};
for (int i = 0; i < 4; ++i) {
- QPointArray corner;
+ TQPointArray corner;
corner.makeArc(corners[i].x(), corners[i].y(), 40, 40, i * 16 * 90, 16 * 90);
corner.resize(corner.size() + 1);
corner.setPoint(corner.size() - 1, corners[i + 4]);
@@ -123,15 +123,15 @@ void Balloon::updateMask() // get screen-geometry for screen our anchor is on
// (geometry can differ from screen to screen!)
- QRect deskRect = KGlobalSettings::desktopGeometry(m_anchor);
+ TQRect deskRect = TDEGlobalSettings::desktopGeometry(m_anchor);
bool bottom = (m_anchor.y() + height()) > (deskRect.height() - 48);
bool right = (m_anchor.x() + width()) > (deskRect.width() - 48);
- QPointArray arrow(4);
- arrow.setPoint(0, QPoint(right ? width() : 0, bottom ? height() : 0));
- arrow.setPoint(1, QPoint(right ? width() - 10 : 10, bottom ? height() - 30 : 30));
- arrow.setPoint(2, QPoint(right ? width() - 30 : 30, bottom ? height() - 10 : 10));
+ TQPointArray arrow(4);
+ arrow.setPoint(0, TQPoint(right ? width() : 0, bottom ? height() : 0));
+ arrow.setPoint(1, TQPoint(right ? width() - 10 : 10, bottom ? height() - 30 : 30));
+ arrow.setPoint(2, TQPoint(right ? width() - 30 : 30, bottom ? height() - 10 : 10));
arrow.setPoint(3, arrow[0]);
mask += arrow;
setMask(mask);
diff --git a/kftpgrabber/src/widgets/balloon.h b/kftpgrabber/src/widgets/balloon.h index c123ae7..502452c 100644 --- a/kftpgrabber/src/widgets/balloon.h +++ b/kftpgrabber/src/widgets/balloon.h @@ -37,7 +37,7 @@ #ifndef KFTPWIDGETSBALLOON_H #define KFTPWIDGETSBALLOON_H -#include <qwidget.h> +#include <ntqwidget.h> namespace KFTPWidgets { @@ -48,7 +48,7 @@ namespace KFTPWidgets { * @author Malte Starostik <malte@kde.org> * @author Duncan Mac-Vicar Prett <duncan@kde.org> */ -class Balloon : public QWidget +class Balloon : public TQWidget { Q_OBJECT public: @@ -58,19 +58,19 @@ public: * @param text The text to display inside the balloon * @param pic Name of the pixmap to display inside the balloon */ - Balloon(const QString &text, const QString &pic); + Balloon(const TQString &text, const TQString &pic); /** * Set widget anchor. * * @param anchor Anchor coordinates */ - void setAnchor(const QPoint &anchor); + void setAnchor(const TQPoint &anchor); /** * Intercept mouse press events. */ - void mousePressEvent(QMouseEvent *e); + void mousePressEvent(TQMouseEvent *e); signals: void signalButtonClicked(); void signalIgnoreButtonClicked(); @@ -78,7 +78,7 @@ signals: protected: void updateMask(); private: - QPoint m_anchor; + TQPoint m_anchor; }; } diff --git a/kftpgrabber/src/widgets/bookmarks/editor.cpp b/kftpgrabber/src/widgets/bookmarks/editor.cpp index 88ba05c..d5bc467 100644 --- a/kftpgrabber/src/widgets/bookmarks/editor.cpp +++ b/kftpgrabber/src/widgets/bookmarks/editor.cpp @@ -34,28 +34,28 @@ * files in the program, then also delete it here. */ -#include <qlayout.h> -#include <qpushbutton.h> -#include <qcheckbox.h> -#include <qgroupbox.h> -#include <qspinbox.h> -#include <qsplitter.h> -#include <qtextedit.h> -#include <qtabwidget.h> - -#include <kglobal.h> +#include <ntqlayout.h> +#include <ntqpushbutton.h> +#include <ntqcheckbox.h> +#include <ntqgroupbox.h> +#include <ntqspinbox.h> +#include <ntqsplitter.h> +#include <ntqtextedit.h> +#include <ntqtabwidget.h> + +#include <tdeglobal.h> #include <kcharsets.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <klineedit.h> #include <kpassdlg.h> -#include <kmessagebox.h> -#include <kpopupmenu.h> +#include <tdemessagebox.h> +#include <tdepopupmenu.h> #include <kcombobox.h> #include <kurlrequester.h> #include <kguiitem.h> -#include <kfiledialog.h> -#include <kio/job.h> +#include <tdefiledialog.h> +#include <tdeio/job.h> #include "kftpapi.h" #include "kftpbookmarks.h" @@ -73,12 +73,12 @@ namespace KFTPWidgets { namespace Bookmarks { -KActionCollection *BookmarkEditor::actionCollection() +TDEActionCollection *BookmarkEditor::actionCollection() { return KFTPAPI::getInstance()->mainWindow()->actionCollection(); } -BookmarkEditor::BookmarkEditor(QWidget *parent, const char *name) +BookmarkEditor::BookmarkEditor(TQWidget *parent, const char *name) : KDialogBase(parent, name, true, "FTP Bookmark Editor", User2|User1|Ok|Apply|Cancel, Ok, true, KGuiItem(i18n("Import...")), KGuiItem(i18n("Export..."))), m_activeSite(0), m_activeItem(0L), @@ -87,9 +87,9 @@ BookmarkEditor::BookmarkEditor(QWidget *parent, const char *name) // We operate on a copy of the bookmarks m_bookmarks = new KFTPBookmarks::Manager(*KFTPBookmarks::Manager::self()); - QHBoxLayout *winLayout = new QHBoxLayout(this, 0, KDialog::spacingHint()); + TQHBoxLayout *winLayout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); - QSplitter *splitter = new QSplitter(this); + TQSplitter *splitter = new TQSplitter(this); setMainWidget(splitter); winLayout->addWidget(splitter); @@ -103,7 +103,7 @@ BookmarkEditor::BookmarkEditor(QWidget *parent, const char *name) connect(this, SIGNAL(user1Clicked()), this, SLOT(slotImportWizard())); connect(this, SIGNAL(user2Clicked()), this, SLOT(slotExportWizard())); - connect(m_tree, SIGNAL(bookmarkClicked(QListViewItem*)), this, SLOT(slotTreeClicked(QListViewItem*))); + connect(m_tree, SIGNAL(bookmarkClicked(TQListViewItem*)), this, SLOT(slotTreeClicked(TQListViewItem*))); connect(m_tree, SIGNAL(bookmarkNew(ListViewItem*, KFTPBookmarks::Site*)), this, SLOT(slotNewAction(ListViewItem*, KFTPBookmarks::Site*))); connect(m_tree, SIGNAL(bookmarkDuplicated(ListViewItem*, KFTPBookmarks::Site*)), this, SLOT(slotDuplicateAction(ListViewItem*, KFTPBookmarks::Site*))); connect(m_tree, SIGNAL(bookmarkDeleted()), this, SLOT(slotDeleteAction())); @@ -114,7 +114,7 @@ BookmarkEditor::BookmarkEditor(QWidget *parent, const char *name) m_tree->fillBookmarkData(); } -BookmarkEditor::BookmarkEditor(ListViewItem *item, QWidget *parent, const char *name) +BookmarkEditor::BookmarkEditor(ListViewItem *item, TQWidget *parent, const char *name) : KDialogBase(parent, name, true, i18n("FTP Bookmark Editor"), Ok|Apply|Cancel, Ok, true), m_activeSite(0), m_activeItem(item), @@ -126,7 +126,7 @@ BookmarkEditor::BookmarkEditor(ListViewItem *item, QWidget *parent, const char * // We operate on a copy of the bookmarks m_bookmarks = new KFTPBookmarks::Manager(*KFTPBookmarks::Manager::self()); - QHBoxLayout *winLayout = new QHBoxLayout(this, 0, KDialog::spacingHint()); + TQHBoxLayout *winLayout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); m_properties = new BookmarkProperties(this); setMainWidget(m_properties); @@ -164,7 +164,7 @@ void BookmarkEditor::initDialog() connect(this, SIGNAL(okClicked()), this, SLOT(slotSaveActiveNode())); // Populate charsets - QStringList charsets = KGlobal::charsets()->descriptiveEncodingNames(); + TQStringList charsets = TDEGlobal::charsets()->descriptiveEncodingNames(); m_properties->serverEncoding->insertStringList(charsets); // Deactivate everything until an item gets selected @@ -181,7 +181,7 @@ void BookmarkEditor::slotImportWizard() { ImportWizard *wizard = new ImportWizard(this); - if (wizard->exec() == QDialog::Accepted) { + if (wizard->exec() == TQDialog::Accepted) { // Refresh bookmarks m_bookmarks->setBookmarks(KFTPBookmarks::Manager::self()); @@ -198,12 +198,12 @@ void BookmarkEditor::slotExportWizard() return; } - QString savePath = KFileDialog::getSaveFileName(QString::null, "*.xml|KFTPGrabber Bookmarks", 0, i18n("Export Bookmarks")); + TQString savePath = KFileDialog::getSaveFileName(TQString::null, "*.xml|KFTPGrabber Bookmarks", 0, i18n("Export Bookmarks")); if (!savePath.isEmpty()) { // Save and copy the bookmarks KFTPBookmarks::Manager::self()->save(); - KIO::copy(KURL(getStoreDir("bookmarks.xml")), KURL(savePath), false); + TDEIO::copy(KURL(getStoreDir("bookmarks.xml")), KURL(savePath), false); } } @@ -254,7 +254,7 @@ void BookmarkEditor::slotSaveActiveNode() m_activeSite->setProperty("username", m_properties->downUser->text()); m_activeSite->setProperty("password", encodePassword(m_properties->downPass->password())); - m_activeSite->setProperty("encoding", KGlobal::charsets()->encodingForName(m_properties->serverEncoding->currentText())); + m_activeSite->setProperty("encoding", TDEGlobal::charsets()->encodingForName(m_properties->serverEncoding->currentText())); // Only save the local dir if it differs from the default one if (m_properties->defLocalDir->url() != KFTPCore::Config::defLocalDir()) @@ -322,7 +322,7 @@ void BookmarkEditor::showActiveNode() m_properties->downUser->setText(m_activeSite->getProperty("username")); m_properties->downPass->insert(m_activeSite->getProperty("password")); - QString defLocalPath = m_activeSite->getProperty("deflocalpath"); + TQString defLocalPath = m_activeSite->getProperty("deflocalpath"); if (defLocalPath.isEmpty()) defLocalPath = KFTPCore::Config::defLocalDir(); @@ -355,11 +355,11 @@ void BookmarkEditor::showActiveNode() m_properties->keepaliveTimeout->setValue(60); } - QString serverEncoding = m_activeSite->getProperty("encoding"); + TQString serverEncoding = m_activeSite->getProperty("encoding"); if (serverEncoding.isEmpty()) serverEncoding = KFTPCore::Config::defEncoding(); - serverEncoding = QString("%1 ( %2 )").arg(KGlobal::charsets()->languageForEncoding(serverEncoding)).arg(serverEncoding); + serverEncoding = TQString("%1 ( %2 )").arg(TDEGlobal::charsets()->languageForEncoding(serverEncoding)).arg(serverEncoding); m_properties->serverEncoding->setCurrentText(serverEncoding); m_properties->disablePASV->setChecked(m_activeSite->getIntProperty("disablePASV")); @@ -370,7 +370,7 @@ void BookmarkEditor::showActiveNode() m_properties->statListings->setChecked(m_activeSite->getIntProperty("statListings")); } -void BookmarkEditor::slotTreeClicked(QListViewItem *item) +void BookmarkEditor::slotTreeClicked(TQListViewItem *item) { m_activeItem = static_cast<ListViewItem*>(item); @@ -405,7 +405,7 @@ void BookmarkEditor::slotChangeActiveKeepaliveGroup() void BookmarkEditor::slotChangeAnonLogin() { - static QString tmpUser, tmpPass; + static TQString tmpUser, tmpPass; if (m_properties->anonLogin->isChecked()) { m_properties->downUser->setEnabled(false); @@ -434,7 +434,7 @@ void BookmarkEditor::slotProtoAdvancedClicked() // Initialize dialog int mode = m_activeSite->getIntProperty("tls_data_mode"); bool useCert = m_activeSite->getIntProperty("use_cert"); - QString certPath = m_activeSite->getProperty("tls_cert_path"); + TQString certPath = m_activeSite->getProperty("tls_cert_path"); tlsDialog->setTLSMode(mode); tlsDialog->setCertChecked(useCert); diff --git a/kftpgrabber/src/widgets/bookmarks/editor.h b/kftpgrabber/src/widgets/bookmarks/editor.h index 50b04aa..f2aa9b0 100644 --- a/kftpgrabber/src/widgets/bookmarks/editor.h +++ b/kftpgrabber/src/widgets/bookmarks/editor.h @@ -39,11 +39,11 @@ #include "ui/bookmark_properties.h" -#include <kaction.h> +#include <tdeaction.h> #include <kdialogbase.h> -#include <qlistview.h> -#include <qdom.h> +#include <ntqlistview.h> +#include <ntqdom.h> namespace KFTPBookmarks { class Manager; @@ -64,8 +64,8 @@ class BookmarkEditor : public KDialogBase { Q_OBJECT public: - BookmarkEditor(QWidget *parent = 0, const char *name = 0); - BookmarkEditor(ListViewItem *item, QWidget *parent = 0, const char *name = 0); + BookmarkEditor(TQWidget *parent = 0, const char *name = 0); + BookmarkEditor(ListViewItem *item, TQWidget *parent = 0, const char *name = 0); ~BookmarkEditor(); private: enum BookmarkType { @@ -91,12 +91,12 @@ private: bool m_portChanged; /* Actions */ - KAction *m_newAction; - KAction *m_renameAction; - KAction *m_deleteAction; - KAction *m_subCatAction; - KAction *m_copyAction; - KActionCollection *actionCollection(); + TDEAction *m_newAction; + TDEAction *m_renameAction; + TDEAction *m_deleteAction; + TDEAction *m_subCatAction; + TDEAction *m_copyAction; + TDEActionCollection *actionCollection(); // Some common stuff for the constructors void initDialog(); @@ -118,7 +118,7 @@ private slots: void slotChangeServerProtocol(int item); void slotPortChanged(); - void slotTreeClicked(QListViewItem *item); + void slotTreeClicked(TQListViewItem *item); void slotImportWizard(); void slotExportWizard(); diff --git a/kftpgrabber/src/widgets/bookmarks/editortls.cpp b/kftpgrabber/src/widgets/bookmarks/editortls.cpp index c299288..da8d898 100644 --- a/kftpgrabber/src/widgets/bookmarks/editortls.cpp +++ b/kftpgrabber/src/widgets/bookmarks/editortls.cpp @@ -34,10 +34,10 @@ * files in the program, then also delete it here. */ -#include <qcheckbox.h> +#include <ntqcheckbox.h> #include <kcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurlrequester.h> #include "kftpapi.h" @@ -51,12 +51,12 @@ namespace KFTPWidgets { namespace Bookmarks { -KActionCollection *BookmarkEditorTLS::actionCollection() +TDEActionCollection *BookmarkEditorTLS::actionCollection() { return KFTPAPI::getInstance()->mainWindow()->actionCollection(); } -BookmarkEditorTLS::BookmarkEditorTLS(QWidget *parent, const char *name) +BookmarkEditorTLS::BookmarkEditorTLS(TQWidget *parent, const char *name) : KDialogBase(parent, name) { m_mainWidget = new KFTPBookmarkEditorTLSWidget(this); @@ -88,7 +88,7 @@ bool BookmarkEditorTLS::isCertChecked() return m_mainWidget->useCert->isChecked(); } -QString BookmarkEditorTLS::getCertPath() +TQString BookmarkEditorTLS::getCertPath() { return m_mainWidget->certPath->url(); } @@ -103,7 +103,7 @@ void BookmarkEditorTLS::setCertChecked(const bool checked) m_mainWidget->useCert->setChecked(checked); } -void BookmarkEditorTLS::setCertPath(const QString &path) +void BookmarkEditorTLS::setCertPath(const TQString &path) { m_mainWidget->certPath->setURL(path); } diff --git a/kftpgrabber/src/widgets/bookmarks/editortls.h b/kftpgrabber/src/widgets/bookmarks/editortls.h index 3325946..f10243c 100644 --- a/kftpgrabber/src/widgets/bookmarks/editortls.h +++ b/kftpgrabber/src/widgets/bookmarks/editortls.h @@ -40,11 +40,11 @@ #include "editor.h" #include "kftpbookmarkeditortlswidget.h" -#include <kaction.h> +#include <tdeaction.h> #include <kdialogbase.h> -#include <qlistview.h> -#include <qdom.h> +#include <ntqlistview.h> +#include <ntqdom.h> namespace KFTPWidgets { @@ -57,23 +57,23 @@ class BookmarkEditorTLS : public KDialogBase { Q_OBJECT public: - BookmarkEditorTLS(QWidget *parent = 0, const char *name = 0); + BookmarkEditorTLS(TQWidget *parent = 0, const char *name = 0); ~BookmarkEditorTLS(); int getTLSMode(); bool isCertChecked(); - QString getCertPath(); + TQString getCertPath(); void setTLSMode(int mode); void setCertChecked(const bool checked); - void setCertPath(const QString &path); + void setCertPath(const TQString &path); private: - QDomNode m_activeNode; - QDomNode m_activeCategory; + TQDomNode m_activeNode; + TQDomNode m_activeCategory; KFTPBookmarkEditorTLSWidget *m_mainWidget; - KActionCollection *actionCollection(); + TDEActionCollection *actionCollection(); public slots: void slotChangeActiveX509Group(); }; diff --git a/kftpgrabber/src/widgets/bookmarks/importwizard.cpp b/kftpgrabber/src/widgets/bookmarks/importwizard.cpp index aa30bee..a40b07f 100644 --- a/kftpgrabber/src/widgets/bookmarks/importwizard.cpp +++ b/kftpgrabber/src/widgets/bookmarks/importwizard.cpp @@ -40,12 +40,12 @@ #include "misc.h" #include "kftpbookmarks.h" -#include <qfileinfo.h> -#include <qlabel.h> +#include <ntqfileinfo.h> +#include <ntqlabel.h> #include <kurlrequester.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kprogress.h> #include <kstandarddirs.h> @@ -55,26 +55,26 @@ namespace KFTPWidgets { namespace Bookmarks { -PluginListItem::PluginListItem(KListView *parent, KService::Ptr service) - : KListViewItem(parent, service->name(), service->comment()), m_service(service) +PluginListItem::PluginListItem(TDEListView *parent, KService::Ptr service) + : TDEListViewItem(parent, service->name(), service->comment()), m_service(service) { setPixmap(0, loadSmallPixmap("filter")); } -ImportWizard::ImportWizard(QWidget *parent, const char *name) +ImportWizard::ImportWizard(TQWidget *parent, const char *name) : KFTPBookmarkImportLayout(parent, name) { m_pluginList->setFullWidth(true); m_pluginList->setAllColumnsShowFocus(true); - connect(m_pluginList, SIGNAL(clicked(QListViewItem*)), this, SLOT(slotPluginsSelectionChanged(QListViewItem*))); + connect(m_pluginList, SIGNAL(clicked(TQListViewItem*)), this, SLOT(slotPluginsSelectionChanged(TQListViewItem*))); setNextEnabled(Step1, false); // Set pixmap - QString pixmapPath = locate("appdata", "kftpgrabber-bi-wizard.png"); + TQString pixmapPath = locate("appdata", "kftpgrabber-bi-wizard.png"); if (!pixmapPath.isNull()) { - QPixmap pix(pixmapPath); + TQPixmap pix(pixmapPath); m_wizardPixmap->setPixmap(pix); m_wizardPixmap_2->setPixmap(pix); @@ -104,13 +104,13 @@ void ImportWizard::next() } } else if (currentPage() == Step2) { // Check if the file exists - if (!QFileInfo(m_importUrl->url()).exists() || !QFileInfo(m_importUrl->url()).isReadable()) { + if (!TQFileInfo(m_importUrl->url()).exists() || !TQFileInfo(m_importUrl->url()).isReadable()) { KMessageBox::error(0, i18n("The selected file does not exist or is not readable.")); return; } } - QWizard::next(); + TQWizard::next(); if (currentPage() == Step3) { // Start the import @@ -138,17 +138,17 @@ void ImportWizard::slotImportProgress(int progress) void ImportWizard::displayPluginList() { - KTrader::OfferList plugins = KFTPAPI::getInstance()->pluginManager()->getImportPlugins(); + TDETrader::OfferList plugins = KFTPAPI::getInstance()->pluginManager()->getImportPlugins(); - KTrader::OfferList::ConstIterator end(plugins.end()); - for (KTrader::OfferList::ConstIterator i(plugins.begin()); i != end; ++i) { + TDETrader::OfferList::ConstIterator end(plugins.end()); + for (TDETrader::OfferList::ConstIterator i(plugins.begin()); i != end; ++i) { KService::Ptr service = *i; new PluginListItem(m_pluginList, service); } } -void ImportWizard::slotPluginsSelectionChanged(QListViewItem *i) +void ImportWizard::slotPluginsSelectionChanged(TQListViewItem *i) { if (i) { PluginListItem *item = static_cast<PluginListItem*>(i); diff --git a/kftpgrabber/src/widgets/bookmarks/importwizard.h b/kftpgrabber/src/widgets/bookmarks/importwizard.h index 9b74dd3..956991a 100644 --- a/kftpgrabber/src/widgets/bookmarks/importwizard.h +++ b/kftpgrabber/src/widgets/bookmarks/importwizard.h @@ -38,8 +38,8 @@ #include "kftpbookmarkimportlayout.h" -#include <kparts/componentfactory.h> -#include <klistview.h> +#include <tdeparts/componentfactory.h> +#include <tdelistview.h> class KFTPBookmarkImportPlugin; @@ -47,11 +47,11 @@ namespace KFTPWidgets { namespace Bookmarks { -class PluginListItem : public KListViewItem +class PluginListItem : public TDEListViewItem { friend class ImportWizard; public: - PluginListItem(KListView *parent, KService::Ptr service); + PluginListItem(TDEListView *parent, KService::Ptr service); private: KService::Ptr m_service; }; @@ -65,7 +65,7 @@ class ImportWizard : public KFTPBookmarkImportLayout { Q_OBJECT public: - ImportWizard(QWidget *parent = 0, const char *name = 0); + ImportWizard(TQWidget *parent = 0, const char *name = 0); private: KService::Ptr m_service; KFTPBookmarkImportPlugin *m_plugin; @@ -75,7 +75,7 @@ private slots: virtual void next(); void slotImportProgress(int progress); - void slotPluginsSelectionChanged(QListViewItem *i); + void slotPluginsSelectionChanged(TQListViewItem *i); }; } diff --git a/kftpgrabber/src/widgets/bookmarks/listview.cpp b/kftpgrabber/src/widgets/bookmarks/listview.cpp index 4349604..e90ab06 100644 --- a/kftpgrabber/src/widgets/bookmarks/listview.cpp +++ b/kftpgrabber/src/widgets/bookmarks/listview.cpp @@ -40,14 +40,14 @@ #include "kftpsession.h" #include "misc.h" -#include <qdragobject.h> +#include <ntqdragobject.h> -#include <kaction.h> +#include <tdeaction.h> #include <kinputdialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> -#include <kio/passdlg.h> +#include <tdeio/passdlg.h> using namespace KFTPGrabberBase; @@ -55,17 +55,17 @@ namespace KFTPWidgets { namespace Bookmarks { -ListViewItem::ListViewItem(QListView *parent, const QString &t1) - : KListViewItem(parent, t1) +ListViewItem::ListViewItem(TQListView *parent, const TQString &t1) + : TDEListViewItem(parent, t1) { } -ListViewItem::ListViewItem(QListViewItem *parent, const QString &t1) - : KListViewItem(parent, t1) +ListViewItem::ListViewItem(TQListViewItem *parent, const TQString &t1) + : TDEListViewItem(parent, t1) { } -int ListViewItem::compare(QListViewItem *i, int col, bool) const +int ListViewItem::compare(TQListViewItem *i, int col, bool) const { if (m_type != static_cast<ListViewItem*>(i)->m_type) { if (m_type == 0) @@ -74,10 +74,10 @@ int ListViewItem::compare(QListViewItem *i, int col, bool) const return 1; // server } - return KListViewItem::compare(i, col, false); + return TDEListViewItem::compare(i, col, false); } -ListView::ListView(KFTPBookmarks::Manager *bookmarks, QWidget *parent, const char *name) +ListView::ListView(KFTPBookmarks::Manager *bookmarks, TQWidget *parent, const char *name) : KFTPWidgets::ListView(parent, name), m_autoUpdate(false), m_connectBookmark(false), @@ -101,22 +101,22 @@ ListView::ListView(KFTPBookmarks::Manager *bookmarks, QWidget *parent, const cha setDropVisualizer(false); // Init auto open timer - m_openTimer = new QTimer(this); + m_openTimer = new TQTimer(this); - connect(this, SIGNAL(dropped(QDropEvent*, QListViewItem*)), this, SLOT(slotDropped(QDropEvent*, QListViewItem*))); - connect(this, SIGNAL(clicked(QListViewItem*)), this, SLOT(slotClicked(QListViewItem*))); - connect(this, SIGNAL(doubleClicked(QListViewItem*)), this, SLOT(slotDoubleClicked(QListViewItem*))); - connect(this, SIGNAL(contextMenuRequested(QListViewItem*, const QPoint&, int)), this, SLOT(slotContextMenu(QListViewItem*, const QPoint&, int))); + connect(this, SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), this, SLOT(slotDropped(TQDropEvent*, TQListViewItem*))); + connect(this, SIGNAL(clicked(TQListViewItem*)), this, SLOT(slotClicked(TQListViewItem*))); + connect(this, SIGNAL(doubleClicked(TQListViewItem*)), this, SLOT(slotDoubleClicked(TQListViewItem*))); + connect(this, SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), this, SLOT(slotContextMenu(TQListViewItem*, const TQPoint&, int))); /* Init the actions */ - m_newAction = new KAction(i18n("&New..."), "filenew", KShortcut(), this, SLOT(slotNewAction()), actionCollection(), "bookmark_new"); - m_renameAction = new KAction(i18n("&Rename"), KShortcut(), this, SLOT(slotRenameAction()), actionCollection(), "bookmark_rename"); - m_deleteAction = new KAction(i18n("&Delete"), "editdelete", KShortcut(), this, SLOT(slotDeleteAction()), actionCollection(), "bookmark_delete"); - m_subCatAction = new KAction(i18n("&Create Subcategory..."), "folder_new", KShortcut(), this, SLOT(slotSubCatAction()), actionCollection(), "bookmark_subcat"); - m_copyAction = new KAction(i18n("&Duplicate"), KShortcut(), this, SLOT(slotDuplicateAction()), actionCollection(), "bookmark_duplicate"); + m_newAction = new TDEAction(i18n("&New..."), "filenew", TDEShortcut(), this, SLOT(slotNewAction()), actionCollection(), "bookmark_new"); + m_renameAction = new TDEAction(i18n("&Rename"), TDEShortcut(), this, SLOT(slotRenameAction()), actionCollection(), "bookmark_rename"); + m_deleteAction = new TDEAction(i18n("&Delete"), "editdelete", TDEShortcut(), this, SLOT(slotDeleteAction()), actionCollection(), "bookmark_delete"); + m_subCatAction = new TDEAction(i18n("&Create Subcategory..."), "folder_new", TDEShortcut(), this, SLOT(slotSubCatAction()), actionCollection(), "bookmark_subcat"); + m_copyAction = new TDEAction(i18n("&Duplicate"), TDEShortcut(), this, SLOT(slotDuplicateAction()), actionCollection(), "bookmark_duplicate"); } -KActionCollection *ListView::actionCollection() +TDEActionCollection *ListView::actionCollection() { return KFTPAPI::getInstance()->mainWindow()->actionCollection(); } @@ -136,7 +136,7 @@ void ListView::setConnectBookmark(bool value) m_connectBookmark = value; if (value) - connect(this, SIGNAL(executed(QListViewItem*)), this, SLOT(slotBookmarkExecuted(QListViewItem*))); + connect(this, SIGNAL(executed(TQListViewItem*)), this, SLOT(slotBookmarkExecuted(TQListViewItem*))); } void ListView::setEditMenuItem(bool value) @@ -144,7 +144,7 @@ void ListView::setEditMenuItem(bool value) m_editMenuItem = value; } -void ListView::slotBookmarkExecuted(QListViewItem *item) +void ListView::slotBookmarkExecuted(TQListViewItem *item) { if (!item || !m_connectBookmark || static_cast<ListViewItem*>(item)->m_type == BT_CATEGORY) return; @@ -154,8 +154,8 @@ void ListView::slotBookmarkExecuted(QListViewItem *item) // Handle empty usernames and passwords for non-anonymous sites if (!siteUrl.hasUser() || !siteUrl.hasPass() && siteUrl.user() != "anonymous") { - KIO::PasswordDialog *dlg = new KIO::PasswordDialog(i18n("Please provide your username and password for connecting to this site."), siteUrl.user(), true); - dlg->addCommentLine(i18n("Site:"), QString("%1:%2").arg(siteUrl.host()).arg(siteUrl.port())); + TDEIO::PasswordDialog *dlg = new TDEIO::PasswordDialog(i18n("Please provide your username and password for connecting to this site."), siteUrl.user(), true); + dlg->addCommentLine(i18n("Site:"), TQString("%1:%2").arg(siteUrl.host()).arg(siteUrl.port())); if (dlg->exec() == KDialogBase::Accepted) { siteUrl.setUser(dlg->username()); @@ -188,34 +188,34 @@ void ListView::slotAutoUpdate() } } -QDragObject *ListView::dragObject() +TQDragObject *ListView::dragObject() { // Determine hotspot and pixmap - QPoint hotspot; - QPixmap pixmap = *selectedItem()->pixmap(0); + TQPoint hotspot; + TQPixmap pixmap = *selectedItem()->pixmap(0); hotspot.setX(pixmap.width() / 2); hotspot.setY(pixmap.height() / 2); - QString id = static_cast<ListViewItem*>(selectedItem())->m_site->id(); - m_dragObject = new QStoredDrag("application/x-qlistviewitem", this); - QByteArray data; - QDataStream arg(data, IO_WriteOnly); + TQString id = static_cast<ListViewItem*>(selectedItem())->m_site->id(); + m_dragObject = new TQStoredDrag("application/x-qlistviewitem", this); + TQByteArray data; + TQDataStream arg(data, IO_WriteOnly); arg << id; // Start the drag - static_cast<QStoredDrag*>(m_dragObject)->setEncodedData(data); + static_cast<TQStoredDrag*>(m_dragObject)->setEncodedData(data); m_dragObject->setPixmap(pixmap, hotspot); return m_dragObject; } -bool ListView::acceptDrag(QDropEvent *e) const +bool ListView::acceptDrag(TQDropEvent *e) const { // If it is a local drag, accept it - return e->source() == static_cast<QWidget*>(const_cast<ListView*>(this)); + return e->source() == static_cast<TQWidget*>(const_cast<ListView*>(this)); } -void ListView::contentsDragEnterEvent(QDragEnterEvent *e) +void ListView::contentsDragEnterEvent(TQDragEnterEvent *e) { if (!acceptDrag(e)) { e->ignore(); @@ -224,7 +224,7 @@ void ListView::contentsDragEnterEvent(QDragEnterEvent *e) e->acceptAction(); m_currentBeforeDropItem = selectedItem(); - QListViewItem *item = itemAt(contentsToViewport(e->pos())); + TQListViewItem *item = itemAt(contentsToViewport(e->pos())); if (item) { m_dropItem = item; @@ -234,7 +234,7 @@ void ListView::contentsDragEnterEvent(QDragEnterEvent *e) } } -void ListView::contentsDragMoveEvent(QDragMoveEvent *e) +void ListView::contentsDragMoveEvent(TQDragMoveEvent *e) { if (!acceptDrag(e)) { e->ignore(); @@ -242,7 +242,7 @@ void ListView::contentsDragMoveEvent(QDragMoveEvent *e) } e->acceptAction(); - QListViewItem *item = itemAt(contentsToViewport(e->pos())); + TQListViewItem *item = itemAt(contentsToViewport(e->pos())); if (item) { setSelected(item, true); if (item != m_dropItem) { @@ -260,7 +260,7 @@ void ListView::contentsDragMoveEvent(QDragMoveEvent *e) } } -void ListView::contentsDragLeaveEvent(QDragLeaveEvent*) +void ListView::contentsDragLeaveEvent(TQDragLeaveEvent*) { if (m_currentBeforeDropItem) { setSelected(m_currentBeforeDropItem, true); @@ -282,12 +282,12 @@ void ListView::slotOpenTimer() } } -void ListView::slotDropped(QDropEvent *e, QListViewItem*) +void ListView::slotDropped(TQDropEvent *e, TQListViewItem*) { KFTPBookmarks::Site *parentSite = 0L; if (selectedItem()) { - QListViewItem *newParent = 0L; + TQListViewItem *newParent = 0L; // Get the new path if (static_cast<ListViewItem*>(selectedItem())->m_type == 0) @@ -303,10 +303,10 @@ void ListView::slotDropped(QDropEvent *e, QListViewItem*) parentSite = m_bookmarks->findCategory("root"); } - QString id; + TQString id; // Decode the data - QDataStream arg(e->encodedData("application/x-qlistviewitem"), IO_ReadOnly); + TQDataStream arg(e->encodedData("application/x-qlistviewitem"), IO_ReadOnly); arg >> id; // Move the site @@ -325,7 +325,7 @@ void ListView::fillBookmarkData() m_bookmarks->guiPopulateBookmarksTree(this); } -void ListView::slotClicked(QListViewItem *item) +void ListView::slotClicked(TQListViewItem *item) { m_activeItem = static_cast<ListViewItem*>(item); @@ -344,7 +344,7 @@ void ListView::slotClicked(QListViewItem *item) emit bookmarkClicked(item); } -void ListView::slotDoubleClicked(QListViewItem *item) +void ListView::slotDoubleClicked(TQListViewItem *item) { if (!item) return; @@ -364,7 +364,7 @@ void ListView::slotRenameAction() KFTPBookmarks::Site *site = item->m_site; bool ok; - QString newName = KInputDialog::getText(i18n("Category Name"), i18n("Rename category:"), item->text(0), &ok, this); + TQString newName = KInputDialog::getText(i18n("Category Name"), i18n("Rename category:"), item->text(0), &ok, this); if (ok) { // Ok, let's rename it @@ -380,7 +380,7 @@ void ListView::slotSubCatAction() KFTPBookmarks::Site *site = item ? item->m_site : m_bookmarks->findCategory("root"); bool ok; - QString newName = KInputDialog::getText(i18n("New Category Name"), i18n("New category:"), "", &ok, this); + TQString newName = KInputDialog::getText(i18n("New Category Name"), i18n("New category:"), "", &ok, this); if (ok) { // Let's create the sub category @@ -491,11 +491,11 @@ void ListView::slotDeleteAction() emit bookmarkDeleted(); } -void ListView::slotContextMenu(QListViewItem *item, const QPoint &pos, int) +void ListView::slotContextMenu(TQListViewItem *item, const TQPoint &pos, int) { slotClicked(item); - KPopupMenu *context = new KPopupMenu(this); + TDEPopupMenu *context = new TDEPopupMenu(this); if (item) { context->insertTitle(item->text(0)); diff --git a/kftpgrabber/src/widgets/bookmarks/listview.h b/kftpgrabber/src/widgets/bookmarks/listview.h index 213ec03..da8c524 100644 --- a/kftpgrabber/src/widgets/bookmarks/listview.h +++ b/kftpgrabber/src/widgets/bookmarks/listview.h @@ -37,13 +37,13 @@ #ifndef KFTPBOOKMARKEDITORLISTVIEW_H #define KFTPBOOKMARKEDITORLISTVIEW_H -#include <qdom.h> -#include <qtimer.h> +#include <ntqdom.h> +#include <ntqtimer.h> #include "../listview.h" -class KAction; -class KActionCollection; +class TDEAction; +class TDEActionCollection; class Sidebar; class KFTPSelectServerDialog; @@ -60,17 +60,17 @@ namespace Bookmarks { class ListView; -class ListViewItem : public KListViewItem +class ListViewItem : public TDEListViewItem { friend class BookmarkEditor; friend class KFTPWidgets::Bookmarks::ListView; friend class Sidebar; friend class ::KFTPSelectServerDialog; public: - ListViewItem(QListView *parent, const QString &t1); - ListViewItem(QListViewItem *parent, const QString &t1); + ListViewItem(TQListView *parent, const TQString &t1); + ListViewItem(TQListViewItem *parent, const TQString &t1); - int compare(QListViewItem *i, int col, bool) const; + int compare(TQListViewItem *i, int col, bool) const; void setSite(KFTPBookmarks::Site *site) { m_site = site; } void setType(int type) { m_type = type; } @@ -86,7 +86,7 @@ class ListView : public KFTPWidgets::ListView { Q_OBJECT public: - ListView(KFTPBookmarks::Manager *bookmarks, QWidget *parent = 0, const char *name = 0); + ListView(KFTPBookmarks::Manager *bookmarks, TQWidget *parent = 0, const char *name = 0); /** * Fill current treeview with all the bookmarks. @@ -132,19 +132,19 @@ private: bool m_autoUpdate; bool m_connectBookmark; bool m_editMenuItem; - QDragObject *m_dragObject; + TQDragObject *m_dragObject; /* Actions */ - KAction *m_newAction; - KAction *m_renameAction; - KAction *m_deleteAction; - KAction *m_subCatAction; - KAction *m_copyAction; + TDEAction *m_newAction; + TDEAction *m_renameAction; + TDEAction *m_deleteAction; + TDEAction *m_subCatAction; + TDEAction *m_copyAction; /* Auto open categories support */ - QListViewItem *m_dropItem; - QListViewItem* m_currentBeforeDropItem; - QTimer *m_openTimer; + TQListViewItem *m_dropItem; + TQListViewItem* m_currentBeforeDropItem; + TQTimer *m_openTimer; /* Specifies, on which bookmarks we operate */ KFTPBookmarks::Manager *m_bookmarks; @@ -153,35 +153,35 @@ private: KFTPBookmarks::Site *m_activeCategory; KFTPWidgets::Bookmarks::ListViewItem *m_activeItem; - KActionCollection *actionCollection(); + TDEActionCollection *actionCollection(); /* Drag & drop support */ - QDragObject *dragObject(); - bool acceptDrag(QDropEvent *e) const; - void contentsDragEnterEvent(QDragEnterEvent *e); - void contentsDragMoveEvent(QDragMoveEvent *e); - void contentsDragLeaveEvent(QDragLeaveEvent*); + TQDragObject *dragObject(); + bool acceptDrag(TQDropEvent *e) const; + void contentsDragEnterEvent(TQDragEnterEvent *e); + void contentsDragMoveEvent(TQDragMoveEvent *e); + void contentsDragLeaveEvent(TQDragLeaveEvent*); private slots: - void slotDropped(QDropEvent *e, QListViewItem*); - void slotDoubleClicked(QListViewItem *item); + void slotDropped(TQDropEvent *e, TQListViewItem*); + void slotDoubleClicked(TQListViewItem *item); void slotOpenTimer(); - void slotClicked(QListViewItem*); + void slotClicked(TQListViewItem*); void slotNewAction(); void slotRenameAction(); void slotDeleteAction(); void slotSubCatAction(); void slotDuplicateAction(); - void slotContextMenu(QListViewItem*, const QPoint&, int col); + void slotContextMenu(TQListViewItem*, const TQPoint&, int col); void slotAutoUpdate(); - void slotBookmarkExecuted(QListViewItem*); + void slotBookmarkExecuted(TQListViewItem*); signals: void bookmarkMoved(); void bookmarkNew(ListViewItem*, KFTPBookmarks::Site*); void bookmarkDeleted(); void bookmarkDuplicated(ListViewItem*, KFTPBookmarks::Site*); - void bookmarkClicked(QListViewItem*); + void bookmarkClicked(TQListViewItem*); void categoryRenamed(); }; diff --git a/kftpgrabber/src/widgets/bookmarks/sidebar.cpp b/kftpgrabber/src/widgets/bookmarks/sidebar.cpp index 21ee0d9..1762e20 100644 --- a/kftpgrabber/src/widgets/bookmarks/sidebar.cpp +++ b/kftpgrabber/src/widgets/bookmarks/sidebar.cpp @@ -33,13 +33,13 @@ * files in the program, then also delete it here. */ -#include <qlayout.h> -#include <qsplitter.h> -#include <qvbox.h> +#include <ntqlayout.h> +#include <ntqsplitter.h> +#include <ntqvbox.h> -#include <kaction.h> -#include <klocale.h> -#include <ktoolbar.h> +#include <tdeaction.h> +#include <tdelocale.h> +#include <tdetoolbar.h> #include "kftpapi.h" #include "kftpbookmarks.h" @@ -55,17 +55,17 @@ namespace KFTPWidgets { namespace Bookmarks { -KActionCollection *Sidebar::actionCollection() +TDEActionCollection *Sidebar::actionCollection() { return KFTPAPI::getInstance()->mainWindow()->actionCollection(); } -Sidebar::Sidebar(QWidget *parent, const char *name) - : QWidget(parent, name) +Sidebar::Sidebar(TQWidget *parent, const char *name) + : TQWidget(parent, name) { - QVBoxLayout *layout = new QVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); - m_toolBar = new KToolBar(this, "bookmarkToolBar"); + m_toolBar = new TDEToolBar(this, "bookmarkToolBar"); m_toolBar->setIconSize(16); layout->addWidget(m_toolBar); @@ -77,8 +77,8 @@ Sidebar::Sidebar(QWidget *parent, const char *name) layout->addWidget(m_tree); - m_editAction = new KAction(i18n("&Edit..."), "edit", KShortcut(), this, SLOT(slotEditAction()), actionCollection(), "bookmark_edit2"); - connect(m_tree, SIGNAL(bookmarkClicked(QListViewItem*)), this, SLOT(slotClicked(QListViewItem*))); + m_editAction = new TDEAction(i18n("&Edit..."), "edit", TDEShortcut(), this, SLOT(slotEditAction()), actionCollection(), "bookmark_edit2"); + connect(m_tree, SIGNAL(bookmarkClicked(TQListViewItem*)), this, SLOT(slotClicked(TQListViewItem*))); connect(m_tree, SIGNAL(bookmarkNew(ListViewItem*, KFTPBookmarks::Site*)), this, SLOT(slotNewAction(ListViewItem*, KFTPBookmarks::Site*))); // Get the new bookmark data @@ -127,7 +127,7 @@ void Sidebar::slotNewAction(ListViewItem*, KFTPBookmarks::Site *site) delete editor; } -void Sidebar::slotClicked(QListViewItem *item) +void Sidebar::slotClicked(TQListViewItem *item) { // When nodes are expanded, item is 0, although an item is still selected, so grab it here item = m_tree->selectedItems().at(0); diff --git a/kftpgrabber/src/widgets/bookmarks/sidebar.h b/kftpgrabber/src/widgets/bookmarks/sidebar.h index ef08d3e..19b51aa 100644 --- a/kftpgrabber/src/widgets/bookmarks/sidebar.h +++ b/kftpgrabber/src/widgets/bookmarks/sidebar.h @@ -40,8 +40,8 @@ namespace KFTPBookmarks { class Site; } -class KAction; -class KToolBar; +class TDEAction; +class TDEToolBar; namespace KFTPWidgets { @@ -53,11 +53,11 @@ class ListView; /** @author Markus Brueffer */ -class Sidebar : public QWidget +class Sidebar : public TQWidget { Q_OBJECT public: - Sidebar(QWidget *parent = 0, const char *name = 0); + Sidebar(TQWidget *parent = 0, const char *name = 0); ~Sidebar(); private: @@ -66,15 +66,15 @@ private: BT_SERVER }; - KToolBar *m_toolBar; + TDEToolBar *m_toolBar; ListView *m_tree; - KAction *m_editAction; - KActionCollection *actionCollection(); + TDEAction *m_editAction; + TDEActionCollection *actionCollection(); public slots: void refresh(); private slots: - void slotClicked(QListViewItem*); + void slotClicked(TQListViewItem*); /* Action slots */ void slotEditAction(); diff --git a/kftpgrabber/src/widgets/browser/actions.cpp b/kftpgrabber/src/widgets/browser/actions.cpp index cc9fc8c..bb7c260 100644 --- a/kftpgrabber/src/widgets/browser/actions.cpp +++ b/kftpgrabber/src/widgets/browser/actions.cpp @@ -54,23 +54,23 @@ #include "misc/filter.h" #include "misc/customcommands/manager.h" -#include <kglobal.h> +#include <tdeglobal.h> #include <kcharsets.h> -#include <kapplication.h> -#include <kmainwindow.h> -#include <klocale.h> -#include <kmessagebox.h> -#include <kpopupmenu.h> +#include <tdeapplication.h> +#include <tdemainwindow.h> +#include <tdelocale.h> +#include <tdemessagebox.h> +#include <tdepopupmenu.h> #include <kinputdialog.h> #include <kpropertiesdialog.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <kshred.h> #include <klineedit.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kstandarddirs.h> -#include <qdir.h> -#include <qclipboard.h> +#include <ntqdir.h> +#include <ntqclipboard.h> using namespace KFTPGrabberBase; using namespace KFTPEngine; @@ -82,14 +82,14 @@ namespace KFTPWidgets { namespace Browser { Actions::Actions(View *parent) - : QObject(parent), + : TQObject(parent), m_view(parent) { } void Actions::initActions() { - m_actionCollection = new KActionCollection(m_view, this); + m_actionCollection = new TDEActionCollection(m_view, this); // Create all the actions m_goUpAction = KStdAction::up(this, SLOT(slotGoUp()), m_actionCollection, "go_up"); @@ -99,45 +99,45 @@ void Actions::initActions() m_reloadAction = KStdAction::redisplay(this, SLOT(slotReload()), m_actionCollection, "reload"); m_reloadAction->setText(i18n("&Reload")); - m_reloadAction->setShortcut(KShortcut(Qt::Key_F5)); + m_reloadAction->setShortcut(TDEShortcut(TQt::Key_F5)); - m_abortAction = new KAction(i18n("&Abort"), "stop", KShortcut(), this, SLOT(slotAbort()), m_actionCollection, "abort"); - m_toggleTreeViewAction = new KToggleAction(i18n("&Show Tree View"), "view_tree", KShortcut(), this, SLOT(slotShowHideTree()), m_actionCollection, "toggle_tree_view"); - m_toggleFilterAction = new KToggleAction(i18n("Show &Filter"), "filter", KShortcut(), this, SLOT(slotShowHideFilter()), m_actionCollection, "toggle_filter"); + m_abortAction = new TDEAction(i18n("&Abort"), "stop", TDEShortcut(), this, SLOT(slotAbort()), m_actionCollection, "abort"); + m_toggleTreeViewAction = new TDEToggleAction(i18n("&Show Tree View"), "view_tree", TDEShortcut(), this, SLOT(slotShowHideTree()), m_actionCollection, "toggle_tree_view"); + m_toggleFilterAction = new TDEToggleAction(i18n("Show &Filter"), "filter", TDEShortcut(), this, SLOT(slotShowHideFilter()), m_actionCollection, "toggle_filter"); - m_renameAction = new KAction(i18n("&Rename"), KShortcut(Qt::Key_F2), this, SLOT(slotRename()), m_actionCollection, "edit_rename"); - m_deleteAction = new KAction(i18n("&Delete"), "editdelete", KShortcut(Qt::Key_Delete), this, SLOT(slotDelete()), m_actionCollection, "edit_delete"); - m_propsAction = new KAction(i18n("&Properties"), KShortcut(), this, SLOT(slotProps()), m_actionCollection, "edit_properties"); - m_shredAction = new KAction(i18n("&Shred"), "editshred", KShortcut(), this, SLOT(slotShred()), m_actionCollection, "edit_shred"); + m_renameAction = new TDEAction(i18n("&Rename"), TDEShortcut(TQt::Key_F2), this, SLOT(slotRename()), m_actionCollection, "edit_rename"); + m_deleteAction = new TDEAction(i18n("&Delete"), "editdelete", TDEShortcut(TQt::Key_Delete), this, SLOT(slotDelete()), m_actionCollection, "edit_delete"); + m_propsAction = new TDEAction(i18n("&Properties"), TDEShortcut(), this, SLOT(slotProps()), m_actionCollection, "edit_properties"); + m_shredAction = new TDEAction(i18n("&Shred"), "editshred", TDEShortcut(), this, SLOT(slotShred()), m_actionCollection, "edit_shred"); m_copyAction = KStdAction::copy(this, SLOT(slotCopy()), m_actionCollection, "edit_copy"); m_pasteAction = KStdAction::paste(this, SLOT(slotPaste()), m_actionCollection, "edit_paste"); - m_filterActions = new KActionMenu(i18n("&Filter Options"), "", m_actionCollection, "edit_filter_options"); - m_alwaysSkipAction = new KAction(i18n("Always &skip this file when queuing"), KShortcut(), this, SLOT(slotAlwaysSkip()), m_actionCollection); - m_topPriorityAction = new KAction(i18n("Make this file &top priority"), KShortcut(), this, SLOT(slotTopPriority()), m_actionCollection); - m_lowPriorityAction = new KAction(i18n("Make this file &lowest priority"), KShortcut(), this, SLOT(slotLowPriority()), m_actionCollection); + m_filterActions = new TDEActionMenu(i18n("&Filter Options"), "", m_actionCollection, "edit_filter_options"); + m_alwaysSkipAction = new TDEAction(i18n("Always &skip this file when queuing"), TDEShortcut(), this, SLOT(slotAlwaysSkip()), m_actionCollection); + m_topPriorityAction = new TDEAction(i18n("Make this file &top priority"), TDEShortcut(), this, SLOT(slotTopPriority()), m_actionCollection); + m_lowPriorityAction = new TDEAction(i18n("Make this file &lowest priority"), TDEShortcut(), this, SLOT(slotLowPriority()), m_actionCollection); m_filterActions->insert(m_alwaysSkipAction); m_filterActions->insert(m_topPriorityAction); m_filterActions->insert(m_lowPriorityAction); - m_transferAction = new KAction(i18n("&Transfer"), KShortcut(), this, SLOT(slotTransfer()), m_actionCollection, "transfer"); - m_queueTransferAction = new KAction(i18n("&Queue Transfer"), "queue", KShortcut(), this, SLOT(slotQueueTransfer()), m_actionCollection, "queue_transfer"); - m_createDirAction = new KAction(i18n("&Create Directory..."), "folder_new", KShortcut(), this, SLOT(slotCreateDir()), m_actionCollection, "create_dir"); - m_fileEditAction = new KAction(i18n("&Open file"), "fileopen", KShortcut(), this, SLOT(slotFileEdit()), m_actionCollection, "open_file"); - m_verifyAction = new KAction(i18n("&Verify..."), "ok", KShortcut(), this, SLOT(slotVerify()), m_actionCollection, "verify"); + m_transferAction = new TDEAction(i18n("&Transfer"), TDEShortcut(), this, SLOT(slotTransfer()), m_actionCollection, "transfer"); + m_queueTransferAction = new TDEAction(i18n("&Queue Transfer"), "queue", TDEShortcut(), this, SLOT(slotQueueTransfer()), m_actionCollection, "queue_transfer"); + m_createDirAction = new TDEAction(i18n("&Create Directory..."), "folder_new", TDEShortcut(), this, SLOT(slotCreateDir()), m_actionCollection, "create_dir"); + m_fileEditAction = new TDEAction(i18n("&Open file"), "fileopen", TDEShortcut(), this, SLOT(slotFileEdit()), m_actionCollection, "open_file"); + m_verifyAction = new TDEAction(i18n("&Verify..."), "ok", TDEShortcut(), this, SLOT(slotVerify()), m_actionCollection, "verify"); populateEncodings(); - m_moreActions = new KActionMenu(i18n("&More Actions"), "configure", this); - m_rawCmdAction = new KAction(i18n("&Manual Command Entry..."), "openterm", KShortcut(), this, SLOT(slotRawCmd()), m_actionCollection, "send_raw_cmd"); - m_exportListingAction = new KAction(i18n("&Export Directory Listing..."), "", KShortcut(), this, SLOT(slotExportListing()), m_actionCollection, "export_listing"); - m_showHiddenFilesAction = new KToggleAction(i18n("Show &Hidden Files && Directories"), KShortcut(), this, SLOT(slotShowHiddenFiles()), m_actionCollection, "show_hidden"); - m_openExternalAction = new KAction(i18n("Open current directory in &Konqueror..."), "konqueror", KShortcut(), this, SLOT(slotOpenExternal()), m_actionCollection, "open_konqi"); + m_moreActions = new TDEActionMenu(i18n("&More Actions"), "configure", this); + m_rawCmdAction = new TDEAction(i18n("&Manual Command Entry..."), "openterm", TDEShortcut(), this, SLOT(slotRawCmd()), m_actionCollection, "send_raw_cmd"); + m_exportListingAction = new TDEAction(i18n("&Export Directory Listing..."), "", TDEShortcut(), this, SLOT(slotExportListing()), m_actionCollection, "export_listing"); + m_showHiddenFilesAction = new TDEToggleAction(i18n("Show &Hidden Files && Directories"), TDEShortcut(), this, SLOT(slotShowHiddenFiles()), m_actionCollection, "show_hidden"); + m_openExternalAction = new TDEAction(i18n("Open current directory in &Konqueror..."), "konqueror", TDEShortcut(), this, SLOT(slotOpenExternal()), m_actionCollection, "open_konqi"); - m_markItemsAction = new KAction(i18n("Compare &selected items"), "", KShortcut(Qt::Key_Space), this, SLOT(slotMarkItems()), m_actionCollection, "compare_selected"); - m_compareAction = new KAction(i18n("Compare &directories"), "", KShortcut(), this, SLOT(slotCompare()), m_actionCollection, "compare_dirs"); + m_markItemsAction = new TDEAction(i18n("Compare &selected items"), "", TDEShortcut(TQt::Key_Space), this, SLOT(slotMarkItems()), m_actionCollection, "compare_selected"); + m_compareAction = new TDEAction(i18n("Compare &directories"), "", TDEShortcut(), this, SLOT(slotCompare()), m_actionCollection, "compare_dirs"); m_showHiddenFilesAction->setChecked(KFTPCore::Config::showHiddenFiles()); @@ -158,10 +158,10 @@ void Actions::initActions() m_moreActions->setStickyMenu(true); m_moreActions->setDelayed(false); - m_siteChangeAction = new KActionMenu(i18n("&Change Site"), "goto", this); - m_quickConnectAction = new KAction(i18n("&Quick Connect..."), "connect_creating", KShortcut(), this, SLOT(slotQuickConnect()), m_actionCollection, "quick_connect"); - m_connectAction = new KActionMenu(i18n("&Connect To"), this); - m_disconnectAction = new KAction(i18n("&Disconnect"), "connect_no", KShortcut(), this, SLOT(slotDisconnect()), m_actionCollection, "disconnect"); + m_siteChangeAction = new TDEActionMenu(i18n("&Change Site"), "goto", this); + m_quickConnectAction = new TDEAction(i18n("&Quick Connect..."), "connect_creating", TDEShortcut(), this, SLOT(slotQuickConnect()), m_actionCollection, "quick_connect"); + m_connectAction = new TDEActionMenu(i18n("&Connect To"), this); + m_disconnectAction = new TDEAction(i18n("&Disconnect"), "connect_no", TDEShortcut(), this, SLOT(slotDisconnect()), m_actionCollection, "disconnect"); m_siteChangeAction->insert(m_quickConnectAction); m_siteChangeAction->insert(m_connectAction); @@ -170,21 +170,21 @@ void Actions::initActions() m_siteChangeAction->setDelayed(false); // Populate bookmarks - KFTPBookmarks::Manager::self()->guiPopulateBookmarksMenu(m_connectAction, QDomNode(), false, m_view->m_session); + KFTPBookmarks::Manager::self()->guiPopulateBookmarksMenu(m_connectAction, TQDomNode(), false, m_view->m_session); } void Actions::populateEncodings() { // Charsets - m_changeEncodingAction = new KActionMenu(i18n("Change Remote &Encoding"), "charset", m_actionCollection, "changeremoteencoding"); + m_changeEncodingAction = new TDEActionMenu(i18n("Change Remote &Encoding"), "charset", m_actionCollection, "changeremoteencoding"); m_changeEncodingAction->setDelayed(false); - KPopupMenu *menu = m_changeEncodingAction->popupMenu(); + TDEPopupMenu *menu = m_changeEncodingAction->popupMenu(); menu->clear(); - QStringList charsets = KGlobal::charsets()->descriptiveEncodingNames(); + TQStringList charsets = TDEGlobal::charsets()->descriptiveEncodingNames(); int count = 0; - for (QStringList::iterator i = charsets.begin(); i != charsets.end(); ++i) + for (TQStringList::iterator i = charsets.begin(); i != charsets.end(); ++i) menu->insertItem(*i, this, SLOT(slotCharsetChanged(int)), 0, ++count); menu->insertSeparator(); @@ -201,7 +201,7 @@ void Actions::updateActions() // History int index = 0; - const QValueList<LocationNavigator::Element> list = m_view->history(index); + const TQValueList<LocationNavigator::Element> list = m_view->history(index); m_goBackAction->setEnabled(index < static_cast<int>(list.count()) - 1); m_goForwardAction->setEnabled(index > 0); @@ -334,14 +334,14 @@ void Actions::slotRename() KFTPWidgets::Browser::DetailsView *view = m_view->getDetailsView(); // Rename the first file in the current selection - view->rename(view->KListView::selectedItems().at(0), 0); + view->rename(view->TDEListView::selectedItems().at(0), 0); // Enhanced rename: Don't highlight the file extension. (from Konqueror) KLineEdit *le = view->renameLineEdit(); if (le) { - const QString txt = le->text(); - QString pattern; + const TQString txt = le->text(); + TQString pattern; KMimeType::diagnoseFileName(txt, pattern); if (!pattern.isEmpty() && pattern.at(0) == '*' && pattern.find('*',1) == -1) @@ -362,7 +362,7 @@ void Actions::slotDelete() // Delete a file or directory KURL::List selection = m_view->selectedURLs(); KURL::List::ConstIterator i = selection.begin(); - QStringList prettyList; + TQStringList prettyList; for (; i != selection.end(); ++i) { prettyList.append((*i).pathOrURL()); } @@ -372,13 +372,13 @@ void Actions::slotDelete() prettyList, i18n("Delete Files"), KStdGuiItem::del(), - QString::null, + TQString::null, KMessageBox::Dangerous) == KMessageBox::Cancel) return; // Go trough all files and delete them if (!session->isRemote()) { - KIO::del(selection); + TDEIO::del(selection); } else { KURL::List::Iterator end(selection.end()); @@ -391,17 +391,17 @@ void Actions::slotDelete() void Actions::slotCopy() { - QClipboard *cb = QApplication::clipboard(); - cb->setData(m_view->getDetailsView()->dragObject(), QClipboard::Clipboard); + TQClipboard *cb = TQApplication::clipboard(); + cb->setData(m_view->getDetailsView()->dragObject(), TQClipboard::Clipboard); } void Actions::slotPaste() { // Decode the data and try to init transfer - KIO::MetaData p_meta; + TDEIO::MetaData p_meta; KURL::List p_urls; - if (KURLDrag::decode(QApplication::clipboard()->data(), p_urls, p_meta)) { + if (KURLDrag::decode(TQApplication::clipboard()->data(), p_urls, p_meta)) { // Add destination url and call the QueueManager p_meta.insert("DestURL", m_view->url().url()); KURLDrag *drag = new KURLDrag(p_urls, p_meta, m_view, name()); @@ -451,7 +451,7 @@ void Actions::addPriorityItems(int priority) if (priority == 0) { rule->setName(i18n("Skip '%1'").arg((*i).filename())); const_cast<ConditionChain*>(rule->conditions())->append(new Condition(Filename, Condition::Is, (*i).filename())); - const_cast<ActionChain*>(rule->actions())->append(new Action(Action::Skip, QVariant())); + const_cast<ActionChain*>(rule->actions())->append(new Action(Action::Skip, TQVariant())); } else { rule->setName(i18n("Priority '%1'").arg((*i).filename())); const_cast<ConditionChain*>(rule->conditions())->append(new Condition(Filename, Condition::Is, (*i).filename())); @@ -540,14 +540,14 @@ void Actions::slotCreateDir() { // Create new directory bool ok; - QString newDirName = KInputDialog::getText(i18n("Create Directory"), i18n("Directory name:"), "", &ok); + TQString newDirName = KInputDialog::getText(i18n("Create Directory"), i18n("Directory name:"), "", &ok); if (ok) { KURL url = m_view->url(); url.addPath(newDirName); if (url.isLocalFile()) - KIO::mkdir(url); + TDEIO::mkdir(url); else m_view->m_ftpClient->mkdir(url); } @@ -564,7 +564,7 @@ void Actions::slotFileEdit() // Create a new transfer to download the file and open it KFTPQueue::TransferFile *transfer = new KFTPQueue::TransferFile(KFTPQueue::Manager::self()); transfer->setSourceUrl(item->url()); - transfer->setDestUrl(KURL(KGlobal::dirs()->saveLocation("tmp") + QString("%1-%2").arg(KApplication::randomString(7)).arg(item->name()))); + transfer->setDestUrl(KURL(TDEGlobal::dirs()->saveLocation("tmp") + TQString("%1-%2").arg(TDEApplication::randomString(7)).arg(item->name()))); transfer->addSize(item->size()); transfer->setTransferType(KFTPQueue::Download); transfer->setOpenAfterTransfer(true); @@ -588,7 +588,7 @@ void Actions::slotAbort() void Actions::slotRawCmd() { bool ok; - QString rawCmd = KInputDialog::getText(i18n("Send Raw Command"), i18n("Command:"), "", &ok); + TQString rawCmd = KInputDialog::getText(i18n("Send Raw Command"), i18n("Command:"), "", &ok); if (ok) m_view->m_ftpClient->raw(rawCmd); @@ -614,8 +614,8 @@ void Actions::slotShowHideFilter() void Actions::slotCharsetChanged(int id) { if (!m_changeEncodingAction->popupMenu()->isItemChecked(id)) { - QStringList charsets = KGlobal::charsets()->descriptiveEncodingNames(); - QString charset = KGlobal::charsets()->encodingForName(charsets[id - 1]); + TQStringList charsets = TDEGlobal::charsets()->descriptiveEncodingNames(); + TQString charset = TDEGlobal::charsets()->encodingForName(charsets[id - 1]); // Set the current socket's charset m_view->m_ftpClient->socket()->changeEncoding(charset); @@ -645,15 +645,15 @@ void Actions::slotCharsetReset(int id) void Actions::slotExportListing() { - QString savePath = KFileDialog::getSaveFileName(QString::null, "*.txt|Directory Dump", 0, i18n("Export Directory Listing")); + TQString savePath = KFileDialog::getSaveFileName(TQString::null, "*.txt|Directory Dump", 0, i18n("Export Directory Listing")); if (!savePath.isEmpty()) { - QFile file(savePath); + TQFile file(savePath); if (!file.open(IO_WriteOnly)) return; - QTextStream stream(&file); + TQTextStream stream(&file); KFileItemList list(*m_view->items()); KFileItemListIterator i(list); @@ -720,7 +720,7 @@ void Actions::slotCompare() DetailsView *oView = opposite->getFileView()->getDetailsView(); // All items in the other list view should be visible by default - QListViewItemIterator j(oView); + TQListViewItemIterator j(oView); while (j.current()) { KFileItem *oItem = static_cast<KFileListViewItem*>(*j)->fileInfo(); oView->setItemVisibility(oItem, true); @@ -729,7 +729,7 @@ void Actions::slotCompare() } // Compare the two listviews - QListViewItemIterator i(tView); + TQListViewItemIterator i(tView); while (i.current()) { KFileItem *tItem = static_cast<KFileListViewItem*>(*i)->fileInfo(); diff --git a/kftpgrabber/src/widgets/browser/actions.h b/kftpgrabber/src/widgets/browser/actions.h index 69434e4..6267fbe 100644 --- a/kftpgrabber/src/widgets/browser/actions.h +++ b/kftpgrabber/src/widgets/browser/actions.h @@ -36,8 +36,8 @@ #ifndef KFTPFILEDIRVIEWACTIONS_H #define KFTPFILEDIRVIEWACTIONS_H -#include <qobject.h> -#include <kaction.h> +#include <ntqobject.h> +#include <tdeaction.h> #include <krun.h> #include <kservice.h> #include <kuserprofile.h> @@ -53,7 +53,7 @@ class View; * * @author Jernej Kos */ -class Actions : public QObject +class Actions : public TQObject { Q_OBJECT friend class View; @@ -76,56 +76,56 @@ public: */ void updateActions(); private: - KActionCollection *m_actionCollection; + TDEActionCollection *m_actionCollection; View *m_view; int m_curCharsetOption; int m_defaultCharsetOption; - KAction *m_goUpAction; - KAction *m_goBackAction; - KAction *m_goForwardAction; - KAction *m_goHomeAction; - KAction *m_reloadAction; + TDEAction *m_goUpAction; + TDEAction *m_goBackAction; + TDEAction *m_goForwardAction; + TDEAction *m_goHomeAction; + TDEAction *m_reloadAction; - KAction *m_abortAction; - KToggleAction *m_toggleTreeViewAction; - KToggleAction *m_toggleFilterAction; + TDEAction *m_abortAction; + TDEToggleAction *m_toggleTreeViewAction; + TDEToggleAction *m_toggleFilterAction; - KAction *m_renameAction; - KAction *m_deleteAction; - KAction *m_propsAction; - KAction *m_shredAction; + TDEAction *m_renameAction; + TDEAction *m_deleteAction; + TDEAction *m_propsAction; + TDEAction *m_shredAction; - KAction *m_copyAction; - KAction *m_pasteAction; + TDEAction *m_copyAction; + TDEAction *m_pasteAction; - KActionMenu *m_filterActions; - KAction *m_alwaysSkipAction; - KAction *m_topPriorityAction; - KAction *m_lowPriorityAction; + TDEActionMenu *m_filterActions; + TDEAction *m_alwaysSkipAction; + TDEAction *m_topPriorityAction; + TDEAction *m_lowPriorityAction; - KAction *m_transferAction; - KAction *m_queueTransferAction; - KAction *m_createDirAction; - KAction *m_fileEditAction; - KAction *m_verifyAction; + TDEAction *m_transferAction; + TDEAction *m_queueTransferAction; + TDEAction *m_createDirAction; + TDEAction *m_fileEditAction; + TDEAction *m_verifyAction; - KActionMenu *m_moreActions; - KActionMenu *m_rawCommandsMenu; - KAction *m_rawCmdAction; - KActionMenu *m_changeEncodingAction; - KAction *m_exportListingAction; - KToggleAction *m_showHiddenFilesAction; - KAction *m_openExternalAction; - - KAction *m_markItemsAction; - KAction *m_compareAction; - - KActionMenu *m_siteChangeAction; - KAction *m_quickConnectAction; - KActionMenu *m_connectAction; - KAction *m_disconnectAction; + TDEActionMenu *m_moreActions; + TDEActionMenu *m_rawCommandsMenu; + TDEAction *m_rawCmdAction; + TDEActionMenu *m_changeEncodingAction; + TDEAction *m_exportListingAction; + TDEToggleAction *m_showHiddenFilesAction; + TDEAction *m_openExternalAction; + + TDEAction *m_markItemsAction; + TDEAction *m_compareAction; + + TDEActionMenu *m_siteChangeAction; + TDEAction *m_quickConnectAction; + TDEActionMenu *m_connectAction; + TDEAction *m_disconnectAction; private: /** * Populates the encodings list. diff --git a/kftpgrabber/src/widgets/browser/detailsview.cpp b/kftpgrabber/src/widgets/browser/detailsview.cpp index 5206d3d..80f8588 100644 --- a/kftpgrabber/src/widgets/browser/detailsview.cpp +++ b/kftpgrabber/src/widgets/browser/detailsview.cpp @@ -46,10 +46,10 @@ #include "kftpqueue.h" -#include <qheader.h> -#include <qpainter.h> +#include <ntqheader.h> +#include <ntqpainter.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kurldrag.h> using namespace KFTPCore::Filter; @@ -58,7 +58,7 @@ namespace KFTPWidgets { namespace Browser { -DetailsView::DetailsView(QWidget *parent, View *view, KFTPSession::Session *session) +DetailsView::DetailsView(TQWidget *parent, View *view, KFTPSession::Session *session) : KFileDetailView(parent, 0), m_view(view), m_treeView(0), @@ -66,7 +66,7 @@ DetailsView::DetailsView(QWidget *parent, View *view, KFTPSession::Session *sess m_shouldDisableResize(true), m_autoResizeEnabled(true) { - m_resizeTimer = new QTimer(this); + m_resizeTimer = new TQTimer(this); connect(m_resizeTimer, SIGNAL(timeout()), this, SLOT(updateColumnWidths())); m_dirLister = new DirLister(this); @@ -82,32 +82,32 @@ DetailsView::DetailsView(QWidget *parent, View *view, KFTPSession::Session *sess connect(m_navigator, SIGNAL(urlChanged(const KURL&)), this, SLOT(slotUrlChanged(const KURL&))); - connect(this, SIGNAL(executed(QListViewItem*)), this, SLOT(slotItemExecuted())); - connect(this, SIGNAL(returnPressed(QListViewItem*)), this, SLOT(slotItemExecuted())); - connect(this, SIGNAL(contextMenu(KListView*, QListViewItem*, const QPoint&)), this, SLOT(slotContextMenu(KListView*, QListViewItem*, const QPoint&))); - connect(this, SIGNAL(itemRenamed(QListViewItem*, const QString&, int)), this, SLOT(slotItemRenamed(QListViewItem*, const QString&))); + connect(this, SIGNAL(executed(TQListViewItem*)), this, SLOT(slotItemExecuted())); + connect(this, SIGNAL(returnPressed(TQListViewItem*)), this, SLOT(slotItemExecuted())); + connect(this, SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), this, SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&))); + connect(this, SIGNAL(itemRenamed(TQListViewItem*, const TQString&, int)), this, SLOT(slotItemRenamed(TQListViewItem*, const TQString&))); // Setup the header - QHeader *viewHeader = header(); + TQHeader *viewHeader = header(); viewHeader->setResizeEnabled(true); viewHeader->setMovingEnabled(false); connect(viewHeader, SIGNAL(sizeChange(int, int, int)), this, SLOT(slotHeaderResized(int))); // Set column width - setColumnWidthMode(NameColumn, QListView::Manual); - setColumnWidthMode(SizeColumn, QListView::Manual); - setColumnWidthMode(DateColumn, QListView::Manual); - setColumnWidthMode(PermissionsColumn, QListView::Manual); + setColumnWidthMode(NameColumn, TQListView::Manual); + setColumnWidthMode(SizeColumn, TQListView::Manual); + setColumnWidthMode(DateColumn, TQListView::Manual); + setColumnWidthMode(PermissionsColumn, TQListView::Manual); // Set column alignments - setColumnAlignment(SizeColumn, Qt::AlignRight); - setColumnAlignment(DateColumn, Qt::AlignHCenter); - setColumnAlignment(PermissionsColumn, Qt::AlignHCenter); + setColumnAlignment(SizeColumn, TQt::AlignRight); + setColumnAlignment(DateColumn, TQt::AlignHCenter); + setColumnAlignment(PermissionsColumn, TQt::AlignHCenter); if (KFTPCore::Config::showOwnerGroup()) { - setColumnAlignment(OwnerColumn, Qt::AlignHCenter); - setColumnAlignment(GroupColumn, Qt::AlignHCenter); + setColumnAlignment(OwnerColumn, TQt::AlignHCenter); + setColumnAlignment(GroupColumn, TQt::AlignHCenter); } else { // Only show owner/group if set in the config removeColumn(4); @@ -119,7 +119,7 @@ DetailsView::DetailsView(QWidget *parent, View *view, KFTPSession::Session *sess setAcceptDrops(true); setSelectionMode(KFile::Extended); - setHScrollBarMode(QScrollView::AlwaysOff); + setHScrollBarMode(TQScrollView::AlwaysOff); // Set the defaults setHomeUrl(KURL(KFTPCore::Config::defLocalDir())); @@ -135,7 +135,7 @@ const KURL &DetailsView::url() const return m_navigator->url(); } -const QValueList<LocationNavigator::Element> DetailsView::history(int &index) const +const TQValueList<LocationNavigator::Element> DetailsView::history(int &index) const { return m_navigator->history(index); } @@ -188,7 +188,7 @@ void DetailsView::endItemUpdates() setCurrentItem(item->fileInfo()); int index = 0; - const QValueList<LocationNavigator::Element> history = m_navigator->history(index); + const TQValueList<LocationNavigator::Element> history = m_navigator->history(index); if (!history.isEmpty()) { KFileView::setCurrentItem(history[index].currentFilename()); KFileDetailView::setSelected(currentFileItem(), true); @@ -247,7 +247,7 @@ void DetailsView::slotCompleted() void DetailsView::slotRefreshItems() { - QTimer::singleShot(0, this, SLOT(reload())); + TQTimer::singleShot(0, this, SLOT(reload())); } void DetailsView::reload() @@ -291,7 +291,7 @@ void DetailsView::slotItemExecuted() void DetailsView::slotHeaderResized(int section) { if (m_autoResizeEnabled && m_shouldDisableResize && section == 0) { - setHScrollBarMode(QScrollView::Auto); + setHScrollBarMode(TQScrollView::Auto); m_autoResizeEnabled = false; } } @@ -309,7 +309,7 @@ void DetailsView::resizeContents(int width, int height) } } -void DetailsView::resizeEvent(QResizeEvent *event) +void DetailsView::resizeEvent(TQResizeEvent *event) { m_shouldDisableResize = false; @@ -332,9 +332,9 @@ void DetailsView::updateColumnWidths() // When a directory contains no items, a minimum width for // the column must be available, so that the header is readable. int columnWidth = 64; - QFontMetrics fontMetrics(font()); + TQFontMetrics fontMetrics(font()); - for (QListViewItem* item = firstChild(); item != 0; item = item->nextSibling()) { + for (TQListViewItem* item = firstChild(); item != 0; item = item->nextSibling()) { const int width = item->width(fontMetrics, this, i); if (width > columnWidth) { @@ -373,10 +373,10 @@ void DetailsView::insertItem(KFileItem *fileItem) if (actionChain && (action = actionChain->getAction(Action::Colorize))) item->setColor(action->value().toColor()); - QDir::SortSpec spec = KFileView::sorting(); - if (spec & QDir::Time) { - item->setKey(sortingKey(fileItem->time(KIO::UDS_MODIFICATION_TIME), fileItem->isDir(), spec)); - } else if (spec & QDir::Size) { + TQDir::SortSpec spec = KFileView::sorting(); + if (spec & TQDir::Time) { + item->setKey(sortingKey(fileItem->time(TDEIO::UDS_MODIFICATION_TIME), fileItem->isDir(), spec)); + } else if (spec & TQDir::Size) { item->setKey(sortingKey(fileItem->size(), fileItem->isDir(), spec)); } else { item->setKey(sortingKey(fileItem->text(), fileItem->isDir(), spec)); @@ -385,12 +385,12 @@ void DetailsView::insertItem(KFileItem *fileItem) fileItem->setExtraData(this, item); } -void DetailsView::slotContextMenu(KListView*, QListViewItem *i, const QPoint &p) +void DetailsView::slotContextMenu(TDEListView*, TQListViewItem *i, const TQPoint &p) { m_view->updateActions(); // Create the popup menu - KPopupMenu *menu = new KPopupMenu(this); + TDEPopupMenu *menu = new TDEPopupMenu(this); Actions *actions = m_view->m_actions; @@ -426,13 +426,13 @@ void DetailsView::slotContextMenu(KListView*, QListViewItem *i, const QPoint &p) menu->exec(p); } -void DetailsView::slotItemRenamed(QListViewItem *item, const QString &name) +void DetailsView::slotItemRenamed(TQListViewItem *item, const TQString &name) { KFileItem *fileItem = static_cast<KFileListViewItem*>(item)->fileInfo(); m_view->rename(fileItem->url(), name); } -QDragObject *DetailsView::dragObject() +TQDragObject *DetailsView::dragObject() { KURLDrag *object = static_cast<KURLDrag*>(KFileDetailView::dragObject()); @@ -444,8 +444,8 @@ QDragObject *DetailsView::dragObject() KFileItem *item; while ((item = i.current()) != 0) { - QString type = item->isDir() ? "D" : "F"; - object->metaData().insert(item->url().htmlURL().local8Bit(), type + ":" + KIO::number(item->size())); + TQString type = item->isDir() ? "D" : "F"; + object->metaData().insert(item->url().htmlURL().local8Bit(), type + ":" + TDEIO::number(item->size())); ++i; } } @@ -453,21 +453,21 @@ QDragObject *DetailsView::dragObject() return object; } -bool DetailsView::acceptDrag(QDropEvent *event) const +bool DetailsView::acceptDrag(TQDropEvent *event) const { return KURLDrag::canDecode(event) && - (event->action() == QDropEvent::Copy || - event->action() == QDropEvent::Move || - event->action() == QDropEvent::Link) && + (event->action() == TQDropEvent::Copy || + event->action() == TQDropEvent::Move || + event->action() == TQDropEvent::Link) && event->source() != this; } -void DetailsView::contentsDropEvent(QDropEvent *event) +void DetailsView::contentsDropEvent(TQDropEvent *event) { if (!acceptDrag(event)) return; - KIO::MetaData meta; + TDEIO::MetaData meta; KURL::List urls; KURLDrag::decode(event, urls, meta); @@ -475,7 +475,7 @@ void DetailsView::contentsDropEvent(QDropEvent *event) KFTPQueue::Manager::self()->insertTransfer(new KURLDrag(urls, meta, this, name())); } -KFileItem *DetailsView::fileItem(const QString &filename) +KFileItem *DetailsView::fileItem(const TQString &filename) { if (!filename.isNull()) { KFileItem *item; @@ -501,7 +501,7 @@ void DetailsView::setItemVisibility(KFileItem *item, int visibility) } } -void DetailsView::setItemColor(KFileItem *item, const QColor &text, const QColor &background) +void DetailsView::setItemColor(KFileItem *item, const TQColor &text, const TQColor &background) { ListViewItem *i = static_cast<ListViewItem*>(item->extraData(this)); @@ -521,7 +521,7 @@ void DetailsView::markItem(KFileItem *item) } } -void DetailsView::markItem(const QString &filename) +void DetailsView::markItem(const TQString &filename) { if (KFileItem *item = fileItem(filename)) markItem(item); @@ -536,47 +536,47 @@ void DetailsView::unmarkItems() } } -DetailsView::ListViewItem::ListViewItem(QListView *parent, KFileItem *fileItem) +DetailsView::ListViewItem::ListViewItem(TQListView *parent, KFileItem *fileItem) : KFileListViewItem(parent, fileItem), m_marked(false) { if (fileItem->isDir() && !KFTPCore::Config::showDirectorySize()) { setText(SizeColumn, " - "); } else { - QString sizeText; - sizeText = KFTPCore::Config::showSizeInBytes() ? KIO::number(fileItem->size()) : KIO::convertSize(fileItem->size()); + TQString sizeText; + sizeText = KFTPCore::Config::showSizeInBytes() ? TDEIO::number(fileItem->size()) : TDEIO::convertSize(fileItem->size()); sizeText.append(" "); setText(SizeColumn, sizeText); } } -void DetailsView::ListViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int alignment) +void DetailsView::ListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) { - QColorGroup colorGroup(cg); - QColor textColor = colorGroup.text(); + TQColorGroup colorGroup(cg); + TQColor textColor = colorGroup.text(); // Set custom file item color if set if (m_textColor.isValid()) - colorGroup.setColor(QColorGroup::Text, m_textColor); + colorGroup.setColor(TQColorGroup::Text, m_textColor); // Set custom file item font - QFont font = p->font(); + TQFont font = p->font(); font.setBold(m_marked); p->setFont(font); if (m_backgroundColor.isValid()) { - colorGroup.setColor(QColorGroup::Base, m_backgroundColor); + colorGroup.setColor(TQColorGroup::Base, m_backgroundColor); - // Override the KListViewItem since it resets the background color - QListViewItem::paintCell(p, colorGroup, column, width, alignment); + // Override the TDEListViewItem since it resets the background color + TQListViewItem::paintCell(p, colorGroup, column, width, alignment); } else { KFileListViewItem::paintCell(p, colorGroup, column, width, alignment); } if (column < listView()->columns() - 1) { // Draw a separator between columns - p->setPen(KGlobalSettings::buttonBackground()); + p->setPen(TDEGlobalSettings::buttonBackground()); p->drawLine(width - 1, 0, width - 1, height() - 1); } } diff --git a/kftpgrabber/src/widgets/browser/detailsview.h b/kftpgrabber/src/widgets/browser/detailsview.h index eb60b70..a06f16b 100644 --- a/kftpgrabber/src/widgets/browser/detailsview.h +++ b/kftpgrabber/src/widgets/browser/detailsview.h @@ -38,7 +38,7 @@ #include "browser/locationnavigator.h" -#include <kfiledetailview.h> +#include <tdefiledetailview.h> #include <kdirlister.h> namespace KFTPSession { @@ -83,7 +83,7 @@ public: * @param view Main view container * @param session Current session */ - DetailsView(QWidget *parent, View *view, KFTPSession::Session *session); + DetailsView(TQWidget *parent, View *view, KFTPSession::Session *session); /** * Class destructor. @@ -106,7 +106,7 @@ public: * @param index Variable to save the current history position to * @return Current history element list */ - const QValueList<LocationNavigator::Element> history(int &index) const; + const TQValueList<LocationNavigator::Element> history(int &index) const; /** * @overload @@ -171,7 +171,7 @@ public: * * @param file Item's filename */ - KFileItem *fileItem(const QString &filename); + KFileItem *fileItem(const TQString &filename); /** * Changes item's colors in the list view. Note that this overrides any @@ -181,7 +181,7 @@ public: * @param text Text color * @param background Background color */ - void setItemColor(KFileItem *item, const QColor &text, const QColor &background); + void setItemColor(KFileItem *item, const TQColor &text, const TQColor &background); /** * Changes item's visibility in the list view. @@ -205,7 +205,7 @@ public: * * @param filename Item's filename */ - void markItem(const QString &filename); + void markItem(const TQString &filename); /** * Unmark all items. @@ -242,7 +242,7 @@ public slots: /** * Returns the drag object to use for copy/paste and "drag and drop". */ - QDragObject *dragObject(); + TQDragObject *dragObject(); protected: /** * Instruct the directory lister object to fetch the specified URL. @@ -256,41 +256,41 @@ protected: * This method gets called when the widget is resized. It is used for automatic * resize handling. */ - void resizeEvent(QResizeEvent *event); + void resizeEvent(TQResizeEvent *event); /** * Returns true if the drop event should be accepted. */ - bool acceptDrag(QDropEvent *event) const; + bool acceptDrag(TQDropEvent *event) const; /** * Called when something acceptable gets dropped on us. */ - void contentsDropEvent(QDropEvent *event); + void contentsDropEvent(TQDropEvent *event); private: class ListViewItem : public KFileListViewItem { public: - ListViewItem(QListView *parent, KFileItem *fileItem); + ListViewItem(TQListView *parent, KFileItem *fileItem); /** * @overload - * Reimplemented from KListView to implement nicer items. + * Reimplemented from TDEListView to implement nicer items. */ - void paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int alignment); + void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment); /** * Set a text color for this item. * * @param color Text color */ - void setColor(QColor color) { m_textColor = color; } + void setColor(TQColor color) { m_textColor = color; } /** * Set a background color for this item. * * @param color Background color */ - void setBackground(QColor color) { m_backgroundColor = color; } + void setBackground(TQColor color) { m_backgroundColor = color; } /** * Set marked state for this item. @@ -304,8 +304,8 @@ private: */ bool marked() const { return m_marked; } private: - QColor m_textColor; - QColor m_backgroundColor; + TQColor m_textColor; + TQColor m_backgroundColor; bool m_marked; }; @@ -313,7 +313,7 @@ private: DirLister *m_dirLister; LocationNavigator *m_navigator; TreeView *m_treeView; - QTimer *m_resizeTimer; + TQTimer *m_resizeTimer; bool m_refreshing; bool m_showHidden; @@ -331,14 +331,14 @@ protected slots: /** * This slot gets called when an item has been renamed. */ - void slotItemRenamed(QListViewItem *item, const QString &name); + void slotItemRenamed(TQListViewItem *item, const TQString &name); void slotContentsMoving(int x, int y); /** * This slot gets called when a context menu should be displayed. */ - void slotContextMenu(KListView*, QListViewItem *i, const QPoint &p); + void slotContextMenu(TDEListView*, TQListViewItem *i, const TQPoint &p); /** * This slot gets called when an item has been clicked. diff --git a/kftpgrabber/src/widgets/browser/dirlister.cpp b/kftpgrabber/src/widgets/browser/dirlister.cpp index 4d539e4..9336a59 100644 --- a/kftpgrabber/src/widgets/browser/dirlister.cpp +++ b/kftpgrabber/src/widgets/browser/dirlister.cpp @@ -40,8 +40,8 @@ #include "kftpsession.h" -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> using namespace KFTPEngine; @@ -49,8 +49,8 @@ namespace KFTPWidgets { namespace Browser { -DirLister::DirLister(QObject *parent) - : QObject(parent) +DirLister::DirLister(TQObject *parent) + : TQObject(parent) { m_localLister = new KDirLister(); m_localLister->setAutoUpdate(true); @@ -97,7 +97,7 @@ void DirLister::fetchLocation(const KURL &url, bool reload) void DirLister::enableLocal() { m_localLister->stop(); - m_localLister->QObject::disconnect(this); + m_localLister->TQObject::disconnect(this); connect(m_localLister, SIGNAL(clear()), this, SIGNAL(clear())); connect(m_localLister, SIGNAL(completed()), this, SIGNAL(completed())); @@ -108,15 +108,15 @@ void DirLister::enableLocal() void DirLister::enableRemote() { m_localLister->stop(); - m_localLister->QObject::disconnect(this); - m_remoteSession->getClient()->eventHandler()->QObject::disconnect(this); + m_localLister->TQObject::disconnect(this); + m_remoteSession->getClient()->eventHandler()->TQObject::disconnect(this); connect(m_remoteSession->getClient()->eventHandler(), SIGNAL(engineEvent(KFTPEngine::Event*)), this, SLOT(slotRemoteEngineEvent(KFTPEngine::Event*))); } void DirLister::disableRemote() { - m_remoteSession->getClient()->eventHandler()->QObject::disconnect(this); + m_remoteSession->getClient()->eventHandler()->TQObject::disconnect(this); } void DirLister::stop() @@ -145,9 +145,9 @@ void DirLister::slotRemoteEngineEvent(KFTPEngine::Event *event) m_items.clear(); // Populate the item list - QValueList<DirectoryEntry> list = event->getParameter(0).asDirectoryListing().list(); - QValueList<DirectoryEntry>::ConstIterator end(list.end()); - for (QValueList<DirectoryEntry>::ConstIterator i(list.begin()); i != end; ++i) { + TQValueList<DirectoryEntry> list = event->getParameter(0).asDirectoryListing().list(); + TQValueList<DirectoryEntry>::ConstIterator end(list.end()); + for (TQValueList<DirectoryEntry>::ConstIterator i(list.begin()); i != end; ++i) { if (!m_showHidden && (*i).filename().at(0) == '.') continue; diff --git a/kftpgrabber/src/widgets/browser/dirlister.h b/kftpgrabber/src/widgets/browser/dirlister.h index 730704f..fae0872 100644 --- a/kftpgrabber/src/widgets/browser/dirlister.h +++ b/kftpgrabber/src/widgets/browser/dirlister.h @@ -36,7 +36,7 @@ #ifndef KFTPWIDGETS_BROWSERDIRLISTER_H #define KFTPWIDGETS_BROWSERDIRLISTER_H -#include <qobject.h> +#include <ntqobject.h> #include <kurl.h> #include <kdirlister.h> @@ -59,7 +59,7 @@ namespace Browser { * * @author Jernej Kos */ -class DirLister : public QObject { +class DirLister : public TQObject { Q_OBJECT public: /** @@ -67,7 +67,7 @@ public: * * @param parent Parent object */ - DirLister(QObject *parent); + DirLister(TQObject *parent); /** * Class destructor. diff --git a/kftpgrabber/src/widgets/browser/filterwidget.cpp b/kftpgrabber/src/widgets/browser/filterwidget.cpp index 47f88d9..0dda482 100644 --- a/kftpgrabber/src/widgets/browser/filterwidget.cpp +++ b/kftpgrabber/src/widgets/browser/filterwidget.cpp @@ -36,18 +36,18 @@ #include "browser/filterwidget.h" #include "browser/detailsview.h" -#include <qlistview.h> -#include <qregexp.h> -#include <qpopupmenu.h> +#include <ntqlistview.h> +#include <ntqregexp.h> +#include <ntqpopupmenu.h> -#include <klocale.h> +#include <tdelocale.h> namespace KFTPWidgets { namespace Browser { -FilterWidget::FilterWidget(QWidget *parent, DetailsView *view) - : KListViewSearchLine(parent, view), +FilterWidget::FilterWidget(TQWidget *parent, DetailsView *view) + : TDEListViewSearchLine(parent, view), m_filterDirectories(true), m_filterSymlinks(true), m_caseSensitive(false) @@ -55,7 +55,7 @@ FilterWidget::FilterWidget(QWidget *parent, DetailsView *view) connect(view, SIGNAL(itemsChanged()), this, SLOT(updateSearch())); } -bool FilterWidget::itemMatches(const QListViewItem *item, const QString &pattern) const +bool FilterWidget::itemMatches(const TQListViewItem *item, const TQString &pattern) const { if (!pattern.isEmpty()) { const KFileListViewItem *i = dynamic_cast<const KFileListViewItem*>(item); @@ -67,7 +67,7 @@ bool FilterWidget::itemMatches(const QListViewItem *item, const QString &pattern return true; } - QRegExp filter(pattern); + TQRegExp filter(pattern); filter.setCaseSensitive(m_caseSensitive); filter.setWildcard(true); @@ -77,11 +77,11 @@ bool FilterWidget::itemMatches(const QListViewItem *item, const QString &pattern return true; } -QPopupMenu *FilterWidget::createPopupMenu() +TQPopupMenu *FilterWidget::createPopupMenu() { - QPopupMenu *popup = KLineEdit::createPopupMenu(); + TQPopupMenu *popup = KLineEdit::createPopupMenu(); - QPopupMenu *subMenu = new QPopupMenu(popup); + TQPopupMenu *subMenu = new TQPopupMenu(popup); connect(subMenu, SIGNAL(activated(int)), this, SLOT(slotOptionsMenuActivated(int))); popup->insertSeparator(); diff --git a/kftpgrabber/src/widgets/browser/filterwidget.h b/kftpgrabber/src/widgets/browser/filterwidget.h index f5429cf..8d7a208 100644 --- a/kftpgrabber/src/widgets/browser/filterwidget.h +++ b/kftpgrabber/src/widgets/browser/filterwidget.h @@ -36,7 +36,7 @@ #ifndef KFTPWIDGETS_BROWSERFILTERWIDGET_H #define KFTPWIDGETS_BROWSERFILTERWIDGET_H -#include <klistviewsearchline.h> +#include <tdelistviewsearchline.h> namespace KFTPWidgets { @@ -51,7 +51,7 @@ class DetailsView; * * @author Jernej Kos <kostko@jweb-network.net> */ -class FilterWidget : public KListViewSearchLine { +class FilterWidget : public TDEListViewSearchLine { Q_OBJECT public: /** @@ -60,7 +60,7 @@ public: * @param parent The parent widget * @param view The view you want to filter */ - FilterWidget(QWidget *parent, DetailsView *view); + FilterWidget(TQWidget *parent, DetailsView *view); protected: enum { FilterDirectories = 1, @@ -70,18 +70,18 @@ protected: /** * @overload - * Reimplemented from KListViewSearchLine to support wildcard + * Reimplemented from TDEListViewSearchLine to support wildcard * matching schemes. */ - bool itemMatches(const QListViewItem *item, const QString &pattern) const; + bool itemMatches(const TQListViewItem *item, const TQString &pattern) const; /** * @overload - * Reimplemented from KListViewSearchLine to remove multiple + * Reimplemented from TDEListViewSearchLine to remove multiple * columns selection, since this widget only operates on the * first column. */ - QPopupMenu *createPopupMenu(); + TQPopupMenu *createPopupMenu(); private: bool m_filterDirectories; bool m_filterSymlinks; diff --git a/kftpgrabber/src/widgets/browser/locationnavigator.cpp b/kftpgrabber/src/widgets/browser/locationnavigator.cpp index 5be8004..35d3e87 100644 --- a/kftpgrabber/src/widgets/browser/locationnavigator.cpp +++ b/kftpgrabber/src/widgets/browser/locationnavigator.cpp @@ -81,7 +81,7 @@ void LocationNavigator::setUrl(const KURL &url) updateCurrentElement(); - const QValueListIterator<LocationNavigator::Element> i = m_history.at(m_historyIndex); + const TQValueListIterator<LocationNavigator::Element> i = m_history.at(m_historyIndex); m_history.insert(i, Element(url)); emit urlChanged(url); @@ -99,7 +99,7 @@ const KURL& LocationNavigator::url() const return m_history[m_historyIndex].url(); } -const QValueList<LocationNavigator::Element> LocationNavigator::history(int &index) const +const TQValueList<LocationNavigator::Element> LocationNavigator::history(int &index) const { index = m_historyIndex; return m_history; diff --git a/kftpgrabber/src/widgets/browser/locationnavigator.h b/kftpgrabber/src/widgets/browser/locationnavigator.h index 475a3af..d709938 100644 --- a/kftpgrabber/src/widgets/browser/locationnavigator.h +++ b/kftpgrabber/src/widgets/browser/locationnavigator.h @@ -36,8 +36,8 @@ #ifndef KFTPWIDGETS_BROWSERLOCATIONNAVIGATOR_H #define KFTPWIDGETS_BROWSERLOCATIONNAVIGATOR_H -#include <qobject.h> -#include <qvaluelist.h> +#include <ntqobject.h> +#include <ntqvaluelist.h> #include <kurl.h> @@ -53,7 +53,7 @@ class DetailsView; * * @author Jernej Kos */ -class LocationNavigator : public QObject { +class LocationNavigator : public TQObject { Q_OBJECT public: /** @@ -84,12 +84,12 @@ public: * * @param filename The filename of the currently selected item */ - void setCurrentFilename(const QString &filename) { m_currentFilename = filename; } + void setCurrentFilename(const TQString &filename) { m_currentFilename = filename; } /** * Returns the selected filename. */ - const QString ¤tFilename() const { return m_currentFilename; } + const TQString ¤tFilename() const { return m_currentFilename; } /** * Set current contents X position. @@ -116,7 +116,7 @@ public: int contentsY() const { return m_contentsY; } private: KURL m_url; - QString m_currentFilename; + TQString m_currentFilename; int m_contentsX; int m_contentsY; @@ -147,7 +147,7 @@ public: * @param index Variable to save the current history position to * @return Current history element list */ - const QValueList<Element> history(int &index) const; + const TQValueList<Element> history(int &index) const; /** * Go one history hop back. @@ -197,7 +197,7 @@ private slots: private: DetailsView *m_view; int m_historyIndex; - QValueList<Element> m_history; + TQValueList<Element> m_history; KURL m_homeUrl; void updateCurrentElement(); diff --git a/kftpgrabber/src/widgets/browser/propsplugin.cpp b/kftpgrabber/src/widgets/browser/propsplugin.cpp index b6e688d..6a6ed1f 100644 --- a/kftpgrabber/src/widgets/browser/propsplugin.cpp +++ b/kftpgrabber/src/widgets/browser/propsplugin.cpp @@ -36,12 +36,12 @@ #include "browser/propsplugin.h" #include "kftpsession.h" -#include <qlayout.h> -#include <qlabel.h> -#include <qstyle.h> -#include <qgroupbox.h> +#include <ntqlayout.h> +#include <ntqlabel.h> +#include <ntqstyle.h> +#include <ntqgroupbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kseparator.h> #include <ksqueezedtextlabel.h> @@ -55,7 +55,7 @@ namespace Browser { PropsPlugin::PropsPlugin(KPropertiesDialog *props, KFileItemList items) : KPropsDlgPlugin(props) { - QFrame *frame = properties->addPage(i18n("&General")); + TQFrame *frame = properties->addPage(i18n("&General")); frame->setMinimumWidth(320); frame->setMinimumHeight(300); @@ -63,9 +63,9 @@ PropsPlugin::PropsPlugin(KPropertiesDialog *props, KFileItemList items) KFileItem *item = items.at(0); KURL fileUrl = item->url(); filesize_t fileSize = item->size(); - QString nameText; - QString iconText; - QString mimeComment; + TQString nameText; + TQString iconText; + TQString mimeComment; if (items.count() == 1) { bool isDir = false; @@ -85,12 +85,12 @@ PropsPlugin::PropsPlugin(KPropertiesDialog *props, KFileItemList items) isDir = true; mimeComment = i18n("Remote folder"); } else { - iconText = mimeType->icon(QString::null, false); + iconText = mimeType->icon(TQString::null, false); mimeComment = mimeType->comment(); } } else { KMimeType::Ptr mimeType = KMimeType::findByURL(fileUrl, 0, false, true); - iconText = mimeType->icon(QString::null, false); + iconText = mimeType->icon(TQString::null, false); mimeComment = mimeType->comment(); } @@ -115,12 +115,12 @@ PropsPlugin::PropsPlugin(KPropertiesDialog *props, KFileItemList items) fileSize += (*i)->size(); } - iconText = "kmultiple"; - nameText = KIO::itemsSummaryString(countFiles + countFolders, countFiles, countFolders, 0, false); + iconText = "tdemultiple"; + nameText = TDEIO::itemsSummaryString(countFiles + countFolders, countFiles, countFolders, 0, false); } - QVBoxLayout *vbl = new QVBoxLayout(frame, 0, KDialog::spacingHint(), "vbl"); - QGridLayout *grid = new QGridLayout(0, 3); + TQVBoxLayout *vbl = new TQVBoxLayout(frame, 0, KDialog::spacingHint(), "vbl"); + TQGridLayout *grid = new TQGridLayout(0, 3); grid->setColStretch(0, 0); grid->setColStretch(1, 0); grid->setColStretch(2, 1); @@ -128,13 +128,13 @@ PropsPlugin::PropsPlugin(KPropertiesDialog *props, KFileItemList items) vbl->addLayout(grid); // Display file name and icon - QLabel *iconLabel = new QLabel(frame); - int bsize = 66 + 2 * iconLabel->style().pixelMetric(QStyle::PM_ButtonMargin); + TQLabel *iconLabel = new TQLabel(frame); + int bsize = 66 + 2 * iconLabel->style().pixelMetric(TQStyle::PM_ButtonMargin); iconLabel->setFixedSize(bsize, bsize); iconLabel->setPixmap(DesktopIcon(iconText)); grid->addWidget(iconLabel, 0, 0, AlignLeft); - QLabel *nameLabel = new QLabel(frame); + TQLabel *nameLabel = new TQLabel(frame); nameLabel->setText(nameText); grid->addWidget(nameLabel, 0, 2); @@ -142,32 +142,32 @@ PropsPlugin::PropsPlugin(KPropertiesDialog *props, KFileItemList items) grid->addMultiCellWidget(sep, 2, 2, 0, 2); // Display file information - QLabel *l; + TQLabel *l; int currentRow = 3; if (items.count() == 1) { - l = new QLabel(i18n("Type:"), frame); + l = new TQLabel(i18n("Type:"), frame); grid->addWidget(l, currentRow, 0); - l = new QLabel(mimeComment, frame); + l = new TQLabel(mimeComment, frame); grid->addWidget(l, currentRow++, 2); } - l = new QLabel(i18n("Location:"), frame); + l = new TQLabel(i18n("Location:"), frame); grid->addWidget(l, currentRow, 0); l = new KSqueezedTextLabel(frame); l->setText(fileUrl.directory()); grid->addWidget(l, currentRow++, 2); - l = new QLabel(i18n("Size:"), frame); + l = new TQLabel(i18n("Size:"), frame); grid->addWidget(l, currentRow, 0); - l = new QLabel(frame); + l = new TQLabel(frame); grid->addWidget(l, currentRow++, 2); - l->setText(QString::fromLatin1("%1 (%2)").arg(KIO::convertSize(fileSize)) - .arg(KGlobal::locale()->formatNumber(fileSize, 0))); + l->setText(TQString::fromLatin1("%1 (%2)").arg(TDEIO::convertSize(fileSize)) + .arg(TDEGlobal::locale()->formatNumber(fileSize, 0))); sep = new KSeparator(KSeparator::HLine, frame); grid->addMultiCellWidget(sep, currentRow, currentRow, 0, 2); @@ -175,12 +175,12 @@ PropsPlugin::PropsPlugin(KPropertiesDialog *props, KFileItemList items) // Display modification time if (items.count() == 1) { - l = new QLabel(i18n("Created:"), frame); + l = new TQLabel(i18n("Created:"), frame); grid->addWidget(l, currentRow, 0); - QDateTime dt; - dt.setTime_t(item->time(KIO::UDS_MODIFICATION_TIME)); - l = new QLabel(KGlobal::locale()->formatDateTime(dt), frame); + TQDateTime dt; + dt.setTime_t(item->time(TDEIO::UDS_MODIFICATION_TIME)); + l = new TQLabel(TDEGlobal::locale()->formatDateTime(dt), frame); grid->addWidget(l, currentRow++, 2); } @@ -203,7 +203,7 @@ PermissionsPropsPlugin::PermissionsPropsPlugin(KPropertiesDialog *_props, KFileI m_session(session), m_cbRecursive(0) { - QFrame *frame = properties->addPage(i18n("&Permissions")); + TQFrame *frame = properties->addPage(i18n("&Permissions")); frame->setMinimumWidth(320); frame->setMinimumHeight(300); @@ -235,59 +235,59 @@ PermissionsPropsPlugin::PermissionsPropsPlugin(KPropertiesDialog *_props, KFileI } } - QBoxLayout *box = new QVBoxLayout(frame, 0, KDialog::spacingHint()); + TQBoxLayout *box = new TQVBoxLayout(frame, 0, KDialog::spacingHint()); - QGroupBox *gb = new QGroupBox(0, Qt::Vertical, i18n("Access Permissions"), frame); + TQGroupBox *gb = new TQGroupBox(0, TQt::Vertical, i18n("Access Permissions"), frame); gb->layout()->setSpacing(KDialog::spacingHint()); gb->layout()->setMargin(KDialog::marginHint()); box->addWidget(gb); - QGridLayout *gl = new QGridLayout(gb->layout(), 6, 6, 15); + TQGridLayout *gl = new TQGridLayout(gb->layout(), 6, 6, 15); - QLabel *l = new QLabel(i18n("Class"), gb); + TQLabel *l = new TQLabel(i18n("Class"), gb); gl->addWidget(l, 1, 0); if (isDir) - l = new QLabel(i18n("Show\nEntries"), gb); + l = new TQLabel(i18n("Show\nEntries"), gb); else - l = new QLabel(i18n("Read"), gb); + l = new TQLabel(i18n("Read"), gb); gl->addWidget(l, 1, 1); if (isDir) - l = new QLabel(i18n("Write\nEntries"), gb); + l = new TQLabel(i18n("Write\nEntries"), gb); else - l = new QLabel(i18n("Write"), gb); + l = new TQLabel(i18n("Write"), gb); gl->addWidget(l, 1, 2); if (isDir) - l = new QLabel(i18n("Enter folder", "Enter"), gb); + l = new TQLabel(i18n("Enter folder", "Enter"), gb); else - l = new QLabel(i18n("Exec"), gb); + l = new TQLabel(i18n("Exec"), gb); - QSize size = l->sizeHint(); + TQSize size = l->sizeHint(); size.setWidth(size.width() + 15); l->setFixedSize(size); gl->addWidget(l, 1, 3); - l = new QLabel(i18n("Special"), gb); + l = new TQLabel(i18n("Special"), gb); gl->addMultiCellWidget(l, 1, 1, 4, 5); - l = new QLabel(i18n("User"), gb); + l = new TQLabel(i18n("User"), gb); gl->addWidget(l, 2, 0); - l = new QLabel(i18n("Group"), gb); + l = new TQLabel(i18n("Group"), gb); gl->addWidget(l, 3, 0); - l = new QLabel(i18n("Others"), gb); + l = new TQLabel(i18n("Others"), gb); gl->addWidget(l, 4, 0); - l = new QLabel(i18n("Set UID"), gb); + l = new TQLabel(i18n("Set UID"), gb); gl->addWidget(l, 2, 5); - l = new QLabel(i18n("Set GID"), gb); + l = new TQLabel(i18n("Set GID"), gb); gl->addWidget(l, 3, 5); - l = new QLabel(i18n("Sticky"), gb); + l = new TQLabel(i18n("Sticky"), gb); gl->addWidget(l, 4, 5); mode_t permissions = item->permissions(); @@ -295,7 +295,7 @@ PermissionsPropsPlugin::PermissionsPropsPlugin(KPropertiesDialog *_props, KFileI // Display checkboxes for (int row = 0; row < 3; ++row) { for (int col = 0; col < 4; ++col) { - QCheckBox *cb = new QCheckBox(gb); + TQCheckBox *cb = new TQCheckBox(gb); connect(cb, SIGNAL(clicked()), this, SLOT(setDirty())); m_permsCheck[row][col] = cb; cb->setChecked(permissions & fperm[row][col]); @@ -308,7 +308,7 @@ PermissionsPropsPlugin::PermissionsPropsPlugin(KPropertiesDialog *_props, KFileI box->addStretch(10); if (isDir) { - m_cbRecursive = new QCheckBox(i18n("Apply changes to all subfolders and their contents"), frame); + m_cbRecursive = new TQCheckBox(i18n("Apply changes to all subfolders and their contents"), frame); connect(m_cbRecursive, SIGNAL(clicked()), this, SLOT(changed())); box->addWidget(m_cbRecursive); } diff --git a/kftpgrabber/src/widgets/browser/propsplugin.h b/kftpgrabber/src/widgets/browser/propsplugin.h index 9283f85..736ec48 100644 --- a/kftpgrabber/src/widgets/browser/propsplugin.h +++ b/kftpgrabber/src/widgets/browser/propsplugin.h @@ -38,7 +38,7 @@ #include "engine/directorylisting.h" -#include <qcheckbox.h> +#include <ntqcheckbox.h> #include <kpropertiesdialog.h> namespace KFTPSession { @@ -86,9 +86,9 @@ private: KFTPSession::Session *m_session; static mode_t fperm[3][4]; - QString m_perms[3]; - QCheckBox *m_permsCheck[3][4]; - QCheckBox *m_cbRecursive; + TQString m_perms[3]; + TQCheckBox *m_permsCheck[3][4]; + TQCheckBox *m_cbRecursive; }; } diff --git a/kftpgrabber/src/widgets/browser/treeview.cpp b/kftpgrabber/src/widgets/browser/treeview.cpp index 0f2a824..f101dc7 100644 --- a/kftpgrabber/src/widgets/browser/treeview.cpp +++ b/kftpgrabber/src/widgets/browser/treeview.cpp @@ -40,10 +40,10 @@ #include "misc.h" -#include <qheader.h> -#include <qtimer.h> +#include <ntqheader.h> +#include <ntqtimer.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <kurl.h> #include <kurldrag.h> @@ -58,7 +58,7 @@ namespace Browser { */ TreeViewItem::TreeViewItem(TreeView *parent, const KURL &url) - : QListViewItem(parent), + : TQListViewItem(parent), m_tree(parent), m_url(url), m_dirty(false) @@ -67,8 +67,8 @@ TreeViewItem::TreeViewItem(TreeView *parent, const KURL &url) setText(0, path2Name(url.path(-1))); } -TreeViewItem::TreeViewItem(TreeView *tree, QListViewItem *parent, const KURL &url) - : QListViewItem(parent), +TreeViewItem::TreeViewItem(TreeView *tree, TQListViewItem *parent, const KURL &url) + : TQListViewItem(parent), m_tree(tree), m_url(url), m_dirty(false) @@ -83,21 +83,21 @@ TreeViewItem::~TreeViewItem() m_tree->m_treeItems.remove(m_url.path()); } -int TreeViewItem::compare(QListViewItem *i, int col, bool) const +int TreeViewItem::compare(TQListViewItem *i, int col, bool) const { // Hidden files must be on top if (m_url.fileName().at(0) == '.') return -1; - return QListViewItem::compare(i, col, false); + return TQListViewItem::compare(i, col, false); } /* * TreeView class */ -TreeView::TreeView(QWidget *parent) - : KListView(parent) +TreeView::TreeView(TQWidget *parent) + : TDEListView(parent) { // Create the columns addColumn(i18n("Directory")); @@ -114,8 +114,8 @@ TreeView::TreeView(QWidget *parent) m_noItemOpen = false; // Connect signals - connect(this, SIGNAL(clicked(QListViewItem*)), this, SLOT(slotClicked(QListViewItem*))); - connect(this, SIGNAL(doubleClicked(QListViewItem*)), this, SLOT(slotDoubleClicked(QListViewItem*))); + connect(this, SIGNAL(clicked(TQListViewItem*)), this, SLOT(slotClicked(TQListViewItem*))); + connect(this, SIGNAL(doubleClicked(TQListViewItem*)), this, SLOT(slotDoubleClicked(TQListViewItem*))); // Drag and drop m_dropItem = 0L; @@ -144,13 +144,13 @@ void TreeView::resetView(const KURL &url) setOpen(rootItem, true); } -int TreeView::openUrl(const KURL &url, QListViewItem *parent) +int TreeView::openUrl(const KURL &url, TQListViewItem *parent) { // Root item should always be open setOpen(firstChild(), true); // Go trough all items in the list and try to find the url - QListViewItem *item; + TQListViewItem *item; if (!parent) item = firstChild(); else @@ -165,7 +165,7 @@ int TreeView::openUrl(const KURL &url, QListViewItem *parent) setSelected(item, true); // Change viewport - QRect r = itemRect(item); + TQRect r = itemRect(item); if (r.isValid()) { int x, y; viewportToContents(contentsX(), r.y(), x, y); @@ -187,9 +187,9 @@ int TreeView::openUrl(const KURL &url, QListViewItem *parent) return 0; } -QListViewItem *TreeView::findItem(QListViewItem *parent, const QString &name) +TQListViewItem *TreeView::findItem(TQListViewItem *parent, const TQString &name) { - QListViewItem *item = parent->firstChild(); + TQListViewItem *item = parent->firstChild(); while (item) { if (item->text(0) == name) @@ -202,13 +202,13 @@ QListViewItem *TreeView::findItem(QListViewItem *parent, const QString &name) return parent; } -void TreeView::createFolder(const KURL &url, QPixmap icon) +void TreeView::createFolder(const KURL &url, TQPixmap icon) { int numDirs = url.path(1).contains('/', false); - QListViewItem *item = firstChild(); + TQListViewItem *item = firstChild(); for (int i = 1; i < numDirs; i++) { - QString itemUrl = url.path().section('/', 0, i); + TQString itemUrl = url.path().section('/', 0, i); if (m_treeItems[itemUrl]) { // Item exists for this URL @@ -270,7 +270,7 @@ void TreeView::endUpdate(const KURL &url) itemURL.setPath("/"); for (int i = 1; i < numDirs; i++) { - QString sect = url.path().section('/', i, i); + TQString sect = url.path().section('/', i, i); itemURL.setPath(url.path().section('/', 0, i)); if (!m_treeItems[itemURL.path()]) { @@ -306,11 +306,11 @@ void TreeView::endUpdate(const KURL &url) void TreeView::clearFolder(const KURL &url) { // Remove url's children - QListViewItem *top = firstChild(); + TQListViewItem *top = firstChild(); int numDirs = url.path(1).contains('/', false); if (url.path() == "/") { - QListViewItem *i = top->firstChild(); + TQListViewItem *i = top->firstChild(); while (i) { // Remove item from the index @@ -327,7 +327,7 @@ void TreeView::clearFolder(const KURL &url) itemURL.setPath("/"); for (int i = 1; i < numDirs; i++) { - QString sect = url.path().section('/', i, i); + TQString sect = url.path().section('/', i, i); itemURL.setPath(url.path().section('/', 0, i)); if (!m_treeItems[itemURL.path()]) { @@ -340,7 +340,7 @@ void TreeView::clearFolder(const KURL &url) // Check for URL match if (itemURL.path(-1) == url.path(-1)) { // URL match, delete the item's children - QListViewItem *i = top->firstChild(); + TQListViewItem *i = top->firstChild(); while (i) { // Remove item from the index @@ -357,7 +357,7 @@ void TreeView::clearFolder(const KURL &url) void TreeView::removeFolder(const KURL &url) { // Removes a folder at url - QListViewItem *top = firstChild(); + TQListViewItem *top = firstChild(); int numDirs = url.path(1).contains('/', false); // URL for items @@ -365,7 +365,7 @@ void TreeView::removeFolder(const KURL &url) itemURL.setPath("/"); for (int i = 1; i < numDirs; i++) { - QString sect = url.path().section('/', i, i); + TQString sect = url.path().section('/', i, i); itemURL.setPath(url.path().section('/', 0, i)); if (!m_treeItems[itemURL.path()]) { @@ -386,7 +386,7 @@ void TreeView::removeFolder(const KURL &url) } } -void TreeView::slotClicked(QListViewItem *item) +void TreeView::slotClicked(TQListViewItem *item) { if (!item) return; @@ -396,7 +396,7 @@ void TreeView::slotClicked(QListViewItem *item) m_noItemOpen = false; } -void TreeView::slotDoubleClicked(QListViewItem *item) +void TreeView::slotDoubleClicked(TQListViewItem *item) { if (!item) return; @@ -409,36 +409,36 @@ void TreeView::startDrag() dragObject()->drag(); } -bool TreeView::acceptDrag(QDropEvent *e) +bool TreeView::acceptDrag(TQDropEvent *e) { return KURLDrag::canDecode(e) && - ( e->action() == QDropEvent::Copy - || e->action() == QDropEvent::Move - || e->action() == QDropEvent::Link ) + ( e->action() == TQDropEvent::Copy + || e->action() == TQDropEvent::Move + || e->action() == TQDropEvent::Link ) && acceptDrops() && dragEnabled(); } -QDragObject *TreeView::dragObject() +TQDragObject *TreeView::dragObject() { TreeViewItem *item = static_cast<TreeViewItem*>(selectedItem()); // Set the correct pixmap - QPixmap pix = *item->pixmap(0); + TQPixmap pix = *item->pixmap(0); KURL::List urls; urls.append(item->m_url); - KIO::MetaData meta; + TDEIO::MetaData meta; meta.insert(item->m_url.htmlURL().local8Bit(), "D:0"); m_dragObject = new KURLDrag(urls, meta, this, name()); - m_dragObject->setPixmap(pix, QPoint(pix.width() / 2, pix.height() / 2)); + m_dragObject->setPixmap(pix, TQPoint(pix.width() / 2, pix.height() / 2)); return m_dragObject; } -void TreeView::contentsDragEnterEvent(QDragEnterEvent *e) +void TreeView::contentsDragEnterEvent(TQDragEnterEvent *e) { if (!acceptDrag(e)) { e->accept(false); @@ -446,12 +446,12 @@ void TreeView::contentsDragEnterEvent(QDragEnterEvent *e) } e->acceptAction(); - QListViewItem *i = itemAt(contentsToViewport(e->pos())); + TQListViewItem *i = itemAt(contentsToViewport(e->pos())); if (i) m_dropItem = i; } -void TreeView::contentsDragMoveEvent(QDragMoveEvent *e) +void TreeView::contentsDragMoveEvent(TQDragMoveEvent *e) { if (!acceptDrag(e)) { e->accept(false); @@ -459,18 +459,18 @@ void TreeView::contentsDragMoveEvent(QDragMoveEvent *e) } e->acceptAction(); - QListViewItem *i = itemAt(contentsToViewport(e->pos())); + TQListViewItem *i = itemAt(contentsToViewport(e->pos())); if (i && i != m_dropItem) m_dropItem = i; } -void TreeView::contentsDragLeaveEvent(QDragLeaveEvent*) +void TreeView::contentsDragLeaveEvent(TQDragLeaveEvent*) { m_dropItem = 0L; } -void TreeView::contentsDropEvent(QDropEvent *e) +void TreeView::contentsDropEvent(TQDropEvent *e) { if (!m_dropItem) return; @@ -482,7 +482,7 @@ void TreeView::contentsDropEvent(QDropEvent *e) e->acceptAction(); // Decode the data and try to init transfer - KIO::MetaData meta; + TDEIO::MetaData meta; KURL::List urls; KURLDrag::decode(e, urls, meta); @@ -498,7 +498,7 @@ void TreeView::contentsDropEvent(QDropEvent *e) destUrl.addPath((*i).fileName()); if ((*i).isLocalFile()) { - KIO::move((*i), destUrl, false); + TDEIO::move((*i), destUrl, false); // Reload the listing static_cast<View*>(parent()->parent())->reload(); diff --git a/kftpgrabber/src/widgets/browser/treeview.h b/kftpgrabber/src/widgets/browser/treeview.h index 220ac88..d325fe6 100644 --- a/kftpgrabber/src/widgets/browser/treeview.h +++ b/kftpgrabber/src/widgets/browser/treeview.h @@ -36,12 +36,12 @@ #ifndef KFTPFILEDIRTREEVIEW_H #define KFTPFILEDIRTREEVIEW_H -#include <klistview.h> -#include <klocale.h> +#include <tdelistview.h> +#include <tdelocale.h> #include <kurl.h> -#include <qpixmap.h> -#include <qdict.h> +#include <ntqpixmap.h> +#include <ntqdict.h> namespace KFTPWidgets { @@ -55,7 +55,7 @@ class TreeViewItem; * * @author Jernej Kos */ -class TreeView : public KListView +class TreeView : public TDEListView { Q_OBJECT friend class ListView; @@ -66,7 +66,7 @@ public: * * @param parent The parent widget */ - TreeView(QWidget *parent); + TreeView(TQWidget *parent); /** * Class destructor. @@ -78,7 +78,7 @@ public: * * @param url The url to open */ - int openUrl(const KURL &url, QListViewItem *parent = 0); + int openUrl(const KURL &url, TQListViewItem *parent = 0); /** * Remove the folder's child items. @@ -101,7 +101,7 @@ public: * @param url The folder's URL * @param icon The icon to use */ - void createFolder(const KURL &url, QPixmap icon); + void createFolder(const KURL &url, TQPixmap icon); /** * Clear all items in the view and create a new root item. @@ -117,25 +117,25 @@ public: */ void endUpdate(const KURL &url); private: - QDict<TreeViewItem> m_treeItems; + TQDict<TreeViewItem> m_treeItems; bool m_noItemOpen; /* Drag & drop support */ - QListViewItem *m_dropItem; - QDragObject *m_dragObject; + TQListViewItem *m_dropItem; + TQDragObject *m_dragObject; - QDragObject *dragObject(); + TQDragObject *dragObject(); void startDrag(); - bool acceptDrag(QDropEvent *e); - void contentsDragEnterEvent(QDragEnterEvent *e); - void contentsDragMoveEvent(QDragMoveEvent *e); - void contentsDragLeaveEvent(QDragLeaveEvent*); - void contentsDropEvent(QDropEvent *e); + bool acceptDrag(TQDropEvent *e); + void contentsDragEnterEvent(TQDragEnterEvent *e); + void contentsDragMoveEvent(TQDragMoveEvent *e); + void contentsDragLeaveEvent(TQDragLeaveEvent*); + void contentsDropEvent(TQDropEvent *e); protected: - QListViewItem *findItem(QListViewItem *parent, const QString &name); + TQListViewItem *findItem(TQListViewItem *parent, const TQString &name); private slots: - void slotClicked(QListViewItem *item); - void slotDoubleClicked(QListViewItem *item); + void slotClicked(TQListViewItem *item); + void slotDoubleClicked(TQListViewItem *item); signals: void pathChanged(const KURL &url); }; @@ -145,7 +145,7 @@ signals: * * @author Jernej Kos */ -class TreeViewItem : public QListViewItem +class TreeViewItem : public TQListViewItem { friend class TreeView; public: @@ -164,7 +164,7 @@ public: * @param parent The parent list view item * @param url This item's URL */ - TreeViewItem(TreeView *tree, QListViewItem *parent, const KURL &url); + TreeViewItem(TreeView *tree, TQListViewItem *parent, const KURL &url); /** * Class destructor. @@ -173,9 +173,9 @@ public: protected: /** * @overload - * Reimplemented from QListViewItem to provide proper comparation. + * Reimplemented from TQListViewItem to provide proper comparation. */ - int compare(QListViewItem *i, int col, bool) const; + int compare(TQListViewItem *i, int col, bool) const; private: TreeView *m_tree; KURL m_url; diff --git a/kftpgrabber/src/widgets/browser/view.cpp b/kftpgrabber/src/widgets/browser/view.cpp index 4b3b0e5..43fb3e2 100644 --- a/kftpgrabber/src/widgets/browser/view.cpp +++ b/kftpgrabber/src/widgets/browser/view.cpp @@ -46,21 +46,21 @@ #include "misc.h" -#include <klocale.h> -#include <ktoolbar.h> +#include <tdelocale.h> +#include <tdetoolbar.h> #include <kstatusbar.h> #include <kcombobox.h> -#include <kaction.h> -#include <kmessagebox.h> +#include <tdeaction.h> +#include <tdemessagebox.h> #include <ksslinfodlg.h> #include <klineedit.h> #include <kpixmapprovider.h> -#include <kio/job.h> +#include <tdeio/job.h> -#include <qdir.h> -#include <qlabel.h> -#include <qlayout.h> +#include <ntqdir.h> +#include <ntqlabel.h> +#include <ntqlayout.h> using namespace KFTPGrabberBase; using namespace KFTPEngine; @@ -72,18 +72,18 @@ namespace Browser { class HistoryPixmapProvider : public KPixmapProvider { public: - QPixmap pixmapFor(const QString&, int) + TQPixmap pixmapFor(const TQString&, int) { return loadSmallPixmap("folder"); } }; -View::View(QWidget *parent, const char *name, KFTPEngine::Thread *client, KFTPSession::Session *session) - : QWidget(parent, name), +View::View(TQWidget *parent, const char *name, KFTPEngine::Thread *client, KFTPSession::Session *session) + : TQWidget(parent, name), m_session(session), m_ftpClient(client) { - m_connTimer = new QTimer(this); + m_connTimer = new TQTimer(this); // Create the GUI init(); @@ -114,12 +114,12 @@ void View::init() m_actions->initActions(); // Layout - QVBoxLayout *layout = new QVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); // Create the toolbars - m_toolBarFirst = new KToolBar(this, "first toolbar", false, false); - m_toolBarSecond = new KToolBar(this, "second toolbar", false, false); - m_searchToolBar = new KToolBar(this, "search toolbar", false, false); + m_toolBarFirst = new TDEToolBar(this, "first toolbar", false, false); + m_toolBarSecond = new TDEToolBar(this, "second toolbar", false, false); + m_searchToolBar = new TDEToolBar(this, "search toolbar", false, false); m_toolBarFirst->setEnableContextMenu(false); m_toolBarFirst->setMovingEnabled(false); @@ -133,14 +133,14 @@ void View::init() m_searchToolBar->setMovingEnabled(false); m_searchToolBar->setFullSize(true); - QLabel *filterLabel = new QLabel(i18n("Filter: "), m_searchToolBar); + TQLabel *filterLabel = new TQLabel(i18n("Filter: "), m_searchToolBar); m_searchToolBar->insertWidget(1, 35, filterLabel); // Create the erase button - m_toolBarSecond->insertButton(QApplication::reverseLayout() ? "clear_left" :"locationbar_erase", 0, SIGNAL(clicked()), this, SLOT(slotHistoryEraseClicked()), true); + m_toolBarSecond->insertButton(TQApplication::reverseLayout() ? "clear_left" :"locationbar_erase", 0, SIGNAL(clicked()), this, SLOT(slotHistoryEraseClicked()), true); // Create the labels - QLabel *pathLabel = new QLabel(i18n("Path: "), m_toolBarSecond); + TQLabel *pathLabel = new TQLabel(i18n("Path: "), m_toolBarSecond); m_toolBarSecond->insertWidget(1, 35, pathLabel); // Create the history combo @@ -150,9 +150,9 @@ void View::init() m_historyCombo->setMaxCount(25); m_historyCombo->setSizeLimit(25); m_historyCombo->setDuplicatesEnabled(false); - m_historyCombo->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed)); + m_historyCombo->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); - connect(m_historyCombo, SIGNAL(activated(const QString&)), this, SLOT(slotHistoryActivated(const QString&))); + connect(m_historyCombo, SIGNAL(activated(const TQString&)), this, SLOT(slotHistoryActivated(const TQString&))); // Do some more stuff m_toolBarSecond->setItemAutoSized(1, true); @@ -161,27 +161,27 @@ void View::init() m_toolBarFirst->updateRects(true); // Create a splitter - m_splitter = new QSplitter(this); + m_splitter = new TQSplitter(this); m_splitter->setOpaqueResize(true); - m_splitter->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding)); + m_splitter->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); // Create a status bar - QHBoxLayout *statusLayout = new QHBoxLayout(this); + TQHBoxLayout *statusLayout = new TQHBoxLayout(this); - m_connDurationMsg = new QLabel(this); + m_connDurationMsg = new TQLabel(this); m_connDurationMsg->setAlignment(AlignAuto | AlignVCenter | AlignHCenter | ExpandTabs); - m_connDurationMsg->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken); + m_connDurationMsg->setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken); m_connDurationMsg->setMinimumWidth(100); - m_sslIcon = new QPushButton(this); + m_sslIcon = new TQPushButton(this); m_sslIcon->setFlat(true); m_sslIcon->setIconSet(SmallIconSet("decrypted")); m_sslIcon->setEnabled(false); connect(m_sslIcon, SIGNAL(clicked()), this, SLOT(slotDisplayCertInfo())); - m_statusMsg = new QLabel(this); - m_statusMsg->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken); + m_statusMsg = new TQLabel(this); + m_statusMsg->setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken); m_statusMsg->setText(i18n("Idle.")); statusLayout->addWidget(m_statusMsg, 1); @@ -222,7 +222,7 @@ const KURL &View::url() const return m_detailsView->url(); } -const QValueList<LocationNavigator::Element> View::history(int &index) const +const TQValueList<LocationNavigator::Element> View::history(int &index) const { return m_detailsView->history(index); } @@ -295,13 +295,13 @@ void View::reload() m_detailsView->reload(); } -void View::rename(const KURL &source, const QString &name) +void View::rename(const KURL &source, const TQString &name) { KURL dest(source.upURL()); dest.addPath(name); if (source.isLocalFile()) - KIO::rename(source, dest, false); + TDEIO::rename(source, dest, false); else m_session->getClient()->rename(source, dest); } @@ -359,10 +359,10 @@ void View::updateBookmarks() { // Repopulate bookmarks menu on updates m_actions->m_connectAction->popupMenu()->clear(); - KFTPBookmarks::Manager::self()->guiPopulateBookmarksMenu(m_actions->m_connectAction, QDomNode(), false, m_session); + KFTPBookmarks::Manager::self()->guiPopulateBookmarksMenu(m_actions->m_connectAction, TQDomNode(), false, m_session); } -void View::slotHistoryActivated(const QString &text) +void View::slotHistoryActivated(const TQString &text) { KURL dest = url(); dest.setPath(text); @@ -372,7 +372,7 @@ void View::slotHistoryActivated(const QString &text) void View::slotHistoryEraseClicked() { - m_historyCombo->setCurrentText(QString::null); + m_historyCombo->setCurrentText(TQString::null); m_historyCombo->setFocus(); } @@ -426,7 +426,7 @@ void View::slotEngineEvent(KFTPEngine::Event *event) } // Reset selected charset to default - KPopupMenu *menu = m_actions->m_changeEncodingAction->popupMenu(); + TDEPopupMenu *menu = m_actions->m_changeEncodingAction->popupMenu(); menu->setItemChecked(m_actions->m_defaultCharsetOption, true); menu->setItemChecked(m_actions->m_curCharsetOption, false); m_actions->m_curCharsetOption = m_actions->m_defaultCharsetOption; diff --git a/kftpgrabber/src/widgets/browser/view.h b/kftpgrabber/src/widgets/browser/view.h index 67dffa6..198a383 100644 --- a/kftpgrabber/src/widgets/browser/view.h +++ b/kftpgrabber/src/widgets/browser/view.h @@ -38,24 +38,24 @@ #include "browser/locationnavigator.h" -#include <qwidget.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qtimer.h> -#include <qdatetime.h> -#include <qsplitter.h> +#include <ntqwidget.h> +#include <ntqlabel.h> +#include <ntqpushbutton.h> +#include <ntqtimer.h> +#include <ntqdatetime.h> +#include <ntqsplitter.h> #include <kurl.h> -#include <kfileitem.h> +#include <tdefileitem.h> namespace KFTPSession { class Session; class Manager; } -class KToolBar; +class TDEToolBar; class KHistoryCombo; -class KAction; +class TDEAction; class KLineEdit; namespace KFTPEngine { @@ -76,7 +76,7 @@ class FilterWidget; /** * @author Jernej Kos */ -class View : public QWidget +class View : public TQWidget { Q_OBJECT friend class Actions; @@ -89,7 +89,7 @@ public: /** * Class constructor. */ - View(QWidget *parent, const char *name, KFTPEngine::Thread *client, KFTPSession::Session *session); + View(TQWidget *parent, const char *name, KFTPEngine::Thread *client, KFTPSession::Session *session); /** * Class destructor. @@ -107,7 +107,7 @@ public: * @param index Variable to save the current history position to * @return Current history element list */ - const QValueList<LocationNavigator::Element> history(int &index) const; + const TQValueList<LocationNavigator::Element> history(int &index) const; /** * Returns all currenty selected items. @@ -181,7 +181,7 @@ public: /** * Renames the provided source file to a new name. */ - void rename(const KURL &source, const QString &name); + void rename(const KURL &source, const TQString &name); /** * Returns the details view widget. @@ -196,7 +196,7 @@ public: /** * Returns the status label widget. */ - QLabel *getStatusLabel() const { return m_statusMsg; } + TQLabel *getStatusLabel() const { return m_statusMsg; } /** * Returns the associated session. @@ -221,17 +221,17 @@ private: Actions *m_actions; - KToolBar *m_toolBarFirst; /* Upper toolbar */ - KToolBar *m_toolBarSecond; /* Lower toolbar */ - KToolBar *m_searchToolBar; + TDEToolBar *m_toolBarFirst; /* Upper toolbar */ + TDEToolBar *m_toolBarSecond; /* Lower toolbar */ + TDEToolBar *m_searchToolBar; - QLabel *m_statusMsg; - QLabel *m_connDurationMsg; - QPushButton *m_sslIcon; - QSplitter *m_splitter; + TQLabel *m_statusMsg; + TQLabel *m_connDurationMsg; + TQPushButton *m_sslIcon; + TQSplitter *m_splitter; - QTimer *m_connTimer; - QTime m_connDuration; + TQTimer *m_connTimer; + TQTime m_connDuration; KHistoryCombo *m_historyCombo; FilterWidget *m_searchFilter; @@ -240,7 +240,7 @@ public slots: void updateBookmarks(); private slots: void slotHistoryEraseClicked(); - void slotHistoryActivated(const QString &text); + void slotHistoryActivated(const TQString &text); void slotHistoryChanged(); void slotDisplayCertInfo(); diff --git a/kftpgrabber/src/widgets/configdialog.cpp b/kftpgrabber/src/widgets/configdialog.cpp index 49d0d16..a0f748b 100644 --- a/kftpgrabber/src/widgets/configdialog.cpp +++ b/kftpgrabber/src/widgets/configdialog.cpp @@ -38,19 +38,19 @@ #include "misc/config.h" #include "widgets/systemtray.h" -#include <klocale.h> -#include <kfontdialog.h> +#include <tdelocale.h> +#include <tdefontdialog.h> #include <kcolorbutton.h> #include <kurlrequester.h> #include <klineedit.h> #include <knuminput.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kcharsets.h> #include <kcombobox.h> -#include <qframe.h> -#include <qlayout.h> -#include <qcheckbox.h> +#include <ntqframe.h> +#include <ntqlayout.h> +#include <ntqcheckbox.h> // Config layouts #include "ui/config_general.h" @@ -62,8 +62,8 @@ namespace KFTPWidgets { -ConfigDialog::ConfigDialog(QWidget *parent, const char *name) - : KConfigDialog(parent, name, KFTPCore::Config::self(), KDialogBase::TreeList, Ok|Apply|Cancel, Ok, true) +ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) + : TDEConfigDialog(parent, name, KFTPCore::Config::self(), KDialogBase::TreeList, Ok|Apply|Cancel, Ok, true) { // Add all standard pages addPage(new GeneralSettings(0, "General"), i18n("General"), "kfm"); @@ -72,8 +72,8 @@ ConfigDialog::ConfigDialog(QWidget *parent, const char *name) addPage(new DisplaySettings(0, "Display"), i18n("Display"), "display"); // Add the actions page - QFrame *aFrame = new QFrame(); - QVBoxLayout *aLayout = new QVBoxLayout(aFrame, 0, 0); + TQFrame *aFrame = new TQFrame(); + TQVBoxLayout *aLayout = new TQVBoxLayout(aFrame, 0, 0); aLayout->addWidget(KFTPCore::Config::self()->dActions()->getConfigWidget(aFrame)); aLayout->addSpacing(KDialog::spacingHint()); aLayout->addWidget(KFTPCore::Config::self()->uActions()->getConfigWidget(aFrame)); @@ -83,8 +83,8 @@ ConfigDialog::ConfigDialog(QWidget *parent, const char *name) addPage(aFrame, i18n("Actions"), "kfm"); // Add the filter page - aFrame = new QFrame(); - aLayout = new QVBoxLayout(aFrame, 0, 0); + aFrame = new TQFrame(); + aLayout = new TQVBoxLayout(aFrame, 0, 0); m_configFilter = new ConfigFilter(aFrame); aLayout->addWidget(m_configFilter); addPage(aFrame, i18n("Filters"), "kfm"); @@ -101,12 +101,12 @@ ConfigDialog::ConfigDialog(QWidget *parent, const char *name) connect(child("kcfg_saveToFile"), SIGNAL(toggled(bool)), this, SLOT(slotLogOutputFileChanged(bool))); // Refresh states - slotGeneralEmailChanged(static_cast<QCheckBox*>(child("kcfg_globalMail"))->isChecked()); - slotTransfersForceIpChanged(static_cast<QCheckBox*>(child("kcfg_portForceIp"))->isChecked()); - slotTransfersDiskChanged(static_cast<QCheckBox*>(child("kcfg_diskCheckSpace"))->isChecked()); - slotTransfersFailedRetryChanged(static_cast<QCheckBox*>(child("kcfg_failedAutoRetry"))->isChecked()); - slotLogOutputFileChanged(static_cast<QCheckBox*>(child("kcfg_saveToFile"))->isChecked()); - slotTransfersForcePortChanged(static_cast<QCheckBox*>(child("kcfg_activeForcePort"))->isChecked()); + slotGeneralEmailChanged(static_cast<TQCheckBox*>(child("kcfg_globalMail"))->isChecked()); + slotTransfersForceIpChanged(static_cast<TQCheckBox*>(child("kcfg_portForceIp"))->isChecked()); + slotTransfersDiskChanged(static_cast<TQCheckBox*>(child("kcfg_diskCheckSpace"))->isChecked()); + slotTransfersFailedRetryChanged(static_cast<TQCheckBox*>(child("kcfg_failedAutoRetry"))->isChecked()); + slotLogOutputFileChanged(static_cast<TQCheckBox*>(child("kcfg_saveToFile"))->isChecked()); + slotTransfersForcePortChanged(static_cast<TQCheckBox*>(child("kcfg_activeForcePort"))->isChecked()); // Let the config be up-to-date connect(this, SIGNAL(settingsChanged()), KFTPCore::Config::self(), SLOT(emitChange())); @@ -121,11 +121,11 @@ void ConfigDialog::prepareDialog() KFTPCore::Config::self()->fActions()->updateWidget(); // Populate charsets - QStringList charsets = KGlobal::charsets()->descriptiveEncodingNames(); + TQStringList charsets = TDEGlobal::charsets()->descriptiveEncodingNames(); static_cast<KComboBox*>(child("cfg_defEncoding"))->insertStringList(charsets); - QString defEncoding = KFTPCore::Config::defEncoding(); - defEncoding = QString("%1 ( %2 )").arg(KGlobal::charsets()->languageForEncoding(defEncoding)).arg(defEncoding); + TQString defEncoding = KFTPCore::Config::defEncoding(); + defEncoding = TQString("%1 ( %2 )").arg(TDEGlobal::charsets()->languageForEncoding(defEncoding)).arg(defEncoding); static_cast<KComboBox*>(child("cfg_defEncoding"))->setCurrentText(defEncoding); m_configFilter->loadSettings(); @@ -141,7 +141,7 @@ void ConfigDialog::slotSettingsChanged() m_configFilter->saveSettings(); // Save encoding - KFTPCore::Config::setDefEncoding(KGlobal::charsets()->encodingForName(static_cast<KComboBox*>(child("cfg_defEncoding"))->currentText())); + KFTPCore::Config::setDefEncoding(TDEGlobal::charsets()->encodingForName(static_cast<KComboBox*>(child("cfg_defEncoding"))->currentText())); // Show/hide the systray icon if (KFTPCore::Config::showSystrayIcon()) @@ -152,34 +152,34 @@ void ConfigDialog::slotSettingsChanged() void ConfigDialog::slotGeneralEmailChanged(bool on) { - static_cast<QWidget*>(child("kcfg_anonMail"))->setEnabled(!on); + static_cast<TQWidget*>(child("kcfg_anonMail"))->setEnabled(!on); } void ConfigDialog::slotTransfersForceIpChanged(bool on) { - static_cast<QWidget*>(child("kcfg_portIp"))->setEnabled(on); + static_cast<TQWidget*>(child("kcfg_portIp"))->setEnabled(on); } void ConfigDialog::slotTransfersForcePortChanged(bool on) { - static_cast<QWidget*>(child("kcfg_activeMinPort"))->setEnabled(on); - static_cast<QWidget*>(child("kcfg_activeMaxPort"))->setEnabled(on); + static_cast<TQWidget*>(child("kcfg_activeMinPort"))->setEnabled(on); + static_cast<TQWidget*>(child("kcfg_activeMaxPort"))->setEnabled(on); } void ConfigDialog::slotTransfersDiskChanged(bool on) { - static_cast<QWidget*>(child("kcfg_diskCheckInterval"))->setEnabled(on); - static_cast<QWidget*>(child("kcfg_diskMinFreeSpace"))->setEnabled(on); + static_cast<TQWidget*>(child("kcfg_diskCheckInterval"))->setEnabled(on); + static_cast<TQWidget*>(child("kcfg_diskMinFreeSpace"))->setEnabled(on); } void ConfigDialog::slotTransfersFailedRetryChanged(bool on) { - static_cast<QWidget*>(child("kcfg_failedAutoRetryCount"))->setEnabled(on); + static_cast<TQWidget*>(child("kcfg_failedAutoRetryCount"))->setEnabled(on); } void ConfigDialog::slotLogOutputFileChanged(bool on) { - static_cast<QWidget*>(child("kcfg_outputFilename"))->setEnabled(on); + static_cast<TQWidget*>(child("kcfg_outputFilename"))->setEnabled(on); } } diff --git a/kftpgrabber/src/widgets/configdialog.h b/kftpgrabber/src/widgets/configdialog.h index 6234c14..0214d5c 100644 --- a/kftpgrabber/src/widgets/configdialog.h +++ b/kftpgrabber/src/widgets/configdialog.h @@ -35,7 +35,7 @@ #ifndef KFTPCONFIGDIALOG_H #define KFTPCONFIGDIALOG_H -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> namespace KFTPWidgets { @@ -44,11 +44,11 @@ class ConfigFilter; /** * @author Jernej Kos */ -class ConfigDialog : public KConfigDialog +class ConfigDialog : public TDEConfigDialog { Q_OBJECT public: - ConfigDialog(QWidget *parent, const char *name = 0); + ConfigDialog(TQWidget *parent, const char *name = 0); void prepareDialog(); private: diff --git a/kftpgrabber/src/widgets/configfilter.cpp b/kftpgrabber/src/widgets/configfilter.cpp index c2dc3b9..48f068a 100644 --- a/kftpgrabber/src/widgets/configfilter.cpp +++ b/kftpgrabber/src/widgets/configfilter.cpp @@ -40,29 +40,29 @@ #include "misc/config.h" #include "misc.h" -#include <klistview.h> -#include <klocale.h> +#include <tdelistview.h> +#include <tdelocale.h> #include <kpushbutton.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <klineeditdlg.h> #include <klineedit.h> #include <kcolorbutton.h> #include <kdialogbase.h> -#include <qcheckbox.h> -#include <qlayout.h> -#include <qtabwidget.h> +#include <ntqcheckbox.h> +#include <ntqlayout.h> +#include <ntqtabwidget.h> using namespace KFTPGrabberBase; namespace KFTPWidgets { -ConfigFilter::ConfigFilter(QWidget *parent, const char *name) - : QWidget(parent, name) +ConfigFilter::ConfigFilter(TQWidget *parent, const char *name) + : TQWidget(parent, name) { // Create the main widget - QVBoxLayout *t = new QVBoxLayout(this, 0, 0); + TQVBoxLayout *t = new TQVBoxLayout(this, 0, 0); m_editorLayout = new ConfigFilterLayout(this); t->addWidget(m_editorLayout); @@ -94,7 +94,7 @@ void ConfigFilter::saveSettings() void ConfigFilter::slotAddAscii() { if (!m_editorLayout->newExtension->text().stripWhiteSpace().isEmpty()) { - new QListViewItem(m_editorLayout->extensionList, m_editorLayout->newExtension->text().stripWhiteSpace()); + new TQListViewItem(m_editorLayout->extensionList, m_editorLayout->newExtension->text().stripWhiteSpace()); m_editorLayout->newExtension->clear(); } } @@ -111,19 +111,19 @@ void ConfigFilter::asciiLoadExtensions() { // Load the ascii extensions m_editorLayout->extensionList->clear(); - QStringList p_extensions = KFTPCore::Config::asciiList(); + TQStringList p_extensions = KFTPCore::Config::asciiList(); - QStringList::iterator end( p_extensions.end() ); - for (QStringList::iterator i( p_extensions.begin() ); i != end; ++i) { - new QListViewItem(m_editorLayout->extensionList, (*i)); + TQStringList::iterator end( p_extensions.end() ); + for (TQStringList::iterator i( p_extensions.begin() ); i != end; ++i) { + new TQListViewItem(m_editorLayout->extensionList, (*i)); } } -QStringList ConfigFilter::asciiToStringList() +TQStringList ConfigFilter::asciiToStringList() { - QStringList p_extensions; - QListViewItem *i = m_editorLayout->extensionList->firstChild(); + TQStringList p_extensions; + TQListViewItem *i = m_editorLayout->extensionList->firstChild(); while (i) { p_extensions.append(i->text(0)); diff --git a/kftpgrabber/src/widgets/configfilter.h b/kftpgrabber/src/widgets/configfilter.h index 3d9ee22..d83baf2 100644 --- a/kftpgrabber/src/widgets/configfilter.h +++ b/kftpgrabber/src/widgets/configfilter.h @@ -37,11 +37,11 @@ #ifndef KFTPWIDGETSCONFIGFILTER_H #define KFTPWIDGETSCONFIGFILTER_H -#include <qwidget.h> +#include <ntqwidget.h> #include <kdialogbase.h> #include <knuminput.h> -#include <qradiobutton.h> -#include <qvaluelist.h> +#include <ntqradiobutton.h> +#include <ntqvaluelist.h> // Layouts #include "ui/config_filters.h" @@ -55,17 +55,17 @@ class FilterEditor; * * @author Jernej Kos */ -class ConfigFilter : public QWidget +class ConfigFilter : public TQWidget { Q_OBJECT public: - ConfigFilter(QWidget *parent = 0, const char *name = 0); + ConfigFilter(TQWidget *parent = 0, const char *name = 0); void saveSettings(); void loadSettings(); private: void asciiLoadExtensions(); - QStringList asciiToStringList(); + TQStringList asciiToStringList(); FilterEditor *m_filterEditor; ConfigFilterLayout *m_editorLayout; diff --git a/kftpgrabber/src/widgets/failedtransfers.cpp b/kftpgrabber/src/widgets/failedtransfers.cpp index 30fc0a6..e256284 100644 --- a/kftpgrabber/src/widgets/failedtransfers.cpp +++ b/kftpgrabber/src/widgets/failedtransfers.cpp @@ -39,23 +39,23 @@ #include "misc.h" #include "kftpapi.h" -#include <klocale.h> -#include <kpopupmenu.h> -#include <kio/job.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdepopupmenu.h> +#include <tdeio/job.h> +#include <tdemessagebox.h> -#include <qlayout.h> -#include <qheader.h> +#include <ntqlayout.h> +#include <ntqheader.h> using namespace KFTPGrabberBase; namespace KFTPWidgets { -FailedTransferItem::FailedTransferItem(KFTPQueue::FailedTransfer *transfer, QListView *parent) +FailedTransferItem::FailedTransferItem(KFTPQueue::FailedTransfer *transfer, TQListView *parent) : KFTPWidgets::ListViewItem(parent), m_failedTransfer(transfer) { - QString desc = "<nobr><b>"; + TQString desc = "<nobr><b>"; desc += i18n("Transfer"); desc += ":</b> "; desc += transfer->getTransfer()->getSourceUrl().prettyURL(); @@ -69,21 +69,21 @@ FailedTransferItem::FailedTransferItem(KFTPQueue::FailedTransfer *transfer, QLis // Setup columns setRichText(0, desc); - setText(1, KIO::convertSize(transfer->getTransfer()->getActualSize())); - setText(2, QString::number(transfer->getTransfer()->getId())); + setText(1, TDEIO::convertSize(transfer->getTransfer()->getActualSize())); + setText(2, TQString::number(transfer->getTransfer()->getId())); setPixmap(0, loadSmallPixmap("info")); } -KActionCollection *FailedTransfers::actionCollection() +TDEActionCollection *FailedTransfers::actionCollection() { return KFTPAPI::getInstance()->mainWindow()->actionCollection(); } -FailedTransfers::FailedTransfers(QWidget *parent, const char *name) - : QWidget(parent, name) +FailedTransfers::FailedTransfers(TQWidget *parent, const char *name) + : TQWidget(parent, name) { - QVBoxLayout *layout = new QVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); // Create the list view m_list = new KFTPWidgets::ListView(this); @@ -102,7 +102,7 @@ FailedTransfers::FailedTransfers(QWidget *parent, const char *name) connect(KFTPQueue::Manager::self(), SIGNAL(failedTransferNew(KFTPQueue::FailedTransfer*)), this, SLOT(slotFailedTransferNew(KFTPQueue::FailedTransfer*))); connect(KFTPQueue::Manager::self(), SIGNAL(failedTransferRemoved(long)), this, SLOT(slotFailedTransferRemoved(long))); - connect(m_list, SIGNAL(contextMenu(KListView*, QListViewItem*, const QPoint&)), this, SLOT(contextMenuRequested(KListView*, QListViewItem*, const QPoint&))); + connect(m_list, SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), this, SLOT(contextMenuRequested(TDEListView*, TQListViewItem*, const TQPoint&))); // Initialize the actions initActions(); @@ -114,11 +114,11 @@ FailedTransfers::~FailedTransfers() void FailedTransfers::initActions() { - m_restartAction = new KAction(i18n("&Restart Transfer"), "launch", KShortcut(), this, SLOT(slotRestart()), actionCollection(), "launch"); - m_addToQueueAction = new KAction(i18n("&Add To Queue"), "queue", KShortcut(), this, SLOT(slotAddToQueue()), actionCollection(), "addtoqueue"); - m_addAllToQueueAction = new KAction(i18n("Add All To Queue"), KShortcut(), this, SLOT(slotAddAllToQueue()), actionCollection(), "addalltoqueue"); - m_removeAction = new KAction(i18n("R&emove"), "editdelete", KShortcut(), this, SLOT(slotRemove()), actionCollection(), "remove"); - m_removeAllAction = new KAction(i18n("Remove All"), KShortcut(), this, SLOT(slotRemoveAll()), actionCollection(), "removeall"); + m_restartAction = new TDEAction(i18n("&Restart Transfer"), "launch", TDEShortcut(), this, SLOT(slotRestart()), actionCollection(), "launch"); + m_addToQueueAction = new TDEAction(i18n("&Add To Queue"), "queue", TDEShortcut(), this, SLOT(slotAddToQueue()), actionCollection(), "addtoqueue"); + m_addAllToQueueAction = new TDEAction(i18n("Add All To Queue"), TDEShortcut(), this, SLOT(slotAddAllToQueue()), actionCollection(), "addalltoqueue"); + m_removeAction = new TDEAction(i18n("R&emove"), "editdelete", TDEShortcut(), this, SLOT(slotRemove()), actionCollection(), "remove"); + m_removeAllAction = new TDEAction(i18n("Remove All"), TDEShortcut(), this, SLOT(slotRemoveAll()), actionCollection(), "removeall"); } void FailedTransfers::updateActions() @@ -140,7 +140,7 @@ void FailedTransfers::slotFailedTransferNew(KFTPQueue::FailedTransfer *transfer) void FailedTransfers::slotFailedTransferRemoved(long id) { // Delete the failed transfer item - QListViewItem *item = m_list->findItem(QString::number(id), 2); + TQListViewItem *item = m_list->findItem(TQString::number(id), 2); if (item) delete item; @@ -164,8 +164,8 @@ void FailedTransfers::slotAddToQueue() void FailedTransfers::slotAddAllToQueue() { KFTPQueue::FailedTransfer *transfer; - QPtrList<KFTPQueue::FailedTransfer> *list = KFTPQueue::Manager::self()->getFailedTransferList(); - QPtrListIterator<KFTPQueue::FailedTransfer> i(*list); + TQPtrList<KFTPQueue::FailedTransfer> *list = KFTPQueue::Manager::self()->getFailedTransferList(); + TQPtrListIterator<KFTPQueue::FailedTransfer> i(*list); while ((transfer = i.current()) != 0) { ++i; @@ -190,9 +190,9 @@ void FailedTransfers::slotRemoveAll() } } -void FailedTransfers::contextMenuRequested(KListView*, QListViewItem*, const QPoint &p) +void FailedTransfers::contextMenuRequested(TDEListView*, TQListViewItem*, const TQPoint &p) { - KPopupMenu *contextMenu = new KPopupMenu(m_list); + TDEPopupMenu *contextMenu = new TDEPopupMenu(m_list); m_restartAction->plug(contextMenu); m_addToQueueAction->plug(contextMenu); diff --git a/kftpgrabber/src/widgets/failedtransfers.h b/kftpgrabber/src/widgets/failedtransfers.h index 2b17a5a..c216ebb 100644 --- a/kftpgrabber/src/widgets/failedtransfers.h +++ b/kftpgrabber/src/widgets/failedtransfers.h @@ -36,11 +36,11 @@ #ifndef KFTPWIDGETSFAILEDTRANSFERS_H #define KFTPWIDGETSFAILEDTRANSFERS_H -#include <klistview.h> -#include <kaction.h> +#include <tdelistview.h> +#include <tdeaction.h> -#include <qwidget.h> -#include <qguardedptr.h> +#include <ntqwidget.h> +#include <ntqguardedptr.h> #include "listviewitem.h" @@ -53,7 +53,7 @@ namespace KFTPWidgets { class ListView; /** - * This class represents a QListViewItem item that contains information + * This class represents a TQListViewItem item that contains information * about a specific failed transfer. * * @author Jernej Kos @@ -61,11 +61,11 @@ class ListView; class FailedTransferItem : public KFTPWidgets::ListViewItem { public: - FailedTransferItem(KFTPQueue::FailedTransfer *transfer, QListView *parent); + FailedTransferItem(KFTPQueue::FailedTransfer *transfer, TQListView *parent); KFTPQueue::FailedTransfer *getFailedTransfer() { return m_failedTransfer; } private: - QGuardedPtr<KFTPQueue::FailedTransfer> m_failedTransfer; + TQGuardedPtr<KFTPQueue::FailedTransfer> m_failedTransfer; }; /** @@ -74,25 +74,25 @@ private: * * @author Jernej Kos */ -class FailedTransfers : public QWidget +class FailedTransfers : public TQWidget { Q_OBJECT public: - FailedTransfers(QWidget *parent = 0, const char *name = 0); + FailedTransfers(TQWidget *parent = 0, const char *name = 0); ~FailedTransfers(); void updateActions(); void initActions(); private: - KActionCollection *actionCollection(); + TDEActionCollection *actionCollection(); KFTPWidgets::ListView *m_list; - KAction *m_restartAction; - KAction *m_addToQueueAction; - KAction *m_addAllToQueueAction; - KAction *m_removeAction; - KAction *m_removeAllAction; + TDEAction *m_restartAction; + TDEAction *m_addToQueueAction; + TDEAction *m_addAllToQueueAction; + TDEAction *m_removeAction; + TDEAction *m_removeAllAction; private slots: void slotRestart(); void slotAddToQueue(); @@ -100,7 +100,7 @@ private slots: void slotRemove(); void slotRemoveAll(); - void contextMenuRequested(KListView*, QListViewItem*, const QPoint&); + void contextMenuRequested(TDEListView*, TQListViewItem*, const TQPoint&); void slotFailedTransferNew(KFTPQueue::FailedTransfer*); void slotFailedTransferRemoved(long); diff --git a/kftpgrabber/src/widgets/filtereditor.cpp b/kftpgrabber/src/widgets/filtereditor.cpp index 9be3b6e..58178e6 100644 --- a/kftpgrabber/src/widgets/filtereditor.cpp +++ b/kftpgrabber/src/widgets/filtereditor.cpp @@ -37,14 +37,14 @@ #include "listview.h" #include "misc/filterwidgethandler.h" -#include <qlayout.h> -#include <qhbox.h> -#include <qtooltip.h> -#include <qheader.h> -#include <qbuttongroup.h> +#include <ntqlayout.h> +#include <ntqhbox.h> +#include <ntqtooltip.h> +#include <ntqheader.h> +#include <ntqbuttongroup.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <kinputdialog.h> @@ -52,26 +52,26 @@ using namespace KFTPCore::Filter; namespace KFTPWidgets { -FilterEditor::FilterEditor(QWidget *parent) - : QWidget(parent), +FilterEditor::FilterEditor(TQWidget *parent) + : TQWidget(parent), m_rule(0) { - QHBoxLayout *mainLayout = new QHBoxLayout(this, 0, KDialog::spacingHint()); + TQHBoxLayout *mainLayout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); m_listView = new FilterListView(this); mainLayout->addWidget(m_listView, 1); - QVBoxLayout *rightLayout = new QVBoxLayout(mainLayout); + TQVBoxLayout *rightLayout = new TQVBoxLayout(mainLayout); mainLayout->setStretchFactor(rightLayout, KDialog::spacingHint()); - m_enabledCheck = new QCheckBox(i18n("Filter &enabled"), this); + m_enabledCheck = new TQCheckBox(i18n("Filter &enabled"), this); rightLayout->addWidget(m_enabledCheck); m_conditionsList = new FilterConditionsList(this); - rightLayout->addWidget(m_conditionsList, 0, Qt::AlignTop); + rightLayout->addWidget(m_conditionsList, 0, TQt::AlignTop); m_actionsList = new FilterActionsList(this); - rightLayout->addWidget(m_actionsList, 0, Qt::AlignTop); + rightLayout->addWidget(m_actionsList, 0, TQt::AlignTop); rightLayout->addStretch(1); @@ -119,17 +119,17 @@ void FilterEditor::reset() } FilterListItem::FilterListItem(ListView *parent, KFTPCore::Filter::Rule *rule) - : QListViewItem(parent), + : TQListViewItem(parent), m_rule(rule) { setText(0, rule->name()); } -FilterListView::FilterListView(QWidget *parent) - : QGroupBox(1, Horizontal, i18n("Filters"), parent) +FilterListView::FilterListView(TQWidget *parent) + : TQGroupBox(1, Horizontal, i18n("Filters"), parent) { m_listView = new ListView(this); - m_listView->setSelectionMode(QListView::Single); + m_listView->setSelectionMode(TQListView::Single); m_listView->setSorting(-1); m_listView->header()->hide(); m_listView->setMinimumWidth(150); @@ -137,44 +137,44 @@ FilterListView::FilterListView(QWidget *parent) m_listView->addColumn(""); m_listView->setFullWidth(true); - QHBox *hb = new QHBox(this); + TQHBox *hb = new TQHBox(this); hb->setSpacing(4); // Up/down buttons - m_buttonUp = new KPushButton(QString::null, hb); + m_buttonUp = new KPushButton(TQString::null, hb); m_buttonUp->setAutoRepeat(true); - m_buttonUp->setIconSet(BarIconSet("up", KIcon::SizeSmall)); + m_buttonUp->setIconSet(BarIconSet("up", TDEIcon::SizeSmall)); m_buttonUp->setMinimumSize(m_buttonUp->sizeHint() * 1.2); - m_buttonDown = new KPushButton(QString::null, hb); + m_buttonDown = new KPushButton(TQString::null, hb); m_buttonDown->setAutoRepeat(true); - m_buttonDown->setIconSet(BarIconSet("down", KIcon::SizeSmall)); + m_buttonDown->setIconSet(BarIconSet("down", TDEIcon::SizeSmall)); m_buttonDown->setMinimumSize(m_buttonDown->sizeHint() * 1.2); - QToolTip::add(m_buttonUp, i18n("Up")); - QToolTip::add(m_buttonDown, i18n("Down")); + TQToolTip::add(m_buttonUp, i18n("Up")); + TQToolTip::add(m_buttonDown, i18n("Down")); // New, copy, delete buttons - hb = new QHBox(this); + hb = new TQHBox(this); hb->setSpacing(4); - m_buttonNew = new QPushButton(QString::null, hb); - m_buttonNew->setPixmap(BarIcon("filenew", KIcon::SizeSmall)); + m_buttonNew = new TQPushButton(TQString::null, hb); + m_buttonNew->setPixmap(BarIcon("filenew", TDEIcon::SizeSmall)); m_buttonNew->setMinimumSize(m_buttonNew->sizeHint() * 1.2); - m_buttonCopy = new QPushButton(QString::null, hb); - m_buttonCopy->setPixmap(BarIcon("editcopy", KIcon::SizeSmall)); + m_buttonCopy = new TQPushButton(TQString::null, hb); + m_buttonCopy->setPixmap(BarIcon("editcopy", TDEIcon::SizeSmall)); m_buttonCopy->setMinimumSize(m_buttonCopy->sizeHint() * 1.2); - m_buttonDelete = new QPushButton(QString::null, hb); - m_buttonDelete->setPixmap(BarIcon("editdelete", KIcon::SizeSmall)); + m_buttonDelete = new TQPushButton(TQString::null, hb); + m_buttonDelete->setPixmap(BarIcon("editdelete", TDEIcon::SizeSmall)); m_buttonDelete->setMinimumSize(m_buttonDelete->sizeHint() * 1.2); - m_buttonRename = new QPushButton(i18n("Rename..."), hb); + m_buttonRename = new TQPushButton(i18n("Rename..."), hb); - QToolTip::add(m_buttonNew, i18n("New")); - QToolTip::add(m_buttonCopy, i18n("Copy")); - QToolTip::add(m_buttonDelete, i18n("Delete")); + TQToolTip::add(m_buttonNew, i18n("New")); + TQToolTip::add(m_buttonCopy, i18n("Copy")); + TQToolTip::add(m_buttonDelete, i18n("Delete")); // Connect the signals connect(m_buttonNew, SIGNAL(clicked()), this, SLOT(slotNewRule())); @@ -185,7 +185,7 @@ FilterListView::FilterListView(QWidget *parent) connect(m_buttonUp, SIGNAL(clicked()), this, SLOT(slotUp())); connect(m_buttonDown, SIGNAL(clicked()), this, SLOT(slotDown())); - connect(m_listView, SIGNAL(selectionChanged(QListViewItem*)), this, SLOT(slotSelectionChanged(QListViewItem*))); + connect(m_listView, SIGNAL(selectionChanged(TQListViewItem*)), this, SLOT(slotSelectionChanged(TQListViewItem*))); m_buttonUp->setEnabled(false); m_buttonDown->setEnabled(false); @@ -212,7 +212,7 @@ void FilterListView::reset() m_listView->setSelected(m_listView->firstChild(), true); } -void FilterListView::slotSelectionChanged(QListViewItem *item) +void FilterListView::slotSelectionChanged(TQListViewItem *item) { FilterListItem *selected = static_cast<FilterListItem*>(item); @@ -263,7 +263,7 @@ void FilterListView::slotRenameRule() FilterListItem *selected = static_cast<FilterListItem*>(m_listView->selectedItem()); if (selected) { - QString name = KInputDialog::getText(i18n("Rename Rule"), i18n("Rename rule '%1' to:").arg(selected->rule()->name()), selected->rule()->name()); + TQString name = KInputDialog::getText(i18n("Rename Rule"), i18n("Rename rule '%1' to:").arg(selected->rule()->name()), selected->rule()->name()); if (name.stripWhiteSpace().isEmpty()) name = i18n("Unnamed Rule"); @@ -290,7 +290,7 @@ void FilterListView::slotCopyRule() void FilterListView::slotUp() { FilterListItem *selected = static_cast<FilterListItem*>(m_listView->selectedItem()); - QListViewItem *tmp = selected->itemAbove(); + TQListViewItem *tmp = selected->itemAbove(); if (!tmp) return; @@ -329,18 +329,18 @@ void FilterListView::slotDown() } } -FilterConditionsList::FilterConditionsList(QWidget *parent) - : QGroupBox(1, Horizontal, i18n("Conditions"), parent) +FilterConditionsList::FilterConditionsList(TQWidget *parent) + : TQGroupBox(1, Horizontal, i18n("Conditions"), parent) { setEnabled(false); - m_buttonAll = new QRadioButton(i18n("Match a&ll of the following"), this); - m_buttonAny = new QRadioButton(i18n("Match an&y of the following"), this); + m_buttonAll = new TQRadioButton(i18n("Match a&ll of the following"), this); + m_buttonAny = new TQRadioButton(i18n("Match an&y of the following"), this); m_buttonAll->setChecked(true); m_buttonAny->setChecked(false); - QButtonGroup *bg = new QButtonGroup(this); + TQButtonGroup *bg = new TQButtonGroup(this); bg->hide(); bg->insert(m_buttonAll, (int) ConditionChain::All); bg->insert(m_buttonAny, (int) ConditionChain::Any); @@ -376,7 +376,7 @@ void FilterConditionsList::slotMatchTypeChanged(int type) const_cast<ConditionChain*>(m_rule->conditions())->setType((ConditionChain::Type) type); } -FilterConditionWidgetLister::FilterConditionWidgetLister(QWidget *parent) +FilterConditionWidgetLister::FilterConditionWidgetLister(TQWidget *parent) : WidgetLister(parent, 0, 7), m_rule(0) { @@ -388,10 +388,10 @@ void FilterConditionWidgetLister::loadConditions(KFTPCore::Filter::Rule *rule) const ConditionChain *conditions = rule->conditions(); // Clear the current list - setNumberShown(QMAX(conditions->count(), 0)); + setNumberShown(TQMAX(conditions->count(), 0)); ConditionChain::ConstIterator le = conditions->end(); - QPtrList<QWidget>::Iterator wi = m_widgetList.begin(); + TQPtrList<TQWidget>::Iterator wi = m_widgetList.begin(); for (ConditionChain::ConstIterator i = conditions->begin(); i != le; ++i, ++wi) static_cast<FilterConditionWidget*>((*wi))->setCondition((*i)); @@ -403,7 +403,7 @@ void FilterConditionWidgetLister::slotMore() WidgetLister::slotMore(); // Actually add the condition and update the latest widget - Condition *condition = new Condition(Filename, Condition::Contains, QVariant("")); + Condition *condition = new Condition(Filename, Condition::Contains, TQVariant("")); const_cast<ConditionChain*>(m_rule->conditions())->append(condition); static_cast<FilterConditionWidget*>(m_widgetList.last())->setCondition(condition); @@ -426,27 +426,27 @@ void FilterConditionWidgetLister::slotClear() WidgetLister::slotClear(); } -QWidget *FilterConditionWidgetLister::createWidget(QWidget *parent) +TQWidget *FilterConditionWidgetLister::createWidget(TQWidget *parent) { return new FilterConditionWidget(parent); } -FilterConditionWidget::FilterConditionWidget(QWidget *parent) - : QWidget(parent), +FilterConditionWidget::FilterConditionWidget(TQWidget *parent) + : TQWidget(parent), m_condition(0) { - QHBoxLayout *layout = new QHBoxLayout(this, 0, KDialog::spacingHint()); + TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); - m_fieldCombo = new QComboBox(this); + m_fieldCombo = new TQComboBox(this); m_fieldCombo->insertStringList(Filters::self()->getFieldNames()); layout->addWidget(m_fieldCombo); - m_typeStack = new QWidgetStack(this); - m_typeStack->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); + m_typeStack = new TQWidgetStack(this); + m_typeStack->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); layout->addWidget(m_typeStack); - m_valueStack = new QWidgetStack(this); - m_valueStack->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); + m_valueStack = new TQWidgetStack(this); + m_valueStack->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); layout->addWidget(m_valueStack); layout->setStretchFactor(m_valueStack, 10); @@ -495,8 +495,8 @@ void FilterConditionWidget::slotValueChanged() } } -FilterActionsList::FilterActionsList(QWidget *parent) - : QGroupBox(1, Horizontal, i18n("Actions"), parent) +FilterActionsList::FilterActionsList(TQWidget *parent) + : TQGroupBox(1, Horizontal, i18n("Actions"), parent) { setEnabled(false); @@ -517,7 +517,7 @@ void FilterActionsList::loadRule(Rule *rule) setEnabled(true); } -FilterActionWidgetLister::FilterActionWidgetLister(QWidget *parent) +FilterActionWidgetLister::FilterActionWidgetLister(TQWidget *parent) : WidgetLister(parent, 0, 7), m_rule(0) { @@ -529,10 +529,10 @@ void FilterActionWidgetLister::loadActions(KFTPCore::Filter::Rule *rule) const ActionChain *actions = rule->actions(); // Clear the current list - setNumberShown(QMAX(actions->count(), 0)); + setNumberShown(TQMAX(actions->count(), 0)); ActionChain::ConstIterator le = actions->end(); - QPtrList<QWidget>::Iterator wi = m_widgetList.begin(); + TQPtrList<TQWidget>::Iterator wi = m_widgetList.begin(); for (ActionChain::ConstIterator i = actions->begin(); i != le; ++i, ++wi) static_cast<FilterActionWidget*>((*wi))->setAction((*i)); @@ -544,7 +544,7 @@ void FilterActionWidgetLister::slotMore() WidgetLister::slotMore(); // Actually add the action and update the latest widget - Action *action = new Action(Action::None, QVariant()); + Action *action = new Action(Action::None, TQVariant()); const_cast<ActionChain*>(m_rule->actions())->append(action); static_cast<FilterActionWidget*>(m_widgetList.last())->setAction(action); @@ -567,23 +567,23 @@ void FilterActionWidgetLister::slotClear() WidgetLister::slotClear(); } -QWidget *FilterActionWidgetLister::createWidget(QWidget *parent) +TQWidget *FilterActionWidgetLister::createWidget(TQWidget *parent) { return new FilterActionWidget(parent); } -FilterActionWidget::FilterActionWidget(QWidget *parent) - : QWidget(parent), +FilterActionWidget::FilterActionWidget(TQWidget *parent) + : TQWidget(parent), m_action(0) { - QHBoxLayout *layout = new QHBoxLayout(this, 0, KDialog::spacingHint()); + TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); - m_actionCombo = new QComboBox(this); + m_actionCombo = new TQComboBox(this); m_actionCombo->insertStringList(Filters::self()->getActionNames()); layout->addWidget(m_actionCombo); - m_valueStack = new QWidgetStack(this); - m_valueStack->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); + m_valueStack = new TQWidgetStack(this); + m_valueStack->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); layout->addWidget(m_valueStack); layout->setStretchFactor(m_valueStack, 10); diff --git a/kftpgrabber/src/widgets/filtereditor.h b/kftpgrabber/src/widgets/filtereditor.h index 95fd664..869b900 100644 --- a/kftpgrabber/src/widgets/filtereditor.h +++ b/kftpgrabber/src/widgets/filtereditor.h @@ -39,14 +39,14 @@ #include "widgetlister.h" #include "misc/filter.h" -#include <qwidget.h> -#include <qpushbutton.h> -#include <qgroupbox.h> -#include <qlistview.h> -#include <qradiobutton.h> -#include <qcombobox.h> -#include <qwidgetstack.h> -#include <qcheckbox.h> +#include <ntqwidget.h> +#include <ntqpushbutton.h> +#include <ntqgroupbox.h> +#include <ntqlistview.h> +#include <ntqradiobutton.h> +#include <ntqcombobox.h> +#include <ntqwidgetstack.h> +#include <ntqcheckbox.h> #include <kpushbutton.h> @@ -59,7 +59,7 @@ class ListView; * * @author Jernej Kos */ -class FilterConditionWidget : public QWidget { +class FilterConditionWidget : public TQWidget { Q_OBJECT public: /** @@ -67,7 +67,7 @@ public: * * @param parent Parent widget */ - FilterConditionWidget(QWidget *parent); + FilterConditionWidget(TQWidget *parent); /** * Associate a condition with this widget. @@ -87,9 +87,9 @@ private slots: void slotTypeChanged(); void slotValueChanged(); private: - QComboBox *m_fieldCombo; - QWidgetStack *m_typeStack; - QWidgetStack *m_valueStack; + TQComboBox *m_fieldCombo; + TQWidgetStack *m_typeStack; + TQWidgetStack *m_valueStack; KFTPCore::Filter::Condition *m_condition; }; @@ -107,7 +107,7 @@ public: * * @param parent Parent widget */ - FilterConditionWidgetLister(QWidget *parent); + FilterConditionWidgetLister(TQWidget *parent); /** * Load the conditions from the specified rule. @@ -116,7 +116,7 @@ public: */ void loadConditions(KFTPCore::Filter::Rule *rule); protected: - QWidget *createWidget(QWidget *parent); + TQWidget *createWidget(TQWidget *parent); protected slots: void slotMore(); void slotFewer(); @@ -130,7 +130,7 @@ private: * * @author Jernej Kos */ -class FilterConditionsList : public QGroupBox { +class FilterConditionsList : public TQGroupBox { Q_OBJECT public: /** @@ -138,7 +138,7 @@ public: * * @param parent Parent widget */ - FilterConditionsList(QWidget *parent); + FilterConditionsList(TQWidget *parent); public slots: /** * Reset the condition list and disable it. @@ -154,8 +154,8 @@ public slots: private slots: void slotMatchTypeChanged(int type); private: - QRadioButton *m_buttonAll; - QRadioButton *m_buttonAny; + TQRadioButton *m_buttonAll; + TQRadioButton *m_buttonAny; FilterConditionWidgetLister *m_lister; KFTPCore::Filter::Rule *m_rule; @@ -166,7 +166,7 @@ private: * * @author Jernej Kos */ -class FilterActionWidget : public QWidget { +class FilterActionWidget : public TQWidget { Q_OBJECT public: /** @@ -174,7 +174,7 @@ public: * * @param parent Parent widget */ - FilterActionWidget(QWidget *parent); + FilterActionWidget(TQWidget *parent); /** * Associate an action with this widget. @@ -193,8 +193,8 @@ private slots: void slotActionChanged(int field); void slotValueChanged(); private: - QComboBox *m_actionCombo; - QWidgetStack *m_valueStack; + TQComboBox *m_actionCombo; + TQWidgetStack *m_valueStack; KFTPCore::Filter::Action *m_action; }; @@ -212,7 +212,7 @@ public: * * @param parent Parent widget */ - FilterActionWidgetLister(QWidget *parent); + FilterActionWidgetLister(TQWidget *parent); /** * Load the actions from the specified rule. @@ -221,7 +221,7 @@ public: */ void loadActions(KFTPCore::Filter::Rule *rule); protected: - QWidget *createWidget(QWidget *parent); + TQWidget *createWidget(TQWidget *parent); protected slots: void slotMore(); void slotFewer(); @@ -235,7 +235,7 @@ private: * * @author Jernej Kos */ -class FilterActionsList : public QGroupBox { +class FilterActionsList : public TQGroupBox { Q_OBJECT public: /** @@ -243,7 +243,7 @@ public: * * @param parent Parent widget */ - FilterActionsList(QWidget *parent); + FilterActionsList(TQWidget *parent); public slots: /** * Reset the action list and disable it. @@ -266,7 +266,7 @@ private: * * @author Jernej Kos */ -class FilterListView : public QGroupBox { +class FilterListView : public TQGroupBox { Q_OBJECT public: /** @@ -274,14 +274,14 @@ public: * * @param parent Parent widget */ - FilterListView(QWidget *parent); + FilterListView(TQWidget *parent); /** * Reset the filter editor and reload all the rules. */ void reset(); private slots: - void slotSelectionChanged(QListViewItem *item); + void slotSelectionChanged(TQListViewItem *item); void slotNewRule(); void slotDeleteRule(); @@ -296,10 +296,10 @@ private: KPushButton *m_buttonUp; KPushButton *m_buttonDown; - QPushButton *m_buttonNew; - QPushButton *m_buttonCopy; - QPushButton *m_buttonDelete; - QPushButton *m_buttonRename; + TQPushButton *m_buttonNew; + TQPushButton *m_buttonCopy; + TQPushButton *m_buttonDelete; + TQPushButton *m_buttonRename; signals: /** * This signal gets emitted when a new rule should be displayed by @@ -320,7 +320,7 @@ signals: * * @author Jernej Kos */ -class FilterListItem : public QListViewItem { +class FilterListItem : public TQListViewItem { public: /** * Class constructor. @@ -344,13 +344,13 @@ private: * * @author Jernej Kos */ -class FilterEditor : public QWidget { +class FilterEditor : public TQWidget { Q_OBJECT public: /** * Class constructor. */ - FilterEditor(QWidget *parent); + FilterEditor(TQWidget *parent); /** * Reset the filter editor and reload all the rules. @@ -364,7 +364,7 @@ private slots: private: KFTPCore::Filter::Rule *m_rule; - QCheckBox *m_enabledCheck; + TQCheckBox *m_enabledCheck; FilterListView *m_listView; FilterConditionsList *m_conditionsList; FilterActionsList *m_actionsList; diff --git a/kftpgrabber/src/widgets/kftpfilteraddpatternlayout.cpp b/kftpgrabber/src/widgets/kftpfilteraddpatternlayout.cpp index 50c403b..409912f 100644 --- a/kftpgrabber/src/widgets/kftpfilteraddpatternlayout.cpp +++ b/kftpgrabber/src/widgets/kftpfilteraddpatternlayout.cpp @@ -1,4 +1,4 @@ -#include <klocale.h> +#include <tdelocale.h> /**************************************************************************** ** Form implementation generated from reading ui file '/home/kostko/development/kftpgrabber/src/widgets/kftpfilteraddpatternlayout.ui' ** @@ -10,53 +10,53 @@ #include "kftpfilteraddpatternlayout.h" -#include <qvariant.h> -#include <qpushbutton.h> -#include <qgroupbox.h> -#include <qlabel.h> +#include <ntqvariant.h> +#include <ntqpushbutton.h> +#include <ntqgroupbox.h> +#include <ntqlabel.h> #include <klineedit.h> #include <kcolorbutton.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <ntqlayout.h> +#include <ntqtooltip.h> +#include <ntqwhatsthis.h> /* * Constructs a KFTPFilterAddPatternLayout as a child of 'parent', with the * name 'name' and widget flags set to 'f'. */ -KFTPFilterAddPatternLayout::KFTPFilterAddPatternLayout( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) +KFTPFilterAddPatternLayout::KFTPFilterAddPatternLayout( TQWidget* parent, const char* name, WFlags fl ) + : TQWidget( parent, name, fl ) { if ( !name ) setName( "KFTPFilterAddPatternLayout" ); - KFTPFilterAddPatternLayoutLayout = new QGridLayout( this, 1, 1, 11, 6, "KFTPFilterAddPatternLayoutLayout"); + KFTPFilterAddPatternLayoutLayout = new TQGridLayout( this, 1, 1, 11, 6, "KFTPFilterAddPatternLayoutLayout"); - groupBox1 = new QGroupBox( this, "groupBox1" ); - groupBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)2, 0, 0, groupBox1->sizePolicy().hasHeightForWidth() ) ); - groupBox1->setColumnLayout(0, Qt::Vertical ); + groupBox1 = new TQGroupBox( this, "groupBox1" ); + groupBox1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)2, 0, 0, groupBox1->sizePolicy().hasHeightForWidth() ) ); + groupBox1->setColumnLayout(0, TQt::Vertical ); groupBox1->layout()->setSpacing( 6 ); groupBox1->layout()->setMargin( 11 ); - groupBox1Layout = new QGridLayout( groupBox1->layout() ); - groupBox1Layout->setAlignment( Qt::AlignTop ); + groupBox1Layout = new TQGridLayout( groupBox1->layout() ); + groupBox1Layout->setAlignment( TQt::AlignTop ); - layout9 = new QHBoxLayout( 0, 0, 6, "layout9"); + layout9 = new TQHBoxLayout( 0, 0, 6, "layout9"); - layout8 = new QVBoxLayout( 0, 0, 6, "layout8"); + layout8 = new TQVBoxLayout( 0, 0, 6, "layout8"); - textLabel1 = new QLabel( groupBox1, "textLabel1" ); + textLabel1 = new TQLabel( groupBox1, "textLabel1" ); layout8->addWidget( textLabel1 ); - textLabel2 = new QLabel( groupBox1, "textLabel2" ); + textLabel2 = new TQLabel( groupBox1, "textLabel2" ); layout8->addWidget( textLabel2 ); layout9->addLayout( layout8 ); - layout7 = new QVBoxLayout( 0, 0, 6, "layout7"); + layout7 = new TQVBoxLayout( 0, 0, 6, "layout7"); kLineEdit1 = new KLineEdit( groupBox1, "kLineEdit1" ); layout7->addWidget( kLineEdit1 ); kColorButton1 = new KColorButton( groupBox1, "kColorButton1" ); - kColorButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, kColorButton1->sizePolicy().hasHeightForWidth() ) ); + kColorButton1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, kColorButton1->sizePolicy().hasHeightForWidth() ) ); layout7->addWidget( kColorButton1 ); layout9->addLayout( layout7 ); @@ -64,7 +64,7 @@ KFTPFilterAddPatternLayout::KFTPFilterAddPatternLayout( QWidget* parent, const c KFTPFilterAddPatternLayoutLayout->addWidget( groupBox1, 0, 0 ); languageChange(); - resize( QSize(380, 110).expandedTo(minimumSizeHint()) ); + resize( TQSize(380, 110).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); } @@ -73,7 +73,7 @@ KFTPFilterAddPatternLayout::KFTPFilterAddPatternLayout( QWidget* parent, const c */ KFTPFilterAddPatternLayout::~KFTPFilterAddPatternLayout() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* @@ -86,7 +86,7 @@ void KFTPFilterAddPatternLayout::languageChange() groupBox1->setTitle( tr2i18n( "New Pattern" ) ); textLabel1->setText( tr2i18n( "Filename pattern:" ) ); textLabel2->setText( tr2i18n( "Color:" ) ); - kColorButton1->setText( QString::null ); + kColorButton1->setText( TQString::null ); } #include "kftpfilteraddpatternlayout.moc" diff --git a/kftpgrabber/src/widgets/kftpfiltereditorlayout.cpp b/kftpgrabber/src/widgets/kftpfiltereditorlayout.cpp index b52913c..44ba1f2 100644 --- a/kftpgrabber/src/widgets/kftpfiltereditorlayout.cpp +++ b/kftpgrabber/src/widgets/kftpfiltereditorlayout.cpp @@ -1,4 +1,4 @@ -#include <klocale.h> +#include <tdelocale.h> /**************************************************************************** ** Form implementation generated from reading ui file '/home/kostko/development/kftpgrabber/src/widgets/kftpfiltereditorlayout.ui' ** @@ -10,35 +10,35 @@ #include "kftpfiltereditorlayout.h" -#include <qvariant.h> -#include <qpushbutton.h> -#include <qtabwidget.h> +#include <ntqvariant.h> +#include <ntqpushbutton.h> +#include <ntqtabwidget.h> #include <kpushbutton.h> -#include <qheader.h> -#include <klistview.h> -#include <qcheckbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <ntqheader.h> +#include <tdelistview.h> +#include <ntqcheckbox.h> +#include <ntqlabel.h> +#include <ntqlayout.h> +#include <ntqtooltip.h> +#include <ntqwhatsthis.h> /* * Constructs a KFTPFilterEditorLayout as a child of 'parent', with the * name 'name' and widget flags set to 'f'. */ -KFTPFilterEditorLayout::KFTPFilterEditorLayout( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) +KFTPFilterEditorLayout::KFTPFilterEditorLayout( TQWidget* parent, const char* name, WFlags fl ) + : TQWidget( parent, name, fl ) { if ( !name ) setName( "KFTPFilterEditorLayout" ); - KFTPFilterEditorLayoutLayout = new QGridLayout( this, 1, 1, 11, 6, "KFTPFilterEditorLayoutLayout"); + KFTPFilterEditorLayoutLayout = new TQGridLayout( this, 1, 1, 11, 6, "KFTPFilterEditorLayoutLayout"); - tabWidget2 = new QTabWidget( this, "tabWidget2" ); + tabWidget2 = new TQTabWidget( this, "tabWidget2" ); - tab = new QWidget( tabWidget2, "tab" ); - tabLayout = new QGridLayout( tab, 1, 1, 11, 6, "tabLayout"); + tab = new TQWidget( tabWidget2, "tab" ); + tabLayout = new TQGridLayout( tab, 1, 1, 11, 6, "tabLayout"); - layout1 = new QVBoxLayout( 0, 0, 6, "layout1"); + layout1 = new TQVBoxLayout( 0, 0, 6, "layout1"); addPatternButton = new KPushButton( tab, "addPatternButton" ); layout1->addWidget( addPatternButton ); @@ -50,37 +50,37 @@ KFTPFilterEditorLayout::KFTPFilterEditorLayout( QWidget* parent, const char* nam layout1->addWidget( removePatternButton ); tabLayout->addLayout( layout1, 0, 1 ); - QSpacerItem* spacer = new QSpacerItem( 31, 111, QSizePolicy::Minimum, QSizePolicy::Expanding ); + TQSpacerItem* spacer = new TQSpacerItem( 31, 111, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); tabLayout->addItem( spacer, 1, 1 ); - layout2 = new QVBoxLayout( 0, 0, 6, "layout2"); + layout2 = new TQVBoxLayout( 0, 0, 6, "layout2"); - patternList = new KListView( tab, "patternList" ); + patternList = new TDEListView( tab, "patternList" ); patternList->addColumn( tr2i18n( "Pattern" ) ); patternList->addColumn( tr2i18n( "Color" ) ); layout2->addWidget( patternList ); - enabledCheck = new QCheckBox( tab, "enabledCheck" ); + enabledCheck = new TQCheckBox( tab, "enabledCheck" ); layout2->addWidget( enabledCheck ); tabLayout->addMultiCellLayout( layout2, 0, 1, 0, 0 ); - tabWidget2->insertTab( tab, QString("") ); + tabWidget2->insertTab( tab, TQString("") ); - tab_2 = new QWidget( tabWidget2, "tab_2" ); + tab_2 = new TQWidget( tabWidget2, "tab_2" ); - textLabel1 = new QLabel( tab_2, "textLabel1" ); - textLabel1->setGeometry( QRect( 10, 10, 130, 20 ) ); - tabWidget2->insertTab( tab_2, QString("") ); + textLabel1 = new TQLabel( tab_2, "textLabel1" ); + textLabel1->setGeometry( TQRect( 10, 10, 130, 20 ) ); + tabWidget2->insertTab( tab_2, TQString("") ); - tab_3 = new QWidget( tabWidget2, "tab_3" ); + tab_3 = new TQWidget( tabWidget2, "tab_3" ); - textLabel1_2 = new QLabel( tab_3, "textLabel1_2" ); - textLabel1_2->setGeometry( QRect( 10, 10, 130, 20 ) ); - tabWidget2->insertTab( tab_3, QString("") ); + textLabel1_2 = new TQLabel( tab_3, "textLabel1_2" ); + textLabel1_2->setGeometry( TQRect( 10, 10, 130, 20 ) ); + tabWidget2->insertTab( tab_3, TQString("") ); KFTPFilterEditorLayoutLayout->addWidget( tabWidget2, 0, 0 ); languageChange(); - resize( QSize(456, 299).expandedTo(minimumSizeHint()) ); + resize( TQSize(456, 299).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); } @@ -89,7 +89,7 @@ KFTPFilterEditorLayout::KFTPFilterEditorLayout( QWidget* parent, const char* nam */ KFTPFilterEditorLayout::~KFTPFilterEditorLayout() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* diff --git a/kftpgrabber/src/widgets/kftpselectserverdialog.cpp b/kftpgrabber/src/widgets/kftpselectserverdialog.cpp index f3b6b3a..effaf46 100644 --- a/kftpgrabber/src/widgets/kftpselectserverdialog.cpp +++ b/kftpgrabber/src/widgets/kftpselectserverdialog.cpp @@ -39,13 +39,13 @@ #include "bookmarks/listview.h" #include "misc.h" -#include <klistview.h> +#include <tdelistview.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> using namespace KFTPGrabberBase; -KFTPSelectServerDialog::KFTPSelectServerDialog(QWidget *parent, const char *name) +KFTPSelectServerDialog::KFTPSelectServerDialog(TQWidget *parent, const char *name) : KDialogBase(parent, name, true, "Select a server", KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok), m_selectedSite(0) { @@ -53,7 +53,7 @@ KFTPSelectServerDialog::KFTPSelectServerDialog(QWidget *parent, const char *name m_tree->setMinimumWidth(270); m_tree->fillBookmarkData(); - connect(m_tree, SIGNAL(clicked(QListViewItem*)), this, SLOT(slotTreeClicked())); + connect(m_tree, SIGNAL(clicked(TQListViewItem*)), this, SLOT(slotTreeClicked())); // Set some stuff setMainWidget(m_tree); diff --git a/kftpgrabber/src/widgets/kftpselectserverdialog.h b/kftpgrabber/src/widgets/kftpselectserverdialog.h index 8c4afd3..86753c0 100644 --- a/kftpgrabber/src/widgets/kftpselectserverdialog.h +++ b/kftpgrabber/src/widgets/kftpselectserverdialog.h @@ -37,8 +37,8 @@ #define KFTPSELECTSERVERDIALOG_H #include <kdialogbase.h> -#include <qdom.h> -#include <qlistview.h> +#include <ntqdom.h> +#include <ntqlistview.h> namespace KFTPBookmarks { class Site; @@ -57,7 +57,7 @@ class KFTPSelectServerDialog : public KDialogBase { Q_OBJECT public: - KFTPSelectServerDialog(QWidget *parent = 0, const char *name = 0); + KFTPSelectServerDialog(TQWidget *parent = 0, const char *name = 0); KFTPBookmarks::Site *getSelectedSite() { return m_selectedSite; } private: diff --git a/kftpgrabber/src/widgets/kftpserverlineedit.cpp b/kftpgrabber/src/widgets/kftpserverlineedit.cpp index 87e94e3..1e1467f 100644 --- a/kftpgrabber/src/widgets/kftpserverlineedit.cpp +++ b/kftpgrabber/src/widgets/kftpserverlineedit.cpp @@ -39,14 +39,14 @@ #include <kdialog.h> #include <kpushbutton.h> -#include <klocale.h> +#include <tdelocale.h> -#include <qlayout.h> +#include <ntqlayout.h> -KFTPServerLineEdit::KFTPServerLineEdit(QWidget *parent, const char *name, WFlags f) - : QWidget(parent, name, f), m_currentSite(0) +KFTPServerLineEdit::KFTPServerLineEdit(TQWidget *parent, const char *name, WFlags f) + : TQWidget(parent, name, f), m_currentSite(0) { - QHBoxLayout *layout = new QHBoxLayout(this, 0, KDialog::spacingHint()); + TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); m_lineEdit = new KLineEdit(this); m_lineEdit->setReadOnly(true); @@ -86,7 +86,7 @@ void KFTPServerLineEdit::slotSelectButtonClicked() { KFTPSelectServerDialog *dialog = new KFTPSelectServerDialog(this); - if (dialog->exec() == QDialog::Accepted) { + if (dialog->exec() == TQDialog::Accepted) { m_currentSite = dialog->getSelectedSite(); if (m_currentSite) diff --git a/kftpgrabber/src/widgets/kftpserverlineedit.h b/kftpgrabber/src/widgets/kftpserverlineedit.h index dd471ae..e7fcd12 100644 --- a/kftpgrabber/src/widgets/kftpserverlineedit.h +++ b/kftpgrabber/src/widgets/kftpserverlineedit.h @@ -36,8 +36,8 @@ #ifndef KFTPSERVERLINEEDIT_H #define KFTPSERVERLINEEDIT_H -#include <qwidget.h> -#include <qdom.h> +#include <ntqwidget.h> +#include <ntqdom.h> #include <klineedit.h> @@ -48,11 +48,11 @@ namespace KFTPBookmarks { /** @author Jernej Kos */ -class KFTPServerLineEdit : public QWidget +class KFTPServerLineEdit : public TQWidget { Q_OBJECT public: - KFTPServerLineEdit(QWidget *parent = 0, const char *name = 0, WFlags f = 0); + KFTPServerLineEdit(TQWidget *parent = 0, const char *name = 0, WFlags f = 0); ~KFTPServerLineEdit(); KFTPBookmarks::Site *getCurrentSite() { return m_currentSite; } diff --git a/kftpgrabber/src/widgets/kftptabwidget.cpp b/kftpgrabber/src/widgets/kftptabwidget.cpp index 317f887..1d89a4a 100644 --- a/kftpgrabber/src/widgets/kftptabwidget.cpp +++ b/kftpgrabber/src/widgets/kftptabwidget.cpp @@ -37,7 +37,7 @@ #include "kftptabwidget.h" #include "kftptabwidget.moc" -KFTPTabWidget::KFTPTabWidget( QWidget* parent, const char* name ) +KFTPTabWidget::KFTPTabWidget( TQWidget* parent, const char* name ) : KTabWidget ( parent, name ) { } @@ -47,7 +47,7 @@ KFTPTabWidget::~KFTPTabWidget() { } -void KFTPTabWidget::mousePressEvent( QMouseEvent* ) +void KFTPTabWidget::mousePressEvent( TQMouseEvent* ) { emit mouseEvent( this->name() ); } diff --git a/kftpgrabber/src/widgets/kftptabwidget.h b/kftpgrabber/src/widgets/kftptabwidget.h index d17efe3..77f60e6 100644 --- a/kftpgrabber/src/widgets/kftptabwidget.h +++ b/kftpgrabber/src/widgets/kftptabwidget.h @@ -47,13 +47,13 @@ class KFTPTabWidget : public KTabWidget Q_OBJECT public: - KFTPTabWidget( QWidget* parent = 0, const char* name = 0 ); + KFTPTabWidget( TQWidget* parent = 0, const char* name = 0 ); ~KFTPTabWidget(); - virtual void mousePressEvent( QMouseEvent* mouseEvent ); + virtual void mousePressEvent( TQMouseEvent* mouseEvent ); signals: - void mouseEvent( QString widgetName ); + void mouseEvent( TQString widgetName ); }; diff --git a/kftpgrabber/src/widgets/kftpzeroconflistview.cpp b/kftpgrabber/src/widgets/kftpzeroconflistview.cpp index eb60204..b64da05 100644 --- a/kftpgrabber/src/widgets/kftpzeroconflistview.cpp +++ b/kftpgrabber/src/widgets/kftpzeroconflistview.cpp @@ -37,16 +37,16 @@ #include "kftpapi.h" #include "kftpsession.h" -#include <kdeversion.h> +#include <tdeversion.h> #if KDE_IS_VERSION(3,4,0) #include "kftpzeroconf.h" #endif -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -KFTPZeroConfListView::KFTPZeroConfListView(QWidget *parent, const char *name) +KFTPZeroConfListView::KFTPZeroConfListView(TQWidget *parent, const char *name) : KFTPWidgets::ListView(parent, name) { // Set some stuff @@ -59,7 +59,7 @@ KFTPZeroConfListView::KFTPZeroConfListView(QWidget *parent, const char *name) #if KDE_IS_VERSION(3,4,0) connect(KFTPAPI::getInstance()->zeroConfInterface(), SIGNAL(servicesUpdated()), this, SLOT(slotSitesChanged())); - connect(this, SIGNAL(executed(QListViewItem*)), this, SLOT(slotSiteExecuted(QListViewItem*))); + connect(this, SIGNAL(executed(TQListViewItem*)), this, SLOT(slotSiteExecuted(TQListViewItem*))); slotSitesChanged(); #endif @@ -69,25 +69,25 @@ void KFTPZeroConfListView::slotSitesChanged() { #if KDE_IS_VERSION(3,4,0) // Update the site list - QValueList<DNSSD::RemoteService::Ptr> list = KFTPAPI::getInstance()->zeroConfInterface()->getServiceList(); + TQValueList<DNSSD::RemoteService::Ptr> list = KFTPAPI::getInstance()->zeroConfInterface()->getServiceList(); clear(); if (!list.isEmpty()) { - QValueList<DNSSD::RemoteService::Ptr>::iterator end(list.end()); + TQValueList<DNSSD::RemoteService::Ptr>::iterator end(list.end()); - for (QValueList<DNSSD::RemoteService::Ptr>::iterator i(list.begin()); i != end; ++i) { - QString name = (*i)->serviceName(); - QString ip = (*i)->hostName(); - QString port = QString::number((*i)->port()); + for (TQValueList<DNSSD::RemoteService::Ptr>::iterator i(list.begin()); i != end; ++i) { + TQString name = (*i)->serviceName(); + TQString ip = (*i)->hostName(); + TQString port = TQString::number((*i)->port()); - KListViewItem *site = new KListViewItem(this, name, ip, port); + TDEListViewItem *site = new TDEListViewItem(this, name, ip, port); site->setPixmap(0, SmallIcon("lan")); } } #endif } -void KFTPZeroConfListView::slotSiteExecuted(QListViewItem *item) +void KFTPZeroConfListView::slotSiteExecuted(TQListViewItem *item) { #if KDE_IS_VERSION(3,4,0) // Connect to the site diff --git a/kftpgrabber/src/widgets/kftpzeroconflistview.h b/kftpgrabber/src/widgets/kftpzeroconflistview.h index 9aea9aa..1c2cc18 100644 --- a/kftpgrabber/src/widgets/kftpzeroconflistview.h +++ b/kftpgrabber/src/widgets/kftpzeroconflistview.h @@ -47,10 +47,10 @@ class KFTPZeroConfListView : public KFTPWidgets::ListView { Q_OBJECT public: - KFTPZeroConfListView(QWidget *parent = 0, const char *name = 0); + KFTPZeroConfListView(TQWidget *parent = 0, const char *name = 0); private slots: void slotSitesChanged(); - void slotSiteExecuted(QListViewItem*); + void slotSiteExecuted(TQListViewItem*); }; #endif diff --git a/kftpgrabber/src/widgets/listview.cpp b/kftpgrabber/src/widgets/listview.cpp index 635130b..fc17ad3 100644 --- a/kftpgrabber/src/widgets/listview.cpp +++ b/kftpgrabber/src/widgets/listview.cpp @@ -35,13 +35,13 @@ #include "listview.h" -#include <qpainter.h> -#include <qstringlist.h> +#include <ntqpainter.h> +#include <ntqstringlist.h> namespace KFTPWidgets { -ListView::ListView(QWidget *parent, const char *name) - : KListView(parent, name) +ListView::ListView(TQWidget *parent, const char *name) + : TDEListView(parent, name) { } @@ -50,30 +50,30 @@ ListView::~ListView() { } -void ListView::resizeEvent(QResizeEvent *e) +void ListView::resizeEvent(TQResizeEvent *e) { - KListView::resizeEvent(e); + TDEListView::resizeEvent(e); triggerUpdate(); } -void ListView::setEmptyListText(const QString &text) +void ListView::setEmptyListText(const TQString &text) { m_emptyListText = text; triggerUpdate(); } -void ListView::drawContentsOffset(QPainter * p, int ox, int oy, int cx, int cy, int cw, int ch) +void ListView::drawContentsOffset(TQPainter * p, int ox, int oy, int cx, int cy, int cw, int ch) { - KListView::drawContentsOffset(p, ox, oy, cx, cy, cw, ch); + TDEListView::drawContentsOffset(p, ox, oy, cx, cy, cw, ch); if (childCount() == 0 && !m_emptyListText.isEmpty()) { - p->setPen(Qt::darkGray); + p->setPen(TQt::darkGray); - QStringList lines = QStringList::split("\n", m_emptyListText); + TQStringList lines = TQStringList::split("\n", m_emptyListText); int ypos = 10 + p->fontMetrics().height(); - QStringList::Iterator end(lines.end()); - for (QStringList::Iterator str( lines.begin() ); str != end; ++str) { + TQStringList::Iterator end(lines.end()); + for (TQStringList::Iterator str( lines.begin() ); str != end; ++str) { p->drawText((viewport()->width()/2)-(p->fontMetrics().width(*str)/2), ypos, *str); ypos += p->fontMetrics().lineSpacing(); } diff --git a/kftpgrabber/src/widgets/listview.h b/kftpgrabber/src/widgets/listview.h index 8718f97..487e9e1 100644 --- a/kftpgrabber/src/widgets/listview.h +++ b/kftpgrabber/src/widgets/listview.h @@ -36,26 +36,26 @@ #ifndef KFTPLISTVIEW_H #define KFTPLISTVIEW_H -#include <klistview.h> +#include <tdelistview.h> namespace KFTPWidgets { /** * @author Jernej Kos */ -class ListView : public KListView +class ListView : public TDEListView { Q_OBJECT public: - ListView(QWidget *parent = 0, const char *name = 0); + ListView(TQWidget *parent = 0, const char *name = 0); ~ListView(); - void setEmptyListText(const QString &text); - virtual void resizeEvent(QResizeEvent *e); + void setEmptyListText(const TQString &text); + virtual void resizeEvent(TQResizeEvent *e); protected: - virtual void drawContentsOffset(QPainter * p, int ox, int oy, int cx, int cy, int cw, int ch ); + virtual void drawContentsOffset(TQPainter * p, int ox, int oy, int cx, int cy, int cw, int ch ); private: - QString m_emptyListText; + TQString m_emptyListText; }; } diff --git a/kftpgrabber/src/widgets/listviewitem.cpp b/kftpgrabber/src/widgets/listviewitem.cpp index 6b91feb..d249d46 100644 --- a/kftpgrabber/src/widgets/listviewitem.cpp +++ b/kftpgrabber/src/widgets/listviewitem.cpp @@ -35,33 +35,33 @@ #include "listviewitem.h" -#include <qheader.h> -#include <qpixmap.h> -#include <qpainter.h> -#include <qsimplerichtext.h> +#include <ntqheader.h> +#include <ntqpixmap.h> +#include <ntqpainter.h> +#include <ntqsimplerichtext.h> namespace KFTPWidgets { -ListViewItem::ListViewItem(QListView *parent) - : KListViewItem(parent) +ListViewItem::ListViewItem(TQListView *parent) + : TDEListViewItem(parent) { } -void ListViewItem::setRichText(int col, const QString &text) +void ListViewItem::setRichText(int col, const TQString &text) { - setText(col, QString::null); + setText(col, TQString::null); m_richText[col] = text; } void ListViewItem::setup() { - QListViewItem::setup(); + TQListViewItem::setup(); int maxHeight = height(); for (int i = 0; i < listView()->header()->count() - 1; i++) { if (text(i).isNull()) { - QSimpleRichText rt(m_richText[i], QFont()); + TQSimpleRichText rt(m_richText[i], TQFont()); maxHeight = rt.height() > maxHeight ? rt.height() : maxHeight; } } @@ -69,27 +69,27 @@ void ListViewItem::setup() setHeight(maxHeight); } -void ListViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int alignment) +void ListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) { if (text(column).isNull()) { - KListViewItem::paintCell(p, cg, column, width, alignment); + TDEListViewItem::paintCell(p, cg, column, width, alignment); int pad = 0; if (pixmap(column)) { pad = pixmap(column)->width() + 5; } - QSimpleRichText rt(m_richText[column], p->font()); - rt.draw(p, pad, 0, QRect(pad, 0, width, height()), cg); + TQSimpleRichText rt(m_richText[column], p->font()); + rt.draw(p, pad, 0, TQRect(pad, 0, width, height()), cg); } else if (m_colors.contains(column)) { - QColorGroup _cg(cg); - QColor c = _cg.text(); + TQColorGroup _cg(cg); + TQColor c = _cg.text(); - _cg.setColor(QColorGroup::Text, m_colors[column]); - KListViewItem::paintCell(p, _cg, column, width, alignment); - _cg.setColor(QColorGroup::Text, c); + _cg.setColor(TQColorGroup::Text, m_colors[column]); + TDEListViewItem::paintCell(p, _cg, column, width, alignment); + _cg.setColor(TQColorGroup::Text, c); } else { - KListViewItem::paintCell(p, cg, column, width, alignment); + TDEListViewItem::paintCell(p, cg, column, width, alignment); } } diff --git a/kftpgrabber/src/widgets/listviewitem.h b/kftpgrabber/src/widgets/listviewitem.h index b9edc23..0feb435 100644 --- a/kftpgrabber/src/widgets/listviewitem.h +++ b/kftpgrabber/src/widgets/listviewitem.h @@ -36,34 +36,34 @@ #ifndef KFTPWIDGETSLISTVIEWITEM_H #define KFTPWIDGETSLISTVIEWITEM_H -#include <klistview.h> +#include <tdelistview.h> -#include <qmap.h> -#include <qcolor.h> +#include <ntqmap.h> +#include <ntqcolor.h> namespace KFTPWidgets { /** - * This class is a simple QListViewItem replacement that supports displaying + * This class is a simple TQListViewItem replacement that supports displaying * richtext. * * @author Jernej Kos */ -class ListViewItem : public KListViewItem +class ListViewItem : public TDEListViewItem { public: - ListViewItem(QListView *parent); + ListViewItem(TQListView *parent); - void setRichText(int col, const QString &text); - QString richText(int col) { return m_richText[col]; } + void setRichText(int col, const TQString &text); + TQString richText(int col) { return m_richText[col]; } - void setTextColor(int col, QColor color) { m_colors[col] = color; } + void setTextColor(int col, TQColor color) { m_colors[col] = color; } - void paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int alignment); + void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment); void setup(); private: - QMap<int, QString> m_richText; - QMap<int, QColor> m_colors; + TQMap<int, TQString> m_richText; + TQMap<int, TQColor> m_colors; }; } diff --git a/kftpgrabber/src/widgets/logview.cpp b/kftpgrabber/src/widgets/logview.cpp index bac9df8..1d1c57f 100644 --- a/kftpgrabber/src/widgets/logview.cpp +++ b/kftpgrabber/src/widgets/logview.cpp @@ -37,20 +37,20 @@ #include "misc/config.h" #include "kftpapi.h" -#include <klocale.h> +#include <tdelocale.h> #include <kstdaction.h> -#include <kfiledialog.h> -#include <kmessagebox.h> +#include <tdefiledialog.h> +#include <tdemessagebox.h> -#include <qfile.h> -#include <qtextstream.h> +#include <ntqfile.h> +#include <ntqtextstream.h> namespace KFTPWidgets { -LogView::LogView(QWidget *parent, const char *name) +LogView::LogView(TQWidget *parent, const char *name) : KTextEdit(parent, name) { - setTextFormat(Qt::LogText); + setTextFormat(TQt::LogText); setMaxLogLines(200); setFont(KFTPCore::Config::logFont()); @@ -69,9 +69,9 @@ LogView::~LogView() { } -QPopupMenu *LogView::createPopupMenu(const QPoint &pos) +TQPopupMenu *LogView::createPopupMenu(const TQPoint &pos) { - QPopupMenu *menu = KTextEdit::createPopupMenu(pos); + TQPopupMenu *menu = KTextEdit::createPopupMenu(pos); m_saveToFileAction->plug(menu); menu->insertSeparator(); @@ -82,12 +82,12 @@ QPopupMenu *LogView::createPopupMenu(const QPoint &pos) void LogView::slotSaveToFile() { - QString savePath = KFileDialog::getSaveFileName(); + TQString savePath = KFileDialog::getSaveFileName(); if (!savePath.isEmpty()) { - QFile file(savePath); + TQFile file(savePath); if (file.open(IO_WriteOnly)) { - QTextStream stream(&file); + TQTextStream stream(&file); stream << text(); file.close(); } else { @@ -101,27 +101,27 @@ void LogView::slotClearLog() clear(); } -void LogView::append(const QString &text) +void LogView::append(const TQString &text) { - QDateTime dt = QDateTime::currentDateTime(); - QTextEdit::append("[" + dt.toString("hh:mm:ss") + "] " + text); + TQDateTime dt = TQDateTime::currentDateTime(); + TQTextEdit::append("[" + dt.toString("hh:mm:ss") + "] " + text); scrollToBottom(); } -void LogView::ftpLog(int type, const QString &text) +void LogView::ftpLog(int type, const TQString &text) { // Set the font if changed if (KFTPCore::Config::logFont() != font()) setFont(KFTPCore::Config::logFont()); - QString line; + TQString line; line = text.stripWhiteSpace(); line.replace("<", "<"); line.replace(">", ">"); switch (type) { case 0: { - QString code = line.section(" ", 0, 0); - QString text = line.mid(line.find(' ')+1); + TQString code = line.section(" ", 0, 0); + TQString text = line.mid(line.find(' ')+1); append("<font color=" + KFTPCore::Config::logResponsesColor().name() + "><b>" + code + "</b> " + text + "</font><br>"); break; } diff --git a/kftpgrabber/src/widgets/logview.h b/kftpgrabber/src/widgets/logview.h index ac2f9e3..80e5f43 100644 --- a/kftpgrabber/src/widgets/logview.h +++ b/kftpgrabber/src/widgets/logview.h @@ -37,9 +37,9 @@ #define KFTPLOGVIEW_H #include <ktextedit.h> -#include <kaction.h> +#include <tdeaction.h> -#include <qpopupmenu.h> +#include <ntqpopupmenu.h> namespace KFTPWidgets { @@ -52,17 +52,17 @@ class LogView : public KTextEdit { Q_OBJECT public: - LogView(QWidget *parent = 0, const char *name = 0); + LogView(TQWidget *parent = 0, const char *name = 0); ~LogView(); - void append(const QString &text); + void append(const TQString &text); protected: - KAction *m_saveToFileAction; - KAction *m_clearLogAction; + TDEAction *m_saveToFileAction; + TDEAction *m_clearLogAction; - QPopupMenu *createPopupMenu(const QPoint &pos); + TQPopupMenu *createPopupMenu(const TQPoint &pos); public slots: - void ftpLog(int type, const QString &text); + void ftpLog(int type, const TQString &text); private slots: void slotSaveToFile(); void slotClearLog(); diff --git a/kftpgrabber/src/widgets/multitabbar.cpp b/kftpgrabber/src/widgets/multitabbar.cpp index 2b7c583..ecbad25 100644 --- a/kftpgrabber/src/widgets/multitabbar.cpp +++ b/kftpgrabber/src/widgets/multitabbar.cpp @@ -42,15 +42,15 @@ #include <math.h> -#include <qapplication.h> -#include <qbutton.h> -#include <qpopupmenu.h> -#include <qlayout.h> -#include <qpainter.h> -#include <qtooltip.h> -#include <qfontmetrics.h> -#include <qstyle.h> -#include <qtimer.h> +#include <ntqapplication.h> +#include <ntqbutton.h> +#include <ntqpopupmenu.h> +#include <ntqlayout.h> +#include <ntqpainter.h> +#include <ntqtooltip.h> +#include <ntqfontmetrics.h> +#include <ntqstyle.h> +#include <ntqtimer.h> #include <kiconloader.h> #include <kdebug.h> @@ -63,11 +63,11 @@ namespace KFTPWidgets { class MultiTabBarTabPrivate { public: - QPixmap pix; + TQPixmap pix; }; -MultiTabBarInternal::MultiTabBarInternal( QWidget *parent, MultiTabBar::MultiTabBarMode bm ) : QScrollView( parent ) +MultiTabBarInternal::MultiTabBarInternal( TQWidget *parent, MultiTabBar::MultiTabBarMode bm ) : TQScrollView( parent ) { m_expandedTabSize = -1; m_showActiveTabTexts = false; @@ -76,23 +76,23 @@ MultiTabBarInternal::MultiTabBarInternal( QWidget *parent, MultiTabBar::MultiTab setHScrollBarMode( AlwaysOff ); setVScrollBarMode( AlwaysOff ); if ( bm == MultiTabBar::Vertical ) { - box = new QWidget( viewport() ); - mainLayout = new QVBoxLayout( box ); + box = new TQWidget( viewport() ); + mainLayout = new TQVBoxLayout( box ); mainLayout->setAutoAdd( true ); box->setFixedWidth( 24 ); setFixedWidth( 24 ); } else { - box = new QWidget( viewport() ); - mainLayout = new QHBoxLayout( box ); + box = new TQWidget( viewport() ); + mainLayout = new TQHBoxLayout( box ); mainLayout->setAutoAdd( true ); box->setFixedHeight( 24 ); setFixedHeight( 24 ); } addChild( box ); setFrameStyle( NoFrame ); - viewport() ->setBackgroundMode( Qt::PaletteBackground ); - /* box->setPaletteBackgroundColor(Qt::red); - setPaletteBackgroundColor(Qt::green);*/ + viewport() ->setBackgroundMode( TQt::PaletteBackground ); + /* box->setPaletteBackgroundColor(TQt::red); + setPaletteBackgroundColor(TQt::green);*/ } void MultiTabBarInternal::setStyle( enum MultiTabBar::MultiTabBarStyle style ) @@ -109,13 +109,13 @@ void MultiTabBarInternal::setStyle( enum MultiTabBar::MultiTabBarStyle style ) resizeEvent( 0 ); } else if ( mainLayout == 0 ) { if ( m_barMode == MultiTabBar::Vertical ) { - box = new QWidget( viewport() ); - mainLayout = new QVBoxLayout( box ); + box = new TQWidget( viewport() ); + mainLayout = new TQVBoxLayout( box ); box->setFixedWidth( 24 ); setFixedWidth( 24 ); } else { - box = new QWidget( viewport() ); - mainLayout = new QHBoxLayout( box ); + box = new TQWidget( viewport() ); + mainLayout = new TQHBoxLayout( box ); box->setFixedHeight( 24 ); setFixedHeight( 24 ); } @@ -128,9 +128,9 @@ void MultiTabBarInternal::setStyle( enum MultiTabBar::MultiTabBarStyle style ) viewport() ->repaint(); } -void MultiTabBarInternal::drawContents ( QPainter * paint, int clipx, int clipy, int clipw, int cliph ) +void MultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clipy, int clipw, int cliph ) { - QScrollView::drawContents ( paint , clipx, clipy, clipw, cliph ); + TQScrollView::drawContents ( paint , clipx, clipy, clipw, cliph ); if ( m_position == MultiTabBar::Right ) { @@ -167,12 +167,12 @@ void MultiTabBarInternal::drawContents ( QPainter * paint, int clipx, int clipy, } -void MultiTabBarInternal::contentsMousePressEvent( QMouseEvent *ev ) +void MultiTabBarInternal::contentsMousePressEvent( TQMouseEvent *ev ) { ev->ignore(); } -void MultiTabBarInternal::mousePressEvent( QMouseEvent *ev ) +void MultiTabBarInternal::mousePressEvent( TQMouseEvent *ev ) { ev->ignore(); } @@ -194,12 +194,12 @@ void MultiTabBarInternal::mousePressEvent( QMouseEvent *ev ) } else {diff=0; } -void MultiTabBarInternal::resizeEvent( QResizeEvent *ev ) +void MultiTabBarInternal::resizeEvent( TQResizeEvent *ev ) { /* kdDebug()<<"MultiTabBarInternal::resizeEvent"<<endl; kdDebug()<<"MultiTabBarInternal::resizeEvent - box geometry"<<box->geometry()<<endl; kdDebug()<<"MultiTabBarInternal::resizeEvent - geometry"<<geometry()<<endl;*/ - if ( ev ) QScrollView::resizeEvent( ev ); + if ( ev ) TQScrollView::resizeEvent( ev ); if ( ( m_style == MultiTabBar::KDEV3 ) || ( m_style == MultiTabBar::KDEV3ICON ) || @@ -335,20 +335,20 @@ void MultiTabBarInternal::showActiveTabTexts( bool show ) MultiTabBarTab* MultiTabBarInternal::tab( int id ) const { - for ( QPtrListIterator<MultiTabBarTab> it( m_tabs );it.current();++it ) { + for ( TQPtrListIterator<MultiTabBarTab> it( m_tabs );it.current();++it ) { if ( it.current() ->id() == id ) return it.current(); } return 0; } -bool MultiTabBarInternal::eventFilter( QObject *, QEvent *e ) +bool MultiTabBarInternal::eventFilter( TQObject *, TQEvent *e ) { - if ( e->type() == QEvent::Resize ) + if ( e->type() == TQEvent::Resize ) resizeEvent( 0 ); //PATCH by markey: Allow switching of tabs with mouse wheel - if ( e->type() == QEvent::Wheel ) { - QWheelEvent* event = static_cast<QWheelEvent*>( e ); + if ( e->type() == TQEvent::Wheel ) { + TQWheelEvent* event = static_cast<TQWheelEvent*>( e ); const int delta = event->delta() / 120; // Determine which tab is currently active @@ -371,7 +371,7 @@ bool MultiTabBarInternal::eventFilter( QObject *, QEvent *e ) return false; } -int MultiTabBarInternal::appendTab(const QPixmap &pic , int id, const QString &text) +int MultiTabBarInternal::appendTab(const TQPixmap &pic , int id, const TQString &text) { MultiTabBarTab *tab; @@ -379,7 +379,7 @@ int MultiTabBarInternal::appendTab(const QPixmap &pic , int id, const QString &t tab->installEventFilter(this); tab->showActiveTabText(m_showActiveTabTexts); - if (m_style == MultiTabBar::KONQSBC) { + if (m_style == MultiTabBar::KONTQSBC) { if (m_expandedTabSize < tab->neededSize()) { m_expandedTabSize = tab->neededSize(); @@ -418,13 +418,13 @@ void MultiTabBarInternal::setPosition( enum MultiTabBar::MultiTabBarPosition pos } -MultiTabBarButton::MultiTabBarButton(MultiTabBarInternal *tb, const QPixmap& pic, const QString& text, QPopupMenu *popup, - int id, QWidget *parent, MultiTabBar::MultiTabBarPosition pos, MultiTabBar::MultiTabBarStyle style ) - : QPushButton(QIconSet(), text, parent), +MultiTabBarButton::MultiTabBarButton(MultiTabBarInternal *tb, const TQPixmap& pic, const TQString& text, TQPopupMenu *popup, + int id, TQWidget *parent, MultiTabBar::MultiTabBarPosition pos, MultiTabBar::MultiTabBarStyle style ) + : TQPushButton(TQIconSet(), text, parent), m_tb(tb), m_style(style), m_animCount(0), - m_animTimer(new QTimer(this)) + m_animTimer(new TQTimer(this)) { setIconSet(pic); setText(text); @@ -443,13 +443,13 @@ MultiTabBarButton::MultiTabBarButton(MultiTabBarInternal *tb, const QPixmap& pic connect(m_animTimer, SIGNAL(timeout()), this, SLOT(slotAnimTimer())); } -MultiTabBarButton::MultiTabBarButton(MultiTabBarInternal *tb, const QString& text, QPopupMenu *popup, - int id, QWidget *parent, MultiTabBar::MultiTabBarPosition pos, MultiTabBar::MultiTabBarStyle style ) - : QPushButton(QIconSet(), text, parent), +MultiTabBarButton::MultiTabBarButton(MultiTabBarInternal *tb, const TQString& text, TQPopupMenu *popup, + int id, TQWidget *parent, MultiTabBar::MultiTabBarPosition pos, MultiTabBar::MultiTabBarStyle style ) + : TQPushButton(TQIconSet(), text, parent), m_tb(tb), m_style(style), m_animCount(0), - m_animTimer(new QTimer(this)) + m_animTimer(new TQTimer(this)) { setText(text); m_position = pos; @@ -474,9 +474,9 @@ int MultiTabBarButton::id() const return m_id; } -void MultiTabBarButton::setText(const QString& text) +void MultiTabBarButton::setText(const TQString& text) { - QPushButton::setText(text); + TQPushButton::setText(text); m_text = text; } @@ -497,25 +497,25 @@ void MultiTabBarButton::setStyle(MultiTabBar::MultiTabBarStyle style) repaint(); } -void MultiTabBarButton::hideEvent(QHideEvent* he) +void MultiTabBarButton::hideEvent(TQHideEvent* he) { - QPushButton::hideEvent(he); + TQPushButton::hideEvent(he); MultiTabBar *tb = dynamic_cast<MultiTabBar*>(parentWidget()); if (tb) tb->updateSeparator(); } -void MultiTabBarButton::showEvent(QShowEvent* he) +void MultiTabBarButton::showEvent(TQShowEvent* he) { - QPushButton::showEvent(he); + TQPushButton::showEvent(he); MultiTabBar *tb = dynamic_cast<MultiTabBar*>(parentWidget()); if (tb) tb->updateSeparator(); } -void MultiTabBarButton::enterEvent(QEvent*) +void MultiTabBarButton::enterEvent(TQEvent*) { m_animEnter = true; m_animCount = 0; @@ -523,7 +523,7 @@ void MultiTabBarButton::enterEvent(QEvent*) m_animTimer->start(ANIM_INTERVAL); } -void MultiTabBarButton::leaveEvent(QEvent*) +void MultiTabBarButton::leaveEvent(TQEvent*) { if (m_animCount == 0) m_animCount = 1; @@ -549,7 +549,7 @@ void MultiTabBarButton::slotAnimTimer() } } -QSize MultiTabBarButton::sizeHint() const +TQSize MultiTabBarButton::sizeHint() const { constPolish(); @@ -558,30 +558,30 @@ QSize MultiTabBarButton::sizeHint() const // calculate contents size... #ifndef QT_NO_ICONSET if ( iconSet() && !iconSet() ->isNull() ) { - int iw = iconSet() ->pixmap( QIconSet::Small, QIconSet::Normal ).width() + 4; - int ih = iconSet() ->pixmap( QIconSet::Small, QIconSet::Normal ).height(); + int iw = iconSet() ->pixmap( TQIconSet::Small, TQIconSet::Normal ).width() + 4; + int ih = iconSet() ->pixmap( TQIconSet::Small, TQIconSet::Normal ).height(); w += iw; - h = QMAX( h, ih ); + h = TQMAX( h, ih ); } #endif if ( isMenuButton() ) - w += style().pixelMetric( QStyle::PM_MenuButtonIndicator, this ); + w += style().pixelMetric( TQStyle::PM_MenuButtonIndicator, this ); if ( pixmap() ) { - QPixmap * pm = ( QPixmap * ) pixmap(); + TQPixmap * pm = ( TQPixmap * ) pixmap(); w += pm->width(); h += pm->height(); } else { - QString s( text() ); + TQString s( text() ); bool empty = s.isEmpty(); if ( empty ) - s = QString::fromLatin1( "XXXX" ); - QFontMetrics fm = fontMetrics(); - QSize sz = fm.size( ShowPrefix, s ); + s = TQString::fromLatin1( "XXXX" ); + TQFontMetrics fm = fontMetrics(); + TQSize sz = fm.size( ShowPrefix, s ); if ( !empty || !w ) w += sz.width(); if ( !empty || !h ) - h = QMAX( h, sz.height() ); + h = TQMAX( h, sz.height() ); } //PATCH by markey @@ -592,13 +592,13 @@ QSize MultiTabBarButton::sizeHint() const h = (parentWidget()->height() - 3) / m_tb->tabs()->count(); } - return ( style().sizeFromContents( QStyle::CT_ToolButton, this, QSize( w, h ) ). - expandedTo( QApplication::globalStrut() ) ); + return ( style().sizeFromContents( TQStyle::CT_ToolButton, this, TQSize( w, h ) ). + expandedTo( TQApplication::globalStrut() ) ); } -MultiTabBarTab::MultiTabBarTab( MultiTabBarInternal *tb, const QPixmap& pic, const QString& text, - int id, QWidget *parent, MultiTabBar::MultiTabBarPosition pos, +MultiTabBarTab::MultiTabBarTab( MultiTabBarInternal *tb, const TQPixmap& pic, const TQString& text, + int id, TQWidget *parent, MultiTabBar::MultiTabBarPosition pos, MultiTabBar::MultiTabBarStyle style ) : MultiTabBarButton(tb, text, 0, id, parent, pos, style), m_showActiveTabText(false) @@ -609,7 +609,7 @@ MultiTabBarTab::MultiTabBarTab( MultiTabBarInternal *tb, const QPixmap& pic, con setToggleButton( true ); // Prevent flicker on redraw - setWFlags( getWFlags() | Qt::WNoAutoErase ); + setWFlags( getWFlags() | TQt::WNoAutoErase ); } MultiTabBarTab::~MultiTabBarTab() @@ -622,7 +622,7 @@ void MultiTabBarTab::setTabsPosition( MultiTabBar::MultiTabBarPosition pos ) { if ( ( pos != m_position ) && ( ( pos == MultiTabBar::Left ) || ( pos == MultiTabBar::Right ) ) ) { if ( !d->pix.isNull() ) { - QWMatrix temp; // (1.0F, 0.0F, 0.0F, -1.0F, 0.0F, 0.0F); + TQWMatrix temp; // (1.0F, 0.0F, 0.0F, -1.0F, 0.0F, 0.0F); temp.rotate( 180 ); d->pix = d->pix.xForm( temp ); setIconSet( d->pix ); @@ -633,23 +633,23 @@ void MultiTabBarTab::setTabsPosition( MultiTabBar::MultiTabBarPosition pos ) // repaint(); } -void MultiTabBarTab::setIcon( const QString& icon ) +void MultiTabBarTab::setIcon( const TQString& icon ) { - QPixmap pic = SmallIcon( icon ); + TQPixmap pic = SmallIcon( icon ); setIcon( pic ); } -void MultiTabBarTab::setIcon( const QPixmap& icon ) +void MultiTabBarTab::setIcon( const TQPixmap& icon ) { if ( m_style != MultiTabBar::KDEV3 ) { if ( ( m_position == MultiTabBar::Left ) || ( m_position == MultiTabBar::Right ) ) { - QWMatrix rotateMatrix; + TQWMatrix rotateMatrix; if ( m_position == MultiTabBar::Left ) rotateMatrix.rotate( 90 ); else rotateMatrix.rotate( -90 ); - QPixmap pic = icon.xForm( rotateMatrix ); //TODO FIX THIS, THIS SHOWS WINDOW + TQPixmap pic = icon.xForm( rotateMatrix ); //TODO FIX THIS, THIS SHOWS WINDOW d->pix = pic; setIconSet( pic ); } else setIconSet( icon ); @@ -677,12 +677,12 @@ void MultiTabBarTab::setState(bool b) void MultiTabBarTab::updateState() { - if ( m_style != MultiTabBar::KONQSBC ) { + if ( m_style != MultiTabBar::KONTQSBC ) { if ( ( m_style == MultiTabBar::KDEV3 ) || ( m_style == MultiTabBar::KDEV3ICON ) || ( m_style == MultiTabBar::AMAROK ) || ( isOn() ) ) { - QPushButton::setText( m_text ); + TQPushButton::setText( m_text ); } else { - kdDebug() << "MultiTabBarTab::updateState(): setting text to an empty QString***************" << endl; - QPushButton::setText( QString::null ); + kdDebug() << "MultiTabBarTab::updateState(): setting text to an empty TQString***************" << endl; + TQPushButton::setText( TQString::null ); } if ( ( m_position == MultiTabBar::Right || m_position == MultiTabBar::Left ) ) { @@ -707,8 +707,8 @@ void MultiTabBarTab::updateState() else setFixedWidth( m_expandedSize ); } - QApplication::sendPostedEvents( 0, QEvent::Paint | QEvent::Move | QEvent::Resize | QEvent::LayoutHint ); - QApplication::flush(); + TQApplication::sendPostedEvents( 0, TQEvent::Paint | TQEvent::Move | TQEvent::Resize | TQEvent::LayoutHint ); + TQApplication::flush(); } int MultiTabBarTab::neededSize() @@ -719,7 +719,7 @@ int MultiTabBarTab::neededSize() else return (parentWidget()->width() - 3) / m_tb->tabs()->count(); } else { - return (((m_style != MultiTabBar::KDEV3 ) ? 24 : 0) + QFontMetrics(QFont()).width(m_text) + 6); + return (((m_style != MultiTabBar::KDEV3 ) ? 24 : 0) + TQFontMetrics(TQFont()).width(m_text) + 6); } } @@ -734,47 +734,47 @@ void MultiTabBarTab::showActiveTabText(bool show) m_showActiveTabText = show; } -void MultiTabBarTab::drawButtonLabel(QPainter *p) +void MultiTabBarTab::drawButtonLabel(TQPainter *p) { drawButton(p); } -void MultiTabBarTab::drawButton(QPainter *paint) +void MultiTabBarTab::drawButton(TQPainter *paint) { if (m_style == MultiTabBar::AMAROK) { drawButtonAmarok(paint); - } else if (m_style != MultiTabBar::KONQSBC) { + } else if (m_style != MultiTabBar::KONTQSBC) { drawButtonStyled(paint); } else { drawButtonClassic(paint); } } -void MultiTabBarTab::drawButtonStyled( QPainter *paint ) +void MultiTabBarTab::drawButtonStyled( TQPainter *paint ) { - QSize sh; + TQSize sh; const int width = 36; // rotated const int height = 24; if ( ( m_style == MultiTabBar::KDEV3 ) || ( m_style == MultiTabBar::KDEV3ICON ) || ( m_style == MultiTabBar::AMAROK ) || ( isOn() ) ) { if ( ( m_position == MultiTabBar::Left ) || ( m_position == MultiTabBar::Right ) ) - sh = QSize( this->height(), this->width() ); //MultiTabBarButton::sizeHint(); - else sh = QSize( this->width(), this->height() ); + sh = TQSize( this->height(), this->width() ); //MultiTabBarButton::sizeHint(); + else sh = TQSize( this->width(), this->height() ); } else - sh = QSize( width, height ); + sh = TQSize( width, height ); - QPixmap pixmap( sh.width(), height ); ///,sh.height()); + TQPixmap pixmap( sh.width(), height ); ///,sh.height()); pixmap.fill( eraseColor() ); - QPainter painter( &pixmap ); + TQPainter painter( &pixmap ); - QStyle::SFlags st = QStyle::Style_Default; + TQStyle::SFlags st = TQStyle::Style_Default; - st |= QStyle::Style_Enabled; + st |= TQStyle::Style_Enabled; - if ( isOn() ) st |= QStyle::Style_On; + if ( isOn() ) st |= TQStyle::Style_On; - style().drawControl( QStyle::CE_PushButton, &painter, this, QRect( 0, 0, pixmap.width(), pixmap.height() ), colorGroup(), st ); - style().drawControl( QStyle::CE_PushButtonLabel, &painter, this, QRect( 0, 0, pixmap.width(), pixmap.height() ), colorGroup(), st ); + style().drawControl( TQStyle::CE_PushButton, &painter, this, TQRect( 0, 0, pixmap.width(), pixmap.height() ), colorGroup(), st ); + style().drawControl( TQStyle::CE_PushButtonLabel, &painter, this, TQRect( 0, 0, pixmap.width(), pixmap.height() ), colorGroup(), st ); switch ( m_position ) { case MultiTabBar::Left: @@ -790,23 +790,23 @@ void MultiTabBarTab::drawButtonStyled( QPainter *paint ) paint->drawPixmap( 0, 0, pixmap ); break; } - // style().drawControl(QStyle::CE_PushButtonLabel,painter,this, QRect(0,0,pixmap.width(),pixmap.height()), - // colorGroup(),QStyle::Style_Enabled); + // style().drawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), + // colorGroup(),TQStyle::Style_Enabled); } -void MultiTabBarTab::drawButtonClassic( QPainter *paint ) +void MultiTabBarTab::drawButtonClassic( TQPainter *paint ) { - QPixmap pixmap; + TQPixmap pixmap; if ( iconSet() ) - pixmap = iconSet() ->pixmap( QIconSet::Small, QIconSet::Normal ); + pixmap = iconSet() ->pixmap( TQIconSet::Small, TQIconSet::Normal ); paint->fillRect( 0, 0, 24, 24, colorGroup().background() ); if ( !isOn() ) { if ( m_position == MultiTabBar::Right ) { - paint->fillRect( 0, 0, 21, 21, QBrush( colorGroup().background() ) ); + paint->fillRect( 0, 0, 21, 21, TQBrush( colorGroup().background() ) ); paint->setPen( colorGroup().background().dark( 150 ) ); paint->drawLine( 0, 22, 23, 22 ); @@ -820,7 +820,7 @@ void MultiTabBarTab::drawButtonClassic( QPainter *paint ) } else if ( ( m_position == MultiTabBar::Bottom ) || ( m_position == MultiTabBar::Top ) ) { - paint->fillRect( 0, 1, 23, 22, QBrush( colorGroup().background() ) ); + paint->fillRect( 0, 1, 23, 22, TQBrush( colorGroup().background() ) ); paint->drawPixmap( 12 - pixmap.width() / 2, 12 - pixmap.height() / 2, pixmap ); @@ -839,7 +839,7 @@ void MultiTabBarTab::drawButtonClassic( QPainter *paint ) } else { paint->setPen( colorGroup().background().dark( 120 ) ); paint->drawLine( 0, 23, 23, 23 ); - paint->fillRect( 0, 0, 23, 21, QBrush( colorGroup().background() ) ); + paint->fillRect( 0, 0, 23, 21, TQBrush( colorGroup().background() ) ); paint->drawPixmap( 12 - pixmap.width() / 2, 12 - pixmap.height() / 2, pixmap ); paint->setPen( colorGroup().light() ); @@ -859,19 +859,19 @@ void MultiTabBarTab::drawButtonClassic( QPainter *paint ) paint->drawLine( 0, height() - 2, 23, height() - 2 ); paint->drawLine( 23, 0, 23, height() - 1 ); paint->drawLine( 22, 0, 22, height() - 1 ); - paint->fillRect( 0, 0, 21, height() - 3, QBrush( colorGroup().light() ) ); + paint->fillRect( 0, 0, 21, height() - 3, TQBrush( colorGroup().light() ) ); paint->drawPixmap( 10 - pixmap.width() / 2, 10 - pixmap.height() / 2, pixmap ); if ( m_showActiveTabText ) { if ( height() < 25 + 4 ) return ; - QPixmap tpixmap( height() - 25 - 3, width() - 2 ); - QPainter painter( &tpixmap ); + TQPixmap tpixmap( height() - 25 - 3, width() - 2 ); + TQPainter painter( &tpixmap ); - painter.fillRect( 0, 0, tpixmap.width(), tpixmap.height(), QBrush( colorGroup().light() ) ); + painter.fillRect( 0, 0, tpixmap.width(), tpixmap.height(), TQBrush( colorGroup().light() ) ); painter.setPen( colorGroup().text() ); - painter.drawText( 0, + width() / 2 + QFontMetrics( QFont() ).height() / 2, m_text ); + painter.drawText( 0, + width() / 2 + TQFontMetrics( TQFont() ).height() / 2, m_text ); paint->rotate( 90 ); kdDebug() << "tpixmap.width:" << tpixmap.width() << endl; @@ -880,22 +880,22 @@ void MultiTabBarTab::drawButtonClassic( QPainter *paint ) } else if ( m_position == MultiTabBar::Top ) { - paint->fillRect( 0, 0, width() - 1, 23, QBrush( colorGroup().light() ) ); + paint->fillRect( 0, 0, width() - 1, 23, TQBrush( colorGroup().light() ) ); paint->drawPixmap( 10 - pixmap.width() / 2, 10 - pixmap.height() / 2, pixmap ); if ( m_showActiveTabText ) { paint->setPen( colorGroup().text() ); - paint->drawText( 25, height() / 2 + QFontMetrics( QFont() ).height() / 2, m_text ); + paint->drawText( 25, height() / 2 + TQFontMetrics( TQFont() ).height() / 2, m_text ); } } else if ( m_position == MultiTabBar::Bottom ) { paint->setPen( colorGroup().shadow() ); paint->drawLine( 0, 23, width() - 1, 23 ); paint->drawLine( 0, 22, width() - 1, 22 ); - paint->fillRect( 0, 0, width() - 1, 21, QBrush( colorGroup().light() ) ); + paint->fillRect( 0, 0, width() - 1, 21, TQBrush( colorGroup().light() ) ); paint->drawPixmap( 10 - pixmap.width() / 2, 10 - pixmap.height() / 2, pixmap ); if ( m_showActiveTabText ) { paint->setPen( colorGroup().text() ); - paint->drawText( 25, height() / 2 + QFontMetrics( QFont() ).height() / 2, m_text ); + paint->drawText( 25, height() / 2 + TQFontMetrics( TQFont() ).height() / 2, m_text ); } } else { @@ -904,19 +904,19 @@ void MultiTabBarTab::drawButtonClassic( QPainter *paint ) paint->setPen( colorGroup().shadow() ); paint->drawLine( 0, height() - 1, 23, height() - 1 ); paint->drawLine( 0, height() - 2, 23, height() - 2 ); - paint->fillRect( 0, 0, 23, height() - 3, QBrush( colorGroup().light() ) ); + paint->fillRect( 0, 0, 23, height() - 3, TQBrush( colorGroup().light() ) ); paint->drawPixmap( 10 - pixmap.width() / 2, 10 - pixmap.height() / 2, pixmap ); if ( m_showActiveTabText ) { if ( height() < 25 + 4 ) return ; - QPixmap tpixmap( height() - 25 - 3, width() - 2 ); - QPainter painter( &tpixmap ); + TQPixmap tpixmap( height() - 25 - 3, width() - 2 ); + TQPainter painter( &tpixmap ); - painter.fillRect( 0, 0, tpixmap.width(), tpixmap.height(), QBrush( colorGroup().light() ) ); + painter.fillRect( 0, 0, tpixmap.width(), tpixmap.height(), TQBrush( colorGroup().light() ) ); painter.setPen( colorGroup().text() ); - painter.drawText( tpixmap.width() - QFontMetrics( QFont() ).width( m_text ), + width() / 2 + QFontMetrics( QFont() ).height() / 2, m_text ); + painter.drawText( tpixmap.width() - TQFontMetrics( TQFont() ).width( m_text ), + width() / 2 + TQFontMetrics( TQFont() ).height() / 2, m_text ); paint->rotate( -90 ); kdDebug() << "tpixmap.width:" << tpixmap.width() << endl; @@ -930,9 +930,9 @@ void MultiTabBarTab::drawButtonClassic( QPainter *paint ) } } -void MultiTabBarTab::drawButtonAmarok(QPainter *paint) +void MultiTabBarTab::drawButtonAmarok(TQPainter *paint) { - QColor fillColor, textColor; + TQColor fillColor, textColor; if (isOn()) { fillColor = blendColors(colorGroup().highlight(), colorGroup().background(), static_cast<int>(m_animCount * 3.5)); @@ -942,10 +942,10 @@ void MultiTabBarTab::drawButtonAmarok(QPainter *paint) textColor = blendColors(colorGroup().text(), colorGroup().highlightedText(), static_cast<int>(m_animCount * 4.5)); } - const QPixmap icon = iconSet()->pixmap(QIconSet::Small, QIconSet::Normal); + const TQPixmap icon = iconSet()->pixmap(TQIconSet::Small, TQIconSet::Normal); // Our pixmap - QPixmap pixmap; + TQPixmap pixmap; if (m_position == MultiTabBar::Left) pixmap.resize(height(), width()); @@ -953,7 +953,7 @@ void MultiTabBarTab::drawButtonAmarok(QPainter *paint) pixmap.resize(width(), height()); pixmap.fill(fillColor); - QPainter painter(&pixmap); + TQPainter painter(&pixmap); // Draw the frame painter.setPen(colorGroup().mid()); @@ -962,15 +962,15 @@ void MultiTabBarTab::drawButtonAmarok(QPainter *paint) painter.drawLine(0, pixmap.height() - 1, pixmap.width() - 1, pixmap.height() - 1); // Draw the text - QFont font; + TQFont font; font.setBold(isOn()); painter.setFont(font); - QString text = KStringHandler::rPixelSqueeze(m_text, QFontMetrics(font), pixmap.width() - icon.width() - 3); + TQString text = KStringHandler::rPixelSqueeze(m_text, TQFontMetrics(font), pixmap.width() - icon.width() - 3); text.replace( "...", ".." ); - const int textX = pixmap.width() / 2 - QFontMetrics( font ).width( text ) / 2; + const int textX = pixmap.width() / 2 - TQFontMetrics( font ).width( text ) / 2; painter.setPen(textColor); - const QRect rect(textX + icon.width() / 2 + 2, 0, pixmap.width(), pixmap.height()); - painter.drawText(rect, Qt::AlignLeft | Qt::AlignVCenter, text); + const TQRect rect(textX + icon.width() / 2 + 2, 0, pixmap.width(), pixmap.height()); + painter.drawText(rect, TQt::AlignLeft | TQt::AlignVCenter, text); // Draw the icon painter.drawPixmap(textX - icon.width() / 2 - 2, pixmap.height() / 2 - icon.height() / 2, icon); @@ -984,7 +984,7 @@ void MultiTabBarTab::drawButtonAmarok(QPainter *paint) } } -QColor MultiTabBarTab::blendColors( const QColor& color1, const QColor& color2, int percent ) +TQColor MultiTabBarTab::blendColors( const TQColor& color1, const TQColor& color2, int percent ) { const float factor1 = ( 100 - ( float ) percent ) / 100; const float factor2 = ( float ) percent / 100; @@ -993,7 +993,7 @@ QColor MultiTabBarTab::blendColors( const QColor& color1, const QColor& color2, const int g = static_cast<int>( color1.green() * factor1 + color2.green() * factor2 ); const int b = static_cast<int>( color1.blue() * factor1 + color2.blue() * factor2 ); - QColor result; + TQColor result; result.setRgb( r, g, b ); return result; @@ -1002,16 +1002,16 @@ QColor MultiTabBarTab::blendColors( const QColor& color1, const QColor& color2, -MultiTabBar::MultiTabBar( MultiTabBarMode bm, QWidget *parent, const char *name ) : QWidget( parent, name ) +MultiTabBar::MultiTabBar( MultiTabBarMode bm, TQWidget *parent, const char *name ) : TQWidget( parent, name ) { m_buttons.setAutoDelete( false ); if ( bm == Vertical ) { - m_l = new QVBoxLayout( this ); - setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Expanding, true ); + m_l = new TQVBoxLayout( this ); + setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Expanding, true ); // setFixedWidth(24); } else { - m_l = new QHBoxLayout( this ); - setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed, true ); + m_l = new TQHBoxLayout( this ); + setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed, true ); // setFixedHeight(24); } m_l->setMargin( 0 ); @@ -1021,11 +1021,11 @@ MultiTabBar::MultiTabBar( MultiTabBarMode bm, QWidget *parent, const char *name setPosition( ( bm == MultiTabBar::Vertical ) ? MultiTabBar::Right : MultiTabBar::Bottom ); setStyle( VSNET ); // setStyle(KDEV3); - //setStyle(KONQSBC); + //setStyle(KONTQSBC); m_l->insertWidget( 0, m_internal ); - m_l->insertWidget( 0, m_btnTabSep = new QFrame( this ) ); + m_l->insertWidget( 0, m_btnTabSep = new TQFrame( this ) ); m_btnTabSep->setFixedHeight( 4 ); - m_btnTabSep->setFrameStyle( QFrame::Panel | QFrame::Sunken ); + m_btnTabSep->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); m_btnTabSep->setLineWidth( 2 ); m_btnTabSep->hide(); @@ -1035,16 +1035,16 @@ MultiTabBar::MultiTabBar( MultiTabBarMode bm, QWidget *parent, const char *name MultiTabBar::~MultiTabBar() {} -/*int MultiTabBar::insertButton(QPixmap pic,int id ,const QString&) +/*int MultiTabBar::insertButton(TQPixmap pic,int id ,const TQString&) { -(new KToolbarButton(pic,id,m_internal))->show(); +(new TDEToolbarButton(pic,id,m_internal))->show(); return 0; }*/ -int MultiTabBar::appendButton( const QPixmap &pic , int id, QPopupMenu *popup, const QString& ) +int MultiTabBar::appendButton( const TQPixmap &pic , int id, TQPopupMenu *popup, const TQString& ) { MultiTabBarButton * btn; - m_buttons.append(btn = new MultiTabBarButton(m_internal, pic, QString::null, popup, id, this, m_position, m_internal->m_style)); + m_buttons.append(btn = new MultiTabBarButton(m_internal, pic, TQString::null, popup, id, this, m_position, m_internal->m_style)); m_l->insertWidget( 0, btn ); btn->show(); @@ -1056,7 +1056,7 @@ int MultiTabBar::appendButton( const QPixmap &pic , int id, QPopupMenu *popup, c void MultiTabBar::updateSeparator() { bool hideSep = true; - for ( QPtrListIterator<MultiTabBarButton> it( m_buttons );it.current();++it ) { + for ( TQPtrListIterator<MultiTabBarButton> it( m_buttons );it.current();++it ) { if ( it.current() ->isVisibleTo( this ) ) { hideSep = false; break; @@ -1067,7 +1067,7 @@ void MultiTabBar::updateSeparator() } -int MultiTabBar::appendTab( const QPixmap &pic , int id , const QString& text ) +int MultiTabBar::appendTab( const TQPixmap &pic , int id , const TQString& text ) { m_internal->appendTab( pic, id, text ); return 0; @@ -1075,7 +1075,7 @@ int MultiTabBar::appendTab( const QPixmap &pic , int id , const QString& text ) MultiTabBarButton* MultiTabBar::button( int id ) const { - for ( QPtrListIterator<MultiTabBarButton> it( m_buttons );it.current();++it ) { + for ( TQPtrListIterator<MultiTabBarButton> it( m_buttons );it.current();++it ) { if ( it.current() ->id() == id ) return it.current(); } return 0; @@ -1140,19 +1140,19 @@ void MultiTabBar::setPosition( MultiTabBarPosition pos ) for ( uint i = 0;i < m_buttons.count();i++ ) m_buttons.at( i ) ->setPosition( pos ); } -void MultiTabBar::fontChange( const QFont& /* oldFont */ ) +void MultiTabBar::fontChange( const TQFont& /* oldFont */ ) { for ( uint i = 0;i < tabs() ->count();i++ ) tabs() ->at( i ) ->resize(); repaint(); } -QPtrList<MultiTabBarTab> *MultiTabBar::tabs() +TQPtrList<MultiTabBarTab> *MultiTabBar::tabs() { return m_internal->tabs(); } -QPtrList<MultiTabBarButton>* MultiTabBar::buttons() +TQPtrList<MultiTabBarButton>* MultiTabBar::buttons() { return & m_buttons; } diff --git a/kftpgrabber/src/widgets/multitabbar.h b/kftpgrabber/src/widgets/multitabbar.h index ece61bf..f5483a8 100644 --- a/kftpgrabber/src/widgets/multitabbar.h +++ b/kftpgrabber/src/widgets/multitabbar.h @@ -38,17 +38,17 @@ #ifndef KFTPWIDGETSMULTITABBAR_H #define KFTPWIDGETSMULTITABBAR_H -#include <qscrollview.h> -#include <qvbox.h> -#include <qhbox.h> -#include <qlayout.h> -#include <qstring.h> -#include <qptrlist.h> -#include <qpushbutton.h> +#include <ntqscrollview.h> +#include <ntqvbox.h> +#include <ntqhbox.h> +#include <ntqlayout.h> +#include <ntqstring.h> +#include <ntqptrlist.h> +#include <ntqpushbutton.h> -class QPixmap; -class QPainter; -class QFrame; +class TQPixmap; +class TQPainter; +class TQFrame; namespace KFTPWidgets { @@ -65,7 +65,7 @@ class MultiTabBarInternal; * * @author Joseph Wenninger */ -class MultiTabBar: public QWidget +class MultiTabBar: public TQWidget { Q_OBJECT friend class MultiTabBarButton; @@ -76,13 +76,13 @@ public: /** * VSNET == Visual Studio .Net like (only show the text of active tabs * KDEV3 == Kdevelop 3 like (always show the text) - * KONQSBC == konqy's classic sidebar style (unthemed), this one is disabled + * KONTQSBC == konqy's classic sidebar style (unthemed), this one is disabled * at the moment, but will be renabled soon too * AMAROK == A nice clean style by the amaroK team */ - enum MultiTabBarStyle { VSNET = 0, KDEV3 = 1, KONQSBC = 2, KDEV3ICON = 3, AMAROK = 4, STYLELAST = 0xffff }; + enum MultiTabBarStyle { VSNET = 0, KDEV3 = 1, KONTQSBC = 2, KDEV3ICON = 3, AMAROK = 4, STYLELAST = 0xffff }; - MultiTabBar(MultiTabBarMode bm, QWidget *parent = 0, const char *name = 0); + MultiTabBar(MultiTabBarMode bm, TQWidget *parent = 0, const char *name = 0); virtual ~MultiTabBar(); /** @@ -95,7 +95,7 @@ public: * @param popup A popup menu which should be displayed if the button is clicked * @param not_used_yet will be used for a popup text in the future */ - int appendButton(const QPixmap &pic, int id = -1, QPopupMenu* popup = 0, const QString& not_used_yet = QString::null); + int appendButton(const TQPixmap &pic, int id = -1, TQPopupMenu* popup = 0, const TQString& not_used_yet = TQString::null); /** * remove a button with the given ID @@ -108,7 +108,7 @@ public: * @param id an arbitrary ID which can be used later on to identify the tab * @param text if a mode with text is used it will be the tab text, otherwise a mouse over hint */ - int appendTab( const QPixmap &pic, int id = -1, const QString& text = QString::null ); + int appendTab( const TQPixmap &pic, int id = -1, const TQString& text = TQString::null ); /** * remove a tab with a given ID @@ -145,24 +145,24 @@ public: /** * be carefull, don't delete tabs yourself and don't delete the list itself */ - QPtrList<MultiTabBarTab>* tabs(); + TQPtrList<MultiTabBarTab>* tabs(); /** * be carefull, don't delete buttons yourself and don't delete the list itself */ - QPtrList<MultiTabBarButton>* buttons(); + TQPtrList<MultiTabBarButton>* buttons(); /** * might vanish, not sure yet */ void showActiveTabTexts( bool show = true ); protected: - virtual void fontChange( const QFont& ); + virtual void fontChange( const TQFont& ); void updateSeparator(); private: class MultiTabBarInternal *m_internal; - QBoxLayout *m_l; - QFrame *m_btnTabSep; - QPtrList<MultiTabBarButton> m_buttons; + TQBoxLayout *m_l; + TQFrame *m_btnTabSep; + TQPtrList<MultiTabBarButton> m_buttons; MultiTabBarPosition m_position; MultiTabBarPrivate *d; }; @@ -170,14 +170,14 @@ private: /** * This class should never be created except with the appendButton call of MultiTabBar */ -class MultiTabBarButton: public QPushButton +class MultiTabBarButton: public TQPushButton { Q_OBJECT public: - MultiTabBarButton(MultiTabBarInternal *tb, const QPixmap& pic, const QString&, QPopupMenu *popup, - int id, QWidget *parent, MultiTabBar::MultiTabBarPosition pos, MultiTabBar::MultiTabBarStyle style); - MultiTabBarButton(MultiTabBarInternal *tb, const QString&, QPopupMenu *popup, - int id, QWidget *parent, MultiTabBar::MultiTabBarPosition pos, MultiTabBar::MultiTabBarStyle style); + MultiTabBarButton(MultiTabBarInternal *tb, const TQPixmap& pic, const TQString&, TQPopupMenu *popup, + int id, TQWidget *parent, MultiTabBar::MultiTabBarPosition pos, MultiTabBar::MultiTabBarStyle style); + MultiTabBarButton(MultiTabBarInternal *tb, const TQString&, TQPopupMenu *popup, + int id, TQWidget *parent, MultiTabBar::MultiTabBarPosition pos, MultiTabBar::MultiTabBarStyle style); virtual ~MultiTabBarButton(); int id() const; @@ -196,9 +196,9 @@ public slots: /** * modify the text of the button */ - void setText( const QString & ); + void setText( const TQString & ); - QSize sizeHint() const; + TQSize sizeHint() const; protected: static const int ANIM_INTERVAL = 18; static const int ANIM_MAX = 20; @@ -208,16 +208,16 @@ protected: MultiTabBar::MultiTabBarPosition m_position; MultiTabBar::MultiTabBarStyle m_style; - QString m_text; + TQString m_text; int m_id; bool m_animEnter; int m_animCount; - class QTimer *m_animTimer; + class TQTimer *m_animTimer; - virtual void hideEvent(class QHideEvent*); - virtual void showEvent(class QShowEvent*); - virtual void enterEvent(class QEvent*); - virtual void leaveEvent(class QEvent*); + virtual void hideEvent(class TQHideEvent*); + virtual void showEvent(class TQShowEvent*); + virtual void enterEvent(class TQEvent*); + virtual void leaveEvent(class TQEvent*); private: MultiTabBarButtonPrivate *d; signals: @@ -239,7 +239,7 @@ class MultiTabBarTab: public MultiTabBarButton Q_OBJECT friend class MultiTabBarInternal; public: - MultiTabBarTab(MultiTabBarInternal *tb, const QPixmap &pic, const QString&, int id, QWidget *parent, + MultiTabBarTab(MultiTabBarInternal *tb, const TQPixmap &pic, const TQString&, int id, TQWidget *parent, MultiTabBar::MultiTabBarPosition pos, MultiTabBar::MultiTabBarStyle style); virtual ~MultiTabBarTab(); /** @@ -262,18 +262,18 @@ protected: void setSize( int ); int neededSize(); void updateState(); - virtual void drawButton( QPainter * ); - virtual void drawButtonLabel( QPainter * ); - void drawButtonStyled( QPainter * ); - void drawButtonClassic( QPainter * ); - void drawButtonAmarok( QPainter * ); - QColor blendColors( const QColor& color1, const QColor& color2, int percent ); + virtual void drawButton( TQPainter * ); + virtual void drawButtonLabel( TQPainter * ); + void drawButtonStyled( TQPainter * ); + void drawButtonClassic( TQPainter * ); + void drawButtonAmarok( TQPainter * ); + TQColor blendColors( const TQColor& color1, const TQColor& color2, int percent ); protected slots: virtual void slotClicked(); void setTabsPosition( MultiTabBar::MultiTabBarPosition ); public slots: - virtual void setIcon( const QString& ); - virtual void setIcon( const QPixmap& ); + virtual void setIcon( const TQString& ); + virtual void setIcon( const TQPixmap& ); }; } diff --git a/kftpgrabber/src/widgets/multitabbar_p.h b/kftpgrabber/src/widgets/multitabbar_p.h index c630f61..39d7d96 100644 --- a/kftpgrabber/src/widgets/multitabbar_p.h +++ b/kftpgrabber/src/widgets/multitabbar_p.h @@ -37,29 +37,29 @@ #ifndef KFTPWIDGETSMULTITABBAR_P_H #define KFTPWIDGETSMULTITABBAR_P_H -#include <qscrollview.h> +#include <ntqscrollview.h> #include "multitabbar.h" namespace KFTPWidgets { -class MultiTabBarInternal : public QScrollView +class MultiTabBarInternal : public TQScrollView { Q_OBJECT friend class MultiTabBar; public: - MultiTabBarInternal(QWidget *parent,MultiTabBar::MultiTabBarMode bm); - int appendTab(const QPixmap &,int=-1,const QString& =QString::null); + MultiTabBarInternal(TQWidget *parent,MultiTabBar::MultiTabBarMode bm); + int appendTab(const TQPixmap &,int=-1,const TQString& =TQString::null); MultiTabBarTab *tab(int) const; void removeTab(int); void setPosition(enum MultiTabBar::MultiTabBarPosition pos); void setStyle(enum MultiTabBar::MultiTabBarStyle style); void showActiveTabTexts(bool show); - QPtrList<MultiTabBarTab>* tabs() { return &m_tabs; } + TQPtrList<MultiTabBarTab>* tabs() { return &m_tabs; } private: - QWidget *box; - QBoxLayout *mainLayout; - QPtrList<MultiTabBarTab> m_tabs; + TQWidget *box; + TQBoxLayout *mainLayout; + TQPtrList<MultiTabBarTab> m_tabs; enum MultiTabBar::MultiTabBarPosition m_position; bool m_showActiveTabTexts; enum MultiTabBar::MultiTabBarStyle m_style; @@ -67,17 +67,17 @@ private: int m_lines; MultiTabBar::MultiTabBarMode m_barMode; protected: - virtual bool eventFilter(QObject *,QEvent*); - virtual void drawContents ( QPainter *, int, int, int, int); + virtual bool eventFilter(TQObject *,TQEvent*); + virtual void drawContents ( TQPainter *, int, int, int, int); /** - * [contentsM|m]ousePressEvent are reimplemented from QScrollView + * [contentsM|m]ousePressEvent are reimplemented from TQScrollView * in order to ignore all mouseEvents on the viewport, so that the * parent can handle them. */ - virtual void contentsMousePressEvent(QMouseEvent *); - virtual void mousePressEvent(QMouseEvent *); - virtual void resizeEvent(QResizeEvent *); + virtual void contentsMousePressEvent(TQMouseEvent *); + virtual void mousePressEvent(TQMouseEvent *); + virtual void resizeEvent(TQResizeEvent *); }; } diff --git a/kftpgrabber/src/widgets/overlaywidget.cpp b/kftpgrabber/src/widgets/overlaywidget.cpp index 58ae387..778a5a9 100644 --- a/kftpgrabber/src/widgets/overlaywidget.cpp +++ b/kftpgrabber/src/widgets/overlaywidget.cpp @@ -36,12 +36,12 @@ */ #include "overlaywidget.h" -#include <qpoint.h> +#include <ntqpoint.h> namespace KFTPWidgets { -OverlayWidget::OverlayWidget(QWidget *parent, QWidget *anchor) - : QFrame(parent->parentWidget()), +OverlayWidget::OverlayWidget(TQWidget *parent, TQWidget *anchor) + : TQFrame(parent->parentWidget()), m_parent(parent), m_anchor(anchor) { @@ -55,16 +55,16 @@ void OverlayWidget::reposition() adjustSize(); // P is in the alignWidget's coordinates - QPoint p; + TQPoint p; p.setX(m_anchor->width() - width()); p.setY(-height()); // Position in the toplevelWidget's coordinates - QPoint pTopLevel = m_anchor->mapTo(topLevelWidget(), p); + TQPoint pTopLevel = m_anchor->mapTo(topLevelWidget(), p); // Position in the widget's parentWidget coordinates - QPoint pParent = parentWidget()->mapFrom(topLevelWidget(), pTopLevel); + TQPoint pParent = parentWidget()->mapFrom(topLevelWidget(), pTopLevel); if (pParent.x() < 0) pParent.rx() = 0; @@ -72,12 +72,12 @@ void OverlayWidget::reposition() move(pParent); } -bool OverlayWidget::event(QEvent *event) +bool OverlayWidget::event(TQEvent *event) { - if (event->type() == QEvent::ChildInserted) + if (event->type() == TQEvent::ChildInserted) adjustSize(); - return QFrame::event(event); + return TQFrame::event(event); } } diff --git a/kftpgrabber/src/widgets/overlaywidget.h b/kftpgrabber/src/widgets/overlaywidget.h index 1140909..c03b2e4 100644 --- a/kftpgrabber/src/widgets/overlaywidget.h +++ b/kftpgrabber/src/widgets/overlaywidget.h @@ -37,22 +37,22 @@ #ifndef KFTPWIDGETSOVERLAYWIDGET_H #define KFTPWIDGETSOVERLAYWIDGET_H -#include <qhbox.h> +#include <ntqhbox.h> namespace KFTPWidgets { /** * @author Max Howell */ -class OverlayWidget : public QFrame { +class OverlayWidget : public TQFrame { public: - OverlayWidget(QWidget *parent, QWidget *anchor); + OverlayWidget(TQWidget *parent, TQWidget *anchor); virtual void reposition(); protected: - virtual bool event(QEvent *event); + virtual bool event(TQEvent *event); private: - QWidget *m_parent; - QWidget *m_anchor; + TQWidget *m_parent; + TQWidget *m_anchor; }; } diff --git a/kftpgrabber/src/widgets/popupmessage.cpp b/kftpgrabber/src/widgets/popupmessage.cpp index 62ee3c8..3f1a6f3 100644 --- a/kftpgrabber/src/widgets/popupmessage.cpp +++ b/kftpgrabber/src/widgets/popupmessage.cpp @@ -41,17 +41,17 @@ #include <kpushbutton.h> #include <kstdguiitem.h> -#include <qfont.h> -#include <qframe.h> -#include <qlabel.h> -#include <qmessagebox.h> -#include <qpainter.h> -#include <qtimer.h> -#include <qtooltip.h> +#include <ntqfont.h> +#include <ntqframe.h> +#include <ntqlabel.h> +#include <ntqmessagebox.h> +#include <ntqpainter.h> +#include <ntqtimer.h> +#include <ntqtooltip.h> namespace KFTPWidgets { -PopupMessage::PopupMessage(QWidget *parent, QWidget *anchor, int timeout) +PopupMessage::PopupMessage(TQWidget *parent, TQWidget *anchor, int timeout) : OverlayWidget(parent, anchor), m_anchor(anchor), m_parent(parent), @@ -64,44 +64,44 @@ PopupMessage::PopupMessage(QWidget *parent, QWidget *anchor, int timeout) m_timeout(timeout), m_showCounter(true) { - setFrameStyle(QFrame::Panel | QFrame::Raised); - setFrameShape(QFrame::StyledPanel); - setWFlags(Qt::WX11BypassWM); + setFrameStyle(TQFrame::Panel | TQFrame::Raised); + setFrameShape(TQFrame::StyledPanel); + setWFlags(TQt::WX11BypassWM); - QPalette p = QToolTip::palette(); + TQPalette p = TQToolTip::palette(); setPalette(p); - QHBoxLayout *hbox; - QLabel *label; + TQHBoxLayout *hbox; + TQLabel *label; KActiveLabel *alabel; - m_layout = new QVBoxLayout(this, 9, 6); - hbox = new QHBoxLayout(m_layout, 12); + m_layout = new TQVBoxLayout(this, 9, 6); + hbox = new TQHBoxLayout(m_layout, 12); - hbox->addWidget(m_countdownFrame = new QFrame(this, "counterVisual")); + hbox->addWidget(m_countdownFrame = new TQFrame(this, "counterVisual")); m_countdownFrame->setFixedWidth(fontMetrics().width("X")); - m_countdownFrame->setFrameStyle(QFrame::Plain | QFrame::Box); + m_countdownFrame->setFrameStyle(TQFrame::Plain | TQFrame::Box); m_countdownFrame->setPaletteForegroundColor(paletteBackgroundColor().dark()); - label = new QLabel(this, "image"); + label = new TQLabel(this, "image"); hbox->add(label); alabel = new KActiveLabel(this, "label"); - alabel->setTextFormat(Qt::RichText); - alabel->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred); + alabel->setTextFormat(TQt::RichText); + alabel->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred); alabel->setPalette(p); hbox->add(alabel); - hbox = new QHBoxLayout(m_layout); + hbox = new TQHBoxLayout(m_layout); - hbox->addItem(new QSpacerItem(4, 4, QSizePolicy::Expanding, QSizePolicy::Preferred)); + hbox->addItem(new TQSpacerItem(4, 4, TQSizePolicy::Expanding, TQSizePolicy::Preferred)); hbox->add(new KPushButton(KStdGuiItem::close(), this, "closeButton")); connect(child("closeButton"), SIGNAL(clicked()), SLOT(close())); } -void PopupMessage::addWidget(QWidget *widget) +void PopupMessage::addWidget(TQWidget *widget) { m_layout->add(widget); adjustSize(); @@ -116,25 +116,25 @@ void PopupMessage::setShowCloseButton(bool show) void PopupMessage::setShowCounter(bool show) { m_showCounter = show; - static_cast<QFrame*>(child("counterVisual"))->setShown(show); + static_cast<TQFrame*>(child("counterVisual"))->setShown(show); adjustSize(); } -void PopupMessage::setText(const QString &text) +void PopupMessage::setText(const TQString &text) { static_cast<KActiveLabel*>(child("label"))->setText(text); adjustSize(); } -void PopupMessage::setImage(const QString &location) +void PopupMessage::setImage(const TQString &location) { - static_cast<QLabel*>(child("image"))->setPixmap(QPixmap(location)); + static_cast<TQLabel*>(child("image"))->setPixmap(TQPixmap(location)); adjustSize(); } -void PopupMessage::setImage(const QPixmap &pix) +void PopupMessage::setImage(const TQPixmap &pix) { - static_cast<QLabel*>(child("image"))->setPixmap(pix); + static_cast<TQLabel*>(child("image"))->setPixmap(pix); adjustSize(); } @@ -161,7 +161,7 @@ void PopupMessage::display() show(); } -void PopupMessage::timerEvent(QTimerEvent*) +void PopupMessage::timerEvent(TQTimerEvent*) { switch(m_maskEffect) { case Plain: plainMask(); break; @@ -177,10 +177,10 @@ void PopupMessage::countDown() return; } - QFrame *&h = m_countdownFrame; + TQFrame *&h = m_countdownFrame; if (m_counter < h->height() - 3) - QPainter(h).fillRect(2, 2, h->width() - 4, m_counter, palette().active().highlight()); + TQPainter(h).fillRect(2, 2, h->width() - 4, m_counter, palette().active().highlight()); if (!hasMouse()) m_counter++; @@ -199,18 +199,18 @@ void PopupMessage::dissolveMask() { if (m_stage == 1) { repaint(false); - QPainter maskPainter(&m_mask); + TQPainter maskPainter(&m_mask); - m_mask.fill(Qt::black); + m_mask.fill(TQt::black); - maskPainter.setBrush(Qt::white); - maskPainter.setPen(Qt::white); + maskPainter.setBrush(TQt::white); + maskPainter.setPen(TQt::white); maskPainter.drawRect(m_mask.rect()); m_dissolveSize += m_dissolveDelta; if (m_dissolveSize > 0) { - maskPainter.setRasterOp(Qt::EraseROP); + maskPainter.setRasterOp(TQt::EraseROP); int x, y, s; const int size = 16; diff --git a/kftpgrabber/src/widgets/popupmessage.h b/kftpgrabber/src/widgets/popupmessage.h index 0550d41..a22b6b8 100644 --- a/kftpgrabber/src/widgets/popupmessage.h +++ b/kftpgrabber/src/widgets/popupmessage.h @@ -40,9 +40,9 @@ #include "overlaywidget.h" -#include <qbitmap.h> -#include <qlayout.h> -#include <qpixmap.h> +#include <ntqbitmap.h> +#include <ntqlayout.h> +#include <ntqpixmap.h> namespace KFTPWidgets { @@ -68,32 +68,32 @@ public: * @param anchor Which widget to tie the popup widget to * @param timeout How long to wait before auto closing */ - PopupMessage(QWidget *parent, QWidget *anchor, int timeout = 5000); + PopupMessage(TQWidget *parent, TQWidget *anchor, int timeout = 5000); - void addWidget(QWidget *widget); + void addWidget(TQWidget *widget); void setShowCloseButton(bool show); void setShowCounter(bool show); - void setImage(const QString &location); - void setImage(const QPixmap &pixmap); + void setImage(const TQString &location); + void setImage(const TQPixmap &pixmap); void setMaskEffect(MaskEffect type) { m_maskEffect = type; } - void setText(const QString &text); + void setText(const TQString &text); void setTimeout(int timeout) { m_timeout = timeout; } public slots: void close(); void display(); protected: - void timerEvent(QTimerEvent *event); + void timerEvent(TQTimerEvent *event); void countDown(); void dissolveMask(); void plainMask(); void slideMask(); private: - QVBoxLayout *m_layout; - QFrame *m_countdownFrame; - QWidget *m_anchor; - QWidget *m_parent; - QBitmap m_mask; + TQVBoxLayout *m_layout; + TQFrame *m_countdownFrame; + TQWidget *m_anchor; + TQWidget *m_parent; + TQBitmap m_mask; MaskEffect m_maskEffect; int m_dissolveSize; diff --git a/kftpgrabber/src/widgets/queueview/queueeditor.cpp b/kftpgrabber/src/widgets/queueview/queueeditor.cpp index c565165..38748e9 100644 --- a/kftpgrabber/src/widgets/queueview/queueeditor.cpp +++ b/kftpgrabber/src/widgets/queueview/queueeditor.cpp @@ -41,34 +41,34 @@ #include <klineedit.h> #include <kpassdlg.h> #include <kcombobox.h> -#include <klocale.h> +#include <tdelocale.h> -#include <qspinbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qtabwidget.h> +#include <ntqspinbox.h> +#include <ntqlabel.h> +#include <ntqlayout.h> +#include <ntqtabwidget.h> #define REMOTE_PROTOCOL m_transfer->getSourceUrl().isLocalFile() ? m_transfer->getDestUrl().protocol() : m_transfer->getSourceUrl().protocol() namespace KFTPWidgets { -QueueEditor::QueueEditor(QWidget *parent, const char *name) +QueueEditor::QueueEditor(TQWidget *parent, const char *name) : KDialogBase(parent, name, true, "Edit queue", KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true) { m_layout = new KFTPQueueEditorLayout(this); setMainWidget(m_layout); - connect(m_layout->srcPath, SIGNAL(textChanged(const QString&)), this, SLOT(slotTextChanged())); - connect(m_layout->dstPath, SIGNAL(textChanged(const QString&)), this, SLOT(slotTextChanged())); + connect(m_layout->srcPath, SIGNAL(textChanged(const TQString&)), this, SLOT(slotTextChanged())); + connect(m_layout->dstPath, SIGNAL(textChanged(const TQString&)), this, SLOT(slotTextChanged())); - connect(m_layout->srcHost, SIGNAL(textChanged(const QString&)), this, SLOT(slotTextChanged())); - connect(m_layout->srcUser, SIGNAL(textChanged(const QString&)), this, SLOT(slotTextChanged())); - connect(m_layout->srcPass, SIGNAL(textChanged(const QString&)), this, SLOT(slotTextChanged())); + connect(m_layout->srcHost, SIGNAL(textChanged(const TQString&)), this, SLOT(slotTextChanged())); + connect(m_layout->srcUser, SIGNAL(textChanged(const TQString&)), this, SLOT(slotTextChanged())); + connect(m_layout->srcPass, SIGNAL(textChanged(const TQString&)), this, SLOT(slotTextChanged())); - connect(m_layout->dstHost, SIGNAL(textChanged(const QString&)), this, SLOT(slotTextChanged())); - connect(m_layout->dstUser, SIGNAL(textChanged(const QString&)), this, SLOT(slotTextChanged())); - connect(m_layout->dstPass, SIGNAL(textChanged(const QString&)), this, SLOT(slotTextChanged())); + connect(m_layout->dstHost, SIGNAL(textChanged(const TQString&)), this, SLOT(slotTextChanged())); + connect(m_layout->dstUser, SIGNAL(textChanged(const TQString&)), this, SLOT(slotTextChanged())); + connect(m_layout->dstPass, SIGNAL(textChanged(const TQString&)), this, SLOT(slotTextChanged())); connect(m_layout->srcName, SIGNAL(siteChanged(KFTPBookmarks::Site*)), this, SLOT(slotSourceSiteChanged(KFTPBookmarks::Site*))); connect(m_layout->dstName, SIGNAL(siteChanged(KFTPBookmarks::Site*)), this, SLOT(slotDestSiteChanged(KFTPBookmarks::Site*))); @@ -76,7 +76,7 @@ QueueEditor::QueueEditor(QWidget *parent, const char *name) connect(m_layout->transferType, SIGNAL(activated(int)), this, SLOT(slotTransferModeChanged(int))); setMaximumHeight(250); - setInitialSize(QSize(500, 250)); + setInitialSize(TQSize(500, 250)); enableButtonOK(false); } @@ -225,7 +225,7 @@ void QueueEditor::saveData() sUrl.setPass(m_layout->srcPass->password()); if (m_transfer->getSourceUrl().pass().isEmpty() && sUrl.pass().isEmpty()) - sUrl.setPass(QString::null); + sUrl.setPass(TQString::null); } else { sUrl.setProtocol("file"); } @@ -240,7 +240,7 @@ void QueueEditor::saveData() dUrl.setPass(m_layout->dstPass->password()); if (m_transfer->getDestUrl().pass().isEmpty() && dUrl.pass().isEmpty()) - dUrl.setPass(QString::null); + dUrl.setPass(TQString::null); } else { dUrl.setProtocol("file"); } @@ -260,7 +260,7 @@ void QueueEditor::saveData() void QueueEditor::recursiveSaveData(KFTPQueue::TransferDir *parent, const KURL &srcUrl, const KURL &dstUrl) { KFTPQueue::QueueObject *o; - QPtrList<KFTPQueue::QueueObject> children = parent->getChildrenList(); + TQPtrList<KFTPQueue::QueueObject> children = parent->getChildrenList(); KURL sUrl, dUrl; diff --git a/kftpgrabber/src/widgets/queueview/queueeditor.h b/kftpgrabber/src/widgets/queueview/queueeditor.h index 09027d6..9daf317 100644 --- a/kftpgrabber/src/widgets/queueview/queueeditor.h +++ b/kftpgrabber/src/widgets/queueview/queueeditor.h @@ -40,7 +40,7 @@ #include "kftpbookmarks.h" #include <kdialogbase.h> -#include <qdom.h> +#include <ntqdom.h> class KFTPQueueEditorLayout; @@ -53,7 +53,7 @@ class QueueEditor : public KDialogBase { Q_OBJECT public: - QueueEditor(QWidget *parent = 0, const char *name = 0); + QueueEditor(TQWidget *parent = 0, const char *name = 0); void setData(KFTPQueue::Transfer *transfer); void saveData(); diff --git a/kftpgrabber/src/widgets/queueview/queueview.cpp b/kftpgrabber/src/widgets/queueview/queueview.cpp index 4fc8e5f..e0249e4 100644 --- a/kftpgrabber/src/widgets/queueview/queueview.cpp +++ b/kftpgrabber/src/widgets/queueview/queueview.cpp @@ -44,27 +44,27 @@ #include "widgets/searchdialog.h" #include "misc/config.h" -#include <kapplication.h> -#include <kfiledialog.h> +#include <tdeapplication.h> +#include <tdefiledialog.h> #include <kiconloader.h> -#include <kio/job.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdeio/job.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kmimetype.h> -#include <kpopupmenu.h> -#include <klistviewsearchline.h> +#include <tdepopupmenu.h> +#include <tdelistviewsearchline.h> #include <kdebug.h> -#include <qspinbox.h> -#include <qtooltip.h> +#include <ntqspinbox.h> +#include <ntqtooltip.h> using namespace KFTPGrabberBase; using namespace KFTPCore; namespace KFTPWidgets { -QueueViewItem::QueueViewItem(QueueView *view, KFTPQueue::QueueObject *object, QListView *parent) - : QListViewItem(parent), +QueueViewItem::QueueViewItem(QueueView *view, KFTPQueue::QueueObject *object, TQListView *parent) + : TQListViewItem(parent), m_lastChild(0), m_queueObject(object), m_queueView(view), @@ -73,8 +73,8 @@ QueueViewItem::QueueViewItem(QueueView *view, KFTPQueue::QueueObject *object, QL init(); } -QueueViewItem::QueueViewItem(QueueView *view, KFTPQueue::QueueObject *object, QListViewItem *parent) - : QListViewItem(parent, static_cast<QueueViewItem*>(parent)->lastChild()), +QueueViewItem::QueueViewItem(QueueView *view, KFTPQueue::QueueObject *object, TQListViewItem *parent) + : TQListViewItem(parent, static_cast<QueueViewItem*>(parent)->lastChild()), m_lastChild(0), m_queueObject(object), m_queueView(view), @@ -88,16 +88,16 @@ QueueViewItem::~QueueViewItem() m_queueView->m_queuedItems.remove(m_queueId); } -void QueueViewItem::insertItem(QListViewItem *newChild) +void QueueViewItem::insertItem(TQListViewItem *newChild) { - QListViewItem::insertItem(newChild); + TQListViewItem::insertItem(newChild); m_lastChild = newChild; } -void QueueViewItem::takeItem(QListViewItem *item) +void QueueViewItem::takeItem(TQListViewItem *item) { if (item == m_lastChild) { - QListViewItem *above = item->itemAbove(); + TQListViewItem *above = item->itemAbove(); if (above->parent() == m_lastChild->parent()) m_lastChild = above; @@ -105,18 +105,18 @@ void QueueViewItem::takeItem(QListViewItem *item) m_lastChild = 0; } - QListViewItem::takeItem(item); + TQListViewItem::takeItem(item); } void QueueViewItem::moveUp() { - QListViewItem *above = itemAbove(); + TQListViewItem *above = itemAbove(); - if (above && above->parent() == QListViewItem::parent()) { - QListViewItem *previous = above->itemAbove(); + if (above && above->parent() == TQListViewItem::parent()) { + TQListViewItem *previous = above->itemAbove(); - if (previous && previous->parent() == QListViewItem::parent()) { - QueueViewItem *parent = static_cast<QueueViewItem*>(QListViewItem::parent()); + if (previous && previous->parent() == TQListViewItem::parent()) { + QueueViewItem *parent = static_cast<QueueViewItem*>(TQListViewItem::parent()); moveItem(previous); if (parent && this == parent->lastChild()) @@ -129,7 +129,7 @@ void QueueViewItem::moveUp() void QueueViewItem::moveDown() { - QueueViewItem *parent = static_cast<QueueViewItem*>(QListViewItem::parent()); + QueueViewItem *parent = static_cast<QueueViewItem*>(TQListViewItem::parent()); QueueViewItem *next = static_cast<QueueViewItem*>(nextSibling()); if (next) { @@ -142,29 +142,29 @@ void QueueViewItem::moveDown() void QueueViewItem::moveToTop() { - QueueViewItem *parent = static_cast<QueueViewItem*>(QListViewItem::parent()); + QueueViewItem *parent = static_cast<QueueViewItem*>(TQListViewItem::parent()); // Just reinsert the item if (parent) { if (this == parent->lastChild()) parent->m_lastChild = itemAbove(); - parent->QListViewItem::takeItem(this); - parent->QListViewItem::insertItem(this); + parent->TQListViewItem::takeItem(this); + parent->TQListViewItem::insertItem(this); } else { ListView *view = m_queueView->m_queue; - view->QListView::takeItem(this); - view->QListView::insertItem(this); + view->TQListView::takeItem(this); + view->TQListView::insertItem(this); } } void QueueViewItem::moveToBottom() { - QueueViewItem *parent = static_cast<QueueViewItem*>(QListViewItem::parent()); + QueueViewItem *parent = static_cast<QueueViewItem*>(TQListViewItem::parent()); // Just reinsert the item if (parent) { - QListViewItem *last = parent->lastChild(); + TQListViewItem *last = parent->lastChild(); parent->takeItem(this); parent->insertItem(this); @@ -176,12 +176,12 @@ void QueueViewItem::moveToBottom() } } -void QueueViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int alignment) +void QueueViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) { - QColorGroup _cg(cg); - QColor c = _cg.text(); + TQColorGroup _cg(cg); + TQColor c = _cg.text(); - QColor n_color; + TQColor n_color; if (m_queueObject && m_queueObject->isTransfer()) { switch (m_queueObject->getStatus()) { @@ -194,10 +194,10 @@ void QueueViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, in } if (n_color.isValid()) - _cg.setColor(QColorGroup::Text, n_color); + _cg.setColor(TQColorGroup::Text, n_color); - QListViewItem::paintCell(p, _cg, column, width, alignment); - _cg.setColor(QColorGroup::Text, c); + TQListViewItem::paintCell(p, _cg, column, width, alignment); + _cg.setColor(TQColorGroup::Text, c); } void QueueViewItem::init() @@ -206,25 +206,25 @@ void QueueViewItem::init() KFTPQueue::Transfer *transfer = static_cast<KFTPQueue::Transfer*>(getObject()); setText(0, transfer->getSourceUrl().fileName()); - setText(1, KIO::convertSize(transfer->getActualSize())); + setText(1, TDEIO::convertSize(transfer->getActualSize())); setText(2, transfer->getSourceUrl().pathOrURL()); setText(3, transfer->getDestUrl().pathOrURL()); // Icon - QString iconText; + TQString iconText; if (transfer->isDir()) { iconText = "folder"; } else { KMimeType::Ptr theType = KMimeType::findByURL("/" + transfer->getSourceUrl().path(), 0, false, true); - iconText = theType->icon(QString::null, false); + iconText = theType->icon(TQString::null, false); } setPixmap(0, loadSmallPixmap(iconText)); } else if (m_queueObject->getType() == KFTPQueue::QueueObject::Site) { KFTPQueue::Site *site = static_cast<KFTPQueue::Site*>(getObject()); - setText(0, QString("%1:%2").arg(site->getUrl().host()).arg(site->getUrl().port())); - setText(1, KIO::convertSize(site->getActualSize())); + setText(0, TQString("%1:%2").arg(site->getUrl().host()).arg(site->getUrl().port())); + setText(1, TDEIO::convertSize(site->getActualSize())); // Set the pixmap setPixmap(0, loadSmallPixmap("server")); @@ -241,7 +241,7 @@ void QueueViewItem::refresh() // Speed bool noSpeed = transfer->getStatus() == KFTPQueue::Transfer::Waiting || transfer->getStatus() == KFTPQueue::Transfer::Connecting; - QString speed; + TQString speed; if ((!transfer->isDir() || !isOpen()) && transfer->isRunning() && !noSpeed) { speed.sprintf( "%lld B/s", (transfer->getSpeed()) ); @@ -259,19 +259,19 @@ void QueueViewItem::refresh() } // ETA - QString eta; + TQString eta; if (transfer->isRunning() && transfer->getSpeed() > 0) { - eta = KIO::convertSeconds(KIO::calculateRemainingSeconds(transfer->getSize(), + eta = TDEIO::convertSeconds(TDEIO::calculateRemainingSeconds(transfer->getSize(), transfer->getCompleted(), transfer->getSpeed())); } else { - eta = QString::null; + eta = TQString::null; } // Set the columns setText(0, transfer->getSourceUrl().fileName()); - setText(1, KIO::convertSize(transfer->getActualSize())); + setText(1, TDEIO::convertSize(transfer->getActualSize())); setText(2, transfer->getSourceUrl().pathOrURL()); setText(3, transfer->getDestUrl().pathOrURL()); setText(5, speed); @@ -309,21 +309,21 @@ void QueueViewItem::refresh() } else if (progress > 0) { setPixmap(4, createProgressPixmap(progress, r_progress)); - QString progressText; + TQString progressText; progressText.sprintf("%d %%", progress); setText(4, progressText); } else { setPixmap(4, NULL); - setText(4, QString::null); + setText(4, TQString::null); } // Icon - QString iconText; + TQString iconText; if (transfer->isDir()) { iconText = "folder"; } else { KMimeType::Ptr theType = KMimeType::findByURL("/" + transfer->getSourceUrl().path(), 0, false, true); - iconText = theType->icon(QString::null, false); + iconText = theType->icon(TQString::null, false); } setPixmap(0, loadSmallPixmap(iconText)); @@ -331,7 +331,7 @@ void QueueViewItem::refresh() KFTPQueue::Site *site = static_cast<KFTPQueue::Site*>(getObject()); // Speed - QString speed; + TQString speed; speed.sprintf( "%lld B/s", (site->getSpeed()) ); if (site->getSpeed() > 1024) @@ -341,13 +341,13 @@ void QueueViewItem::refresh() speed.sprintf("%lld MB/s", (site->getSpeed() / 1024) / 1024); if (site->getSpeed() == 0) - speed = QString::null; + speed = TQString::null; // ETA - QString eta; + TQString eta; if (site->isRunning() && site->getSpeed() > 0) { - eta = KIO::convertSeconds(KIO::calculateRemainingSeconds(site->getSize(), + eta = TDEIO::convertSeconds(TDEIO::calculateRemainingSeconds(site->getSize(), site->getCompleted(), site->getSpeed())); } else { @@ -363,17 +363,17 @@ void QueueViewItem::refresh() setPixmap(4, createProgressPixmap(progress, 0)); - QString progressText; + TQString progressText; progressText.sprintf("%d %%", progress); setText(4, progressText); } else { setPixmap(4, NULL); - setText(4, QString::null); + setText(4, TQString::null); } // Set the columns - setText(0, QString("%1:%2").arg(site->getUrl().host()).arg(site->getUrl().port())); - setText(1, KIO::convertSize(site->getActualSize())); + setText(0, TQString("%1:%2").arg(site->getUrl().host()).arg(site->getUrl().port())); + setText(1, TDEIO::convertSize(site->getActualSize())); setText(5, speed); setText(6, eta); @@ -382,46 +382,46 @@ void QueueViewItem::refresh() } } -QueueListView::QueueListView(QWidget *parent) +QueueListView::QueueListView(TQWidget *parent) : ListView(parent) { } -void QueueListView::insertItem(QListViewItem *item) +void QueueListView::insertItem(TQListViewItem *item) { - QListViewItem *last = lastChild(); - QListView::insertItem(item); + TQListViewItem *last = lastChild(); + TQListView::insertItem(item); if (last) item->moveItem(last); } -QueueView::QueueView(QWidget *parent, const char *name) - : QWidget(parent, name) +QueueView::QueueView(TQWidget *parent, const char *name) + : TQWidget(parent, name) { - QVBoxLayout *layout = new QVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); - m_toolBar = new KToolBar(this, "queueToolBar"); + m_toolBar = new TDEToolBar(this, "queueToolBar"); m_toolBar->setIconSize(16); layout->addWidget(m_toolBar); - m_searchToolBar = new KToolBar(this, "searchToolBar"); + m_searchToolBar = new TDEToolBar(this, "searchToolBar"); m_searchToolBar->setEnableContextMenu(false); m_searchToolBar->setMovingEnabled(false); m_searchToolBar->setFullSize(true); // Create the erase button - m_searchToolBar->insertButton(QApplication::reverseLayout() ? "clear_left" :"locationbar_erase", 0, SIGNAL(clicked()), this, SLOT(slotSearchEraseClicked()), true); + m_searchToolBar->insertButton(TQApplication::reverseLayout() ? "clear_left" :"locationbar_erase", 0, SIGNAL(clicked()), this, SLOT(slotSearchEraseClicked()), true); // Create the labels - QLabel *searchLabel = new QLabel(i18n("Filter: "), m_searchToolBar); + TQLabel *searchLabel = new TQLabel(i18n("Filter: "), m_searchToolBar); m_searchToolBar->insertWidget(1, 35, searchLabel); // Create the list view m_queue = new QueueListView(this); // Create the search field - m_searchField = new KListViewSearchLine(m_searchToolBar, m_queue); + m_searchField = new TDEListViewSearchLine(m_searchToolBar, m_queue); // Do some more stuff m_searchToolBar->setItemAutoSized(1, true); @@ -444,17 +444,17 @@ QueueView::QueueView(QWidget *parent, const char *name) m_queue->setEmptyListText(i18n("You do not have any files in the queue.")); // Multi-select - m_queue->setSelectionModeExt(KListView::FileManager); + m_queue->setSelectionModeExt(TDEListView::FileManager); m_queue->setAllColumnsShowFocus(true); m_queue->setRootIsDecorated(true); - m_queue->QListView::setSorting(-1); - m_queue->QListView::setSortColumn(-1); + m_queue->TQListView::setSorting(-1); + m_queue->TQListView::setSortColumn(-1); layout->addWidget(m_queue); // The signals - connect(m_queue, SIGNAL(contextMenu(KListView*, QListViewItem*, const QPoint&)), this, - SLOT(contextMenuRequested(KListView*, QListViewItem*, const QPoint&))); + connect(m_queue, SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), this, + SLOT(contextMenuRequested(TDEListView*, TQListViewItem*, const TQPoint&))); connect(m_queue, SIGNAL(selectionChanged()), this, SLOT(updateActions())); // Let us be up-to-date @@ -504,18 +504,18 @@ void QueueView::initToolBar() // Create speed control widgets m_toolBar->insertSeparator(); - QSpinBox *downloadSpeed = new QSpinBox(0, 10240, 1, m_toolBar); - QToolTip::add(downloadSpeed, i18n("Limit download transfer speed")); - m_toolBar->insertWidget(1, 35, new QLabel(i18n("Down: "), m_toolBar)); + TQSpinBox *downloadSpeed = new TQSpinBox(0, 10240, 1, m_toolBar); + TQToolTip::add(downloadSpeed, i18n("Limit download transfer speed")); + m_toolBar->insertWidget(1, 35, new TQLabel(i18n("Down: "), m_toolBar)); m_toolBar->insertWidget(2, 35, downloadSpeed); downloadSpeed->setValue(Config::downloadSpeedLimit()); connect(downloadSpeed, SIGNAL(valueChanged(int)), this, SLOT(slotDownloadLimitChanged(int))); m_toolBar->insertSeparator(); - QSpinBox *uploadSpeed = new QSpinBox(0, 10240, 1, m_toolBar); - QToolTip::add(uploadSpeed, i18n("Limit upload transfer speed")); - m_toolBar->insertWidget(3, 35, new QLabel(i18n("Up: "), m_toolBar)); + TQSpinBox *uploadSpeed = new TQSpinBox(0, 10240, 1, m_toolBar); + TQToolTip::add(uploadSpeed, i18n("Limit upload transfer speed")); + m_toolBar->insertWidget(3, 35, new TQLabel(i18n("Up: "), m_toolBar)); m_toolBar->insertWidget(4, 35, uploadSpeed); uploadSpeed->setValue(Config::uploadSpeedLimit()); connect(uploadSpeed, SIGNAL(valueChanged(int)), this, SLOT(slotUploadLimitChanged(int))); @@ -523,9 +523,9 @@ void QueueView::initToolBar() // Create thread count control widget m_toolBar->insertSeparator(); - QSpinBox *threadCount = new QSpinBox(1, 10, 1, m_toolBar); - QToolTip::add(threadCount, i18n("Per-session transfer thread count")); - m_toolBar->insertWidget(5, 35, new QLabel(i18n("Threads: "), m_toolBar)); + TQSpinBox *threadCount = new TQSpinBox(1, 10, 1, m_toolBar); + TQToolTip::add(threadCount, i18n("Per-session transfer thread count")); + m_toolBar->insertWidget(5, 35, new TQLabel(i18n("Threads: "), m_toolBar)); m_toolBar->insertWidget(6, 35, threadCount); threadCount->setValue(Config::threadCount()); connect(threadCount, SIGNAL(valueChanged(int)), this, SLOT(slotThreadCountChanged(int))); @@ -551,28 +551,28 @@ void QueueView::slotThreadCountChanged(int value) void QueueView::initActions() { - m_actionCollection = new KActionCollection(this, this); + m_actionCollection = new TDEActionCollection(this, this); // Create all the actions - m_launchAction = new KAction(i18n("&Start Transfer"), "launch", KShortcut(), this, SLOT(slotLaunch()), m_actionCollection, "launch"); - m_abortAction = new KAction(i18n("&Abort Transfer"), KShortcut(), this, SLOT(slotAbort()), m_actionCollection, "abort"); - m_removeAction = new KAction(i18n("&Remove"), "editdelete", KShortcut(Qt::Key_Delete), this, SLOT(slotRemove()), m_actionCollection, "remove"); - m_removeAllAction = new KAction(i18n("Remove &All"), KShortcut(), this, SLOT(slotRemoveAll()), m_actionCollection, "removeAll"); - m_moveUpAction = new KAction(i18n("Move &Up"), "up", KShortcut(), this, SLOT(slotMoveUp()), m_actionCollection, "moveUp"); - m_moveDownAction = new KAction(i18n("Move &Down"), "down", KShortcut("del"), this, SLOT(slotMoveDown()), m_actionCollection, "moveDown"); - m_moveTopAction = new KAction(i18n("Move To &Top"), "top", KShortcut(), this, SLOT(slotMoveTop()), m_actionCollection, "moveTop"); - m_moveBottomAction = new KAction(i18n("Move To &Bottom"), "bottom", KShortcut(), this, SLOT(slotMoveBottom()), m_actionCollection, "moveBottom"); - m_editAction = new KAction(i18n("&Change Transfer Info"), KShortcut(), this, SLOT(slotEdit()), m_actionCollection, "changeTransfer"); + m_launchAction = new TDEAction(i18n("&Start Transfer"), "launch", TDEShortcut(), this, SLOT(slotLaunch()), m_actionCollection, "launch"); + m_abortAction = new TDEAction(i18n("&Abort Transfer"), TDEShortcut(), this, SLOT(slotAbort()), m_actionCollection, "abort"); + m_removeAction = new TDEAction(i18n("&Remove"), "editdelete", TDEShortcut(TQt::Key_Delete), this, SLOT(slotRemove()), m_actionCollection, "remove"); + m_removeAllAction = new TDEAction(i18n("Remove &All"), TDEShortcut(), this, SLOT(slotRemoveAll()), m_actionCollection, "removeAll"); + m_moveUpAction = new TDEAction(i18n("Move &Up"), "up", TDEShortcut(), this, SLOT(slotMoveUp()), m_actionCollection, "moveUp"); + m_moveDownAction = new TDEAction(i18n("Move &Down"), "down", TDEShortcut("del"), this, SLOT(slotMoveDown()), m_actionCollection, "moveDown"); + m_moveTopAction = new TDEAction(i18n("Move To &Top"), "top", TDEShortcut(), this, SLOT(slotMoveTop()), m_actionCollection, "moveTop"); + m_moveBottomAction = new TDEAction(i18n("Move To &Bottom"), "bottom", TDEShortcut(), this, SLOT(slotMoveBottom()), m_actionCollection, "moveBottom"); + m_editAction = new TDEAction(i18n("&Change Transfer Info"), TDEShortcut(), this, SLOT(slotEdit()), m_actionCollection, "changeTransfer"); // Create the toolbar actions - m_loadAction = new KAction(i18n("&Load Queue From File"), "fileopen", KShortcut(), this, SLOT(slotLoad()), m_actionCollection, "load"); - m_saveAction = new KAction(i18n("&Save Queue to File"), "filesaveas", KShortcut(), this, SLOT(slotSave()), m_actionCollection, "save"); - m_startAction = new KAction(i18n("S&tart"), "player_play", KShortcut(), this, SLOT(slotStart()), m_actionCollection, "start"); - m_pauseAction = new KAction(i18n("&Pause"), "player_pause", KShortcut(), this, SLOT(slotPause()), m_actionCollection, "pause"); - m_stopAction = new KAction(i18n("St&op"), "player_stop", KShortcut(), this, SLOT(slotStop()), m_actionCollection, "stop"); - m_addAction = new KAction(i18n("&Add Transfer..."), "filenew", KShortcut(), this, SLOT(slotAdd()), m_actionCollection, "add"); - m_searchAction = new KAction(i18n("&Search && Replace..."), "find", KShortcut(), this, SLOT(slotSearch()), m_actionCollection, "search"); - m_filterAction = new KToggleAction(i18n("Show &Filter"), "filter", KShortcut(), this, SLOT(slotFilter()), m_actionCollection, "filter"); + m_loadAction = new TDEAction(i18n("&Load Queue From File"), "fileopen", TDEShortcut(), this, SLOT(slotLoad()), m_actionCollection, "load"); + m_saveAction = new TDEAction(i18n("&Save Queue to File"), "filesaveas", TDEShortcut(), this, SLOT(slotSave()), m_actionCollection, "save"); + m_startAction = new TDEAction(i18n("S&tart"), "player_play", TDEShortcut(), this, SLOT(slotStart()), m_actionCollection, "start"); + m_pauseAction = new TDEAction(i18n("&Pause"), "player_pause", TDEShortcut(), this, SLOT(slotPause()), m_actionCollection, "pause"); + m_stopAction = new TDEAction(i18n("St&op"), "player_stop", TDEShortcut(), this, SLOT(slotStop()), m_actionCollection, "stop"); + m_addAction = new TDEAction(i18n("&Add Transfer..."), "filenew", TDEShortcut(), this, SLOT(slotAdd()), m_actionCollection, "add"); + m_searchAction = new TDEAction(i18n("&Search && Replace..."), "find", TDEShortcut(), this, SLOT(slotSearch()), m_actionCollection, "search"); + m_filterAction = new TDEToggleAction(i18n("Show &Filter"), "filter", TDEShortcut(), this, SLOT(slotFilter()), m_actionCollection, "filter"); m_saveAction->setEnabled( false ); m_startAction->setEnabled(false); @@ -590,7 +590,7 @@ void QueueView::updateActions() m_stopAction->setEnabled(KFTPQueue::Manager::self()->isProcessing()); m_removeAllAction->setEnabled(!KFTPQueue::Manager::self()->isProcessing()); - QPtrList<QListViewItem> selection = m_queue->selectedItems(); + TQPtrList<TQListViewItem> selection = m_queue->selectedItems(); QueueViewItem *firstItem = static_cast<QueueViewItem*>(selection.first()); m_removeAction->setEnabled((bool) firstItem); @@ -611,8 +611,8 @@ void QueueView::updateActions() // Only allow moving of multi selections if they have the same parent bool allowMove = true; - for (QListViewItem *i = selection.first(); i; i = selection.next()) { - if (i->parent() != static_cast<QListViewItem*>(firstItem)->parent()) { + for (TQListViewItem *i = selection.first(); i; i = selection.next()) { + if (i->parent() != static_cast<TQListViewItem*>(firstItem)->parent()) { allowMove = false; break; } @@ -667,7 +667,7 @@ void QueueView::slotObjectRemoved(long id) void QueueView::slotObjectUpdated() { - KFTPQueue::QueueObject *object = (KFTPQueue::QueueObject*) QObject::sender(); + KFTPQueue::QueueObject *object = (KFTPQueue::QueueObject*) TQObject::sender(); if (object) { QueueViewItem *item = m_queuedItems.find(object->getId()); @@ -677,13 +677,13 @@ void QueueView::slotObjectUpdated() } } -void QueueView::contextMenuRequested(KListView*, QListViewItem* item, const QPoint& p) +void QueueView::contextMenuRequested(TDEListView*, TQListViewItem* item, const TQPoint& p) { if (!item) return; QueueViewItem *firstItem = static_cast<QueueViewItem*>(m_queue->selectedItems().first()); - KPopupMenu *contextMenu = new KPopupMenu(m_queue); + TDEPopupMenu *contextMenu = new TDEPopupMenu(m_queue); // Populate context menu if (firstItem->getObject()->isTransfer()) { @@ -734,8 +734,8 @@ void QueueView::slotRemove() if (KMessageBox::questionYesNo(this, i18n("Are you sure you want to remove queued file(s)?")) == KMessageBox::Yes) { KFTPQueue::Manager::self()->setEmitUpdate(false); - QPtrList<QListViewItem> selection = m_queue->selectedItems(); - for (QListViewItem *item = selection.first(); item; item = selection.next()) { + TQPtrList<TQListViewItem> selection = m_queue->selectedItems(); + for (TQListViewItem *item = selection.first(); item; item = selection.next()) { if (item && static_cast<QueueViewItem*>(item)->getObject()) KFTPQueue::Manager::self()->removeTransfer(static_cast<KFTPQueue::Transfer*>(static_cast<QueueViewItem*>(item)->getObject())); } @@ -754,9 +754,9 @@ void QueueView::slotRemoveAll() void QueueView::slotMoveUp() { - QPtrList<QListViewItem> selection = m_queue->selectedItems(); + TQPtrList<TQListViewItem> selection = m_queue->selectedItems(); - for (QListViewItem *item = selection.first(); item; item = selection.next()) { + for (TQListViewItem *item = selection.first(); item; item = selection.next()) { QueueViewItem *queueItem = static_cast<QueueViewItem*>(item); // Move the transfer @@ -767,9 +767,9 @@ void QueueView::slotMoveUp() void QueueView::slotMoveDown() { - QPtrList<QListViewItem> selection = m_queue->selectedItems(); + TQPtrList<TQListViewItem> selection = m_queue->selectedItems(); - for (QListViewItem *item = selection.last(); item; item = selection.prev()) { + for (TQListViewItem *item = selection.last(); item; item = selection.prev()) { QueueViewItem *queueItem = static_cast<QueueViewItem*>(item); // Move the transfer @@ -780,9 +780,9 @@ void QueueView::slotMoveDown() void QueueView::slotMoveTop() { - QPtrList<QListViewItem> selection = m_queue->selectedItems(); + TQPtrList<TQListViewItem> selection = m_queue->selectedItems(); - for (QListViewItem *item = selection.last(); item; item = selection.prev()) { + for (TQListViewItem *item = selection.last(); item; item = selection.prev()) { QueueViewItem *queueItem = static_cast<QueueViewItem*>(item); // Move the transfer @@ -793,9 +793,9 @@ void QueueView::slotMoveTop() void QueueView::slotMoveBottom() { - QPtrList<QListViewItem> selection = m_queue->selectedItems(); + TQPtrList<TQListViewItem> selection = m_queue->selectedItems(); - for (QListViewItem *item = selection.first(); item; item = selection.next()) { + for (TQListViewItem *item = selection.first(); item; item = selection.next()) { QueueViewItem *queueItem = static_cast<QueueViewItem*>(item); // Move the transfer @@ -812,7 +812,7 @@ void QueueView::slotEdit() editor->setData(static_cast<KFTPQueue::Transfer*>(item->getObject())); // Show the queue editor - if (editor->exec() == QDialog::Accepted) { + if (editor->exec() == TQDialog::Accepted) { editor->saveData(); KFTPQueue::Manager::self()->revalidateTransfer(static_cast<KFTPQueue::Transfer*>(item->getObject())); @@ -834,7 +834,7 @@ void QueueView::slotLoad() if (m_queue->childCount() && KMessageBox::warningContinueCancel(0L, i18n("Loading a new queue will overwrite the existing one; are you sure you want to continue?"), i18n("Load Queue")) == KMessageBox::Cancel) return; - QString loadPath = KFileDialog::getOpenFileName(); + TQString loadPath = KFileDialog::getOpenFileName(); if (!loadPath.isEmpty()) { KFTPQueue::Manager::self()->getConverter()->importQueue(loadPath); @@ -843,7 +843,7 @@ void QueueView::slotLoad() void QueueView::slotSave() { - QString savePath = KFileDialog::getSaveFileName(); + TQString savePath = KFileDialog::getSaveFileName(); if (!savePath.isEmpty()) { KFTPQueue::Manager::self()->getConverter()->exportQueue(savePath); diff --git a/kftpgrabber/src/widgets/queueview/queueview.h b/kftpgrabber/src/widgets/queueview/queueview.h index d93e14f..812e965 100644 --- a/kftpgrabber/src/widgets/queueview/queueview.h +++ b/kftpgrabber/src/widgets/queueview/queueview.h @@ -37,18 +37,18 @@ #ifndef KFTPQUEUEVIEW_H #define KFTPQUEUEVIEW_H -#include <qguardedptr.h> -#include <qintdict.h> -#include <qlayout.h> -#include <qlabel.h> +#include <ntqguardedptr.h> +#include <ntqintdict.h> +#include <ntqlayout.h> +#include <ntqlabel.h> -#include <kaction.h> -#include <klistview.h> +#include <tdeaction.h> +#include <tdelistview.h> #include "kftpqueue.h" -class KToolBar; -class KListViewSearchLine; +class TDEToolBar; +class TDEListViewSearchLine; namespace KFTPWidgets { @@ -58,7 +58,7 @@ class QueueView; /** * A visual representation of a queued object. */ -class QueueViewItem : public QListViewItem +class QueueViewItem : public TQListViewItem { public: /** @@ -68,7 +68,7 @@ public: * @param object Queue object * @param parent Parent list view */ - QueueViewItem(QueueView *view, KFTPQueue::QueueObject *object, QListView *parent); + QueueViewItem(QueueView *view, KFTPQueue::QueueObject *object, TQListView *parent); /** * Class constructor. @@ -77,7 +77,7 @@ public: * @param object Queue object * @param parent Parent item */ - QueueViewItem(QueueView *view, KFTPQueue::QueueObject *object, QListViewItem *parent); + QueueViewItem(QueueView *view, KFTPQueue::QueueObject *object, TQListViewItem *parent); /** * Class destructor. @@ -104,7 +104,7 @@ public: /** * Returns the last child item. */ - QListViewItem *lastChild() const { return m_lastChild; } + TQListViewItem *lastChild() const { return m_lastChild; } /** * Moves this item one position up. @@ -128,25 +128,25 @@ public: /** * @overload - * Reimplemented from QListViewItem. + * Reimplemented from TQListViewItem. */ - void insertItem(QListViewItem *newChild); + void insertItem(TQListViewItem *newChild); /** * @overload - * Reimplemented from QListViewItem. + * Reimplemented from TQListViewItem. */ - void takeItem(QListViewItem *item); + void takeItem(TQListViewItem *item); /** * @overload - * Reimplemented from QListViewItem for text colors. + * Reimplemented from TQListViewItem for text colors. */ - void paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int alignment); + void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment); /** * @overload - * Reimplemented from QListViewItem. + * Reimplemented from TQListViewItem. */ void sortChildItems(int, bool) {} protected: @@ -155,7 +155,7 @@ protected: */ void init(); private: - QListViewItem *m_lastChild; + TQListViewItem *m_lastChild; KFTPQueue::QueueObject *m_queueObject; QueueView *m_queueView; @@ -174,19 +174,19 @@ public: * * @param parent Parent widget */ - QueueListView(QWidget *parent); + QueueListView(TQWidget *parent); /** * @overload - * Reimplemented from QListView. + * Reimplemented from TQListView. */ - void insertItem(QListViewItem *item); + void insertItem(TQListViewItem *item); /** * @overload - * Reimplemented from QListView. + * Reimplemented from TQListView. */ - void setSorting(int, bool = true) { QListView::setSorting(-1); } + void setSorting(int, bool = true) { TQListView::setSorting(-1); } }; /** @@ -194,7 +194,7 @@ public: * * @author Jernej Kos */ -class QueueView : public QWidget +class QueueView : public TQWidget { friend class QueueViewItem; Q_OBJECT @@ -202,7 +202,7 @@ public: /** * Class constructor. */ - QueueView(QWidget *parent, const char *name); + QueueView(TQWidget *parent, const char *name); /** * Load queue list layout from the configuration file. @@ -226,43 +226,43 @@ protected: */ void initToolBar(); private: - KActionCollection *m_actionCollection; + TDEActionCollection *m_actionCollection; // Actions - KAction *m_launchAction; - KAction *m_abortAction; - KAction *m_removeAction; - KAction *m_removeAllAction; - KAction *m_moveUpAction; - KAction *m_moveDownAction; - KAction *m_moveTopAction; - KAction *m_moveBottomAction; - KAction *m_editAction; + TDEAction *m_launchAction; + TDEAction *m_abortAction; + TDEAction *m_removeAction; + TDEAction *m_removeAllAction; + TDEAction *m_moveUpAction; + TDEAction *m_moveDownAction; + TDEAction *m_moveTopAction; + TDEAction *m_moveBottomAction; + TDEAction *m_editAction; // Toolbar Actions - KAction *m_loadAction; - KAction *m_saveAction; - KAction *m_startAction; - KAction *m_pauseAction; - KAction *m_stopAction; - KAction *m_addAction; - KAction *m_searchAction; - KToggleAction *m_filterAction; + TDEAction *m_loadAction; + TDEAction *m_saveAction; + TDEAction *m_startAction; + TDEAction *m_pauseAction; + TDEAction *m_stopAction; + TDEAction *m_addAction; + TDEAction *m_searchAction; + TDEToggleAction *m_filterAction; - KListViewSearchLine *m_searchField; + TDEListViewSearchLine *m_searchField; - KToolBar *m_toolBar; - KToolBar *m_searchToolBar; + TDEToolBar *m_toolBar; + TDEToolBar *m_searchToolBar; QueueListView *m_queue; - QIntDict<QueueViewItem> m_queuedItems; + TQIntDict<QueueViewItem> m_queuedItems; private slots: void slotObjectRemoved(long); void slotObjectUpdated(); void slotTransferAdded(KFTPQueue::Transfer*); void slotSiteAdded(KFTPQueue::Site*); - void contextMenuRequested(KListView*, QListViewItem*, const QPoint&); + void contextMenuRequested(TDEListView*, TQListViewItem*, const TQPoint&); void slotSearchEraseClicked(); diff --git a/kftpgrabber/src/widgets/queueview/threadview.cpp b/kftpgrabber/src/widgets/queueview/threadview.cpp index fd1c663..9047dfa 100644 --- a/kftpgrabber/src/widgets/queueview/threadview.cpp +++ b/kftpgrabber/src/widgets/queueview/threadview.cpp @@ -38,23 +38,23 @@ #include "listview.h" -#include <qlayout.h> -#include <klocale.h> +#include <ntqlayout.h> +#include <tdelocale.h> namespace KFTPWidgets { -ThreadViewItem::ThreadViewItem(KFTPSession::Session *session, QListView *parent) - : QObject(parent), - QListViewItem(parent), +ThreadViewItem::ThreadViewItem(KFTPSession::Session *session, TQListView *parent) + : TQObject(parent), + TQListViewItem(parent), m_connection(0), m_session(session) { refresh(); } -ThreadViewItem::ThreadViewItem(KFTPSession::Connection *conn, QListViewItem *parent, int id) - : QObject(), - QListViewItem(parent), +ThreadViewItem::ThreadViewItem(KFTPSession::Connection *conn, TQListViewItem *parent, int id) + : TQObject(), + TQListViewItem(parent), m_id(id), m_connection(conn), m_session(0) @@ -97,7 +97,7 @@ void ThreadViewItem::refresh() KFTPQueue::Transfer *transfer = m_connection->getTransfer(); if (transfer && transfer->isRunning()) { - QString speed; + TQString speed; filesize_t rawSpeed = transfer->getSpeed(); speed.sprintf( "%lld KB/s", (rawSpeed / 1024) ); @@ -124,9 +124,9 @@ void ThreadViewItem::refresh() } } -void ThreadViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int alignment) +void ThreadViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) { - QListViewItem::paintCell(p, cg, column, width, alignment); + TQListViewItem::paintCell(p, cg, column, width, alignment); } void ThreadViewItem::slotUpdateItemRequested() @@ -134,15 +134,15 @@ void ThreadViewItem::slotUpdateItemRequested() refresh(); } -KActionCollection *ThreadView::actionCollection() +TDEActionCollection *ThreadView::actionCollection() { return KFTPAPI::getInstance()->mainWindow()->actionCollection(); } -ThreadView::ThreadView(QWidget *parent, const char *name) - : QWidget(parent, name) +ThreadView::ThreadView(TQWidget *parent, const char *name) + : TQWidget(parent, name) { - QVBoxLayout *layout = new QVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); // Create the list view m_threads = new KFTPWidgets::ListView(this); @@ -156,7 +156,7 @@ ThreadView::ThreadView(QWidget *parent, const char *name) m_threads->setEmptyListText(i18n("There are no threads currently running.")); // Multi-select - m_threads->setSelectionModeExt(KListView::FileManager); + m_threads->setSelectionModeExt(TDEListView::FileManager); m_threads->setAllColumnsShowFocus(true); m_threads->setRootIsDecorated(true); @@ -180,7 +180,7 @@ void ThreadView::slotUpdateSessions() if (i->isRemote()) { ThreadViewItem *site = new ThreadViewItem(i, m_threads); - QPtrList<KFTPSession::Connection> *c_list = i->getConnectionList(); + TQPtrList<KFTPSession::Connection> *c_list = i->getConnectionList(); if (c_list->count() > 0) { KFTPSession::Connection *conn; diff --git a/kftpgrabber/src/widgets/queueview/threadview.h b/kftpgrabber/src/widgets/queueview/threadview.h index 5c37e6c..5977086 100644 --- a/kftpgrabber/src/widgets/queueview/threadview.h +++ b/kftpgrabber/src/widgets/queueview/threadview.h @@ -36,33 +36,33 @@ #ifndef KFTPTHREADVIEW_H #define KFTPTHREADVIEW_H -#include <qguardedptr.h> +#include <ntqguardedptr.h> -#include <kaction.h> -#include <klistview.h> +#include <tdeaction.h> +#include <tdelistview.h> #include "kftpsession.h" -class KToolBar; +class TDEToolBar; namespace KFTPWidgets { class ListView; -class ThreadViewItem : public QObject, public QListViewItem +class ThreadViewItem : public TQObject, public TQListViewItem { Q_OBJECT public: - ThreadViewItem(KFTPSession::Session *session, QListView *parent); - ThreadViewItem(KFTPSession::Connection *conn, QListViewItem *parent, int id); + ThreadViewItem(KFTPSession::Session *session, TQListView *parent); + ThreadViewItem(KFTPSession::Connection *conn, TQListViewItem *parent, int id); void refresh(); - virtual void paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int alignment); + virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment); private: int m_id; - QGuardedPtr<KFTPSession::Connection> m_connection; - QGuardedPtr<KFTPSession::Session> m_session; + TQGuardedPtr<KFTPSession::Connection> m_connection; + TQGuardedPtr<KFTPSession::Session> m_session; private slots: void slotConnectionAcquired(); void slotUpdateItemRequested(); @@ -73,14 +73,14 @@ private slots: * * @author Jernej Kos */ -class ThreadView : public QWidget +class ThreadView : public TQWidget { Q_OBJECT public: - ThreadView(QWidget *parent = 0, const char *name = 0); + ThreadView(TQWidget *parent = 0, const char *name = 0); ~ThreadView(); - KActionCollection *actionCollection(); + TDEActionCollection *actionCollection(); private slots: void slotUpdateSessions(); diff --git a/kftpgrabber/src/widgets/quickconnect.cpp b/kftpgrabber/src/widgets/quickconnect.cpp index 0eabdc8..a71a716 100644 --- a/kftpgrabber/src/widgets/quickconnect.cpp +++ b/kftpgrabber/src/widgets/quickconnect.cpp @@ -43,26 +43,26 @@ #include "engine/thread.h" #include "engine/ftpsocket.h" -#include <kglobal.h> +#include <tdeglobal.h> #include <kcharsets.h> #include <kcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include <kpassdlg.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kpushbutton.h> /* KSSL includes */ #include <ksslpkcs12.h> -#include <qcheckbox.h> -#include <qspinbox.h> +#include <ntqcheckbox.h> +#include <ntqspinbox.h> using namespace KFTPGrabberBase; namespace KFTPWidgets { -QuickConnectDialog::QuickConnectDialog(QWidget *parent, const char *name) +QuickConnectDialog::QuickConnectDialog(TQWidget *parent, const char *name) : KDialogBase(parent, name, true, i18n("Quick Connect"), Ok|Cancel, Ok), m_noUrlChange(false), m_protocolAdvancedDialog(0L), @@ -73,18 +73,18 @@ QuickConnectDialog::QuickConnectDialog(QWidget *parent, const char *name) // Set the dialog options setMainWidget(m_layout); - resize(QSize(200,300)); + resize(TQSize(200,300)); m_layout->clearRecent->setIconSet(loadSmallIcon("clear_left")); m_layout->protoAdvanced->setIconSet(loadSmallIcon("configure")); // Connect the slots - connect(m_layout->urlBox, SIGNAL(textChanged(const QString&)), this, SLOT(slotUrlChanged(const QString &))); - connect(m_layout->hostBox, SIGNAL(textChanged(const QString&)), this, SLOT(slotHostChanged(const QString&))); + connect(m_layout->urlBox, SIGNAL(textChanged(const TQString&)), this, SLOT(slotUrlChanged(const TQString &))); + connect(m_layout->hostBox, SIGNAL(textChanged(const TQString&)), this, SLOT(slotHostChanged(const TQString&))); connect(m_layout->protocolBox, SIGNAL(activated(int)), this, SLOT(slotProtocolChanged(int))); connect(m_layout->protoAdvanced, SIGNAL(clicked()), this, SLOT(slotProtoAdvancedClicked())); - connect(m_layout->usernameBox, SIGNAL(textChanged(const QString&)), this, SLOT(slotUserChanged())); - connect(m_layout->passwordBox, SIGNAL(textChanged(const QString&)), this, SLOT(slotPassChanged())); + connect(m_layout->usernameBox, SIGNAL(textChanged(const TQString&)), this, SLOT(slotUserChanged())); + connect(m_layout->passwordBox, SIGNAL(textChanged(const TQString&)), this, SLOT(slotPassChanged())); connect(m_layout->portBox, SIGNAL(valueChanged(int)), this, SLOT(slotPortChanged(int))); connect(m_layout->anonLogin, SIGNAL(clicked()), this, SLOT(slotAnonClicked())); connect(m_layout->recentConnections, SIGNAL(activated(int)), this, SLOT(slotRecentConnectionActivated(int))); @@ -104,17 +104,17 @@ QuickConnectDialog::QuickConnectDialog(QWidget *parent, const char *name) m_layout->protoAdvanced->setEnabled(false); // Populate charsets - QStringList charsets = KGlobal::charsets()->descriptiveEncodingNames(); + TQStringList charsets = TDEGlobal::charsets()->descriptiveEncodingNames(); m_layout->serverEncoding->insertStringList(charsets); - QString defEncoding = KFTPCore::Config::defEncoding(); - defEncoding = QString("%1 ( %2 )").arg(KGlobal::charsets()->languageForEncoding(defEncoding)).arg(defEncoding); + TQString defEncoding = KFTPCore::Config::defEncoding(); + defEncoding = TQString("%1 ( %2 )").arg(TDEGlobal::charsets()->languageForEncoding(defEncoding)).arg(defEncoding); m_layout->serverEncoding->setCurrentText(defEncoding); // Populate recent sites int index = 0; - QStringList recentSites = KFTPCore::Config::recentSites(); - for (QStringList::Iterator i = recentSites.begin(); i != recentSites.end(); ++i) { + TQStringList recentSites = KFTPCore::Config::recentSites(); + for (TQStringList::Iterator i = recentSites.begin(); i != recentSites.end(); ++i) { KURL siteUrl = KURL(*i); m_recentSites[index] = siteUrl; @@ -148,10 +148,10 @@ void QuickConnectDialog::slotClearRecentClicked() m_layout->recentConnections->clear(); m_recentSites.clear(); - KFTPCore::Config::setRecentSites(QStringList()); + KFTPCore::Config::setRecentSites(TQStringList()); } -void QuickConnectDialog::slotUrlChanged(const QString &text) +void QuickConnectDialog::slotUrlChanged(const TQString &text) { if (m_noUrlChange) return; @@ -207,7 +207,7 @@ void QuickConnectDialog::slotUrlChanged(const QString &text) m_noUrlChange = false; } -void QuickConnectDialog::slotHostChanged(const QString &text) +void QuickConnectDialog::slotHostChanged(const TQString &text) { if (m_noUrlChange) return; @@ -250,7 +250,7 @@ void QuickConnectDialog::slotPassChanged() void QuickConnectDialog::slotAnonClicked() { - static QString tmpUser, tmpPass; + static TQString tmpUser, tmpPass; if (m_layout->anonLogin->isChecked()) { m_layout->usernameBox->setEnabled(false); @@ -280,19 +280,19 @@ void QuickConnectDialog::slotAnonClicked() void QuickConnectDialog::slotOk() { // Construct a nice error message - QString errorMessage; + TQString errorMessage; if (m_url.host().isEmpty()) errorMessage = i18n("a hostname"); if (m_url.port() < 1) - errorMessage += (errorMessage.isEmpty() ? QString::null : QString::fromLatin1(", ")) + i18n("a valid port"); + errorMessage += (errorMessage.isEmpty() ? TQString::null : TQString::fromLatin1(", ")) + i18n("a valid port"); if (m_url.user().isEmpty()) - errorMessage += (errorMessage.isEmpty() ? QString::null : QString::fromLatin1(", ")) + i18n("your username"); + errorMessage += (errorMessage.isEmpty() ? TQString::null : TQString::fromLatin1(", ")) + i18n("your username"); if (m_url.pass().isEmpty()) - errorMessage += (errorMessage.isEmpty() ? QString::null : QString::fromLatin1(", ")) + i18n("your password"); + errorMessage += (errorMessage.isEmpty() ? TQString::null : TQString::fromLatin1(", ")) + i18n("your password"); if (errorMessage.findRev(",") != -1) errorMessage = errorMessage.replace(errorMessage.findRev(","), 1 , i18n(" and")); @@ -316,7 +316,7 @@ void QuickConnectDialog::slotOk() site->setProperty("protocol", m_layout->protocolBox->currentItem() == SP_SFTP ? "sftp" : "ftp"); site->setProperty("use_tls", m_layout->protocolBox->currentItem() == SP_SSL_EXPLICIT); site->setProperty("use_implicit", m_layout->protocolBox->currentItem() == SP_SSL_IMPLICIT); - site->setProperty("encoding", KGlobal::charsets()->encodingForName(m_layout->serverEncoding->currentText())); + site->setProperty("encoding", TDEGlobal::charsets()->encodingForName(m_layout->serverEncoding->currentText())); // Save TLS options if (m_protocolAdvancedDialog) { @@ -331,7 +331,7 @@ void QuickConnectDialog::slotOk() } // Save to recent sites - QStringList recentSites = KFTPCore::Config::recentSites(); + TQStringList recentSites = KFTPCore::Config::recentSites(); if (m_url.user() == "anonymous") m_url.setPass(""); @@ -351,14 +351,14 @@ void QuickConnectDialog::slotOk() void QuickConnectDialog::setupClient(KFTPEngine::Thread *client) { // First activate the correct socket and reset the old flags - client->selectSocketForProtocol(KURL(QString("%1://test/").arg(m_layout->protocolBox->currentItem() == SP_SFTP ? "sftp" : "ftp"))); + client->selectSocketForProtocol(KURL(TQString("%1://test/").arg(m_layout->protocolBox->currentItem() == SP_SFTP ? "sftp" : "ftp"))); client->socket()->initConfig(); client->socket()->setConfig("retry", 0); client->socket()->setConfig("ssl.use_tls", m_layout->protocolBox->currentItem() == SP_SSL_EXPLICIT); client->socket()->setConfig("ssl.use_implicit", m_layout->protocolBox->currentItem() == SP_SSL_IMPLICIT); - client->socket()->setConfig("encoding", KGlobal::charsets()->encodingForName(m_layout->serverEncoding->currentText())); + client->socket()->setConfig("encoding", TDEGlobal::charsets()->encodingForName(m_layout->serverEncoding->currentText())); // Set TLS options if (m_protocolAdvancedDialog) { @@ -367,7 +367,7 @@ void QuickConnectDialog::setupClient(KFTPEngine::Thread *client) // Should we use a X509 certificate ? if (m_protocolAdvancedDialog->isCertChecked() && m_layout->protocolBox->currentItem() == SP_FTP) { // Ask the user for the decryption password - QCString certPass; + TQCString certPass; KPasswordDialog::getPassword(certPass, i18n("Please provide your X509 certificate decryption password.")); static_cast<KFTPEngine::FtpSocket*>(client->socket())->setSslClientCertificate(KSSLPKCS12::loadCertFile(m_protocolAdvancedDialog->getCertPath(), certPass)); @@ -414,9 +414,9 @@ void QuickConnectDialog::slotProtoAdvancedClicked() if (!m_protocolAdvancedDialog) m_protocolAdvancedDialog = new KFTPWidgets::Bookmarks::BookmarkEditorTLS(this); - QChar tlsMode = m_protocolAdvancedDialog->getTLSMode(); + TQChar tlsMode = m_protocolAdvancedDialog->getTLSMode(); bool certChecked = m_protocolAdvancedDialog->isCertChecked(); - QString certPath = m_protocolAdvancedDialog->getCertPath(); + TQString certPath = m_protocolAdvancedDialog->getCertPath(); m_protocolAdvancedDialog->slotChangeActiveX509Group(); if (!m_protocolAdvancedDialog->exec()) { @@ -427,7 +427,7 @@ void QuickConnectDialog::slotProtoAdvancedClicked() } } -QChar QuickConnectDialog::getTLSMode() +TQChar QuickConnectDialog::getTLSMode() { if (!m_protocolAdvancedDialog) return false; @@ -443,10 +443,10 @@ bool QuickConnectDialog::isCertChecked() return m_protocolAdvancedDialog->isCertChecked(); } -QString QuickConnectDialog::getCertPath() +TQString QuickConnectDialog::getCertPath() { if (!m_protocolAdvancedDialog) - return QString::null; + return TQString::null; return m_protocolAdvancedDialog->getCertPath(); } @@ -456,7 +456,7 @@ int QuickConnectDialog::getFTPMode() return m_layout->protocolBox->currentItem(); } -void QuickConnectDialog::setHost(const QString &host) +void QuickConnectDialog::setHost(const TQString &host) { m_layout->hostBox->setText(host); } diff --git a/kftpgrabber/src/widgets/quickconnect.h b/kftpgrabber/src/widgets/quickconnect.h index ad88212..86eef44 100644 --- a/kftpgrabber/src/widgets/quickconnect.h +++ b/kftpgrabber/src/widgets/quickconnect.h @@ -39,7 +39,7 @@ #include "kftpquickconnectlayout.h" -#include <qmap.h> +#include <ntqmap.h> #include <kdialogbase.h> #include <kurl.h> @@ -61,7 +61,7 @@ class QuickConnectDialog : public KDialogBase { Q_OBJECT public: - QuickConnectDialog(QWidget *parent = 0, const char *name = 0); + QuickConnectDialog(TQWidget *parent = 0, const char *name = 0); ~QuickConnectDialog(); /** @@ -83,7 +83,7 @@ public: * * @return currently set TLS operation mode */ - QChar getTLSMode(); + TQChar getTLSMode(); /** * Is the "use custom X509 certificate" checked or not. @@ -97,14 +97,14 @@ public: * * @return path to the user's X509 certificate for this connection */ - QString getCertPath(); + TQString getCertPath(); /** * Set the destination server's hostname. * * @param host destination server's hostname */ - void setHost(const QString &host); + void setHost(const TQString &host); /** * Set the destination server's port. @@ -141,12 +141,12 @@ private: bool m_portChanged; - QMap<int, KURL> m_recentSites; + TQMap<int, KURL> m_recentSites; private slots: virtual void slotOk(); - void slotUrlChanged(const QString &); - void slotHostChanged(const QString&); + void slotUrlChanged(const TQString &); + void slotHostChanged(const TQString&); void slotPortChanged(int); void slotUserChanged(); void slotPassChanged(); diff --git a/kftpgrabber/src/widgets/searchdialog.cpp b/kftpgrabber/src/widgets/searchdialog.cpp index ade32c3..9fc380d 100644 --- a/kftpgrabber/src/widgets/searchdialog.cpp +++ b/kftpgrabber/src/widgets/searchdialog.cpp @@ -39,18 +39,18 @@ #include "kftpbookmarks.h" #include "kftpqueue.h" -#include <qcheckbox.h> -#include <qgroupbox.h> -#include <qspinbox.h> -#include <qregexp.h> +#include <ntqcheckbox.h> +#include <ntqgroupbox.h> +#include <ntqspinbox.h> +#include <ntqregexp.h> -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include <kpassdlg.h> namespace KFTPWidgets { -SearchDialog::SearchDialog(QWidget *parent, const char *name) +SearchDialog::SearchDialog(TQWidget *parent, const char *name) : KDialogBase(parent, name, true, i18n("Search & Replace"), Ok|Cancel, Ok) { // Create the main widget @@ -58,19 +58,19 @@ SearchDialog::SearchDialog(QWidget *parent, const char *name) // Set the dialog options setMainWidget(m_layout); - setInitialSize(QSize(500,400)); + setInitialSize(TQSize(500,400)); connect(m_layout->searchServer, SIGNAL(clicked()), this, SLOT(slotSearchServerClicked())); connect(m_layout->searchServerName, SIGNAL(siteChanged(KFTPBookmarks::Site*)), this, SLOT(slotSiteChanged(KFTPBookmarks::Site*))); } -QString SearchDialog::replaceCap(QStringList cap, const QString &text) +TQString SearchDialog::replaceCap(TQStringList cap, const TQString &text) { - QString tmp = text; + TQString tmp = text; - QStringList::Iterator end( cap.end() ); - for(QStringList::Iterator i( cap.begin() ); i != end; ++i) { - tmp.replace("$" + QString::number(cap.findIndex(*i)), *i); + TQStringList::Iterator end( cap.end() ); + for(TQStringList::Iterator i( cap.begin() ); i != end; ++i) { + tmp.replace("$" + TQString::number(cap.findIndex(*i)), *i); } return tmp; @@ -78,7 +78,7 @@ QString SearchDialog::replaceCap(QStringList cap, const QString &text) void SearchDialog::replace(KFTPQueue::Transfer *i) { - QRegExp s, d; + TQRegExp s, d; s.setPattern(m_layout->searchSrcPath->text()); d.setPattern(m_layout->searchDstPath->text()); @@ -115,7 +115,7 @@ void SearchDialog::searchAndReplace(KFTPQueue::QueueObject *parent) if (parent->isLocked()) return; - QPtrList<KFTPQueue::QueueObject> list = parent->getChildrenList(); + TQPtrList<KFTPQueue::QueueObject> list = parent->getChildrenList(); KFTPQueue::QueueObject *i; for (i = list.first(); i; i = list.next()) { diff --git a/kftpgrabber/src/widgets/searchdialog.h b/kftpgrabber/src/widgets/searchdialog.h index 7ae598b..d42a390 100644 --- a/kftpgrabber/src/widgets/searchdialog.h +++ b/kftpgrabber/src/widgets/searchdialog.h @@ -36,7 +36,7 @@ #ifndef KFTPWIDGETSSEARCHDIALOG_H #define KFTPWIDGETSSEARCHDIALOG_H -#include <qdom.h> +#include <ntqdom.h> #include <kdialogbase.h> namespace KFTPQueue { @@ -64,13 +64,13 @@ public: /** * Class constructor. */ - SearchDialog(QWidget *parent = 0, const char *name = 0); + SearchDialog(TQWidget *parent = 0, const char *name = 0); private: KFTPSearchLayout *m_layout; void replace(KFTPQueue::Transfer *i); - QString replaceCap(QStringList cap, const QString &text); + TQString replaceCap(TQStringList cap, const TQString &text); void searchAndReplace(KFTPQueue::QueueObject *parent); void searchAndReplace(); private slots: diff --git a/kftpgrabber/src/widgets/sidebar.cpp b/kftpgrabber/src/widgets/sidebar.cpp index bd7545b..0e26987 100644 --- a/kftpgrabber/src/widgets/sidebar.cpp +++ b/kftpgrabber/src/widgets/sidebar.cpp @@ -38,47 +38,47 @@ #include "sidebar.h" #include "multitabbar.h" -#include <kapplication.h> -#include <kconfig.h> +#include <tdeapplication.h> +#include <tdeconfig.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> -#include <qcursor.h> -#include <qpainter.h> -#include <qsignalmapper.h> -#include <qstyle.h> +#include <ntqcursor.h> +#include <ntqpainter.h> +#include <ntqsignalmapper.h> +#include <ntqstyle.h> namespace KFTPWidgets { -class Splitter : public QWidget { +class Splitter : public TQWidget { public: Splitter(Sidebar *w) - : QWidget(w, "divider"), + : TQWidget(w, "divider"), m_position(w->m_position) { if (m_position == Sidebar::Left) - setCursor(QCursor(SplitHCursor)); + setCursor(TQCursor(SplitHCursor)); else - setCursor(QCursor(SplitVCursor)); + setCursor(TQCursor(SplitVCursor)); styleChange(style()); } - virtual void paintEvent(QPaintEvent*) + virtual void paintEvent(TQPaintEvent*) { - QPainter p(this); - parentWidget()->style().drawPrimitive(QStyle::PE_Splitter, &p, rect(), colorGroup(), m_position == Sidebar::Left ? QStyle::Style_Horizontal : 0); + TQPainter p(this); + parentWidget()->style().drawPrimitive(TQStyle::PE_Splitter, &p, rect(), colorGroup(), m_position == Sidebar::Left ? TQStyle::Style_Horizontal : 0); } - virtual void styleChange(QStyle&) + virtual void styleChange(TQStyle&) { if (m_position == Sidebar::Left) - setFixedWidth(style().pixelMetric(QStyle::PM_SplitterWidth, this)); + setFixedWidth(style().pixelMetric(TQStyle::PM_SplitterWidth, this)); else - setFixedHeight(style().pixelMetric(QStyle::PM_SplitterWidth, this)); + setFixedHeight(style().pixelMetric(TQStyle::PM_SplitterWidth, this)); } - virtual void mouseMoveEvent(QMouseEvent *e) + virtual void mouseMoveEvent(TQMouseEvent *e) { static_cast<Sidebar*>(parent())->mouseMovedOverSplitter(e); } @@ -86,16 +86,16 @@ private: Sidebar::Position m_position; }; -Sidebar::Sidebar(QWidget *parent, Position position) - : QWidget(parent, "Sidebar"), +Sidebar::Sidebar(TQWidget *parent, Position position) + : TQWidget(parent, "Sidebar"), m_position(position), m_divider(new KFTPWidgets::Splitter(this)), - m_content(new QVBox(this)), + m_content(new TQVBox(this)), m_tabBar(new MultiTabBar(position == Left ? MultiTabBar::Vertical : MultiTabBar::Horizontal, this)), - m_sidebarBox(new QWidget(this)), + m_sidebarBox(new TQWidget(this)), m_currentIndex(-1), m_lastIndex(-1), - m_mapper(new QSignalMapper(this)) + m_mapper(new TQSignalMapper(this)) { m_tabBar->setStyle(MultiTabBar::AMAROK); m_tabBar->setPosition(m_position == Left ? MultiTabBar::Left : MultiTabBar::Bottom); @@ -107,7 +107,7 @@ Sidebar::Sidebar(QWidget *parent, Position position) m_tabBar->setFixedWidth(m_pos); m_tabBar->move(0, 3); - QVBoxLayout *layout = new QVBoxLayout(m_sidebarBox); + TQVBoxLayout *layout = new TQVBoxLayout(m_sidebarBox); layout->addSpacing(3); layout->setAutoAdd(true); @@ -119,7 +119,7 @@ Sidebar::Sidebar(QWidget *parent, Position position) m_pos = m_tabBar->sizeHint().height() + 5; m_tabBar->setFixedHeight(m_pos); - QVBoxLayout *layout = new QVBoxLayout(m_sidebarBox); + TQVBoxLayout *layout = new TQVBoxLayout(m_sidebarBox); layout->setAutoAdd(true); m_sidebarBox->hide(); @@ -153,17 +153,17 @@ void Sidebar::setVisible(bool visible) Sidebar::~Sidebar() { - KConfig *config; + TDEConfig *config; // Save the currently selected sidebar if (m_position == Left) { - config = KFTPGrabberBase::config(QString("Sidebar_%1").arg("Left")); + config = KFTPGrabberBase::config(TQString("Sidebar_%1").arg("Left")); } else { - config = KFTPGrabberBase::config(QString("Sidebar_%1").arg("Bottom")); + config = KFTPGrabberBase::config(TQString("Sidebar_%1").arg("Bottom")); } if (m_currentIndex != -1) { config->writeEntry("CurrentSidebar", currentSidebar()->name()); } else { - config->writeEntry("CurrentSidebar", QString::null); + config->writeEntry("CurrentSidebar", TQString::null); } if (m_position == Left) { config->writeEntry("Size", m_sidebarBox->width()); @@ -174,9 +174,9 @@ Sidebar::~Sidebar() void Sidebar::polish() { - QWidget::polish(); + TQWidget::polish(); - KConfig *config = KFTPGrabberBase::config(QString("Sidebar_%1").arg(m_position == Left ? "Left" : "Bottom")); + TDEConfig *config = KFTPGrabberBase::config(TQString("Sidebar_%1").arg(m_position == Left ? "Left" : "Bottom")); const int index = indexForName(config->readEntry("CurrentSidebar")); if (m_position == Left) { @@ -250,7 +250,7 @@ void Sidebar::adjustWidgetSizes() } } -void Sidebar::mouseMovedOverSplitter(QMouseEvent *e) +void Sidebar::mouseMovedOverSplitter(TQMouseEvent *e) { const uint oldPos = m_pos; uint newPos; @@ -278,10 +278,10 @@ void Sidebar::mouseMovedOverSplitter(QMouseEvent *e) adjustWidgetSizes(); } -bool Sidebar::event(QEvent *e) +bool Sidebar::event(TQEvent *e) { switch (e->type()) { - case QEvent::LayoutHint: { + case TQEvent::LayoutHint: { if (m_position == Left) { setMinimumWidth(m_tabBar->minimumWidth() + m_divider->minimumWidth() + m_sidebarBox->width() + m_content->minimumWidth()); } else { @@ -289,7 +289,7 @@ bool Sidebar::event(QEvent *e) } break; } - case QEvent::Resize: { + case TQEvent::Resize: { if (m_position == Left) { m_divider->resize(0, height()); m_tabBar->resize(0, height()); @@ -304,21 +304,21 @@ bool Sidebar::event(QEvent *e) default: break; } - return QWidget::event(e); + return TQWidget::event(e); } -void Sidebar::addSidebar(QWidget *widget, const QString &title, const QString &icon) +void Sidebar::addSidebar(TQWidget *widget, const TQString &title, const TQString &icon) { const int id = m_tabBar->tabs()->count(); // the next available id - const QString name(widget->name()); - QWidget *tab; + const TQString name(widget->name()); + TQWidget *tab; - widget->reparent(m_sidebarBox, QPoint()); + widget->reparent(m_sidebarBox, TQPoint()); widget->hide(); m_tabBar->appendTab(SmallIcon(icon), id, title); tab = m_tabBar->tab(id); - tab->setFocusPolicy(QWidget::NoFocus); + tab->setFocusPolicy(TQWidget::NoFocus); // We use a SignalMapper to show/hide the corresponding browser when tabs are clicked connect(tab, SIGNAL(clicked()), m_mapper, SLOT(map())); @@ -347,7 +347,7 @@ void Sidebar::showHideSidebar(int index) adjustWidgetSizes(); } else if ((uint) index < m_sidebars.count()) { // Open up target - QWidget* const target = m_sidebars[index]; + TQWidget* const target = m_sidebars[index]; m_currentIndex = index; m_divider->show(); @@ -368,7 +368,7 @@ void Sidebar::showHideSidebar(int index) } } -QWidget *Sidebar::sidebar(const QString &name) const +TQWidget *Sidebar::sidebar(const TQString &name) const { for (SidebarList::ConstIterator it = m_sidebars.begin(), end = m_sidebars.end(); it != end; ++it) { if (name == (*it)->name()) @@ -378,7 +378,7 @@ QWidget *Sidebar::sidebar(const QString &name) const return 0; } -int Sidebar::indexForName(const QString &name) const +int Sidebar::indexForName(const TQString &name) const { for (uint x = 0; x < m_sidebars.count(); ++x) { if (name == m_sidebars[x]->name()) diff --git a/kftpgrabber/src/widgets/sidebar.h b/kftpgrabber/src/widgets/sidebar.h index 4d4f710..60f95ee 100644 --- a/kftpgrabber/src/widgets/sidebar.h +++ b/kftpgrabber/src/widgets/sidebar.h @@ -37,23 +37,23 @@ #ifndef KFTPWIDGETSSIDEBAR_H #define KFTPWIDGETSSIDEBAR_H -#include <qwidget.h> -#include <qvaluevector.h> +#include <ntqwidget.h> +#include <ntqvaluevector.h> class KURL; -class QSignalMapper; -class QVBox; +class TQSignalMapper; +class TQVBox; namespace KFTPWidgets { -typedef QValueVector<QWidget*> SidebarList; +typedef TQValueVector<TQWidget*> SidebarList; class MultiTabBar; class MultiTabBarTab; /** * This class provides a sidebar. It uses a customised version of KMultiTabBar for - * displaying the actual tabs. It uses a QSignalMapper to map signals from the + * displaying the actual tabs. It uses a TQSignalMapper to map signals from the * tabs to the actual sidebars. * * This class was copied from amaroK (BrowserBar) and modified to support bottom @@ -62,7 +62,7 @@ class MultiTabBarTab; * @author amaroK developers * @author Jernej Kos */ -class Sidebar : public QWidget +class Sidebar : public TQWidget { Q_OBJECT friend class Splitter; @@ -72,7 +72,7 @@ public: Bottom }; - Sidebar(QWidget *parent, Position position); + Sidebar(TQWidget *parent, Position position); ~Sidebar(); /** @@ -86,32 +86,32 @@ public: * Returns the content box of the sidebar. This should be where the widget, that * should be resized when the sidebar resizes, should be placed. * - * @return A QVBox container widget + * @return A TQVBox container widget */ - QVBox *content() { return m_content; } + TQVBox *content() { return m_content; } /** * Returns the sidebar by it's name. * * @param name The sidebar's name - * @return A QWidget representing the sidebar or NULL if it is not found + * @return A TQWidget representing the sidebar or NULL if it is not found */ - QWidget *sidebar(const QString &name) const; + TQWidget *sidebar(const TQString &name) const; /** * Returns the sidebar by it's index. * * @param index The sidebar's index - * @return A QWidget representing the sidebar or NULL if the index is invalid + * @return A TQWidget representing the sidebar or NULL if the index is invalid */ - QWidget *sidebar(int index) const { if (index < 0) index = 0; return m_sidebars[index]; } + TQWidget *sidebar(int index) const { if (index < 0) index = 0; return m_sidebars[index]; } /** * Returns the currently open sidebar. * - * @return A QWidget representing the current sidebar + * @return A TQWidget representing the current sidebar */ - QWidget *currentSidebar() const { return sidebar(m_currentIndex); } + TQWidget *currentSidebar() const { return sidebar(m_currentIndex); } /** * Adds a new sidebar widget. @@ -120,18 +120,18 @@ public: * @param title The title that will be displayed on the tab * @param icon Name of the icon that will be displayed besides the title */ - void addSidebar(QWidget *widget, const QString &title, const QString &icon); + void addSidebar(TQWidget *widget, const TQString &title, const TQString &icon); protected: virtual void polish(); - virtual bool event(QEvent *e); + virtual bool event(TQEvent *e); public slots: - void showSidebar(const QString &name) { showSidebar(indexForName(name)); } + void showSidebar(const TQString &name) { showSidebar(indexForName(name)); } void showSidebar(int index) { if (index != m_currentIndex) showHideSidebar(index); } void showHideSidebar(int); void closeCurrentSidebar() { showHideSidebar(m_currentIndex); } private: - int indexForName(const QString&) const; - void mouseMovedOverSplitter(QMouseEvent *e); + int indexForName(const TQString&) const; + void mouseMovedOverSplitter(TQMouseEvent *e); void adjustWidgetSizes(); uint maxSidebarWidth() const { return width() / 2; } @@ -140,16 +140,16 @@ private: Position m_position; uint m_pos; - QWidget *m_divider; - QVBox *m_content; + TQWidget *m_divider; + TQVBox *m_content; MultiTabBar *m_tabBar; - QWidget *m_sidebarBox; + TQWidget *m_sidebarBox; SidebarList m_sidebars; int m_currentIndex; int m_lastIndex; - QSignalMapper *m_mapper; + TQSignalMapper *m_mapper; }; } diff --git a/kftpgrabber/src/widgets/systemtray.cpp b/kftpgrabber/src/widgets/systemtray.cpp index 98179b7..e4cbba3 100644 --- a/kftpgrabber/src/widgets/systemtray.cpp +++ b/kftpgrabber/src/widgets/systemtray.cpp @@ -33,9 +33,9 @@ * files in the program, then also delete it here. */ -#include <kpopupmenu.h> -#include <klocale.h> -#include <kwin.h> +#include <tdepopupmenu.h> +#include <tdelocale.h> +#include <twin.h> #include "widgets/systemtray.h" #include "widgets/balloon.h" @@ -66,7 +66,7 @@ SystemTray::SystemTray(MainWindow *parent) show(); // Add some actions - m_bookmarkMenu = new KActionMenu(i18n("Bookmarks")); + m_bookmarkMenu = new TDEActionMenu(i18n("Bookmarks")); slotUpdateBookmarks(); // Let our bookmarks be up to date @@ -93,10 +93,10 @@ void SystemTray::slotUpdateBookmarks() { // Re-create the bookmarks menu m_bookmarkMenu->popupMenu()->clear(); - KFTPBookmarks::Manager::self()->guiPopulateBookmarksMenu(m_bookmarkMenu, QDomNode(), false); + KFTPBookmarks::Manager::self()->guiPopulateBookmarksMenu(m_bookmarkMenu, TQDomNode(), false); } -void SystemTray::showBalloon(const QString &text) +void SystemTray::showBalloon(const TQString &text) { // Create a little modified Kopete balloon if (m_balloon) { @@ -110,7 +110,7 @@ void SystemTray::showBalloon(const QString &text) KWin::setOnAllDesktops(m_balloon->winId() , true); // Hide the balloon after 5 sec - QTimer::singleShot(5000, this, SLOT(slotHideBalloon())); + TQTimer::singleShot(5000, this, SLOT(slotHideBalloon())); } void SystemTray::slotHideBalloon() diff --git a/kftpgrabber/src/widgets/systemtray.h b/kftpgrabber/src/widgets/systemtray.h index ce77811..1a5ec44 100644 --- a/kftpgrabber/src/widgets/systemtray.h +++ b/kftpgrabber/src/widgets/systemtray.h @@ -37,9 +37,9 @@ #define KFTPWIDGETSSYSTEMTRAY_H #include <ksystemtray.h> -#include <kaction.h> +#include <tdeaction.h> -#include <qmenudata.h> +#include <ntqmenudata.h> class MainWindow; class MainActions; @@ -75,11 +75,11 @@ public: /** * Show a balloon notification widget. */ - void showBalloon(const QString &text); + void showBalloon(const TQString &text); protected: static SystemTray *m_self; private: - KActionMenu *m_bookmarkMenu; + TDEActionMenu *m_bookmarkMenu; Balloon *m_balloon; MainActions *m_actions; private slots: diff --git a/kftpgrabber/src/widgets/trafficgraph.cpp b/kftpgrabber/src/widgets/trafficgraph.cpp index ddd339f..6770234 100644 --- a/kftpgrabber/src/widgets/trafficgraph.cpp +++ b/kftpgrabber/src/widgets/trafficgraph.cpp @@ -37,10 +37,10 @@ #include <math.h> #include <string.h> -#include <qpainter.h> -#include <qpixmap.h> +#include <ntqpainter.h> +#include <ntqpixmap.h> -#include <klocale.h> +#include <tdelocale.h> #include "trafficgraph.h" @@ -51,8 +51,8 @@ static inline int min(int a, int b) return (a < b ? a : b); } -TrafficGraph::TrafficGraph(QWidget *parent, const char *name) - : QWidget(parent, name) +TrafficGraph::TrafficGraph(TQWidget *parent, const char *name) + : TQWidget(parent, name) { // Auto deletion does not work for pointer to arrays. m_beamData.setAutoDelete(false); @@ -67,25 +67,25 @@ TrafficGraph::TrafficGraph(QWidget *parent, const char *name) // Anything smaller than this does not make sense. setMinimumSize(16, 100); - setSizePolicy(QSizePolicy(QSizePolicy::Expanding, - QSizePolicy::Expanding, false)); + setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, + TQSizePolicy::Expanding, false)); m_showVerticalLines = true; - m_verticalLinesColor = QColor(0x04FB1D); + m_verticalLinesColor = TQColor(0x04FB1D); m_verticalLinesDistance = 30; m_verticalLinesScroll = true; m_verticalLinesOffset = 0; m_horizontalScale = 1; m_showHorizontalLines = true; - m_horizontalLinesColor = QColor(0x04FB1D); + m_horizontalLinesColor = TQColor(0x04FB1D); m_horizontalLinesCount = 5; m_showLabels = true; m_showTopBar = false; m_fontSize = 8; - m_backgroundColor = QColor(0x313031); + m_backgroundColor = TQColor(0x313031); } @@ -95,7 +95,7 @@ TrafficGraph::~TrafficGraph() delete [] p; } -bool TrafficGraph::addBeam(const QColor &color) +bool TrafficGraph::addBeam(const TQColor &color) { double* d = new double[m_samples]; memset(d, 0, sizeof(double) * m_samples); @@ -105,7 +105,7 @@ bool TrafficGraph::addBeam(const QColor &color) return true; } -void TrafficGraph::addSample(const QValueList<double>& sampleBuf) +void TrafficGraph::addSample(const TQValueList<double>& sampleBuf) { if (m_beamData.count() != sampleBuf.count()) return; @@ -132,7 +132,7 @@ void TrafficGraph::addSample(const QValueList<double>& sampleBuf) } // Shift data buffers one sample down and insert new samples. - QValueList<double>::ConstIterator s; + TQValueList<double>::ConstIterator s; for (d = m_beamData.first(), s = sampleBuf.begin(); d; d = m_beamData.next(), ++s) { memmove(d, d + 1, (m_samples - 1) * sizeof(double)); d[m_samples - 1] = *s; @@ -151,7 +151,7 @@ void TrafficGraph::changeRange(int beam, double min, double max) m_maxValue = max; } -QValueList<QColor> &TrafficGraph::beamColors() +TQValueList<TQColor> &TrafficGraph::beamColors() { return m_beamColor; } @@ -227,12 +227,12 @@ bool TrafficGraph::showVerticalLines() const return m_showVerticalLines; } -void TrafficGraph::setVerticalLinesColor(const QColor &color) +void TrafficGraph::setVerticalLinesColor(const TQColor &color) { m_verticalLinesColor = color; } -QColor TrafficGraph::verticalLinesColor() const +TQColor TrafficGraph::verticalLinesColor() const { return m_verticalLinesColor; } @@ -267,12 +267,12 @@ bool TrafficGraph::showHorizontalLines() const return m_showHorizontalLines; } -void TrafficGraph::setHorizontalLinesColor(const QColor &color) +void TrafficGraph::setHorizontalLinesColor(const TQColor &color) { m_horizontalLinesColor = color; } -QColor TrafficGraph::horizontalLinesColor() const +TQColor TrafficGraph::horizontalLinesColor() const { return m_horizontalLinesColor; } @@ -317,17 +317,17 @@ int TrafficGraph::fontSize() const return m_fontSize; } -void TrafficGraph::setBackgroundColor(const QColor &color) +void TrafficGraph::setBackgroundColor(const TQColor &color) { m_backgroundColor = color; } -QColor TrafficGraph::backgroundColor() const +TQColor TrafficGraph::backgroundColor() const { return m_backgroundColor; } -void TrafficGraph::resizeEvent(QResizeEvent*) +void TrafficGraph::resizeEvent(TQResizeEvent*) { updateDataBuffers(); } @@ -368,7 +368,7 @@ void TrafficGraph::updateDataBuffers() m_samples = newSampleNum; } -void TrafficGraph::paintEvent(QPaintEvent*) +void TrafficGraph::paintEvent(TQPaintEvent*) { uint w = width(); uint h = height(); @@ -377,14 +377,14 @@ void TrafficGraph::paintEvent(QPaintEvent*) if (w <= 2) return; - QPixmap pm(w, h); - QPainter p; + TQPixmap pm(w, h); + TQPainter p; p.begin(&pm, this); pm.fill(m_backgroundColor); /* Draw white line along the bottom and the right side of the * widget to create a 3D like look. */ - p.setPen(QColor(colorGroup().light())); + p.setPen(TQColor(colorGroup().light())); p.drawLine(0, h - 1, w - 1, h - 1); p.drawLine(w - 1, 0, w - 1, h - 1); @@ -422,18 +422,18 @@ void TrafficGraph::paintEvent(QPaintEvent*) /* Draw horizontal bar with current sensor values at top of display. */ p.setPen(m_horizontalLinesColor); int x0 = w / 2; - p.setFont(QFont(p.font().family(), m_fontSize)); + p.setFont(TQFont(p.font().family(), m_fontSize)); top = p.fontMetrics().height(); h -= top; int h0 = top - 2; - p.drawText(0, 0, x0, top - 2, Qt::AlignCenter, i18n("Bandwidth usage")); + p.drawText(0, 0, x0, top - 2, TQt::AlignCenter, i18n("Bandwidth usage")); p.drawLine(x0 - 1, 1, x0 - 1, h0); p.drawLine(0, top - 1, w - 2, top - 1); double bias = -minValue; double scaleFac = ( w - x0 - 2 ) / range; - QValueList<QColor>::Iterator col; + TQValueList<TQColor>::Iterator col; col = m_beamColor.begin(); for (double *d = m_beamData.first(); d; d = m_beamData.next(), ++col) { @@ -486,7 +486,7 @@ void TrafficGraph::paintEvent(QPaintEvent*) for (int i = 0; i < m_samples; i++, xPos += m_horizontalScale) { double bias = -minValue; - QValueList<QColor>::Iterator col; + TQValueList<TQColor>::Iterator col; col = m_beamColor.begin(); double sum = 0.0; @@ -523,7 +523,7 @@ void TrafficGraph::paintEvent(QPaintEvent*) int x1 = w - ((m_samples + 1) * m_horizontalScale); for (int i = 0; i < m_samples; i++) { - QValueList<QColor>::Iterator col; + TQValueList<TQColor>::Iterator col; col = m_beamColor.begin(); double sum = 0.0; int y = top + h - 2; @@ -551,10 +551,10 @@ void TrafficGraph::paintEvent(QPaintEvent*) /* If the line is longer than 2 pixels we draw only the last * 2 pixels with the bright color. The rest is painted with * a 50% darker color. */ - QPen lastPen = QPen(p.pen()); + TQPen lastPen = TQPen(p.pen()); p.setPen((*col).dark(150)); p.setBrush((*col).dark(150)); - QPointArray pa(4); + TQPointArray pa(4); int prevY = (i == 0) ? y : prevVals[j]; pa.putPoints(0, 1, x1, prevY); pa.putPoints(1, 1, x2, y); @@ -601,20 +601,20 @@ void TrafficGraph::paintEvent(QPaintEvent*) * when width is greater than 60 */ if (m_showHorizontalLines && h > (10 * (m_horizontalLinesCount + 1))) { p.setPen(m_horizontalLinesColor); - p.setFont(QFont(p.font().family(), m_fontSize)); - QString val; + p.setFont(TQFont(p.font().family(), m_fontSize)); + TQString val; for (uint y = 1; y < m_horizontalLinesCount; y++) { p.drawLine(0, top + y * (h / m_horizontalLinesCount), w - 2, top + y * (h / m_horizontalLinesCount)); if (m_showLabels && h > (m_fontSize + 1) * (m_horizontalLinesCount + 1) && w > 60 ) { - val = QString("%1").arg(maxValue - y * (range / m_horizontalLinesCount)); + val = TQString("%1").arg(maxValue - y * (range / m_horizontalLinesCount)); p.drawText(6, top + y * (h / m_horizontalLinesCount) - 1, val); } } if (m_showLabels && h > (m_fontSize + 1) * (m_horizontalLinesCount + 1) && w > 60) { - val = QString("%1").arg(minValue); + val = TQString("%1").arg(minValue); p.drawText(6, top + h - 2, val); } } diff --git a/kftpgrabber/src/widgets/trafficgraph.h b/kftpgrabber/src/widgets/trafficgraph.h index 3822165..2e45981 100644 --- a/kftpgrabber/src/widgets/trafficgraph.h +++ b/kftpgrabber/src/widgets/trafficgraph.h @@ -36,37 +36,37 @@ #ifndef KFTPTRAFFICGRAPH_H #define KFTPTRAFFICGRAPH_H -#include <qpoint.h> -#include <qdialog.h> -#include <qptrlist.h> -#include <qstring.h> -#include <qvaluelist.h> +#include <ntqpoint.h> +#include <ntqdialog.h> +#include <ntqptrlist.h> +#include <ntqstring.h> +#include <ntqvaluelist.h> #define GRAPH_POLYGON 0 #define GRAPH_ORIGINAL 1 -class QColor; +class TQColor; namespace KFTPWidgets { /** @author Jernej Kos */ -class TrafficGraph : public QWidget +class TrafficGraph : public TQWidget { Q_OBJECT public: - TrafficGraph(QWidget *parent = 0, const char *name = 0); + TrafficGraph(TQWidget *parent = 0, const char *name = 0); ~TrafficGraph(); - bool addBeam(const QColor &color); - void addSample(const QValueList<double> &samples); + bool addBeam(const TQColor &color); + void addSample(const TQValueList<double> &samples); void removeBeam(uint pos); void changeRange(int beam, double min, double max); - QValueList<QColor> &beamColors(); + TQValueList<TQColor> &beamColors(); void setUseAutoRange(bool value); bool useAutoRange() const; @@ -86,8 +86,8 @@ public: void setShowVerticalLines(bool value); bool showVerticalLines() const; - void setVerticalLinesColor(const QColor &color); - QColor verticalLinesColor() const; + void setVerticalLinesColor(const TQColor &color); + TQColor verticalLinesColor() const; void setVerticalLinesDistance(int distance); int verticalLinesDistance() const; @@ -98,8 +98,8 @@ public: void setShowHorizontalLines(bool value); bool showHorizontalLines() const; - void setHorizontalLinesColor(const QColor &color); - QColor horizontalLinesColor() const; + void setHorizontalLinesColor(const TQColor &color); + TQColor horizontalLinesColor() const; void setHorizontalLinesCount(int count); int horizontalLinesCount() const; @@ -113,13 +113,13 @@ public: void setFontSize(int size); int fontSize() const; - void setBackgroundColor(const QColor &color); - QColor backgroundColor() const; + void setBackgroundColor(const TQColor &color); + TQColor backgroundColor() const; protected: void updateDataBuffers(); - virtual void resizeEvent(QResizeEvent*); - virtual void paintEvent(QPaintEvent*); + virtual void resizeEvent(TQResizeEvent*); + virtual void paintEvent(TQPaintEvent*); private: double m_minValue; double m_maxValue; @@ -128,24 +128,24 @@ private: uint m_graphStyle; bool m_showVerticalLines; - QColor m_verticalLinesColor; + TQColor m_verticalLinesColor; uint m_verticalLinesDistance; bool m_verticalLinesScroll; uint m_verticalLinesOffset; uint m_horizontalScale; bool m_showHorizontalLines; - QColor m_horizontalLinesColor; + TQColor m_horizontalLinesColor; uint m_horizontalLinesCount; bool m_showLabels; bool m_showTopBar; uint m_fontSize; - QColor m_backgroundColor; + TQColor m_backgroundColor; - QPtrList<double> m_beamData; - QValueList<QColor> m_beamColor; + TQPtrList<double> m_beamData; + TQValueList<TQColor> m_beamColor; int m_samples; }; diff --git a/kftpgrabber/src/widgets/verifier.cpp b/kftpgrabber/src/widgets/verifier.cpp index 1f6c9d9..bdbee22 100644 --- a/kftpgrabber/src/widgets/verifier.cpp +++ b/kftpgrabber/src/widgets/verifier.cpp @@ -38,14 +38,14 @@ #include "misc.h" #include "listviewitem.h" -#include <klocale.h> -#include <klistview.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdelistview.h> +#include <tdemessagebox.h> #include <kprogress.h> #include <kurl.h> -#include <qheader.h> -#include <qlabel.h> +#include <ntqheader.h> +#include <ntqlabel.h> // UI layouts #include "ui/checksum_verifier.h" @@ -54,7 +54,7 @@ using namespace KFTPGrabberBase; namespace KFTPWidgets { -Verifier::Verifier(QWidget *parent, const char *name) +Verifier::Verifier(TQWidget *parent, const char *name) : KDialogBase(parent, name, true, i18n("Checksum verifier"), Cancel, Cancel, true), m_verifier(0) { @@ -75,14 +75,14 @@ Verifier::~Verifier() delete m_verifier; } -void Verifier::setFile(const QString &filename) +void Verifier::setFile(const TQString &filename) { // Create the verifier m_verifier = new KFTPCore::ChecksumVerifier(filename); m_layout->currentFile->setText(KURL(filename).fileName()); - connect(m_verifier, SIGNAL(fileList(QValueList<QPair<QString, QString> >)), this, SLOT(slotHaveFileList(QValueList<QPair<QString, QString> >))); - connect(m_verifier, SIGNAL(fileDone(const QString&, KFTPCore::ChecksumVerifier::Result)), this, SLOT(slotFileDone(const QString&, KFTPCore::ChecksumVerifier::Result))); + connect(m_verifier, SIGNAL(fileList(TQValueList<TQPair<TQString, TQString> >)), this, SLOT(slotHaveFileList(TQValueList<TQPair<TQString, TQString> >))); + connect(m_verifier, SIGNAL(fileDone(const TQString&, KFTPCore::ChecksumVerifier::Result)), this, SLOT(slotFileDone(const TQString&, KFTPCore::ChecksumVerifier::Result))); connect(m_verifier, SIGNAL(progress(int)), this, SLOT(slotProgress(int))); connect(m_verifier, SIGNAL(error()), this, SLOT(slotError())); @@ -90,16 +90,16 @@ void Verifier::setFile(const QString &filename) m_verifier->verify(); } -void Verifier::slotHaveFileList(QValueList<QPair<QString, QString> > list) +void Verifier::slotHaveFileList(TQValueList<TQPair<TQString, TQString> > list) { - for (QValueList<QPair<QString, QString> >::iterator i = list.begin(); i != list.end(); ++i) { + for (TQValueList<TQPair<TQString, TQString> >::iterator i = list.begin(); i != list.end(); ++i) { KFTPWidgets::ListViewItem *item = new KFTPWidgets::ListViewItem(m_layout->fileList); item->setText(0, (*i).first); item->setText(1, (*i).second); } } -void Verifier::slotFileDone(const QString &filename, KFTPCore::ChecksumVerifier::Result result) +void Verifier::slotFileDone(const TQString &filename, KFTPCore::ChecksumVerifier::Result result) { KFTPWidgets::ListViewItem *item = static_cast<KFTPWidgets::ListViewItem*>(m_layout->fileList->findItem(filename, 0)); @@ -107,20 +107,20 @@ void Verifier::slotFileDone(const QString &filename, KFTPCore::ChecksumVerifier: switch (result) { case KFTPCore::ChecksumVerifier::Ok: { item->setPixmap(0, loadSmallPixmap("ok")); - item->setTextColor(0, QColor(0, 200, 0)); - item->setTextColor(1, QColor(0, 200, 0)); + item->setTextColor(0, TQColor(0, 200, 0)); + item->setTextColor(1, TQColor(0, 200, 0)); break; } case KFTPCore::ChecksumVerifier::NotFound: { item->setPixmap(0, loadSmallPixmap("error")); - item->setTextColor(0, QColor(128, 128, 128)); - item->setTextColor(1, QColor(128, 128, 128)); + item->setTextColor(0, TQColor(128, 128, 128)); + item->setTextColor(1, TQColor(128, 128, 128)); break; } case KFTPCore::ChecksumVerifier::Error: { item->setPixmap(0, loadSmallPixmap("error")); - item->setTextColor(0, QColor(255, 0, 0)); - item->setTextColor(1, QColor(255, 0, 0)); + item->setTextColor(0, TQColor(255, 0, 0)); + item->setTextColor(1, TQColor(255, 0, 0)); break; } } diff --git a/kftpgrabber/src/widgets/verifier.h b/kftpgrabber/src/widgets/verifier.h index 6f1ee1e..53cdf53 100644 --- a/kftpgrabber/src/widgets/verifier.h +++ b/kftpgrabber/src/widgets/verifier.h @@ -41,8 +41,8 @@ #include <kdialogbase.h> -#include <qvaluelist.h> -#include <qpair.h> +#include <ntqvaluelist.h> +#include <ntqpair.h> class VerifierLayout; @@ -55,16 +55,16 @@ class Verifier : public KDialogBase { Q_OBJECT public: - Verifier(QWidget *parent = 0, const char *name = 0); + Verifier(TQWidget *parent = 0, const char *name = 0); ~Verifier(); - void setFile(const QString &filename); + void setFile(const TQString &filename); private: VerifierLayout *m_layout; KFTPCore::ChecksumVerifier *m_verifier; private slots: - void slotHaveFileList(QValueList<QPair<QString, QString> > list); - void slotFileDone(const QString &filename, KFTPCore::ChecksumVerifier::Result result); + void slotHaveFileList(TQValueList<TQPair<TQString, TQString> > list); + void slotFileDone(const TQString &filename, KFTPCore::ChecksumVerifier::Result result); void slotProgress(int percent); void slotError(); }; diff --git a/kftpgrabber/src/widgets/widgetlister.cpp b/kftpgrabber/src/widgets/widgetlister.cpp index 55022d2..933101e 100644 --- a/kftpgrabber/src/widgets/widgetlister.cpp +++ b/kftpgrabber/src/widgets/widgetlister.cpp @@ -35,28 +35,28 @@ */ #include "widgetlister.h" -#include <klocale.h> +#include <tdelocale.h> #include <kguiitem.h> #include <kpushbutton.h> #include <kdialog.h> -#include <qpushbutton.h> -#include <qlayout.h> -#include <qhbox.h> +#include <ntqpushbutton.h> +#include <ntqlayout.h> +#include <ntqhbox.h> namespace KFTPWidgets { -WidgetLister::WidgetLister(QWidget *parent, int minWidgets, int maxWidgets) - : QWidget(parent) +WidgetLister::WidgetLister(TQWidget *parent, int minWidgets, int maxWidgets) + : TQWidget(parent) { m_widgetList.setAutoDelete(true); - m_minWidgets = QMAX(minWidgets, 0); - m_maxWidgets = QMAX(maxWidgets, m_minWidgets + 1); + m_minWidgets = TQMAX(minWidgets, 0); + m_maxWidgets = TQMAX(maxWidgets, m_minWidgets + 1); // The button box - m_layout = new QVBoxLayout(this, 0, 4); - m_buttonBox = new QHBox(this); + m_layout = new TQVBoxLayout(this, 0, 4); + m_buttonBox = new TQHBox(this); m_buttonBox->setSpacing(KDialog::spacingHint()); m_layout->addWidget(m_buttonBox); @@ -66,7 +66,7 @@ WidgetLister::WidgetLister(QWidget *parent, int minWidgets, int maxWidgets) m_buttonFewer = new KPushButton(KGuiItem(i18n("fewer widgets", "Fewer"), "button_fewer"), m_buttonBox); m_buttonBox->setStretchFactor(m_buttonFewer, 0); - QWidget *spacer = new QWidget(m_buttonBox); + TQWidget *spacer = new TQWidget(m_buttonBox); m_buttonBox->setStretchFactor(spacer, 1); m_buttonClear = new KPushButton(KGuiItem(i18n("clear widgets", "Clear"), "locationbar_erase"), m_buttonBox); @@ -101,7 +101,7 @@ void WidgetLister::clear() setNumberShown(m_minWidgets); // Clear remaining widgets - QPtrListIterator<QWidget> i(m_widgetList); + TQPtrListIterator<TQWidget> i(m_widgetList); for (i.toFirst(); i.current(); ++i) clearWidget((*i)); @@ -114,7 +114,7 @@ void WidgetLister::slotClear() clear(); } -void WidgetLister::addWidget(QWidget *widget) +void WidgetLister::addWidget(TQWidget *widget) { if (!widget) widget = createWidget(this); @@ -135,20 +135,20 @@ void WidgetLister::removeWidget() emit widgetRemoved(); } -void WidgetLister::clearWidget(QWidget *widget) +void WidgetLister::clearWidget(TQWidget *widget) { Q_UNUSED(widget) } -QWidget *WidgetLister::createWidget(QWidget* parent) +TQWidget *WidgetLister::createWidget(TQWidget* parent) { - return new QWidget(parent); + return new TQWidget(parent); } void WidgetLister::setNumberShown(int number) { - int superfluousWidgets = QMAX((int) m_widgetList.count() - number, 0); - int missingWidgets = QMAX(number - (int) m_widgetList.count(), 0); + int superfluousWidgets = TQMAX((int) m_widgetList.count() - number, 0); + int missingWidgets = TQMAX(number - (int) m_widgetList.count(), 0); // Remove superfluous widgets for (; superfluousWidgets; superfluousWidgets--) diff --git a/kftpgrabber/src/widgets/widgetlister.h b/kftpgrabber/src/widgets/widgetlister.h index 8aac58f..40192eb 100644 --- a/kftpgrabber/src/widgets/widgetlister.h +++ b/kftpgrabber/src/widgets/widgetlister.h @@ -36,23 +36,23 @@ #ifndef KFTPWIDGETSWIDGETLISTER_H #define KFTPWIDGETSWIDGETLISTER_H -#include <qwidget.h> -#include <qptrlist.h> +#include <ntqwidget.h> +#include <ntqptrlist.h> -class QPushButton; -class QVBoxLayout; -class QHBox; +class TQPushButton; +class TQVBoxLayout; +class TQHBox; namespace KFTPWidgets { /** - * This class has been adopted from KDEPIM with slight functional and style + * This class has been adopted from TDEPIM with slight functional and style * changes. * * @author Jernej Kos * @author Marc Mutz <marc@mutz.com> */ -class WidgetLister : public QWidget +class WidgetLister : public TQWidget { Q_OBJECT public: @@ -63,7 +63,7 @@ public: * @param minWidgets Minimum number of widgets in the list * @param maxWidgets Maximum number of widgets in the list */ - WidgetLister(QWidget* parent, int minWidgets, int maxWidgets); + WidgetLister(TQWidget* parent, int minWidgets, int maxWidgets); /** * Class destructor. @@ -112,12 +112,12 @@ protected: * what it is asked to do. You want to reimplement this method if you want to * initialize the the widget when showing it on screen. Make sure you call this * implementaion, though, since you cannot put the widget on screen from derived - * classes (@p m_layout is private). Make sure the parent of the QWidget to add is + * classes (@p m_layout is private). Make sure the parent of the TQWidget to add is * this WidgetLister. * * @param widget The widget that should be added */ - virtual void addWidget(QWidget *widget = 0); + virtual void addWidget(TQWidget *widget = 0); /** * Removes a single (always the last) widget. Doesn't care if there are still only @@ -134,24 +134,24 @@ protected: * * @param widget The widget that should be cleared */ - virtual void clearWidget(QWidget *widget); + virtual void clearWidget(TQWidget *widget); /** * This method should return a new widget to add to the widget list. * * @param parent The parent widget - * @return A valid QWidget + * @return A valid TQWidget */ - virtual QWidget *createWidget(QWidget *parent); + virtual TQWidget *createWidget(TQWidget *parent); protected: - QPtrList<QWidget> m_widgetList; + TQPtrList<TQWidget> m_widgetList; int m_minWidgets; int m_maxWidgets; signals: /** * This signal is emitted whenever a widget gets added. */ - void widgetAdded(QWidget *widget); + void widgetAdded(TQWidget *widget); /** * This signal is emitted whenever a widget gets removed. @@ -165,11 +165,11 @@ signals: private: void enableControls(); - QPushButton *m_buttonMore; - QPushButton *m_buttonFewer; - QPushButton *m_buttonClear; - QVBoxLayout *m_layout; - QHBox *m_buttonBox; + TQPushButton *m_buttonMore; + TQPushButton *m_buttonFewer; + TQPushButton *m_buttonClear; + TQVBoxLayout *m_layout; + TQHBox *m_buttonBox; }; } diff --git a/translations/de/messages/kftpgrabber.po b/translations/de/messages/kftpgrabber.po index 7fa07db..bf26614 100644 --- a/translations/de/messages/kftpgrabber.po +++ b/translations/de/messages/kftpgrabber.po @@ -13,7 +13,7 @@ msgstr "" "POT-Creation-Date: 2007-04-15 07:14+0200\n" "PO-Revision-Date: 2007-04-18 15:59+0200\n" "Last-Translator: Jannick Kuhr <jannick.kuhr@kdemail.net>\n" -"Language-Team: Deutsch <kde-i18n-de@kde.org>\n" +"Language-Team: Deutsch <tde-i18n-de@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/translations/el/messages/kftpgrabber.po b/translations/el/messages/kftpgrabber.po index 716eb02..37aa6be 100644 --- a/translations/el/messages/kftpgrabber.po +++ b/translations/el/messages/kftpgrabber.po @@ -8,7 +8,7 @@ msgstr "" "POT-Creation-Date: 2007-04-15 07:14+0200\n" "PO-Revision-Date: 2007-04-19 18:04+0300\n" "Last-Translator: Toussis Manolis <manolis@koppermind.homelinux.org>\n" -"Language-Team: greek <kde-i18n-el@kde.org>\n" +"Language-Team: greek <tde-i18n-el@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/translations/es/messages/kftpgrabber.po b/translations/es/messages/kftpgrabber.po index 1b0c610..ee178ad 100644 --- a/translations/es/messages/kftpgrabber.po +++ b/translations/es/messages/kftpgrabber.po @@ -579,7 +579,7 @@ msgstr "&Nueva sesión" #: src/mainactions.cpp:80 msgid "&Left Side" -msgstr "&Lado izquierdo" +msgstr "&Lado iztquierdo" #: src/mainactions.cpp:81 msgid "&Right Side" @@ -694,7 +694,7 @@ msgstr "¿Desea limpiar la lista de los servidores accedidos recientemente?" #: src/widgets/quickconnect.cpp:286 msgid "a hostname" -msgstr "un nombre de máquina" +msgstr "un nombre de mátquina" #: src/widgets/quickconnect.cpp:289 msgid "a valid port" @@ -845,7 +845,7 @@ msgstr "Coincidir con tod&as las siguientes" #: src/widgets/filtereditor.cpp:338 msgid "Match an&y of the following" -msgstr "Coincidir con cu&alquiera de las siguientes" +msgstr "Coincidir con cu&altquiera de las siguientes" #: src/widgets/searchdialog.cpp:54 msgid "Search & Replace" @@ -1707,7 +1707,7 @@ msgstr "&Otros elementos de la interfaz" #: rc.cpp:27 #, no-c-format msgid "Show left sidebar" -msgstr "Mostrar la barra lateral izquierda" +msgstr "Mostrar la barra lateral iztquierda" #. i18n: file ./src/ui/kftpsearchlayout.ui line 22 #: rc.cpp:40 @@ -1766,7 +1766,7 @@ msgstr "Nombre del servidor:" #: rc.cpp:64 rc.cpp:180 rc.cpp:201 rc.cpp:468 #, no-c-format msgid "Host:" -msgstr "Máquina:" +msgstr "Mátquina:" #. i18n: file ./src/ui/kftpsearchlayout.ui line 109 #: rc.cpp:67 rc.cpp:183 rc.cpp:204 rc.cpp:352 rc.cpp:505 @@ -1991,7 +1991,7 @@ msgstr "Forzar PORT/EPRT para &usar la IP configurada" #: rc.cpp:240 #, no-c-format msgid "IP/hostname:" -msgstr "IP/Nombre de la máquina:" +msgstr "IP/Nombre de la mátquina:" #. i18n: file ./src/ui/config_transfers.ui line 95 #: rc.cpp:243 @@ -2160,7 +2160,7 @@ msgstr "ftpSiteProperties" #: rc.cpp:333 #, no-c-format msgid "Hostname:" -msgstr "Nombre de la máquina:" +msgstr "Nombre de la mátquina:" #. i18n: file ./src/ui/bookmark_properties.ui line 69 #: rc.cpp:336 rc.cpp:477 @@ -2382,7 +2382,7 @@ msgstr "Introduzca el URL completo en esta caja" #: rc.cpp:471 #, no-c-format msgid "Enter ftp's hostname" -msgstr "Introduzca el nombre de la máquina FTP" +msgstr "Introduzca el nombre de la mátquina FTP" #. i18n: file ./src/ui/kftpquickconnectlayout.ui line 321 #: rc.cpp:493 @@ -2964,7 +2964,7 @@ msgstr "Mostrar el tamaño del directorio." #: rc.cpp:806 #, no-c-format msgid "Show left sidebar." -msgstr "Mostrar la barra lateral izquierda." +msgstr "Mostrar la barra lateral iztquierda." #. i18n: file ./src/kftpgrabberui.rc line 5 #: rc.cpp:809 diff --git a/translations/gl/messages/kftpgrabber.po b/translations/gl/messages/kftpgrabber.po index 555f3b1..9e6453a 100644 --- a/translations/gl/messages/kftpgrabber.po +++ b/translations/gl/messages/kftpgrabber.po @@ -445,11 +445,11 @@ msgstr "Ocioso." #: src/engine/socket.cpp:517 src/engine/socket.cpp:553 msgid "Scan complete." -msgstr "Pesquisa completa." +msgstr "Pestquisa completa." #: src/engine/socket.cpp:567 msgid "Starting recursive directory scan..." -msgstr "A iniciar a pesquisa recursiva do cartafol..." +msgstr "A iniciar a pestquisa recursiva do cartafol..." #: src/engine/connectionretry.cpp:66 msgid "Waiting %1 seconds before reconnect..." @@ -686,7 +686,7 @@ msgstr "" #: src/widgets/quickconnect.cpp:286 msgid "a hostname" -msgstr "un nome de máquina" +msgstr "un nome de mátquina" #: src/widgets/quickconnect.cpp:289 msgid "a valid port" @@ -1767,7 +1767,7 @@ msgstr "Nome do servidor:" #: rc.cpp:64 rc.cpp:180 rc.cpp:201 rc.cpp:468 #, no-c-format msgid "Host:" -msgstr "Máquina:" +msgstr "Mátquina:" #. i18n: file ./src/ui/kftpsearchlayout.ui line 109 #: rc.cpp:67 rc.cpp:183 rc.cpp:204 rc.cpp:352 rc.cpp:505 @@ -1991,7 +1991,7 @@ msgstr "Obrigar a PORT/EPRT a &usar o IP configurado" #: rc.cpp:240 #, no-c-format msgid "IP/hostname:" -msgstr "IP/nome da máquina:" +msgstr "IP/nome da mátquina:" #. i18n: file ./src/ui/config_transfers.ui line 95 #: rc.cpp:243 @@ -2161,7 +2161,7 @@ msgstr "ftpSiteProperties" #: rc.cpp:333 #, no-c-format msgid "Hostname:" -msgstr "Máquina:" +msgstr "Mátquina:" #. i18n: file ./src/ui/bookmark_properties.ui line 69 #: rc.cpp:336 rc.cpp:477 @@ -2383,7 +2383,7 @@ msgstr "Indique o URL completo nesta opzón" #: rc.cpp:471 #, no-c-format msgid "Enter ftp's hostname" -msgstr "Indique o nome da máquina FTP" +msgstr "Indique o nome da mátquina FTP" #. i18n: file ./src/ui/kftpquickconnectlayout.ui line 321 #: rc.cpp:493 @@ -3102,13 +3102,13 @@ msgstr "Barra de Favoritos" #~ msgstr "Borrar un usuário, pode ser lido con \"site READD\"" #~ msgid "Delete a user, may be readded with site READD<br><br><i>Example:</i> site deluser Archimede<br><br>This will activate the flag DELETED (6) for the user 'Archimede'.<br>In order to fully delete this user you will need to do a 'site purge'<br>" -#~ msgstr "Borra un usuário, pode ser lido co comando \"site READD\"<br><br><i>Exemplo:</i> site deluser Arquimedes<br><br>Isto activará a opzón DELETED (6) para o usuário \"Arquimedes\".<br>Para borrar por completo este usuário, terá que facer un \"site purge\"<br>" +#~ msgstr "Borra un usuário, pode ser lido co comando \"site READD\"<br><br><i>Exemplo:</i> site deluser Artquimedes<br><br>Isto activará a opzón DELETED (6) para o usuário \"Artquimedes\".<br>Para borrar por completo este usuário, terá que facer un \"site purge\"<br>" #~ msgid "Change user's password" #~ msgstr "Mudar o contrasinal dun usuário" #~ msgid "Change user's password<br><i>Example:</i> site chpass Archimede newpassword<br>This would change the password to 'newpassword' for the<br>user 'Archimede'.<br><br>See \"site passwd\" for more info if you get a Password is not secure<br>enough error.<br><br>* Denotes any password, <i>Example:</i> site chpass arch *<br>This will allow arch to login with any password<br><br>@ Denotes any email-like password, <i>Example:</i> site chpass arch @<br>This will allow arch to login with a@b.com but not ab.com<br>" -#~ msgstr "Mudar o contrasinal dun usuário<br><i>Exemplo:</i> site chpass Arquimedes novo_contrasinal<br>Mudará o contrasinal do usuário \"Arquimedes\"<br>para \"novo_contrasinal\".<br><br>Consulte \"site passwd\" para máis informazón se obtén dun contrasinal que non sexa seguro<br>.<br><br>O * corresponde a calquer contrasinal, <i>Exemplo:</i> site chpass arq *<br>Isto permite que \"arq\" se autentique con calquer contrasinal<br><br>@ Corresponde a calquer contrasinal semellante a un enderezo de correo, <i>Exemplo:</i> site chpass arq @<br>Isto permitirá a \"arq\" conectar-se como \"a@b.com\" pero non como \"ab. com\"<br>" +#~ msgstr "Mudar o contrasinal dun usuário<br><i>Exemplo:</i> site chpass Artquimedes novo_contrasinal<br>Mudará o contrasinal do usuário \"Artquimedes\"<br>para \"novo_contrasinal\".<br><br>Consulte \"site passwd\" para máis informazón se obtén dun contrasinal que non sexa seguro<br>.<br><br>O * corresponde a calquer contrasinal, <i>Exemplo:</i> site chpass arq *<br>Isto permite que \"arq\" se autentique con calquer contrasinal<br><br>@ Corresponde a calquer contrasinal semellante a un enderezo de correo, <i>Exemplo:</i> site chpass arq @<br>Isto permitirá a \"arq\" conectar-se como \"a@b.com\" pero non como \"ab. com\"<br>" #~ msgid "Toggle the user's gadmin status for the given group" #~ msgstr "Comutar o estado de \"gadmin\" do usuário para o grupo indicado" @@ -3120,13 +3120,13 @@ msgstr "Barra de Favoritos" #~ msgstr "Mostrar as opzóns dun usuário" #~ msgid "Display a user's flags<br><br><i>Example:</i> site flags<br><br>This will show your own flags.<br><br><i>Example:</i> site flags Archimede<br><br>This will show flags of user Archimede.<br>" -#~ msgstr "Mostra as opzóns dun usuário<br><br><i>Exemplo:</i> site flags<br><br>Isto mostrará as suas próprias opzóns.<br><br><i>Exemplo:</i> site flags Arquimedes<br><br>Isto mostrará as opzóns do usuário Arquimedes.<br>" +#~ msgstr "Mostra as opzóns dun usuário<br><br><i>Exemplo:</i> site flags<br><br>Isto mostrará as suas próprias opzóns.<br><br><i>Exemplo:</i> site flags Artquimedes<br><br>Isto mostrará as opzóns do usuário Artquimedes.<br>" #~ msgid "Kick a user off the site" #~ msgstr "Expulsar un usuário do sítio" #~ msgid "Kick a user off the site<br><br><i>Example:</i> site kick Archimede<br><br>This will kill all connections for the user 'Archimede'<br>" -#~ msgstr "Expulsar un usuário do sítio<br><br><i>Exemplo:</i> site kick Arquimedes<br><br>Isto matará todas as conexóns do usuário \"Arquimedes\"<br>" +#~ msgstr "Expulsar un usuário do sítio<br><br><i>Exemplo:</i> site kick Artquimedes<br><br>Isto matará todas as conexóns do usuário \"Artquimedes\"<br>" #~ msgid "Remove deleted users, site READD will NOT work for purged uers." #~ msgstr "Elimina os usuários borrados, \"site READD\" non funcionará para os usuários purgados." @@ -3138,7 +3138,7 @@ msgstr "Barra de Favoritos" #~ msgstr "Engadir de novo o usuário" #~ msgid "Readd user<br><br><i>Example:</i> site readd<br><br>This will show a list of users that can be readded.<br>(You can also achieve this with \"site users deleted\")<br><br><i>Example:</i> site readd Archimede<br><br>This will remove the DELETED flag for user 'Archimede'.<br><br><b>NOTE:</b> When readding a user from a group the group must have available slots<br>left, even when you are a siteop.<br>" -#~ msgstr "Engadir de novo o usuário<br><br><i>Exemplo:</i> site readd<br><br>Isto mostrará unha lista dos usuários que poden ser engadidos de novo. <br>(Tamén pode conseguir isto con \" site users deleted\")<br><br><i>Exemplo:</i> site readd Arquimedes<br><br>Isto retirará a opzón DELETED do usuário \"Arquimedes\".<br><br><b>NOTA:</b> Ao volver a engadir un usuário dun grupo, este debe ter espazos libres disponíbeis,<br>mesmo cando sexa é un \"siteop\" (operador do sítio) .<br>" +#~ msgstr "Engadir de novo o usuário<br><br><i>Exemplo:</i> site readd<br><br>Isto mostrará unha lista dos usuários que poden ser engadidos de novo. <br>(Tamén pode conseguir isto con \" site users deleted\")<br><br><i>Exemplo:</i> site readd Artquimedes<br><br>Isto retirará a opzón DELETED do usuário \"Artquimedes\".<br><br><b>NOTA:</b> Ao volver a engadir un usuário dun grupo, este debe ter espazos libres disponíbeis,<br>mesmo cando sexa é un \"siteop\" (operador do sítio) .<br>" #~ msgid "Display a user's upload/download statistics" #~ msgstr "Mostrar as estatísticas de envio/recepzón dun usuário" @@ -3150,7 +3150,7 @@ msgstr "Barra de Favoritos" #~ msgstr "Listar os usuários / Mostrar informazón detallada sobre un usuário" #~ msgid "Lists users / Shows detailed info about a user<br><br><i>Example:</i> site user<br><br>This will display a list of all users currently on site.<br><br><i>Example:</i> site user Archimede<br><br>This will show detailed information about user 'Archimede'.<br>" -#~ msgstr "Listar os usuários / Mostrar informazón detallada sobre un usuário<br><br><i>Exemplo:</i> site user<br><br>Isto mostrará unha lista con todos os usuários conectados ao sítio.<br><br><i>Exemplo:</i> site user Arquimedes<br><br>Isto mostrará informazón detallada sobre o usuário \"Arquimedes\".<br>" +#~ msgstr "Listar os usuários / Mostrar informazón detallada sobre un usuário<br><br><i>Exemplo:</i> site user<br><br>Isto mostrará unha lista con todos os usuários conectados ao sítio.<br><br><i>Exemplo:</i> site user Artquimedes<br><br>Isto mostrará informazón detallada sobre o usuário \"Artquimedes\".<br>" #~ msgid "Shows available groups" #~ msgstr "Mostra os grupos disponíbeis" @@ -3345,7 +3345,7 @@ msgstr "Barra de Favoritos" #~ msgstr "Verificar a última data de conexón dun usuário" #~ msgid "Check when a user was last online<br><br><i>Example:</i> site seen Archimede<br><br>This will display the last time Archimede logged in.<br>" -#~ msgstr "Verificar a última data de conexón dun usuário<br><br><i>Exemplo:</i> site seen Arquimedes<br><br>Isto mostrará a última vez que Arquimedes se conectou.<br>" +#~ msgstr "Verificar a última data de conexón dun usuário<br><br><i>Exemplo:</i> site seen Artquimedes<br><br>Isto mostrará a última vez que Artquimedes se conectou.<br>" #~ msgid "Displays the userfile in raw format" #~ msgstr "Mostrar en bruto o ficheiro do usuário" diff --git a/translations/it/messages/kftpgrabber.po b/translations/it/messages/kftpgrabber.po index 8972c62..37c0f89 100644 --- a/translations/it/messages/kftpgrabber.po +++ b/translations/it/messages/kftpgrabber.po @@ -8,7 +8,7 @@ msgstr "" "POT-Creation-Date: 2007-04-15 07:14+0200\n" "PO-Revision-Date: 2007-04-21 14:26+0200\n" "Last-Translator: Nicola Ruggero <nicola@nxnt.org>\n" -"Language-Team: Italian <kde-i18n-it@kde.org>\n" +"Language-Team: Italian <tde-i18n-it@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/translations/lt/messages/kftpgrabber.po b/translations/lt/messages/kftpgrabber.po index 9070ee8..66514e3 100644 --- a/translations/lt/messages/kftpgrabber.po +++ b/translations/lt/messages/kftpgrabber.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2007-04-15 07:14+0200\n" "PO-Revision-Date: 2005-09-10 19:40+0300\n" "Last-Translator: Donatas Glodenis <dgvirtual@akl.lt>\n" -"Language-Team: Lithuanian <kde-i18n-lt@kde.org>\n" +"Language-Team: Lithuanian <tde-i18n-lt@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/translations/nl/messages/kftpgrabber.po b/translations/nl/messages/kftpgrabber.po index b4013e0..b1fad21 100644 --- a/translations/nl/messages/kftpgrabber.po +++ b/translations/nl/messages/kftpgrabber.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2007-04-15 07:14+0200\n" "PO-Revision-Date: 2006-12-11 19:57+0100\n" "Last-Translator: Rinse de Vries <rinsedevries@kde.nl>\n" -"Language-Team: Dutch <kde-i18n-nl@kde.org>\n" +"Language-Team: Dutch <tde-i18n-nl@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/translations/pt/messages/kftpgrabber.po b/translations/pt/messages/kftpgrabber.po index cbed3a7..fe968dd 100644 --- a/translations/pt/messages/kftpgrabber.po +++ b/translations/pt/messages/kftpgrabber.po @@ -4,7 +4,7 @@ msgstr "" "POT-Creation-Date: 2007-04-15 07:14+0200\n" "PO-Revision-Date: 2007-04-10 11:05+0100\n" "Last-Translator: José Nuno Coelho Pires <jncp@netcabo.pt>\n" -"Language-Team: LANGUAGE <kde-i18n-doc@kde.org>\n" +"Language-Team: LANGUAGE <tde-i18n-doc@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -457,11 +457,11 @@ msgstr "Parado." #: src/engine/socket.cpp:517 src/engine/socket.cpp:553 msgid "Scan complete." -msgstr "Pesquisa completa." +msgstr "Pestquisa completa." #: src/engine/socket.cpp:567 msgid "Starting recursive directory scan..." -msgstr "A iniciar a pesquisa recursiva da pasta..." +msgstr "A iniciar a pestquisa recursiva da pasta..." #: src/engine/connectionretry.cpp:66 msgid "Waiting %1 seconds before reconnect..." @@ -700,7 +700,7 @@ msgstr "Deseja limpar a lista dos servidores acedidos recentemente ?" #: src/widgets/quickconnect.cpp:286 msgid "a hostname" -msgstr "um nome de máquina" +msgstr "um nome de mátquina" #: src/widgets/quickconnect.cpp:289 msgid "a valid port" @@ -1770,7 +1770,7 @@ msgstr "Nome do servidor:" #: rc.cpp:64 rc.cpp:180 rc.cpp:201 rc.cpp:468 #, no-c-format msgid "Host:" -msgstr "Máquina:" +msgstr "Mátquina:" #. i18n: file ./src/ui/kftpsearchlayout.ui line 109 #: rc.cpp:67 rc.cpp:183 rc.cpp:204 rc.cpp:352 rc.cpp:505 @@ -1995,7 +1995,7 @@ msgstr "Obrigar o PORT/EPRT a &usar o IP configurado" #: rc.cpp:240 #, no-c-format msgid "IP/hostname:" -msgstr "IP/nome da máquina:" +msgstr "IP/nome da mátquina:" #. i18n: file ./src/ui/config_transfers.ui line 95 #: rc.cpp:243 @@ -2164,7 +2164,7 @@ msgstr "ftpSiteProperties" #: rc.cpp:333 #, no-c-format msgid "Hostname:" -msgstr "Máquina:" +msgstr "Mátquina:" #. i18n: file ./src/ui/bookmark_properties.ui line 69 #: rc.cpp:336 rc.cpp:477 @@ -2386,7 +2386,7 @@ msgstr "Indique o URL completo nesta opção" #: rc.cpp:471 #, no-c-format msgid "Enter ftp's hostname" -msgstr "Indique o nome da máquina de FTP" +msgstr "Indique o nome da mátquina de FTP" #. i18n: file ./src/ui/kftpquickconnectlayout.ui line 321 #: rc.cpp:493 @@ -2735,7 +2735,7 @@ msgstr "A codificação por omissão do 'site'." #: rc.cpp:698 #, no-c-format msgid "Recent sites accessed via quick connect." -msgstr "Máquinas recentes acedidas através das ligações rápidas." +msgstr "Mátquinas recentes acedidas através das ligações rápidas." #. i18n: file ./src/misc/kftpgrabber.kcfg line 124 #: rc.cpp:701 |