diff options
| author | gregory guy <gregory-tde@laposte.net> | 2020-08-17 20:04:20 +0200 |
|---|---|---|
| committer | gregory guy <gregory-tde@laposte.net> | 2020-08-17 20:04:20 +0200 |
| commit | 2e2a3c5923526e5f0baa0b4b85d32afec6f19805 (patch) | |
| tree | 74b2b4ac39c666b8479b91796c57287a7401bed1 | |
| parent | 503fddb48f2229ecc6ed6930a99c4d740ff979e5 (diff) | |
| download | tdepacman-2e2a3c5923526e5f0baa0b4b85d32afec6f19805.tar.gz tdepacman-2e2a3c5923526e5f0baa0b4b85d32afec6f19805.zip | |
third step, convert to tdelibs libraries.
Signed-off-by: gregory guy <gregory-tde@laposte.net>
55 files changed, 638 insertions, 638 deletions
diff --git a/Makefile.am b/Makefile.am index 49e5418..75f4c72 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,10 +1,10 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## SUBDIRS = kpacman po doc fonts maps pics EXTRA_DIST = kpacman.kdevprj admin AUTHORS COPYING ChangeLog INSTALL README TODO kpacman.lsm -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ # not a GNU package. You can remove this line, if # have all needed files, that a GNU package needs AUTOMAKE_OPTIONS = foreign diff --git a/Makefile.in b/Makefile.in index 470ec15..e85c3e4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -111,16 +111,16 @@ LIBXINERAMA = @LIBXINERAMA@ LIBZ = @LIBZ@ LIB_KAB = @LIB_KAB@ LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ +LIB_TDECORE = @LIB_TDECORE@ +LIB_TDEPRINT = @LIB_TDEPRINT@ +LIB_TDEUI = @LIB_TDEUI@ LIB_KFILE = @LIB_KFILE@ LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIO = @LIB_KIO@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ +LIB_TDEHTML = @LIB_TDEHTML@ +LIB_TDEIO = @LIB_TDEIO@ +LIB_TDEPARTS = @LIB_TDEPARTS@ +LIB_TDESPELL = @LIB_TDESPELL@ +LIB_TDESYCOCA = @LIB_TDESYCOCA@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ @@ -241,7 +241,7 @@ SUBDIRS = kpacman po doc fonts maps pics EXTRA_DIST = kpacman.kdevprj admin AUTHORS COPYING ChangeLog INSTALL README TODO kpacman.lsm -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ # not a GNU package. You can remove this line, if # have all needed files, that a GNU package needs AUTOMAKE_OPTIONS = foreign @@ -1,6 +1,6 @@ - add some sounds (for Bernd Johannes Wuebben ;-) - ability to change most (if not all) timing parameters without compilation - (using KConfig and/or commandline) + (using TDEConfig and/or commandline) - smoother movement of figures (Sprites? or reassemble timercontrol) - learn english and rewrite the code (or learn C/C++) - two (or more) players diff --git a/acinclude.m4 b/acinclude.m4 index 5ca38c0..fabb7ff 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. dnl ------------------------------------------------------------------------ dnl Forward compatibility macros (make autoconf 2.13 look like 2.50), @@ -113,41 +113,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! @@ -366,24 +366,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) @@ -524,11 +524,11 @@ AC_DEFUN(KDE_SUBST_PROGRAMS, [ 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 @@ -538,12 +538,12 @@ AC_DEFUN(KDE_SUBST_PROGRAMS, KDE_FIND_PATH(dcopidl2cpp, DCOPIDL2CPP, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl2cpp)]) 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)]) - 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]) 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="" @@ -565,9 +565,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` @@ -845,7 +845,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 @@ -1366,7 +1366,7 @@ qt_includes="" AC_ARG_WITH(qt-dir, [ --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 ]) @@ -1407,7 +1407,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 @@ -1577,7 +1577,7 @@ rm -f actest.ui actest.cpp if test "$kde_cv_uic_plugins" = yes; then AC_MSG_RESULT([yes]) else - AC_MSG_ERROR([not found - you need to install kdelibs first.]) + AC_MSG_ERROR([not found - you need to install tdelibs first.]) fi fi ]) @@ -1635,12 +1635,12 @@ if test "${prefix}" != NONE; then if test "${exec_prefix}" != NONE; then kde_libraries=${libdir} ac_kde_libraries=$libdir - if test "$ac_kde_libraries" = '${exec_prefix}/lib'${kdelibsuff}; then - ac_kde_libraries=$exec_prefix/lib${kdelibsuff} + if test "$ac_kde_libraries" = '${exec_prefix}/lib'${tdelibsuff}; then + ac_kde_libraries=$exec_prefix/lib${tdelibsuff} fi else - kde_libraries=${prefix}/lib${kdelibsuff} - ac_kde_libraries=$prefix/lib${kdelibsuff} + kde_libraries=${prefix}/lib${tdelibsuff} + ac_kde_libraries=$prefix/lib${tdelibsuff} fi else ac_kde_includes= @@ -1654,16 +1654,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" @@ -1674,15 +1674,15 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail. So, check this please and use another prefix!]) fi -kde_libdirs="/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" kde_widgetdir=NO dnl this might be somewhere else -AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir) +AC_FIND_FILE("kde3/plugins/designer/tdewidgets.la", $kde_libdirs, kde_widgetdir) if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then AC_MSG_ERROR([ @@ -1690,10 +1690,10 @@ in the prefix, you've chosen, are no KDE libraries installed. This will fail. So, check this please and use another prefix!]) fi -if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then +if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/tdewidgets.la"; then AC_MSG_ERROR([ I can't find the designer plugins. These are required and should have been installed -by kdelibs]) +by tdelibs]) fi if test -n "$kde_widgetdir"; then @@ -1847,20 +1847,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"); @@ -1892,7 +1892,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([ @@ -1955,37 +1955,37 @@ 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_TDEIO, "-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_KABC, "-ltdeabc") + AC_SUBST(LIB_TDEHTML, "-ltdehtml") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") # these are for backward compatibility - AC_SUBST(LIB_KSYCOCA, "-lkio") - AC_SUBST(LIB_KFILE, "-lkio") + AC_SUBST(LIB_TDESYCOCA, "-ltdeio") + AC_SUBST(LIB_KFILE, "-ltdeio") elif test $kde_qtver = 2; then - AC_SUBST(LIB_KDECORE, "-lkdecore") - AC_SUBST(LIB_KDEUI, "-lkdeui") - AC_SUBST(LIB_KIO, "-lkio") - AC_SUBST(LIB_KSYCOCA, "-lksycoca") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") + AC_SUBST(LIB_TDEIO, "-ltdeio") + AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") - AC_SUBST(LIB_KFILE, "-lkfile") + AC_SUBST(LIB_KFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_KHTML, "-lkhtml") - AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") - AC_SUBST(LIB_KDEPRINT, "-lkdeprint") + AC_SUBST(LIB_TDEHTML, "-ltdehtml") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else - AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)") - AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)") - AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)") - AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)") - AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)") + AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") + AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") + AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") + AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) @@ -2050,7 +2050,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 @@ -2324,7 +2324,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 ]) @@ -2389,7 +2389,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 @@ -2971,26 +2971,26 @@ See http:://objprelink.sourceforge.net for details: AC_DEFUN(KDE_CHECK_LIB64, [ - kdelibsuff=none + tdelibsuff=none 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" = "none"; then - kdelibsuff= + if 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 ]) @@ -3007,7 +3007,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 @@ -4591,8 +4591,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 @@ -5195,7 +5195,7 @@ ssl_includes="" AC_ARG_WITH(ssl-dir, [ --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 @@ -5215,7 +5215,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 @@ -35,8 +35,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. dnl ------------------------------------------------------------------------ dnl Forward compatibility macros (make autoconf 2.13 look like 2.50), @@ -125,41 +125,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! @@ -378,24 +378,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) @@ -536,11 +536,11 @@ AC_DEFUN(KDE_SUBST_PROGRAMS, [ 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 @@ -550,12 +550,12 @@ AC_DEFUN(KDE_SUBST_PROGRAMS, KDE_FIND_PATH(dcopidl2cpp, DCOPIDL2CPP, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl2cpp)]) 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)]) - 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]) 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="" @@ -577,9 +577,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` @@ -857,7 +857,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 @@ -1378,7 +1378,7 @@ qt_includes="" AC_ARG_WITH(qt-dir, [ --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 ]) @@ -1419,7 +1419,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 @@ -1589,7 +1589,7 @@ rm -f actest.ui actest.cpp if test "$kde_cv_uic_plugins" = yes; then AC_MSG_RESULT([yes]) else - AC_MSG_ERROR([not found - you need to install kdelibs first.]) + AC_MSG_ERROR([not found - you need to install tdelibs first.]) fi fi ]) @@ -1647,12 +1647,12 @@ if test "${prefix}" != NONE; then if test "${exec_prefix}" != NONE; then kde_libraries=${libdir} ac_kde_libraries=$libdir - if test "$ac_kde_libraries" = '${exec_prefix}/lib'${kdelibsuff}; then - ac_kde_libraries=$exec_prefix/lib${kdelibsuff} + if test "$ac_kde_libraries" = '${exec_prefix}/lib'${tdelibsuff}; then + ac_kde_libraries=$exec_prefix/lib${tdelibsuff} fi else - kde_libraries=${prefix}/lib${kdelibsuff} - ac_kde_libraries=$prefix/lib${kdelibsuff} + kde_libraries=${prefix}/lib${tdelibsuff} + ac_kde_libraries=$prefix/lib${tdelibsuff} fi else ac_kde_includes= @@ -1666,16 +1666,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" @@ -1686,15 +1686,15 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail. So, check this please and use another prefix!]) fi -kde_libdirs="/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" kde_widgetdir=NO dnl this might be somewhere else -AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir) +AC_FIND_FILE("kde3/plugins/designer/tdewidgets.la", $kde_libdirs, kde_widgetdir) if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then AC_MSG_ERROR([ @@ -1702,10 +1702,10 @@ in the prefix, you've chosen, are no KDE libraries installed. This will fail. So, check this please and use another prefix!]) fi -if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then +if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/tdewidgets.la"; then AC_MSG_ERROR([ I can't find the designer plugins. These are required and should have been installed -by kdelibs]) +by tdelibs]) fi if test -n "$kde_widgetdir"; then @@ -1859,20 +1859,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"); @@ -1904,7 +1904,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([ @@ -1967,37 +1967,37 @@ 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_TDEIO, "-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_KABC, "-ltdeabc") + AC_SUBST(LIB_TDEHTML, "-ltdehtml") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") # these are for backward compatibility - AC_SUBST(LIB_KSYCOCA, "-lkio") - AC_SUBST(LIB_KFILE, "-lkio") + AC_SUBST(LIB_TDESYCOCA, "-ltdeio") + AC_SUBST(LIB_KFILE, "-ltdeio") elif test $kde_qtver = 2; then - AC_SUBST(LIB_KDECORE, "-lkdecore") - AC_SUBST(LIB_KDEUI, "-lkdeui") - AC_SUBST(LIB_KIO, "-lkio") - AC_SUBST(LIB_KSYCOCA, "-lksycoca") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") + AC_SUBST(LIB_TDEIO, "-ltdeio") + AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") - AC_SUBST(LIB_KFILE, "-lkfile") + AC_SUBST(LIB_KFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_KHTML, "-lkhtml") - AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") - AC_SUBST(LIB_KDEPRINT, "-lkdeprint") + AC_SUBST(LIB_TDEHTML, "-ltdehtml") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else - AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)") - AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)") - AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)") - AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)") - AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)") + AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") + AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") + AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") + AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) @@ -2062,7 +2062,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 @@ -2336,7 +2336,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 ]) @@ -2401,7 +2401,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 @@ -2983,26 +2983,26 @@ See http:://objprelink.sourceforge.net for details: AC_DEFUN(KDE_CHECK_LIB64, [ - kdelibsuff=none + tdelibsuff=none 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" = "none"; then - kdelibsuff= + if 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 ]) @@ -3019,7 +3019,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 @@ -4603,8 +4603,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 @@ -5207,7 +5207,7 @@ ssl_includes="" AC_ARG_WITH(ssl-dir, [ --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 @@ -5227,7 +5227,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 @@ -420,7 +420,7 @@ PACKAGE_STRING= PACKAGE_BUGREPORT= ac_unique_file="acinclude.m4" -ac_default_prefix=${KDEDIR:-/usr/local/kde} +ac_default_prefix=${TDEDIR:-/usr/local/kde} # Factoring default headers for most tests. ac_includes_default="\ #include <stdio.h> @@ -458,7 +458,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS REPO NOREPO KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE LN_S ECHO RANLIB ac_ct_RANLIB EGREP LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL X_INCLUDES X_LDFLAGS x_libraries x_includes LIBSM X_PRE_LIBS LIB_X11 LIBXINERAMA QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG KDECONFIG MEINPROC KDE_XSL_STYLESHEET kde_libs_prefix kde_libs_htmldir kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_mimedir kde_wallpaperdir kde_bindir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KSYCOCA LIB_KFILE LIB_KFM TOPSUBDIRS LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS REPO NOREPO KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE LN_S ECHO RANLIB ac_ct_RANLIB EGREP LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL X_INCLUDES X_LDFLAGS x_libraries x_includes LIBSM X_PRE_LIBS LIB_X11 LIBXINERAMA QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG KDECONFIG MEINPROC KDE_XSL_STYLESHEET kde_libs_prefix kde_libs_htmldir kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_mimedir kde_wallpaperdir kde_bindir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kde_styledir kde_widgetdir LIB_TDECORE LIB_TDEUI LIB_TDEIO LIB_SMB LIB_KAB LIB_KABC LIB_TDEHTML LIB_TDESPELL LIB_TDEPARTS LIB_TDEPRINT LIB_TDESYCOCA LIB_KFILE LIB_KFM TOPSUBDIRS LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -5727,18 +5727,18 @@ fi; - kdelibsuff=none + tdelibsuff=none # Check whether --enable-libsuffix or --disable-libsuffix was given. if test "${enable_libsuffix+set}" = set; then enableval="$enable_libsuffix" - kdelibsuff=$enableval + tdelibsuff=$enableval fi; # TODO: add an auto case that compiles a little C app to check # where the glibc is - if test "$kdelibsuff" = "none"; then - kdelibsuff= + if test "$tdelibsuff" = "none"; then + tdelibsuff= fi - if test -z "$kdelibsuff"; then + if test -z "$tdelibsuff"; then echo "$as_me:$LINENO: result: not using lib directory suffix" >&5 echo "${ECHO_T}not using lib directory suffix" >&6 @@ -5748,16 +5748,16 @@ _ACEOF else if test "$libdir" = '${exec_prefix}/lib'; then - libdir="$libdir${kdelibsuff}" + libdir="$libdir${tdelibsuff}" libdir="$libdir" fi cat >>confdefs.h <<_ACEOF -#define KDELIBSUFF "\"${kdelibsuff}\"" +#define KDELIBSUFF "\"${tdelibsuff}\"" _ACEOF - echo "$as_me:$LINENO: result: using lib directory suffix $kdelibsuff" >&5 -echo "${ECHO_T}using lib directory suffix $kdelibsuff" >&6 + echo "$as_me:$LINENO: result: using lib directory suffix $tdelibsuff" >&5 +echo "${ECHO_T}using lib directory suffix $tdelibsuff" >&6 fi # Check whether --enable-fast-install or --disable-fast-install was given. @@ -20589,41 +20589,41 @@ sed 's/^/| /' conftest.$ac_ext >&5 LIBS="$ac_save_LIBS" # First see if replacing the include by lib works. # Check X11 before X11Rn because it is often a symlink to the current release. -for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \ - /usr/X11/lib${kdelibsuff} \ - /usr/X11R6/lib${kdelibsuff} \ - /usr/X11R5/lib${kdelibsuff} \ - /usr/X11R4/lib${kdelibsuff} \ +for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \ + /usr/X11/lib${tdelibsuff} \ + /usr/X11R6/lib${tdelibsuff} \ + /usr/X11R5/lib${tdelibsuff} \ + /usr/X11R4/lib${tdelibsuff} \ \ - /usr/lib${kdelibsuff}/X11 \ - /usr/lib${kdelibsuff}/X11R6 \ - /usr/lib${kdelibsuff}/X11R5 \ - /usr/lib${kdelibsuff}/X11R4 \ + /usr/lib${tdelibsuff}/X11 \ + /usr/lib${tdelibsuff}/X11R6 \ + /usr/lib${tdelibsuff}/X11R5 \ + /usr/lib${tdelibsuff}/X11R4 \ \ - /usr/local/X11/lib${kdelibsuff} \ - /usr/local/X11R6/lib${kdelibsuff} \ - /usr/local/X11R5/lib${kdelibsuff} \ - /usr/local/X11R4/lib${kdelibsuff} \ + /usr/local/X11/lib${tdelibsuff} \ + /usr/local/X11R6/lib${tdelibsuff} \ + /usr/local/X11R5/lib${tdelibsuff} \ + /usr/local/X11R4/lib${tdelibsuff} \ \ - /usr/local/lib${kdelibsuff}/X11 \ - /usr/local/lib${kdelibsuff}/X11R6 \ - /usr/local/lib${kdelibsuff}/X11R5 \ - /usr/local/lib${kdelibsuff}/X11R4 \ + /usr/local/lib${tdelibsuff}/X11 \ + /usr/local/lib${tdelibsuff}/X11R6 \ + /usr/local/lib${tdelibsuff}/X11R5 \ + /usr/local/lib${tdelibsuff}/X11R4 \ \ - /usr/X386/lib${kdelibsuff} \ - /usr/x386/lib${kdelibsuff} \ - /usr/XFree86/lib${kdelibsuff}/X11 \ + /usr/X386/lib${tdelibsuff} \ + /usr/x386/lib${tdelibsuff} \ + /usr/XFree86/lib${tdelibsuff}/X11 \ \ - /usr/lib${kdelibsuff} \ - /usr/local/lib${kdelibsuff} \ - /usr/unsupported/lib${kdelibsuff} \ - /usr/athena/lib${kdelibsuff} \ - /usr/local/x11r5/lib${kdelibsuff} \ - /usr/lpp/Xamples/lib${kdelibsuff} \ - /lib/usr/lib${kdelibsuff}/X11 \ + /usr/lib${tdelibsuff} \ + /usr/local/lib${tdelibsuff} \ + /usr/unsupported/lib${tdelibsuff} \ + /usr/athena/lib${tdelibsuff} \ + /usr/local/x11r5/lib${tdelibsuff} \ + /usr/lpp/Xamples/lib${tdelibsuff} \ + /lib/usr/lib${tdelibsuff}/X11 \ \ - /usr/openwin/lib${kdelibsuff} \ - /usr/openwin/share/lib${kdelibsuff} \ + /usr/openwin/lib${tdelibsuff} \ + /usr/openwin/share/lib${tdelibsuff} \ ; \ do for ac_extension in a so sl; do @@ -20681,7 +20681,7 @@ fi ac_x_includes="." fi if test -z "$ac_x_libraries"; then - ac_x_libraries="/usr/lib${kdelibsuff}" + ac_x_libraries="/usr/lib${tdelibsuff}" fi esac #from now on we use our own again @@ -22097,7 +22097,7 @@ qt_includes="" if test "${with_qt_dir+set}" = set; then withval="$with_qt_dir" ac_qt_includes="$withval"/include - ac_qt_libraries="$withval"/lib${kdelibsuff} + ac_qt_libraries="$withval"/lib${tdelibsuff} ac_qt_bindir="$withval"/bin fi; @@ -22161,7 +22161,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 @@ -22902,12 +22902,12 @@ if test "${prefix}" != NONE; then if test "${exec_prefix}" != NONE; then kde_libraries=${libdir} ac_kde_libraries=$libdir - if test "$ac_kde_libraries" = '${exec_prefix}/lib'${kdelibsuff}; then - ac_kde_libraries=$exec_prefix/lib${kdelibsuff} + if test "$ac_kde_libraries" = '${exec_prefix}/lib'${tdelibsuff}; then + ac_kde_libraries=$exec_prefix/lib${tdelibsuff} fi else - kde_libraries=${prefix}/lib${kdelibsuff} - ac_kde_libraries=$prefix/lib${kdelibsuff} + kde_libraries=${prefix}/lib${tdelibsuff} + ac_kde_libraries=$prefix/lib${tdelibsuff} fi else ac_kde_includes= @@ -22923,16 +22923,16 @@ else if test "$kde_qtver" = 1; then kde_check_header="ksock.h" - kde_check_lib="libkdecore.la" + kde_check_lib="libtdecore.la" else kde_check_header="ksharedptr.h" - kde_check_lib="libkio.la" + kde_check_lib="libtdeio.la" fi if test -z ""; then -kde_incdirs="/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" kde_incdir=NO @@ -22961,8 +22961,8 @@ So, check this please and use another prefix!" >&2;} { (exit 1); exit 1; }; } 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" kde_libdir=NO @@ -22986,7 +22986,7 @@ kde_widgetdir=NO kde_widgetdir=NO for i in $kde_libdirs; do - for j in "kde3/plugins/designer/kdewidgets.la"; + for j in "kde3/plugins/designer/tdewidgets.la"; do echo "configure: 22991: $i/$j" >&5 if test -r "$i/$j"; then @@ -23008,13 +23008,13 @@ So, check this please and use another prefix!" >&2;} { (exit 1); exit 1; }; } fi -if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then +if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/tdewidgets.la"; then { { echo "$as_me:$LINENO: error: I can't find the designer plugins. These are required and should have been installed -by kdelibs" >&5 +by tdelibs" >&5 echo "$as_me: error: I can't find the designer plugins. These are required and should have been installed -by kdelibs" >&2;} +by tdelibs" >&2;} { (exit 1); exit 1; }; } fi @@ -23143,8 +23143,8 @@ if test "$kde_cv_uic_plugins" = yes; then echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - { { echo "$as_me:$LINENO: error: not found - you need to install kdelibs first." >&5 -echo "$as_me: error: not found - you need to install kdelibs first." >&2;} + { { echo "$as_me:$LINENO: error: not found - you need to install tdelibs first." >&5 +echo "$as_me: error: not found - you need to install tdelibs first." >&2;} { (exit 1); exit 1; }; } fi fi @@ -23301,20 +23301,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"); @@ -23371,7 +23371,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu echo "$as_me:$LINENO: checking for KDE libraries installed" >&5 echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6 -ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' +ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5' if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 @@ -23383,22 +23383,22 @@ echo "${ECHO_T}yes" >&6 else { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application! Check, if your compiler is installed correctly and if you have used the -same compiler to compile Qt and kdelibs as you did use now. +same compiler to compile Qt and tdelibs as you did use now. For more details about this problem, look at the end of config.log." >&5 echo "$as_me: error: your system fails at linking a small KDE application! Check, if your compiler is installed correctly and if you have used the -same compiler to compile Qt and kdelibs as you did use now. +same compiler to compile Qt and tdelibs as you did use now. For more details about this problem, look at the end of config.log." >&2;} { (exit 1); exit 1; }; } fi -if eval `KDEDIR= ./conftest 2>&5`; then +if eval `TDEDIR= ./conftest 2>&5`; then kde_result=done else kde_result=problems fi -KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log +TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log kde_have_all_paths=yes @@ -23575,20 +23575,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"); @@ -23645,7 +23645,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu echo "$as_me:$LINENO: checking for KDE libraries installed" >&5 echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6 -ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' +ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5' if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 @@ -23657,22 +23657,22 @@ echo "${ECHO_T}yes" >&6 else { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application! Check, if your compiler is installed correctly and if you have used the -same compiler to compile Qt and kdelibs as you did use now. +same compiler to compile Qt and tdelibs as you did use now. For more details about this problem, look at the end of config.log." >&5 echo "$as_me: error: your system fails at linking a small KDE application! Check, if your compiler is installed correctly and if you have used the -same compiler to compile Qt and kdelibs as you did use now. +same compiler to compile Qt and tdelibs as you did use now. For more details about this problem, look at the end of config.log." >&2;} { (exit 1); exit 1; }; } fi -if eval `KDEDIR= ./conftest 2>&5`; then +if eval `TDEDIR= ./conftest 2>&5`; then kde_result=done else kde_result=problems fi -KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log +TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log kde_have_all_paths=yes @@ -23748,11 +23748,11 @@ bindir=$kde_bindir 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 @@ -24023,12 +24023,12 @@ echo "${ECHO_T}$kde_cv_path" >&6 fi - echo "$as_me:$LINENO: checking for kde-config" >&5 -echo $ECHO_N "checking for kde-config... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for tde-config" >&5 +echo $ECHO_N "checking for tde-config... $ECHO_C" >&6 if test -n "$KDECONFIG"; then kde_cv_path="$KDECONFIG"; else - kde_cache=`echo kde-config | sed 'y%./+-%__p_%'` + kde_cache=`echo tde-config | sed 'y%./+-%__p_%'` if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -24044,16 +24044,16 @@ else IFS=$kde_save_IFS for dir in $dirs; do - if test -x "$dir/kde-config"; then + if test -x "$dir/tde-config"; then if test -n "" then - evalstr="$dir/kde-config 2>&1 " + evalstr="$dir/tde-config 2>&1 " if eval $evalstr; then - kde_cv_path="$dir/kde-config" + kde_cv_path="$dir/tde-config" break fi else - kde_cv_path="$dir/kde-config" + kde_cv_path="$dir/tde-config" break fi fi @@ -24141,7 +24141,7 @@ echo "${ECHO_T}$kde_cv_path" >&6 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" KDE_XSL_STYLESHEET=NO for i in $kde_sharedirs; @@ -24177,13 +24177,13 @@ done 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 - { { echo "$as_me:$LINENO: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. + { { echo "$as_me:$LINENO: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs. This means it has been moved since you installed it. - This won't work. Please recompile kdelibs for the new prefix. + This won't work. Please recompile tdelibs for the new prefix. " >&5 -echo "$as_me: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. +echo "$as_me: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs. This means it has been moved since you installed it. - This won't work. Please recompile kdelibs for the new prefix. + This won't work. Please recompile tdelibs for the new prefix. " >&2;} { (exit 1); exit 1; }; } fi @@ -24229,64 +24229,64 @@ fi if test $kde_qtver = 3; then - LIB_KDECORE="-lkdecore" + LIB_TDECORE="-ltdecore" - LIB_KDEUI="-lkdeui" + LIB_TDEUI="-ltdeui" - LIB_KIO="-lkio" + LIB_TDEIO="-ltdeio" LIB_SMB="-lsmb" LIB_KAB="-lkab" - LIB_KABC="-lkabc" + LIB_KABC="-ltdeabc" - LIB_KHTML="-lkhtml" + LIB_TDEHTML="-ltdehtml" - LIB_KSPELL="-lkspell" + LIB_TDESPELL="-ltdespell" - LIB_KPARTS="-lkparts" + LIB_TDEPARTS="-ltdeparts" - LIB_KDEPRINT="-lkdeprint" + LIB_TDEPRINT="-ltdeprint" # these are for backward compatibility - LIB_KSYCOCA="-lkio" + LIB_TDESYCOCA="-ltdeio" - LIB_KFILE="-lkio" + LIB_KFILE="-ltdeio" elif test $kde_qtver = 2; then - LIB_KDECORE="-lkdecore" + LIB_TDECORE="-ltdecore" - LIB_KDEUI="-lkdeui" + LIB_TDEUI="-ltdeui" - LIB_KIO="-lkio" + LIB_TDEIO="-ltdeio" - LIB_KSYCOCA="-lksycoca" + LIB_TDESYCOCA="-ltdesycoca" LIB_SMB="-lsmb" - LIB_KFILE="-lkfile" + LIB_KFILE="-ltdefile" LIB_KAB="-lkab" - LIB_KHTML="-lkhtml" + LIB_TDEHTML="-ltdehtml" - LIB_KSPELL="-lkspell" + LIB_TDESPELL="-ltdespell" - LIB_KPARTS="-lkparts" + LIB_TDEPARTS="-ltdeparts" - LIB_KDEPRINT="-lkdeprint" + LIB_TDEPRINT="-ltdeprint" else - LIB_KDECORE="-lkdecore -lXext $(LIB_QT)" + LIB_TDECORE="-ltdecore -lXext $(LIB_QT)" - LIB_KDEUI="-lkdeui $(LIB_KDECORE)" + LIB_TDEUI="-ltdeui $(LIB_TDECORE)" - LIB_KFM="-lkfm $(LIB_KDECORE)" + LIB_KFM="-lkfm $(LIB_TDECORE)" - LIB_KFILE="-lkfile $(LIB_KFM) $(LIB_KDEUI)" + LIB_KFILE="-ltdefile $(LIB_KFM) $(LIB_TDEUI)" - LIB_KAB="-lkab $(LIB_KIMGIO) $(LIB_KDECORE)" + LIB_KAB="-lkab $(LIB_KIMGIO) $(LIB_TDECORE)" fi @@ -25175,17 +25175,17 @@ s,@kde_servicetypesdir@,$kde_servicetypesdir,;t t s,@kde_moduledir@,$kde_moduledir,;t t s,@kde_styledir@,$kde_styledir,;t t s,@kde_widgetdir@,$kde_widgetdir,;t t -s,@LIB_KDECORE@,$LIB_KDECORE,;t t -s,@LIB_KDEUI@,$LIB_KDEUI,;t t -s,@LIB_KIO@,$LIB_KIO,;t t +s,@LIB_TDECORE@,$LIB_TDECORE,;t t +s,@LIB_TDEUI@,$LIB_TDEUI,;t t +s,@LIB_TDEIO@,$LIB_TDEIO,;t t s,@LIB_SMB@,$LIB_SMB,;t t s,@LIB_KAB@,$LIB_KAB,;t t s,@LIB_KABC@,$LIB_KABC,;t t -s,@LIB_KHTML@,$LIB_KHTML,;t t -s,@LIB_KSPELL@,$LIB_KSPELL,;t t -s,@LIB_KPARTS@,$LIB_KPARTS,;t t -s,@LIB_KDEPRINT@,$LIB_KDEPRINT,;t t -s,@LIB_KSYCOCA@,$LIB_KSYCOCA,;t t +s,@LIB_TDEHTML@,$LIB_TDEHTML,;t t +s,@LIB_TDESPELL@,$LIB_TDESPELL,;t t +s,@LIB_TDEPARTS@,$LIB_TDEPARTS,;t t +s,@LIB_TDEPRINT@,$LIB_TDEPRINT,;t t +s,@LIB_TDESYCOCA@,$LIB_TDESYCOCA,;t t s,@LIB_KFILE@,$LIB_KFILE,;t t s,@LIB_KFM@,$LIB_KFM,;t t s,@TOPSUBDIRS@,$TOPSUBDIRS,;t t diff --git a/configure.in b/configure.in index 5035e61..8a1310b 100644 --- a/configure.in +++ b/configure.in @@ -59,12 +59,12 @@ AC_PATH_KDE dnl PACKAGE set before -dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __kdevelop[noopt]__ -dnl CFLAGS="$NOOPT_CFLAGS" dnl __kdevelop[noopt]__ -dnl CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS" dnl __kdevelop[exc]__ +dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __tdevelop[noopt]__ +dnl CFLAGS="$NOOPT_CFLAGS" dnl __tdevelop[noopt]__ +dnl CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS" dnl __tdevelop[exc]__ -dnl KDE_NEED_FLEX dnl __kdevelop__ -dnl AC_PROG_YACC dnl __kdevelop__ +dnl KDE_NEED_FLEX dnl __tdevelop__ +dnl AC_PROG_YACC dnl __tdevelop__ KDE_CREATE_SUBDIRSLIST AC_CONFIG_FILES([ Makefile ]) diff --git a/configure.in.in b/configure.in.in index 1c3c2a0..97c965a 100644 --- a/configure.in.in +++ b/configure.in.in @@ -2,10 +2,10 @@ AM_INIT_AUTOMAKE(kpacman,0.3.2) -dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __kdevelop[noopt]__ -dnl CFLAGS="$NOOPT_CFLAGS" dnl __kdevelop[noopt]__ -dnl CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS" dnl __kdevelop[exc]__ +dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __tdevelop[noopt]__ +dnl CFLAGS="$NOOPT_CFLAGS" dnl __tdevelop[noopt]__ +dnl CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS" dnl __tdevelop[exc]__ -dnl KDE_NEED_FLEX dnl __kdevelop__ -dnl AC_PROG_YACC dnl __kdevelop__ +dnl KDE_NEED_FLEX dnl __tdevelop__ +dnl AC_PROG_YACC dnl __tdevelop__ diff --git a/doc/Makefile.am b/doc/Makefile.am index a7734c6..7189f6a 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,6 +1,6 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## SUBDIRS = en de -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ diff --git a/doc/Makefile.in b/doc/Makefile.in index b0b7949..775d118 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -111,16 +111,16 @@ LIBXINERAMA = @LIBXINERAMA@ LIBZ = @LIBZ@ LIB_KAB = @LIB_KAB@ LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ +LIB_TDECORE = @LIB_TDECORE@ +LIB_TDEPRINT = @LIB_TDEPRINT@ +LIB_TDEUI = @LIB_TDEUI@ LIB_KFILE = @LIB_KFILE@ LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIO = @LIB_KIO@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ +LIB_TDEHTML = @LIB_TDEHTML@ +LIB_TDEIO = @LIB_TDEIO@ +LIB_TDEPARTS = @LIB_TDEPARTS@ +LIB_TDESPELL = @LIB_TDESPELL@ +LIB_TDESYCOCA = @LIB_TDESYCOCA@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ @@ -535,7 +535,7 @@ uninstall-info: uninstall-info-recursive uninstall-info-recursive uninstall-recursive -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/doc/de/Makefile.am b/doc/de/Makefile.am index 315c2ce..70605c5 100644 --- a/doc/de/Makefile.am +++ b/doc/de/Makefile.am @@ -1,9 +1,9 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## EXTRA_DIST = index.html kpacman-1.html kpacman-2.html kpacman-3.html kpacman-4.html kpacman.gif -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ KDE_LANG = de KDE_DOCS = kpacman diff --git a/doc/de/Makefile.in b/doc/de/Makefile.in index 9e5c27c..c5d7550 100644 --- a/doc/de/Makefile.in +++ b/doc/de/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -111,16 +111,16 @@ LIBXINERAMA = @LIBXINERAMA@ LIBZ = @LIBZ@ LIB_KAB = @LIB_KAB@ LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ +LIB_TDECORE = @LIB_TDECORE@ +LIB_TDEPRINT = @LIB_TDEPRINT@ +LIB_TDEUI = @LIB_TDEUI@ LIB_KFILE = @LIB_KFILE@ LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIO = @LIB_KIO@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ +LIB_TDEHTML = @LIB_TDEHTML@ +LIB_TDEIO = @LIB_TDEIO@ +LIB_TDEPARTS = @LIB_TDEPARTS@ +LIB_TDESPELL = @LIB_TDESPELL@ +LIB_TDESYCOCA = @LIB_TDESYCOCA@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ @@ -240,7 +240,7 @@ x_libraries = @x_libraries@ EXTRA_DIST = index.html kpacman-1.html kpacman-2.html kpacman-3.html kpacman-4.html kpacman.gif -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ KDE_LANG = de KDE_DOCS = kpacman subdir = doc/de diff --git a/doc/de/kpacman-3.html b/doc/de/kpacman-3.html index b5c3f6b..fb3eafe 100644 --- a/doc/de/kpacman-3.html +++ b/doc/de/kpacman-3.html @@ -441,7 +441,7 @@ nur folgende Schlüssel/Wert-Paare ausgewertet: <td>Dateiname der xbm-Fontdatei. Wird der Name ohne absolute Pfadangabe (führendes "/" oder "~") spezifiziert, bezieht er sich relativ auf -das Verzeichnis <tt>$KDEDIR/share/apps/kpacman/fonts</tt> . Der Aufbau +das Verzeichnis <tt>$TDEDIR/share/apps/kpacman/fonts</tt> . Der Aufbau dieser Fontdatei wird in einer der nächsten Versionen beschrieben, wenn Sie sich die Datei allerdings mit einem Bitmap-Editor ansehen wird Ihnen aber bestimmt schon alles klar.</td> @@ -474,7 +474,7 @@ werden, wird hier der numerische Wert des letzten Buchstabens definiert.</td> <td>Verzeichnis in dem sich die Pixmap-Dateien für die Spielfiguren, die Punkte, die Wände usw. befinden. Die Namen der einzelnen xpm-Dateien sind momentan noch fest codiert (wird sich auch noch ändern). Der -Pfad bezieht sich, falls nicht absolut angegeben, auf das Verzeichnis <tt>$KDEDIR/share/apps/kpacman/pics</tt>. +Pfad bezieht sich, falls nicht absolut angegeben, auf das Verzeichnis <tt>$TDEDIR/share/apps/kpacman/pics</tt>. Wird hier kein Wert angegeben, werden die Pixmaps in diesem Verzeichnis gesucht.</td> diff --git a/doc/en/Makefile.am b/doc/en/Makefile.am index b386973..38ad04f 100644 --- a/doc/en/Makefile.am +++ b/doc/en/Makefile.am @@ -1,9 +1,9 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## EXTRA_DIST = index.docbook index.html kpacman-1.html kpacman-2.html kpacman-3.html kpacman-4.html kpacman.gif -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ KDE_LANG = en KDE_DOCS = kpacman diff --git a/doc/en/Makefile.in b/doc/en/Makefile.in index fdfd488..e75abe2 100644 --- a/doc/en/Makefile.in +++ b/doc/en/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -111,16 +111,16 @@ LIBXINERAMA = @LIBXINERAMA@ LIBZ = @LIBZ@ LIB_KAB = @LIB_KAB@ LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ +LIB_TDECORE = @LIB_TDECORE@ +LIB_TDEPRINT = @LIB_TDEPRINT@ +LIB_TDEUI = @LIB_TDEUI@ LIB_KFILE = @LIB_KFILE@ LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIO = @LIB_KIO@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ +LIB_TDEHTML = @LIB_TDEHTML@ +LIB_TDEIO = @LIB_TDEIO@ +LIB_TDEPARTS = @LIB_TDEPARTS@ +LIB_TDESPELL = @LIB_TDESPELL@ +LIB_TDESYCOCA = @LIB_TDESYCOCA@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ @@ -240,7 +240,7 @@ x_libraries = @x_libraries@ EXTRA_DIST = index.docbook index.html kpacman-1.html kpacman-2.html kpacman-3.html kpacman-4.html kpacman.gif -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ KDE_LANG = en KDE_DOCS = kpacman subdir = doc/en diff --git a/doc/en/index.docbook b/doc/en/index.docbook index be93a99..c039dc5 100644 --- a/doc/en/index.docbook +++ b/doc/en/index.docbook @@ -91,7 +91,7 @@ Please at least include KDE, the KDE package it is in, the name <keywordset> <keyword>KDE</keyword> -<keyword>kdeutils</keyword> +<keyword>tdeutils</keyword> <keyword>Kapp</keyword> <keyword>nothing</keyword> <keyword>nothing else</keyword> @@ -340,7 +340,7 @@ Documentation copyright 1999 George N. Ugnacious <email>gnu@kde.org</email> <para> &kpacman; is part of the KDE project <ulink url="http://www.kde.org">http://www.kde.org</ulink>. -&kpacman; can be found in the kdeutils package on +&kpacman; can be found in the tdeutils package on <ulink url="ftp://ftp.kde.org/pub/kde/">ftp://ftp.kde.org/pub/kde/</ulink>, the main ftp site of the KDE project. </para> </sect1> @@ -350,8 +350,8 @@ main ftp site of the KDE project. </para> <!-- List any special requirements for your application here. This should include: -.Libraries or other software that is not included in kdesupport, -kdelibs, or kdebase. +.Libraries or other software that is not included in tdesupport, +tdelibs, or tdebase. .Hardware requirements like amount of RAM, disk space, graphics card capabilities, screen resolution, special expansion cards, etc. .Operating systems the app will run on. If your app is designed only for a diff --git a/doc/en/kpacman-3.html b/doc/en/kpacman-3.html index aa5b6e2..7abb5bd 100644 --- a/doc/en/kpacman-3.html +++ b/doc/en/kpacman-3.html @@ -454,7 +454,7 @@ keys: <td>Font</td> <td>Filename of the xbm-font. Names without an absolute path (a leading -"/" or "~") are relative to <tt>$KDEDIR/share/apps/kpacman/fonts</tt>. +"/" or "~") are relative to <tt>$TDEDIR/share/apps/kpacman/fonts</tt>. The structure of the fontfile will be explained in one of the next releases, but you should be able to figure it out by opening one of the fontfiles included with KPacman using a bitmap-editor.</td> @@ -485,7 +485,7 @@ must be changed.</td> <td>Directory in which the pixmap-files for the figures are located. Direcotry names without an absolute path (a leading "/" or "~") are relative -to <tt>$KDEDIR/share/apps/kpacman/pics</tt>. The names of the individual +to <tt>$TDEDIR/share/apps/kpacman/pics</tt>. The names of the individual xpm-files are fixed in the code at the moment (this will be changed) and are ''down.xpm" for an arrow pointing down, "fruit.xpm" for the series of fruit for the various levels, "lifes.xpm" for the image to display at diff --git a/fonts/Makefile.am b/fonts/Makefile.am index 2302170..bff6b80 100644 --- a/fonts/Makefile.am +++ b/fonts/Makefile.am @@ -1,4 +1,4 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## EXTRA_DIST = font-small.pbm font-smooth.pbm font.pbm @@ -16,4 +16,4 @@ uninstall-local: -rm -f $(kde_datadir)/kpacman/fonts/font-smooth.pbm -rm -f $(kde_datadir)/kpacman/fonts/font.pbm -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ diff --git a/fonts/Makefile.in b/fonts/Makefile.in index 549b964..0474a1d 100644 --- a/fonts/Makefile.in +++ b/fonts/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -111,16 +111,16 @@ LIBXINERAMA = @LIBXINERAMA@ LIBZ = @LIBZ@ LIB_KAB = @LIB_KAB@ LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ +LIB_TDECORE = @LIB_TDECORE@ +LIB_TDEPRINT = @LIB_TDEPRINT@ +LIB_TDEUI = @LIB_TDEUI@ LIB_KFILE = @LIB_KFILE@ LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIO = @LIB_KIO@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ +LIB_TDEHTML = @LIB_TDEHTML@ +LIB_TDEIO = @LIB_TDEIO@ +LIB_TDEPARTS = @LIB_TDEPARTS@ +LIB_TDESPELL = @LIB_TDESPELL@ +LIB_TDESYCOCA = @LIB_TDESYCOCA@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ @@ -424,7 +424,7 @@ uninstall-local: #>+ 1 -rm -f $(DESTDIR)$(kde_datadir)/kpacman/fonts/font.pbm -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/kpacman.kdevprj b/kpacman.kdevprj index 637001e..1c1ea9c 100644 --- a/kpacman.kdevprj +++ b/kpacman.kdevprj @@ -20,7 +20,7 @@ type=DATA addcxxflags= bin_program=kpacman cxxflags=\s-O0 -g3 -Wall -ldadd=-lkdegames $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) +ldadd=-ltdegames $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) ldflags= [General] diff --git a/kpacman/Makefile.am b/kpacman/Makefile.am index a98f991..15f0ab3 100644 --- a/kpacman/Makefile.am +++ b/kpacman/Makefile.am @@ -1,10 +1,10 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## bin_PROGRAMS = kpacman -## INCLUDES were found outside kdevelop specific part +## INCLUDES were found outside tdevelop specific part kpacman_SOURCES = kpacmanview.cpp referee.cpp status.cpp painter.cpp score.cpp pacman.cpp monster.cpp keys.cpp fruit.cpp energizer.cpp board.cpp bitfont.cpp kpacman.cpp main.cpp -kpacman_LDADD = -lkdegames $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET) +kpacman_LDADD = -ltdegames $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIBSOCKET) EXTRA_DIST = main.cpp kpacman.cpp kpacman.h kpacman.desktop lo32-app-kpacman.png lo16-app-kpacman.png bitfont.cpp bitfont.h colors.h bitmaps.h board.cpp board.h energizer.cpp energizer.h fruit.cpp fruit.h keys.cpp keys.h monster.cpp monster.h pacman.cpp pacman.h score.cpp score.h painter.cpp painter.h status.cpp status.h referee.cpp referee.h kpacmanrc kpacmanview.h kpacmanview.cpp kpacmanui.rc hi16-app-kpacman.png hi32-app-kpacman.png @@ -31,7 +31,7 @@ uninstall-local: -rm -f $(kde_icondir)/hicolor/16x16/apps/kpacman.png -rm -f $(kde_icondir)/hicolor/32x32/apps/kpacman.png -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ # this 10 paths are KDE specific. Use them: # kde_htmldir Where your docs should go to. (contains lang subdirs) # kde_appsdir Where your application file (.kdelnk) should go to. diff --git a/kpacman/Makefile.in b/kpacman/Makefile.in index 22a7c3e..2895d1a 100644 --- a/kpacman/Makefile.in +++ b/kpacman/Makefile.in @@ -109,16 +109,16 @@ LIBXINERAMA = @LIBXINERAMA@ LIBZ = @LIBZ@ LIB_KAB = @LIB_KAB@ LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ +LIB_TDECORE = @LIB_TDECORE@ +LIB_TDEPRINT = @LIB_TDEPRINT@ +LIB_TDEUI = @LIB_TDEUI@ LIB_KFILE = @LIB_KFILE@ LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIO = @LIB_KIO@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ +LIB_TDEHTML = @LIB_TDEHTML@ +LIB_TDEIO = @LIB_TDEIO@ +LIB_TDEPARTS = @LIB_TDEPARTS@ +LIB_TDESPELL = @LIB_TDESPELL@ +LIB_TDESYCOCA = @LIB_TDESYCOCA@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ @@ -235,15 +235,15 @@ target_vendor = @target_vendor@ x_includes = @x_includes@ x_libraries = @x_libraries@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## bin_PROGRAMS = kpacman kpacman_SOURCES = kpacmanview.cpp referee.cpp status.cpp painter.cpp score.cpp pacman.cpp monster.cpp keys.cpp fruit.cpp energizer.cpp board.cpp bitfont.cpp kpacman.cpp main.cpp -kpacman_LDADD = -lkdegames $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET) +kpacman_LDADD = -ltdegames $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIBSOCKET) EXTRA_DIST = main.cpp kpacman.cpp kpacman.h kpacman.desktop lo32-app-kpacman.png lo16-app-kpacman.png bitfont.cpp bitfont.h colors.h bitmaps.h board.cpp board.h energizer.cpp energizer.h fruit.cpp fruit.h keys.cpp keys.h monster.cpp monster.h pacman.cpp pacman.h score.cpp score.h painter.cpp painter.h status.cpp status.h referee.cpp referee.h kpacmanrc kpacmanview.h kpacmanview.cpp kpacmanui.rc hi16-app-kpacman.png hi32-app-kpacman.png -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ # this 10 paths are KDE specific. Use them: # kde_htmldir Where your docs should go to. (contains lang subdirs) # kde_appsdir Where your application file (.kdelnk) should go to. diff --git a/kpacman/board.cpp b/kpacman/board.cpp index 1f98f7f..b08928e 100644 --- a/kpacman/board.cpp +++ b/kpacman/board.cpp @@ -1,5 +1,5 @@ #include <kapp.h> -#include <klocale.h> +#include <tdelocale.h> #include <ntqrect.h> #include <ntqregexp.h> diff --git a/kpacman/keys.cpp b/kpacman/keys.cpp index 8dc5648..46b55d7 100644 --- a/kpacman/keys.cpp +++ b/kpacman/keys.cpp @@ -1,11 +1,11 @@ #include <kapp.h> -#include <kconfig.h> -#include <klocale.h> +#include <tdeconfig.h> +#include <tdelocale.h> #include <kstddirs.h> #include <keys.h> -#include <kaccel.h> +#include <tdeaccel.h> #include <ntqpushbt.h> #include <ntqlabel.h> #include <ntqframe.h> @@ -16,7 +16,7 @@ Keys::Keys( TQWidget *parent, const char *name) : TQDialog( parent, name, TRUE ) { - KStandardDirs *dirs = KGlobal::dirs(); + TDEStandardDirs *dirs = TDEGlobal::dirs(); TQPushButton *okButton = new TQPushButton(this); okButton->setText(i18n("Ok")); @@ -91,7 +91,7 @@ Keys::Keys( TQWidget *parent, const char *name) void Keys::keyPressEvent( TQKeyEvent *e ) { uint kCode = e->key() & ~(SHIFT | CTRL | ALT); - TQString string = KAccel::keyToString(kCode); + TQString string = TDEAccel::keyToString(kCode); if (lab != 0) { if ( string.isNull() ) diff --git a/kpacman/keys.h b/kpacman/keys.h index ca27d99..e2fb5ea 100644 --- a/kpacman/keys.h +++ b/kpacman/keys.h @@ -11,7 +11,7 @@ #include <ntqlabel.h> #include <ntqstring.h> -#include <kaccel.h> +#include <tdeaccel.h> class Keys : public TQDialog { diff --git a/kpacman/kpacman.cpp b/kpacman/kpacman.cpp index 7ee12c3..4b87122 100644 --- a/kpacman/kpacman.cpp +++ b/kpacman/kpacman.cpp @@ -32,7 +32,7 @@ #define ID_STATUS_MSG 1 -KpacmanApp::KpacmanApp(TQWidget *, const char *name) : KMainWindow(0, name) +KpacmanApp::KpacmanApp(TQWidget *, const char *name) : TDEMainWindow(0, name) { config=kapp->config(); @@ -75,16 +75,16 @@ void KpacmanApp::initActions() showMenuBar = KStdAction::showMenubar(this, SLOT(slotShowMenuBar()), actionCollection()); showToolBar = KStdAction::showToolbar(this, SLOT(slotShowToolBar()), actionCollection()); showStatusBar = KStdAction::showStatusbar(this, SLOT(slotShowStatusBar()), actionCollection()); - showMouseCursor = new KToggleAction(i18n("Show Mouse&cursor"), 0, + showMouseCursor = new TDEToggleAction(i18n("Show Mouse&cursor"), 0, this, SLOT(slotShowMouseCursor()), actionCollection(), "options_show_mousecursor"); - selectGraphicScheme = new KActionMenu(i18n("&Select graphic scheme"), actionCollection(), + selectGraphicScheme = new TDEActionMenu(i18n("&Select graphic scheme"), actionCollection(), "options_select_graphic_scheme"); KStdAction::keyBindings(this, SLOT(slotKeyBindings()), actionCollection()); - focusOutPause = new KToggleAction(i18n("Pause in &Background"), 0, + focusOutPause = new TDEToggleAction(i18n("Pause in &Background"), 0, this, SLOT(slotFocusOutPause()), actionCollection(), "options_focus_out_pause"); - focusInContinue = new KToggleAction(i18n("Continue in &Foreground"), 0, + focusInContinue = new TDEToggleAction(i18n("Continue in &Foreground"), 0, this, SLOT(slotFocusInContinue()), actionCollection(), "options_focus_in_continue"); @@ -109,7 +109,7 @@ void KpacmanApp::initStatusBar() void KpacmanApp::initView() { //////////////////////////////////////////////////////////////////// - // create the main widget here that is managed by KMainWindow's view-region and + // create the main widget here that is managed by TDEMainWindow's view-region and // connect the widget. view = new KpacmanView(this); @@ -167,8 +167,8 @@ void KpacmanApp::readOptions() slotFocusInContinue(); // bar position settings - KToolBar::BarPosition toolBarPos; - toolBarPos = (KToolBar::BarPosition) config->readNumEntry("ToolBarPos", KToolBar::Top); + TDEToolBar::BarPosition toolBarPos; + toolBarPos = (TDEToolBar::BarPosition) config->readNumEntry("ToolBarPos", TDEToolBar::Top); toolBar("mainToolBar")->setBarPos(toolBarPos); TQSize size = config->readSizeEntry("Geometry"); @@ -196,7 +196,7 @@ void KpacmanApp::readSchemes() schemeID.resize(schemeCount); schemeMode.resize(schemeCount); - schemesPopup = new TQList<KPopupMenu>; + schemesPopup = new TQList<TDEPopupMenu>; schemesPopup->setAutoDelete(true); modesPopup = selectGraphicScheme->popupMenu(); @@ -216,7 +216,7 @@ void KpacmanApp::readSchemes() description = config->readEntry("Description", group); - KPopupMenu *p = new KPopupMenu; + TDEPopupMenu *p = new TDEPopupMenu; p->setCheckable(true); connect(p, SIGNAL(activated(int)), this, SLOT(slotSchemeActivated(int))); schemesPopup->append(p); diff --git a/kpacman/kpacman.desktop b/kpacman/kpacman.desktop index 399ab77..97c88c3 100644 --- a/kpacman/kpacman.desktop +++ b/kpacman/kpacman.desktop @@ -4,7 +4,7 @@ Type=Application Exec=kpacman -caption "%c" %i %m Icon=kpacman.png MiniIcon=kpacman.png -DocPath=kpacman/index.html +X-DocPath=kpacman/index.html Comment= Comment[de]= Terminal=0 diff --git a/kpacman/kpacman.h b/kpacman/kpacman.h index 04210af..c6ab495 100644 --- a/kpacman/kpacman.h +++ b/kpacman/kpacman.h @@ -30,11 +30,11 @@ //include files for KDE #include <kapp.h> -#include <kmainwindow.h> -#include <kpopupmenu.h> -#include <kaction.h> -#include <klocale.h> -#include <kmenubar.h> +#include <tdemainwindow.h> +#include <tdepopupmenu.h> +#include <tdeaction.h> +#include <tdelocale.h> +#include <tdemenubar.h> // application specific includes #include "kpacmanview.h" @@ -49,7 +49,7 @@ class KpacmanView; /** * The base class for Kpacman application. */ -class KpacmanApp : public KMainWindow +class KpacmanApp : public TDEMainWindow { Q_OBJECT @@ -72,7 +72,7 @@ class KpacmanApp : public KMainWindow /** read graphic schemes and build menu items for selection */ void readSchemes(); - /** initializes the KActions of the application */ + /** initializes the TDEActions of the application */ void initActions(); /** sets up the statusbar for the main window by initialzing a statuslabel. */ @@ -144,7 +144,7 @@ class KpacmanApp : public KMainWindow private: /** the configuration object of the application */ - KConfig *config; + TDEConfig *config; /** view is the main widget which represents your working area. The View * class should handle all events of the view widget. It is kept empty so * you can create your view according to your application's needs by @@ -152,25 +152,25 @@ class KpacmanApp : public KMainWindow */ KpacmanView *view; - // KAction pointers to enable/disable actions - KAction* gameNew; - KToggleAction* gamePause; - KAction* gameHighscores; - KAction* gameQuit; - KToggleAction* showMenuBar; - KToggleAction* showToolBar; - KToggleAction* showStatusBar; - KToggleAction* showMouseCursor; - KToggleAction* focusOutPause; - KToggleAction* focusInContinue; - KActionMenu* selectGraphicScheme; + // TDEAction pointers to enable/disable actions + TDEAction* gameNew; + TDEToggleAction* gamePause; + TDEAction* gameHighscores; + TDEAction* gameQuit; + TDEToggleAction* showMenuBar; + TDEToggleAction* showToolBar; + TDEToggleAction* showStatusBar; + TDEToggleAction* showMouseCursor; + TDEToggleAction* focusOutPause; + TDEToggleAction* focusInContinue; + TDEActionMenu* selectGraphicScheme; // active scheme/mode int scheme; int mode; - KPopupMenu *modesPopup; // KAction main scheme selection menu - TQList<KPopupMenu> *schemesPopup; // submenus for selecting scheme + TDEPopupMenu *modesPopup; // TDEAction main scheme selection menu + TQList<TDEPopupMenu> *schemesPopup; // submenus for selecting scheme // ID's of the menuitem(s) for finding/selecting scheme by id TQArray<int> modeID; diff --git a/kpacman/kpacmanview.cpp b/kpacman/kpacmanview.cpp index b1931ec..1999c41 100644 --- a/kpacman/kpacmanview.cpp +++ b/kpacman/kpacmanview.cpp @@ -20,7 +20,7 @@ // include files for KDE #include <kapp.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstddirs.h> // application specific includes @@ -51,7 +51,7 @@ KpacmanView::~KpacmanView() void KpacmanView::confMisc(bool defGroup) { - KStandardDirs *dirs = KGlobal::dirs(); + TDEStandardDirs *dirs = TDEGlobal::dirs(); TQString findPath; if (defGroup || kapp->config()->hasKey("Font")) { diff --git a/kpacman/main.cpp b/kpacman/main.cpp index 48ebf48..14ac8e0 100644 --- a/kpacman/main.cpp +++ b/kpacman/main.cpp @@ -15,9 +15,9 @@ * * ***************************************************************************/ -#include <kcmdlineargs.h> -#include <kaboutdata.h> -#include <klocale.h> +#include <tdecmdlineargs.h> +#include <tdeaboutdata.h> +#include <tdelocale.h> #include "kpacman.h" @@ -31,7 +31,7 @@ static const char *description = "the last 14 years of her friendship\n" "and Christine Nickel for the 'K' in my life."); -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { 0, 0, 0 } // INSERT YOUR COMMANDLINE OPTIONS HERE @@ -40,14 +40,14 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { - KAboutData aboutData( "kpacman", I18N_NOOP("Kpacman"), - VERSION, description, KAboutData::License_GPL, + TDEAboutData aboutData( "kpacman", I18N_NOOP("Kpacman"), + VERSION, description, TDEAboutData::License_GPL, "(c) 1998-2003, Jörg Thönnissen", 0, 0, "joe@dsite.de"); aboutData.addAuthor("Jörg Thönnissen",0, "joe@dsite.de"); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); // Add our own options. + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. - KApplication app; + TDEApplication app; KpacmanApp *kpacman = new KpacmanApp(); kpacman->show(); diff --git a/kpacman/painter.cpp b/kpacman/painter.cpp index 9060620..b585df3 100644 --- a/kpacman/painter.cpp +++ b/kpacman/painter.cpp @@ -1,5 +1,5 @@ #include <kapp.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstddirs.h> #include <ntqcolor.h> @@ -759,7 +759,7 @@ void Painter::fillPixmapName(TQStrList &pixmapName) pixmap = list.at(i); if (pixmap.left(1) != "/" && pixmap.left(1) != "~") - pixmap = KGlobal::dirs()->findResource("appdata", pixmapDirectory+pixmap); + pixmap = TDEGlobal::dirs()->findResource("appdata", pixmapDirectory+pixmap); fileInfo.setFile(pixmap); if (!fileInfo.isReadable() || !fileInfo.isFile()) diff --git a/kpacman/painter.h b/kpacman/painter.h index ebd5bba..d44705c 100644 --- a/kpacman/painter.h +++ b/kpacman/painter.h @@ -2,7 +2,7 @@ #define PAINTER_H #include <kapp.h> -#include <klocale.h> +#include <tdelocale.h> #include <ntqpixmap.h> #include <ntqbitmap.h> diff --git a/kpacman/referee.cpp b/kpacman/referee.cpp index bc8660b..efe0d12 100644 --- a/kpacman/referee.cpp +++ b/kpacman/referee.cpp @@ -1,5 +1,5 @@ #include <kapp.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstddirs.h> #include <referee.h> @@ -11,7 +11,7 @@ #include <ntqcolor.h> #include <ntqkeycode.h> #include <ntqfileinfo.h> -#include <kaccel.h> +#include <tdeaccel.h> #include "board.h" #include "pacman.h" @@ -409,19 +409,19 @@ void Referee::initKeys() { TQString up("Up"); up = kapp->config()->readEntry("upKey", (const char*) up); - UpKey = KAccel::stringToKey(up); + UpKey = TDEAccel::stringToKey(up); TQString down("Down"); down = kapp->config()->readEntry("downKey", (const char*) down); - DownKey = KAccel::stringToKey(down); + DownKey = TDEAccel::stringToKey(down); TQString left("Left"); left = kapp->config()->readEntry("leftKey", (const char*) left); - LeftKey = KAccel::stringToKey(left); + LeftKey = TDEAccel::stringToKey(left); TQString right("Right"); right = kapp->config()->readEntry("rightKey", (const char*) right); - RightKey = KAccel::stringToKey(right); + RightKey = TDEAccel::stringToKey(right); } void Referee::fillArray(TQArray<int> &array, TQString values, int max) @@ -490,7 +490,7 @@ void Referee::fillMapName() map = list.at(i); if (map.left(1) != "/" && map.left(1) != "~") - map = KGlobal::dirs()->findResource("appdata", mapDirectory+map); + map = TDEGlobal::dirs()->findResource("appdata", mapDirectory+map); fileInfo.setFile(map); if (!fileInfo.isReadable()) diff --git a/kpacman/score.cpp b/kpacman/score.cpp index aa2045a..ffa4ecc 100644 --- a/kpacman/score.cpp +++ b/kpacman/score.cpp @@ -3,12 +3,12 @@ #include <stdlib.h> #include <ctype.h> -#include <kaccel.h> +#include <tdeaccel.h> #include <kapp.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstddirs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <ntqpixmap.h> #include <ntqstring.h> #include <ntqdstream.h> @@ -252,19 +252,19 @@ void Score::initKeys() { TQString up("Up"); up = kapp->config()->readEntry("upKey", (const char*) up); - UpKey = KAccel::stringToKey(up); + UpKey = TDEAccel::stringToKey(up); TQString down("Down"); down = kapp->config()->readEntry("downKey", (const char*) down); - DownKey = KAccel::stringToKey(down); + DownKey = TDEAccel::stringToKey(down); TQString left("Left"); left = kapp->config()->readEntry("leftKey", (const char*) left); - LeftKey = KAccel::stringToKey(left); + LeftKey = TDEAccel::stringToKey(left); TQString right("Right"); right = kapp->config()->readEntry("rightKey", (const char*) right); - RightKey = KAccel::stringToKey(right); + RightKey = TDEAccel::stringToKey(right); } void Score::confTiming(bool defGroup) @@ -584,7 +584,7 @@ int Score::y(float row) /** * Ermittelt die zu benutzende "highscore"-Datei, in die auch geschrieben werden kann. - * Über den "highscoreFilePath"-KConfig-Eintrag, kann abweichend von der Standardlokation + * Über den "highscoreFilePath"-TDEConfig-Eintrag, kann abweichend von der Standardlokation * der Standort der "highscore"-Datei spezifiziert werden. * Wenn die systemweite "highscore"-Datei nicht beschrieben werden kann, wird mit einer * privaten Datei gearbeitet. @@ -595,14 +595,14 @@ TQFileInfo Score::locateHighscoreFilePath() TQStringList systemHighscoreDirs; // Schreibfähige "private" highscore-Datei ermitteln für den fallback. - privateHighscoreFileInfo.setFile(KGlobal::dirs()->saveLocation("appdata")+highscoreName); + privateHighscoreFileInfo.setFile(TDEGlobal::dirs()->saveLocation("appdata")+highscoreName); // FilePath aus der Konfigurationsdatei benutzen systemHighscoreFileInfo.setFile(kapp->config()->readEntry("HighscoreFilePath")); // Kein Wert aus der Konfiguration erhalten, dann die "system"-Datei suchen. if (systemHighscoreFileInfo.filePath().isEmpty()) - systemHighscoreDirs = KGlobal::dirs()->resourceDirs("appdata"); + systemHighscoreDirs = TDEGlobal::dirs()->resourceDirs("appdata"); else systemHighscoreDirs = TQStringList(systemHighscoreFileInfo.filePath()); diff --git a/kpacman/score.h b/kpacman/score.h index a6bc1de..d26af2e 100644 --- a/kpacman/score.h +++ b/kpacman/score.h @@ -70,7 +70,7 @@ private: /** * Ermittelt die zu benutzende "highscore"-Datei, in die auch geschrieben werden kann. - * Über den "highscoreFilePath"-KConfig-Eintrag, kann abweichend von der Standardlokation + * Über den "highscoreFilePath"-TDEConfig-Eintrag, kann abweichend von der Standardlokation * der Standort der "highscore"-Datei spezifiziert werden. * Wenn die systemweite "globale" Datei nicht beschrieben werden kann, wird mit einer * privaten Datei gearbeitet. diff --git a/kpacman/status.cpp b/kpacman/status.cpp index 8ccb7ab..6143b00 100644 --- a/kpacman/status.cpp +++ b/kpacman/status.cpp @@ -1,5 +1,5 @@ #include <kapp.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstddirs.h> #include <status.h> @@ -199,7 +199,7 @@ void Status::fillPixmapName(TQStrList &pixmapName) pixmap = list.at(i); if (pixmap.left(1) != "/" && pixmap.left(1) != "~") - pixmap = KGlobal::dirs()->findResource("appdata", pixmapDirectory+pixmap); + pixmap = TDEGlobal::dirs()->findResource("appdata", pixmapDirectory+pixmap); fileInfo.setFile(pixmap); if (!fileInfo.isReadable() || !fileInfo.isFile()) diff --git a/kpacman/status.h b/kpacman/status.h index 6eeb4ac..6428043 100644 --- a/kpacman/status.h +++ b/kpacman/status.h @@ -6,7 +6,7 @@ #endif #include <kapp.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <ntqwidget.h> #include <ntqpixmap.h> diff --git a/maps/Makefile.am b/maps/Makefile.am index 9dc0290..6755a64 100644 --- a/maps/Makefile.am +++ b/maps/Makefile.am @@ -1,5 +1,5 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## SUBDIRS = mspacman -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ diff --git a/maps/Makefile.in b/maps/Makefile.in index 7e2998f..8b39618 100644 --- a/maps/Makefile.in +++ b/maps/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -111,16 +111,16 @@ LIBXINERAMA = @LIBXINERAMA@ LIBZ = @LIBZ@ LIB_KAB = @LIB_KAB@ LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ +LIB_TDECORE = @LIB_TDECORE@ +LIB_TDEPRINT = @LIB_TDEPRINT@ +LIB_TDEUI = @LIB_TDEUI@ LIB_KFILE = @LIB_KFILE@ LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIO = @LIB_KIO@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ +LIB_TDEHTML = @LIB_TDEHTML@ +LIB_TDEIO = @LIB_TDEIO@ +LIB_TDEPARTS = @LIB_TDEPARTS@ +LIB_TDESPELL = @LIB_TDESPELL@ +LIB_TDESYCOCA = @LIB_TDESYCOCA@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ @@ -535,7 +535,7 @@ uninstall-info: uninstall-info-recursive uninstall-info-recursive uninstall-recursive -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/maps/mspacman/Makefile.am b/maps/mspacman/Makefile.am index a6aedf8..60fba6d 100644 --- a/maps/mspacman/Makefile.am +++ b/maps/mspacman/Makefile.am @@ -1,4 +1,4 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## EXTRA_DIST = map01 map02 map03 map04 @@ -19,4 +19,4 @@ uninstall-local: -rm -f $(kde_datadir)/kpacman/maps/mspacman/map03 -rm -f $(kde_datadir)/kpacman/maps/mspacman/map04 -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ diff --git a/maps/mspacman/Makefile.in b/maps/mspacman/Makefile.in index 852b408..f99b42d 100644 --- a/maps/mspacman/Makefile.in +++ b/maps/mspacman/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -111,16 +111,16 @@ LIBXINERAMA = @LIBXINERAMA@ LIBZ = @LIBZ@ LIB_KAB = @LIB_KAB@ LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ +LIB_TDECORE = @LIB_TDECORE@ +LIB_TDEPRINT = @LIB_TDEPRINT@ +LIB_TDEUI = @LIB_TDEUI@ LIB_KFILE = @LIB_KFILE@ LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIO = @LIB_KIO@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ +LIB_TDEHTML = @LIB_TDEHTML@ +LIB_TDEIO = @LIB_TDEIO@ +LIB_TDEPARTS = @LIB_TDEPARTS@ +LIB_TDESPELL = @LIB_TDESPELL@ +LIB_TDESYCOCA = @LIB_TDESYCOCA@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ @@ -433,7 +433,7 @@ uninstall-local: #>+ 1 -rm -f $(DESTDIR)$(kde_datadir)/kpacman/maps/mspacman/map04 -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/pics/Makefile.am b/pics/Makefile.am index a8f0d52..febb3a5 100644 --- a/pics/Makefile.am +++ b/pics/Makefile.am @@ -1,4 +1,4 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## SUBDIRS = mspacman mspacman-tiny tiny zacman @@ -50,4 +50,4 @@ uninstall-local: -rm -f $(kde_datadir)/kpacman/pics/up.xpm -rm -f $(kde_datadir)/kpacman/pics/wall.xpm -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ diff --git a/pics/Makefile.in b/pics/Makefile.in index d8e7925..dc5a57e 100644 --- a/pics/Makefile.in +++ b/pics/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -111,16 +111,16 @@ LIBXINERAMA = @LIBXINERAMA@ LIBZ = @LIBZ@ LIB_KAB = @LIB_KAB@ LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ +LIB_TDECORE = @LIB_TDECORE@ +LIB_TDEPRINT = @LIB_TDEPRINT@ +LIB_TDEUI = @LIB_TDEUI@ LIB_KFILE = @LIB_KFILE@ LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIO = @LIB_KIO@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ +LIB_TDEHTML = @LIB_TDEHTML@ +LIB_TDEIO = @LIB_TDEIO@ +LIB_TDEPARTS = @LIB_TDEPARTS@ +LIB_TDESPELL = @LIB_TDESPELL@ +LIB_TDESYCOCA = @LIB_TDESYCOCA@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ @@ -667,7 +667,7 @@ uninstall-local: #>+ 1 -rm -f $(DESTDIR)$(kde_datadir)/kpacman/pics/wall.xpm -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/pics/mspacman-tiny/Makefile.am b/pics/mspacman-tiny/Makefile.am index d285b90..2e845c5 100644 --- a/pics/mspacman-tiny/Makefile.am +++ b/pics/mspacman-tiny/Makefile.am @@ -1,4 +1,4 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## EXTRA_DIST = dying.xpm fruit.xpm fruitscore.xpm lifes.xpm pacman.xpm point.xpm point02.xpm point03.xpm prison.xpm prison02.xpm prison03.xpm prison04.xpm prison05.xpm prison06.xpm switch.xpm switch02.xpm switch03.xpm wall.xpm wall02.xpm wall03.xpm wall04.xpm wall05.xpm wall06.xpm @@ -76,4 +76,4 @@ uninstall-local: -rm -f $(kde_datadir)/kpacman/pics/mspacman-tiny/wall05.xpm -rm -f $(kde_datadir)/kpacman/pics/mspacman-tiny/wall06.xpm -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ diff --git a/pics/mspacman-tiny/Makefile.in b/pics/mspacman-tiny/Makefile.in index bdcca6a..b01c32c 100644 --- a/pics/mspacman-tiny/Makefile.in +++ b/pics/mspacman-tiny/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -111,16 +111,16 @@ LIBXINERAMA = @LIBXINERAMA@ LIBZ = @LIBZ@ LIB_KAB = @LIB_KAB@ LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ +LIB_TDECORE = @LIB_TDECORE@ +LIB_TDEPRINT = @LIB_TDEPRINT@ +LIB_TDEUI = @LIB_TDEUI@ LIB_KFILE = @LIB_KFILE@ LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIO = @LIB_KIO@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ +LIB_TDEHTML = @LIB_TDEHTML@ +LIB_TDEIO = @LIB_TDEIO@ +LIB_TDEPARTS = @LIB_TDEPARTS@ +LIB_TDESPELL = @LIB_TDESPELL@ +LIB_TDESYCOCA = @LIB_TDESYCOCA@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ @@ -604,7 +604,7 @@ uninstall-local: #>+ 1 -rm -f $(DESTDIR)$(kde_datadir)/kpacman/pics/mspacman-tiny/wall06.xpm -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/pics/mspacman/Makefile.am b/pics/mspacman/Makefile.am index 41d0573..822f4f0 100644 --- a/pics/mspacman/Makefile.am +++ b/pics/mspacman/Makefile.am @@ -1,4 +1,4 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## EXTRA_DIST = dying.xpm fruit.xpm fruitscore.xpm lifes.xpm pacman.xpm point.xpm point02.xpm point03.xpm prison.xpm prison02.xpm prison03.xpm prison04.xpm prison05.xpm prison06.xpm switch.xpm switch02.xpm switch03.xpm wall.xpm wall02.xpm wall03.xpm wall04.xpm wall05.xpm wall06.xpm @@ -76,4 +76,4 @@ uninstall-local: -rm -f $(kde_datadir)/kpacman/pics/mspacman/wall05.xpm -rm -f $(kde_datadir)/kpacman/pics/mspacman/wall06.xpm -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ diff --git a/pics/mspacman/Makefile.in b/pics/mspacman/Makefile.in index b05a014..95bb8fa 100644 --- a/pics/mspacman/Makefile.in +++ b/pics/mspacman/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -111,16 +111,16 @@ LIBXINERAMA = @LIBXINERAMA@ LIBZ = @LIBZ@ LIB_KAB = @LIB_KAB@ LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ +LIB_TDECORE = @LIB_TDECORE@ +LIB_TDEPRINT = @LIB_TDEPRINT@ +LIB_TDEUI = @LIB_TDEUI@ LIB_KFILE = @LIB_KFILE@ LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIO = @LIB_KIO@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ +LIB_TDEHTML = @LIB_TDEHTML@ +LIB_TDEIO = @LIB_TDEIO@ +LIB_TDEPARTS = @LIB_TDEPARTS@ +LIB_TDESPELL = @LIB_TDESPELL@ +LIB_TDESYCOCA = @LIB_TDESYCOCA@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ @@ -604,7 +604,7 @@ uninstall-local: #>+ 1 -rm -f $(DESTDIR)$(kde_datadir)/kpacman/pics/mspacman/wall06.xpm -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/pics/tiny/Makefile.am b/pics/tiny/Makefile.am index b9e7b79..e0c7ae9 100644 --- a/pics/tiny/Makefile.am +++ b/pics/tiny/Makefile.am @@ -1,4 +1,4 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## EXTRA_DIST = dying.xpm eyes.xpm fruit.xpm lifes.xpm monster.xpm pacman.xpm point.xpm prison.xpm switch.xpm wall.xpm @@ -37,4 +37,4 @@ uninstall-local: -rm -f $(kde_datadir)/kpacman/pics/tiny/switch.xpm -rm -f $(kde_datadir)/kpacman/pics/tiny/wall.xpm -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ diff --git a/pics/tiny/Makefile.in b/pics/tiny/Makefile.in index 120532d..b506f8d 100644 --- a/pics/tiny/Makefile.in +++ b/pics/tiny/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -111,16 +111,16 @@ LIBXINERAMA = @LIBXINERAMA@ LIBZ = @LIBZ@ LIB_KAB = @LIB_KAB@ LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ +LIB_TDECORE = @LIB_TDECORE@ +LIB_TDEPRINT = @LIB_TDEPRINT@ +LIB_TDEUI = @LIB_TDEUI@ LIB_KFILE = @LIB_KFILE@ LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIO = @LIB_KIO@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ +LIB_TDEHTML = @LIB_TDEHTML@ +LIB_TDEIO = @LIB_TDEIO@ +LIB_TDEPARTS = @LIB_TDEPARTS@ +LIB_TDESPELL = @LIB_TDESPELL@ +LIB_TDESYCOCA = @LIB_TDESYCOCA@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ @@ -487,7 +487,7 @@ uninstall-local: #>+ 1 -rm -f $(DESTDIR)$(kde_datadir)/kpacman/pics/tiny/wall.xpm -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/pics/zacman/Makefile.am b/pics/zacman/Makefile.am index 5bc45ff..15f523d 100644 --- a/pics/zacman/Makefile.am +++ b/pics/zacman/Makefile.am @@ -1,4 +1,4 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## EXTRA_DIST = dying.xpm eyes.xpm lifes.xpm monster.xpm pacman.xpm point.xpm switch.xpm wall.xpm @@ -31,4 +31,4 @@ uninstall-local: -rm -f $(kde_datadir)/kpacman/pics/zacman/switch.xpm -rm -f $(kde_datadir)/kpacman/pics/zacman/wall.xpm -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ diff --git a/pics/zacman/Makefile.in b/pics/zacman/Makefile.in index 6f2f45b..4d13fc8 100644 --- a/pics/zacman/Makefile.in +++ b/pics/zacman/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -111,16 +111,16 @@ LIBXINERAMA = @LIBXINERAMA@ LIBZ = @LIBZ@ LIB_KAB = @LIB_KAB@ LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ +LIB_TDECORE = @LIB_TDECORE@ +LIB_TDEPRINT = @LIB_TDEPRINT@ +LIB_TDEUI = @LIB_TDEUI@ LIB_KFILE = @LIB_KFILE@ LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIO = @LIB_KIO@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ +LIB_TDEHTML = @LIB_TDEHTML@ +LIB_TDEIO = @LIB_TDEIO@ +LIB_TDEPARTS = @LIB_TDEPARTS@ +LIB_TDESPELL = @LIB_TDESPELL@ +LIB_TDESYCOCA = @LIB_TDESYCOCA@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ @@ -469,7 +469,7 @@ uninstall-local: #>+ 1 -rm -f $(DESTDIR)$(kde_datadir)/kpacman/pics/zacman/wall.xpm -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/po/Makefile.am b/po/Makefile.am index 50aeed8..630dedf 100644 --- a/po/Makefile.am +++ b/po/Makefile.am @@ -1,6 +1,6 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ POFILES = AUTO diff --git a/po/Makefile.in b/po/Makefile.in index 272224c..24517c8 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -111,16 +111,16 @@ LIBXINERAMA = @LIBXINERAMA@ LIBZ = @LIBZ@ LIB_KAB = @LIB_KAB@ LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ +LIB_TDECORE = @LIB_TDECORE@ +LIB_TDEPRINT = @LIB_TDEPRINT@ +LIB_TDEUI = @LIB_TDEUI@ LIB_KFILE = @LIB_KFILE@ LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIO = @LIB_KIO@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ +LIB_TDEHTML = @LIB_TDEHTML@ +LIB_TDEIO = @LIB_TDEIO@ +LIB_TDEPARTS = @LIB_TDEPARTS@ +LIB_TDESPELL = @LIB_TDESPELL@ +LIB_TDESYCOCA = @LIB_TDESYCOCA@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ @@ -237,7 +237,7 @@ target_vendor = @target_vendor@ x_includes = @x_includes@ x_libraries = @x_libraries@ -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ #>- POFILES = AUTO #>+ 2 POFILES = de.po es.po pt.po sv.po @@ -340,5 +340,5 @@ msgstr "" #~ msgid " PAUSED" #~ msgstr "PARADO" -#~ msgid "KConfig error ??\n" -#~ msgstr "Erro do KConfig ??\n" +#~ msgid "TDEConfig error ??\n" +#~ msgstr "Erro do TDEConfig ??\n" @@ -329,8 +329,8 @@ msgstr "Ingen Tangent" #~ msgid "Cancel" #~ msgstr "Avbryt" -#~ msgid "KConfig error ??\n" -#~ msgstr "KConfig problem ??\n" +#~ msgid "TDEConfig error ??\n" +#~ msgstr "TDEConfig problem ??\n" #~ msgid "&Quit" #~ msgstr "&Avsluta" |