Initial TDE conversion

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 Single-module modifications are best placed in configure.in for tdelibs
-dnl and kdebase or configure.in.in if present.
+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}/` \
+for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \
-    /usr/X11/lib${kdelibsuff}           \
+    /usr/X11/lib${tdelibsuff}           \
-    /usr/X11R6/lib${kdelibsuff}         \
+    /usr/X11R6/lib${tdelibsuff}         \
-    /usr/X11R5/lib${kdelibsuff}         \
+    /usr/X11R5/lib${tdelibsuff}         \
-    /usr/X11R4/lib${kdelibsuff}         \
+    /usr/X11R4/lib${tdelibsuff}         \
                                         \
-    /usr/lib${kdelibsuff}/X11           \
+    /usr/lib${tdelibsuff}/X11           \
-    /usr/lib${kdelibsuff}/X11R6         \
+    /usr/lib${tdelibsuff}/X11R6         \
-    /usr/lib${kdelibsuff}/X11R5         \
+    /usr/lib${tdelibsuff}/X11R5         \
-    /usr/lib${kdelibsuff}/X11R4         \
+    /usr/lib${tdelibsuff}/X11R4         \
                                         \
-    /usr/local/X11/lib${kdelibsuff}     \
+    /usr/local/X11/lib${tdelibsuff}     \
-    /usr/local/X11R6/lib${kdelibsuff}   \
+    /usr/local/X11R6/lib${tdelibsuff}   \
-    /usr/local/X11R5/lib${kdelibsuff}   \
+    /usr/local/X11R5/lib${tdelibsuff}   \
-    /usr/local/X11R4/lib${kdelibsuff}   \
+    /usr/local/X11R4/lib${tdelibsuff}   \
                                         \
-    /usr/local/lib${kdelibsuff}/X11     \
+    /usr/local/lib${tdelibsuff}/X11     \
-    /usr/local/lib${kdelibsuff}/X11R6   \
+    /usr/local/lib${tdelibsuff}/X11R6   \
-    /usr/local/lib${kdelibsuff}/X11R5   \
+    /usr/local/lib${tdelibsuff}/X11R5   \
-    /usr/local/lib${kdelibsuff}/X11R4   \
+    /usr/local/lib${tdelibsuff}/X11R4   \
                                         \
-    /usr/X386/lib${kdelibsuff}          \
+    /usr/X386/lib${tdelibsuff}          \
-    /usr/x386/lib${kdelibsuff}          \
+    /usr/x386/lib${tdelibsuff}          \
-    /usr/XFree86/lib${kdelibsuff}/X11   \
+    /usr/XFree86/lib${tdelibsuff}/X11   \
                                         \
-    /usr/lib${kdelibsuff}               \
+    /usr/lib${tdelibsuff}               \
-    /usr/local/lib${kdelibsuff}         \
+    /usr/local/lib${tdelibsuff}         \
-    /usr/unsupported/lib${kdelibsuff}   \
+    /usr/unsupported/lib${tdelibsuff}   \
-    /usr/athena/lib${kdelibsuff}        \
+    /usr/athena/lib${tdelibsuff}        \
-    /usr/local/x11r5/lib${kdelibsuff}   \
+    /usr/local/x11r5/lib${tdelibsuff}   \
-    /usr/lpp/Xamples/lib${kdelibsuff}   \
+    /usr/lpp/Xamples/lib${tdelibsuff}   \
-    /lib/usr/lib${kdelibsuff}/X11       \
+    /lib/usr/lib${tdelibsuff}/X11       \
                                         \
-    /usr/openwin/lib${kdelibsuff}       \
+    /usr/openwin/lib${tdelibsuff}       \
-    /usr/openwin/share/lib${kdelibsuff} \
+    /usr/openwin/share/lib${tdelibsuff} \
     ; \
 do
 dnl Don't even attempt the hair of trying to link an X program!
@@ -371,24 +371,24 @@ AC_DEFUN([KDE_1_CHECK_PATHS],
   fi
 
 AC_MSG_CHECKING([for KDE libraries installed])
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
+ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
 
 if AC_TRY_EVAL(ac_link) && test -s conftest; then
   AC_MSG_RESULT(yes)
 else
   AC_MSG_ERROR([your system fails at linking a small KDE application!
 Check, if your compiler is installed correctly and if you have used the
-same compiler to compile Qt and kdelibs as you did use now.
+same compiler to compile Qt and tdelibs as you did use now.
 For more details about this problem, look at the end of config.log.])
 fi
 
-if eval `KDEDIR= ./conftest 2>&5`; then
+if eval `TDEDIR= ./conftest 2>&5`; then
   kde_result=done
 else
   kde_result=problems
 fi
 
-KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
+TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
 kde_have_all_paths=yes
 
 KDE_SET_PATHS($kde_result)
@@ -547,11 +547,11 @@ Please check whether you installed aRts correctly or use
 AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
 [
     kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
-    test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
+    test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
-    if test -n "$KDEDIRS"; then
+    if test -n "$TDEDIRS"; then
        kde_save_IFS=$IFS
        IFS=:
-       for dir in $KDEDIRS; do
+       for dir in $TDEDIRS; do
             kde_default_bindirs="$dir/bin $kde_default_bindirs "
        done
        IFS=$kde_save_IFS
@@ -602,18 +602,18 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
-            KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)])
+            KDE_FIND_PATH(maketdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(maketdewidgets)])
             AC_SUBST(MAKEKDEWIDGETS)
         fi
         KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
 
         if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
  	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
-            test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
+            test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs"
             AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
 	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
 		KDE_XSL_STYLESHEET=""
@@ -710,7 +710,7 @@ AC_SUBST(kde_templatesdir)
 AC_SUBST(kde_servicesdir)
 AC_SUBST(kde_servicetypesdir)
 AC_SUBST(kde_moduledir)
-AC_SUBST(kdeinitdir, '$(kde_moduledir)')
+AC_SUBST(tdeinitdir, '$(kde_moduledir)')
 AC_SUBST(kde_styledir)
 AC_SUBST(kde_widgetdir)
 if test "$kde_qtver" = 1; then
@@ -937,7 +937,7 @@ mips-sgi-irix6*)
     ac_x_includes="."
   fi
   if test -z "$ac_x_libraries"; then
-    ac_x_libraries="/usr/lib${kdelibsuff}"
+    ac_x_libraries="/usr/lib${tdelibsuff}"
   fi
 esac
 #from now on we use our own again
@@ -1418,7 +1418,7 @@ qt_includes=""
 AC_ARG_WITH(qt-dir,
     AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
     [  ac_qt_includes="$withval"/include
-       ac_qt_libraries="$withval"/lib${kdelibsuff}
+       ac_qt_libraries="$withval"/lib${tdelibsuff}
        ac_qt_bindir="$withval"/bin
     ])
 
@@ -1459,7 +1459,7 @@ ac_qt_includes="$qt_incdir"
 
 qt_libdirs=""
 for dir in $kde_qt_dirs; do
-   qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
+   qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir"
 done
 qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
 if test ! "$ac_qt_libraries" = "NO"; then
@@ -1644,11 +1644,11 @@ rm -f actest.ui actest.cpp
 AC_MSG_RESULT([$kde_cv_uic_plugins])
 if test "$kde_cv_uic_plugins" != yes; then
 	AC_MSG_ERROR([
-you need to install kdelibs first.
+you need to install tdelibs first.
 
-If you did install kdelibs, then the Qt version that is picked up by
+If you did install tdelibs, then the Qt version that is picked up by
-this configure is not the same version you used to compile kdelibs. 
+this configure is not the same version you used to compile tdelibs. 
-The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the 
+The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the 
 _same Qt version_, compiled with the _same compiler_ and the same Qt
 configuration settings.
 ])
@@ -1785,16 +1785,16 @@ AC_CACHE_VAL(ac_cv_have_kde,
 
 if test "$kde_qtver" = 1; then
   kde_check_header="ksock.h"
-  kde_check_lib="libkdecore.la"
+  kde_check_lib="libtdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
 
-kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
+kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
-test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
+test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"
 kde_incdirs="$ac_kde_includes $kde_incdirs"
 AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
 ac_kde_includes="$kde_incdir"
@@ -1805,8 +1805,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
 So, check this please and use another prefix!])
 fi
 
-kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
+kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
-test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
+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"
@@ -1824,7 +1824,7 @@ fi
 if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
 AC_MSG_ERROR([
 I can't find the designer plugins. These are required and should have been installed
-by kdelibs])
+by tdelibs])
 fi
 
 if test -n "$kde_widgetdir"; then
@@ -1839,7 +1839,7 @@ else
     ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
 fi
 
-else dnl test -z $1, e.g. from kdelibs
+else dnl test -z $1, e.g. from tdelibs
 
   ac_cv_have_kde="have_kde=no"
 
@@ -1979,20 +1979,20 @@ cat > conftest.$ac_ext <<EOF
 #include <kapp.h>
 
 int main() {
-    printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
+    printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
-    printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
+    printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
-    printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
+    printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
-    printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
+    printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
-    printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
+    printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
-    printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
+    printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
-    printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
+    printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
-    printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
+    printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
-    printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
+    printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
-    printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
+    printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
     printf("kde_wallpaperdir=\\"%s\\"\n",
-	KApplication::kde_wallpaperdir().data());
+	TDEApplication::kde_wallpaperdir().data());
-    printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
+    printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
-    printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
+    printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
     printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
     printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
     printf("kde_moduledir=\\"/tmp/dummy\\"\n");
@@ -2030,7 +2030,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  kde_cxxflags_safe="$CXXFLAGS"
 
  LIBS="-lkde-qt-addon $LIBQT $LIBS"
- CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes"
+ CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes"
  LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
 
  AC_TRY_LINK([
@@ -2064,48 +2064,48 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
 
 if test $kde_qtver = 3; then
    case $host in 
-               *cygwin*) lib_kded="-lkdeinit_kded" ;;
+               *cygwin*) lib_kded="-ltdeinit_kded" ;;
                *) lib_kded="" ;;
        esac
    AC_SUBST(LIB_KDED, $lib_kded)
-   AC_SUBST(LIB_KDECORE, "-lkdecore")
+   AC_SUBST(LIB_TDECORE, "-ltdecore")
-   AC_SUBST(LIB_KDEUI, "-lkdeui")
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
-   AC_SUBST(LIB_KIO, "-lkio")
+   AC_SUBST(LIB_KIO, "-ltdeio")
    AC_SUBST(LIB_KJS, "-lkjs")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KABC, "-lkabc")
+   AC_SUBST(LIB_KABC, "-ltdeabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
+   AC_SUBST(LIB_TDEHTML, "-ltdehtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
-   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
-   AC_SUBST(LIB_KDEPIM, "-lkdepim")
+   AC_SUBST(LIB_TDEPIM, "-ltdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
-   AC_SUBST(LIB_KSYCOCA, "-lkio")
+   AC_SUBST(LIB_KSYCOCA, "-ltdeio")
-   AC_SUBST(LIB_KFILE, "-lkio")
+   AC_SUBST(LIB_KFILE, "-ltdeio")
 elif test $kde_qtver = 2; then
-   AC_SUBST(LIB_KDECORE, "-lkdecore")
+   AC_SUBST(LIB_TDECORE, "-ltdecore")
-   AC_SUBST(LIB_KDEUI, "-lkdeui")
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
-   AC_SUBST(LIB_KIO, "-lkio")
+   AC_SUBST(LIB_KIO, "-ltdeio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
+   AC_SUBST(LIB_TDEHTML, "-ltdehtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
-   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
 else
-   AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
+   AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
-   AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
+   AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
-   AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
+   AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
-   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
+   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
 fi
 ])
 
@@ -2170,7 +2170,7 @@ if test "x$kde_cv_func_$1" = xyes; then
 else
   case "$1" in
 	setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
-		kde_cv_proto_$1="yes - in libkdefakes"
+		kde_cv_proto_$1="yes - in libtdefakes"
 		;;
 	*)
 		kde_cv_proto_$1=unknown
@@ -2489,7 +2489,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
   AC_MSG_RESULT(yes)
   AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
 else
-  AC_MSG_ERROR(You need giflib30. Please install the kdesupport package)
+  AC_MSG_ERROR(You need giflib30. Please install the tdesupport package)
 fi
 ])
 
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
@@ -3502,9 +3502,9 @@ AC_DEFUN([KDE_CHECK_LIB64],
     AC_ARG_ENABLE(libsuffix,
         AC_HELP_STRING([--enable-libsuffix],
             [/lib directory suffix (64,32,none,auto[=default])]),
-            kdelibsuff=$enableval, kdelibsuff="auto")
+            tdelibsuff=$enableval, tdelibsuff="auto")
     
-    if test "$kdelibsuff" = "auto"; then
+    if test "$tdelibsuff" = "auto"; then
     
 cat > conftest.c << EOF
 #include <stdio.h>
@@ -3512,26 +3512,26 @@ int main() {
  return 0;
 }
 EOF
-        kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
+        tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
     s,.*/lib\([[^\/]]*\)/.*,\1, 
     p 
 }'`
 	rm -rf conftest.*
     fi	
 	
-    if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then
+    if test "$tdelibsuff" = "no" || test "$tdelibsuff" = "none"; then
-       kdelibsuff=
+       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_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories)
-        AC_MSG_RESULT([using lib directory suffix $kdelibsuff])
+        AC_MSG_RESULT([using lib directory suffix $tdelibsuff])
     fi
 ])
 
@@ -3549,7 +3549,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
@@ -4556,7 +4556,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)
@@ -4944,14 +4944,14 @@ AC_DEFUN([KDE_CONF_FILES],
   AC_SUBST(CONF_FILES)
 ])dnl
 
-dnl This sets the prefix, for arts and kdelibs
+dnl This sets the prefix, for arts and tdelibs
 dnl Do NOT use in any other module.
-dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde
+dnl It only looks at --prefix, TDEDIR and falls back to /usr/local/kde
 AC_DEFUN([KDE_SET_PREFIX_CORE],
 [
   unset CDPATH
-  dnl make $KDEDIR the default for the installation
+  dnl make $TDEDIR the default for the installation
-  AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
+  AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
 
   if test "x$prefix" = "xNONE"; then
     prefix=$ac_default_prefix
@@ -4975,25 +4975,25 @@ AC_DEFUN([KDE_SET_PREFIX],
   unset CDPATH
   dnl We can't give real code to that macro, only a value.
   dnl It only matters for --help, since we set the prefix in this function anyway.
-  AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix})
+  AC_PREFIX_DEFAULT(${TDEDIR:-the kde prefix})
 
   KDE_SET_DEFAULT_BINDIRS
   if test "x$prefix" = "xNONE"; then
-    dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it
+    dnl no prefix given: look for tde-config in the PATH and deduce the prefix from it
-    KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
+    KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
   else
-    dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH
+    dnl prefix given: look for tde-config, preferrably in prefix, otherwise in PATH
     kde_save_PATH="$PATH"
     PATH="$exec_prefix/bin:$prefix/bin:$PATH"
-    KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
+    KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
     PATH="$kde_save_PATH"
   fi
 
   kde_libs_prefix=`$KDECONFIG --prefix`
   if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
-       AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
+       AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs.
                     This means it has been moved since you installed it.
-                    This won't work. Please recompile kdelibs for the new prefix.
+                    This won't work. Please recompile tdelibs for the new prefix.
                     ])
   fi
   kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
@@ -5001,7 +5001,7 @@ AC_DEFUN([KDE_SET_PREFIX],
   AC_MSG_CHECKING([where to install])
   if test "x$prefix" = "xNONE"; then
     prefix=$kde_libs_prefix
-    AC_MSG_RESULT([$prefix (as returned by kde-config)])
+    AC_MSG_RESULT([$prefix (as returned by tde-config)])
   else
     dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different
     given_prefix=$prefix
@@ -5658,7 +5658,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
@@ -5678,7 +5678,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
@@ -5915,9 +5915,9 @@ dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page
 dnl also defines KSTUFF_PKG_ERRORS on error
 AC_DEFUN([KDE_PKG_CHECK_MODULES], [
 
-   PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
+   PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
    if test "$prefix" != "$kde_libs_prefix"; then
-       PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
+       PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
    fi
    export PKG_CONFIG_PATH
    PKG_CHECK_MODULES([$1],[$2],[$3],[$4])

configure.in

@@ -304,13 +304,13 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
   # And if so, warn when they don't match
   if test "$kde_libs_prefix" != "$given_prefix"; then
     # And if kde doesn't know about the prefix yet
-    echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
+    echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
     if test $? -ne 0; then
       echo ""
       echo "Warning: you chose to install this package in $given_prefix,"
       echo "but KDE was found in $kde_libs_prefix."
       echo "For this to work, you will need to tell KDE about the new prefix, by ensuring"
-      echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix"
+      echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix"
       echo "Then restart KDE."
       echo ""
     fi

doc/da/index.docbook

@@ -6,7 +6,7 @@
   <!ENTITY kappname "&krecipes;"
 ><!-- replace kapp here, do *not* replace kappname-->
   <!ENTITY package "extragear/utils"
-><!-- kdebase, kdeadmin, etc -->
+><!-- tdebase, tdeadmin, etc -->
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % Danish "INCLUDE"
 ><!-- change language only here -->
@@ -7404,8 +7404,8 @@ distribution. -->
 
 <!--
 List any special requirements for your application here. This should include:
-.Libraries or other software that is not included in kdesupport,
+.Libraries or other software that is not included in tdesupport,
-kdelibs, or kdebase.
+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
@@ -7460,7 +7460,7 @@ information here.
 ></listitem>
 <listitem
 ><para
->kdelibs-devel</para
+>tdelibs-devel</para
 ></listitem>
 <listitem
 ><para

doc/es/index.docbook

@@ -6,7 +6,7 @@
   <!ENTITY kappname "&krecipes;"
 ><!-- replace kapp here, do *not* replace kappname-->
   <!ENTITY package "extragear/utils"
-><!-- kdebase, kdeadmin, etc -->
+><!-- tdebase, tdeadmin, etc -->
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % Spanish "INCLUDE"
 ><!-- change language only here -->
@@ -7116,8 +7116,8 @@ distribution. -->
 
 <!--
 List any special requirements for your application here. This should include:
-.Libraries or other software that is not included in kdesupport,
+.Libraries or other software that is not included in tdesupport,
-kdelibs, or kdebase.
+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
@@ -7172,7 +7172,7 @@ information here.
 ></listitem>
 <listitem
 ><para
->kdelibs-devel.</para
+>tdelibs-devel.</para
 ></listitem>
 <listitem
 ><para

doc/et/index.docbook

@@ -6,7 +6,7 @@
   <!ENTITY kappname "&krecipes;"
 ><!-- replace kapp here, do *not* replace kappname-->
   <!ENTITY package "extragear/utils"
-><!-- kdebase, kdeadmin, etc -->
+><!-- tdebase, tdeadmin, etc -->
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % Estonian  "INCLUDE"
 ><!-- change language only here -->
@@ -5652,8 +5652,8 @@ distribution. -->
 
 <!--
 List any special requirements for your application here. This should include:
-.Libraries or other software that is not included in kdesupport,
+.Libraries or other software that is not included in tdesupport,
-kdelibs, or kdebase.
+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
@@ -5708,7 +5708,7 @@ information here.
 ></listitem>
 <listitem
 ><para
->kdelibs-devel</para
+>tdelibs-devel</para
 ></listitem>
 <listitem
 ><para

doc/krecipes/index.docbook

@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
   <!ENTITY krecipes "<application>Krecipes</application>">
   <!ENTITY kappname "&krecipes;"><!-- replace kapp here, do *not* replace kappname-->
-  <!ENTITY package "extragear/utils"><!-- kdebase, kdeadmin, etc -->
+  <!ENTITY package "extragear/utils"><!-- tdebase, tdeadmin, etc -->
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE"><!-- change language only here -->
   
@@ -3050,8 +3050,8 @@ Documentation copyright 2004-2006 Colleen Beamer <email>colleen.beamer&#064;gmai
 
 <!--
 List any special requirements for your application here. This should include:
-.Libraries or other software that is not included in kdesupport,
+.Libraries or other software that is not included in tdesupport,
-kdelibs, or kdebase.
+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
@@ -3078,7 +3078,7 @@ In order to successfully use &krecipes;, make sure you have at least one of the
 <listitem><para>arts-devel</para></listitem>
 <listitem><para>zlib-devel</para></listitem>
 <listitem><para>XFree86-devel or xorg-x11-devel or libxorg-x11-devel</para></listitem>
-<listitem><para>kdelibs-devel</para></listitem>
+<listitem><para>tdelibs-devel</para></listitem>
 <listitem><para>qt-devel or libqt3-devel</para></listitem>
 </itemizedlist>
 

doc/pt/index.docbook

@@ -6,7 +6,7 @@
   <!ENTITY kappname "&krecipes;"
 ><!-- replace kapp here, do *not* replace kappname-->
   <!ENTITY package "extragear/utils"
-><!-- kdebase, kdeadmin, etc -->
+><!-- tdebase, tdeadmin, etc -->
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % Portuguese "INCLUDE"
 ><!-- change language only here -->
@@ -8776,8 +8776,8 @@ distribution. -->
 
 <!--
 List any special requirements for your application here. This should include:
-.Libraries or other software that is not included in kdesupport,
+.Libraries or other software that is not included in tdesupport,
-kdelibs, or kdebase.
+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
@@ -8832,7 +8832,7 @@ information here.
 ></listitem>
 <listitem
 ><para
->kdelibs-devel</para
+>tdelibs-devel</para
 ></listitem>
 <listitem
 ><para

doc/sv/index.docbook

@@ -6,7 +6,7 @@
   <!ENTITY kappname "&krecipes;"
 ><!-- replace kapp here, do *not* replace kappname-->
   <!ENTITY package "extragear/utils"
-><!-- kdebase, kdeadmin, etc -->
+><!-- tdebase, tdeadmin, etc -->
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % Swedish "INCLUDE"
 ><!-- change language only here -->
@@ -7428,8 +7428,8 @@ distribution. -->
 
 <!--
 List any special requirements for your application here. This should include:
-.Libraries or other software that is not included in kdesupport,
+.Libraries or other software that is not included in tdesupport,
-kdelibs, or kdebase.
+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
@@ -7484,7 +7484,7 @@ information here.
 ></listitem>
 <listitem
 ><para
->kdelibs-devel</para
+>tdelibs-devel</para
 ></listitem>
 <listitem
 ><para

krecipes/krecipes.kdevelop

@@ -1,5 +1,5 @@
 <?xml version = '1.0'?>
-<kdevelop>
+<tdevelop>
   <general>
     <author>Unai Garro</author>
     <email>ugarro@users.sourceforge.net</email>
@@ -35,7 +35,7 @@
     </run>
     <make>
       <envvars>
-        <envvar value="$KDEDIR/unsermake/unsermake" name="UNSERMAKE" />
+        <envvar value="$TDEDIR/unsermake/unsermake" name="UNSERMAKE" />
         <envvar value="1" name="WANT_AUTOCONF_2_5" />
         <envvar value="1" name="WANT_AUTOMAKE_1_7" />
       </envvars>
@@ -179,4 +179,4 @@
     <customArguments/>
     <customTagfilePath/>
   </ctagspart>
-</kdevelop>
+</tdevelop>

krecipes/src/Makefile.am

@@ -10,7 +10,7 @@ SUBDIRS = backends importers widgets dialogs exporters datablocks tests
 INCLUDES         = -I$(srcdir) -I$(srcdir)/backends -I$(srcdir)/backends/SQLite $(all_includes)
 
 # the library search path.
-krecipes_LDFLAGS = $(KDE_RPATH) $(LIB_KPARTS) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) -lkdefx -lDCOP $(LIB_QT) $(all_libraries)
+krecipes_LDFLAGS = $(KDE_RPATH) $(LIB_KPARTS) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -ltdefx -lDCOP $(LIB_QT) $(all_libraries)
 
 
 # Check for optional libs
@@ -31,7 +31,7 @@ krecipes_LDADD = \
 	backends/libkrecipesdbs.la exporters/libkrecipesexporters.la \
 	importers/libkrecipesimporters.la widgets/libkrecipeswidgets.la dialogs/libkrecipesdialogs.la \
 	widgets/libkrecipeswidgets.la datablocks/libdatablocks.la \
-	$(qsqlite_libadds) $(mysql_libadds) $(psql_libadds) $(LIB_KHTML) $(LIB_KSPELL)
+	$(qsqlite_libadds) $(mysql_libadds) $(psql_libadds) $(LIB_TDEHTML) $(LIB_KSPELL)
 
 # which sources should be compiled for krecipes
 krecipes_SOURCES = \

krecipes/src/backends/MySQL/mysqlrecipedb.cpp

@@ -16,10 +16,10 @@
 
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 MySQLRecipeDB::MySQLRecipeDB( const TQString &host, const TQString &user, const TQString &pass, const TQString &DBname, int port ) : TQSqlRecipeDB( host, user, pass, DBname, port )
 {}
@@ -51,7 +51,7 @@ void MySQLRecipeDB::createDB()
 
 TQStringList MySQLRecipeDB::backupCommand() const
 {
-	KConfig *config = KGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup("Server");
 
 	TQStringList command;
@@ -76,7 +76,7 @@ TQStringList MySQLRecipeDB::backupCommand() const
 
 TQStringList MySQLRecipeDB::restoreCommand() const
 {
-	KConfig *config = KGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup("Server");
 
 	TQStringList command;

krecipes/src/backends/PostgreSQL/psqlrecipedb.cpp

@@ -16,9 +16,9 @@
 
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <ntqvariant.h>
 
@@ -51,7 +51,7 @@ void PSqlRecipeDB::createDB()
 
 TQStringList PSqlRecipeDB::backupCommand() const
 {
-	KConfig *config = KGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup("Server");
 
 	TQStringList command;
@@ -67,7 +67,7 @@ TQStringList PSqlRecipeDB::backupCommand() const
 
 TQStringList PSqlRecipeDB::restoreCommand() const
 {
-	KConfig *config = KGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup("Server");
 
 	TQStringList command;

krecipes/src/backends/SQLite/literecipedb.cpp

@@ -17,9 +17,9 @@
 #include <ntqbuffer.h>
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -37,7 +37,7 @@ TQString escape( const TQString &s );
 
 LiteRecipeDB::LiteRecipeDB( const TQString &_dbFile ) : TQSqlRecipeDB( TQString::null, TQString::null, TQString::null, _dbFile )
 {
-/*	KConfig * config = KGlobal::config();
+/*	TDEConfig * config = TDEGlobal::config();
 	config->setGroup( "Server" );
 
 	if ( dbFile.isNull() )
@@ -69,7 +69,7 @@ TQStringList LiteRecipeDB::backupCommand() const
 	TQString binary = "sqlite3";
 	#endif
 
-	KConfig * config = KGlobal::config();
+	TDEConfig * config = TDEGlobal::config();
 	config->setGroup( "Server" );
 	binary = config->readEntry( "SQLitePath", binary );
 
@@ -86,7 +86,7 @@ TQStringList LiteRecipeDB::restoreCommand() const
 	TQString binary = "sqlite3";
 	#endif
 
-	KConfig * config = KGlobal::config();
+	TDEConfig * config = TDEGlobal::config();
 	config->setGroup( "Server" );
 	binary = config->readEntry( "SQLitePath", binary );
 

krecipes/src/backends/qsqlrecipedb.cpp

@@ -25,12 +25,12 @@
 #include <ntqtextcodec.h>
 #include <ntqvariant.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmdcodec.h>
 
 int TQSqlRecipeDB::m_refCount = 0;

krecipes/src/backends/recipedb.cpp

@@ -17,18 +17,18 @@
 #include "config.h"
 #endif
 
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <kprogress.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kprocess.h>
 #include <kprocio.h>
 #include <kfilterdev.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <ntqfile.h>
 #include <ntqstringlist.h>
@@ -89,7 +89,7 @@ double RecipeDB::latestDBVersion() const
 
 TQString RecipeDB::krecipes_version() const
 {
-	KInstance * this_instance = KGlobal::instance();
+	TDEInstance * this_instance = TDEGlobal::instance();
 	if ( this_instance && this_instance->aboutData() )
 		return this_instance->aboutData() ->version();
 
@@ -98,7 +98,7 @@ TQString RecipeDB::krecipes_version() const
 
 RecipeDB* RecipeDB::createDatabase( const TQString &dbType, const TQString &file )
 {
-	KConfig * config = kapp->config();
+	TDEConfig * config = kapp->config();
 	config->setGroup( "Server" );
 	TQString host = config->readEntry( "Host", "localhost" );
 	TQString user = config->readEntry( "Username", TQString::null );
@@ -268,7 +268,7 @@ bool RecipeDB::backup( const TQString &backup_file, TQString *errMsg )
 {
 	kdDebug()<<"Backing up current database to "<<backup_file<<endl;
 
-	KProcess *p = new KProcess;
+	TDEProcess *p = new TDEProcess;
 	//p->setUseShell(true);
 
 	TQIODevice *dumpFile = KFilterDev::deviceForFile(backup_file,"application/x-gzip");
@@ -285,7 +285,7 @@ bool RecipeDB::backup( const TQString &backup_file, TQString *errMsg )
 		return false;
 	}
 
-	KConfig * config = kapp->config();
+	TDEConfig * config = kapp->config();
 	config->setGroup( "DBType" );
 
 	(*dumpStream) << "-- Generated for Krecipes v"<<krecipes_version()<<endl;
@@ -295,15 +295,15 @@ bool RecipeDB::backup( const TQString &backup_file, TQString *errMsg )
 	kdDebug()<<"Running '"<<command.first()<<"' to create backup file"<<endl;
 	*p << command /*<< ">" << backup_file*/;
 
-	TQApplication::connect( p, SIGNAL(receivedStdout(KProcess*,char*,int)), this, SLOT(processDumpOutput(KProcess*,char*,int)) );
+	TQApplication::connect( p, SIGNAL(receivedStdout(TDEProcess*,char*,int)), this, SLOT(processDumpOutput(TDEProcess*,char*,int)) );
-	TQApplication::connect( p, SIGNAL(receivedStderr(KProcess*,char*,int)), this, SLOT(processDumpOutput(KProcess*,char*,int)) );
+	TQApplication::connect( p, SIGNAL(receivedStderr(TDEProcess*,char*,int)), this, SLOT(processDumpOutput(TDEProcess*,char*,int)) );
 
 	emit progressBegin(0,TQString::null,
 		TQString("<center><b>%1</b></center>%2")
 			.arg(i18n("Creating complete backup"))
 			.arg(i18n("Depending on the number of recipes and amount of data, this could take some time.")),50);
 
-	bool success = p->start( KProcess::Block, KProcess::AllOutput );
+	bool success = p->start( TDEProcess::Block, TDEProcess::AllOutput );
 	if ( !success ) {
 		if ( errMsg ) *errMsg = TQString(i18n("Unable to find or run the program '%1'.  Either it is not installed on your system or it is not in $PATH.")).arg(command.first());
 		delete p;
@@ -354,7 +354,7 @@ bool RecipeDB::backup( const TQString &backup_file, TQString *errMsg )
 	return true;
 }
 
-void RecipeDB::processDumpOutput( KProcess *p, char *buffer, int buflen )
+void RecipeDB::processDumpOutput( TDEProcess *p, char *buffer, int buflen )
 {
 	int written = dumpStream->device()->writeBlock(buffer,buflen);
 	if ( written != buflen )
@@ -369,7 +369,7 @@ void RecipeDB::initializeData( void )
 	// Populate with data
 
 	// Read the commands form the data file
-	TQFile datafile( KGlobal::dirs() ->findResource( "appdata", "data/data.sql" ) );
+	TQFile datafile( TDEGlobal::dirs() ->findResource( "appdata", "data/data.sql" ) );
 	if ( datafile.open( IO_ReadOnly ) ) {
 		TQTextStream stream( &datafile );
 		execSQL(stream);
@@ -392,7 +392,7 @@ bool RecipeDB::restore( const TQString &file, TQString *errMsg )
 			return false;
 		}
 
-		KConfig * config = kapp->config();
+		TDEConfig * config = kapp->config();
 		config->setGroup( "DBType" );
 		TQString dbType = stream.readLine().stripWhiteSpace();
 		dbType = dbType.right( dbType.length() - dbType.find(":") - 2 );
@@ -420,8 +420,8 @@ bool RecipeDB::restore( const TQString &file, TQString *errMsg )
 		kdDebug()<<"Restoring backup using: "<<command[0]<<endl;
 		*process << command;
 		
-		//process->setComm( KProcess::Stdin );
+		//process->setComm( TDEProcess::Stdin );
-		if ( process->start( KProcess::NotifyOnExit ) ) {
+		if ( process->start( TDEProcess::NotifyOnExit ) ) {
 			emit progressBegin(0,TQString::null,
 				TQString("<center><b>%1</b></center>%2")
 					.arg(i18n("Restoring backup"))
@@ -537,10 +537,10 @@ int RecipeDB::unitCount()
 
 void RecipeDB::importSamples()
 {
-	TQString sample_recipes = locate( "appdata", "data/samples-" + KGlobal::locale() ->language() + ".kreml" );
+	TQString sample_recipes = locate( "appdata", "data/samples-" + TDEGlobal::locale() ->language() + ".kreml" );
 	if ( sample_recipes.isEmpty() ) {
 		//TODO: Make this a KMessageBox??
-		kdDebug() << "NOTICE: Samples recipes for the language \"" << KGlobal::locale() ->language() << "\" are not available.  However, if you would like samples recipes for this language included in future releases of Krecipes, we invite you to submit your own.  Just save your favorite recipes in the kreml format and e-mail them to jkivlighn@gmail.com." << endl;
+		kdDebug() << "NOTICE: Samples recipes for the language \"" << TDEGlobal::locale() ->language() << "\" are not available.  However, if you would like samples recipes for this language included in future releases of Krecipes, we invite you to submit your own.  Just save your favorite recipes in the kreml format and e-mail them to jkivlighn@gmail.com." << endl;
 
 		sample_recipes = locate( "appdata", "data/samples-en_US.kreml" ); //default to English
 	}

krecipes/src/backends/recipedb.h

@@ -35,7 +35,7 @@
 @author Unai Garro
 */
 
-class KProcess;
+class TDEProcess;
 class TQTextStream;
 
 class CategoryTree;
@@ -152,7 +152,7 @@ public:
 	                                 int port,
 	                                 const TQString &file = TQString::null );
 
-	/** Convenience method.  Calls the above with arguments from KConfig. */
+	/** Convenience method.  Calls the above with arguments from TDEConfig. */
 	static RecipeDB* createDatabase( const TQString &dbType, const TQString &file = TQString::null );
 
 	virtual void addIngredientWeight( const Weight & ) = 0;
@@ -391,7 +391,7 @@ private:
 	bool haltOperation;
 
 private slots:
-	void processDumpOutput( KProcess *, char *buffer, int buflen );
+	void processDumpOutput( TDEProcess *, char *buffer, int buflen );
 };
 
 #endif

krecipes/src/backends/usda_ingredient_data.h

@@ -14,7 +14,7 @@
 #ifndef USDA_INGREDIENT_DATA_H
 #define USDA_INGREDIENT_DATA_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 struct ingredient_data
 {

krecipes/src/backends/usda_property_data.h

@@ -14,7 +14,7 @@
 #ifndef USDA_PROPERTY_DATA_H
 #define USDA_PROPERTY_DATA_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 struct property_data
 {

krecipes/src/backends/usda_unit_data.h

@@ -12,7 +12,7 @@
 #ifndef USDA_UNIT_DATA_H
 #define USDA_UNIT_DATA_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <ntqstring.h>
 

krecipes/src/convert_sqlite3.cpp

@@ -14,9 +14,9 @@
 #include <ntqfile.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprocio.h>
 
 //FIXME: Some messages should be given to the user about success/failure, but that can't be done in the 0.8.x branch due to i18n.
@@ -25,7 +25,7 @@ ConvertSQLite3::ConvertSQLite3( const TQString &db_file ) : TQObject(), error(fa
 {
 	TQString file = db_file;
 	if ( file.isEmpty() ) {
-		KConfig *config = KGlobal::config();
+		TDEConfig *config = TDEGlobal::config();
 		config->setGroup("Server");
 		file = config->readEntry("DBFile");
 	}
@@ -39,9 +39,9 @@ ConvertSQLite3::ConvertSQLite3( const TQString &db_file ) : TQObject(), error(fa
 
 	TQApplication::connect( p, SIGNAL(readReady(KProcIO*)), this, SLOT(processOutput(KProcIO*)) );
 
-	bool success = p->start( KProcess::Block, true );
+	bool success = p->start( TDEProcess::Block, true );
 	if ( !success ) {
-		kdDebug()<<"Conversion failed... unable to start KProcess"<<endl;
+		kdDebug()<<"Conversion failed... unable to start TDEProcess"<<endl;
 		return;
 	}
 

krecipes/src/datablocks/mixednumber.cpp

@@ -11,14 +11,14 @@
 
 #include <ntqregexp.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 TQString beautify( const TQString &num )
 {
 	TQString copy( num );
-	copy.remove( TQRegExp( TQString( "(%1){0,1}0+$" ).arg( TQRegExp::escape( KGlobal::locale() ->decimalSymbol() ) ) ) );
+	copy.remove( TQRegExp( TQString( "(%1){0,1}0+$" ).arg( TQRegExp::escape( TDEGlobal::locale() ->decimalSymbol() ) ) ) );
 	return copy;
 }
 
@@ -26,18 +26,18 @@ MixedNumber::MixedNumber() :
 		m_whole( 0 ),
 		m_numerator( 0 ),
 		m_denominator( 1 ),
-		locale( KGlobal::locale() )
+		locale( TDEGlobal::locale() )
 {}
 
 MixedNumber::MixedNumber( int whole, int numerator, int denominator ) :
 		m_whole( whole ),
 		m_numerator( numerator ),
 		m_denominator( denominator ),
-		locale( KGlobal::locale() )
+		locale( TDEGlobal::locale() )
 {}
 
 MixedNumber::MixedNumber( double decimal, double precision ) :
-		locale( KGlobal::locale() )
+		locale( TDEGlobal::locale() )
 {
 	// find nearest fraction
 	int intPart = static_cast<int>( decimal );
@@ -115,7 +115,7 @@ MixedNumber MixedNumber::fromString( const TQString &str, bool *ok, bool locale_
 		return MixedNumber();
 	}
 
-	KLocale *locale = KGlobal::locale();
+	TDELocale *locale = TDEGlobal::locale();
 
 	bool num_ok;
 

krecipes/src/datablocks/mixednumber.h

@@ -16,7 +16,7 @@
 /** remove any extra zeros on the end of the string and the decimal if a whole number */
 TQString beautify( const TQString &num );
 
-class KLocale;
+class TDELocale;
 
 /** A class to hold and manipulate a mixed number.
   * @author Jason Kivlighn
@@ -99,7 +99,7 @@ private:
 	int m_numerator;
 	int m_denominator;
 
-	KLocale *locale;
+	TDELocale *locale;
 };
 
 inline const MixedNumber operator+( const MixedNumber &mn1, const MixedNumber &mn2 )

krecipes/src/datablocks/unitratio.cpp

@@ -8,7 +8,7 @@
 *   (at your option) any later version.                                   *
 ***************************************************************************/
 #include "unitratio.h"
-#include "klocale.h"
+#include "tdelocale.h"
 
 UnitRatio::UnitRatio()
 {

krecipes/src/datablocks/unitratiolist.cpp

@@ -8,7 +8,7 @@
 *   (at your option) any later version.                                   *
 ***************************************************************************/
 #include "unitratiolist.h"
-#include "klocale.h"
+#include "tdelocale.h"
 
 
 UnitRatioList::UnitRatioList()

krecipes/src/dialogs/advancedsearchdialog.cpp

@@ -33,15 +33,15 @@
 #include <ntqradiobutton.h>
 #include <ntqbuttongroup.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcursor.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include "backends/recipedb.h"
 #include "backends/searchparameters.h"
@@ -412,7 +412,7 @@ AdvancedSearchDialog::AdvancedSearchDialog( TQWidget *parent, RecipeDB *db ) : T
 #endif
 	criterionFrameLayout->addLayout( layout12 );
 	
-	criteriaListView = new KListView( criterionFrame, "criteriaListView" );
+	criteriaListView = new TDEListView( criterionFrame, "criteriaListView" );
 	criteriaListView->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Minimum );
 	criteriaListView->addColumn( i18n( "Criterion" ) );
 	criteriaListView->addColumn( i18n( "Stars" ) );
@@ -441,7 +441,7 @@ AdvancedSearchDialog::AdvancedSearchDialog( TQWidget *parent, RecipeDB *db ) : T
 	layout7->addLayout( layout9 );
 	AdvancedSearchDialogLayout->addLayout( layout7 );
 	
-	resultsListView = new KListView( this, "resultsListView" );
+	resultsListView = new TDEListView( this, "resultsListView" );
 	resultsListView->setSelectionMode( TQListView::Extended );
 	resultsListView->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 1, resultsListView->sizePolicy().hasHeightForWidth() ) );
 	AdvancedSearchDialogLayout->addWidget( resultsListView );
@@ -459,7 +459,7 @@ AdvancedSearchDialog::AdvancedSearchDialog( TQWidget *parent, RecipeDB *db ) : T
 	scrollView1->setHScrollBarMode( TQScrollView::AlwaysOff );
 	scrollView1->setResizePolicy( TQScrollView::AutoOneFit );
 
-	KConfig *config = KGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup( "Advanced" );
 	bool show_id = config->readBoolEntry( "ShowID", false );
 	resultsListView->addColumn( i18n( "Title" ) );
@@ -529,7 +529,7 @@ AdvancedSearchDialog::AdvancedSearchDialog( TQWidget *parent, RecipeDB *db ) : T
 
 	clear();
 
-	KPopupMenu *kpop = new KPopupMenu( criteriaListView );
+	TDEPopupMenu *kpop = new TDEPopupMenu( criteriaListView );
 	kpop->insertItem( i18n( "&Delete" ), this, SLOT( slotRemoveRatingCriteria() ), Key_Delete );
 }
 
@@ -659,7 +659,7 @@ void AdvancedSearchDialog::buttonSwitched()
 
 void AdvancedSearchDialog::search()
 {
-	KApplication::setOverrideCursor( KCursor::waitCursor() );
+	TDEApplication::setOverrideCursor( KCursor::waitCursor() );
 
 	//we need to load more than just the title because we'll be doing further refining of the search
 	int load_items = RecipeDB::Title | RecipeDB::NamesOnly | RecipeDB::Noatime;
@@ -877,7 +877,7 @@ void AdvancedSearchDialog::search()
 		( void ) new TQListViewItem( resultsListView, "--- "+i18n("No matching recipes found")+" ---");
 	}
 
-	KApplication::restoreOverrideCursor();
+	TDEApplication::restoreOverrideCursor();
 }
 
 TQStringList AdvancedSearchDialog::split( const TQString &text, bool sql_wildcards ) const

krecipes/src/dialogs/advancedsearchdialog.h

@@ -27,7 +27,7 @@ class TQComboBox;
 class TQSpinBox;
 class TQTimeEdit;
 class KPushButton;
-class KListView;
+class TDEListView;
 class TQListViewItem;
 class TQRadioButton;
 class TQButtonGroup;
@@ -97,7 +97,7 @@ protected:
 	TQFrame* instructionsFrame;
 	KPushButton* clearButton;
 	KPushButton* findButton;
-	KListView* resultsListView;
+	TDEListView* resultsListView;
 	TQCheckBox *requireAllTitle;
 	TQCheckBox *requireAllInstructions;
 	KDateEdit *createdStartDateEdit;
@@ -116,7 +116,7 @@ protected:
 	FractionInput* starsWidget;
 	TQPushButton* addCriteriaButton;
 	TQPushButton* removeCriteriaButton;
-	KListView* criteriaListView;
+	TDEListView* criteriaListView;
 	TQPushButton* ratingsButton;
 	TQButtonGroup *ratingButtonGroup;
 	TQFrame *ratingAvgFrame;

krecipes/src/dialogs/authorsdialog.cpp

@@ -16,8 +16,8 @@
 #include "widgets/authorlistview.h"
 
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 AuthorsDialog::AuthorsDialog( TQWidget* parent, RecipeDB *db ) : TQWidget( parent )
 {

krecipes/src/dialogs/authorsdialog.h

@@ -18,7 +18,7 @@
 #include <ntqhbox.h>
 #include <ntqlayout.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include "widgets/dblistviewbase.h"
 
@@ -46,6 +46,6 @@ private:
 	StdAuthorListView *authorListView;
 	TQPushButton *newAuthorButton;
 	TQPushButton *removeAuthorButton;
-	KIconLoader *il;
+	TDEIconLoader *il;
 };
 #endif

krecipes/src/dialogs/borderdialog.cpp

@@ -20,10 +20,10 @@
 #include <ntqwhatsthis.h>
 
 #include <kdebug.h>
-#include <khtml_part.h>
+#include <tdehtml_part.h>
-#include <khtmlview.h>
+#include <tdehtmlview.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "datablocks/kreborder.h"
 
@@ -47,7 +47,7 @@ BorderDialog::BorderDialog( const KreBorder &border, TQWidget* parent, const cha
 	styleLabel = new TQLabel( borderGroupBox, "styleLabel" );
 	layout3->addWidget( styleLabel );
 
-	styleListBox = new KListBox( borderGroupBox, "styleListBox" );
+	styleListBox = new TDEListBox( borderGroupBox, "styleListBox" );
 	layout3->addWidget( styleListBox );
 	layout4->addLayout( layout3 );
 
@@ -78,12 +78,12 @@ BorderDialog::BorderDialog( const KreBorder &border, TQWidget* parent, const cha
 	widthSpinBox->setMinValue( 1 );
 	layout1->addWidget( widthSpinBox );
 
-	widthListBox = new KListBox( borderGroupBox, "widthListBox" );
+	widthListBox = new TDEListBox( borderGroupBox, "widthListBox" );
 	layout1->addWidget( widthListBox );
 	layout4->addLayout( layout1 );
 	borderGroupBoxLayout->addLayout( layout4 );
 
-	borderPreview = new KHTMLPart( borderGroupBox );
+	borderPreview = new TDEHTMLPart( borderGroupBox );
 	borderPreview->view() ->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed );
 	borderGroupBoxLayout->addWidget( borderPreview->view() );
 

krecipes/src/dialogs/borderdialog.h

@@ -20,10 +20,10 @@ class TQGridLayout;
 class TQSpacerItem;
 class TQGroupBox;
 class TQLabel;
-class KListBox;
+class TDEListBox;
 class TQListBoxItem;
 class TQSpinBox;
-class KHTMLPart;
+class TDEHTMLPart;
 
 class KreBorder;
 
@@ -39,14 +39,14 @@ public:
 
 	TQGroupBox* borderGroupBox;
 	TQLabel* styleLabel;
-	KListBox* styleListBox;
+	TDEListBox* styleListBox;
 	TQLabel* colorLabel;
 	KHSSelector* hsSelector;
 	KValueSelector* valuePal;
 	TQLabel* widthLabel;
 	TQSpinBox* widthSpinBox;
-	KListBox* widthListBox;
+	TDEListBox* widthListBox;
-	KHTMLPart* borderPreview;
+	TDEHTMLPart* borderPreview;
 
 protected:
 	TQVBoxLayout* borderGroupBoxLayout;

krecipes/src/dialogs/categorieseditordialog.cpp

@@ -14,8 +14,8 @@
 
 #include <kdebug.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "widgets/categorylistview.h"
 #include "createcategorydialog.h"

krecipes/src/dialogs/categorieseditordialog.h

@@ -18,7 +18,7 @@
 #include <ntqhbox.h>
 #include <ntqlayout.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include "datablocks/categorytree.h"
 #include "widgets/dblistviewbase.h"
@@ -50,7 +50,7 @@ private:
 	TQHBox *buttonBar;
 	TQPushButton *newCategoryButton;
 	TQPushButton *removeCategoryButton;
-	KIconLoader *il;
+	TDEIconLoader *il;
 };
 
 #endif

krecipes/src/dialogs/conversiondialog.cpp

@@ -22,7 +22,7 @@
 
 #include <kcombobox.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "backends/recipedb.h"
 #include "widgets/unitcombobox.h"

krecipes/src/dialogs/createcategorydialog.cpp

@@ -20,7 +20,7 @@
 
 #include <kcombobox.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 CreateCategoryDialog::CreateCategoryDialog( TQWidget *parent, const ElementList& categories )
 		: KDialogBase( parent, "createCategoryDialog", true, i18n( "New Category" ),

krecipes/src/dialogs/createelementdialog.cpp

@@ -12,7 +12,7 @@
 
 #include "createelementdialog.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 CreateElementDialog::CreateElementDialog( TQWidget *parent, const TQString &text )
 		: KDialogBase( parent, "createElementDialog", true, text,

krecipes/src/dialogs/createingredientweightdialog.cpp

@@ -18,8 +18,8 @@
 #include <ntqwhatsthis.h>
 #include <ntqvbox.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "widgets/unitcombobox.h"
 #include "widgets/prepmethodcombobox.h"

krecipes/src/dialogs/createpropertydialog.cpp

@@ -12,7 +12,7 @@
 
 #include "createpropertydialog.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 CreatePropertyDialog::CreatePropertyDialog( TQWidget *parent, UnitList* list )
 		: KDialogBase( parent, "createPropertyDialog", true, i18n( "New Property" ),

krecipes/src/dialogs/createunitdialog.cpp

@@ -14,7 +14,7 @@
 
 #include <ntqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <kcombobox.h>
 

krecipes/src/dialogs/dbimportdialog.cpp

@@ -29,9 +29,9 @@
 #include <ntqwhatsthis.h>
 #include <ntqhbox.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 #include <knuminput.h>
 

krecipes/src/dialogs/dependanciesdialog.cpp

@@ -17,10 +17,10 @@
 
 #include <ntqvbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 DependanciesDialog::DependanciesDialog( TQWidget *parent, const TQValueList<ListInfo> &lists, bool deps_are_deleted ) : KDialogBase( parent, "DependanciesDialog", true, TQString::null,
 	  KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Cancel ),
@@ -62,7 +62,7 @@ void DependanciesDialog::init( const TQValueList<ListInfo> &lists )
 	for ( TQValueList<ListInfo>::const_iterator list_it = lists.begin(); list_it != lists.end(); ++list_it ) {
 		if ( !((*list_it).list).isEmpty() ) {
 			TQGroupBox *groupBox = new TQGroupBox( 1, TQt::Vertical, (*list_it).name, page );
-			KListBox *listBox = new KListBox( groupBox );
+			TDEListBox *listBox = new TDEListBox( groupBox );
 			loadList( listBox, (*list_it).list );
 		}
 	}
@@ -70,9 +70,9 @@ void DependanciesDialog::init( const TQValueList<ListInfo> &lists )
 	setSizeGripEnabled( true );
 }
 
-void DependanciesDialog::loadList( KListBox* listBox, const ElementList &list )
+void DependanciesDialog::loadList( TDEListBox* listBox, const ElementList &list )
 {
-	KConfig * config = KGlobal::config();
+	TDEConfig * config = TDEGlobal::config();
 	config->setGroup( "Advanced" );
 	bool show_id = config->readBoolEntry( "ShowID", false );
 

krecipes/src/dialogs/dependanciesdialog.h

@@ -18,7 +18,7 @@
 #include <ntqgroupbox.h>
 #include <ntqlabel.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdialogbase.h>
 
 #include "datablocks/elementlist.h"
@@ -54,7 +54,7 @@ private:
 
 	// Methods
 	void init( const TQValueList<ListInfo> &lists );
-	void loadList( KListBox*, const ElementList &list );
+	void loadList( TDEListBox*, const ElementList &list );
 };
 
 #endif

krecipes/src/dialogs/dietviewdialog.cpp

@@ -12,7 +12,7 @@
 #include "dietviewdialog.h"
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 DietViewDialog::DietViewDialog( TQWidget *parent, const RecipeList &recipeList, int dayNumber, int mealNumber, const TQValueList <int> &dishNumbers )
@@ -26,7 +26,7 @@ DietViewDialog::DietViewDialog( TQWidget *parent, const RecipeList &recipeList,
 	TQVBox *page = makeVBoxMainWidget();
 
 	// The html part
-	dietView = new KHTMLPart( page );
+	dietView = new TDEHTMLPart( page );
 
 	setInitialSize( TQSize(350, 450) );
 

krecipes/src/dialogs/dietviewdialog.h

@@ -16,8 +16,8 @@
 #include <ntqvbox.h>
 #include <ntqwidget.h>
 
-#include <khtml_part.h>
+#include <tdehtml_part.h>
-#include <khtmlview.h>
+#include <tdehtmlview.h>
 #include <kdialogbase.h>
 
 #include "datablocks/recipelist.h"
@@ -31,7 +31,7 @@ public:
 	~DietViewDialog();
 private:
 	// Widgets
-	KHTMLPart *dietView;
+	TDEHTMLPart *dietView;
 
 	// Private methods
 	void showDiet( const RecipeList &recipeList, int dayNumber, int mealNumber, const TQValueList <int> &dishNumbers );

krecipes/src/dialogs/dietwizarddialog.cpp

@@ -20,12 +20,12 @@
 #include <ntqpainter.h>
 #include <ntqwmatrix.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcursor.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
 #include <kdebug.h>
 
@@ -77,17 +77,17 @@ DietWizardDialog::DietWizardDialog( TQWidget *parent, RecipeDB *db ) : TQVBox( p
 	mealTabs->setMargin( 5 );
 
 	// Button bar
-	KIconLoader il;
+	TDEIconLoader il;
 
 	TQHBox *bottom_layout = new TQHBox( this );
 	//bottom_layout->layout()->addItem( new TQSpacerItem( 10,10, TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed ) );
 
 	okButton = new TQPushButton( bottom_layout );
-	okButton->setIconSet( il.loadIconSet( "button_ok", KIcon::Small ) );
+	okButton->setIconSet( il.loadIconSet( "button_ok", TDEIcon::Small ) );
 	okButton->setText( i18n( "Create the diet" ) );
 
 	TQPushButton *clearButton = new TQPushButton( bottom_layout );
-	clearButton->setIconSet( il.loadIconSet( "editclear", KIcon::Small ) );
+	clearButton->setIconSet( il.loadIconSet( "editclear", TDEIcon::Small ) );
 	clearButton->setText( i18n( "Clear" ) );
 
 	// Create Tabs
@@ -179,7 +179,7 @@ void DietWizardDialog::changeDayNumber( int dn )
 
 void DietWizardDialog::createDiet( void )
 {
-	KApplication::setOverrideCursor( KCursor::waitCursor() );
+	TDEApplication::setOverrideCursor( KCursor::waitCursor() );
 
 	START_TIMER("Creating the diet");
 
@@ -227,7 +227,7 @@ void DietWizardDialog::createDiet( void )
 	}
 
 	if ( alert ) {
-		KApplication::restoreOverrideCursor();
+		TDEApplication::restoreOverrideCursor();
 		KMessageBox::sorry( this, i18n( "I could not create a full diet list given the constraints. Either the recipe list is too short or the constraints are too demanding. " ) );
 	}
 
@@ -242,7 +242,7 @@ void DietWizardDialog::createDiet( void )
 			dishNumbers << dishNo;
 		}
 
-		KApplication::restoreOverrideCursor();
+		TDEApplication::restoreOverrideCursor();
 
 		// display the list
 		DietViewDialog dietDisplay( this, *dietRList, dayNumber, mealNumber, dishNumbers );
@@ -335,16 +335,16 @@ MealInput::MealInput( TQWidget *parent, RecipeDB *db ) : TQWidget( parent ),
 	toolBar->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum ) );
 
 	// Next dish/ Previous dish buttons
-	KIconLoader il;
+	TDEIconLoader il;
 	buttonPrev = new TQToolButton( toolBar );
 	buttonPrev->setUsesTextLabel( true );
 	buttonPrev->setTextLabel( i18n( "Previous Dish" ) );
-	buttonPrev->setIconSet( il.loadIconSet( "back", KIcon::Small ) );
+	buttonPrev->setIconSet( il.loadIconSet( "back", TDEIcon::Small ) );
 	buttonPrev->setTextPosition( TQToolButton::Under );
 	buttonNext = new TQToolButton( toolBar );
 	buttonNext->setUsesTextLabel( true );
 	buttonNext->setTextLabel( i18n( "Next Dish" ) );
-	buttonNext->setIconSet( il.loadIconSet( "forward", KIcon::Small ) );
+	buttonNext->setIconSet( il.loadIconSet( "forward", TDEIcon::Small ) );
 	buttonNext->setTextPosition( TQToolButton::Under );
 
 
@@ -463,7 +463,7 @@ DishInput::DishInput( TQWidget* parent, RecipeDB *db, const TQString &title ) :
 	TQVBoxLayout *layout = new TQVBoxLayout( this );
 	layout->setSpacing( 10 );
 
-	//Horizontal Box to hold the KListView's
+	//Horizontal Box to hold the TDEListView's
 	listBox = new TQHGroupBox( i18n( "Dish Characteristics" ), this );
 	layout->addWidget( listBox );
 
@@ -634,13 +634,13 @@ void DishTitle::paintEvent( TQPaintEvent * )
 		TQPainter painter( this );
 
 		// First draw the decoration
-		painter.setPen( KGlobalSettings::activeTitleColor() );
+		painter.setPen( TDEGlobalSettings::activeTitleColor() );
-		painter.setBrush( TQBrush( KGlobalSettings::activeTitleColor() ) );
+		painter.setBrush( TQBrush( TDEGlobalSettings::activeTitleColor() ) );
 		painter.drawRoundRect( 0, 20, 30, height() - 40, 50, ( int ) ( 50.0 / ( height() - 40 ) * 35.0 ) );
 
 		// Now draw the text
 
-		TQFont titleFont = KGlobalSettings::windowTitleFont ();
+		TQFont titleFont = TDEGlobalSettings::windowTitleFont ();
 		titleFont.setPointSize( 15 );
 		painter.setFont( titleFont );
 		painter.rotate( -90 );
@@ -661,12 +661,12 @@ void DishTitle::paintEvent( TQPaintEvent * )
 		TQPainter painter( &pm );
 
 		// First draw the decoration
-		painter.setPen( KGlobalSettings::activeTitleColor() );
+		painter.setPen( TDEGlobalSettings::activeTitleColor() );
-		painter.setBrush( TQBrush( KGlobalSettings::activeTitleColor() ) );
+		painter.setBrush( TQBrush( TDEGlobalSettings::activeTitleColor() ) );
 		painter.drawRoundRect( 20, 0, height() - 40, 30, ( int ) ( 50.0 / ( height() - 40 ) * 35.0 ), 50 );
 
 		// Now draw the text
-		TQFont titleFont = KGlobalSettings::windowTitleFont ();
+		TQFont titleFont = TDEGlobalSettings::windowTitleFont ();
 		titleFont.setPointSize( 15 );
 		painter.setFont( titleFont );
 		painter.setPen( TQColor( 0x00, 0x00, 0x00 ) );
@@ -753,21 +753,21 @@ void DietWizardDialog::loadConstraints( int meal, int dish, ConstraintList *cons
 {
 	MealInput * mealTab = ( MealInput* ) ( mealTabs->page( meal ) ); // Get the meal
 	DishInput* dishInput = mealTab->dishInputList[ dish ]; // Get the dish input
-	dishInput->loadConstraints( constraints ); //Load the constraints form the KListView
+	dishInput->loadConstraints( constraints ); //Load the constraints form the TDEListView
 }
 
 void DietWizardDialog::loadEnabledCategories( int meal, int dish, ElementList *categories )
 {
 	MealInput * mealTab = ( MealInput* ) ( mealTabs->page( meal ) ); // Get the meal
 	DishInput* dishInput = mealTab->dishInputList[ dish ]; // Get the dish input
-	dishInput->loadEnabledCategories( categories ); //Load the categories that have been checked in the KListView
+	dishInput->loadEnabledCategories( categories ); //Load the categories that have been checked in the TDEListView
 }
 
 bool DietWizardDialog::categoryFiltering( int meal, int dish ) const
 {
 	MealInput * mealTab = ( MealInput* ) ( mealTabs->page( meal ) ); // Get the meal
 	DishInput* dishInput = mealTab->dishInputList[ dish ]; // Get the dish input
-	return ( dishInput->isCategoryFilteringEnabled() ); //Load the categories that have been checked in the KListView
+	return ( dishInput->isCategoryFilteringEnabled() ); //Load the categories that have been checked in the TDEListView
 }
 
 bool DietWizardDialog::checkLimits( IngredientPropertyList &properties, ConstraintList &constraints )

krecipes/src/dialogs/dietwizarddialog.h

@@ -30,7 +30,7 @@
 #include <ntqvgroupbox.h>
 #include <ntqwidgetstack.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include "datablocks/constraintlist.h"
 #include "datablocks/recipelist.h"

krecipes/src/dialogs/editratingdialog.cpp

@@ -10,7 +10,7 @@
 
 #include "editratingdialog.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <ntqvariant.h>
 #include <ntqpushbutton.h>
@@ -18,7 +18,7 @@
 #include <ntqcombobox.h>
 #include <knuminput.h>
 #include <ntqheader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <ntqtextedit.h>
 #include <ntqlineedit.h>
 #include <ntqlayout.h>
@@ -27,8 +27,8 @@
 #include <ntqpainter.h>
 #include <ntqvbox.h>
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 
@@ -38,17 +38,17 @@
 
 #include "widgets/ratingwidget.h"
 
-class RatingCriteriaListView : public KListView
+class RatingCriteriaListView : public TDEListView
 {
 public:
-	RatingCriteriaListView( TQWidget *parent = 0, const char *name = 0 ) : KListView(parent,name){}
+	RatingCriteriaListView( TQWidget *parent = 0, const char *name = 0 ) : TDEListView(parent,name){}
 
 	void rename( TQListViewItem *it, int c )
 	{
 		if ( c == 1 )
 			it->setPixmap(c,TQPixmap());
 
-		KListView::rename(it,c);
+		TDEListView::rename(it,c);
 	}
 };
 
@@ -119,9 +119,9 @@ void EditRatingDialog::init( const ElementList &criteriaList )
 	connect( addButton, SIGNAL(clicked()), this, SLOT(slotAddRatingCriteria()) );
 	connect( removeButton, SIGNAL(clicked()), this, SLOT(slotRemoveRatingCriteria()) );
 
-	KIconLoader il;
+	TDEIconLoader il;
-	KPopupMenu *kpop = new KPopupMenu( criteriaListView );
+	TDEPopupMenu *kpop = new TDEPopupMenu( criteriaListView );
-	kpop->insertItem( il.loadIcon( "editshred", KIcon::NoGroup, 16 ), i18n( "&Delete" ), this, SLOT( slotRemoveRatingCriteria() ), Key_Delete );
+	kpop->insertItem( il.loadIcon( "editshred", TDEIcon::NoGroup, 16 ), i18n( "&Delete" ), this, SLOT( slotRemoveRatingCriteria() ), Key_Delete );
 
 	for ( ElementList::const_iterator criteria_it = criteriaList.begin(); criteria_it != criteriaList.end(); ++criteria_it ) {
 		criteriaComboBox->insertItem( ( *criteria_it ).name );

krecipes/src/dialogs/editratingdialog.h

@@ -21,7 +21,7 @@ class TQLabel;
 class TQComboBox;
 class KDoubleSpinBox;
 class TQPushButton;
-class KListView;
+class TDEListView;
 class TQListViewItem;
 class TQTextEdit;
 class TQLineEdit;

krecipes/src/dialogs/ingredientgroupsdialog.cpp

@@ -14,7 +14,7 @@
 #include <ntqlayout.h>
 #include <ntqvbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 
 #include "widgets/krelistview.h"

krecipes/src/dialogs/ingredientmatcherdialog.cpp

@@ -27,13 +27,13 @@
 #include <ntqlayout.h>
 #include <ntqgroupbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcursor.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 
@@ -59,15 +59,15 @@ IngredientMatcherDialog::IngredientMatcherDialog( TQWidget *parent, RecipeDB *db
 
 	TQVBoxLayout *layout1 = new TQVBoxLayout( 0, 0, 6, "layout1" );
 
-	KIconLoader il;
+	TDEIconLoader il;
 
 	addButton = new TQPushButton( this, "addButton" );
-	addButton->setIconSet( il.loadIconSet( "forward", KIcon::Small ) );
+	addButton->setIconSet( il.loadIconSet( "forward", TDEIcon::Small ) );
 	addButton->setFixedSize( TQSize( 32, 32 ) );
 	layout1->addWidget( addButton );
 
 	removeButton = new TQPushButton( this, "removeButton" );
-	removeButton->setIconSet( il.loadIconSet( "back", KIcon::Small ) );
+	removeButton->setIconSet( il.loadIconSet( "back", TDEIcon::Small ) );
 	removeButton->setFixedSize( TQSize( 32, 32 ) );
 	layout1->addWidget( removeButton );
 	TQSpacerItem *spacer1 = new TQSpacerItem( 51, 191, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
@@ -96,7 +96,7 @@ IngredientMatcherDialog::IngredientMatcherDialog( TQWidget *parent, RecipeDB *db
 
 	recipeListView->listView() ->addColumn( i18n( "Title" ) );
 
-	KConfig *config = KGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup( "Advanced" );
 	bool show_id = config->readBoolEntry( "ShowID", false );
 	recipeListView->listView() ->addColumn( i18n( "Id" ), show_id ? -1 : 0 );
@@ -111,13 +111,13 @@ IngredientMatcherDialog::IngredientMatcherDialog( TQWidget *parent, RecipeDB *db
 	TQHBox *buttonBox = new TQHBox( this );
 
 	okButton = new TQPushButton( buttonBox );
-	okButton->setIconSet( il.loadIconSet( "button_ok", KIcon::Small ) );
+	okButton->setIconSet( il.loadIconSet( "button_ok", TDEIcon::Small ) );
 	okButton->setText( i18n( "Find matching recipes" ) );
 
 	//buttonBox->layout()->addItem( new TQSpacerItem( 10,10, TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed ) );
 
 	clearButton = new TQPushButton( buttonBox );
-	clearButton->setIconSet( il.loadIconSet( "editclear", KIcon::Small ) );
+	clearButton->setIconSet( il.loadIconSet( "editclear", TDEIcon::Small ) );
 	clearButton->setText( i18n( "Clear" ) );
 	dialogLayout->addWidget(buttonBox);
 
@@ -234,7 +234,7 @@ void IngredientMatcherDialog::unselectIngredients()
 
 void IngredientMatcherDialog::findRecipes( void )
 {
-	KApplication::setOverrideCursor( KCursor::waitCursor() );
+	TDEApplication::setOverrideCursor( KCursor::waitCursor() );
 
 	START_TIMER("Ingredient Matcher: loading database data");
 
@@ -274,7 +274,7 @@ void IngredientMatcherDialog::findRecipes( void )
 	//Check if the user wants to show missing ingredients
 
 	if ( missingNumberSpinBox->value() == 0 ) {
-		KApplication::restoreOverrideCursor();
+		TDEApplication::restoreOverrideCursor();
 		return ;
 	} //"None"
 
@@ -325,7 +325,7 @@ void IngredientMatcherDialog::findRecipes( void )
 	}
 	END_TIMER();
 
-	KApplication::restoreOverrideCursor();
+	TDEApplication::restoreOverrideCursor();
 }
 
 void IngredientMatcherDialog::reload( ReloadFlags flag )
@@ -336,16 +336,16 @@ void IngredientMatcherDialog::reload( ReloadFlags flag )
 void SectionItem::paintCell ( TQPainter * p, const TQColorGroup & /*cg*/, int column, int width, int /*align*/ )
 {
 	// Draw the section's deco
-	p->setPen( KGlobalSettings::activeTitleColor() );
+	p->setPen( TDEGlobalSettings::activeTitleColor() );
-	p->setBrush( KGlobalSettings::activeTitleColor() );
+	p->setBrush( TDEGlobalSettings::activeTitleColor() );
 	p->drawRect( 0, 0, width, height() );
 
 	// Draw the section's text
 	if ( column == 0 ) {
-		TQFont titleFont = KGlobalSettings::windowTitleFont ();
+		TQFont titleFont = TDEGlobalSettings::windowTitleFont ();
 		p->setFont( titleFont );
 
-		p->setPen( KGlobalSettings::activeTextColor() );
+		p->setPen( TDEGlobalSettings::activeTextColor() );
 		p->drawText( 0, 0, width, height(), TQt::AlignLeft | TQt::AlignVCenter, mText );
 	}
 }

krecipes/src/dialogs/ingredientmatcherdialog.h

@@ -27,7 +27,7 @@
 #include <ntqvbox.h>
 
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 class KreListView;
 class KIntSpinBox;

krecipes/src/dialogs/ingredientparserdialog.cpp

@@ -22,13 +22,13 @@
 #include <ntqclipboard.h>
 #include <ntqvbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
-#include <kaction.h>
+#include <tdeaction.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include "datablocks/mixednumber.h"
 #include "widgets/inglistviewitem.h"
@@ -53,7 +53,7 @@ IngredientParserDialog::IngredientParserDialog( const UnitList &units, TQWidget*
 	previewLabel = new TQLabel( page, "previewLabel" );
 	previewLabel->setTextFormat( TQLabel::RichText );
 	
-	previewIngView = new KListView( page, "previewIngView" );
+	previewIngView = new TDEListView( page, "previewIngView" );
 	previewIngView->setSorting(-1);
 	previewIngView->addColumn( i18n( "Ingredient" ) );
 	previewIngView->addColumn( i18n( "Amount" ) );
@@ -82,7 +82,7 @@ IngredientParserDialog::IngredientParserDialog( const UnitList &units, TQWidget*
 	buttonBox->addWidget( buttonGroup );
 	buttonBox->addItem( horizontalSpacing );
 	
-	KPopupMenu *kpop = new KPopupMenu( previewIngView );
+	TDEPopupMenu *kpop = new TDEPopupMenu( previewIngView );
 	kpop->insertItem( i18n( "&Delete" ), this, SLOT( removeIngredient() ), Key_Delete );
 	kpop->insertItem( i18n("Set &Header") , this, SLOT( convertToHeader() ) );
  

krecipes/src/dialogs/ingredientparserdialog.h

@@ -24,7 +24,7 @@ class TQLabel;
 class TQTextEdit;
 class TQLineEdit;
 class KPushButton;
-class KListView;
+class TDEListView;
 class TQListViewItem;
 class TQPushButton;
 
@@ -43,7 +43,7 @@ protected:
 	TQLabel *previewLabel;
 	TQTextEdit* ingredientTextEdit;
 	KPushButton* parseButton;
-	KListView* previewIngView;
+	TDEListView* previewIngView;
 	TQPushButton* buttonGroup;
 
 protected slots:

krecipes/src/dialogs/ingredientsdialog.cpp

@@ -26,13 +26,13 @@
 #include "dialogs/ingredientgroupsdialog.h"
 #include "dialogs/createingredientweightdialog.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcursor.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <ntqheader.h>
 #include <ntqmessagebox.h>
@@ -136,7 +136,7 @@ IngredientsDialog::IngredientsDialog( TQWidget* parent, RecipeDB *db ) : TQWidge
 	layout->addItem( spacer_Ing_Units, 1, 4 );
 
 
-	KConfig *config = KGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup( "Advanced" );
 	bool show_id = config->readBoolEntry( "ShowID", false );
 
@@ -327,7 +327,7 @@ void IngredientsDialog::reloadUnitList()
 	if ( ingredientID >= 0 ) {
 		database->loadPossibleUnits( ingredientID, unitList );
 
-		//Populate this data into the KListView
+		//Populate this data into the TDEListView
 
 		for ( UnitList::const_iterator unit_it = unitList->begin(); unit_it != unitList->end(); ++unit_it ) {
 			if ( !( *unit_it ).name.isEmpty() ) {
@@ -519,7 +519,7 @@ void IngredientsDialog:: reloadPropertyList( void )
 	TQListViewItem *it;
 	it = ingredientListView->listView() ->selectedItem();
 
-	//Populate this data into the KListView
+	//Populate this data into the TDEListView
 	if ( it ) { // make sure that the ingredient list is not empty
 
 		database->loadProperties( propertiesList, it->text( 1 ).toInt() ); // load the list for this ingredient
@@ -544,7 +544,7 @@ void IngredientsDialog::reloadWeightList( void )
 	//If none is selected, select first item
 	TQListViewItem *it = ingredientListView->listView() ->selectedItem();
 
-	//Populate this data into the KListView
+	//Populate this data into the TDEListView
 	if ( it ) { // make sure that the ingredient list is not empty
 		WeightList list = database->ingredientWeightUnits( it->text( 1 ).toInt() ); // load the list for this ingredient
 		for ( WeightList::const_iterator weight_it = list.begin(); weight_it != list.end(); ++weight_it ) {
@@ -686,9 +686,9 @@ void IngredientsDialog::openUSDADialog( void )
 {
 	TQListViewItem * ing_it = ingredientListView->listView() ->selectedItem(); // Find selected ingredient
 	if ( ing_it ) {
-		KApplication::setOverrideCursor( KCursor::waitCursor() );
+		TDEApplication::setOverrideCursor( KCursor::waitCursor() );
 		USDADataDialog usda_dialog( Element( ing_it->text( 0 ), ing_it->text( 1 ).toInt() ), database, this );
-		KApplication::restoreOverrideCursor();
+		TDEApplication::restoreOverrideCursor();
 
 		if ( usda_dialog.exec() == TQDialog::Accepted ) {
 			reloadPropertyList(); //update property list upon success

krecipes/src/dialogs/pagesetupdialog.cpp

@@ -20,35 +20,35 @@
 #include <ntqtabwidget.h>
 #include <ntqlabel.h>
 
-#include <khtmlview.h>
+#include <tdehtmlview.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
-#include <kaction.h>
+#include <tdeaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstdaction.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include "setupdisplay.h"
 
 PageSetupDialog::PageSetupDialog( TQWidget *parent, const Recipe &sample, const TQString &configEntry ) : KDialog( parent, 0, true ), m_configEntry(configEntry)
 {
-	KIconLoader il;
+	TDEIconLoader il;
 
 	TQVBoxLayout * layout = new TQVBoxLayout( this );
 
-	KToolBar *toolbar = new KToolBar( this );
+	TDEToolBar *toolbar = new TDEToolBar( this );
-	KActionCollection *actionCollection = new KActionCollection( this );
+	TDEActionCollection *actionCollection = new TDEActionCollection( this );
 
-	KAction *std_open = KStdAction::open( 0, 0, 0 ); //use this to create a custom open action
+	TDEAction *std_open = KStdAction::open( 0, 0, 0 ); //use this to create a custom open action
-	KToolBarPopupAction *custom_open = new KToolBarPopupAction( std_open->text(), std_open->icon(), std_open->shortcut(), this, SLOT( loadFile() ), actionCollection, "open_popup" );
+	TDEToolBarPopupAction *custom_open = new TDEToolBarPopupAction( std_open->text(), std_open->icon(), std_open->shortcut(), this, SLOT( loadFile() ), actionCollection, "open_popup" );
 
-	KPopupMenu *open_popup = custom_open->popupMenu();
+	TDEPopupMenu *open_popup = custom_open->popupMenu();
 
 	open_popup->insertTitle( i18n( "Styles" ) );
 	TQDir included_layouts( getIncludedLayoutDir(), "*.klo", TQDir::Name | TQDir::IgnoreCase, TQDir::Files );
@@ -70,7 +70,7 @@ PageSetupDialog::PageSetupDialog( TQWidget *parent, const Recipe &sample, const
 	KStdAction::saveAs( this, SLOT( saveAsLayout() ), actionCollection ) ->plug( toolbar );
 	KStdAction::redisplay( this, SLOT( reloadLayout() ), actionCollection ) ->plug( toolbar );
 
-	KToolBarPopupAction *shown_items = new KToolBarPopupAction( i18n( "Items Shown" ), "frame_edit" );
+	TDEToolBarPopupAction *shown_items = new TDEToolBarPopupAction( i18n( "Items Shown" ), "frame_edit" );
 	shown_items->setDelayed( false );
 	shown_items_popup = shown_items->popupMenu();
 	shown_items_popup->insertTitle( i18n( "Show Items" ) );
@@ -84,15 +84,15 @@ PageSetupDialog::PageSetupDialog( TQWidget *parent, const Recipe &sample, const
 	layout->addWidget( m_htmlPart->view() );
 
 	TQHBox *buttonsBox = new TQHBox( this );
-	TQPushButton *okButton = new TQPushButton( il.loadIconSet( "ok", KIcon::Small ), i18n( "Save and Close" ), buttonsBox );
+	TQPushButton *okButton = new TQPushButton( il.loadIconSet( "ok", TDEIcon::Small ), i18n( "Save and Close" ), buttonsBox );
-	TQPushButton *cancelButton = new TQPushButton( il.loadIconSet( "cancel", KIcon::Small ), i18n( "&Cancel" ), buttonsBox );
+	TQPushButton *cancelButton = new TQPushButton( il.loadIconSet( "cancel", TDEIcon::Small ), i18n( "&Cancel" ), buttonsBox );
 	layout->addWidget( buttonsBox );
 
 	connect( m_htmlPart, SIGNAL(itemVisibilityChanged(KreDisplayItem*,bool)), this, SLOT(updateItemVisibility(KreDisplayItem*,bool)) );
 	connect( okButton, SIGNAL( clicked() ), SLOT( accept() ) );
 	connect( cancelButton, SIGNAL( clicked() ), SLOT( reject() ) );
 
-	KConfig *config = KGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup( "Page Setup" );
 	TQSize defaultSize(300,400);
 	resize(config->readSizeEntry( "WindowSize", &defaultSize ));
@@ -118,18 +118,18 @@ void PageSetupDialog::accept()
 		saveLayout();
 
 	if ( !active_filename.isEmpty() ) {
-		KConfig * config = kapp->config();
+		TDEConfig * config = kapp->config();
 		config->setGroup( "Page Setup" );
 		config->writeEntry( m_configEntry+"Layout", active_filename );
 	}
 
 	if ( !active_template.isEmpty() ) {
-		KConfig * config = kapp->config();
+		TDEConfig * config = kapp->config();
 		config->setGroup( "Page Setup" );
 		config->writeEntry( m_configEntry+"Template", active_template );
 	}
 
-	KConfig *config = kapp->config();
+	TDEConfig *config = kapp->config();
 	config->setGroup( "Page Setup" );
 	config->writeEntry( "WindowSize", size() );
 
@@ -259,7 +259,7 @@ void PageSetupDialog::saveLayout()
 
 void PageSetupDialog::saveAsLayout()
 {
-	TQString filename = KFileDialog::getSaveFileName( KGlobal::instance() ->dirs() ->saveLocation( "appdata", "layouts/" ), "*.klo|Krecipes Layout (*.klo)", this, TQString::null );
+	TQString filename = KFileDialog::getSaveFileName( TDEGlobal::instance() ->dirs() ->saveLocation( "appdata", "layouts/" ), "*.klo|Krecipes Layout (*.klo)", this, TQString::null );
 
 	if ( !filename.isEmpty() ) {
 		if ( haveWritePerm( filename ) ) {

krecipes/src/dialogs/pagesetupdialog.h

@@ -17,7 +17,7 @@
 
 #include "datablocks/recipe.h"
 
-class KPopupMenu;
+class TDEPopupMenu;
 
 class SetupDisplay;
 class KreDisplayItem;
@@ -66,7 +66,7 @@ private:
 	TQMap<int, KreDisplayItem*> popup_widget_map;
 	TQMap<KreDisplayItem*, int> widget_popup_map;
 	TQMap<int, TQString> included_layouts_map;
-	KPopupMenu *shown_items_popup;
+	TDEPopupMenu *shown_items_popup;
 };
 
 #endif //PAGESETUPDIALOG_H

krecipes/src/dialogs/prepmethodsdialog.cpp

@@ -17,8 +17,8 @@
 #include "widgets/prepmethodlistview.h"
 
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 PrepMethodsDialog::PrepMethodsDialog( TQWidget* parent, RecipeDB *db ) : TQWidget( parent )
 {

krecipes/src/dialogs/prepmethodsdialog.h

@@ -18,7 +18,7 @@
 #include <ntqhbox.h>
 #include <ntqlayout.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include "widgets/dblistviewbase.h"
 
@@ -48,6 +48,6 @@ private:
 	TQHBox *buttonBar;
 	TQPushButton *newPrepMethodButton;
 	TQPushButton *removePrepMethodButton;
-	KIconLoader *il;
+	TDEIconLoader *il;
 };
 #endif

krecipes/src/dialogs/propertiesdialog.cpp

@@ -11,10 +11,10 @@
 ***************************************************************************/
 
 #include "propertiesdialog.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "backends/recipedb.h"
 #include "createpropertydialog.h"
@@ -33,7 +33,7 @@ PropertiesDialog::PropertiesDialog( TQWidget *parent, RecipeDB *db ) : TQWidget(
 	propertyListView = new CheckPropertyListView( this, database, true );
 	propertyListView->reload();
 
-	KConfig *config = KGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup("Formatting");
 	TQStringList hiddenList = config->readListEntry("HiddenProperties");
 	for ( TQCheckListItem *item = (TQCheckListItem*)propertyListView->firstChild(); item; item = (TQCheckListItem*)item->nextSibling() ) {

krecipes/src/dialogs/propertiesdialog.h

@@ -16,7 +16,7 @@
 #include <ntqlayout.h>
 #include <ntqpushbutton.h>
 #include <ntqvbox.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 class RecipeDB;
 class StdPropertyListView;

krecipes/src/dialogs/recipeimportdialog.cpp

@@ -12,9 +12,9 @@
 
 #include "recipeimportdialog.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdebug.h>
 
 #include <ntqvbox.h>
@@ -34,7 +34,7 @@ RecipeImportDialog::RecipeImportDialog( const RecipeList &list, TQWidget *parent
 
 	TQVBox *page = makeVBoxMainWidget();
 
-	kListView = new KListView( page );
+	kListView = new TDEListView( page );
 	kListView->addColumn( i18n( "Recipes" ) );
 	kListView->setProperty( "selectionMode", "NoSelection" );
 	kListView->setRootIsDecorated( true );

krecipes/src/dialogs/recipeimportdialog.h

@@ -21,7 +21,7 @@
 
 #include "datablocks/recipelist.h"
 
-class KListView;
+class TDEListView;
 
 class TQListViewItem;
 
@@ -45,7 +45,7 @@ protected slots:
 private:
 	void loadListView();
 
-	KListView* kListView;
+	TDEListView* kListView;
 
 	TQMap<CustomCheckListItem*, RecipeList::const_iterator> *recipe_items;
 	const RecipeList list_copy;

krecipes/src/dialogs/recipeinputdialog.cpp

@@ -28,13 +28,13 @@
 #include <ntqwidgetstack.h>
 #include <ntqpainter.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kcompletionbox.h>
+#include <tdecompletionbox.h>
-#include <kspell.h>
+#include <tdespell.h>
 #include <kurl.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <kled.h>
 #include <kdialogbase.h>
@@ -114,7 +114,7 @@ RecipeInputDialog::RecipeInputDialog( TQWidget* parent, RecipeDB *db ) : TQVBox(
 	loadedRecipe->instructions = TQString::null;
 	database = db;
 
-	KIconLoader *il = new KIconLoader;
+	TDEIconLoader *il = new TDEIconLoader;
 
 	// Tabs
 	tabWidget = new TQTabWidget( this, "tabWidget" );
@@ -161,7 +161,7 @@ RecipeInputDialog::RecipeInputDialog( TQWidget* parent, RecipeDB *db ) : TQVBox(
 		( changePhotoButton, i18n( "Select photo" ) );
 
 	TQPushButton *clearPhotoButton = new TQPushButton( photoButtonsBox );
-	clearPhotoButton->setPixmap( il->loadIcon( "clear_left", KIcon::NoGroup, 16 ) );
+	clearPhotoButton->setPixmap( il->loadIcon( "clear_left", TDEIcon::NoGroup, 16 ) );
 	TQToolTip::add
 		( clearPhotoButton, i18n( "Clear photo" ) );
 
@@ -288,7 +288,7 @@ RecipeInputDialog::RecipeInputDialog( TQWidget* parent, RecipeDB *db ) : TQVBox(
 	addButton = new KPushButton( ingredientGBox );
 	addButton->setFixedSize( TQSize( 31, 31 ) );
 	addButton->setFlat( true );
-	TQPixmap pm = il->loadIcon( "new", KIcon::NoGroup, 16 );
+	TQPixmap pm = il->loadIcon( "new", TDEIcon::NoGroup, 16 );
 	addButton->setPixmap( pm );
 	addButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
 	ingredientsLayout->addWidget( addButton, 3, 5 );
@@ -300,7 +300,7 @@ RecipeInputDialog::RecipeInputDialog( TQWidget* parent, RecipeDB *db ) : TQVBox(
 	upButton = new KPushButton( ingredientGBox );
 	upButton->setFixedSize( TQSize( 31, 31 ) );
 	upButton->setFlat( true );
-	pm = il->loadIcon( "up", KIcon::NoGroup, 16 );
+	pm = il->loadIcon( "up", TDEIcon::NoGroup, 16 );
 	upButton->setPixmap( pm );
 	upButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
 	ingredientsLayout->addWidget( upButton, 5, 5 );
@@ -308,7 +308,7 @@ RecipeInputDialog::RecipeInputDialog( TQWidget* parent, RecipeDB *db ) : TQVBox(
 	downButton = new KPushButton( ingredientGBox );
 	downButton->setFixedSize( TQSize( 31, 31 ) );
 	downButton->setFlat( true );
-	pm = il->loadIcon( "down", KIcon::NoGroup, 16 );
+	pm = il->loadIcon( "down", TDEIcon::NoGroup, 16 );
 	downButton->setPixmap( pm );
 	downButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
 	ingredientsLayout->addWidget( downButton, 6, 5 );
@@ -316,7 +316,7 @@ RecipeInputDialog::RecipeInputDialog( TQWidget* parent, RecipeDB *db ) : TQVBox(
 	removeButton = new KPushButton( ingredientGBox );
 	removeButton->setFixedSize( TQSize( 31, 31 ) );
 	removeButton->setFlat( true );
-	pm = il->loadIcon( "remove", KIcon::NoGroup, 16 );
+	pm = il->loadIcon( "remove", TDEIcon::NoGroup, 16 );
 	removeButton->setPixmap( pm );
 	removeButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
 	ingredientsLayout->addWidget( removeButton, 7, 5 );
@@ -324,7 +324,7 @@ RecipeInputDialog::RecipeInputDialog( TQWidget* parent, RecipeDB *db ) : TQVBox(
 	ingParserButton = new KPushButton( ingredientGBox );
 	ingParserButton->setFixedSize( TQSize( 31, 31 ) );
 	ingParserButton->setFlat( true );
-	pm = il->loadIcon( "editpaste", KIcon::NoGroup, 16 );
+	pm = il->loadIcon( "editpaste", TDEIcon::NoGroup, 16 );
 	ingParserButton->setPixmap( pm );
 	ingParserButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
 	ingredientsLayout->addWidget( ingParserButton, 8, 5 );
@@ -341,7 +341,7 @@ RecipeInputDialog::RecipeInputDialog( TQWidget* parent, RecipeDB *db ) : TQVBox(
 		( ingParserButton, i18n( "Paste Ingredients" ) );
 
 	// Ingredient List
-	ingredientList = new KListView( ingredientGBox, "ingredientList" );
+	ingredientList = new TDEListView( ingredientGBox, "ingredientList" );
 	ingredientList->addColumn( i18n( "Ingredient" ) );
 	ingredientList->addColumn( i18n( "Amount" ) );
 	ingredientList->setColumnAlignment( 1, TQt::AlignHCenter );
@@ -374,7 +374,7 @@ RecipeInputDialog::RecipeInputDialog( TQWidget* parent, RecipeDB *db ) : TQVBox(
 
 	KGuiItem updateGuiItem;
 	updateGuiItem.setText( i18n("Update") );
-	updateGuiItem.setIconSet( il->loadIconSet( "reload", KIcon::NoGroup ) );
+	updateGuiItem.setIconSet( il->loadIconSet( "reload", TDEIcon::NoGroup ) );
 	propertyStatusDialog = new KDialogBase( KDialogBase::Swallow, i18n("Property details"),
 		KDialogBase::Close | KDialogBase::User1 | KDialogBase::Help,
 		KDialogBase::Close, this, "propertyStatusDialog", false, false,
@@ -403,7 +403,7 @@ RecipeInputDialog::RecipeInputDialog( TQWidget* parent, RecipeDB *db ) : TQVBox(
 	instructionsLayout->addWidget( instructionsEdit );
 
 	spellCheckButton = new TQToolButton( instructionsTab );
-	spellCheckButton->setIconSet( il->loadIconSet( "spellcheck", KIcon::Small ) );
+	spellCheckButton->setIconSet( il->loadIconSet( "spellcheck", TDEIcon::Small ) );
 	TQToolTip::add
 		( spellCheckButton, i18n( "Check spelling" ) );
 	instructionsLayout->addWidget( spellCheckButton );
@@ -435,14 +435,14 @@ RecipeInputDialog::RecipeInputDialog( TQWidget* parent, RecipeDB *db ) : TQVBox(
 	functionsBox->setFrameStyle( TQFrame::NoFrame );
 
 	saveButton = new TQToolButton( functionsBox );
-	saveButton->setIconSet( il->loadIconSet( "filesave", KIcon::Small ) );
+	saveButton->setIconSet( il->loadIconSet( "filesave", TDEIcon::Small ) );
 	saveButton->setEnabled( false );
 	showButton = new TQToolButton( functionsBox );
-	showButton->setIconSet( il->loadIconSet( "viewmag", KIcon::Small ) );
+	showButton->setIconSet( il->loadIconSet( "viewmag", TDEIcon::Small ) );
 	closeButton = new TQToolButton( functionsBox );
-	closeButton->setIconSet( il->loadIconSet( "fileclose", KIcon::Small ) );
+	closeButton->setIconSet( il->loadIconSet( "fileclose", TDEIcon::Small ) );
 	resizeButton = new TQToolButton( functionsBox );
-	resizeButton->setIconSet( il->loadIconSet( "2uparrow", KIcon::Small ) ); //TODO: give me an icon :)
+	resizeButton->setIconSet( il->loadIconSet( "2uparrow", TDEIcon::Small ) ); //TODO: give me an icon :)
 
 	saveButton->setTextLabel( i18n( "Save recipe" ), true );
 	saveButton->setUsesTextLabel( true );
@@ -656,7 +656,7 @@ void RecipeInputDialog::reload( void )
 	ratingListDisplayWidget->ensureCellVisible(0,0);
 
 	// Update yield type auto completion
-	KCompletion *completion = yieldTypeEdit->completionObject();
+	TDECompletion *completion = yieldTypeEdit->completionObject();
 	completion->clear();
 	ElementList yieldList;
 	database->loadYieldTypes( &yieldList );

krecipes/src/dialogs/recipeinputdialog.h

@@ -17,7 +17,7 @@
 #include <ktextedit.h>
 #include <klineedit.h>
 #include <kcombobox.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <knuminput.h>
 #include <kpushbutton.h>
 #include <kiconloader.h>
@@ -108,7 +108,7 @@ private:
 	TQPushButton* addCategoryButton;
 
 	//Ingredient inputs
-	KListView* ingredientList;
+	TDEListView* ingredientList;
 	TQGroupBox *ingredientGBox;
 	IngredientInputWidget *ingInput;
 	ClickableLed *propertyStatusLed;

krecipes/src/dialogs/recipeprintpreview.cpp

@@ -13,7 +13,7 @@
 #include <ntqvbox.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "recipeviewdialog.h"
 #include "pagesetupdialog.h"

krecipes/src/dialogs/recipeviewdialog.cpp

@@ -16,18 +16,18 @@
 #include <ntqstyle.h>
 #include <ntqfile.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcursor.h>
 #include <kdebug.h>
-#include <khtmlview.h>
+#include <tdehtmlview.h>
-#include <khtml_part.h>
+#include <tdehtml_part.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kprogress.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "datablocks/mixednumber.h"
 #include "backends/recipedb.h"
@@ -38,7 +38,7 @@ RecipeViewDialog::RecipeViewDialog( TQWidget *parent, RecipeDB *db, int recipeID
 	database(db)
 {
 	// Initialize UI Elements
-	recipeView = new KHTMLPart( this );
+	recipeView = new TDEHTMLPart( this );
 
 	connect( database, SIGNAL(recipeRemoved(int)), SLOT(recipeRemoved(int)) );
 
@@ -64,7 +64,7 @@ bool RecipeViewDialog::loadRecipe( int recipeID )
 
 bool RecipeViewDialog::loadRecipes( const TQValueList<int> &ids, const TQString &layoutConfig )
 {
-	KApplication::setOverrideCursor( KCursor::waitCursor() );
+	TDEApplication::setOverrideCursor( KCursor::waitCursor() );
 
 	// Remove any files created by the last recipe loaded
 	removeOldFiles();
@@ -74,7 +74,7 @@ bool RecipeViewDialog::loadRecipes( const TQValueList<int> &ids, const TQString
 
 	bool success = showRecipes( ids, layoutConfig );
 
-	KApplication::restoreOverrideCursor();
+	TDEApplication::restoreOverrideCursor();
 	return success;
 }
 
@@ -90,7 +90,7 @@ bool RecipeViewDialog::showRecipes( const TQValueList<int> &ids, const TQString
 
 	HTMLExporter html_generator( tmp_filename + ".html", "html" );
 	if ( layoutConfig != TQString::null ) {
-		KConfig *config = KGlobal::config();
+		TDEConfig *config = TDEGlobal::config();
 		config->setGroup( "Page Setup" );
 		TQString styleFile = config->readEntry( layoutConfig+"Layout", locate( "appdata", "layouts/Default.klo" ) );
 		if ( !styleFile.isEmpty() && TQFile::exists( styleFile ) )
@@ -108,7 +108,7 @@ bool RecipeViewDialog::showRecipes( const TQValueList<int> &ids, const TQString
 	}
 
 	delete recipeView;              // Temporary workaround
-	recipeView = new KHTMLPart( this ); // to avoid the problem of caching images of KHTMLPart
+	recipeView = new TDEHTMLPart( this ); // to avoid the problem of caching images of TDEHTMLPart
 
 	KURL url;
 	url.setPath( tmp_filename + ".html" );

krecipes/src/dialogs/recipeviewdialog.h

@@ -18,7 +18,7 @@
 
 class RecipeDB;
 class Recipe;
-class KHTMLPart;
+class TDEHTMLPart;
 class TQPushButton;
 
 /**
@@ -58,7 +58,7 @@ public slots:
 private:
 
 	// Internal Variables
-	KHTMLPart *recipeView;
+	TDEHTMLPart *recipeView;
 	RecipeDB *database;
 	bool recipe_loaded;
 	TQValueList<int> ids_loaded;

krecipes/src/dialogs/refineshoppinglistdialog.cpp

@@ -18,11 +18,11 @@
 #include <ntqtooltip.h>
 #include <ntqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcursor.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "backends/recipedb.h"
 #include "widgets/krelistview.h"
@@ -55,15 +55,15 @@ RefineShoppingListDialog::RefineShoppingListDialog( TQWidget* parent, RecipeDB *
 
 	layout1 = new TQVBoxLayout( 0, 0, 6, "layout1" );
 
-	KIconLoader il;
+	TDEIconLoader il;
 
 	addButton = new TQPushButton( layout2Widget, "addButton" );
-	addButton->setIconSet( il.loadIconSet( "forward", KIcon::Small ) );
+	addButton->setIconSet( il.loadIconSet( "forward", TDEIcon::Small ) );
 	addButton->setFixedSize( TQSize( 32, 32 ) );
 	layout1->addWidget( addButton );
 
 	removeButton = new TQPushButton( layout2Widget, "removeButton" );
-	removeButton->setIconSet( il.loadIconSet( "back", KIcon::Small ) );
+	removeButton->setIconSet( il.loadIconSet( "back", TDEIcon::Small ) );
 	removeButton->setFixedSize( TQSize( 32, 32 ) );
 	layout1->addWidget( removeButton );
 	spacer1 = new TQSpacerItem( 51, 191, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
@@ -88,9 +88,9 @@ RefineShoppingListDialog::RefineShoppingListDialog( TQWidget* parent, RecipeDB *
 	connect( removeButton, SIGNAL( clicked() ), this, SLOT( removeIngredient() ) );
 	connect( ingListView->listView(), SIGNAL( itemRenamed( TQListViewItem*, const TQString &, int ) ), SLOT( itemRenamed( TQListViewItem*, const TQString &, int ) ) );
 
-	KApplication::setOverrideCursor( KCursor::waitCursor() );
+	TDEApplication::setOverrideCursor( KCursor::waitCursor() );
 	calculateShopping( recipeList, &ingredientList, database );
-	KApplication::restoreOverrideCursor();
+	TDEApplication::restoreOverrideCursor();
 
 	loadData();
 }
@@ -126,13 +126,13 @@ void RefineShoppingListDialog::loadData()
 
 		TQString amount_str;
 		if ( ( *it ).amount > 0 ) {
-			KConfig * config = kapp->config();
+			TDEConfig * config = kapp->config();
 			config->setGroup( "Formatting" );
 	
 			if ( config->readBoolEntry( "Fraction" ) )
 				amount_str = MixedNumber( ( *it ).amount ).toString();
 			else
-				amount_str = beautify( KGlobal::locale() ->formatNumber( ( *it ).amount, 5 ) );
+				amount_str = beautify( TDEGlobal::locale() ->formatNumber( ( *it ).amount, 5 ) );
 		}
 
 		TQListViewItem *new_item = new TQListViewItem( ingListView->listView(), ( *it ).name, amount_str, ( *it ).amount > 1 ? ( *it ).units.plural : ( *it ).units.name );
@@ -181,13 +181,13 @@ void RefineShoppingListDialog::itemRenamed( TQListViewItem* item, const TQString
 		else { //revert back to the valid amount string
 			TQString amount_str;
 			if ( ( *found_it ).amount > 0 ) {
-				KConfig * config = kapp->config();
+				TDEConfig * config = kapp->config();
 				config->setGroup( "Formatting" );
 		
 				if ( config->readBoolEntry( "Fraction" ) )
 					amount_str = MixedNumber( ( *found_it ).amount ).toString();
 				else
-					amount_str = beautify( KGlobal::locale() ->formatNumber( ( *found_it ).amount, 5 ) );
+					amount_str = beautify( TDEGlobal::locale() ->formatNumber( ( *found_it ).amount, 5 ) );
 			}
 
 			item->setText( 1, amount_str );

krecipes/src/dialogs/resizerecipedialog.cpp

@@ -28,8 +28,8 @@
 #include <ntqimage.h>
 #include <ntqpixmap.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 #include "datablocks/recipe.h"

krecipes/src/dialogs/selectauthorsdialog.cpp

@@ -15,11 +15,11 @@
 #include <ntqmessagebox.h>
 #include <ntqvbox.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "backends/recipedb.h"
 
@@ -38,26 +38,26 @@ SelectAuthorsDialog::SelectAuthorsDialog( TQWidget *parent, const ElementList &c
 
 	authorsCombo = new KComboBox( true, topBox );
 	authorsCombo->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding ) );
-	authorsCombo->completionObject() ->setCompletionMode( KGlobalSettings::CompletionPopupAuto );
+	authorsCombo->completionObject() ->setCompletionMode( TDEGlobalSettings::CompletionPopupAuto );
 	authorsCombo->lineEdit() ->disconnect( authorsCombo ); //so hitting enter doesn't enter the item into the box
 	
 	// Add/Remove buttons
 
-	il = new KIconLoader;
+	il = new TDEIconLoader;
 	addAuthorButton = new TQPushButton( topBox );
-	TQPixmap pm = il->loadIcon( "down", KIcon::NoGroup, 16 );
+	TQPixmap pm = il->loadIcon( "down", TDEIcon::NoGroup, 16 );
 	addAuthorButton->setIconSet( pm );
 
 	removeAuthorButton = new TQPushButton( topBox );
-	pm = il->loadIcon( "up", KIcon::NoGroup, 16 );
+	pm = il->loadIcon( "up", TDEIcon::NoGroup, 16 );
 	removeAuthorButton->setIconSet( pm );
 
 	// Author List
 
-	authorListView = new KListView( page );
+	authorListView = new TDEListView( page );
 	authorListView->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding ) );
 
-	KConfig * config = KGlobal::config();
+	TDEConfig * config = TDEGlobal::config();
 	config->setGroup( "Advanced" );
 	bool show_id = config->readBoolEntry( "ShowID", false );
 	authorListView->addColumn( i18n( "Id" ), show_id ? -1 : 0 );

krecipes/src/dialogs/selectauthorsdialog.h

@@ -18,7 +18,7 @@
 
 #include <kdialogbase.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kcombobox.h>
 
 #include "datablocks/elementlist.h"
@@ -43,12 +43,12 @@ private:
 
 	//Widgets
 	KComboBox *authorsCombo;
-	KListView *authorListView;
+	TDEListView *authorListView;
 	TQPushButton *okButton;
 	TQPushButton *cancelButton;
 	TQPushButton *addAuthorButton;
 	TQPushButton *removeAuthorButton;
-	KIconLoader *il;
+	TDEIconLoader *il;
 
 	//Variables
 	ElementList authorList;

krecipes/src/dialogs/selectcategoriesdialog.cpp

@@ -15,10 +15,10 @@
 
 #include <ntqvbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "datablocks/categorytree.h"
 #include "backends/recipedb.h"

krecipes/src/dialogs/selectcategoriesdialog.h

@@ -16,7 +16,7 @@
 #include <ntqlayout.h>
 #include <ntqpushbutton.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdialogbase.h>
 
 #include "datablocks/elementlist.h"

krecipes/src/dialogs/selectpropertydialog.cpp

@@ -12,9 +12,9 @@
 
 #include "selectpropertydialog.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "datablocks/ingredientpropertylist.h"
 
@@ -37,9 +37,9 @@ SelectPropertyDialog::SelectPropertyDialog( TQWidget* parent, IngredientProperty
 	TQVBoxLayout *boxLayout = new TQVBoxLayout( box->layout() );
 	boxLayout->setAlignment( TQt::AlignTop );
 
-	propertyChooseView = new KListView( box, "propertyChooseView" );
+	propertyChooseView = new TDEListView( box, "propertyChooseView" );
 
-	KConfig *config = KGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup( "Advanced" );
 	bool show_id = config->readBoolEntry( "ShowID", false );
 	propertyChooseView->addColumn( i18n( "Id" ), show_id ? -1 : 0 );

krecipes/src/dialogs/selectpropertydialog.h

@@ -20,7 +20,7 @@
 #include <ntqpushbutton.h>
 #include <ntqvbox.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kcombobox.h>
 #include <kdialogbase.h>
 
@@ -44,7 +44,7 @@ public:
 private:
 	//Widgets
 	TQGroupBox *box;
-	KListView *propertyChooseView;
+	TDEListView *propertyChooseView;
 	TQLabel *perUnitsLabel;
 	KComboBox *perUnitsBox;
 	OptionFlag m_showEmpty;

krecipes/src/dialogs/selectrecipedialog.cpp

@@ -16,13 +16,13 @@
 #include <ntqtabwidget.h>
 #include <ntqtooltip.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kprogress.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcursor.h>
 #include <kiconloader.h>
 
@@ -66,9 +66,9 @@ SelectRecipeDialog::SelectRecipeDialog( TQWidget *parent, RecipeDB* db )
 	searchBar->setSpacing( 7 );
 	layout->addWidget( searchBar, 1, 1 );
 
-	KIconLoader *il = new KIconLoader;
+	TDEIconLoader *il = new TDEIconLoader;
 	TQPushButton *clearSearchButton = new TQPushButton( searchBar );
-	clearSearchButton->setPixmap( il->loadIcon( "locationbar_erase", KIcon::NoGroup, 16 ) );
+	clearSearchButton->setPixmap( il->loadIcon( "locationbar_erase", TDEIcon::NoGroup, 16 ) );
 
 	searchLabel = new TQLabel( searchBar );
 	searchLabel->setText( i18n( "Search:" ) );
@@ -97,18 +97,18 @@ SelectRecipeDialog::SelectRecipeDialog( TQWidget *parent, RecipeDB* db )
 	openButton = new TQPushButton( buttonBar );
 	openButton->setText( i18n( "Open Recipe(s)" ) );
 	openButton->setDisabled( true );
-	TQPixmap pm = il->loadIcon( "ok", KIcon::NoGroup, 16 );
+	TQPixmap pm = il->loadIcon( "ok", TDEIcon::NoGroup, 16 );
 	openButton->setIconSet( pm );
 	editButton = new TQPushButton( buttonBar );
 	editButton->setText( i18n( "Edit Recipe" ) );
 	editButton->setDisabled( true );
-	pm = il->loadIcon( "edit", KIcon::NoGroup, 16 );
+	pm = il->loadIcon( "edit", TDEIcon::NoGroup, 16 );
 	editButton->setIconSet( pm );
 	removeButton = new TQPushButton( buttonBar );
 	removeButton->setText( i18n( "Delete" ) );
 	removeButton->setDisabled( true );
 	removeButton->setMaximumWidth( 100 );
-	pm = il->loadIcon( "editshred", KIcon::NoGroup, 16 );
+	pm = il->loadIcon( "editshred", TDEIcon::NoGroup, 16 );
 	removeButton->setIconSet( pm );
 
 	tabWidget->insertTab( basicSearchTab, i18n( "Basic" ) );
@@ -134,7 +134,7 @@ SelectRecipeDialog::SelectRecipeDialog( TQWidget *parent, RecipeDB* db )
 
 	connect( clearSearchButton, SIGNAL( clicked() ), this, SLOT( clearSearch() ) );
 
-	KConfig * config = kapp->config();
+	TDEConfig * config = kapp->config();
 	config->setGroup( "Performance" );
 	if ( config->readBoolEntry("SearchAsYouType",true) ) {
 		connect( searchBox, SIGNAL( returnPressed( const TQString& ) ), recipeFilter, SLOT( filter( const TQString& ) ) );

krecipes/src/dialogs/selectrecipedialog.h

@@ -23,10 +23,10 @@
 
 #include <kcombobox.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include "recipeactionshandler.h"
 #include "widgets/dblistviewbase.h"

krecipes/src/dialogs/selectunitdialog.cpp

@@ -12,9 +12,9 @@
 
 #include "selectunitdialog.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 SelectUnitDialog::SelectUnitDialog( TQWidget* parent, const UnitList &unitList, OptionFlag showEmpty )
 		: KDialogBase( parent, "SelectUnitDialog", true, i18n( "Choose Unit" ),
@@ -27,9 +27,9 @@ SelectUnitDialog::SelectUnitDialog( TQWidget* parent, const UnitList &unitList,
 	box->setColumnLayout( 0, TQt::Vertical );
 	TQVBoxLayout *boxLayout = new TQVBoxLayout( box->layout() );
 
-	unitChooseView = new KListView( box );
+	unitChooseView = new TDEListView( box );
 
-	KConfig *config = KGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup( "Advanced" );
 	bool show_id = config->readBoolEntry( "ShowID", false );
 	unitChooseView->addColumn( i18n( "Id" ), show_id ? -1 : 0 );

krecipes/src/dialogs/selectunitdialog.h

@@ -19,7 +19,7 @@
 #include <ntqgroupbox.h>
 #include <ntqvbox.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdialogbase.h>
 
 #include "datablocks/unit.h"
@@ -41,7 +41,7 @@ public:
 private:
 	//Widgets
 	TQGroupBox *box;
-	KListView *unitChooseView;
+	TDEListView *unitChooseView;
 	OptionFlag m_showEmpty;
 
 	void loadUnits( const UnitList &unitList );

krecipes/src/dialogs/setupdisplay.cpp

@@ -10,18 +10,18 @@
 
 #include "setupdisplay.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <kcolordialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
-#include <khtmlview.h>
+#include <tdehtmlview.h>
 #include <dom/dom_doc.h>
 #include <dom/css_rule.h>
 
@@ -56,7 +56,7 @@ void KreDisplayItem::clear()
 	columns = 1;
 }
 
-SetupDisplay::SetupDisplay( const Recipe &sample, TQWidget *parent ) : KHTMLPart(parent),
+SetupDisplay::SetupDisplay( const Recipe &sample, TQWidget *parent ) : TDEHTMLPart(parent),
 		box_properties( new PropertiesMap ),
 		node_item_map( new TQMap<TQString, KreDisplayItem*> ),
 		has_changes( false ),
@@ -360,7 +360,7 @@ void SetupDisplay::saveLayout( const TQString &filename )
 void SetupDisplay::begin(const KURL &url, int xOffset, int yOffset)
 {
 	kdDebug()<<"begin"<<endl;
-	KHTMLPart::begin(url,xOffset,yOffset);
+	TDEHTMLPart::begin(url,xOffset,yOffset);
 	kdDebug()<<"end"<<endl;
 
 	DOM::Document doc = document();
@@ -406,7 +406,7 @@ void SetupDisplay::nodeClicked(const TQString &/*url*/,const TQPoint &point)
 	KreDisplayItem *item = *node_item_map->find( m_currNodeId );
 	
 	delete popup;
-	popup = new KPopupMenu( view() );
+	popup = new TDEPopupMenu( view() );
 	popup->insertTitle( item->name );
 
 	unsigned int properties = 0;
@@ -417,7 +417,7 @@ void SetupDisplay::nodeClicked(const TQString &/*url*/,const TQPoint &point)
 		}
 	}
 
-	KIconLoader il;
+	TDEIconLoader il;
 
 	if ( properties & BackgroundColor )
 		popup->insertItem( i18n( "Background Color..." ), this, SLOT( setBackgroundColor() ) );
@@ -426,7 +426,7 @@ void SetupDisplay::nodeClicked(const TQString &/*url*/,const TQPoint &point)
 		popup->insertItem( i18n( "Text Color..." ), this, SLOT( setTextColor() ) );
 
 	if ( properties & Font )
-		popup->insertItem( il.loadIconSet( "text", KIcon::Small, 16 ), i18n( "Font..." ), this, SLOT( setFont() ) );
+		popup->insertItem( il.loadIconSet( "text", TDEIcon::Small, 16 ), i18n( "Font..." ), this, SLOT( setFont() ) );
 
 	if ( properties & Visibility ) {
 		int id = popup->insertItem( i18n( "Show" ), this, SLOT( setShown( int ) ) );
@@ -546,7 +546,7 @@ void SetupDisplay::setShown( int id )
 void SetupDisplay::setFont()
 {
 	KreDisplayItem *item = *node_item_map->find( m_currNodeId );
-	if ( KFontDialog::getFont( item->font, false, view() ) == TQDialog::Accepted ) {
+	if ( TDEFontDialog::getFont( item->font, false, view() ) == TQDialog::Accepted ) {
 		m_currentItem = item;
 		loadFont(m_currNodeId,item->font);
 		m_currentItem = 0;

krecipes/src/dialogs/setupdisplay.h

@@ -11,7 +11,7 @@
 #ifndef SETUPDISPLAY_H
 #define SETUPDISPLAY_H
 
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 #include <dom/html_element.h>
 #include <dom/css_stylesheet.h>
 
@@ -25,7 +25,7 @@
 
 #include <math.h>
 
-class KPopupMenu;
+class TDEPopupMenu;
 
 class TQAction;
 class TQLabel;
@@ -53,13 +53,13 @@ public:
 
 typedef TQMap< KreDisplayItem*, unsigned int > PropertiesMap;
 
-/** @brief A KHTMLPart for editing specific CSS properties
+/** @brief A TDEHTMLPart for editing specific CSS properties
   *
   * Set up the items of a recipe for display.
   *
   * @author Jason Kivlighn
   */
-class SetupDisplay : public KHTMLPart, protected KLOManager
+class SetupDisplay : public TDEHTMLPart, protected KLOManager
 {
 	Q_OBJECT
 
@@ -136,7 +136,7 @@ private:
 	//the item corresponding to the current point of processing the KLO
 	KreDisplayItem *m_currentItem;
 
-	KPopupMenu *popup;
+	TDEPopupMenu *popup;
 	DOM::CSSStyleSheet m_styleSheet;
 	Recipe m_sample;
 

krecipes/src/dialogs/shoppinglistdialog.cpp

@@ -12,12 +12,12 @@
 
 #include "shoppinglistdialog.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcursor.h>
 #include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "backends/recipedb.h"
 #include "refineshoppinglistdialog.h"
@@ -27,10 +27,10 @@
 #include "recipeactionshandler.h"
 
 /** A simple listview to accept dropping a RecipeItemDrag */
-class ShoppingListView : public KListView
+class ShoppingListView : public TDEListView
 {
 public:
-	ShoppingListView( TQWidget *parent ) : KListView( parent )
+	ShoppingListView( TQWidget *parent ) : TDEListView( parent )
 	{}
 
 protected:
@@ -71,22 +71,22 @@ ShoppingListDialog::ShoppingListDialog( TQWidget *parent, RecipeDB *db ) : TQWid
 	listview->setAcceptDrops( true );
 	listview->setDropVisualizer( false );
 	connect( recipeListView, SIGNAL( textChanged(const TQString&) ), SLOT( ensurePopulated() ) );
-	connect( listview, SIGNAL( dropped( KListView*, TQDropEvent*, TQListViewItem* ) ),
+	connect( listview, SIGNAL( dropped( TDEListView*, TQDropEvent*, TQListViewItem* ) ),
-	         this, SLOT( slotDropped( KListView*, TQDropEvent*, TQListViewItem* ) ) );
+	         this, SLOT( slotDropped( TDEListView*, TQDropEvent*, TQListViewItem* ) ) );
 	recipeListView->setListView( listview );
 	recipeListView->setCustomFilter( new RecipeFilter( recipeListView->listView() ), SLOT( filter( const TQString & ) ) );
 	recipeListView->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding );
 
 	TQBoxLayout* vboxl = new TQVBoxLayout( KDialog::spacingHint() );
-	KIconLoader il;
+	TDEIconLoader il;
 	addRecipeButton = new TQPushButton( this );
-	addRecipeButton->setIconSet( il.loadIconSet( "forward", KIcon::Small ) );
+	addRecipeButton->setIconSet( il.loadIconSet( "forward", TDEIcon::Small ) );
 	addRecipeButton->setFixedSize( TQSize( 32, 32 ) );
 	addRecipeButton->setFlat( true );
 	vboxl->addWidget( addRecipeButton );
 
 	removeRecipeButton = new TQPushButton( this );
-	removeRecipeButton->setIconSet( il.loadIconSet( "back", KIcon::Small ) );
+	removeRecipeButton->setIconSet( il.loadIconSet( "back", TDEIcon::Small ) );
 	removeRecipeButton->setFixedSize( TQSize( 32, 32 ) );
 	removeRecipeButton->setFlat( true );
 	vboxl->addWidget( removeRecipeButton );
@@ -100,14 +100,14 @@ ShoppingListDialog::ShoppingListDialog( TQWidget *parent, RecipeDB *db ) : TQWid
 	slistview->setDragEnabled( true );
 	slistview->setAcceptDrops( true );
 	slistview->setDropVisualizer( false );
-	connect( slistview, SIGNAL( dropped( KListView*, TQDropEvent*, TQListViewItem* ) ),
+	connect( slistview, SIGNAL( dropped( TDEListView*, TQDropEvent*, TQListViewItem* ) ),
-	         this, SLOT( slotDropped( KListView*, TQDropEvent*, TQListViewItem* ) ) );
+	         this, SLOT( slotDropped( TDEListView*, TQDropEvent*, TQListViewItem* ) ) );
 	shopRecipeListView->setListView( slistview );
 	layout->addWidget( shopRecipeListView, 0, 2 );
 
 	shopRecipeListView->listView() ->addColumn( i18n( "Recipe Title" ) );
 
-	KConfig *config = KGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup( "Advanced" );
 	bool show_id = config->readBoolEntry( "ShowID", false );
 	shopRecipeListView->listView() ->addColumn( i18n( "Id" ), show_id ? -1 : 0 );
@@ -125,14 +125,14 @@ ShoppingListDialog::ShoppingListDialog( TQWidget *parent, RecipeDB *db ) : TQWid
 
 	okButton = new TQPushButton( buttonBar, "okButton" );
 	okButton->setText( i18n( "&OK" ) );
-	TQPixmap pm = il.loadIcon( "ok", KIcon::NoGroup, 16 );
+	TQPixmap pm = il.loadIcon( "ok", TDEIcon::NoGroup, 16 );
 	okButton->setIconSet( pm );
 
 	//buttonBar->layout()->addItem( new TQSpacerItem( 10,10, TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed ) );
 
 	clearButton = new TQPushButton( buttonBar, "clearButton" );
 	clearButton->setText( i18n( "Clear" ) );
-	pm = il.loadIcon( "editclear", KIcon::NoGroup, 16 );
+	pm = il.loadIcon( "editclear", TDEIcon::NoGroup, 16 );
 	clearButton->setIconSet( pm );
 
 	//Takes care of all recipe actions and provides a popup menu to 'recipeListView'
@@ -236,7 +236,7 @@ void ShoppingListDialog::clear()
 	shopRecipeListView->listView() ->clear();
 }
 
-void ShoppingListDialog::slotDropped( KListView *list, TQDropEvent *e, TQListViewItem * /*after*/ )
+void ShoppingListDialog::slotDropped( TDEListView *list, TQDropEvent *e, TQListViewItem * /*after*/ )
 {
 	Recipe r;
 	RecipeListItem *item = new RecipeListItem( recipeListView->listView(), r ); // needs parent, use this temporarily

krecipes/src/dialogs/shoppinglistdialog.h

@@ -69,7 +69,7 @@ private slots:
 	void removeRecipe( void );
 	void showShoppingList( void );
 	void clear( void );
-	void slotDropped( KListView *list, TQDropEvent *e, TQListViewItem *after );
+	void slotDropped( TDEListView *list, TQDropEvent *e, TQListViewItem *after );
 	void ensurePopulated();
 };
 

krecipes/src/dialogs/shoppinglistviewdialog.cpp

@@ -16,9 +16,9 @@
 
 #include <ntqpushbutton.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 
 ShoppingListViewDialog::ShoppingListViewDialog( TQWidget *parent, const IngredientList &ingredientList )
@@ -29,7 +29,7 @@ ShoppingListViewDialog::ShoppingListViewDialog( TQWidget *parent, const Ingredie
 	// Design dialog
 	TQVBox *page = makeVBoxMainWidget();
 
-	shoppingListView = new KHTMLPart( page );
+	shoppingListView = new TDEHTMLPart( page );
 
 	setInitialSize( TQSize(350, 450) );
 
@@ -64,7 +64,7 @@ void ShoppingListViewDialog::display( const IngredientList &ingredientList )
 	recipeHTML += "<div STYLE=\"border:medium solid blue; width:95%\"><table cellspacing=0px width=100%><tbody>";
 	bool counter = true;
 
-	KConfig *config = KGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup( "Formatting" );
 
 	bool useAbbreviations = config->readBoolEntry("AbbreviateUnits");

krecipes/src/dialogs/shoppinglistviewdialog.h

@@ -17,8 +17,8 @@
 #include <ntqvbox.h>
 #include <ntqwidget.h>
 
-#include <khtml_part.h>
+#include <tdehtml_part.h>
-#include <khtmlview.h>
+#include <tdehtmlview.h>
 #include <kdialogbase.h>
 
 class IngredientList;
@@ -37,7 +37,7 @@ public slots:
 private:
 
 	// Widgets
-	KHTMLPart *shoppingListView;
+	TDEHTMLPart *shoppingListView;
 
 	// Internal Methods
 	void display( const IngredientList &ingredientList );

krecipes/src/dialogs/similarcategoriesdialog.cpp

@@ -19,9 +19,9 @@
 #include <ntqtooltip.h>
 #include <ntqwhatsthis.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <klineedit.h>
 
 #include "widgets/categorycombobox.h"
@@ -72,7 +72,7 @@ SimilarCategoriesDialog::SimilarCategoriesDialog( ElementList &list, TQWidget* p
 	allLabel = new TQLabel( this, "allLabel" );
 	layout8->addWidget( allLabel );
 	
-	allListView = new KListView( this, "allListView" );
+	allListView = new TDEListView( this, "allListView" );
 	allListView->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 1, allListView->sizePolicy().hasHeightForWidth() ) );
 	layout8->addWidget( allListView );
 	layout9->addLayout( layout8 );
@@ -93,7 +93,7 @@ SimilarCategoriesDialog::SimilarCategoriesDialog( ElementList &list, TQWidget* p
 	toMergeLabel = new TQLabel( this, "toMergeLabel" );
 	layout7->addWidget( toMergeLabel );
 	
-	toMergeListView = new KListView( this, "toMergeListView" );
+	toMergeListView = new TDEListView( this, "toMergeListView" );
 	toMergeListView->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 1, toMergeListView->sizePolicy().hasHeightForWidth() ) );
 	layout7->addWidget( toMergeListView );
 	layout9->addLayout( layout7 );

krecipes/src/dialogs/similarcategoriesdialog.h

@@ -25,7 +25,7 @@ class TQLabel;
 class TQPushButton;
 class TQListViewItem;
 
-class KListView;
+class TDEListView;
 class KLineEdit;
 
 class RecipeDB;
@@ -47,11 +47,11 @@ public:
 	TQLabel* categoryLabel;
 	TQPushButton* searchButton;
 	TQLabel* allLabel;
-	KListView* allListView;
+	TDEListView* allListView;
 	TQPushButton* removeButton;
 	TQPushButton* addButton;
 	TQLabel* toMergeLabel;
-	KListView* toMergeListView;
+	TDEListView* toMergeListView;
 	TQPushButton* mergeButton;
 	TQPushButton* cancelButton;
 	

krecipes/src/dialogs/unitsdialog.cpp

@@ -20,11 +20,11 @@
 #include "widgets/conversiontable.h"
 #include "widgets/unitlistview.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprogress.h>
 
 UnitsDialog::UnitsDialog( TQWidget *parent, RecipeDB *db ) : TQWidget( parent )

krecipes/src/dialogs/unitsdialog.h

@@ -13,7 +13,7 @@
 #ifndef UNITSDIALOG_H
 #define UNITSDIALOG_H
 #include <ntqwidget.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <ntqpushbutton.h>
 
 #include "datablocks/unitratiolist.h"

krecipes/src/dialogs/usdadatadialog.cpp

@@ -13,9 +13,9 @@
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <ntqfile.h>
 #include <ntqlabel.h>

krecipes/src/dialogs/usdadatadialog.h

@@ -20,7 +20,7 @@
 
 class RecipeDB;
 
-class KListView;
+class TDEListView;
 
 class USDADataDialog : public KDialogBase
 {
@@ -33,7 +33,7 @@ public:
 private:
 	void loadDataFromFile();
 
-	KListView *listView;
+	TDEListView *listView;
 
 	Element ingredient;
 	RecipeDB *database;

krecipes/src/exporters/baseexporter.cpp

@@ -14,11 +14,11 @@
 #include <ntqfile.h>
 #include <ntqfileinfo.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ktar.h>
 #include <kstandarddirs.h>
 
@@ -163,7 +163,7 @@ void BaseExporter::saveToFile( const TQValueList<int> &ids, RecipeDB *database )
 
 TQString BaseExporter::krecipes_version() const
 {
-	KInstance * this_instance = KGlobal::instance();
+	TDEInstance * this_instance = TDEGlobal::instance();
 	if ( this_instance && this_instance->aboutData() )
 		return this_instance->aboutData() ->version();
 

krecipes/src/exporters/baseexporter.h

@@ -14,7 +14,7 @@
 
 #include <ntqstringlist.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kprogress.h>
 
 #include "datablocks/recipelist.h"
@@ -76,7 +76,7 @@ protected:
 	void setCompressed( bool );
 
 	/** Attempt to return the version of the application via
-	  * KGlobal::instance()->aboutData()->version()
+	  * TDEGlobal::instance()->aboutData()->version()
 	  * This can be used by exporters to put the version of the app exporting the file.
 	  */
 	TQString krecipes_version() const;

krecipes/src/exporters/cookmlexporter.cpp

@@ -16,12 +16,12 @@
 #include <ntqpixmap.h>
 #include <ntqfile.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kmdcodec.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 #include "backends/recipedb.h"
@@ -60,7 +60,7 @@ TQString CookMLExporter::createContent( const RecipeList& recipes )
 	RecipeList::const_iterator recipe_it;
 	for ( recipe_it = recipes.begin(); recipe_it != recipes.end(); ++recipe_it ) {
 		TQDomElement recipe_tag = doc.createElement( "recipe" );
-		recipe_tag.setAttribute( "lang", ( KGlobal::locale() ) ->language() );
+		recipe_tag.setAttribute( "lang", ( TDEGlobal::locale() ) ->language() );
 
 		//cookml_tag.appendChild( recipe_tag );
 

krecipes/src/exporters/htmlexporter.cpp

@@ -23,12 +23,12 @@
 #include <ntqpainter.h>
 #include <ntqfileinfo.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <khtml_part.h>
+#include <tdehtml_part.h>
-#include <khtmlview.h>
+#include <tdehtmlview.h>
 #include <kprogress.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
@@ -45,7 +45,7 @@
 HTMLExporter::HTMLExporter( const TQString& filename, const TQString &format ) :
 		BaseExporter( filename, format )
 {
-	KConfig *config = KGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup( "Page Setup" );
 
 	//let's do everything we can to be sure at least some layout is loaded
@@ -121,7 +121,7 @@ TQString HTMLExporter::createHeader( const RecipeList & )
 	m_visibilityMap.clear();
 	m_columnsMap.clear();
 
-	KConfig *config = KGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup( "Page Setup" );
 
 	m_error = false;
@@ -152,7 +152,7 @@ TQString HTMLExporter::createHeader( const RecipeList & )
 
 	RecipeList::const_iterator recipe_it;
 
-	KLocale*loc = KGlobal::locale();
+	TDELocale*loc = TDEGlobal::locale();
 	TQString encoding = loc->encoding();
 
 	TQString output = "<html>";
@@ -269,7 +269,7 @@ TQString HTMLExporter::HTMLIfVisible( const TQString &name, const TQString &html
 
 void HTMLExporter::populateTemplate( const Recipe &recipe, TQString &content )
 {
-	KConfig * config = KGlobal::config();
+	TDEConfig * config = TDEGlobal::config();
 
 	//=======================TITLE======================//
 	content = content.replace("**TITLE**",HTMLIfVisible("title",recipe.title));
@@ -460,7 +460,7 @@ void HTMLExporter::populateTemplate( const Recipe &recipe, TQString &content )
 		double prop_amount = (*prop_it).amount;
 		if ( prop_amount > 0 ) { //TODO: make the precision configuratble
 			prop_amount = double( tqRound( prop_amount * 10.0 ) ) / 10.0; //not a "chemistry experiment" ;)  Let's only have one decimal place
-			amount_str = beautify( KGlobal::locale() ->formatNumber( prop_amount, 5 ) );
+			amount_str = beautify( TDEGlobal::locale() ->formatNumber( prop_amount, 5 ) );
 		}
 		else
 			amount_str = "0";

krecipes/src/exporters/kreexporter.cpp

@@ -19,9 +19,9 @@
 #include <ntqimage.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmdcodec.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 #include "backends/recipedb.h"
@@ -55,7 +55,7 @@ TQString KreExporter::createHeader( const RecipeList& recipes )
 	TQString xml;
 
 	xml += "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n";
-	xml += "<krecipes version=\"" + krecipes_version() + "\" lang=\"" + ( KGlobal::locale() )->language() + "\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"krecipes.xsd\">\n";
+	xml += "<krecipes version=\"" + krecipes_version() + "\" lang=\"" + ( TDEGlobal::locale() )->language() + "\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"krecipes.xsd\">\n";
 
 	createCategoryStructure( xml, recipes );
 

krecipes/src/exporters/mmfexporter.cpp

@@ -12,10 +12,10 @@
 
 #include <ntqregexp.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "backends/recipedb.h"
 #include "datablocks/mixednumber.h"
@@ -134,7 +134,7 @@ void MMFExporter::writeMMFIngredients( TQString &content, const Recipe &recipe )
 
 void MMFExporter::writeSingleIngredient( TQString &content, const Ingredient &ing, bool is_sub )
 {
-	KConfig * config = kapp->config();
+	TDEConfig * config = kapp->config();
 	config->setGroup( "Formatting" );
 	MixedNumber::Format number_format = ( config->readBoolEntry( "Fraction" ) ) ? MixedNumber::MixedNumberFormat : MixedNumber::DecimalFormat;
 

krecipes/src/exporters/plaintextexporter.cpp

@@ -10,9 +10,9 @@
 
 #include "plaintextexporter.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "backends/recipedb.h"
 
@@ -31,7 +31,7 @@ int PlainTextExporter::supportedItems() const
 
 TQString PlainTextExporter::generateIngredient( const IngredientData &ing, MixedNumber::Format number_format )
 {
-	KConfig *config = KGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 
 	TQString content;
 
@@ -63,7 +63,7 @@ TQString PlainTextExporter::generateIngredient( const IngredientData &ing, Mixed
 
 TQString PlainTextExporter::createContent( const RecipeList& recipes )
 {
-	KConfig *config = KGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup( "Formatting" );
 
 	MixedNumber::Format number_format = ( config->readBoolEntry( "Fraction" ) ) ? MixedNumber::MixedNumberFormat : MixedNumber::DecimalFormat;

krecipes/src/exporters/recipemlexporter.cpp

@@ -11,7 +11,7 @@
 #include "recipemlexporter.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "backends/recipedb.h"
 

krecipes/src/exporters/rezkonvexporter.cpp

@@ -12,10 +12,10 @@
 
 #include <ntqregexp.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "backends/recipedb.h"
 #include "datablocks/mixednumber.h"
@@ -214,7 +214,7 @@ void RezkonvExporter::writeIngredients( TQString &content, const Recipe &recipe
 
 void RezkonvExporter::writeSingleIngredient( TQString &content, const IngredientData &ing, bool is_sub )
 {
-	KConfig * config = kapp->config();
+	TDEConfig * config = kapp->config();
 	config->setGroup( "Formatting" );
 	MixedNumber::Format number_format = ( config->readBoolEntry( "Fraction" ) ) ? MixedNumber::MixedNumberFormat : MixedNumber::DecimalFormat;
 

krecipes/src/importers/baseimporter.cpp

@@ -10,12 +10,12 @@
 
 #include "baseimporter.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprogress.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <ntqvaluevector.h>
 
@@ -29,7 +29,7 @@ BaseImporter::BaseImporter() :
 		m_cat_structure( 0 ),
 		file_recipe_count( 0 )
 {
-	KConfig * config = kapp->config();
+	TDEConfig * config = kapp->config();
 	config->setGroup( "Import" );
 
 	direct = config->readBoolEntry( "DirectImport", false );
@@ -209,7 +209,7 @@ void BaseImporter::importIngredient( IngredientData &ing, RecipeDB *db, KProgres
 void BaseImporter::importRecipes( RecipeList &selected_recipes, RecipeDB *db, KProgressDialog *progress_dialog )
 {
 	// Load Current Settings
-	KConfig *config = kapp->config();
+	TDEConfig *config = kapp->config();
 	config->setGroup( "Import" );
 	bool overwrite = config->readBoolEntry( "OverwriteExisting", false );
 

krecipes/src/importers/baseimporter.h

@@ -13,7 +13,7 @@
 #ifndef BASEIMPORTER_H
 #define BASEIMPORTER_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <ntqstring.h>
 #include <ntqstringlist.h>

krecipes/src/importers/kredbimporter.cpp

@@ -10,8 +10,8 @@
 
 #include "kredbimporter.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include "datablocks/recipelist.h"

krecipes/src/importers/kreimporter.cpp

@@ -13,7 +13,7 @@
 
 #include "kreimporter.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <ntqfile.h>

krecipes/src/importers/kreimporter.h

@@ -11,11 +11,11 @@
 #ifndef KREIMPORTER_H
 #define KREIMPORTER_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kmdcodec.h>
 #include <ktar.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <ntqfile.h>
 #include <ntqstringlist.h>

krecipes/src/importers/mmfimporter.cpp

@@ -10,8 +10,8 @@
 
 #include "mmfimporter.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <ntqfile.h>

krecipes/src/importers/mx2importer.cpp

@@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA  02111-1307  USA
 
 #include "mx2importer.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <ntqfile.h>

krecipes/src/importers/mxpimporter.cpp

@@ -15,8 +15,8 @@
 #include <ntqstringlist.h>
 #include <ntqdatetime.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "datablocks/mixednumber.h"

krecipes/src/importers/nycgenericimporter.cpp

@@ -10,8 +10,8 @@
 
 #include "nycgenericimporter.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <ntqfile.h>

krecipes/src/importers/recipemlimporter.cpp

@@ -16,7 +16,7 @@
 #include <ntqfile.h>
 #include <ntqdatetime.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "datablocks/recipe.h"

krecipes/src/importers/rezkonvimporter.cpp

@@ -10,8 +10,8 @@
 
 #include "rezkonvimporter.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <ntqfile.h>

krecipes/src/krecipes.cpp

@@ -51,35 +51,35 @@
 #include <ntqmessagebox.h>
 
 #include <kprogress.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kstatusbar.h>
 #include <kkeydialog.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcursor.h>
 
 #include <kedittoolbar.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h> 
 //Settings headers
-#include <kdeversion.h>
+#include <tdeversion.h>
 
 Krecipes::Krecipes()
-		: KMainWindow( 0, "Krecipes" ),
+		: TDEMainWindow( 0, "Krecipes" ),
 		m_view( new KrecipesView( this ) ),
 		m_printer( 0 )
 {
 	// accept dnd
 	setAcceptDrops( true );
 
-	// tell the KMainWindow that this is indeed the main widget
+	// tell the TDEMainWindow that this is indeed the main widget
 	setCentralWidget( m_view );
 
 	// then, setup our actions
@@ -164,29 +164,29 @@ void Krecipes::recipeSelected( bool selected )
 void Krecipes::setupActions()
 {
 	printAction = KStdAction::print( this, SLOT( filePrint() ), actionCollection() );
-	reloadAction = new KAction( i18n( "Reloa&d" ), "reload", Key_F5, m_view, SLOT( reloadDisplay() ), actionCollection(), "reload_action" );
+	reloadAction = new TDEAction( i18n( "Reloa&d" ), "reload", Key_F5, m_view, SLOT( reloadDisplay() ), actionCollection(), "reload_action" );
 
-	editAction = new KAction( i18n( "&Edit Recipe" ), "edit", CTRL + Key_E,
+	editAction = new TDEAction( i18n( "&Edit Recipe" ), "edit", CTRL + Key_E,
 	                          m_view, SLOT( editRecipe() ),
 	                          actionCollection(), "edit_action" );
 
-	(void) new KAction( i18n( "&Measurement Converter" ), "", CTRL + Key_M,
+	(void) new TDEAction( i18n( "&Measurement Converter" ), "", CTRL + Key_M,
 	                          this, SLOT( conversionToolSlot() ),
 	                          actionCollection(), "converter_action" );
 
-	KConfig *config = KGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup("Advanced");
 	if ( config->readBoolEntry("UnhideMergeTools",false) ) {
-		( void ) new KAction( i18n( "&Merge Similar Categories..." ), "categories", CTRL + Key_M,
+		( void ) new TDEAction( i18n( "&Merge Similar Categories..." ), "categories", CTRL + Key_M,
 					this, SLOT( mergeSimilarCategories() ),
 					actionCollection(), "merge_categories_action" );
 	
-		( void ) new KAction( i18n( "&Merge Similar Ingredients..." ), "ingredients", CTRL + Key_M,
+		( void ) new TDEAction( i18n( "&Merge Similar Ingredients..." ), "ingredients", CTRL + Key_M,
 					this, SLOT( mergeSimilarIngredients() ),
 					actionCollection(), "merge_ingredients_action" );
 	}
 
-	KAction *action = KStdAction::openNew( this, SLOT( fileNew() ), actionCollection() );
+	TDEAction *action = KStdAction::openNew( this, SLOT( fileNew() ), actionCollection() );
 	action->setText( i18n( "&New Recipe" ) );
 
 	saveAction = KStdAction::save( this, SLOT( fileSave() ), actionCollection() );
@@ -200,36 +200,36 @@ void Krecipes::setupActions()
 	KStdAction::configureToolbars( this, SLOT( optionsConfigureToolbars() ), actionCollection() );
 	KStdAction::preferences( this, SLOT( optionsPreferences() ), actionCollection() );
 
-	( void ) new KAction( i18n( "Import from File..." ), CTRL + Key_I,
+	( void ) new TDEAction( i18n( "Import from File..." ), CTRL + Key_I,
 	                      this, SLOT( import() ),
 	                      actionCollection(), "import_action" );
 
-	( void ) new KAction( i18n( "Import from Database..." ), 0,
+	( void ) new TDEAction( i18n( "Import from Database..." ), 0,
 	                      this, SLOT( kreDBImport() ),
 	                      actionCollection(), "import_db_action" );
 
-	exportAction = new KAction( i18n( "Export..." ), 0,
+	exportAction = new TDEAction( i18n( "Export..." ), 0,
 	                            this, SLOT( fileExport() ),
 	                            actionCollection(), "export_action" );
 
-	copyToClipboardAction = new KAction( i18n( "&Copy to Clipboard" ), "editcopy",
+	copyToClipboardAction = new TDEAction( i18n( "&Copy to Clipboard" ), "editcopy",
 	                            CTRL + Key_C,
 	                            this, SLOT( fileToClipboard() ),
 	                            actionCollection(), "copy_to_clipboard_action" );
 
-	( void ) new KAction( i18n( "Page Setup..." ), 0,
+	( void ) new TDEAction( i18n( "Page Setup..." ), 0,
 	                      this, SLOT( pageSetupSlot() ),
 	                      actionCollection(), "page_setup_action" );
 
-	( void ) new KAction( i18n( "Print Setup..." ), 0,
+	( void ) new TDEAction( i18n( "Print Setup..." ), 0,
 	                      this, SLOT( printSetupSlot() ),
 	                      actionCollection(), "print_setup_action" );
 
-	( void ) new KAction( i18n( "Backup..." ), "krecipes_file", 0,
+	( void ) new TDEAction( i18n( "Backup..." ), "krecipes_file", 0,
 	                      this, SLOT( backupSlot() ),
 	                      actionCollection(), "backup_action" );
 
-	( void ) new KAction( i18n( "Restore..." ), 0,
+	( void ) new TDEAction( i18n( "Restore..." ), 0,
 	                      this, SLOT( restoreSlot() ),
 	                      actionCollection(), "restore_action" );
 
@@ -239,7 +239,7 @@ void Krecipes::setupActions()
 	createGUI();
 }
 
-void Krecipes::saveProperties( KConfig * )
+void Krecipes::saveProperties( TDEConfig * )
 {
 	// the 'config' object points to the session managed
 	// config file.  anything you write here will be available
@@ -249,7 +249,7 @@ void Krecipes::saveProperties( KConfig * )
 	//  config->writeEntry("lastURL", m_view->currentURL());
 }
 
-void Krecipes::readProperties( KConfig * )
+void Krecipes::readProperties( TDEConfig * )
 {
 	// the 'config' object points to the session managed
 	// config file.  this function is automatically called whenever
@@ -362,12 +362,12 @@ void Krecipes::import()
 		}
 
 		parsing_file_dlg->show();
-		KApplication::setOverrideCursor( KCursor::waitCursor() );
+		TDEApplication::setOverrideCursor( KCursor::waitCursor() );
 		importer->parseFiles( file_dialog.selectedFiles() );
 		parsing_file_dlg->hide();
-		KApplication::restoreOverrideCursor();
+		TDEApplication::restoreOverrideCursor();
 
-		KConfig * config = kapp->config();
+		TDEConfig * config = kapp->config();
 		config->setGroup( "Import" );
 		bool direct = config->readBoolEntry( "DirectImport", false );
 		if ( !direct ) {
@@ -412,7 +412,7 @@ void Krecipes::kreDBImport()
 		KreDBImporter importer( importOptions.dbType(), host, user, pass, port ); //last 4 params may or may not be even used (depends on dbType)
 
 		parsing_file_dlg->show();
-		KApplication::setOverrideCursor( KCursor::waitCursor() );
+		TDEApplication::setOverrideCursor( KCursor::waitCursor() );
 		TQStringList tables;
 		if ( importOptions.dbType() == "SQLite" )
 			tables << importOptions.dbFile();
@@ -420,9 +420,9 @@ void Krecipes::kreDBImport()
 			tables << table;
 		importer.parseFiles( tables );
 		parsing_file_dlg->hide();
-		KApplication::restoreOverrideCursor();
+		TDEApplication::restoreOverrideCursor();
 
-		KConfig * config = KGlobal::config();
+		TDEConfig * config = TDEGlobal::config();
 		config->setGroup( "Import" );
 		bool direct = config->readBoolEntry( "DirectImport", false );
 		if ( !direct ) {
@@ -449,7 +449,7 @@ void Krecipes::pageSetupSlot()
 	Recipe recipe;
 	m_view->selectPanel->getCurrentRecipe( &recipe );
 
-	KConfig *config = KGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup("Page Setup");
 	TQString layout = config->readEntry( "Layout", locate( "appdata", "layouts/Default.klo" ) );
 	TQString printLayout = config->readEntry( "PrintLayout", locate( "appdata", "layouts/Default.klo" ) );
@@ -468,7 +468,7 @@ void Krecipes::printSetupSlot()
 	Recipe recipe;
 	m_view->selectPanel->getCurrentRecipe( &recipe );
 
-	KConfig *config = KGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup("Page Setup");
 	TQString layout = config->readEntry( "Layout", locate( "appdata", "layouts/Default.klo" ) );
 	TQString printLayout = config->readEntry( "PrintLayout", locate( "appdata", "layouts/Default.klo" ) );
@@ -638,16 +638,16 @@ void Krecipes::optionsConfigureKeys()
 void Krecipes::optionsConfigureToolbars()
 {
 	// use the standard toolbar editor
-#if defined(KDE_MAKE_VERSION)
+#if defined(TDE_MAKE_VERSION)
-# if KDE_VERSION >= KDE_MAKE_VERSION(3,1,0)
+# if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0)
-	saveMainWindowSettings( KGlobal::config(), autoSaveGroup() );
+	saveMainWindowSettings( TDEGlobal::config(), autoSaveGroup() );
 # else
 
-	saveMainWindowSettings( KGlobal::config() );
+	saveMainWindowSettings( TDEGlobal::config() );
 # endif
 #else
 
-	saveMainWindowSettings( KGlobal::config() );
+	saveMainWindowSettings( TDEGlobal::config() );
 #endif
 
 	KEditToolbar dlg( actionCollection() );
@@ -661,17 +661,17 @@ void Krecipes::newToolbarConfig()
 	// recreate our GUI, and re-apply the settings (e.g. "text under icons", etc.)
 	createGUI();
 
-#if defined(KDE_MAKE_VERSION)
+#if defined(TDE_MAKE_VERSION)
-# if KDE_VERSION >= KDE_MAKE_VERSION(3,1,0)
+# if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0)
 
-	applyMainWindowSettings( KGlobal::config(), autoSaveGroup() );
+	applyMainWindowSettings( TDEGlobal::config(), autoSaveGroup() );
 # else
 
-	applyMainWindowSettings( KGlobal::config() );
+	applyMainWindowSettings( TDEGlobal::config() );
 # endif
 #else
 
-	applyMainWindowSettings( KGlobal::config() );
+	applyMainWindowSettings( TDEGlobal::config() );
 #endif
 }
 

krecipes/src/krecipes.desktop

@@ -32,35 +32,35 @@ GenericName[sv]=Kokbok
 GenericName[uk]=Куховарська книга
 GenericName[xx]=xxCooking Bookxx
 GenericName[zh_CN]=食谱
-Comment=The KDE Cooking Book
+Comment=The TDE Cooking Book
-Comment[bg]=Готварската книга на KDE
+Comment[bg]=Готварската книга на TDE
-Comment[br]=Al levr keginer KDE
+Comment[br]=Al levr keginer TDE
-Comment[bs]=KDE kuhar
+Comment[bs]=TDE kuhar
-Comment[cs]=Kuchařka pro KDE
+Comment[cs]=Kuchařka pro TDE
-Comment[da]=KDE's kogebog
+Comment[da]=TDE's kogebog
-Comment[de]=Das KDE Kochbuch
+Comment[de]=Das TDE Kochbuch
-Comment[el]=Το βιβλίο μαγειρικής του KDE
+Comment[el]=Το βιβλίο μαγειρικής του TDE
-Comment[es]=El libro de cocina de KDE
+Comment[es]=El libro de cocina de TDE
-Comment[et]=KDE kokaraamat
+Comment[et]=TDE kokaraamat
-Comment[fr]=Le guide de KDE
+Comment[fr]=Le guide de TDE
-Comment[ga]=Leabhar Cócaireachta KDE
+Comment[ga]=Leabhar Cócaireachta TDE
-Comment[gl]=O Libro de Receitas de KDE
+Comment[gl]=O Libro de Receitas de TDE
-Comment[it]=Il libro delle ricette di KDE
+Comment[it]=Il libro delle ricette di TDE
-Comment[ja]=KDE 料理本
+Comment[ja]=TDE 料理本
-Comment[ka]=KDE-ს სამზარეულო წიგნი
+Comment[ka]=TDE-ს სამზარეულო წიგნი
-Comment[nb]=KDE kokebok
+Comment[nb]=TDE kokebok
-Comment[nl]=Het KDE-kookboek
+Comment[nl]=Het TDE-kookboek
-Comment[pa]=KDE ਖਾਣਾ ਬਣਾਉਣ ਦੀ ਕਿਤਾਬ
+Comment[pa]=TDE ਖਾਣਾ ਬਣਾਉਣ ਦੀ ਕਿਤਾਬ
-Comment[pt]=Livro de Culinária do KDE
+Comment[pt]=Livro de Culinária do TDE
-Comment[pt_BR]=Livro de Culinária do KDE
+Comment[pt_BR]=Livro de Culinária do TDE
 Comment[ru]=Книга рецептов
-Comment[sr]=Кувар за KDE
+Comment[sr]=Кувар за TDE
-Comment[sr@Latn]=Kuvar za KDE
+Comment[sr@Latn]=Kuvar za TDE
-Comment[sv]=KDE:s kokbok
+Comment[sv]=TDE:s kokbok
-Comment[ta]=KDE சமைக்குக்ம் புத்தகம்
+Comment[ta]=TDE சமைக்குக்ம் புத்தகம்
-Comment[uk]=Куховарська книга для KDE
+Comment[uk]=Куховарська книга для TDE
-Comment[xx]=xxThe KDE Cooking Bookxx
+Comment[xx]=xxThe TDE Cooking Bookxx
-Comment[zh_CN]=KDE 食谱
+Comment[zh_CN]=TDE 食谱
 Terminal=false
 X-DCOP-ServiceType=Unique
-Categories=Utility;Database;Qt;KDE;
+Categories=Utility;Database;Qt;TDE;

krecipes/src/krecipes.h

@@ -16,15 +16,15 @@
 #include <config.h>
 #endif
 
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include "krecipesview.h" //for KrePanel
 
 class KrecipesView;
 
 class KPrinter;
-class KToggleAction;
+class TDEToggleAction;
 class KURL;
 class KDialog;
 class ConversionDialog;
@@ -37,7 +37,7 @@ class ConversionDialog;
  * @author $AUTHOR <$EMAIL>
  * @version $APP_VERSION
  */
-class Krecipes : public KMainWindow
+class Krecipes : public TDEMainWindow
 {
 	Q_OBJECT
 public:
@@ -63,14 +63,14 @@ protected:
 	 * This function is called when it is time for the app to save its
 	 * properties for session management purposes.
 	 */
-	void saveProperties( KConfig * );
+	void saveProperties( TDEConfig * );
 
 	/**
-	 * This function is called when this app is restored.  The KConfig
+	 * This function is called when this app is restored.  The TDEConfig
 	 * object points to the session management config file that was saved
 	 * with @ref saveProperties
 	 */
-	void readProperties( KConfig * );
+	void readProperties( TDEConfig * );
 
 	virtual bool queryClose();
 
@@ -115,22 +115,22 @@ private:
 	KrecipesView *m_view;
 
 	KPrinter *m_printer;
-	KToggleAction *m_toolbarAction;
+	TDEToggleAction *m_toolbarAction;
-	KToggleAction *m_statusbarAction;
+	TDEToggleAction *m_statusbarAction;
 
 private:
 	// Internal variables
-	KAction *saveAction;
+	TDEAction *saveAction;
-	KAction *exportAction;
+	TDEAction *exportAction;
-	KAction *editAction;
+	TDEAction *editAction;
-	KAction *printAction;
+	TDEAction *printAction;
-	KAction *reloadAction;
+	TDEAction *reloadAction;
-	KAction *copyToClipboardAction;
+	TDEAction *copyToClipboardAction;
 
 	KDialog *parsing_file_dlg;
 	ConversionDialog *convertDialog;
 
-	TQValueList<KAction*> recipe_actions;
+	TQValueList<TDEAction*> recipe_actions;
 
 private slots:
 	void enableSaveOption( bool en = true );

krecipes/src/krecipesview.cpp

@@ -20,13 +20,13 @@
 #include <ntqpainter.h>
 #include <ntqpalette.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprogress.h>
 #include <krun.h>
 #include <ktrader.h>
@@ -73,8 +73,8 @@ KrecipesView::KrecipesView( TQWidget *parent )
 
 	// Show Splash Screen
 
-	KStartupLogo* start_logo = 0L;
+	TDEStartupLogo* start_logo = 0L;
-	start_logo = new KStartupLogo();
+	start_logo = new TDEStartupLogo();
 	start_logo -> setHideEnabled( true );
 	start_logo->show();
 	start_logo->raise();
@@ -83,7 +83,7 @@ KrecipesView::KrecipesView( TQWidget *parent )
 
 	// Read the database setup
 
-	KConfig *config;
+	TDEConfig *config;
 	config = kapp->config();
 	config->sync();
 
@@ -101,7 +101,7 @@ KrecipesView::KrecipesView( TQWidget *parent )
 	// Create Left and Right Panels (splitter)
 
 
-	KIconLoader il;
+	TDEIconLoader il;
 	leftPanel = new KreMenu( splitter, "leftPanel" );
 	rightPanel = new PanelDeco( splitter, "rightPanel", i18n( "Find/Edit Recipes" ), "filefind" );
 
@@ -113,19 +113,19 @@ KrecipesView::KrecipesView( TQWidget *parent )
 	buttonsList->setAutoDelete( TRUE );
 
 	button0 = new KreMenuButton( leftPanel, SelectP );
-	button0->setIconSet( il.loadIconSet( "filefind", KIcon::Panel, 32 ) );
+	button0->setIconSet( il.loadIconSet( "filefind", TDEIcon::Panel, 32 ) );
 	buttonsList->append( button0 );
 
 	button1 = new KreMenuButton( leftPanel, ShoppingP );
-	button1->setIconSet( il.loadIconSet( "trolley", KIcon::Panel, 32 ) );
+	button1->setIconSet( il.loadIconSet( "trolley", TDEIcon::Panel, 32 ) );
 	buttonsList->append( button1 );
 
 	button7 = new KreMenuButton( leftPanel, DietP );
-	button7->setIconSet( il.loadIconSet( "diet", KIcon::Panel, 32 ) );
+	button7->setIconSet( il.loadIconSet( "diet", TDEIcon::Panel, 32 ) );
 	buttonsList->append( button7 );
 
 	button8 = new KreMenuButton( leftPanel, MatcherP );
-	button8->setIconSet( il.loadIconSet( "categories", KIcon::Panel, 32 ) );
+	button8->setIconSet( il.loadIconSet( "categories", TDEIcon::Panel, 32 ) );
 	buttonsList->append( button8 );
 
 
@@ -133,31 +133,31 @@ KrecipesView::KrecipesView( TQWidget *parent )
 	dataMenu = leftPanel->createSubMenu( i18n( "Data" ), "2rightarrow" );
 
 	button2 = new KreMenuButton( leftPanel, IngredientsP, dataMenu );
-	button2->setIconSet( il.loadIconSet( "ingredients", KIcon::Panel, 32 ) );
+	button2->setIconSet( il.loadIconSet( "ingredients", TDEIcon::Panel, 32 ) );
 	//buttonsList->append(button2);
 
 	button3 = new KreMenuButton( leftPanel, PropertiesP, dataMenu );
-	button3->setIconSet( il.loadIconSet( "properties", KIcon::Panel, 32 ) );
+	button3->setIconSet( il.loadIconSet( "properties", TDEIcon::Panel, 32 ) );
 	buttonsList->append( button3 );
 
 	button4 = new KreMenuButton( leftPanel, UnitsP, dataMenu );
-	button4->setIconSet( il.loadIconSet( "units", KIcon::Panel, 32 ) );
+	button4->setIconSet( il.loadIconSet( "units", TDEIcon::Panel, 32 ) );
 	buttonsList->append( button4 );
 
 	button9 = new KreMenuButton( leftPanel, PrepMethodsP, dataMenu );
-	button9->setIconSet( il.loadIconSet( "ICON PLEASE", KIcon::Panel, 32 ) );
+	button9->setIconSet( il.loadIconSet( "ICON PLEASE", TDEIcon::Panel, 32 ) );
 	buttonsList->append( button9 );
 
 	button5 = new KreMenuButton( leftPanel, CategoriesP, dataMenu );
-	button5->setIconSet( il.loadIconSet( "categories", KIcon::Panel, 32 ) );
+	button5->setIconSet( il.loadIconSet( "categories", TDEIcon::Panel, 32 ) );
 	buttonsList->append( button5 );
 
 	button6 = new KreMenuButton( leftPanel, AuthorsP, dataMenu );
-	button6->setIconSet( il.loadIconSet( "personal", KIcon::Panel, 32 ) );
+	button6->setIconSet( il.loadIconSet( "personal", TDEIcon::Panel, 32 ) );
 	buttonsList->append( button6 );
 
 	contextButton = new TQPushButton( leftPanel, "contextButton" );
-	contextButton->setIconSet( il.loadIconSet( "krectip", KIcon::Panel, 32 ) );
+	contextButton->setIconSet( il.loadIconSet( "krectip", TDEIcon::Panel, 32 ) );
 	contextButton->setGeometry( leftPanel->width() - 42, leftPanel->height() - 42, 32, 32 );
 	contextButton->setPaletteBackgroundColor( contextButton->paletteBackgroundColor().light( 140 ) );
 	contextButton->setFlat( true );
@@ -540,7 +540,7 @@ void KrecipesView::createNewElement( void )
 
 void KrecipesView::wizard( bool force )
 {
-	KConfig * config = kapp->config();
+	TDEConfig * config = kapp->config();
 	config->setGroup( "Wizard" );
 	bool setupDone = config->readBoolEntry( "SystemSetup", false );
 
@@ -557,7 +557,7 @@ void KrecipesView::wizard( bool force )
 		SetupWizard *setupWizard = new SetupWizard( this );
 		if ( setupWizard->exec() == TQDialog::Accepted )
 		{
-			KConfig * config;
+			TDEConfig * config;
 			config = kapp->config();
 			config->sync();
 			config->setGroup( "DBType" );
@@ -690,11 +690,11 @@ void KrecipesView::initializeData( const TQString &host, const TQString &dbName,
 void KrecipesView::addRecipeButton( TQWidget *w, const TQString &title )
 {
 	recipeWidget = w;
-	KIconLoader il;
+	TDEIconLoader il;
 	if ( !recipeButton ) {
 		recipeButton = new KreMenuButton( leftPanel, RecipeEdit );
 
-		recipeButton->setIconSet( il.loadIconSet( "filesave", KIcon::Small ) );
+		recipeButton->setIconSet( il.loadIconSet( "filesave", TDEIcon::Small ) );
 
 		TQString short_title = title.left( 20 );
 		if ( title.length() > 20 )
@@ -828,7 +828,7 @@ void KrecipesView::resizeRightPane( int lpw, int )
 
 
 
-void KrecipesView::initDatabase( KConfig *config )
+void KrecipesView::initDatabase( TDEConfig *config )
 {
 
 	// Read the database type
@@ -877,7 +877,7 @@ void KrecipesView::initDatabase( KConfig *config )
 	kdDebug() << i18n( "DB started correctly\n" ).latin1();
 }
 
-TQString KrecipesView::checkCorrectDBType( KConfig *config )
+TQString KrecipesView::checkCorrectDBType( TDEConfig *config )
 {
 	dbType = config->readEntry( "Type", "SQLite" );
 

krecipes/src/krecipesview.h

@@ -29,8 +29,8 @@
 #include <kpixmap.h>
 #include <kpixmapeffect.h>
 #include <kimageeffect.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
-#include <kstyle.h>
+#include <tdestyle.h>
 #include <ktextbrowser.h>
 
 #include "importers/baseimporter.h"
@@ -142,9 +142,9 @@ public:
 private:
 
 	// Internal methods
-	TQString checkCorrectDBType( KConfig *config );
+	TQString checkCorrectDBType( TDEConfig *config );
 	void initializeData( const TQString &host, const TQString &dbName, const TQString &user, const TQString &pass, int port );
-	void initDatabase( KConfig *config );
+	void initDatabase( TDEConfig *config );
 	bool questionRerunWizard( const TQString &message, const TQString &error = "" );
 	void setupUserPermissions( const TQString &host, const TQString &client, const TQString &dbName, const TQString &newUser, const TQString &newPass, const TQString &adminUser = TQString::null, const TQString &adminPass = TQString::null, int port = 0 );
 	void wizard( bool force = false );

krecipes/src/krepagelayout.cpp

@@ -21,10 +21,10 @@
 */
 #include "krepagelayout.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprinter.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <ntqdom.h>
 
@@ -215,7 +215,7 @@ KoFormat KoPageFormat::formatFromString( const TQString & string )
 
 KoFormat KoPageFormat::defaultFormat()
 {
-    int kprinter = KGlobal::locale()->pageSize();
+    int kprinter = TDEGlobal::locale()->pageSize();
     for ( int i = 0 ; i <= PG_LAST_FORMAT ; ++i )
     {
         if ( pageFormatInfo[ i ].kprinter == kprinter )

krecipes/src/kstartuplogo.cpp

@@ -15,12 +15,12 @@
 
 #include "kstartuplogo.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <ntqcursor.h>
 
-KStartupLogo::KStartupLogo( TQWidget * parent, const char *name ) : TQWidget( parent, name, WStyle_NoBorder | WStyle_Customize | WDestructiveClose ), m_bReadyToHide( false )
+TDEStartupLogo::TDEStartupLogo( TQWidget * parent, const char *name ) : TQWidget( parent, name, WStyle_NoBorder | WStyle_Customize | WDestructiveClose ), m_bReadyToHide( false )
 {
 	TQString dataDir = locate( "data", "krecipes/pics/startlogo.png" );
 	TQPixmap pm( dataDir );
@@ -33,25 +33,25 @@ KStartupLogo::KStartupLogo( TQWidget * parent, const char *name ) : TQWidget( pa
 		width(), height() );
 }
 
-KStartupLogo::~KStartupLogo()
+TDEStartupLogo::~TDEStartupLogo()
 {}
 
-void KStartupLogo::mousePressEvent( TQMouseEvent* )
+void TDEStartupLogo::mousePressEvent( TQMouseEvent* )
 {
 	if ( m_bReadyToHide ) {
 		hide();
 	}
 }
 
-/** This function is based on KDE's KGlobalSettings::splashScreenDesktopGeometry(),
+/** This function is based on KDE's TDEGlobalSettings::splashScreenDesktopGeometry(),
   * which is not available in KDE 3.1.
   */
-TQRect KStartupLogo::splashScreenDesktopGeometry() const
+TQRect TDEStartupLogo::splashScreenDesktopGeometry() const
 {
 	TQDesktopWidget *dw = TQApplication::desktop();
 	
 	if (dw->isVirtualDesktop()) {
-		KConfigGroup group(KGlobal::config(), "Windows");
+		TDEConfigGroup group(TDEGlobal::config(), "Windows");
 		int scr = group.readNumEntry("Unmanaged", -3);
 		if (group.readBoolEntry("XineramaEnabled", true) && scr != -2) {
 			if (scr == -3)

krecipes/src/kstartuplogo.h

@@ -19,18 +19,18 @@
 
 #include <ntqwidget.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 
 /**
  * Displays a startup splash screen
  */
-class KStartupLogo : public TQWidget
+class TDEStartupLogo : public TQWidget
 {
 	Q_OBJECT
 public:
-	KStartupLogo( TQWidget *parent = 0, const char *name = 0 );
+	TDEStartupLogo( TQWidget *parent = 0, const char *name = 0 );
-	~KStartupLogo();
+	~TDEStartupLogo();
 	void setHideEnabled( bool bEnabled )
 	{
 		m_bReadyToHide = bEnabled;

krecipes/src/main.cpp

@@ -15,9 +15,9 @@
 #include <iostream>
 
 #include <kuniqueapplication.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "convert_sqlite3.h"
 
@@ -26,7 +26,7 @@ static const char *description =
 
 static const char *version = "1.0-beta1";
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
     {
         { "convert-sqlite3", I18N_NOOP("Convert the current SQLite 2.x database to SQLite 3 and exit") , 0 },
         { 0, 0, 0 }
@@ -34,8 +34,8 @@ static KCmdLineOptions options[] =
 
 int main( int argc, char **argv )
 {
-	KAboutData about( "krecipes", I18N_NOOP( "Krecipes" ), version, description,
+	TDEAboutData about( "krecipes", I18N_NOOP( "Krecipes" ), version, description,
-	                  KAboutData::License_GPL, I18N_NOOP( "(C) 2003 Unai Garro\n(C) 2004-2006 Jason Kivlighn\n\n___________\n\n\nThis product is RecipeML compatible.\n You can get more information about this file format in:\n http://www.formatdata.com/recipeml" ), 0, 0, "jkivlighn@gmail.com" );
+	                  TDEAboutData::License_GPL, I18N_NOOP( "(C) 2003 Unai Garro\n(C) 2004-2006 Jason Kivlighn\n\n___________\n\n\nThis product is RecipeML compatible.\n You can get more information about this file format in:\n http://www.formatdata.com/recipeml" ), 0, 0, "jkivlighn@gmail.com" );
 	about.addAuthor( "Unai Garro", 0, "ugarro@users.sourceforge.net" );
 	about.addAuthor( "Jason Kivlighn", 0, "jkivlighn@gmail.com" );
 	about.addAuthor( "Cyril Bosselut", 0, "bosselut@b1project.com" );
@@ -43,8 +43,8 @@ int main( int argc, char **argv )
 	about.addCredit( "Colleen Beamer", I18N_NOOP("Testing, bug reports, suggestions"), "colleen.beamer@gmail.com" );
 
 	about.setTranslator( I18N_NOOP( "INSERT YOUR NAME HERE" ), I18N_NOOP( "INSERT YOUR EMAIL ADDRESS" ) );
-	KCmdLineArgs::init( argc, argv, &about );
+	TDECmdLineArgs::init( argc, argv, &about );
-	KCmdLineArgs::addCmdLineOptions( options );
+	TDECmdLineArgs::addCmdLineOptions( options );
 	KUniqueApplication::addCmdLineOptions();
 
 	if ( !KUniqueApplication::start() ) {
@@ -60,7 +60,7 @@ int main( int argc, char **argv )
 	}
 	else {
 		// no session.. just start up normally
-		KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+		TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
 		TQApplication::flushX();
 

krecipes/src/pref.cpp

@@ -30,12 +30,12 @@
 #include <ntqframe.h>
 #include <ntqcombobox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <knuminput.h>
 #include <klineedit.h>
 #include <kurlrequester.h>
@@ -50,31 +50,31 @@ KrecipesPreferences::KrecipesPreferences( TQWidget *parent )
 	// possibilities (including Tab, Swallow, and just Plain)
 	TQFrame * frame;
 
-	KConfig *config = KGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup( "DBType" );
 
-	KIconLoader il;
+	TDEIconLoader il;
 	frame = addPage( i18n( "Server Settings" ),
 	                 TQString( i18n( "Database Server Options (%1)" ) ).arg( config->readEntry( "Type" ) ),
-	                 il.loadIcon( "network_local", KIcon::NoGroup, 32 ) );
+	                 il.loadIcon( "network_local", TDEIcon::NoGroup, 32 ) );
 	TQHBoxLayout* layout = new TQHBoxLayout( frame );
 	m_pageServer = new ServerPrefs( frame );
 	layout->addWidget( m_pageServer );
 	m_helpMap.insert(0,"configure-server-settings");
 
-	frame = addPage( i18n( "Formatting" ), i18n( "Customize Formatting" ), il.loadIcon( "math_frac", KIcon::NoGroup, 32 ) );
+	frame = addPage( i18n( "Formatting" ), i18n( "Customize Formatting" ), il.loadIcon( "math_frac", TDEIcon::NoGroup, 32 ) );
 	TQHBoxLayout* formatting_layout = new TQHBoxLayout( frame );
 	m_pageNumbers = new NumbersPrefs( frame );
 	formatting_layout->addWidget( m_pageNumbers );
 	m_helpMap.insert(1,"custom-formatting");
 
-	frame = addPage( i18n( "Import/Export" ), i18n( "Recipe Import and Export Options" ), il.loadIcon( "down", KIcon::NoGroup, 32 ) );
+	frame = addPage( i18n( "Import/Export" ), i18n( "Recipe Import and Export Options" ), il.loadIcon( "down", TDEIcon::NoGroup, 32 ) );
 	TQHBoxLayout* import_layout = new TQHBoxLayout( frame );
 	m_pageImport = new ImportPrefs( frame );
 	import_layout->addWidget( m_pageImport );
 	m_helpMap.insert(2,"import-export-preference");
 
-	frame = addPage( i18n( "Performance" ), i18n( "Performance Options" ), il.loadIcon( "launch", KIcon::NoGroup, 32 ) );
+	frame = addPage( i18n( "Performance" ), i18n( "Performance Options" ), il.loadIcon( "launch", TDEIcon::NoGroup, 32 ) );
 	TQHBoxLayout* performance_layout = new TQHBoxLayout( frame );
 	m_pagePerformance = new PerformancePrefs( frame );
 	performance_layout->addWidget( m_pagePerformance );
@@ -193,7 +193,7 @@ MySQLServerPrefs::MySQLServerPrefs( TQWidget *parent ) : TQWidget( parent )
 	layout->addItem( spacerRight, 1, 4 );
 
 	// Load & Save Current Settings
-	KConfig *config = kapp->config();
+	TDEConfig *config = kapp->config();
 	config->setGroup( "Server" );
 	serverEdit->setText( config->readEntry( "Host", "localhost" ) );
 	usernameEdit->setText( config->readEntry( "Username", "" ) );
@@ -206,7 +206,7 @@ MySQLServerPrefs::MySQLServerPrefs( TQWidget *parent ) : TQWidget( parent )
 
 void MySQLServerPrefs::saveOptions( void )
 {
-	KConfig * config = kapp->config();
+	TDEConfig * config = kapp->config();
 	config->setGroup( "Server" );
 	config->writeEntry( "Host", serverEdit->text() );
 	config->writeEntry( "Username", usernameEdit->text() );
@@ -320,7 +320,7 @@ PostgreSQLServerPrefs::PostgreSQLServerPrefs( TQWidget *parent ) : TQWidget( par
 	layout->addItem( spacerRight, 1, 4 );
 
 	// Load & Save Current Settings
-	KConfig *config = kapp->config();
+	TDEConfig *config = kapp->config();
 	config->setGroup( "Server" );
 	serverEdit->setText( config->readEntry( "Host", "localhost" ) );
 	usernameEdit->setText( config->readEntry( "Username", "" ) );
@@ -333,7 +333,7 @@ PostgreSQLServerPrefs::PostgreSQLServerPrefs( TQWidget *parent ) : TQWidget( par
 
 void PostgreSQLServerPrefs::saveOptions( void )
 {
-	KConfig * config = kapp->config();
+	TDEConfig * config = kapp->config();
 	config->setGroup( "Server" );
 	config->writeEntry( "Host", serverEdit->text() );
 	config->writeEntry( "Username", usernameEdit->text() );
@@ -380,7 +380,7 @@ SQLiteServerPrefs::SQLiteServerPrefs( TQWidget *parent ) : TQWidget( parent )
 	dumpPathRequester->setFilter( sqliteBinary );
 
 	// Load & Save Current Settings
-	KConfig *config = kapp->config();
+	TDEConfig *config = kapp->config();
 	config->setGroup( "Server" );
 	fileRequester->setURL( config->readEntry( "DBFile", locateLocal( "appdata", "krecipes.krecdb" ) ) );
 	dumpPathRequester->setURL( config->readEntry( "SQLitePath", sqliteBinary ) );
@@ -388,7 +388,7 @@ SQLiteServerPrefs::SQLiteServerPrefs( TQWidget *parent ) : TQWidget( parent )
 
 void SQLiteServerPrefs::saveOptions( void )
 {
-	KConfig * config = kapp->config();
+	TDEConfig * config = kapp->config();
 	config->setGroup( "Server" );
 	config->writeEntry( "DBFile", fileRequester->url() );
 	config->writeEntry( "SQLitePath", dumpPathRequester->url() );
@@ -401,7 +401,7 @@ ServerPrefs::ServerPrefs( TQWidget *parent )
 {
 	TQVBoxLayout * Form1Layout = new TQVBoxLayout( this, 11, 6 );
 
-	KConfig *config = kapp->config();
+	TDEConfig *config = kapp->config();
 	config->setGroup( "DBType" );
 	TQString DBtype = config->readEntry( "Type" );
 	if ( DBtype == "MySQL" )
@@ -438,7 +438,7 @@ void KrecipesPreferences::saveSettings( void )
 // Save Server settings
 void ServerPrefs::saveOptions( void )
 {
-	KConfig * config = kapp->config();
+	TDEConfig * config = kapp->config();
 	config->setGroup( "DBType" );
 	TQString DBtype = config->readEntry( "Type" );
 	if ( DBtype == "MySQL" )
@@ -506,7 +506,7 @@ NumbersPrefs::NumbersPrefs( TQWidget *parent )
 	languageChange();
 
 	// Load Current Settings
-	KConfig *config = kapp->config();
+	TDEConfig *config = kapp->config();
 	config->setGroup( "Formatting" );
 
 	int button = ( config->readBoolEntry( "Fraction", false ) ) ? 1 : 0;
@@ -519,7 +519,7 @@ NumbersPrefs::NumbersPrefs( TQWidget *parent )
 
 void NumbersPrefs::saveOptions()
 {
-	KConfig * config = kapp->config();
+	TDEConfig * config = kapp->config();
 	config->setGroup( "Formatting" );
 
 	bool fraction = !numberButtonGroup->find( 0 ) ->isOn();
@@ -542,7 +542,7 @@ ImportPrefs::ImportPrefs( TQWidget *parent )
 		: TQWidget( parent )
 {
 	// Load Current Settings
-	KConfig * config = kapp->config();
+	TDEConfig * config = kapp->config();
 	config->setGroup( "Import" );
 
 	bool overwrite = config->readBoolEntry( "OverwriteExisting", false );
@@ -602,7 +602,7 @@ ImportPrefs::ImportPrefs( TQWidget *parent )
 
 void ImportPrefs::saveOptions()
 {
-	KConfig * config = kapp->config();
+	TDEConfig * config = kapp->config();
 	config->setGroup( "Import" );
 
 	config->writeEntry( "OverwriteExisting", overwriteCheckbox->isChecked() );
@@ -619,7 +619,7 @@ PerformancePrefs::PerformancePrefs( TQWidget *parent )
 		: TQWidget( parent )
 {
 	// Load Current Settings
-	KConfig * config = kapp->config();
+	TDEConfig * config = kapp->config();
 	config->setGroup( "Performance" );
 
 	int cat_limit = config->readNumEntry( "CategoryLimit", -1 );
@@ -663,7 +663,7 @@ PerformancePrefs::PerformancePrefs( TQWidget *parent )
 
 void PerformancePrefs::saveOptions()
 {
-	KConfig * config = kapp->config();
+	TDEConfig * config = kapp->config();
 	config->setGroup( "Performance" );
 
 	int catLimit = ( catLimitInput->value() == 0 ) ? -1 : catLimitInput->value();

krecipes/src/recipeactionshandler.cpp

@@ -15,13 +15,13 @@
 #include <ntqwidget.h>
 #include <ntqclipboard.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kprogress.h>
 
 #include "dialogs/selectcategoriesdialog.h"
@@ -40,47 +40,47 @@
 
 #include "backends/recipedb.h"
 
-RecipeActionsHandler::RecipeActionsHandler( KListView *_parentListView, RecipeDB *db, int actions ) : TQObject( _parentListView ),
+RecipeActionsHandler::RecipeActionsHandler( TDEListView *_parentListView, RecipeDB *db, int actions ) : TQObject( _parentListView ),
 		parentListView( _parentListView ),
 		database( db )
 {
-	KIconLoader * il = new KIconLoader;
+	TDEIconLoader * il = new TDEIconLoader;
 
-	kpop = new KPopupMenu( parentListView );
+	kpop = new TDEPopupMenu( parentListView );
 	if ( actions & Open )
-		kpop->insertItem( il->loadIcon( "ok", KIcon::NoGroup, 16 ), i18n( "&Open" ), this, SLOT( open() ), CTRL + Key_L );
+		kpop->insertItem( il->loadIcon( "ok", TDEIcon::NoGroup, 16 ), i18n( "&Open" ), this, SLOT( open() ), CTRL + Key_L );
 	if ( actions & Edit )
-		kpop->insertItem( il->loadIcon( "edit", KIcon::NoGroup, 16 ), i18n( "&Edit" ), this, SLOT( edit() ), CTRL + Key_E );
+		kpop->insertItem( il->loadIcon( "edit", TDEIcon::NoGroup, 16 ), i18n( "&Edit" ), this, SLOT( edit() ), CTRL + Key_E );
 	if ( actions & Export )
-		kpop->insertItem( il->loadIcon( "fileexport", KIcon::NoGroup, 16 ), i18n( "E&xport" ), this, SLOT( recipeExport() ), 0 );
+		kpop->insertItem( il->loadIcon( "fileexport", TDEIcon::NoGroup, 16 ), i18n( "E&xport" ), this, SLOT( recipeExport() ), 0 );
 	if ( actions & RemoveFromCategory )
-		remove_from_cat_item = kpop->insertItem( il->loadIcon( "editshred", KIcon::NoGroup, 16 ), i18n( "&Remove From Category" ), this, SLOT( removeFromCategory() ), CTRL + Key_R );
+		remove_from_cat_item = kpop->insertItem( il->loadIcon( "editshred", TDEIcon::NoGroup, 16 ), i18n( "&Remove From Category" ), this, SLOT( removeFromCategory() ), CTRL + Key_R );
 	if ( actions & Remove )
-		kpop->insertItem( il->loadIcon( "editshred", KIcon::NoGroup, 16 ), i18n( "&Delete" ), this, SLOT( remove
+		kpop->insertItem( il->loadIcon( "editshred", TDEIcon::NoGroup, 16 ), i18n( "&Delete" ), this, SLOT( remove
 			                  () ), Key_Delete );
 	if ( actions & AddToShoppingList )
-		kpop->insertItem( il->loadIcon( "trolley", KIcon::NoGroup, 16 ), i18n( "&Add to Shopping List" ), this, SLOT( addToShoppingList() ), CTRL + Key_A );
+		kpop->insertItem( il->loadIcon( "trolley", TDEIcon::NoGroup, 16 ), i18n( "&Add to Shopping List" ), this, SLOT( addToShoppingList() ), CTRL + Key_A );
 	if ( actions & CopyToClipboard )
-		kpop->insertItem( il->loadIcon( "editcopy", KIcon::NoGroup, 16 ), i18n( "&Copy to Clipboard" ), this, SLOT( recipesToClipboard() ), CTRL + Key_C );
+		kpop->insertItem( il->loadIcon( "editcopy", TDEIcon::NoGroup, 16 ), i18n( "&Copy to Clipboard" ), this, SLOT( recipesToClipboard() ), CTRL + Key_C );
 
 	if ( actions & Categorize )
-		categorize_item = kpop->insertItem( il->loadIcon( "categories", KIcon::NoGroup, 16 ), i18n( "Ca&tegorize..." ), this, SLOT(categorize()), CTRL + Key_T );
+		categorize_item = kpop->insertItem( il->loadIcon( "categories", TDEIcon::NoGroup, 16 ), i18n( "Ca&tegorize..." ), this, SLOT(categorize()), CTRL + Key_T );
 
 	kpop->polish();
 
-	catPop = new KPopupMenu( parentListView );
+	catPop = new TDEPopupMenu( parentListView );
 	if ( actions & ExpandAll )
 		catPop->insertItem( i18n( "&Expand All" ), this, SLOT( expandAll() ), CTRL + Key_Plus );
 	if ( actions & CollapseAll )
 		catPop->insertItem( i18n( "&Collapse All" ), this, SLOT( collapseAll() ), CTRL + Key_Minus );
 	if ( actions & Export )
-		catPop->insertItem( il->loadIcon( "fileexport", KIcon::NoGroup, 16 ), i18n( "E&xport" ), this, SLOT( recipeExport() ), 0 );
+		catPop->insertItem( il->loadIcon( "fileexport", TDEIcon::NoGroup, 16 ), i18n( "E&xport" ), this, SLOT( recipeExport() ), 0 );
 
 	catPop->polish();
 
 	delete il;
 
-	connect( parentListView, SIGNAL( contextMenu( KListView *, TQListViewItem *, const TQPoint & ) ), SLOT( showPopup( KListView *, TQListViewItem *, const TQPoint & ) ) );
+	connect( parentListView, SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), SLOT( showPopup( TDEListView *, TQListViewItem *, const TQPoint & ) ) );
 	connect( parentListView, SIGNAL( doubleClicked( TQListViewItem*, const TQPoint &, int ) ), SLOT( open() ) );
 }
 
@@ -96,7 +96,7 @@ void RecipeActionsHandler::exec( ItemType type, const TQPoint &p )
 	}
 }
 
-void RecipeActionsHandler::showPopup( KListView * /*l*/, TQListViewItem *i, const TQPoint &p )
+void RecipeActionsHandler::showPopup( TDEListView * /*l*/, TQListViewItem *i, const TQPoint &p )
 {
 	if ( i ) { // Check if the TQListViewItem actually exists
 		if ( i->rtti() == 1000 ) {
@@ -395,7 +395,7 @@ void RecipeActionsHandler::exportRecipes( const TQValueList<int> &ids, const TQS
 
 void RecipeActionsHandler::recipesToClipboard( const TQValueList<int> &ids, RecipeDB *db )
 {
-	KConfig *config = KGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup("Export");
 	TQString formatFilter = config->readEntry("ClipboardFormat");
 

krecipes/src/recipeactionshandler.h

@@ -18,13 +18,13 @@
 #include <ntqptrlist.h>
 
 class TQListViewItem;
-class KListView;
+class TDEListView;
-class KPopupMenu;
+class TDEPopupMenu;
 class RecipeDB;
 
 /** @brief A class that centralizes common actions for recipes such as saving and editing.
   * 
-  * It acts upon a given KListView that is assumed to be a list of recipes.  It 
+  * It acts upon a given TDEListView that is assumed to be a list of recipes.  It 
   * automagically enables this list view with a popup menu for user access to 
   * the provided actions.
   *
@@ -50,7 +50,7 @@ public:
 	    Categorize = 0x0200
 	};
 
-	RecipeActionsHandler( KListView *parentListView, RecipeDB *db, int actions = AllActions );
+	RecipeActionsHandler( TDEListView *parentListView, RecipeDB *db, int actions = AllActions );
 	~RecipeActionsHandler()
 	{}
 
@@ -64,7 +64,7 @@ signals:
 
 public slots:
 	void exec( ItemType type, const TQPoint &p );
-	void showPopup( KListView *, TQListViewItem *, const TQPoint & );
+	void showPopup( TDEListView *, TQListViewItem *, const TQPoint & );
 
 	void categorize();
 
@@ -102,10 +102,10 @@ public slots:
 	void recipesToClipboard();
 
 private:
-	KPopupMenu *kpop;
+	TDEPopupMenu *kpop;
-	KPopupMenu *catPop;
+	TDEPopupMenu *catPop;
 
-	KListView *parentListView;
+	TDEListView *parentListView;
 	RecipeDB *database;
 
 	int remove_from_cat_item;

krecipes/src/recipefilter.cpp

@@ -15,7 +15,7 @@
 
 #include "widgets/recipelistview.h"
 
-RecipeFilter::RecipeFilter( KListView *klv ) : TQObject( klv ),
+RecipeFilter::RecipeFilter( TDEListView *klv ) : TQObject( klv ),
 		listview( klv ),
 		currentCategory( 0 )
 {}

krecipes/src/recipefilter.h

@@ -14,7 +14,7 @@
 
 #include <ntqobject.h>
 
-class KListView;
+class TDEListView;
 class TQListViewItem;
 
 class RecipeFilter : public TQObject
@@ -22,7 +22,7 @@ class RecipeFilter : public TQObject
 	Q_OBJECT
 
 public:
-	RecipeFilter( KListView * );
+	RecipeFilter( TDEListView * );
 
 public slots:
 	void filter( const TQString & );
@@ -32,7 +32,7 @@ private:
 	bool isParentOf( TQListViewItem *parent, TQListViewItem *to_check );
 	bool hideIfEmpty( TQListViewItem *parent = 0 );
 
-	KListView *listview;
+	TDEListView *listview;
 	TQListViewItem *currentCategory;
 };
 

krecipes/src/setupwizard.cpp

@@ -23,13 +23,13 @@
 #include <ntqpushbutton.h>
 #include <ntqtooltip.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include "setupwizard.h"
 
@@ -556,8 +556,8 @@ SQLiteSetupPage::SQLiteSetupPage( TQWidget *parent ) : TQWidget( parent )
 	fileEdit->setText( locateLocal ( "appdata", "krecipes.krecdb" ) );
 	hbox->setStretchFactor( fileEdit, 2 );
 
-	KIconLoader il;
+	TDEIconLoader il;
-	TQPushButton *file_select = new TQPushButton( il.loadIcon( "fileopen", KIcon::NoGroup, 16 ), TQString::null, hbox );
+	TQPushButton *file_select = new TQPushButton( il.loadIcon( "fileopen", TDEIcon::NoGroup, 16 ), TQString::null, hbox );
 	TQToolTip::add
 		( file_select, i18n( "Open file dialog" ) );
 	file_select->setFixedWidth( 25 );
@@ -615,8 +615,8 @@ SavePage::SavePage( TQWidget *parent ) : TQWidget( parent )
 
 void SetupWizard::save( void )
 {
-	kdDebug() << "Setting parameters in kconfig..." << endl;
+	kdDebug() << "Setting parameters in tdeconfig..." << endl;
-	KConfig *config = kapp->config();
+	TDEConfig *config = kapp->config();
 
 	// Save the database type
 	TQString sDBType;
@@ -635,7 +635,7 @@ void SetupWizard::save( void )
 
 	config->setGroup( "DBType" );
 	config->writeEntry( "Type", sDBType );
-	kdDebug() << "DB type set in kconfig was... " << sDBType << endl;
+	kdDebug() << "DB type set in tdeconfig was... " << sDBType << endl;
 	// Save the server data if needed
 	if ( !( dbTypeSetupPage->dbType() == SQLite ) ) {
 		config->setGroup( "Server" );
@@ -655,7 +655,7 @@ void SetupWizard::save( void )
 	config->setGroup( "Wizard" );
 	config->writeEntry( "SystemSetup", true );
 	config->writeEntry( "Version", "0.9" );
-	kdDebug() << "Setting in kconfig the lines to disable wizard startup..." << sDBType << endl;
+	kdDebug() << "Setting in tdeconfig the lines to disable wizard startup..." << sDBType << endl;
 }
 
 void SetupWizard::getOptions( bool &setupUser, bool &initializeData, bool &doUSDAImport )

krecipes/src/tests/Makefile.am

@@ -8,7 +8,7 @@ noinst_HEADERS = importertest.h exportertest.h
 
 METASOURCES = AUTO
 
-LDADD = ../importers/libkrecipesimporters.la ../exporters/libkrecipesexporters.la ../backends/libkrecipesdbs.la ../datablocks/libdatablocks.la $(LIB_QT) $(LIB_KHTML) $(LIB_KSPELL)
+LDADD = ../importers/libkrecipesimporters.la ../exporters/libkrecipesexporters.la ../backends/libkrecipesdbs.la ../datablocks/libdatablocks.la $(LIB_QT) $(LIB_TDEHTML) $(LIB_KSPELL)
 
 kretest_SOURCES = kretest.cpp
 mmftest_SOURCES = mmftest.cpp

krecipes/src/tests/kretest.cpp

@@ -8,7 +8,7 @@
 *   (at your option) any later version.                                   *
 ***************************************************************************/
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <ntqstring.h>
 #include <ntqfile.h>
@@ -23,7 +23,7 @@
 int
 main(int argc, char *argv[])
 {
-	KApplication a(argc, argv, "kretest");
+	TDEApplication a(argc, argv, "kretest");
 
 	printf("Creating KreImporter.\n");
 	KreImporter importer;

krecipes/src/tests/mmftest.cpp

@@ -8,7 +8,7 @@
 *   (at your option) any later version.                                   *
 ***************************************************************************/
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <ntqstring.h>
 
@@ -24,7 +24,7 @@ using std::endl;
 int
 main(int argc, char *argv[])
 {
-	KApplication a(argc, argv, "mmftest");
+	TDEApplication a(argc, argv, "mmftest");
 
 	printf("Creating MMFImporter.\n");
 	MMFImporter importer;

krecipes/src/tests/mx2test.cpp

@@ -8,7 +8,7 @@
 *   (at your option) any later version.                                   *
 ***************************************************************************/
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <ntqstring.h>
 
@@ -22,7 +22,7 @@ using std::endl;
 int
 main(int argc, char *argv[])
 {
-	KApplication a(argc, argv, "mx2test");
+	TDEApplication a(argc, argv, "mx2test");
 
 	printf("Creating MX2Importer.\n");
 	MX2Importer importer;

krecipes/src/tests/mxptest.cpp

@@ -8,7 +8,7 @@
 *   (at your option) any later version.                                   *
 ***************************************************************************/
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <ntqstring.h>
 
@@ -22,7 +22,7 @@ using std::endl;
 int
 main(int argc, char *argv[])
 {
-	KApplication a(argc, argv, "mxptest");
+	TDEApplication a(argc, argv, "mxptest");
 
 	printf("Creating MXPImporter.\n");
 	MXPImporter importer;

krecipes/src/tests/nyctest.cpp

@@ -8,7 +8,7 @@
 *   (at your option) any later version.                                   *
 ***************************************************************************/
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <ntqstring.h>
 
@@ -22,7 +22,7 @@ using std::endl;
 int
 main(int argc, char *argv[])
 {
-	KApplication a(argc, argv, "nyctest");
+	TDEApplication a(argc, argv, "nyctest");
 
 	printf("Creating NYCGenericImporter.\n");
 	NYCGenericImporter importer;

krecipes/src/tests/recipemltest.cpp

@@ -8,7 +8,7 @@
 *   (at your option) any later version.                                   *
 ***************************************************************************/
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <ntqstring.h>
 
@@ -24,7 +24,7 @@ using std::endl;
 int
 main(int argc, char *argv[])
 {
-	KApplication a(argc, argv, "recipemltest");
+	TDEApplication a(argc, argv, "recipemltest");
 
 	printf("Creating RecipeMLImporter.\n");
 	RecipeMLImporter importer;

krecipes/src/tests/rezkonvtest.cpp

@@ -8,7 +8,7 @@
 *   (at your option) any later version.                                   *
 ***************************************************************************/
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <ntqstring.h>
 
@@ -24,7 +24,7 @@ using std::endl;
 int
 main(int argc, char *argv[])
 {
-	KApplication a(argc, argv, "rezkonvtest");
+	TDEApplication a(argc, argv, "rezkonvtest");
 
 	printf("Creating RezkonvImporter.\n");
 	RezkonvImporter importer;

krecipes/src/widgets/authorlistview.cpp

@@ -10,12 +10,12 @@
 
 #include "authorlistview.h"
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include "backends/recipedb.h"
 #include "dialogs/createelementdialog.h"
@@ -56,7 +56,7 @@ StdAuthorListView::StdAuthorListView( TQWidget *parent, RecipeDB *db, bool edita
 {
 	addColumn( i18n( "Author" ) );
 
-	KConfig * config = KGlobal::config();
+	TDEConfig * config = TDEGlobal::config();
 	config->setGroup( "Advanced" );
 	bool show_id = config->readBoolEntry( "ShowID", false );
 	addColumn( i18n( "Id" ), show_id ? -1 : 0 );
@@ -64,24 +64,24 @@ StdAuthorListView::StdAuthorListView( TQWidget *parent, RecipeDB *db, bool edita
 	if ( editable ) {
 		setRenameable( 0, true );
 
-		KIconLoader *il = new KIconLoader;
+		TDEIconLoader *il = new TDEIconLoader;
 
-		kpop = new KPopupMenu( this );
+		kpop = new TDEPopupMenu( this );
-		kpop->insertItem( il->loadIcon( "filenew", KIcon::NoGroup, 16 ), i18n( "&Create" ), this, SLOT( createNew() ), CTRL + Key_N );
+		kpop->insertItem( il->loadIcon( "filenew", TDEIcon::NoGroup, 16 ), i18n( "&Create" ), this, SLOT( createNew() ), CTRL + Key_N );
-		kpop->insertItem( il->loadIcon( "editdelete", KIcon::NoGroup, 16 ), i18n( "&Delete" ), this, SLOT( remove
+		kpop->insertItem( il->loadIcon( "editdelete", TDEIcon::NoGroup, 16 ), i18n( "&Delete" ), this, SLOT( remove
 			                  () ), Key_Delete );
-		kpop->insertItem( il->loadIcon( "edit", KIcon::NoGroup, 16 ), i18n( "&Rename" ), this, SLOT( rename() ), CTRL + Key_R );
+		kpop->insertItem( il->loadIcon( "edit", TDEIcon::NoGroup, 16 ), i18n( "&Rename" ), this, SLOT( rename() ), CTRL + Key_R );
 		kpop->polish();
 
 		delete il;
 
-		connect( this, SIGNAL( contextMenu( KListView *, TQListViewItem *, const TQPoint & ) ), SLOT( showPopup( KListView *, TQListViewItem *, const TQPoint & ) ) );
+		connect( this, SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), SLOT( showPopup( TDEListView *, TQListViewItem *, const TQPoint & ) ) );
 		connect( this, SIGNAL( doubleClicked( TQListViewItem* ) ), this, SLOT( modAuthor( TQListViewItem* ) ) );
 		connect( this, SIGNAL( itemRenamed( TQListViewItem* ) ), this, SLOT( saveAuthor( TQListViewItem* ) ) );
 	}
 }
 
-void StdAuthorListView::showPopup( KListView * /*l*/, TQListViewItem *i, const TQPoint &p )
+void StdAuthorListView::showPopup( TDEListView * /*l*/, TQListViewItem *i, const TQPoint &p )
 {
 	if ( i )
 		kpop->exec( p );
@@ -233,7 +233,7 @@ AuthorCheckListView::AuthorCheckListView( TQWidget *parent, RecipeDB *db ) : Aut
 {
 	addColumn( i18n( "Author" ) );
 
-	KConfig *config = KGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup( "Advanced" );
 	bool show_id = config->readBoolEntry( "ShowID", false );
 	addColumn( i18n( "Id" ), show_id ? -1 : 0 );

krecipes/src/widgets/authorlistview.h

@@ -16,7 +16,7 @@
 #include "datablocks/element.h"
 
 class RecipeDB;
-class KPopupMenu;
+class TDEPopupMenu;
 
 class AuthorCheckListView;
 
@@ -68,7 +68,7 @@ protected:
 	virtual void removeAuthor( int );
 
 private slots:
-	void showPopup( KListView *, TQListViewItem *, const TQPoint & );
+	void showPopup( TDEListView *, TQListViewItem *, const TQPoint & );
 
 	void createNew();
 	void remove
@@ -81,7 +81,7 @@ private slots:
 private:
 	bool checkBounds( const TQString &name );
 
-	KPopupMenu *kpop;
+	TDEPopupMenu *kpop;
 };
 
 

krecipes/src/widgets/categorycombobox.cpp

@@ -14,9 +14,9 @@
 
 #include <ntqlistbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "backends/recipedb.h"
 #include "backends/progressinterface.h"
@@ -48,7 +48,7 @@ void CategoryComboBox::reload()
 {
 	TQString remember_cat_filter = currentText();
 
-	KConfig * config = KGlobal::config();config->setGroup( "Performance" );
+	TDEConfig * config = TDEGlobal::config();config->setGroup( "Performance" );
 	int limit = config->readNumEntry( "CategoryLimit", -1 );
 
 	//ProgressInterface pi(this);
@@ -84,7 +84,7 @@ void CategoryComboBox::loadCategories( CategoryTree *categoryTree, int &row )
 
 void CategoryComboBox::loadNextGroup()
 {
-	KConfig * config = KGlobal::config();config->setGroup( "Performance" );
+	TDEConfig * config = TDEGlobal::config();config->setGroup( "Performance" );
 	int limit = config->readNumEntry( "CategoryLimit", -1 );
 
 	m_offset += limit;
@@ -94,7 +94,7 @@ void CategoryComboBox::loadNextGroup()
 
 void CategoryComboBox::loadPrevGroup()
 {
-	KConfig * config = KGlobal::config();config->setGroup( "Performance" );
+	TDEConfig * config = TDEGlobal::config();config->setGroup( "Performance" );
 	int limit = config->readNumEntry( "CategoryLimit", -1 );
 
 	m_offset -= limit;

krecipes/src/widgets/categorylistview.cpp

@@ -12,12 +12,12 @@
 
 #include "categorylistview.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include "backends/recipedb.h"
@@ -301,7 +301,7 @@ StdCategoryListView::StdCategoryListView( TQWidget *parent, RecipeDB *db, bool e
 {
 	addColumn( i18n( "Category" ) );
 
-	KConfig *config = KGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup( "Advanced" );
 	bool show_id = config->readBoolEntry( "ShowID", false );
 	addColumn( i18n( "Id" ), show_id ? -1 : 0 );
@@ -311,23 +311,23 @@ StdCategoryListView::StdCategoryListView( TQWidget *parent, RecipeDB *db, bool e
 		setDragEnabled( true );
 		setAcceptDrops( true );
 
-		KIconLoader *il = new KIconLoader;
+		TDEIconLoader *il = new TDEIconLoader;
 
-		kpop = new KPopupMenu( this );
+		kpop = new TDEPopupMenu( this );
-		kpop->insertItem( il->loadIcon( "filenew", KIcon::NoGroup, 16 ), i18n( "&Create" ), this, SLOT( createNew() ), CTRL + Key_C );
+		kpop->insertItem( il->loadIcon( "filenew", TDEIcon::NoGroup, 16 ), i18n( "&Create" ), this, SLOT( createNew() ), CTRL + Key_C );
-		kpop->insertItem( il->loadIcon( "editdelete", KIcon::NoGroup, 16 ), i18n( "&Delete" ), this, SLOT( remove
+		kpop->insertItem( il->loadIcon( "editdelete", TDEIcon::NoGroup, 16 ), i18n( "&Delete" ), this, SLOT( remove
 			                  () ), Key_Delete );
-		kpop->insertItem( il->loadIcon( "edit", KIcon::NoGroup, 16 ), i18n( "&Rename" ), this, SLOT( rename() ), CTRL + Key_R );
+		kpop->insertItem( il->loadIcon( "edit", TDEIcon::NoGroup, 16 ), i18n( "&Rename" ), this, SLOT( rename() ), CTRL + Key_R );
 		kpop->insertSeparator();
-		kpop->insertItem( il->loadIcon( "editcut", KIcon::NoGroup, 16 ), i18n( "Cu&t" ), this, SLOT( cut() ), CTRL + Key_X );
+		kpop->insertItem( il->loadIcon( "editcut", TDEIcon::NoGroup, 16 ), i18n( "Cu&t" ), this, SLOT( cut() ), CTRL + Key_X );
-		kpop->insertItem( il->loadIcon( "editpaste", KIcon::NoGroup, 16 ), i18n( "&Paste" ), this, SLOT( paste() ), CTRL + Key_V );
+		kpop->insertItem( il->loadIcon( "editpaste", TDEIcon::NoGroup, 16 ), i18n( "&Paste" ), this, SLOT( paste() ), CTRL + Key_V );
-		kpop->insertItem( il->loadIcon( "editpaste", KIcon::NoGroup, 16 ), i18n( "Paste as Subcategory" ), this, SLOT( pasteAsSub() ), CTRL + SHIFT + Key_V );
+		kpop->insertItem( il->loadIcon( "editpaste", TDEIcon::NoGroup, 16 ), i18n( "Paste as Subcategory" ), this, SLOT( pasteAsSub() ), CTRL + SHIFT + Key_V );
 		kpop->polish();
 
 		delete il;
 
 		connect( kpop, SIGNAL( aboutToShow() ), SLOT( preparePopup() ) );
-		connect( this, SIGNAL( contextMenu( KListView *, TQListViewItem *, const TQPoint & ) ), SLOT( showPopup( KListView *, TQListViewItem *, const TQPoint & ) ) );
+		connect( this, SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), SLOT( showPopup( TDEListView *, TQListViewItem *, const TQPoint & ) ) );
 		connect( this, SIGNAL( doubleClicked( TQListViewItem*, const TQPoint &, int ) ), SLOT( modCategory( TQListViewItem* ) ) );
 		connect( this, SIGNAL( itemRenamed ( TQListViewItem* ) ), SLOT( saveCategory( TQListViewItem* ) ) );
 		connect( this, SIGNAL( moved( TQListViewItem *, TQListViewItem *, TQListViewItem * ) ), SLOT( changeCategoryParent( TQListViewItem *, TQListViewItem *, TQListViewItem * ) ) );
@@ -351,7 +351,7 @@ void StdCategoryListView::preparePopup()
 	kpop->setItemEnabled( kpop->idAt( 6 ), clipboard_item );
 }
 
-void StdCategoryListView::showPopup( KListView * /*l*/, TQListViewItem *i, const TQPoint &p )
+void StdCategoryListView::showPopup( TDEListView * /*l*/, TQListViewItem *i, const TQPoint &p )
 {
 	if ( i )
 		kpop->exec( p );
@@ -567,7 +567,7 @@ CategoryCheckListView::CategoryCheckListView( TQWidget *parent, RecipeDB *db, bo
 {
 	addColumn( i18n( "Category" ) );
 
-	KConfig *config = KGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup( "Advanced" );
 	bool show_id = config->readBoolEntry( "ShowID", false );
 	addColumn( i18n( "Id" ), show_id ? -1 : 0 );

krecipes/src/widgets/categorylistview.h

@@ -19,7 +19,7 @@
 
 #include "datablocks/elementlist.h"
 
-class KPopupMenu;
+class TDEPopupMenu;
 
 class RecipeDB;
 class CategoryTree;
@@ -123,7 +123,7 @@ protected:
 	virtual void load( int limit, int offset );
 
 	/** so that it allows dropping into
-	         * subchildren that aren't expandable.  The code is taken from KDE's KListView with
+	         * subchildren that aren't expandable.  The code is taken from KDE's TDEListView with
 	         * one line commented out.
 	  */
 	void findDrop( const TQPoint &pos, TQListViewItem *&parent, TQListViewItem *&after )
@@ -225,7 +225,7 @@ protected:
 
 private slots:
 	void preparePopup();
-	void showPopup( KListView *, TQListViewItem *, const TQPoint & );
+	void showPopup( TDEListView *, TQListViewItem *, const TQPoint & );
 
 	void createNew();
 	void remove
@@ -243,7 +243,7 @@ private slots:
 private:
 	bool checkBounds( const TQString &name );
 
-	KPopupMenu *kpop;
+	TDEPopupMenu *kpop;
 	TQListViewItem *clipboard_item;
 	TQListViewItem *clipboard_parent;
 	

krecipes/src/widgets/conversiontable.cpp

@@ -17,8 +17,8 @@
 
 #include <ntqtooltip.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 class ConversionTableToolTip : public TQToolTip
 {
@@ -200,7 +200,7 @@ void ConversionTable::createNewItem( int r, int c, double amount )
 {
 
 	ConversionTableItem * ci = new ConversionTableItem( this, TQTableItem::WhenCurrent );
-	ci->setText( beautify( KGlobal::locale() ->formatNumber( amount, 5 ) ) );
+	ci->setText( beautify( TDEGlobal::locale() ->formatNumber( amount, 5 ) ) );
 	setItem( r, c, ci );
 	// connect signal (forward) to know when it's actually changed
 	connect( ci, SIGNAL( ratioChanged( int, int, double ) ), this, SIGNAL( ratioChanged( int, int, double ) ) );

krecipes/src/widgets/dblistviewbase.cpp

@@ -10,12 +10,12 @@
 
 #include "dblistviewbase.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcursor.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprogress.h>
 
 
@@ -52,7 +52,7 @@ public:
 	}
 };
 
-DBListViewBase::DBListViewBase( TQWidget *parent, RecipeDB *db, int t ) : KListView(parent),
+DBListViewBase::DBListViewBase( TQWidget *parent, RecipeDB *db, int t ) : TDEListView(parent),
   database(db),
   curr_limit(-1),
   curr_offset(0),
@@ -65,7 +65,7 @@ DBListViewBase::DBListViewBase( TQWidget *parent, RecipeDB *db, int t ) : KListV
 	setSorting(-1);
 
 	if ( curr_limit == -1 ) { //only use the default limit if a subclass hasn't given curr_limit its own value
-		KConfig * config = KGlobal::config();config->setGroup( "Performance" );
+		TDEConfig * config = TDEGlobal::config();config->setGroup( "Performance" );
 		curr_limit = config->readNumEntry( "Limit", -1 );
 	}
 
@@ -103,7 +103,7 @@ void DBListViewBase::rename( TQListViewItem *it, int c )
 		return;
 	}
 
-	KListView::rename(it,c);
+	TDEListView::rename(it,c);
 }
 
 void DBListViewBase::slotDoubleClicked( TQListViewItem *it )
@@ -151,13 +151,13 @@ void DBListViewBase::keyPressEvent( TQKeyEvent *k )
 		}
 	}
 
-	KListView::keyPressEvent(k);
+	TDEListView::keyPressEvent(k);
 }
 
 void DBListViewBase::reload( ReloadFlags flag )
 {
 	if ( flag == ForceReload || (!firstChild() && flag == Load) || (firstChild() && flag == ReloadIfPopulated) ) {
-		KApplication::setOverrideCursor( KCursor::waitCursor() );
+		TDEApplication::setOverrideCursor( KCursor::waitCursor() );
 
 		init();
 
@@ -184,7 +184,7 @@ void DBListViewBase::reload( ReloadFlags flag )
 
 		//delete m_progress; m_progress = 0;
 	
-		KApplication::restoreOverrideCursor();
+		TDEApplication::restoreOverrideCursor();
 	}
 }
 

krecipes/src/widgets/dblistviewbase.h

@@ -14,7 +14,7 @@
 #include <ntqobject.h>
 #include <ntqmap.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 #define PREVLISTITEM_RTTI 1002
 #define NEXTLISTITEM_RTTI 1003
@@ -29,7 +29,7 @@ typedef enum ReloadFlags {
 	ForceReload		/** Load/reload the list regardless of whether or not it's been loaded */
 };
 
-class DBListViewBase : public KListView
+class DBListViewBase : public TDEListView
 {
 Q_OBJECT
 
@@ -57,7 +57,7 @@ protected:
 	void removeElement( TQListViewItem *, bool delete_item = true );
 
 	bool reloading(){ return bulk_load; }
-	void setSorting(int c){KListView::setSorting(c);} //don't do sorting, the database comes sorted from the database anyways
+	void setSorting(int c){TDEListView::setSorting(c);} //don't do sorting, the database comes sorted from the database anyways
 	void setTotalItems(int);
 
 	RecipeDB *database;
@@ -73,7 +73,7 @@ private:
 	void activateNext();
 
 	//make this private because the data should always be synced with the database
-	void clear(){KListView::clear();}
+	void clear(){TDEListView::clear();}
 
 	int total;
 	

krecipes/src/widgets/fractioninput.cpp

@@ -12,7 +12,7 @@
 
 #include <ntqtimer.h>
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include "datablocks/ingredient.h"
 
@@ -107,7 +107,7 @@ void FractionInput::slotStartValidateTimer()
 void FractionInput::validate()
 {
 	if ( isInputValid() ) {
-		setPaletteForegroundColor( KGlobalSettings::textColor() );
+		setPaletteForegroundColor( TDEGlobalSettings::textColor() );
 	}
 	else
 		setPaletteForegroundColor( TQt::red );

krecipes/src/widgets/headerlistview.cpp

@@ -12,12 +12,12 @@
 
 #include "headerlistview.h"
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include "backends/recipedb.h"
 #include "dialogs/createelementdialog.h"
@@ -59,7 +59,7 @@ StdHeaderListView::StdHeaderListView( TQWidget *parent, RecipeDB *db, bool edita
 {
 	addColumn( i18n( "Header" ) );
 
-	KConfig * config = KGlobal::config();
+	TDEConfig * config = TDEGlobal::config();
 	config->setGroup( "Advanced" );
 	bool show_id = config->readBoolEntry( "ShowID", false );
 	addColumn( i18n( "Id" ), show_id ? -1 : 0 );
@@ -67,24 +67,24 @@ StdHeaderListView::StdHeaderListView( TQWidget *parent, RecipeDB *db, bool edita
 	if ( editable ) {
 		setRenameable( 0, true );
 
-		KIconLoader *il = new KIconLoader;
+		TDEIconLoader *il = new TDEIconLoader;
 
-		kpop = new KPopupMenu( this );
+		kpop = new TDEPopupMenu( this );
-		kpop->insertItem( il->loadIcon( "filenew", KIcon::NoGroup, 16 ), i18n( "&Create" ), this, SLOT( createNew() ), CTRL + Key_C );
+		kpop->insertItem( il->loadIcon( "filenew", TDEIcon::NoGroup, 16 ), i18n( "&Create" ), this, SLOT( createNew() ), CTRL + Key_C );
-		kpop->insertItem( il->loadIcon( "editdelete", KIcon::NoGroup, 16 ), i18n( "&Delete" ), this, SLOT( remove
+		kpop->insertItem( il->loadIcon( "editdelete", TDEIcon::NoGroup, 16 ), i18n( "&Delete" ), this, SLOT( remove
 			                  () ), Key_Delete );
-		kpop->insertItem( il->loadIcon( "edit", KIcon::NoGroup, 16 ), i18n( "&Rename" ), this, SLOT( rename() ), CTRL + Key_R );
+		kpop->insertItem( il->loadIcon( "edit", TDEIcon::NoGroup, 16 ), i18n( "&Rename" ), this, SLOT( rename() ), CTRL + Key_R );
 		kpop->polish();
 
 		delete il;
 
-		connect( this, SIGNAL( contextMenu( KListView *, TQListViewItem *, const TQPoint & ) ), SLOT( showPopup( KListView *, TQListViewItem *, const TQPoint & ) ) );
+		connect( this, SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), SLOT( showPopup( TDEListView *, TQListViewItem *, const TQPoint & ) ) );
 		connect( this, SIGNAL( doubleClicked( TQListViewItem*, const TQPoint &, int ) ), this, SLOT( modHeader( TQListViewItem*, const TQPoint &, int ) ) );
 		connect( this, SIGNAL( itemRenamed( TQListViewItem*, const TQString &, int ) ), this, SLOT( saveHeader( TQListViewItem*, const TQString &, int ) ) );
 	}
 }
 
-void StdHeaderListView::showPopup( KListView * /*l*/, TQListViewItem *i, const TQPoint &p )
+void StdHeaderListView::showPopup( TDEListView * /*l*/, TQListViewItem *i, const TQPoint &p )
 {
 	if ( i )
 		kpop->exec( p );

krecipes/src/widgets/headerlistview.h

@@ -18,7 +18,7 @@
 #include "datablocks/element.h"
 
 class RecipeDB;
-class KPopupMenu;
+class TDEPopupMenu;
 
 class HeaderListView : public DBListViewBase
 {
@@ -52,7 +52,7 @@ protected:
 	virtual void removeHeader( int );
 
 private slots:
-	void showPopup( KListView *, TQListViewItem *, const TQPoint & );
+	void showPopup( TDEListView *, TQListViewItem *, const TQPoint & );
 
 	void createNew();
 	void remove();
@@ -64,7 +64,7 @@ private slots:
 private:
 	bool checkBounds( const TQString &unit );
 
-	KPopupMenu *kpop;
+	TDEPopupMenu *kpop;
 };
 
 #endif //HEADERLISTVIEW_H

krecipes/src/widgets/inglistviewitem.cpp

@@ -10,9 +10,9 @@
 
 #include "inglistviewitem.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include "datablocks/unit.h"
@@ -87,13 +87,13 @@ void IngListViewItem::setAmount( double amount, double amount_offset )
 	amount_str = TQString::null;
 
 	if ( amount > 0 ) {
-		KConfig * config = KGlobal::config();
+		TDEConfig * config = TDEGlobal::config();
 		config->setGroup( "Formatting" );
 
 		if ( config->readBoolEntry( "Fraction" ) )
 			amount_str = MixedNumber( amount ).toString();
 		else
-			amount_str = beautify( KGlobal::locale() ->formatNumber( amount, 5 ) );
+			amount_str = beautify( TDEGlobal::locale() ->formatNumber( amount, 5 ) );
 	}
 	if ( amount_offset > 0 ) {
 		if ( amount < 1e-10 )

krecipes/src/widgets/ingredientcombobox.cpp

@@ -14,9 +14,9 @@
 #include <ntqtimer.h>
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "backends/recipedb.h"
 #include "datablocks/elementlist.h"
@@ -82,7 +82,7 @@ void IngredientComboBox::startLoad()
 	//don't receive ingredient created/removed events from the database
 	database->disconnect( this );
 
-	KConfig * config = KGlobal::config(); config->setGroup( "Performance" );
+	TDEConfig * config = TDEGlobal::config(); config->setGroup( "Performance" );
 	load_limit = config->readNumEntry( "Limit", -1 );
 	if ( load_limit == -1 ) {
 		reload();

krecipes/src/widgets/ingredientinputwidget.cpp

@@ -24,8 +24,8 @@
 #include <ntqcheckbox.h>
 
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 #include "backends/recipedb.h"

krecipes/src/widgets/ingredientlistview.cpp

@@ -10,12 +10,12 @@
 
 #include "ingredientlistview.h"
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include "backends/recipedb.h"
 #include "dialogs/createelementdialog.h"
@@ -108,7 +108,7 @@ StdIngredientListView::StdIngredientListView( TQWidget *parent, RecipeDB *db, bo
 {
 	addColumn( i18n( "Ingredient" ) );
 
-	KConfig * config = KGlobal::config();
+	TDEConfig * config = TDEGlobal::config();
 	config->setGroup( "Advanced" );
 	bool show_id = config->readBoolEntry( "ShowID", false );
 	addColumn( i18n( "Id" ), show_id ? -1 : 0 );
@@ -116,24 +116,24 @@ StdIngredientListView::StdIngredientListView( TQWidget *parent, RecipeDB *db, bo
 	if ( editable ) {
 		setRenameable( 0, true );
 
-		KIconLoader *il = new KIconLoader;
+		TDEIconLoader *il = new TDEIconLoader;
 
-		kpop = new KPopupMenu( this );
+		kpop = new TDEPopupMenu( this );
-		kpop->insertItem( il->loadIcon( "filenew", KIcon::NoGroup, 16 ), i18n( "&Create" ), this, SLOT( createNew() ), CTRL + Key_C );
+		kpop->insertItem( il->loadIcon( "filenew", TDEIcon::NoGroup, 16 ), i18n( "&Create" ), this, SLOT( createNew() ), CTRL + Key_C );
-		kpop->insertItem( il->loadIcon( "editdelete", KIcon::NoGroup, 16 ), i18n( "&Delete" ), this, SLOT( remove
+		kpop->insertItem( il->loadIcon( "editdelete", TDEIcon::NoGroup, 16 ), i18n( "&Delete" ), this, SLOT( remove
 			                  () ), Key_Delete );
-		kpop->insertItem( il->loadIcon( "edit", KIcon::NoGroup, 16 ), i18n( "&Rename" ), this, SLOT( rename() ), CTRL + Key_R );
+		kpop->insertItem( il->loadIcon( "edit", TDEIcon::NoGroup, 16 ), i18n( "&Rename" ), this, SLOT( rename() ), CTRL + Key_R );
 		kpop->polish();
 
 		delete il;
 
-		connect( this, SIGNAL( contextMenu( KListView *, TQListViewItem *, const TQPoint & ) ), SLOT( showPopup( KListView *, TQListViewItem *, const TQPoint & ) ) );
+		connect( this, SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), SLOT( showPopup( TDEListView *, TQListViewItem *, const TQPoint & ) ) );
 		connect( this, SIGNAL( doubleClicked( TQListViewItem* ) ), this, SLOT( modIngredient( TQListViewItem* ) ) );
 		connect( this, SIGNAL( itemRenamed( TQListViewItem* ) ), this, SLOT( saveIngredient( TQListViewItem* ) ) );
 	}
 }
 
-void StdIngredientListView::showPopup( KListView * /*l*/, TQListViewItem *i, const TQPoint &p )
+void StdIngredientListView::showPopup( TDEListView * /*l*/, TQListViewItem *i, const TQPoint &p )
 {
 	if ( i )
 		kpop->exec( p );
@@ -245,7 +245,7 @@ IngredientCheckListView::IngredientCheckListView( TQWidget *parent, RecipeDB *db
 {
 	addColumn( i18n( "Ingredient" ) );
 
-	KConfig *config = KGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup( "Advanced" );
 	bool show_id = config->readBoolEntry( "ShowID", false );
 	addColumn( i18n( "Id" ), show_id ? -1 : 0 );

krecipes/src/widgets/ingredientlistview.h

@@ -17,7 +17,7 @@
 #include "datablocks/element.h"
 
 class RecipeDB;
-class KPopupMenu;
+class TDEPopupMenu;
 class IngredientCheckListView;
 
 /**
@@ -79,7 +79,7 @@ protected:
 	virtual void removeIngredient( int );
 
 private slots:
-	void showPopup( KListView *, TQListViewItem *, const TQPoint & );
+	void showPopup( TDEListView *, TQListViewItem *, const TQPoint & );
 
 	void createNew();
 	void remove
@@ -92,7 +92,7 @@ private slots:
 private:
 	bool checkBounds( const TQString &name );
 
-	KPopupMenu *kpop;
+	TDEPopupMenu *kpop;
 };
 
 

krecipes/src/widgets/kdateedit.cpp

@@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
 
     Copyright (c) 2002 Cornelius Schumacher <schumacher@kde.org>
     Copyright (c) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
@@ -27,10 +27,10 @@
 #include <ntqvalidator.h>
 
 //#include <kcalendarsystem.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "kdateedit.h"
 
@@ -38,7 +38,7 @@ TQRect desktopGeometry(TQWidget* w)
 {
  TQDesktopWidget *dw = TQApplication::desktop();
  if (dw->isVirtualDesktop()) {
-     KConfigGroup group(KGlobal::config(), "Windows");
+     TDEConfigGroup group(TDEGlobal::config(), "Windows");
      if (group.readBoolEntry("XineramaEnabled", true) &&
          group.readBoolEntry("XineramaPlacementEnabled", true)) {
          if (w)
@@ -71,7 +71,7 @@ class DateValidator : public TQValidator
         return Acceptable;
 
       bool ok = false;
-      KGlobal::locale()->readDate( str, &ok );
+      TDEGlobal::locale()->readDate( str, &ok );
       if ( ok )
         return Acceptable;
       else
@@ -91,7 +91,7 @@ KDateEdit::KDateEdit( TQWidget *parent, const char *name )
   setMaxCount( 1 );
 
   mDate = TQDate::currentDate();
-  TQString today = KGlobal::locale()->formatDate( mDate, true );
+  TQString today = TDEGlobal::locale()->formatDate( mDate, true );
 
   insertItem( today );
   setCurrentItem( 0 );
@@ -262,7 +262,7 @@ TQDate KDateEdit::parseDate( bool *replaced ) const
     if ( replaced )
       (*replaced) = true;
   } else {
-    result = KGlobal::locale()->readDate( text );
+    result = TDEGlobal::locale()->readDate( text );
   }
 
   return result;
@@ -358,7 +358,7 @@ void KDateEdit::setupKeywords()
   #if 0 //depends on KDE 3.2
   TQString dayName;
   for ( int i = 1; i <= 7; ++i ) {
-    dayName = KGlobal::locale()->calendar()->weekDayName( i ).lower();
+    dayName = TDEGlobal::locale()->calendar()->weekDayName( i ).lower();
     mKeywordMap.insert( dayName, i + 100 );
   }
   #endif
@@ -375,7 +375,7 @@ void KDateEdit::updateView()
 {
   TQString dateString;
   if ( mDate.isValid() )
-    dateString = KGlobal::locale()->formatDate( mDate, true );
+    dateString = TDEGlobal::locale()->formatDate( mDate, true );
 
   // We do not want to generate a signal here,
   // since we explicitly setting the date

krecipes/src/widgets/kdateedit.h

@@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
 
     Copyright (c) 2002 Cornelius Schumacher <schumacher@kde.org>
     Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>

krecipes/src/widgets/kdatepickerpopup.cpp

@@ -1,5 +1,5 @@
 /*
-  This file is part of libkdepim.
+  This file is part of libtdepim.
 
   Copyright (c) 2004 Bram Schoenmakers <bramschoenmakers@kde.nl>
 
@@ -22,7 +22,7 @@
 #include <ntqdatetime.h>
 #include <ntqpopupmenu.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kdatepickerpopup.h"
 

krecipes/src/widgets/kdatepickerpopup.h

@@ -1,5 +1,5 @@
 /*
-  This file is part of libkdepim.
+  This file is part of libtdepim.
 
   Copyright (c) 2004 Bram Schoenmakers <bramschoenmakers@kde.nl>
 

krecipes/src/widgets/krelistview.cpp

@@ -13,8 +13,8 @@
 
 #include "krelistview.h"
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "widgets/dblistviewbase.h"
@@ -33,8 +33,8 @@ KreListView::KreListView( TQWidget *parent, const TQString &title, bool filter,
 		listLabel = new TQLabel( header );
 		listLabel->setFrameShape( TQFrame::GroupBoxPanel );
 		listLabel->setFrameShadow( TQFrame::Sunken );
-		listLabel->setPaletteForegroundColor( KGlobalSettings::highlightedTextColor() );
+		listLabel->setPaletteForegroundColor( TDEGlobalSettings::highlightedTextColor() );
-		listLabel->setPaletteBackgroundColor( KGlobalSettings::highlightColor().light( 120 ) ); // 120, to match the kremenu settings
+		listLabel->setPaletteBackgroundColor( TDEGlobalSettings::highlightColor().light( 120 ) ); // 120, to match the kremenu settings
 		listLabel->setText( title );
 
 	}
@@ -49,7 +49,7 @@ KreListView::KreListView( TQWidget *parent, const TQString &title, bool filter,
 	}
 
 
-	list = new KListView( this );
+	list = new TDEListView( this );
 	list->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding );
 	setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding );
 	setSpacing( 10 );

krecipes/src/widgets/krelistview.h

@@ -13,7 +13,7 @@
 
 #include <ntqlabel.h>
 #include <ntqvbox.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klineedit.h>
 
 class DBListViewBase;
@@ -29,12 +29,12 @@ public:
 
 	KreListView( TQWidget *parent, const TQString &title = TQString::null, bool filter = false, int filterCol = 0, TQWidget *embeddedWidget = 0 );
 	~KreListView();
-	KListView *listView()
+	TDEListView *listView()
 	{
 		return list;
 	}
 
-	void setListView( KListView *list_view )
+	void setListView( TDEListView *list_view )
 	{
 		delete list;
 		list = list_view;
@@ -56,7 +56,7 @@ private:
 	int filteredColumn;
 	TQLabel *filterLabel;
 	KLineEdit *filterEdit;
-	KListView *list;
+	TDEListView *list;
 
 private slots:
 	void filter( const TQString& s );

krecipes/src/widgets/kremenu.cpp

@@ -20,13 +20,13 @@
 #include <ntqpixmap.h>
 #include <ntqsignalmapper.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcursor.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <kimageeffect.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpixmap.h>
 #include <kpixmapeffect.h>
 
@@ -126,18 +126,18 @@ MenuId KreMenu::createSubMenu( const TQString &title, const TQString &icon )
 	MenuId id = menus.append( newMenu );
 
 	// Add a button to the main menu for this submenu
-	KIconLoader il;
+	TDEIconLoader il;
 	KreMenuButton *newMenuButton = new KreMenuButton( this );
 	newMenuButton->subMenuId = id;
 	newMenuButton->setTitle( title );
-	newMenuButton->setIconSet( il.loadIconSet( icon, KIcon::Panel ) );
+	newMenuButton->setIconSet( il.loadIconSet( icon, TDEIcon::Panel ) );
 
 	// Add a button to the submenu to go back to the top menu
 	KreMenuButton *newSubMenuButton = new KreMenuButton( this );
 	newSubMenuButton->menuId = id;
 	newSubMenuButton->subMenuId = mainMenuId;
 	newSubMenuButton->setTitle( i18n( "Up" ) );
-	newSubMenuButton->setIconSet( il.loadIconSet( "1uparrow", KIcon::Panel ) );
+	newSubMenuButton->setIconSet( il.loadIconSet( "1uparrow", TDEIcon::Panel ) );
 
 	connect( newMenuButton, SIGNAL( clicked( MenuId ) ), this, SLOT( showMenu( MenuId ) ) );
 	connect( newSubMenuButton, SIGNAL( clicked( MenuId ) ), this, SLOT( showMenu( MenuId ) ) );
@@ -174,7 +174,7 @@ void KreMenu::keyPressEvent( TQKeyEvent *e )
 
 				//simulate a mouse click
 				TQMouseEvent me( TQEvent::MouseButtonPress, TQPoint(), 0, 0 );
-				KApplication::sendEvent( m_currentMenu->activeButton, &me );
+				TDEApplication::sendEvent( m_currentMenu->activeButton, &me );
 
 				e->accept();
 			}
@@ -187,7 +187,7 @@ void KreMenu::keyPressEvent( TQKeyEvent *e )
 
 				//simulate a mouse click
 				TQMouseEvent me( TQEvent::MouseButtonPress, TQPoint(), 0, 0 );
-				KApplication::sendEvent( m_currentMenu->activeButton, &me );
+				TDEApplication::sendEvent( m_currentMenu->activeButton, &me );
 
 				e->accept();
 			}
@@ -198,7 +198,7 @@ void KreMenu::keyPressEvent( TQKeyEvent *e )
 	case TQt::Key_Space: {
 			//simulate a mouse click
 			TQMouseEvent me( TQEvent::MouseButtonPress, TQPoint(), 0, 0 );
-			KApplication::sendEvent( m_currentMenu->activeButton, &me );
+			TDEApplication::sendEvent( m_currentMenu->activeButton, &me );
 
 			e->accept();
 			break;
@@ -416,8 +416,8 @@ void KreMenuButton::paintEvent( TQPaintEvent * )
 	if ( highlighted ) {
 		darken -= 10;
 		lighten += 10;
-		c1h = KGlobalSettings::highlightColor().dark( darken );
+		c1h = TDEGlobalSettings::highlightColor().dark( darken );
-		c2h = KGlobalSettings::highlightColor().light( lighten );
+		c2h = TDEGlobalSettings::highlightColor().light( lighten );
 	}
 
 	// draw the gradient now
@@ -550,9 +550,9 @@ void KreMenuButton::paintEvent( TQPaintEvent * )
 
 	painter.begin( &kpm );
 	if ( highlighted )
-		painter.setPen( KGlobalSettings::highlightedTextColor() );
+		painter.setPen( TDEGlobalSettings::highlightedTextColor() );
 	else
-		painter.setPen( KGlobalSettings::textColor() );
+		painter.setPen( TDEGlobalSettings::textColor() );
 	painter.setClipRect( r );
 	painter.drawText( r, TQt::AlignVCenter, text );
 	painter.end();

krecipes/src/widgets/kreruler.cpp

@@ -24,8 +24,8 @@
 
 #include "kreruler.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <ntqcursor.h>
@@ -203,7 +203,7 @@ double KoRuler::lineDistance() const
 /*================================================================*/
 void KoRuler::drawHorizontal( TQPainter *_painter )
 {
-    TQFont font = KGlobalSettings::toolBarFont();
+    TQFont font = TDEGlobalSettings::toolBarFont();
     TQFontMetrics fm( font );
     resize( width(), TQMAX( fm.height() + 4, 20 ) );
 
@@ -303,7 +303,7 @@ void KoRuler::drawHorizontal( TQPainter *_painter )
 /*================================================================*/
 void KoRuler::drawVertical( TQPainter *_painter )
 {
-    TQFont font = KGlobalSettings::toolBarFont();
+    TQFont font = TDEGlobalSettings::toolBarFont();
     TQFontMetrics fm( font );
     resize( TQMAX( fm.height() + 4, 20 ), height() );
 
@@ -1026,7 +1026,7 @@ void KoRuler::slotMenuActivated( int i )
 TQSize KoRuler::minimumSizeHint() const
 {
     TQSize size;
-    TQFont font = KGlobalSettings::toolBarFont();
+    TQFont font = TDEGlobalSettings::toolBarFont();
     TQFontMetrics fm( font );
 
     size.setWidth( TQMAX( fm.height() + 4, 20 ) );

krecipes/src/widgets/kretextedit.cpp

@@ -12,12 +12,12 @@
 
 #include <ntqtextstream.h>
 
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <kdebug.h>
 
-KreTextEdit::KreTextEdit( TQWidget *parent ) : KTextEdit( parent ), KCompletionBase()
+KreTextEdit::KreTextEdit( TQWidget *parent ) : KTextEdit( parent ), TDECompletionBase()
 {
-	KCompletion * comp = completionObject(); //creates the completion object
+	TDECompletion * comp = completionObject(); //creates the completion object
 	comp->setIgnoreCase( true );
 
 	completing = false;
@@ -36,7 +36,7 @@ void KreTextEdit::keyPressEvent( TQKeyEvent *e )
 	KKey key( e );
 
 	KeyBindingMap keys = getKeyBindings();
-	KShortcut cut;
+	TDEShortcut cut;
 	bool noModifier = ( e->state() == NoButton || e->state() == ShiftButton );
 
 	if ( noModifier ) {
@@ -51,7 +51,7 @@ void KreTextEdit::keyPressEvent( TQKeyEvent *e )
 
 	// Handles completion
 	if ( keys[ TextCompletion ].isNull() )
-		cut = KStdAccel::shortcut( KStdAccel::TextCompletion );
+		cut = TDEStdAccel::shortcut( TDEStdAccel::TextCompletion );
 	else
 		cut = keys[ TextCompletion ];
 
@@ -71,23 +71,23 @@ void KreTextEdit::keyPressEvent( TQKeyEvent *e )
 
 	// Handles previous match
 	if ( keys[ PrevCompletionMatch ].isNull() )
-		cut = KStdAccel::shortcut( KStdAccel::PrevCompletion );
+		cut = TDEStdAccel::shortcut( TDEStdAccel::PrevCompletion );
 	else
 		cut = keys[ PrevCompletionMatch ];
 
 	if ( cut.contains( key ) ) {
-		rotateText( KCompletionBase::PrevCompletionMatch );
+		rotateText( TDECompletionBase::PrevCompletionMatch );
 		return ;
 	}
 
 	// Handles next match
 	if ( keys[ NextCompletionMatch ].isNull() )
-		cut = KStdAccel::shortcut( KStdAccel::NextCompletion );
+		cut = TDEStdAccel::shortcut( TDEStdAccel::NextCompletion );
 	else
 		cut = keys[ NextCompletionMatch ];
 
 	if ( cut.contains( key ) ) {
-		rotateText( KCompletionBase::NextCompletionMatch );
+		rotateText( TDECompletionBase::NextCompletionMatch );
 		return ;
 	}
 
@@ -146,13 +146,13 @@ void KreTextEdit::tryCompletion()
 	}
 }
 
-void KreTextEdit::rotateText( KCompletionBase::KeyBindingType type )
+void KreTextEdit::rotateText( TDECompletionBase::KeyBindingType type )
 {
-	KCompletion * comp = compObj();
+	TDECompletion * comp = compObj();
 	if ( comp && completing &&
-	        ( type == KCompletionBase::PrevCompletionMatch ||
+	        ( type == TDECompletionBase::PrevCompletionMatch ||
-	          type == KCompletionBase::NextCompletionMatch ) ) {
+	          type == TDECompletionBase::NextCompletionMatch ) ) {
-		TQString input = ( type == KCompletionBase::PrevCompletionMatch ) ? comp->previousMatch() : comp->nextMatch();
+		TQString input = ( type == TDECompletionBase::PrevCompletionMatch ) ? comp->previousMatch() : comp->nextMatch();
 
 		// Skip rotation if previous/next match is null or the same text
 		int para, index;

krecipes/src/widgets/kretextedit.h

@@ -19,7 +19,7 @@
 /*  @author Jason Kivlighn
  *  @brief An extended KTextEdit that allows for text completion
  */
-class KreTextEdit : public KTextEdit, KCompletionBase
+class KreTextEdit : public KTextEdit, TDECompletionBase
 {
 	Q_OBJECT
 
@@ -42,7 +42,7 @@ private slots:
 
 private:
 	void tryCompletion();
-	void rotateText( KCompletionBase::KeyBindingType type );
+	void rotateText( TDECompletionBase::KeyBindingType type );
 
 	bool completing;
 	int completion_begin;

krecipes/src/widgets/kwidgetlistbox.cpp

@@ -22,7 +22,7 @@
  ****************************************************************************/
 #include "kwidgetlistbox.h"
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 KWidgetListbox::KWidgetListbox(TQWidget *parent, const char *name)
  : TQTable(parent, name)
@@ -162,19 +162,19 @@ if ( !itm){ kdDebug()<<"no widget at index "<<index<<endl; return; }
 /*
   if(index == selected())
   {
-    itm->setPaletteBackgroundColor(KGlobalSettings::highlightColor());
+    itm->setPaletteBackgroundColor(TDEGlobalSettings::highlightColor());
-    itm->setPaletteForegroundColor(KGlobalSettings::highlightedTextColor());
+    itm->setPaletteForegroundColor(TDEGlobalSettings::highlightedTextColor());
   }*/
   if(even)
   {
-    itm->setPaletteBackgroundColor(KGlobalSettings::baseColor());
+    itm->setPaletteBackgroundColor(TDEGlobalSettings::baseColor());
-    itm->setPaletteForegroundColor(KGlobalSettings::textColor());
+    itm->setPaletteForegroundColor(TDEGlobalSettings::textColor());
   }
   else
   {
     itm->setPaletteBackgroundColor(
-        KGlobalSettings::alternateBackgroundColor());
+        TDEGlobalSettings::alternateBackgroundColor());
-    itm->setPaletteForegroundColor(KGlobalSettings::textColor());
+    itm->setPaletteForegroundColor(TDEGlobalSettings::textColor());
   }
 }
 

krecipes/src/widgets/paneldeco.cpp

@@ -105,8 +105,8 @@ TopDeco::TopDeco( TQWidget *parent, const char *name, const TQString &title, con
 	icon = 0;
 	panelTitle = TQString::null;
 	if ( !iconName.isNull() ) {
-		KIconLoader il;
+		TDEIconLoader il;
-		icon = new TQPixmap( il.loadIcon( iconName, KIcon::NoGroup, 22 ) );
+		icon = new TQPixmap( il.loadIcon( iconName, TDEIcon::NoGroup, 22 ) );
 	}
 
 	if ( !title.isNull() ) {
@@ -166,8 +166,8 @@ void TopDeco::setHeader( const TQString &title, const TQString &iconName )
 	if ( !title.isNull() )
 		panelTitle = title;
 	if ( !iconName.isNull() ) {
-		KIconLoader il;
+		TDEIconLoader il;
-		icon = new TQPixmap( il.loadIcon( iconName, KIcon::NoGroup, 22 ) );
+		icon = new TQPixmap( il.loadIcon( iconName, TDEIcon::NoGroup, 22 ) );
 	}
 	if ( !title.isNull() || !iconName.isNull() )
 		update();

krecipes/src/widgets/prepmethodcombobox.cpp

@@ -20,10 +20,10 @@
 /** Completion object which allows completing completing items
   * the last item in a comma-separated list
   */
-class PrepMethodCompletion : public KCompletion
+class PrepMethodCompletion : public TDECompletion
 {
 public:
-	PrepMethodCompletion() : KCompletion()
+	PrepMethodCompletion() : TDECompletion()
 	{}
 
 	virtual TQString makeCompletion( const TQString &string ) {
@@ -38,7 +38,7 @@ public:
 
 		kdDebug()<<"altered makeCompletion( "<<completion_txt<<" )"<<endl;
 
-		completion_txt = KCompletion::makeCompletion(completion_txt);
+		completion_txt = TDECompletion::makeCompletion(completion_txt);
 		kdDebug()<<"got: "<<completion_txt<<endl;
 
 		if ( completion_txt.isEmpty() )

krecipes/src/widgets/prepmethodlistview.cpp

@@ -10,12 +10,12 @@
 
 #include "prepmethodlistview.h"
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include "backends/recipedb.h"
 #include "dialogs/createelementdialog.h"
@@ -56,7 +56,7 @@ StdPrepMethodListView::StdPrepMethodListView( TQWidget *parent, RecipeDB *db, bo
 {
 	addColumn( i18n( "Preparation Method" ) );
 
-	KConfig * config = KGlobal::config();
+	TDEConfig * config = TDEGlobal::config();
 	config->setGroup( "Advanced" );
 	bool show_id = config->readBoolEntry( "ShowID", false );
 	addColumn( i18n( "Id" ), show_id ? -1 : 0 );
@@ -64,24 +64,24 @@ StdPrepMethodListView::StdPrepMethodListView( TQWidget *parent, RecipeDB *db, bo
 	if ( editable ) {
 		setRenameable( 0, true );
 
-		KIconLoader *il = new KIconLoader;
+		TDEIconLoader *il = new TDEIconLoader;
 
-		kpop = new KPopupMenu( this );
+		kpop = new TDEPopupMenu( this );
-		kpop->insertItem( il->loadIcon( "filenew", KIcon::NoGroup, 16 ), i18n( "&Create" ), this, SLOT( createNew() ), CTRL + Key_C );
+		kpop->insertItem( il->loadIcon( "filenew", TDEIcon::NoGroup, 16 ), i18n( "&Create" ), this, SLOT( createNew() ), CTRL + Key_C );
-		kpop->insertItem( il->loadIcon( "editdelete", KIcon::NoGroup, 16 ), i18n( "&Delete" ), this, SLOT( remove
+		kpop->insertItem( il->loadIcon( "editdelete", TDEIcon::NoGroup, 16 ), i18n( "&Delete" ), this, SLOT( remove
 			                  () ), Key_Delete );
-		kpop->insertItem( il->loadIcon( "edit", KIcon::NoGroup, 16 ), i18n( "&Rename" ), this, SLOT( rename() ), CTRL + Key_R );
+		kpop->insertItem( il->loadIcon( "edit", TDEIcon::NoGroup, 16 ), i18n( "&Rename" ), this, SLOT( rename() ), CTRL + Key_R );
 		kpop->polish();
 
 		delete il;
 
-		connect( this, SIGNAL( contextMenu( KListView *, TQListViewItem *, const TQPoint & ) ), SLOT( showPopup( KListView *, TQListViewItem *, const TQPoint & ) ) );
+		connect( this, SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), SLOT( showPopup( TDEListView *, TQListViewItem *, const TQPoint & ) ) );
 		connect( this, SIGNAL( doubleClicked( TQListViewItem* ) ), this, SLOT( modPrepMethod( TQListViewItem* ) ) );
 		connect( this, SIGNAL( itemRenamed( TQListViewItem* ) ), this, SLOT( savePrepMethod( TQListViewItem* ) ) );
 	}
 }
 
-void StdPrepMethodListView::showPopup( KListView * /*l*/, TQListViewItem *i, const TQPoint &p )
+void StdPrepMethodListView::showPopup( TDEListView * /*l*/, TQListViewItem *i, const TQPoint &p )
 {
 	if ( i )
 		kpop->exec( p );

krecipes/src/widgets/prepmethodlistview.h

@@ -16,7 +16,7 @@
 #include "datablocks/element.h"
 
 class RecipeDB;
-class KPopupMenu;
+class TDEPopupMenu;
 
 class PrepMethodListView : public DBListViewBase
 {
@@ -51,7 +51,7 @@ protected:
 	virtual void removePrepMethod( int );
 
 private slots:
-	void showPopup( KListView *, TQListViewItem *, const TQPoint & );
+	void showPopup( TDEListView *, TQListViewItem *, const TQPoint & );
 
 	void createNew();
 	void remove
@@ -64,7 +64,7 @@ private slots:
 private:
 	bool checkBounds( const TQString &name );
 
-	KPopupMenu *kpop;
+	TDEPopupMenu *kpop;
 };
 
 #endif //PREPMETHODLISTVIEW_H

krecipes/src/widgets/propertylistview.cpp

@@ -10,12 +10,12 @@
 
 #include "propertylistview.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdebug.h>
 
 #include "backends/recipedb.h"
@@ -69,7 +69,7 @@ HidePropertyCheckListItem::HidePropertyCheckListItem( TQListViewItem* it, const
 void HidePropertyCheckListItem::stateChange( bool on )
 {
 	if ( !m_holdSettings ) {
-		KConfig *config = KGlobal::config();
+		TDEConfig *config = TDEGlobal::config();
 		config->setGroup("Formatting");
 	
 		config->sync();
@@ -83,7 +83,7 @@ void HidePropertyCheckListItem::stateChange( bool on )
 	}
 }
 
-PropertyListView::PropertyListView( TQWidget *parent, RecipeDB *db ) : KListView( parent ),
+PropertyListView::PropertyListView( TQWidget *parent, RecipeDB *db ) : TDEListView( parent ),
 		database( db )
 {
 	setAllColumnsShowFocus( true );
@@ -102,7 +102,7 @@ void PropertyListView::reload()
 	IngredientPropertyList propertyList;
 	database->loadProperties( &propertyList );
 
-	//Populate this data into the KListView
+	//Populate this data into the TDEListView
 	IngredientPropertyList::const_iterator prop_it;
 	for ( prop_it = propertyList.begin(); prop_it != propertyList.end(); ++prop_it )
 		createProperty( *prop_it );
@@ -117,7 +117,7 @@ StdPropertyListView::StdPropertyListView( TQWidget *parent, RecipeDB *db, bool e
 	addColumn( i18n( "Property" ) );
 	addColumn( i18n( "Units" ) );
 
-	KConfig * config = KGlobal::config();
+	TDEConfig * config = TDEGlobal::config();
 	config->setGroup( "Advanced" );
 	bool show_id = config->readBoolEntry( "ShowID", false );
 	addColumn( i18n( "Id" ), show_id ? -1 : 2 );
@@ -127,24 +127,24 @@ StdPropertyListView::StdPropertyListView( TQWidget *parent, RecipeDB *db, bool e
 	if ( editable ) {
 		setRenameable( 0, true );
 
-		KIconLoader *il = new KIconLoader;
+		TDEIconLoader *il = new TDEIconLoader;
 
-		kpop = new KPopupMenu( this );
+		kpop = new TDEPopupMenu( this );
-		kpop->insertItem( il->loadIcon( "filenew", KIcon::NoGroup, 16 ), i18n( "&Create" ), this, SLOT( createNew() ), CTRL + Key_C );
+		kpop->insertItem( il->loadIcon( "filenew", TDEIcon::NoGroup, 16 ), i18n( "&Create" ), this, SLOT( createNew() ), CTRL + Key_C );
-		kpop->insertItem( il->loadIcon( "editdelete", KIcon::NoGroup, 16 ), i18n( "&Delete" ), this, SLOT( remove
+		kpop->insertItem( il->loadIcon( "editdelete", TDEIcon::NoGroup, 16 ), i18n( "&Delete" ), this, SLOT( remove
 			                  () ), Key_Delete );
-		kpop->insertItem( il->loadIcon( "edit", KIcon::NoGroup, 16 ), i18n( "&Rename" ), this, SLOT( rename() ), CTRL + Key_R );
+		kpop->insertItem( il->loadIcon( "edit", TDEIcon::NoGroup, 16 ), i18n( "&Rename" ), this, SLOT( rename() ), CTRL + Key_R );
 		kpop->polish();
 
 		delete il;
 
-		connect( this, SIGNAL( contextMenu( KListView *, TQListViewItem *, const TQPoint & ) ), SLOT( showPopup( KListView *, TQListViewItem *, const TQPoint & ) ) );
+		connect( this, SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), SLOT( showPopup( TDEListView *, TQListViewItem *, const TQPoint & ) ) );
 		connect( this, SIGNAL( doubleClicked( TQListViewItem* ) ), this, SLOT( modProperty( TQListViewItem* ) ) );
 		connect( this, SIGNAL( itemRenamed( TQListViewItem* ) ), this, SLOT( saveProperty( TQListViewItem* ) ) );
 	}
 }
 
-void StdPropertyListView::showPopup( KListView * /*l*/, TQListViewItem *i, const TQPoint &p )
+void StdPropertyListView::showPopup( TDEListView * /*l*/, TQListViewItem *i, const TQPoint &p )
 {
 	if ( i )
 		kpop->exec( p );

krecipes/src/widgets/propertylistview.h

@@ -11,14 +11,14 @@
 #ifndef PROPERTYLISTVIEW_H
 #define PROPERTYLISTVIEW_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include "datablocks/element.h"
 #include "datablocks/ingredientproperty.h"
 #include "datablocks/constraintlist.h"
 
 class RecipeDB;
-class KPopupMenu;
+class TDEPopupMenu;
 
 class PropertyCheckListItem : public TQCheckListItem
 {
@@ -125,7 +125,7 @@ public:
 };
 
 
-class PropertyListView : public KListView
+class PropertyListView : public TDEListView
 {
 	Q_OBJECT
 
@@ -158,7 +158,7 @@ protected:
 	virtual void createProperty( const IngredientProperty &property );
 
 private slots:
-	void showPopup( KListView *, TQListViewItem *, const TQPoint & );
+	void showPopup( TDEListView *, TQListViewItem *, const TQPoint & );
 
 	void createNew();
 	void remove
@@ -171,7 +171,7 @@ private slots:
 private:
 	bool checkBounds( const TQString &name );
 
-	KPopupMenu *kpop;
+	TDEPopupMenu *kpop;
 };
 
 

krecipes/src/widgets/ratingdisplaywidget.ui

@@ -113,7 +113,7 @@
                         <string>Rater</string>
                     </property>
                 </widget>
-                <widget class="KListView">
+                <widget class="TDEListView">
                     <column>
                         <property name="text">
                             <string>Criteria</string>
@@ -232,7 +232,7 @@
 <layoutdefaults spacing="6" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
 </includehints>

krecipes/src/widgets/ratingwidget.cpp

@@ -13,7 +13,7 @@
 
 #include "ratingwidget.h"
 
-#include <kglobal.h> // needed for KMAX
+#include <tdeglobal.h> // needed for KMAX
 #include <kiconloader.h>
 #include <kdebug.h>
 

krecipes/src/widgets/recipelistview.cpp

@@ -15,11 +15,11 @@
 #include <ntqdatastream.h>
 #include <ntqtooltip.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kprogress.h>
 
@@ -99,11 +99,11 @@ RecipeListView::RecipeListView( TQWidget *parent, RecipeDB *db ) : StdCategoryLi
 {
 	setColumnText( 0, i18n( "Recipe" ) );
 
-	KConfig *config = KGlobal::config(); config->setGroup( "Performance" );
+	TDEConfig *config = TDEGlobal::config(); config->setGroup( "Performance" );
 	curr_limit = config->readNumEntry("CategoryLimit",-1);
 
-	KIconLoader il;
+	TDEIconLoader il;
-	setPixmap( il.loadIcon( "categories", KIcon::NoGroup, 16 ) );
+	setPixmap( il.loadIcon( "categories", TDEIcon::NoGroup, 16 ) );
 
 	setSelectionMode( TQListView::Extended );
 
@@ -146,7 +146,7 @@ TQString RecipeListView::tooltip(TQListViewItem *item, int /*column*/) const
 		Recipe r;
  		database->loadRecipe(&r,RecipeDB::Meta|RecipeDB::Noatime,recipe_it->recipeID() );
 
-		KLocale *locale = KGlobal::locale();
+		TDELocale *locale = TDEGlobal::locale();
 
 		return TQString("<center><b>%7</b></center><center>__________</center>%1 %2<br />%3 %4<br />%5 %6")
 		   .arg(i18n("Created:")).arg(locale->formatDateTime(r.ctime))

krecipes/src/widgets/unitcombobox.cpp

@@ -12,9 +12,9 @@
 
 #include <ntqlistbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "backends/recipedb.h"
 #include "datablocks/elementlist.h"

krecipes/src/widgets/unitlistview.cpp

@@ -17,12 +17,12 @@
 #include <ntqcombobox.h>
 #include <ntqheader.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdebug.h>
 
 #include "backends/recipedb.h"
@@ -119,7 +119,7 @@ StdUnitListView::StdUnitListView( TQWidget *parent, RecipeDB *db, bool editable
 	addColumn( i18n( "Abbreviation" ) );
 	addColumn( i18n( "Type" ) );
 
-	KConfig * config = KGlobal::config();
+	TDEConfig * config = TDEGlobal::config();
 	config->setGroup( "Advanced" );
 	bool show_id = config->readBoolEntry( "ShowID", false );
 	addColumn( i18n( "Id" ), show_id ? -1 : 0 );
@@ -131,13 +131,13 @@ StdUnitListView::StdUnitListView( TQWidget *parent, RecipeDB *db, bool editable
 		setRenameable( 3, true );
 		setRenameable( 4, true );
 
-		KIconLoader il;
+		TDEIconLoader il;
 
-		kpop = new KPopupMenu( this );
+		kpop = new TDEPopupMenu( this );
-		kpop->insertItem( il.loadIcon( "filenew", KIcon::NoGroup, 16 ), i18n( "&Create" ), this, SLOT( createNew() ), CTRL + Key_C );
+		kpop->insertItem( il.loadIcon( "filenew", TDEIcon::NoGroup, 16 ), i18n( "&Create" ), this, SLOT( createNew() ), CTRL + Key_C );
-		kpop->insertItem( il.loadIcon( "editdelete", KIcon::NoGroup, 16 ), i18n( "&Delete" ), this, SLOT( remove
+		kpop->insertItem( il.loadIcon( "editdelete", TDEIcon::NoGroup, 16 ), i18n( "&Delete" ), this, SLOT( remove
 			                  () ), Key_Delete );
-		kpop->insertItem( il.loadIcon( "edit", KIcon::NoGroup, 16 ), i18n( "&Rename" ), this, SLOT( rename() ), CTRL + Key_R );
+		kpop->insertItem( il.loadIcon( "edit", TDEIcon::NoGroup, 16 ), i18n( "&Rename" ), this, SLOT( rename() ), CTRL + Key_R );
 		kpop->polish();
 
 		typeComboBox = new TQComboBox( false, viewport() );
@@ -150,7 +150,7 @@ StdUnitListView::StdUnitListView( TQWidget *parent, RecipeDB *db, bool editable
 		connect( typeComboBox, SIGNAL( activated(int) ), SLOT( updateType(int) ) );
 		connect( this, SIGNAL( selectionChanged() ), SLOT( hideTypeCombo() ) );
 
-		connect( this, SIGNAL( contextMenu( KListView *, TQListViewItem *, const TQPoint & ) ), SLOT( showPopup( KListView *, TQListViewItem *, const TQPoint & ) ) );
+		connect( this, SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), SLOT( showPopup( TDEListView *, TQListViewItem *, const TQPoint & ) ) );
 		connect( this, SIGNAL( doubleClicked( TQListViewItem*, const TQPoint &, int ) ), this, SLOT( modUnit( TQListViewItem*, const TQPoint &, int ) ) );
 		connect( this, SIGNAL( itemRenamed( TQListViewItem*, const TQString &, int ) ), this, SLOT( saveUnit( TQListViewItem*, const TQString &, int ) ) );
 	}
@@ -187,7 +187,7 @@ void StdUnitListView::hideTypeCombo()
 	typeComboBox->hide();
 }
 
-void StdUnitListView::showPopup( KListView * /*l*/, TQListViewItem *i, const TQPoint &p )
+void StdUnitListView::showPopup( TDEListView * /*l*/, TQListViewItem *i, const TQPoint &p )
 {
 	if ( i )
 		kpop->exec( p );

krecipes/src/widgets/unitlistview.h

@@ -20,7 +20,7 @@
 class TQComboBox;
 
 class RecipeDB;
-class KPopupMenu;
+class TDEPopupMenu;
 
 class UnitListView : public DBListViewBase
 {
@@ -54,7 +54,7 @@ protected:
 	virtual void removeUnit( int );
 
 private slots:
-	void showPopup( KListView *, TQListViewItem *, const TQPoint & );
+	void showPopup( TDEListView *, TQListViewItem *, const TQPoint & );
 	void hideTypeCombo();
 	void updateType( int type );
 
@@ -69,7 +69,7 @@ private:
 	bool checkBounds( const Unit &unit );
 	void insertTypeComboBox( TQListViewItem* );
 
-	KPopupMenu *kpop;
+	TDEPopupMenu *kpop;
 	TQComboBox *typeComboBox;
 };
 

krecipes/src/widgets/weightinput.cpp

@@ -10,7 +10,7 @@
 
 #include "weightinput.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "backends/recipedb.h"
 #include "datablocks/element.h"

po/de/krecipes.po

@@ -13,7 +13,7 @@ msgstr ""
 "POT-Creation-Date: 2006-09-01 08:44+0200\n"
 "PO-Revision-Date: 2006-07-09 10:25+0200\n"
 "Last-Translator: Thomas Reitelbach <tr@erdfunkstelle.de>\n"
-"Language-Team: German <kde-i18n-de@kde.org>\n"
+"Language-Team: German <tde-i18n-de@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/fi/krecipes.po

@@ -9,7 +9,7 @@ msgstr ""
 "POT-Creation-Date: 2006-09-01 08:44+0200\n"
 "PO-Revision-Date: 2005-10-17 20:44+0300\n"
 "Last-Translator: Ilpo Kantonen <ilpo@iki.fi>\n"
-"Language-Team: finnish <Finnish <kde-i18n-fi-discussion@lists.sourceforge.net>>"
+"Language-Team: finnish <Finnish <tde-i18n-fi-discussion@lists.sourceforge.net>>"
 "\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

po/it/krecipes.po

@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2006-09-01 08:44+0200\n"
 "PO-Revision-Date: 2006-08-22 23:03+0200\n"
 "Last-Translator: Federico Zenith <zenith@chemeng.ntnu.no>\n"
-"Language-Team: Italian <kde-i18n-it@kde.org>\n"
+"Language-Team: Italian <tde-i18n-it@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/lt/krecipes.po

@@ -69,7 +69,7 @@ msgstr "Serveris:"
 #, fuzzy
 msgid "Username:"
 msgstr ""
-"#-#-#-#-#  kdmgreet.po (kdmgreet)  #-#-#-#-#\n"
+"#-#-#-#-#  tdmgreet.po (tdmgreet)  #-#-#-#-#\n"
 "Naudotojo vardas:\n"
 "#-#-#-#-#  kgreet_classic.po (kgreet_classic)  #-#-#-#-#\n"
 "Naudotojo vardas:\n"
@@ -77,7 +77,7 @@ msgstr ""
 "Naudotojo vardas:\n"
 "#-#-#-#-#  kgreet_winbind.po (kgreet_winbind)  #-#-#-#-#\n"
 "Naudotojas:\n"
-"#-#-#-#-#  kabc_sql.po (kabc_sql)  #-#-#-#-#\n"
+"#-#-#-#-#  tdeabc_sql.po (tdeabc_sql)  #-#-#-#-#\n"
 "Naudotojo vardas:\n"
 "#-#-#-#-#  pwmanager.po (pwmanager)  #-#-#-#-#\n"
 "Naudotojo vardas:\n"
@@ -295,7 +295,7 @@ msgstr ""
 "Sudėtingesnės\n"
 "#-#-#-#-#  kasbarextension.po (kasbarextension)  #-#-#-#-#\n"
 "Sudėtingesnės\n"
-"#-#-#-#-#  kdelibs.po (kdelibs)  #-#-#-#-#\n"
+"#-#-#-#-#  tdelibs.po (tdelibs)  #-#-#-#-#\n"
 "Sudėtingiau\n"
 "#-#-#-#-#  k3b.po (k3b)  #-#-#-#-#\n"
 "Papildomai\n"
@@ -324,7 +324,7 @@ msgid "&Load"
 msgstr ""
 "#-#-#-#-#  amarok.po (amarok)  #-#-#-#-#\n"
 "Į&kelti\n"
-"#-#-#-#-#  kfileshare.po (kfileshare)  #-#-#-#-#\n"
+"#-#-#-#-#  tdefileshare.po (tdefileshare)  #-#-#-#-#\n"
 "&Įkrauti"
 
 #: src/dialogs/usdadatadialog.cpp:48
@@ -470,33 +470,33 @@ msgstr ""
 "Antraštė\n"
 "#-#-#-#-#  ksysguard.po (ksysguard)  #-#-#-#-#\n"
 "Antraštė\n"
-"#-#-#-#-#  kabc_ldapkio.po (kabc_ldapkio)  #-#-#-#-#\n"
+"#-#-#-#-#  tdeabc_ldapkio.po (tdeabc_ldapkio)  #-#-#-#-#\n"
 "Antraštė\n"
-"#-#-#-#-#  kdelibs.po (kdelibs)  #-#-#-#-#\n"
+"#-#-#-#-#  tdelibs.po (tdelibs)  #-#-#-#-#\n"
 "Titulas\n"
 "#-#-#-#-#  k3b.po (k3b)  #-#-#-#-#\n"
 "Antraštė\n"
-"#-#-#-#-#  kfile_pdf.po (kfile_pdf)  #-#-#-#-#\n"
+"#-#-#-#-#  tdefile_pdf.po (tdefile_pdf)  #-#-#-#-#\n"
 "Antraštė\n"
-"#-#-#-#-#  kfile_png.po (kfile_png)  #-#-#-#-#\n"
+"#-#-#-#-#  tdefile_png.po (tdefile_png)  #-#-#-#-#\n"
 "Antraštė\n"
-"#-#-#-#-#  kfile_ps.po (kfile_ps)  #-#-#-#-#\n"
+"#-#-#-#-#  tdefile_ps.po (tdefile_ps)  #-#-#-#-#\n"
 "Antraštė\n"
 "#-#-#-#-#  kaddressbook.po (kaddressbook)  #-#-#-#-#\n"
 "Antraštė\n"
 "#-#-#-#-#  ktnef.po (ktnef)  #-#-#-#-#\n"
 "Antraštė\n"
-"#-#-#-#-#  kfile_html.po (kfile_html)  #-#-#-#-#\n"
+"#-#-#-#-#  tdefile_html.po (tdefile_html)  #-#-#-#-#\n"
 "Antraštė\n"
 "#-#-#-#-#  kopete.po (kopete)  #-#-#-#-#\n"
 "Titulas\n"
 "#-#-#-#-#  libkcddb.po (libkcddb)  #-#-#-#-#\n"
 "Pavadinimas\n"
-"#-#-#-#-#  kfile_mp3.po (kfile_mp3)  #-#-#-#-#\n"
+"#-#-#-#-#  tdefile_mp3.po (tdefile_mp3)  #-#-#-#-#\n"
 "Pavadinimas\n"
 "#-#-#-#-#  artscontrol.po (artscontrol)  #-#-#-#-#\n"
 "Antraštė\n"
-"#-#-#-#-#  kfile_ogg.po (kfile_ogg)  #-#-#-#-#\n"
+"#-#-#-#-#  tdefile_ogg.po (tdefile_ogg)  #-#-#-#-#\n"
 "Antraštė\n"
 "#-#-#-#-#  kaudiocreator.po (kaudiocreator)  #-#-#-#-#\n"
 "Antraštė"
@@ -513,7 +513,7 @@ msgid "Photo"
 msgstr ""
 "#-#-#-#-#  ppdtranslations.po (ppdtranslations)  #-#-#-#-#\n"
 "Foto\n"
-"#-#-#-#-#  kdelibs.po (kdelibs)  #-#-#-#-#\n"
+"#-#-#-#-#  tdelibs.po (tdelibs)  #-#-#-#-#\n"
 "Foto\n"
 "#-#-#-#-#  kopete.po (kopete)  #-#-#-#-#\n"
 "Nuotrauka"
@@ -1104,13 +1104,13 @@ msgstr ""
 "Nėra\n"
 "#-#-#-#-#  cupsdconf.po (cupsdconf)  #-#-#-#-#\n"
 "Nėra\n"
-"#-#-#-#-#  kdeprint.po (kdeprint)  #-#-#-#-#\n"
+"#-#-#-#-#  tdeprint.po (tdeprint)  #-#-#-#-#\n"
 "Nieko\n"
-"#-#-#-#-#  kio.po (kio)  #-#-#-#-#\n"
+"#-#-#-#-#  tdeio.po (tdeio)  #-#-#-#-#\n"
 "Nieko\n"
 "#-#-#-#-#  ppdtranslations.po (ppdtranslations)  #-#-#-#-#\n"
 "Nėra\n"
-"#-#-#-#-#  kdelibs.po (kdelibs)  #-#-#-#-#\n"
+"#-#-#-#-#  tdelibs.po (tdelibs)  #-#-#-#-#\n"
 "Jokio\n"
 "#-#-#-#-#  katepart.po (katepart)  #-#-#-#-#\n"
 "Nieko\n"
@@ -1134,7 +1134,7 @@ msgstr ""
 "Nieko\n"
 "#-#-#-#-#  k3b.po (k3b)  #-#-#-#-#\n"
 "Nieko\n"
-"#-#-#-#-#  kfile_png.po (kfile_png)  #-#-#-#-#\n"
+"#-#-#-#-#  tdefile_png.po (tdefile_png)  #-#-#-#-#\n"
 "nieko\n"
 "#-#-#-#-#  kolourpaint.po (kolourpaint)  #-#-#-#-#\n"
 "Nieko\n"
@@ -1164,7 +1164,7 @@ msgstr ""
 "Nieko\n"
 "#-#-#-#-#  kppp.po (kppp)  #-#-#-#-#\n"
 "Nėra\n"
-"#-#-#-#-#  kmid.po (kmid)  #-#-#-#-#\n"
+"#-#-#-#-#  tdemid.po (tdemid)  #-#-#-#-#\n"
 "Nėra\n"
 "#-#-#-#-#  noatun.po (noatun)  #-#-#-#-#\n"
 "Nieko"
@@ -1454,7 +1454,7 @@ msgid "Enabled"
 msgstr ""
 "#-#-#-#-#  knetworkconf.po (knetworkconf)  #-#-#-#-#\n"
 "Įgalintas\n"
-"#-#-#-#-#  kdeprint.po (kdeprint)  #-#-#-#-#\n"
+"#-#-#-#-#  tdeprint.po (tdeprint)  #-#-#-#-#\n"
 "Įjungtas\n"
 "#-#-#-#-#  ppdtranslations.po (ppdtranslations)  #-#-#-#-#\n"
 "Naudoti\n"
@@ -1681,7 +1681,7 @@ msgstr "Ekranas"
 #, fuzzy
 msgid "Custom"
 msgstr ""
-"#-#-#-#-#  kdmgreet.po (kdmgreet)  #-#-#-#-#\n"
+"#-#-#-#-#  tdmgreet.po (tdmgreet)  #-#-#-#-#\n"
 "Pasirinktina\n"
 "#-#-#-#-#  khelpcenter.po (khelpcenter)  #-#-#-#-#\n"
 "Pasirinkta\n"
@@ -1695,7 +1695,7 @@ msgstr ""
 "Pasirinktas\n"
 "#-#-#-#-#  ppdtranslations.po (ppdtranslations)  #-#-#-#-#\n"
 "Pasirinktas\n"
-"#-#-#-#-#  kdelibs.po (kdelibs)  #-#-#-#-#\n"
+"#-#-#-#-#  tdelibs.po (tdelibs)  #-#-#-#-#\n"
 "Pasirinkta\n"
 "#-#-#-#-#  libkscan.po (libkscan)  #-#-#-#-#\n"
 "Pasirinktas\n"
@@ -1912,7 +1912,7 @@ msgid "Open file dialog"
 msgstr ""
 "#-#-#-#-#  kcmbackground.po (kcmbackground)  #-#-#-#-#\n"
 "Atverti bylos dialogą\n"
-"#-#-#-#-#  kio.po (kio)  #-#-#-#-#\n"
+"#-#-#-#-#  tdeio.po (tdeio)  #-#-#-#-#\n"
 "Bylos atvėrimo dialogas"
 
 #: src/setupwizard.cpp:607
@@ -1996,9 +1996,9 @@ msgstr "Formatuojama"
 #, fuzzy
 msgid "Total"
 msgstr ""
-"#-#-#-#-#  kio_devices.po (kio_devices)  #-#-#-#-#\n"
+"#-#-#-#-#  tdeio_devices.po (tdeio_devices)  #-#-#-#-#\n"
 "Iš viso\n"
-"#-#-#-#-#  kio_media.po (kio_media)  #-#-#-#-#\n"
+"#-#-#-#-#  tdeio_media.po (tdeio_media)  #-#-#-#-#\n"
 "Iš viso\n"
 "#-#-#-#-#  ksysguard.po (ksysguard)  #-#-#-#-#\n"
 "Iš viso\n"
@@ -2069,13 +2069,13 @@ msgid "&Open"
 msgstr ""
 "#-#-#-#-#  libkonq.po (libkonq)  #-#-#-#-#\n"
 "At&verti\n"
-"#-#-#-#-#  kio.po (kio)  #-#-#-#-#\n"
+"#-#-#-#-#  tdeio.po (tdeio)  #-#-#-#-#\n"
 "At&verti\n"
-"#-#-#-#-#  kdelibs.po (kdelibs)  #-#-#-#-#\n"
+"#-#-#-#-#  tdelibs.po (tdelibs)  #-#-#-#-#\n"
 "At&verti\n"
 "#-#-#-#-#  quanta.po (quanta)  #-#-#-#-#\n"
 "&Atverti\n"
-"#-#-#-#-#  kfilereplace.po (kfilereplace)  #-#-#-#-#\n"
+"#-#-#-#-#  tdefilereplace.po (tdefilereplace)  #-#-#-#-#\n"
 "&Atverti\n"
 "#-#-#-#-#  ksysv.po (ksysv)  #-#-#-#-#\n"
 "&Atverti\n"
@@ -2414,7 +2414,7 @@ msgstr ""
 "Neribojamas\n"
 "#-#-#-#-#  cupsdconf.po (cupsdconf)  #-#-#-#-#\n"
 "Neribota\n"
-"#-#-#-#-#  kdeprint.po (kdeprint)  #-#-#-#-#\n"
+"#-#-#-#-#  tdeprint.po (tdeprint)  #-#-#-#-#\n"
 "Neribota\n"
 "#-#-#-#-#  katepart.po (katepart)  #-#-#-#-#\n"
 "Neribota\n"
@@ -2525,33 +2525,33 @@ msgstr ""
 "Antraštė\n"
 "#-#-#-#-#  ksysguard.po (ksysguard)  #-#-#-#-#\n"
 "Antraštė\n"
-"#-#-#-#-#  kabc_ldapkio.po (kabc_ldapkio)  #-#-#-#-#\n"
+"#-#-#-#-#  tdeabc_ldapkio.po (tdeabc_ldapkio)  #-#-#-#-#\n"
 "Antraštė\n"
-"#-#-#-#-#  kdelibs.po (kdelibs)  #-#-#-#-#\n"
+"#-#-#-#-#  tdelibs.po (tdelibs)  #-#-#-#-#\n"
 "Titulas\n"
 "#-#-#-#-#  k3b.po (k3b)  #-#-#-#-#\n"
 "Antraštė\n"
-"#-#-#-#-#  kfile_pdf.po (kfile_pdf)  #-#-#-#-#\n"
+"#-#-#-#-#  tdefile_pdf.po (tdefile_pdf)  #-#-#-#-#\n"
 "Antraštė\n"
-"#-#-#-#-#  kfile_png.po (kfile_png)  #-#-#-#-#\n"
+"#-#-#-#-#  tdefile_png.po (tdefile_png)  #-#-#-#-#\n"
 "Antraštė\n"
-"#-#-#-#-#  kfile_ps.po (kfile_ps)  #-#-#-#-#\n"
+"#-#-#-#-#  tdefile_ps.po (tdefile_ps)  #-#-#-#-#\n"
 "Antraštė\n"
 "#-#-#-#-#  kaddressbook.po (kaddressbook)  #-#-#-#-#\n"
 "Antraštė\n"
 "#-#-#-#-#  ktnef.po (ktnef)  #-#-#-#-#\n"
 "Antraštė\n"
-"#-#-#-#-#  kfile_html.po (kfile_html)  #-#-#-#-#\n"
+"#-#-#-#-#  tdefile_html.po (tdefile_html)  #-#-#-#-#\n"
 "Antraštė\n"
 "#-#-#-#-#  kopete.po (kopete)  #-#-#-#-#\n"
 "Titulas\n"
 "#-#-#-#-#  libkcddb.po (libkcddb)  #-#-#-#-#\n"
 "Pavadinimas\n"
-"#-#-#-#-#  kfile_mp3.po (kfile_mp3)  #-#-#-#-#\n"
+"#-#-#-#-#  tdefile_mp3.po (tdefile_mp3)  #-#-#-#-#\n"
 "Pavadinimas\n"
 "#-#-#-#-#  artscontrol.po (artscontrol)  #-#-#-#-#\n"
 "Antraštė\n"
-"#-#-#-#-#  kfile_ogg.po (kfile_ogg)  #-#-#-#-#\n"
+"#-#-#-#-#  tdefile_ogg.po (tdefile_ogg)  #-#-#-#-#\n"
 "Antraštė\n"
 "#-#-#-#-#  kaudiocreator.po (kaudiocreator)  #-#-#-#-#\n"
 "Antraštė"
@@ -2643,7 +2643,7 @@ msgstr ""
 "Pe&rvadinti\n"
 "#-#-#-#-#  konqueror.po (konqueror)  #-#-#-#-#\n"
 "Pe&rvadinti\n"
-"#-#-#-#-#  kio.po (kio)  #-#-#-#-#\n"
+"#-#-#-#-#  tdeio.po (tdeio)  #-#-#-#-#\n"
 "Pe&rvadinti\n"
 "#-#-#-#-#  kexi.po (kexi)  #-#-#-#-#\n"
 "Pe&rvadinti\n"
@@ -2655,7 +2655,7 @@ msgstr ""
 "Pe&rvadinti\n"
 "#-#-#-#-#  kmail.po (kmail)  #-#-#-#-#\n"
 "Pe&rvadinti\n"
-"#-#-#-#-#  kwalletmanager.po (kwalletmanager)  #-#-#-#-#\n"
+"#-#-#-#-#  tdewalletmanager.po (tdewalletmanager)  #-#-#-#-#\n"
 "Pe&rvadinti\n"
 "#-#-#-#-#  ksirc.po (ksirc)  #-#-#-#-#\n"
 "&Pervadinti"

po/nl/krecipes.po

@@ -11,7 +11,7 @@ msgstr ""
 "POT-Creation-Date: 2006-09-01 08:44+0200\n"
 "PO-Revision-Date: 2006-08-24 12:44+0200\n"
 "Last-Translator: Rinse de Vries <rinsedevries@kde.nl>\n"
-"Language-Team: Dutch <kde-i18n-nl@kde.org>\n"
+"Language-Team: Dutch <tde-i18n-nl@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/pt/krecipes.po

@@ -4,7 +4,7 @@ msgstr ""
 "POT-Creation-Date: 2006-09-01 08:44+0200\n"
 "PO-Revision-Date: 2006-08-29 02:33+0100\n"
 "Last-Translator: Jose Nuno Pires <jncp@netcabo.pt>\n"
-"Language-Team: pt <kde-i18n-pt@kde.org>\n"
+"Language-Team: pt <tde-i18n-pt@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"