diff --git a/ChangeLog b/ChangeLog index fa31f39..c9b154c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,7 +2,7 @@ === * If root-only options are selected by a 'normal' user, - the 'kdesu' facility is envoked to run nmap as root + the 'tdesu' facility is envoked to run nmap as root * Previously all nmap output was "wrapped", this is now an option. The default is to wrap long lines. diff --git a/acinclude.m4 b/acinclude.m4 index 9df64a8..8ba1fec 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! @@ -360,24 +360,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) @@ -543,11 +543,11 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], AM_CONDITIONAL(include_ARTS, test "$build_arts" != "no") 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 @@ -559,7 +559,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)]) KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)]) fi - KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs]) + KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs]) KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs]) kde32ornewer=1 @@ -572,14 +572,14 @@ 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 KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [XMLLINT=""]) if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share" - test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" + test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs" AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) if test "$KDE_XSL_STYLESHEET" = "NO"; then KDE_XSL_STYLESHEET="" @@ -609,9 +609,9 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], if test -x "$KDECONFIG"; then # it can be "compiled" 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` @@ -693,7 +693,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 @@ -910,7 +910,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 @@ -1394,7 +1394,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 ]) @@ -1435,7 +1435,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 @@ -1619,7 +1619,7 @@ 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.]) + AC_MSG_ERROR([you need to install tdelibs first.]) fi fi ]) @@ -1730,16 +1730,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="/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="/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" @@ -1750,8 +1750,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail. So, check this please and use another prefix!]) fi -kde_libdirs="/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="/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" @@ -1769,7 +1769,7 @@ fi if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then AC_MSG_ERROR([ I can't find the designer plugins. These are required and should have been installed -by kdelibs]) +by tdelibs]) fi if test -n "$kde_widgetdir"; then @@ -1924,20 +1924,20 @@ cat > conftest.$ac_ext < 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"); @@ -1975,7 +1975,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([ @@ -2008,39 +2008,39 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES], AC_REQUIRE([K_PATH_X]) if test $kde_qtver = 3; then - AC_SUBST(LIB_KDECORE, "-lkdecore") - AC_SUBST(LIB_KDEUI, "-lkdeui") - AC_SUBST(LIB_KIO, "-lkio") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") + AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_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_KABC, "-ltdeabc") + AC_SUBST(LIB_TDEHTML, "-ltdehtml") + AC_SUBST(LIB_KSPELL, "-ltdespell") + AC_SUBST(LIB_KPARTS, "-ltdeparts") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") + AC_SUBST(LIB_KUTILS, "-ltdeutils") + AC_SUBST(LIB_TDEPIM, "-ltdepim") # these are for backward compatibility - AC_SUBST(LIB_KSYCOCA, "-lkio") - AC_SUBST(LIB_KFILE, "-lkio") + AC_SUBST(LIB_KSYCOCA, "-ltdeio") + AC_SUBST(LIB_KFILE, "-ltdeio") elif test $kde_qtver = 2; then - AC_SUBST(LIB_KDECORE, "-lkdecore") - AC_SUBST(LIB_KDEUI, "-lkdeui") - AC_SUBST(LIB_KIO, "-lkio") - AC_SUBST(LIB_KSYCOCA, "-lksycoca") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") + AC_SUBST(LIB_KIO, "-ltdeio") + AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") - AC_SUBST(LIB_KFILE, "-lkfile") + AC_SUBST(LIB_KFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_KHTML, "-lkhtml") - AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") - AC_SUBST(LIB_KDEPRINT, "-lkdeprint") + AC_SUBST(LIB_TDEHTML, "-ltdehtml") + AC_SUBST(LIB_KSPELL, "-ltdespell") + AC_SUBST(LIB_KPARTS, "-ltdeparts") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else - AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)") - AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)") - AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)") - AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)") - AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)") + AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") + AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") + AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") + AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) @@ -2105,7 +2105,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 @@ -2386,7 +2386,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 ]) @@ -2450,7 +2450,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 @@ -3066,26 +3066,26 @@ AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch config AC_DEFUN([KDE_CHECK_LIB64], [ - kdelibsuff=no + tdelibsuff=no AC_ARG_ENABLE(libsuffix, AC_HELP_STRING([--enable-libsuffix], [/lib directory suffix (64,32,none[=default])]), - kdelibsuff=$enableval) + tdelibsuff=$enableval) # TODO: add an auto case that compiles a little C app to check # where the glibc is - if test "$kdelibsuff" = "no"; then - kdelibsuff= + if test "$tdelibsuff" = "no"; then + tdelibsuff= fi - if test -z "$kdelibsuff"; then + if test -z "$tdelibsuff"; then AC_MSG_RESULT([not using lib directory suffix]) AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories) else if test "$libdir" = '${exec_prefix}/lib'; then - libdir="$libdir${kdelibsuff}" + libdir="$libdir${tdelibsuff}" AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms fi - AC_DEFINE_UNQUOTED(KDELIBSUFF, ["\"${kdelibsuff}\""], Suffix for lib directories) - AC_MSG_RESULT([using lib directory suffix $kdelibsuff]) + AC_DEFINE_UNQUOTED(KDELIBSUFF, ["\"${tdelibsuff}\""], Suffix for lib directories) + AC_MSG_RESULT([using lib directory suffix $tdelibsuff]) fi ]) @@ -3102,7 +3102,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 @@ -4076,7 +4076,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) @@ -4465,8 +4465,8 @@ AC_DEFUN([KDE_CONF_FILES], AC_DEFUN([KDE_SET_PREFIX], [ 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 @@ -4545,15 +4545,15 @@ pushdef([AC_PROG_INSTALL], fi ])dnl -AC_DEFUN([KDE_LANG_CPLUSPLUS], +AC_DEFUN([TDE_LANG_CPLUSPLUS], [AC_LANG_CPLUSPLUS ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AC_FD_CC' -pushdef([AC_LANG_CPLUSPLUS], [popdef([AC_LANG_CPLUSPLUS]) KDE_LANG_CPLUSPLUS]) +pushdef([AC_LANG_CPLUSPLUS], [popdef([AC_LANG_CPLUSPLUS]) TDE_LANG_CPLUSPLUS]) ]) pushdef([AC_LANG_CPLUSPLUS], [popdef([AC_LANG_CPLUSPLUS]) -KDE_LANG_CPLUSPLUS +TDE_LANG_CPLUSPLUS ]) AC_DEFUN([KDE_CHECK_LONG_LONG], @@ -5116,7 +5116,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 @@ -5136,7 +5136,7 @@ AC_CACHE_VAL(ac_cv_have_ssl, AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir) ac_ssl_includes="$ssl_incdir" - ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs" + ssl_libdirs="/usr/lib$tdelibsuff /usr/local/lib$tdelibsuff /usr/ssl/lib$tdelibsuff /usr/local/ssl/lib$tdelibsuff $libdir $prefix/lib$tdelibsuff $exec_prefix/lib$tdelibsuff $kde_extra_libs" if test ! "$ac_ssl_libraries" = "NO"; then ssl_libdirs="$ac_ssl_libraries $ssl_libdirs" fi diff --git a/doc/Makefile.am b/doc/Makefile.am index 79a09b7..a361daa 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,6 +1,6 @@ # the SUBDIRS is filled automatically by am_edit. If files are # in this directory they are installed into the english dir -KDE_LANG = en +TDE_LANG = en KDE_DOCS = knmap SUBDIRS = $(AUTODIRS) diff --git a/doc/en/Makefile.am b/doc/en/Makefile.am index fb2ea2a..5aaf479 100644 --- a/doc/en/Makefile.am +++ b/doc/en/Makefile.am @@ -1,3 +1,3 @@ KDE_DOCS = knmap -KDE_LANG = en +TDE_LANG = en kde_docs_KDEDOCS = new_scan.png diff --git a/doc/en/index.docbook b/doc/en/index.docbook index 2a28769..285826b 100644 --- a/doc/en/index.docbook +++ b/doc/en/index.docbook @@ -3,7 +3,7 @@ Knmap"> - + ]> @@ -62,7 +62,7 @@ - Version 1.0 of &knmap; was merely a re-write of the original. Version 2.0 adds the extra functionality of multiple concurrent nmap scans from within the one instance of &knmap;. Version 2.1 allows a normal (non-root) user to use the privileged nmap functions via to 'kdesu' utility. (Previously, the privileged options were only available if &knmap; was run by root.) + Version 1.0 of &knmap; was merely a re-write of the original. Version 2.0 adds the extra functionality of multiple concurrent nmap scans from within the one instance of &knmap;. Version 2.1 allows a normal (non-root) user to use the privileged nmap functions via to 'tdesu' utility. (Previously, the privileged options were only available if &knmap; was run by root.) @@ -254,7 +254,7 @@ - This screenshot shows those nmap options that require a value. The associated input area is activated when the option is activated. Options preceded by a hash (#) require root privileges. When the "Start nmap" button is pressed, the 'kdesu' facility will be invoked to run nmap as the super user. + This screenshot shows those nmap options that require a value. The associated input area is activated when the option is activated. Options preceded by a hash (#) require root privileges. When the "Start nmap" button is pressed, the 'tdesu' facility will be invoked to run nmap as the super user. @@ -303,7 +303,7 @@ - This screenshot shows the nmap options that control the types of ping and scans that will be performed. Options preceded by a hash (#) require root privileges. When the "Start nmap" button is pressed, the 'kdesu' facility will be invoked to run nmap as the super user. + This screenshot shows the nmap options that control the types of ping and scans that will be performed. Options preceded by a hash (#) require root privileges. When the "Start nmap" button is pressed, the 'tdesu' facility will be invoked to run nmap as the super user. @@ -318,7 +318,7 @@ - This screenshot shows the boolean nmap options, i.e., those options that do not require a value. Options preceded by a hash (#) require root privileges. When the "Start nmap" button is pressed, the 'kdesu' facility will be invoked to run nmap as the super user. + This screenshot shows the boolean nmap options, i.e., those options that do not require a value. Options preceded by a hash (#) require root privileges. When the "Start nmap" button is pressed, the 'tdesu' facility will be invoked to run nmap as the super user. diff --git a/src/Makefile.am b/src/Makefile.am index 7a2a2be..925ea04 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -31,7 +31,7 @@ knmap_SOURCES = main.cpp knmap.cpp mainwidget.cpp outputwidget.cpp \ tabwidgetptrlist.cpp tabwidgetdata.cpp scanwidget.cpp indexwidget.cpp scannamedialog.cpp \ scanstack.cpp scanmonitor.cpp scanmonitorevent.cpp nmapoutputbuffer.cpp knmap_LDFLAGS = $(TDE_RPATH) $(all_libraries) -knmap_LDADD = $(LIB_KIO) $(LIB_KHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT) +knmap_LDADD = $(LIB_KIO) $(LIB_TDEHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT) # this is where the desktop file will go shelldesktopdir = $(kde_appsdir)/Utilities diff --git a/src/commonwidget.cpp b/src/commonwidget.cpp index 72f9e9b..7a5eaf7 100644 --- a/src/commonwidget.cpp +++ b/src/commonwidget.cpp @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include "commonwidget.h" #include "whatsthis.h" diff --git a/src/compoundwidget.cpp b/src/compoundwidget.cpp index 420a67e..997be7c 100644 --- a/src/compoundwidget.cpp +++ b/src/compoundwidget.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include "compoundwidget.h" #include "knmap.h" diff --git a/src/htmlwidget.cpp b/src/htmlwidget.cpp index 4132ba4..689f363 100644 --- a/src/htmlwidget.cpp +++ b/src/htmlwidget.cpp @@ -23,13 +23,13 @@ #include #include -#include +#include #include #include -#include -#include +#include +#include #include -#include +#include #include #include @@ -48,7 +48,7 @@ HTMLWidget::HTMLWidget( TQStringList* stylesheetURLs, TQWidget* parent, const ch m_process( NULL ), m_stylesheetURLs( stylesheetURLs ), m_zoomFactor( 100 ) -{ m_htmlPart = new KHTMLPart( this, "html part" ); +{ m_htmlPart = new TDEHTMLPart( this, "html part" ); m_htmlPart->setOnlyLocalReferences( true ); } diff --git a/src/htmlwidget.h b/src/htmlwidget.h index be0b5cc..ba57b0f 100644 --- a/src/htmlwidget.h +++ b/src/htmlwidget.h @@ -35,7 +35,7 @@ // forward class definitions // ========================= -class KHTMLPart; +class TDEHTMLPart; class TDEProcess; class StylesheetDialog; @@ -82,7 +82,7 @@ class HTMLWidget : public TQWidget StylesheetDialog* m_dlg; TQString m_htmlData; - KHTMLPart* m_htmlPart; + TDEHTMLPart* m_htmlPart; TQString m_manPageData; TQString m_manPagePath; TDEProcess* m_process; diff --git a/src/indexwidget.cpp b/src/indexwidget.cpp index 023867e..c223186 100644 --- a/src/indexwidget.cpp +++ b/src/indexwidget.cpp @@ -26,11 +26,11 @@ #include #include -#include +#include #include #include #include -#include +#include #include #include diff --git a/src/knmap.cpp b/src/knmap.cpp index 32c1f13..aa3dda5 100644 --- a/src/knmap.cpp +++ b/src/knmap.cpp @@ -23,18 +23,18 @@ #include #include -#include -#include +#include +#include #include #include #include -#include -#include +#include +#include #include #include #include #include -#include +#include #include #include #include @@ -93,7 +93,7 @@ void Knmap::createMenu( ) SLOT( slotFileSaveAs( )), actionCollection( )); - m_settingsManAction = new KAction( i18n( "&Use local man page" ), + m_settingsManAction = new TDEAction( i18n( "&Use local man page" ), "localman.png", 0, m_mainWidget, @@ -101,7 +101,7 @@ void Knmap::createMenu( ) actionCollection( ), "settings_local" ); - m_useTargetHostAction = new KToggleAction( i18n( "Use target host name" ), + m_useTargetHostAction = new TDEToggleAction( i18n( "Use target host name" ), NULL, 0, m_mainWidget, @@ -109,7 +109,7 @@ void Knmap::createMenu( ) actionCollection( ), "scan_use" ); - m_wrapTextAction = new KToggleAction( i18n( "Wrap text" ), + m_wrapTextAction = new TDEToggleAction( i18n( "Wrap text" ), NULL, 0, m_mainWidget, @@ -117,7 +117,7 @@ void Knmap::createMenu( ) actionCollection( ), "settings_wrap_text" ); - new KAction( i18n( "Close scan" ), + new TDEAction( i18n( "Close scan" ), "scanclose", CTRL+Key_W, m_mainWidget, @@ -125,7 +125,7 @@ void Knmap::createMenu( ) actionCollection( ), "scan_close" ); - new KAction( i18n( "Copy profile..." ), + new TDEAction( i18n( "Copy profile..." ), "profilecopy", 0, m_mainWidget, @@ -133,7 +133,7 @@ void Knmap::createMenu( ) actionCollection( ), "profile_copy" ); - new KAction( i18n( "Delete profile..." ), + new TDEAction( i18n( "Delete profile..." ), "profiledelete", 0, m_mainWidget, @@ -141,7 +141,7 @@ void Knmap::createMenu( ) actionCollection( ), "profile_delete" ); - new KAction( i18n( "Display nmap man page" ), + new TDEAction( i18n( "Display nmap man page" ), "manpage", 0, m_mainWidget, @@ -149,7 +149,7 @@ void Knmap::createMenu( ) actionCollection( ), "help_man_page" ); - new KAction( i18n( "Duplicate scan" ), + new TDEAction( i18n( "Duplicate scan" ), "scanduplicate", CTRL+Key_C, m_mainWidget, @@ -157,7 +157,7 @@ void Knmap::createMenu( ) actionCollection( ), "scan_duplicate" ); - new KAction( i18n( "Load profile..." ), + new TDEAction( i18n( "Load profile..." ), "profileload", 0, m_mainWidget, @@ -165,7 +165,7 @@ void Knmap::createMenu( ) actionCollection( ), "profile_load" ); - new KAction( i18n( "man page stylesheet..." ), + new TDEAction( i18n( "man page stylesheet..." ), "manstylesheet", 0, m_mainWidget, @@ -173,7 +173,7 @@ void Knmap::createMenu( ) actionCollection( ), "settings_stylesheet" ); - new KAction( i18n( "New scan..." ), + new TDEAction( i18n( "New scan..." ), "scannew", CTRL+Key_N, m_mainWidget, @@ -181,7 +181,7 @@ void Knmap::createMenu( ) actionCollection( ), "scan_new" ); - new KAction( i18n( "Rename profile..." ), + new TDEAction( i18n( "Rename profile..." ), "profilerename", 0, m_mainWidget, @@ -189,7 +189,7 @@ void Knmap::createMenu( ) actionCollection( ), "profile_rename" ); - new KAction( i18n( "Rename scan..." ), + new TDEAction( i18n( "Rename scan..." ), "scanrename", Key_F2, m_mainWidget, @@ -197,7 +197,7 @@ void Knmap::createMenu( ) actionCollection( ), "scan_rename" ); - new KAction( i18n( "Save profile..." ), + new TDEAction( i18n( "Save profile..." ), "profilesave", 0, m_mainWidget, @@ -205,7 +205,7 @@ void Knmap::createMenu( ) actionCollection( ), "profile_save" ); - new KAction( i18n( "Save profile as..." ), + new TDEAction( i18n( "Save profile as..." ), "profilesaveas", 0, m_mainWidget, @@ -213,7 +213,7 @@ void Knmap::createMenu( ) actionCollection( ), "profile_save_as" ); - new KAction( i18n( "Zoom custom" ), + new TDEAction( i18n( "Zoom custom" ), "zoomcustom", 0, m_mainWidget, @@ -221,7 +221,7 @@ void Knmap::createMenu( ) actionCollection( ), "settings_zoom_custom" ); - new KAction( i18n( "Zoom in" ), + new TDEAction( i18n( "Zoom in" ), "zoomin", 0, m_mainWidget, @@ -229,7 +229,7 @@ void Knmap::createMenu( ) actionCollection( ), "settings_zoom_in" ); - new KAction( i18n( "Zoom out" ), + new TDEAction( i18n( "Zoom out" ), "zoomout", 0, m_mainWidget, @@ -255,7 +255,7 @@ void Knmap::createMenu( ) // ======== void Knmap::findNmap( ) -{ TQString nmapPath = KStandardDirs::findExe( "nmap" ); +{ TQString nmapPath = TDEStandardDirs::findExe( "nmap" ); if( nmapPath.isEmpty( )) { KMessageBox::error( this, diff --git a/src/knmap.desktop b/src/knmap.desktop index 38949f4..33bb39c 100644 --- a/src/knmap.desktop +++ b/src/knmap.desktop @@ -39,4 +39,4 @@ Comment[xx]=xxA simple KDE Applicationxx Comment[zh_CN]=一个简单的 KDE 应用程序 GenericName=nmap Graphical User Interface GenericName[fr]=Interface Graphique pour nmap -Categories=Qt;KDE;Utility +Categories=Qt;TDE;Utility diff --git a/src/knmap.h b/src/knmap.h index 87dfa48..67bbd39 100644 --- a/src/knmap.h +++ b/src/knmap.h @@ -34,8 +34,8 @@ // forward class definitions // ========================= -class KAction; -class KToggleAction; +class TDEAction; +class TDEToggleAction; class MainWidget; class ScanWidget; @@ -70,12 +70,12 @@ class Knmap : public TDEMainWindow void saveSettings( ); void switchManPages( ); - KAction* m_fileSaveAction; - KAction* m_fileSaveAsAction; + TDEAction* m_fileSaveAction; + TDEAction* m_fileSaveAsAction; MainWidget* m_mainWidget; - KAction* m_settingsManAction; - KToggleAction* m_useTargetHostAction; - KToggleAction* m_wrapTextAction; + TDEAction* m_settingsManAction; + TDEToggleAction* m_useTargetHostAction; + TDEToggleAction* m_wrapTextAction; }; #endif // _KNMAP_H_ diff --git a/src/loggingoptions.cpp b/src/loggingoptions.cpp index e525a19..75a2b9c 100644 --- a/src/loggingoptions.cpp +++ b/src/loggingoptions.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include "knmap.h" #include "loggingoptions.h" diff --git a/src/main.cpp b/src/main.cpp index 4d60369..5485aa1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -21,7 +21,7 @@ ***************************************************************************/ #include -#include +#include #include #include #include @@ -30,7 +30,7 @@ #include "knmap.h" static const char description[] = I18N_NOOP( "A KDE frontend for nmap" ); -static TDECmdLineOptions options[] = { KCmdLineLastOption }; +static TDECmdLineOptions options[] = { TDECmdLineLastOption }; // main // ==== @@ -61,7 +61,7 @@ int main( int argc, string argv[]) "http://informatics.cdu.edu.au/staff/kgilbert" ); TDECmdLineArgs::init( argc, argv, &about ); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app; + TDEApplication app; if( app.isRestored( )) { RESTORE( Knmap ); diff --git a/src/mainwidget.cpp b/src/mainwidget.cpp index 17756aa..6f235e2 100644 --- a/src/mainwidget.cpp +++ b/src/mainwidget.cpp @@ -22,12 +22,12 @@ #include -#include +#include #include #include #include #include -#include +#include #include "htmlwidget.h" #include "indexwidget.h" diff --git a/src/outputwidget.cpp b/src/outputwidget.cpp index 852a1ff..3fe0d02 100644 --- a/src/outputwidget.cpp +++ b/src/outputwidget.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include "knmap.h" #include "outputwidget.h" diff --git a/src/pandsoptions.cpp b/src/pandsoptions.cpp index 9d0e66c..5b663b6 100644 --- a/src/pandsoptions.cpp +++ b/src/pandsoptions.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include "pandsoptions.h" #include "whatsthis.h" diff --git a/src/profiledialog.cpp b/src/profiledialog.cpp index c6c8ef7..40eb2dd 100644 --- a/src/profiledialog.cpp +++ b/src/profiledialog.cpp @@ -27,12 +27,12 @@ #include #include -#include +#include #include #include #include #include -#include +#include #include "profiledialog.h" diff --git a/src/scannamedialog.cpp b/src/scannamedialog.cpp index 2139ac5..1af3d80 100644 --- a/src/scannamedialog.cpp +++ b/src/scannamedialog.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include "scannamedialog.h" #include "scanwidget.h" diff --git a/src/scanwidget.cpp b/src/scanwidget.cpp index b9ca7c6..7f8c382 100644 --- a/src/scanwidget.cpp +++ b/src/scanwidget.cpp @@ -34,11 +34,11 @@ #include #include -#include +#include #include #include #include -#include +#include #include #include #include @@ -120,7 +120,7 @@ ScanWidget::~ScanWidget( ) TQStringList ScanWidget::buildNmapOptionsList( ) { TQStringList nmapOptions; - nmapOptions << KStandardDirs::findExe ( "nmap" ); + nmapOptions << TDEStandardDirs::findExe ( "nmap" ); if( m_commonWidget->resovleAlwaysState( )) nmapOptions << "-R"; @@ -509,7 +509,7 @@ bool ScanWidget::createPipes( ) { ASSERT( m_pipeStderr == NULL ); ASSERT( m_pipeStdout == NULL ); - KStandardDirs standardDirs; + TDEStandardDirs standardDirs; TQStringList tempDir = standardDirs.resourceDirs( "tmp" ); if( tempDir.isEmpty( )) @@ -969,7 +969,7 @@ void ScanWidget::slotStartClicked( ) nmapOptions << "2>"; nmapOptions << m_pipeStderr->name( ); - *m_nmapProcess << "kdesu"; + *m_nmapProcess << "tdesu"; *m_nmapProcess << "-n"; *m_nmapProcess << nmapOptions.join( " " ); } diff --git a/src/stylesheetdialog.cpp b/src/stylesheetdialog.cpp index 99795ca..f2b49b4 100644 --- a/src/stylesheetdialog.cpp +++ b/src/stylesheetdialog.cpp @@ -30,11 +30,11 @@ #include #include -#include -#include +#include +#include #include #include -#include +#include #include "stylesheetdialog.h" diff --git a/src/timingwidget.cpp b/src/timingwidget.cpp index 79e6cb6..3defb03 100644 --- a/src/timingwidget.cpp +++ b/src/timingwidget.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include "timingwidget.h" #include "whatsthis.h"