31 files changed, 142 insertions, 142 deletions
diff --git a/AUTHORS b/AUTHORS
index 5b24c1d..7cce135 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1 +1 @@
-Michal Rudolf <[email protected]>
+Michal Rudolf <[email protected]>
diff --git a/README b/README
index 0be4c3d..be2c620 100644
--- a/README
+++ b/README
@@ -14,6 +14,6 @@ Spelling and grammar corrections are most welcomed, too, as well as
 programming suggestions (this is my first KDE project so far).
 
 My address: 
-Michal Rudolf <[email protected]>
+Michal Rudolf <[email protected]>
 
 KnowIt homepage: http://knowit.sourceforge.net
diff --git a/acinclude.m4 b/acinclude.m4
index 9bc2310..d2bc293 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -23,8 +23,8 @@ dnl IMPORTANT NOTE:
 dnl Please do not modify this file unless you expect your modifications to be
 dnl carried into every other module in the repository. 
 dnl
-dnl Single-module modifications are best placed in configure.in for kdelibs
-dnl and kdebase or configure.in.in if present.
+dnl Single-module modifications are best placed in configure.in for tdelibs
+dnl and tdebase or configure.in.in if present.
 
 # KDE_PATH_X_DIRECT
 dnl Internal subroutine of AC_PATH_X.
@@ -103,41 +103,41 @@ ac_x_libraries=],
 [LIBS="$ac_save_LIBS"
 # First see if replacing the include by lib works.
 # Check X11 before X11Rn because it is often a symlink to the current release.
-for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
-    /usr/X11/lib${kdelibsuff}           \
-    /usr/X11R6/lib${kdelibsuff}         \
-    /usr/X11R5/lib${kdelibsuff}         \
-    /usr/X11R4/lib${kdelibsuff}         \
+for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \
+    /usr/X11/lib${tdelibsuff}           \
+    /usr/X11R6/lib${tdelibsuff}         \
+    /usr/X11R5/lib${tdelibsuff}         \
+    /usr/X11R4/lib${tdelibsuff}         \
                                         \
-    /usr/lib${kdelibsuff}/X11           \
-    /usr/lib${kdelibsuff}/X11R6         \
-    /usr/lib${kdelibsuff}/X11R5         \
-    /usr/lib${kdelibsuff}/X11R4         \
+    /usr/lib${tdelibsuff}/X11           \
+    /usr/lib${tdelibsuff}/X11R6         \
+    /usr/lib${tdelibsuff}/X11R5         \
+    /usr/lib${tdelibsuff}/X11R4         \
                                         \
-    /usr/local/X11/lib${kdelibsuff}     \
-    /usr/local/X11R6/lib${kdelibsuff}   \
-    /usr/local/X11R5/lib${kdelibsuff}   \
-    /usr/local/X11R4/lib${kdelibsuff}   \
+    /usr/local/X11/lib${tdelibsuff}     \
+    /usr/local/X11R6/lib${tdelibsuff}   \
+    /usr/local/X11R5/lib${tdelibsuff}   \
+    /usr/local/X11R4/lib${tdelibsuff}   \
                                         \
-    /usr/local/lib${kdelibsuff}/X11     \
-    /usr/local/lib${kdelibsuff}/X11R6   \
-    /usr/local/lib${kdelibsuff}/X11R5   \
-    /usr/local/lib${kdelibsuff}/X11R4   \
+    /usr/local/lib${tdelibsuff}/X11     \
+    /usr/local/lib${tdelibsuff}/X11R6   \
+    /usr/local/lib${tdelibsuff}/X11R5   \
+    /usr/local/lib${tdelibsuff}/X11R4   \
                                         \
-    /usr/X386/lib${kdelibsuff}          \
-    /usr/x386/lib${kdelibsuff}          \
-    /usr/XFree86/lib${kdelibsuff}/X11   \
+    /usr/X386/lib${tdelibsuff}          \
+    /usr/x386/lib${tdelibsuff}          \
+    /usr/XFree86/lib${tdelibsuff}/X11   \
                                         \
-    /usr/lib${kdelibsuff}               \
-    /usr/local/lib${kdelibsuff}         \
-    /usr/unsupported/lib${kdelibsuff}   \
-    /usr/athena/lib${kdelibsuff}        \
-    /usr/local/x11r5/lib${kdelibsuff}   \
-    /usr/lpp/Xamples/lib${kdelibsuff}   \
-    /lib/usr/lib${kdelibsuff}/X11       \
+    /usr/lib${tdelibsuff}               \
+    /usr/local/lib${tdelibsuff}         \
+    /usr/unsupported/lib${tdelibsuff}   \
+    /usr/athena/lib${tdelibsuff}        \
+    /usr/local/x11r5/lib${tdelibsuff}   \
+    /usr/lpp/Xamples/lib${tdelibsuff}   \
+    /lib/usr/lib${tdelibsuff}/X11       \
                                         \
-    /usr/openwin/lib${kdelibsuff}       \
-    /usr/openwin/share/lib${kdelibsuff} \
+    /usr/openwin/lib${tdelibsuff}       \
+    /usr/openwin/share/lib${tdelibsuff} \
     ; \
 do
 dnl Don't even attempt the hair of trying to link an X program!
@@ -367,7 +367,7 @@ if AC_TRY_EVAL(ac_link) && test -s conftest; then
 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
 
@@ -609,9 +609,9 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         if test -x "$KDECONFIG"; then # it can be "compiled"
           kde_libs_prefix=`$KDECONFIG --prefix`
           if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
-               AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
+               AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs.
                           This means it has been moved since you installed it.
-                          This won't work. Please recompile kdelibs for the new prefix.
+                          This won't work. Please recompile tdelibs for the new prefix.
                           ])
            fi
            kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
@@ -910,7 +910,7 @@ mips-sgi-irix6*)
     ac_x_includes="."
   fi
   if test -z "$ac_x_libraries"; then
-    ac_x_libraries="/usr/lib${kdelibsuff}"
+    ac_x_libraries="/usr/lib${tdelibsuff}"
   fi
 esac
 #from now on we use our own again
@@ -1394,7 +1394,7 @@ qt_includes=""
 AC_ARG_WITH(qt-dir,
     AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
     [  ac_qt_includes="$withval"/include
-       ac_qt_libraries="$withval"/lib${kdelibsuff}
+       ac_qt_libraries="$withval"/lib${tdelibsuff}
        ac_qt_bindir="$withval"/bin
     ])
 
@@ -1435,7 +1435,7 @@ ac_qt_includes="$qt_incdir"
 
 qt_libdirs=""
 for dir in $kde_qt_dirs; do
-   qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
+   qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir"
 done
 qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
 if test ! "$ac_qt_libraries" = "NO"; then
@@ -1619,7 +1619,7 @@ rm -f actest.ui actest.cpp
 
 AC_MSG_RESULT([$kde_cv_uic_plugins])
 if test "$kde_cv_uic_plugins" != yes; then
-	AC_MSG_ERROR([you need to install kdelibs first.])
+	AC_MSG_ERROR([you need to install tdelibs first.])
 fi
 fi
 ])
@@ -1750,8 +1750,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
 So, check this please and use another prefix!])
 fi
 
-kde_libdirs="/usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/trinity /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/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}/trinity /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/trinity/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
+test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${tdelibsuff} $KDEDIR $kde_libdirs"
 kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
 AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
 ac_kde_libraries="$kde_libdir"
@@ -1769,7 +1769,7 @@ fi
 if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
 AC_MSG_ERROR([
 I can't find the designer plugins. These are required and should have been installed
-by kdelibs])
+by tdelibs])
 fi
 
 if test -n "$kde_widgetdir"; then
@@ -3066,26 +3066,26 @@ AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch config
 
 AC_DEFUN([KDE_CHECK_LIB64],
 [
-    kdelibsuff=no
+    tdelibsuff=no
     AC_ARG_ENABLE(libsuffix,
         AC_HELP_STRING([--enable-libsuffix],
             [/lib directory suffix (64,32,none[=default])]),
-            kdelibsuff=$enableval)
+            tdelibsuff=$enableval)
     # TODO: add an auto case that compiles a little C app to check
     # where the glibc is
-    if test "$kdelibsuff" = "no"; then
-       kdelibsuff=
+    if test "$tdelibsuff" = "no"; then
+       tdelibsuff=
     fi
-    if test -z "$kdelibsuff"; then
+    if test -z "$tdelibsuff"; then
         AC_MSG_RESULT([not using lib directory suffix])
         AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories)
     else
         if test "$libdir" = '${exec_prefix}/lib'; then
-            libdir="$libdir${kdelibsuff}"
+            libdir="$libdir${tdelibsuff}"
             AC_SUBST([libdir], ["$libdir"])  dnl ugly hack for lib64 platforms
         fi
-        AC_DEFINE_UNQUOTED(KDELIBSUFF, ["\"${kdelibsuff}\""], Suffix for lib directories)
-        AC_MSG_RESULT([using lib directory suffix $kdelibsuff])
+        AC_DEFINE_UNQUOTED(KDELIBSUFF, ["\"${tdelibsuff}\""], Suffix for lib directories)
+        AC_MSG_RESULT([using lib directory suffix $tdelibsuff])
     fi
 ])
 
@@ -4076,7 +4076,7 @@ fi
 
 PYTHONINC=-I$python_incdir
 
-python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
+python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs"
 AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
 if test ! -r $python_libdir/libpython$version.so; then
   AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
@@ -5116,7 +5116,7 @@ ssl_includes=""
 AC_ARG_WITH(ssl-dir,
     AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]),
     [  ac_ssl_includes="$withval"/include
-       ac_ssl_libraries="$withval"/lib$kdelibsuff
+       ac_ssl_libraries="$withval"/lib$tdelibsuff
     ])
 
 want_ssl=yes
@@ -5136,7 +5136,7 @@ AC_CACHE_VAL(ac_cv_have_ssl,
   AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir)
   ac_ssl_includes="$ssl_incdir"
 
-  ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs"
+  ssl_libdirs="/usr/lib$tdelibsuff /usr/local/lib$tdelibsuff /usr/ssl/lib$tdelibsuff /usr/local/ssl/lib$tdelibsuff $libdir $prefix/lib$tdelibsuff $exec_prefix/lib$tdelibsuff $kde_extra_libs"
   if test ! "$ac_ssl_libraries" = "NO"; then
     ssl_libdirs="$ac_ssl_libraries $ssl_libdirs"
   fi
diff --git a/aclocal.m4 b/aclocal.m4
index 8b30979..6632c8f 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -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.
 
 # KDE_PATH_X_DIRECT
 dnl Internal subroutine of AC_PATH_X.
@@ -115,41 +115,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!
@@ -379,7 +379,7 @@ if AC_TRY_EVAL(ac_link) && test -s conftest; then
 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
 
@@ -621,9 +621,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`
@@ -922,7 +922,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
@@ -1406,7 +1406,7 @@ qt_includes=""
 AC_ARG_WITH(qt-dir,
     AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
     [  ac_qt_includes="$withval"/include
-       ac_qt_libraries="$withval"/lib${kdelibsuff}
+       ac_qt_libraries="$withval"/lib${tdelibsuff}
        ac_qt_bindir="$withval"/bin
     ])
 
@@ -1447,7 +1447,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
@@ -1631,7 +1631,7 @@ rm -f actest.ui actest.cpp
 
 AC_MSG_RESULT([$kde_cv_uic_plugins])
 if test "$kde_cv_uic_plugins" != yes; then
-	AC_MSG_ERROR([you need to install kdelibs first.])
+	AC_MSG_ERROR([you need to install tdelibs first.])
 fi
 fi
 ])
@@ -1762,8 +1762,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
 So, check this please and use another prefix!])
 fi
 
-kde_libdirs="/usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/trinity /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/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}/trinity /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/trinity/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
+test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${tdelibsuff} $KDEDIR $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"
@@ -1781,7 +1781,7 @@ fi
 if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
 AC_MSG_ERROR([
 I can't find the designer plugins. These are required and should have been installed
-by kdelibs])
+by tdelibs])
 fi
 
 if test -n "$kde_widgetdir"; then
@@ -3078,26 +3078,26 @@ AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch config
 
 AC_DEFUN([KDE_CHECK_LIB64],
 [
-    kdelibsuff=no
+    tdelibsuff=no
     AC_ARG_ENABLE(libsuffix,
         AC_HELP_STRING([--enable-libsuffix],
             [/lib directory suffix (64,32,none[=default])]),
-            kdelibsuff=$enableval)
+            tdelibsuff=$enableval)
     # TODO: add an auto case that compiles a little C app to check
     # where the glibc is
-    if test "$kdelibsuff" = "no"; then
-       kdelibsuff=
+    if test "$tdelibsuff" = "no"; then
+       tdelibsuff=
     fi
-    if test -z "$kdelibsuff"; then
+    if test -z "$tdelibsuff"; then
         AC_MSG_RESULT([not using lib directory suffix])
         AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories)
     else
         if test "$libdir" = '${exec_prefix}/lib'; then
-            libdir="$libdir${kdelibsuff}"
+            libdir="$libdir${tdelibsuff}"
             AC_SUBST([libdir], ["$libdir"])  dnl ugly hack for lib64 platforms
         fi
-        AC_DEFINE_UNQUOTED(KDELIBSUFF, ["\"${kdelibsuff}\""], Suffix for lib directories)
-        AC_MSG_RESULT([using lib directory suffix $kdelibsuff])
+        AC_DEFINE_UNQUOTED(KDELIBSUFF, ["\"${tdelibsuff}\""], Suffix for lib directories)
+        AC_MSG_RESULT([using lib directory suffix $tdelibsuff])
     fi
 ])
 
@@ -4088,7 +4088,7 @@ fi
 
 PYTHONINC=-I$python_incdir
 
-python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
+python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs"
 AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
 if test ! -r $python_libdir/libpython$version.so; then
   AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
@@ -5128,7 +5128,7 @@ ssl_includes=""
 AC_ARG_WITH(ssl-dir,
     AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]),
     [  ac_ssl_includes="$withval"/include
-       ac_ssl_libraries="$withval"/lib$kdelibsuff
+       ac_ssl_libraries="$withval"/lib$tdelibsuff
     ])
 
 want_ssl=yes
@@ -5148,7 +5148,7 @@ AC_CACHE_VAL(ac_cv_have_ssl,
   AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir)
   ac_ssl_includes="$ssl_incdir"
 
-  ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs"
+  ssl_libdirs="/usr/lib$tdelibsuff /usr/local/lib$tdelibsuff /usr/ssl/lib$tdelibsuff /usr/local/ssl/lib$tdelibsuff $libdir $prefix/lib$tdelibsuff $exec_prefix/lib$tdelibsuff $kde_extra_libs"
   if test ! "$ac_ssl_libraries" = "NO"; then
     ssl_libdirs="$ac_ssl_libraries $ssl_libdirs"
   fi
diff --git a/doc/en/index.docbook b/doc/en/index.docbook
index fd1edb1..0b18609 100644
--- a/doc/en/index.docbook
+++ b/doc/en/index.docbook
@@ -22,7 +22,7 @@
 <othername></othername>
 <surname>Rudolf</surname>
 <affiliation>
-<address><email>[email protected]</email></address>
+<address><email>[email protected]</email></address>
 </affiliation>
 </author>
 </authorgroup>
@@ -159,7 +159,7 @@ on it, and note with appropriate title will be displayed.
 <para>
 Program and documentation:
 </para>
-<para>copyright 2002, 2003, 2004 Michal Rudolf <email>[email protected]</email>
+<para>copyright 2002, 2003, 2004 Michal Rudolf <email>[email protected]</email>
 </para>
 &underFDL;   <!-- FDL: do not remove. Commercial development should -->
 &underGPL;   <!-- GPL License -->
diff --git a/knowit.kdevelop b/knowit.kdevelop
index 3c1dec4..81e6af3 100644
--- a/knowit.kdevelop
+++ b/knowit.kdevelop
@@ -1,8 +1,8 @@
 <?xml version = '1.0'?>
-<kdevelop>
+<tdevelop>
   <general>
     <author>Michal Rudolf</author>
-    <email>[email protected]</email>
+    <email>[email protected]</email>
     <version>0.10</version>
     <projectmanagement>KDevKDEAutoProject</projectmanagement>
     <primarylanguage>C++</primarylanguage>
@@ -187,4 +187,4 @@
       <implementationsuffix>.cpp</implementationsuffix>
     </filetemplates>
   </cppsupportpart>
-</kdevelop>
+</tdevelop>
diff --git a/po/pl.po b/po/pl.po
index 5bd0937..e50fb0c 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,7 +1,7 @@
 # translation of pl.po to Polish
 # translation of knowit.po to Polish
 # Copyright (C) 2002,2003, 2004 Free Software Foundation, Inc.
-# Michal Rudolf <[email protected]>, 2002,2004.
+# Michal Rudolf <[email protected]>, 2002,2004.
 # Michal Rudolf <[email protected]>, 2004.
 #
 msgid ""
@@ -767,7 +767,7 @@ msgstr "Michał Rudolf"
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
-msgstr "[email protected]"
+msgstr "[email protected]"
 
 #: notes.cpp:239
 msgid "KnowIt document"
diff --git a/src/knowit.cpp b/src/knowit.cpp
index 5ba35b8..b587824 100644
--- a/src/knowit.cpp
+++ b/src/knowit.cpp
@@ -3,7 +3,7 @@
                              -------------------
     begin                : czw wrz 26 08:27:40 CEST 2002
     copyright            : (C) 2002-2004 by Micha� Rudolf
-    email                : [email protected]
+    email                : [email protected]
  ***************************************************************************/
 
 /***************************************************************************
@@ -31,7 +31,7 @@
 #include <kcmdlineargs.h>
 #include <kcolordialog.h>
 #include <kconfig.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <kedittoolbar.h>
 #include <kfiledialog.h>
 #include <kkeydialog.h>
diff --git a/src/knowit.h b/src/knowit.h
index f14891a..b623bb6 100644
--- a/src/knowit.h
+++ b/src/knowit.h
@@ -3,7 +3,7 @@
                              -------------------
     begin                : czw wrz 26 08:27:40 CEST 2002
     copyright            : (C) 2002-2004 by Micha� Rudolf
-    email                : [email protected]
+    email                : [email protected]
  ***************************************************************************/
 
 /***************************************************************************
diff --git a/src/knowit.lsm b/src/knowit.lsm
index ac510e6..f94acd4 100644
--- a/src/knowit.lsm
+++ b/src/knowit.lsm
@@ -4,8 +4,8 @@ Version:        0.10
 Entered-date:   31 Mar 2004
 Description:    tool for knowledge management
 Keywords:       notes knowledge management tree hierarchy
-Author:         Micha� Rudolf <[email protected]>
-Maintained-by:  Micha� Rudolf <[email protected]>
+Author:         Micha� Rudolf <[email protected]>
+Maintained-by:  Micha� Rudolf <[email protected]>
 Primary-site:   	      
 Home-page:      http://knowit.sourceforge.net
 Original-site:  
diff --git a/src/knowitapp.cpp b/src/knowitapp.cpp
index 16cc68d..d0cc748 100644
--- a/src/knowitapp.cpp
+++ b/src/knowitapp.cpp
@@ -3,7 +3,7 @@
                              -------------------
     begin                : wto maj 20 2003
     copyright            : (C) 2003 by Micha� Rudolf
-    email                : [email protected]
+    email                : [email protected]
  ***************************************************************************/
 
 /***************************************************************************
diff --git a/src/knowitapp.h b/src/knowitapp.h
index eb98f58..209ed54 100644
--- a/src/knowitapp.h
+++ b/src/knowitapp.h
@@ -3,7 +3,7 @@
                              -------------------
     begin                : wto maj 20 2003
     copyright            : (C) 2003 by Micha� Rudolf
-    email                : [email protected]
+    email                : [email protected]
  ***************************************************************************/
 
 /***************************************************************************
diff --git a/src/knowitchooser.cpp b/src/knowitchooser.cpp
index bdffb7f..a17bbd8 100644
--- a/src/knowitchooser.cpp
+++ b/src/knowitchooser.cpp
@@ -3,7 +3,7 @@
                              -------------------
     begin                : pi? lut 14 2003
     copyright            : (C) 2003 by Micha? Rudolf
-    email                : [email protected]
+    email                : [email protected]
  ***************************************************************************/
 
 /***************************************************************************
diff --git a/src/knowitchooser.h b/src/knowitchooser.h
index 1b60089..71fe4d1 100644
--- a/src/knowitchooser.h
+++ b/src/knowitchooser.h
@@ -3,7 +3,7 @@
                              -------------------
     begin                : pi? lut 14 2003
     copyright            : (C) 2003 by Micha? Rudolf
-    email                : [email protected]
+    email                : [email protected]
  ***************************************************************************/
 
 /***************************************************************************
diff --git a/src/knowitedit.cpp b/src/knowitedit.cpp
index 11f2a29..aa17c37 100644
--- a/src/knowitedit.cpp
+++ b/src/knowitedit.cpp
@@ -3,7 +3,7 @@
                              -------------------
     begin                : pi� maj 23 2003
     copyright            : (C) 2003 by Micha� Rudolf
-    email                : [email protected]
+    email                : [email protected]
  ***************************************************************************/
 
 /***************************************************************************
diff --git a/src/knowitedit.h b/src/knowitedit.h
index 8438725..5f5f80d 100644
--- a/src/knowitedit.h
+++ b/src/knowitedit.h
@@ -3,7 +3,7 @@
                              -------------------
     begin                : pi� maj 23 2003
     copyright            : (C) 2003 by Micha� Rudolf
-    email                : [email protected]
+    email                : [email protected]
  ***************************************************************************/
 
 /***************************************************************************
diff --git a/src/knowitlink.cpp b/src/knowitlink.cpp
index e503c25..a137dd2 100644
--- a/src/knowitlink.cpp
+++ b/src/knowitlink.cpp
@@ -3,7 +3,7 @@
                              -------------------
     begin                : pi� cze 27 2003
     copyright            : (C) 2003 by Micha� Rudolf
-    email                : [email protected]
+    email                : [email protected]
  ***************************************************************************/
 
 /***************************************************************************
diff --git a/src/knowitlink.h b/src/knowitlink.h
index a33acad..385d004 100644
--- a/src/knowitlink.h
+++ b/src/knowitlink.h
@@ -3,7 +3,7 @@
                              -------------------
     begin                : pi� cze 27 2003
     copyright            : (C) 2003 by Micha� Rudolf
-    email                : [email protected]
+    email                : [email protected]
  ***************************************************************************/
 
 /***************************************************************************
diff --git a/src/knowitlinks.cpp b/src/knowitlinks.cpp
index 5684a55..fc12f1d 100644
--- a/src/knowitlinks.cpp
+++ b/src/knowitlinks.cpp
@@ -3,7 +3,7 @@
                              -------------------
     begin                : nie gru 21 2003
     copyright            : (C) 2003 by Micha� Rudolf
-    email                : [email protected]
+    email                : [email protected]
  ***************************************************************************/
 
 /***************************************************************************
diff --git a/src/knowitlinks.h b/src/knowitlinks.h
index 5792438..6999699 100644
--- a/src/knowitlinks.h
+++ b/src/knowitlinks.h
@@ -3,7 +3,7 @@
                              -------------------
     begin                : nie gru 21 2003
     copyright            : (C) 2003 by Micha� Rudolf
-    email                : [email protected]
+    email                : [email protected]
  ***************************************************************************/
 
 /***************************************************************************
diff --git a/src/knowitpref.cpp b/src/knowitpref.cpp
index a5edeb1..f48deb0 100644
--- a/src/knowitpref.cpp
+++ b/src/knowitpref.cpp
@@ -3,7 +3,7 @@
                              -------------------
     begin                : czw lis 28 2002
     copyright            : (C) 2002-2004 by Micha� Rudolf
-    email                : [email protected]
+    email                : [email protected]
  ***************************************************************************/
 
 /***************************************************************************
@@ -34,7 +34,7 @@
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <kfontdialog.h>
 #include <klineedit.h>
 #include <kcolorbutton.h>
diff --git a/src/knowitpref.h b/src/knowitpref.h
index 8ec5d86..db6d909 100644
--- a/src/knowitpref.h
+++ b/src/knowitpref.h
@@ -3,7 +3,7 @@
                              -------------------
     begin                : czw lis 28 2002
     copyright            : (C) 2002-2004 by Micha� Rudolf
-    email                : [email protected]
+    email                : [email protected]
  ***************************************************************************/
 
 /***************************************************************************
diff --git a/src/knowittray.cpp b/src/knowittray.cpp
index 057a126..b0b5ba0 100644
--- a/src/knowittray.cpp
+++ b/src/knowittray.cpp
@@ -3,7 +3,7 @@
                              -------------------
     begin                : czw lis 28 2002
     copyright            : (C) 2002-2004 by Micha� Rudolf
-    email                : [email protected]
+    email                : [email protected]
  ***************************************************************************/
 
 /***************************************************************************
diff --git a/src/knowittray.h b/src/knowittray.h
index aa20c72..e050d2f 100644
--- a/src/knowittray.h
+++ b/src/knowittray.h
@@ -3,7 +3,7 @@
                              -------------------
     begin                : czw lis 28 2002
     copyright            : (C) 2002-2004 by Micha� Rudolf
-    email                : [email protected]
+    email                : [email protected]
  ***************************************************************************/
 
 /***************************************************************************
diff --git a/src/knowittree.cpp b/src/knowittree.cpp
index b3ac8ef..a9f285d 100644
--- a/src/knowittree.cpp
+++ b/src/knowittree.cpp
@@ -3,7 +3,7 @@
                              -------------------
     begin                : sob gru 20 2003
     copyright            : (C) 2003 by Micha� Rudolf
-    email                : [email protected]
+    email                : [email protected]
  ***************************************************************************/
 
 /***************************************************************************
diff --git a/src/knowittree.h b/src/knowittree.h
index 4ee08c4..078b281 100644
--- a/src/knowittree.h
+++ b/src/knowittree.h
@@ -3,7 +3,7 @@
                              -------------------
     begin                : sob gru 20 2003
     copyright            : (C) 2003 by Micha� Rudolf
-    email                : [email protected]
+    email                : [email protected]
  ***************************************************************************/
 
 /***************************************************************************
diff --git a/src/main.cpp b/src/main.cpp
index 14734b7..ae1f209 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3,7 +3,7 @@
                              -------------------
     begin                : czw wrz 26 08:27:40 CEST 2002
     copyright            : (C) 2002-2004 by Micha� Rudolf
-    email                : [email protected]
+    email                : [email protected]
  ***************************************************************************/
 
 /***************************************************************************
@@ -35,8 +35,8 @@ int main(int argc, char *argv[])
 {
   KAboutData aboutData( "knowit", I18N_NOOP("KnowIt"),
     VERSION, description, KAboutData::License_GPL,
-    "(C) 2002-2004 Michal Rudolf", 0, 0, "[email protected]");
-  aboutData.addAuthor("Michal Rudolf",0, "[email protected]");
+    "(C) 2002-2004 Michal Rudolf", 0, 0, "[email protected]");
+  aboutData.addAuthor("Michal Rudolf",0, "[email protected]");
   aboutData.setTranslator (I18N_NOOP("_: NAME OF TRANSLATORS\nYour names"),
      I18N_NOOP("_: EMAIL OF TRANSLATORS\nYour emails"));
   
diff --git a/src/notes.cpp b/src/notes.cpp
index 6bf96ab..870c7af 100644
--- a/src/notes.cpp
+++ b/src/notes.cpp
@@ -3,7 +3,7 @@
                              -------------------
     begin                : sob lis 16 2002
     copyright            : (C) 2002-2004 by Micha� Rudolf
-    email                : [email protected]
+    email                : [email protected]
  ***************************************************************************/
 
 /***************************************************************************
diff --git a/src/notes.h b/src/notes.h
index 0092d4f..f5d69f1 100644
--- a/src/notes.h
+++ b/src/notes.h
@@ -3,7 +3,7 @@
                              -------------------
     begin                : sob lis 16 2002
     copyright            : (C) 2002-2004 by Micha� Rudolf
-    email                : [email protected]
+    email                : [email protected]
  ***************************************************************************/
 
 /***************************************************************************
diff --git a/templates/cpp b/templates/cpp
index 296fc68..e34e4b5 100644
--- a/templates/cpp
+++ b/templates/cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2004 by Michal Rudolf                                   *
- *   [email protected]                                                 *
+ *   [email protected]                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/templates/h b/templates/h
index 296fc68..e34e4b5 100644
--- a/templates/h
+++ b/templates/h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2004 by Michal Rudolf                                   *
- *   [email protected]                                                 *
+ *   [email protected]                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *