Browse Source

Rename a number of libraries and executables to avoid conflicts with KDE4

tags/r14.0.0
Timothy Pearson 6 years ago
parent
commit
b363d2579a
100 changed files with 185 additions and 185 deletions
  1. 2
    2
      CMakeLists.txt
  2. 4
    4
      Makefile.am.in
  3. 1
    1
      README.Kolab
  4. 2
    2
      akregator/src/CMakeLists.txt
  5. 1
    1
      akregator/src/Makefile.am
  6. 4
    4
      akregator/src/akregator_part.cpp
  7. 2
    2
      akregator/src/akregator_part.h
  8. 1
    1
      akregator/src/akregator_run.h
  9. 3
    3
      akregator/src/akregator_view.cpp
  10. 1
    1
      akregator/src/articleviewer.cpp
  11. 1
    1
      akregator/src/feedlistview.cpp
  12. 2
    2
      akregator/src/frame.cpp
  13. 1
    1
      akregator/src/listtabwidget.cpp
  14. 2
    2
      akregator/src/mainwindow.cpp
  15. 3
    3
      akregator/src/mainwindow.h
  16. 3
    3
      akregator/src/pageviewer.cpp
  17. 2
    2
      akregator/src/tabwidget.cpp
  18. 2
    2
      akregator/src/viewer.cpp
  19. 1
    1
      akregator/src/viewer.h
  20. 1
    1
      certmanager/CMakeLists.txt
  21. 1
    1
      certmanager/Makefile.am
  22. 1
    1
      certmanager/kwatchgnupg/Makefile.am
  23. 7
    7
      dependency-graph.dot
  24. 3
    3
      doc/kmail/menus.docbook
  25. 1
    1
      doc/kmail/using-kmail.docbook
  26. 1
    1
      kabc/frontend/Makefile.am
  27. 1
    1
      kabc/kabc2mutt/Makefile.am
  28. 1
    1
      kabc/kabcdistlistupdater/Makefile.am
  29. 1
    1
      kaddressbook/CMakeLists.txt
  30. 1
    1
      kaddressbook/Makefile.am
  31. 1
    1
      kaddressbook/features/Makefile.am
  32. 1
    1
      kaddressbook/features/resourceselection.cpp
  33. 2
    2
      kaddressbook/kabcore.cpp
  34. 2
    2
      kaddressbook/kaddressbook_part.cpp
  35. 3
    3
      kaddressbook/kaddressbook_part.h
  36. 1
    1
      kaddressbook/viewmanager.cpp
  37. 1
    1
      kaddressbook/views/contactlistview.cpp
  38. 1
    1
      kaddressbook/views/kaddressbooktableview.cpp
  39. 1
    1
      kalarm/CMakeLists.txt
  40. 1
    1
      kalarm/Makefile.am
  41. 2
    2
      kalarm/kalarmd/Makefile.am
  42. 2
    2
      kandy/src/Makefile.am
  43. 2
    2
      karm/CMakeLists.txt
  44. 4
    4
      karm/Makefile.am
  45. 1
    1
      karm/karm_part.cpp
  46. 2
    2
      karm/karm_part.h
  47. 1
    1
      karm/mainwindow.cpp
  48. 1
    1
      karm/mainwindow.h
  49. 2
    2
      karm/test/Makefile.am
  50. 1
    1
      karm/test/locking.cpp
  51. 1
    1
      karm/test/remote_storage.sh
  52. 1
    1
      kioslaves/opengroupware/Makefile.am
  53. 1
    1
      kitchensync/src/CMakeLists.txt
  54. 1
    1
      kitchensync/src/Makefile.am
  55. 2
    2
      kitchensync/src/aboutpage.cpp
  56. 1
    1
      kitchensync/src/part.cpp
  57. 3
    3
      kitchensync/src/part.h
  58. 3
    3
      kmail/CMakeLists.txt
  59. 1
    1
      kmail/Mainpage.dox
  60. 2
    2
      kmail/Makefile.am
  61. 1
    1
      kmail/encodingdetector.cpp
  62. 3
    3
      kmail/encodingdetector_ja_p.h
  63. 1
    1
      kmail/headerstyle.cpp
  64. 2
    2
      kmail/kmail_part.cpp
  65. 5
    5
      kmail/kmail_part.h
  66. 2
    2
      kmail/kmcommands.cpp
  67. 2
    2
      kmail/kmcomposewin.cpp
  68. 2
    2
      kmail/kmedit.cpp
  69. 1
    1
      kmail/kmedit.h
  70. 1
    1
      kmail/kmheaders.cpp
  71. 1
    1
      kmail/kmkernel.cpp
  72. 1
    1
      kmail/kmkernel.h
  73. 1
    1
      kmail/kmmessage.cpp
  74. 1
    1
      kmail/kmmsgdict.cpp
  75. 4
    4
      kmail/kmreaderwin.cpp
  76. 2
    2
      kmail/kmtransport.cpp
  77. 1
    1
      kmail/networkaccount.cpp
  78. 1
    1
      kmail/objecttreeparser.cpp
  79. 1
    1
      kmail/regexplineedit.cpp
  80. 1
    1
      kmail/searchwindow.cpp
  81. 2
    2
      kmail/snippetwidget.h
  82. 5
    5
      kmail/tdehtmlparthtmlwriter.cpp
  83. 1
    1
      kmail/tdehtmlparthtmlwriter.h
  84. 1
    1
      kmail/tdemdict.cpp
  85. 0
    0
      kmail/tdemdict.h
  86. 12
    12
      kmail/tests/Makefile.am
  87. 3
    3
      kmail/tests/messagedicttests.cpp
  88. 1
    1
      kmail/tests/messagedicttests.h
  89. 4
    4
      kmail/tests/mimelibtests.cpp
  90. 1
    1
      kmail/tests/mimelibtests.h
  91. 3
    3
      kmail/tests/storagelayermodule.cpp
  92. 3
    3
      kmail/tests/utiltests.cpp
  93. 1
    1
      kmail/tests/utiltests.h
  94. 2
    2
      kmail/urlhandlermanager.cpp
  95. 1
    1
      kmailcvt/Makefile.am
  96. 2
    2
      kmobile/Makefile.am
  97. 1
    1
      knode/CMakeLists.txt
  98. 1
    1
      knode/Makefile.am
  99. 2
    2
      knode/articlewidget.cpp
  100. 0
    0
      knode/knaccountmanager.cpp

+ 2
- 2
CMakeLists.txt View File

@@ -109,7 +109,7 @@ option( BUILD_KORGANIZER "Build korganizer" ${BUILD_ALL} )
109 109
 option( BUILD_PLUGINS "Build plugins" ${BUILD_ALL} )
110 110
 option( BUILD_KNOTES "Build knotes" ${BUILD_ALL} )
111 111
 option( BUILD_KODE "Build kode" ${BUILD_ALL} )
112
-option( BUILD_KRESOURCES "Build kresources" ${BUILD_ALL} )
112
+option( BUILD_KRESOURCES "Build tderesources" ${BUILD_ALL} )
113 113
 option( BUILD_WIZARDS "Build wizards" ${BUILD_ALL} )
114 114
 option( BUILD_KABC "Build kabc" ${BUILD_ALL} )
115 115
 option( BUILD_KONSOLEKALENDAR "Build konsolekalendar" ${BUILD_ALL} )
@@ -181,7 +181,7 @@ tde_conditional_add_subdirectory( BUILD_KORGANIZER korganizer )
181 181
 tde_conditional_add_subdirectory( BUILD_PLUGINS plugins )
182 182
 tde_conditional_add_subdirectory( BUILD_KNOTES knotes )
183 183
 tde_conditional_add_subdirectory( BUILD_KODE kode )
184
-tde_conditional_add_subdirectory( BUILD_KRESOURCES kresources )
184
+tde_conditional_add_subdirectory( BUILD_KRESOURCES tderesources )
185 185
 tde_conditional_add_subdirectory( BUILD_WIZARDS wizards )
186 186
 tde_conditional_add_subdirectory( BUILD_KABC kabc )
187 187
 tde_conditional_add_subdirectory( BUILD_KONSOLEKALENDAR konsolekalendar )

+ 4
- 4
Makefile.am.in View File

@@ -11,7 +11,7 @@
11 11
 COMPILE_AFTER_libkmime = libemailfunctions
12 12
 COMPILE_AFTER_libemailfunctions = libkcal libkpimidentities kmail korganizer
13 13
 COMPILE_AFTER_libkholidays = korganizer kontact
14
-COMPILE_AFTER_libkcal = kalarm kitchensync konsolekalendar korganizer libkpimexchange libtdepim karm knotes kresources kfile-plugins
14
+COMPILE_AFTER_libkcal = kalarm kitchensync konsolekalendar korganizer libkpimexchange libtdepim karm knotes tderesources kfile-plugins
15 15
 COMPILE_AFTER_mimelib = korn kmail
16 16
 COMPILE_AFTER_libtdenetwork = kmail knode
17 17
 COMPILE_AFTER_libksieve = kmail
@@ -25,14 +25,14 @@ COMPILE_BEFORE_kaddressbook = libtdepim certmanager akregator
25 25
 COMPILE_BEFORE_kandy = libtdepim
26 26
 COMPILE_BEFORE_kmail= libtdepim libkpimidentities certmanager libkpgp libkmime
27 27
 COMPILE_BEFORE_knode= libtdepim libkpgp libkmime
28
-COMPILE_BEFORE_karm = libtdepim kresources
28
+COMPILE_BEFORE_karm = libtdepim tderesources
29 29
 COMPILE_BEFORE_plugins = kmail libtdepim libkcal
30 30
 COMPILE_BEFORE_kontact = kaddressbook knotes korganizer akregator karm
31 31
 COMPILE_BEFORE_kioslaves = libkmime libtdepim
32 32
 COMPILE_BEFORE_libkpimexchange = libtdepim
33 33
 COMPILE_BEFORE_kalarm = libtdepim libkmime
34
-COMPILE_BEFORE_kresources = libkpimexchange knotes kaddressbook kode
35
-COMPILE_BEFORE_wizards = libtdepim kresources korganizer kaddressbook kmail
34
+COMPILE_BEFORE_tderesources = libkpimexchange knotes kaddressbook kode
35
+COMPILE_BEFORE_wizards = libtdepim tderesources korganizer kaddressbook kmail
36 36
 COMPILE_BEFORE_korn = libtdenetwork
37 37
 COMPILE_BEFORE_kitchensync = libtdepim
38 38
 COMPILE_BEFORE_akregator = libtdepim

+ 1
- 1
README.Kolab View File

@@ -76,7 +76,7 @@ General Notes:
76 76
 ==============
77 77
 Autocompletion: Works in both KMail and KOrganizer. The order of resources used for completion
78 78
 is as follows:
79
-  1. All available addressbook resources as seen in "kcmshell kresources", section "kabc"
79
+  1. All available addressbook resources as seen in "kcmshell tderesources", section "kabc"
80 80
   2. LDAP
81 81
 
82 82
 Nothing special, AFAIK

+ 2
- 2
akregator/src/CMakeLists.txt View File

@@ -92,7 +92,7 @@ tde_add_library( akregatorprivate SHARED AUTOMOC
92 92
 
93 93
 tde_add_executable( akregator AUTOMOC
94 94
   SOURCES main.cpp mainwindow.cpp
95
-  LINK akregatorprivate-shared tdepim-shared kparts-shared
95
+  LINK akregatorprivate-shared tdepim-shared tdeparts-shared
96 96
   DESTINATION ${BIN_INSTALL_DIR}
97 97
 )
98 98
 
@@ -117,6 +117,6 @@ tde_add_kpart( libakregatorpart AUTOMOC
117 117
     tagpropertieswidgetbase.ui treenodeitem.cpp
118 118
     viewer.cpp ${TDE_INCLUDE_DIR}/kspeechsink.skel
119 119
     ${TDE_INCLUDE_DIR}/kspeech.stub listtabwidget.cpp
120
-  LINK akregatorprivate-shared tdepim-shared khtml-shared
120
+  LINK akregatorprivate-shared tdepim-shared tdehtml-shared
121 121
   DESTINATION ${PLUGIN_INSTALL_DIR}
122 122
 )

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

@@ -20,7 +20,7 @@ bin_PROGRAMS = akregator
20 20
 
21 21
 # the application source, library search path, and link libraries
22 22
 akregator_SOURCES = main.cpp mainwindow.cpp
23
-akregator_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
23
+akregator_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
24 24
 akregator_LDADD = $(LIB_KPARTS) libakregatorprivate.la
25 25
 #akregator_LDADD = $(LIB_KPARTS) libakregatorprivate.la $(top_builddir)/libtdepim/libtdepim.la
26 26
 

+ 4
- 4
akregator/src/akregator_part.cpp View File

@@ -32,7 +32,7 @@
32 32
 #include <kconfigdialog.h>
33 33
 #include <kfiledialog.h>
34 34
 #include <kglobalsettings.h>
35
-#include <khtmldefaults.h>
35
+#include <tdehtmldefaults.h>
36 36
 #include <kinstance.h>
37 37
 #include <kmainwindow.h>
38 38
 #include <kmessagebox.h>
@@ -45,9 +45,9 @@
45 45
 #include <ktempfile.h>
46 46
 #include <ktrader.h>
47 47
 #include <kio/netaccess.h>
48
-#include <kparts/browserinterface.h>
49
-#include <kparts/genericfactory.h>
50
-#include <kparts/partmanager.h>
48
+#include <tdeparts/browserinterface.h>
49
+#include <tdeparts/genericfactory.h>
50
+#include <tdeparts/partmanager.h>
51 51
 
52 52
 #include <tqfile.h>
53 53
 #include <tqobjectlist.h>

+ 2
- 2
akregator/src/akregator_part.h View File

@@ -26,8 +26,8 @@
26 26
 #ifndef _AKREGATORPART_H_
27 27
 #define _AKREGATORPART_H_
28 28
 
29
-#include <kparts/browserextension.h>
30
-#include <kparts/part.h>
29
+#include <tdeparts/browserextension.h>
30
+#include <tdeparts/part.h>
31 31
 #include <kurl.h>
32 32
 
33 33
 #include "config.h"

+ 1
- 1
akregator/src/akregator_run.h View File

@@ -25,7 +25,7 @@
25 25
 #ifndef AKREGATOR_RUN_H 
26 26
 #define AKREGATOR_RUN_H
27 27
 
28
-#include <kparts/browserrun.h>
28
+#include <tdeparts/browserrun.h>
29 29
 
30 30
 namespace Akregator
31 31
 {

+ 3
- 3
akregator/src/akregator_view.cpp View File

@@ -67,8 +67,8 @@
67 67
 #include <kdialog.h>
68 68
 #include <kfiledialog.h>
69 69
 #include <kfileitem.h>
70
-#include <khtml_part.h>
71
-#include <khtmlview.h>
70
+#include <tdehtml_part.h>
71
+#include <tdehtmlview.h>
72 72
 #include <kiconloader.h>
73 73
 #include <kinputdialog.h>
74 74
 #include <klineedit.h>
@@ -82,7 +82,7 @@
82 82
 #include <kstandarddirs.h>
83 83
 #include <kurl.h>
84 84
 #include <kxmlguifactory.h>
85
-#include <kparts/partmanager.h>
85
+#include <tdeparts/partmanager.h>
86 86
 
87 87
 #include <tqbuttongroup.h>
88 88
 #include <tqcheckbox.h>

+ 1
- 1
akregator/src/articleviewer.cpp View File

@@ -31,7 +31,7 @@
31 31
 #include <kapplication.h>
32 32
 #include <kdebug.h>
33 33
 #include <kglobalsettings.h>
34
-#include <khtmlview.h>
34
+#include <tdehtmlview.h>
35 35
 #include <klocale.h>
36 36
 #include <kprocess.h>
37 37
 #include <krun.h>

+ 1
- 1
akregator/src/feedlistview.cpp View File

@@ -43,7 +43,7 @@
43 43
 #include <kiconeffect.h>
44 44
 #include <kiconloader.h>
45 45
 #include <klocale.h>
46
-#include <kmultipledrag.h>
46
+#include <tdemultipledrag.h>
47 47
 #include <kstringhandler.h>
48 48
 #include <kurldrag.h>
49 49
 

+ 2
- 2
akregator/src/frame.cpp View File

@@ -28,8 +28,8 @@
28 28
 #include <kactioncollection.h>
29 29
 #include <kdebug.h>
30 30
 #include <klocale.h>
31
-#include <kparts/browserextension.h>
32
-#include <kparts/part.h>
31
+#include <tdeparts/browserextension.h>
32
+#include <tdeparts/part.h>
33 33
 
34 34
 #include <libtdepim/progressmanager.h>
35 35
 

+ 1
- 1
akregator/src/listtabwidget.cpp View File

@@ -27,7 +27,7 @@
27 27
 #include "folder.h"
28 28
 #include "treenode.h"
29 29
 
30
-#include <kmultitabbar.h>
30
+#include <tdemultitabbar.h>
31 31
 
32 32
 #include <tqiconset.h>
33 33
 #include <tqlayout.h>

+ 2
- 2
akregator/src/mainwindow.cpp View File

@@ -41,7 +41,7 @@
41 41
 #include <klibloader.h>
42 42
 #include <klocale.h>
43 43
 #include <kmessagebox.h>
44
-#include <kparts/partmanager.h>
44
+#include <tdeparts/partmanager.h>
45 45
 #include <ksqueezedtextlabel.h>
46 46
 #include <kstandarddirs.h>
47 47
 #include <kstatusbar.h>
@@ -237,7 +237,7 @@ bool MainWindow::queryExit()
237 237
     kdDebug() << "MainWindow::queryExit()" << endl;
238 238
     if ( !kapp->sessionSaving() )
239 239
     {
240
-        delete m_part; // delete that here instead of dtor to ensure nested khtmlparts are deleted before singleton objects like KHTMLPageCache
240
+        delete m_part; // delete that here instead of dtor to ensure nested tdehtmlparts are deleted before singleton objects like KHTMLPageCache
241 241
         m_part = 0;
242 242
     }
243 243
     else

+ 3
- 3
akregator/src/mainwindow.h View File

@@ -30,9 +30,9 @@
30 30
 #endif
31 31
 
32 32
 #include <kapplication.h>
33
-#include <kparts/mainwindow.h>
34
-#include <kparts/browserinterface.h>
35
-#include <kparts/browserextension.h>
33
+#include <tdeparts/mainwindow.h>
34
+#include <tdeparts/browserinterface.h>
35
+#include <tdeparts/browserextension.h>
36 36
 #include <kio/job.h>
37 37
 
38 38
 class KActionCollection;

+ 3
- 3
akregator/src/pageviewer.cpp View File

@@ -35,14 +35,14 @@
35 35
 #include <kbookmarkmanager.h>
36 36
 #include <kconfig.h>
37 37
 #include <kglobalsettings.h>
38
-#include <khtml_settings.h>
39
-#include <khtmlview.h>
38
+#include <tdehtml_settings.h>
39
+#include <tdehtmlview.h>
40 40
 #include <kiconloader.h>
41 41
 #include <klocale.h>
42 42
 #include <kpopupmenu.h>
43 43
 #include <kstandarddirs.h>
44 44
 #include <kstdaccel.h>
45
-#include <kparts/browserinterface.h>
45
+#include <tdeparts/browserinterface.h>
46 46
 
47 47
 #include <tqclipboard.h>
48 48
 #include <tqcstring.h>

+ 2
- 2
akregator/src/tabwidget.cpp View File

@@ -41,8 +41,8 @@
41 41
 #include <kpopupmenu.h>
42 42
 #include <krun.h>
43 43
 #include <klocale.h>
44
-#include <khtmlview.h>
45
-#include <khtml_part.h>
44
+#include <tdehtmlview.h>
45
+#include <tdehtml_part.h>
46 46
 #include <kiconloader.h>
47 47
 #include <kurl.h>
48 48
 #include <kurldrag.h>

+ 2
- 2
akregator/src/viewer.cpp View File

@@ -26,7 +26,7 @@
26 26
 #include <kaction.h>
27 27
 #include <kapplication.h>
28 28
 #include <kfiledialog.h>
29
-#include <khtmlview.h>
29
+#include <tdehtmlview.h>
30 30
 #include <kiconloader.h>
31 31
 #include <klocale.h>
32 32
 #include <kmessagebox.h>
@@ -35,7 +35,7 @@
35 35
 #include <krun.h>
36 36
 #include <kshell.h>
37 37
 #include <kurl.h>
38
-#include <kparts/browserextension.h>
38
+#include <tdeparts/browserextension.h>
39 39
 
40 40
 #include <tqaccel.h>
41 41
 #include <tqclipboard.h>

+ 1
- 1
akregator/src/viewer.h View File

@@ -25,7 +25,7 @@
25 25
 #ifndef VIEWER_H
26 26
 #define VIEWER_H
27 27
 
28
-#include <khtml_part.h>
28
+#include <tdehtml_part.h>
29 29
 
30 30
 class KURL;
31 31
 

+ 1
- 1
certmanager/CMakeLists.txt View File

@@ -50,7 +50,7 @@ tde_add_executable( kleopatra AUTOMOC
50 50
     hierarchyanalyser.cpp certificatewizard.ui certificatewizardimpl.cpp
51 51
     certificateinfowidget.ui certificateinfowidgetimpl.cpp
52 52
     crlview.cpp storedtransferjob.cpp certlistview.cpp
53
-  LINK conf-static kleopatra-shared kutils-shared kabc-shared
53
+  LINK conf-static kleopatra-shared tdeutils-shared kabc-shared
54 54
   DESTINATION ${BIN_INSTALL_DIR}
55 55
 )
56 56
 

+ 1
- 1
certmanager/Makefile.am View File

@@ -17,7 +17,7 @@ kleopatra_SOURCES = \
17 17
 
18 18
 METASOURCES = AUTO
19 19
 
20
-kleopatra_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
20
+kleopatra_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
21 21
 kleopatra_LDADD   = conf/libconf.la lib/libkleopatra.la $(LIB_KUTILS) $(LIB_KABC)
22 22
 
23 23
 rcdir = $(kde_datadir)/kleopatra

+ 1
- 1
certmanager/kwatchgnupg/Makefile.am View File

@@ -13,7 +13,7 @@ kwatchgnupg_SOURCES = \
13 13
 
14 14
 METASOURCES = AUTO
15 15
 
16
-kwatchgnupg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
16
+kwatchgnupg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
17 17
 kwatchgnupg_LDADD   = ../conf/libconf.la ../lib/libkleopatra.la $(LIB_KUTILS) $(LIB_KABC)
18 18
 
19 19
 rcdir = $(kde_datadir)/kwatchgnupg

+ 7
- 7
dependency-graph.dot View File

@@ -6,18 +6,18 @@ digraph "inter-dependency graph for tdepim" {
6 6
         "certmanager" -> "kmail";
7 7
         "certmanager" -> "libkpimidentities";
8 8
         "kaddressbook" -> "kontact";
9
-        "kaddressbook" -> "kresources";
9
+        "kaddressbook" -> "tderesources";
10 10
         "kaddressbook" -> "wizards";
11 11
         "kgantt" -> "korganizer";
12 12
         "kmail" -> "plugins";
13 13
         "kmail" -> "wizards";
14 14
         "knotes" -> "kontact";
15
-        "knotes" -> "kresources";
16
-        "kode" -> "kresources";
15
+        "knotes" -> "tderesources";
16
+        "kode" -> "tderesources";
17 17
         "korganizer" -> "kontact";
18 18
         "korganizer" -> "wizards";
19
-        "kresources" -> "karm";
20
-        "kresources" -> "wizards";
19
+        "tderesources" -> "karm";
20
+        "tderesources" -> "wizards";
21 21
         "ktnef" -> "libkcal";
22 22
         "libemailfunctions" -> "kmail";
23 23
         "libemailfunctions" -> "korganizer";
@@ -31,7 +31,7 @@ digraph "inter-dependency graph for tdepim" {
31 31
         "libkcal" -> "konsolekalendar";
32 32
         "libkcal" -> "korganizer";
33 33
         "libkcal" -> "kpilot";
34
-        "libkcal" -> "kresources";
34
+        "libkcal" -> "tderesources";
35 35
         "libkcal" -> "libtdepim";
36 36
         "libkcal" -> "libkpimexchange";
37 37
         "libkcal" -> "plugins";
@@ -64,7 +64,7 @@ digraph "inter-dependency graph for tdepim" {
64 64
         "libkpgp" -> "kmail";
65 65
         "libkpgp" -> "knode";
66 66
         "libkpimexchange" -> "korganizer";
67
-        "libkpimexchange" -> "kresources";
67
+        "libkpimexchange" -> "tderesources";
68 68
         "libkpimidentities" -> "kmail";
69 69
         "libkpimidentities" -> "korganizer";
70 70
         "libksieve" -> "kmail";

+ 3
- 3
doc/kmail/menus.docbook View File

@@ -2100,9 +2100,9 @@ attachment window.</para>
2100 2100
 </menuchoice>
2101 2101
 </term>
2102 2102
 <listitem>
2103
-<para>Uses <ulink url="/kspell/">&kspell;</ulink> to check the spelling in the body of your
2103
+<para>Uses <ulink url="/tdespell/">&tdespell;</ulink> to check the spelling in the body of your
2104 2104
 message. Note that
2105
-you have to configure &kspell; with <menuchoice><guimenu>Settings</guimenu>
2105
+you have to configure &tdespell; with <menuchoice><guimenu>Settings</guimenu>
2106 2106
 <guimenuitem>Spellchecker...</guimenuitem></menuchoice> if you use it for the
2107 2107
 first time.</para>
2108 2108
 </listitem>
@@ -2163,7 +2163,7 @@ tools to change certain properties of the composed text.</para>
2163 2163
 </menuchoice>
2164 2164
 </term>
2165 2165
 <listitem>
2166
-<para>Allows you to configure <ulink url="/kspell/">&kspell;</ulink>, &kde;'s spellchecker.</para>
2166
+<para>Allows you to configure <ulink url="/tdespell/">&tdespell;</ulink>, &kde;'s spellchecker.</para>
2167 2167
 </listitem>
2168 2168
 </varlistentry>
2169 2169
 

+ 1
- 1
doc/kmail/using-kmail.docbook View File

@@ -366,7 +366,7 @@ automatic spellchecking in the <menuchoice><guimenu>Options</guimenu></menuchoic
366 366
 <para>To check the spelling of your message using a dialog, select
367 367
 <menuchoice><guimenu>Tools</guimenu>
368 368
 <guimenuitem>Spelling...</guimenuitem></menuchoice>. &kmail; uses
369
-<ulink url="/kspell/">&kspell;</ulink> to
369
+<ulink url="/tdespell/">&tdespell;</ulink> to
370 370
 check spelling, which is the &kde; frontend to the
371 371
 <application>ispell</application> or <application>aspell</application> spelling
372 372
 checker. Note that you may first need to configure the spellchecker using

+ 1
- 1
kabc/frontend/Makefile.am View File

@@ -4,7 +4,7 @@ METASOURCES = AUTO
4 4
 
5 5
 bin_PROGRAMS = kabcfrontend
6 6
 
7
-kabcfrontend_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
7
+kabcfrontend_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
8 8
 kabcfrontend_LDADD = -lkabc $(LIB_TDECORE)
9 9
 kabcfrontend_SOURCES = main.cpp mainWindow.ui
10 10
 

+ 1
- 1
kabc/kabc2mutt/Makefile.am View File

@@ -4,7 +4,7 @@ METASOURCES = AUTO
4 4
 
5 5
 bin_PROGRAMS = kabc2mutt
6 6
 
7
-kabc2mutt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
7
+kabc2mutt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
8 8
 kabc2mutt_LDADD = -lkabc $(LIB_TDECORE)
9 9
 kabc2mutt_SOURCES = kabc2mutt.cpp main.cpp
10 10
 

+ 1
- 1
kabc/kabcdistlistupdater/Makefile.am View File

@@ -4,7 +4,7 @@ METASOURCES = AUTO
4 4
 
5 5
 bin_PROGRAMS = kabcdistlistupdater
6 6
 
7
-kabcdistlistupdater_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
7
+kabcdistlistupdater_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
8 8
 kabcdistlistupdater_LDADD = $(LIB_KABC) $(top_builddir)/libtdepim/libtdepim.la
9 9
 kabcdistlistupdater_SOURCES = kabcdistlistupdater.cpp
10 10
 

+ 1
- 1
kaddressbook/CMakeLists.txt View File

@@ -103,6 +103,6 @@ tde_add_library( kaddressbook SHARED AUTOMOC
103 103
   LINK
104 104
     kabcommon-static kabim-static printer-static
105 105
     kabinterfaces-shared
106
-    tdepim-shared kabc_file-shared tdeprint-shared kutils-shared
106
+    tdepim-shared kabc_file-shared tdeprint-shared tdeutils-shared
107 107
   DESTINATION ${LIB_INSTALL_DIR}
108 108
 )

+ 1
- 1
kaddressbook/Makefile.am View File

@@ -17,7 +17,7 @@ INCLUDES= -I$(top_srcdir)/kaddressbook/interfaces \
17 17
 bin_PROGRAMS = kaddressbook
18 18
 
19 19
 kaddressbook_SOURCES = main.cpp kaddressbookmain.cpp
20
-kaddressbook_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
20
+kaddressbook_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
21 21
 kaddressbook_LDADD = libkaddressbook.la
22 22
 
23 23
 kde_module_LTLIBRARIES = libkaddressbookpart.la

+ 1
- 1
kaddressbook/features/Makefile.am View File

@@ -26,7 +26,7 @@ endif
26 26
 
27 27
 libkaddrbk_resourceselection_la_SOURCES = resourceselection.cpp
28 28
 libkaddrbk_resourceselection_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
29
-libkaddrbk_resourceselection_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) -lkresources
29
+libkaddrbk_resourceselection_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) -ltderesources
30 30
 
31 31
 noinst_HEADERS = distributionlistwidget.h distributionlistngwidget.h resourceselection.h
32 32
 

+ 1
- 1
kaddressbook/features/resourceselection.cpp View File

@@ -36,7 +36,7 @@
36 36
 #include <kinputdialog.h>
37 37
 #include <klocale.h>
38 38
 #include <kmessagebox.h>
39
-#include <kresources/configdialog.h>
39
+#include <tderesources/configdialog.h>
40 40
 
41 41
 #include "core.h"
42 42
 

+ 2
- 2
kaddressbook/kabcore.cpp View File

@@ -52,13 +52,13 @@
52 52
 #include <kcmultidialog.h>
53 53
 #include <kdebug.h>
54 54
 #include <tdeversion.h>
55
-#include <kimproxy.h>
55
+#include <tdeimproxy.h>
56 56
 #include <klocale.h>
57 57
 #include <kmessagebox.h>
58 58
 #include <kprinter.h>
59 59
 #include <kprotocolinfo.h>
60 60
 #include <kpushbutton.h>
61
-#include <kresources/selectdialog.h>
61
+#include <tderesources/selectdialog.h>
62 62
 #include <kstandarddirs.h>
63 63
 #include <kstatusbar.h>
64 64
 #include <kstdguiitem.h>

+ 2
- 2
kaddressbook/kaddressbook_part.cpp View File

@@ -29,8 +29,8 @@
29 29
 #include <kiconloader.h>
30 30
 #include <kinstance.h>
31 31
 #include <klocale.h>
32
-#include <kparts/genericfactory.h>
33
-#include <kparts/statusbarextension.h>
32
+#include <tdeparts/genericfactory.h>
33
+#include <tdeparts/statusbarextension.h>
34 34
 #include <kstatusbar.h>
35 35
 
36 36
 #include "kabcore.h"

+ 3
- 3
kaddressbook/kaddressbook_part.h View File

@@ -23,9 +23,9 @@
23 23
 #ifndef KADDRESSBOOK_PART_H
24 24
 #define KADDRESSBOOK_PART_H
25 25
 
26
-#include <kparts/event.h>
27
-#include <kparts/factory.h>
28
-#include <kparts/part.h>
26
+#include <tdeparts/event.h>
27
+#include <tdeparts/factory.h>
28
+#include <tdeparts/part.h>
29 29
 
30 30
 #include "kaddressbookiface.h"
31 31
 

+ 1
- 1
kaddressbook/viewmanager.cpp View File

@@ -35,7 +35,7 @@
35 35
 #include <kiconloader.h>
36 36
 #include <klocale.h>
37 37
 #include <kmessagebox.h>
38
-#include <kmultipledrag.h>
38
+#include <tdemultipledrag.h>
39 39
 #include <ktempdir.h>
40 40
 #include <ktrader.h>
41 41
 #include <kurldrag.h>

+ 1
- 1
kaddressbook/views/contactlistview.cpp View File

@@ -38,7 +38,7 @@
38 38
 #include <kurl.h>
39 39
 #include <kabc/addressbook.h>
40 40
 #include <kabc/addressee.h>
41
-#include <kimproxy.h>
41
+#include <tdeimproxy.h>
42 42
 
43 43
 #include "kaddressbooktableview.h"
44 44
 

+ 1
- 1
kaddressbook/views/kaddressbooktableview.cpp View File

@@ -48,7 +48,7 @@
48 48
 #include <kmessagebox.h>
49 49
 #include <kurl.h>
50 50
 #include <kurlrequester.h>
51
-#include <kimproxy.h>
51
+#include <tdeimproxy.h>
52 52
 
53 53
 #include "configuretableviewdialog.h"
54 54
 #include "contactlistview.h"

+ 1
- 1
kalarm/CMakeLists.txt View File

@@ -74,6 +74,6 @@ tde_add_executable( kalarm AUTOMOC
74 74
     kalarmd/alarmguiiface.skel
75 75
   LINK
76 76
     kalarm-static kalarmd-static
77
-    kpimidentities-shared kutils-shared ${ARTS_LIBRARIES}
77
+    kpimidentities-shared tdeutils-shared ${ARTS_LIBRARIES}
78 78
   DESTINATION ${BIN_INSTALL_DIR}
79 79
 )

+ 1
- 1
kalarm/Makefile.am View File

@@ -31,7 +31,7 @@ kalarm_LDADD = $(top_builddir)/kalarm/lib/libkalarm.la \
31 31
 	$(top_builddir)/kalarm/kalarmd/libkalarmd.la \
32 32
 	$(top_builddir)/libtdepim/libtdepim.la \
33 33
 	$(top_builddir)/libkpimidentities/libkpimidentities.la \
34
-	-lkabc -lkutils $(LIB_TDEUI) $(ARTSLIB) $(LIBXTST)
34
+	-lkabc -ltdeutils $(LIB_TDEUI) $(ARTSLIB) $(LIBXTST)
35 35
 noinst_HEADERS = alarmcalendar.h alarmevent.h alarmlistview.h alarmtext.h \
36 36
 	alarmtimewidget.h birthdaydlg.h daemon.h dcophandler.h deferdlg.h \
37 37
 	editdlg.h editdlgprivate.h emailidcombo.h eventlistviewbase.h find.h \

+ 2
- 2
kalarm/kalarmd/Makefile.am View File

@@ -2,13 +2,13 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kalarm $(all_includes)
2 2
 
3 3
 noinst_LTLIBRARIES = libkalarmd.la
4 4
 
5
-libkalarmd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
5
+libkalarmd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
6 6
 libkalarmd_la_LIBADD  = $(LIB_TDECORE) $(top_builddir)/libkcal/libkcal.la
7 7
 libkalarmd_la_SOURCES =  alarmdaemoniface.stub alarmguiiface.stub
8 8
 
9 9
 bin_PROGRAMS = kalarmd
10 10
 
11
-kalarmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
11
+kalarmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
12 12
 kalarmd_LDADD = $(LIB_TDEUI) $(top_builddir)/libkcal/libkcal.la libkalarmd.la
13 13
 kalarmd_SOURCES = alarmdaemon.cpp admain.cpp adapp.cpp \
14 14
         adcalendar.cpp adconfigdata.cpp clientinfo.cpp \

+ 2
- 2
kandy/src/Makefile.am View File

@@ -2,7 +2,7 @@ bin_PROGRAMS = kandy kandy_client
2 2
 
3 3
 INCLUDES = -I$(top_srcdir) $(all_includes)
4 4
 
5
-kandy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
5
+kandy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
6 6
 kandy_LDADD   = $(KANDY_LIBLOCKDEV) $(LIB_KFILE) -lkabc $(top_builddir)/libtdepim/libtdepim.la
7 7
 kandy_SOURCES =	main.cpp kandy.cpp \
8 8
                 cmdpropertiesdialog_base.ui cmdpropertiesdialog.cpp \
@@ -19,7 +19,7 @@ KDE_ICON = kandy
19 19
 noinst_HEADERS   = kandy.h kandyview.h modem.h atcommand.h \
20 20
                    commanditem.h mobilegui.h commandscheduler.h
21 21
 
22
-kandy_client_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
22
+kandy_client_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
23 23
 kandy_client_LDADD   = $(LIB_TDECORE)
24 24
 kandy_client_SOURCES = kandy_client.cpp
25 25
 

+ 2
- 2
karm/CMakeLists.txt View File

@@ -13,7 +13,7 @@ tde_import( libkmime )
13 13
 tde_import( ktnef )
14 14
 tde_import( libkcal )
15 15
 tde_import( libtdepim )
16
-tde_import( kresources )
16
+tde_import( tderesources )
17 17
 
18 18
 add_subdirectory( support )
19 19
 add_subdirectory( pics )
@@ -25,7 +25,7 @@ include_directories(
25 25
   ${CMAKE_SOURCE_DIR}
26 26
   ${CMAKE_SOURCE_DIR}/libkcal
27 27
   ${CMAKE_SOURCE_DIR}/libtdepim
28
-  ${CMAKE_SOURCE_DIR}/kresources/remote
28
+  ${CMAKE_SOURCE_DIR}/tderesources/remote
29 29
   ${TDE_INCLUDE_DIR}
30 30
   ${TQT_INCLUDE_DIRS}
31 31
 )

+ 4
- 4
karm/Makefile.am View File

@@ -1,13 +1,13 @@
1 1
 
2 2
 ############ Autoconf-generated variables  ###################
3
-INCLUDES = -I$(top_srcdir)/libkcal -I$(top_srcdir)/kresources/remote -I$(top_srcdir) $(all_includes)
3
+INCLUDES = -I$(top_srcdir)/libkcal -I$(top_srcdir)/tderesources/remote -I$(top_srcdir) $(all_includes)
4 4
 
5 5
 bin_PROGRAMS = karm
6 6
 SUBDIRS = support pics test
7 7
 
8 8
 METASOURCES = AUTO
9 9
 
10
-COMPILE_BEFORE_karm = libtdepim kresources
10
+COMPILE_BEFORE_karm = libtdepim tderesources
11 11
 
12 12
 noinst_LTLIBRARIES = libkarm_shared.la
13 13
 
@@ -19,11 +19,11 @@ libkarm_shared_la_SOURCES = kaccelmenuwatch.cpp desktoptracker.cpp \
19 19
 		csvexportdialog_base.ui csvexportdialog.cpp plannerparser.cpp \
20 20
 		karmdcopiface.skel taskviewwhatsthis.cpp
21 21
 libkarm_shared_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
22
-	     $(top_builddir)/kresources/remote/libkcal_resourceremote.la \
22
+	     $(top_builddir)/tderesources/remote/libkcal_resourceremote.la \
23 23
              $(top_builddir)/libtdepim/libtdepim.la $(LIBXSS) -ltdeprint 
24 24
 karm_SOURCES = main.cpp
25 25
 karm_LDADD = libkarm_shared.la 
26
-karm_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
26
+karm_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
27 27
 noinst_HEADERS = desktoptracker.h edittaskdialog.h printdialog.h \
28 28
                  idletimedetector.h kaccelmenuwatch.h timekard.h \
29 29
 		 karmutility.h ktimewidget.h karmstorage.h mainwindow.h \

+ 1
- 1
karm/karm_part.cpp View File

@@ -156,7 +156,7 @@ void karmPart::makeMenus()
156 156
       TQT_SLOT( newTask() ), actionCollection(),
157 157
       "new_task");
158 158
   actionNewSub = new KAction( i18n("New &Subtask..."),
159
-      TQString::fromLatin1("kmultiple"), CTRL+ALT+Key_N,
159
+      TQString::fromLatin1("tdemultiple"), CTRL+ALT+Key_N,
160 160
       TQT_TQOBJECT(_taskView),
161 161
       TQT_SLOT( newSubTask() ), actionCollection(),
162 162
       "new_sub_task");

+ 2
- 2
karm/karm_part.h View File

@@ -1,9 +1,9 @@
1 1
 #ifndef _KARMPART_H_
2 2
 #define _KARMPART_H_
3 3
 
4
-#include <kparts/part.h>
4
+#include <tdeparts/part.h>
5 5
 #include "karmerrors.h"
6
-#include <kparts/factory.h>
6
+#include <tdeparts/factory.h>
7 7
 #include <karmdcopiface.h>
8 8
 #include "reportcriteria.h"
9 9
 #include <tqlistview.h>

+ 1
- 1
karm/mainwindow.cpp View File

@@ -294,7 +294,7 @@ void MainWindow::makeMenus()
294 294
       TQT_SLOT( newTask() ), actionCollection(),
295 295
       "new_task");
296 296
   actionNewSub = new KAction( i18n("New &Subtask..."),
297
-      TQString::fromLatin1("kmultiple"), CTRL+ALT+Key_N,
297
+      TQString::fromLatin1("tdemultiple"), CTRL+ALT+Key_N,
298 298
       TQT_TQOBJECT(_taskView),
299 299
       TQT_SLOT( newSubTask() ), actionCollection(),
300 300
       "new_sub_task");

+ 1
- 1
karm/mainwindow.h View File

@@ -1,7 +1,7 @@
1 1
 #ifndef KARM_MAIN_WINDOW_H
2 2
 #define KARM_MAIN_WINDOW_H
3 3
 
4
-#include <kparts/mainwindow.h>
4
+#include <tdeparts/mainwindow.h>
5 5
 
6 6
 #include "karmerrors.h"
7 7
 #include <karmdcopiface.h>

+ 2
- 2
karm/test/Makefile.am View File

@@ -3,11 +3,11 @@ METASOURCES = AUTO
3 3
 check_PROGRAMS = runscripts locking
4 4
 
5 5
 runscripts_SOURCES = script.cpp runscripts.cpp
6
-runscripts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
6
+runscripts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
7 7
 runscripts_LDADD = $(LIB_QT) $(LIB_TDECORE)
8 8
 
9 9
 locking_SOURCES = locking.cpp lockerthread.cpp
10
-locking_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
10
+locking_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
11 11
 locking_LDADD = $(LIB_QT) $(top_builddir)/libkcal/libkcal.la
12 12
 
13 13
 KDE_CXXFLAGS = $(USE_EXCEPTIONS)

+ 1
- 1
karm/test/locking.cpp View File

@@ -128,7 +128,7 @@ int main( int argc, char *argv[] )
128 128
   short rval = 0;
129 129
 
130 130
   // Use another directory than the real one, just to keep things clean
131
-  // TDEHOME needs to be writable though, for a ksycoca database
131
+  // TDEHOME needs to be writable though, for a tdesycoca database
132 132
   // FIXME: Delete this directory when done with test.
133 133
   setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.tde-testresource" ), true );
134 134
 

+ 1
- 1
karm/test/remote_storage.sh View File

@@ -15,7 +15,7 @@ DCOPID=`dcop | grep karm 2>/dev/null`
15 15
 if [ -n $DCOPID ]; then dcop $DCOPID KarmDCOPIface quit; fi;
16 16
 if [ -e $TESTFILE_LOCAL ]; then rm $TESTFILE_LOCAL; fi
17 17
 
18
-# if the file does not exist, kresources pops up a modal dialog box
18
+# if the file does not exist, tderesources pops up a modal dialog box
19 19
 # telling us that a file does not exist.
20 20
 
21 21
 touch $TESTFILE_LOCAL

+ 1
- 1
kioslaves/opengroupware/Makefile.am View File

@@ -1,4 +1,4 @@
1
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kresources/opengroupware/soap \
1
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tderesources/opengroupware/soap \
2 2
   $(all_includes)
3 3
 
4 4
 noinst_HEADERS = opengroupware.h

+ 1
- 1
kitchensync/src/CMakeLists.txt View File

@@ -72,6 +72,6 @@ tde_add_library( kitchensync SHARED AUTOMOC
72 72
     configguijescs.cpp configguievo2.cpp configguimoto.cpp
73 73
     configguisynce.cpp configguisunbird.cpp
74 74
   VERSION 0.0.0
75
-  LINK qopensync-shared tdepim-shared khtml-shared
75
+  LINK qopensync-shared tdepim-shared tdehtml-shared
76 76
   DESTINATION ${LIB_INSTALL_DIR}
77 77
 )

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

@@ -10,7 +10,7 @@ INCLUDES = -I$(top_srcdir)/kitchensync/src \
10 10
 bin_PROGRAMS = kitchensync
11 11
 
12 12
 kitchensync_SOURCES = main.cpp mainwindow.cpp
13
-kitchensync_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
13
+kitchensync_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
14 14
 kitchensync_LDADD = libkitchensync.la
15 15
 
16 16
 xdg_apps_DATA = kitchensync.desktop

+ 2
- 2
kitchensync/src/aboutpage.cpp View File

@@ -24,8 +24,8 @@
24 24
 #include <kaboutdata.h>
25 25
 #include <kapplication.h>
26 26
 #include <kdebug.h>
27
-#include <khtml_part.h>
28
-#include <khtmlview.h>
27
+#include <tdehtml_part.h>
28
+#include <tdehtmlview.h>
29 29
 #include <kiconloader.h>
30 30
 #include <klocale.h>
31 31
 #include <krun.h>

+ 1
- 1
kitchensync/src/part.cpp View File

@@ -27,7 +27,7 @@
27 27
 #include <kiconloader.h>
28 28
 #include <kinstance.h>
29 29
 #include <klocale.h>
30
-#include <kparts/genericfactory.h>
30
+#include <tdeparts/genericfactory.h>
31 31
 
32 32
 #include "mainwidget.h"
33 33
 

+ 3
- 3
kitchensync/src/part.h View File

@@ -21,9 +21,9 @@
21 21
 #ifndef PART_H
22 22
 #define PART_H
23 23
 
24
-#include <kparts/event.h>
25
-#include <kparts/factory.h>
26
-#include <kparts/part.h>
24
+#include <tdeparts/event.h>
25
+#include <tdeparts/factory.h>
26
+#include <tdeparts/part.h>
27 27
 
28 28
 class TDEAboutData;
29 29
 

+ 3
- 3
kmail/CMakeLists.txt View File

@@ -140,7 +140,7 @@ set( ${target}_SRCS
140 140
   kmcomposewin.cpp kmfolder.cpp kmmsgpartdlg.cpp kmreaderwin.cpp htmlstatusbar.cpp
141 141
   kmgroupware.cpp folderstorage.cpp listjob.cpp csshelper.cpp klistboxdialog.cpp
142 142
   kmmsginfo.cpp actionscheduler.cpp messageproperty.cpp accountmanager.cpp kmacctfolder.cpp
143
-  kmdict.cpp kmsystemtray.cpp kmacctlocal.cpp kmfolderdir.cpp kmfoldermgr.cpp
143
+  tdemdict.cpp kmsystemtray.cpp kmacctlocal.cpp kmfolderdir.cpp kmfoldermgr.cpp
144 144
   kmfoldernode.cpp kmsender.cpp kmacctseldlg.cpp kmfiltermgr.cpp kmfilterdlg.cpp
145 145
   filterimporterexporter.cpp kmsearchpatternedit.cpp encodingdetector.cpp encodingdetector_ja.cpp
146 146
   kmfilteraction.cpp kmsearchpattern.cpp kmfolderimap.cpp kmfolderseldlg.cpp kmfilter.cpp
@@ -151,7 +151,7 @@ set( ${target}_SRCS
151 151
   kmkernel.cpp accountdialog.cpp searchwindow.cpp vcardviewer.cpp vacationdialog.cpp
152 152
   vacation.cpp sievedebugdialog.cpp sieveconfig.cpp sievejob.cpp kmpopheaders.cpp
153 153
   kmpopfiltercnfrmdlg.cpp kmmimeparttree.cpp mailinglist-magic.cpp kmacctmaildir.cpp
154
-  headerstyle.cpp headerstrategy.cpp khtmlparthtmlwriter.cpp filehtmlwriter.cpp
154
+  headerstyle.cpp headerstrategy.cpp tdehtmlparthtmlwriter.cpp filehtmlwriter.cpp
155 155
   teehtmlwriter.cpp mailcomposerIface.skel objecttreeparser.cpp objecttreeparser_p.cpp
156 156
   attachmentcollector.cpp bodypartformatterfactory.cpp bodypartformatter.cpp partNode.cpp
157 157
   mailsourceviewer.cpp kmcommands.cpp kmreadermainwin.cpp kmstartup.cpp kmmainwidget.cpp
@@ -191,7 +191,7 @@ tde_add_library( ${target} SHARED AUTOMOC
191 191
   SOURCES ${${target}_SRCS}
192 192
   LINK
193 193
     emailfunctions-static kmime-shared kpgp-shared tdepim-shared kpimidentities-shared
194
-    mimelib-shared ksieve-shared khtml-shared ${INDEX_LIBRARY}
194
+    mimelib-shared ksieve-shared tdehtml-shared ${INDEX_LIBRARY}
195 195
   DESTINATION ${LIB_INSTALL_DIR}
196 196
 )
197 197
 

+ 1
- 1
kmail/Mainpage.dox View File

@@ -42,7 +42,7 @@ access to all the core KMail functionality.
42 42
 
43 43
 FIXME this has moved to libkpimidentities, right?
44 44
 
45
-Files: identity*, kmidentity.{h,cpp}, configuredialog.cpp,
45
+Files: identity*, tdemidentity.{h,cpp}, configuredialog.cpp,
46 46
        signatureconfigurator.{h,cpp}
47 47
 
48 48
 Contact Marc Mutz <mutz@kde.org> on questions...

+ 2
- 2
kmail/Makefile.am View File

@@ -65,7 +65,7 @@ libkmailprivate_la_SOURCES = kmmessage.cpp kmmainwin.cpp configuredialog.cpp \
65 65
                 csshelper.cpp klistboxdialog.cpp \
66 66
                 actionscheduler.cpp messageproperty.cpp \
67 67
                 kmmsgpart.cpp kmmsginfo.cpp \
68
-                accountmanager.cpp kmacctfolder.cpp kmdict.cpp \
68
+                accountmanager.cpp kmacctfolder.cpp tdemdict.cpp \
69 69
                 kmsystemtray.cpp kmacctlocal.cpp kmfolderdir.cpp \
70 70
                 kmfoldermgr.cpp kmfoldernode.cpp kmsender.cpp \
71 71
                 kmacctseldlg.cpp kmfiltermgr.cpp kmsearchpatternedit.cpp \
@@ -88,7 +88,7 @@ libkmailprivate_la_SOURCES = kmmessage.cpp kmmainwin.cpp configuredialog.cpp \
88 88
                 kmmimeparttree.cpp \
89 89
                 mailinglist-magic.cpp kmacctmaildir.cpp \
90 90
                 attachmentstrategy.cpp \
91
-                headerstrategy.cpp headerstyle.cpp khtmlparthtmlwriter.cpp \
91
+                headerstrategy.cpp headerstyle.cpp tdehtmlparthtmlwriter.cpp \
92 92
                 filehtmlwriter.cpp teehtmlwriter.cpp \
93 93
                 mailcomposerIface.skel objecttreeparser.cpp \
94 94
 		objecttreeparser_p.cpp \

+ 1
- 1
kmail/encodingdetector.cpp View File

@@ -1135,7 +1135,7 @@ bool EncodingDetector::analyze(const char *data, int len)
1135 1135
         case EncodingDetector::WesternEuropean:
1136 1136
             if (setEncoding(automaticDetectionForWesternEuropean( (const unsigned char*) data, len ), AutoDetectedEncoding))
1137 1137
                 return true;
1138
-            else if (d->m_defaultCodec->mibEnum()==MibLatin1) //detection for khtml
1138
+            else if (d->m_defaultCodec->mibEnum()==MibLatin1) //detection for tdehtml
1139 1139
             {
1140 1140
                 return setEncoding("iso-8859-15",AutoDetectedEncoding);
1141 1141
             }

+ 3
- 3
kmail/encodingdetector_ja_p.h View File

@@ -42,7 +42,7 @@
42 42
 #ifdef TQ_WS_WIN
43 43
 #undef UNICODE
44 44
 #endif 
45
-namespace khtml {
45
+namespace tdehtml {
46 46
     class guess_arc {
47 47
     public:
48 48
         unsigned int next;          /* next state */
@@ -50,7 +50,7 @@ namespace khtml {
50 50
     };
51 51
 }
52 52
 
53
-using namespace khtml;
53
+using namespace tdehtml;
54 54
 
55 55
 typedef signed char dfa_table[256];
56 56
 
@@ -62,7 +62,7 @@ extern guess_arc guess_sjis_ar[6];
62 62
 extern const dfa_table guess_utf8_st[];
63 63
 extern guess_arc guess_utf8_ar[11];
64 64
 
65
-namespace khtml {
65
+namespace tdehtml {
66 66
 
67 67
     class guess_dfa {
68 68
     public:

+ 1
- 1
kmail/headerstyle.cpp View File

@@ -53,7 +53,7 @@ using namespace KPIM;
53 53
 #include <kdebug.h>
54 54
 #include <klocale.h>
55 55
 #include <kglobal.h>
56
-#include <kimproxy.h>
56
+#include <tdeimproxy.h>
57 57
 #include <kabc/stdaddressbook.h>
58 58
 #include <kabc/addresseelist.h>
59 59
 #include <kmdcodec.h>

+ 2
- 2
kmail/kmail_part.cpp View File

@@ -44,8 +44,8 @@ using KMail::AccountManager;
44 44
 using KRecentAddress::RecentAddresses;
45 45
 
46 46
 #include <kapplication.h>
47
-#include <kparts/mainwindow.h>
48
-#include <kparts/genericfactory.h>
47
+#include <tdeparts/mainwindow.h>
48
+#include <tdeparts/genericfactory.h>
49 49
 #include <knotifyclient.h>
50 50
 #include <dcopclient.h>
51 51
 #include <kiconloader.h>

+ 5
- 5
kmail/kmail_part.h View File

@@ -28,11 +28,11 @@
28 28
 #include "kmailpartIface.h"
29 29
 
30 30
 #include <tdeversion.h>
31
-#include <kparts/browserextension.h>
32
-#include <kparts/statusbarextension.h>
33
-#include <kparts/factory.h>
34
-#include <kparts/event.h>
35
-#include <kparts/part.h>
31
+#include <tdeparts/browserextension.h>
32
+#include <tdeparts/statusbarextension.h>
33
+#include <tdeparts/factory.h>
34
+#include <tdeparts/event.h>
35
+#include <tdeparts/part.h>
36 36
 
37 37
 #include <tqwidget.h>
38 38
 #include <tdepimmacros.h>

+ 2
- 2
kmail/kmcommands.cpp View File

@@ -67,13 +67,13 @@
67 67
 #include <kdirselectdialog.h>
68 68
 #include <klocale.h>
69 69
 #include <kmessagebox.h>
70
-#include <kparts/browserextension.h>
70
+#include <tdeparts/browserextension.h>
71 71
 #include <kprogress.h>
72 72
 #include <krun.h>
73 73
 #include <kbookmarkmanager.h>
74 74
 #include <kstandarddirs.h>
75 75
 #include <ktempfile.h>
76
-#include <kimproxy.h>
76
+#include <tdeimproxy.h>
77 77
 #include <kuserprofile.h>
78 78
 // KIO headers
79 79
 #include <kio/job.h>

+ 2
- 2
kmail/kmcomposewin.cpp View File

@@ -109,8 +109,8 @@ using KRecentAddress::RecentAddresses;
109 109
 #include "globalsettings.h"
110 110
 #include "replyphrases.h"
111 111
 
112
-#include <kspell.h>
113
-#include <kspelldlg.h>
112
+#include <tdespell.h>
113
+#include <tdespelldlg.h>
114 114
 #include <spellingfilter.h>
115 115
 #include <ksyntaxhighlighter.h>
116 116
 #include <kcolordialog.h>

+ 2
- 2
kmail/kmedit.cpp View File

@@ -38,8 +38,8 @@ using KPIM::MailListDrag;
38 38
 #include "globalsettings.h"
39 39
 #include "replyphrases.h"
40 40
 
41
-#include <kspell.h>
42
-#include <kspelldlg.h>
41
+#include <tdespell.h>
42
+#include <tdespelldlg.h>
43 43
 #include <spellingfilter.h>
44 44
 #include <ksyntaxhighlighter.h>
45 45
 

+ 1
- 1
kmail/kmedit.h View File

@@ -7,7 +7,7 @@
7 7
 
8 8
 #include <tdeversion.h>
9 9
 #include <keditcl.h>
10
-#include <kspell.h>
10
+#include <tdespell.h>
11 11
 #include <ksyntaxhighlighter.h>
12 12
 #include <tqmap.h>
13 13
 #include <tqstringlist.h>

+ 1
- 1
kmail/kmheaders.cpp View File

@@ -2401,7 +2401,7 @@ void KMHeaders::contentsMouseMoveEvent( TQMouseEvent* e )
2401 2401
       if( count == 1 )
2402 2402
         pixmap = TQPixmap( DesktopIcon("message", KIcon::SizeSmall) );
2403 2403
       else
2404
-        pixmap = TQPixmap( DesktopIcon("kmultiple", KIcon::SizeSmall) );
2404
+        pixmap = TQPixmap( DesktopIcon("tdemultiple", KIcon::SizeSmall) );
2405 2405
 
2406 2406
       // Calculate hotspot (as in Konqueror)
2407 2407
       if( !pixmap.isNull() ) {

+ 1
- 1
kmail/kmkernel.cpp View File

@@ -69,7 +69,7 @@ using KMail::FolderIface;
69 69
 #include <kpgp.h>
70 70
 #include <kdebug.h>
71 71
 #include <kio/netaccess.h>
72
-#include <kwallet.h>
72
+#include <tdewallet.h>
73 73
 using KWallet::Wallet;
74 74
 #include "actionscheduler.h"
75 75
 

+ 1
- 1
kmail/kmkernel.h View File

@@ -11,7 +11,7 @@
11 11
 
12 12
 #include <kconfig.h>
13 13
 #include <tdeversion.h>
14
-#include <kimproxy.h>
14
+#include <tdeimproxy.h>
15 15
 #include <tdepimmacros.h>
16 16
 
17 17
 #include "kmailIface.h"

+ 1
- 1
kmail/kmmessage.cpp View File

@@ -38,7 +38,7 @@ using KMail::HeaderStrategy;
38 38
 #include <kglobalsettings.h>
39 39
 #include <kdebug.h>
40 40
 #include <kconfig.h>
41
-#include <khtml_part.h>
41
+#include <tdehtml_part.h>
42 42
 #include <kuser.h>
43 43
 #include <kidna.h>
44 44
 #include <kasciistricmp.h>

+ 1
- 1
kmail/kmmsgdict.cpp View File

@@ -4,7 +4,7 @@
4 4
 #include "kmfolderindex.h"
5 5
 #include "kmfolder.h"
6 6
 #include "kmmsgdict.h"
7
-#include "kmdict.h"
7
+#include "tdemdict.h"
8 8
 #include "globalsettings.h"
9 9
 #include "folderstorage.h"
10 10
 

+ 4
- 4
kmail/kmreaderwin.cpp View File

@@ -37,7 +37,7 @@ using KMail::AttachmentStrategy;
37 37
 using KMail::HeaderStrategy;
38 38
 #include "headerstyle.h"
39 39
 using KMail::HeaderStyle;
40
-#include "khtmlparthtmlwriter.h"
40
+#include "tdehtmlparthtmlwriter.h"
41 41
 using KMail::HtmlWriter;
42 42
 using KMail::KHtmlPartHtmlWriter;
43 43
 #include "htmlstatusbar.h"
@@ -80,9 +80,9 @@ using KMail::TeeHtmlWriter;
80 80
 #include <kabc/addressee.h>
81 81
 #include <kabc/vcardconverter.h>
82 82
 
83
-// khtml headers
84
-#include <khtml_part.h>
85
-#include <khtmlview.h> // So that we can get rid of the frames
83
+// tdehtml headers
84
+#include <tdehtml_part.h>
85
+#include <tdehtmlview.h> // So that we can get rid of the frames
86 86
 #include <dom/html_element.h>
87 87
 #include <dom/html_block.h>
88 88
 #include <dom/html_document.h>

+ 2
- 2
kmail/kmtransport.cpp View File

@@ -38,7 +38,7 @@
38 38
 #include <kmessagebox.h>
39 39
 #include <kseparator.h>
40 40
 #include <kdebug.h>
41
-#include <kwallet.h>
41
+#include <tdewallet.h>
42 42
 using KWallet::Wallet;
43 43
 #include <kprotocolinfo.h>
44 44
 
@@ -87,7 +87,7 @@ void KMTransportInfo::readConfig(int id)
87 87
     return;
88 88
 
89 89
   if ( !mPasswd.isEmpty() ) {
90
-    // migration to kwallet if available
90
+    // migration to tdewallet if available
91 91
     if ( Wallet::isEnabled() ) {
92 92
       config->deleteEntry( "pass" );
93 93
       mPasswdDirty = true;

+ 1
- 1
kmail/networkaccount.cpp View File

@@ -37,7 +37,7 @@
37 37
 #include <klocale.h>
38 38
 #include <kmessagebox.h>
39 39
 #include <kdebug.h>
40
-#include <kwallet.h>
40
+#include <tdewallet.h>
41 41
 using TDEIO::MetaData;
42 42
 using KWallet::Wallet;
43 43
 

+ 1
- 1
kmail/objecttreeparser.cpp View File

@@ -89,7 +89,7 @@
89 89
 #include <klocale.h>
90 90
 #include <kmimetype.h>
91 91
 #include <kglobal.h>
92
-#include <khtml_part.h>
92
+#include <tdehtml_part.h>
93 93
 #include <ktempfile.h>
94 94
 #include <kstandarddirs.h>
95 95
 #include <kapplication.h>

+ 1
- 1
kmail/regexplineedit.cpp View File

@@ -38,7 +38,7 @@
38 38
 
39 39
 #include <klocale.h>
40 40
 #include <klineedit.h>
41
-#include <kparts/componentfactory.h>
41
+#include <tdeparts/componentfactory.h>
42 42
 #include <kregexpeditorinterface.h>
43 43
 #include <kdialog.h>
44 44
 

+ 1
- 1
kmail/searchwindow.cpp View File

@@ -95,7 +95,7 @@ class MatchListView : public KListView
95 95
       if( mailList.count() == 1 )
96 96
         pixmap = TQPixmap( DesktopIcon("message", KIcon::SizeSmall) );
97 97
       else
98
-        pixmap = TQPixmap( DesktopIcon("kmultiple", KIcon::SizeSmall) );
98
+        pixmap = TQPixmap( DesktopIcon("tdemultiple", KIcon::SizeSmall) );
99 99
 
100 100
       d->setPixmap( pixmap );
101 101
       return d;

+ 2
- 2
kmail/snippetwidget.h View File

@@ -19,8 +19,8 @@
19 19
 #include <tqtooltip.h>
20 20
 #include <tqrect.h>
21 21
 
22
-#include <ktexteditor/editinterface.h>
23
-#include <ktexteditor/view.h>
22
+#include <tdetexteditor/editinterface.h>
23
+#include <tdetexteditor/view.h>
24 24
 #include "snippetconfig.h"
25 25
 
26 26
 class KDevProject;

kmail/khtmlparthtmlwriter.cpp → kmail/tdehtmlparthtmlwriter.cpp View File

@@ -1,5 +1,5 @@
1 1
 /*  -*- c++ -*-
2
-    khtmlparthtmlwriter.cpp
2
+    tdehtmlparthtmlwriter.cpp
3 3
 
4 4
     This file is part of KMail, the KDE mail client.
5 5
     Copyright (c) 2003 Marc Mutz <mutz@kde.org>
@@ -31,11 +31,11 @@
31 31
 
32 32
 #include <config.h>
33 33
 
34
-#include "khtmlparthtmlwriter.h"
34
+#include "tdehtmlparthtmlwriter.h"
35 35
 
36 36
 #include <kdebug.h>
37
-#include <khtml_part.h>
38
-#include <khtmlview.h>
37
+#include <tdehtml_part.h>
38
+#include <tdehtmlview.h>
39 39
 
40 40
 #include <dom/dom_string.h>
41 41
 #include <dom/html_document.h>
@@ -151,4 +151,4 @@ namespace KMail {
151 151
 
152 152
 } // namespace KMail
153 153
 
154
-#include "khtmlparthtmlwriter.moc"
154
+#include "tdehtmlparthtmlwriter.moc"

kmail/khtmlparthtmlwriter.h → kmail/tdehtmlparthtmlwriter.h View File

@@ -1,5 +1,5 @@
1 1
 /*  -*- c++ -*-
2
-    khtmlparthtmlwriter.h
2
+    tdehtmlparthtmlwriter.h
3 3
 
4 4
     This file is part of KMail, the KDE mail client.
5 5
     Copyright (c) 2003 Marc Mutz <mutz@kde.org>

kmail/kmdict.cpp → kmail/tdemdict.cpp View File

@@ -5,7 +5,7 @@
5 5
 #include <config.h>
6 6
 #endif
7 7
 
8
-#include "kmdict.h"
8
+#include "tdemdict.h"
9 9
 #include "kmglobal.h"
10 10
 #include <kdebug.h>
11 11
 

kmail/kmdict.h → kmail/tdemdict.h View File


+ 12
- 12
kmail/tests/Makefile.am View File

@@ -2,22 +2,22 @@ INCLUDES = -I$(top_srcdir)/kmail -I$(top_srcdir)/mimelib $(all_includes)
2 2
 AM_CPPFLAGS = -DTDESRCDIR=\"$(srcdir)\"
3 3
 METASOURCES = AUTO
4 4
 
5
-check_LTLIBRARIES = kunittest_storagelayermodule.la \
6
-        kunittest_utilmodule.la \
7
-        kunittest_mimelibmodule.la
5
+check_LTLIBRARIES = tdeunittest_storagelayermodule.la \
6
+        tdeunittest_utilmodule.la \
7
+        tdeunittest_mimelibmodule.la
8 8
 
9
-kunittest_storagelayermodule_la_SOURCES = storagelayermodule.cpp messagedicttests.cpp ../kmdict.cpp
10
-kunittest_storagelayermodule_la_LIBADD = -lkunittest
11
-kunittest_utilmodule_la_SOURCES = utiltests.cpp ../util.cpp
12
-kunittest_utilmodule_la_LIBADD = -lkunittest ../../mimelib/libmimelib.la
13
-kunittest_mimelibmodule_la_SOURCES = mimelibtests.cpp ../util.cpp
14
-kunittest_mimelibmodule_la_LIBADD = -lkunittest ../../mimelib/libmimelib.la
9
+tdeunittest_storagelayermodule_la_SOURCES = storagelayermodule.cpp messagedicttests.cpp ../tdemdict.cpp
10
+tdeunittest_storagelayermodule_la_LIBADD = -ltdeunittest
11
+tdeunittest_utilmodule_la_SOURCES = utiltests.cpp ../util.cpp
12
+tdeunittest_utilmodule_la_LIBADD = -ltdeunittest ../../mimelib/libmimelib.la
13
+tdeunittest_mimelibmodule_la_SOURCES = mimelibtests.cpp ../util.cpp
14
+tdeunittest_mimelibmodule_la_LIBADD = -ltdeunittest ../../mimelib/libmimelib.la
15 15
 
16
-#LIBADD = -lkunittest
16
+#LIBADD = -ltdeunittest
17 17
 AM_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
18 18
 
19 19
 check-local:
20
-	kunittestmodrunner
20
+	tdeunittestmodrunner
21 21
 
22 22
 guicheck:
23
-	kunittestguimodrunner
23
+	tdeunittestguimodrunner

+ 3
- 3
kmail/tests/messagedicttests.cpp View File

@@ -4,10 +4,10 @@
4 4
  */
5 5
 
6 6
 #include <kdebug.h>
7
-#include <kunittest/runner.h>
8
-#include <kunittest/module.h>
7
+#include <tdeunittest/runner.h>
8
+#include <tdeunittest/module.h>
9 9
 
10
-#include "kmdict.h"
10
+#include "tdemdict.h"
11 11
 
12 12
 #include "messagedicttests.h"
13 13
 

+ 1
- 1
kmail/tests/messagedicttests.h View File

@@ -7,7 +7,7 @@
7 7
 #ifndef MESSAGEDICTTESTS_H
8 8
 #define MESSAGEDICTTESTS_H
9 9
 
10
-#include <kunittest/tester.h>
10
+#include <tdeunittest/tester.h>
11 11
 
12 12
 class KMDict;
13 13
 

+ 4
- 4
kmail/tests/mimelibtests.cpp View File

@@ -21,12 +21,12 @@
21 21
 #include "mimelibtests.moc"
22 22
 
23 23
 #include <kdebug.h>
24
-#include <kunittest/runner.h>
25
-#include <kunittest/module.h>
24
+#include <tdeunittest/runner.h>
25
+#include <tdeunittest/module.h>
26 26
 
27 27
 using namespace KUnitTest;
28 28
 
29
-KUNITTEST_MODULE( kunittest_mimelibmodule, "Mimelib Tests" );
29
+KUNITTEST_MODULE( tdeunittest_mimelibmodule, "Mimelib Tests" );
30 30
 KUNITTEST_MODULE_REGISTER_TESTER( MimeLibTester );
31 31
 
32 32
 #include <mimelib/string.h>
@@ -56,7 +56,7 @@ static TQString makePrintable( const DwString& str )
56 56
 TQCString MimeLibTester::readFile(const TQString& fileName)
57 57
 {
58 58
   TQFile file( fileName );
59
-  // #!@#$& kunittest... VERIFY() does nothing in setUp. Using assert instead.
59
+  // #!@#$& tdeunittest... VERIFY() does nothing in setUp. Using assert instead.
60 60
   bool ok = file.open( IO_ReadOnly );
61 61
   if ( !ok ) {
62 62
     kdError() << fileName << " not found!" << endl;

+ 1
- 1
kmail/tests/mimelibtests.h View File

@@ -20,7 +20,7 @@
20 20
 #ifndef MIMELIBTEST_H
21 21
 #define MIMELIBTEST_H
22 22
 
23
-#include <kunittest/tester.h>
23
+#include <tdeunittest/tester.h>
24 24
 class DwString;
25 25
 
26 26
 class MimeLibTester : public KUnitTest::SlotTester

+ 3
- 3
kmail/tests/storagelayermodule.cpp View File

@@ -5,12 +5,12 @@
5 5
  * have to fix it" license.
6 6
  */
7 7
 
8
-#include <kunittest/runner.h>
9
-#include <kunittest/module.h>
8
+#include <tdeunittest/runner.h>
9
+#include <tdeunittest/module.h>
10 10
 
11 11
 #include "messagedicttests.h"
12 12
 
13 13
 using namespace KUnitTest;
14 14
 
15
-KUNITTEST_MODULE( kunittest_storagelayermodule, "KMail Storage Layer Tests" );
15
+KUNITTEST_MODULE( tdeunittest_storagelayermodule, "KMail Storage Layer Tests" );
16 16
 KUNITTEST_MODULE_REGISTER_TESTER( MessageDictTester );

+ 3
- 3
kmail/tests/utiltests.cpp View File

@@ -4,13 +4,13 @@
4 4
  */
5 5
 
6 6
 #include <kdebug.h>
7
-#include <kunittest/runner.h>
8
-#include <kunittest/module.h>
7
+#include <tdeunittest/runner.h>
8
+#include <tdeunittest/module.h>
9 9
 #include "utiltests.h"
10 10
 
11 11
 using namespace KUnitTest;
12 12
 
13
-KUNITTEST_MODULE( kunittest_utilmodule, "KMail::Util Tests" );
13
+KUNITTEST_MODULE( tdeunittest_utilmodule, "KMail::Util Tests" );
14 14
 KUNITTEST_MODULE_REGISTER_TESTER( UtilTester );
15 15
 
16 16
 #include "util.h"

+ 1
- 1
kmail/tests/utiltests.h View File

@@ -7,7 +7,7 @@
7 7
 #ifndef UTILTESTS_H
8 8
 #define UTILTESTS_H
9 9
 
10
-#include <kunittest/tester.h>
10
+#include <tdeunittest/tester.h>
11 11
 
12 12
 class UtilTester : public KUnitTest::SlotTester
13 13
 {

+ 2
- 2
kmail/urlhandlermanager.cpp View File

@@ -47,7 +47,7 @@
47 47
 
48 48
 #include <kstandarddirs.h>
49 49
 #include <kurldrag.h>
50
-#include <kimproxy.h>
50
+#include <tdeimproxy.h>
51 51
 #include <kurl.h>
52 52
 
53 53
 #include <algorithm>
@@ -399,7 +399,7 @@ TQString KMail::URLHandlerManager::statusBarMessage( const KURL & url, KMReaderW
399 399
 #include <klocale.h>
400 400
 #include <kprocess.h>
401 401
 #include <kmessagebox.h>
402
-#include <khtml_part.h>
402
+#include <tdehtml_part.h>
403 403
 
404 404
 #include <tqstring.h>
405 405
 

+ 1
- 1
kmailcvt/Makefile.am View File

@@ -40,7 +40,7 @@ INCLUDES= $(all_includes)
40 40
 kmailcvt_METASOURCES = AUTO
41 41
 
42 42
 # the library search path. 
43
-kmailcvt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
43
+kmailcvt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
44 44
 
45 45
 KDE_ICON=AUTO
46 46
 

+ 2
- 2
kmobile/Makefile.am View File

@@ -8,7 +8,7 @@ lib_LTLIBRARIES = libkmobiledevice.la libkmobileclient.la
8 8
 
9 9
 INCLUDES         = $(all_includes)
10 10
 
11
-kmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
11
+kmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
12 12
 kmobile_LDADD   = $(LIB_KFILE) $(LIB_KABC) libkmobiledevice.la
13 13
 kmobile_SOURCES = main.cpp kmobile.cpp kmobileview.cpp kmobileitem.cpp\
14 14
 			pref.cpp kmobileiface.skel kmobile_selectiondialog.ui \
@@ -29,7 +29,7 @@ libkmobileclient_la_LDFLAGS = $(all_libraries) -no-undefined -avoid-version
29 29
 libkmobileclient_la_LIBADD = $(LIB_TDECORE) -lDCOP
30 30
 
31 31
 EXTRA_PROGRAMS = testlibkmobile
32
-testlibkmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
32
+testlibkmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
33 33
 testlibkmobile_LDADD = libkmobileclient.la
34 34
 testlibkmobile_SOURCES = testlibkmobile.cpp
35 35
 

+ 1
- 1
knode/CMakeLists.txt View File

@@ -80,7 +80,7 @@ tde_add_library( knodecommon SHARED AUTOMOC
80 80
     kncollectionview.cpp articlewidget.cpp csshelper.cpp
81 81
     smtpaccountwidget_base.ui
82 82
   VERSION 3.0.0
83
-  LINK emailfunctions-static tdepim-shared kpgp-shared khtml-shared
83
+  LINK emailfunctions-static tdepim-shared kpgp-shared tdehtml-shared
84 84
   DESTINATION ${LIB_INSTALL_DIR}
85 85
 )
86 86
 

+ 1
- 1
knode/Makefile.am View File

@@ -17,7 +17,7 @@ SUBDIRS = pics filters
17 17
 
18 18
 bin_PROGRAMS = knode
19 19
 
20
-knode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
20
+knode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
21 21
 knode_LDADD   = libknodecommon.la
22 22
 
23 23
 kcm_knode_la_SOURCES = knconfigpages.cpp

+ 2
- 2
knode/articlewidget.cpp View File

@@ -32,8 +32,8 @@
32 32
 #include <kapplication.h>
33 33
 #include <kbookmarkmanager.h>
34 34
 #include <kcharsets.h>
35
-#include <khtml_part.h>
36
-#include <khtmlview.h>
35
+#include <tdehtml_part.h>
36
+#include <tdehtmlview.h>
37 37
 #include <kiconloader.h>
38 38
 #include <klocale.h>
39 39
 #include <kmdcodec.h>

+ 0
- 0
knode/knaccountmanager.cpp View File


Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save