Browse Source

Additional kde to tde renaming

Timothy Pearson 7 years ago
parent
commit
d70ce47c22
100 changed files with 138 additions and 138 deletions
  1. 3
    3
      CMakeLists.txt
  2. 1
    1
      Makefile.am.in
  3. 8
    8
      NewsLog.txt
  4. 3
    3
      README
  5. 1
    1
      README.Kolab
  6. 2
    2
      akregator/src/CMakeLists.txt
  7. 3
    3
      akregator/src/Makefile.am
  8. 1
    1
      akregator/src/aboutdata.h
  9. 1
    1
      akregator/src/akregator_export.h
  10. 1
    1
      akregator/src/librss/Makefile.am
  11. 1
    1
      akregator/src/librss/global.h
  12. 1
    1
      akregator/src/pics/action-rss_tag.svg
  13. 1
    1
      certmanager/Makefile.am
  14. 1
    1
      certmanager/certmanager.cpp
  15. 1
    1
      certmanager/certmanager.h
  16. 1
    1
      certmanager/conf/appearanceconfigpage.cpp
  17. 1
    1
      certmanager/conf/dirservconfigpage.cpp
  18. 1
    1
      certmanager/conf/dirservconfigpage.h
  19. 1
    1
      certmanager/conf/dnorderconfigpage.cpp
  20. 1
    1
      certmanager/kwatchgnupg/Makefile.am
  21. 1
    1
      certmanager/lib/Makefile.am
  22. 1
    1
      certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h
  23. 1
    1
      certmanager/lib/backends/qgpgme/qgpgmejob.h
  24. 1
    1
      certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h
  25. 1
    1
      certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h
  26. 1
    1
      certmanager/lib/cryptplug.h
  27. 1
    1
      certmanager/lib/cryptplugfactory.h
  28. 1
    1
      certmanager/lib/cryptplugwrapper.h
  29. 1
    1
      certmanager/lib/kleo/cryptobackendfactory.h
  30. 1
    1
      certmanager/lib/kleo/dn.h
  31. 1
    1
      certmanager/lib/kleo/enum.h
  32. 1
    1
      certmanager/lib/kleo/hierarchicalkeylistjob.h
  33. 1
    1
      certmanager/lib/kleo/keyfiltermanager.h
  34. 1
    1
      certmanager/lib/kleo/multideletejob.h
  35. 1
    1
      certmanager/lib/ui/backendconfigwidget.h
  36. 1
    1
      certmanager/lib/ui/cryptoconfigdialog.h
  37. 1
    1
      certmanager/lib/ui/directoryserviceswidget.h
  38. 1
    1
      certmanager/lib/ui/dnattributeorderconfigwidget.h
  39. 1
    1
      certmanager/lib/ui/keyapprovaldialog.h
  40. 1
    1
      certmanager/lib/ui/keylistview.h
  41. 1
    1
      certmanager/lib/ui/keyrequester.h
  42. 1
    1
      certmanager/lib/ui/keyselectiondialog.h
  43. 1
    1
      certmanager/lib/ui/progressbar.h
  44. 1
    1
      certmanager/lib/ui/progressdialog.h
  45. 1
    1
      configure.in.in
  46. 1
    1
      dependency-graph.dot
  47. 1
    1
      doc/akregator/index.docbook
  48. 1
    1
      doc/kaddressbook/index.docbook
  49. 4
    4
      doc/kalarm/index.docbook
  50. 5
    5
      doc/kandy/index.docbook
  51. 1
    1
      doc/karm/index.docbook
  52. 1
    1
      doc/kleopatra/index.docbook
  53. 2
    2
      doc/kmail/index.docbook
  54. 1
    1
      doc/kmail/menus.docbook
  55. 1
    1
      doc/knode/index.docbook
  56. 1
    1
      doc/knotes/index.docbook
  57. 2
    2
      doc/konsolekalendar/index.docbook
  58. 2
    2
      doc/kontact/index.docbook
  59. 4
    4
      doc/korganizer/index.docbook
  60. 1
    1
      doc/korganizer/outlook-to-vcalendar.docbook
  61. 1
    1
      doc/korn/index.docbook
  62. 3
    3
      doc/kpilot/index.docbook
  63. 1
    1
      doc/ktnef/index.docbook
  64. 1
    1
      doc/kwatchgnupg/index.docbook
  65. 1
    1
      kabc/frontend/Makefile.am
  66. 1
    1
      kabc/kabc2mutt/Makefile.am
  67. 1
    1
      kabc/kabcdistlistupdater/CMakeLists.txt
  68. 1
    1
      kabc/kabcdistlistupdater/Makefile.am
  69. 1
    1
      kaddressbook/CMakeLists.txt
  70. 2
    2
      kaddressbook/Makefile.am
  71. 1
    1
      kaddressbook/common/kabprefs.h
  72. 1
    1
      kaddressbook/common/kaddressbook.kcfg
  73. 2
    2
      kaddressbook/features/CMakeLists.txt
  74. 1
    1
      kaddressbook/interfaces/configurewidget.h
  75. 1
    1
      kaddressbook/interfaces/contacteditorwidget.h
  76. 1
    1
      kaddressbook/interfaces/core.h
  77. 1
    1
      kaddressbook/interfaces/extensionwidget.h
  78. 1
    1
      kaddressbook/interfaces/xxport.h
  79. 1
    1
      kaddressbook/kabcore.h
  80. 1
    1
      kaddressbook/kaddressbookiface.h
  81. 1
    1
      kaddressbook/kaddressbookview.h
  82. 3
    3
      kaddressbook/kcmconfigs/CMakeLists.txt
  83. 1
    1
      kaddressbook/kcmconfigs/kcmkabconfig.cpp
  84. 1
    1
      kaddressbook/kcmconfigs/kcmkabcustomfields.cpp
  85. 1
    1
      kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
  86. 1
    1
      kaddressbook/thumbnailcreator/Makefile.am
  87. 1
    1
      kaddressbook/viewconfigurewidget.h
  88. 1
    1
      kaddressbook/xxport/HACKING
  89. 1
    1
      kaddressbook/xxportmanager.h
  90. 1
    1
      kalarm/daemon.cpp
  91. 2
    2
      kalarm/kalarmd/Makefile.am
  92. 1
    1
      kalarm/kalarmd/alarmdaemon.cpp
  93. 1
    1
      kalarm/lib/Makefile.am
  94. 1
    1
      kalarm/lib/colourcombo.cpp
  95. 2
    2
      kandy/src/CMakeLists.txt
  96. 2
    2
      kandy/src/Makefile.am
  97. 1
    1
      karm/CMakeLists.txt
  98. 4
    4
      karm/Makefile.am
  99. 1
    1
      karm/karmstorage.h
  100. 0
    0
      karm/test/Makefile.am

+ 3
- 3
CMakeLists.txt View File

@@ -14,8 +14,8 @@ cmake_minimum_required( VERSION 2.8 )
14 14
 
15 15
 ##### general package setup #####################
16 16
 
17
-project( kdepim )
18
-set( PACKAGE kdepim )
17
+project( tdepim )
18
+set( PACKAGE tdepim )
19 19
 set( VERSION "3.5.13" )
20 20
 
21 21
 
@@ -152,7 +152,7 @@ if( BUILD_KADDRESSBOOK OR (BUILD_KRESOURCES AND (WITH_EGROUPWARE OR WITH_BIRTHDA
152 152
 endif()
153 153
 
154 154
 
155
-##### kdepim directories ########################
155
+##### tdepim directories ########################
156 156
 
157 157
 tde_conditional_add_subdirectory( BUILD_INDEXLIB indexlib )
158 158
 tde_conditional_add_subdirectory( BUILD_LIBKMIME libkmime )

+ 1
- 1
Makefile.am.in View File

@@ -1,4 +1,4 @@
1
-## kdepim/Makefile.am
1
+## tdepim/Makefile.am
2 2
 ## (C) 1997 Stephan Kulow
3 3
 
4 4
 # these are here to control the compilation order, but are only textual

+ 8
- 8
NewsLog.txt View File

@@ -1270,7 +1270,7 @@ Problems addressed
1270 1270
 
1271 1271
 Merges
1272 1272
 ------
1273
-* Enterprise branch is in sync with kdepim 3.5 branch
1273
+* Enterprise branch is in sync with tdepim 3.5 branch
1274 1274
 * Bugfixes from enterprise ported to 3.5 branch 
1275 1275
 
1276 1276
 Friday, July 4th 2008
@@ -1284,7 +1284,7 @@ Problems addressed
1284 1284
 Merges
1285 1285
 ------
1286 1286
 
1287
-* Enterprise branch is in sync with kdepim 3.5 branch
1287
+* Enterprise branch is in sync with tdepim 3.5 branch
1288 1288
 
1289 1289
 Friday, June 27th 2008
1290 1290
 
@@ -1316,7 +1316,7 @@ Problems addressed
1316 1316
 Merges
1317 1317
 --------
1318 1318
 
1319
-* Enterprise branch is in sync with kdepim 3.5 branch
1319
+* Enterprise branch is in sync with tdepim 3.5 branch
1320 1320
 
1321 1321
 Friday, May 30th 2008
1322 1322
 
@@ -1327,7 +1327,7 @@ Problems addressed
1327 1327
 
1328 1328
 Merges
1329 1329
 -------
1330
-* Enterprise in sync with kdepim 3.5 branch.
1330
+* Enterprise in sync with tdepim 3.5 branch.
1331 1331
 
1332 1332
 
1333 1333
 
@@ -1341,7 +1341,7 @@ Problems addressed
1341 1341
 Merges
1342 1342
 -------
1343 1343
 
1344
-* Enterprise in sync with kdepim 3.5 branch.
1344
+* Enterprise in sync with tdepim 3.5 branch.
1345 1345
 
1346 1346
 
1347 1347
 Friday, May 9th 2008
@@ -1359,7 +1359,7 @@ Problems addressed
1359 1359
 Merges
1360 1360
 --------
1361 1361
 
1362
-* Enterprise in sync with kdepim 3.5 branch.
1362
+* Enterprise in sync with tdepim 3.5 branch.
1363 1363
 
1364 1364
 
1365 1365
 Saturday, May 3rd 2008
@@ -1367,7 +1367,7 @@ Saturday, May 3rd 2008
1367 1367
 Merges
1368 1368
 -------
1369 1369
 
1370
-* Enterprise in sync with kdepim 3.5 branch.
1370
+* Enterprise in sync with tdepim 3.5 branch.
1371 1371
 
1372 1372
 Monday, April 28th 2008
1373 1373
 
@@ -1630,7 +1630,7 @@ Problems addressed
1630 1630
 
1631 1631
 Merges
1632 1632
 -------
1633
-* More merges from all of kdepim.
1633
+* More merges from all of tdepim.
1634 1634
 
1635 1635
 Monday, December 4th 2007
1636 1636
 

+ 3
- 3
README View File

@@ -41,7 +41,7 @@ What it is
41 41
 There is also quite an amount of infrastructure in this package:
42 42
 
43 43
 * calendarsystem: library for handling of non-gregorian calendar systems
44
-* libtdepim: Common code for different kdepim apps
44
+* libtdepim: Common code for different tdepim apps
45 45
 * libkdenetwork: Common code for apps previously being in the kdenetwork CVS
46 46
                  module (KMail, KNode). This will be merged with libtdepim.
47 47
 * mimelib: MIME messages library
@@ -56,7 +56,7 @@ There is also quite an amount of infrastructure in this package:
56 56
 * kioslaves/sieve: Sieve kioslave
57 57
 * ktnef: handling of tnef data
58 58
 
59
-The following subdirectories have been moved to kdenonbeta/kdepim:
59
+The following subdirectories have been moved to kdenonbeta/tdepim:
60 60
 
61 61
 * empath: a modular e-mail client, designed for reuse, needs a Qt
62 62
           with threading support
@@ -77,7 +77,7 @@ subscribe my@email.address
77 77
 
78 78
 If you have questions relating to development of this module please post them on
79 79
 the developers mailing list (kde-pim@kde.org). If you have user questions,
80
-please use kdepim-users@kde.org
80
+please use tdepim-users@kde.org
81 81
 
82 82
 If you are interested in kmail development use the mailing list
83 83
 kmail-devel@kde.org.

+ 1
- 1
README.Kolab View File

@@ -1,4 +1,4 @@
1
-These are preliminary instructions on how to set up kdepim to work
1
+These are preliminary instructions on how to set up tdepim to work
2 2
 with a kolab server. It is meant to be a help for people setting
3 3
 up for testing. It is also meant as a list of things to set up in the
4 4
 upcoming Kolab setup wizard.

+ 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 kdepim-shared kparts-shared
95
+  LINK akregatorprivate-shared tdepim-shared kparts-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 kdepim-shared khtml-shared
120
+  LINK akregatorprivate-shared tdepim-shared khtml-shared
121 121
   DESTINATION ${PLUGIN_INSTALL_DIR}
122 122
 )

+ 3
- 3
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_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
23
+akregator_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
24 24
 akregator_LDADD = $(LIB_KPARTS) libakregatorprivate.la
25 25
 #akregator_LDADD = $(LIB_KPARTS) libakregatorprivate.la $(top_builddir)/libtdepim/libtdepim.la
26 26
 
@@ -146,7 +146,7 @@ libakregatorpart_la_SOURCES = \
146 146
 	kspeech.stub
147 147
 
148 148
 libakregatorpart_la_LDFLAGS = $(KDE_RPATH) $(KDE_PLUGIN) $(LIB_KUTILS) -avoid-version -no-undefined $(all_libraries)
149
-libakregatorpart_la_LIBADD = libakregatorprivate.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KHTML) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -L$(top_builddir)/libtdepim -lkdepim
149
+libakregatorpart_la_LIBADD = libakregatorprivate.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KHTML) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -L$(top_builddir)/libtdepim -ltdepim
150 150
 
151 151
 # this is where the desktop file will go
152 152
 partdesktopdir = $(kde_servicesdir)
@@ -161,6 +161,6 @@ kde_servicetypes_DATA = akregator_plugin.desktop
161 161
 
162 162
 SUBDIRS = librss about . mk4storage pics
163 163
 
164
-DOXYGEN_REFERENCES = kdeui
164
+DOXYGEN_REFERENCES = tdeui
165 165
 include $(top_srcdir)/admin/Doxyfile.am
166 166
 

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

@@ -26,7 +26,7 @@
26 26
 #define ABOUTDATA_H
27 27
 
28 28
 #include <kaboutdata.h>
29
-#include <kdepimmacros.h>
29
+#include <tdepimmacros.h>
30 30
 
31 31
 #define AKREGATOR_VERSION "1.2.9"
32 32
 

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

@@ -21,7 +21,7 @@
21 21
 #ifndef AKREGATOR_AKREGATOREXPORT_H
22 22
 #define AKREGATOR_AKREGATOREXPORT_H
23 23
 
24
-#include <kdepimmacros.h>
24
+#include <tdepimmacros.h>
25 25
 
26 26
 #define AKREGATOR_EXPORT KDE_EXPORT
27 27
 

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

@@ -18,5 +18,5 @@ testlibrss_SOURCES = testlibrss.cpp
18 18
 testlibrss_LDFLAGS = $(all_libraries)
19 19
 testlibrss_LDADD =  librsslocal.la $(LIB_KIO)
20 20
 
21
-DOXYGEN_REFERENCES = kdeui
21
+DOXYGEN_REFERENCES = tdeui
22 22
 include $(top_srcdir)/admin/Doxyfile.am

+ 1
- 1
akregator/src/librss/global.h View File

@@ -11,7 +11,7 @@
11 11
 #ifndef LIBRSS_GLOBAL_H
12 12
 #define LIBRSS_GLOBAL_H
13 13
 
14
-#include <kdepimmacros.h>
14
+#include <tdepimmacros.h>
15 15
 
16 16
 template <class>
17 17
 class TQValueList;

+ 1
- 1
akregator/src/pics/action-rss_tag.svg View File

@@ -4,7 +4,7 @@
4 4
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
5 5
 <svg
6 6
    sodipodi:docname="action-rss_tag.svg"
7
-   sodipodi:docbase="/mnt/ablage01/frank/cvs-mirror/kde_3.5_branch/kdepim/akregator/src/pics"
7
+   sodipodi:docbase="/mnt/ablage01/frank/cvs-mirror/kde_3.5_branch/tdepim/akregator/src/pics"
8 8
    inkscape:version="0.40"
9 9
    sodipodi:version="0.32"
10 10
    id="svg1291"

+ 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_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
20
+kleopatra_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
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/certmanager.cpp View File

@@ -96,7 +96,7 @@
96 96
 // other
97 97
 #include <algorithm>
98 98
 #include <assert.h>
99
-#include <kdepimmacros.h>
99
+#include <tdepimmacros.h>
100 100
 #include <kinputdialog.h>
101 101
 namespace {
102 102
 

+ 1
- 1
certmanager/certmanager.h View File

@@ -36,7 +36,7 @@
36 36
 //#include <gpgme.h>
37 37
 
38 38
 #include <kmainwindow.h>
39
-#include <kdepimmacros.h>
39
+#include <tdepimmacros.h>
40 40
 #include <kurl.h>
41 41
 #include <tqcstring.h>
42 42
 #include <tqptrlist.h>

+ 1
- 1
certmanager/conf/appearanceconfigpage.cpp View File

@@ -36,7 +36,7 @@
36 36
 #include <klocale.h>
37 37
 #include <kdebug.h>
38 38
 
39
-#include <kdepimmacros.h>
39
+#include <tdepimmacros.h>
40 40
 
41 41
 AppearanceConfigurationPage::AppearanceConfigurationPage( TQWidget * parent, const char * name )
42 42
     : KCModule( parent, name )

+ 1
- 1
certmanager/conf/dirservconfigpage.cpp View File

@@ -47,7 +47,7 @@
47 47
 #include <tqcheckbox.h>
48 48
 #include <tqlayout.h>
49 49
 
50
-#include <kdepimmacros.h>
50
+#include <tdepimmacros.h>
51 51
 
52 52
 #if 0 // disabled, since it is apparently confusing
53 53
 // For sync'ing kabldaprc

+ 1
- 1
certmanager/conf/dirservconfigpage.h View File

@@ -34,7 +34,7 @@
34 34
 
35 35
 #include <kcmodule.h>
36 36
 #include <kleo/cryptoconfig.h>
37
-#include <kdepimmacros.h>
37
+#include <tdepimmacros.h>
38 38
 
39 39
 class TQCheckBox;
40 40
 class TQTimeEdit;

+ 1
- 1
certmanager/conf/dnorderconfigpage.cpp View File

@@ -34,7 +34,7 @@
34 34
 #include <ui/dnattributeorderconfigwidget.h>
35 35
 #include <kleo/dn.h>
36 36
 
37
-#include <kdepimmacros.h>
37
+#include <tdepimmacros.h>
38 38
 
39 39
 #include <tqlayout.h>
40 40
 

+ 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_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
16
+kwatchgnupg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
17 17
 kwatchgnupg_LDADD   = ../conf/libconf.la ../lib/libkleopatra.la $(LIB_KUTILS) $(LIB_KABC)
18 18
 
19 19
 rcdir = $(kde_datadir)/kwatchgnupg

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

@@ -19,7 +19,7 @@ libkleopatra_la_LIBADD = \
19 19
 			$(top_builddir)/libkdenetwork/qgpgme/libqgpgme.la \
20 20
 			$(LIB_KIO) $(LIB_KDEUI)
21 21
 
22
-# Disabled for kdepim-3.3, see also kleo/cryptobackendfactory.cpp
22
+# Disabled for tdepim-3.3, see also kleo/cryptobackendfactory.cpp
23 23
 # backends/kpgp/libkleopatra_backend_kpgp.la
24 24
 
25 25
 # --version-info CURRENT:REVISION:AGE

+ 1
- 1
certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h View File

@@ -38,7 +38,7 @@
38 38
 #include "qgpgmejob.h"
39 39
 
40 40
 #include <tqcstring.h>
41
-#include <kdepimmacros.h>
41
+#include <tdepimmacros.h>
42 42
 
43 43
 namespace GpgME {
44 44
   class Error;

+ 1
- 1
certmanager/lib/backends/qgpgme/qgpgmejob.h View File

@@ -43,7 +43,7 @@
43 43
 #include <tqstring.h>
44 44
 
45 45
 #include <vector>
46
-#include <kdepimmacros.h>
46
+#include <tdepimmacros.h>
47 47
 
48 48
 namespace GpgME {
49 49
   class Data;

+ 1
- 1
certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h View File

@@ -36,7 +36,7 @@
36 36
 #include <kleo/keygenerationjob.h>
37 37
 
38 38
 #include "qgpgmejob.h"
39
-#include <kdepimmacros.h>
39
+#include <tdepimmacros.h>
40 40
 
41 41
 namespace GpgME {
42 42
   class Error;

+ 1
- 1
certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h View File

@@ -44,7 +44,7 @@
44 44
 
45 45
 #include <utility>
46 46
 
47
-#include <kdepimmacros.h>
47
+#include <tdepimmacros.h>
48 48
 namespace GpgME {
49 49
   class Error;
50 50
   class Context;

+ 1
- 1
certmanager/lib/cryptplug.h View File

@@ -26,7 +26,7 @@
26 26
 
27 27
 #include <gpgmepp/context.h>
28 28
 #include <gpgme.h> // need it for gpgme_protocol_t :(
29
-#include <kdepimmacros.h>
29
+#include <tdepimmacros.h>
30 30
 
31 31
 namespace GpgME {
32 32
   class ImportResult;

+ 1
- 1
certmanager/lib/cryptplugfactory.h View File

@@ -35,7 +35,7 @@
35 35
 
36 36
 #include "kleo/cryptobackendfactory.h"
37 37
 
38
-#include <kdepimmacros.h>
38
+#include <tdepimmacros.h>
39 39
 
40 40
 #ifndef LIBKLEOPATRA_NO_COMPAT
41 41
 namespace Kleo {

+ 1
- 1
certmanager/lib/cryptplugwrapper.h View File

@@ -54,7 +54,7 @@
54 54
 #include <tqpair.h>
55 55
 #include <tqstringlist.h>
56 56
 #include <tqstring.h>
57
-#include <kdepimmacros.h>
57
+#include <tdepimmacros.h>
58 58
 
59 59
 
60 60
 class KConfigBase;

+ 1
- 1
certmanager/lib/kleo/cryptobackendfactory.h View File

@@ -36,7 +36,7 @@
36 36
 #include <tqobject.h>
37 37
 
38 38
 #include "cryptobackend.h"
39
-#include <kdepimmacros.h>
39
+#include <tdepimmacros.h>
40 40
 
41 41
 #include <vector>
42 42
 #include <map>

+ 1
- 1
certmanager/lib/kleo/dn.h View File

@@ -35,7 +35,7 @@
35 35
 
36 36
 #include <tqstring.h>
37 37
 #include <tqvaluevector.h>
38
-#include <kdepimmacros.h>
38
+#include <tdepimmacros.h>
39 39
 
40 40
 class TQStringList;
41 41
 class TQWidget;

+ 1
- 1
certmanager/lib/kleo/enum.h View File

@@ -33,7 +33,7 @@
33 33
 #ifndef __KLEO_ENUM_H__
34 34
 #define __KLEO_ENUM_H__
35 35
 
36
-#include <kdepimmacros.h>
36
+#include <tdepimmacros.h>
37 37
 
38 38
 class TQString;
39 39
 class TQStringList;

+ 1
- 1
certmanager/lib/kleo/hierarchicalkeylistjob.h View File

@@ -35,7 +35,7 @@
35 35
 
36 36
 #include <kleo/keylistjob.h>
37 37
 #include <kleo/cryptobackend.h>
38
-#include <kdepimmacros.h>
38
+#include <tdepimmacros.h>
39 39
 
40 40
 #include <gpgmepp/keylistresult.h>
41 41
 

+ 1
- 1
certmanager/lib/kleo/keyfiltermanager.h View File

@@ -34,7 +34,7 @@
34 34
 #define __KLEO_KEYFILTERMANAGER_H__
35 35
 
36 36
 #include <tqobject.h>
37
-#include <kdepimmacros.h>
37
+#include <tdepimmacros.h>
38 38
 namespace GpgME {
39 39
   class Key;
40 40
 }

+ 1
- 1
certmanager/lib/kleo/multideletejob.h View File

@@ -36,7 +36,7 @@
36 36
 #include <kleo/job.h>
37 37
 #include <kleo/cryptobackend.h>
38 38
 
39
-#include <kdepimmacros.h>
39
+#include <tdepimmacros.h>
40 40
 #include <tqguardedptr.h>
41 41
 
42 42
 #include <vector>

+ 1
- 1
certmanager/lib/ui/backendconfigwidget.h View File

@@ -35,7 +35,7 @@
35 35
 #define __KLEO_UI_BACKENDCONFIGWIDGET_H__
36 36
 
37 37
 #include <tqwidget.h>
38
-#include <kdepimmacros.h>
38
+#include <tdepimmacros.h>
39 39
 
40 40
 namespace Kleo {
41 41
   class CryptoBackendFactory;

+ 1
- 1
certmanager/lib/ui/cryptoconfigdialog.h View File

@@ -33,7 +33,7 @@
33 33
 #define CRYPTOCONFIGDIALOG_H
34 34
 
35 35
 #include <kdialogbase.h>
36
-#include <kdepimmacros.h>
36
+#include <tdepimmacros.h>
37 37
 
38 38
 namespace Kleo {
39 39
 

+ 1
- 1
certmanager/lib/ui/directoryserviceswidget.h View File

@@ -34,7 +34,7 @@
34 34
 #define DIRECTORYSERVICESWIDGET_H
35 35
 #include "directoryserviceswidgetbase.h"
36 36
 #include <kurl.h>
37
-#include <kdepimmacros.h>
37
+#include <tdepimmacros.h>
38 38
 
39 39
 class CryptPlugWrapper;
40 40
 namespace Kleo {

+ 1
- 1
certmanager/lib/ui/dnattributeorderconfigwidget.h View File

@@ -34,7 +34,7 @@
34 34
 #define __KLEO_UI_DNATTRIBUTEORDERCONFIGWIDGET_H__
35 35
 
36 36
 #include <tqwidget.h>
37
-#include <kdepimmacros.h>
37
+#include <tdepimmacros.h>
38 38
 namespace Kleo {
39 39
   class DNAttributeMapper;
40 40
 }

+ 1
- 1
certmanager/lib/ui/keyapprovaldialog.h View File

@@ -40,7 +40,7 @@
40 40
 #include <kleo/enum.h>
41 41
 
42 42
 #include <kdialogbase.h>
43
-#include <kdepimmacros.h>
43
+#include <tdepimmacros.h>
44 44
 
45 45
 #include <kpgpkey.h> // for EncryptPref
46 46
 #include <gpgmepp/key.h>

+ 1
- 1
certmanager/lib/ui/keylistview.h View File

@@ -36,7 +36,7 @@
36 36
 #include <klistview.h>
37 37
 
38 38
 #include <gpgmepp/key.h>
39
-#include <kdepimmacros.h>
39
+#include <tdepimmacros.h>
40 40
 
41 41
 class TQPainter;
42 42
 class TQColorGroup;

+ 1
- 1
certmanager/lib/ui/keyrequester.h View File

@@ -53,7 +53,7 @@
53 53
 #include <kleo/cryptobackend.h>
54 54
 
55 55
 #include <vector>
56
-#include <kdepimmacros.h>
56
+#include <tdepimmacros.h>
57 57
 
58 58
 namespace Kleo {
59 59
   class KeyListView;

+ 1
- 1
certmanager/lib/ui/keyselectiondialog.h View File

@@ -41,7 +41,7 @@
41 41
 
42 42
 #include <kleo/cryptobackend.h>
43 43
 #include <gpgmepp/key.h>
44
-#include <kdepimmacros.h>
44
+#include <tdepimmacros.h>
45 45
 #include <vector>
46 46
 
47 47
 class TQVBoxLayout;

+ 1
- 1
certmanager/lib/ui/progressbar.h View File

@@ -34,7 +34,7 @@
34 34
 #define __KLEO_PROGRESSBAR_H__
35 35
 
36 36
 #include <tqprogressbar.h>
37
-#include <kdepimmacros.h>
37
+#include <tdepimmacros.h>
38 38
 class TQTimer;
39 39
 
40 40
 namespace Kleo {

+ 1
- 1
certmanager/lib/ui/progressdialog.h View File

@@ -35,7 +35,7 @@
35 35
 
36 36
 #include <tqprogressdialog.h>
37 37
 #include <tqstring.h>
38
-#include <kdepimmacros.h>
38
+#include <tdepimmacros.h>
39 39
 namespace Kleo {
40 40
 
41 41
   class Job;

+ 1
- 1
configure.in.in View File

@@ -80,7 +80,7 @@ AC_CHECK_HEADERS(sys/ioctl.h) dnl for kandy/src/modem.cpp
80 80
 AC_CHECK_HEADERS(sys/file.h sys/stat.h sys/time.h byteswap.h) dnl for at least kmail
81 81
 
82 82
 dnl the below is copied from kdenetwork's configure as too many apps moved
83
-dnl and noone can say which tests are needed and which are obsolete for kdepim ;(
83
+dnl and noone can say which tests are needed and which are obsolete for tdepim ;(
84 84
 
85 85
 AC_CHECK_HEADERS(fcntl.h unistd.h sysent.h strings.h paths.h)
86 86
 

+ 1
- 1
dependency-graph.dot View File

@@ -1,5 +1,5 @@
1 1
 # to create a ps file use 'dot -Tps -o dependency-graph.ps dependency-graph.dot' (dot is part of the graphviz package)
2
-digraph "inter-dependency graph for kdepim" {
2
+digraph "inter-dependency graph for tdepim" {
3 3
         "akregator" -> "kaddressbook";
4 4
         "akregator" -> "kontact";
5 5
         "certmanager" -> "kaddressbook";

+ 1
- 1
doc/akregator/index.docbook View File

@@ -2,7 +2,7 @@
2 2
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
3 3
   <!ENTITY akregator        "<application>Akregator</application>">
4 4
   <!ENTITY kappname "&akregator;">
5
-  <!ENTITY package "kdepim">
5
+  <!ENTITY package "tdepim">
6 6
   <!ENTITY % addindex "IGNORE">
7 7
   <!ENTITY % English "INCLUDE">
8 8
 ]>

+ 1
- 1
doc/kaddressbook/index.docbook View File

@@ -2,7 +2,7 @@
2 2
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" 
3 3
 "dtd/kdex.dtd" [
4 4
  <!ENTITY kappname "&kaddressbook;">
5
- <!ENTITY package "kdepim">
5
+ <!ENTITY package "tdepim">
6 6
  <!ENTITY % addindex "IGNORE">
7 7
  <!ENTITY % English "INCLUDE" > <!-- change language only here -->  
8 8
 ]>

+ 4
- 4
doc/kalarm/index.docbook View File

@@ -1,7 +1,7 @@
1 1
 <?xml version="1.0" ?>
2 2
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
3 3
   <!ENTITY kappname "&kalarm;">
4
-  <!ENTITY package "kdepim">
4
+  <!ENTITY package "tdepim">
5 5
   <!ENTITY % addindex "IGNORE">
6 6
   <!ENTITY % English "INCLUDE"><!-- change language only here -->
7 7
 ]>
@@ -51,7 +51,7 @@
51 51
 
52 52
 <keywordset>
53 53
 <keyword>KDE</keyword>
54
-<keyword>kdepim</keyword>
54
+<keyword>tdepim</keyword>
55 55
 <keyword>kalarm</keyword>
56 56
 <keyword>alarm</keyword>
57 57
 <keyword>reminder</keyword>
@@ -3964,7 +3964,7 @@ together with details of the &kalarm; client application.</para>
3964 3964
 files whose format is defined by the document
3965 3965
 <ulink url="http://www.w3.org/2002/12/cal/rfc2445.html">RFC2445 -
3966 3966
 Internet Calendaring and Scheduling Core Object Specification
3967
-(iCalendar)</ulink>. This is the standard format used by all kdepim
3967
+(iCalendar)</ulink>. This is the standard format used by all tdepim
3968 3968
 applications. &kalarm; uses certain non-standard properties in the
3969 3969
 Alarm component, in conformance with RFC2445:
3970 3970
 <literal>X-KDE-KALARM-NEXTRECUR</literal>,
@@ -4088,7 +4088,7 @@ url="http://www.astrojar.org.uk/kalarm">http://www.astrojar.org.uk/kalarm</ulink
4088 4088
 
4089 4089
 <para>If you cannot obtain a suitable precompiled binary package, you
4090 4090
 need to compile &kalarm; yourself from source files. Get the source
4091
-package file <filename>kdepim-x.x.tar.bz2</filename> or
4091
+package file <filename>tdepim-x.x.tar.bz2</filename> or
4092 4092
 <filename>kalarm-x.x.tar.bz2</filename> (or similar), depending on
4093 4093
 whether you want to install &package; or just &kalarm;. Unpack it in a
4094 4094
 new folder using a command similar to

+ 5
- 5
doc/kandy/index.docbook View File

@@ -1,7 +1,7 @@
1 1
 <?xml version="1.0" ?>
2 2
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
3 3
   <!ENTITY kappname "&kandy;">
4
-  <!ENTITY package "kdepim">
4
+  <!ENTITY package "tdepim">
5 5
   <!ENTITY % addindex "IGNORE">
6 6
   <!ENTITY % English "INCLUDE" > <!-- change language only here -->
7 7
 ]>
@@ -27,7 +27,7 @@ with the data on the desktop.</para>
27 27
 </abstract>
28 28
 <keywordset>
29 29
 <keyword>KDE</keyword>
30
-<keyword>kdepim</keyword>
30
+<keyword>tdepim</keyword>
31 31
 <keyword>kandy</keyword>
32 32
 <keyword>synchronizing</keyword>
33 33
 <keyword>phone</keyword>
@@ -294,12 +294,12 @@ Watts <email>lauri@kde.org</email>.</para>
294 294
 <title>Requirements</title>
295 295
 
296 296
 <para>You will need to have the kdelibs package installed in order to
297
-successfully compile the kdepim package that contains &kandy;.  The
298
-kdelibs package may be found at the same location as the kdepim
297
+successfully compile the tdepim package that contains &kandy;.  The
298
+kdelibs package may be found at the same location as the tdepim
299 299
 package.</para>
300 300
 
301 301
 <para>The &kaddressbook; is part of the kdebase package.  This can also
302
-be found at the same location as the kdepim package.</para>
302
+be found at the same location as the tdepim package.</para>
303 303
 
304 304
 </sect1>
305 305
 

+ 1
- 1
doc/karm/index.docbook View File

@@ -1,7 +1,7 @@
1 1
 <?xml version="1.0" ?>
2 2
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
3 3
   <!ENTITY kappname "&karm;">
4
-  <!ENTITY package "kdepim">
4
+  <!ENTITY package "tdepim">
5 5
   <!ENTITY % English "INCLUDE" > <!-- change language only here -->
6 6
   <!ENTITY % addindex "IGNORE">
7 7
 ]>

+ 1
- 1
doc/kleopatra/index.docbook View File

@@ -6,7 +6,7 @@
6 6
   <!ENTITY gpg "<application>GPG</application>">
7 7
   <!ENTITY gpgconf "<application>GpgConf</application>">
8 8
   <!ENTITY kappname "&kleopatra;">
9
-  <!ENTITY package "kdepim">
9
+  <!ENTITY package "tdepim">
10 10
   <!ENTITY smime "<acronym>S/MIME</acronym>">
11 11
   <!ENTITY % addindex "IGNORE">
12 12
   <!ENTITY % English "INCLUDE">

+ 2
- 2
doc/kmail/index.docbook View File

@@ -1,7 +1,7 @@
1 1
 <?xml version="1.0" ?>
2 2
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
3 3
   <!ENTITY kappname "&kmail;">
4
-  <!ENTITY package "kdepim">
4
+  <!ENTITY package "tdepim">
5 5
   <!ENTITY kmail-intro SYSTEM "intro.docbook">
6 6
   <!ENTITY kmail-getting-started SYSTEM "getting-started.docbook">
7 7
   <!ENTITY kmail-using-kmail SYSTEM "using-kmail.docbook">
@@ -36,7 +36,7 @@
36 36
 -->
37 37
 
38 38
 <!-- TODO:
39
-*index (see kdegames/kpat/)
39
+*index (see tdegames/kpat/)
40 40
 
41 41
 * guisubmenu vs. guititem ??
42 42
 * more about security?

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

@@ -1256,7 +1256,7 @@ the &kde; address book.</para>
1256 1256
       <listitem>
1257 1257
         <para>
1258 1258
           Starts up <application>kmailcvt</application> (which is
1259
-          part of kdepim). This application lets you import
1259
+          part of tdepim). This application lets you import
1260 1260
           messages from several email clients &kmail;.
1261 1261
         </para>
1262 1262
       </listitem>

+ 1
- 1
doc/knode/index.docbook View File

@@ -1,7 +1,7 @@
1 1
 <?xml version="1.0" ?>
2 2
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
3 3
  <!ENTITY kappname "&knode;">
4
- <!ENTITY package "kdepim"> 
4
+ <!ENTITY package "tdepim"> 
5 5
  <!ENTITY introduction SYSTEM "introduction.docbook">
6 6
  <!ENTITY commands SYSTEM "commands.docbook">
7 7
  <!ENTITY faq SYSTEM "faq.docbook">

+ 1
- 1
doc/knotes/index.docbook View File

@@ -1,7 +1,7 @@
1 1
 <?xml version="1.0" ?>
2 2
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
3 3
   <!ENTITY kappname "&knotes;">
4
-  <!ENTITY package "kdepim">
4
+  <!ENTITY package "tdepim">
5 5
   <!ENTITY % addindex "IGNORE">
6 6
   <!ENTITY % English "INCLUDE" > <!-- change language only here -->
7 7
 ]>

+ 2
- 2
doc/konsolekalendar/index.docbook View File

@@ -8,7 +8,7 @@
8 8
 
9 9
   <!ENTITY konsolekalendar "<application>KonsoleKalendar</application>">
10 10
   <!ENTITY kappname "KonsoleKalendar">
11
-  <!ENTITY package "kdepim">
11
+  <!ENTITY package "tdepim">
12 12
   <!ENTITY % addindex "IGNORE">
13 13
   <!ENTITY % English "INCLUDE">
14 14
 ]>
@@ -828,7 +828,7 @@ Compiling &kde; 3.2.x</ulink> for complete instructions.</para>
828 828
 
829 829
 <para>If you cannot obtain a suitable precompiled binary package, you
830 830
 need to compile &konsolekalendar; yourself from source files. Get the source
831
-package file <filename>kdepim-x.x.tar.bz2</filename>.
831
+package file <filename>tdepim-x.x.tar.bz2</filename>.
832 832
 Unpack it in a new folder using a command similar to
833 833
 <userinput><command>tar</command> <option>xvfj
834 834
 <replaceable>package.tar.bz2</replaceable></option></userinput>, and

+ 2
- 2
doc/kontact/index.docbook View File

@@ -3,7 +3,7 @@
3 3
  "dtd/kdex.dtd" [
4 4
   <!ENTITY PIM "<acronym>PIM</acronym>">
5 5
   <!ENTITY kappname "&kontact;">
6
-  <!ENTITY package "kdepim">
6
+  <!ENTITY package "tdepim">
7 7
   <!ENTITY % addindex "IGNORE">
8 8
   <!ENTITY % English "INCLUDE">
9 9
   <!ENTITY akregator "<application>Akregator</application>">
@@ -54,7 +54,7 @@ address book and other &PIM; functionality.  </para></abstract>
54 54
 
55 55
 <keywordset>
56 56
 <keyword>KDE</keyword>
57
-<keyword>kdepim</keyword>
57
+<keyword>tdepim</keyword>
58 58
 <keyword>KMail</keyword>
59 59
 <keyword>Organizer</keyword>
60 60
 <keyword>KAddressBook</keyword>

+ 4
- 4
doc/korganizer/index.docbook View File

@@ -2,7 +2,7 @@
2 2
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
3 3
  "dtd/kdex.dtd" [
4 4
   <!ENTITY kappname "&korganizer;">
5
-  <!ENTITY package "kdepim">
5
+  <!ENTITY package "tdepim">
6 6
   <!ENTITY plugins-chapter SYSTEM "plugins-chapter.docbook">
7 7
   <!ENTITY outlook-to-vcalendar-workshop SYSTEM "outlook-to-vcalendar.docbook">
8 8
   <!ENTITY % addindex "IGNORE">
@@ -114,7 +114,7 @@ help you keep your schedule. </para></abstract>
114 114
 <keywordset>
115 115
 <keyword>KDE</keyword>
116 116
 <keyword>KOrganizer</keyword>
117
-<keyword>kdepim</keyword>
117
+<keyword>tdepim</keyword>
118 118
 <keyword>manager</keyword>
119 119
 <keyword>time</keyword>
120 120
 <keyword>schedule</keyword>
@@ -4631,7 +4631,7 @@ computer.</para>
4631 4631
 <title>Command Line</title>
4632 4632
 
4633 4633
 <para>A nice program to access a &kde; calendar from the command line is konsolekalendar, which 
4634
-is included in the kdepim package together with &korganizer;.</para>
4634
+is included in the tdepim package together with &korganizer;.</para>
4635 4635
 
4636 4636
 </sect1>
4637 4637
 
@@ -4826,7 +4826,7 @@ on your platform and the size of your calendar(s).</para>
4826 4826
 <para>All required libraries are part of standard &kde; libraries
4827 4827
 (kdelibs). &kde; base package (kdebase) must also be installed to change
4828 4828
 localization preferences like date and time formats. &korganizer; itself
4829
-is in the kdepim package. All packages can be found on <ulink
4829
+is in the tdepim package. All packages can be found on <ulink
4830 4830
 url="http://www.kde.org">&kde; home page</ulink>.</para>
4831 4831
 
4832 4832
 <para>The &korganizer; homepage is at <ulink

+ 1
- 1
doc/korganizer/outlook-to-vcalendar.docbook View File

@@ -32,7 +32,7 @@ to vCalendar</quote> was released on October 17, 2002. See the
32 32
 </abstract>
33 33
 
34 34
 <keywordset>
35
-<keyword>kdepim</keyword>
35
+<keyword>tdepim</keyword>
36 36
 <keyword>KOrganizer</keyword>
37 37
 <keyword>KOrganizer workshop</keyword>
38 38
 <keyword>Outlook</keyword>

+ 1
- 1
doc/korn/index.docbook View File

@@ -1,7 +1,7 @@
1 1
 <?xml version="1.0" ?>
2 2
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
3 3
  <!ENTITY appname "&korn;" >
4
- <!ENTITY package "kdepim">
4
+ <!ENTITY package "tdepim">
5 5
  <!ENTITY % English "INCLUDE">
6 6
  <!ENTITY % addindex "IGNORE">
7 7
 ]>

+ 3
- 3
doc/kpilot/index.docbook View File

@@ -3,7 +3,7 @@
3 3
  "dtd/kdex.dtd" [
4 4
 <!ENTITY kappname "&kpilot;">
5 5
 <!ENTITY kpilotver "4.4.6">
6
-<!ENTITY package "kdepim">
6
+<!ENTITY package "tdepim">
7 7
 <!ENTITY USB "<acronym>USB</acronym>">
8 8
 <!ENTITY PalmOS '<trademark class="registered">Palm OS</trademark>'>
9 9
 <!ENTITY PalmOne '<trademark class="registered">PalmOne</trademark>'>
@@ -87,7 +87,7 @@
87 87
 <keywordset>
88 88
 <keyword>KDE</keyword>
89 89
 <keyword>KPilot</keyword>
90
-<keyword>kdepim</keyword>
90
+<keyword>tdepim</keyword>
91 91
 <keyword>palm pilot</keyword>
92 92
 <keyword>synchronization</keyword>
93 93
 </keywordset>
@@ -111,7 +111,7 @@ There is a web page for &kpilot;: the <ulink
111 111
 url="http://www.kpilot.org/">Official &kpilot; Home Page</ulink>. The <ulink
112 112
 url="http://pim.kde.org/">KDE-PIM website</ulink> also offers useful information
113 113
 on the subject of <acronym>PIM</acronym> in general. &kpilot; shares the
114
-kdepim-users mailing list, <email>kdepim-users@kde.org</email>. See <ulink
114
+tdepim-users mailing list, <email>tdepim-users@kde.org</email>. See <ulink
115 115
 url="http://www.kde.org/mailinglists"> the mailing lists page</ulink> for more
116 116
 information on subscribing and unsubscribing from the list.
117 117
 </para>

+ 1
- 1
doc/ktnef/index.docbook View File

@@ -1,7 +1,7 @@
1 1
 <?xml version="1.0" ?>
2 2
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
3 3
   <!ENTITY kappname "&ktnef;">
4
-  <!ENTITY package "kdepim">
4
+  <!ENTITY package "tdepim">
5 5
   <!ENTITY % addindex "IGNORE">
6 6
   <!ENTITY % English "INCLUDE" > <!-- change language only here -->
7 7
 ]>

+ 1
- 1
doc/kwatchgnupg/index.docbook View File

@@ -5,7 +5,7 @@
5 5
   <!ENTITY watchgnupg "<application>WatchGnuPG</application>">
6 6
   <!ENTITY kwatchgnupg "<application>KWatchGnuPG</application>">
7 7
   <!ENTITY kappname "&kwatchgnupg;">
8
-  <!ENTITY package "kdepim">
8
+  <!ENTITY package "tdepim">
9 9
   <!ENTITY % addindex "IGNORE">
10 10
   <!ENTITY % English "INCLUDE">
11 11
 ]>

+ 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_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
7
+kabcfrontend_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
8 8
 kabcfrontend_LDADD = -lkabc $(LIB_KDECORE)
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_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
7
+kabc2mutt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
8 8
 kabc2mutt_LDADD = -lkabc $(LIB_KDECORE)
9 9
 kabc2mutt_SOURCES = kabc2mutt.cpp main.cpp
10 10
 

+ 1
- 1
kabc/kabcdistlistupdater/CMakeLists.txt View File

@@ -37,6 +37,6 @@ install(
37 37
 
38 38
 tde_add_executable( kabcdistlistupdater
39 39
   SOURCES kabcdistlistupdater.cpp
40
-  LINK  kdepim-shared
40
+  LINK  tdepim-shared
41 41
   DESTINATION ${BIN_INSTALL_DIR}
42 42
 )

+ 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_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
7
+kabcdistlistupdater_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
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
-    kdepim-shared kabc_file-shared kdeprint-shared kutils-shared
106
+    tdepim-shared kabc_file-shared tdeprint-shared kutils-shared
107 107
   DESTINATION ${LIB_INSTALL_DIR}
108 108
 )

+ 2
- 2
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_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
20
+kaddressbook_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
21 21
 kaddressbook_LDADD = libkaddressbook.la
22 22
 
23 23
 kde_module_LTLIBRARIES = libkaddressbookpart.la
@@ -48,7 +48,7 @@ libkaddressbook_la_LIBADD = $(top_builddir)/kaddressbook/printing/libprinter.la
48 48
                             -lkabc_file $(LIB_KABC) $(LIB_KHTML) \
49 49
                             $(top_builddir)/kaddressbook/common/libkabcommon.la \
50 50
                             $(top_builddir)/kaddressbook/editors/libkabim.la \
51
-                            -lkdeprint
51
+                            -ltdeprint
52 52
 libkaddressbook_la_COMPILE_FIRST = $(top_srcdir)/libtdepim/categoryselectdialog.h \
53 53
                                    $(top_srcdir)/libtdepim/categoryeditdialog.h \
54 54
                                    $(top_builddir)/kaddressbook/common/kabprefs_base.h

+ 1
- 1
kaddressbook/common/kabprefs.h View File

@@ -25,7 +25,7 @@
25 25
 #define KABPREFS_H
26 26
 
27 27
 #include <tqstringlist.h>
28
-#include <kdepimmacros.h>
28
+#include <tdepimmacros.h>
29 29
 #include "kabprefs_base.h"
30 30
 
31 31
 class KConfig;

+ 1
- 1
kaddressbook/common/kaddressbook.kcfg View File

@@ -21,7 +21,7 @@
21 21
     <entry type="String" name="FaxHookApplication">
22 22
       <label>Fax</label>
23 23
       <whatsthis></whatsthis>
24
-      <default>kdeprintfax --phone %N</default>
24
+      <default>tdeprintfax --phone %N</default>
25 25
     </entry>
26 26
     <entry type="String" name="SMSHookApplication">
27 27
       <label>SMS</label>

+ 2
- 2
kaddressbook/features/CMakeLists.txt View File

@@ -46,7 +46,7 @@ install( FILES
46 46
 
47 47
 tde_add_kpart( ${TARGET} AUTOMOC
48 48
   SOURCES ${SOURCE}
49
-  LINK kabinterfaces-shared kdepim-shared kabc-shared
49
+  LINK kabinterfaces-shared tdepim-shared kabc-shared
50 50
   DESTINATION ${PLUGIN_INSTALL_DIR}
51 51
 )
52 52
 
@@ -55,6 +55,6 @@ tde_add_kpart( ${TARGET} AUTOMOC
55 55
 
56 56
 tde_add_kpart( libkaddrbk_resourceselection AUTOMOC
57 57
   SOURCES resourceselection.cpp
58
-  LINK kabinterfaces-shared kdepim-shared kabc-shared
58
+  LINK kabinterfaces-shared tdepim-shared kabc-shared
59 59
   DESTINATION ${PLUGIN_INSTALL_DIR}
60 60
 )

+ 1
- 1
kaddressbook/interfaces/configurewidget.h View File

@@ -27,7 +27,7 @@
27 27
 #include <tqwidget.h>
28 28
 
29 29
 #include <kconfig.h>
30
-#include <kdepimmacros.h>
30
+#include <tdepimmacros.h>
31 31
 
32 32
 namespace KABC {
33 33
 class AddressBook;

+ 1
- 1
kaddressbook/interfaces/contacteditorwidget.h View File

@@ -28,7 +28,7 @@
28 28
 
29 29
 #include <kabc/addressbook.h>
30 30
 #include <klibloader.h>
31
-#include <kdepimmacros.h>
31
+#include <tdepimmacros.h>
32 32
 
33 33
 #define KAB_CEW_PLUGIN_VERSION 1
34 34
 

+ 1
- 1
kaddressbook/interfaces/core.h View File

@@ -35,7 +35,7 @@
35 35
 #include <kabc/field.h>
36 36
 #include <kcommand.h>
37 37
 #include <kxmlguiclient.h>
38
-#include <kdepimmacros.h>
38
+#include <tdepimmacros.h>
39 39
 
40 40
 namespace KABC {
41 41
 class AddressBook;

+ 1
- 1
kaddressbook/interfaces/extensionwidget.h View File

@@ -28,7 +28,7 @@
28 28
 
29 29
 #include <kabc/addressbook.h>
30 30
 #include <klibloader.h>
31
-#include <kdepimmacros.h>
31
+#include <tdepimmacros.h>
32 32
 
33 33
 #define KAB_EXTENSIONWIDGET_PLUGIN_VERSION 1
34 34
 

+ 1
- 1
kaddressbook/interfaces/xxport.h View File

@@ -30,7 +30,7 @@
30 30
 #include <kabc/addresseelist.h>
31 31
 #include <klibloader.h>
32 32
 #include <kxmlguiclient.h>
33
-#include <kdepimmacros.h>
33
+#include <tdepimmacros.h>
34 34
 
35 35
 #define KAB_XXPORT_PLUGIN_VERSION 1
36 36
 

+ 1
- 1
kaddressbook/kabcore.h View File

@@ -33,7 +33,7 @@
33 33
 #include <tqwidget.h>
34 34
 
35 35
 #include "core.h"
36
-#include <kdepimmacros.h>
36
+#include <tdepimmacros.h>
37 37
 
38 38
 namespace KABC {
39 39
 class AddressBook;

+ 1
- 1
kaddressbook/kaddressbookiface.h View File

@@ -27,7 +27,7 @@
27 27
 #include <dcopobject.h>
28 28
 #include <kurl.h>
29 29
 #include <tqstringlist.h>
30
-#include <kdepimmacros.h>
30
+#include <tdepimmacros.h>
31 31
 
32 32
 class KDE_EXPORT KAddressBookIface : virtual public DCOPObject
33 33
 {

+ 1
- 1
kaddressbook/kaddressbookview.h View File

@@ -31,7 +31,7 @@
31 31
 
32 32
 #include <kabc/field.h>
33 33
 #include <klibloader.h>
34
-#include <kdepimmacros.h>
34
+#include <tdepimmacros.h>
35 35
 
36 36
 #include "filter.h"
37 37
 #include "viewconfigurewidget.h"

+ 3
- 3
kaddressbook/kcmconfigs/CMakeLists.txt View File

@@ -38,7 +38,7 @@ tde_add_kpart( kcm_kabconfig AUTOMOC
38 38
   SOURCES
39 39
     kcmkabconfig.cpp kabconfigwidget.cpp extensionconfigdialog.cpp
40 40
     addresseewidget.cpp
41
-  LINK kabcommon-static kdepim-shared
41
+  LINK kabcommon-static tdepim-shared
42 42
   DESTINATION ${PLUGIN_INSTALL_DIR}
43 43
 )
44 44
 
@@ -48,7 +48,7 @@ tde_add_kpart( kcm_kabconfig AUTOMOC
48 48
 tde_add_kpart( kcm_kabldapconfig AUTOMOC
49 49
   SOURCES
50 50
     addhostdialog.cpp kcmkabldapconfig.cpp ldapoptionswidget.cpp
51
-  LINK kdepim-shared
51
+  LINK tdepim-shared
52 52
   DESTINATION ${PLUGIN_INSTALL_DIR}
53 53
 )
54 54
 
@@ -57,6 +57,6 @@ tde_add_kpart( kcm_kabldapconfig AUTOMOC
57 57
 
58 58
 tde_add_kpart( kcm_kabcustomfields AUTOMOC
59 59
   SOURCES kcmkabcustomfields.cpp
60
-  LINK kabcommon-static kdepim-shared
60
+  LINK kabcommon-static tdepim-shared
61 61
   DESTINATION ${PLUGIN_INSTALL_DIR}
62 62
 )

+ 1
- 1
kaddressbook/kcmconfigs/kcmkabconfig.cpp View File

@@ -31,7 +31,7 @@
31 31
 
32 32
 #include "kcmkabconfig.h"
33 33
 
34
-#include <kdepimmacros.h>
34
+#include <tdepimmacros.h>
35 35
 
36 36
 extern "C"
37 37
 {

+ 1
- 1
kaddressbook/kcmconfigs/kcmkabcustomfields.cpp View File

@@ -29,7 +29,7 @@
29 29
 
30 30
 #include <tqregexp.h>
31 31
 
32
-#include <kdepimmacros.h>
32
+#include <tdepimmacros.h>
33 33
 
34 34
 extern "C"
35 35
 {

+ 1
- 1
kaddressbook/kcmconfigs/kcmkabldapconfig.cpp View File

@@ -32,7 +32,7 @@
32 32
 
33 33
 #include "kcmkabldapconfig.h"
34 34
 
35
-#include <kdepimmacros.h>
35
+#include <tdepimmacros.h>
36 36
 
37 37
 extern "C"
38 38
 {

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

@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = ldifvcardthumbnail.la
5 5
 
6 6
 ldifvcardthumbnail_la_SOURCES = ldifvcardcreator.cpp
7 7
 ldifvcardthumbnail_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
8
-ldifvcardthumbnail_la_LIBADD = $(LIB_KDECORE) $(LIB_KABC) -lkdefx
8
+ldifvcardthumbnail_la_LIBADD = $(LIB_KDECORE) $(LIB_KABC) -ltdefx
9 9
 
10 10
 noinst_HEADERS = ldifvcardcreator.h
11 11
 

+ 1
- 1
kaddressbook/viewconfigurewidget.h View File

@@ -25,7 +25,7 @@
25 25
 #define VIEWCONFIGUREWIDGET_H
26 26
 
27 27
 #include <kdialogbase.h>
28
-#include <kdepimmacros.h>
28
+#include <tdepimmacros.h>
29 29
 #include <tqpixmap.h>
30 30
 
31 31
 #include "configurewidget.h"

+ 1
- 1
kaddressbook/xxport/HACKING View File

@@ -1,7 +1,7 @@
1 1
 Coding Style
2 2
 =============
3 3
 
4
-Please use the coding style conventions from kdepim/kaddressbook/HACKING
4
+Please use the coding style conventions from tdepim/kaddressbook/HACKING
5 5
 if you want to commit your xxport plugin into the cvs.
6 6
 
7 7
 

+ 1
- 1
kaddressbook/xxportmanager.h View File

@@ -29,7 +29,7 @@
29 29
 
30 30
 #include <kurl.h>
31 31
 
32
-#include <kdepimmacros.h>
32
+#include <tdepimmacros.h>
33 33
 
34 34
 #include "xxport.h"
35 35
 

+ 1
- 1
kalarm/daemon.cpp View File

@@ -141,7 +141,7 @@ bool Daemon::start()
141 141
 				kdError() << "Daemon::startApp(): " DAEMON_APP_NAME " not found" << endl;
142 142
 				return false;
143 143
 			}
144
-			KApplication::kdeinitExec(execStr);
144
+			KApplication::tdeinitExec(execStr);
145 145
 			kdDebug(5950) << "Daemon::start(): Alarm daemon started" << endl;
146 146
 			mStartTimeout = 5000/startCheckInterval + 1;    // check daemon status for 5 seconds before giving up
147 147
 			mStartTimer = new TQTimer(mInstance);

+ 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_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
5
+libkalarmd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
6 6
 libkalarmd_la_LIBADD  = $(LIB_KDECORE) $(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_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
11
+kalarmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
12 12
 kalarmd_LDADD = $(LIB_KDEUI) $(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 \

+ 1
- 1
kalarm/kalarmd/alarmdaemon.cpp View File

@@ -120,7 +120,7 @@ void AlarmDaemon::autostartKAlarm()
120 120
 	kdDebug(5900) << "AlarmDaemon::autostartKAlarm(): starting KAlarm\n";
121 121
 	TQStringList args;
122 122
 	args << TQString::tqfromLatin1("--tray");
123
-	int ret = KApplication::kdeinitExec(TQString::tqfromLatin1("kalarm"), args);
123
+	int ret = KApplication::tdeinitExec(TQString::tqfromLatin1("kalarm"), args);
124 124
 	if (ret)
125 125
 		kdError(5900) << "AlarmDaemon::autostartKAlarm(): error=" << ret << endl;
126 126
 	else

+ 1
- 1
kalarm/lib/Makefile.am View File

@@ -18,5 +18,5 @@ noinst_HEADERS = \
18 18
 	timeperiod.h shellprocess.h slider.h spinbox.h spinbox2.h \
19 19
 	synchtimer.h spinbox2private.h
20 20
 
21
-DOXYGEN_REFERENCES=kdecore kdeui libtdepim
21
+DOXYGEN_REFERENCES=tdecore tdeui libtdepim
22 22
 include $(top_srcdir)/admin/Doxyfile.am

+ 1
- 1
kalarm/lib/colourcombo.cpp View File

@@ -3,7 +3,7 @@
3 3
  *  Program:  kalarm
4 4
  *  Copyright (c) 2001 - 2003, 2005 by David Jarvie <software@astrojar.org.uk>
5 5
  *
6
- *  Some code taken from kdelibs/kdeui/kcolorcombo.cpp in the KDE libraries:
6
+ *  Some code taken from kdelibs/tdeui/kcolorcombo.cpp in the KDE libraries:
7 7
  *  Copyright (C) 1997 Martin Jones (mjones@kde.org)
8 8
  *
9 9
  *  This program is free software; you can redistribute it and/or modify

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

@@ -46,7 +46,7 @@ tde_add_executable( kandy AUTOMOC
46 46
     atcommand.cpp commanditem.cpp mobilegui_base.ui mobilegui.cpp
47 47
     commandscheduler.cpp commandset.cpp kandyprefs.kcfgc
48 48
     kandyprefsdialog.cpp mobilemain.cpp
49
-  LINK kdepim-shared ${LOCKDEV_LIBRARY}
49
+  LINK tdepim-shared ${LOCKDEV_LIBRARY}
50 50
   DESTINATION ${BIN_INSTALL_DIR}
51 51
 )
52 52
 
@@ -55,6 +55,6 @@ tde_add_executable( kandy AUTOMOC
55 55
 
56 56
 tde_add_executable( kandy_client AUTOMOC
57 57
   SOURCES kandy_client.cpp
58
-  LINK kdecore-shared
58
+  LINK tdecore-shared
59 59
   DESTINATION ${BIN_INSTALL_DIR}
60 60
 )

+ 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_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
5
+kandy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
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 \
@@ -17,7 +17,7 @@ kandy_SOURCES =	main.cpp kandy.cpp \
17 17
 noinst_HEADERS   = kandy.h kandyview.h modem.h atcommand.h \
18 18
                    commanditem.h mobilegui.h commandscheduler.h
19 19
 
20
-kandy_client_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
20
+kandy_client_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
21 21
 kandy_client_LDADD   = $(LIB_KDECORE)
22 22
 kandy_client_SOURCES = kandy_client.cpp
23 23
 

+ 1
- 1
karm/CMakeLists.txt View File

@@ -55,7 +55,7 @@ tde_add_library( karm SHARED AUTOMOC
55 55
     csvexportdialog.cpp plannerparser.cpp karmdcopiface.skel
56 56
     taskviewwhatsthis.cpp
57 57
   VERSION 0.0.0
58
-  LINK kcal_resourceremote-shared kdeprint-shared
58
+  LINK kcal_resourceremote-shared tdeprint-shared
59 59
   DESTINATION ${LIB_INSTALL_DIR}
60 60
 )
61 61
 

+ 4
- 4
karm/Makefile.am View File

@@ -20,10 +20,10 @@ libkarm_shared_la_SOURCES = kaccelmenuwatch.cpp desktoptracker.cpp \
20 20
 		karmdcopiface.skel taskviewwhatsthis.cpp
21 21
 libkarm_shared_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
22 22
 	     $(top_builddir)/kresources/remote/libkcal_resourceremote.la \
23
-             $(top_builddir)/libtdepim/libtdepim.la $(LIBXSS) -lkdeprint 
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_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
26
+karm_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
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 \
@@ -43,9 +43,9 @@ messages: rc.cpp
43 43
 	$(XGETTEXT) *.cpp -o $(podir)/karm.pot
44 44
 
45 45
 srcdoc:
46
-	kdoc -a -p -H -d $(HOME)/web/src/karm karm *.h -lkdecore -lkdeui -lqt
46
+	kdoc -a -p -H -d $(HOME)/web/src/karm karm *.h -ltdecore -ltdeui -lqt
47 47
 
48
-DOXYGEN_REFERENCES = kdeui
48
+DOXYGEN_REFERENCES = tdeui
49 49
 include $(top_srcdir)/admin/Doxyfile.am
50 50
 
51 51
 #########################################################################

+ 1
- 1
karm/karmstorage.h View File

@@ -34,7 +34,7 @@
34 34
 #include <calendarresources.h>
35 35
 #include <vector>
36 36
 #include "resourcecalendar.h"
37
-#include <kdepimmacros.h>
37
+#include <tdepimmacros.h>
38 38
 
39 39
 class TQDateTime;
40 40
 class Preferences;

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


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

Loading…
Cancel
Save