Browse Source

Automated conversion to TQt and TDE APIs

master
Timothy Pearson 5 years ago
parent
commit
afe05794c4
19 changed files with 969 additions and 969 deletions
  1. 1
    1
      ChangeLog
  2. 1
    1
      INSTALL
  3. 135
    135
      acinclude.m4
  4. 230
    230
      autom4te.cache/output.0
  5. 230
    230
      autom4te.cache/output.1
  6. 163
    163
      autom4te.cache/traces.0
  7. 78
    78
      autom4te.cache/traces.1
  8. 9
    9
      doc/en/index.docbook
  9. 5
    5
      src/Makefile.am
  10. 25
    25
      src/find.cpp
  11. 7
    7
      src/find.h
  12. 2
    2
      src/find.protocol
  13. 47
    47
      src/findimpl.cpp
  14. 11
    11
      src/findimpl.h
  15. 8
    8
      src/findurl.cpp
  16. 6
    6
      src/findurl.h
  17. 1
    1
      src/tracker.h
  18. 4
    4
      src/trackerfindclient.cpp
  19. 6
    6
      src/trackerfindclient.h

+ 1
- 1
ChangeLog View File

@@ -1 +1 @@
1
-2007/2/18 Version 0.2: Now shipping tracker.h and tracker-client.h from tracker-0.5.4 to build against. This is just a temporary hack and kio-find will probably not work with tracker-0.6.
1
+2007/2/18 Version 0.2: Now shipping tracker.h and tracker-client.h from tracker-0.5.4 to build against. This is just a temporary hack and tdeio-find will probably not work with tracker-0.6.

+ 1
- 1
INSTALL View File

@@ -150,7 +150,7 @@ operates.
150 150
 `--help'
151 151
      Print a summary of the options to `configure', and exit.
152 152
 
153
-`--quiet'
153
+`--tquiet'
154 154
 `--silent'
155 155
 `-q'
156 156
      Do not print messages saying which checks are being made.

+ 135
- 135
acinclude.m4 View File

@@ -23,8 +23,8 @@ dnl IMPORTANT NOTE:
23 23
 dnl Please do not modify this file unless you expect your modifications to be
24 24
 dnl carried into every other module in the repository. 
25 25
 dnl
26
-dnl Single-module modifications are best placed in configure.in for kdelibs
27
-dnl and kdebase or configure.in.in if present.
26
+dnl Single-module modifications are best placed in configure.in for tdelibs
27
+dnl and tdebase or configure.in.in if present.
28 28
 
29 29
 # KDE_PATH_X_DIRECT
30 30
 dnl Internal subroutine of AC_PATH_X.
@@ -103,41 +103,41 @@ ac_x_libraries=],
103 103
 [LIBS="$ac_save_LIBS"
104 104
 # First see if replacing the include by lib works.
105 105
 # Check X11 before X11Rn because it is often a symlink to the current release.
106
-for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
107
-    /usr/X11/lib${kdelibsuff}           \
108
-    /usr/X11R6/lib${kdelibsuff}         \
109
-    /usr/X11R5/lib${kdelibsuff}         \
110
-    /usr/X11R4/lib${kdelibsuff}         \
106
+for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \
107
+    /usr/X11/lib${tdelibsuff}           \
108
+    /usr/X11R6/lib${tdelibsuff}         \
109
+    /usr/X11R5/lib${tdelibsuff}         \
110
+    /usr/X11R4/lib${tdelibsuff}         \
111 111
                                         \
112
-    /usr/lib${kdelibsuff}/X11           \
113
-    /usr/lib${kdelibsuff}/X11R6         \
114
-    /usr/lib${kdelibsuff}/X11R5         \
115
-    /usr/lib${kdelibsuff}/X11R4         \
112
+    /usr/lib${tdelibsuff}/X11           \
113
+    /usr/lib${tdelibsuff}/X11R6         \
114
+    /usr/lib${tdelibsuff}/X11R5         \
115
+    /usr/lib${tdelibsuff}/X11R4         \
116 116
                                         \
117
-    /usr/local/X11/lib${kdelibsuff}     \
118
-    /usr/local/X11R6/lib${kdelibsuff}   \
119
-    /usr/local/X11R5/lib${kdelibsuff}   \
120
-    /usr/local/X11R4/lib${kdelibsuff}   \
117
+    /usr/local/X11/lib${tdelibsuff}     \
118
+    /usr/local/X11R6/lib${tdelibsuff}   \
119
+    /usr/local/X11R5/lib${tdelibsuff}   \
120
+    /usr/local/X11R4/lib${tdelibsuff}   \
121 121
                                         \
122
-    /usr/local/lib${kdelibsuff}/X11     \
123
-    /usr/local/lib${kdelibsuff}/X11R6   \
124
-    /usr/local/lib${kdelibsuff}/X11R5   \
125
-    /usr/local/lib${kdelibsuff}/X11R4   \
122
+    /usr/local/lib${tdelibsuff}/X11     \
123
+    /usr/local/lib${tdelibsuff}/X11R6   \
124
+    /usr/local/lib${tdelibsuff}/X11R5   \
125
+    /usr/local/lib${tdelibsuff}/X11R4   \
126 126
                                         \
127
-    /usr/X386/lib${kdelibsuff}          \
128
-    /usr/x386/lib${kdelibsuff}          \
129
-    /usr/XFree86/lib${kdelibsuff}/X11   \
127
+    /usr/X386/lib${tdelibsuff}          \
128
+    /usr/x386/lib${tdelibsuff}          \
129
+    /usr/XFree86/lib${tdelibsuff}/X11   \
130 130
                                         \
131
-    /usr/lib${kdelibsuff}               \
132
-    /usr/local/lib${kdelibsuff}         \
133
-    /usr/unsupported/lib${kdelibsuff}   \
134
-    /usr/athena/lib${kdelibsuff}        \
135
-    /usr/local/x11r5/lib${kdelibsuff}   \
136
-    /usr/lpp/Xamples/lib${kdelibsuff}   \
137
-    /lib/usr/lib${kdelibsuff}/X11       \
131
+    /usr/lib${tdelibsuff}               \
132
+    /usr/local/lib${tdelibsuff}         \
133
+    /usr/unsupported/lib${tdelibsuff}   \
134
+    /usr/athena/lib${tdelibsuff}        \
135
+    /usr/local/x11r5/lib${tdelibsuff}   \
136
+    /usr/lpp/Xamples/lib${tdelibsuff}   \
137
+    /lib/usr/lib${tdelibsuff}/X11       \
138 138
                                         \
139
-    /usr/openwin/lib${kdelibsuff}       \
140
-    /usr/openwin/share/lib${kdelibsuff} \
139
+    /usr/openwin/lib${tdelibsuff}       \
140
+    /usr/openwin/share/lib${tdelibsuff} \
141 141
     ; \
142 142
 do
143 143
 dnl Don't even attempt the hair of trying to link an X program!
@@ -371,24 +371,24 @@ AC_DEFUN([KDE_1_CHECK_PATHS],
371 371
   fi
372 372
 
373 373
 AC_MSG_CHECKING([for KDE libraries installed])
374
-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'
374
+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'
375 375
 
376 376
 if AC_TRY_EVAL(ac_link) && test -s conftest; then
377 377
   AC_MSG_RESULT(yes)
378 378
 else
379 379
   AC_MSG_ERROR([your system fails at linking a small KDE application!
380 380
 Check, if your compiler is installed correctly and if you have used the
381
-same compiler to compile Qt and kdelibs as you did use now.
381
+same compiler to compile Qt and tdelibs as you did use now.
382 382
 For more details about this problem, look at the end of config.log.])
383 383
 fi
384 384
 
385
-if eval `KDEDIR= ./conftest 2>&5`; then
385
+if eval `TDEDIR= ./conftest 2>&5`; then
386 386
   kde_result=done
387 387
 else
388 388
   kde_result=problems
389 389
 fi
390 390
 
391
-KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
391
+TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
392 392
 kde_have_all_paths=yes
393 393
 
394 394
 KDE_SET_PATHS($kde_result)
@@ -547,11 +547,11 @@ Please check whether you installed aRts correctly or use
547 547
 AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
548 548
 [
549 549
     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"
550
-    test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
551
-    if test -n "$KDEDIRS"; then
550
+    test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
551
+    if test -n "$TDEDIRS"; then
552 552
        kde_save_IFS=$IFS
553 553
        IFS=:
554
-       for dir in $KDEDIRS; do
554
+       for dir in $TDEDIRS; do
555 555
             kde_default_bindirs="$dir/bin $kde_default_bindirs "
556 556
        done
557 557
        IFS=$kde_save_IFS
@@ -602,18 +602,18 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
602 602
         fi
603 603
 
604 604
         if test -n "$kde32ornewer"; then
605
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
605
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
606 606
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
607 607
         fi
608 608
         if test -n "$kde33ornewer"; then
609
-            KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)])
609
+            KDE_FIND_PATH(maketdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(maketdewidgets)])
610 610
             AC_SUBST(MAKEKDEWIDGETS)
611 611
         fi
612 612
         KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
613 613
 
614 614
         if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
615 615
  	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
616
-            test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
616
+            test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs"
617 617
             AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
618 618
 	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
619 619
 		KDE_XSL_STYLESHEET=""
@@ -710,7 +710,7 @@ AC_SUBST(kde_templatesdir)
710 710
 AC_SUBST(kde_servicesdir)
711 711
 AC_SUBST(kde_servicetypesdir)
712 712
 AC_SUBST(kde_moduledir)
713
-AC_SUBST(kdeinitdir, '$(kde_moduledir)')
713
+AC_SUBST(tdeinitdir, '$(kde_moduledir)')
714 714
 AC_SUBST(kde_styledir)
715 715
 AC_SUBST(kde_widgetdir)
716 716
 if test "$kde_qtver" = 1; then
@@ -937,7 +937,7 @@ mips-sgi-irix6*)
937 937
     ac_x_includes="."
938 938
   fi
939 939
   if test -z "$ac_x_libraries"; then
940
-    ac_x_libraries="/usr/lib${kdelibsuff}"
940
+    ac_x_libraries="/usr/lib${tdelibsuff}"
941 941
   fi
942 942
 esac
943 943
 #from now on we use our own again
@@ -1325,7 +1325,7 @@ AC_ARG_ENABLE(
1325 1325
 USING_QT_MT=""
1326 1326
 
1327 1327
 dnl ------------------------------------------------------------------------
1328
-dnl If we not get --disable-qt-mt then adjust some vars for the host.
1328
+dnl If we not get --disable-tqt-mt then adjust some vars for the host.
1329 1329
 dnl ------------------------------------------------------------------------
1330 1330
 
1331 1331
 KDE_MT_LDFLAGS=
@@ -1383,7 +1383,7 @@ dnl ------------------------------------------------------------
1383 1383
 fi
1384 1384
 
1385 1385
 dnl ------------------------------------------------------------------------
1386
-dnl If we got --enable-qt-mt then adjust the Qt library name for the host.
1386
+dnl If we got --enable-tqt-mt then adjust the Qt library name for the host.
1387 1387
 dnl ------------------------------------------------------------------------
1388 1388
 
1389 1389
 if test "x$kde_use_qt_mt" = "xyes"; then
@@ -1418,7 +1418,7 @@ qt_includes=""
1418 1418
 AC_ARG_WITH(qt-dir,
1419 1419
     AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
1420 1420
     [  ac_qt_includes="$withval"/include
1421
-       ac_qt_libraries="$withval"/lib${kdelibsuff}
1421
+       ac_qt_libraries="$withval"/lib${tdelibsuff}
1422 1422
        ac_qt_bindir="$withval"/bin
1423 1423
     ])
1424 1424
 
@@ -1459,7 +1459,7 @@ ac_qt_includes="$qt_incdir"
1459 1459
 
1460 1460
 qt_libdirs=""
1461 1461
 for dir in $kde_qt_dirs; do
1462
-   qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
1462
+   qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir"
1463 1463
 done
1464 1464
 qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
1465 1465
 if test ! "$ac_qt_libraries" = "NO"; then
@@ -1644,11 +1644,11 @@ rm -f actest.ui actest.cpp
1644 1644
 AC_MSG_RESULT([$kde_cv_uic_plugins])
1645 1645
 if test "$kde_cv_uic_plugins" != yes; then
1646 1646
 	AC_MSG_ERROR([
1647
-you need to install kdelibs first.
1647
+you need to install tdelibs first.
1648 1648
 
1649
-If you did install kdelibs, then the Qt version that is picked up by
1650
-this configure is not the same version you used to compile kdelibs. 
1651
-The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the 
1649
+If you did install tdelibs, then the Qt version that is picked up by
1650
+this configure is not the same version you used to compile tdelibs. 
1651
+The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the 
1652 1652
 _same Qt version_, compiled with the _same compiler_ and the same Qt
1653 1653
 configuration settings.
1654 1654
 ])
@@ -1785,16 +1785,16 @@ AC_CACHE_VAL(ac_cv_have_kde,
1785 1785
 
1786 1786
 if test "$kde_qtver" = 1; then
1787 1787
   kde_check_header="ksock.h"
1788
-  kde_check_lib="libkdecore.la"
1788
+  kde_check_lib="libtdecore.la"
1789 1789
 else
1790 1790
   kde_check_header="ksharedptr.h"
1791
-  kde_check_lib="libkio.la"
1791
+  kde_check_lib="libtdeio.la"
1792 1792
 fi
1793 1793
 
1794 1794
 if test -z "$1"; then
1795 1795
 
1796
-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"
1797
-test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
1796
+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"
1797
+test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"
1798 1798
 kde_incdirs="$ac_kde_includes $kde_incdirs"
1799 1799
 AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
1800 1800
 ac_kde_includes="$kde_incdir"
@@ -1805,8 +1805,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
1805 1805
 So, check this please and use another prefix!])
1806 1806
 fi
1807 1807
 
1808
-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}"
1809
-test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
1808
+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}"
1809
+test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs"
1810 1810
 kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
1811 1811
 AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
1812 1812
 ac_kde_libraries="$kde_libdir"
@@ -1824,7 +1824,7 @@ fi
1824 1824
 if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
1825 1825
 AC_MSG_ERROR([
1826 1826
 I can't find the designer plugins. These are required and should have been installed
1827
-by kdelibs])
1827
+by tdelibs])
1828 1828
 fi
1829 1829
 
1830 1830
 if test -n "$kde_widgetdir"; then
@@ -1839,7 +1839,7 @@ else
1839 1839
     ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
1840 1840
 fi
1841 1841
 
1842
-else dnl test -z $1, e.g. from kdelibs
1842
+else dnl test -z $1, e.g. from tdelibs
1843 1843
 
1844 1844
   ac_cv_have_kde="have_kde=no"
1845 1845
 
@@ -1979,20 +1979,20 @@ cat > conftest.$ac_ext <<EOF
1979 1979
 #include <kapp.h>
1980 1980
 
1981 1981
 int main() {
1982
-    printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
1983
-    printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
1984
-    printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
1985
-    printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
1986
-    printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
1987
-    printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
1988
-    printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
1989
-    printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
1990
-    printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
1991
-    printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
1982
+    printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
1983
+    printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
1984
+    printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
1985
+    printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
1986
+    printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
1987
+    printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
1988
+    printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
1989
+    printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
1990
+    printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
1991
+    printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
1992 1992
     printf("kde_wallpaperdir=\\"%s\\"\n",
1993
-	KApplication::kde_wallpaperdir().data());
1994
-    printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
1995
-    printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
1993
+	TDEApplication::kde_wallpaperdir().data());
1994
+    printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
1995
+    printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
1996 1996
     printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
1997 1997
     printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
1998 1998
     printf("kde_moduledir=\\"/tmp/dummy\\"\n");
@@ -2030,7 +2030,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
2030 2030
  kde_cxxflags_safe="$CXXFLAGS"
2031 2031
 
2032 2032
  LIBS="-lkde-qt-addon $LIBQT $LIBS"
2033
- CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes"
2033
+ CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes"
2034 2034
  LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
2035 2035
 
2036 2036
  AC_TRY_LINK([
@@ -2064,48 +2064,48 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
2064 2064
 
2065 2065
 if test $kde_qtver = 3; then
2066 2066
    case $host in 
2067
-               *cygwin*) lib_kded="-lkdeinit_kded" ;;
2067
+               *cygwin*) lib_kded="-ltdeinit_kded" ;;
2068 2068
                *) lib_kded="" ;;
2069 2069
        esac
2070 2070
    AC_SUBST(LIB_KDED, $lib_kded)
2071
-   AC_SUBST(LIB_KDECORE, "-lkdecore")
2072
-   AC_SUBST(LIB_KDEUI, "-lkdeui")
2073
-   AC_SUBST(LIB_KIO, "-lkio")
2071
+   AC_SUBST(LIB_TDECORE, "-ltdecore")
2072
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
2073
+   AC_SUBST(LIB_TDEIO, "-ltdeio")
2074 2074
    AC_SUBST(LIB_KJS, "-lkjs")
2075 2075
    AC_SUBST(LIB_SMB, "-lsmb")
2076 2076
    AC_SUBST(LIB_KAB, "-lkab")
2077
-   AC_SUBST(LIB_KABC, "-lkabc")
2078
-   AC_SUBST(LIB_KHTML, "-lkhtml")
2079
-   AC_SUBST(LIB_KSPELL, "-lkspell")
2080
-   AC_SUBST(LIB_KPARTS, "-lkparts")
2081
-   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
2082
-   AC_SUBST(LIB_KUTILS, "-lkutils")
2083
-   AC_SUBST(LIB_KDEPIM, "-lkdepim")
2084
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
2077
+   AC_SUBST(LIB_KABC, "-ltdeabc")
2078
+   AC_SUBST(LIB_TDEHTML, "-ltdehtml")
2079
+   AC_SUBST(LIB_TDESPELL, "-ltdespell")
2080
+   AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
2081
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
2082
+   AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
2083
+   AC_SUBST(LIB_TDEPIM, "-ltdepim")
2084
+   AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
2085 2085
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
2086
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
2087
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
2086
+   AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
2087
+   AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
2088 2088
 # these are for backward compatibility
2089
-   AC_SUBST(LIB_KSYCOCA, "-lkio")
2090
-   AC_SUBST(LIB_KFILE, "-lkio")
2089
+   AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
2090
+   AC_SUBST(LIB_KFILE, "-ltdeio")
2091 2091
 elif test $kde_qtver = 2; then
2092
-   AC_SUBST(LIB_KDECORE, "-lkdecore")
2093
-   AC_SUBST(LIB_KDEUI, "-lkdeui")
2094
-   AC_SUBST(LIB_KIO, "-lkio")
2095
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
2092
+   AC_SUBST(LIB_TDECORE, "-ltdecore")
2093
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
2094
+   AC_SUBST(LIB_TDEIO, "-ltdeio")
2095
+   AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
2096 2096
    AC_SUBST(LIB_SMB, "-lsmb")
2097
-   AC_SUBST(LIB_KFILE, "-lkfile")
2097
+   AC_SUBST(LIB_KFILE, "-ltdefile")
2098 2098
    AC_SUBST(LIB_KAB, "-lkab")
2099
-   AC_SUBST(LIB_KHTML, "-lkhtml")
2100
-   AC_SUBST(LIB_KSPELL, "-lkspell")
2101
-   AC_SUBST(LIB_KPARTS, "-lkparts")
2102
-   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
2099
+   AC_SUBST(LIB_TDEHTML, "-ltdehtml")
2100
+   AC_SUBST(LIB_TDESPELL, "-ltdespell")
2101
+   AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
2102
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
2103 2103
 else
2104
-   AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
2105
-   AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
2106
-   AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
2107
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
2108
-   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
2104
+   AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
2105
+   AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
2106
+   AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
2107
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
2108
+   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
2109 2109
 fi
2110 2110
 ])
2111 2111
 
@@ -2170,7 +2170,7 @@ if test "x$kde_cv_func_$1" = xyes; then
2170 2170
 else
2171 2171
   case "$1" in
2172 2172
 	setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
2173
-		kde_cv_proto_$1="yes - in libkdefakes"
2173
+		kde_cv_proto_$1="yes - in libtdefakes"
2174 2174
 		;;
2175 2175
 	*)
2176 2176
 		kde_cv_proto_$1=unknown
@@ -2489,7 +2489,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
2489 2489
   AC_MSG_RESULT(yes)
2490 2490
   AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
2491 2491
 else
2492
-  AC_MSG_ERROR(You need giflib30. Please install the kdesupport package)
2492
+  AC_MSG_ERROR(You need giflib30. Please install the tdesupport package)
2493 2493
 fi
2494 2494
 ])
2495 2495
 
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
2547 2547
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
2548 2548
 
2549 2549
 dnl if headers _and_ libraries are missing, this is no error, and we
2550
-dnl continue with a warning (the user will get no jpeg support in khtml)
2550
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
2551 2551
 dnl if only one is missing, it means a configuration error, but we still
2552 2552
 dnl only warn
2553 2553
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
3489 3489
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
3490 3490
 AC_SUBST(KDE_PLUGIN)
3491 3491
 
3492
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
3492
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
3493 3493
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
3494 3494
 AC_SUBST(KDE_CHECK_PLUGIN)
3495 3495
 
@@ -3502,9 +3502,9 @@ AC_DEFUN([KDE_CHECK_LIB64],
3502 3502
     AC_ARG_ENABLE(libsuffix,
3503 3503
         AC_HELP_STRING([--enable-libsuffix],
3504 3504
             [/lib directory suffix (64,32,none,auto[=default])]),
3505
-            kdelibsuff=$enableval, kdelibsuff="auto")
3505
+            tdelibsuff=$enableval, tdelibsuff="auto")
3506 3506
     
3507
-    if test "$kdelibsuff" = "auto"; then
3507
+    if test "$tdelibsuff" = "auto"; then
3508 3508
     
3509 3509
 cat > conftest.c << EOF
3510 3510
 #include <stdio.h>
@@ -3512,26 +3512,26 @@ int main() {
3512 3512
  return 0;
3513 3513
 }
3514 3514
 EOF
3515
-        kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
3515
+        tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
3516 3516
     s,.*/lib\([[^\/]]*\)/.*,\1, 
3517 3517
     p 
3518 3518
 }'`
3519 3519
 	rm -rf conftest.*
3520 3520
     fi	
3521 3521
 	
3522
-    if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then
3523
-       kdelibsuff=
3522
+    if test "$tdelibsuff" = "no" || test "$tdelibsuff" = "none"; then
3523
+       tdelibsuff=
3524 3524
     fi
3525
-    if test -z "$kdelibsuff"; then
3525
+    if test -z "$tdelibsuff"; then
3526 3526
         AC_MSG_RESULT([not using lib directory suffix])
3527 3527
         AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories)
3528 3528
     else
3529 3529
         if test "$libdir" = '${exec_prefix}/lib'; then
3530
-            libdir="$libdir${kdelibsuff}"
3530
+            libdir="$libdir${tdelibsuff}"
3531 3531
             AC_SUBST([libdir], ["$libdir"])  dnl ugly hack for lib64 platforms
3532 3532
         fi
3533
-        AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories)
3534
-        AC_MSG_RESULT([using lib directory suffix $kdelibsuff])
3533
+        AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories)
3534
+        AC_MSG_RESULT([using lib directory suffix $tdelibsuff])
3535 3535
     fi
3536 3536
 ])
3537 3537
 
@@ -3549,7 +3549,7 @@ AC_CANONICAL_SYSTEM
3549 3549
 AC_ARG_PROGRAM
3550 3550
 AM_INIT_AUTOMAKE($1, $2)
3551 3551
 AM_DISABLE_LIBRARIES
3552
-AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
3552
+AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
3553 3553
 AC_CHECK_COMPILERS
3554 3554
 KDE_PROG_LIBTOOL
3555 3555
 AM_KDE_WITH_NLS
@@ -4556,7 +4556,7 @@ fi
4556 4556
 
4557 4557
 PYTHONINC=-I$python_incdir
4558 4558
 
4559
-python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
4559
+python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs"
4560 4560
 AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
4561 4561
 if test ! -r $python_libdir/libpython$version.so; then
4562 4562
   AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
@@ -4946,14 +4946,14 @@ AC_DEFUN([KDE_CONF_FILES],
4946 4946
   AC_SUBST(CONF_FILES)
4947 4947
 ])dnl
4948 4948
 
4949
-dnl This sets the prefix, for arts and kdelibs
4949
+dnl This sets the prefix, for arts and tdelibs
4950 4950
 dnl Do NOT use in any other module.
4951
-dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde
4951
+dnl It only looks at --prefix, TDEDIR and falls back to /usr/local/kde
4952 4952
 AC_DEFUN([KDE_SET_PREFIX_CORE],
4953 4953
 [
4954 4954
   unset CDPATH
4955
-  dnl make $KDEDIR the default for the installation
4956
-  AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
4955
+  dnl make $TDEDIR the default for the installation
4956
+  AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
4957 4957
 
4958 4958
   if test "x$prefix" = "xNONE"; then
4959 4959
     prefix=$ac_default_prefix
@@ -4977,25 +4977,25 @@ AC_DEFUN([KDE_SET_PREFIX],
4977 4977
   unset CDPATH
4978 4978
   dnl We can't give real code to that macro, only a value.
4979 4979
   dnl It only matters for --help, since we set the prefix in this function anyway.
4980
-  AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix})
4980
+  AC_PREFIX_DEFAULT(${TDEDIR:-the kde prefix})
4981 4981
 
4982 4982
   KDE_SET_DEFAULT_BINDIRS
4983 4983
   if test "x$prefix" = "xNONE"; then
4984
-    dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it
4985
-    KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
4984
+    dnl no prefix given: look for tde-config in the PATH and deduce the prefix from it
4985
+    KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
4986 4986
   else
4987
-    dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH
4987
+    dnl prefix given: look for tde-config, preferrably in prefix, otherwise in PATH
4988 4988
     kde_save_PATH="$PATH"
4989 4989
     PATH="$exec_prefix/bin:$prefix/bin:$PATH"
4990
-    KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
4990
+    KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
4991 4991
     PATH="$kde_save_PATH"
4992 4992
   fi
4993 4993
 
4994 4994
   kde_libs_prefix=`$KDECONFIG --prefix`
4995 4995
   if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
4996
-       AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
4996
+       AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs.
4997 4997
                     This means it has been moved since you installed it.
4998
-                    This won't work. Please recompile kdelibs for the new prefix.
4998
+                    This won't work. Please recompile tdelibs for the new prefix.
4999 4999
                     ])
5000 5000
   fi
5001 5001
   kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
@@ -5003,7 +5003,7 @@ AC_DEFUN([KDE_SET_PREFIX],
5003 5003
   AC_MSG_CHECKING([where to install])
5004 5004
   if test "x$prefix" = "xNONE"; then
5005 5005
     prefix=$kde_libs_prefix
5006
-    AC_MSG_RESULT([$prefix (as returned by kde-config)])
5006
+    AC_MSG_RESULT([$prefix (as returned by tde-config)])
5007 5007
   else
5008 5008
     dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different
5009 5009
     given_prefix=$prefix
@@ -5660,7 +5660,7 @@ ssl_includes=""
5660 5660
 AC_ARG_WITH(ssl-dir,
5661 5661
     AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]),
5662 5662
     [  ac_ssl_includes="$withval"/include
5663
-       ac_ssl_libraries="$withval"/lib$kdelibsuff
5663
+       ac_ssl_libraries="$withval"/lib$tdelibsuff
5664 5664
     ])
5665 5665
 
5666 5666
 want_ssl=yes
@@ -5680,7 +5680,7 @@ AC_CACHE_VAL(ac_cv_have_ssl,
5680 5680
   AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir)
5681 5681
   ac_ssl_includes="$ssl_incdir"
5682 5682
 
5683
-  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"
5683
+  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"
5684 5684
   if test ! "$ac_ssl_libraries" = "NO"; then
5685 5685
     ssl_libdirs="$ac_ssl_libraries $ssl_libdirs"
5686 5686
   fi
@@ -5917,9 +5917,9 @@ dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page
5917 5917
 dnl also defines KSTUFF_PKG_ERRORS on error
5918 5918
 AC_DEFUN([KDE_PKG_CHECK_MODULES], [
5919 5919
 
5920
-   PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
5920
+   PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
5921 5921
    if test "$prefix" != "$kde_libs_prefix"; then
5922
-       PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
5922
+       PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
5923 5923
    fi
5924 5924
    export PKG_CONFIG_PATH
5925 5925
    PKG_CHECK_MODULES([$1],[$2],[$3],[$4])
@@ -10384,7 +10384,7 @@ EOF
10384 10384
     # Now try to grab the symbols.
10385 10385
     nlist=conftest.nm
10386 10386
     if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
10387
-      # Try sorting and uniquifying the output.
10387
+      # Try sorting and unitquifying the output.
10388 10388
       if sort "$nlist" | uniq > "$nlist"T; then
10389 10389
 	mv -f "$nlist"T "$nlist"
10390 10390
       else

+ 230
- 230
autom4te.cache/output.0
File diff suppressed because it is too large
View File


+ 230
- 230
autom4te.cache/output.1
File diff suppressed because it is too large
View File


+ 163
- 163
autom4te.cache/traces.0 View File

@@ -647,41 +647,41 @@ ac_x_libraries=],
647 647
 [LIBS="$ac_save_LIBS"
648 648
 # First see if replacing the include by lib works.
649 649
 # Check X11 before X11Rn because it is often a symlink to the current release.
650
-for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
651
-    /usr/X11/lib${kdelibsuff}           \
652
-    /usr/X11R6/lib${kdelibsuff}         \
653
-    /usr/X11R5/lib${kdelibsuff}         \
654
-    /usr/X11R4/lib${kdelibsuff}         \
650
+for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \
651
+    /usr/X11/lib${tdelibsuff}           \
652
+    /usr/X11R6/lib${tdelibsuff}         \
653
+    /usr/X11R5/lib${tdelibsuff}         \
654
+    /usr/X11R4/lib${tdelibsuff}         \
655 655
                                         \
656
-    /usr/lib${kdelibsuff}/X11           \
657
-    /usr/lib${kdelibsuff}/X11R6         \
658
-    /usr/lib${kdelibsuff}/X11R5         \
659
-    /usr/lib${kdelibsuff}/X11R4         \
656
+    /usr/lib${tdelibsuff}/X11           \
657
+    /usr/lib${tdelibsuff}/X11R6         \
658
+    /usr/lib${tdelibsuff}/X11R5         \
659
+    /usr/lib${tdelibsuff}/X11R4         \
660 660
                                         \
661
-    /usr/local/X11/lib${kdelibsuff}     \
662
-    /usr/local/X11R6/lib${kdelibsuff}   \
663
-    /usr/local/X11R5/lib${kdelibsuff}   \
664
-    /usr/local/X11R4/lib${kdelibsuff}   \
661
+    /usr/local/X11/lib${tdelibsuff}     \
662
+    /usr/local/X11R6/lib${tdelibsuff}   \
663
+    /usr/local/X11R5/lib${tdelibsuff}   \
664
+    /usr/local/X11R4/lib${tdelibsuff}   \
665 665
                                         \
666
-    /usr/local/lib${kdelibsuff}/X11     \
667
-    /usr/local/lib${kdelibsuff}/X11R6   \
668
-    /usr/local/lib${kdelibsuff}/X11R5   \
669
-    /usr/local/lib${kdelibsuff}/X11R4   \
666
+    /usr/local/lib${tdelibsuff}/X11     \
667
+    /usr/local/lib${tdelibsuff}/X11R6   \
668
+    /usr/local/lib${tdelibsuff}/X11R5   \
669
+    /usr/local/lib${tdelibsuff}/X11R4   \
670 670
                                         \
671
-    /usr/X386/lib${kdelibsuff}          \
672
-    /usr/x386/lib${kdelibsuff}          \
673
-    /usr/XFree86/lib${kdelibsuff}/X11   \
671
+    /usr/X386/lib${tdelibsuff}          \
672
+    /usr/x386/lib${tdelibsuff}          \
673
+    /usr/XFree86/lib${tdelibsuff}/X11   \
674 674
                                         \
675
-    /usr/lib${kdelibsuff}               \
676
-    /usr/local/lib${kdelibsuff}         \
677
-    /usr/unsupported/lib${kdelibsuff}   \
678
-    /usr/athena/lib${kdelibsuff}        \
679
-    /usr/local/x11r5/lib${kdelibsuff}   \
680
-    /usr/lpp/Xamples/lib${kdelibsuff}   \
681
-    /lib/usr/lib${kdelibsuff}/X11       \
675
+    /usr/lib${tdelibsuff}               \
676
+    /usr/local/lib${tdelibsuff}         \
677
+    /usr/unsupported/lib${tdelibsuff}   \
678
+    /usr/athena/lib${tdelibsuff}        \
679
+    /usr/local/x11r5/lib${tdelibsuff}   \
680
+    /usr/lpp/Xamples/lib${tdelibsuff}   \
681
+    /lib/usr/lib${tdelibsuff}/X11       \
682 682
                                         \
683
-    /usr/openwin/lib${kdelibsuff}       \
684
-    /usr/openwin/share/lib${kdelibsuff} \
683
+    /usr/openwin/lib${tdelibsuff}       \
684
+    /usr/openwin/share/lib${tdelibsuff} \
685 685
     ; \
686 686
 do
687 687
 dnl Don't even attempt the hair of trying to link an X program!
@@ -881,24 +881,24 @@ m4trace:acinclude.m4:396: -1- AC_DEFUN([KDE_1_CHECK_PATHS], [
881 881
   fi
882 882
 
883 883
 AC_MSG_CHECKING([for KDE libraries installed])
884
-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'
884
+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'
885 885
 
886 886
 if AC_TRY_EVAL(ac_link) && test -s conftest; then
887 887
   AC_MSG_RESULT(yes)
888 888
 else
889 889
   AC_MSG_ERROR([your system fails at linking a small KDE application!
890 890
 Check, if your compiler is installed correctly and if you have used the
891
-same compiler to compile Qt and kdelibs as you did use now.
891
+same compiler to compile Qt and tdelibs as you did use now.
892 892
 For more details about this problem, look at the end of config.log.])
893 893
 fi
894 894
 
895
-if eval `KDEDIR= ./conftest 2>&5`; then
895
+if eval `TDEDIR= ./conftest 2>&5`; then
896 896
   kde_result=done
897 897
 else
898 898
   kde_result=problems
899 899
 fi
900 900
 
901
-KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
901
+TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
902 902
 kde_have_all_paths=yes
903 903
 
904 904
 KDE_SET_PATHS($kde_result)
@@ -1045,11 +1045,11 @@ Please check whether you installed aRts correctly or use
1045 1045
 ])
1046 1046
 m4trace:acinclude.m4:559: -1- AC_DEFUN([KDE_SET_DEFAULT_BINDIRS], [
1047 1047
     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"
1048
-    test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
1049
-    if test -n "$KDEDIRS"; then
1048
+    test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
1049
+    if test -n "$TDEDIRS"; then
1050 1050
        kde_save_IFS=$IFS
1051 1051
        IFS=:
1052
-       for dir in $KDEDIRS; do
1052
+       for dir in $TDEDIRS; do
1053 1053
             kde_default_bindirs="$dir/bin $kde_default_bindirs "
1054 1054
        done
1055 1055
        IFS=$kde_save_IFS
@@ -1098,18 +1098,18 @@ m4trace:acinclude.m4:641: -1- AC_DEFUN([KDE_SUBST_PROGRAMS], [
1098 1098
         fi
1099 1099
 
1100 1100
         if test -n "$kde32ornewer"; then
1101
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
1101
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
1102 1102
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
1103 1103
         fi
1104 1104
         if test -n "$kde33ornewer"; then
1105
-            KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)])
1105
+            KDE_FIND_PATH(maketdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(maketdewidgets)])
1106 1106
             AC_SUBST(MAKEKDEWIDGETS)
1107 1107
         fi
1108 1108
         KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
1109 1109
 
1110 1110
         if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
1111 1111
  	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
1112
-            test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
1112
+            test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs"
1113 1113
             AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
1114 1114
 	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
1115 1115
 		KDE_XSL_STYLESHEET=""
@@ -1202,7 +1202,7 @@ AC_SUBST(kde_templatesdir)
1202 1202
 AC_SUBST(kde_servicesdir)
1203 1203
 AC_SUBST(kde_servicetypesdir)
1204 1204
 AC_SUBST(kde_moduledir)
1205
-AC_SUBST(kdeinitdir, '$(kde_moduledir)')
1205
+AC_SUBST(tdeinitdir, '$(kde_moduledir)')
1206 1206
 AC_SUBST(kde_styledir)
1207 1207
 AC_SUBST(kde_widgetdir)
1208 1208
 if test "$kde_qtver" = 1; then
@@ -1420,7 +1420,7 @@ mips-sgi-irix6*)
1420 1420
     ac_x_includes="."
1421 1421
   fi
1422 1422
   if test -z "$ac_x_libraries"; then
1423
-    ac_x_libraries="/usr/lib${kdelibsuff}"
1423
+    ac_x_libraries="/usr/lib${tdelibsuff}"
1424 1424
   fi
1425 1425
 esac
1426 1426
 #from now on we use our own again
@@ -1794,7 +1794,7 @@ AC_ARG_ENABLE(
1794 1794
 USING_QT_MT=""
1795 1795
 
1796 1796
 dnl ------------------------------------------------------------------------
1797
-dnl If we not get --disable-qt-mt then adjust some vars for the host.
1797
+dnl If we not get --disable-tqt-mt then adjust some vars for the host.
1798 1798
 dnl ------------------------------------------------------------------------
1799 1799
 
1800 1800
 KDE_MT_LDFLAGS=
@@ -1852,7 +1852,7 @@ dnl ------------------------------------------------------------
1852 1852
 fi
1853 1853
 
1854 1854
 dnl ------------------------------------------------------------------------
1855
-dnl If we got --enable-qt-mt then adjust the Qt library name for the host.
1855
+dnl If we got --enable-tqt-mt then adjust the Qt library name for the host.
1856 1856
 dnl ------------------------------------------------------------------------
1857 1857
 
1858 1858
 if test "x$kde_use_qt_mt" = "xyes"; then
@@ -1887,7 +1887,7 @@ qt_includes=""
1887 1887
 AC_ARG_WITH(qt-dir,
1888 1888
     AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
1889 1889
     [  ac_qt_includes="$withval"/include
1890
-       ac_qt_libraries="$withval"/lib${kdelibsuff}
1890
+       ac_qt_libraries="$withval"/lib${tdelibsuff}
1891 1891
        ac_qt_bindir="$withval"/bin
1892 1892
     ])
1893 1893
 
@@ -1928,7 +1928,7 @@ ac_qt_includes="$qt_incdir"
1928 1928
 
1929 1929
 qt_libdirs=""
1930 1930
 for dir in $kde_qt_dirs; do
1931
-   qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
1931
+   qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir"
1932 1932
 done
1933 1933
 qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
1934 1934
 if test ! "$ac_qt_libraries" = "NO"; then
@@ -2109,11 +2109,11 @@ rm -f actest.ui actest.cpp
2109 2109
 AC_MSG_RESULT([$kde_cv_uic_plugins])
2110 2110
 if test "$kde_cv_uic_plugins" != yes; then
2111 2111
 	AC_MSG_ERROR([
2112
-you need to install kdelibs first.
2112
+you need to install tdelibs first.
2113 2113
 
2114
-If you did install kdelibs, then the Qt version that is picked up by
2115
-this configure is not the same version you used to compile kdelibs. 
2116
-The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the 
2114
+If you did install tdelibs, then the Qt version that is picked up by
2115
+this configure is not the same version you used to compile tdelibs. 
2116
+The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the 
2117 2117
 _same Qt version_, compiled with the _same compiler_ and the same Qt
2118 2118
 configuration settings.
2119 2119
 ])
@@ -2232,16 +2232,16 @@ AC_CACHE_VAL(ac_cv_have_kde,
2232 2232
 
2233 2233
 if test "$kde_qtver" = 1; then
2234 2234
   kde_check_header="ksock.h"
2235
-  kde_check_lib="libkdecore.la"
2235
+  kde_check_lib="libtdecore.la"
2236 2236
 else
2237 2237
   kde_check_header="ksharedptr.h"
2238
-  kde_check_lib="libkio.la"
2238
+  kde_check_lib="libtdeio.la"
2239 2239
 fi
2240 2240
 
2241 2241
 if test -z "$1"; then
2242 2242
 
2243
-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"
2244
-test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
2243
+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"
2244
+test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"
2245 2245
 kde_incdirs="$ac_kde_includes $kde_incdirs"
2246 2246
 AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
2247 2247
 ac_kde_includes="$kde_incdir"
@@ -2252,8 +2252,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
2252 2252
 So, check this please and use another prefix!])
2253 2253
 fi
2254 2254
 
2255
-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}"
2256
-test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
2255
+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}"
2256
+test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs"
2257 2257
 kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
2258 2258
 AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
2259 2259
 ac_kde_libraries="$kde_libdir"
@@ -2271,7 +2271,7 @@ fi
2271 2271
 if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
2272 2272
 AC_MSG_ERROR([
2273 2273
 I can't find the designer plugins. These are required and should have been installed
2274
-by kdelibs])
2274
+by tdelibs])
2275 2275
 fi
2276 2276
 
2277 2277
 if test -n "$kde_widgetdir"; then
@@ -2286,7 +2286,7 @@ else
2286 2286
     ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
2287 2287
 fi
2288 2288
 
2289
-else dnl test -z $1, e.g. from kdelibs
2289
+else dnl test -z $1, e.g. from tdelibs
2290 2290
 
2291 2291
   ac_cv_have_kde="have_kde=no"
2292 2292
 
@@ -2422,20 +2422,20 @@ cat > conftest.$ac_ext <<EOF
2422 2422
 #include <kapp.h>
2423 2423
 
2424 2424
 int main() {
2425
-    printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
2426
-    printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
2427
-    printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
2428
-    printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
2429
-    printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
2430
-    printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
2431
-    printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
2432
-    printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
2433
-    printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
2434
-    printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
2425
+    printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
2426
+    printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
2427
+    printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
2428
+    printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
2429
+    printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
2430
+    printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
2431
+    printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
2432
+    printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
2433
+    printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
2434
+    printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
2435 2435
     printf("kde_wallpaperdir=\\"%s\\"\n",
2436
-	KApplication::kde_wallpaperdir().data());
2437
-    printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
2438
-    printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
2436
+	TDEApplication::kde_wallpaperdir().data());
2437
+    printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
2438
+    printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
2439 2439
     printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
2440 2440
     printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
2441 2441
     printf("kde_moduledir=\\"/tmp/dummy\\"\n");
@@ -2471,7 +2471,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
2471 2471
  kde_cxxflags_safe="$CXXFLAGS"
2472 2472
 
2473 2473
  LIBS="-lkde-qt-addon $LIBQT $LIBS"
2474
- CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes"
2474
+ CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes"
2475 2475
  LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
2476 2476
 
2477 2477
  AC_TRY_LINK([
@@ -2503,48 +2503,48 @@ m4trace:acinclude.m4:2110: -1- AC_DEFUN([KDE_CREATE_LIBS_ALIASES], [
2503 2503
 
2504 2504
 if test $kde_qtver = 3; then
2505 2505
    case $host in 
2506
-               *cygwin*) lib_kded="-lkdeinit_kded" ;;
2506
+               *cygwin*) lib_kded="-ltdeinit_kded" ;;
2507 2507
                *) lib_kded="" ;;
2508 2508
        esac
2509 2509
    AC_SUBST(LIB_KDED, $lib_kded)
2510
-   AC_SUBST(LIB_KDECORE, "-lkdecore")
2511
-   AC_SUBST(LIB_KDEUI, "-lkdeui")
2512
-   AC_SUBST(LIB_KIO, "-lkio")
2510
+   AC_SUBST(LIB_TDECORE, "-ltdecore")
2511
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
2512
+   AC_SUBST(LIB_TDEIO, "-ltdeio")
2513 2513
    AC_SUBST(LIB_KJS, "-lkjs")
2514 2514
    AC_SUBST(LIB_SMB, "-lsmb")
2515 2515
    AC_SUBST(LIB_KAB, "-lkab")
2516
-   AC_SUBST(LIB_KABC, "-lkabc")
2517
-   AC_SUBST(LIB_KHTML, "-lkhtml")
2518
-   AC_SUBST(LIB_KSPELL, "-lkspell")
2519
-   AC_SUBST(LIB_KPARTS, "-lkparts")
2520
-   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
2521
-   AC_SUBST(LIB_KUTILS, "-lkutils")
2522
-   AC_SUBST(LIB_KDEPIM, "-lkdepim")
2523
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
2516
+   AC_SUBST(LIB_KABC, "-ltdeabc")
2517
+   AC_SUBST(LIB_TDEHTML, "-ltdehtml")
2518
+   AC_SUBST(LIB_TDESPELL, "-ltdespell")
2519
+   AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
2520
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
2521
+   AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
2522
+   AC_SUBST(LIB_TDEPIM, "-ltdepim")
2523
+   AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
2524 2524
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
2525
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
2526
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
2525
+   AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
2526
+   AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
2527 2527
 # these are for backward compatibility
2528
-   AC_SUBST(LIB_KSYCOCA, "-lkio")
2529
-   AC_SUBST(LIB_KFILE, "-lkio")
2528
+   AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
2529
+   AC_SUBST(LIB_KFILE, "-ltdeio")
2530 2530
 elif test $kde_qtver = 2; then
2531
-   AC_SUBST(LIB_KDECORE, "-lkdecore")
2532
-   AC_SUBST(LIB_KDEUI, "-lkdeui")
2533
-   AC_SUBST(LIB_KIO, "-lkio")
2534
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
2531
+   AC_SUBST(LIB_TDECORE, "-ltdecore")
2532
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
2533
+   AC_SUBST(LIB_TDEIO, "-ltdeio")
2534
+   AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
2535 2535
    AC_SUBST(LIB_SMB, "-lsmb")
2536
-   AC_SUBST(LIB_KFILE, "-lkfile")
2536
+   AC_SUBST(LIB_KFILE, "-ltdefile")
2537 2537
    AC_SUBST(LIB_KAB, "-lkab")
2538
-   AC_SUBST(LIB_KHTML, "-lkhtml")
2539
-   AC_SUBST(LIB_KSPELL, "-lkspell")
2540
-   AC_SUBST(LIB_KPARTS, "-lkparts")
2541
-   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
2538
+   AC_SUBST(LIB_TDEHTML, "-ltdehtml")
2539
+   AC_SUBST(LIB_TDESPELL, "-ltdespell")
2540
+   AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
2541
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
2542 2542
 else
2543
-   AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
2544
-   AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
2545
-   AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
2546
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
2547
-   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
2543
+   AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
2544
+   AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
2545
+   AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
2546
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
2547
+   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
2548 2548
 fi
2549 2549
 ])
2550 2550
 m4trace:acinclude.m4:2134: -1- AC_DEFUN([AC_PATH_KDE], [
@@ -2604,7 +2604,7 @@ if test "x$kde_cv_func_$1" = xyes; then
2604 2604
 else
2605 2605
   case "$1" in
2606 2606
 	setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
2607
-		kde_cv_proto_$1="yes - in libkdefakes"
2607
+		kde_cv_proto_$1="yes - in libtdefakes"
2608 2608
 		;;
2609 2609
 	*)
2610 2610
 		kde_cv_proto_$1=unknown
@@ -2888,7 +2888,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
2888 2888
   AC_MSG_RESULT(yes)
2889 2889
   AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
2890 2890
 else
2891
-  AC_MSG_ERROR(You need giflib30. Please install the kdesupport package)
2891
+  AC_MSG_ERROR(You need giflib30. Please install the tdesupport package)
2892 2892
 fi
2893 2893
 ])
2894 2894
 m4trace:acinclude.m4:2530: -1- AC_DEFUN([KDE_FIND_JPEG_HELPER], [
@@ -2942,7 +2942,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
2942 2942
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
2943 2943
 
2944 2944
 dnl if headers _and_ libraries are missing, this is no error, and we
2945
-dnl continue with a warning (the user will get no jpeg support in khtml)
2945
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
2946 2946
 dnl if only one is missing, it means a configuration error, but we still
2947 2947
 dnl only warn
2948 2948
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3832,7 +3832,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
3832 3832
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
3833 3833
 AC_SUBST(KDE_PLUGIN)
3834 3834
 
3835
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
3835
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
3836 3836
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
3837 3837
 AC_SUBST(KDE_CHECK_PLUGIN)
3838 3838
 
@@ -3843,9 +3843,9 @@ m4trace:acinclude.m4:3536: -1- AC_DEFUN([KDE_CHECK_LIB64], [
3843 3843
     AC_ARG_ENABLE(libsuffix,
3844 3844
         AC_HELP_STRING([--enable-libsuffix],
3845 3845
             [/lib directory suffix (64,32,none,auto[=default])]),
3846
-            kdelibsuff=$enableval, kdelibsuff="auto")
3846
+            tdelibsuff=$enableval, tdelibsuff="auto")
3847 3847
     
3848
-    if test "$kdelibsuff" = "auto"; then
3848
+    if test "$tdelibsuff" = "auto"; then
3849 3849
     
3850 3850
 cat > conftest.c << EOF
3851 3851
 #include <stdio.h>
@@ -3853,26 +3853,26 @@ int main() {
3853 3853
  return 0;
3854 3854
 }
3855 3855
 EOF
3856
-        kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
3856
+        tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
3857 3857
     s,.*/lib\([[^\/]]*\)/.*,\1, 
3858 3858
     p 
3859 3859
 }'`
3860 3860
 	rm -rf conftest.*
3861 3861
     fi	
3862 3862
 	
3863
-    if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then
3864
-       kdelibsuff=
3863
+    if test "$tdelibsuff" = "no" || test "$tdelibsuff" = "none"; then
3864
+       tdelibsuff=
3865 3865
     fi
3866
-    if test -z "$kdelibsuff"; then
3866
+    if test -z "$tdelibsuff"; then
3867 3867
         AC_MSG_RESULT([not using lib directory suffix])
3868 3868
         AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories)
3869 3869
     else
3870 3870
         if test "$libdir" = '${exec_prefix}/lib'; then
3871
-            libdir="$libdir${kdelibsuff}"
3871
+            libdir="$libdir${tdelibsuff}"
3872 3872
             AC_SUBST([libdir], ["$libdir"])  dnl ugly hack for lib64 platforms
3873 3873
         fi
3874
-        AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories)
3875
-        AC_MSG_RESULT([using lib directory suffix $kdelibsuff])
3874
+        AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories)
3875
+        AC_MSG_RESULT([using lib directory suffix $tdelibsuff])
3876 3876
     fi
3877 3877
 ])
3878 3878
 m4trace:acinclude.m4:3543: -1- AC_DEFUN([KDE_CHECK_TYPES], [  AC_CHECK_SIZEOF(int, 4)dnl
@@ -3885,7 +3885,7 @@ AC_CANONICAL_SYSTEM
3885 3885
 AC_ARG_PROGRAM
3886 3886
 AM_INIT_AUTOMAKE($1, $2)
3887 3887
 AM_DISABLE_LIBRARIES
3888
-AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
3888
+AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
3889 3889
 AC_CHECK_COMPILERS
3890 3890
 KDE_PROG_LIBTOOL
3891 3891
 AM_KDE_WITH_NLS
@@ -4798,7 +4798,7 @@ fi
4798 4798
 
4799 4799
 PYTHONINC=-I$python_incdir
4800 4800
 
4801
-python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
4801
+python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs"
4802 4802
 AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
4803 4803
 if test ! -r $python_libdir/libpython$version.so; then
4804 4804
   AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
@@ -5152,8 +5152,8 @@ m4trace:acinclude.m4:4947: -1- AC_DEFUN([KDE_CONF_FILES], [
5152 5152
 ])
5153 5153
 m4trace:acinclude.m4:4972: -1- AC_DEFUN([KDE_SET_PREFIX_CORE], [
5154 5154
   unset CDPATH
5155
-  dnl make $KDEDIR the default for the installation
5156
-  AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
5155
+  dnl make $TDEDIR the default for the installation
5156
+  AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
5157 5157
 
5158 5158
   if test "x$prefix" = "xNONE"; then
5159 5159
     prefix=$ac_default_prefix
@@ -5174,25 +5174,25 @@ m4trace:acinclude.m4:5024: -1- AC_DEFUN([KDE_SET_PREFIX], [
5174 5174
   unset CDPATH
5175 5175
   dnl We can't give real code to that macro, only a value.
5176 5176
   dnl It only matters for --help, since we set the prefix in this function anyway.
5177
-  AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix})
5177
+  AC_PREFIX_DEFAULT(${TDEDIR:-the kde prefix})
5178 5178
 
5179 5179
   KDE_SET_DEFAULT_BINDIRS
5180 5180
   if test "x$prefix" = "xNONE"; then
5181
-    dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it
5182
-    KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
5181
+    dnl no prefix given: look for tde-config in the PATH and deduce the prefix from it
5182
+    KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
5183 5183
   else
5184
-    dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH
5184
+    dnl prefix given: look for tde-config, preferrably in prefix, otherwise in PATH
5185 5185
     kde_save_PATH="$PATH"
5186 5186
     PATH="$exec_prefix/bin:$prefix/bin:$PATH"
5187
-    KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
5187
+    KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
5188 5188
     PATH="$kde_save_PATH"
5189 5189
   fi
5190 5190
 
5191 5191
   kde_libs_prefix=`$KDECONFIG --prefix`
5192 5192
   if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
5193
-       AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
5193
+       AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs.
5194 5194
                     This means it has been moved since you installed it.
5195
-                    This won't work. Please recompile kdelibs for the new prefix.
5195
+                    This won't work. Please recompile tdelibs for the new prefix.
5196 5196
                     ])
5197 5197
   fi
5198 5198
   kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
@@ -5200,7 +5200,7 @@ m4trace:acinclude.m4:5024: -1- AC_DEFUN([KDE_SET_PREFIX], [
5200 5200
   AC_MSG_CHECKING([where to install])
5201 5201
   if test "x$prefix" = "xNONE"; then
5202 5202
     prefix=$kde_libs_prefix
5203
-    AC_MSG_RESULT([$prefix (as returned by kde-config)])
5203
+    AC_MSG_RESULT([$prefix (as returned by tde-config)])
5204 5204
   else
5205 5205
     dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different
5206 5206
     given_prefix=$prefix
@@ -5741,7 +5741,7 @@ ssl_includes=""
5741 5741
 AC_ARG_WITH(ssl-dir,
5742 5742
     AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]),
5743 5743
     [  ac_ssl_includes="$withval"/include
5744
-       ac_ssl_libraries="$withval"/lib$kdelibsuff
5744
+       ac_ssl_libraries="$withval"/lib$tdelibsuff
5745 5745
     ])
5746 5746
 
5747 5747
 want_ssl=yes
@@ -5761,7 +5761,7 @@ AC_CACHE_VAL(ac_cv_have_ssl,
5761 5761
   AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir)
5762 5762
   ac_ssl_includes="$ssl_incdir"
5763 5763
 
5764
-  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"
5764
+  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"
5765 5765
   if test ! "$ac_ssl_libraries" = "NO"; then
5766 5766
     ssl_libdirs="$ac_ssl_libraries $ssl_libdirs"
5767 5767
   fi
@@ -5982,9 +5982,9 @@ fi
5982 5982
 ])
5983 5983
 m4trace:acinclude.m4:5926: -1- AC_DEFUN([KDE_PKG_CHECK_MODULES], [
5984 5984
 
5985
-   PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
5985
+   PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
5986 5986
    if test "$prefix" != "$kde_libs_prefix"; then
5987
-       PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
5987
+       PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
5988 5988
    fi
5989 5989
    export PKG_CONFIG_PATH
5990 5990
    PKG_CHECK_MODULES([$1],[$2],[$3],[$4])
@@ -10033,7 +10033,7 @@ EOF
10033 10033
     # Now try to grab the symbols.
10034 10034
     nlist=conftest.nm
10035 10035
     if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
10036
-      # Try sorting and uniquifying the output.
10036
+      # Try sorting and unitquifying the output.
10037 10037
       if sort "$nlist" | uniq > "$nlist"T; then
10038 10038
 	mv -f "$nlist"T "$nlist"
10039 10039
       else
@@ -11592,10 +11592,10 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
11592 11592
 m4trace:configure.in:43: -2- _AM_MANGLE_OPTION([no-dependencies])
11593 11593
 m4trace:configure.in:45: -1- KDE_SET_PREFIX
11594 11594
 m4trace:configure.in:45: -1- KDE_SET_DEFAULT_BINDIRS
11595
-m4trace:configure.in:45: -1- KDE_FIND_PATH([kde-config], [KDECONFIG], [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], [prepend])
11596
-m4trace:configure.in:45: -1- KDE_MISSING_PROG_ERROR([kde-config])
11597
-m4trace:configure.in:45: -1- KDE_FIND_PATH([kde-config], [KDECONFIG], [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], [prepend])
11598
-m4trace:configure.in:45: -1- KDE_MISSING_PROG_ERROR([kde-config])
11595
+m4trace:configure.in:45: -1- KDE_FIND_PATH([tde-config], [KDECONFIG], [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], [prepend])
11596
+m4trace:configure.in:45: -1- KDE_MISSING_PROG_ERROR([tde-config])
11597
+m4trace:configure.in:45: -1- KDE_FIND_PATH([tde-config], [KDECONFIG], [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], [prepend])
11598
+m4trace:configure.in:45: -1- KDE_MISSING_PROG_ERROR([tde-config])
11599 11599
 m4trace:configure.in:45: -1- m4_pattern_allow([^KDECONFIG$])
11600 11600
 m4trace:configure.in:45: -1- m4_pattern_allow([^kde_libs_prefix$])
11601 11601
 m4trace:configure.in:45: -1- m4_pattern_allow([^kde_libs_htmldir$])
@@ -16519,12 +16519,12 @@ m4trace:configure.in:61: -1- KDE_MISSING_ARTS_ERROR([mcopidl])
16519 16519
 m4trace:configure.in:61: -1- KDE_FIND_PATH([artsc-config], [ARTSCCONFIG], [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)])
16520 16520
 m4trace:configure.in:61: -1- KDE_MISSING_ARTS_ERROR([artsc-config])
16521 16521
 m4trace:configure.in:61: -1- KDE_FIND_PATH([meinproc], [MEINPROC], [$kde_default_bindirs])
16522
-m4trace:configure.in:61: -1- KDE_FIND_PATH([kconfig_compiler], [KCONFIG_COMPILER], [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
16523
-m4trace:configure.in:61: -1- KDE_MISSING_PROG_ERROR([kconfig_compiler])
16522
+m4trace:configure.in:61: -1- KDE_FIND_PATH([tdeconfig_compiler], [KCONFIG_COMPILER], [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
16523
+m4trace:configure.in:61: -1- KDE_MISSING_PROG_ERROR([tdeconfig_compiler])
16524 16524
 m4trace:configure.in:61: -1- KDE_FIND_PATH([dcopidlng], [DCOPIDLNG], [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
16525 16525
 m4trace:configure.in:61: -1- KDE_MISSING_PROG_ERROR([dcopidlng])
16526
-m4trace:configure.in:61: -1- KDE_FIND_PATH([makekdewidgets], [MAKEKDEWIDGETS], [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)])
16527
-m4trace:configure.in:61: -1- KDE_MISSING_PROG_ERROR([makekdewidgets])
16526
+m4trace:configure.in:61: -1- KDE_FIND_PATH([maketdewidgets], [MAKEKDEWIDGETS], [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(maketdewidgets)])
16527
+m4trace:configure.in:61: -1- KDE_MISSING_PROG_ERROR([maketdewidgets])
16528 16528
 m4trace:configure.in:61: -1- m4_pattern_allow([^MAKEKDEWIDGETS$])
16529 16529
 m4trace:configure.in:61: -1- KDE_FIND_PATH([xmllint], [XMLLINT], [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
16530 16530
 m4trace:configure.in:61: -1- AC_FIND_FILE([apps/ksgmltools2/customization/kde-chunk.xsl], [$kde_sharedirs], [KDE_XSL_STYLESHEET])
@@ -16572,43 +16572,43 @@ m4trace:configure.in:61: -1- m4_pattern_allow([^kde_templatesdir$])
16572 16572
 m4trace:configure.in:61: -1- m4_pattern_allow([^kde_servicesdir$])
16573 16573
 m4trace:configure.in:61: -1- m4_pattern_allow([^kde_servicetypesdir$])
16574 16574
 m4trace:configure.in:61: -1- m4_pattern_allow([^kde_moduledir$])
16575
-m4trace:configure.in:61: -1- m4_pattern_allow([^kdeinitdir$])
16575
+m4trace:configure.in:61: -1- m4_pattern_allow([^tdeinitdir$])
16576 16576
 m4trace:configure.in:61: -1- m4_pattern_allow([^kde_styledir$])
16577 16577
 m4trace:configure.in:61: -1- m4_pattern_allow([^kde_widgetdir$])
16578 16578
 m4trace:configure.in:61: -1- KDE_CREATE_LIBS_ALIASES
16579 16579
 m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDED$])
16580
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDECORE$])
16581
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDEUI$])
16582
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KIO$])
16580
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDECORE$])
16581
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEUI$])
16582
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEIO$])
16583 16583
 m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KJS$])
16584 16584
 m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_SMB$])
16585 16585
 m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KAB$])
16586 16586
 m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KABC$])
16587
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KHTML$])
16588
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KSPELL$])
16589
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KPARTS$])
16590
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDEPRINT$])
16591
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KUTILS$])
16592
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDEPIM$])
16593
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KIMPROXY$])
16587
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEHTML$])
16588
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDESPELL$])
16589
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEPARTS$])
16590
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEPRINT$])
16591
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEUTILS$])
16592
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEPIM$])
16593
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEIMPROXY$])
16594 16594
 m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KNEWSTUFF$])
16595
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDNSSD$])
16596
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KUNITTEST$])
16597
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KSYCOCA$])
16595
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEDNSSD$])
16596
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEUNITTEST$])
16597
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDESYCOCA$])
16598 16598
 m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KFILE$])
16599
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDECORE$])
16600
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDEUI$])
16601
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KIO$])
16602
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KSYCOCA$])
16599
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDECORE$])
16600
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEUI$])
16601
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEIO$])
16602
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDESYCOCA$])
16603 16603
 m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_SMB$])
16604 16604
 m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KFILE$])
16605 16605
 m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KAB$])
16606
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KHTML$])
16607
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KSPELL$])
16608
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KPARTS$])
16609
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDEPRINT$])
16610
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDECORE$])
16611
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDEUI$])
16606
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEHTML$])
16607
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDESPELL$])
16608
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEPARTS$])
16609
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEPRINT$])
16610
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDECORE$])
16611
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEUI$])
16612 16612
 m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KFM$])
16613 16613
 m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KFILE$])
16614 16614
 m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KAB$])

+ 78
- 78
autom4te.cache/traces.1 View File

@@ -3368,9 +3368,9 @@ m4trace:configure.in:61: -1- m4_pattern_allow([^kde_servicetypesdir$])
3368 3368
 m4trace:configure.in:61: -1- AC_SUBST([kde_moduledir])
3369 3369
 m4trace:configure.in:61: -1- AC_SUBST_TRACE([kde_moduledir])
3370 3370
 m4trace:configure.in:61: -1- m4_pattern_allow([^kde_moduledir$])
3371
-m4trace:configure.in:61: -1- AC_SUBST([kdeinitdir], ['$(kde_moduledir)'])
3372
-m4trace:configure.in:61: -1- AC_SUBST_TRACE([kdeinitdir])
3373
-m4trace:configure.in:61: -1- m4_pattern_allow([^kdeinitdir$])
3371
+m4trace:configure.in:61: -1- AC_SUBST([tdeinitdir], ['$(kde_moduledir)'])
3372
+m4trace:configure.in:61: -1- AC_SUBST_TRACE([tdeinitdir])
3373
+m4trace:configure.in:61: -1- m4_pattern_allow([^tdeinitdir$])
3374 3374
 m4trace:configure.in:61: -1- AC_SUBST([kde_styledir])
3375 3375
 m4trace:configure.in:61: -1- AC_SUBST_TRACE([kde_styledir])
3376 3376
 m4trace:configure.in:61: -1- m4_pattern_allow([^kde_styledir$])
@@ -3380,15 +3380,15 @@ m4trace:configure.in:61: -1- m4_pattern_allow([^kde_widgetdir$])
3380 3380
 m4trace:configure.in:61: -1- AC_SUBST([LIB_KDED], [$lib_kded])
3381 3381
 m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KDED])
3382 3382
 m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDED$])
3383
-m4trace:configure.in:61: -1- AC_SUBST([LIB_KDECORE], ["-lkdecore"])
3384
-m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KDECORE])
3385
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDECORE$])
3386
-m4trace:configure.in:61: -1- AC_SUBST([LIB_KDEUI], ["-lkdeui"])
3387
-m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KDEUI])
3388
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDEUI$])
3389
-m4trace:configure.in:61: -1- AC_SUBST([LIB_KIO], ["-lkio"])
3390
-m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KIO])
3391
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KIO$])
3383
+m4trace:configure.in:61: -1- AC_SUBST([LIB_TDECORE], ["-ltdecore"])
3384
+m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDECORE])
3385
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDECORE$])
3386
+m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEUI], ["-ltdeui"])
3387
+m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEUI])
3388
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEUI$])
3389
+m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEIO], ["-ltdeio"])
3390
+m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEIO])
3391
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEIO$])
3392 3392
 m4trace:configure.in:61: -1- AC_SUBST([LIB_KJS], ["-lkjs"])
3393 3393
 m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KJS])
3394 3394
 m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KJS$])
@@ -3398,91 +3398,91 @@ m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_SMB$])
3398 3398
 m4trace:configure.in:61: -1- AC_SUBST([LIB_KAB], ["-lkab"])
3399 3399
 m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KAB])
3400 3400
 m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KAB$])
3401
-m4trace:configure.in:61: -1- AC_SUBST([LIB_KABC], ["-lkabc"])
3401
+m4trace:configure.in:61: -1- AC_SUBST([LIB_KABC], ["-ltdeabc"])
3402 3402
 m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KABC])
3403 3403
 m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KABC$])
3404
-m4trace:configure.in:61: -1- AC_SUBST([LIB_KHTML], ["-lkhtml"])
3405
-m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KHTML])
3406
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KHTML$])
3407
-m4trace:configure.in:61: -1- AC_SUBST([LIB_KSPELL], ["-lkspell"])
3408
-m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KSPELL])
3409
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KSPELL$])
3410
-m4trace:configure.in:61: -1- AC_SUBST([LIB_KPARTS], ["-lkparts"])
3411
-m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KPARTS])
3412
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KPARTS$])
3413
-m4trace:configure.in:61: -1- AC_SUBST([LIB_KDEPRINT], ["-lkdeprint"])
3414
-m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KDEPRINT])
3415
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDEPRINT$])
3416
-m4trace:configure.in:61: -1- AC_SUBST([LIB_KUTILS], ["-lkutils"])
3417
-m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KUTILS])
3418
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KUTILS$])
3419
-m4trace:configure.in:61: -1- AC_SUBST([LIB_KDEPIM], ["-lkdepim"])
3420
-m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KDEPIM])
3421
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDEPIM$])
3422
-m4trace:configure.in:61: -1- AC_SUBST([LIB_KIMPROXY], ["-lkimproxy"])
3423
-m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KIMPROXY])
3424
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KIMPROXY$])
3404
+m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEHTML], ["-ltdehtml"])
3405
+m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEHTML])
3406
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEHTML$])
3407
+m4trace:configure.in:61: -1- AC_SUBST([LIB_TDESPELL], ["-ltdespell"])
3408
+m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDESPELL])
3409
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDESPELL$])
3410
+m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEPARTS], ["-ltdeparts"])
3411
+m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEPARTS])
3412
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEPARTS$])
3413
+m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEPRINT], ["-ltdeprint"])
3414
+m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEPRINT])
3415
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEPRINT$])
3416
+m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEUTILS], ["-ltdeutils"])
3417
+m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEUTILS])
3418
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEUTILS$])
3419
+m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEPIM], ["-ltdepim"])
3420
+m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEPIM])
3421
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEPIM$])
3422
+m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEIMPROXY], ["-ltdeimproxy"])
3423
+m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEIMPROXY])
3424
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEIMPROXY$])
3425 3425
 m4trace:configure.in:61: -1- AC_SUBST([LIB_KNEWSTUFF], ["-lknewstuff"])
3426 3426
 m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KNEWSTUFF])
3427 3427
 m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KNEWSTUFF$])
3428
-m4trace:configure.in:61: -1- AC_SUBST([LIB_KDNSSD], ["-lkdnssd"])
3429
-m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KDNSSD])
3430
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDNSSD$])
3431
-m4trace:configure.in:61: -1- AC_SUBST([LIB_KUNITTEST], ["-lkunittest"])
3432
-m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KUNITTEST])
3433
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KUNITTEST$])
3434
-m4trace:configure.in:61: -1- AC_SUBST([LIB_KSYCOCA], ["-lkio"])
3435
-m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KSYCOCA])
3436
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KSYCOCA$])
3437
-m4trace:configure.in:61: -1- AC_SUBST([LIB_KFILE], ["-lkio"])
3428
+m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEDNSSD], ["-ltdednssd"])
3429
+m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEDNSSD])
3430
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEDNSSD$])
3431
+m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEUNITTEST], ["-ltdeunittest"])
3432
+m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEUNITTEST])
3433
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEUNITTEST$])
3434
+m4trace:configure.in:61: -1- AC_SUBST([LIB_TDESYCOCA], ["-ltdeio"])
3435
+m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDESYCOCA])
3436
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDESYCOCA$])
3437
+m4trace:configure.in:61: -1- AC_SUBST([LIB_KFILE], ["-ltdeio"])
3438 3438
 m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KFILE])
3439 3439
 m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KFILE$])
3440
-m4trace:configure.in:61: -1- AC_SUBST([LIB_KDECORE], ["-lkdecore"])
3441
-m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KDECORE])
3442
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDECORE$])
3443
-m4trace:configure.in:61: -1- AC_SUBST([LIB_KDEUI], ["-lkdeui"])
3444
-m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KDEUI])
3445
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDEUI$])
3446
-m4trace:configure.in:61: -1- AC_SUBST([LIB_KIO], ["-lkio"])
3447
-m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KIO])
3448
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KIO$])
3449
-m4trace:configure.in:61: -1- AC_SUBST([LIB_KSYCOCA], ["-lksycoca"])
3450
-m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KSYCOCA])
3451
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KSYCOCA$])
3440
+m4trace:configure.in:61: -1- AC_SUBST([LIB_TDECORE], ["-ltdecore"])
3441
+m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDECORE])
3442
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDECORE$])
3443
+m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEUI], ["-ltdeui"])
3444
+m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEUI])
3445
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEUI$])
3446
+m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEIO], ["-ltdeio"])
3447
+m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEIO])
3448
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEIO$])
3449
+m4trace:configure.in:61: -1- AC_SUBST([LIB_TDESYCOCA], ["-ltdesycoca"])
3450
+m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDESYCOCA])
3451
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDESYCOCA$])
3452 3452
 m4trace:configure.in:61: -1- AC_SUBST([LIB_SMB], ["-lsmb"])
3453 3453
 m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_SMB])
3454 3454
 m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_SMB$])
3455
-m4trace:configure.in:61: -1- AC_SUBST([LIB_KFILE], ["-lkfile"])
3455
+m4trace:configure.in:61: -1- AC_SUBST([LIB_KFILE], ["-ltdefile"])
3456 3456
 m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KFILE])
3457 3457
 m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KFILE$])
3458 3458
 m4trace:configure.in:61: -1- AC_SUBST([LIB_KAB], ["-lkab"])
3459 3459
 m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KAB])
3460 3460
 m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KAB$])
3461
-m4trace:configure.in:61: -1- AC_SUBST([LIB_KHTML], ["-lkhtml"])
3462
-m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KHTML])
3463
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KHTML$])
3464
-m4trace:configure.in:61: -1- AC_SUBST([LIB_KSPELL], ["-lkspell"])
3465
-m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KSPELL])
3466
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KSPELL$])
3467
-m4trace:configure.in:61: -1- AC_SUBST([LIB_KPARTS], ["-lkparts"])
3468
-m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KPARTS])
3469
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KPARTS$])
3470
-m4trace:configure.in:61: -1- AC_SUBST([LIB_KDEPRINT], ["-lkdeprint"])
3471
-m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KDEPRINT])
3472
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDEPRINT$])
3473
-m4trace:configure.in:61: -1- AC_SUBST([LIB_KDECORE], ["-lkdecore -lXext $(LIB_QT)"])
3474
-m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KDECORE])
3475
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDECORE$])
3476
-m4trace:configure.in:61: -1- AC_SUBST([LIB_KDEUI], ["-lkdeui $(LIB_KDECORE)"])
3477
-m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KDEUI])
3478
-m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDEUI$])
3479
-m4trace:configure.in:61: -1- AC_SUBST([LIB_KFM], ["-lkfm $(LIB_KDECORE)"])
3461
+m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEHTML], ["-ltdehtml"])
3462
+m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEHTML])
3463
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEHTML$])
3464
+m4trace:configure.in:61: -1- AC_SUBST([LIB_TDESPELL], ["-ltdespell"])
3465
+m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDESPELL])
3466
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDESPELL$])
3467
+m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEPARTS], ["-ltdeparts"])
3468
+m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEPARTS])
3469
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEPARTS$])
3470
+m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEPRINT], ["-ltdeprint"])
3471
+m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEPRINT])
3472
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEPRINT$])
3473
+m4trace:configure.in:61: -1- AC_SUBST([LIB_TDECORE], ["-ltdecore -lXext $(LIB_QT)"])
3474
+m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDECORE])
3475
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDECORE$])
3476
+m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEUI], ["-ltdeui $(LIB_TDECORE)"])
3477
+m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEUI])
3478
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEUI$])
3479
+m4trace:configure.in:61: -1- AC_SUBST([LIB_KFM], ["-lkfm $(LIB_TDECORE)"])
3480 3480
 m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KFM])
3481 3481
 m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KFM$])
3482
-m4trace:configure.in:61: -1- AC_SUBST([LIB_KFILE], ["-lkfile $(LIB_KFM) $(LIB_KDEUI)"])
3482
+m4trace:configure.in:61: -1- AC_SUBST([LIB_KFILE], ["-ltdefile $(LIB_KFM) $(LIB_TDEUI)"])
3483 3483
 m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KFILE])
3484 3484
 m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KFILE$])
3485
-m4trace:configure.in:61: -1- AC_SUBST([LIB_KAB], ["-lkab $(LIB_KIMGIO) $(LIB_KDECORE)"])
3485
+m4trace:configure.in:61: -1- AC_SUBST([LIB_KAB], ["-lkab $(LIB_KIMGIO) $(LIB_TDECORE)"])
3486 3486
 m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KAB])
3487 3487
 m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KAB$])
3488 3488
 m4trace:configure.in:69: -1- AC_DEFINE_TRACE_LITERAL([WORDS_BIGENDIAN])

+ 9
- 9
doc/en/index.docbook View File

@@ -2,7 +2,7 @@
2 2
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
3 3
   <!ENTITY find "<application>find 0.1</application>">
4 4
   <!ENTITY kappname "&find;"><!-- Do *not* replace kappname-->
5
-  <!ENTITY package "kde-module"><!-- kdebase, kdeadmin, etc -->
5
+  <!ENTITY package "kde-module"><!-- tdebase, tdeadmin, etc -->
6 6
   <!ENTITY % addindex "IGNORE">
7 7
   <!ENTITY % English "INCLUDE"><!-- change language only here -->
8 8
   
@@ -158,17 +158,17 @@ patent issues. -->
158 158
 
159 159
 <para>It slices! It dices! and it comes with a free toaster!</para>
160 160
 <para>
161
-The Squiggle Tool <guiicon><inlinemediaobject>
161
+The Stquiggle Tool <guiicon><inlinemediaobject>
162 162
 	  <imageobject>
163
-	    <imagedata fileref="squiggle.png" format="PNG"/>
163
+	    <imagedata fileref="stquiggle.png" format="PNG"/>
164 164
 	  </imageobject>
165 165
 	  <imageobject>
166
-	    <imagedata fileref="squiggle.eps" format="EPS"/>
166
+	    <imagedata fileref="stquiggle.eps" format="EPS"/>
167 167
 	  </imageobject>
168 168
 	  <textobject>
169
-	    <phrase>Squiggle</phrase>
169
+	    <phrase>Stquiggle</phrase>
170 170
 	  </textobject>
171
-</inlinemediaobject></guiicon> is used to draw squiggly lines all over
171
+</inlinemediaobject></guiicon> is used to draw stquiggly lines all over
172 172
 the &find; main window. It's not a bug, it's a feature!
173 173
 </para>
174 174
 
@@ -441,7 +441,7 @@ Program copyright 2007 Andreas Eckstein <email>andreas.eckstein@gmx.net</email>
441 441
 <para>
442 442
 Contributors:
443 443
 <itemizedlist>
444
-<listitem><para>Konqui the KDE Dragon <email>konqui@kde.org</email></para>
444
+<listitem><para>Kontqui the KDE Dragon <email>kontqui@kde.org</email></para>
445 445
 </listitem>
446 446
 <listitem><para>Tux the Linux Penguin <email>tux@linux.org</email></para>
447 447
 </listitem>
@@ -488,8 +488,8 @@ application -->
488 488
 
489 489
 <!--
490 490
 List any special requirements for your application here. This should include:
491
-.Libraries or other software that is not included in kdesupport,
492
-kdelibs, or kdebase.
491
+.Libraries or other software that is not included in tdesupport,
492
+tdelibs, or tdebase.
493 493
 .Hardware requirements like amount of RAM, disk space, graphics card
494 494
 capabilities, screen resolution, special expansion cards, etc.
495 495
 .Operating systems the app will run on. If your app is designed only for a

+ 5
- 5
src/Makefile.am View File

@@ -1,15 +1,15 @@
1 1
 INCLUDES    = $(all_includes)
2 2
 
3
-kde_module_LTLIBRARIES = kio_find.la
3
+kde_module_LTLIBRARIES = tdeio_find.la
4 4
 
5
-kio_find_la_SOURCES = find.cpp findimpl.cpp findurl.cpp trackerfindclient.cpp
6
-kio_find_la_LIBADD = -lkio        
7
-kio_find_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN)
5
+tdeio_find_la_SOURCES = find.cpp findimpl.cpp findurl.cpp trackerfindclient.cpp
6
+tdeio_find_la_LIBADD = -ltdeio        
7
+tdeio_find_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN)
8 8
 
9 9
 protocol_DATA = find.protocol
10 10
 protocoldir = $(kde_servicesdir)
11 11
 
12 12
 messages: rc.cpp
13 13
 	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
14
-	$(XGETTEXT) *.cpp -o $(podir)/kio_find.pot
14
+	$(XGETTEXT) *.cpp -o $(podir)/tdeio_find.pot
15 15
 noinst_HEADERS = findimpl.h findurl.h trackerfindclient.h

+ 25
- 25
src/find.cpp View File

@@ -19,56 +19,56 @@
19 19
  ***************************************************************************/
20 20
 
21 21
 #include <kdebug.h>
22
-#include <klocale.h>
23
-#include <kapplication.h>
22
+#include <tdelocale.h>
23
+#include <tdeapplication.h>
24 24
 #include <dcopclient.h>
25
-#include <kcmdlineargs.h>
26
-#include <kglobal.h>
25
+#include <tdecmdlineargs.h>
26
+#include <tdeglobal.h>
27 27
 
28 28
 #include "findurl.h"
29 29
 #include "find.h"
30 30
 
31
-static const KCmdLineOptions options[] =
31
+static const TDECmdLineOptions options[] =
32 32
 {
33 33
     { "+protocol", I18N_NOOP( "Protocol name" ), 0 },
34 34
     { "+pool", I18N_NOOP( "Socket name" ), 0 },
35 35
     { "+app", I18N_NOOP( "Socket name" ), 0 },
36
-    KCmdLineLastOption
36
+    TDECmdLineLastOption
37 37
 };
38 38
 
39 39
 extern "C" {
40 40
     int KDE_EXPORT kdemain( int argc, char **argv )
41 41
     {
42 42
         putenv(strdup("SESSION_MANAGER="));
43
-        KCmdLineArgs::init(argc, argv, "kio_find", 0, 0, 0, 0);
44
-        KCmdLineArgs::addCmdLineOptions( options );
45
-        KApplication app( false, false );
43
+        TDECmdLineArgs::init(argc, argv, "tdeio_find", 0, 0, 0, 0);
44
+        TDECmdLineArgs::addCmdLineOptions( options );
45
+        TDEApplication app( false, false );
46 46
         app.dcopClient()->attach();
47 47
 
48
-        KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
49
-        kio_findProtocol slave( args->arg(0), args->arg(1), args->arg(2) );
48
+        TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
49
+        tdeio_findProtocol slave( args->arg(0), args->arg(1), args->arg(2) );
50 50
         slave.dispatchLoop();
51 51
         return 0;
52 52
     }
53 53
 }
54 54
 
55
-kio_findProtocol::kio_findProtocol(const QCString &protocol,
56
-                               const QCString &pool, const QCString &app)
55
+tdeio_findProtocol::tdeio_findProtocol(const TQCString &protocol,
56
+                               const TQCString &pool, const TQCString &app)
57 57
     : SlaveBase(protocol, pool, app)
58 58
 {
59 59
 }
60 60
 
61
-kio_findProtocol::~kio_findProtocol()
61
+tdeio_findProtocol::~tdeio_findProtocol()
62 62
 {
63 63
 }
64 64
 
65
-void kio_findProtocol::listDir(const KURL &url)
65
+void tdeio_findProtocol::listDir(const KURL &url)
66 66
 {
67 67
     FindURL furl(url);
68 68
 
69 69
     if(furl.isMalformed())
70 70
     {
71
-        malformedError(url, QString("listDir"), furl);
71
+        malformedError(url, TQString("listDir"), furl);
72 72
         return;
73 73
     }
74 74
 
@@ -79,8 +79,8 @@ void kio_findProtocol::listDir(const KURL &url)
79 79
         return;
80 80
     }
81 81
 
82
-    KIO::UDSEntry entry;
83
-    KIO::UDSEntryList result_list;
82
+    TDEIO::UDSEntry entry;
83
+    TDEIO::UDSEntryList result_list;
84 84
     
85 85
     if(furl.hasSearch())
86 86
     {
@@ -105,13 +105,13 @@ void kio_findProtocol::listDir(const KURL &url)
105 105
     return;
106 106
 }
107 107
 
108
-void kio_findProtocol::stat(const KURL &url)
108
+void tdeio_findProtocol::stat(const KURL &url)
109 109
 {
110 110
     FindURL furl(url);
111 111
 
112 112
     if (furl.isMalformed())
113 113
     {
114
-        malformedError(url, QString("rewriteURL"), furl);
114
+        malformedError(url, TQString("rewriteURL"), furl);
115 115
         return;
116 116
     }
117 117
 
@@ -124,23 +124,23 @@ void kio_findProtocol::stat(const KURL &url)
124 124
 
125 125
     if(!furl.hasSearch())
126 126
     {
127
-        KIO::UDSEntry entry;
127
+        TDEIO::UDSEntry entry;
128 128
         m_impl.createTopLevelEntry(entry);
129 129
         statEntry(entry);
130 130
         finished();
131 131
         return;
132 132
     }
133 133
 
134
-    KIO::UDSEntry entry;
134
+    TDEIO::UDSEntry entry;
135 135
     m_impl.createSearchSecondLevelEntry(entry , furl.search());
136 136
     statEntry(entry);
137 137
     finished();
138 138
     return;
139 139
 }
140 140
 
141
-void kio_findProtocol::malformedError(const KURL& url, QString func, FindURL& furl)
141
+void tdeio_findProtocol::malformedError(const KURL& url, TQString func, FindURL& furl)
142 142
 {
143
-    QString msg = url.url() + ", " + func + ", path=" + url.path()  + "|search=" + furl.search() + "|filter=" + furl.filter() + "|query=" + furl.query() + "|ref=" + furl.ref();
143
+    TQString msg = url.url() + ", " + func + ", path=" + url.path()  + "|search=" + furl.search() + "|filter=" + furl.filter() + "|query=" + furl.query() + "|ref=" + furl.ref();
144 144
 
145
-    error(KIO::ERR_MALFORMED_URL, msg);
145
+    error(TDEIO::ERR_MALFORMED_URL, msg);
146 146
 }

+ 7
- 7
src/find.h View File

@@ -18,22 +18,22 @@
18 18
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
19 19
  ***************************************************************************/
20 20
 
21
-#ifndef KIO_FIND_H
22
-#define KIO_FIND_H
21
+#ifndef TDEIO_FIND_H
22
+#define TDEIO_FIND_H
23 23
 
24
-#include <kio/forwardingslavebase.h>
24
+#include <tdeio/forwardingslavebase.h>
25 25
 #include "findimpl.h"
26 26
 
27
-class kio_findProtocol : public KIO::SlaveBase
27
+class tdeio_findProtocol : public TDEIO::SlaveBase
28 28
 {
29 29
 public:
30
-    kio_findProtocol(const QCString &protocol, const QCString &pool, const QCString &app);
31
-    virtual ~kio_findProtocol();
30
+    tdeio_findProtocol(const TQCString &protocol, const TQCString &pool, const TQCString &app);
31
+    virtual ~tdeio_findProtocol();
32 32
     virtual void listDir(const KURL &url);
33 33
     virtual void stat(const KURL &url);
34 34
     
35 35
 private:
36
-    void malformedError(const KURL& url, QString func, FindURL& furl);
36
+    void malformedError(const KURL& url, TQString func, FindURL& furl);
37 37
     
38 38
     FindImpl m_impl;
39 39
 };

+ 2
- 2
src/find.protocol View File

@@ -1,5 +1,5 @@
1 1
 [Protocol]
2
-exec=kio_find
2
+exec=tdeio_find
3 3
 protocol=find
4 4
 input=none
5 5
 output=filesystem
@@ -11,6 +11,6 @@ moving=false
11 11
 linking=false
12 12
 #defaultMimetype=inode/directory
13 13
 Icon=find
14
-Description=A kioslave for the 'tracker' indexing and search backend
14
+Description=A tdeioslave for the 'tracker' indexing and search backend
15 15
 URIMode=URL
16 16
 Class=:local

+ 47
- 47
src/findimpl.cpp View File

@@ -22,16 +22,16 @@
22 22
 
23 23
 #include "findimpl.h"
24 24
 
25
-const QString FindImpl::history_dir_name=QString(".find_history.d");
25
+const TQString FindImpl::history_dir_name=TQString(".find_history.d");
26 26
 
27 27
 void FindImpl::applyFilter(ResultList& list, FindURL& url)
28 28
 {
29 29
     if(!url.hasFilter())
30 30
         return;
31 31
 
32
-    QString filter = url.filter().replace('.', "\\.");
32
+    TQString filter = url.filter().replace('.', "\\.");
33 33
     filter = filter.replace('*', "[^\\/]*") + "$";
34
-    QRegExp re(filter, false);
34
+    TQRegExp re(filter, false);
35 35
     ResultListIterator iter = ResultListIterator(list);
36 36
 
37 37
     while(iter.current() != NULL)
@@ -43,9 +43,9 @@ void FindImpl::applyFilter(ResultList& list, FindURL& url)
43 43
     }
44 44
 }
45 45
 
46
-static void addAtom(KIO::UDSEntry &entry, unsigned int ID, long l, const QString &s = QString::null)
46
+static void addAtom(TDEIO::UDSEntry &entry, unsigned int ID, long l, const TQString &s = TQString::null)
47 47
 {
48
-    KIO::UDSAtom atom;
48
+    TDEIO::UDSAtom atom;
49 49
     atom.m_uds = ID;
50 50
     atom.m_long = l;
51 51
     atom.m_str = s;
@@ -54,25 +54,25 @@ static void addAtom(KIO::UDSEntry &entry, unsigned int ID, long l, const QString
54 54
 
55 55
 FindImpl::FindImpl()
56 56
 {
57
-    history_dir.setPath(QDir::homeDirPath() + "/" + history_dir_name);
57
+    history_dir.setPath(TQDir::homeDirPath() + "/" + history_dir_name);
58 58
 }
59 59
 
60 60
 void FindImpl::appendToHistory(FindURL& furl)
61 61
 {
62
-    QFile _history_file(history_dir.path() + "/" + furl.prettyURL().replace('/', "_"));
62
+    TQFile _history_file(history_dir.path() + "/" + furl.prettyURL().replace('/', "_"));
63 63
 
64 64
     if(!history_dir.exists())
65
-        if(!QDir::home().mkdir(history_dir_name))
65
+        if(!TQDir::home().mkdir(history_dir_name))
66 66
             return;
67 67
 
68 68
     if(_history_file.open(IO_WriteOnly|IO_Append))
69 69
     {
70
-            QTextStream stream(&_history_file);
70
+            TQTextStream stream(&_history_file);
71 71
             _history_file.close();
72 72
     }
73 73
 }
74 74
 
75
-void FindImpl::parseHistory(QValueList<KIO::UDSEntry> &list)
75
+void FindImpl::parseHistory(TQValueList<TDEIO::UDSEntry> &list)
76 76
 {
77 77
     history_dir.refresh();
78 78
 
@@ -82,8 +82,8 @@ void FindImpl::parseHistory(QValueList<KIO::UDSEntry> &list)
82 82
     if(history_dir.count()==0)
83 83
         return;
84 84
 
85
-    QFileInfoListIterator it(*history_dir.entryInfoList());
86
-    QFileInfo *info;
85
+    TQFileInfoListIterator it(*history_dir.entryInfoList());
86
+    TQFileInfo *info;
87 87
 
88 88
     while(it.current() != NULL)
89 89
     {
@@ -91,15 +91,15 @@ void FindImpl::parseHistory(QValueList<KIO::UDSEntry> &list)
91 91
         if(info->isFile())
92 92
         {
93 93
             FindURL url(info->baseName().replace('_', "/"));
94
-            KIO::UDSEntry entry;
95
-            addAtom(entry, KIO::UDS_URL, 0, url.prettyURL());
96
-            addAtom(entry, KIO::UDS_NAME, 0, url.search());
97
-            addAtom(entry, KIO::UDS_FILE_TYPE, S_IFDIR);
98
-            addAtom(entry, KIO::UDS_MODIFICATION_TIME, info->lastModified().toTime_t(), QString::null);
99
-            addAtom(entry, KIO::UDS_ACCESS_TIME, info->lastRead().toTime_t(), QString::null);
100
-            addAtom(entry, KIO::UDS_CREATION_TIME, info->created().toTime_t(), QString::null);
101
-            addAtom(entry, KIO::UDS_MIME_TYPE, 0, "inode/directory");
102
-            addAtom(entry, KIO::UDS_ICON_NAME, 0, getIcon(url));
94
+            TDEIO::UDSEntry entry;
95
+            addAtom(entry, TDEIO::UDS_URL, 0, url.prettyURL());
96
+            addAtom(entry, TDEIO::UDS_NAME, 0, url.search());
97
+            addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFDIR);
98
+            addAtom(entry, TDEIO::UDS_MODIFICATION_TIME, info->lastModified().toTime_t(), TQString::null);
99
+            addAtom(entry, TDEIO::UDS_ACCESS_TIME, info->lastRead().toTime_t(), TQString::null);
100
+            addAtom(entry, TDEIO::UDS_CREATION_TIME, info->created().toTime_t(), TQString::null);
101
+            addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, "inode/directory");
102
+            addAtom(entry, TDEIO::UDS_ICON_NAME, 0, getIcon(url));
103 103
             list.append(entry);
104 104
         }
105 105
         
@@ -107,7 +107,7 @@ void FindImpl::parseHistory(QValueList<KIO::UDSEntry> &list)
107 107
     }
108 108
 }
109 109
 
110
-bool FindImpl::getBasename(QString& path, QString& basename)
110
+bool FindImpl::getBasename(TQString& path, TQString& basename)
111 111
 {
112 112
     int i = path.findRev('/');
113 113
     if (i > 0)
@@ -119,19 +119,19 @@ bool FindImpl::getBasename(QString& path, QString& basename)
119 119
         basename = path;
120 120
     }
121 121
 
122
-    return basename != QString::null;
122
+    return basename != TQString::null;
123 123
 }
124 124
 
125
-static void addSearchEntry(QValueList<KIO::UDSEntry> &list, QString& path, QString& label)
125
+static void addSearchEntry(TQValueList<TDEIO::UDSEntry> &list, TQString& path, TQString& label)
126 126
 {
127
-    KIO::UDSEntry entry;
128
-        addAtom(entry, KIO::UDS_URL, 0, path);
129
-        addAtom(entry, KIO::UDS_NAME, 0, label);
127
+    TDEIO::UDSEntry entry;
128
+        addAtom(entry, TDEIO::UDS_URL, 0, path);
129
+        addAtom(entry, TDEIO::UDS_NAME, 0, label);
130 130
 
131 131
     list.append(entry);
132 132
 }
133 133
 
134
-bool FindImpl::listSearch(FindURL& furl, QValueList<KIO::UDSEntry> &list)
134
+bool FindImpl::listSearch(FindURL& furl, TQValueList<TDEIO::UDSEntry> &list)
135 135
 {
136 136
     uint count=0;
137 137
     TrackerFindClient tfclient;
@@ -145,8 +145,8 @@ bool FindImpl::listSearch(FindURL& furl, QValueList<KIO::UDSEntry> &list)
145 145
 
146 146
     for(; iter.current() != NULL; ++iter)
147 147
     {
148
-        QString path = "file://" + (*iter)->path;
149
-        QString basename;
148
+        TQString path = "file://" + (*iter)->path;
149
+        TQString basename;
150 150
         if(getBasename(path, basename))
151 151
             addSearchEntry(list, path, basename);
152 152
         count++;
@@ -159,35 +159,35 @@ bool FindImpl::listSearch(FindURL& furl, QValueList<KIO::UDSEntry> &list)
159 159
     return true;
160 160
 }
161 161
 
162
-bool FindImpl::listSearches(QValueList<KIO::UDSEntry> &list)
162
+bool FindImpl::listSearches(TQValueList<TDEIO::UDSEntry> &list)
163 163
 {
164 164
     parseHistory(list);
165 165
 
166 166
     return true;
167 167
 }
168 168
 
169
-void FindImpl::createTopLevelEntry(KIO::UDSEntry &entry) const
169
+void FindImpl::createTopLevelEntry(TDEIO::UDSEntry &entry) const
170 170
 {
171 171
     entry.clear();
172
-    addAtom(entry, KIO::UDS_NAME, 0, ".");
173
-    addAtom(entry, KIO::UDS_FILE_TYPE, S_IFDIR);
174
-    addAtom(entry, KIO::UDS_ACCESS, 0555);
175
-    addAtom(entry, KIO::UDS_MIME_TYPE, 0, "inode/directory");
176
-    addAtom(entry, KIO::UDS_ICON_NAME, 0, "find");
177
-    addAtom(entry, KIO::UDS_USER, 0, "root");
178
-    addAtom(entry, KIO::UDS_GROUP, 0, "root");
172
+    addAtom(entry, TDEIO::UDS_NAME, 0, ".");
173
+    addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFDIR);
174
+    addAtom(entry, TDEIO::UDS_ACCESS, 0555);
175
+    addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, "inode/directory");
176
+    addAtom(entry, TDEIO::UDS_ICON_NAME, 0, "find");
177
+    addAtom(entry, TDEIO::UDS_USER, 0, "root");
178
+    addAtom(entry, TDEIO::UDS_GROUP, 0, "root");
179 179
 }
180 180
 
181
-void FindImpl::createSearchSecondLevelEntry(KIO::UDSEntry &entry, QString searchstring) const
181
+void FindImpl::createSearchSecondLevelEntry(TDEIO::UDSEntry &entry, TQString searchstring) const
182 182
 {
183 183
     entry.clear();
184
-    addAtom(entry, KIO::UDS_NAME, 0, ".");
185
-    addAtom(entry, KIO::UDS_FILE_TYPE, S_IFDIR);
186
-    addAtom(entry, KIO::UDS_ACCESS, 0555);
187
-    addAtom(entry, KIO::UDS_MIME_TYPE, 0, "inode/directory");
188
-    addAtom(entry, KIO::UDS_ICON_NAME, 0, "kfind");
189
-    addAtom(entry, KIO::UDS_USER, 0, "root");
190
-    addAtom(entry, KIO::UDS_GROUP, 0, "root");
184
+    addAtom(entry, TDEIO::UDS_NAME, 0, ".");
185
+    addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFDIR);
186
+    addAtom(entry, TDEIO::UDS_ACCESS, 0555);
187
+    addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, "inode/directory");
188
+    addAtom(entry, TDEIO::UDS_ICON_NAME, 0, "kfind");
189
+    addAtom(entry, TDEIO::UDS_USER, 0, "root");
190
+    addAtom(entry, TDEIO::UDS_GROUP, 0, "root");
191 191
 }
192 192
 
193 193
 const char* FindImpl::getIcon(FindURL &url)

+ 11
- 11
src/findimpl.h View File

@@ -21,15 +21,15 @@
21 21
 #ifndef FINDIMPL_H
22 22
 #define FINDIMPL_H
23 23
 
24
-#include <kio/global.h>
25
-#include <kio/job.h>
24
+#include <tdeio/global.h>
25
+#include <tdeio/job.h>
26 26
 
27 27
 #include <qdir.h>
28 28
 #include <qpixmap.h>
29 29
 #include "trackerfindclient.h"
30 30
 #include "findurl.h"
31 31
 
32
-class FindImpl : public QObject
32
+class FindImpl : public TQObject
33 33
 {
34 34
 //Q_OBJECT
35 35
 
@@ -37,17 +37,17 @@ public:
37 37
     FindImpl();
38 38
     void applyFilter(ResultList& list, FindURL& url);
39 39
     void appendToHistory(FindURL& furl);
40
-    void parseHistory(QValueList<KIO::UDSEntry> &list);
41
-    bool listSearches(QValueList<KIO::UDSEntry> &list);
42
-    void createTopLevelEntry(KIO::UDSEntry &entry) const;
43
-    void createSearchSecondLevelEntry(KIO::UDSEntry &entry, QString searchstring) const;
44
-    bool listSearch(FindURL& furl, QValueList<KIO::UDSEntry> &list);
40
+    void parseHistory(TQValueList<TDEIO::UDSEntry> &list);
41
+    bool listSearches(TQValueList<TDEIO::UDSEntry> &list);
42
+    void createTopLevelEntry(TDEIO::UDSEntry &entry) const;
43
+    void createSearchSecondLevelEntry(TDEIO::UDSEntry &entry, TQString searchstring) const;
44
+    bool listSearch(FindURL& furl, TQValueList<TDEIO::UDSEntry> &list);
45 45
 
46 46
 private:
47
-    bool getBasename(QString& path, QString& basename);
47
+    bool getBasename(TQString& path, TQString& basename);
48 48
     const char *getIcon(FindURL &url);
49
-    QDir history_dir;
50
-    static const QString history_dir_name;
49
+    TQDir history_dir;
50
+    static const TQString history_dir_name;
51 51
 };
52 52
 
53 53
 #endif

+ 8
- 8
src/findurl.cpp View File

@@ -33,23 +33,23 @@ FindURL::FindURL(const KURL& kurl) : KURL(kurl)
33 33
     parsePath();
34 34
 }
35 35
 
36
-FindURL::FindURL(QString urlstring) : KURL(urlstring)
36
+FindURL::FindURL(TQString urlstring) : KURL(urlstring)
37 37
 {
38 38
     parsePath();
39 39
 }
40 40
 
41 41
 bool FindURL::hasFilter()
42 42
 {
43
-    return m_filter!=QString::null;
43
+    return m_filter!=TQString::null;
44 44
 }
45 45
 
46 46
 bool FindURL::hasSearch()
47 47
 {
48
-    return m_search!=QString::null;
48
+    return m_search!=TQString::null;
49 49
 }
50 50
 bool FindURL::parsePath()
51 51
 {
52
-    QString p = path();
52
+    TQString p = path();
53 53
 
54 54
     normalised = false;
55 55
     malformed = false;
@@ -79,7 +79,7 @@ bool FindURL::parsePath()
79 79
         return false;
80 80
     }
81 81
     
82
-    QString nsearch = m_search.simplifyWhiteSpace();
82
+    TQString nsearch = m_search.simplifyWhiteSpace();
83 83
     nsearch = nsearch.replace(' ', "+");
84 84
     
85 85
     if(nsearch!=m_search)
@@ -88,7 +88,7 @@ bool FindURL::parsePath()
88 88
         m_search = nsearch;
89 89
     }
90 90
     
91
-    QString np = "/";
91
+    TQString np = "/";
92 92
     np += (m_search + "/" + m_filter);
93 93
     setPath(np);
94 94
 
@@ -106,12 +106,12 @@ bool FindURL::isNormalised()
106 106
     return normalised;
107 107
 }
108 108
 
109
-QString FindURL::search()
109
+TQString FindURL::search()
110 110
 {
111 111
     return m_search;
112 112
 }
113 113
 
114
-QString FindURL::filter()
114
+TQString FindURL::filter()
115 115
 {
116 116
     return m_filter;
117 117
 }

+ 6
- 6
src/findurl.h View File

@@ -26,7 +26,7 @@
26 26
 class FindURL : public KURL
27 27
 {
28 28
 public:
29
-    FindURL(QString urlstring);
29
+    FindURL(TQString urlstring);
30 30
     FindURL(KURL& url);
31 31
     FindURL(const KURL& url);
32 32
 
@@ -34,8 +34,8 @@ public:
34 34
     bool isNormalised();
35 35
     bool isMalformed();
36 36
 
37
-    QString filter();
38
-    QString search();
37
+    TQString filter();
38
+    TQString search();
39 39
     int port();
40 40
     bool hasFilter();
41 41
     bool hasSearch();
@@ -43,10 +43,10 @@ public:
43 43
 private:
44 44
     bool malformed;
45 45
     bool normalised;
46
-    bool parseURL(QString path);
46
+    bool parseURL(TQString path);
47 47
     bool parsePath();
48
-    QString m_filter;
49
-    QString m_search;
48
+    TQString m_filter;
49
+    TQString m_search;
50 50
 };
51 51
 
52 52
 #endif

+ 1
- 1
src/tracker.h View File

@@ -1,7 +1,7 @@
1 1
 /* Tracker - indexer and metadata database engine
2 2
  * Copyright (C) 2006, Mr Jamie McCracken (jamiemcc@gnome.org)
3 3
  *
4
- * Slightly adjusted by Andreas Eckstein for use in the kio-find project
4
+ * Slightly adjusted by Andreas Eckstein for use in the tdeio-find project
5 5
  * (changed 'class' variable names to 'classname')
6 6
  *
7 7
  * This library is free software; you can redistribute it and/or

+ 4
- 4
src/trackerfindclient.cpp View File

@@ -58,7 +58,7 @@ const char *TrackerFindClient::getServiceIcon(ServiceType s)
58 58
         case SERVICE_TEXT_FILES:
59 59
             return "kate";
60 60
         case SERVICE_DEVELOPMENT_FILES:
61
-            return "kdevelop";
61
+            return "tdevelop";
62 62
         default:
63 63
             return "kviewshell";
64 64
     }
@@ -72,7 +72,7 @@ ServiceType TrackerFindClient::getServiceType(FindURL &url)
72 72
     }
73 73
     else
74 74
     {
75
-        QString ref = url.ref().lower();
75
+        TQString ref = url.ref().lower();
76 76
         
77 77
         if (ref=="doc"||ref=="document"||ref=="documents") {
78 78
             return SERVICE_DOCUMENTS;
@@ -102,7 +102,7 @@ bool TrackerFindClient::search(FindURL url)
102 102
     TrackerClient *client = NULL;
103 103
     GError *error = NULL;
104 104
     ServiceType type;
105
-    QCString qcsearch = url.search().utf8();
105
+    TQCString qcsearch = url.search().utf8();
106 106
     char search[qcsearch.length()*3+1];// \0 not included!
107 107
 
108 108
     strcpy(search, (const char*)qcsearch);
@@ -136,7 +136,7 @@ bool TrackerFindClient::search(FindURL url)
136 136
 
137 137
     while((search_results[i]!=NULL)&&(i<=limit))
138 138
     {
139
-        results.append(new FindResult(QString::fromUtf8(search_results[i])));
139
+        results.append(new FindResult(TQString::fromUtf8(search_results[i])));
140 140
         i++;
141 141
     }
142 142
 

+ 6
- 6
src/trackerfindclient.h View File

@@ -33,23 +33,23 @@ extern "C"
33 33
 class FindResult
34 34
 {
35 35
 public:
36
-    FindResult(QString p, QString m)
36
+    FindResult(TQString p, TQString m)
37 37
     {
38 38
         path=p;
39 39
         mimeType=m;
40 40
     }
41 41
 
42
-    FindResult(QString p)
42
+    FindResult(TQString p)
43 43
     {
44 44
         path=p;
45 45
     }
46 46
 
47
-    QString path;
48
-    QString mimeType;
47
+    TQString path;
48
+    TQString mimeType;
49 49
 };
50 50
 
51
-typedef QPtrList<FindResult> ResultList;
52
-typedef QPtrListIterator<FindResult> ResultListIterator;
51
+typedef TQPtrList<FindResult> ResultList;
52
+typedef TQPtrListIterator<FindResult> ResultListIterator;
53 53
 
54 54
 class FindBackend
55 55
 {

Loading…
Cancel
Save