diff options
86 files changed, 1354 insertions, 1354 deletions
@@ -33,7 +33,7 @@ KlamAV 0.42 wrong (Dirk Mueller dmueller at suse.de) o Fix the ui for archivelimits to show "default" when its 0, so that the user isn`t confusing it with "no limit". ( Dirk Mueller dmueller at suse.de) - o Restrict khtml`s parsing and not allow javascript by default in the update dialog. also, + o Restrict tdehtml`s parsing and not allow javascript by default in the update dialog. also, deleting the filelist is too much because it is already deleted via qojbect (Dirk Mueller dmueller at suse.de) o Fix https://bugs.gentoo.org/show_bug.cgi?id=171414 @@ -357,7 +357,7 @@ Previous Releases: ---------- * Mail Scanning much faster (klammail now uses clamd to scan and will start clamd if it is not already up and running). * Some enhancements to the klamscan interface (thanks to malakai for his suggestions). -* Less dirty file management when moving files in and out of quarantine. (Using KDE's KIO interface instead of 'mv' &c.) +* Less dirty file management when moving files in and out of quarantine. (Using KDE's TDEIO interface instead of 'mv' &c.) 10/10/2004 @@ -3,7 +3,7 @@ #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- -PROJECT_NAME = klamav02.kdevelop +PROJECT_NAME = klamav02.tdevelop PROJECT_NUMBER = 0.1 OUTPUT_DIRECTORY = OUTPUT_LANGUAGE = English diff --git a/Makefile.in b/Makefile.in index 40d69f1..3c47934 100644 --- a/Makefile.in +++ b/Makefile.in @@ -173,24 +173,24 @@ LIBZ = @LIBZ@ LIB_CLAM = @LIB_CLAM@ LIB_KAB = @LIB_KAB@ LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ +LIB_TDECORE = @LIB_TDECORE@ LIB_KDED = @LIB_KDED@ -LIB_KDEPIM = @LIB_KDEPIM@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ -LIB_KDNSSD = @LIB_KDNSSD@ +LIB_TDEPIM = @LIB_TDEPIM@ +LIB_TDEPRINT = @LIB_TDEPRINT@ +LIB_TDEUI = @LIB_TDEUI@ +LIB_TDEDNSSD = @LIB_TDEDNSSD@ LIB_KFILE = @LIB_KFILE@ LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIMPROXY = @LIB_KIMPROXY@ -LIB_KIO = @LIB_KIO@ +LIB_TDEHTML = @LIB_TDEHTML@ +LIB_TDEIMPROXY = @LIB_TDEIMPROXY@ +LIB_TDEIO = @LIB_TDEIO@ LIB_KJS = @LIB_KJS@ LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ -LIB_KUNITTEST = @LIB_KUNITTEST@ -LIB_KUTILS = @LIB_KUTILS@ +LIB_TDEPARTS = @LIB_TDEPARTS@ +LIB_TDESPELL = @LIB_TDESPELL@ +LIB_TDESYCOCA = @LIB_TDESYCOCA@ +LIB_TDEUNITTEST = @LIB_TDEUNITTEST@ +LIB_TDEUTILS = @LIB_TDEUTILS@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ @@ -202,7 +202,7 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ -MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ +MAKETDEWIDGETS = @MAKETDEWIDGETS@ MCOPIDL = @MCOPIDL@ MEINPROC = @MEINPROC@ MOC = @MOC@ @@ -307,7 +307,7 @@ kde_styledir = @kde_styledir@ kde_templatesdir = @kde_templatesdir@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ -kdeinitdir = @kdeinitdir@ +tdeinitdir = @tdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -25,7 +25,7 @@ DONE *allow multiple instances of same filename in quarantine *add first-run wizard *i18n everything -*kconfigxt the options and prettify/fix the options dialogs +*tdeconfigxt the options and prettify/fix the options dialogs *implement logging for all activity and a log viewer WON'T DO diff --git a/acinclude.m4 b/acinclude.m4 index fad2a7f..5a6ad85 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)]) - AC_SUBST(MAKEKDEWIDGETS) + KDE_FIND_PATH(maketdewidgets, MAKETDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(maketdewidgets)]) + AC_SUBST(MAKETDEWIDGETS) 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 @@ -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 ]) @@ -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,15 +1805,15 @@ 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" kde_widgetdir=NO dnl this might be somewhere else -AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir) +AC_FIND_FILE("kde3/plugins/designer/tdewidgets.la", $kde_libdirs, kde_widgetdir) if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then AC_MSG_ERROR([ @@ -1821,10 +1821,10 @@ in the prefix, you've chosen, are no KDE libraries installed. This will fail. So, check this please and use another prefix!]) fi -if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then +if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/tdewidgets.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,7 +2030,7 @@ 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([ @@ -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_TDEIO, "-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_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") + AC_SUBST(LIB_TDEUTILS, "-ltdeutils") + AC_SUBST(LIB_TDEPIM, "-ltdepim") + AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") - AC_SUBST(LIB_KDNSSD, "-lkdnssd") - AC_SUBST(LIB_KUNITTEST, "-lkunittest") + AC_SUBST(LIB_TDEDNSSD, "-ltdednssd") + AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest") # these are for backward compatibility - AC_SUBST(LIB_KSYCOCA, "-lkio") - AC_SUBST(LIB_KFILE, "-lkio") + AC_SUBST(LIB_TDESYCOCA, "-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_TDEIO, "-ltdeio") + AC_SUBST(LIB_TDESYCOCA, "-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_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-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 @@ -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) @@ -3499,16 +3499,16 @@ AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch config AC_DEFUN([KDE_CHECK_LIB64], [ - kdelibsuff="$kde_libs_suffix" - if test -z "$kdelibsuff"; then - kdelibsuff="no" + tdelibsuff="$kde_libs_suffix" + if test -z "$tdelibsuff"; then + tdelibsuff="no" fi AC_ARG_ENABLE(libsuffix, AC_HELP_STRING([--enable-libsuffix], [/lib directory suffix (64,32,none,auto[=default])]), - kdelibsuff=$enableval) + tdelibsuff=$enableval) - if test "$kdelibsuff" = "auto"; then + if test "$tdelibsuff" = "auto"; then cat > conftest.c << EOF #include <stdio.h> @@ -3516,26 +3516,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 ]) @@ -3553,7 +3553,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 @@ -4560,7 +4560,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) @@ -4948,14 +4948,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 @@ -4979,25 +4979,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` @@ -5006,7 +5006,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 @@ -5663,7 +5663,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 @@ -5683,7 +5683,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 @@ -5920,9 +5920,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/admin/acinclude.m4.in b/admin/acinclude.m4.in index db3de08..20db3f6 100644 --- a/admin/acinclude.m4.in +++ b/admin/acinclude.m4.in @@ -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)]) - AC_SUBST(MAKEKDEWIDGETS) + KDE_FIND_PATH(maketdewidgets, MAKETDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(maketdewidgets)]) + AC_SUBST(MAKETDEWIDGETS) 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 @@ -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 ]) @@ -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,15 +1805,15 @@ 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" kde_widgetdir=NO dnl this might be somewhere else -AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir) +AC_FIND_FILE("kde3/plugins/designer/tdewidgets.la", $kde_libdirs, kde_widgetdir) if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then AC_MSG_ERROR([ @@ -1821,10 +1821,10 @@ in the prefix, you've chosen, are no KDE libraries installed. This will fail. So, check this please and use another prefix!]) fi -if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then +if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/tdewidgets.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,7 +2030,7 @@ 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([ @@ -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_TDEIO, "-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_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") + AC_SUBST(LIB_TDEUTILS, "-ltdeutils") + AC_SUBST(LIB_TDEPIM, "-ltdepim") + AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") - AC_SUBST(LIB_KDNSSD, "-lkdnssd") - AC_SUBST(LIB_KUNITTEST, "-lkunittest") + AC_SUBST(LIB_TDEDNSSD, "-ltdednssd") + AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest") # these are for backward compatibility - AC_SUBST(LIB_KSYCOCA, "-lkio") - AC_SUBST(LIB_KFILE, "-lkio") + AC_SUBST(LIB_TDESYCOCA, "-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_TDEIO, "-ltdeio") + AC_SUBST(LIB_TDESYCOCA, "-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_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-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 @@ -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) @@ -3499,16 +3499,16 @@ AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch config AC_DEFUN([KDE_CHECK_LIB64], [ - kdelibsuff="$kde_libs_suffix" - if test -z "$kdelibsuff"; then - kdelibsuff="no" + tdelibsuff="$kde_libs_suffix" + if test -z "$tdelibsuff"; then + tdelibsuff="no" fi AC_ARG_ENABLE(libsuffix, AC_HELP_STRING([--enable-libsuffix], [/lib directory suffix (64,32,none,auto[=default])]), - kdelibsuff=$enableval) + tdelibsuff=$enableval) - if test "$kdelibsuff" = "auto"; then + if test "$tdelibsuff" = "auto"; then cat > conftest.c << EOF #include <stdio.h> @@ -3516,26 +3516,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 ]) @@ -3553,7 +3553,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 @@ -4560,7 +4560,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) @@ -4948,14 +4948,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 @@ -4979,25 +4979,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` @@ -5006,7 +5006,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 @@ -5663,7 +5663,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 @@ -5683,7 +5683,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 @@ -5920,9 +5920,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/admin/am_edit b/admin/am_edit index a1a2991..f7b11cf 100644 --- a/admin/am_edit +++ b/admin/am_edit @@ -68,7 +68,7 @@ sub tag_CLOSURE(); sub tag_NO_UNDEFINED(); sub tag_NMCHECK(); sub tag_DIST(); -sub tag_KDEINIT(); +sub tag_TDEINIT(); # Some global globals... $verbose = 0; # a debug flag @@ -215,7 +215,7 @@ sub processMakefile ($) local @programs = (); # lists the names of programs and libraries local $program = ""; - local @kdeinits = (); # lists the kdeinit targets + local @tdeinits = (); # lists the tdeinit targets local %realObjs = (); # lists the objects compiled into $program local %sources = (); # lists the sources used for $program @@ -274,11 +274,11 @@ sub processMakefile ($) if ($sources_changed{$program}) { my $lookup = $program . '_SOURCES\s*=[ \t]*(.*)'; - if($program =~ /libkdeinit_(.*)/) { + if($program =~ /libtdeinit_(.*)/) { my $prog = $1; substituteLine($prog . '_SOURCES\s*=[ \t]*(.*)', "${prog}_SOURCES = ${prog}_dummy.$cxxsuffix\n" . - "libkdeinit_${prog}_SOURCES = " . $sources{$program}); + "libtdeinit_${prog}_SOURCES = " . $sources{$program}); $sources{$prog} = "${prog}_dummy.$cxxsuffix"; } else { @@ -614,7 +614,7 @@ sub initialise () } } - tag_KDEINIT(); + tag_TDEINIT(); while ($MakefileData =~ /\n(\S*)_OBJECTS\s*=[\034 \t]*([^\n]*)\n/g) { @@ -638,7 +638,7 @@ sub initialise () } next if ($ocv); - next if ($program =~ /^am_libkdeinit_/); + next if ($program =~ /^am_libtdeinit_/); $program =~ s/^am_// if ($program =~ /^am_/); @@ -853,148 +853,148 @@ sub tag_FINAL() } } -sub tag_KDEINIT() +sub tag_TDEINIT() { my @progs = (); my $ltlibs = ""; - my $lookup = 'kdeinit_LTLIBRARIES\s*=[ \t]*(.*)'; + my $lookup = 'tdeinit_LTLIBRARIES\s*=[ \t]*(.*)'; if ($MakefileData =~ m/\n$lookup/) { - @kdeinits = split(/[\034\s]+/, $1); + @tdeinits = split(/[\034\s]+/, $1); my $lines = ""; - foreach my $kdeinit (@kdeinits) { - if ($kdeinit =~ m/\.la$/) { - $kdeinit =~ s/\.la$//; - push(@progs, $kdeinit); + foreach my $tdeinit (@tdeinits) { + if ($tdeinit =~ m/\.la$/) { + $tdeinit =~ s/\.la$//; + push(@progs, $tdeinit); - $lines .= "\n${kdeinit}.la.$cxxsuffix:\n"; - $lines .= "\techo 'extern \"C\" int kdemain(int argc, char* argv[]);' > ${kdeinit}.la.$cxxsuffix; \\\n"; - $lines .= "\techo 'int main(int argc, char* argv[]) { return kdemain(argc,argv); }' >> ${kdeinit}.la.$cxxsuffix\n"; + $lines .= "\n${tdeinit}.la.$cxxsuffix:\n"; + $lines .= "\techo 'extern \"C\" int kdemain(int argc, char* argv[]);' > ${tdeinit}.la.$cxxsuffix; \\\n"; + $lines .= "\techo 'int main(int argc, char* argv[]) { return kdemain(argc,argv); }' >> ${tdeinit}.la.$cxxsuffix\n"; - $lines .= "\n${kdeinit}_dummy.$cxxsuffix:\n"; - $lines .= "\techo '#include <kdemacros.h>' > ${kdeinit}_dummy.$cxxsuffix; \\\n"; - $lines .= "\techo 'extern \"C\" int kdemain(int argc, char* argv[]);' >> ${kdeinit}_dummy.$cxxsuffix; \\\n"; - $lines .= "\techo 'extern \"C\" KDE_EXPORT int kdeinitmain(int argc, char* argv[]) { return kdemain(argc,argv); }' >> ${kdeinit}_dummy.$cxxsuffix\n"; + $lines .= "\n${tdeinit}_dummy.$cxxsuffix:\n"; + $lines .= "\techo '#include <kdemacros.h>' > ${tdeinit}_dummy.$cxxsuffix; \\\n"; + $lines .= "\techo 'extern \"C\" int kdemain(int argc, char* argv[]);' >> ${tdeinit}_dummy.$cxxsuffix; \\\n"; + $lines .= "\techo 'extern \"C\" KDE_EXPORT int tdeinitmain(int argc, char* argv[]) { return kdemain(argc,argv); }' >> ${tdeinit}_dummy.$cxxsuffix\n"; - push(@cleanfiles, "${kdeinit}.la.$cxxsuffix"); - push(@cleanfiles, "${kdeinit}_dummy.$cxxsuffix"); + push(@cleanfiles, "${tdeinit}.la.$cxxsuffix"); + push(@cleanfiles, "${tdeinit}_dummy.$cxxsuffix"); # add dependency - $dep_files .= " \$(DEPDIR)/${kdeinit}.la.Po" if($dep_files !~/${kdeinit}.la.Po/ ); - $dep_files .= " \$(DEPDIR)/${kdeinit}_dummy.Plo" if($dep_files !~/${kdeinit}_dummy.Plo/ ); + $dep_files .= " \$(DEPDIR)/${tdeinit}.la.Po" if($dep_files !~/${tdeinit}.la.Po/ ); + $dep_files .= " \$(DEPDIR)/${tdeinit}_dummy.Plo" if($dep_files !~/${tdeinit}_dummy.Plo/ ); # make library - $lookup = $kdeinit . '_la_LIBADD\s*=[ \t]*(.*)'; + $lookup = $tdeinit . '_la_LIBADD\s*=[ \t]*(.*)'; if($MakefileData =~ m/\n$lookup/) { my $libadd = $1; - substituteLine($lookup, "${kdeinit}_la_LIBADD = libkdeinit_${kdeinit}.la"); - appendLines("libkdeinit_${kdeinit}_la_LIBADD = $libadd\n"); + substituteLine($lookup, "${tdeinit}_la_LIBADD = libtdeinit_${tdeinit}.la"); + appendLines("libtdeinit_${tdeinit}_la_LIBADD = $libadd\n"); } - appendLines("libkdeinit_${kdeinit}_la_LDFLAGS = -no-undefined -avoid-version \$(all_libraries)\n"); + appendLines("libtdeinit_${tdeinit}_la_LDFLAGS = -no-undefined -avoid-version \$(all_libraries)\n"); # add library dependencies - $lookup = $kdeinit . '_la_DEPENDENCIES\s*=[ \t]*(.*)'; + $lookup = $tdeinit . '_la_DEPENDENCIES\s*=[ \t]*(.*)'; if($MakefileData =~ m/\n$lookup/) { my $libdeps = $1; - substituteLine($lookup, "${kdeinit}_la_DEPENDENCIES = libkdeinit_${kdeinit}.la"); - appendLines("libkdeinit_${kdeinit}_la_DEPENDENCIES = $libdeps\n"); + substituteLine($lookup, "${tdeinit}_la_DEPENDENCIES = libtdeinit_${tdeinit}.la"); + appendLines("libtdeinit_${tdeinit}_la_DEPENDENCIES = $libdeps\n"); } # make library objects - $lookup = "am_${kdeinit}_la_OBJECTS" . '\s*=[ \t]*(.*)'; + $lookup = "am_${tdeinit}_la_OBJECTS" . '\s*=[ \t]*(.*)'; if($MakefileData =~ m/\n$lookup/) { my $libobjects = $1; - substituteLine($lookup, "am_${kdeinit}_la_OBJECTS = ${kdeinit}_dummy.lo"); - appendLines("am_libkdeinit_${kdeinit}_la_OBJECTS = $libobjects\n"); - my $prog = "libkdeinit_${kdeinit}_la"; + substituteLine($lookup, "am_${tdeinit}_la_OBJECTS = ${tdeinit}_dummy.lo"); + appendLines("am_libtdeinit_${tdeinit}_la_OBJECTS = $libobjects\n"); + my $prog = "libtdeinit_${tdeinit}_la"; push(@programs, $prog); $realObjs{$prog} = $libobjects; - $realname{$prog} = "libkdeinit_${kdeinit}.la"; + $realname{$prog} = "libtdeinit_${tdeinit}.la"; } - $target_adds{"libkdeinit_${kdeinit}.la"} = "\$(libkdeinit_${kdeinit}_la_OBJECTS) \$(libkdeinit_${kdeinit}_la_DEPENDENCIES)\n" . - "\t\$(CXXLINK) -rpath \$(libdir) \$(libkdeinit_${kdeinit}_la_LDFLAGS) ". - "\$(libkdeinit_${kdeinit}_la_OBJECTS) " . - "\$(libkdeinit_${kdeinit}_la_LIBADD) " . + $target_adds{"libtdeinit_${tdeinit}.la"} = "\$(libtdeinit_${tdeinit}_la_OBJECTS) \$(libtdeinit_${tdeinit}_la_DEPENDENCIES)\n" . + "\t\$(CXXLINK) -rpath \$(libdir) \$(libtdeinit_${tdeinit}_la_LDFLAGS) ". + "\$(libtdeinit_${tdeinit}_la_OBJECTS) " . + "\$(libtdeinit_${tdeinit}_la_LIBADD) " . "\$(LIBS)\n"; - # make libkdeinit sources - $lookup = $kdeinit . '_la_SOURCES\s*=[ \t]*(.*)'; + # make libtdeinit sources + $lookup = $tdeinit . '_la_SOURCES\s*=[ \t]*(.*)'; if($MakefileData =~ m/\n$lookup/) { my $srces = $1; - $sources_changed{"libkdeinit_${kdeinit}_la"} = 1; - $sources{"libkdeinit_${kdeinit}_la"} = $srces; + $sources_changed{"libtdeinit_${tdeinit}_la"} = 1; + $sources{"libtdeinit_${tdeinit}_la"} = $srces; } - # make libkdeinit metasources - $lookup = $kdeinit . '_la_METASOURCES\s*=[ \t]*(.*)'; - substituteLine($lookup, "libkdeinit_${kdeinit}_la_METASOURCES = $1") + # make libtdeinit metasources + $lookup = $tdeinit . '_la_METASOURCES\s*=[ \t]*(.*)'; + substituteLine($lookup, "libtdeinit_${tdeinit}_la_METASOURCES = $1") if($MakefileData =~ m/\n$lookup/); =cut # make binary sources - $lookup = $kdeinit. '_SOURCES\s*=[ \t]*(.*)'; + $lookup = $tdeinit. '_SOURCES\s*=[ \t]*(.*)'; if($MakefileData =~ m/\n$lookup/) { - substituteLine($lookup, "${kdeinit}_SOURCES = ${kdeinit}.la.$cxxsuffix"); + substituteLine($lookup, "${tdeinit}_SOURCES = ${tdeinit}.la.$cxxsuffix"); $lookup = 'SOURCES\s*=[ \t]*(.*)'; if($MakefileData =~ m/\n$lookup/) { my $srces = $1; - $srces =~ s/\b$kdeinit\.c\b/\$(${kdeinit}_SOURCES)/; - $srces =~ s/\$\(${kdeinit}_la_SOURCES\)/\$(libkdeinit_${kdeinit}_la_SOURCES)/; + $srces =~ s/\b$tdeinit\.c\b/\$(${tdeinit}_SOURCES)/; + $srces =~ s/\$\(${tdeinit}_la_SOURCES\)/\$(libtdeinit_${tdeinit}_la_SOURCES)/; substituteLine($lookup, "SOURCES = $srces"); } $lookup = 'DIST_SOURCES\s*=[ \t](.*)'; if($MakefileData =~ m/\n$lookup/) { my $srces = $1; - $srces =~ s/\b$kdeinit\.c\b/\$(${kdeinit}_SOURCES)/; - $srces =~ s/\$\(${kdeinit}_la_SOURCES\)/\$(libkdeinit_${kdeinit}_la_SOURCES)/; + $srces =~ s/\b$tdeinit\.c\b/\$(${tdeinit}_SOURCES)/; + $srces =~ s/\$\(${tdeinit}_la_SOURCES\)/\$(libtdeinit_${tdeinit}_la_SOURCES)/; substituteLine($lookup, "DIST_SOURCES = $srces"); } } # make binary objects / libs - $lookup = $kdeinit . '_OBJECTS\s*=[ \t]*.*'; + $lookup = $tdeinit . '_OBJECTS\s*=[ \t]*.*'; if($MakefileData =~ m/\n$lookup/) { - $realObjs{$kdeinit} = "${kdeinit}.la.\$(OBJEXT)"; - substituteLine("${kdeinit}_LDFLAGS\\s*=.*", "${kdeinit}_LDFLAGS = \$(all_libraries)"); - substituteLine("${kdeinit}_LDADD\\s*=.*", "${kdeinit}_LDADD = libkdeinit_${kdeinit}.la"); - substituteLine("${kdeinit}_DEPENDENCIES\\s*=.*", "${kdeinit}_DEPENDENCIES = libkdeinit_${kdeinit}.la"); + $realObjs{$tdeinit} = "${tdeinit}.la.\$(OBJEXT)"; + substituteLine("${tdeinit}_LDFLAGS\\s*=.*", "${tdeinit}_LDFLAGS = \$(all_libraries)"); + substituteLine("${tdeinit}_LDADD\\s*=.*", "${tdeinit}_LDADD = libtdeinit_${tdeinit}.la"); + substituteLine("${tdeinit}_DEPENDENCIES\\s*=.*", "${tdeinit}_DEPENDENCIES = libtdeinit_${tdeinit}.la"); } =cut # add binary - push(@programs, $kdeinit); - $realObjs{$kdeinit} = "${kdeinit}.la.\$(OBJEXT)"; - $realname{$kdeinit} = $kdeinit; - $sources{$kdeinit} = "${kdeinit}.la.$cxxsuffix"; + push(@programs, $tdeinit); + $realObjs{$tdeinit} = "${tdeinit}.la.\$(OBJEXT)"; + $realname{$tdeinit} = $tdeinit; + $sources{$tdeinit} = "${tdeinit}.la.$cxxsuffix"; - $lines .= "${kdeinit}_LDFLAGS = \$(KDE_RPATH) -no-undefined \$(all_libraries)\n"; - $lines .= "${kdeinit}_LDADD = libkdeinit_${kdeinit}.la\n"; - $lines .= "${kdeinit}_DEPENDENCIES = libkdeinit_${kdeinit}.la\n"; + $lines .= "${tdeinit}_LDFLAGS = \$(KDE_RPATH) -no-undefined \$(all_libraries)\n"; + $lines .= "${tdeinit}_LDADD = libtdeinit_${tdeinit}.la\n"; + $lines .= "${tdeinit}_DEPENDENCIES = libtdeinit_${tdeinit}.la\n"; - $target_adds{"${kdeinit}\$(EXEEXT)"} = - "\$(${kdeinit}_OBJECTS) \$(${kdeinit}_DEPENDENCIES)\n" . - "\t\@rm -f ${kdeinit}\$(EXEEXT)\n" . - "\t\$(CXXLINK) \$(${kdeinit}_LDFLAGS) \$(${kdeinit}_OBJECTS) \$(${kdeinit}_LDADD) \$(LIBS)\n"; + $target_adds{"${tdeinit}\$(EXEEXT)"} = + "\$(${tdeinit}_OBJECTS) \$(${tdeinit}_DEPENDENCIES)\n" . + "\t\@rm -f ${tdeinit}\$(EXEEXT)\n" . + "\t\$(CXXLINK) \$(${tdeinit}_LDFLAGS) \$(${tdeinit}_OBJECTS) \$(${tdeinit}_LDADD) \$(LIBS)\n"; - $ltlibs .= " libkdeinit_${kdeinit}.la"; + $ltlibs .= " libtdeinit_${tdeinit}.la"; } } appendLines($lines); - # add libkdeinit target + # add libtdeinit target $lookup = 'lib_LTLIBRARIES\s*=[ \t]*(.*)'; if($MakefileData =~ m/\n$lookup/) { substituteLine($lookup, "lib_LTLIBRARIES = $1 $ltlibs"); } else { print STDERR - "Error: lib_LTLIBRARIES missing in $printname (required for kdeinit_LTLIBRARIES).\n"; + "Error: lib_LTLIBRARIES missing in $printname (required for tdeinit_LTLIBRARIES).\n"; $errorflag = 1; } } if($#progs >= 0) { if($MakefileData !~ m/\nbin_PROGRAMS\s*=/) { - print STDERR "Error: bin_PROGRAMS missing in $printname (required for kdeinit_LTLIBRARIES).\n"; + print STDERR "Error: bin_PROGRAMS missing in $printname (required for tdeinit_LTLIBRARIES).\n"; $errorflag = 1; } else { @@ -1362,7 +1362,7 @@ sub tag_UIFILES () $dep_lines .= "\trm -f $source.$cxxsuffix\n"; if (!$kdeopts{"qtonly"}) { $dep_lines .= "\techo '#include <kdialog.h>' > $source.$cxxsuffix\n"; - $dep_lines .= "\techo '#include <klocale.h>' >> $source.$cxxsuffix\n"; + $dep_lines .= "\techo '#include <tdelocale.h>' >> $source.$cxxsuffix\n"; my ($mangled_source) = $source; $mangled_source =~ s/[^A-Za-z0-9]/_/g; # get rid of garbage $dep_lines .= "\t\$(UIC) -tr \${UIC_TR} -i $source.h $sourcedir$source.ui > $source.$cxxsuffix.temp ; ret=\$\$?; \\\n"; @@ -1735,7 +1735,7 @@ sub tag_POFILES () $pofiles = join(" ", grep(/\.po$/, readdir(THISDIR))); closedir (THISDIR); print STDOUT "pofiles found = $pofiles\n" if ($verbose); - if (-f "charset" && -f "kdelibs/kdelibs.po") { + if (-f "charset" && -f "tdelibs/tdelibs.po") { handle_TOPLEVEL(); } } diff --git a/admin/config.pl b/admin/config.pl index c2b0517..89ab9ed 100644 --- a/admin/config.pl +++ b/admin/config.pl @@ -8,7 +8,7 @@ # has to recompile the regexps every time. # # this script does better. It changes all Makefile.ins in one process. -# in kdelibs the time for building Makefile went down from 2:59 min to 13 sec! +# in tdelibs the time for building Makefile went down from 2:59 min to 13 sec! # # written by Michael Matz <[email protected]> # adapted by Dirk Mueller <[email protected]> diff --git a/admin/configure.in.bot.end b/admin/configure.in.bot.end index 1bc030b..3c902f9 100644 --- a/admin/configure.in.bot.end +++ b/admin/configure.in.bot.end @@ -3,13 +3,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/admin/cvs.sh b/admin/cvs.sh index 14491e6..a081257 100644 --- a/admin/cvs.sh +++ b/admin/cvs.sh @@ -548,15 +548,15 @@ for subdir in $dirs; do echo "$subdir has *.rc, *.ui or *.kcfg files, but not correct messages line" fi fi - if find . -name \*.c\* -o -name \*.h\* | fgrep -v ".svn" | xargs fgrep -s -q KAboutData ; then + if find . -name \*.c\* -o -name \*.h\* | fgrep -v ".svn" | xargs fgrep -s -q TDEAboutData ; then echo -e 'i18n("_: NAME OF TRANSLATORS\\n"\n"Your names")\ni18n("_: EMAIL OF TRANSLATORS\\n"\n"Your emails")' > _translatorinfo.cpp else echo " " > _translatorinfo.cpp fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot + kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot if ! test -f $kdepotpath; then - kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot + kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/admin/debianrules b/admin/debianrules index 25897f2..c065a09 100755 --- a/admin/debianrules +++ b/admin/debianrules @@ -9,7 +9,7 @@ chomp $origPwd; $kde_prefix = "/usr"; $sysconfdir = "/etc"; -$kde_includedir = "$kde_prefix/include/kde"; +$kde_includedir = "$kde_prefix/include/tde"; $infodir = "$kde_prefix/share/info"; $mandir = "$kde_prefix/share/man"; $qtdir = "/usr/share/qt3"; diff --git a/admin/doxygen.sh b/admin/doxygen.sh index 3e233d7..8f74d89 100644 --- a/admin/doxygen.sh +++ b/admin/doxygen.sh @@ -3,7 +3,7 @@ # doxygen.sh Copyright (C) 2005 by Adriaan de Groot # Based on some code from Doxyfile.am, among other things. # License: GPL version 2. -# See file COPYING in kdelibs for details. +# See file COPYING in tdelibs for details. echo "*** doxygen.sh" @@ -731,7 +731,7 @@ PACKAGE_STRING= PACKAGE_BUGREPORT= ac_unique_file="acinclude.m4" -ac_default_prefix=${KDEDIR:-the kde prefix} +ac_default_prefix=${TDEDIR:-the kde prefix} # Factoring default headers for most tests. ac_includes_default="\ #include <stdio.h> @@ -956,7 +956,7 @@ all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE -MAKEKDEWIDGETS +MAKETDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG @@ -986,28 +986,28 @@ kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir -kdeinitdir +tdeinitdir kde_styledir kde_widgetdir LIB_KDED -LIB_KDECORE -LIB_KDEUI -LIB_KIO +LIB_TDECORE +LIB_TDEUI +LIB_TDEIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC -LIB_KHTML -LIB_KSPELL -LIB_KPARTS -LIB_KDEPRINT -LIB_KUTILS -LIB_KDEPIM -LIB_KIMPROXY +LIB_TDEHTML +LIB_TDESPELL +LIB_TDEPARTS +LIB_TDEPRINT +LIB_TDEUTILS +LIB_TDEPIM +LIB_TDEIMPROXY LIB_KNEWSTUFF -LIB_KDNSSD -LIB_KUNITTEST -LIB_KSYCOCA +LIB_TDEDNSSD +LIB_TDEUNITTEST +LIB_TDESYCOCA LIB_KFILE LIB_KFM PKGCONFIGFOUND @@ -2739,11 +2739,11 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' 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 @@ -2751,12 +2751,12 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' if test "x$prefix" = "xNONE"; then - { echo "$as_me:$LINENO: checking for kde-config" >&5 -echo $ECHO_N "checking for kde-config... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: checking for tde-config" >&5 +echo $ECHO_N "checking for tde-config... $ECHO_C" >&6; } if test -n "$KDECONFIG"; then kde_cv_path="$KDECONFIG"; else - kde_cache=`echo kde-config | sed 'y%./+-%__p_%'` + kde_cache=`echo tde-config | sed 'y%./+-%__p_%'` if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2775,16 +2775,16 @@ else IFS=$kde_save_IFS for dir in $dirs; do - if test -x "$dir/kde-config"; then + if test -x "$dir/tde-config"; then if test -n "" then - evalstr="$dir/kde-config 2>&1 " + evalstr="$dir/tde-config 2>&1 " if eval $evalstr; then - kde_cv_path="$dir/kde-config" + kde_cv_path="$dir/tde-config" break fi else - kde_cv_path="$dir/kde-config" + kde_cv_path="$dir/tde-config" break fi fi @@ -2804,10 +2804,10 @@ fi { echo "$as_me:$LINENO: result: not found" >&5 echo "${ECHO_T}not found" >&6; } - { { echo "$as_me:$LINENO: error: The important program kde-config was not found! + { { echo "$as_me:$LINENO: error: The important program tde-config was not found! Please check whether you installed KDE correctly. " >&5 -echo "$as_me: error: The important program kde-config was not found! +echo "$as_me: error: The important program tde-config was not found! Please check whether you installed KDE correctly. " >&2;} { (exit 1); exit 1; }; } @@ -2823,12 +2823,12 @@ echo "${ECHO_T}$kde_cv_path" >&6; } kde_save_PATH="$PATH" PATH="$exec_prefix/bin:$prefix/bin:$PATH" - { echo "$as_me:$LINENO: checking for kde-config" >&5 -echo $ECHO_N "checking for kde-config... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: checking for tde-config" >&5 +echo $ECHO_N "checking for tde-config... $ECHO_C" >&6; } if test -n "$KDECONFIG"; then kde_cv_path="$KDECONFIG"; else - kde_cache=`echo kde-config | sed 'y%./+-%__p_%'` + kde_cache=`echo tde-config | sed 'y%./+-%__p_%'` if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2847,16 +2847,16 @@ else IFS=$kde_save_IFS for dir in $dirs; do - if test -x "$dir/kde-config"; then + if test -x "$dir/tde-config"; then if test -n "" then - evalstr="$dir/kde-config 2>&1 " + evalstr="$dir/tde-config 2>&1 " if eval $evalstr; then - kde_cv_path="$dir/kde-config" + kde_cv_path="$dir/tde-config" break fi else - kde_cv_path="$dir/kde-config" + kde_cv_path="$dir/tde-config" break fi fi @@ -2876,10 +2876,10 @@ fi { echo "$as_me:$LINENO: result: not found" >&5 echo "${ECHO_T}not found" >&6; } - { { echo "$as_me:$LINENO: error: The important program kde-config was not found! + { { echo "$as_me:$LINENO: error: The important program tde-config was not found! Please check whether you installed KDE correctly. " >&5 -echo "$as_me: error: The important program kde-config was not found! +echo "$as_me: error: The important program tde-config was not found! Please check whether you installed KDE correctly. " >&2;} { (exit 1); exit 1; }; } @@ -2896,13 +2896,13 @@ echo "${ECHO_T}$kde_cv_path" >&6; } kde_libs_prefix=`$KDECONFIG --prefix` if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then - { { echo "$as_me:$LINENO: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. + { { echo "$as_me:$LINENO: 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. " >&5 -echo "$as_me: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. +echo "$as_me: 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. " >&2;} { (exit 1); exit 1; }; } fi @@ -2913,8 +2913,8 @@ echo "$as_me: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_ echo $ECHO_N "checking where to install... $ECHO_C" >&6; } if test "x$prefix" = "xNONE"; then prefix=$kde_libs_prefix - { echo "$as_me:$LINENO: result: $prefix (as returned by kde-config)" >&5 -echo "${ECHO_T}$prefix (as returned by kde-config)" >&6; } + { echo "$as_me:$LINENO: result: $prefix (as returned by tde-config)" >&5 +echo "${ECHO_T}$prefix (as returned by tde-config)" >&6; } else given_prefix=$prefix { echo "$as_me:$LINENO: result: $prefix (as requested)" >&5 @@ -7581,17 +7581,17 @@ fi - kdelibsuff="$kde_libs_suffix" - if test -z "$kdelibsuff"; then - kdelibsuff="no" + tdelibsuff="$kde_libs_suffix" + if test -z "$tdelibsuff"; then + tdelibsuff="no" fi # Check whether --enable-libsuffix was given. if test "${enable_libsuffix+set}" = set; then - enableval=$enable_libsuffix; kdelibsuff=$enableval + enableval=$enable_libsuffix; tdelibsuff=$enableval fi - if test "$kdelibsuff" = "auto"; then + if test "$tdelibsuff" = "auto"; then cat > conftest.c << EOF #include <stdio.h> @@ -7599,17 +7599,17 @@ 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 { echo "$as_me:$LINENO: result: not using lib directory suffix" >&5 echo "${ECHO_T}not using lib directory suffix" >&6; } @@ -7619,16 +7619,16 @@ _ACEOF else if test "$libdir" = '${exec_prefix}/lib'; then - libdir="$libdir${kdelibsuff}" + libdir="$libdir${tdelibsuff}" libdir="$libdir" fi cat >>confdefs.h <<_ACEOF -#define KDELIBSUFF "${kdelibsuff}" +#define KDELIBSUFF "${tdelibsuff}" _ACEOF - { echo "$as_me:$LINENO: result: using lib directory suffix $kdelibsuff" >&5 -echo "${ECHO_T}using lib directory suffix $kdelibsuff" >&6; } + { echo "$as_me:$LINENO: result: using lib directory suffix $tdelibsuff" >&5 +echo "${ECHO_T}using lib directory suffix $tdelibsuff" >&6; } fi # Check whether --enable-fast-install was given. @@ -22525,7 +22525,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool" KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)" -# 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)" @@ -22957,7 +22957,7 @@ if test "x$kde_cv_func_strlcat" = xyes; then else case "strlcat" in setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) - kde_cv_proto_strlcat="yes - in libkdefakes" + kde_cv_proto_strlcat="yes - in libtdefakes" ;; *) kde_cv_proto_strlcat=unknown @@ -23168,7 +23168,7 @@ if test "x$kde_cv_func_strlcpy" = xyes; then else case "strlcpy" in setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) - kde_cv_proto_strlcpy="yes - in libkdefakes" + kde_cv_proto_strlcpy="yes - in libtdefakes" ;; *) kde_cv_proto_strlcpy=unknown @@ -25247,7 +25247,7 @@ if test "x$kde_cv_func_res_init" = xyes; then else case "res_init" in setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) - kde_cv_proto_res_init="yes - in libkdefakes" + kde_cv_proto_res_init="yes - in libtdefakes" ;; *) kde_cv_proto_res_init=unknown @@ -28787,41 +28787,41 @@ sed 's/^/| /' conftest.$ac_ext >&5 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 for ac_extension in a so sl; do @@ -28886,7 +28886,7 @@ fi 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 @@ -30237,7 +30237,7 @@ qt_includes="" # Check whether --with-qt-dir was given. if test "${with_qt_dir+set}" = set; then withval=$with_qt_dir; ac_qt_includes="$withval"/include - ac_qt_libraries="$withval"/lib${kdelibsuff} + ac_qt_libraries="$withval"/lib${tdelibsuff} ac_qt_bindir="$withval"/bin fi @@ -30302,7 +30302,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 @@ -31103,16 +31103,16 @@ else 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 ""; 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" kde_incdir=NO @@ -31141,8 +31141,8 @@ So, check this please and use another prefix!" >&2;} { (exit 1); exit 1; }; } 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" kde_libdir=NO @@ -31166,7 +31166,7 @@ kde_widgetdir=NO kde_widgetdir=NO for i in $kde_libdirs; do - for j in "kde3/plugins/designer/kdewidgets.la"; + for j in "kde3/plugins/designer/tdewidgets.la"; do echo "configure: 31171: $i/$j" >&5 if test -r "$i/$j"; then @@ -31188,13 +31188,13 @@ So, check this please and use another prefix!" >&2;} { (exit 1); exit 1; }; } fi -if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then +if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/tdewidgets.la"; then { { echo "$as_me:$LINENO: error: I can't find the designer plugins. These are required and should have been installed -by kdelibs" >&5 +by tdelibs" >&5 echo "$as_me: error: I can't find the designer plugins. These are required and should have been installed -by kdelibs" >&2;} +by tdelibs" >&2;} { (exit 1); exit 1; }; } fi @@ -31328,20 +31328,20 @@ fi echo "${ECHO_T}$kde_cv_uic_plugins" >&6; } if test "$kde_cv_uic_plugins" != yes; then { { echo "$as_me:$LINENO: 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. " >&5 echo "$as_me: 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. " >&2;} @@ -31516,20 +31516,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"); @@ -31592,7 +31592,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu { echo "$as_me:$LINENO: checking for KDE libraries installed" >&5 echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6; } -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 { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 @@ -31604,22 +31604,22 @@ echo "${ECHO_T}yes" >&6; } else { { echo "$as_me:$LINENO: 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." >&5 echo "$as_me: 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." >&2;} { (exit 1); exit 1; }; } 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 @@ -31818,20 +31818,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"); @@ -31894,7 +31894,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu { echo "$as_me:$LINENO: checking for KDE libraries installed" >&5 echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6; } -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 { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 @@ -31906,22 +31906,22 @@ echo "${ECHO_T}yes" >&6; } else { { echo "$as_me:$LINENO: 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." >&5 echo "$as_me: 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." >&2;} { (exit 1); exit 1; }; } 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 @@ -32030,11 +32030,11 @@ _ACEOF 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 @@ -32408,12 +32408,12 @@ echo "${ECHO_T}$kde_cv_path" >&6; } if test -n "$kde32ornewer"; then - { echo "$as_me:$LINENO: checking for kconfig_compiler" >&5 -echo $ECHO_N "checking for kconfig_compiler... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: checking for tdeconfig_compiler" >&5 +echo $ECHO_N "checking for tdeconfig_compiler... $ECHO_C" >&6; } if test -n "$KCONFIG_COMPILER"; then kde_cv_path="$KCONFIG_COMPILER"; else - kde_cache=`echo kconfig_compiler | sed 'y%./+-%__p_%'` + kde_cache=`echo tdeconfig_compiler | sed 'y%./+-%__p_%'` if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -32432,16 +32432,16 @@ else IFS=$kde_save_IFS for dir in $dirs; do - if test -x "$dir/kconfig_compiler"; then + if test -x "$dir/tdeconfig_compiler"; then if test -n "" then - evalstr="$dir/kconfig_compiler 2>&1 " + evalstr="$dir/tdeconfig_compiler 2>&1 " if eval $evalstr; then - kde_cv_path="$dir/kconfig_compiler" + kde_cv_path="$dir/tdeconfig_compiler" break fi else - kde_cv_path="$dir/kconfig_compiler" + kde_cv_path="$dir/tdeconfig_compiler" break fi fi @@ -32461,10 +32461,10 @@ fi { echo "$as_me:$LINENO: result: not found" >&5 echo "${ECHO_T}not found" >&6; } - { { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found! + { { echo "$as_me:$LINENO: error: The important program tdeconfig_compiler was not found! Please check whether you installed KDE correctly. " >&5 -echo "$as_me: error: The important program kconfig_compiler was not found! +echo "$as_me: error: The important program tdeconfig_compiler was not found! Please check whether you installed KDE correctly. " >&2;} { (exit 1); exit 1; }; } @@ -32548,12 +32548,12 @@ echo "${ECHO_T}$kde_cv_path" >&6; } fi if test -n "$kde33ornewer"; then - { echo "$as_me:$LINENO: checking for makekdewidgets" >&5 -echo $ECHO_N "checking for makekdewidgets... $ECHO_C" >&6; } - if test -n "$MAKEKDEWIDGETS"; then - kde_cv_path="$MAKEKDEWIDGETS"; + { echo "$as_me:$LINENO: checking for maketdewidgets" >&5 +echo $ECHO_N "checking for maketdewidgets... $ECHO_C" >&6; } + if test -n "$MAKETDEWIDGETS"; then + kde_cv_path="$MAKETDEWIDGETS"; else - kde_cache=`echo makekdewidgets | sed 'y%./+-%__p_%'` + kde_cache=`echo maketdewidgets | sed 'y%./+-%__p_%'` if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -32572,16 +32572,16 @@ else IFS=$kde_save_IFS for dir in $dirs; do - if test -x "$dir/makekdewidgets"; then + if test -x "$dir/maketdewidgets"; then if test -n "" then - evalstr="$dir/makekdewidgets 2>&1 " + evalstr="$dir/maketdewidgets 2>&1 " if eval $evalstr; then - kde_cv_path="$dir/makekdewidgets" + kde_cv_path="$dir/maketdewidgets" break fi else - kde_cv_path="$dir/makekdewidgets" + kde_cv_path="$dir/maketdewidgets" break fi fi @@ -32601,10 +32601,10 @@ fi { echo "$as_me:$LINENO: result: not found" >&5 echo "${ECHO_T}not found" >&6; } - { { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found! + { { echo "$as_me:$LINENO: error: The important program maketdewidgets was not found! Please check whether you installed KDE correctly. " >&5 -echo "$as_me: error: The important program makekdewidgets was not found! +echo "$as_me: error: The important program maketdewidgets was not found! Please check whether you installed KDE correctly. " >&2;} { (exit 1); exit 1; }; } @@ -32612,7 +32612,7 @@ Please check whether you installed KDE correctly. else { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 echo "${ECHO_T}$kde_cv_path" >&6; } - MAKEKDEWIDGETS=$kde_cv_path + MAKETDEWIDGETS=$kde_cv_path fi @@ -32682,7 +32682,7 @@ echo "${ECHO_T}$kde_cv_path" >&6; } 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" KDE_XSL_STYLESHEET=NO for i in $kde_sharedirs; @@ -32744,7 +32744,7 @@ done -kdeinitdir='$(kde_moduledir)' +tdeinitdir='$(kde_moduledir)' @@ -32763,16 +32763,16 @@ fi if test $kde_qtver = 3; then case $host in - *cygwin*) lib_kded="-lkdeinit_kded" ;; + *cygwin*) lib_kded="-ltdeinit_kded" ;; *) lib_kded="" ;; esac LIB_KDED=$lib_kded - LIB_KDECORE="-lkdecore" + LIB_TDECORE="-ltdecore" - LIB_KDEUI="-lkdeui" + LIB_TDEUI="-ltdeui" - LIB_KIO="-lkio" + LIB_TDEIO="-ltdeio" LIB_KJS="-lkjs" @@ -32780,66 +32780,66 @@ if test $kde_qtver = 3; then LIB_KAB="-lkab" - LIB_KABC="-lkabc" + LIB_KABC="-ltdeabc" - LIB_KHTML="-lkhtml" + LIB_TDEHTML="-ltdehtml" - LIB_KSPELL="-lkspell" + LIB_TDESPELL="-ltdespell" - LIB_KPARTS="-lkparts" + LIB_TDEPARTS="-ltdeparts" - LIB_KDEPRINT="-lkdeprint" + LIB_TDEPRINT="-ltdeprint" - LIB_KUTILS="-lkutils" + LIB_TDEUTILS="-ltdeutils" - LIB_KDEPIM="-lkdepim" + LIB_TDEPIM="-ltdepim" - LIB_KIMPROXY="-lkimproxy" + LIB_TDEIMPROXY="-ltdeimproxy" LIB_KNEWSTUFF="-lknewstuff" - LIB_KDNSSD="-lkdnssd" + LIB_TDEDNSSD="-ltdednssd" - LIB_KUNITTEST="-lkunittest" + LIB_TDEUNITTEST="-ltdeunittest" # these are for backward compatibility - LIB_KSYCOCA="-lkio" + LIB_TDESYCOCA="-ltdeio" - LIB_KFILE="-lkio" + LIB_KFILE="-ltdeio" elif test $kde_qtver = 2; then - LIB_KDECORE="-lkdecore" + LIB_TDECORE="-ltdecore" - LIB_KDEUI="-lkdeui" + LIB_TDEUI="-ltdeui" - LIB_KIO="-lkio" + LIB_TDEIO="-ltdeio" - LIB_KSYCOCA="-lksycoca" + LIB_TDESYCOCA="-ltdesycoca" LIB_SMB="-lsmb" - LIB_KFILE="-lkfile" + LIB_KFILE="-ltdefile" LIB_KAB="-lkab" - LIB_KHTML="-lkhtml" + LIB_TDEHTML="-ltdehtml" - LIB_KSPELL="-lkspell" + LIB_TDESPELL="-ltdespell" - LIB_KPARTS="-lkparts" + LIB_TDEPARTS="-ltdeparts" - LIB_KDEPRINT="-lkdeprint" + LIB_TDEPRINT="-ltdeprint" else - LIB_KDECORE="-lkdecore -lXext $(LIB_QT)" + LIB_TDECORE="-ltdecore -lXext $(LIB_QT)" - LIB_KDEUI="-lkdeui $(LIB_KDECORE)" + LIB_TDEUI="-ltdeui $(LIB_TDECORE)" - LIB_KFM="-lkfm $(LIB_KDECORE)" + LIB_KFM="-lkfm $(LIB_TDECORE)" - LIB_KFILE="-lkfile $(LIB_KFM) $(LIB_KDEUI)" + LIB_KFILE="-ltdefile $(LIB_KFM) $(LIB_TDEUI)" - LIB_KAB="-lkab $(LIB_KIMGIO) $(LIB_KDECORE)" + LIB_KAB="-lkab $(LIB_KIMGIO) $(LIB_TDECORE)" fi @@ -34960,14 +34960,14 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -kdeversion_save_CXXFLAGS="$CXXFLAGS" -kdeversion_safe_LIBS="$LIBS" +tdeversion_save_CXXFLAGS="$CXXFLAGS" +tdeversion_safe_LIBS="$LIBS" LIBS="$LIBS $X_EXTRA_LIBS" CXXFLAGS="$CXXFLAGS $all_includes" cat >conftest.$ac_ext <<_ACEOF -#include <kdeversion.h> +#include <tdeversion.h> #if ! ( KDE_IS_VERSION( 3, 2, 90 ) ) #error KDE 3.2 #endif @@ -35004,7 +35004,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#include <kdeversion.h> +#include <tdeversion.h> #if ! ( KDE_IS_VERSION( 3, 3, 90 ) ) #error KDE 3.3 #endif @@ -35041,7 +35041,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#include <kdeversion.h> +#include <tdeversion.h> #if ! ( KDE_IS_VERSION( 3, 4, 90 ) ) #error KDE 3.4 #endif @@ -35078,7 +35078,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#include <kdeversion.h> +#include <tdeversion.h> #if ! ( KDE_IS_VERSION( 3, 5, 2 ) ) #error KDE 3.5.x (x < 2) #endif @@ -35112,8 +35112,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -CXXFLAGS="$kdeversion_save_CXXFLAGS" -LIBS="$kdeversion_safe_LIBS" +CXXFLAGS="$tdeversion_save_CXXFLAGS" +LIBS="$tdeversion_safe_LIBS" ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -36313,7 +36313,7 @@ all_libraries!$all_libraries$ac_delim AUTODIRS!$AUTODIRS$ac_delim include_ARTS_TRUE!$include_ARTS_TRUE$ac_delim include_ARTS_FALSE!$include_ARTS_FALSE$ac_delim -MAKEKDEWIDGETS!$MAKEKDEWIDGETS$ac_delim +MAKETDEWIDGETS!$MAKETDEWIDGETS$ac_delim KCONFIG_COMPILER!$KCONFIG_COMPILER$ac_delim KCFG_DEPENDENCIES!$KCFG_DEPENDENCIES$ac_delim DCOPIDLNG!$DCOPIDLNG$ac_delim @@ -36384,28 +36384,28 @@ kde_templatesdir!$kde_templatesdir$ac_delim kde_servicesdir!$kde_servicesdir$ac_delim kde_servicetypesdir!$kde_servicetypesdir$ac_delim kde_moduledir!$kde_moduledir$ac_delim -kdeinitdir!$kdeinitdir$ac_delim +tdeinitdir!$tdeinitdir$ac_delim kde_styledir!$kde_styledir$ac_delim kde_widgetdir!$kde_widgetdir$ac_delim LIB_KDED!$LIB_KDED$ac_delim -LIB_KDECORE!$LIB_KDECORE$ac_delim -LIB_KDEUI!$LIB_KDEUI$ac_delim -LIB_KIO!$LIB_KIO$ac_delim +LIB_TDECORE!$LIB_TDECORE$ac_delim +LIB_TDEUI!$LIB_TDEUI$ac_delim +LIB_TDEIO!$LIB_TDEIO$ac_delim LIB_KJS!$LIB_KJS$ac_delim LIB_SMB!$LIB_SMB$ac_delim LIB_KAB!$LIB_KAB$ac_delim LIB_KABC!$LIB_KABC$ac_delim -LIB_KHTML!$LIB_KHTML$ac_delim -LIB_KSPELL!$LIB_KSPELL$ac_delim -LIB_KPARTS!$LIB_KPARTS$ac_delim -LIB_KDEPRINT!$LIB_KDEPRINT$ac_delim -LIB_KUTILS!$LIB_KUTILS$ac_delim -LIB_KDEPIM!$LIB_KDEPIM$ac_delim -LIB_KIMPROXY!$LIB_KIMPROXY$ac_delim +LIB_TDEHTML!$LIB_TDEHTML$ac_delim +LIB_TDESPELL!$LIB_TDESPELL$ac_delim +LIB_TDEPARTS!$LIB_TDEPARTS$ac_delim +LIB_TDEPRINT!$LIB_TDEPRINT$ac_delim +LIB_TDEUTILS!$LIB_TDEUTILS$ac_delim +LIB_TDEPIM!$LIB_TDEPIM$ac_delim +LIB_TDEIMPROXY!$LIB_TDEIMPROXY$ac_delim LIB_KNEWSTUFF!$LIB_KNEWSTUFF$ac_delim -LIB_KDNSSD!$LIB_KDNSSD$ac_delim -LIB_KUNITTEST!$LIB_KUNITTEST$ac_delim -LIB_KSYCOCA!$LIB_KSYCOCA$ac_delim +LIB_TDEDNSSD!$LIB_TDEDNSSD$ac_delim +LIB_TDEUNITTEST!$LIB_TDEUNITTEST$ac_delim +LIB_TDESYCOCA!$LIB_TDESYCOCA$ac_delim LIB_KFILE!$LIB_KFILE$ac_delim LIB_KFM!$LIB_KFM$ac_delim PKGCONFIGFOUND!$PKGCONFIGFOUND$ac_delim @@ -37022,13 +37022,13 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then # And if so, warn when they don't match if test "$kde_libs_prefix" != "$given_prefix"; then # And if kde doesn't know about the prefix yet - echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null + echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null if test $? -ne 0; then echo "" echo "Warning: you chose to install this package in $given_prefix," echo "but KDE was found in $kde_libs_prefix." echo "For this to work, you will need to tell KDE about the new prefix, by ensuring" - echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix" + echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix" echo "Then restart KDE." echo "" fi diff --git a/configure.in b/configure.in index dcf329a..5d7fc33 100644 --- a/configure.in +++ b/configure.in @@ -123,13 +123,13 @@ AC_MSG_CHECKING([for KDE version]) AC_LANG_SAVE AC_LANG_CPLUSPLUS -kdeversion_save_CXXFLAGS="$CXXFLAGS" -kdeversion_safe_LIBS="$LIBS" +tdeversion_save_CXXFLAGS="$CXXFLAGS" +tdeversion_safe_LIBS="$LIBS" LIBS="$LIBS $X_EXTRA_LIBS" CXXFLAGS="$CXXFLAGS $all_includes" AC_COMPILE_IFELSE([ -#include <kdeversion.h> +#include <tdeversion.h> #if ! ( KDE_IS_VERSION( 3, 2, 90 ) ) #error KDE 3.2 #endif @@ -140,7 +140,7 @@ AC_COMPILE_IFELSE([ ) AC_COMPILE_IFELSE([ -#include <kdeversion.h> +#include <tdeversion.h> #if ! ( KDE_IS_VERSION( 3, 3, 90 ) ) #error KDE 3.3 #endif @@ -151,7 +151,7 @@ AC_COMPILE_IFELSE([ ) AC_COMPILE_IFELSE([ -#include <kdeversion.h> +#include <tdeversion.h> #if ! ( KDE_IS_VERSION( 3, 4, 90 ) ) #error KDE 3.4 #endif @@ -162,7 +162,7 @@ AC_COMPILE_IFELSE([ ) AC_COMPILE_IFELSE([ -#include <kdeversion.h> +#include <tdeversion.h> #if ! ( KDE_IS_VERSION( 3, 5, 2 ) ) #error KDE 3.5.x (x < 2) #endif @@ -171,8 +171,8 @@ AC_COMPILE_IFELSE([ , need_kde351_compat="yes" ) -CXXFLAGS="$kdeversion_save_CXXFLAGS" -LIBS="$kdeversion_safe_LIBS" +CXXFLAGS="$tdeversion_save_CXXFLAGS" +LIBS="$tdeversion_safe_LIBS" AC_LANG_RESTORE if test "$need_kde32_compat" = "yes"; then @@ -243,13 +243,13 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then # And if so, warn when they don't match if test "$kde_libs_prefix" != "$given_prefix"; then # And if kde doesn't know about the prefix yet - echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null + echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null if test $? -ne 0; then echo "" echo "Warning: you chose to install this package in $given_prefix," echo "but KDE was found in $kde_libs_prefix." echo "For this to work, you will need to tell KDE about the new prefix, by ensuring" - echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix" + echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix" echo "Then restart KDE." echo "" fi diff --git a/configure.in.in b/configure.in.in index b8a5925..055c222 100644 --- a/configure.in.in +++ b/configure.in.in @@ -58,13 +58,13 @@ AC_MSG_CHECKING([for KDE version]) AC_LANG_SAVE AC_LANG_CPLUSPLUS -kdeversion_save_CXXFLAGS="$CXXFLAGS" -kdeversion_safe_LIBS="$LIBS" +tdeversion_save_CXXFLAGS="$CXXFLAGS" +tdeversion_safe_LIBS="$LIBS" LIBS="$LIBS $X_EXTRA_LIBS" CXXFLAGS="$CXXFLAGS $all_includes" AC_COMPILE_IFELSE([ -#include <kdeversion.h> +#include <tdeversion.h> #if ! ( KDE_IS_VERSION( 3, 2, 90 ) ) #error KDE 3.2 #endif @@ -75,7 +75,7 @@ AC_COMPILE_IFELSE([ ) AC_COMPILE_IFELSE([ -#include <kdeversion.h> +#include <tdeversion.h> #if ! ( KDE_IS_VERSION( 3, 3, 90 ) ) #error KDE 3.3 #endif @@ -86,7 +86,7 @@ AC_COMPILE_IFELSE([ ) AC_COMPILE_IFELSE([ -#include <kdeversion.h> +#include <tdeversion.h> #if ! ( KDE_IS_VERSION( 3, 4, 90 ) ) #error KDE 3.4 #endif @@ -97,7 +97,7 @@ AC_COMPILE_IFELSE([ ) AC_COMPILE_IFELSE([ -#include <kdeversion.h> +#include <tdeversion.h> #if ! ( KDE_IS_VERSION( 3, 5, 2 ) ) #error KDE 3.5.x (x < 2) #endif @@ -106,8 +106,8 @@ AC_COMPILE_IFELSE([ , need_kde351_compat="yes" ) -CXXFLAGS="$kdeversion_save_CXXFLAGS" -LIBS="$kdeversion_safe_LIBS" +CXXFLAGS="$tdeversion_save_CXXFLAGS" +LIBS="$tdeversion_safe_LIBS" AC_LANG_RESTORE if test "$need_kde32_compat" = "yes"; then diff --git a/doc/Makefile.in b/doc/Makefile.in index c8e6933..f587dc9 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -158,24 +158,24 @@ LIBZ = @LIBZ@ LIB_CLAM = @LIB_CLAM@ LIB_KAB = @LIB_KAB@ LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ +LIB_TDECORE = @LIB_TDECORE@ LIB_KDED = @LIB_KDED@ -LIB_KDEPIM = @LIB_KDEPIM@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ -LIB_KDNSSD = @LIB_KDNSSD@ +LIB_TDEPIM = @LIB_TDEPIM@ +LIB_TDEPRINT = @LIB_TDEPRINT@ +LIB_TDEUI = @LIB_TDEUI@ +LIB_TDEDNSSD = @LIB_TDEDNSSD@ LIB_KFILE = @LIB_KFILE@ LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIMPROXY = @LIB_KIMPROXY@ -LIB_KIO = @LIB_KIO@ +LIB_TDEHTML = @LIB_TDEHTML@ +LIB_TDEIMPROXY = @LIB_TDEIMPROXY@ +LIB_TDEIO = @LIB_TDEIO@ LIB_KJS = @LIB_KJS@ LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ -LIB_KUNITTEST = @LIB_KUNITTEST@ -LIB_KUTILS = @LIB_KUTILS@ +LIB_TDEPARTS = @LIB_TDEPARTS@ +LIB_TDESPELL = @LIB_TDESPELL@ +LIB_TDESYCOCA = @LIB_TDESYCOCA@ +LIB_TDEUNITTEST = @LIB_TDEUNITTEST@ +LIB_TDEUTILS = @LIB_TDEUTILS@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ @@ -187,7 +187,7 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ -MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ +MAKETDEWIDGETS = @MAKETDEWIDGETS@ MCOPIDL = @MCOPIDL@ MEINPROC = @MEINPROC@ MOC = @MOC@ @@ -292,7 +292,7 @@ kde_styledir = @kde_styledir@ kde_templatesdir = @kde_templatesdir@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ -kdeinitdir = @kdeinitdir@ +tdeinitdir = @tdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/doc/en/Makefile.in b/doc/en/Makefile.in index 0268dfc..a856b75 100644 --- a/doc/en/Makefile.in +++ b/doc/en/Makefile.in @@ -139,24 +139,24 @@ LIBZ = @LIBZ@ LIB_CLAM = @LIB_CLAM@ LIB_KAB = @LIB_KAB@ LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ +LIB_TDECORE = @LIB_TDECORE@ LIB_KDED = @LIB_KDED@ -LIB_KDEPIM = @LIB_KDEPIM@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ -LIB_KDNSSD = @LIB_KDNSSD@ +LIB_TDEPIM = @LIB_TDEPIM@ +LIB_TDEPRINT = @LIB_TDEPRINT@ +LIB_TDEUI = @LIB_TDEUI@ +LIB_TDEDNSSD = @LIB_TDEDNSSD@ LIB_KFILE = @LIB_KFILE@ LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIMPROXY = @LIB_KIMPROXY@ -LIB_KIO = @LIB_KIO@ +LIB_TDEHTML = @LIB_TDEHTML@ +LIB_TDEIMPROXY = @LIB_TDEIMPROXY@ +LIB_TDEIO = @LIB_TDEIO@ LIB_KJS = @LIB_KJS@ LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ -LIB_KUNITTEST = @LIB_KUNITTEST@ -LIB_KUTILS = @LIB_KUTILS@ +LIB_TDEPARTS = @LIB_TDEPARTS@ +LIB_TDESPELL = @LIB_TDESPELL@ +LIB_TDESYCOCA = @LIB_TDESYCOCA@ +LIB_TDEUNITTEST = @LIB_TDEUNITTEST@ +LIB_TDEUTILS = @LIB_TDEUTILS@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ @@ -168,7 +168,7 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ -MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ +MAKETDEWIDGETS = @MAKETDEWIDGETS@ MCOPIDL = @MCOPIDL@ MEINPROC = @MEINPROC@ MOC = @MOC@ @@ -273,7 +273,7 @@ kde_styledir = @kde_styledir@ kde_templatesdir = @kde_templatesdir@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ -kdeinitdir = @kdeinitdir@ +tdeinitdir = @tdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/doc/en/index.docbook b/doc/en/index.docbook index e2c68f9..106d655 100644 --- a/doc/en/index.docbook +++ b/doc/en/index.docbook @@ -2,7 +2,7 @@ <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ <!ENTITY klamav02 "<application>klamav02 0.1</application>"> <!ENTITY kappname "&klamav02;"><!-- Do *not* replace kappname--> - <!ENTITY package "kde-module"><!-- kdebase, kdeadmin, etc --> + <!ENTITY package "kde-module"><!-- tdebase, tdeadmin, etc --> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE"><!-- change language only here --> @@ -488,8 +488,8 @@ application --> <!-- List any special requirements for your application here. This should include: -.Libraries or other software that is not included in kdesupport, -kdelibs, or kdebase. +.Libraries or other software that is not included in tdesupport, +tdelibs, or tdebase. .Hardware requirements like amount of RAM, disk space, graphics card capabilities, screen resolution, special expansion cards, etc. .Operating systems the app will run on. If your app is designed only for a diff --git a/po/Makefile.in b/po/Makefile.in index 789ba48..6817117 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -141,24 +141,24 @@ LIBZ = @LIBZ@ LIB_CLAM = @LIB_CLAM@ LIB_KAB = @LIB_KAB@ LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ +LIB_TDECORE = @LIB_TDECORE@ LIB_KDED = @LIB_KDED@ -LIB_KDEPIM = @LIB_KDEPIM@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ -LIB_KDNSSD = @LIB_KDNSSD@ +LIB_TDEPIM = @LIB_TDEPIM@ +LIB_TDEPRINT = @LIB_TDEPRINT@ +LIB_TDEUI = @LIB_TDEUI@ +LIB_TDEDNSSD = @LIB_TDEDNSSD@ LIB_KFILE = @LIB_KFILE@ LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIMPROXY = @LIB_KIMPROXY@ -LIB_KIO = @LIB_KIO@ +LIB_TDEHTML = @LIB_TDEHTML@ +LIB_TDEIMPROXY = @LIB_TDEIMPROXY@ +LIB_TDEIO = @LIB_TDEIO@ LIB_KJS = @LIB_KJS@ LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ -LIB_KUNITTEST = @LIB_KUNITTEST@ -LIB_KUTILS = @LIB_KUTILS@ +LIB_TDEPARTS = @LIB_TDEPARTS@ +LIB_TDESPELL = @LIB_TDESPELL@ +LIB_TDESYCOCA = @LIB_TDESYCOCA@ +LIB_TDEUNITTEST = @LIB_TDEUNITTEST@ +LIB_TDEUTILS = @LIB_TDEUTILS@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ @@ -170,7 +170,7 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ -MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ +MAKETDEWIDGETS = @MAKETDEWIDGETS@ MCOPIDL = @MCOPIDL@ MEINPROC = @MEINPROC@ MOC = @MOC@ @@ -275,7 +275,7 @@ kde_styledir = @kde_styledir@ kde_templatesdir = @kde_templatesdir@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ -kdeinitdir = @kdeinitdir@ +tdeinitdir = @tdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/src/Makefile.am b/src/Makefile.am index edbc088..cd01a64 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,7 +19,7 @@ INCLUDES = $(all_includes) klamav_LDFLAGS = $(KDE_RPATH) $(all_libraries) # the libraries to link against. -klamav_LDADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KHTML) $(LIB_SQLITE) $(LIB_SQLITE_LOCAL) $(LIB_CLAM) +klamav_LDADD = $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEHTML) $(LIB_SQLITE) $(LIB_SQLITE_LOCAL) $(LIB_CLAM) # which sources should be compiled for klamav klamav_SOURCES = main.cpp klamav.cpp freshklam.cpp sigtool.cpp klamscan.cpp \ diff --git a/src/Makefile.in b/src/Makefile.in index 4d94125..9f8af3b 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -235,24 +235,24 @@ LIBZ = @LIBZ@ LIB_CLAM = @LIB_CLAM@ LIB_KAB = @LIB_KAB@ LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ +LIB_TDECORE = @LIB_TDECORE@ LIB_KDED = @LIB_KDED@ -LIB_KDEPIM = @LIB_KDEPIM@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ -LIB_KDNSSD = @LIB_KDNSSD@ +LIB_TDEPIM = @LIB_TDEPIM@ +LIB_TDEPRINT = @LIB_TDEPRINT@ +LIB_TDEUI = @LIB_TDEUI@ +LIB_TDEDNSSD = @LIB_TDEDNSSD@ LIB_KFILE = @LIB_KFILE@ LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIMPROXY = @LIB_KIMPROXY@ -LIB_KIO = @LIB_KIO@ +LIB_TDEHTML = @LIB_TDEHTML@ +LIB_TDEIMPROXY = @LIB_TDEIMPROXY@ +LIB_TDEIO = @LIB_TDEIO@ LIB_KJS = @LIB_KJS@ LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ -LIB_KUNITTEST = @LIB_KUNITTEST@ -LIB_KUTILS = @LIB_KUTILS@ +LIB_TDEPARTS = @LIB_TDEPARTS@ +LIB_TDESPELL = @LIB_TDESPELL@ +LIB_TDESYCOCA = @LIB_TDESYCOCA@ +LIB_TDEUNITTEST = @LIB_TDEUNITTEST@ +LIB_TDEUTILS = @LIB_TDEUTILS@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ @@ -264,7 +264,7 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ -MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ +MAKETDEWIDGETS = @MAKETDEWIDGETS@ MCOPIDL = @MCOPIDL@ MEINPROC = @MEINPROC@ MOC = @MOC@ @@ -369,7 +369,7 @@ kde_styledir = @kde_styledir@ kde_templatesdir = @kde_templatesdir@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ -kdeinitdir = @kdeinitdir@ +tdeinitdir = @tdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -412,7 +412,7 @@ INCLUDES = $(all_includes) klamav_LDFLAGS = $(KDE_RPATH) $(all_libraries) # the libraries to link against. -klamav_LDADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KHTML) $(LIB_SQLITE) $(LIB_SQLITE_LOCAL) $(LIB_CLAM) +klamav_LDADD = $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEHTML) $(LIB_SQLITE) $(LIB_SQLITE_LOCAL) $(LIB_CLAM) # which sources should be compiled for klamav #>- klamav_SOURCES = main.cpp klamav.cpp freshklam.cpp sigtool.cpp klamscan.cpp \ @@ -1366,7 +1366,7 @@ kuarantine.lo: kuarantine.moc firstrunwizard.cpp: $(srcdir)/firstrunwizard.ui firstrunwizard.h firstrunwizard.moc rm -f firstrunwizard.cpp echo '#include <kdialog.h>' > firstrunwizard.cpp - echo '#include <klocale.h>' >> firstrunwizard.cpp + echo '#include <tdelocale.h>' >> firstrunwizard.cpp $(UIC) -tr ${UIC_TR} -i firstrunwizard.h $(srcdir)/firstrunwizard.ui > firstrunwizard.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" firstrunwizard.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_firstrunwizard,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> firstrunwizard.cpp ;\ rm -f firstrunwizard.cpp.temp ;\ @@ -1381,7 +1381,7 @@ firstrunwizard.moc: firstrunwizard.h specialfiletypes.cpp: $(srcdir)/specialfiletypes.ui specialfiletypes.h specialfiletypes.moc rm -f specialfiletypes.cpp echo '#include <kdialog.h>' > specialfiletypes.cpp - echo '#include <klocale.h>' >> specialfiletypes.cpp + echo '#include <tdelocale.h>' >> specialfiletypes.cpp $(UIC) -tr ${UIC_TR} -i specialfiletypes.h $(srcdir)/specialfiletypes.ui > specialfiletypes.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" specialfiletypes.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_specialfiletypes,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> specialfiletypes.cpp ;\ rm -f specialfiletypes.cpp.temp ;\ @@ -1396,7 +1396,7 @@ specialfiletypes.moc: specialfiletypes.h autoscanoptions.cpp: $(srcdir)/autoscanoptions.ui autoscanoptions.h autoscanoptions.moc rm -f autoscanoptions.cpp echo '#include <kdialog.h>' > autoscanoptions.cpp - echo '#include <klocale.h>' >> autoscanoptions.cpp + echo '#include <tdelocale.h>' >> autoscanoptions.cpp $(UIC) -tr ${UIC_TR} -i autoscanoptions.h $(srcdir)/autoscanoptions.ui > autoscanoptions.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" autoscanoptions.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_autoscanoptions,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> autoscanoptions.cpp ;\ rm -f autoscanoptions.cpp.temp ;\ @@ -1417,7 +1417,7 @@ klamavconfig.h: $(srcdir)/klamavconfig.kcfg $(srcdir)/klamavconfig.kcfgc $(KCFG_ archivetypes.cpp: $(srcdir)/archivetypes.ui archivetypes.h archivetypes.moc rm -f archivetypes.cpp echo '#include <kdialog.h>' > archivetypes.cpp - echo '#include <klocale.h>' >> archivetypes.cpp + echo '#include <tdelocale.h>' >> archivetypes.cpp $(UIC) -tr ${UIC_TR} -i archivetypes.h $(srcdir)/archivetypes.ui > archivetypes.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" archivetypes.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_archivetypes,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> archivetypes.cpp ;\ rm -f archivetypes.cpp.temp ;\ @@ -1432,7 +1432,7 @@ archivetypes.moc: archivetypes.h logoptions.cpp: $(srcdir)/logoptions.ui logoptions.h logoptions.moc rm -f logoptions.cpp echo '#include <kdialog.h>' > logoptions.cpp - echo '#include <klocale.h>' >> logoptions.cpp + echo '#include <tdelocale.h>' >> logoptions.cpp $(UIC) -tr ${UIC_TR} -i logoptions.h $(srcdir)/logoptions.ui > logoptions.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" logoptions.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_logoptions,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> logoptions.cpp ;\ rm -f logoptions.cpp.temp ;\ @@ -1447,7 +1447,7 @@ logoptions.moc: logoptions.h archivelimits.cpp: $(srcdir)/archivelimits.ui archivelimits.h archivelimits.moc rm -f archivelimits.cpp echo '#include <kdialog.h>' > archivelimits.cpp - echo '#include <klocale.h>' >> archivelimits.cpp + echo '#include <tdelocale.h>' >> archivelimits.cpp $(UIC) -tr ${UIC_TR} -i archivelimits.h $(srcdir)/archivelimits.ui > archivelimits.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" archivelimits.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_archivelimits,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> archivelimits.cpp ;\ rm -f archivelimits.cpp.temp ;\ diff --git a/src/about/Makefile.in b/src/about/Makefile.in index 2828a4f..154e6c8 100644 --- a/src/about/Makefile.in +++ b/src/about/Makefile.in @@ -149,24 +149,24 @@ LIBZ = @LIBZ@ LIB_CLAM = @LIB_CLAM@ LIB_KAB = @LIB_KAB@ LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ +LIB_TDECORE = @LIB_TDECORE@ LIB_KDED = @LIB_KDED@ -LIB_KDEPIM = @LIB_KDEPIM@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ -LIB_KDNSSD = @LIB_KDNSSD@ +LIB_TDEPIM = @LIB_TDEPIM@ +LIB_TDEPRINT = @LIB_TDEPRINT@ +LIB_TDEUI = @LIB_TDEUI@ +LIB_TDEDNSSD = @LIB_TDEDNSSD@ LIB_KFILE = @LIB_KFILE@ LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIMPROXY = @LIB_KIMPROXY@ -LIB_KIO = @LIB_KIO@ +LIB_TDEHTML = @LIB_TDEHTML@ +LIB_TDEIMPROXY = @LIB_TDEIMPROXY@ +LIB_TDEIO = @LIB_TDEIO@ LIB_KJS = @LIB_KJS@ LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ -LIB_KUNITTEST = @LIB_KUNITTEST@ -LIB_KUTILS = @LIB_KUTILS@ +LIB_TDEPARTS = @LIB_TDEPARTS@ +LIB_TDESPELL = @LIB_TDESPELL@ +LIB_TDESYCOCA = @LIB_TDESYCOCA@ +LIB_TDEUNITTEST = @LIB_TDEUNITTEST@ +LIB_TDEUTILS = @LIB_TDEUTILS@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ @@ -178,7 +178,7 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ -MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ +MAKETDEWIDGETS = @MAKETDEWIDGETS@ MCOPIDL = @MCOPIDL@ MEINPROC = @MEINPROC@ MOC = @MOC@ @@ -283,7 +283,7 @@ kde_styledir = @kde_styledir@ kde_templatesdir = @kde_templatesdir@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ -kdeinitdir = @kdeinitdir@ +tdeinitdir = @tdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/src/aboutklamav.cpp b/src/aboutklamav.cpp index e06c18d..793b1f4 100644 --- a/src/aboutklamav.cpp +++ b/src/aboutklamav.cpp @@ -7,7 +7,7 @@ #include "tabwidget.h" #include "version.h" -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kstandarddirs.h> diff --git a/src/aboutklamav.h b/src/aboutklamav.h index 0d3452c..a04f106 100644 --- a/src/aboutklamav.h +++ b/src/aboutklamav.h @@ -9,13 +9,13 @@ #include <config.h> #endif -#include <kapplication.h> -#include <kmainwindow.h> +#include <tdeapplication.h> +#include <tdemainwindow.h> class KPrinter; -class KToggleAction; +class TDEToggleAction; class KURL; class TQLineEdit; class TQComboBox; @@ -23,8 +23,8 @@ class TQCheckBox; class TQListBox; class TQPushButton; class TQLabel; -class KProcess; -class KConfig; +class TDEProcess; +class TDEConfig; class KURLRequester; namespace KlamAV @@ -74,14 +74,14 @@ protected: * This function is called when it is time for the app to save its * properties for session management purposes. */ - //void saveProperties(KConfig *); + //void saveProperties(TDEConfig *); /** - * This function is called when this app is restored. The KConfig + * This function is called when this app is restored. The TDEConfig * object points to the session management config file that was saved * with @ref saveProperties */ - //void readProperties(KConfig *); + //void readProperties(TDEConfig *); private slots: @@ -108,8 +108,8 @@ private: //AboutklamavView *m_view; /* KPrinter *m_printer; - KToggleAction *m_toolbarAction; - KToggleAction *m_statusbarAction;*/ + TDEToggleAction *m_toolbarAction; + TDEToggleAction *m_statusbarAction;*/ KlamAV::PageViewer* homepage; KlamAV::TabWidget* tabBrowser; signals: @@ -126,7 +126,7 @@ protected slots: private: TQPushButton *about_button; - KConfig *config; + TDEConfig *config; TQComboBox *check_combo; TQLabel *notes_label; }; diff --git a/src/action/Makefile.in b/src/action/Makefile.in index 938d8d2..0391604 100644 --- a/src/action/Makefile.in +++ b/src/action/Makefile.in @@ -143,24 +143,24 @@ LIBZ = @LIBZ@ LIB_CLAM = @LIB_CLAM@ LIB_KAB = @LIB_KAB@ LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ +LIB_TDECORE = @LIB_TDECORE@ LIB_KDED = @LIB_KDED@ -LIB_KDEPIM = @LIB_KDEPIM@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ -LIB_KDNSSD = @LIB_KDNSSD@ +LIB_TDEPIM = @LIB_TDEPIM@ +LIB_TDEPRINT = @LIB_TDEPRINT@ +LIB_TDEUI = @LIB_TDEUI@ +LIB_TDEDNSSD = @LIB_TDEDNSSD@ LIB_KFILE = @LIB_KFILE@ LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIMPROXY = @LIB_KIMPROXY@ -LIB_KIO = @LIB_KIO@ +LIB_TDEHTML = @LIB_TDEHTML@ +LIB_TDEIMPROXY = @LIB_TDEIMPROXY@ +LIB_TDEIO = @LIB_TDEIO@ LIB_KJS = @LIB_KJS@ LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ -LIB_KUNITTEST = @LIB_KUNITTEST@ -LIB_KUTILS = @LIB_KUTILS@ +LIB_TDEPARTS = @LIB_TDEPARTS@ +LIB_TDESPELL = @LIB_TDESPELL@ +LIB_TDESYCOCA = @LIB_TDESYCOCA@ +LIB_TDEUNITTEST = @LIB_TDEUNITTEST@ +LIB_TDEUTILS = @LIB_TDEUTILS@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ @@ -172,7 +172,7 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ -MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ +MAKETDEWIDGETS = @MAKETDEWIDGETS@ MCOPIDL = @MCOPIDL@ MEINPROC = @MEINPROC@ MOC = @MOC@ @@ -277,7 +277,7 @@ kde_styledir = @kde_styledir@ kde_templatesdir = @kde_templatesdir@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ -kdeinitdir = @kdeinitdir@ +tdeinitdir = @tdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/src/activityviewer.cpp b/src/activityviewer.cpp index 6df81b6..7b11b57 100644 --- a/src/activityviewer.cpp +++ b/src/activityviewer.cpp @@ -11,16 +11,16 @@ #include "collectiondb.h" -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kmenubar.h> +#include <tdemenubar.h> #include <kstatusbar.h> #include <kkeydialog.h> -#include <kio/netaccess.h> -#include <kfiledialog.h> +#include <tdeio/netaccess.h> +#include <tdefiledialog.h> #include <kdebug.h> -#include <klistviewsearchline.h> -#include <ktoolbarbutton.h> //ctor +#include <tdelistviewsearchline.h> +#include <tdetoolbarbutton.h> //ctor #include <kbuttonbox.h> @@ -28,7 +28,7 @@ #include <kurlcompletion.h> #include <kcombobox.h> #include <tqlayout.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <tqtoolbutton.h> @@ -122,18 +122,18 @@ Activityviewer::Activityviewer(TQWidget *parent, const char *name) - KToolBarButton *button; - KToolBar* searchToolBar = new KToolBar( hlp2 ); + TDEToolBarButton *button; + TDEToolBar* searchToolBar = new TDEToolBar( hlp2 ); searchToolBar->setMovingEnabled(false); searchToolBar->setFlat(true); searchToolBar->setIconSize( 16 ); searchToolBar->setEnableContextMenu( false ); - button = new KToolBarButton( "locationbar_erase", 0, searchToolBar ); + button = new TDEToolBarButton( "locationbar_erase", 0, searchToolBar ); /*TQLabel *filter_label =*/ new TQLabel( i18n("Search:") + " ", searchToolBar ); - currentbox = new KListView(hlp2); + currentbox = new TDEListView(hlp2); currentbox->setShowSortIndicator(true); TQFontMetrics rb_fm(currentbox->fontMetrics()); @@ -153,7 +153,7 @@ Activityviewer::Activityviewer(TQWidget *parent, const char *name) // connect(currentbox, SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint& , int ) ), // this, SLOT( slotRMB( TQListViewItem *, const TQPoint &, int ) ) ); - kLineEdit1 = new KListViewSearchLine( (TQWidget *)searchToolBar, currentbox,"klinedit1"); + kLineEdit1 = new TDEListViewSearchLine( (TQWidget *)searchToolBar, currentbox,"klinedit1"); /* TQValueList<int> columns; columns.append(0); columns.append(1); @@ -256,7 +256,7 @@ void Activityviewer::insertItem(const TQString &date, const TQString &type, co void Activityviewer::slotOptions(){ - kmain->slotConfigKlamav( "Event Logging" ); + tdemain->slotConfigKlamav( "Event Logging" ); } @@ -265,8 +265,8 @@ Activityviewer::~Activityviewer() { } -EventListItem::EventListItem( KListView *parent, TQString label1, TQString label2 , TQString label3, TQString label4) - : KListViewItem( parent, label1, label2 , label3, label4 ) +EventListItem::EventListItem( TDEListView *parent, TQString label1, TQString label2 , TQString label3, TQString label4) + : TDEListViewItem( parent, label1, label2 , label3, label4 ) { } @@ -288,7 +288,7 @@ void EventListItem::paintCell ( TQPainter * p, const TQColorGroup & cg, int colu else if ( this->text(1) == "Quarantine") cg2.setColor(TQColorGroup::Text, TQt::green); - KListViewItem::paintCell( p, cg2, column, width, align ); + TDEListViewItem::paintCell( p, cg2, column, width, align ); } diff --git a/src/activityviewer.h b/src/activityviewer.h index e027ee0..f1511b5 100644 --- a/src/activityviewer.h +++ b/src/activityviewer.h @@ -9,24 +9,24 @@ #include <config.h> #endif -#include <kapplication.h> -#include <kmainwindow.h> -#include <klistview.h> +#include <tdeapplication.h> +#include <tdemainwindow.h> +#include <tdelistview.h> -class KToggleAction; +class TDEToggleAction; class KURL; class TQLineEdit; class TQComboBox; class TQCheckBox; -class KListView; +class TDEListView; class TQPushButton; class TQLabel; -class KProcess; -class KConfig; +class TDEProcess; +class TDEConfig; class KURLRequester; -class KListViewItem; -class KListViewSearchLine; +class TDEListViewItem; +class TDEListViewSearchLine; /** @@ -62,7 +62,7 @@ public: TQString getWhen(TQString); TQString getSelectedVirusName(); void insertItem(const TQString &date, const TQString &type, const TQString &event, const TQString &file); - KListViewSearchLine* kLineEdit1; + TDEListViewSearchLine* kLineEdit1; protected: /** @@ -76,14 +76,14 @@ protected: * This function is called when it is time for the app to save its * properties for session management purposes. */ - //void saveProperties(KConfig *); + //void saveProperties(TDEConfig *); /** - * This function is called when this app is restored. The KConfig + * This function is called when this app is restored. The TDEConfig * object points to the session management config file that was saved * with @ref saveProperties */ - //void readProperties(KConfig *); + //void readProperties(TDEConfig *); private slots: @@ -100,8 +100,8 @@ private: //ActivityviewerView *m_view; /* KPrinter *m_printer; - KToggleAction *m_toolbarAction; - KToggleAction *m_statusbarAction;*/ + TDEToggleAction *m_toolbarAction; + TDEToggleAction *m_statusbarAction;*/ signals: @@ -119,12 +119,12 @@ private: TQComboBox *check_combo, *days_combo; KURLRequester *dir_combo; TQCheckBox *recursive_box; - KListView *currentbox; + TDEListView *currentbox; TQPushButton *search_button, *cancel_button, *refresh_button, *search_button3, *cancel_button3; TQLabel *status_label, *matches_label; - KProcess *childproc; + TDEProcess *childproc; TQString buf; - KConfig* config; + TDEConfig* config; TQStringList lastQuarItems; TQStringList lastHistoryItems; TQStringList lastQuarLocations; @@ -136,10 +136,10 @@ private: }; - class EventListItem : public KListViewItem + class EventListItem : public TDEListViewItem { public: - EventListItem( KListView *parent, TQString label1, TQString label2 = TQString::null, TQString label3 = TQString::null, TQString label4 = TQString::null); + EventListItem( TDEListView *parent, TQString label1, TQString label2 = TQString::null, TQString label3 = TQString::null, TQString label4 = TQString::null); ~EventListItem(); void paintCell ( TQPainter * p, const TQColorGroup & cg, int column, int width, int align ); diff --git a/src/arkollon/Makefile.in b/src/arkollon/Makefile.in index c13c0e9..58cff69 100644 --- a/src/arkollon/Makefile.in +++ b/src/arkollon/Makefile.in @@ -184,24 +184,24 @@ LIBZ = @LIBZ@ LIB_CLAM = @LIB_CLAM@ LIB_KAB = @LIB_KAB@ LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ +LIB_TDECORE = @LIB_TDECORE@ LIB_KDED = @LIB_KDED@ -LIB_KDEPIM = @LIB_KDEPIM@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ -LIB_KDNSSD = @LIB_KDNSSD@ +LIB_TDEPIM = @LIB_TDEPIM@ +LIB_TDEPRINT = @LIB_TDEPRINT@ +LIB_TDEUI = @LIB_TDEUI@ +LIB_TDEDNSSD = @LIB_TDEDNSSD@ LIB_KFILE = @LIB_KFILE@ LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIMPROXY = @LIB_KIMPROXY@ -LIB_KIO = @LIB_KIO@ +LIB_TDEHTML = @LIB_TDEHTML@ +LIB_TDEIMPROXY = @LIB_TDEIMPROXY@ +LIB_TDEIO = @LIB_TDEIO@ LIB_KJS = @LIB_KJS@ LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ -LIB_KUNITTEST = @LIB_KUNITTEST@ -LIB_KUTILS = @LIB_KUTILS@ +LIB_TDEPARTS = @LIB_TDEPARTS@ +LIB_TDESPELL = @LIB_TDESPELL@ +LIB_TDESYCOCA = @LIB_TDESYCOCA@ +LIB_TDEUNITTEST = @LIB_TDEUNITTEST@ +LIB_TDEUTILS = @LIB_TDEUTILS@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ @@ -213,7 +213,7 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ -MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ +MAKETDEWIDGETS = @MAKETDEWIDGETS@ MCOPIDL = @MCOPIDL@ MEINPROC = @MEINPROC@ MOC = @MOC@ @@ -318,7 +318,7 @@ kde_styledir = @kde_styledir@ kde_templatesdir = @kde_templatesdir@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ -kdeinitdir = @kdeinitdir@ +tdeinitdir = @tdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -807,7 +807,7 @@ $(srcdir)/wizard.cpp: logdialog.h wizardbase.h wizardbase.cpp: $(srcdir)/wizardbase.ui wizardbase.h wizardbase.moc rm -f wizardbase.cpp echo '#include <kdialog.h>' > wizardbase.cpp - echo '#include <klocale.h>' >> wizardbase.cpp + echo '#include <tdelocale.h>' >> wizardbase.cpp $(UIC) -tr ${UIC_TR} -i wizardbase.h $(srcdir)/wizardbase.ui > wizardbase.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" wizardbase.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_wizardbase,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> wizardbase.cpp ;\ rm -f wizardbase.cpp.temp ;\ @@ -822,7 +822,7 @@ wizardbase.moc: wizardbase.h logdialog.cpp: $(srcdir)/logdialog.ui logdialog.h logdialog.moc rm -f logdialog.cpp echo '#include <kdialog.h>' > logdialog.cpp - echo '#include <klocale.h>' >> logdialog.cpp + echo '#include <tdelocale.h>' >> logdialog.cpp $(UIC) -tr ${UIC_TR} -i logdialog.h $(srcdir)/logdialog.ui > logdialog.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" logdialog.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_logdialog,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> logdialog.cpp ;\ rm -f logdialog.cpp.temp ;\ diff --git a/src/arkollon/klamarkollon.cpp b/src/arkollon/klamarkollon.cpp index 0dc7b08..c966d78 100644 --- a/src/arkollon/klamarkollon.cpp +++ b/src/arkollon/klamarkollon.cpp @@ -39,7 +39,7 @@ int main(int argc, char *argv[]) // Check if we're root if (getuid() != 0) { - TQString command = "kdesu -i klamav -n -c \""; + TQString command = "tdesu -i klamav -n -c \""; for (int i=0 ; i<app.argc() ; i++) { if (TQString(app.argv()[i]).contains(" ")) diff --git a/src/arkollon/wizard.cpp b/src/arkollon/wizard.cpp index a15491b..67ce53f 100644 --- a/src/arkollon/wizard.cpp +++ b/src/arkollon/wizard.cpp @@ -108,7 +108,7 @@ Wizard::Wizard(TQWidget *parent, const char *name) kdeDirProcess = new TQProcess(this); connect(kdeDirProcess, SIGNAL(readyReadStdout()), SLOT(kdeDirReady())); connect(kdeDirProcess, SIGNAL(processExited()), SLOT(getInstalledComponents())); - kdeDirProcess->addArgument("kde-config"); + kdeDirProcess->addArgument("tde-config"); kdeDirProcess->addArgument("--prefix"); if (!kdeDirProcess->start()) getInstalledComponents(); @@ -890,7 +890,7 @@ void Wizard::errorOccured() TQString Wizard::sub(TQString s) { TQString tmp = s; - tmp.replace(TQRegExp("\\$KDEDIR"), kdeDir); + tmp.replace(TQRegExp("\\$TDEDIR"), kdeDir); tmp.replace(TQRegExp("\\$HOMEDIR"), TQDir::homeDirPath()); tmp.replace(TQRegExp("~"), TQDir::homeDirPath()); tmp.replace(TQRegExp("\\$PREFIX"), "/usr/local"); diff --git a/src/clicklineedit.cpp b/src/clicklineedit.cpp index e3cb6db..0e63579 100644 --- a/src/clicklineedit.cpp +++ b/src/clicklineedit.cpp @@ -1,5 +1,5 @@ /* - This file is part of libkdepim. + This file is part of libtdepim. Copyright (c) 2004 Daniel Molkentin <[email protected]> based on code by Cornelius Schumacher <[email protected]> @@ -63,7 +63,7 @@ void ClickComboBox::paintEvent( TQPaintEvent * ev) KComboBox::paintEvent(ev); - if (kmain->klamscan->isMultiScan()){ + if (tdemain->klamscan->isMultiScan()){ //kdDebug() << "drawing text" << endl; TQPainter p (this->lineEdit()); p.setPen( palette().color( TQPalette::Disabled, TQColorGroup::Text ) ); diff --git a/src/clicklineedit.h b/src/clicklineedit.h index 171aa28..5a4aa77 100644 --- a/src/clicklineedit.h +++ b/src/clicklineedit.h @@ -1,5 +1,5 @@ /* - This file is part of libkdepim. + This file is part of libtdepim. Copyright (c) 2004 Daniel Molkentin <[email protected]> This library is free software; you can redistribute it and/or diff --git a/src/collectiondb.cpp b/src/collectiondb.cpp index a729282..fea1182 100644 --- a/src/collectiondb.cpp +++ b/src/collectiondb.cpp @@ -18,18 +18,18 @@ #include <tqfile.h> #include <tqtimer.h> -#include <kapplication.h> -#include <kconfig.h> -#include <kglobal.h> +#include <tdeapplication.h> +#include <tdeconfig.h> +#include <tdeglobal.h> #include <kinputdialog.h> //setupCoverFetcher() -#include <kio/job.h> +#include <tdeio/job.h> #include <klineedit.h> //setupCoverFetcher() -#include <klocale.h> +#include <tdelocale.h> #include <kmdcodec.h> #include <kstandarddirs.h> #include <kurl.h> #include <kdebug.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <cmath> //DbConnection::sqlite_power() #include <ctime> //query() @@ -388,7 +388,7 @@ CollectionDB::initialize() DbConnection *dbConn = m_dbConnPool->getDbConnection(); m_dbConnPool->putDbConnection( dbConn ); -// KConfig* config = amaroK::config( "Collection Browser" ); +// TDEConfig* config = amaroK::config( "Collection Browser" ); if(!dbConn->isConnected()) kdDebug() << "db not connected" << endl; //amaroK::MessageQueue::instance()->addMessage(dbConn->lastError()); @@ -606,7 +606,7 @@ int SqliteConnection::insert( const TQString& statement, const TQString& /* tabl // this implements a RAND() function compatible with the MySQL RAND() (0-param-form without seed) void SqliteConnection::sqlite_rand(sqlite3_context *context, int /*argc*/, sqlite3_value ** /*argv*/) { - sqlite3_result_double( context, static_cast<double>(KApplication::random()) / (RAND_MAX+1.0) ); + sqlite3_result_double( context, static_cast<double>(TDEApplication::random()) / (RAND_MAX+1.0) ); } // this implements a POWER() function compatible with the MySQL POWER() @@ -761,7 +761,7 @@ void CollectionDB::insertEvent(const TQString &type, const TQString &event, con .arg( file ) , "klamav_activity", conn); - kmain->activityviewer->insertItem(date,type,event,file); + tdemain->activityviewer->insertItem(date,type,event,file); } void CollectionDB::insertMetaDBEntry(const TQString &date, const TQString &submission, const TQString &creator,const TQString &virus,const TQString &alias, const TQString &sender,DbConnection *conn) diff --git a/src/configdialog.cpp b/src/configdialog.cpp index 6c02371..a46c304 100644 --- a/src/configdialog.cpp +++ b/src/configdialog.cpp @@ -34,19 +34,19 @@ email : [email protected] #include <tqtooltip.h> #include <tqvbox.h> -#include <kapplication.h> //kapp +#include <tdeapplication.h> //kapp #include <kcombobox.h> #include <kiconloader.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> ////////////////////////////////////////////////////////////////////////////////////////// // PUBLIC ////////////////////////////////////////////////////////////////////////////////////////// -KlamavConfigDialog::KlamavConfigDialog( TQWidget *parent, const char* name, KConfigSkeleton *config ) - : KConfigDialog( parent, name, config ) +KlamavConfigDialog::KlamavConfigDialog( TQWidget *parent, const char* name, TDEConfigSkeleton *config ) + : TDEConfigDialog( parent, name, config ) { setWFlags( WDestructiveClose ); @@ -69,7 +69,7 @@ KlamavConfigDialog::KlamavConfigDialog( TQWidget *parent, const char* name, KCon static_cast<TQLabel*>(label)->setPixmap( TQMessageBox::standardIcon( TQMessageBox::Information ) ); delete list; - //stop KFont Requesters getting stupidly large + //stop TDEFont Requesters getting stupidly large list = queryList( "TQLabel", "m_sampleLabel" ); for( TQObject *label = list->first(); label; label = list->next() ) static_cast<TQLabel*>(label)->setMaximumWidth( 250 ); @@ -89,19 +89,19 @@ void KlamavConfigDialog::showPage( const TQCString& page ) { for( uint index = 0; index < m_pageList.count(); index++ ) { if ( m_pageList[index]->name() == page ) { - KConfigDialog::showPage( index ); + TDEConfigDialog::showPage( index ); return; } } } -/** Reimplemented from KConfigDialog */ +/** Reimplemented from TDEConfigDialog */ void KlamavConfigDialog::addPage( TQWidget *page, const TQString &itemName, const TQString &pixmapName, const TQString &header, bool manage ) { // Add the widget pointer to our list, for later reference m_pageList << page; - KConfigDialog::addPage( page, itemName, pixmapName, header, manage ); + TDEConfigDialog::addPage( page, itemName, pixmapName, header, manage ); } diff --git a/src/configdialog.h b/src/configdialog.h index dfaf901..c18e106 100644 --- a/src/configdialog.h +++ b/src/configdialog.h @@ -20,19 +20,19 @@ email : [email protected] #include <tqmap.h> #include <tqvaluelist.h> -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> class TQComboBox; class TQGroupBox; class TQVBox; -class KlamavConfigDialog : public KConfigDialog +class KlamavConfigDialog : public TDEConfigDialog { Q_OBJECT public: - KlamavConfigDialog( TQWidget *parent, const char* name, KConfigSkeleton *config ); + KlamavConfigDialog( TQWidget *parent, const char* name, TDEConfigSkeleton *config ); ~KlamavConfigDialog(); void addPage( TQWidget *page, const TQString &itemName, const TQString &pixmapName, diff --git a/src/ctcron.cpp b/src/ctcron.cpp index d5bfd07..d8b5893 100644 --- a/src/ctcron.cpp +++ b/src/ctcron.cpp @@ -22,7 +22,7 @@ #include <tqfile.h> #include <kprocess.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <stdlib.h> // system using namespace std; @@ -44,15 +44,15 @@ CTCron::CTCron(bool _syscron, string ) : { if (syscron) { - readCommand = "cat /etc/crontab > " + KProcess::quote(tmpFileName); - writeCommand = "cat " + KProcess::quote(tmpFileName) + " > /etc/crontab"; + readCommand = "cat /etc/crontab > " + TDEProcess::quote(tmpFileName); + writeCommand = "cat " + TDEProcess::quote(tmpFileName) + " > /etc/crontab"; login = (const char *)i18n("(System Crontab)").local8Bit(); name = ""; } else { - readCommand = TQString("crontab -u ") + _login.c_str() + " -l > " + KProcess::quote(tmpFileName); - writeCommand = TQString("crontab -u ") + _login.c_str() + " " + KProcess::quote(tmpFileName); + readCommand = TQString("crontab -u ") + _login.c_str() + " -l > " + TDEProcess::quote(tmpFileName); + writeCommand = TQString("crontab -u ") + _login.c_str() + " " + TDEProcess::quote(tmpFileName); if (!initFromPasswd(getpwnam(_login.c_str()))) { error = i18n("No password entry found for user '%1'").arg(_login.c_str()); @@ -62,8 +62,8 @@ CTCron::CTCron(bool _syscron, string ) : else*/ // regular user, so provide user's own crontab { - readCommand = "crontab -l > " + KProcess::quote(tmpFileName); - writeCommand = "crontab " + KProcess::quote(tmpFileName); + readCommand = "crontab -l > " + TDEProcess::quote(tmpFileName); + writeCommand = "crontab " + TDEProcess::quote(tmpFileName); if (!initFromPasswd(getpwuid(uid))) { error = i18n("No password entry found for uid '%1'").arg(uid); @@ -101,8 +101,8 @@ CTCron::CTCron(const struct passwd *pwd) : tmp.close(); tmpFileName = tmp.name(); - TQString readCommand = TQString("crontab -u ") + TQString(pwd->pw_name) + " -l > " + KProcess::quote(tmpFileName); - writeCommand = TQString("crontab -u ") + TQString(pwd->pw_name) + " " + KProcess::quote(tmpFileName); + TQString readCommand = TQString("crontab -u ") + TQString(pwd->pw_name) + " -l > " + TDEProcess::quote(tmpFileName); + writeCommand = TQString("crontab -u ") + TQString(pwd->pw_name) + " " + TDEProcess::quote(tmpFileName); initFromPasswd(pwd); diff --git a/src/cti18n.h b/src/cti18n.h index a5b96ec..7cea13a 100644 --- a/src/cti18n.h +++ b/src/cti18n.h @@ -21,7 +21,7 @@ // Regardless, please don't introduce any other TQt or KDE dependencies here. // -GM 11/99 -#include <klocale.h> -#include <kapplication.h> +#include <tdelocale.h> +#include <tdeapplication.h> #endif // CTI18N_H diff --git a/src/datepicker.cpp b/src/datepicker.cpp index 7a7b589..c881010 100644 --- a/src/datepicker.cpp +++ b/src/datepicker.cpp @@ -26,8 +26,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kdatepicker.h> #include <kiconloader.h> -#include <klocale.h> -#include <kwin.h> +#include <tdelocale.h> +#include <twin.h> DatePicker::DatePicker(TQWidget *parent, const TQDate& date) : TQVBox( parent, 0,(WType_TopLevel | WDestructiveClose | WStyle_StaysOnTop)) diff --git a/src/dbviewer.cpp b/src/dbviewer.cpp index 4e53574..4e128c6 100644 --- a/src/dbviewer.cpp +++ b/src/dbviewer.cpp @@ -18,17 +18,17 @@ #include <tqlayout.h> #include <tqpopupmenu.h> -#include <ktoolbarbutton.h> //ctor -#include <ktempfile.h> +#include <tdetoolbarbutton.h> //ctor +#include <tdetempfile.h> #include <ktempdir.h> -#include <klistviewsearchline.h> -#include <klistview.h> +#include <tdelistviewsearchline.h> +#include <tdelistview.h> #include <kprogress.h> #include <dirent.h> #include <zlib.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kiconloader.h> @@ -70,16 +70,16 @@ KlamDB::KlamDB( TQWidget* parent, const char* name, bool modal, WFlags fl ) dblayout->addMultiCellWidget( tabBrowser, 0, 1, 1, 1 ); - KToolBarButton *button; - KToolBar* searchToolBar = new KToolBar( privateLayoutWidget ); + TDEToolBarButton *button; + TDEToolBar* searchToolBar = new TDEToolBar( privateLayoutWidget ); searchToolBar->setMovingEnabled(false); searchToolBar->setFlat(true); searchToolBar->setIconSize( 16 ); searchToolBar->setEnableContextMenu( false ); - button = new KToolBarButton( "locationbar_erase", 0, searchToolBar ); + button = new TDEToolBarButton( "locationbar_erase", 0, searchToolBar ); - VirusList = new KListView( privateLayoutWidget, "VirusList" ); + VirusList = new TDEListView( privateLayoutWidget, "VirusList" ); VirusList->addColumn( i18n( "All Known Viruses" ),150 ); connect(VirusList, SIGNAL( doubleClicked( TQListViewItem * , const TQPoint &, int ) ), this, SLOT(slotOpenTab(TQListViewItem * , const TQPoint &, int )) ); @@ -92,19 +92,19 @@ KlamDB::KlamDB( TQWidget* parent, const char* name, bool modal, WFlags fl ) TQString iconPath = locate("cache", KMimeType::favIconForURL("http://www.viruspool.net")+".png"); if ( iconPath.isEmpty() ) - vicon = SmallIcon("find"); + vicon = SmallIcon("edit-find"); else vicon = TQPixmap( iconPath ); iconPath = locate("cache", KMimeType::favIconForURL("http://www.google.com")+".png"); if ( iconPath.isEmpty() ) - gicon = SmallIcon("find"); + gicon = SmallIcon("edit-find"); else gicon = TQPixmap( iconPath ); iconPath = locate("cache", KMimeType::favIconForURL("http://www.trendmicro.com")+".png"); if ( iconPath.isEmpty() ) - ticon = SmallIcon("find"); + ticon = SmallIcon("edit-find"); else ticon = TQPixmap( iconPath ); @@ -116,7 +116,7 @@ KlamDB::KlamDB( TQWidget* parent, const char* name, bool modal, WFlags fl ) connect(VirusList, SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint& , int ) ), this, SLOT( slotRMB( TQListViewItem *, const TQPoint &, int ) ) ); - kLineEdit1 = new KListViewSearchLine( (TQWidget *)searchToolBar, VirusList,"klinedit1"); + kLineEdit1 = new TDEListViewSearchLine( (TQWidget *)searchToolBar, VirusList,"klinedit1"); TQValueList<int> columns; columns.append(0); kLineEdit1->setSearchColumns(columns); @@ -153,7 +153,7 @@ void KlamDB::languageChange() tabBrowser->changeTab( tab, i18n( "Info" ) ); VirusList->header()->setLabel( 0, i18n( "All Known Viruses" ) ); VirusList->clear(); - /*KListViewItem * item =*/ new KListViewItem( VirusList, 0 ); + /*TDEListViewItem * item =*/ new TDEListViewItem( VirusList, 0 ); //item->setText( 0, tr( "New Item" ) ); } @@ -698,7 +698,7 @@ void KlamDB::shouldIShow(TQWidget * current) TQString location; if ((current == this) && (!(loadinprogress))){ - TQString db = kmain->freshklam->getCurrentDBDir(); + TQString db = tdemain->freshklam->getCurrentDBDir(); if (checkdir((const char *)db) == -1){ kdDebug() << "returned -1" << endl; @@ -732,7 +732,7 @@ void KlamDB::shouldIShow(TQWidget * current) prog->setProgress (count); kapp->processEvents(); -// TQString db = kmain->freshklam->getCurrentDBDir(); +// TQString db = tdemain->freshklam->getCurrentDBDir(); listdir((const char *)db); @@ -754,7 +754,7 @@ void KlamDB::shouldIShow(TQWidget * current) loadinprogress = false; // Default english - TQString location = locate( "data", "klamav/about/main-" + KGlobal::locale()->language() + ".html" ); + TQString location = locate( "data", "klamav/about/main-" + TDEGlobal::locale()->language() + ".html" ); if( location != TQString::null ) homepage->openURL( location ); else @@ -776,7 +776,7 @@ void KlamDB::addVirusName(char *start) prog->setProgress (count); kapp->processEvents(); } - new KListViewItem( VirusList, TQString(start)); + new TDEListViewItem( VirusList, TQString(start)); kapp->processEvents(); } @@ -792,7 +792,7 @@ unsigned int KlamDB::getSigNos() TQString dbdir; TQString db; - KConfig* config = KGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->setGroup("Freshklam"); lastDownloadPaths = config->readListEntry("lastDownloadPaths"); dbdir = lastDownloadPaths.first(); @@ -896,7 +896,7 @@ void KlamDB::slotOpenHome() // else setFocus(); - TQString location = locate( "data", "klamav/about/wait-" + KGlobal::locale()->language() + ".html" ); + TQString location = locate( "data", "klamav/about/wait-" + TDEGlobal::locale()->language() + ".html" ); if( location != TQString::null ) homepage->openURL( location ); else @@ -956,7 +956,7 @@ void KlamDB::slotTrendMicro() void KlamDB::slotExternal(TQString name,TQString service) { - kmain->showVirusBrowser(); + tdemain->showVirusBrowser(); shouldIShow(this); TQString prefix; if (service == "VirusPool") diff --git a/src/dbviewer.h b/src/dbviewer.h index 6f0b280..63a33d5 100644 --- a/src/dbviewer.h +++ b/src/dbviewer.h @@ -21,10 +21,10 @@ class TQGridLayout; class TQSpacerItem; class TQTabWidget; class TQWidget; -class KListViewSearchLine; +class TDEListViewSearchLine; class TQListView; -class KListView; -class KListViewItem; +class TDEListView; +class TDEListViewItem; class TQListViewItem; class KProgress; class KProgressDialog; @@ -48,8 +48,8 @@ public: KlamAV::TabWidget* tabBrowser; TQWidget* tab; - KListViewSearchLine* kLineEdit1; - KListView* VirusList; + TDEListViewSearchLine* kLineEdit1; + TDEListView* VirusList; void slotExternal(TQString name, TQString service); public slots: diff --git a/src/directorylist.cpp b/src/directorylist.cpp index f830ecd..80571ab 100644 --- a/src/directorylist.cpp +++ b/src/directorylist.cpp @@ -20,13 +20,13 @@ #include <tqtooltip.h> #include <tqdir.h> -#include <kfileitem.h> -#include <klocale.h> +#include <tdefileitem.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <tqregexp.h> #include <kiconloader.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <dcopref.h> #include <dcopclient.h> #include <kautomount.h> @@ -194,7 +194,7 @@ Item::newItems( const KFileItemList &list ) //SLOT item->setOn( CollectionSetup::instance()->recursive() && isOn() || CollectionSetup::instance()->m_dirs.contains( item->fullPath() ) ); - item->setPixmap( 0, (*it)->pixmap( KIcon::SizeSmall ) ); + item->setPixmap( 0, (*it)->pixmap( TDEIcon::SizeSmall ) ); } } @@ -379,7 +379,7 @@ DeviceItem::newItems( const KFileItemList &list ) //SLOT item->setOn( CollectionSetup::instance()->recursive() && isOn() || CollectionSetup::instance()->m_dirs.contains( item->fullPath() ) ); - item->setPixmap( 0, (*it)->pixmap( KIcon::SizeSmall ) ); + item->setPixmap( 0, (*it)->pixmap( TDEIcon::SizeSmall ) ); } } } diff --git a/src/firstrunwizard.ui.h b/src/firstrunwizard.ui.h index 2f74980..5d14bcd 100644 --- a/src/firstrunwizard.ui.h +++ b/src/firstrunwizard.ui.h @@ -11,8 +11,8 @@ *****************************************************************************/ #include "config.h" #include "klamav.h" -#include <kapplication.h> -#include <klocale.h> +#include <tdeapplication.h> +#include <tdelocale.h> #include <tqpushbutton.h> #include <tqpixmap.h> #include <stdlib.h> @@ -68,7 +68,7 @@ FirstRunWizard::showPage( TQWidget *w ) //virtual // { // // -// KConfig* config = klamav->KGlobal::config(); +// TDEConfig* config = klamav->TDEGlobal::config(); // config->setGroup("Freshklam"); // // //Configure Database Path @@ -94,7 +94,7 @@ FirstRunWizard::showPage( TQWidget *w ) //virtual // // //Download an updated database? // if (CheckForDatabaseUpdates->isChecked()) -// kmain->firstDownload = true; +// tdemain->firstDownload = true; // } KURL diff --git a/src/frame.cpp b/src/frame.cpp index eabb217..eafb543 100644 --- a/src/frame.cpp +++ b/src/frame.cpp @@ -5,9 +5,9 @@ * Licensed under GPL. * ***************************************************************************/ -#include <kparts/browserextension.h> +#include <tdeparts/browserextension.h> -//#include <libkdepim/progressmanager.h> +//#include <libtdepim/progressmanager.h> #include "frame.h" @@ -32,12 +32,12 @@ Frame::Frame(TQObject * parent, KParts::ReadOnlyPart *p, TQWidget *visWidget, co if (ext) connect( ext, SIGNAL(loadingProgress(int)), this, SLOT(setProgress(int)) ); - connect(p, SIGNAL(started(KIO::Job*)), this, SLOT(setStarted())); + connect(p, SIGNAL(started(TDEIO::Job*)), this, SLOT(setStarted())); connect(p, SIGNAL(completed()), this, SLOT(setCompleted())); connect(p, SIGNAL(canceled(const TQString &)), this, SLOT(setCanceled(const TQString&))); connect(p, SIGNAL(completed(bool)), this, SLOT(setCompleted())); -/* KActionCollection *coll=p->actionCollection(); +/* TDEActionCollection *coll=p->actionCollection(); if (coll) { connect( coll, SIGNAL( actionStatusText( const TQString & ) ), diff --git a/src/frame.h b/src/frame.h index da37fff..9c14fd9 100644 --- a/src/frame.h +++ b/src/frame.h @@ -8,7 +8,7 @@ #ifndef FRAME_H #define FRAME_H -#include <kparts/part.h> +#include <tdeparts/part.h> #include <tqobject.h> diff --git a/src/freshklam.cpp b/src/freshklam.cpp index 77bfe27..341564e 100644 --- a/src/freshklam.cpp +++ b/src/freshklam.cpp @@ -12,11 +12,11 @@ #include "config.h" #include "../config.h" -#include <klocale.h> -#include <kio/netaccess.h> +#include <tdelocale.h> +#include <tdeio/netaccess.h> -#include <kaction.h> +#include <tdeaction.h> #include <tqcheckbox.h> #include <kbuttonbox.h> @@ -24,16 +24,16 @@ #include <kurlcompletion.h> #include <kcombobox.h> #include <tqlayout.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <klineedit.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <ksystemtray.h> #include <ktar.h> #include <kprogress.h> #include <kprocio.h> #include <knotifyclient.h> #include <dom/html_misc.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <dcopclient.h> #include <kuser.h> @@ -88,17 +88,17 @@ Freshklam::Freshklam(TQWidget *parent, const char *name) - kmain->firstDownload = false; + tdemain->firstDownload = false; checkingDirectly = false; freshklamAlive = FALSE; - config = KGlobal::config(); + config = TDEGlobal::config(); config->setGroup("Freshklam"); lastDownloadPaths = config->readListEntry("lastDownloadPaths"); getCurrentVersionOfClamAV( ); - if ((lastDownloadPaths.isEmpty()) || (!(KIO::NetAccess::exists(TQString((*lastDownloadPaths.begin())),TRUE,NULL)))){ + if ((lastDownloadPaths.isEmpty()) || (!(TDEIO::NetAccess::exists(TQString((*lastDownloadPaths.begin())),TRUE,NULL)))){ createDBDir(); } TQString proxyIPText = config->readEntry("ProxyIP"); @@ -310,7 +310,7 @@ Freshklam::~Freshklam() killPID(); } if (!(tempFileName.isEmpty())) - KIO::NetAccess::del(tempFileName,NULL); + TDEIO::NetAccess::del(tempFileName,NULL); } @@ -346,20 +346,20 @@ void Freshklam::processOutput() if ((pos = item2.find("Database updated")) != -1){ CollectionDB::instance()->insertEvent("Updates","Database Updated",dir_combo->url()); - KNotifyClient::event(kmain->_tray->winId(),"UpdatedDatabase", "Virus Database Updated."); + KNotifyClient::event(tdemain->_tray->winId(),"UpdatedDatabase", "Virus Database Updated."); updateMailClient(); } if ((pos = item2.find("daily.cvd is up to date")) != -1){ CollectionDB::instance()->insertEvent("Updates","Database Already Up To Date",dir_combo->url()); - KNotifyClient::event(kmain->_tray->winId(),"DatabaseUpToDate", "Virus Database Up To Date."); + KNotifyClient::event(tdemain->_tray->winId(),"DatabaseUpToDate", "Virus Database Up To Date."); updateMailClient(); } if ((pos = item2.find("Recommended version:")) != -1){ - kmain->_tray->setPixmap(KSystemTray::loadIcon("klamav_update_required")); + tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_update_required")); pos2 = item2.find('\n',pos); TQString version = item2.mid((pos+20),pos2 - (pos+20)).stripWhiteSpace(); @@ -374,7 +374,7 @@ void Freshklam::processOutput() updater->downloadComponent("clamav",version,"tar.gz"); } }else if (!(clamav_box->isChecked())) - KNotifyClient::event(kmain->_tray->winId(),"ClamAVOutDated", TQString("Your copy of ClamAV is out of date! Please Upgrade to ClamAV %1!").arg(version)); + KNotifyClient::event(tdemain->_tray->winId(),"ClamAVOutDated", TQString("Your copy of ClamAV is out of date! Please Upgrade to ClamAV %1!").arg(version)); } @@ -421,10 +421,10 @@ void Freshklam::slotSearch() freshklamAlive = TRUE; } - if (!(KApplication::kApplication()->isRestored())){ + if (!(TDEApplication::kApplication()->isRestored())){ - if (kmain->klamd->isKlamdAlive()){ - TQString klamdconf = kmain->klamd->getKlamdConfFile(); + if (tdemain->klamd->isKlamdAlive()){ + TQString klamdconf = tdemain->klamd->getKlamdConfFile(); ////kdDebug() << klamdconf << endl; command += " --daemon-notify="; command += klamdconf; @@ -442,20 +442,20 @@ void Freshklam::slotSearch() //kdDebug() << command << endl; - childproc->start(KProcess::NotifyOnExit, KProcess::Stdout); + childproc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout); - connect( childproc, SIGNAL(processExited(KProcess *)), + connect( childproc, SIGNAL(processExited(TDEProcess *)), SLOT(childExited()) ); - connect( childproc, SIGNAL(receivedStdout(KProcess *, char *, int)), - SLOT(receivedOutput(KProcess *, char *, int)) ); + connect( childproc, SIGNAL(receivedStdout(TDEProcess *, char *, int)), + SLOT(receivedOutput(TDEProcess *, char *, int)) ); -// if (kmain->klamd->isKlamdAlive()) -// kmain->_tray->setPixmap(KSystemTray::loadIcon("klamavdl")); +// if (tdemain->klamd->isKlamdAlive()) +// tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamavdl")); // else -// kmain->_tray->setPixmap(KSystemTray::loadIcon("klamavbwdl")); +// tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamavbwdl")); - kmain->EnableFreshklam->setEnabled(FALSE); - kmain->DisableFreshklam->setEnabled(TRUE); + tdemain->EnableFreshklam->setEnabled(FALSE); + tdemain->DisableFreshklam->setEnabled(TRUE); } @@ -465,10 +465,10 @@ void Freshklam::finish() cancel_button->setEnabled(false); enableInputs(); - if (kmain->klamd->isKlamdAlive()) - kmain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_enabled")); + if (tdemain->klamd->isKlamdAlive()) + tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_enabled")); else - kmain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_disabled")); + tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_disabled")); buf += '\n'; processOutput(); @@ -476,10 +476,10 @@ void Freshklam::finish() childproc = 0; freshklamAlive = FALSE; if (!(tempFileName.isEmpty())) - KIO::NetAccess::del(tempFileName,NULL); + TDEIO::NetAccess::del(tempFileName,NULL); - kmain->EnableFreshklam->setEnabled(TRUE); - kmain->DisableFreshklam->setEnabled(FALSE); + tdemain->EnableFreshklam->setEnabled(TRUE); + tdemain->DisableFreshklam->setEnabled(FALSE); //updateMetaDB(); @@ -530,8 +530,8 @@ void Freshklam::childExited() int status = childproc->exitStatus(); /* int winid = 0; - if (KApplication::kApplication()->mainWidget()) { - winid = KApplication::kApplication()->mainWidget()->winId(); + if (TDEApplication::kApplication()->mainWidget()) { + winid = TDEApplication::kApplication()->mainWidget()->winId(); }*/ finish(); @@ -616,7 +616,7 @@ void Freshklam::updateMailClient() config->sync(); - KConfig* mailconfig = new KConfig("kmailrc"); + TDEConfig* mailconfig = new TDEConfig("kmailrc"); mailconfig->setGroup("General"); TQVariant nooffilters = mailconfig->readEntry("filters"); @@ -654,7 +654,7 @@ void Freshklam::updateMailClient() delete mailconfig; } -void Freshklam::receivedOutput(KProcess */*proc*/, char *buffer, int buflen) +void Freshklam::receivedOutput(TDEProcess */*proc*/, char *buffer, int buflen) { //kdDebug() << buffer << endl; buf += TQCString(buffer, buflen+1); @@ -749,7 +749,7 @@ void Freshklam::initCheckBoxes(){ void Freshklam::handleChecks(){ - config = KGlobal::config(); + config = TDEGlobal::config(); config->setGroup("Freshklam"); if (daemon_box->isChecked()){ config->writeEntry("AutoUpdate","Yes"); @@ -792,7 +792,7 @@ bool Freshklam::killPID(){ else return false; if (!(pidFileName.isEmpty())) - KIO::NetAccess::del(pidFileName,NULL); + TDEIO::NetAccess::del(pidFileName,NULL); return true; } @@ -830,7 +830,7 @@ TQString Freshklam::getCurrentDBDir(){ TQString dbdir; TQString db; - config = KGlobal::config(); + config = TDEGlobal::config(); config->setGroup("Freshklam"); lastDownloadPaths = config->readListEntry("lastDownloadPaths"); for (TQStringList::Iterator ita = lastDownloadPaths.begin(); ita == lastDownloadPaths.begin() ; ita++){ @@ -886,7 +886,7 @@ void Freshklam::createDBDir(){ if (ok){ lastDownloadPaths.prepend( TQString("%1").arg(path)); - config = KGlobal::config(); + config = TDEGlobal::config(); config->setGroup("Freshklam"); config->writeEntry("lastDownloadPaths", lastDownloadPaths); config->sync(); @@ -901,7 +901,7 @@ void Freshklam::createDBDir(){ switch (result) { case 2 : KMessageBox::information (this,i18n( "You should update the database manually at your earliest convenience.") ); break; case 5 : - kmain->firstDownload = true; + tdemain->firstDownload = true; break; } @@ -920,7 +920,7 @@ bool Freshklam::isFreshklamAlive(){ void Freshklam::enableAutoUpdates() { - config = KGlobal::config(); + config = TDEGlobal::config(); config->writeEntry("AutoUpdate","Yes"); config->sync(); daemon_box->setChecked(true); @@ -992,7 +992,7 @@ Freshklam::getCurrentVersionOfClamAV( ) connect( versionproc, SIGNAL(readReady(KProcIO *)), SLOT(readVersionLine(KProcIO *)) ); - connect( versionproc, SIGNAL(processExited(KProcess *)), + connect( versionproc, SIGNAL(processExited(TDEProcess *)), SLOT(versionExited()) ); versionproc->start(KProcIO::NotifyOnExit); diff --git a/src/freshklam.h b/src/freshklam.h index 96e1f99..f6a4bf9 100644 --- a/src/freshklam.h +++ b/src/freshklam.h @@ -9,12 +9,12 @@ #include <config.h> #endif -#include <kapplication.h> -#include <kmainwindow.h> +#include <tdeapplication.h> +#include <tdemainwindow.h> #include <kdirlister.h> //stack allocated #include <kurl.h> //stack allocated #include <kresolver.h> // namespace -#include <khtml_part.h> +#include <tdehtml_part.h> #include "update.h" namespace DOM { @@ -25,7 +25,7 @@ namespace DOM { using namespace KNetwork; class KPrinter; -class KToggleAction; +class TDEToggleAction; class KURL; class TQLineEdit; class TQComboBox; @@ -33,13 +33,13 @@ class TQCheckBox; class TQListBox; class TQPushButton; class TQLabel; -class KProcess; -class KConfig; +class TDEProcess; +class TDEConfig; class KURLRequester; class KLineEdit; class KProgressDialog; class KProcIO; -class KHTMLPart; +class TDEHTMLPart; class KlamavUpdate; /** @@ -85,14 +85,14 @@ protected: * This function is called when it is time for the app to save its * properties for session management purposes. */ - //void saveProperties(KConfig *); + //void saveProperties(TDEConfig *); /** - * This function is called when this app is restored. The KConfig + * This function is called when this app is restored. The TDEConfig * object points to the session management config file that was saved * with @ref saveProperties */ - //void readProperties(KConfig *); + //void readProperties(TDEConfig *); @@ -119,13 +119,13 @@ private slots: /* void slotProg();*/ void childExited(); void processDied(); - void receivedOutput(KProcess *proc, char *buffer, int buflen); + void receivedOutput(TDEProcess *proc, char *buffer, int buflen); void slotClear(); void writeConf(); void handleChecks(); - //void arkollonExited(KProcess *arkollonproc); -/* void klamavInstallationExited(KProcess *arkollonproc); - void clamavInstallationExited(KProcess *arkollonproc);*/ + //void arkollonExited(TDEProcess *arkollonproc); +/* void klamavInstallationExited(TDEProcess *arkollonproc); + void clamavInstallationExited(TDEProcess *arkollonproc);*/ //void newItems( const KFileItemList& ); void resolved(KResolverResults result); void checkForNewKlamAVNow(); @@ -165,10 +165,10 @@ private: TQCheckBox *recursive_box; TQListBox *resultbox; TQLabel *status_label, *matches_label; - KProcess *childproc; + TDEProcess *childproc; KProcIO *versionproc; TQString buf; - KConfig* config; + TDEConfig* config; TQStringList lastSearchItems; TQStringList lastDownloadPaths; KLineEdit *proxyIP; @@ -188,7 +188,7 @@ private: TQString highestsofarfilename;*/ KResolver m_resolver; /* TQString currentClamAVVersion; - KHTMLPart *filelist;*/ + TDEHTMLPart *filelist;*/ TQPushButton *clamav_options; TQPushButton *klamav_options; diff --git a/src/icons/Makefile.in b/src/icons/Makefile.in index a72b63e..8613c30 100644 --- a/src/icons/Makefile.in +++ b/src/icons/Makefile.in @@ -139,24 +139,24 @@ LIBZ = @LIBZ@ LIB_CLAM = @LIB_CLAM@ LIB_KAB = @LIB_KAB@ LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ +LIB_TDECORE = @LIB_TDECORE@ LIB_KDED = @LIB_KDED@ -LIB_KDEPIM = @LIB_KDEPIM@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ -LIB_KDNSSD = @LIB_KDNSSD@ +LIB_TDEPIM = @LIB_TDEPIM@ +LIB_TDEPRINT = @LIB_TDEPRINT@ +LIB_TDEUI = @LIB_TDEUI@ +LIB_TDEDNSSD = @LIB_TDEDNSSD@ LIB_KFILE = @LIB_KFILE@ LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIMPROXY = @LIB_KIMPROXY@ -LIB_KIO = @LIB_KIO@ +LIB_TDEHTML = @LIB_TDEHTML@ +LIB_TDEIMPROXY = @LIB_TDEIMPROXY@ +LIB_TDEIO = @LIB_TDEIO@ LIB_KJS = @LIB_KJS@ LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ -LIB_KUNITTEST = @LIB_KUNITTEST@ -LIB_KUTILS = @LIB_KUTILS@ +LIB_TDEPARTS = @LIB_TDEPARTS@ +LIB_TDESPELL = @LIB_TDESPELL@ +LIB_TDESYCOCA = @LIB_TDESYCOCA@ +LIB_TDEUNITTEST = @LIB_TDEUNITTEST@ +LIB_TDEUTILS = @LIB_TDEUTILS@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ @@ -168,7 +168,7 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ -MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ +MAKETDEWIDGETS = @MAKETDEWIDGETS@ MCOPIDL = @MCOPIDL@ MEINPROC = @MEINPROC@ MOC = @MOC@ @@ -273,7 +273,7 @@ kde_styledir = @kde_styledir@ kde_templatesdir = @kde_templatesdir@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ -kdeinitdir = @kdeinitdir@ +tdeinitdir = @tdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/src/k3bjobprogressosd_mod.cpp b/src/k3bjobprogressosd_mod.cpp index 1431bf3..cf1ed3e 100644 --- a/src/k3bjobprogressosd_mod.cpp +++ b/src/k3bjobprogressosd_mod.cpp @@ -21,13 +21,13 @@ #include "k3bjobprogressosd_mod.h" -#include <kwin.h> +#include <twin.h> #include <kiconloader.h> #include <kdebug.h> #include <kcursor.h> -#include <kconfig.h> -#include <klocale.h> -#include <kpopupmenu.h> +#include <tdeconfig.h> +#include <tdelocale.h> +#include <tdepopupmenu.h> #include <tqpixmap.h> #include <tqpainter.h> @@ -115,7 +115,7 @@ void K3bJobProgressOSD::renderOSD() // ---------------------------------------- // calculate needed size - TQPixmap icon = KGlobal::iconLoader()->loadIcon( "klamav", KIcon::NoGroup, 32 ); + TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "klamav", TDEIcon::NoGroup, 32 ); int margin = 10; int textWidth = fontMetrics().width( m_text ); @@ -212,7 +212,7 @@ void K3bJobProgressOSD::mousePressEvent( TQMouseEvent* e ) m_dragging = true; } else if( e->button() == RightButton ) { - KPopupMenu m; + TDEPopupMenu m; if( m.insertItem( i18n("Hide OSD") ) == m.exec( e->globalPos() ) ) hide(); } @@ -279,7 +279,7 @@ TQPoint K3bJobProgressOSD::fixupPosition( const TQPoint& pp ) } -void K3bJobProgressOSD::readSettings( KConfigBase* c ) +void K3bJobProgressOSD::readSettings( TDEConfigBase* c ) { TQString oldGroup = c->group(); c->setGroup( "KlamOSD Position" ); @@ -291,7 +291,7 @@ void K3bJobProgressOSD::readSettings( KConfigBase* c ) } -void K3bJobProgressOSD::saveSettings( KConfigBase* c ) +void K3bJobProgressOSD::saveSettings( TDEConfigBase* c ) { TQString oldGroup = c->group(); c->setGroup( "KlamOSD Position" ); diff --git a/src/k3bjobprogressosd_mod.h b/src/k3bjobprogressosd_mod.h index 123f43a..dc27699 100644 --- a/src/k3bjobprogressosd_mod.h +++ b/src/k3bjobprogressosd_mod.h @@ -21,7 +21,7 @@ class TQPaintEvent; class TQMouseEvent; -class KConfigBase; +class TDEConfigBase; /** * An OSD displaying a text and a progress bar. @@ -39,8 +39,8 @@ class K3bJobProgressOSD : public TQWidget int screen() const { return m_screen; } const TQPoint& position() const { return m_position; } - void readSettings( KConfigBase* ); - void saveSettings( KConfigBase* ); + void readSettings( TDEConfigBase* ); + void saveSettings( TDEConfigBase* ); public slots: void setScreen( int ); diff --git a/src/klamav-dropdown.desktop b/src/klamav-dropdown.desktop index 5832531..870944a 100644 --- a/src/klamav-dropdown.desktop +++ b/src/klamav-dropdown.desktop @@ -1,8 +1,8 @@ [Desktop Entry] Actions=Scan Encoding=UTF-8 -ServiceTypes=all/allfiles,inode/directory -ExcludeServiceTypes=application/x-iso +X-TDE-ServiceTypes=all/allfiles,inode/directory +X-TDE-ExcludeServiceTypes=application/x-iso Comment=KlamAV - Anti-Virus Manager Keywords=klamav Terminal=false diff --git a/src/klamav.cpp b/src/klamav.cpp index 4778c11..ab99910 100644 --- a/src/klamav.cpp +++ b/src/klamav.cpp @@ -17,46 +17,46 @@ #include "configdialog.h" #include "klamavconfig.h" -#include <klocale.h> +#include <tdelocale.h> -#include <kaction.h> +#include <tdeaction.h> #include <tqpushbutton.h> #include <tqlayout.h> #include <ksystemtray.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kurl.h> #include <tqdir.h> #include <tqfile.h> -Klamav *kmain = 0L; +Klamav *tdemain = 0L; Klamav::Klamav() - : KMainWindow( 0, "KlamAV " ) + : TDEMainWindow( 0, "KlamAV " ) { downloadDBForWizard = false; downloadClamAVForWizard = false; - kmain = this; + tdemain = this; TQVBoxLayout *top = new TQVBoxLayout(this,10,10); tab = new TQTabWidget(this); - _tray = new KSystemTray(kmain, "klamav tray"); + _tray = new KSystemTray(tdemain, "klamav tray"); _tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_disabled")); connect(_tray,SIGNAL(quitSelected()),SLOT(shuttingDown())); - KPopupMenu *conf_menu = _tray->contextMenu(); - EnableKlamd = new KAction(i18n("&Enable Auto-Scan"), "klamav_on_acc_enabled", 0,this, SLOT(contextEnable()),actionCollection(),"klamd_enable"); - DisableKlamd = new KAction(i18n("&Disable Auto-Scan"),"klamav_on_acc_disabled", 0,this, SLOT(contextDisable()),actionCollection(),"klamd_disable"); + TDEPopupMenu *conf_menu = _tray->contextMenu(); + EnableKlamd = new TDEAction(i18n("&Enable Auto-Scan"), "klamav_on_acc_enabled", 0,this, SLOT(contextEnable()),actionCollection(),"klamd_enable"); + DisableKlamd = new TDEAction(i18n("&Disable Auto-Scan"),"klamav_on_acc_disabled", 0,this, SLOT(contextDisable()),actionCollection(),"klamd_disable"); - EnableFreshklam = new KAction(i18n("&Enable Auto-Updates"), "klamav", 0,this, SLOT(contextEnableFK()),actionCollection(),"fk_enable"); - DisableFreshklam = new KAction(i18n("&Disable Auto-Updates"),"klamavbw", 0,this, SLOT(contextDisableFK()),actionCollection(),"fk_disable"); + EnableFreshklam = new TDEAction(i18n("&Enable Auto-Updates"), "klamav", 0,this, SLOT(contextEnableFK()),actionCollection(),"fk_enable"); + DisableFreshklam = new TDEAction(i18n("&Disable Auto-Updates"),"klamavbw", 0,this, SLOT(contextDisableFK()),actionCollection(),"fk_disable"); EnableFreshklam->plug(conf_menu); DisableFreshklam->plug(conf_menu); @@ -71,7 +71,7 @@ Klamav::Klamav() DisableKlamd->setEnabled(FALSE); EnableKlamd->setEnabled(TRUE); - KConfig* config = KGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->setGroup("Freshklam"); TQStringList DatabasePaths = config->readListEntry("lastDownloadPaths"); @@ -126,8 +126,8 @@ Klamav::Klamav() KStdAction::quit(this, SLOT(shuttingDown()), actionCollection()); - if (KApplication::kApplication()->isRestored()){ -/* config = KGlobal::config(); + if (TDEApplication::kApplication()->isRestored()){ +/* config = TDEGlobal::config(); config->setGroup("Klamd"); TQString RunKlamd = config->readEntry("Enabled"); @@ -249,7 +249,7 @@ void Klamav::firstRunWizard() { TQString defaultquar = homepath + "/.klamav/quarantine"; if( wizard.exec() != TQDialog::Rejected ){ - KConfig* config = KGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->setGroup("Freshklam"); @@ -334,11 +334,11 @@ void Klamav::checkDir(TQString path){ void Klamav::slotConfigKlamav( const TQCString& page ) { - KlamavConfigDialog* dialog = (KlamavConfigDialog*) KConfigDialog::exists( "settings" ); + KlamavConfigDialog* dialog = (KlamavConfigDialog*) TDEConfigDialog::exists( "settings" ); if( !dialog ) { - //KConfigDialog didn't find an instance of this dialog, so lets create it : + //TDEConfigDialog didn't find an instance of this dialog, so lets create it : dialog = new KlamavConfigDialog( this, "settings", KlamavConfig::self() ); //connect( dialog, SIGNAL(settingsChanged()), SLOT(applySettings()) ); } diff --git a/src/klamav.desktop b/src/klamav.desktop index fba4d75..5c32197 100644 --- a/src/klamav.desktop +++ b/src/klamav.desktop @@ -4,7 +4,7 @@ Name=KlamAV Exec=klamav %i %m -caption "%c" Icon=klamav Type=Application -DocPath=klamav/klamav.html +X-DocPath=klamav/klamav.html Comment=An Anti-Virus Manager Comment[cs]=An Anti-Virus Manager Comment[da]=An Anti-Virus Manager @@ -38,4 +38,4 @@ Comment[zh_CN.GB2312]=An Anti-Virus Manager Terminal=0 GenericName=Anti-Virus Manager GenericName[fr]=Anti-Virus Manager -Categories=Qt;KDE;Application;System; +Categories=Qt;TDE;Application;System; diff --git a/src/klamav.h b/src/klamav.h index 80552fa..01a0b07 100644 --- a/src/klamav.h +++ b/src/klamav.h @@ -9,14 +9,14 @@ #include <config.h> #endif -#include <kapplication.h> -#include <kmainwindow.h> +#include <tdeapplication.h> +#include <tdemainwindow.h> #include <tqtabwidget.h> #include <stdlib.h> class KPrinter; -class KToggleAction; +class TDEToggleAction; class KURL; class TQLineEdit; class TQComboBox; @@ -24,8 +24,8 @@ class TQCheckBox; class TQListBox; class TQPushButton; class TQLabel; -class KProcess; -class KConfig; +class TDEProcess; +class TDEConfig; class KURLRequester; class Freshklam; class Sigtool; @@ -46,7 +46,7 @@ class KSystemTray; * @author $AUTHOR <$EMAIL> * @version $APP_VERSION */ -class Klamav : public KMainWindow +class Klamav : public TDEMainWindow { Q_OBJECT public: @@ -67,10 +67,10 @@ public: KlamavDock *m_dock; KSystemTray *_tray; - KAction *EnableKlamd; - KAction *DisableKlamd; - KAction *EnableFreshklam; - KAction *DisableFreshklam; + TDEAction *EnableKlamd; + TDEAction *DisableKlamd; + TDEAction *EnableFreshklam; + TDEAction *DisableFreshklam; Klamd *klamd; Freshklam *freshklam; bool firstDownload; @@ -99,14 +99,14 @@ protected: * This function is called when it is time for the app to save its * properties for session management purposes. */ - //void saveProperties(KConfig *); + //void saveProperties(TDEConfig *); /** - * This function is called when this app is restored. The KConfig + * This function is called when this app is restored. The TDEConfig * object points to the session management config file that was saved * with @ref saveProperties */ - //void readProperties(KConfig *); + //void readProperties(TDEConfig *); public slots: void contextDisable(); @@ -148,9 +148,9 @@ private: TQListBox *resultbox; TQPushButton *search_button, *cancel_button; TQLabel *status_label, *matches_label; - KProcess *childproc; + TDEProcess *childproc; TQString buf; - KConfig* config; + TDEConfig* config; TQStringList lastSearchItems; TQStringList lastSearchPaths; Sigtool *sigtool; @@ -158,6 +158,6 @@ private: }; -extern Klamav *kmain; +extern Klamav *tdemain; #endif // _KLAMAV_H_ diff --git a/src/klamav_run.h b/src/klamav_run.h index 0e9280f..76a0f8d 100644 --- a/src/klamav_run.h +++ b/src/klamav_run.h @@ -8,7 +8,7 @@ #ifndef KLAMAV_RUN_H #define KLAMAV_RUN_H -#include <kparts/browserrun.h> +#include <tdeparts/browserrun.h> namespace KlamAV { diff --git a/src/klamavconfig.kcfgc b/src/klamavconfig.kcfgc index 3292c2b..c8f883a 100644 --- a/src/klamavconfig.kcfgc +++ b/src/klamavconfig.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=klamavconfig.kcfg ClassName=KlamavConfig Singleton=true diff --git a/src/klamd.cpp b/src/klamd.cpp index f8b6c89..e6d6859 100644 --- a/src/klamd.cpp +++ b/src/klamd.cpp @@ -10,21 +10,21 @@ -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <karrowbutton.h> -#include <kaction.h> +#include <tdeaction.h> #include <tqcheckbox.h> #include <kbuttonbox.h> #include <kprocio.h> #include <kurlrequester.h> #include <tqlayout.h> -#include <kmessagebox.h> -#include <ktempfile.h> +#include <tdemessagebox.h> +#include <tdetempfile.h> #include <ksystemtray.h> #include <tqtoolbutton.h> #include <knotifyclient.h> @@ -98,7 +98,7 @@ Klamd::Klamd(TQWidget *_parent, const char *name) sessionslb = new MyListBox(hlp); - config = KGlobal::config(); + config = TDEGlobal::config(); config->setGroup("Klamd"); includePaths = config->readListEntry("IncludePaths"); if (!(includePaths.isEmpty())) @@ -146,7 +146,7 @@ Klamd::Klamd(TQWidget *_parent, const char *name) sessionslb2 = new MyListBox(hlp2); - //config = KGlobal::config(); + //config = TDEGlobal::config(); config->setGroup("Klamd"); excludePaths = config->readListEntry("ExcludePaths"); if (!(excludePaths.isEmpty())) @@ -266,7 +266,7 @@ Klamd::Klamd(TQWidget *_parent, const char *name) connect( cancel_button, SIGNAL(clicked()), SLOT(slotCancel()) ); */ - if (KApplication::kApplication()->isRestored()) + if (TDEApplication::kApplication()->isRestored()) restoreKlamd(); // KStdAction::quit(this, SLOT(hide()), actionCollection()); @@ -282,7 +282,7 @@ Klamd::~Klamd() } if (!(tempFileName.isEmpty())) - KIO::NetAccess::del(tempFileName,NULL); + TDEIO::NetAccess::del(tempFileName,NULL); } @@ -306,14 +306,14 @@ void Klamd::processOutput() tmpVirusName.replace("FOUND",""); CollectionDB::instance()->insertEvent("Virus Found",tmpVirusName,tmpFName); if (recursive_box1->isChecked()) - KNotifyClient::event(kmain->_tray->winId(),i18n( "ScanCompleteNoVirus" ), i18n( "Virus %1 Found In %2 by Auto-Scan!" ).arg(tmpVirusName).arg(tmpFName)); + KNotifyClient::event(tdemain->_tray->winId(),i18n( "ScanCompleteNoVirus" ), i18n( "Virus %1 Found In %2 by Auto-Scan!" ).arg(tmpVirusName).arg(tmpFName)); if (recursive_box->isChecked()) Quarantine(tmpFName.stripWhiteSpace(),tmpVirusName.stripWhiteSpace()); } if ((pos = (item2.find("ERROR: Clamuko: Can't register with Dazuko"))) != -1){ finish(); KMessageBox::information (this,i18n( "Can't Start On-Access Scanning! Check you have read permissions on file /dev/dazuko.") ); - KNotifyClient::event(kmain->_tray->winId(),i18n( "Can't Start On-Access Scanning!" ), i18n( "Check you have read permissions on file /dev/dazuko." )); + KNotifyClient::event(tdemain->_tray->winId(),i18n( "Can't Start On-Access Scanning!" ), i18n( "Check you have read permissions on file /dev/dazuko." )); return; } @@ -333,7 +333,7 @@ void Klamd::processOutput() bool Klamd::startKlamd() { - config = KGlobal::config(); + config = TDEGlobal::config(); config->setGroup("Klamd"); if ((config->readListEntry("IncludePaths")).isEmpty()){ KMessageBox::information (this,i18n("You haven't specified any paths to scan. Select the directories you want to KlamAV to keep an eye on and try again.")); @@ -361,12 +361,12 @@ void Klamd::finish() { search_button->setEnabled(true); cancel_button->setEnabled(false); - //config = KGlobal::config(); - if (!KApplication::kApplication()->closingDown()){ + //config = TDEGlobal::config(); + if (!TDEApplication::kApplication()->closingDown()){ config->setGroup("Klamd"); config->writeEntry("Enabled", "No"); } - kmain->clamdStopped(); + tdemain->clamdStopped(); buf += '\n'; if (childproc){ @@ -379,7 +379,7 @@ void Klamd::finish() klamdAlive = FALSE; enableInputs(); if (!(tempFileName.isEmpty())) - KIO::NetAccess::del(tempFileName,NULL); + TDEIO::NetAccess::del(tempFileName,NULL); } @@ -400,7 +400,7 @@ void Klamd::childExited() // // kdDebug() << "klamd status" << status << endl; - kmain->contextDisable(); + tdemain->contextDisable(); KMessageBox::information (this,i18n( "The auto-scan process died unexpectedly!") ); @@ -438,7 +438,7 @@ void Klamd::slotAddIncludeDir() if ((includePaths.contains(filepa) == 0) && (excludePaths.contains(filepa) == 0)){ sessionslb->insertItem(filepa); - //config = KGlobal::config(); + //config = TDEGlobal::config(); config->setGroup("Klamd"); if (includePaths.contains(filepa) == 0) { @@ -465,7 +465,7 @@ void Klamd::slotDelIncludeDir() sessionslb->removeItem(sessionslb->currentItem()); - //config = KGlobal::config(); + //config = TDEGlobal::config(); config->setGroup("Klamd"); config->writeEntry("IncludePaths", includePaths); config->sync(); @@ -487,7 +487,7 @@ void Klamd::slotAddExcludeDir() if ((includePaths.contains(filepa) == 0) && (excludePaths.contains(filepa) == 0)){ sessionslb2->insertItem(filepa); - //config = KGlobal::config(); + //config = TDEGlobal::config(); config->setGroup("Klamd"); if (excludePaths.contains(filepa) == 0) { @@ -513,7 +513,7 @@ void Klamd::slotDelExcludeDir() sessionslb2->removeItem(sessionslb2->currentItem()); - //config = KGlobal::config(); + //config = TDEGlobal::config(); config->setGroup("Klamd"); config->writeEntry("ExcludePaths", excludePaths); config->sync(); @@ -535,7 +535,7 @@ void Klamd::writeConf() } - //config = KGlobal::config(); + //config = TDEGlobal::config(); config->setGroup("Kuarantine"); TQStringList lastQuarLocations = config->readListEntry("KuarantineLocations"); TQString quarloc; @@ -543,7 +543,7 @@ void Klamd::writeConf() quarloc = *ita; } - TQString db = kmain->freshklam->getCurrentDBDir(); + TQString db = tdemain->freshklam->getCurrentDBDir(); //tf->setAutoDelete(TRUE); @@ -613,7 +613,7 @@ void Klamd::writeConf() void Klamd::Quarantine(TQString fname, TQString virusname){ - //config = KGlobal::config(); + //config = TDEGlobal::config(); config->setGroup("Kuarantine"); //object.replace("Clamuko:",""); //object = object.stripWhiteSpace(); @@ -695,7 +695,7 @@ void Klamd::Quarantine(TQString fname, TQString virusname){ config->writeEntry(TQString("Items %1").arg(quarloc), lastQuarItems); //config->sync(); - //kmain->kuarantine->refresh(); + //tdemain->kuarantine->refresh(); //kdDebug() << "finished klamd quar" << endl; } @@ -726,10 +726,10 @@ int Klamd::runDazuko(bool caller){ connect( lsmodproc, SIGNAL(readReady(KProcIO *)), SLOT(checkForDazuko()) ); if (caller){ - connect( lsmodproc, SIGNAL(processExited(KProcess *)), + connect( lsmodproc, SIGNAL(processExited(TDEProcess *)), SLOT(lsmodOutput()) ); }else{ - connect( lsmodproc, SIGNAL(processExited(KProcess *)), + connect( lsmodproc, SIGNAL(processExited(TDEProcess *)), SLOT(lsmodCheck()) ); } @@ -767,7 +767,7 @@ void Klamd::loadKlamd() klamdAlive = TRUE; - //TQString suCommand=TQString("kdesu -t -c '" +clamdcommand+" -c '%1'").arg(tempFileName)+"'"; + //TQString suCommand=TQString("tdesu -t -c '" +clamdcommand+" -c '%1'").arg(tempFileName)+"'"; TQString suCommand=TQString(clamdcommand+" -c '%1'").arg(tempFileName); childproc = new KProcIO(); childproc->setUseShell(TRUE); @@ -782,19 +782,19 @@ void Klamd::loadKlamd() connect( childproc, SIGNAL(readReady(KProcIO *)), SLOT(receivedOutput(KProcIO *)) ); childproc->start(KProcIO::NotifyOnExit); - connect( childproc, SIGNAL(processExited(KProcess *)), + connect( childproc, SIGNAL(processExited(TDEProcess *)), SLOT(childExited()) ); search_button->setEnabled(false); cancel_button->setEnabled(true); -/* if (kmain->freshklam->isFreshklamAlive()) - kmain->_tray->setPixmap(KSystemTray::loadIcon("klamavdl")); +/* if (tdemain->freshklam->isFreshklamAlive()) + tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamavdl")); else*/ - kmain->_tray->setPixmap(KSystemTray::loadIcon("klamav")); - kmain->EnableKlamd->setEnabled(FALSE); - kmain->DisableKlamd->setEnabled(TRUE); - //config = KGlobal::config(); + tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav")); + tdemain->EnableKlamd->setEnabled(FALSE); + tdemain->DisableKlamd->setEnabled(TRUE); + //config = TDEGlobal::config(); config->setGroup("Klamd"); config->writeEntry("Enabled", "Yes"); config->sync(); @@ -826,9 +826,9 @@ void Klamd::loadDazuko() insmodproc->setEnvironment("PATH",curpath + ":/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin"); insmodproc->setUseShell(TRUE); - *insmodproc<<"kdesu -i klamav"<<"-c"<<insmodCommand; + *insmodproc<<"tdesu -i klamav"<<"-c"<<insmodCommand; - connect( insmodproc, SIGNAL(processExited(KProcess *)), + connect( insmodproc, SIGNAL(processExited(TDEProcess *)), SLOT(moduleLoaded()) ); insmodproc->start(KProcIO::NotifyOnExit); @@ -878,7 +878,7 @@ void Klamd::checkForDazuko() void Klamd::restoreKlamd(){ - config = KGlobal::config(); + config = TDEGlobal::config(); config->setGroup("Klamd"); TQString RunKlamd = config->readEntry("Enabled"); @@ -890,7 +890,7 @@ void Klamd::restoreKlamd(){ void Klamd::handleChecks(){ - //config = KGlobal::config(); + //config = TDEGlobal::config(); config->setGroup("Klamd"); if (recursive_box->isChecked()) config->writeEntry("Quarantine","Yes"); @@ -925,7 +925,7 @@ TQString Klamd::getKlamdConfFile(){ void Klamd::slotAdvOptions(){ -/* config = KGlobal::config(); +/* config = TDEGlobal::config(); config->setGroup("Klamd"); TQString RunKlamd = config->readEntry("Enabled"); @@ -938,7 +938,7 @@ void Klamd::slotAdvOptions(){ dialog->raise(); dialog->setActiveWindow();*/ - kmain->slotConfigKlamav( "Auto-Scan" ); + tdemain->slotConfigKlamav( "Auto-Scan" ); } diff --git a/src/klamd.h b/src/klamd.h index 66f8d71..e909d49 100644 --- a/src/klamd.h +++ b/src/klamd.h @@ -9,16 +9,16 @@ #include <config.h> #endif -#include <kapplication.h> -#include <kmainwindow.h> +#include <tdeapplication.h> +#include <tdemainwindow.h> #include <tqlistview.h> #include <tqlistbox.h> -#include "kfiletreeview.h" +#include "tdefiletreeview.h" class KPrinter; -class KToggleAction; +class TDEToggleAction; class KURL; class TQLineEdit; class TQComboBox; @@ -26,8 +26,8 @@ class TQCheckBox; class TQListBox; class TQPushButton; class TQLabel; -class KProcess; -class KConfig; +class TDEProcess; +class TDEConfig; class KURLRequester; class K3bFileTreeView; class KArrowButton; @@ -87,14 +87,14 @@ protected: * This function is called when it is time for the app to save its * properties for session management purposes. */ - //void saveProperties(KConfig *); + //void saveProperties(TDEConfig *); /** - * This function is called when this app is restored. The KConfig + * This function is called when this app is restored. The TDEConfig * object points to the session management config file that was saved * with @ref saveProperties */ - //void readProperties(KConfig *); + //void readProperties(TDEConfig *); public: @@ -106,8 +106,8 @@ private: //KlamdView *m_view; /* KPrinter *m_printer; - KToggleAction *m_toolbarAction; - KToggleAction *m_statusbarAction;*/ + TDEToggleAction *m_toolbarAction; + TDEToggleAction *m_statusbarAction;*/ signals: @@ -159,7 +159,7 @@ private: KProcIO *proc; KProcIO *lsmodproc; TQString buf, bufmv, mvbuffer; - KConfig* config; + TDEConfig* config; TQStringList lastSearchItems; TQStringList lastSearchPaths; TQStringList lastQuarItems; diff --git a/src/klamdoptions.cpp b/src/klamdoptions.cpp index ff7ccb6..a2b53a5 100644 --- a/src/klamdoptions.cpp +++ b/src/klamdoptions.cpp @@ -13,7 +13,7 @@ #include <tqpushbutton.h> #include <kpushbutton.h> #include <kdialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqgroupbox.h> #include <tqcombobox.h> #include <tqcheckbox.h> @@ -21,8 +21,8 @@ #include <tqlayout.h> #include <tqtooltip.h> #include <tqwhatsthis.h> -#include <kconfig.h> -#include <klocale.h> +#include <tdeconfig.h> +#include <tdelocale.h> const char *check_desc3[] = { "1", @@ -156,7 +156,7 @@ void KlamdOptions::languageChange() void KlamdOptions::updateSettings() { - KConfig* config = KGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->setGroup("Klamd"); config->writeEntry("Enabled", "No"); @@ -193,7 +193,7 @@ void KlamdOptions::updateSettings() void KlamdOptions::fetchSettings() { - config = KGlobal::config(); + config = TDEGlobal::config(); config->setGroup("Klamd"); diff --git a/src/klamdoptions.h b/src/klamdoptions.h index 3a5a696..7f5d658 100644 --- a/src/klamdoptions.h +++ b/src/klamdoptions.h @@ -23,7 +23,7 @@ class TQGroupBox; class TQComboBox; class TQCheckBox; class TQLabel; -class KConfig; +class TDEConfig; class KlamdOptions : public TQDialog { @@ -45,7 +45,7 @@ public: TQCheckBox* Executed; TQCheckBox* Opened; TQCheckBox* Closed; - KConfig* config; + TDEConfig* config; private: void fetchSettings(); diff --git a/src/klammail/Makefile.in b/src/klammail/Makefile.in index 818d5f9..cb84bbc 100644 --- a/src/klammail/Makefile.in +++ b/src/klammail/Makefile.in @@ -170,24 +170,24 @@ LIBZ = @LIBZ@ LIB_CLAM = @LIB_CLAM@ LIB_KAB = @LIB_KAB@ LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ +LIB_TDECORE = @LIB_TDECORE@ LIB_KDED = @LIB_KDED@ -LIB_KDEPIM = @LIB_KDEPIM@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ -LIB_KDNSSD = @LIB_KDNSSD@ +LIB_TDEPIM = @LIB_TDEPIM@ +LIB_TDEPRINT = @LIB_TDEPRINT@ +LIB_TDEUI = @LIB_TDEUI@ +LIB_TDEDNSSD = @LIB_TDEDNSSD@ LIB_KFILE = @LIB_KFILE@ LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIMPROXY = @LIB_KIMPROXY@ -LIB_KIO = @LIB_KIO@ +LIB_TDEHTML = @LIB_TDEHTML@ +LIB_TDEIMPROXY = @LIB_TDEIMPROXY@ +LIB_TDEIO = @LIB_TDEIO@ LIB_KJS = @LIB_KJS@ LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ -LIB_KUNITTEST = @LIB_KUNITTEST@ -LIB_KUTILS = @LIB_KUTILS@ +LIB_TDEPARTS = @LIB_TDEPARTS@ +LIB_TDESPELL = @LIB_TDESPELL@ +LIB_TDESYCOCA = @LIB_TDESYCOCA@ +LIB_TDEUNITTEST = @LIB_TDEUNITTEST@ +LIB_TDEUTILS = @LIB_TDEUTILS@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ @@ -199,7 +199,7 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ -MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ +MAKETDEWIDGETS = @MAKETDEWIDGETS@ MCOPIDL = @MCOPIDL@ MEINPROC = @MEINPROC@ MOC = @MOC@ @@ -304,7 +304,7 @@ kde_styledir = @kde_styledir@ kde_templatesdir = @kde_templatesdir@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ -kdeinitdir = @kdeinitdir@ +tdeinitdir = @tdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/src/klamscan.cpp b/src/klamscan.cpp index a5dc91c..16de3c8 100644 --- a/src/klamscan.cpp +++ b/src/klamscan.cpp @@ -22,8 +22,8 @@ #include <tqpushbutton.h> #include <tqlayout.h> -#include <kcmdlineargs.h> -#include <kmessagebox.h> +#include <tdecmdlineargs.h> +#include <tdemessagebox.h> #include <tqtooltip.h> #include <tqtoolbutton.h> #include <dcopclient.h> @@ -71,7 +71,7 @@ Klamscan::Klamscan(TQWidget *parent, const char *name) - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TQLabel *combo_label = new TQLabel(i18n("When a virus is found:"), privateLayoutWidget2); @@ -132,7 +132,7 @@ Klamscan::Klamscan(TQWidget *parent, const char *name) controls->setMargin(2); play = new TQToolButton( controls,"play" ); - play->setIconSet( SmallIconSet( "player_play" ) ); + play->setIconSet( SmallIconSet( "media-playback-start" ) ); play->setTextLabel(i18n( "Scan" )); play->setTextPosition(TQToolButton::Right); play->setUsesTextLabel(true); @@ -140,7 +140,7 @@ Klamscan::Klamscan(TQWidget *parent, const char *name) play->setFixedHeight(play->height() - 1); stop = new TQToolButton( controls,"stop" ); - stop->setIconSet( SmallIconSet( "player_stop" ) ); + stop->setIconSet( SmallIconSet( "media-playback-stop" ) ); stop->setTextLabel(i18n( "Stop" )); stop->setTextPosition(TQToolButton::Right); stop->setUsesTextLabel(true); @@ -213,7 +213,7 @@ void Klamscan::slotScan() SLOT( slotManageButtons(TQWidget *) ) ); - kmain->_tray->setPixmap(KSystemTray::loadIcon("klamav_scanning")); + tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_scanning")); TQDate today = TQDate::currentDate(); TQTime now = TQTime::currentTime(); @@ -227,7 +227,7 @@ void Klamscan::slotScan() TQStringList filepattern; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if( args->isSet( "scanthis" ) ) { listOfUrlsToScan.clear(); @@ -260,7 +260,7 @@ void Klamscan::slotAdvOptions(){ dialog->raise(); dialog->setActiveWindow();*/ - kmain->slotConfigKlamav( "Archive Limits" ); + tdemain->slotConfigKlamav( "Archive Limits" ); } @@ -286,7 +286,7 @@ void Klamscan::slotSchedule(){ void Klamscan::setDefaults(){ - config = KGlobal::config(); + config = TDEGlobal::config(); config->setGroup("ScanPaths"); config->setGroup("Klamscan"); @@ -345,7 +345,7 @@ void Klamscan::scanURLs(const TQString &urls) { setActiveWindow(); raise(); - kmain->tab->setCurrentPage(0); + tdemain->tab->setCurrentPage(0); TQString tmpurls = urls; //urlsToScan = urlsToScan.replace("*"," "); @@ -379,10 +379,10 @@ void Klamscan::scanURLs(const TQString &urls) void Klamscan::slotStopScanning(){ - if (kmain->klamd->isKlamdAlive()) - kmain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_enabled")); + if (tdemain->klamd->isKlamdAlive()) + tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_enabled")); else - kmain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_disabled")); + tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_disabled")); ////kdDebug() << tabBrowser->currentPage()->name() << endl; ScanViewer* cur = static_cast<ScanViewer*>(tabBrowser->currentPage()); @@ -408,10 +408,10 @@ void Klamscan::slotStartAgain(){ void Klamscan::slotRemoveTab(){ - if (kmain->klamd->isKlamdAlive()) - kmain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_enabled")); + if (tdemain->klamd->isKlamdAlive()) + tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_enabled")); else - kmain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_disabled")); + tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_disabled")); ////kdDebug() << tabBrowser->currentPage()->name() << endl; if (tabBrowser->currentPageIndex() != 0){ slotStopScanning(); diff --git a/src/klamscan.h b/src/klamscan.h index a765364..c8e02f5 100644 --- a/src/klamscan.h +++ b/src/klamscan.h @@ -9,13 +9,13 @@ #include <config.h> #endif -#include <kapplication.h> -#include <kmainwindow.h> +#include <tdeapplication.h> +#include <tdemainwindow.h> #include <dcopklamscan.h> class KPrinter; -class KToggleAction; +class TDEToggleAction; class KURL; class TQLineEdit; class TQComboBox; @@ -25,8 +25,8 @@ class TQListView; class TQListViewItem; class TQPushButton; class TQLabel; -class KProcess; -class KConfig; +class TDEProcess; +class TDEConfig; class KURLRequester; class CollectionSetup; class TQToolButton; @@ -78,11 +78,11 @@ protected: */ /** - * This function is called when this app is restored. The KConfig + * This function is called when this app is restored. The TDEConfig * object points to the session management config file that was saved * with @ref saveProperties */ - //void readProperties(KConfig *); + //void readProperties(TDEConfig *); private slots: @@ -115,9 +115,9 @@ private: TQListView *resultview; TQPushButton *search_button, *cancel_button; TQLabel *status_label, *status2_label,*matches_label,*matches2_label; - KProcess *childproc; + TDEProcess *childproc; TQString buf; - KConfig* config; + TDEConfig* config; bool errorsEncountered; TQPopupMenu* menu; TQToolButton* adv_options; diff --git a/src/klamscan.hpre b/src/klamscan.hpre index 994328a..94f4d17 100644 --- a/src/klamscan.hpre +++ b/src/klamscan.hpre @@ -9,13 +9,13 @@ #include <config.h> #endif -#include <kapplication.h> -#include <kmainwindow.h> +#include <tdeapplication.h> +#include <tdemainwindow.h> #include <dcopklamscan.h> class KPrinter; -class KToggleAction; +class TDEToggleAction; class KURL; class TQLineEdit; class TQComboBox; @@ -25,8 +25,8 @@ class TQListView; class TQListViewItem; class TQPushButton; class TQLabel; -class KProcess; -class KConfig; +class TDEProcess; +class TDEConfig; class KURLRequester; @@ -70,14 +70,14 @@ protected: * This function is called when it is time for the app to save its * properties for session management purposes. */ - //void saveProperties(KConfig *); + //void saveProperties(TDEConfig *); /** - * This function is called when this app is restored. The KConfig + * This function is called when this app is restored. The TDEConfig * object points to the session management config file that was saved * with @ref saveProperties */ - //void readProperties(KConfig *); + //void readProperties(TDEConfig *); private slots: @@ -104,8 +104,8 @@ private: //KlamscanView *m_view; /* KPrinter *m_printer; - KToggleAction *m_toolbarAction; - KToggleAction *m_statusbarAction;*/ + TDEToggleAction *m_toolbarAction; + TDEToggleAction *m_statusbarAction;*/ signals: void itemSelected(TQString abs_filename, int line); @@ -117,7 +117,7 @@ private slots: //void dirButtonClicked(); //void templateActivated(int index); void childExited(); - void receivedOutput(KProcess *proc, char *buffer, int buflen); + void receivedOutput(TDEProcess *proc, char *buffer, int buflen); //void itemSelected(const TQString&); void slotSearch(); void slotCancel(); @@ -144,9 +144,9 @@ private: TQListView *resultview; TQPushButton *search_button, *cancel_button; TQLabel *status_label, *status2_label,*matches_label,*matches2_label; - KProcess *childproc; + TDEProcess *childproc; TQString buf; - KConfig* config; + TDEConfig* config; TQStringList lastSearchItems; TQStringList lastScanPaths; TQStringList lastQuarItems; diff --git a/src/klamscanoptions.cpp b/src/klamscanoptions.cpp index 428cd5c..cb1140e 100644 --- a/src/klamscanoptions.cpp +++ b/src/klamscanoptions.cpp @@ -14,9 +14,9 @@ #include <tqcheckbox.h> #include <tqbuttongroup.h> #include <kurlrequester.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kcombobox.h> -#include <klocale.h> +#include <tdelocale.h> /* * Constructs a KlamscanOptions as a child of 'parent', with the @@ -221,7 +221,7 @@ void KlamscanOptions::languageChange() void KlamscanOptions::updateSettings() { - KConfig* config = KGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->setGroup("Klamscan"); config->writeEntry("NoFilesToExtract", NoFilesToExtract->text()); @@ -332,7 +332,7 @@ void KlamscanOptions::updateSettings() void KlamscanOptions::fetchSettings() { - config = KGlobal::config(); + config = TDEGlobal::config(); config->setGroup("Klamscan"); diff --git a/src/klamscanoptions.h b/src/klamscanoptions.h index 3ceeb29..bf7ca5a 100644 --- a/src/klamscanoptions.h +++ b/src/klamscanoptions.h @@ -24,7 +24,7 @@ class TQCheckBox; class TQButtonGroup; class KURLRequester; class TQPushButton; -class KConfig; +class TDEConfig; class KComboBox; class KlamscanOptions : public TQDialog @@ -74,7 +74,7 @@ public: TQCheckBox* ExcludeQuarantine; TQPushButton* OK; TQPushButton* Cancel; - KConfig* config; + TDEConfig* config; KComboBox* zipedit; diff --git a/src/kticon.cpp b/src/kticon.cpp index 9fff86d..bc2af78 100644 --- a/src/kticon.cpp +++ b/src/kticon.cpp @@ -88,9 +88,9 @@ TQPixmap KTIcon::shell(bool mini) TQPixmap KTIcon::home(bool mini) { if (mini) - return getMiniIcon("gohome"); + return getMiniIcon("go-home"); else - return getIcon("gohome"); + return getIcon("go-home"); } TQPixmap KTIcon::path(bool mini) diff --git a/src/ktlistcron.cpp b/src/ktlistcron.cpp index d45b723..5dbc48a 100644 --- a/src/ktlistcron.cpp +++ b/src/ktlistcron.cpp @@ -11,7 +11,7 @@ #include "ktlistcron.h" -#include <klocale.h> +#include <tdelocale.h> #include "ctcron.h" diff --git a/src/ktlisttasks.cpp b/src/ktlisttasks.cpp index a5eba31..6a44456 100644 --- a/src/ktlisttasks.cpp +++ b/src/ktlisttasks.cpp @@ -12,7 +12,7 @@ #include "ktlisttasks.h" -#include <klocale.h> // i18n() +#include <tdelocale.h> // i18n() #include "kticon.h" @@ -65,7 +65,7 @@ void KTListTasks::refresh() // // stnd = printer.getFont(); // -// printer.setFont(TQFont( KGlobalSettings::generalFont().family(), 10, TQFont::Bold )); +// printer.setFont(TQFont( TDEGlobalSettings::generalFont().family(), 10, TQFont::Bold )); // printer.print (i18n("Task name:"), 1, KTPrint::alignTextLeft); // printer.print (i18n("Program:"), 2, KTPrint::alignTextCenter); // printer.print (i18n("Description:"),3,KTPrint::alignTextRight); diff --git a/src/ktview.cpp b/src/ktview.cpp index 4225595..dd018a1 100644 --- a/src/ktview.cpp +++ b/src/ktview.cpp @@ -295,11 +295,11 @@ void KTView::refresh() // .arg(TQString::fromLocal8Bit(hostName)); // // stnd = printer.getFont(); -// printer.setFont(TQFont( KGlobalSettings::generalFont().family(), 14, TQFont::Bold )); +// printer.setFont(TQFont( TDEGlobalSettings::generalFont().family(), 14, TQFont::Bold )); // // printer.print (i18n("Scheduled Tasks"), 2, KTPrint::alignTextCenter, false); // printer.print (logonInfo, 2, KTPrint::alignTextCenter, false); -// printer.print (KGlobal::locale()->formatDateTime(now), 2, KTPrint::alignTextCenter, false); +// printer.print (TDEGlobal::locale()->formatDateTime(now), 2, KTPrint::alignTextCenter, false); // printer.setFont(stnd); // // printer.levelColumns(20); diff --git a/src/kuarantine.cpp b/src/kuarantine.cpp index fdb335f..03b0847 100644 --- a/src/kuarantine.cpp +++ b/src/kuarantine.cpp @@ -9,13 +9,13 @@ #include "klamav.h" -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kmenubar.h> +#include <tdemenubar.h> #include <kstatusbar.h> #include <kkeydialog.h> -#include <kio/netaccess.h> -#include <kfiledialog.h> +#include <tdeio/netaccess.h> +#include <tdefiledialog.h> @@ -24,7 +24,7 @@ #include <kurlcompletion.h> #include <kcombobox.h> #include <tqlayout.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> @@ -32,7 +32,7 @@ Kuarantine::Kuarantine(TQWidget *parent, const char *name) : TQWidget(parent, name) { - config = KGlobal::config(); + config = TDEGlobal::config(); config->setGroup("Kuarantine"); lastQuarLocations = config->readListEntry("KuarantineLocations"); @@ -42,7 +42,7 @@ Kuarantine::Kuarantine(TQWidget *parent, const char *name) }else{ for (TQStringList::Iterator it = lastQuarLocations.begin(); it == lastQuarLocations.begin(); it++ ) quarloc = *it; - if (!(KIO::NetAccess::exists(quarloc,TRUE,NULL))){ + if (!(TDEIO::NetAccess::exists(quarloc,TRUE,NULL))){ KMessageBox::information (this,i18n( "Your current quarantine location ('%1') no longer exists. I'm going to attempt to create a new one.").arg(quarloc)); createQuarDir(); } @@ -250,11 +250,11 @@ void Kuarantine::refresh() TQStringList obsoleteQuarItems; - config = KGlobal::config(); + config = TDEGlobal::config(); config->setGroup("Kuarantine"); lastQuarItems = config->readListEntry(TQString("Items %1").arg(quarloc)); - if (!(KIO::NetAccess::exists(quarloc,TRUE,NULL))){ + if (!(TDEIO::NetAccess::exists(quarloc,TRUE,NULL))){ KMessageBox::information (this,i18n("Your current quarantine location ('%1') no longer exists. I'm going to attempt to create a new one.").arg(quarloc)); createQuarDir(); }else{ @@ -273,7 +273,7 @@ void Kuarantine::refresh() qname.prepend(quarloc); qname.append(":"+when); //kdDebug() << qname << endl; - if (KIO::NetAccess::exists(qname,TRUE,NULL)){ + if (TDEIO::NetAccess::exists(qname,TRUE,NULL)){ //currentbox->insertItem(*it); new TQListViewItem( currentbox, fname, itemname,when); }else{ @@ -293,7 +293,7 @@ void Kuarantine::refresh() void Kuarantine::refreshhistory() { - config = KGlobal::config(); + config = TDEGlobal::config(); config->setGroup("Kuarantine"); lastHistoryItems = config->readListEntry(TQString("History %1").arg(quarloc)); @@ -338,7 +338,7 @@ void Kuarantine::slotSearch() while ( it.current() ) { TQListViewItem* tItem = it.current(); - config = KGlobal::config(); + config = TDEGlobal::config(); config->setGroup("Kuarantine"); lastQuarItems = config->readListEntry(TQString("Items %1").arg(quarloc)); lastHistoryItems = config->readListEntry(TQString("History %1").arg(quarloc)); @@ -351,7 +351,7 @@ void Kuarantine::slotSearch() qname.prepend(quarloc); qname.append(":"+tItem->text(2)); - if (KIO::NetAccess::file_move(qname,fname)){ + if (TDEIO::NetAccess::file_move(qname,fname)){ lastQuarItems.remove(tItem->text(0)+":"+tItem->text(1)+":"+tItem->text(2)); //currentbox->takeItem(currentbox->currentItem()); @@ -378,7 +378,7 @@ void Kuarantine::updateLastQuarLocations() { - config = KGlobal::config(); + config = TDEGlobal::config(); config->setGroup("Kuarantine"); lastQuarLocations = config->readListEntry("KuarantineLocations"); @@ -416,7 +416,7 @@ void Kuarantine::slotCancel() //TQListViewItem* tItem = ( *it ); //if (tItem->isSelected()){ - config = KGlobal::config(); + config = TDEGlobal::config(); config->setGroup("Kuarantine"); lastQuarItems = config->readListEntry(TQString("Items %1").arg(quarloc)); lastHistoryItems = config->readListEntry(TQString("History %1").arg(quarloc)); @@ -436,7 +436,7 @@ void Kuarantine::slotCancel() qname.prepend(QuarLocation); qname.append(":"+( it.current() )->text(2)); - if (KIO::NetAccess::del(qname,NULL)){ + if (TDEIO::NetAccess::del(qname,NULL)){ lastQuarItems.remove(( it.current() )->text(0)+":"+( it.current() )->text(1)+":"+( it.current() )->text(2)); lastHistoryItems.prepend(( it.current() )->text(0)+":"+( it.current() )->text(1)+":"+( it.current() )->text(2)); @@ -473,7 +473,7 @@ void Kuarantine::slotClearHistory() { historybox->clear(); - config = KGlobal::config(); + config = TDEGlobal::config(); config->setGroup("Kuarantine"); lastHistoryItems = config->readListEntry(TQString("History %1").arg(quarloc)); @@ -551,7 +551,7 @@ void Kuarantine::createQuarDir(){ if (ok){ quarloc = TQString("%1").arg(path); lastQuarLocations.append( TQString("%1").arg(path)); - config = KGlobal::config(); + config = TDEGlobal::config(); config->setGroup("Kuarantine"); config->writeEntry("KuarantineLocations", lastQuarLocations); config->sync(); @@ -612,25 +612,25 @@ void Kuarantine::slotRMB( TQListViewItem* Item, const TQPoint & point, int ) TQString iconPath = locate("cache", KMimeType::favIconForURL("http://www.viruspool.net")+".png"); if ( iconPath.isEmpty() ) - vicon = SmallIcon("find"); + vicon = SmallIcon("edit-find"); else vicon = TQPixmap( iconPath ); iconPath = locate("cache", KMimeType::favIconForURL("http://www.google.com")+".png"); if ( iconPath.isEmpty() ) - gicon = SmallIcon("find"); + gicon = SmallIcon("edit-find"); else gicon = TQPixmap( iconPath ); iconPath = locate("cache", KMimeType::favIconForURL("http://www.trendmicro.com")+".png"); if ( iconPath.isEmpty() ) - ticon = SmallIcon("find"); + ticon = SmallIcon("edit-find"); else ticon = TQPixmap( iconPath ); iconPath = locate("cache", KMimeType::favIconForURL("http://www.viruslist.com")+".png"); if ( iconPath.isEmpty() ) - vlicon = SmallIcon("find"); + vlicon = SmallIcon("edit-find"); else vlicon = TQPixmap( iconPath ); @@ -658,50 +658,50 @@ void Kuarantine::slotRMB( TQListViewItem* Item, const TQPoint & point, int ) void Kuarantine::slotVirusPoolCurrent() { TQString name = currentbox->currentItem()->text(1); - kmain->klamdb->slotExternal(name,"VirusPool"); + tdemain->klamdb->slotExternal(name,"VirusPool"); } void Kuarantine::slotVirusListCurrent() { TQString name = currentbox->currentItem()->text(1); - kmain->klamdb->slotExternal(name,"VirusList"); + tdemain->klamdb->slotExternal(name,"VirusList"); } void Kuarantine::slotGoogleCurrent() { TQString name = currentbox->currentItem()->text(1); - kmain->klamdb->slotExternal(name,"Google"); + tdemain->klamdb->slotExternal(name,"Google"); } void Kuarantine::slotTrendMicroCurrent() { TQString name = currentbox->currentItem()->text(1); - kmain->klamdb->slotExternal(name, "TrendMicro"); + tdemain->klamdb->slotExternal(name, "TrendMicro"); } void Kuarantine::slotVirusPoolHistory() { TQString name = historybox->currentItem()->text(1); - kmain->klamdb->slotExternal(name,"VirusPool"); + tdemain->klamdb->slotExternal(name,"VirusPool"); } void Kuarantine::slotVirusListHistory() { TQString name = historybox->currentItem()->text(1); - kmain->klamdb->slotExternal(name,"VirusList"); + tdemain->klamdb->slotExternal(name,"VirusList"); } void Kuarantine::slotGoogleHistory() { TQString name = historybox->currentItem()->text(1); - kmain->klamdb->slotExternal(name,"Google"); + tdemain->klamdb->slotExternal(name,"Google"); } void Kuarantine::slotTrendMicroHistory() { TQString name = historybox->currentItem()->text(1); - kmain->klamdb->slotExternal(name, "TrendMicro"); + tdemain->klamdb->slotExternal(name, "TrendMicro"); } #include "kuarantine.moc" diff --git a/src/kuarantine.h b/src/kuarantine.h index 4dfc9bd..060442a 100644 --- a/src/kuarantine.h +++ b/src/kuarantine.h @@ -9,13 +9,13 @@ #include <config.h> #endif -#include <kapplication.h> -#include <kmainwindow.h> +#include <tdeapplication.h> +#include <tdemainwindow.h> class KPrinter; -class KToggleAction; +class TDEToggleAction; class KURL; class TQLineEdit; class TQComboBox; @@ -23,8 +23,8 @@ class TQCheckBox; class TQListView; class TQPushButton; class TQLabel; -class KProcess; -class KConfig; +class TDEProcess; +class TDEConfig; class KURLRequester; class TQListViewItem; @@ -74,14 +74,14 @@ protected: * This function is called when it is time for the app to save its * properties for session management purposes. */ - //void saveProperties(KConfig *); + //void saveProperties(TDEConfig *); /** - * This function is called when this app is restored. The KConfig + * This function is called when this app is restored. The TDEConfig * object points to the session management config file that was saved * with @ref saveProperties */ - //void readProperties(KConfig *); + //void readProperties(TDEConfig *); private slots: @@ -109,8 +109,8 @@ private: //KuarantineView *m_view; /* KPrinter *m_printer; - KToggleAction *m_toolbarAction; - KToggleAction *m_statusbarAction;*/ + TDEToggleAction *m_toolbarAction; + TDEToggleAction *m_statusbarAction;*/ signals: @@ -147,9 +147,9 @@ private: TQListView *historybox; TQPushButton *search_button, *cancel_button, *refresh_button, *search_button3, *cancel_button3; TQLabel *status_label, *matches_label; - KProcess *childproc; + TDEProcess *childproc; TQString buf; - KConfig* config; + TDEConfig* config; TQStringList lastQuarItems; TQStringList lastHistoryItems; TQStringList lastQuarLocations; diff --git a/src/main.cpp b/src/main.cpp index 00c39dc..f7f0191 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -5,8 +5,8 @@ #include "klamav.h" #include "version.h" #include "klamavconfig.h" -#include <kaboutdata.h> -#include <kcmdlineargs.h> +#include <tdeaboutdata.h> +#include <tdecmdlineargs.h> #include <kuniqueapplication.h> static const char *description = @@ -15,7 +15,7 @@ static const char *description = static const char *version = KLAMAV_VERSION; //static const char title[] = "KlamAV"; -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+[URL]", I18N_NOOP( "Document to open." ), 0 }, { "scanthis", I18N_NOOP("Scan this..."), 0 }, @@ -24,11 +24,11 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData about("klamav", I18N_NOOP(""), version, description, - KAboutData::License_GPL, "(C) 2004 Robert Hogan", 0, 0, "robert at roberthogan dot net"); + TDEAboutData about("klamav", I18N_NOOP(""), version, description, + TDEAboutData::License_GPL, "(C) 2004 Robert Hogan", 0, 0, "robert at roberthogan dot net"); about.addAuthor( "Robert Hogan", 0, "robert at roberthogan dot net" ); - KCmdLineArgs::init(argc, argv, &about); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc, argv, &about); + TDECmdLineArgs::addCmdLineOptions(options); KUniqueApplication app; @@ -42,7 +42,7 @@ int main(int argc, char **argv) //else //{ // no session.. just start up normally - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if (args->count() == 0) { new Klamav; diff --git a/src/pageviewer.cpp b/src/pageviewer.cpp index 64b3265..849c833 100644 --- a/src/pageviewer.cpp +++ b/src/pageviewer.cpp @@ -9,12 +9,12 @@ //#include "feediconmanager.h" #include "pageviewer.h" -#include <kaction.h> +#include <tdeaction.h> #include <kbookmarkmanager.h> -#include <khtml_settings.h> +#include <tdehtml_settings.h> #include <kiconloader.h> -#include <klocale.h> -#include <kpopupmenu.h> +#include <tdelocale.h> +#include <tdepopupmenu.h> #include <tqmetaobject.h> @@ -26,13 +26,13 @@ PageViewer::PageViewer(TQWidget *parent, const char *name) : Viewer(parent, name) { // this hack is necessary since the part looks for []HTML Settings] in - // KGlobal::config() by default, which is wrong when running in Kontact - KHTMLSettings* s = const_cast<KHTMLSettings*> (settings()); + // TDEGlobal::config() by default, which is wrong when running in Kontact + TDEHTMLSettings* s = const_cast<TDEHTMLSettings*> (settings()); //s->init(Settings::self()->config()); s->init(); //setXMLFile(locate("data", "akregator/pageviewer.rc"), true); - m_backAction = new KToolBarPopupAction(i18n("Back"), "back", 0, this, SLOT(slotBack()), actionCollection(), "pageviewer_back"); + m_backAction = new TDEToolBarPopupAction(i18n("Back"), "back", 0, this, SLOT(slotBack()), actionCollection(), "pageviewer_back"); connect(m_backAction->popupMenu(), SIGNAL(aboutToShow()), this, SLOT(slotBackAboutToShow())); @@ -40,17 +40,17 @@ PageViewer::PageViewer(TQWidget *parent, const char *name) this, SLOT(slotPopupActivated(int))); - m_forwardAction = new KToolBarPopupAction(i18n("Forward"), "forward", 0, this, SLOT(slotForward()), actionCollection(), "pageviewer_forward"); + m_forwardAction = new TDEToolBarPopupAction(i18n("Forward"), "forward", 0, this, SLOT(slotForward()), actionCollection(), "pageviewer_forward"); connect(m_forwardAction->popupMenu(), SIGNAL(aboutToShow()), this, SLOT(slotForwardAboutToShow())); connect(m_forwardAction->popupMenu(), SIGNAL(activated(int)), this, SLOT(slotPopupActivated(int))); - m_reloadAction = new KAction(i18n("Reload"), "reload", 0, + m_reloadAction = new TDEAction(i18n("Reload"), "reload", 0, this, SLOT(slotReload()), actionCollection(), "pageviewer_reload"); - m_stopAction = new KAction(i18n("Stop"), "stop", 0, + m_stopAction = new TDEAction(i18n("Stop"), "stop", 0, this, SLOT(slotStop()), actionCollection(), "pageviewer_stop"); @@ -60,7 +60,7 @@ PageViewer::PageViewer(TQWidget *parent, const char *name) m_forwardAction->setEnabled(false); m_stopAction->setEnabled(false); - connect(this, SIGNAL(started(KIO::Job *)), this, SLOT(slotStarted(KIO::Job* ))); + connect(this, SIGNAL(started(TDEIO::Job *)), this, SLOT(slotStarted(TDEIO::Job* ))); connect(this, SIGNAL(completed()), this, SLOT(slotCompleted())); connect(this, SIGNAL(canceled(const TQString &)), this, SLOT(slotCancelled(const TQString &))); @@ -101,7 +101,7 @@ void PageViewer::slotForward() void PageViewer::slotBackAboutToShow() { - KPopupMenu *popup = m_backAction->popupMenu(); + TDEPopupMenu *popup = m_backAction->popupMenu(); popup->clear(); if ( m_current == m_history.begin() ) @@ -127,7 +127,7 @@ void PageViewer::slotBackAboutToShow() void PageViewer::slotForwardAboutToShow() { - KPopupMenu *popup = m_forwardAction->popupMenu(); + TDEPopupMenu *popup = m_forwardAction->popupMenu(); popup->clear(); if ( m_current == m_history.fromLast() ) @@ -175,9 +175,9 @@ bool PageViewer::openURL(const KURL &url) /* TQString favicon = FeedIconManager::self()->iconLocation(url); if (!favicon.isEmpty()) - emit setTabIcon(TQPixmap(KGlobal::dirs()->findResource("cache", favicon+".png"))); + emit setTabIcon(TQPixmap(TDEGlobal::dirs()->findResource("cache", favicon+".png"))); else - emit setTabIcon(SmallIcon("html")); + emit setTabIcon(SmallIcon("text-html")); */ return true; } @@ -229,7 +229,7 @@ void PageViewer::addHistoryEntry(const KURL& url) } // Taken from KDevelop (lib/widgets/kdevhtmlpart.cpp) -void PageViewer::slotStarted( KIO::Job * ) +void PageViewer::slotStarted( TDEIO::Job * ) { m_stopAction->setEnabled(true); } @@ -255,7 +255,7 @@ void PageViewer::slotSetCaption(const TQString& cap) { void PageViewer::slotPaletteOrFontChanged() { //kdDebug() << "PageViewer::slotPaletteOrFontChanged()" << endl; - // taken from KonqView (kdebase/konqueror/konq_view.cc) + // taken from KonqView (tdebase/konqueror/konq_view.cc) TQObject *obj = KParts::BrowserExtension::childObject(this); if ( !obj ) // not all views have a browser extension ! @@ -269,9 +269,9 @@ void PageViewer::slotPaletteOrFontChanged() obj->tqt_invoke(id, o); // this hack is necessary since the part looks for []HTML Settings] in - // KGlobal::config() by default, which is wrong when running in Kontact + // TDEGlobal::config() by default, which is wrong when running in Kontact // NOTE: when running in Kontact, immediate updating doesn't work - KHTMLSettings* s = const_cast<KHTMLSettings*> (settings()); + TDEHTMLSettings* s = const_cast<TDEHTMLSettings*> (settings()); //s->init(Settings::self()->config()); s->init(); } @@ -293,8 +293,8 @@ void PageViewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kur // if true show popup menu for link. Maybe that doesn't work properly when using frames bool isLink = kurl != Viewer::url(); -// KPopupMenu popup( i18n( "Documentation Viewer" ), this->widget() ); - KPopupMenu popup(this->widget()); +// TDEPopupMenu popup( i18n( "Documentation Viewer" ), this->widget() ); + TDEPopupMenu popup(this->widget()); // bool needSep = false; int idNewWindow = -2; @@ -302,16 +302,16 @@ void PageViewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kur { idNewWindow = popup.insertItem(SmallIcon("tab_new"),i18n("Open Link in New &Tab"), this, SLOT(slotOpenLinkInForegroundTab())); popup.setWhatsThis(idNewWindow, i18n("<b>Open Link in New Tab</b><p>Opens current link in a new tab.")); - popup.insertItem(SmallIcon("window_new"), i18n("Open Link in External &Browser"), this, SLOT(slotOpenLinkInBrowser())); + popup.insertItem(SmallIcon("window-new"), i18n("Open Link in External &Browser"), this, SLOT(slotOpenLinkInBrowser())); popup.insertSeparator(); - KAction *savelinkas = action("savelinkas"); + TDEAction *savelinkas = action("savelinkas"); if (savelinkas) savelinkas->plug( &popup); - KAction* copylinkaddress = action("copylinkaddress"); + TDEAction* copylinkaddress = action("copylinkaddress"); if (copylinkaddress) { copylinkaddress->plug( &popup); @@ -330,8 +330,8 @@ void PageViewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kur action("viewer_copy")->plug(&popup); popup.insertSeparator(); - KAction* incFontAction = this->action("incFontSizes"); - KAction* decFontAction = this->action("decFontSizes"); + TDEAction* incFontAction = this->action("incFontSizes"); + TDEAction* decFontAction = this->action("decFontSizes"); if ( incFontAction && decFontAction ) { incFontAction->plug( &popup ); @@ -339,12 +339,12 @@ void PageViewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kur popup.insertSeparator(); } - popup.insertItem(SmallIcon("window_new"), i18n("Open Page in External Browser"), this, SLOT(slotOpenLinkInBrowser())); + popup.insertItem(SmallIcon("window-new"), i18n("Open Page in External Browser"), this, SLOT(slotOpenLinkInBrowser())); action("viewer_print")->plug(&popup); popup.insertSeparator(); - KAction *ac = action("setEncoding"); + TDEAction *ac = action("setEncoding"); if (ac) ac->plug(&popup); popup.insertItem(SmallIcon("bookmark_add"),i18n("Add to Konqueror Bookmarks"), this, SLOT(slotGlobalBookmarkArticle())); diff --git a/src/pageviewer.h b/src/pageviewer.h index 80a4ff5..3b39437 100644 --- a/src/pageviewer.h +++ b/src/pageviewer.h @@ -17,8 +17,8 @@ using std::abs; #include "viewer.h" -class KAction; -class KToolBarPopupAction; +class TDEAction; +class TDEToolBarPopupAction; namespace KlamAV @@ -60,7 +60,7 @@ namespace KlamAV void addHistoryEntry(const KURL& url); protected slots: - void slotStarted(KIO::Job *); + void slotStarted(TDEIO::Job *); void slotCompleted(); void slotCancelled(const TQString &errMsg); void slotBackAboutToShow(); @@ -80,10 +80,10 @@ namespace KlamAV TQValueList<PageViewerHistoryEntry> m_history; TQValueList<PageViewerHistoryEntry>::Iterator m_current; - KToolBarPopupAction* m_backAction; - KToolBarPopupAction* m_forwardAction; - KAction* m_reloadAction; - KAction* m_stopAction; + TDEToolBarPopupAction* m_backAction; + TDEToolBarPopupAction* m_forwardAction; + TDEAction* m_reloadAction; + TDEAction* m_stopAction; bool m_restoring; TQString m_caption; diff --git a/src/scanviewer.cpp b/src/scanviewer.cpp index 22ccb42..bce8d72 100644 --- a/src/scanviewer.cpp +++ b/src/scanviewer.cpp @@ -14,16 +14,16 @@ #include "klamavconfig.h" -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kmenubar.h> +#include <tdemenubar.h> #include <kstatusbar.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <knotifyclient.h> #include <kprocio.h> #include <tqlayout.h> -#include <kcmdlineargs.h> -#include <kmessagebox.h> +#include <tdecmdlineargs.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <ksystemtray.h> #include <kprogress.h> @@ -112,7 +112,7 @@ ScanViewer::ScanViewer(TQWidget *parent, const char *name) prog = new KProgress(status2_frame); progosd = new K3bJobProgressOSD(); progosd->setText("Scanning.."); - progosd->readSettings(KGlobal::config()); + progosd->readSettings(TDEGlobal::config()); status2_layout->addWidget(prog, 10); prog->adjustSize(); @@ -238,7 +238,7 @@ void ScanViewer::processOutput() filesscanned++; if (!(showProgress)) status2_label->setText(i18n("Files scanned: %1").arg(filesscanned)); - KNotifyClient::event(kmain->_tray->winId(),"ScanAccessDenied", TQString("Can't scan %1 " + KNotifyClient::event(tdemain->_tray->winId(),"ScanAccessDenied", TQString("Can't scan %1 " "- Access Denied!").arg(tmpFName)); CollectionDB::instance()->insertEvent("Error Found","Access Denied",tmpFName); //}else if ((pos = buf.section('\n',j,j).find(": Can't open")) != -1){ @@ -248,7 +248,7 @@ void ScanViewer::processOutput() filesscanned++; if (!(showProgress)) status2_label->setText(i18n("Files scanned: %1").arg(filesscanned)); - KNotifyClient::event(kmain->_tray->winId(),"ScanAccessDenied", TQString("Can't scan %1 " + KNotifyClient::event(tdemain->_tray->winId(),"ScanAccessDenied", TQString("Can't scan %1 " "- Access Denied!").arg(tmpFName)); CollectionDB::instance()->insertEvent("Error Found","Access Denied",tmpFName); }else if ((pos = (item2.find(": Empty file"))) != -1){ @@ -256,7 +256,7 @@ void ScanViewer::processOutput() filesscanned++; if (!(showProgress)) status2_label->setText(i18n("Files scanned: %1").arg(filesscanned)); - //KNotifyClient::event(kmain->_tray->winId(),"ScanAccessDenied", TQString("Can't scan %1 " + //KNotifyClient::event(tdemain->_tray->winId(),"ScanAccessDenied", TQString("Can't scan %1 " // "- Empty File!").arg(tmpFName)); CollectionDB::instance()->insertEvent("Error Found","Empty File",tmpFName); } @@ -282,7 +282,7 @@ void ScanViewer::slotScan(const TQStringList & filepattern, int mode, bool recur { //KMessageBox::information (this, filepattern); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if(( args->isSet( "scanthis" ) ) || (dcopscan)) { calculateTime = FALSE; @@ -344,7 +344,7 @@ void ScanViewer::slotScan(const TQStringList & filepattern, int mode, bool recur prog->setTotalSteps(cnt); kdDebug() << "COUNT" << cnt << endl; - config = KGlobal::config(); + config = TDEGlobal::config(); slotClear(); QuarantineList.clear(); @@ -356,7 +356,7 @@ void ScanViewer::slotScan(const TQStringList & filepattern, int mode, bool recur TQString db; if(!( args->isSet( "scanthis" ) ) ) - db = kmain->freshklam->getCurrentDBDir(); + db = tdemain->freshklam->getCurrentDBDir(); else{ config->setGroup("Freshklam"); TQStringList lastDownloadPaths = config->readListEntry("lastDownloadPaths"); @@ -525,16 +525,16 @@ void ScanViewer::slotScan(const TQStringList & filepattern, int mode, bool recur *childproc << "'" + m_filepattern.join("' '") + "'"; -/* connect( childproc, SIGNAL(processExited(KProcess *)), +/* connect( childproc, SIGNAL(processExited(TDEProcess *)), SLOT(childExited()) ); - connect( childproc, SIGNAL(receivedStdout(KProcess *, char *, int)), - SLOT(receivedOutput(KProcess *, char *, int)) ); - childproc->start(KProcess::NotifyOnExit, KProcess::Stdout);*/ + connect( childproc, SIGNAL(receivedStdout(TDEProcess *, char *, int)), + SLOT(receivedOutput(TDEProcess *, char *, int)) ); + childproc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout);*/ connect( childproc, SIGNAL(readReady(KProcIO *)), SLOT(receivedOutput(KProcIO *)) ); childproc->start(KProcIO::NotifyOnExit); - connect( childproc, SIGNAL(processExited(KProcess *)), + connect( childproc, SIGNAL(processExited(TDEProcess *)), SLOT(childExited()) ); scanInProgress = TRUE; @@ -568,7 +568,7 @@ void ScanViewer::finish() scan_time->hide(); prog->hide(); progosd->hide(); - progosd->saveSettings(KGlobal::config()); + progosd->saveSettings(TDEGlobal::config()); status2_label->show(); multiScan = FALSE; @@ -594,10 +594,10 @@ void ScanViewer::slotCancel() void ScanViewer::resetSysTray() { - if (kmain->klamd->isKlamdAlive()) - kmain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_enabled")); + if (tdemain->klamd->isKlamdAlive()) + tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_enabled")); else - kmain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_disabled")); + tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_disabled")); } void ScanViewer::childExited() @@ -610,21 +610,21 @@ void ScanViewer::childExited() CollectionDB::instance()->insertEvent("Manual Scan",TQString("Scan Complete"),m_filepattern.join(" ")); if (status == 0){ - kmain->_tray->setPixmap(KSystemTray::loadIcon("klamav_scan_safe")); + tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_scan_safe")); TQTimer::singleShot( 10000, this, SLOT(resetSysTray()) ); if (!(errorsEncountered)) - KNotifyClient::event(kmain->_tray->winId(),i18n( "ScanCompleteNoVirus" ), i18n( "Scan Complete - No Viruses Found!" )); + KNotifyClient::event(tdemain->_tray->winId(),i18n( "ScanCompleteNoVirus" ), i18n( "Scan Complete - No Viruses Found!" )); else - KNotifyClient::event(kmain->_tray->winId(),i18n( "ScanCompleteNoVirusButErrors" ), i18n( "Scan Complete - No Viruses Found But Some Errors Encountered!" )); + KNotifyClient::event(tdemain->_tray->winId(),i18n( "ScanCompleteNoVirusButErrors" ), i18n( "Scan Complete - No Viruses Found But Some Errors Encountered!" )); }else if(status == 1){ - kmain->_tray->setPixmap(KSystemTray::loadIcon("klamav_scan_found")); + tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_scan_found")); switch (m_mode) { case 0: progosd->setText("Problems found!"); result = KMessageBox::warningContinueCancelList(this, i18n( "I'm going to quarantine this lot, you can restore them later if you want. If you don't want to quarantine, just press cancel."),QuarantineList,i18n( "Quarantine Infected Files" ),i18n( "Quarantine" )); switch (result) { - case 2 :KNotifyClient::event(kmain->_tray->winId(),"ScanAccessDenied", TQString("Suspicious Items Not " + case 2 :KNotifyClient::event(tdemain->_tray->winId(),"ScanAccessDenied", TQString("Suspicious Items Not " "Quarantined!")); break; case 5 : Quarantine(); break; } @@ -709,7 +709,7 @@ void ScanViewer::Quarantine(){ config->setGroup("Kuarantine"); TQStringList lastQuarLocations = config->readListEntry("KuarantineLocations"); - kmain->_tray->setPixmap(KSystemTray::loadIcon("klamav_quarantining")); + tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_quarantining")); TQString quarloc; for (TQStringList::Iterator it = lastQuarLocations.begin(); it == lastQuarLocations.begin() ; it++){ @@ -734,7 +734,7 @@ void ScanViewer::Quarantine(){ qname.prepend("/"); qname.prepend(quarloc); qname.append(":"+when); - if (KIO::NetAccess::file_move(fname,qname)){ + if (TDEIO::NetAccess::file_move(fname,qname)){ if (lastQuarItems.contains(item2)) lastQuarItems.remove(item2); lastQuarItems.prepend(item2); @@ -751,16 +751,16 @@ void ScanViewer::Quarantine(){ } } if (allQuarantined) { - if (kmain->klamd->isKlamdAlive()) - kmain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_enabled")); + if (tdemain->klamd->isKlamdAlive()) + tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_enabled")); else - kmain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_disabled")); + tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_disabled")); }else - kmain->_tray->setPixmap(KSystemTray::loadIcon("klamav_scan_found")); + tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_scan_found")); config->writeEntry(TQString("Items %1").arg(quarloc), lastQuarItems); config->sync(); - //kmain->kuarantine->refresh(); + //tdemain->kuarantine->refresh(); @@ -777,25 +777,25 @@ void ScanViewer::slotRMB( TQListViewItem* Item, const TQPoint & point, int ) TQString iconPath = locate("cache", KMimeType::favIconForURL("http://www.viruspool.net")+".png"); if ( iconPath.isEmpty() ) - vicon = SmallIcon("find"); + vicon = SmallIcon("edit-find"); else vicon = TQPixmap( iconPath ); iconPath = locate("cache", KMimeType::favIconForURL("http://www.google.com")+".png"); if ( iconPath.isEmpty() ) - gicon = SmallIcon("find"); + gicon = SmallIcon("edit-find"); else gicon = TQPixmap( iconPath ); iconPath = locate("cache", KMimeType::favIconForURL("http://www.trendmicro.com")+".png"); if ( iconPath.isEmpty() ) - ticon = SmallIcon("find"); + ticon = SmallIcon("edit-find"); else ticon = TQPixmap( iconPath ); iconPath = locate("cache", KMimeType::favIconForURL("http://www.viruslist.com")+".png"); if ( iconPath.isEmpty() ) - vlicon = SmallIcon("find"); + vlicon = SmallIcon("edit-find"); else vlicon = TQPixmap( iconPath ); @@ -839,25 +839,25 @@ void ScanViewer::slotQuarantineSelected() void ScanViewer::slotGoogle() { TQString name = resultview->currentItem()->text(1); - kmain->klamdb->slotExternal(name, "Google"); + tdemain->klamdb->slotExternal(name, "Google"); } void ScanViewer::slotVirusPool() { TQString name = resultview->currentItem()->text(1); - kmain->klamdb->slotExternal(name, "VirusPool"); + tdemain->klamdb->slotExternal(name, "VirusPool"); } void ScanViewer::slotTrendMicro() { TQString name = resultview->currentItem()->text(1); - kmain->klamdb->slotExternal(name, "TrendMicro"); + tdemain->klamdb->slotExternal(name, "TrendMicro"); } void ScanViewer::slotVirusList() { TQString name = resultview->currentItem()->text(1); - kmain->klamdb->slotExternal(name, "VirusList"); + tdemain->klamdb->slotExternal(name, "VirusList"); } void ScanViewer::slotStartAgain() diff --git a/src/scanviewer.h b/src/scanviewer.h index 00de43b..7dc1306 100644 --- a/src/scanviewer.h +++ b/src/scanviewer.h @@ -9,13 +9,13 @@ #include <config.h> #endif -#include <kapplication.h> -#include <kmainwindow.h> +#include <tdeapplication.h> +#include <tdemainwindow.h> #include "k3bjobprogressosd_mod.h" class KPrinter; -class KToggleAction; +class TDEToggleAction; class KURL; class TQLineEdit; class TQComboBox; @@ -26,7 +26,7 @@ class TQListViewItem; class TQPushButton; class TQLabel; class KProcIO; -class KConfig; +class TDEConfig; class KURLRequester; class KProgress; class K3bJobProgressOSD; @@ -78,14 +78,14 @@ protected: * This function is called when it is time for the app to save its * properties for session management purposes. */ - //void saveProperties(KConfig *); + //void saveProperties(TDEConfig *); /** - * This function is called when this app is restored. The KConfig + * This function is called when this app is restored. The TDEConfig * object points to the session management config file that was saved * with @ref saveProperties */ - //void readProperties(KConfig *); + //void readProperties(TDEConfig *); private slots: @@ -141,7 +141,7 @@ private: TQLabel *status_label, *status2_label,*matches_label,*matches2_label; KProcIO *childproc; TQString buf; - KConfig* config; + TDEConfig* config; TQStringList lastSearchItems; TQStringList lastScanPaths; TQStringList lastQuarItems; diff --git a/src/schedule.cpp b/src/schedule.cpp index 56c03d2..4ad3532 100644 --- a/src/schedule.cpp +++ b/src/schedule.cpp @@ -15,7 +15,7 @@ #include <tqlayout.h> #include <tqlistview.h> //#include <qlistviewitem.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kdialog.h> #include <dcopclient.h> #include <kstdguiitem.h> @@ -173,7 +173,7 @@ void Schedule::slotAddDateToCombo(TQDate newdate) check_combo->insertItem(newstring); check_combo->setCurrentItem(check_combo->count()-1); - DCOPClient* client = KApplication::dcopClient(); + DCOPClient* client = TDEApplication::dcopClient(); client->attach(); client->registerAs(kapp->name()); @@ -357,7 +357,7 @@ TQString Schedule::createScanScript() if ( file.open( IO_WriteOnly ) ) { TQTextStream ts( &file ); - TQString kdedir = getenv("KDEDIR"); + TQString tdedir = getenv("TDEDIR"); ts << "#!/bin/bash" << "\n"; @@ -403,7 +403,7 @@ TQString Schedule::createScanScript() TQString Schedule::createStartupScript() { - TQString path = KGlobalSettings::autostartPath(); + TQString path = TDEGlobalSettings::autostartPath(); TQDir startupdir(path); if (!startupdir.exists()) return TQString("Error"); diff --git a/src/schedule.h b/src/schedule.h index adc99eb..d3725fd 100644 --- a/src/schedule.h +++ b/src/schedule.h @@ -26,7 +26,7 @@ class KPrinter; -class KToggleAction; +class TDEToggleAction; class KURL; class TQLineEdit; class TQComboBox; @@ -37,8 +37,8 @@ class KTView; class TQListViewItem; class TQPushButton; class TQLabel; -class KProcess; -class KConfig; +class TDEProcess; +class TDEConfig; class KURLRequester; class CollectionSetup; class TQToolButton; @@ -105,14 +105,14 @@ protected: * This function is called when it is time for the app to save its * properties for session management purposes. */ - //void saveProperties(KConfig *); + //void saveProperties(TDEConfig *); /** - * This function is called when this app is restored. The KConfig + * This function is called when this app is restored. The TDEConfig * object points to the session management config file that was saved * with @ref saveProperties */ - //void readProperties(KConfig *); + //void readProperties(TDEConfig *); private slots: @@ -141,9 +141,9 @@ private: // TQListView *resultview; TQPushButton *search_button, *cancel_button; TQLabel *status_label, *status2_label,*matches_label,*matches2_label; - KProcess *childproc; + TDEProcess *childproc; TQString buf; - KConfig* config; + TDEConfig* config; bool errorsEncountered; TQPushButton* adv_options; TQString urlsToScan; diff --git a/src/sigtool.cpp b/src/sigtool.cpp index 779047b..3c2b1d8 100644 --- a/src/sigtool.cpp +++ b/src/sigtool.cpp @@ -5,15 +5,15 @@ #include "sigtool.h" -#include <klocale.h> +#include <tdelocale.h> #include <kstatusbar.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kurlrequester.h> #include <tqlayout.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> const char *mail_clients[] = { "KMail", @@ -130,14 +130,14 @@ void Sigtool::configureKMail(){ KMessageBox::information (this,i18n( "Please ensure KMail is not open before we proceed.") ); TQString DatabaseLocation; - config = KGlobal::config(); + config = TDEGlobal::config(); config->setGroup("Freshklam"); TQStringList lastDownloadPaths = config->readListEntry("lastDownloadPaths"); for (TQStringList::Iterator it = lastDownloadPaths.begin(); it == lastDownloadPaths.begin() ; it++){ DatabaseLocation = *it; } - config = new KConfig("kmailrc"); + config = new TDEConfig("kmailrc"); config->setGroup("General"); TQVariant nooffilters = config->readEntry("filters"); diff --git a/src/sigtool.h b/src/sigtool.h index bb5da38..df35641 100644 --- a/src/sigtool.h +++ b/src/sigtool.h @@ -9,13 +9,13 @@ #include <config.h> #endif -#include <kapplication.h> -#include <kmainwindow.h> +#include <tdeapplication.h> +#include <tdemainwindow.h> class KPrinter; -class KToggleAction; +class TDEToggleAction; class KURL; class TQLineEdit; class TQComboBox; @@ -23,8 +23,8 @@ class TQCheckBox; class TQListBox; class TQPushButton; class TQLabel; -class KProcess; -class KConfig; +class TDEProcess; +class TDEConfig; class KURLRequester; @@ -67,14 +67,14 @@ protected: * This function is called when it is time for the app to save its * properties for session management purposes. */ - //void saveProperties(KConfig *); + //void saveProperties(TDEConfig *); /** - * This function is called when this app is restored. The KConfig + * This function is called when this app is restored. The TDEConfig * object points to the session management config file that was saved * with @ref saveProperties */ - //void readProperties(KConfig *); + //void readProperties(TDEConfig *); private slots: @@ -101,8 +101,8 @@ private: //SigtoolView *m_view; /* KPrinter *m_printer; - KToggleAction *m_toolbarAction; - KToggleAction *m_statusbarAction;*/ + TDEToggleAction *m_toolbarAction; + TDEToggleAction *m_statusbarAction;*/ signals: @@ -125,9 +125,9 @@ private: TQListBox *resultbox; TQPushButton *search_button, *manual_button; TQLabel *status_label, *matches_label; - KProcess *childproc; + TDEProcess *childproc; TQString buf; - KConfig *config; + TDEConfig *config; TQStringList lastSearchItems; TQStringList lastSearchPaths; TQComboBox *check_combo; diff --git a/src/sqlite/Makefile.in b/src/sqlite/Makefile.in index 93cff89..cab70a6 100644 --- a/src/sqlite/Makefile.in +++ b/src/sqlite/Makefile.in @@ -196,24 +196,24 @@ LIBZ = @LIBZ@ LIB_CLAM = @LIB_CLAM@ LIB_KAB = @LIB_KAB@ LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ +LIB_TDECORE = @LIB_TDECORE@ LIB_KDED = @LIB_KDED@ -LIB_KDEPIM = @LIB_KDEPIM@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ -LIB_KDNSSD = @LIB_KDNSSD@ +LIB_TDEPIM = @LIB_TDEPIM@ +LIB_TDEPRINT = @LIB_TDEPRINT@ +LIB_TDEUI = @LIB_TDEUI@ +LIB_TDEDNSSD = @LIB_TDEDNSSD@ LIB_KFILE = @LIB_KFILE@ LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIMPROXY = @LIB_KIMPROXY@ -LIB_KIO = @LIB_KIO@ +LIB_TDEHTML = @LIB_TDEHTML@ +LIB_TDEIMPROXY = @LIB_TDEIMPROXY@ +LIB_TDEIO = @LIB_TDEIO@ LIB_KJS = @LIB_KJS@ LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ -LIB_KUNITTEST = @LIB_KUNITTEST@ -LIB_KUTILS = @LIB_KUTILS@ +LIB_TDEPARTS = @LIB_TDEPARTS@ +LIB_TDESPELL = @LIB_TDESPELL@ +LIB_TDESYCOCA = @LIB_TDESYCOCA@ +LIB_TDEUNITTEST = @LIB_TDEUNITTEST@ +LIB_TDEUTILS = @LIB_TDEUTILS@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ @@ -225,7 +225,7 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ -MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ +MAKETDEWIDGETS = @MAKETDEWIDGETS@ MCOPIDL = @MCOPIDL@ MEINPROC = @MEINPROC@ MOC = @MOC@ @@ -330,7 +330,7 @@ kde_styledir = @kde_styledir@ kde_templatesdir = @kde_templatesdir@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ -kdeinitdir = @kdeinitdir@ +tdeinitdir = @tdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/src/tabwidget.cpp b/src/tabwidget.cpp index e2d4577..a001fb2 100644 --- a/src/tabwidget.cpp +++ b/src/tabwidget.cpp @@ -10,12 +10,12 @@ #include <tqstyle.h> #include <tqclipboard.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <ktabbar.h> -#include <kpopupmenu.h> -#include <klocale.h> -#include <khtmlview.h> -#include <khtml_part.h> +#include <tdepopupmenu.h> +#include <tdelocale.h> +#include <tdehtmlview.h> +#include <tdehtml_part.h> #include <kiconloader.h> //#include "akregatorconfig.h" @@ -151,7 +151,7 @@ void TabWidget::setTitle( const TQString &title , TQWidget* sender) void TabWidget::contextMenu(int i, const TQPoint &p) { currentItem = page(i); - KPopupMenu popup; + TDEPopupMenu popup; //popup.insertTitle(tabLabel(currentItem)); //int detachTab = popup.insertItem( SmallIcon("tab_breakoff"), i18n("Detach Tab"), this, SLOT( slotDetachTab() ) ); //int copyLink = popup.insertItem( i18n("Copy Link Address"), this, SLOT( slotCopyLinkAddress() ) ); @@ -169,7 +169,7 @@ void TabWidget::slotDetachTab() { if(!currentItem) return; KURL url; - if (KHTMLView *view = dynamic_cast<KHTMLView*>(currentItem)) url = view->part()->url(); + if (TDEHTMLView *view = dynamic_cast<TDEHTMLView*>(currentItem)) url = view->part()->url(); else return; kapp->invokeBrowser(url.url(), "0"); removePage(currentItem); @@ -181,7 +181,7 @@ void TabWidget::slotCopyLinkAddress() { if(!currentItem) return; KURL url; - if (KHTMLView *view = dynamic_cast<KHTMLView*>(currentItem)) url = view->part()->url(); + if (TDEHTMLView *view = dynamic_cast<TDEHTMLView*>(currentItem)) url = view->part()->url(); else return; TQClipboard *cb = TQApplication::clipboard(); if(cb) cb->setText(url.prettyURL()); diff --git a/src/update.cpp b/src/update.cpp index f8497d0..8ee0ad4 100644 --- a/src/update.cpp +++ b/src/update.cpp @@ -25,11 +25,11 @@ #include <kstaticdeleter.h> -#include <klocale.h> -#include <kio/netaccess.h> +#include <tdelocale.h> +#include <tdeio/netaccess.h> -#include <kaction.h> +#include <tdeaction.h> #include <tqcheckbox.h> #include <kbuttonbox.h> @@ -37,16 +37,16 @@ #include <kurlcompletion.h> #include <kcombobox.h> #include <tqlayout.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <klineedit.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <ksystemtray.h> #include <ktar.h> #include <kprogress.h> #include <kprocio.h> #include <knotifyclient.h> #include <dom/html_misc.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <dcopclient.h> #include <kuser.h> @@ -78,7 +78,7 @@ const char *mirrors[] = { }; KlamavUpdate::KlamavUpdate(TQWidget *parent, const char *name) - : TQWidget(parent, name),filelist(new KHTMLPart(this)) + : TQWidget(parent, name),filelist(new TDEHTMLPart(this)) { filelist->hide(); @@ -140,7 +140,7 @@ void KlamavUpdate::downloadComponent(TQString component, TQString version, TQStr startProgressDialog( i18n( "Downloading %1-%2..." ).arg(component).arg(version) ); TQString tmpFile; - if ( !KIO::NetAccess::download( TQString("http://%1.dl.sourceforge.net/sourceforge/%2/%3-%4.%5").arg(getMirror()).arg(component).arg(component).arg(version).arg(extension), tmpFile, 0L ) ){ + if ( !TDEIO::NetAccess::download( TQString("http://%1.dl.sourceforge.net/sourceforge/%2/%3-%4.%5").arg(getMirror()).arg(component).arg(component).arg(version).arg(extension), tmpFile, 0L ) ){ KMessageBox::information (this,i18n("Couldn't download %1.").arg(component)); delete timer; timer=0; @@ -180,7 +180,7 @@ void KlamavUpdate::downloadComponent(TQString component, TQString version, TQStr tar.directory()->copyTo( location ); tar.close(); // remove the temp file - KIO::NetAccess::removeTempFile( tmpFile ); + TDEIO::NetAccess::removeTempFile( tmpFile ); delete timer; timer=0; @@ -215,7 +215,7 @@ void KlamavUpdate::downloadComponent(TQString component, TQString version, TQStr break; case 5 : - KProcess* arkollonproc = new KShellProcess(); + TDEProcess* arkollonproc = new KShellProcess(); //make sure we catch arkollon in the .klamav directory // TQString curpath = (TQString) getenv("PATH"); // TQString homedir = (TQString) getenv("HOME"); @@ -230,9 +230,9 @@ void KlamavUpdate::downloadComponent(TQString component, TQString version, TQStr TQString command = TQString("klamarkollon %1/%2-%3").arg(location).arg(component).arg(version); *arkollonproc << command; if (component == "klamav") - connect( arkollonproc, SIGNAL(processExited(KProcess *)), SLOT(klamavInstallationExited(KProcess *)) ); + connect( arkollonproc, SIGNAL(processExited(TDEProcess *)), SLOT(klamavInstallationExited(TDEProcess *)) ); else - connect( arkollonproc, SIGNAL(processExited(KProcess *)), SLOT(clamavInstallationExited(KProcess *)) ); + connect( arkollonproc, SIGNAL(processExited(TDEProcess *)), SLOT(clamavInstallationExited(TDEProcess *)) ); arkollonproc->start(); } } @@ -351,7 +351,7 @@ void KlamavUpdate::slotProg() progressDialog->progressBar()->setProgress(progressDialog->progressBar()->progress() + 4 ); } -void KlamavUpdate::clamavInstallationExited(KProcess* arkollonproc) +void KlamavUpdate::clamavInstallationExited(TDEProcess* arkollonproc) { arkollonproc = 0; @@ -361,7 +361,7 @@ void KlamavUpdate::clamavInstallationExited(KProcess* arkollonproc) } -void KlamavUpdate::klamavInstallationExited(KProcess* arkollonproc) +void KlamavUpdate::klamavInstallationExited(TDEProcess* arkollonproc) { arkollonproc = 0; diff --git a/src/update.h b/src/update.h index da0ffe3..b3fa5aa 100644 --- a/src/update.h +++ b/src/update.h @@ -26,11 +26,11 @@ #include <config.h> #endif -#include <kapplication.h> +#include <tdeapplication.h> #include <kdirlister.h> //stack allocated #include <kurl.h> //stack allocated #include <kresolver.h> // namespace -#include <khtml_part.h> +#include <tdehtml_part.h> namespace DOM { @@ -41,11 +41,11 @@ namespace DOM { using namespace KNetwork; class KURL; -class KProcess; +class TDEProcess; class KURLRequester; class KProgressDialog; class KProcIO; -class KHTMLPart; +class TDEHTMLPart; /** * This class serves as the main window for KlamavUpdate. It handles the @@ -79,8 +79,8 @@ signals: private slots: void slotProg(); - void klamavInstallationExited(KProcess *arkollonproc); - void clamavInstallationExited(KProcess *arkollonproc); + void klamavInstallationExited(TDEProcess *arkollonproc); + void clamavInstallationExited(TDEProcess *arkollonproc); /* void resolved(KResolverResults result);*/ /* void readVersionLine(KProcIO *);*/ void parseSFPage(); @@ -97,7 +97,7 @@ private: void completedSearchForUpdates(const TQString &component, const TQString &extension); double numericizeVersion(TQString &version); TQString getMirror(); - KProcess *childproc; + TDEProcess *childproc; KProcIO *versionproc; TQString tempFileName; TQString errorMessage; @@ -112,7 +112,7 @@ private: KResolver m_resolver; TQString currentClamavVersion; bool m_alpha; - KHTMLPart *filelist; + TDEHTMLPart *filelist; private: KDirLister clamav_lister; KURL clamav_url; diff --git a/src/viewer.cpp b/src/viewer.cpp index 1cbf083..f98fb79 100644 --- a/src/viewer.cpp +++ b/src/viewer.cpp @@ -5,12 +5,12 @@ * Licensed under GPL. * ***************************************************************************/ -#include <kaction.h> -#include <kapplication.h> -#include <khtmlview.h> +#include <tdeaction.h> +#include <tdeapplication.h> +#include <tdehtmlview.h> #include <kiconloader.h> -#include <klocale.h> -#include <kpopupmenu.h> +#include <tdelocale.h> +#include <tdepopupmenu.h> #include <tqclipboard.h> #include <tqpaintdevicemetrics.h> @@ -22,7 +22,7 @@ using namespace KlamAV; Viewer::Viewer(TQWidget *parent, const char *name) - : KHTMLPart(parent, name), m_url(0) + : TDEHTMLPart(parent, name), m_url(0) { setZoomFactor(100); setJScriptEnabled(true); @@ -34,8 +34,8 @@ Viewer::Viewer(TQWidget *parent, const char *name) setStatusMessagesEnabled(true); // change the cursor when loading stuff... - connect( this, SIGNAL(started(KIO::Job *)), - this, SLOT(slotStarted(KIO::Job *))); + connect( this, SIGNAL(started(TDEIO::Job *)), + this, SLOT(slotStarted(TDEIO::Job *))); connect( this, SIGNAL(completed()), this, SLOT(slotCompleted())); @@ -50,12 +50,12 @@ SIGNAL(popupMenu (KXMLGUIClient*, const TQPoint&, const KURL&, const KStdAction::print(this, SLOT(slotPrint()), actionCollection(), "viewer_print"); KStdAction::copy(this, SLOT(slotCopy()), actionCollection(), "viewer_copy"); - new KAction( i18n("&Increase Font Sizes"), "viewmag+", "Ctrl+Plus", this, SLOT(slotZoomIn()), actionCollection(), "incFontSizes" ); - new KAction( i18n("&Decrease Font Sizes"), "viewmag-", "Ctrl+Minus", this, SLOT(slotZoomOut()), actionCollection(), "decFontSizes" ); + new TDEAction( i18n("&Increase Font Sizes"), "viewmag+", "Ctrl+Plus", this, SLOT(slotZoomIn()), actionCollection(), "incFontSizes" ); + new TDEAction( i18n("&Decrease Font Sizes"), "viewmag-", "Ctrl+Minus", this, SLOT(slotZoomOut()), actionCollection(), "decFontSizes" ); connect(this, SIGNAL(selectionChanged()), this, SLOT(slotSelectionChanged())); - new KAction(i18n("Copy &Link Address"), "", 0, + new TDEAction(i18n("Copy &Link Address"), "", 0, this, SLOT(slotCopyLinkAddress()), actionCollection(), "copylinkaddress"); } @@ -72,7 +72,7 @@ bool Viewer::closeURL() { emit browserExtension()->loadingProgress(-1); emit canceled(TQString::null); - return KHTMLPart::closeURL(); + return TDEHTMLPart::closeURL(); } int Viewer::pointsToPixel(int pointSize) const @@ -96,10 +96,10 @@ void Viewer::displayInExternalBrowser(const KURL &url, const TQString &mimetype) TQString cmd = Settings::externalBrowserCustomCommand(); TQString urlStr = url.url(); cmd.replace(TQRegExp("%u"), urlStr); - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; TQStringList cmdAndArgs = KShell::splitArgs(cmd); *proc << cmdAndArgs; - proc->start(KProcess::DontCare); + proc->start(TDEProcess::DontCare); delete proc; }*/ } @@ -145,12 +145,12 @@ void Viewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kurl, c TQString url = kurl.url(); if(this->url() == url) return; m_url = url; - KPopupMenu popup; + TDEPopupMenu popup; if (!url.isEmpty()) { popup.insertItem(SmallIcon("tab_new"), i18n("Open Link in New &Tab"), this, SLOT(slotOpenLinkInForegroundTab())); - popup.insertItem(SmallIcon("window_new"), i18n("Open Link in External &Browser"), this, SLOT(slotOpenLinkInBrowser())); + popup.insertItem(SmallIcon("window-new"), i18n("Open Link in External &Browser"), this, SLOT(slotOpenLinkInBrowser())); action("copylinkaddress")->plug(&popup); } else @@ -158,7 +158,7 @@ void Viewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kurl, c action("viewer_copy")->plug(&popup); popup.insertSeparator(); action("viewer_print")->plug(&popup); - KAction *ac = action("setEncoding"); + TDEAction *ac = action("setEncoding"); if (ac) ac->plug(&popup); } @@ -210,7 +210,7 @@ void Viewer::slotOpenLinkInBrowser() displayInExternalBrowser(m_url, TQString::null); } -void Viewer::slotStarted(KIO::Job *) +void Viewer::slotStarted(TDEIO::Job *) { widget()->setCursor( waitCursor ); } diff --git a/src/viewer.h b/src/viewer.h index de0fcfc..f8ed799 100644 --- a/src/viewer.h +++ b/src/viewer.h @@ -8,18 +8,18 @@ #ifndef VIEWER_H #define VIEWER_H -#include <khtml_part.h> +#include <tdehtml_part.h> class KURL; -namespace KIO +namespace TDEIO { class MetaData; } namespace KlamAV { - class Viewer : public KHTMLPart + class Viewer : public TDEHTMLPart { Q_OBJECT public: @@ -27,8 +27,8 @@ namespace KlamAV virtual bool closeURL(); virtual bool openURL(const KURL &); - /** used by the BrowserRun object to call KHTMLPart::openURL() */ - void openPage(const KURL& url) { KHTMLPart::openURL(url);} + /** used by the BrowserRun object to call TDEHTMLPart::openURL() */ + void openPage(const KURL& url) { TDEHTMLPart::openURL(url);} public slots: @@ -72,7 +72,7 @@ namespace KlamAV virtual void slotOpenLinkInBackgroundTab(); /** This changes cursor to wait cursor */ - void slotStarted(KIO::Job *); + void slotStarted(TDEIO::Job *); /** This reverts cursor back to normal one */ void slotCompleted(); |