diff options
44 files changed, 357 insertions, 357 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 71b1eeb..8a32f46 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -23,8 +23,8 @@ dnl IMPORTANT NOTE: dnl Please do not modify this file unless you expect your modifications to be dnl carried into every other module in the repository. dnl -dnl Single-module modifications are best placed in configure.in for kdelibs -dnl and kdebase or configure.in.in if present. +dnl Single-module modifications are best placed in configure.in for tdelibs +dnl and tdebase or configure.in.in if present. # KDE_PATH_X_DIRECT dnl Internal subroutine of AC_PATH_X. @@ -103,41 +103,41 @@ ac_x_libraries=], [LIBS="$ac_save_LIBS" # First see if replacing the include by lib works. # Check X11 before X11Rn because it is often a symlink to the current release. -for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \ - /usr/X11/lib${kdelibsuff} \ - /usr/X11R6/lib${kdelibsuff} \ - /usr/X11R5/lib${kdelibsuff} \ - /usr/X11R4/lib${kdelibsuff} \ +for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \ + /usr/X11/lib${tdelibsuff} \ + /usr/X11R6/lib${tdelibsuff} \ + /usr/X11R5/lib${tdelibsuff} \ + /usr/X11R4/lib${tdelibsuff} \ \ - /usr/lib${kdelibsuff}/X11 \ - /usr/lib${kdelibsuff}/X11R6 \ - /usr/lib${kdelibsuff}/X11R5 \ - /usr/lib${kdelibsuff}/X11R4 \ + /usr/lib${tdelibsuff}/X11 \ + /usr/lib${tdelibsuff}/X11R6 \ + /usr/lib${tdelibsuff}/X11R5 \ + /usr/lib${tdelibsuff}/X11R4 \ \ - /usr/local/X11/lib${kdelibsuff} \ - /usr/local/X11R6/lib${kdelibsuff} \ - /usr/local/X11R5/lib${kdelibsuff} \ - /usr/local/X11R4/lib${kdelibsuff} \ + /usr/local/X11/lib${tdelibsuff} \ + /usr/local/X11R6/lib${tdelibsuff} \ + /usr/local/X11R5/lib${tdelibsuff} \ + /usr/local/X11R4/lib${tdelibsuff} \ \ - /usr/local/lib${kdelibsuff}/X11 \ - /usr/local/lib${kdelibsuff}/X11R6 \ - /usr/local/lib${kdelibsuff}/X11R5 \ - /usr/local/lib${kdelibsuff}/X11R4 \ + /usr/local/lib${tdelibsuff}/X11 \ + /usr/local/lib${tdelibsuff}/X11R6 \ + /usr/local/lib${tdelibsuff}/X11R5 \ + /usr/local/lib${tdelibsuff}/X11R4 \ \ - /usr/X386/lib${kdelibsuff} \ - /usr/x386/lib${kdelibsuff} \ - /usr/XFree86/lib${kdelibsuff}/X11 \ + /usr/X386/lib${tdelibsuff} \ + /usr/x386/lib${tdelibsuff} \ + /usr/XFree86/lib${tdelibsuff}/X11 \ \ - /usr/lib${kdelibsuff} \ - /usr/local/lib${kdelibsuff} \ - /usr/unsupported/lib${kdelibsuff} \ - /usr/athena/lib${kdelibsuff} \ - /usr/local/x11r5/lib${kdelibsuff} \ - /usr/lpp/Xamples/lib${kdelibsuff} \ - /lib/usr/lib${kdelibsuff}/X11 \ + /usr/lib${tdelibsuff} \ + /usr/local/lib${tdelibsuff} \ + /usr/unsupported/lib${tdelibsuff} \ + /usr/athena/lib${tdelibsuff} \ + /usr/local/x11r5/lib${tdelibsuff} \ + /usr/lpp/Xamples/lib${tdelibsuff} \ + /lib/usr/lib${tdelibsuff}/X11 \ \ - /usr/openwin/lib${kdelibsuff} \ - /usr/openwin/share/lib${kdelibsuff} \ + /usr/openwin/lib${tdelibsuff} \ + /usr/openwin/share/lib${tdelibsuff} \ ; \ do dnl Don't even attempt the hair of trying to link an X program! @@ -371,24 +371,24 @@ AC_DEFUN([KDE_1_CHECK_PATHS], fi AC_MSG_CHECKING([for KDE libraries installed]) -ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' +ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5' if AC_TRY_EVAL(ac_link) && test -s conftest; then AC_MSG_RESULT(yes) else AC_MSG_ERROR([your system fails at linking a small KDE application! Check, if your compiler is installed correctly and if you have used the -same compiler to compile Qt and kdelibs as you did use now. +same compiler to compile Qt and tdelibs as you did use now. For more details about this problem, look at the end of config.log.]) fi -if eval `KDEDIR= ./conftest 2>&5`; then +if eval `TDEDIR= ./conftest 2>&5`; then kde_result=done else kde_result=problems fi -KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log +TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log kde_have_all_paths=yes KDE_SET_PATHS($kde_result) @@ -547,11 +547,11 @@ Please check whether you installed aRts correctly or use AC_DEFUN([KDE_SET_DEFAULT_BINDIRS], [ kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" - test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" - if test -n "$KDEDIRS"; then + test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs" + if test -n "$TDEDIRS"; then kde_save_IFS=$IFS IFS=: - for dir in $KDEDIRS; do + for dir in $TDEDIRS; do kde_default_bindirs="$dir/bin $kde_default_bindirs " done IFS=$kde_save_IFS @@ -602,18 +602,18 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], fi if test -n "$kde32ornewer"; then - KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) + KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) fi if test -n "$kde33ornewer"; then - KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)]) + KDE_FIND_PATH(maketdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(maketdewidgets)]) AC_SUBST(MAKEKDEWIDGETS) fi KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share" - test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" + test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs" AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) if test "$KDE_XSL_STYLESHEET" = "NO"; then KDE_XSL_STYLESHEET="" @@ -710,7 +710,7 @@ AC_SUBST(kde_templatesdir) AC_SUBST(kde_servicesdir) AC_SUBST(kde_servicetypesdir) AC_SUBST(kde_moduledir) -AC_SUBST(kdeinitdir, '$(kde_moduledir)') +AC_SUBST(tdeinitdir, '$(kde_moduledir)') AC_SUBST(kde_styledir) AC_SUBST(kde_widgetdir) if test "$kde_qtver" = 1; then @@ -937,7 +937,7 @@ mips-sgi-irix6*) ac_x_includes="." fi if test -z "$ac_x_libraries"; then - ac_x_libraries="/usr/lib${kdelibsuff}" + ac_x_libraries="/usr/lib${tdelibsuff}" fi esac #from now on we use our own again @@ -1226,7 +1226,7 @@ if test $kde_qtver = 4; then kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4" fi if test $kde_qtver = 3; then - kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3 /usr/lib${kdelibsuff}/qt-3.3" + kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3 /usr/lib${tdelibsuff}/qt-3.3" if test -z "$PKG_CONFIG"; then AC_PATH_PROG(PKG_CONFIG, pkg-config, no) fi @@ -1426,7 +1426,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 ]) @@ -1475,7 +1475,7 @@ ac_qt_includes="$qt_incdir" qt_libdirs="" for dir in $kde_qt_dirs; do - qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir/lib $dir" + qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir/lib $dir" done if test -z "$PKG_CONFIG"; then AC_PATH_PROG(PKG_CONFIG, pkg-config, no) @@ -1668,11 +1668,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. ]) @@ -1809,16 +1809,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" @@ -1829,8 +1829,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail. So, check this please and use another prefix!]) fi -kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" -test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" +kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}" +test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) ac_kde_libraries="$kde_libdir" @@ -1848,7 +1848,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 @@ -1863,7 +1863,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" @@ -2003,20 +2003,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"); @@ -2054,7 +2054,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([ @@ -2088,48 +2088,48 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES], if test $kde_qtver = 3; then case $host in - *cygwin*) lib_kded="-lkdeinit_kded" ;; + *cygwin*) lib_kded="-ltdeinit_kded" ;; *) lib_kded="" ;; esac AC_SUBST(LIB_KDED, $lib_kded) - AC_SUBST(LIB_KDECORE, "-lkdecore") - AC_SUBST(LIB_KDEUI, "-lkdeui") - AC_SUBST(LIB_KIO, "-lkio") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") + AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_KABC, "-lkabc") - AC_SUBST(LIB_KHTML, "-lkhtml") - AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") - AC_SUBST(LIB_KDEPRINT, "-lkdeprint") - AC_SUBST(LIB_KUTILS, "-lkutils") - AC_SUBST(LIB_KDEPIM, "-lkdepim") - AC_SUBST(LIB_KIMPROXY, "-lkimproxy") + AC_SUBST(LIB_KABC, "-ltdeabc") + AC_SUBST(LIB_TDEHTML, "-ltdehtml") + AC_SUBST(LIB_KSPELL, "-ltdespell") + AC_SUBST(LIB_KPARTS, "-ltdeparts") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") + AC_SUBST(LIB_KUTILS, "-ltdeutils") + AC_SUBST(LIB_TDEPIM, "-ltdepim") + AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") - AC_SUBST(LIB_KDNSSD, "-lkdnssd") - AC_SUBST(LIB_KUNITTEST, "-lkunittest") + AC_SUBST(LIB_KDNSSD, "-ltdednssd") + AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") # these are for backward compatibility - AC_SUBST(LIB_KSYCOCA, "-lkio") - AC_SUBST(LIB_KFILE, "-lkio") + AC_SUBST(LIB_KSYCOCA, "-ltdeio") + AC_SUBST(LIB_KFILE, "-ltdeio") elif test $kde_qtver = 2; then - AC_SUBST(LIB_KDECORE, "-lkdecore") - AC_SUBST(LIB_KDEUI, "-lkdeui") - AC_SUBST(LIB_KIO, "-lkio") - AC_SUBST(LIB_KSYCOCA, "-lksycoca") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") + AC_SUBST(LIB_KIO, "-ltdeio") + AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") - AC_SUBST(LIB_KFILE, "-lkfile") + AC_SUBST(LIB_KFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_KHTML, "-lkhtml") - AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") - AC_SUBST(LIB_KDEPRINT, "-lkdeprint") + AC_SUBST(LIB_TDEHTML, "-ltdehtml") + AC_SUBST(LIB_KSPELL, "-ltdespell") + AC_SUBST(LIB_KPARTS, "-ltdeparts") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else - AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)") - AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)") - AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)") - AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)") - AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)") + AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") + AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") + AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") + AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) @@ -2194,7 +2194,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 @@ -2513,7 +2513,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 ]) @@ -2571,7 +2571,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 @@ -3514,7 +3514,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) @@ -3527,9 +3527,9 @@ AC_DEFUN([KDE_CHECK_LIB64], AC_ARG_ENABLE(libsuffix, AC_HELP_STRING([--enable-libsuffix], [/lib directory suffix (64,32,none,auto[=default])]), - kdelibsuff=$enableval, kdelibsuff="auto") + tdelibsuff=$enableval, tdelibsuff="auto") - if test "$kdelibsuff" = "auto"; then + if test "$tdelibsuff" = "auto"; then cat > conftest.c << EOF #include <stdio.h> @@ -3537,26 +3537,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 ]) @@ -3574,7 +3574,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 @@ -4581,7 +4581,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) @@ -4971,14 +4971,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 @@ -5003,25 +5003,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` @@ -5029,7 +5029,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 @@ -5115,15 +5115,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], @@ -5687,7 +5687,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 @@ -5707,7 +5707,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 @@ -5944,9 +5944,9 @@ dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page dnl also defines KSTUFF_PKG_ERRORS on error AC_DEFUN([KDE_PKG_CHECK_MODULES], [ - PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" if test "$prefix" != "$kde_libs_prefix"; then - PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" fi export PKG_CONFIG_PATH PKG_CHECK_MODULES([$1],[$2],[$3],[$4]) diff --git a/configure.in b/configure.in index 5ef79e1..b453ada 100644 --- a/configure.in +++ b/configure.in @@ -199,13 +199,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 @@ -17,7 +17,7 @@ Vendor: Johannes Sixt <j6t@kdbg.org> Packager: Ullrich von Bassewitz <uz@musoftware.de> Source: %{name}-%{version}.tar.gz URL: http://www.kdbg.org/ -Requires: kdelibs >= 2.0 +Requires: tdelibs >= 2.0 BuildRoot: /tmp/build-%{name}-%{version} %description @@ -33,17 +33,17 @@ rm -rf %{builddir} touch `find . -type f` %build -if [ -z "$KDEDIR" ]; then - export KDEDIR=%{prefix} +if [ -z "$TDEDIR" ]; then + export TDEDIR=%{prefix} fi CXXFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RPM_OPT_FLAGS" ./configure \ - --prefix=$KDEDIR + --prefix=$TDEDIR make %install -if [ -z "$KDEDIR" ]; then - export KDEDIR=%{prefix} +if [ -z "$TDEDIR" ]; then + export TDEDIR=%{prefix} fi rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install-strip @@ -56,7 +56,7 @@ find . -type f | sed -e 's,^\.,\%attr(-\,root\,root) ,' \ $RPM_BUILD_DIR/file.list.%{name} find . -type l | sed 's,^\.,\%attr(-\,root\,root) ,' >> \ $RPM_BUILD_DIR/file.list.%{name} -echo "%docdir $KDEDIR/share/doc/HTML" >> $RPM_BUILD_DIR/file.list.%{name} +echo "%docdir $TDEDIR/share/doc/HTML" >> $RPM_BUILD_DIR/file.list.%{name} %clean diff --git a/kdbg/Makefile.am b/kdbg/Makefile.am index 95887fb..bfa5696 100644 --- a/kdbg/Makefile.am +++ b/kdbg/Makefile.am @@ -40,7 +40,7 @@ kdbg_LDFLAGS = \ $(all_libraries) $(KDE_RPATH) # the libraries to link against. -kdbg_LDADD = $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) +kdbg_LDADD = $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) # this option you can leave out. Just, if you use "make dist", you need it noinst_HEADERS = \ @@ -84,7 +84,7 @@ rcdir = $(kde_datadir)/kdbg rc_DATA = kdbgui.rc # Make messages.po and move it to $(top_srcdir)/po. "make merge" there. -# the -x is for skipping messages already translated in kdelibs +# the -x is for skipping messages already translated in tdelibs # Messages are generated in the source directory so that file names # mentioned in the .pot file are not prefixed by $(srcdir). messages: diff --git a/kdbg/brkpt.cpp b/kdbg/brkpt.cpp index 50cf6c3..67a1ee8 100644 --- a/kdbg/brkpt.cpp +++ b/kdbg/brkpt.cpp @@ -4,8 +4,8 @@ * See the file COPYING in the toplevel directory of the source directory. */ -#include <kapplication.h> -#include <klocale.h> /* i18n */ +#include <tdeapplication.h> +#include <tdelocale.h> /* i18n */ #include <kiconloader.h> #include <ksimpleconfig.h> #include <ntqdialog.h> diff --git a/kdbg/dbgdriver.cpp b/kdbg/dbgdriver.cpp index dce4569..8ac7cd7 100644 --- a/kdbg/dbgdriver.cpp +++ b/kdbg/dbgdriver.cpp @@ -18,7 +18,7 @@ DebuggerDriver::DebuggerDriver() : - KProcess(), + TDEProcess(), m_state(DSidle), m_output(0), m_outputLen(0), @@ -36,10 +36,10 @@ DebuggerDriver::DebuggerDriver() : // m_promptLastChar and m_promptMinLen must also be set. // debugger process - connect(this, SIGNAL(receivedStdout(KProcess*,char*,int)), - SLOT(slotReceiveOutput(KProcess*,char*,int))); - connect(this, SIGNAL(wroteStdin(KProcess*)), SLOT(slotCommandRead(KProcess*))); - connect(this, SIGNAL(processExited(KProcess*)), SLOT(slotExited(KProcess*))); + connect(this, SIGNAL(receivedStdout(TDEProcess*,char*,int)), + SLOT(slotReceiveOutput(TDEProcess*,char*,int))); + connect(this, SIGNAL(wroteStdin(TDEProcess*)), SLOT(slotCommandRead(TDEProcess*))); + connect(this, SIGNAL(processExited(TDEProcess*)), SLOT(slotExited(TDEProcess*))); } DebuggerDriver::~DebuggerDriver() @@ -53,7 +53,7 @@ int DebuggerDriver::commSetupDoneC() { TRACE(__PRETTY_FUNCTION__); - if (!KProcess::commSetupDoneC()) + if (!TDEProcess::commSetupDoneC()) return 0; close(STDERR_FILENO); @@ -80,8 +80,8 @@ bool DebuggerDriver::startup(TQString cmdStr) *this << *i; } - if (!start(KProcess::NotifyOnExit, - KProcess::Communication(KProcess::Stdin|KProcess::Stdout))) { + if (!start(TDEProcess::NotifyOnExit, + TDEProcess::Communication(TDEProcess::Stdin|TDEProcess::Stdout))) { return false; } @@ -102,7 +102,7 @@ bool DebuggerDriver::startup(TQString cmdStr) return true; } -void DebuggerDriver::slotExited(KProcess*) +void DebuggerDriver::slotExited(TDEProcess*) { static const char txt[] = "\n====== debugger exited ======\n"; if (m_logFile.isOpen()) { @@ -256,7 +256,7 @@ void DebuggerDriver::flushCommands(bool hipriOnly) } } -void DebuggerDriver::slotCommandRead(KProcess*) +void DebuggerDriver::slotCommandRead(TDEProcess*) { TRACE(__PRETTY_FUNCTION__); @@ -288,7 +288,7 @@ void DebuggerDriver::slotCommandRead(KProcess*) } } -void DebuggerDriver::slotReceiveOutput(KProcess*, char* buffer, int buflen) +void DebuggerDriver::slotReceiveOutput(TDEProcess*, char* buffer, int buflen) { /* * The debugger should be running (processing a command) at this point. diff --git a/kdbg/dbgdriver.h b/kdbg/dbgdriver.h index dbc1d49..0d33300 100644 --- a/kdbg/dbgdriver.h +++ b/kdbg/dbgdriver.h @@ -270,7 +270,7 @@ struct MemoryDump * interface to the commandline debugger. As such it implements the * commands and parses the output. */ -class DebuggerDriver : public KProcess +class DebuggerDriver : public TDEProcess { Q_OBJECT public: @@ -578,9 +578,9 @@ public slots: void dequeueCmdByVar(VarTree* var); protected slots: - virtual void slotReceiveOutput(KProcess*, char* buffer, int buflen); - virtual void slotCommandRead(KProcess*); - virtual void slotExited(KProcess*); + virtual void slotReceiveOutput(TDEProcess*, char* buffer, int buflen); + virtual void slotCommandRead(TDEProcess*); + virtual void slotExited(TDEProcess*); signals: /** diff --git a/kdbg/dbgmainwnd.cpp b/kdbg/dbgmainwnd.cpp index f5bc457..d1a3ab1 100644 --- a/kdbg/dbgmainwnd.cpp +++ b/kdbg/dbgmainwnd.cpp @@ -4,21 +4,21 @@ * See the file COPYING in the toplevel directory of the source directory. */ -#include <kapplication.h> -#include <klocale.h> /* i18n */ -#include <kmessagebox.h> -#include <kconfig.h> +#include <tdeapplication.h> +#include <tdelocale.h> /* i18n */ +#include <tdemessagebox.h> +#include <tdeconfig.h> #include <kstatusbar.h> #include <kiconloader.h> -#include <kstdaccel.h> +#include <tdestdaccel.h> #include <kstdaction.h> -#include <kaction.h> -#include <kpopupmenu.h> -#include <kfiledialog.h> +#include <tdeaction.h> +#include <tdepopupmenu.h> +#include <tdefiledialog.h> #include <kprocess.h> #include <kkeydialog.h> #include <kanimwidget.h> -#include <kwin.h> +#include <twin.h> #include <ntqlistbox.h> #include <ntqfileinfo.h> #include "dbgmainwnd.h" @@ -131,10 +131,10 @@ DebuggerMainWnd::DebuggerMainWnd(const char* name) : connect(m_debugger, SIGNAL(memoryDumpChanged(const TQString&, const std::list<MemoryDump>&)), m_memoryWindow, SLOT(slotNewMemoryDump(const TQString&, const std::list<MemoryDump>&))); - connect(m_debugger, SIGNAL(saveProgramSpecific(KConfigBase*)), - m_memoryWindow, SLOT(saveProgramSpecific(KConfigBase*))); - connect(m_debugger, SIGNAL(restoreProgramSpecific(KConfigBase*)), - m_memoryWindow, SLOT(restoreProgramSpecific(KConfigBase*))); + connect(m_debugger, SIGNAL(saveProgramSpecific(TDEConfigBase*)), + m_memoryWindow, SLOT(saveProgramSpecific(TDEConfigBase*))); + connect(m_debugger, SIGNAL(restoreProgramSpecific(TDEConfigBase*)), + m_memoryWindow, SLOT(restoreProgramSpecific(TDEConfigBase*))); // thread window connect(m_debugger, SIGNAL(threadsChanged(const std::list<ThreadInfo>&)), @@ -176,35 +176,35 @@ DebuggerMainWnd::~DebuggerMainWnd() void DebuggerMainWnd::initKAction() { // file menu - KAction* open = KStdAction::open(this, SLOT(slotFileOpen()), + TDEAction* open = KStdAction::open(this, SLOT(slotFileOpen()), actionCollection()); open->setText(i18n("&Open Source...")); KStdAction::close(m_filesWindow, SLOT(slotClose()), actionCollection()); - (void)new KAction(i18n("&Reload Source"), "reload", 0, m_filesWindow, + (void)new TDEAction(i18n("&Reload Source"), "reload", 0, m_filesWindow, SLOT(slotFileReload()), actionCollection(), "file_reload"); - (void)new KAction(i18n("&Executable..."), "execopen", 0, this, + (void)new TDEAction(i18n("&Executable..."), "execopen", 0, this, SLOT(slotFileExe()), actionCollection(), "file_executable"); - m_recentExecAction = new KRecentFilesAction(i18n("Recent E&xecutables"), 0, + m_recentExecAction = new TDERecentFilesAction(i18n("Recent E&xecutables"), 0, this, SLOT(slotRecentExec(const KURL&)), actionCollection(), "file_executable_recent"); - (void)new KAction(i18n("&Core dump..."), 0, this, SLOT(slotFileCore()), + (void)new TDEAction(i18n("&Core dump..."), 0, this, SLOT(slotFileCore()), actionCollection(), "file_core_dump"); KStdAction::quit(kapp, SLOT(closeAllWindows()), actionCollection()); // settings menu - (void)new KAction(i18n("This &Program..."), 0, this, + (void)new TDEAction(i18n("This &Program..."), 0, this, SLOT(slotFileProgSettings()), actionCollection(), "settings_program"); - (void)new KAction(i18n("&Global Options..."), 0, this, + (void)new TDEAction(i18n("&Global Options..."), 0, this, SLOT(slotFileGlobalSettings()), actionCollection(), "settings_global"); KStdAction::keyBindings(this, SLOT(slotConfigureKeys()), actionCollection()); KStdAction::showStatusbar(this, SLOT(slotViewStatusbar()), actionCollection()); // view menu - (void)new KToggleAction(i18n("&Find"), "find", CTRL+Key_F, m_filesWindow, + (void)new TDEToggleAction(i18n("&Find"), "find", CTRL+Key_F, m_filesWindow, SLOT(slotViewFind()), actionCollection(), "view_find"); (void)KStdAction::findNext(m_filesWindow, SLOT(slotFindForward()), actionCollection(), "view_findnext"); @@ -223,80 +223,80 @@ void DebuggerMainWnd::initKAction() }; for (unsigned i = 0; i < sizeof(dw)/sizeof(dw[0]); i++) { KDockWidget* d = dockParent(dw[i].w); - (void)new KToggleAction(dw[i].text, 0, d, SLOT(changeHideShowState()), + (void)new TDEToggleAction(dw[i].text, 0, d, SLOT(changeHideShowState()), actionCollection(), dw[i].id); } // execution menu - KAction* a = new KAction(i18n("&Run"), "pgmrun", Key_F5, m_debugger, + TDEAction* a = new TDEAction(i18n("&Run"), "pgmrun", Key_F5, m_debugger, SLOT(programRun()), actionCollection(), "exec_run"); connect(a, SIGNAL(activated()), this, SLOT(intoBackground())); - a = new KAction(i18n("Step &into"), "pgmstep", Key_F8, m_debugger, + a = new TDEAction(i18n("Step &into"), "pgmstep", Key_F8, m_debugger, SLOT(programStep()), actionCollection(), "exec_step_into"); connect(a, SIGNAL(activated()), this, SLOT(intoBackground())); - a = new KAction(i18n("Step &over"), "pgmnext", Key_F10, m_debugger, + a = new TDEAction(i18n("Step &over"), "pgmnext", Key_F10, m_debugger, SLOT(programNext()), actionCollection(), "exec_step_over"); connect(a, SIGNAL(activated()), this, SLOT(intoBackground())); - a = new KAction(i18n("Step o&ut"), "pgmfinish", Key_F6, m_debugger, + a = new TDEAction(i18n("Step o&ut"), "pgmfinish", Key_F6, m_debugger, SLOT(programFinish()), actionCollection(), "exec_step_out"); connect(a, SIGNAL(activated()), this, SLOT(intoBackground())); - a = new KAction(i18n("Run to &cursor"), Key_F7, this, + a = new TDEAction(i18n("Run to &cursor"), Key_F7, this, SLOT(slotExecUntil()), actionCollection(), "exec_run_to_cursor"); connect(a, SIGNAL(activated()), this, SLOT(intoBackground())); - a = new KAction(i18n("Step i&nto by instruction"), "pgmstepi", + a = new TDEAction(i18n("Step i&nto by instruction"), "pgmstepi", SHIFT+Key_F8, m_debugger, SLOT(programStepi()), actionCollection(), "exec_step_into_by_insn"); connect(a, SIGNAL(activated()), this, SLOT(intoBackground())); - a = new KAction(i18n("Step o&ver by instruction"), "pgmnexti", + a = new TDEAction(i18n("Step o&ver by instruction"), "pgmnexti", SHIFT+Key_F10, m_debugger, SLOT(programNexti()), actionCollection(), "exec_step_over_by_insn"); connect(a, SIGNAL(activated()), this, SLOT(intoBackground())); - (void)new KAction(i18n("&Program counter to current line"), 0, + (void)new TDEAction(i18n("&Program counter to current line"), 0, m_filesWindow, SLOT(slotMoveProgramCounter()), actionCollection(), "exec_movepc"); - (void)new KAction(i18n("&Break"), 0, m_debugger, + (void)new TDEAction(i18n("&Break"), 0, m_debugger, SLOT(programBreak()), actionCollection(), "exec_break"); - (void)new KAction(i18n("&Kill"), 0, m_debugger, + (void)new TDEAction(i18n("&Kill"), 0, m_debugger, SLOT(programKill()), actionCollection(), "exec_kill"); - (void)new KAction(i18n("Re&start"), 0, m_debugger, + (void)new TDEAction(i18n("Re&start"), 0, m_debugger, SLOT(programRunAgain()), actionCollection(), "exec_restart"); - (void)new KAction(i18n("A&ttach..."), 0, this, + (void)new TDEAction(i18n("A&ttach..."), 0, this, SLOT(slotExecAttach()), actionCollection(), "exec_attach"); - (void)new KAction(i18n("&Arguments..."), 0, this, + (void)new TDEAction(i18n("&Arguments..."), 0, this, SLOT(slotExecArgs()), actionCollection(), "exec_arguments"); // breakpoint menu - (void)new KAction(i18n("Set/Clear &breakpoint"), "brkpt", Key_F9, + (void)new TDEAction(i18n("Set/Clear &breakpoint"), "brkpt", Key_F9, m_filesWindow, SLOT(slotBrkptSet()), actionCollection(), "breakpoint_set"); - (void)new KAction(i18n("Set &temporary breakpoint"), SHIFT+Key_F9, + (void)new TDEAction(i18n("Set &temporary breakpoint"), SHIFT+Key_F9, m_filesWindow, SLOT(slotBrkptSetTemp()), actionCollection(), "breakpoint_set_temporary"); - (void)new KAction(i18n("&Enable/Disable breakpoint"), CTRL+Key_F9, + (void)new TDEAction(i18n("&Enable/Disable breakpoint"), CTRL+Key_F9, m_filesWindow, SLOT(slotBrkptEnable()), actionCollection(), "breakpoint_enable"); // only in popup menus - (void)new KAction(i18n("Watch Expression"), 0, this, + (void)new TDEAction(i18n("Watch Expression"), 0, this, SLOT(slotLocalsToWatch()), actionCollection(), "watch_expression"); - (void)new KAction(i18n("Edit Value"), Key_F2, this, + (void)new TDEAction(i18n("Edit Value"), Key_F2, this, SLOT(slotEditValue()), actionCollection(), "edit_value"); // all actions force an UI update - TQValueList<KAction*> actions = actionCollection()->actions(); - TQValueList<KAction*>::Iterator it = actions.begin(); + TQValueList<TDEAction*> actions = actionCollection()->actions(); + TQValueList<TDEAction*>::Iterator it = actions.begin(); for (; it != actions.end(); ++it) { connect(*it, SIGNAL(activated()), this, SLOT(updateUI())); } @@ -306,7 +306,7 @@ void DebuggerMainWnd::initKAction() void DebuggerMainWnd::initToolbar() { - KToolBar* toolbar = toolBar("mainToolBar"); + TDEToolBar* toolbar = toolBar("mainToolBar"); toolbar->insertAnimatedWidget(ID_STATUS_BUSY, actionCollection()->action("exec_break"), SLOT(activate()), "pulse", -1); @@ -333,7 +333,7 @@ bool DebuggerMainWnd::queryClose() // instance properties -void DebuggerMainWnd::saveProperties(KConfig* config) +void DebuggerMainWnd::saveProperties(TDEConfig* config) { // session management TQString executable = ""; @@ -343,7 +343,7 @@ void DebuggerMainWnd::saveProperties(KConfig* config) config->writeEntry("executable", executable); } -void DebuggerMainWnd::readProperties(KConfig* config) +void DebuggerMainWnd::readProperties(TDEConfig* config) { // session management TQString execName = config->readEntry("executable"); @@ -358,25 +358,25 @@ const char WindowGroup[] = "Windows"; const char RecentExecutables[] = "RecentExecutables"; const char LastSession[] = "LastSession"; -void DebuggerMainWnd::saveSettings(KConfig* config) +void DebuggerMainWnd::saveSettings(TDEConfig* config) { - KConfigGroupSaver g(config, WindowGroup); + TDEConfigGroupSaver g(config, WindowGroup); writeDockConfig(config); fixDockConfig(config, false); // downgrade m_recentExecAction->saveEntries(config, RecentExecutables); - KConfigGroupSaver g2(config, LastSession); + TDEConfigGroupSaver g2(config, LastSession); config->writeEntry("Width0Locals", m_localVariables->columnWidth(0)); config->writeEntry("Width0Watches", m_watches->columnWidth(0)); DebuggerMainWndBase::saveSettings(config); } -void DebuggerMainWnd::restoreSettings(KConfig* config) +void DebuggerMainWnd::restoreSettings(TDEConfig* config) { - KConfigGroupSaver g(config, WindowGroup); + TDEConfigGroupSaver g(config, WindowGroup); fixDockConfig(config, true); // upgrade readDockConfig(config); @@ -405,7 +405,7 @@ void DebuggerMainWnd::restoreSettings(KConfig* config) m_recentExecAction->loadEntries(config, RecentExecutables); - KConfigGroupSaver g2(config, LastSession); + TDEConfigGroupSaver g2(config, LastSession); int w; w = config->readNumEntry("Width0Locals", -1); if (w >= 0 && w < 30000) @@ -421,8 +421,8 @@ void DebuggerMainWnd::restoreSettings(KConfig* config) void DebuggerMainWnd::updateUI() { - KToggleAction* viewFind = - static_cast<KToggleAction*>(actionCollection()->action("view_find")); + TDEToggleAction* viewFind = + static_cast<TDEToggleAction*>(actionCollection()->action("view_find")); viewFind->setChecked(m_filesWindow->m_findDlg.isVisible()); viewFind->setEnabled(m_filesWindow->hasWindows()); actionCollection()->action("breakpoint_set")->setEnabled(m_debugger->canChangeBreakpoints()); @@ -484,8 +484,8 @@ void DebuggerMainWnd::updateUI() void DebuggerMainWnd::dockUpdateHelper(TQString action, TQWidget* w) { - KToggleAction* item = - static_cast<KToggleAction*>(actionCollection()->action(action)); + TDEToggleAction* item = + static_cast<TDEToggleAction*>(actionCollection()->action(action)); bool canChange = canChangeDockVisibility(w); item->setEnabled(canChange); item->setChecked(canChange && isDockVisible(w)); @@ -540,7 +540,7 @@ bool DebuggerMainWnd::canChangeDockVisibility(TQWidget* w) } // upgrades the entries from version 0.0.4 to 0.0.5 and back -void DebuggerMainWnd::fixDockConfig(KConfig* c, bool upgrade) +void DebuggerMainWnd::fixDockConfig(TDEConfig* c, bool upgrade) { static const char dockGroup[] = "dock_setting_default"; if (!c->hasGroup(dockGroup)) @@ -554,7 +554,7 @@ void DebuggerMainWnd::fixDockConfig(KConfig* c, bool upgrade) if (e["Version"] != from) return; - KConfigGroupSaver g(c, dockGroup); + TDEConfigGroupSaver g(c, dockGroup); c->writeEntry("Version", to); TRACE(upgrade ? "upgrading dockconfig" : "downgrading dockconfig"); @@ -656,7 +656,7 @@ TQString DebuggerMainWnd::createOutputWindow() { TQString tty = DebuggerMainWndBase::createOutputWindow(); if (!tty.isEmpty()) { - connect(m_outputTermProc, SIGNAL(processExited(KProcess*)), + connect(m_outputTermProc, SIGNAL(processExited(TDEProcess*)), SLOT(slotTermEmuExited())); } return tty; diff --git a/kdbg/dbgmainwnd.h b/kdbg/dbgmainwnd.h index fdd2753..b4e7697 100644 --- a/kdbg/dbgmainwnd.h +++ b/kdbg/dbgmainwnd.h @@ -12,7 +12,7 @@ #include "mainwndbase.h" #include "regwnd.h" -class KRecentFilesAction; +class TDERecentFilesAction; class WinStack; class TQListBox; class TQCString; @@ -33,11 +33,11 @@ public: protected: // session properties - virtual void saveProperties(KConfig*); - virtual void readProperties(KConfig*); + virtual void saveProperties(TDEConfig*); + virtual void readProperties(TDEConfig*); // settings - void saveSettings(KConfig*); - void restoreSettings(KConfig*); + void saveSettings(TDEConfig*); + void restoreSettings(TDEConfig*); void initToolbar(); void initKAction(); @@ -56,7 +56,7 @@ protected: TQTimer m_backTimer; // recent execs in File menu - KRecentFilesAction* m_recentExecAction; + TDERecentFilesAction* m_recentExecAction; protected: virtual bool queryClose(); @@ -67,7 +67,7 @@ protected: bool isDockVisible(TQWidget* w); bool canChangeDockVisibility(TQWidget* w); void dockUpdateHelper(TQString action, TQWidget* w); - void fixDockConfig(KConfig* c, bool upgrade); + void fixDockConfig(TDEConfig* c, bool upgrade); TQString makeSourceFilter(); diff --git a/kdbg/debugger.cpp b/kdbg/debugger.cpp index 8aaf0ef..5d0f517 100644 --- a/kdbg/debugger.cpp +++ b/kdbg/debugger.cpp @@ -15,10 +15,10 @@ #include <ntqfileinfo.h> #include <ntqlistbox.h> #include <ntqstringlist.h> -#include <kapplication.h> -#include <kconfig.h> -#include <klocale.h> /* i18n */ -#include <kmessagebox.h> +#include <tdeapplication.h> +#include <tdeconfig.h> +#include <tdelocale.h> /* i18n */ +#include <tdemessagebox.h> #include <ctype.h> #include <stdlib.h> /* strtol, atoi */ #ifdef HAVE_UNISTD_H @@ -73,11 +73,11 @@ KDebugger::~KDebugger() } -void KDebugger::saveSettings(KConfig* /*config*/) +void KDebugger::saveSettings(TDEConfig* /*config*/) { } -void KDebugger::restoreSettings(KConfig* /*config*/) +void KDebugger::restoreSettings(TDEConfig* /*config*/) { } @@ -113,10 +113,10 @@ bool KDebugger::debugProgram(const TQString& name, // wire up the driver connect(driver, SIGNAL(activateFileLine(const TQString&,int,const DbgAddr&)), this, SIGNAL(activateFileLine(const TQString&,int,const DbgAddr&))); - connect(driver, SIGNAL(processExited(KProcess*)), SLOT(gdbExited(KProcess*))); + connect(driver, SIGNAL(processExited(TDEProcess*)), SLOT(gdbExited(TDEProcess*))); connect(driver, SIGNAL(commandReceived(CmdQueueItem*,const char*)), SLOT(parse(CmdQueueItem*,const char*))); - connect(driver, SIGNAL(wroteStdin(KProcess*)), SIGNAL(updateUI())); + connect(driver, SIGNAL(wroteStdin(TDEProcess*)), SIGNAL(updateUI())); connect(driver, SIGNAL(inferiorRunning()), SLOT(slotInferiorRunning())); connect(driver, SIGNAL(enterIdleState()), SLOT(backgroundUpdate())); connect(driver, SIGNAL(enterIdleState()), SIGNAL(updateUI())); @@ -624,7 +624,7 @@ void KDebugger::stopDriver() } } -void KDebugger::gdbExited(KProcess*) +void KDebugger::gdbExited(TDEProcess*) { /* * Save settings, but only if gdb has already processed "info line @@ -1768,7 +1768,7 @@ void KDebugger::evalStructExpression(VarTree* var, ExprWnd* wnd, bool immediate) /* * This should not happen: the type libraries should be set up * in a way that this can't happen. If this happens - * nevertheless it means that, eg., kdecore was loaded but qt2 + * nevertheless it means that, eg., tdecore was loaded but qt2 * was not (only qt2 enables the TQString feature). */ // TODO: remove this "print"; queue the next printStruct instead diff --git a/kdbg/debugger.h b/kdbg/debugger.h index d2fc30c..f48c62e 100644 --- a/kdbg/debugger.h +++ b/kdbg/debugger.h @@ -22,8 +22,8 @@ class VarTree; struct ExprValue; class ProgramTypeTable; class KTreeViewItem; -class KConfig; -class KConfigBase; +class TDEConfig; +class TDEConfigBase; class ProgramConfig; class TQListBox; class RegisterInfo; @@ -34,7 +34,7 @@ class Breakpoint; struct DisassembledCode; struct MemoryDump; struct DbgAddr; -class KProcess; +class TDEProcess; class KDebugger : public TQObject @@ -333,8 +333,8 @@ public: void setMemoryFormat(unsigned format) { m_memoryFormat = format; } // settings - void saveSettings(KConfig*); - void restoreSettings(KConfig*); + void saveSettings(TDEConfig*); + void restoreSettings(TDEConfig*); protected: TQString m_inferiorTerminal; @@ -424,7 +424,7 @@ protected: TQString m_statusMessage; protected slots: - void gdbExited(KProcess*); + void gdbExited(TDEProcess*); void slotInferiorRunning(); void backgroundUpdate(); void gotoFrame(int); @@ -536,12 +536,12 @@ signals: /** * Gives other objects a chance to save program specific settings. */ - void saveProgramSpecific(KConfigBase* config); + void saveProgramSpecific(TDEConfigBase* config); /** * Gives other objects a chance to restore program specific settings. */ - void restoreProgramSpecific(KConfigBase* config); + void restoreProgramSpecific(TDEConfigBase* config); protected: ExprWnd& m_localVariables; diff --git a/kdbg/doc/en/types.html b/kdbg/doc/en/types.html index 8d57799..2538efe 100644 --- a/kdbg/doc/en/types.html +++ b/kdbg/doc/en/types.html @@ -16,8 +16,8 @@ The information which member variable is displayed is stored in <em>type tables</em>. There is generally one type table per shared library.</p> <p>KDbg's default type tables are located under <tt>$prefix/share/apps/kdbg/types</tt>. -User defined type tables can be placed in <tt>${KDEHOME}/share/apps/kdbg/types</tt>, where -<tt>${KDEHOME}</tt> is <tt>~/.kde</tt> if it is not a defined environment variable. +User defined type tables can be placed in <tt>${TDEHOME}/share/apps/kdbg/types</tt>, where +<tt>${TDEHOME}</tt> is <tt>~/.kde</tt> if it is not a defined environment variable. The file names end with <tt>.kdbgtt</tt>. Example: The type table for <tt>libqt.so</tt> is named <tt>qt.kdbgtt</tt>. User defined type tables override the type tables provided by the system.</p> diff --git a/kdbg/doc/ru/types.html b/kdbg/doc/ru/types.html index 7670d9d..2d29941 100644 --- a/kdbg/doc/ru/types.html +++ b/kdbg/doc/ru/types.html @@ -15,7 +15,7 @@ KDbg может отображать содержимое отдельно взятых членов структурированных типов переменная какого члена отображается, хранится в <i>таблицах типов</i>. Обычно существует одна таблица на разделяемую библиотеку. <p>Таблицы типов KDbg расположены в каталоге -<tt>$KDEDIR/share/apps/kdbg/types</tt>. Имена файло таблиц оканчиваются на +<tt>$TDEDIR/share/apps/kdbg/types</tt>. Имена файло таблиц оканчиваются на <tt>.kdbgtt</tt>. Например, таблица типов для <tt>libqt.so</tt> называется <tt>qt.kdbgtt</tt>. <p>Файлы таблиц типов соответствуют стандартному синтаксису файлов конфигурации diff --git a/kdbg/exprwnd.cpp b/kdbg/exprwnd.cpp index 49cb11f..f95457c 100644 --- a/kdbg/exprwnd.cpp +++ b/kdbg/exprwnd.cpp @@ -10,9 +10,9 @@ #include <ntqstringlist.h> #include <ntqpainter.h> #include <ntqscrollbar.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kiconloader.h> /* icons */ -#include <klocale.h> /* i18n */ +#include <tdelocale.h> /* i18n */ #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/kdbg/gdbdriver.cpp b/kdbg/gdbdriver.cpp index 4aab46d..e9c2f84 100644 --- a/kdbg/gdbdriver.cpp +++ b/kdbg/gdbdriver.cpp @@ -8,7 +8,7 @@ #include "exprwnd.h" #include <ntqregexp.h> #include <ntqstringlist.h> -#include <klocale.h> /* i18n */ +#include <tdelocale.h> /* i18n */ #include <ctype.h> #include <stdlib.h> /* strtol, atoi */ #include <string.h> /* strcpy */ diff --git a/kdbg/kdbg.desktop b/kdbg/kdbg.desktop index f80fb55..bcbbf23 100644 --- a/kdbg/kdbg.desktop +++ b/kdbg/kdbg.desktop @@ -39,4 +39,4 @@ Comment[sk]=Ladiaci program Comment[sl]=Odpravljanje napak v programih Comment[sv]=Avlusar program Terminal=false -Categories=Qt;KDE;Development;Debugger; +Categories=Qt;TDE;Development;Debugger; diff --git a/kdbg/main.cpp b/kdbg/main.cpp index 1e188f0..7668313 100644 --- a/kdbg/main.cpp +++ b/kdbg/main.cpp @@ -4,15 +4,15 @@ * See the file COPYING in the toplevel directory of the source directory. */ -#include <kapplication.h> -#include <klocale.h> /* i18n */ -#include <kmessagebox.h> -#include <kglobal.h> +#include <tdeapplication.h> +#include <tdelocale.h> /* i18n */ +#include <tdemessagebox.h> +#include <tdeglobal.h> #include <kstandarddirs.h> -#include <kcmdlineargs.h> -#include <kaboutdata.h> -#include <kpopupmenu.h> -#include <kmenubar.h> +#include <tdecmdlineargs.h> +#include <tdeaboutdata.h> +#include <tdepopupmenu.h> +#include <tdemenubar.h> #include "dbgmainwnd.h" #include "typetable.h" #ifdef HAVE_CONFIG_H @@ -33,10 +33,10 @@ int main(int argc, char** argv) { - KAboutData aboutData("kdbg", "KDbg", + TDEAboutData aboutData("kdbg", "KDbg", VERSION, I18N_NOOP("A Debugger"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, "(c) 1998-2010 Johannes Sixt", 0, /* any text */ "http://www.kdbg.org/", @@ -48,9 +48,9 @@ int main(int argc, char** argv) aboutData.addCredit("Daniel Kristjansson", I18N_NOOP("Register groups and formating"), "danielk@cat.nyu.edu"); - KCmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::init( argc, argv, &aboutData ); - static KCmdLineOptions options[] = { + static TDECmdLineOptions options[] = { { "t <file>", I18N_NOOP("transcript of conversation with the debugger"), 0 }, { "r <device>", I18N_NOOP("remote debugging via <device>"), 0 }, { "l <language>", I18N_NOOP("specify language: C, XSLT"), ""}, @@ -61,11 +61,11 @@ int main(int argc, char** argv) { "+[core]", I18N_NOOP("a core file to use"), 0}, { 0, 0, 0 } }; - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::addCmdLineOptions(options); - KApplication app; + TDEApplication app; - KGlobal::dirs()->addResourceType("types", "share/apps/kdbg/types"); + TDEGlobal::dirs()->addResourceType("types", "share/apps/kdbg/types"); DebuggerMainWnd* debugger = new DebuggerMainWnd("kdbg_main"); @@ -75,7 +75,7 @@ int main(int argc, char** argv) // session management bool restored = false; if (app.isRestored()) { - if (KMainWindow::canBeRestored(1)) { + if (TDEMainWindow::canBeRestored(1)) { debugger->restore(1); restored = true; } @@ -87,7 +87,7 @@ int main(int argc, char** argv) // handle options - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TQString transcript = args->getOption("t"); TQString remote = args->getOption("r"); if (!remote.isEmpty()) diff --git a/kdbg/mainwndbase.cpp b/kdbg/mainwndbase.cpp index 2c97c41..bed938e 100644 --- a/kdbg/mainwndbase.cpp +++ b/kdbg/mainwndbase.cpp @@ -4,12 +4,12 @@ * See the file COPYING in the toplevel directory of the source directory. */ -#include <kapplication.h> -#include <klocale.h> /* i18n */ -#include <kconfig.h> -#include <kmessagebox.h> +#include <tdeapplication.h> +#include <tdelocale.h> /* i18n */ +#include <tdeconfig.h> +#include <tdemessagebox.h> #include <kstatusbar.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <ntqtabdialog.h> #include <ntqfile.h> #include <ntqdragobject.h> @@ -207,13 +207,13 @@ const char SourceFileFilter[] = "SourceFileFilter"; const char HeaderFileFilter[] = "HeaderFileFilter"; const char GeneralGroup[] = "General"; -void DebuggerMainWndBase::saveSettings(KConfig* config) +void DebuggerMainWndBase::saveSettings(TDEConfig* config) { if (m_debugger != 0) { m_debugger->saveSettings(config); } - KConfigGroupSaver g(config, OutputWindowGroup); + TDEConfigGroupSaver g(config, OutputWindowGroup); config->writeEntry(TermCmdStr, m_outputTermCmdStr); config->setGroup(DebuggerGroup); @@ -227,13 +227,13 @@ void DebuggerMainWndBase::saveSettings(KConfig* config) config->writeEntry(HeaderFileFilter, m_headerFilter); } -void DebuggerMainWndBase::restoreSettings(KConfig* config) +void DebuggerMainWndBase::restoreSettings(TDEConfig* config) { if (m_debugger != 0) { m_debugger->restoreSettings(config); } - KConfigGroupSaver g(config, OutputWindowGroup); + TDEConfigGroupSaver g(config, OutputWindowGroup); /* * For debugging and emergency purposes, let the config file override * the shell script that is used to keep the output window open. This @@ -479,7 +479,7 @@ TQString DebuggerMainWndBase::createOutputWindow() } #endif - m_outputTermProc = new KProcess; + m_outputTermProc = new TDEProcess; { /* diff --git a/kdbg/mainwndbase.h b/kdbg/mainwndbase.h index df8023b..8dc919b 100644 --- a/kdbg/mainwndbase.h +++ b/kdbg/mainwndbase.h @@ -18,9 +18,9 @@ class KDebugger; class TTYWindow; class UpdateUI; -class KToolBar; +class TDEToolBar; class KStatusBar; -class KProcess; +class TDEProcess; class DebuggerDriver; class WatchWindow : public TQWidget @@ -98,8 +98,8 @@ public: protected: // settings - virtual void saveSettings(KConfig*); - virtual void restoreSettings(KConfig*); + virtual void saveSettings(TDEConfig*); + virtual void restoreSettings(TDEConfig*); // override must return the integrated output window virtual TTYWindow* ttyWindow() = 0; @@ -110,7 +110,7 @@ protected: // output window TQString m_outputTermCmdStr; TQString m_outputTermKeepScript; - KProcess* m_outputTermProc; + TDEProcess* m_outputTermProc; int m_ttyLevel; virtual TQString createOutputWindow(); /* returns terminal name */ void shutdownTermWindow(); diff --git a/kdbg/memwindow.cpp b/kdbg/memwindow.cpp index 287aca3..532a4da 100644 --- a/kdbg/memwindow.cpp +++ b/kdbg/memwindow.cpp @@ -6,8 +6,8 @@ #include "memwindow.h" #include <ntqheader.h> -#include <klocale.h> -#include <kconfigbase.h> +#include <tdelocale.h> +#include <tdeconfigbase.h> #include "debugger.h" @@ -240,9 +240,9 @@ static const char ExpressionFmt[] = "Expression%d"; static const char FormatFmt[] = "Format%d"; static const char ColumnWidths[] = "ColumnWidths"; -void MemoryWindow::saveProgramSpecific(KConfigBase* config) +void MemoryWindow::saveProgramSpecific(TDEConfigBase* config) { - KConfigGroupSaver s(config, MemoryGroup); + TDEConfigGroupSaver s(config, MemoryGroup); int numEntries = m_expression.count(); config->writeEntry(NumExprs, numEntries); @@ -270,9 +270,9 @@ void MemoryWindow::saveProgramSpecific(KConfigBase* config) config->writeEntry(ColumnWidths, widths); } -void MemoryWindow::restoreProgramSpecific(KConfigBase* config) +void MemoryWindow::restoreProgramSpecific(TDEConfigBase* config) { - KConfigGroupSaver s(config, MemoryGroup); + TDEConfigGroupSaver s(config, MemoryGroup); int numEntries = config->readNumEntry(NumExprs, 0); m_expression.clear(); diff --git a/kdbg/memwindow.h b/kdbg/memwindow.h index a9e9654..807b28b 100644 --- a/kdbg/memwindow.h +++ b/kdbg/memwindow.h @@ -15,7 +15,7 @@ #include "dbgdriver.h" class KDebugger; -class KConfigBase; +class TDEConfigBase; class MemoryWindow : public TQWidget { @@ -48,8 +48,8 @@ public slots: void slotNewExpression(const TQString&); void slotTypeChange(int id); void slotNewMemoryDump(const TQString&, const std::list<MemoryDump>&); - void saveProgramSpecific(KConfigBase* config); - void restoreProgramSpecific(KConfigBase* config); + void saveProgramSpecific(TDEConfigBase* config); + void restoreProgramSpecific(TDEConfigBase* config); }; #endif // MEMWINDOW_H diff --git a/kdbg/pgmargs.cpp b/kdbg/pgmargs.cpp index df2334a..d427ed6 100644 --- a/kdbg/pgmargs.cpp +++ b/kdbg/pgmargs.cpp @@ -10,9 +10,9 @@ #include <ntqlistview.h> #include <ntqlistbox.h> #include <ntqtabwidget.h> -#include <kapplication.h> -#include <kfiledialog.h> -#include <klocale.h> /* i18n */ +#include <tdeapplication.h> +#include <tdefiledialog.h> +#include <tdelocale.h> /* i18n */ #include "config.h" #include "mydebug.h" diff --git a/kdbg/pgmargsbase.cpp b/kdbg/pgmargsbase.cpp index dfcc0ad..fe2a71d 100644 --- a/kdbg/pgmargsbase.cpp +++ b/kdbg/pgmargsbase.cpp @@ -1,5 +1,5 @@ #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> /**************************************************************************** ** Form implementation generated from reading ui file '../../exper/kdbg/pgmargsbase.ui' ** diff --git a/kdbg/pgmsettings.cpp b/kdbg/pgmsettings.cpp index eed6859..6b328cd 100644 --- a/kdbg/pgmsettings.cpp +++ b/kdbg/pgmsettings.cpp @@ -5,8 +5,8 @@ */ #include "pgmsettings.h" -#include <klocale.h> /* i18n */ -#include <kapplication.h> +#include <tdelocale.h> /* i18n */ +#include <tdeapplication.h> #include <ntqfileinfo.h> #include <ntqlayout.h> #include <ntqlineedit.h> diff --git a/kdbg/prefdebugger.cpp b/kdbg/prefdebugger.cpp index e0a8349..f741e98 100644 --- a/kdbg/prefdebugger.cpp +++ b/kdbg/prefdebugger.cpp @@ -4,7 +4,7 @@ * See the file COPYING in the toplevel directory of the source directory. */ -#include <klocale.h> /* i18n */ +#include <tdelocale.h> /* i18n */ #include <ntqlayout.h> #include "prefdebugger.h" diff --git a/kdbg/prefmisc.cpp b/kdbg/prefmisc.cpp index b73c80b..57aee1a 100644 --- a/kdbg/prefmisc.cpp +++ b/kdbg/prefmisc.cpp @@ -5,7 +5,7 @@ */ #include "prefmisc.h" -#include <klocale.h> /* i18n */ +#include <tdelocale.h> /* i18n */ PrefMisc::PrefMisc(TQWidget* parent) : TQWidget(parent, "debugger"), diff --git a/kdbg/procattach.cpp b/kdbg/procattach.cpp index b3bf77f..5b082d1 100644 --- a/kdbg/procattach.cpp +++ b/kdbg/procattach.cpp @@ -10,9 +10,9 @@ #include <ntqlineedit.h> #include <kprocess.h> #include <ctype.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kiconloader.h> -#include <klocale.h> /* i18n */ +#include <tdelocale.h> /* i18n */ #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -23,10 +23,10 @@ ProcAttachPS::ProcAttachPS(TQWidget* parent) : m_pidCol(-1), m_ppidCol(-1) { - m_ps = new KProcess; - connect(m_ps, SIGNAL(receivedStdout(KProcess*, char*, int)), - this, SLOT(slotTextReceived(KProcess*, char*, int))); - connect(m_ps, SIGNAL(processExited(KProcess*)), + m_ps = new TDEProcess; + connect(m_ps, SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, SLOT(slotTextReceived(TDEProcess*, char*, int))); + connect(m_ps, SIGNAL(processExited(TDEProcess*)), this, SLOT(slotPSDone())); TQIconSet icon = SmallIconSet("clear_left"); @@ -66,10 +66,10 @@ void ProcAttachPS::runPS() m_pidCol = -1; m_ppidCol = -1; - m_ps->start(KProcess::NotifyOnExit, KProcess::Stdout); + m_ps->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout); } -void ProcAttachPS::slotTextReceived(KProcess*, char* buffer, int buflen) +void ProcAttachPS::slotTextReceived(TDEProcess*, char* buffer, int buflen) { const char* end = buffer+buflen; while (buffer < end) diff --git a/kdbg/procattach.h b/kdbg/procattach.h index ebf04df..068478b 100644 --- a/kdbg/procattach.h +++ b/kdbg/procattach.h @@ -16,7 +16,7 @@ #include <ntqlayout.h> -class KProcess; +class TDEProcess; /* * This is the full-featured version of the dialog. It is used when the @@ -39,14 +39,14 @@ protected: virtual void selectedChanged(); protected slots: - void slotTextReceived(KProcess* proc, char* buffer, int buflen); + void slotTextReceived(TDEProcess* proc, char* buffer, int buflen); void slotPSDone(); protected: void pushLine(); bool setVisibility(TQListViewItem* i, const TQString& text); - KProcess* m_ps; + TDEProcess* m_ps; // parse state int m_pidCol; //!< The PID column in the ps output int m_ppidCol; //!< The parent-PID column in the ps output diff --git a/kdbg/procattachbase.cpp b/kdbg/procattachbase.cpp index d3463db..7f45969 100644 --- a/kdbg/procattachbase.cpp +++ b/kdbg/procattachbase.cpp @@ -1,5 +1,5 @@ #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> /**************************************************************************** ** Form implementation generated from reading ui file '../../exper/kdbg/procattachbase.ui' ** diff --git a/kdbg/programconfig.cpp b/kdbg/programconfig.cpp index 2d1fb26..192f747 100644 --- a/kdbg/programconfig.cpp +++ b/kdbg/programconfig.cpp @@ -5,19 +5,19 @@ */ #include "programconfig.h" -#include <kconfigbackend.h> +#include <tdeconfigbackend.h> #include <ntqfile.h> #include <sys/stat.h> #include <unistd.h> -struct ProgramConfig::MyBackend : KConfigINIBackEnd +struct ProgramConfig::MyBackend : TDEConfigINIBackEnd { - MyBackend(KConfigBase* cfg, const TQString& fn) : - KConfigINIBackEnd(cfg, fn, "", false) + MyBackend(TDEConfigBase* cfg, const TQString& fn) : + TDEConfigINIBackEnd(cfg, fn, "", false) { } // need the following public - using KConfigINIBackEnd::parseSingleConfigFile; + using TDEConfigINIBackEnd::parseSingleConfigFile; }; ProgramConfig::ProgramConfig(const TQString& fileName) : diff --git a/kdbg/programconfig.h b/kdbg/programconfig.h index 2dbd002..35364c6 100644 --- a/kdbg/programconfig.h +++ b/kdbg/programconfig.h @@ -4,11 +4,11 @@ * See the file COPYING in the toplevel directory of the source directory. */ -#include <kconfigbase.h> +#include <tdeconfigbase.h> -class KConfigINIBackEnd; +class TDEConfigINIBackEnd; -class ProgramConfig : public KConfigBase +class ProgramConfig : public TDEConfigBase { public: ProgramConfig(const TQString &fileName); diff --git a/kdbg/regwnd.cpp b/kdbg/regwnd.cpp index 991d869..1ced083 100644 --- a/kdbg/regwnd.cpp +++ b/kdbg/regwnd.cpp @@ -5,8 +5,8 @@ */ #include <ntqheader.h> -#include <kglobalsettings.h> -#include <klocale.h> /* i18n */ +#include <tdeglobalsettings.h> +#include <tdelocale.h> /* i18n */ #include <kiconloader.h> #include <ntqfontdialog.h> #include <ntqmessagebox.h> @@ -418,7 +418,7 @@ RegisterView::RegisterView(TQWidget* parent, const char* name) : TQListView(parent, name) { setSorting(-1); - setFont(KGlobalSettings::fixedFont()); + setFont(TDEGlobalSettings::fixedFont()); TQPixmap iconRegs = UserIcon("regs.xpm"); TQPixmap iconWatchcoded = UserIcon("watchcoded.xpm"); @@ -606,7 +606,7 @@ void RegisterView::slotModeChange(int pcode) void RegisterView::paletteChange(const TQPalette& oldPal) { - setFont(KGlobalSettings::fixedFont()); + setFont(TDEGlobalSettings::fixedFont()); TQListView::paletteChange(oldPal); } diff --git a/kdbg/sourcewnd.cpp b/kdbg/sourcewnd.cpp index 87a6945..6fd1a29 100644 --- a/kdbg/sourcewnd.cpp +++ b/kdbg/sourcewnd.cpp @@ -13,10 +13,10 @@ #include <ntqfileinfo.h> #include <ntqkeycode.h> #include <ntqpopupmenu.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kiconloader.h> -#include <kglobalsettings.h> -#include <kmainwindow.h> +#include <tdeglobalsettings.h> +#include <tdemainwindow.h> #include <algorithm> #ifdef HAVE_CONFIG_H #include "config.h" @@ -40,7 +40,7 @@ SourceWindow::SourceWindow(const TQString& fileName, TQWidget* parent, const cha m_brktmp = UserIcon("brktmp"); m_brkcond = UserIcon("brkcond"); m_brkorph = UserIcon("brkorph"); - setFont(KGlobalSettings::fixedFont()); + setFont(TDEGlobalSettings::fixedFont()); setReadOnly(true); setMargins(m_widthItems+m_widthPlus+m_widthLineNo, 0, 0 ,0); setAutoFormatting(AutoNone); @@ -458,7 +458,7 @@ bool SourceWindow::wordAtPoint(const TQPoint& p, TQString& word, TQRect& r) void SourceWindow::paletteChange(const TQPalette& oldPal) { - setFont(KGlobalSettings::fixedFont()); + setFont(TDEGlobalSettings::fixedFont()); TQTextEdit::paletteChange(oldPal); } @@ -753,7 +753,7 @@ void SourceWindow::contextMenuEvent(TQContextMenuEvent* e) do top = top->parentWidget(); while (!top->isTopLevel()); - KMainWindow* mw = static_cast<KMainWindow*>(top); + TDEMainWindow* mw = static_cast<TDEMainWindow*>(top); TQPopupMenu* m = static_cast<TQPopupMenu*>(mw->factory()->container("popup_files", mw)); m->exec(e->globalPos()); diff --git a/kdbg/threadlist.cpp b/kdbg/threadlist.cpp index d2e4c35..5d03213 100644 --- a/kdbg/threadlist.cpp +++ b/kdbg/threadlist.cpp @@ -6,7 +6,7 @@ #include "threadlist.h" #include "dbgdriver.h" -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <ntqbitmap.h> #include <ntqpainter.h> diff --git a/kdbg/ttywnd.cpp b/kdbg/ttywnd.cpp index 9ed911c..48e39d2 100644 --- a/kdbg/ttywnd.cpp +++ b/kdbg/ttywnd.cpp @@ -7,8 +7,8 @@ #include <ntqsocketnotifier.h> #include <ntqpopupmenu.h> #include "ttywnd.h" -#include <kglobalsettings.h> -#include <klocale.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> #include "config.h" #ifdef HAVE_FCNTL_H @@ -143,7 +143,7 @@ TTYWindow::TTYWindow(TQWidget* parent, const char* name) : m_tty(0), m_hPos(0) { - setFont(KGlobalSettings::fixedFont()); + setFont(TDEGlobalSettings::fixedFont()); setReadOnly(true); setAutoFormatting(AutoNone); setTextFormat(PlainText); diff --git a/kdbg/typetable.cpp b/kdbg/typetable.cpp index e2d96a5..7c0c54e 100644 --- a/kdbg/typetable.cpp +++ b/kdbg/typetable.cpp @@ -6,7 +6,7 @@ #include <ntqdir.h> #include <ntqptrlist.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <ksimpleconfig.h> #include <list> @@ -40,7 +40,7 @@ void TypeTable::loadTypeTables() { typeTablesInited = true; - const TQStringList files = KGlobal::dirs()->findAllResources("types", "*.kdbgtt", + const TQStringList files = TDEGlobal::dirs()->findAllResources("types", "*.kdbgtt", false, true); if (files.isEmpty()) { @@ -150,7 +150,7 @@ void TypeTable::loadFromFile(const TQString& fileName) } // for all Types%d } -void TypeTable::readType(KConfigBase& cf, const TQString& type) +void TypeTable::readType(TDEConfigBase& cf, const TQString& type) { // the display string TQString expr = cf.readEntry(DisplayEntry); diff --git a/kdbg/typetable.h b/kdbg/typetable.h index 0696675..c58e55a 100644 --- a/kdbg/typetable.h +++ b/kdbg/typetable.h @@ -10,7 +10,7 @@ #include <ntqstringlist.h> #include <map> -class KConfigBase; +class TDEConfigBase; /** * The maximum number of sub-expressions that may appear in a single struct @@ -117,7 +117,7 @@ protected: */ static void loadTypeTables(); void loadFromFile(const TQString& fileName); - void readType(KConfigBase& cf, const TQString& type); + void readType(TDEConfigBase& cf, const TQString& type); TQDict<TypeInfo> m_typeDict; TQDict<TypeInfo> m_aliasDict; TypeMap m_templates; diff --git a/kdbg/typetables/Makefile.am b/kdbg/typetables/Makefile.am index 4b8c958..2cf3ca2 100644 --- a/kdbg/typetables/Makefile.am +++ b/kdbg/typetables/Makefile.am @@ -5,8 +5,8 @@ types_DATA = \ qt2.kdbgtt \ qt3.kdbgtt \ qt4core.kdbgtt \ - kdecore.kdbgtt \ - kdecore3.kdbgtt \ + tdecore.kdbgtt \ + tdecore3.kdbgtt \ glib.kdbgtt \ gtk+.kdbgtt \ stdc++.kdbgtt \ diff --git a/kdbg/typetables/kdecore.kdbgtt b/kdbg/typetables/tdecore.kdbgtt index d68226d..8c5082d 100644 --- a/kdbg/typetables/kdecore.kdbgtt +++ b/kdbg/typetables/tdecore.kdbgtt @@ -1,7 +1,7 @@ [Type Table] Types1=KSimpleConfig -LibDisplayName=kdecore (KDE 1.0 and 1.1) -ShlibRE=libkdecore\.so\.[12]$ +LibDisplayName=tdecore (KDE 1.0 and 1.1) +ShlibRE=libtdecore\.so\.[12]$ [KSimpleConfig] Display={ global=% } Expr1=(%s).pData->aGlobalAppFile.shd->data diff --git a/kdbg/typetables/kdecore3.kdbgtt b/kdbg/typetables/tdecore3.kdbgtt index dc16bf0..6b3ca19 100644 --- a/kdbg/typetables/kdecore3.kdbgtt +++ b/kdbg/typetables/tdecore3.kdbgtt @@ -1,7 +1,7 @@ [Type Table] Types1=KSimpleConfig -LibDisplayName=kdecore (KDE post-1.1) -ShlibRE=libkdecore\.so\.3$ +LibDisplayName=tdecore (KDE post-1.1) +ShlibRE=libtdecore\.so\.3$ [KSimpleConfig] Display={ global=% } Expr1=(*(%s).pData->aGlobalAppFile.shd->data) diff --git a/kdbg/winstack.cpp b/kdbg/winstack.cpp index ace4d50..1d2d687 100644 --- a/kdbg/winstack.cpp +++ b/kdbg/winstack.cpp @@ -9,9 +9,9 @@ #include <ntqbrush.h> #include <ntqfileinfo.h> #include <ntqpopupmenu.h> -#include <kapplication.h> -#include <kmainwindow.h> -#include <klocale.h> /* i18n */ +#include <tdeapplication.h> +#include <tdemainwindow.h> +#include <tdelocale.h> /* i18n */ #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -45,7 +45,7 @@ void WinStack::contextMenuEvent(TQContextMenuEvent* e) do top = top->parentWidget(); while (!top->isTopLevel()); - KMainWindow* mw = static_cast<KMainWindow*>(top); + TDEMainWindow* mw = static_cast<TDEMainWindow*>(top); TQPopupMenu* m = static_cast<TQPopupMenu*>(mw->factory()->container("popup_files_empty", mw)); m->exec(e->globalPos()); diff --git a/kdbg/xsldbgdriver.cpp b/kdbg/xsldbgdriver.cpp index bafc191..d59023f 100644 --- a/kdbg/xsldbgdriver.cpp +++ b/kdbg/xsldbgdriver.cpp @@ -7,11 +7,11 @@ #include "xsldbgdriver.h" #include "exprwnd.h" #include <ntqstringlist.h> -#include <klocale.h> /* i18n */ +#include <tdelocale.h> /* i18n */ #include <ctype.h> #include <stdlib.h> /* strtol, atoi */ #include <string.h> /* strcpy */ -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "assert.h" #ifdef HAVE_CONFIG_H @@ -213,7 +213,7 @@ TQStringList XsldbgDriver::boolOptionList() const void -XsldbgDriver::slotReceiveOutput(KProcess * process, char *buffer, +XsldbgDriver::slotReceiveOutput(TDEProcess * process, char *buffer, int buflen) { //TRACE(buffer); diff --git a/kdbg/xsldbgdriver.h b/kdbg/xsldbgdriver.h index b8585f9..b4e2f43 100644 --- a/kdbg/xsldbgdriver.h +++ b/kdbg/xsldbgdriver.h @@ -22,7 +22,7 @@ class XsldbgDriver:public DebuggerDriver { static TQString defaultXsldbg(); virtual bool startup(TQString cmdStr); virtual void commandFinished(CmdQueueItem * cmd); - void slotReceiveOutput(KProcess * process, char *buffer, int buflen); + void slotReceiveOutput(TDEProcess * process, char *buffer, int buflen); virtual CmdQueueItem *executeCmd(DbgCommand, bool clearLow = false); virtual CmdQueueItem *executeCmd(DbgCommand, TQString strArg, @@ -11,7 +11,7 @@ msgstr "" "POT-Creation-Date: 2009-07-19 22:57+0200\n" "PO-Revision-Date: 2002-03-03 16:16MDT\n" "Last-Translator: Serdar Cevher <serdar@linuxtr.com>\n" -"Language-Team: Turkish <kde-i18n-tr@kde.org>\n" +"Language-Team: Turkish <tde-i18n-tr@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" |