Browse Source

Initial TDE conversion

tags/r14.0.0
Slávek Banko 6 years ago
parent
commit
a915aa74dc
79 changed files with 777 additions and 777 deletions
  1. 1
    1
      ChangeLog
  2. 1
    1
      Doxyfile
  3. 8
    8
      TODO
  4. 132
    132
      acinclude.m4
  5. 10
    10
      configure.in
  6. 8
    8
      configure.in.in
  7. 3
    3
      doc/en/index.docbook
  8. 1
    1
      src/Makefile.am
  9. 1
    1
      src/arkollon/Makefile.am
  10. 1
    1
      src/arkollon/torkarkollon.cpp
  11. 2
    2
      src/arkollon/wizard.cpp
  12. 11
    11
      src/configdialog.cpp
  13. 3
    3
      src/configdialog.h
  14. 5
    5
      src/crashhandler.cpp
  15. 1
    1
      src/dndlistview.cpp
  16. 5
    5
      src/firewallsproxies.ui.h
  17. 6
    6
      src/functions.cpp
  18. 1
    1
      src/hiddensrvs.ui
  19. 6
    6
      src/hiddensrvs.ui.h
  20. 1
    1
      src/hidsrvwizard.ui.h
  21. 6
    6
      src/hitwidget.cpp
  22. 3
    3
      src/kerrylabel.cpp
  23. 6
    6
      src/konqplugin/Makefile.am
  24. 28
    28
      src/konqplugin/tork_plug_in.cpp
  25. 11
    11
      src/konqplugin/tork_plug_in.desktop
  26. 4
    4
      src/konqplugin/tork_plug_in.h
  27. 1
    1
      src/konqplugin/tork_plug_in.rc
  28. 7
    7
      src/kwidgetlistbox.cpp
  29. 38
    38
      src/likeback.cpp
  30. 18
    18
      src/likeback.h
  31. 3
    3
      src/likeback_private.h
  32. 12
    12
      src/main.cpp
  33. 2
    2
      src/maxmin.ui.h
  34. 2
    2
      src/mixminion.ui
  35. 4
    4
      src/mixminion.ui.h
  36. 16
    16
      src/newfirstrunwizard.ui.h
  37. 9
    9
      src/newstreamosd.cpp
  38. 3
    3
      src/newstreamosd.h
  39. 1
    1
      src/paranoia.ui.h
  40. 4
    4
      src/quickconfig.ui.h
  41. 1
    1
      src/running.ui.h
  42. 1
    1
      src/server.ui.h
  43. 2
    2
      src/serverwizard.ui.h
  44. 1
    1
      src/testprivacyproxy.cpp
  45. 1
    1
      src/testprivacyproxy.h
  46. 5
    5
      src/tor_ioslave/Makefile.am
  47. 16
    16
      src/tor_ioslave/torioslave.cpp
  48. 5
    5
      src/tor_ioslave/torioslave.h
  49. 13
    13
      src/tor_ioslave/torioslave.protocol
  50. 6
    6
      src/torclient.cpp
  51. 5
    5
      src/torclient.h
  52. 153
    153
      src/tork.cpp
  53. 1
    1
      src/tork.desktop
  54. 75
    75
      src/tork.h
  55. 1
    1
      src/tork.kcfgc
  56. 1
    1
      src/tork_downloadwithfirefox.desktop
  57. 1
    1
      src/tork_downloadwithkonqueror.desktop
  58. 1
    1
      src/tork_downloadwithopera.desktop
  59. 1
    1
      src/torkactivelabel.cpp
  60. 1
    1
      src/torkapplet/Makefile.am
  61. 6
    6
      src/torkapplet/tork_mnu.cpp
  62. 2
    2
      src/torkapplet/torkmenu.desktop
  63. 1
    1
      src/torkconfig.kcfgc
  64. 24
    24
      src/torkview.cpp
  65. 1
    1
      src/torkview_base.ui
  66. 8
    8
      src/torkview_base.ui.h
  67. 1
    1
      src/torservers.ui.h
  68. 4
    4
      src/trayicon.cpp
  69. 2
    2
      src/trayicon.h
  70. 15
    15
      src/update.cpp
  71. 7
    7
      src/update.h
  72. 3
    3
      src/upnp/exitoperation.cpp
  73. 4
    4
      src/upnp/exitoperation.h
  74. 2
    2
      src/upnp/upnpmcastsocket.cpp
  75. 12
    12
      src/upnp/upnprouter.cpp
  76. 4
    4
      src/upnp/upnprouter.h
  77. 2
    2
      src/upnpmanager.cpp
  78. 1
    1
      src/usability.ui.h
  79. 2
    2
      tork.kdevelop

+ 1
- 1
ChangeLog View File

@@ -111,7 +111,7 @@
111 111
        in some situations.
112 112
      o The non-anonymous settings (e.g. cookies,javascript) were not getting
113 113
        restored properly in some cases. This was due to an eccentricity in
114
-       KConfig.
114
+       TDEConfig.
115 115
      o Be a little more aggressive with UPnP. Silently re-apply port
116 116
        forwarding to the UPnP router when (i) Tor tells us it has failed
117 117
        reachability tests, (ii) whenever the user presses play.

+ 1
- 1
Doxyfile View File

@@ -3,7 +3,7 @@
3 3
 #---------------------------------------------------------------------------
4 4
 # Project related configuration options
5 5
 #---------------------------------------------------------------------------
6
-PROJECT_NAME           = ktor.kdevelop
6
+PROJECT_NAME           = ktor.tdevelop
7 7
 PROJECT_NUMBER         = 0.1
8 8
 OUTPUT_DIRECTORY       = 
9 9
 CREATE_SUBDIRS         = NO

+ 8
- 8
TODO View File

@@ -35,12 +35,12 @@ make it easier to spot and add servers like these to the enemy server list.
35 35
         selected in drop-down?)
36 36
       - Leave 'server' grayed-out and unapplied until settings are applied?
37 37
 
38
-  - kdesudo is fucked. need to use the API.
38
+  - tdesudo is fucked. need to use the API.
39 39
 
40 40
   - Add a 'monitor' option - tork does not do any setconf'ing.
41 41
 
42 42
 
43
-  - Ability to import blocklists. - khotnewstuff?
43
+  - Ability to import blocklists. - tdehotnewstuff?
44 44
 
45 45
   * customized pktstat to report all non-tor traffic
46 46
     - non-tor traffic osd
@@ -68,8 +68,8 @@ TorkConfig::self()->config()->copyTo("profilename",TorkConfig::self()->config()
68 68
 
69 69
 
70 70
       //Load a profile
71
-      KConfig *tmpconfig;
72
-      tmpconfig = new KConfig("torkspecialrc", false, false);
71
+      TDEConfig *tmpconfig;
72
+      tmpconfig = new TDEConfig("torkspecialrc", false, false);
73 73
       tmpconfig->copyTo("torkspecialrctmp",TorkConfig::self()->config());
74 74
       now delete torkspecialrctmp
75 75
 
@@ -122,7 +122,7 @@ For 0.32:
122 122
 
123 123
 Sometime:
124 124
 
125
-  * use kpaaworddialog and kdesuclient for password requests
125
+  * use kpaaworddialog and tdesuclient for password requests
126 126
 
127 127
   - Re-tool kicker applet
128 128
 
@@ -298,7 +298,7 @@ options manually and on the fly.
298 298
 * Check torkify installation when launching torkify
299 299
 
300 300
 Minor
301
-* use kpaaworddialog and kdesuclient for password requests
301
+* use kpaaworddialog and tdesuclient for password requests
302 302
 * Toggle javascript and cookies from control button in konqueror
303 303
 * rename 'my network view'
304 304
 * Use RelayBandwidthRate
@@ -329,7 +329,7 @@ TODO SOMETIME
329 329
 * Re-write controller logic.
330 330
 * use kompile instead of arkollon
331 331
 * Split out tork.cpp a bit, at least a vagure gesture towards cleaner code
332
-* Find and squash as many bugs as possible in kconfig and elsewhere.
332
+* Find and squash as many bugs as possible in tdeconfig and elsewhere.
333 333
 * 'Configure KMail' wizard for Mixminion
334 334
 * filter log with right-click
335 335
 * Full-refresh-of-server-list button
@@ -417,7 +417,7 @@ if it is more than'. but that option is for clients, not servers.
417 417
 simultaneous connections allowed'. my maxconn doesn't actually perform this
418 418
 function. nothing does.
419 419
 * remove ASSERT: "(mode & KFile::Files) == 0"
420
-in/tmp/buildd/kdelibs-3.5.5a.dfsg.1/./kio/kfile/kurlrequester.cpp (311)
420
+in/tmp/buildd/tdelibs-3.5.5a.dfsg.1/./tdeio/tdefile/kurlrequester.cpp (311)
421 421
 
422 422
 
423 423
 In 0.19:

+ 132
- 132
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
@@ -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_KIO, "-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_KSPELL, "-ltdespell")
2080
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
2081
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
2082
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
2083
+   AC_SUBST(LIB_TDEPIM, "-ltdepim")
2084
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
2085 2085
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
2086
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
2087
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
2086
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
2087
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
2088 2088
 # these are for backward compatibility
2089
-   AC_SUBST(LIB_KSYCOCA, "-lkio")
2090
-   AC_SUBST(LIB_KFILE, "-lkio")
2089
+   AC_SUBST(LIB_KSYCOCA, "-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_KIO, "-ltdeio")
2095
+   AC_SUBST(LIB_KSYCOCA, "-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_KSPELL, "-ltdespell")
2101
+   AC_SUBST(LIB_KPARTS, "-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
@@ -5661,7 +5661,7 @@ ssl_includes=""
5661 5661
 AC_ARG_WITH(ssl-dir,
5662 5662
     AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]),
5663 5663
     [  ac_ssl_includes="$withval"/include
5664
-       ac_ssl_libraries="$withval"/lib$kdelibsuff
5664
+       ac_ssl_libraries="$withval"/lib$tdelibsuff
5665 5665
     ])
5666 5666
 
5667 5667
 want_ssl=yes
@@ -5681,7 +5681,7 @@ AC_CACHE_VAL(ac_cv_have_ssl,
5681 5681
   AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir)
5682 5682
   ac_ssl_includes="$ssl_incdir"
5683 5683
 
5684
-  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"
5684
+  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"
5685 5685
   if test ! "$ac_ssl_libraries" = "NO"; then
5686 5686
     ssl_libdirs="$ac_ssl_libraries $ssl_libdirs"
5687 5687
   fi
@@ -5918,9 +5918,9 @@ dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page
5918 5918
 dnl also defines KSTUFF_PKG_ERRORS on error
5919 5919
 AC_DEFUN([KDE_PKG_CHECK_MODULES], [
5920 5920
 
5921
-   PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
5921
+   PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
5922 5922
    if test "$prefix" != "$kde_libs_prefix"; then
5923
-       PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
5923
+       PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
5924 5924
    fi
5925 5925
    export PKG_CONFIG_PATH
5926 5926
    PKG_CHECK_MODULES([$1],[$2],[$3],[$4])

+ 10
- 10
configure.in View File

@@ -76,13 +76,13 @@ AC_MSG_CHECKING([for KDE version])
76 76
 
77 77
 AC_LANG_SAVE
78 78
 AC_LANG_CPLUSPLUS
79
-kdeversion_save_CXXFLAGS="$CXXFLAGS"
80
-kdeversion_safe_LIBS="$LIBS"
79
+tdeversion_save_CXXFLAGS="$CXXFLAGS"
80
+tdeversion_safe_LIBS="$LIBS"
81 81
 LIBS="$LIBS $X_EXTRA_LIBS"
82 82
 CXXFLAGS="$CXXFLAGS $all_includes"
83 83
 
84 84
 AC_COMPILE_IFELSE([
85
-#include <kdeversion.h>
85
+#include <tdeversion.h>
86 86
 #if ! ( KDE_IS_VERSION( 3, 2, 90 ) )
87 87
 #error KDE 3.2
88 88
 #endif
@@ -93,7 +93,7 @@ AC_COMPILE_IFELSE([
93 93
 )
94 94
 
95 95
 AC_COMPILE_IFELSE([
96
-#include <kdeversion.h>
96
+#include <tdeversion.h>
97 97
 #if ! ( KDE_IS_VERSION( 3, 3, 90 ) )
98 98
 #error KDE 3.3
99 99
 #endif
@@ -104,7 +104,7 @@ AC_COMPILE_IFELSE([
104 104
 )
105 105
 
106 106
 AC_COMPILE_IFELSE([
107
-#include <kdeversion.h>
107
+#include <tdeversion.h>
108 108
 #if ! ( KDE_IS_VERSION( 3, 4, 90 ) )
109 109
 #error KDE 3.4
110 110
 #endif
@@ -115,7 +115,7 @@ AC_COMPILE_IFELSE([
115 115
 )
116 116
 
117 117
 AC_COMPILE_IFELSE([
118
-#include <kdeversion.h>
118
+#include <tdeversion.h>
119 119
 #if ! ( KDE_IS_VERSION( 3, 5, 2 ) )
120 120
 #error KDE 3.5.x (x < 2)
121 121
 #endif
@@ -124,8 +124,8 @@ AC_COMPILE_IFELSE([
124 124
 ,
125 125
         need_kde351_compat="yes"
126 126
 )
127
-CXXFLAGS="$kdeversion_save_CXXFLAGS"
128
-LIBS="$kdeversion_safe_LIBS"
127
+CXXFLAGS="$tdeversion_save_CXXFLAGS"
128
+LIBS="$tdeversion_safe_LIBS"
129 129
 AC_LANG_RESTORE
130 130
 
131 131
 if test "$need_kde32_compat" = "yes"; then
@@ -649,13 +649,13 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
649 649
   # And if so, warn when they don't match
650 650
   if test "$kde_libs_prefix" != "$given_prefix"; then
651 651
     # And if kde doesn't know about the prefix yet
652
-    echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
652
+    echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
653 653
     if test $? -ne 0; then
654 654
       echo ""
655 655
       echo "Warning: you chose to install this package in $given_prefix,"
656 656
       echo "but KDE was found in $kde_libs_prefix."
657 657
       echo "For this to work, you will need to tell KDE about the new prefix, by ensuring"
658
-      echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix"
658
+      echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix"
659 659
       echo "Then restart KDE."
660 660
       echo ""
661 661
     fi

+ 8
- 8
configure.in.in View File

@@ -11,13 +11,13 @@ AC_MSG_CHECKING([for KDE version])
11 11
 
12 12
 AC_LANG_SAVE
13 13
 AC_LANG_CPLUSPLUS
14
-kdeversion_save_CXXFLAGS="$CXXFLAGS"
15
-kdeversion_safe_LIBS="$LIBS"
14
+tdeversion_save_CXXFLAGS="$CXXFLAGS"
15
+tdeversion_safe_LIBS="$LIBS"
16 16
 LIBS="$LIBS $X_EXTRA_LIBS"
17 17
 CXXFLAGS="$CXXFLAGS $all_includes"
18 18
 
19 19
 AC_COMPILE_IFELSE([
20
-#include <kdeversion.h>
20
+#include <tdeversion.h>
21 21
 #if ! ( KDE_IS_VERSION( 3, 2, 90 ) )
22 22
 #error KDE 3.2
23 23
 #endif
@@ -28,7 +28,7 @@ AC_COMPILE_IFELSE([
28 28
 )
29 29
 
30 30
 AC_COMPILE_IFELSE([
31
-#include <kdeversion.h>
31
+#include <tdeversion.h>
32 32
 #if ! ( KDE_IS_VERSION( 3, 3, 90 ) )
33 33
 #error KDE 3.3
34 34
 #endif
@@ -39,7 +39,7 @@ AC_COMPILE_IFELSE([
39 39
 )
40 40
 
41 41
 AC_COMPILE_IFELSE([
42
-#include <kdeversion.h>
42
+#include <tdeversion.h>
43 43
 #if ! ( KDE_IS_VERSION( 3, 4, 90 ) )
44 44
 #error KDE 3.4
45 45
 #endif
@@ -50,7 +50,7 @@ AC_COMPILE_IFELSE([
50 50
 )
51 51
 
52 52
 AC_COMPILE_IFELSE([
53
-#include <kdeversion.h>
53
+#include <tdeversion.h>
54 54
 #if ! ( KDE_IS_VERSION( 3, 5, 2 ) )
55 55
 #error KDE 3.5.x (x < 2)
56 56
 #endif
@@ -59,8 +59,8 @@ AC_COMPILE_IFELSE([
59 59
 ,
60 60
         need_kde351_compat="yes"
61 61
 )
62
-CXXFLAGS="$kdeversion_save_CXXFLAGS"
63
-LIBS="$kdeversion_safe_LIBS"
62
+CXXFLAGS="$tdeversion_save_CXXFLAGS"
63
+LIBS="$tdeversion_safe_LIBS"
64 64
 AC_LANG_RESTORE
65 65
 
66 66
 if test "$need_kde32_compat" = "yes"; then

+ 3
- 3
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 tork "<application>tork 0.1</application>">
4 4
   <!ENTITY kappname "&tork;"><!-- 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
   
@@ -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

+ 1
- 1
src/Makefile.am View File

@@ -28,7 +28,7 @@ METASOURCES = AUTO
28 28
 tork_LDFLAGS = $(KDE_RPATH) $(all_libraries)
29 29
 
30 30
 # the libraries to link against.
31
-tork_LDADD   = $(LIB_KIO) $(LIB_KFILE) $(LIB_KHTML) $(geoiplib) $(LIB_KDEUI) $(LIB_KDECORE) -lDCOP $(LIB_QT) \
31
+tork_LDADD   = $(LIB_KIO) $(LIB_KFILE) $(LIB_TDEHTML) $(geoiplib) $(LIB_TDEUI) $(LIB_TDECORE) -lDCOP $(LIB_QT) \
32 32
                upnp/libktupnp.la $(CRYPTO_LIBS)
33 33
 
34 34
 # which sources should be compiled for tork

+ 1
- 1
src/arkollon/Makefile.am View File

@@ -26,7 +26,7 @@ torkarkollon_LDFLAGS = $(all_libraries)
26 26
 LIBS =
27 27
 #torkarkollon_LDFLAGS = 
28 28
 #torkarkollon_LDADD = $(LIB_QT) $(LIB_KFILE)
29
-torkarkollon_LDADD = $(LIB_KFILE) $(LIB_QT) $(LIB_KDECORE)
29
+torkarkollon_LDADD = $(LIB_KFILE) $(LIB_QT) $(LIB_TDECORE)
30 30
 
31 31
 # let automoc handle all of the meta source files (moc)
32 32
 METASOURCES = AUTO

+ 1
- 1
src/arkollon/torkarkollon.cpp View File

@@ -39,7 +39,7 @@ int main(int argc, char *argv[])
39 39
 	// Check if we're root
40 40
 	if (getuid() != 0)
41 41
 	{
42
-		TQString command = "kdesu -t -i tork -n -c \"";
42
+		TQString command = "tdesu -t -i tork -n -c \"";
43 43
 		for (int i=0 ; i<app.argc() ; i++)
44 44
 		{
45 45
 			if (TQString(app.argv()[i]).contains(" "))

+ 2
- 2
src/arkollon/wizard.cpp View File

@@ -114,7 +114,7 @@ Wizard::Wizard(TQWidget *parent, const char *name)
114 114
 	kdeDirProcess = new TQProcess(this);
115 115
 	connect(kdeDirProcess, SIGNAL(readyReadStdout()), SLOT(kdeDirReady()));
116 116
 	connect(kdeDirProcess, SIGNAL(processExited()), SLOT(getInstalledComponents()));
117
-	kdeDirProcess->addArgument("kde-config");
117
+	kdeDirProcess->addArgument("tde-config");
118 118
 	kdeDirProcess->addArgument("--prefix");
119 119
 	if (!kdeDirProcess->start())
120 120
 		getInstalledComponents();
@@ -923,7 +923,7 @@ void Wizard::errorOccured()
923 923
 TQString Wizard::sub(TQString s)
924 924
 {
925 925
 	TQString tmp = s;
926
-	tmp.replace(TQRegExp("\\$KDEDIR"), kdeDir);
926
+	tmp.replace(TQRegExp("\\$TDEDIR"), kdeDir);
927 927
 	tmp.replace(TQRegExp("\\$HOMEDIR"), TQDir::homeDirPath());
928 928
 	tmp.replace(TQRegExp("~"), TQDir::homeDirPath());
929 929
 	tmp.replace(TQRegExp("\\$PREFIX"), "/usr/local");

+ 11
- 11
src/configdialog.cpp View File

@@ -67,23 +67,23 @@ email                : markey@web.de
67 67
 #include <ntqlistview.h>
68 68
 #include <ntqcheckbox.h>
69 69
 
70
-#include <kapplication.h> //kapp
70
+#include <tdeapplication.h> //kapp
71 71
 #include <kcombobox.h>
72 72
 #include <kiconloader.h>
73 73
 #include <klineedit.h>
74
-#include <klocale.h>
74
+#include <tdelocale.h>
75 75
 #include <kstandarddirs.h>
76 76
 #include <kdebug.h>
77 77
 #include <dcopref.h>
78
-#include <kconfig.h>
79
-#include <kmessagebox.h>
78
+#include <tdeconfig.h>
79
+#include <tdemessagebox.h>
80 80
 
81 81
 //////////////////////////////////////////////////////////////////////////////////////////
82 82
 // PUBLIC
83 83
 //////////////////////////////////////////////////////////////////////////////////////////
84 84
 
85
-TorkConfigDialog::TorkConfigDialog( TQWidget *parent, const char* name, KConfigSkeleton *config )
86
-        : KConfigDialog( parent, name, config ),m_parent(parent)
85
+TorkConfigDialog::TorkConfigDialog( TQWidget *parent, const char* name, TDEConfigSkeleton *config )
86
+        : TDEConfigDialog( parent, name, config ),m_parent(parent)
87 87
 {
88 88
     setWFlags( WDestructiveClose );
89 89
 
@@ -137,7 +137,7 @@ TorkConfigDialog::TorkConfigDialog( TQWidget *parent, const char* name, KConfigS
137 137
         static_cast<TQLabel*>(label)->setPixmap( TQMessageBox::standardIcon( TQMessageBox::Information ) );
138 138
     delete list;
139 139
 
140
-    //stop KFont Requesters getting stupidly large
140
+    //stop TDEFont Requesters getting stupidly large
141 141
     list = queryList( "TQLabel", "m_sampleLabel" );
142 142
     for( TQObject *label = list->first(); label; label = list->next() )
143 143
         static_cast<TQLabel*>(label)->setMaximumWidth( 250 );
@@ -229,19 +229,19 @@ void TorkConfigDialog::showPage( const TQCString& page )
229 229
 {
230 230
     for( uint index = 0; index < m_pageList.count(); index++ ) {
231 231
         if ( m_pageList[index]->name() == page ) {
232
-            KConfigDialog::showPage( index );
232
+            TDEConfigDialog::showPage( index );
233 233
             return;
234 234
         }
235 235
     }
236 236
 }
237 237
 
238
-/** Reimplemented from KConfigDialog */
238
+/** Reimplemented from TDEConfigDialog */
239 239
 void TorkConfigDialog::addPage( TQWidget *page, const TQString &itemName, const TQString &pixmapName, const TQString &header, bool manage )
240 240
 {
241 241
     // Add the widget pointer to our list, for later reference
242 242
     m_pageList << page;
243 243
 
244
-    KConfigDialog::addPage( page, itemName, pixmapName, header, manage );
244
+    TDEConfigDialog::addPage( page, itemName, pixmapName, header, manage );
245 245
 }
246 246
 
247 247
 
@@ -258,7 +258,7 @@ void TorkConfigDialog::updateCustomSettings()
258 258
     //When settings are changed in the config dialog, this is called
259 259
     //to update all possibly changed values and apply them to Tor.
260 260
 
261
-    //TQListViews need to be handled outside of kconfigxt
261
+    //TQListViews need to be handled outside of tdeconfigxt
262 262
     TorkConfig::setQuickConfigure( m_quickconfig->QuickConfigure->currentItem() );
263 263
 
264 264
     TorkConfig::setAccountingStart(m_myserver->AccountingStart->currentText());

+ 3
- 3
src/configdialog.h View File

@@ -21,18 +21,18 @@ email                : markey@web.de
21 21
 
22 22
 #include <ntqmap.h>
23 23
 #include <ntqvaluelist.h>
24
-#include <kconfigdialog.h>
24
+#include <tdeconfigdialog.h>
25 25
 
26 26
 class TQComboBox;
27 27
 class TQGroupBox;
28 28
 class TQVBox;
29 29
 
30
-class TorkConfigDialog : public KConfigDialog
30
+class TorkConfigDialog : public TDEConfigDialog
31 31
 {
32 32
     Q_OBJECT
33 33
 
34 34
     public:
35
-        TorkConfigDialog( TQWidget *parent, const char* name, KConfigSkeleton *config );
35
+        TorkConfigDialog( TQWidget *parent, const char* name, TDEConfigSkeleton *config );
36 36
         ~TorkConfigDialog();
37 37
 
38 38
         void addPage( TQWidget *page, const TQString &itemName, const TQString &pixmapName,

+ 5
- 5
src/crashhandler.cpp View File

@@ -14,11 +14,11 @@
14 14
 #include "torkconfig.h"
15 15
 #include "crashhandler.h"
16 16
 
17
-#include <kapplication.h> //invokeMailer()
17
+#include <tdeapplication.h> //invokeMailer()
18 18
 #include <kdebug.h>       //kdBacktrace()
19
-#include <kdeversion.h>
20
-#include <klocale.h>
21
-#include <ktempfile.h>
19
+#include <tdeversion.h>
20
+#include <tdelocale.h>
21
+#include <tdetempfile.h>
22 22
 
23 23
 #include <ntqfile.h>
24 24
 #include <ntqregexp.h>
@@ -95,7 +95,7 @@ namespace torK
95 95
                     "Version:    " TORK_VERSION "\n"
96 96
                     "Build date: " __DATE__ "\n"
97 97
                     "CC version: " __VERSION__ "\n" //assuming we're using GCC
98
-                    "KDElibs:    " KDE_VERSION_STRING "\n"
98
+                    "KDElibs:    " TDE_VERSION_STRING "\n"
99 99
                     "TQt:         %2\n"
100 100
                     "CPU count:  %6\n";
101 101
 

+ 1
- 1
src/dndlistview.cpp View File

@@ -24,7 +24,7 @@
24 24
 #include <ntqapplication.h>
25 25
 #include <ntqheader.h>
26 26
 #include <kiconloader.h>
27
-#include <klocale.h>
27
+#include <tdelocale.h>
28 28
 #include <kstandarddirs.h>
29 29
 
30 30
 #include <ntqsimplerichtext.h>

+ 5
- 5
src/firewallsproxies.ui.h View File

@@ -19,20 +19,20 @@
19 19
  ***************************************************************************/
20 20
 
21 21
 #include "torkconfig.h"
22
-#include <klocale.h>
22
+#include <tdelocale.h>
23 23
 #include <ntqtooltip.h>
24 24
 #include <ntqpopupmenu.h>
25 25
 #include <kdebug.h>
26
-#include <khtml_part.h>
26
+#include <tdehtml_part.h>
27 27
 #include <dom/html_misc.h>
28
-#include <kmessagebox.h>
28
+#include <tdemessagebox.h>
29 29
 
30
-KHTMLPart *filelist;
30
+TDEHTMLPart *filelist;
31 31
 
32 32
 void FirewallsProxies::init()
33 33
 {
34 34
 
35
-    filelist = new KHTMLPart();
35
+    filelist = new TDEHTMLPart();
36 36
 
37 37
     TQStringList existingMaps = TorkConfig::reachableAddresses();
38 38
     TQListViewItem *tm;

+ 6
- 6
src/functions.cpp View File

@@ -21,8 +21,8 @@
21 21
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
22 22
  ***************************************************************************/
23 23
 #include <ntqdatetime.h>
24
-#include <klocale.h>
25
-#include <kglobal.h>
24
+#include <tdelocale.h>
25
+#include <tdeglobal.h>
26 26
 #include <kdebug.h>
27 27
 #include <sys/time.h>
28 28
 #include <ntqdir.h>
@@ -39,7 +39,7 @@ namespace tk
39 39
 	
40 40
 	TQString BytesToString(Uint64 bytes,int precision)
41 41
 	{
42
-		KLocale* loc = KGlobal::locale();
42
+		TDELocale* loc = TDEGlobal::locale();
43 43
 		if (bytes >= 1024 * 1024 * 1024)
44 44
 			return i18n("%1 GB").arg(loc->formatNumber(bytes / TO_GIG,precision < 0 ? 2 : precision));
45 45
 		else if (bytes >= 1024*1024)
@@ -52,7 +52,7 @@ namespace tk
52 52
 
53 53
 	TQString BytesPerSecToString(double bytes,int precision)
54 54
 	{
55
-		KLocale* loc = KGlobal::locale();
55
+		TDELocale* loc = TDEGlobal::locale();
56 56
 		if (bytes >= 1024 * 1024 * 1024)
57 57
 			return i18n("%1 GB/s").arg(loc->formatNumber(bytes / TO_GIG,precision < 0 ? 2 : precision));
58 58
 		else if (bytes >= 1024*1024)
@@ -65,14 +65,14 @@ namespace tk
65 65
 
66 66
 	TQString KBytesPerSecToString(double speed,int precision)
67 67
 	{
68
-		KLocale* loc = KGlobal::locale();
68
+		TDELocale* loc = TDEGlobal::locale();
69 69
 		return i18n("%1 KB/s").arg(loc->formatNumber(speed,precision));
70 70
 	}
71 71
 
72 72
 
73 73
 	TQString DurationToString(Uint32 nsecs)
74 74
 	{
75
-		KLocale* loc = KGlobal::locale();
75
+		TDELocale* loc = TDEGlobal::locale();
76 76
 		TQTime t;
77 77
 		int ndays = nsecs / 86400;
78 78
 		t = t.addSecs(nsecs % 86400);

+ 1
- 1
src/hiddensrvs.ui View File

@@ -226,7 +226,7 @@
226 226
     <slot>addService( const TQString &amp; nick, const TQString &amp; publicport, const TQString &amp; actualaddress, const TQString &amp; toraddress, const TQString &amp; folder, const TQString &amp; servicefolder )</slot>
227 227
     <slot>deleteService_clicked()</slot>
228 228
     <slot>startService_clicked()</slot>
229
-    <slot>thttpdprocExited(KProcess *proc)</slot>
229
+    <slot>thttpdprocExited(TDEProcess *proc)</slot>
230 230
     <slot>servicesList_selectionChanged()</slot>
231 231
     <slot>startAllServices_clicked()</slot>
232 232
     <slot>testService_clicked()</slot>

+ 6
- 6
src/hiddensrvs.ui.h View File

@@ -20,14 +20,14 @@
20 20
 #include "torkconfig.h"
21 21
 #include "tork.h"
22 22
 #include "hidsrvwizard.h"
23
-#include <klocale.h>
23
+#include <tdelocale.h>
24 24
 #include <kdebug.h>
25 25
 #include <ntqtooltip.h>
26 26
 #include <ntqpopupmenu.h>
27 27
 #include <kurl.h>
28
-#include <kapplication.h>
28
+#include <tdeapplication.h>
29 29
 #include <kprocio.h>
30
-#include <kmessagebox.h>
30
+#include <tdemessagebox.h>
31 31
 #include <cstdlib>
32 32
 
33 33
 void MyHidden::init()
@@ -125,14 +125,14 @@ void MyHidden::startService_clicked()
125 125
                 << "-h " << servicesList->currentItem()->text(3).section(":",0,0)
126 126
                 << "-d " << servicesList->currentItem()->text(4);
127 127
 
128
- 	connect( thttpdproc, SIGNAL(processExited(KProcess *)),
129
- 			SLOT(thttpdprocExited(KProcess *)) );
128
+ 	connect( thttpdproc, SIGNAL(processExited(TDEProcess *)),
129
+ 			SLOT(thttpdprocExited(TDEProcess *)) );
130 130
 
131 131
 	thttpdproc->start(KProcIO::NotifyOnExit)    ;
132 132
 
133 133
 }
134 134
 
135
-void MyHidden::thttpdprocExited(KProcess *proc)
135
+void MyHidden::thttpdprocExited(TDEProcess *proc)
136 136
 {
137 137
     TQString caption;
138 138
     TQString message;

+ 1
- 1
src/hidsrvwizard.ui.h View File

@@ -21,7 +21,7 @@
21 21
 #include "tork.h"
22 22
 #include "functions.h"
23 23
 #include <ntqtimer.h>
24
-#include <kmessagebox.h>
24
+#include <tdemessagebox.h>
25 25
 #include <cstdlib>
26 26
 
27 27
 bool local;

+ 6
- 6
src/hitwidget.cpp View File

@@ -24,9 +24,9 @@
24 24
 #include <kdebug.h>
25 25
 #include <kiconloader.h>
26 26
 #include <ntqtoolbutton.h>
27
-#include <klocale.h>
27
+#include <tdelocale.h>
28 28
 #include <kurllabel.h>
29
-#include <kglobalsettings.h>
29
+#include <tdeglobalsettings.h>
30 30
 #include <ntqlayout.h>
31 31
 /*#include <konq_filetip.h>*/
32 32
 #include <ntqscrollview.h>
@@ -59,9 +59,9 @@ void HitWidget::setIcon(const TQString name)
59 59
 {
60 60
   m_icon = name;
61 61
   if (m_collapsed)
62
-    icon->setPixmap(KGlobal::iconLoader()->loadIcon(m_icon, KIcon::NoGroup, KIcon::SizeSmall));
62
+    icon->setPixmap(TDEGlobal::iconLoader()->loadIcon(m_icon, TDEIcon::NoGroup, TDEIcon::SizeSmall));
63 63
   else
64
-    icon->setPixmap(KGlobal::iconLoader()->loadIcon(m_icon, KIcon::NoGroup, KIcon::SizeLarge));
64
+    icon->setPixmap(TDEGlobal::iconLoader()->loadIcon(m_icon, TDEIcon::NoGroup, TDEIcon::SizeLarge));
65 65
 }
66 66
 
67 67
 void HitWidget::toggleCollapsed()
@@ -77,7 +77,7 @@ void HitWidget::setCollapsed(bool collapsed)
77 77
   if (collapsed) {
78 78
     toolButton1->setEnabled(true);
79 79
     m_was_collapsed = true;
80
-    icon->setPixmap(KGlobal::iconLoader()->loadIcon(m_icon, KIcon::NoGroup, KIcon::SizeSmall));
80
+    icon->setPixmap(TDEGlobal::iconLoader()->loadIcon(m_icon, TDEIcon::NoGroup, TDEIcon::SizeSmall));
81 81
 #if 0
82 82
     i18n("Expand");
83 83
     i18n("Collapse");
@@ -94,7 +94,7 @@ void HitWidget::setCollapsed(bool collapsed)
94 94
     m_collapsed = collapsed;
95 95
   }
96 96
   else {
97
-    icon->setPixmap(KGlobal::iconLoader()->loadIcon(m_icon, KIcon::NoGroup, KIcon::SizeLarge));
97
+    icon->setPixmap(TDEGlobal::iconLoader()->loadIcon(m_icon, TDEIcon::NoGroup, TDEIcon::SizeLarge));
98 98
     toolButton1->setIconSet(SmallIconSet("2uparrow"));
99 99
     description->setHidden(false);
100 100
     properties->setHidden(false);

+ 3
- 3
src/kerrylabel.cpp View File

@@ -22,7 +22,7 @@
22 22
 #include "hitwidget.h"
23 23
 
24 24
 #include <ntqdragobject.h>
25
-#include <kglobalsettings.h>
25
+#include <tdeglobalsettings.h>
26 26
 #include <kurl.h>
27 27
 #include <krun.h>
28 28
 /*
@@ -59,7 +59,7 @@ void KerryLabel::mousePressEvent(TQMouseEvent* ev)
59 59
 void KerryLabel::mouseMoveEvent(TQMouseEvent* ev)
60 60
 {
61 61
   if (dragInfo.state == diPending) {
62
-      int distance = KGlobalSettings::dndEventDelay();
62
+      int distance = TDEGlobalSettings::dndEventDelay();
63 63
       if ( ev->x() > dragInfo.start.x() + distance || ev->x() < dragInfo.start.x() - distance ||
64 64
            ev->y() > dragInfo.start.y() + distance || ev->y() < dragInfo.start.y() - distance) {
65 65
           doDrag();
@@ -94,7 +94,7 @@ void KerryLabel::doDrag()
94 94
 //     _items.append( &item );
95 95
 // 
96 96
 //     const KURL kurl(url());
97
-//     KActionCollection act(this);
97
+//     TDEActionCollection act(this);
98 98
 // 
99 99
 //     KonqPopupMenu * popupMenu = new KonqPopupMenu( KonqBookmarkManager::self(), _items,
100 100
 //                                                    kurl, act, (KNewMenu*)NULL, this,

+ 6
- 6
src/konqplugin/Makefile.am View File

@@ -1,14 +1,14 @@
1 1
 INCLUDES = $(all_includes)
2 2
 
3
-kde_module_LTLIBRARIES = khtml_tork.la
3
+kde_module_LTLIBRARIES = tdehtml_tork.la
4 4
 
5
-khtml_tork_la_METASOURCES = AUTO
6
-khtml_tork_la_SOURCES = tork_plug_in.cpp
7
-khtml_tork_la_LIBADD =  $(LIB_KHTML)
8
-khtml_tork_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
5
+tdehtml_tork_la_METASOURCES = AUTO
6
+tdehtml_tork_la_SOURCES = tork_plug_in.cpp
7
+tdehtml_tork_la_LIBADD =  $(LIB_TDEHTML)
8
+tdehtml_tork_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
9 9
 
10 10
 KDE_ICON = AUTO
11 11
 
12 12
 part_DATA = tork_plug_in.rc tork_plug_in.desktop
13
-partdir = $(kde_datadir)/khtml/kpartplugins
13
+partdir = $(kde_datadir)/tdehtml/kpartplugins
14 14
 

+ 28
- 28
src/konqplugin/tork_plug_in.cpp View File

@@ -40,21 +40,21 @@
40 40
 #include <dcopref.h>
41 41
 #include <kdatastream.h>
42 42
 #include <kdebug.h>
43
-#include <khtml_part.h>
43
+#include <tdehtml_part.h>
44 44
 #include <kiconloader.h>
45
-#include <kglobal.h>
46
-#include <kaction.h>
45
+#include <tdeglobal.h>
46
+#include <tdeaction.h>
47 47
 #include <kinstance.h>
48
-#include <klocale.h>
49
-#include <kmessagebox.h>
50
-#include <kpopupmenu.h>
48
+#include <tdelocale.h>
49
+#include <tdemessagebox.h>
50
+#include <tdepopupmenu.h>
51 51
 #include <krun.h>
52 52
 
53 53
 #include <dom/html_document.h>
54 54
 #include <dom/html_misc.h>
55 55
 #include <dom/dom_element.h>
56 56
 
57
-#include <kparts/partmanager.h>
57
+#include <tdeparts/partmanager.h>
58 58
 
59 59
 #include <set>
60 60
 
@@ -62,32 +62,32 @@
62 62
 Tork_plug_in::Tork_plug_in( TQObject* parent, const char* name )
63 63
     : Plugin( parent, name )
64 64
 {
65
-    TQPixmap pix = KGlobal::iconLoader()->loadIcon("tork",
66
-                                                  KIcon::MainToolbar);
67
-    KActionMenu *menu = new KActionMenu( i18n("Anonymity Manager"), pix,
65
+    TQPixmap pix = TDEGlobal::iconLoader()->loadIcon("tork",
66
+                                                  TDEIcon::MainToolbar);
67
+    TDEActionMenu *menu = new TDEActionMenu( i18n("Anonymity Manager"), pix,
68 68
                                          actionCollection(), "tork_menu" );
69 69
     menu->setDelayed( false );
70 70
     connect( menu->popupMenu(), SIGNAL( aboutToShow() ), SLOT( showPopup() ));
71 71
 
72
-    m_paToggleKDE=new KAction(i18n("Anonymize KDE"),
73
-                                           KGlobal::iconLoader()->loadIconSet("tork_konqueroroff",                                               KIcon::Small),
74
-                                           KShortcut(),
72
+    m_paToggleKDE=new TDEAction(i18n("Anonymize KDE"),
73
+                                           TDEGlobal::iconLoader()->loadIconSet("tork_konqueroroff",                                               TDEIcon::Small),
74
+                                           TDEShortcut(),
75 75
                                            this, SLOT(toggleKDE()),
76 76
                                            actionCollection(), "tork_konqueroron" );
77 77
 
78 78
     menu->insert( m_paToggleKDE );
79 79
 
80 80
 
81
-    KAction *m_firefox=new KAction(i18n("Re-Open Anonymously with Firefox"),
82
-                                           KGlobal::iconLoader()->loadIconSet("tork_firefox",                                               KIcon::Small),
83
-                                           KShortcut(),
81
+    TDEAction *m_firefox=new TDEAction(i18n("Re-Open Anonymously with Firefox"),
82
+                                           TDEGlobal::iconLoader()->loadIconSet("tork_firefox",                                               TDEIcon::Small),
83
+                                           TDEShortcut(),
84 84
                                            this, SLOT(openWithFirefox()),
85 85
                                            actionCollection(), "tork_firefox" );
86 86
     menu->insert( m_firefox );
87 87
 
88
-    KAction *m_opera=new KAction(i18n("Re-Open Anonymously with Opera"),
89
-                                           KGlobal::iconLoader()->loadIconSet("tork_opera",                                               KIcon::Small),
90
-                                           KShortcut(),
88
+    TDEAction *m_opera=new TDEAction(i18n("Re-Open Anonymously with Opera"),
89
+                                           TDEGlobal::iconLoader()->loadIconSet("tork_opera",                                               TDEIcon::Small),
90
+                                           TDEShortcut(),
91 91
                                            this, SLOT(openWithOpera()),
92 92
                                            actionCollection(), "tork_opera" );
93 93
     menu->insert( m_opera );
@@ -115,12 +115,12 @@ void Tork_plug_in::showPopup()
115 115
     }
116 116
 
117 117
     if (anonymized){
118
-        m_paToggleKDE->setIconSet( KGlobal::iconLoader()->loadIconSet("tork_konqueroroff",
119
-                                                  KIcon::Small) );
118
+        m_paToggleKDE->setIconSet( TDEGlobal::iconLoader()->loadIconSet("tork_konqueroroff",
119
+                                                  TDEIcon::Small) );
120 120
         m_paToggleKDE->setText( "De-Anonymize KDE" );
121 121
     }else{
122
-        m_paToggleKDE->setIconSet( KGlobal::iconLoader()->loadIconSet("tork_konqueroron",
123
-                                                  KIcon::Small) );
122
+        m_paToggleKDE->setIconSet( TDEGlobal::iconLoader()->loadIconSet("tork_konqueroron",
123
+                                                  TDEIcon::Small) );
124 124
         m_paToggleKDE->setText( "Anonymize KDE" );
125 125
     }
126 126
 }
@@ -141,7 +141,7 @@ void Tork_plug_in::openWithOpera()
141 141
 
142 142
 void Tork_plug_in::openWithBrowser(const TQString &browser)
143 143
 {
144
-    KHTMLPart *htmlPart = static_cast<KHTMLPart*>( parent() );
144
+    TDEHTMLPart *htmlPart = static_cast<TDEHTMLPart*>( parent() );
145 145
     TQString url = htmlPart->toplevelURL().url();
146 146
 
147 147
     if (p_dcopServer->isApplicationRegistered ("tork")){
@@ -168,7 +168,7 @@ void Tork_plug_in::toggleKDE()
168 168
 KPluginFactory::KPluginFactory( TQObject* parent, const char* name )
169 169
         : KLibFactory( parent, name )
170 170
 {
171
-    s_instance = new KInstance("KPluginFactory");
171
+    s_instance = new TDEInstance("KPluginFactory");
172 172
 }
173 173
 
174 174
 TQObject* KPluginFactory::createObject( TQObject* parent, const char* name, const char*, const TQStringList & )
@@ -184,14 +184,14 @@ KPluginFactory::~KPluginFactory()
184 184
 
185 185
 extern "C"
186 186
 {
187
-    KDE_EXPORT void* init_khtml_tork()
187
+    KDE_EXPORT void* init_tdehtml_tork()
188 188
     {
189
-        KGlobal::locale()->insertCatalogue("tork");
189
+        TDEGlobal::locale()->insertCatalogue("tork");
190 190
         return new KPluginFactory;
191 191
     }
192 192
 
193 193
 }
194 194
 
195
-KInstance* KPluginFactory::s_instance = 0L;
195
+TDEInstance* KPluginFactory::s_instance = 0L;
196 196
 
197 197
 #include "tork_plug_in.moc"

+ 11
- 11
src/konqplugin/tork_plug_in.desktop View File

@@ -1,15 +1,15 @@
1 1
 [Desktop Entry]
2
-X-KDE-Library=khtml_tork
3
-X-KDE-PluginInfo-Author=Robert Hogan
4
-X-KDE-PluginInfo-Email=robert@roberthogan.net
5
-X-KDE-PluginInfo-Name=tork
6
-X-KDE-PluginInfo-Version=3.4
7
-X-KDE-PluginInfo-Website=http://tork.sourceforge.net
8
-X-KDE-PluginInfo-Category=Tools
9
-X-KDE-PluginInfo-Depends=
10
-X-KDE-PluginInfo-License=GPL
11
-X-KDE-PluginInfo-EnabledByDefault=true
2
+X-TDE-Library=tdehtml_tork
3
+X-TDE-PluginInfo-Author=Robert Hogan
4
+X-TDE-PluginInfo-Email=robert@roberthogan.net
5
+X-TDE-PluginInfo-Name=tork
6
+X-TDE-PluginInfo-Version=3.4
7
+X-TDE-PluginInfo-Website=http://tork.sourceforge.net
8
+X-TDE-PluginInfo-Category=Tools
9
+X-TDE-PluginInfo-Depends=
10
+X-TDE-PluginInfo-License=GPL
11
+X-TDE-PluginInfo-EnabledByDefault=true
12 12
 Name=TorK
13 13
 Type=Application
14 14
 Comment=Anonymity Manager
15
-Icon=khtml_tork
15
+Icon=tdehtml_tork

+ 4
- 4
src/konqplugin/tork_plug_in.h View File

@@ -38,19 +38,19 @@
38 38
 #ifndef __plugin_tork_plug_in_h
39 39
 #define __plugin_tork_plug_in_h
40 40
 
41
-#include <kparts/plugin.h>
41
+#include <tdeparts/plugin.h>
42 42
 #include <klibloader.h>
43 43
 #include <dcopclient.h>
44 44
 #include <kurl.h>
45 45
 
46
-class KInstance;
46
+class TDEInstance;
47 47
 
48 48
 class Tork_plug_in : public KParts::Plugin
49 49
 {
50 50
     Q_OBJECT
51 51
 public:
52 52
     Tork_plug_in( TQObject* parent = 0, const char* name = 0 );
53
-    KAction *m_paToggleKDE ;
53
+    TDEAction *m_paToggleKDE ;
54 54
     DCOPClient* p_dcopServer;
55 55
     virtual ~Tork_plug_in();
56 56
 
@@ -75,7 +75,7 @@ public:
75 75
                                    const TQStringList &args = TQStringList() );
76 76
 
77 77
 private:
78
-    static KInstance* s_instance;
78
+    static TDEInstance* s_instance;
79 79
 };
80 80
 
81 81
 #endif

+ 1
- 1
src/konqplugin/tork_plug_in.rc View File

@@ -1,5 +1,5 @@
1 1
 <!DOCTYPE kpartgui>
2
-<kpartgui library="khtml_tork" name="khtml_tork" version="3" >
2
+<kpartgui library="tdehtml_tork" name="tdehtml_tork" version="3" >
3 3
 <MenuBar>
4 4
     <Menu name="tools"><Text>&amp;Tools</Text>
5 5
         <Action name="tork_menu"/>

+ 7
- 7
src/kwidgetlistbox.cpp View File

@@ -19,7 +19,7 @@
19 19
 
20 20
 #include "kwidgetlistbox.h"
21 21
 #include <kdebug.h>
22
-#include <kglobalsettings.h>
22
+#include <tdeglobalsettings.h>
23 23
 #include <hitwidget.h>
24 24
 
25 25
 KWidgetListbox::KWidgetListbox(TQWidget *parent, const char *name)
@@ -177,19 +177,19 @@ void KWidgetListbox::setItemColors(int index, bool even)
177 177
 
178 178
   if(index == selected())
179 179
   {
180
-    itm->setPaletteBackgroundColor(KGlobalSettings::highlightColor());
181
-    itm->setPaletteForegroundColor(KGlobalSettings::highlightedTextColor());
180
+    itm->setPaletteBackgroundColor(TDEGlobalSettings::highlightColor());
181
+    itm->setPaletteForegroundColor(TDEGlobalSettings::highlightedTextColor());
182 182
   }
183 183
   else if(even)
184 184
   {
185
-    itm->setPaletteBackgroundColor(KGlobalSettings::baseColor());
186
-    itm->setPaletteForegroundColor(KGlobalSettings::textColor());
185
+    itm->setPaletteBackgroundColor(TDEGlobalSettings::baseColor());
186
+    itm->setPaletteForegroundColor(TDEGlobalSettings::textColor());
187 187
   }
188 188
   else
189 189
   {
190 190
     itm->setPaletteBackgroundColor(
191
-        KGlobalSettings::alternateBackgroundColor());
192
-    itm->setPaletteForegroundColor(KGlobalSettings::textColor());
191
+        TDEGlobalSettings::alternateBackgroundColor());
192
+    itm->setPaletteForegroundColor(TDEGlobalSettings::textColor());
193 193
   }
194 194
 }
195 195
 

+ 38
- 38
src/likeback.cpp View File

@@ -18,15 +18,15 @@
18 18
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.         *
19 19
  ***************************************************************************/
20 20
 
21
-#include <kapplication.h>
22
-#include <kaboutdata.h>
23
-#include <kconfig.h>
24
-#include <kaction.h>
21
+#include <tdeapplication.h>
22
+#include <tdeaboutdata.h>
23
+#include <tdeconfig.h>
24
+#include <tdeaction.h>
25 25
 #include <kiconloader.h>
26
-#include <kaboutdata.h>
27
-#include <klocale.h>
26
+#include <tdeaboutdata.h>
27
+#include <tdelocale.h>
28 28
 #include <kdebug.h>
29
-#include <kmessagebox.h>
29
+#include <tdemessagebox.h>
30 30
 #include <ntqlayout.h>
31 31
 #include <ntqtoolbutton.h>
32 32
 #include <kpushbutton.h>
@@ -65,10 +65,10 @@ LikeBackBar::LikeBackBar(LikeBack *likeBack)
65 65
 {
66 66
 	TQHBoxLayout *layout = new TQHBoxLayout(this);
67 67
 
68
-	TQIconSet likeIconSet    = kapp->iconLoader()->loadIconSet("likeback_like_tork",    KIcon::Small);
69
-	TQIconSet dislikeIconSet = kapp->iconLoader()->loadIconSet("likeback_dislike_tork", KIcon::Small);
70
-	TQIconSet bugIconSet     = kapp->iconLoader()->loadIconSet("likeback_bug_tork",     KIcon::Small);
71
-	TQIconSet featureIconSet = kapp->iconLoader()->loadIconSet("likeback_feature_tork", KIcon::Small);
68
+	TQIconSet likeIconSet    = kapp->iconLoader()->loadIconSet("likeback_like_tork",    TDEIcon::Small);
69
+	TQIconSet dislikeIconSet = kapp->iconLoader()->loadIconSet("likeback_dislike_tork", TDEIcon::Small);
70
+	TQIconSet bugIconSet     = kapp->iconLoader()->loadIconSet("likeback_bug_tork",     TDEIcon::Small);
71
+	TQIconSet featureIconSet = kapp->iconLoader()->loadIconSet("likeback_feature_tork", TDEIcon::Small);
72 72
 
73 73
 	m_likeButton = new TQToolButton(this, "likeback_like_tork");
74 74
 	m_likeButton->setIconSet(likeIconSet);
@@ -208,7 +208,7 @@ LikeBackPrivate::~LikeBackPrivate()
208 208
 /********** class LikeBack: **********/
209 209
 /*************************************/
210 210
 
211
-LikeBack::LikeBack(Button buttons, bool showBarByDefault, KConfig *config, const KAboutData *aboutData)
211
+LikeBack::LikeBack(Button buttons, bool showBarByDefault, TDEConfig *config, const TDEAboutData *aboutData)
212 212
  : TQObject()
213 213
 {
214 214
 	// Initialize properties (1/2):
@@ -218,7 +218,7 @@ LikeBack::LikeBack(Button buttons, bool showBarByDefault, KConfig *config, const
218 218
 	d->aboutData        = aboutData;
219 219
 	d->showBarByDefault = showBarByDefault;
220 220
 
221
-	// Use default KApplication config and aboutData if not provided:
221
+	// Use default TDEApplication config and aboutData if not provided:
222 222
 	if (d->config == 0)
223 223
 		d->config = kapp->config();
224 224
 	if (d->aboutData == 0)
@@ -364,20 +364,20 @@ LikeBack::Button LikeBack::buttons()
364 364
 	return d->buttons;
365 365
 }
366 366
 
367
-const KAboutData* LikeBack::aboutData()
367
+const TDEAboutData* LikeBack::aboutData()
368 368
 {
369 369
 	return d->aboutData;
370 370
 }
371 371
 
372
-KConfig* LikeBack::config()
372
+TDEConfig* LikeBack::config()
373 373
 {
374 374
 	return d->config;
375 375
 }
376 376
 
377
-KAction* LikeBack::sendACommentAction(KActionCollection *parent)
377
+TDEAction* LikeBack::sendACommentAction(TDEActionCollection *parent)
378 378
 {
379 379
 	if (d->action == 0)
380
-		d->action = new KAction(
380
+		d->action = new TDEAction(
381 381
 			i18n("&Send a Comment to Developers"), /*icon=*/"mail_new", /*shortcut=*/"",
382 382
 			this, SLOT(execCommentDialog()),
383 383
 			parent, "likeback_send_a_comment"
@@ -412,10 +412,10 @@ void LikeBack::setUserWantsToShowBar(bool showBar)
412 412
 void LikeBack::showInformationMessage()
413 413
 {
414 414
 	// Load and register the images needed by the message:
415
-	TQPixmap likeIcon    = kapp->iconLoader()->loadIcon("likeback_like_tork",    KIcon::Small);
416
-	TQPixmap dislikeIcon = kapp->iconLoader()->loadIcon("likeback_dislike_tork", KIcon::Small);
417
-	TQPixmap bugIcon     = kapp->iconLoader()->loadIcon("likeback_bug_tork",     KIcon::Small);
418
-	TQPixmap featureIcon = kapp->iconLoader()->loadIcon("likeback_feature_tork", KIcon::Small);
415
+	TQPixmap likeIcon    = kapp->iconLoader()->loadIcon("likeback_like_tork",    TDEIcon::Small);
416
+	TQPixmap dislikeIcon = kapp->iconLoader()->loadIcon("likeback_dislike_tork", TDEIcon::Small);
417
+	TQPixmap bugIcon     = kapp->iconLoader()->loadIcon("likeback_bug_tork",     TDEIcon::Small);
418
+	TQPixmap featureIcon = kapp->iconLoader()->loadIcon("likeback_feature_tork", TDEIcon::Small);
419 419
 	TQMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_like",    likeIcon);
420 420
 	TQMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_dislike", dislikeIcon);
421 421
 	TQMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_bug",     bugIcon);
@@ -566,7 +566,7 @@ void LikeBack::askEmailAddress()
566 566
 		setEmailAddress(email);
567 567
 }
568 568
 
569
-// FIXME: Should be moved to KAboutData? Cigogne will also need it.
569
+// FIXME: Should be moved to TDEAboutData? Cigogne will also need it.
570 570
 bool LikeBack::isDevelopmentVersion(const TQString &version)
571 571
 {
572 572
 	return version.find("alpha", /*index=*/0, /*caseSensitive=*/false) != -1 ||
@@ -577,17 +577,17 @@ bool LikeBack::isDevelopmentVersion(const TQString &version)
577 577
 }
578 578
 
579 579
 /**
580
- * Code from KBugReport::slotConfigureEmail() in kdeui/kbugreport.cpp:
580
+ * Code from KBugReport::slotConfigureEmail() in tdeui/kbugreport.cpp:
581 581
  */
582 582
 /*void LikeBack::beginFetchingEmail()
583 583
 {
584 584
 	if (m_process)
585 585
 		return;
586
-	m_process = new KProcess();
587
-	*m_process << TQString::fromLatin1("kcmshell") << TQString::fromLatin1("kcm_useraccount");
588
-	connect( m_process, SIGNAL(processExited(KProcess*)), SLOT(fetchUserEmail()) );
586
+	m_process = new TDEProcess();
587
+	*m_process << TQString::fromLatin1("tdecmshell") << TQString::fromLatin1("kcm_useraccount");
588
+	connect( m_process, SIGNAL(processExited(TDEProcess*)), SLOT(fetchUserEmail()) );
589 589
 	if (!m_process->start()) {
590
-		kdDebug() << "Couldn't start kcmshell.." << endl;
590
+		kdDebug() << "Couldn't start tdecmshell.." << endl;
591 591
 		delete m_process;
592 592
 		m_process = 0;
593 593
 		return;
@@ -596,7 +596,7 @@ bool LikeBack::isDevelopmentVersion(const TQString &version)
596 596
 }*/
597 597
 
598 598
 /**
599
- * Code from KBugReport::slotSetFrom() in kdeui/kbugreport.cpp:
599
+ * Code from KBugReport::slotSetFrom() in tdeui/kbugreport.cpp:
600 600
  */
601 601
 void LikeBack::fetchUserEmail()
602 602
 {
@@ -604,8 +604,8 @@ void LikeBack::fetchUserEmail()
604 604
 //	m_process = 0;
605 605
 //	m_configureEmail->setEnabled(true);
606 606
 
607
-	// ### KDE4: why oh why is KEmailSettings in kio?
608
-	KConfig emailConf( TQString::fromLatin1("emaildefaults") );
607
+	// ### KDE4: why oh why is KEmailSettings in tdeio?
608
+	TDEConfig emailConf( TQString::fromLatin1("emaildefaults") );
609 609
 
610 610
 	// find out the default profile
611 611
 	emailConf.setGroup(TQString::fromLatin1("Defaults"));
@@ -668,7 +668,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const TQString &initialC
668 668
 	TQWidget *buttons = new TQWidget(box);
669 669
 	TQGridLayout *buttonsGrid = new TQGridLayout(buttons, /*nbRows=*/4, /*nbColumns=*/2, /*margin=*/0, spacingHint());
670 670
 	if (m_likeBack->buttons() & LikeBack::Like) {
671
-		TQPixmap likePixmap = kapp->iconLoader()->loadIcon("likeback_like_tork", KIcon::NoGroup, 16, KIcon::DefaultState, 0L, true);
671
+		TQPixmap likePixmap = kapp->iconLoader()->loadIcon("likeback_like_tork", TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, true);
672 672
 		TQLabel *likeIcon = new TQLabel(buttons);
673 673
 		likeIcon->setPixmap(likePixmap);
674 674
 		likeIcon->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
@@ -678,7 +678,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const TQString &initialC
678 678
 		m_group->insert(likeButton, LikeBack::Like);
679 679
 	}
680 680
 	if (m_likeBack->buttons() & LikeBack::Dislike) {
681
-		TQPixmap dislikePixmap = kapp->iconLoader()->loadIcon("likeback_dislike_tork", KIcon::NoGroup, 16, KIcon::DefaultState, 0L, true);
681
+		TQPixmap dislikePixmap = kapp->iconLoader()->loadIcon("likeback_dislike_tork", TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, true);
682 682
 		TQLabel *dislikeIcon = new TQLabel(buttons);
683 683
 		dislikeIcon->setPixmap(dislikePixmap);
684 684
 		dislikeIcon->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
@@ -688,7 +688,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const TQString &initialC
688 688
 		m_group->insert(dislikeButton, LikeBack::Dislike);
689 689
 	}
690 690
 	if (m_likeBack->buttons() & LikeBack::Bug) {
691
-		TQPixmap bugPixmap = kapp->iconLoader()->loadIcon("likeback_bug_tork", KIcon::NoGroup, 16, KIcon::DefaultState, 0L, true);
691
+		TQPixmap bugPixmap = kapp->iconLoader()->loadIcon("likeback_bug_tork", TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, true);
692 692
 		TQLabel *bugIcon = new TQLabel(buttons);
693 693
 		bugIcon->setPixmap(bugPixmap);
694 694
 		bugIcon->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
@@ -698,7 +698,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const TQString &initialC
698 698
 		m_group->insert(bugButton, LikeBack::Bug);
699 699
 	}
700 700
 	if (m_likeBack->buttons() & LikeBack::Feature) {
701
-		TQPixmap featurePixmap = kapp->iconLoader()->loadIcon("likeback_feature_tork", KIcon::NoGroup, 16, KIcon::DefaultState, 0L, true);
701
+		TQPixmap featurePixmap = kapp->iconLoader()->loadIcon("likeback_feature_tork", TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, true);
702 702
 		TQLabel *featureIcon = new TQLabel(buttons);
703 703
 		featureIcon->setPixmap(featurePixmap);
704 704
 		featureIcon->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
@@ -749,11 +749,11 @@ TQString LikeBackDialog::introductionText()
749 749
 		TQStringList locales = m_likeBack->acceptedLocales();
750 750
 		for (TQStringList::Iterator it = locales.begin(); it != locales.end(); ++it) {
751 751
 			TQString locale = *it;
752
-			if (KGlobal::locale()->language().startsWith(locale))
752
+			if (TDEGlobal::locale()->language().startsWith(locale))
753 753
 				languagesMessage = "";
754 754
 		}
755 755
 	} else {
756
-		if (!KGlobal::locale()->language().startsWith("en"))
756
+		if (!TDEGlobal::locale()->language().startsWith("en"))
757 757
 			languagesMessage = i18n("Please write in English.");
758 758
 	}
759 759
 
@@ -761,7 +761,7 @@ TQString LikeBackDialog::introductionText()
761 761
 		// TODO: Replace the URL with a localized one:
762 762
 		text += languagesMessage + " " +
763 763
 			i18n("You may be able to use an <a href=\"%1\">online translation tool</a>.")
764
-			.arg("http://www.google.com/language_tools?hl=" + KGlobal::locale()->language())
764
+			.arg("http://www.google.com/language_tools?hl=" + TDEGlobal::locale()->language())
765 765
 			+ " ";
766 766
 
767 767
 	// If both "I Like" and "I Dislike" buttons are shown and one is clicked:
@@ -811,7 +811,7 @@ void LikeBackDialog::send()
811 811
 		"protocol=" + KURL::encode_string("1.0")                              + '&' +
812 812
 		"type="     + KURL::encode_string(type)                               + '&' +
813 813
 		"version="  + KURL::encode_string(m_likeBack->aboutData()->version()) + '&' +
814
-		"locale="   + KURL::encode_string(KGlobal::locale()->language())      + '&' +
814
+		"locale="   + KURL::encode_string(TDEGlobal::locale()->language())      + '&' +
815 815
 		"window="   + KURL::encode_string(m_windowPath)                       + '&' +
816 816
 		"context="  + KURL::encode_string(m_context)                          + '&' +
817 817
 		"comment="  + KURL::encode_string(m_comment->text())                  + '&' +

+ 18
- 18
src/likeback.h View File

@@ -23,10 +23,10 @@
23 23
 
24 24
 #include <ntqobject.h>
25 25
 
26
-class KConfig;
27
-class KAboutData;
28
-class KAction;
29
-class KActionCollection;
26
+class TDEConfig;
27
+class TDEAboutData;
28
+class TDEAction;
29
+class TDEActionCollection;
30 30
 
31 31
 class LikeBackPrivate;
32 32
 class LikeBackBar;
@@ -48,7 +48,7 @@ class LikeBackDialog;
48 48
  *
49 49
  * The LikeBack system has 5 components:
50 50
  * @li In the application: The comment dialog, where the user write a comment, select a type of comment, etc.
51
- * @li In the application: The KAction to plug in the Help menu. This action displays the comment dialog.
51
+ * @li In the application: The TDEAction to plug in the Help menu. This action displays the comment dialog.
52 52
  * @li In the application: The button-bar, that floats bellow titlebar of every windows of the application, and let the user to quickly show the comment dialog.
53 53
  *                         The button-bar can be hidden.
54 54
  * @li On the server: A PHP script that collects every comments that users send. The LikeBack object should be configured to contact that server.
@@ -64,7 +64,7 @@ class LikeBackDialog;
64 64
  *     // Comment the following line once you are sure all your windows have a name:
65 65
  *     likeBack->setWindowNamesListing(LikeBack::WarnUnnamedWindows);
66 66
  *
67
- *     // This line should be called early in your KMainWindow constructor because it references actionCollection().
67
+ *     // This line should be called early in your TDEMainWindow constructor because it references actionCollection().
68 68
  *     // It should be called before createGUI() for the action to be plugged in the Help menu:
69 69
  *     likeBack->sendACommentAction(actionCollection());
70 70
  * @endcode
@@ -117,18 +117,18 @@ class LikeBack : public TQObject
117 117
 	 *                         The button-bar display is stored by version. On a new version, your default value will take effect again.
118 118
 	 *                         This allow you to disable the button-bar once the version is stable enought to be released as final.
119 119
 	 * @param config           Set the configuration file where to store the user email address and if the button-bar should be shown.
120
-	 *                         By default (null), the KApplication configuration object is used.
121
-	 * @param aboutData        Set the KAboutData instance used to get the application name and version. By default (null), the KApplication about data object is used.
120
+	 *                         By default (null), the TDEApplication configuration object is used.
121
+	 * @param aboutData        Set the TDEAboutData instance used to get the application name and version. By default (null), the TDEApplication about data object is used.
122 122
 	 *                         The application name is only used in the first-use information message.
123 123
 	 *                         The version is used to store the button-bar visibility per version (can be shown in a development version but not in a final one...)
124 124
 	 *                         and to send with the comment, so you can filter per version and know if a comment refers the latest version of the application or not.
125 125
 	 */
126
-	LikeBack(Button buttons = DefaultButtons, bool showBarByDefault = false, KConfig *config = 0, const KAboutData *aboutData = 0);
126
+	LikeBack(Button buttons = DefaultButtons, bool showBarByDefault = false, TDEConfig *config = 0, const TDEAboutData *aboutData = 0);
127 127
 
128 128
 	/**
129 129
 	 * Destructor.
130 130
 	 * Also hide the button-bar, if it was shown.
131
-	 * Be careful, the KAction is deleted. Do not use it afterward, and take care to unplug it before destroying this LikeBack instance.
131
+	 * Be careful, the TDEAction is deleted. Do not use it afterward, and take care to unplug it before destroying this LikeBack instance.
132 132
 	 */
133 133
 	~LikeBack();
134 134
 
@@ -209,7 +209,7 @@ class LikeBack : public TQObject
209 209
 	TQ_UINT16 hostPort();
210 210
 
211 211
 	/**
212
-	 * Get the KAction letting user to show the comment dialog.
212
+	 * Get the TDEAction letting user to show the comment dialog.
213 213
 	 * You should plug it in your Help menu, just bellow the "Report a Bug" action, or replace it.
214 214
 	 * Adding the action below "Report a Bug" or replacing "Report a Bug" depends on your application and if you have a Bugzilla account.
215 215
 	 * If you do not have a Bugzilla account, LikeBack is a good way for your small application to get bug reports: remove "Report a Bug".
@@ -219,7 +219,7 @@ class LikeBack : public TQObject
219 219
 	 *       <Action name="likeback_send_a_comment" />
220 220
 	 * @endcode
221 221
 	 */
222
-	KAction* sendACommentAction(KActionCollection *parent = 0);
222
+	TDEAction* sendACommentAction(TDEActionCollection *parent = 0);
223 223
 
224 224
 	/**
225 225
 	 * @Returns The path of the currently active window. Each windows are separated with "~~".
@@ -280,7 +280,7 @@ class LikeBack : public TQObject
280 280
 	 * @param windowPath     The window path to send with the comment. If empty (the default), the current window path is took.
281 281
 	 *                       Separate window names with "~~". For instance "MainWindow~~NewFile~~FileOpen".
282 282
 	 *                       If you popup the dialog after an error occurred, you can put the error name in that field (if the window path has no sense in that context).
283
-	 *                       When the dialog is popuped up from the sendACommentAction() KAction, this value is "HelpMenu", because there is no way to know if the user
283
+	 *                       When the dialog is popuped up from the sendACommentAction() TDEAction, this value is "HelpMenu", because there is no way to know if the user
284 284
 	 *                       is commenting a thing he found/thinked about in a sub-dialog.
285 285
 	 * @param context        Not used for the moment. Will allow more fine-grained application status report.
286 286
 	 */
@@ -302,7 +302,7 @@ class LikeBack : public TQObject
302 302
 
303 303
   private slots:
304 304
 	/**
305
-	 * Slot triggered by the "Help -> Send a Comment to Developers" KAction.
305
+	 * Slot triggered by the "Help -> Send a Comment to Developers" TDEAction.
306 306
 	 * It popups the comment dialog, and set the window path to "HelpMenuAction",
307 307
 	 * because current window path has no meaning in that case.
308 308
 	 */
@@ -323,16 +323,16 @@ class LikeBack : public TQObject
323 323
 	void setUserWantsToShowBar(bool showBar);
324 324
 
325 325
 	/**
326
-	 * @Returns A pointer to the KAboutData used to determin the application name and version.
326
+	 * @Returns A pointer to the TDEAboutData used to determin the application name and version.
327 327
 	 * @See The LikeBack constructor for more information.
328 328
 	 */
329
-	const KAboutData *aboutData();
329
+	const TDEAboutData *aboutData();
330 330
 
331 331
 	/**
332
-	 * @Returns A pointer to the KConfig used to store user configuration (email address, if the button-bar should be shown).
332
+	 * @Returns A pointer to the TDEConfig used to store user configuration (email address, if the button-bar should be shown).
333 333
 	 * @See The LikeBack constructor for more information.
334 334
 	 */
335
-	KConfig *config();
335
+	TDEConfig *config();
336 336
 
337 337
 	/**
338 338
 	 * During the first comment sending, the user is invited to enter his email address for the developers to be able to contact him back.

+ 3
- 3
src/likeback_private.h View File

@@ -38,8 +38,8 @@ class LikeBackPrivate
38 38
 	LikeBackPrivate();
39 39
 	~LikeBackPrivate();
40 40
 	LikeBackBar             *bar;
41
-	KConfig                 *config;
42
-	const KAboutData        *aboutData;
41
+	TDEConfig                 *config;
42
+	const TDEAboutData        *aboutData;
43 43
 	LikeBack::Button         buttons;
44 44
 	TQString                  hostName;
45 45
 	TQString                  remotePath;
@@ -51,7 +51,7 @@ class LikeBackPrivate
51 51
 	bool                     showBar;
52 52
 	int                      disabledCount;
53 53
 	TQString                  fetchedEmail;
54
-	KAction                 *action;
54
+	TDEAction                 *action;
55 55
 };
56 56
 
57 57
 class LikeBackBar : public TQWidget

+ 12
- 12
src/main.cpp View File

@@ -25,11 +25,11 @@
25 25
 #include "torkconfig.h"
26 26
 #include "functions.h"
27 27
 #include "newfirstrunwizard.h"
28
-#include <kapplication.h>
29
-#include <kaboutdata.h>
30
-#include <kcmdlineargs.h>
31
-#include <klocale.h>
32
-#include <kconfigdialogmanager.h>
28
+#include <tdeapplication.h>
29
+#include <tdeaboutdata.h>
30
+#include <tdecmdlineargs.h>
31
+#include <tdelocale.h>
32
+#include <tdeconfigdialogmanager.h>
33 33
 
34 34
 static const char description[] =
35 35
     I18N_NOOP("<b>TorK - An Anonymity Manager for the KDE Desktop.</b>\n"
@@ -40,7 +40,7 @@ static const char description[] =
40 40
 static const char version[] = "";
41 41
 static const char title[] = "TorK 0.33";
42 42
 
43
-static KCmdLineOptions options[] =
43
+static TDECmdLineOptions options[] =
44 44
 {
45 45
     { "+[URL]", I18N_NOOP( "Document to open." ), 0 },
46 46
     { "toggleKDE", I18N_NOOP("Toggle Anonymous KDE"), 0 },
@@ -58,8 +58,8 @@ static KCmdLineOptions options[] =
58 58
 
59 59
 int main(int argc, char **argv)
60 60
 {
61
-    KAboutData about("tork", I18N_NOOP(title), version, description,
62
-    KAboutData::License_GPL, "(C) 2006 - 2008 Robert Hogan", 0, 0, "tork-users@lists.sf.net");
61
+    TDEAboutData about("tork", I18N_NOOP(title), version, description,
62
+    TDEAboutData::License_GPL, "(C) 2006 - 2008 Robert Hogan", 0, 0, "tork-users@lists.sf.net");
63 63
     about.addAuthor( "Robert Hogan", I18N_NOOP("Author and Maintainer"), "robert@roberthogan.net", "http://tork.anonymityanywhere.com" );
64 64
     about.addAuthor( "Corinna Habets", I18N_NOOP("Icons"), 0);
65 65
     about.addAuthor( "Contains code by: Matt Edman, Justin Hipple, Max Howell,", 0, "" );
@@ -82,9 +82,9 @@ int main(int argc, char **argv)
82 82
     about.addCredit( "Max Urgel", I18N_NOOP("German Translation"), "bitwisser@googlemail.com");
83 83
     about.addCredit( "Daniel Berthereau", I18N_NOOP("French Translation"),
84 84
                      "Daniel.Berthereau@free.fr");
85
-    KCmdLineArgs::init(argc, argv, &about);
86
-    KCmdLineArgs::addCmdLineOptions(options);
87
-    KApplication app;
85
+    TDECmdLineArgs::init(argc, argv, &about);
86
+    TDECmdLineArgs::addCmdLineOptions(options);
87
+    TDEApplication app;
88 88
 
89 89
 
90 90
     //Check for the existence of anonymizable/helper programs first.
@@ -113,7 +113,7 @@ int main(int argc, char **argv)
113 113
     else
114 114
         widget->show();
115 115
 
116
-    //KCrash::setCrashHandler( torK::Crash::crashHandler );
116
+    //TDECrash::setCrashHandler( torK::Crash::crashHandler );
117 117
 
118 118
     return app.exec();
119 119
 }

+ 2
- 2
src/maxmin.ui.h View File

@@ -19,8 +19,8 @@
19 19
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
20 20
  ***************************************************************************/
21 21
 #include "torkconfig.h"
22
-#include <klocale.h>
23
-#include <kmessagebox.h>
22
+#include <tdelocale.h>
23
+#include <tdemessagebox.h>
24 24
 #include <ntqtooltip.h>
25 25
 #include <ntqpopupmenu.h>
26 26
 

+ 2
- 2
src/mixminion.ui View File

@@ -148,7 +148,7 @@
148 148
     </widget>
149 149
 </widget>
150 150
 <customwidgets>
151
-    <widget class="KProcess">
151
+    <widget class="TDEProcess">
152 152
         <property name="name">
153 153
             <cstring>proc</cstring>
154 154
         </property>
@@ -181,7 +181,7 @@
181 181
     <slot>send_clicked()</slot>
182 182
     <slot>slotProg(  )</slot>
183 183
     <slot>receivedMixminionOutput( KProcIO * mixminionproc )</slot>
184
-    <slot>mixminionprocExited( KProcess * proc )</slot>
184
+    <slot>mixminionprocExited( TDEProcess * proc )</slot>
185 185
 </slots>
186 186
 <functions>
187 187
     <function access="private" specifier="non virtual">init()</function>

+ 4
- 4
src/mixminion.ui.h View File

@@ -19,7 +19,7 @@
19 19
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
20 20
  ***************************************************************************/
21 21
 #include <kprocio.h>
22
-#include <kmessagebox.h>
22
+#include <tdemessagebox.h>
23 23
 #include <kprogress.h>
24 24
 #include <kdebug.h>
25 25
 #include <ntqregexp.h>
@@ -58,8 +58,8 @@ void MixMinionClient::send_clicked()
58 58
     *mixminionproc << "printf '" << messageBody->text() <<"' | mixminion  send -t " << toAddress->text() 
59 59
                 << " --subject '" << subject->text() << "'";
60 60
 
61
- 	connect( mixminionproc, SIGNAL(processExited(KProcess *)),
62
- 			SLOT(mixminionprocExited(KProcess *)) );
61
+ 	connect( mixminionproc, SIGNAL(processExited(TDEProcess *)),
62
+ 			SLOT(mixminionprocExited(TDEProcess *)) );
63 63
 	connect( mixminionproc, SIGNAL(readReady(KProcIO *)),
64 64
 		SLOT(receivedMixminionOutput(KProcIO *)) );
65 65
 
@@ -104,7 +104,7 @@ void MixMinionClient::receivedMixminionOutput(KProcIO *mixminionproc)
104 104
 }
105 105
 
106 106
 
107
-void MixMinionClient::mixminionprocExited(KProcess *proc)
107
+void MixMinionClient::mixminionprocExited(TDEProcess *proc)
108 108
 {
109 109
     TQString caption;
110 110
     TQString message;

+ 16
- 16
src/newfirstrunwizard.ui.h View File

@@ -23,7 +23,7 @@
23 23
 #include "crypto.h"
24 24
 #include "torclient.h"
25 25
 
26
-#include <kapplication.h>
26
+#include <tdeapplication.h>
27 27
 #include <ntqpushbutton.h>
28 28
 #include <ntqpixmap.h>
29 29
 #include <ntqtimer.h>
@@ -34,9 +34,9 @@
34 34
 #include <kdebug.h>
35 35
 #include <stdlib.h>
36 36
 #include <dcopref.h>
37
-#include <kconfig.h>
38
-#include <kmessagebox.h>
39
-#include <klocale.h>
37
+#include <tdeconfig.h>
38
+#include <tdemessagebox.h>
39
+#include <tdelocale.h>
40 40
 #include <krun.h>
41 41
 #include <ntqvaluevector.h>
42 42
 
@@ -128,7 +128,7 @@ FirstRunWizard::init()
128 128
 
129 129
     serverName->setText("TorKServer");
130 130
     
131
-	KConfig emailConf( TQString::fromLatin1("emaildefaults") );
131
+	TDEConfig emailConf( TQString::fromLatin1("emaildefaults") );
132 132
 	emailConf.setGroup(TQString::fromLatin1("Defaults"));
133 133
 	TQString profile = TQString::fromLatin1("PROFILE_");
134 134
 	profile += emailConf.readEntry(TQString::fromLatin1("Profile"), TQString::fromLatin1("Default"));
@@ -379,18 +379,18 @@ FirstRunWizard::saveNonAnonymousProxySettings()
379 379
 {
380 380
 
381 381
 
382
-    KConfig* config = new KConfig("kioslaverc", false, false);
382
+    TDEConfig* config = new TDEConfig("tdeioslaverc", false, false);
383 383
     config->setGroup( "Proxy Settings" );
384 384
     OriginalHttpProxy = config->readEntry( "httpProxy" );
385 385
     OriginalHttpsProxy = config->readEntry( "httpsProxy" );
386 386
     OriginalProxyType = config->readEntry( "ProxyType" );
387
-    config = new KConfig("kcookiejarrc", false, false);
387
+    config = new TDEConfig("kcookiejarrc", false, false);
388 388
     config->setGroup( "Cookie Policy" );
389 389
     OriginalCookies = config->readEntry( "Cookies" );
390
-    config = new KConfig("kio_httprc", false, false);
390
+    config = new TDEConfig("tdeio_httprc", false, false);
391 391
     OriginalUseCache = config->readEntry( "UseCache" );
392 392
     OriginalSendUserAgent = config->readEntry( "SendUserAgent" );
393
-    config = new KConfig("konquerorrc", false, false);
393
+    config = new TDEConfig("konquerorrc", false, false);
394 394
     config->setGroup( "Java/JavaScript Settings" );
395 395
     OriginalEnableJavascript = config->readEntry( "EnableJavaScript" );
396 396
     OriginalEnableJava = config->readEntry( "EnableJava" );
@@ -413,7 +413,7 @@ FirstRunWizard::saveAnonymousProxySettings()
413 413
 
414 414
 
415 415
 
416
-    KConfig* config = new KConfig("kioslaverc", false, false);
416
+    TDEConfig* config = new TDEConfig("tdeioslaverc", false, false);
417 417
     config->setGroup( "Proxy Settings" );
418 418
     KonqHttpProxy = config->readEntry( "httpProxy" ).section(":",0,1);
419 419
     KonqHttpProxyPort = config->readEntry( "httpProxy" ).section(":",-1,-1).toInt();
@@ -435,20 +435,20 @@ void FirstRunWizard::TorLocation_textChanged( const TQString & text)
435 435
 
436 436
 void FirstRunWizard::pushButton1_clicked()
437 437
 {
438
-    KRun::runCommand( "kcmshell proxy" );
438
+    KRun::runCommand( "tdecmshell proxy" );
439 439
 
440 440
 }
441 441
 
442 442
 
443 443
 void FirstRunWizard::pushButton1_2_clicked()
444 444
 {
445
-    KRun::runCommand( "kcmshell proxy" );
445
+    KRun::runCommand( "tdecmshell proxy" );
446 446
 }
447 447
 
448 448
 
449 449
 void FirstRunWizard::pushButton1_3_clicked()
450 450
 {
451
-    KRun::runCommand( "kcmshell proxy" );
451
+    KRun::runCommand( "tdecmshell proxy" );
452 452
 }
453 453
 
454 454
 void FirstRunWizard::testTorAgain_clicked()
@@ -600,7 +600,7 @@ void FirstRunWizard::rootifyNetstat()
600 600
 
601 601
     KProcIO *catproc = new KProcIO();
602 602
     catproc->setUseShell(TRUE);
603
-    TQString whichCommand= TQString("kdesu -t -c 'cp %1 %2;chmod u+s %3'").arg(netstat).arg(newnetstat).arg(newnetstat);
603
+    TQString whichCommand= TQString("tdesu -t -c 'cp %1 %2;chmod u+s %3'").arg(netstat).arg(newnetstat).arg(newnetstat);
604 604
     *catproc<<whichCommand;
605 605
     catproc->start(KProcIO::NotifyOnExit,TRUE);
606 606
 
@@ -645,7 +645,7 @@ void FirstRunWizard::appendControlDirective(const TQString& text)
645 645
 		TQString directory = KURL(text).directory();
646 646
         KProcIO *catproc = new KProcIO();
647 647
         catproc->setUseShell(TRUE);
648
-        TQString whichCommand= TQString("kdesu -c \"sh -c 'mkdir -p %1;printf \\\"ControlPort 9051\\n\\\""
648
+        TQString whichCommand= TQString("tdesu -c \"sh -c 'mkdir -p %1;printf \\\"ControlPort 9051\\n\\\""
649 649
                                       " >> %2;killall -s HUP tor'\"").arg(directory).arg(text);
650 650
         *catproc<<whichCommand;
651 651
         catproc->start(KProcIO::NotifyOnExit,TRUE);
@@ -758,7 +758,7 @@ void FirstRunWizard::appendPrivoxyConfig(const TQString& text)
758 758
 
759 759
         KProcIO *catproc = new KProcIO();
760 760
         catproc->setUseShell(TRUE);
761
-        TQString whichCommand= TQString("kdesu -c \"sh -c 'printf \\\"%1\\\""
761
+        TQString whichCommand= TQString("tdesu -c \"sh -c 'printf \\\"%1\\\""
762 762
                                       " >> %2;killall -s HUP privoxy'\"")
763 763
                                       .arg(privoxyConf)
764 764
                                       .arg(text);

+ 9
- 9
src/newstreamosd.cpp View File

@@ -40,13 +40,13 @@
40 40
 #include "newstreamosd.h"
41 41
 #include "torkview.h"
42 42
 
43
-#include <kwin.h>
43
+#include <twin.h>
44 44
 #include <kiconloader.h>
45 45
 #include <kdebug.h>
46 46
 #include <kcursor.h>
47
-#include <kconfig.h>
48
-#include <klocale.h>
49
-#include <kpopupmenu.h>
47
+#include <tdeconfig.h>
48
+#include <tdelocale.h>
49
+#include <tdepopupmenu.h>
50 50
 #include <ntqlistview.h>
51 51
 #include <ntqlayout.h>
52 52
 #include <ntqheader.h>
@@ -56,7 +56,7 @@
56 56
 #include <ntqapplication.h>
57 57
 #include <ntqframe.h>
58 58
 #include <ntqtoolbutton.h>
59
-#include <kapplication.h>
59
+#include <tdeapplication.h>
60 60
 #include <kiconloader.h>
61 61
 
62 62
 #include <X11/Xlib.h>
@@ -197,7 +197,7 @@ void StreamOSD::renderOSD()
197 197
     infoList = new TQListView( this, "infoList" );
198 198
     infoList->addColumn(  "StreamID"  );
199 199
     infoList->addColumn(  "Host"  );
200
-    infoList->addColumn(  kapp->iconLoader()->loadIconSet("tork_torsmall", KIcon::Small),"", 24   );
200
+    infoList->addColumn(  kapp->iconLoader()->loadIconSet("tork_torsmall", TDEIcon::Small),"", 24   );
201 201
     infoList->addColumn(  "KB/s"  );
202 202
     infoList->addColumn(  "Exit"  );
203 203
     infoList->setColumnWidthMode(0, TQListView::Manual);
@@ -398,7 +398,7 @@ void StreamOSD::mousePressEvent( TQMouseEvent* e )
398 398
     m_dragging = true;
399 399
   }
400 400
 /*  else if( e->button() == RightButton ) {
401
-    KPopupMenu m;
401
+    TDEPopupMenu m;
402 402
     if( m.insertItem( i18n("Hide OSD") ) == m.exec( e->pos() ) )
403 403
       hide();
404 404
   }*/
@@ -465,7 +465,7 @@ TQPoint StreamOSD::fixupPosition( const TQPoint& pp )
465 465
 }
466 466
 
467 467
 
468
-void StreamOSD::readSettings( KConfigBase* c )
468
+void StreamOSD::readSettings( TDEConfigBase* c )
469 469
 {
470 470
   TQString oldGroup = c->group();
471 471
   if (m_tortraffic)
@@ -480,7 +480,7 @@ void StreamOSD::readSettings( KConfigBase* c )
480 480
 }
481 481
 
482 482
 
483
-void StreamOSD::saveSettings( KConfigBase* c )
483
+void StreamOSD::saveSettings( TDEConfigBase* c )
484 484
 {
485 485
   TQString oldGroup = c->group();
486 486
   if (m_tortraffic)

+ 3
- 3
src/newstreamosd.h View File

@@ -26,7 +26,7 @@
26 26
 
27 27
 class TQPaintEvent;
28 28
 class TQMouseEvent;
29
-class KConfigBase;
29
+class TDEConfigBase;
30 30
 class TQHBox;
31 31
 class TQListView;
32 32
 class TQToolButton;
@@ -49,8 +49,8 @@ class StreamOSD : public TQWidget
49 49
   int screen() const { return m_screen; }
50 50
   const TQPoint& position() const { return m_position; }
51 51
 
52
-  void readSettings( KConfigBase* );
53
-  void saveSettings( KConfigBase* );
52
+  void readSettings( TDEConfigBase* );
53
+  void saveSettings( TDEConfigBase* );
54 54
 
55 55
  signals:
56 56
   void requestHideMonitor();

+ 1
- 1
src/paranoia.ui.h View File

@@ -20,7 +20,7 @@
20 20
  ***************************************************************************/
21 21
 
22 22
 #include "torkconfig.h"
23
-#include <klocale.h>
23
+#include <tdelocale.h>
24 24
 #include <ntqtooltip.h>
25 25
 #include <ntqpopupmenu.h>
26 26
 #include <kdebug.h>

+ 4
- 4
src/quickconfig.ui.h View File

@@ -21,14 +21,14 @@
21 21
 
22 22
 
23 23
 #include "torkconfig.h"
24
-#include <klocale.h>
24
+#include <tdelocale.h>
25 25
 #include <ntqtooltip.h>
26 26
 #include <ntqpopupmenu.h>
27 27
 #include <kdebug.h>
28 28
 #include <dcopref.h>
29
-#include <kconfig.h>
30
-#include <kmessagebox.h>
31
-#include <klocale.h>
29
+#include <tdeconfig.h>
30
+#include <tdemessagebox.h>
31
+#include <tdelocale.h>
32 32
 
33 33
 
34 34
 void QuickConfig::init()

+ 1
- 1
src/running.ui.h View File

@@ -21,7 +21,7 @@
21 21
 
22 22
 //dummy
23 23
 #include "torkconfig.h"
24
-#include <klocale.h>
24
+#include <tdelocale.h>
25 25
 #include <ntqtooltip.h>
26 26
 #include <ntqpopupmenu.h>
27 27
 #include <kdebug.h>

+ 1
- 1
src/server.ui.h View File

@@ -21,7 +21,7 @@
21 21
 #include "tork.h"
22 22
 #include "torkconfig.h"
23 23
 #include "upnpmanager.h"
24
-#include <klocale.h>
24
+#include <tdelocale.h>
25 25
 #include <kdebug.h>
26 26
 #include <ntqtooltip.h>
27 27
 #include <ntqpopupmenu.h>

+ 2
- 2
src/serverwizard.ui.h View File

@@ -18,7 +18,7 @@
18 18
  *   Free Software Foundation, Inc.,                                       *
19 19
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
20 20
  ***************************************************************************/
21
-#include <kmessagebox.h>
21
+#include <tdemessagebox.h>
22 22
 #include <kdebug.h>
23 23
 #include <ntqstringlist.h>
24 24
 #include "tork.h"
@@ -37,7 +37,7 @@ void ServerWizard::init()
37 37
         displayDiscoveredRouters();
38 38
 
39 39
     serverName->setText("TorKServer");
40
-	KConfig emailConf( TQString::fromLatin1("emaildefaults") );
40
+	TDEConfig emailConf( TQString::fromLatin1("emaildefaults") );
41 41
 	emailConf.setGroup(TQString::fromLatin1("Defaults"));
42 42
 	TQString profile = TQString::fromLatin1("PROFILE_");
43 43
 	profile += emailConf.readEntry(TQString::fromLatin1("Profile"), TQString::fromLatin1("Default"));

+ 1
- 1
src/testprivacyproxy.cpp View File

@@ -27,7 +27,7 @@
27 27
 #include "torkconfig.h"
28 28
 
29 29
 #include <ntqtimer.h>
30
-#include <klocale.h>
30
+#include <tdelocale.h>
31 31
 #include <assert.h>
32 32
 #include <ntqfile.h>
33 33
 #include <sys/socket.h>

+ 1
- 1
src/testprivacyproxy.h View File

@@ -32,7 +32,7 @@
32 32
 #include <ntqsocket.h>
33 33
 #include <ntqtextstream.h>
34 34
 #include <kdebug.h>
35
-#include <kconfigskeleton.h>
35
+#include <tdeconfigskeleton.h>
36 36
 #include <ntqlistview.h>
37 37
 #include "torkconfig.h"
38 38
 

+ 5
- 5
src/tor_ioslave/Makefile.am View File

@@ -1,15 +1,15 @@
1 1
 INCLUDES    = $(all_includes)
2 2
 LIBS =
3 3
 
4
-kde_module_LTLIBRARIES = kio_torioslave.la
4
+kde_module_LTLIBRARIES = tdeio_torioslave.la
5 5
 
6
-kio_torioslave_la_SOURCES = torioslave.cpp
7
-kio_torioslave_la_LIBADD = -lkio        
8
-kio_torioslave_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN)
6
+tdeio_torioslave_la_SOURCES = torioslave.cpp
7
+tdeio_torioslave_la_LIBADD = -ltdeio        
8
+tdeio_torioslave_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN)
9 9
 
10 10
 protocol_DATA = torioslave.protocol
11 11
 protocoldir = $(kde_servicesdir)
12 12
 
13 13
 messages: rc.cpp
14 14
 	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
15
-	$(XGETTEXT) *.cpp -o $(podir)/kio_torioslave.pot
15
+	$(XGETTEXT) *.cpp -o $(podir)/tdeio_torioslave.pot

+ 16
- 16
src/tor_ioslave/torioslave.cpp View File

@@ -32,39 +32,39 @@
32 32
 #include <netinet/in.h>
33 33
 #include <netdb.h>
34 34
 
35
-#include <kapplication.h>
35
+#include <tdeapplication.h>
36 36
 #include <kdebug.h>
37
-#include <kmessagebox.h>
37
+#include <tdemessagebox.h>
38 38
 #include <kinstance.h>
39
-#include <kglobal.h>
39
+#include <tdeglobal.h>
40 40
 #include <kstandarddirs.h>
41
-#include <klocale.h>
41
+#include <tdelocale.h>
42 42
 #include <kurl.h>
43 43
 #include <ksock.h>
44 44
 #include <dcopref.h>
45 45
 #include <dcopclient.h>
46 46
 #include <kdebug.h>
47
-#include <klocale.h>
47
+#include <tdelocale.h>
48 48
 #include <krun.h>
49 49
 #include <kprocio.h>
50 50
 
51 51
 #include "torioslave.h"
52 52
 
53
-using namespace KIO;
53
+using namespace TDEIO;
54 54
 
55 55
 
56
-kio_torProtocol::kio_torProtocol(const TQCString &pool_socket, const TQCString &app_socket)
57
-    : SlaveBase("kio_tor", pool_socket, app_socket)
56
+tdeio_torProtocol::tdeio_torProtocol(const TQCString &pool_socket, const TQCString &app_socket)
57
+    : SlaveBase("tdeio_tor", pool_socket, app_socket)
58 58
 {
59 59
 }
60 60
 
61 61
 
62
-kio_torProtocol::~kio_torProtocol()
62
+tdeio_torProtocol::~tdeio_torProtocol()
63 63
 {
64