Browse Source

Additional k => tde renaming and fixes

pull/21/head
Slávek Banko 8 years ago
parent
commit
533bad2a15
  1. 4
      CMakeLists.txt
  2. 2
      Makefile.am.in
  3. 2
      README
  4. 2
      README.Kolab
  5. 10
      akregator/src/Makefile.am
  6. 2
      akregator/src/librss/Makefile.am
  7. 4
      akregator/src/librss/loader.h
  8. 4
      certmanager/Makefile.am
  9. 2
      certmanager/aboutdata.cpp
  10. 2
      certmanager/certificatewizardimpl.cpp
  11. 4
      certmanager/kwatchgnupg/Makefile.am
  12. 2
      certmanager/lib/Makefile.am
  13. 6
      certmanager/lib/kleo/tdeconfigbasedkeyfilter.h
  14. 6
      certmanager/storedtransferjob.cpp
  15. 2
      certmanager/storedtransferjob.h
  16. 2
      cvs.sh.diff
  17. 4
      doc/kaddressbook/index.docbook
  18. 5
      kabc/Makefile.am
  19. 1
      kabc/README
  20. 10
      kabc/frontend/Makefile.am
  21. 13
      kabc/kabc2mutt/Makefile.am
  22. 12
      kabc/kabcdistlistupdater/Makefile.am
  23. 4
      kaddressbook/Makefile.am
  24. 6
      kaddressbook/kabcore.cpp
  25. 4
      kaddressbook/kcmconfigs/Makefile.am
  26. 4
      kaddressbook/kcmconfigs/addresseewidget.cpp
  27. 4
      kaddressbook/kcmconfigs/kabconfigwidget.cpp
  28. 2
      kaddressbook/nameeditdialog.cpp
  29. 6
      kaddressbook/views/Makefile.am
  30. 18
      kaddressbook/xxport/Makefile.am
  31. 2
      kaddressbook/xxport/bookmark_xxport.cpp
  32. 4
      kalarm/kalarmd/Makefile.am
  33. 4
      kandy/src/Makefile.am
  34. 4
      karm/Makefile.am
  35. 4
      karm/tdeaccelmenuwatch.h
  36. 4
      karm/test/Makefile.am
  37. 6
      kitchensync/src/Makefile.am
  38. 4
      kitchensync/src/memberinfo.cpp
  39. 2
      kmail/CMakeLists.txt
  40. 8
      kmail/Makefile.am
  41. 2
      kmail/folderdiaacltab.h
  42. 2
      kmail/folderdiaquotatab.h
  43. 30
      kmail/headerstyle.cpp
  44. 2
      kmail/imapaccountbase.cpp
  45. 10
      kmail/imapaccountbase.h
  46. 2
      kmail/imapjob.cpp
  47. 2
      kmail/keyresolver.cpp
  48. 2
      kmail/kmacctimap.cpp
  49. 2
      kmail/kmacctimap.h
  50. 2
      kmail/kmail_part.cpp
  51. 4
      kmail/kmcommands.cpp
  52. 2
      kmail/kmcomposewin.cpp
  53. 2
      kmail/kmcomposewin.h
  54. 2
      kmail/kmdict.cpp
  55. 0
      kmail/kmdict.h
  56. 4
      kmail/kmfolderdia.h
  57. 2
      kmail/kmmainwin.cpp
  58. 2
      kmail/kmmsgdict.cpp
  59. 2
      kmail/kmreaderwin.cpp
  60. 2
      kmail/networkaccount.h
  61. 10
      kmail/popaccount.h
  62. 2
      kmail/recipientspicker.cpp
  63. 2
      kmail/redirectdialog.cpp
  64. 4
      kmail/tdelistboxdialog.h
  65. 6
      kmail/tdelistviewindexedsearchline.h
  66. 2
      kmail/tests/Makefile.am
  67. 2
      kmail/tests/messagedicttests.cpp
  68. 4
      kmail/tests/mimelibtests.cpp
  69. 4
      kmail/tests/storagelayermodule.cpp
  70. 4
      kmail/tests/utiltests.cpp
  71. 2
      kmailcvt/Makefile.am
  72. 4
      kmobile/Makefile.am
  73. 2
      kmobile/tdeioslave/Makefile.am
  74. 4
      kmobile/tdeioslave/tdeio_mobile.cpp
  75. 4
      kmobile/tdeioslave/tdeio_mobile.h
  76. 6
      knode/Makefile.am
  77. 2
      knode/kncomposer.cpp
  78. 6
      knotes/Makefile.am
  79. 2
      kode/Makefile.am
  80. 4
      kode/kodemain.cpp
  81. 2
      kode/kwsdl/Makefile.am
  82. 2
      kode/kwsdl/converter.cpp
  83. 2
      kode/kwsdl/kung/Makefile.am
  84. 2
      kode/kwsdl/kung/transport.cpp
  85. 2
      kode/kwsdl/schema/Makefile.am
  86. 2
      kode/kwsdl/tests/google/Makefile.am
  87. 2
      kode/kwsdl/tests/google/transport.cpp
  88. 2
      kode/kwsdl/wscl/Makefile.am
  89. 2
      kode/kxml_compiler/Makefile.am
  90. 2
      konsolekalendar/Makefile.am
  91. 2
      kontact/Thoughts
  92. 2
      kontact/interfaces/Makefile.am
  93. 2
      kontact/plugins/akregator/Makefile.am
  94. 2
      kontact/plugins/kmail/Makefile.am
  95. 2
      kontact/plugins/knode/Makefile.am
  96. 2
      kontact/plugins/knotes/Makefile.am
  97. 6
      kontact/plugins/korganizer/Makefile.am
  98. 2
      kontact/plugins/kpilot/Makefile.am
  99. 2
      kontact/plugins/newsticker/Makefile.am
  100. 4
      kontact/plugins/summary/Makefile.am
  101. 2
      kontact/plugins/test/Makefile.am
  102. 2
      kontact/plugins/weather/Makefile.am
  103. 4
      kontact/src/Makefile.am
  104. 18
      korganizer/Makefile.am
  105. 4
      korganizer/korgac/Makefile.am
  106. 2
      korganizer/plugins/exchange/Makefile.am
  107. 2
      korganizer/plugins/projectview/Makefile.am
  108. 2
      korganizer/plugins/timespanview/Makefile.am
  109. 2
      korn/CMakeLists.txt
  110. 8
      korn/Makefile.am
  111. 2
      korn/accountmanager.cpp
  112. 6
      korn/dcop_proto.h
  113. 4
      korn/imap_proto.h
  114. 2
      korn/imaps_proto.h
  115. 2
      korn/kmail_proto.cpp
  116. 4
      korn/maildir_proto.h
  117. 2
      korn/maildrop.h
  118. 2
      korn/mbox_proto.cpp
  119. 2
      korn/mbox_proto.h
  120. 2
      korn/nntp_proto.cpp
  121. 4
      korn/nntp_proto.h
  122. 2
      korn/polldrop.h
  123. 2
      korn/pop3_proto.cpp
  124. 4
      korn/pop3_proto.h
  125. 2
      korn/pop3s_proto.h
  126. 2
      korn/process_proto.cpp
  127. 4
      korn/process_proto.h
  128. 4
      korn/protocol.h
  129. 2
      korn/qmail_proto.cpp
  130. 4
      korn/qmail_proto.h
  131. 2
      korn/stringid.h
  132. 2
      korn/tdeconf_update/Makefile.am
  133. 8
      korn/tdeconf_update/korn-3-4-config_change.cpp
  134. 34
      korn/tdeio.cpp
  135. 42
      korn/tdeio.h
  136. 84
      korn/tdeio_count.cpp
  137. 18
      korn/tdeio_count.h
  138. 52
      korn/tdeio_delete.cpp
  139. 22
      korn/tdeio_delete.h
  140. 6
      korn/tdeio_proto.cpp
  141. 18
      korn/tdeio_proto.h
  142. 24
      korn/tdeio_read.cpp
  143. 16
      korn/tdeio_read.h
  144. 14
      korn/tdeio_single_subject.cpp
  145. 16
      korn/tdeio_single_subject.h
  146. 64
      korn/tdeio_subjects.cpp
  147. 24
      korn/tdeio_subjects.h
  148. 2
      ktnef/gui/Makefile.am
  149. 2
      ktnef/lib/Makefile.am
  150. 2
      ktnef/tests/Makefile.am
  151. 4
      libemailfunctions/tests/Makefile.am
  152. 2
      libkcal/Makefile.am
  153. 28
      libkcal/tests/Makefile.am
  154. 2
      libkholidays/Makefile.am
  155. 2
      libkholidays/holidays/holiday_it
  156. 2
      libkmime/tests/run_codec_tests
  157. 10
      libkmime/tests/test_kmime_codec.cpp
  158. 2
      libkpimexchange/Makefile.am
  159. 2
      libkpimexchange/core/Makefile.am
  160. 4
      libtdepim/Makefile.am
  161. 2
      libtdepim/addresseeemailselection.cpp
  162. 2
      libtdepim/addresseelineedit.cpp
  163. 2
      libtdepim/addresseeview.h
  164. 8
      libtdepim/addressesdialog.cpp
  165. 4
      libtdepim/cfgc/Makefile.am
  166. 2
      libtdepim/completionordereditor.cpp
  167. 4
      libtdepim/groupwarejob.h
  168. 20
      libtdepim/kaddrbook.cpp
  169. 2
      libtdepim/komposer/core/Makefile.am
  170. 6
      libtdepim/komposer/core/tests/Makefile.am
  171. 2
      libtdepim/komposer/plugins/default/Makefile.am
  172. 4
      libtdepim/komposer/test/Makefile.am
  173. 2
      libtdepim/recentaddresses.h
  174. 4
      libtdepim/tdeabcresourcecached.h
  175. 4
      libtdepim/tdeabcresourcenull.h
  176. 4
      libtdepim/tdeconfigpropagator.h
  177. 4
      libtdepim/tdeconfigwizard.h
  178. 2
      libtdepim/tdepartsdesignerplugin/Makefile.am
  179. 4
      libtdepim/tests/Makefile.am
  180. 4
      tdeabc/CMakeLists.txt
  181. 5
      tdeabc/Makefile.am
  182. 1
      tdeabc/README
  183. 10
      tdeabc/frontend/Makefile.am
  184. 0
      tdeabc/frontend/main.cpp
  185. 0
      tdeabc/frontend/mainWindow.ui
  186. 0
      tdeabc/frontend/mainWindow.ui.h
  187. 6
      tdeabc/tdeabc2mutt/CMakeLists.txt
  188. 13
      tdeabc/tdeabc2mutt/Makefile.am
  189. 8
      tdeabc/tdeabc2mutt/README
  190. 8
      tdeabc/tdeabc2mutt/main.cpp
  191. 4
      tdeabc/tdeabc2mutt/tdeabc2mutt.cpp
  192. 4
      tdeabc/tdeabc2mutt/tdeabc2mutt.h
  193. 8
      tdeabc/tdeabcdistlistupdater/CMakeLists.txt
  194. 12
      tdeabc/tdeabcdistlistupdater/Makefile.am
  195. 4
      tdeabc/tdeabcdistlistupdater/tdeabcdistlistupdater.cpp
  196. 6
      tdeabc/tdeabcdistlistupdater/tdeabcdistlistupdater.desktop
  197. 2
      tdefile-plugins/ics/Makefile.am
  198. 2
      tdefile-plugins/palm-databases/Makefile.am
  199. 2
      tdefile-plugins/rfc822/Makefile.am
  200. 2
      tdefile-plugins/vcf/Makefile.am
  201. 2
      tdeioslaves/imap4/Makefile.am
  202. 2
      tdeioslaves/mbox/Makefile.am
  203. 2
      tdeioslaves/opengroupware/Makefile.am
  204. 2
      tdeioslaves/sieve/Makefile.am
  205. 2
      tdeioslaves/sieve/sieve.cpp
  206. 10
      tderesources/birthdays/CMakeLists.txt
  207. 10
      tderesources/birthdays/Makefile.am
  208. 10
      tderesources/birthdays/resourcetdeabc.cpp
  209. 4
      tderesources/birthdays/resourcetdeabc.h
  210. 6
      tderesources/birthdays/resourcetdeabcconfig.cpp
  211. 4
      tderesources/birthdays/resourcetdeabcconfig.h
  212. 2
      tderesources/birthdays/tdeabc.desktop
  213. 2
      tderesources/blogging/xmlrpcjob.cpp
  214. 6
      tderesources/egroupware/Makefile.am
  215. 2
      tderesources/egroupware/synchronizer.h
  216. 4
      tderesources/egroupware/tdeabc_resourcexmlrpc.h
  217. 2
      tderesources/egroupware/xmlrpciface.cpp
  218. 4
      tderesources/featureplan/Makefile.am
  219. 4
      tderesources/groupdav/tdeabc_resourcegroupdav.h
  220. 4
      tderesources/groupware/tdeabc_resourcegroupware.h
  221. 4
      tderesources/groupware/tdeabc_resourcegroupwareconfig.h
  222. 2
      tderesources/groupwise/soap/Makefile.am
  223. 4
      tderesources/groupwise/tdeabc_resourcegroupwise.h
  224. 4
      tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h
  225. 2
      tderesources/groupwise/tdeioslave/Makefile.am
  226. 2
      tderesources/kolab/kcal/resourcekolab.cpp
  227. 2
      tderesources/kolab/kcal/resourcekolab_plugin.cpp
  228. 2
      tderesources/kolab/knotes/resourcekolab_plugin.cpp
  229. 2
      tderesources/kolab/shared/subresource.cpp
  230. 2
      tderesources/kolab/shared/subresource.h
  231. 6
      tderesources/kolab/tdeabc/CMakeLists.txt
  232. 10
      tderesources/kolab/tdeabc/Makefile.am
  233. 2
      tderesources/kolab/tdeabc/contact.cpp
  234. 2
      tderesources/kolab/tdeabc/contact.h
  235. 2
      tderesources/kolab/tdeabc/resourcekolab.cpp
  236. 4
      tderesources/kolab/tdeabc/resourcekolab.h
  237. 2
      tderesources/kolab/tdeabc/resourcekolab_plugin.cpp
  238. 4
      tderesources/lib/tdeabc_resourcegroupwarebase.h
  239. 4
      tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h
  240. 2
      tderesources/newexchange/Person.mapping
  241. 4
      tderesources/newexchange/exchangeconvertercontact.cpp
  242. 4
      tderesources/newexchange/tdeabc_resourceexchange.h
  243. 2
      tderesources/scalix/README
  244. 2
      tderesources/scalix/kcal/resourcescalix.cpp
  245. 2
      tderesources/scalix/scalixadmin/Makefile.am
  246. 6
      tderesources/scalix/tdeabc/CMakeLists.txt
  247. 10
      tderesources/scalix/tdeabc/Makefile.am
  248. 2
      tderesources/scalix/tdeabc/resourcescalix.h
  249. 2
      tderesources/scalix/tdeioslave/Makefile.am
  250. 2
      tderesources/scalix/tdeioslave/scalix.cpp
  251. 2
      tderesources/slox/Makefile.am
  252. 4
      tderesources/slox/tdeabcresourceslox.h
  253. 4
      wizards/CMakeLists.txt
  254. 18
      wizards/Makefile.am
  255. 24
      wizards/egroupwarewizard.cpp
  256. 18
      wizards/exchangewizard.cpp
  257. 4
      wizards/groupwise.kcfg
  258. 18
      wizards/groupwisewizard.cpp
  259. 4
      wizards/slox.kcfg
  260. 18
      wizards/sloxwizard.cpp

4
CMakeLists.txt

@ -112,7 +112,7 @@ option( BUILD_KNOTES "Build knotes" ${BUILD_ALL} )
option( BUILD_KODE "Build kode" ${BUILD_ALL} )
option( BUILD_TDERESOURCES "Build tderesources" ${BUILD_ALL} )
option( BUILD_WIZARDS "Build wizards" ${BUILD_ALL} )
option( BUILD_KABC "Build kabc" ${BUILD_ALL} )
option( BUILD_TDEABC "Build tdeabc" ${BUILD_ALL} )
option( BUILD_KONSOLEKALENDAR "Build konsolekalendar" ${BUILD_ALL} )
option( BUILD_KMAILCVT "Build kmailcvt" ${BUILD_ALL} )
option( BUILD_KARM "Build karm" ${BUILD_ALL} )
@ -184,7 +184,7 @@ tde_conditional_add_subdirectory( BUILD_KNOTES knotes )
tde_conditional_add_subdirectory( BUILD_KODE kode )
tde_conditional_add_subdirectory( BUILD_TDERESOURCES tderesources )
tde_conditional_add_subdirectory( BUILD_WIZARDS wizards )
tde_conditional_add_subdirectory( BUILD_KABC kabc )
tde_conditional_add_subdirectory( BUILD_TDEABC tdeabc )
tde_conditional_add_subdirectory( BUILD_KONSOLEKALENDAR konsolekalendar )
tde_conditional_add_subdirectory( BUILD_KMAILCVT kmailcvt )
tde_conditional_add_subdirectory( BUILD_KARM karm )

2
Makefile.am.in

@ -38,7 +38,7 @@ COMPILE_BEFORE_kitchensync = libtdepim
COMPILE_BEFORE_akregator = libtdepim
COMPILE_BEFORE_knotes = libtdepim
COMPILE_BEFORE_konsolekalendar = libtdepim
COMPILE_BEFORE_kabc = libtdepim
COMPILE_BEFORE_tdeabc = libtdepim
AUTOMAKE_OPTIONS = foreign 1.6.1
DISTCLEANFILES = inst-apps

2
README

@ -48,7 +48,7 @@ There is also quite an amount of infrastructure in this package:
* libkcal: C++ api for the iCalendar and vCalendar formats
* libkcal/libical: a basic iCalendar protocol implementation, see RFCs 2245,2246
* libkpimexchange: connecting to Exchange2000 servers
* tdeabc/frontend: A GUI frontend for libkabc, not intended for end users.
* tdeabc/frontend: A GUI frontend for libtdeabc, not intended for end users.
* kgantt: lib to display and manage Gantt diagrams used by the project view
plugin of KOrganizer
* kdgantt: alternative lib for Gantt diagrams, used by the free/busy view of

2
README.Kolab

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

10
akregator/src/Makefile.am

@ -20,9 +20,9 @@ bin_PROGRAMS = akregator
# the application source, library search path, and link libraries
akregator_SOURCES = main.cpp mainwindow.cpp
akregator_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
akregator_LDADD = $(LIB_KPARTS) libakregatorprivate.la
#akregator_LDADD = $(LIB_KPARTS) libakregatorprivate.la $(top_builddir)/libtdepim/libtdepim.la
akregator_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
akregator_LDADD = $(LIB_TDEPARTS) libakregatorprivate.la
#akregator_LDADD = $(LIB_TDEPARTS) libakregatorprivate.la $(top_builddir)/libtdepim/libtdepim.la
# this is where the desktop file will go
xdg_apps_DATA = akregator.desktop
@ -145,8 +145,8 @@ libakregatorpart_la_SOURCES = \
kspeechsink.skel \
kspeech.stub
libakregatorpart_la_LDFLAGS = $(KDE_RPATH) $(KDE_PLUGIN) $(LIB_KUTILS) -avoid-version -no-undefined $(all_libraries)
libakregatorpart_la_LIBADD = libakregatorprivate.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEHTML) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -L$(top_builddir)/libtdepim -ltdepim
libakregatorpart_la_LDFLAGS = $(KDE_RPATH) $(KDE_PLUGIN) $(LIB_TDEUTILS) -avoid-version -no-undefined $(all_libraries)
libakregatorpart_la_LIBADD = libakregatorprivate.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEHTML) $(LIB_TDEIO) $(LIB_TDEPARTS) -lDCOP -L$(top_builddir)/libtdepim -ltdepim
# this is where the desktop file will go
partdesktopdir = $(kde_servicesdir)

2
akregator/src/librss/Makefile.am

@ -16,7 +16,7 @@ librsslocal_la_METASOURCES = AUTO
check_PROGRAMS = testlibrss
testlibrss_SOURCES = testlibrss.cpp
testlibrss_LDFLAGS = $(all_libraries)
testlibrss_LDADD = librsslocal.la $(LIB_KIO)
testlibrss_LDADD = librsslocal.la $(LIB_TDEIO)
DOXYGEN_REFERENCES = tdeui
include $(top_srcdir)/admin/Doxyfile.am

4
akregator/src/librss/loader.h

@ -114,8 +114,8 @@ namespace RSS
/**
* @return The error code for the last process of retrieving data.
* The returned numbers correspond directly to the error codes
* <a href="http://developer.kde.org/documentation/library/cvs-api/classref/tdeio/KIO.html#Error">as
* defined by KIO</a>.
* <a href="http://developer.kde.org/documentation/library/cvs-api/classref/tdeio/TDEIO.html#Error">as
* defined by TDEIO</a>.
*/
virtual int errorCode() const;

4
certmanager/Makefile.am

@ -17,8 +17,8 @@ kleopatra_SOURCES = \
METASOURCES = AUTO
kleopatra_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kleopatra_LDADD = conf/libconf.la lib/libkleopatra.la $(LIB_KUTILS) $(LIB_TDEABC)
kleopatra_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kleopatra_LDADD = conf/libconf.la lib/libkleopatra.la $(LIB_TDEUTILS) $(LIB_TDEABC)
rcdir = $(kde_datadir)/kleopatra
rc_DATA = kleopatraui.rc

2
certmanager/aboutdata.cpp

@ -58,7 +58,7 @@ static const about_data authors[] = {
static const about_data credits[] = {
{ "David Faure",
I18N_NOOP("Backend configuration framework, KIO integration"),
I18N_NOOP("Backend configuration framework, TDEIO integration"),
"faure@kde.org", 0 },
{ "Michel Boyer de la Giroday",
I18N_NOOP("Key-state dependant colors and fonts in the key list"),

2
certmanager/certificatewizardimpl.cpp

@ -498,7 +498,7 @@ void CertificateWizardImpl::accept()
}
/**
This slot is invoked by the KIO job used in newCertificate
This slot is invoked by the TDEIO job used in newCertificate
to save/upload the certificate, when finished (success or error).
*/
void CertificateWizardImpl::slotUploadResult( TDEIO::Job* job )

4
certmanager/kwatchgnupg/Makefile.am

@ -13,8 +13,8 @@ kwatchgnupg_SOURCES = \
METASOURCES = AUTO
kwatchgnupg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kwatchgnupg_LDADD = ../conf/libconf.la ../lib/libkleopatra.la $(LIB_KUTILS) $(LIB_TDEABC)
kwatchgnupg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kwatchgnupg_LDADD = ../conf/libconf.la ../lib/libkleopatra.la $(LIB_TDEUTILS) $(LIB_TDEABC)
rcdir = $(kde_datadir)/kwatchgnupg
rc_DATA = kwatchgnupgui.rc

2
certmanager/lib/Makefile.am

@ -17,7 +17,7 @@ libkleopatra_la_LIBADD = \
ui/libkleopatra_ui.la \
\
$(top_builddir)/libtdenetwork/qgpgme/libqgpgme.la \
$(LIB_KIO) $(LIB_TDEUI)
$(LIB_TDEIO) $(LIB_TDEUI)
# Disabled for tdepim-3.3, see also kleo/cryptobackendfactory.cpp
# backends/kpgp/libkleopatra_backend_kpgp.la

6
certmanager/lib/kleo/tdeconfigbasedkeyfilter.h

@ -30,8 +30,8 @@
your version.
*/
#ifndef __KLEO_KCONFIGBASEDKEYFILTER_H__
#define __KLEO_KCONFIGBASEDKEYFILTER_H__
#ifndef __KLEO_TDECONFIGBASEDKEYFILTER_H__
#define __KLEO_TDECONFIGBASEDKEYFILTER_H__
#include "keyfilter.h"
@ -101,4 +101,4 @@ namespace Kleo {
}
#endif // __KLEO_KCONFIGBASEDKEYFILTER_H__
#endif // __KLEO_TDECONFIGBASEDKEYFILTER_H__

6
certmanager/storedtransferjob.cpp

@ -21,7 +21,7 @@
using namespace TDEIOext;
#define KIO_ARGS TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); stream
#define TDEIO_ARGS TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); stream
StoredTransferJob::StoredTransferJob(const KURL& url, int command,
const TQByteArray &packedArgs,
@ -79,7 +79,7 @@ void StoredTransferJob::slotDataReq( TDEIO::Job *, TQByteArray &data )
StoredTransferJob *TDEIOext::storedGet( const KURL& url, bool reload, bool showProgressInfo )
{
// Send decoded path and encoded query
KIO_ARGS << url;
TDEIO_ARGS << url;
StoredTransferJob * job = new StoredTransferJob( url, TDEIO::CMD_GET, packedArgs, TQByteArray(), showProgressInfo );
if (reload)
job->addMetaData("cache", "reload");
@ -89,7 +89,7 @@ StoredTransferJob *TDEIOext::storedGet( const KURL& url, bool reload, bool showP
StoredTransferJob *TDEIOext::put( const TQByteArray& arr, const KURL& url, int permissions,
bool overwrite, bool resume, bool showProgressInfo )
{
KIO_ARGS << url << TQ_INT8( overwrite ? 1 : 0 ) << TQ_INT8( resume ? 1 : 0 ) << permissions;
TDEIO_ARGS << url << TQ_INT8( overwrite ? 1 : 0 ) << TQ_INT8( resume ? 1 : 0 ) << permissions;
StoredTransferJob * job = new StoredTransferJob( url, TDEIO::CMD_PUT, packedArgs, TQByteArray(), showProgressInfo );
job->setData( arr );
return job;

2
certmanager/storedtransferjob.h

@ -22,7 +22,7 @@
#include <tdeio/job.h>
// To be moved to KIO?
// To be moved to TDEIO?
namespace TDEIOext {
/**

2
cvs.sh.diff

@ -7,7 +7,7 @@ Index: admin/cvs.sh
done
for i in `ls -1 po/*.pot 2>/dev/null | sed -e "s#po/##"`; do
- sed -e 's,^"Content-Type: text/plain; charset=CHARSET\\n"$,"Content-Type: text/plain; charset=UTF-8\\n",' po/$i > po/$i.new && mv po/$i.new po/$i
+ sed -e 's,^"Content-Type: text/plain; charset=CHARSET\\n"$,"Content-Type: text/plain; charset=UTF-8\\n",; s,"Content-Transfer-Encoding: ENCODING\\n","Content-Transfer-Encoding: 8bit\\n", ; s,"Language-Team: LANGUAGE <LL@li.org>\\n","Language-Team: LANGUAGE <tde-i18n-doc@kde.org>\\n",' po/$i > po/$i.new && mv po/$i.new po/$i
+ sed -e 's,^"Content-Type: text/plain; charset=CHARSET\\n"$,"Content-Type: text/plain; charset=UTF-8\\n",; s,"Content-Transfer-Encoding: ENCODING\\n","Content-Transfer-Encoding: 8bit\\n", ; s,"Language-Team: LANGUAGE <LL@li.org>\\n","Language-Team: LANGUAGE <kde-i18n-doc@kde.org>\\n",' po/$i > po/$i.new && mv po/$i.new po/$i
#msgmerge -q -o po/$i po/$i po/$i
egrep -v '^#[^,]' po/$i | egrep '^.*[^ ]+.*$' | grep -v "\"POT-Creation" > temp.pot
if test -f po.backup/$i && ! cmp -s temp.pot po.backup/$i; then

4
doc/kaddressbook/index.docbook

@ -69,7 +69,7 @@
<para>
&kaddressbook; is the main address book application for &kde;; it
enables you to manage your contacts efficiently and comfortably.
Since it is based on the kabc library it supports resources,
Since it is based on the tdeabc library it supports resources,
which can be used to load and save your contacts to many different locations &mdash;
not just the local file system, but also to LDAP servers and SQL databases.
</para>
@ -79,7 +79,7 @@ The user interface is similar to MS Outlook and it supports different views
for to represent the contact data differently;
it also provides an incremental search over all fields and a jump button
bar to quickly access single entries.
Since the underlying kabc library uses the vCard format (specified in RFC
Since the underlying tdeabc library uses the vCard format (specified in RFC
2426) as its default storage medium, &kaddressbook; mainly reflects the supported
entry fields in its graphical user interface.
</para>

5
kabc/Makefile.am

@ -1,5 +0,0 @@
if compile_newdistrlists
KABCDISTLISTUPDATER=kabcdistlistupdater
endif
SUBDIRS = kabc2mutt $(KABCDISTLISTUPDATER)

1
kabc/README

@ -1 +0,0 @@
This directory contains test code for kabc.

10
kabc/frontend/Makefile.am

@ -1,10 +0,0 @@
INCLUDES = -I$(includedir)/tdeabc $(all_includes)
METASOURCES = AUTO
bin_PROGRAMS = kabcfrontend
kabcfrontend_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kabcfrontend_LDADD = -ltdeabc $(LIB_TDECORE)
kabcfrontend_SOURCES = main.cpp mainWindow.ui

13
kabc/kabc2mutt/Makefile.am

@ -1,13 +0,0 @@
INCLUDES = -I$(includedir)/tdeabc $(all_includes)
METASOURCES = AUTO
bin_PROGRAMS = kabc2mutt
kabc2mutt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kabc2mutt_LDADD = -ltdeabc $(LIB_TDECORE)
kabc2mutt_SOURCES = kabc2mutt.cpp main.cpp
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/tdeabc2mutt.pot

12
kabc/kabcdistlistupdater/Makefile.am

@ -1,12 +0,0 @@
INCLUDES = -I$(includedir)/tdeabc -I$(top_srcdir) $(all_includes)
METASOURCES = AUTO
bin_PROGRAMS = kabcdistlistupdater
kabcdistlistupdater_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kabcdistlistupdater_LDADD = $(LIB_TDEABC) $(top_builddir)/libtdepim/libtdepim.la
kabcdistlistupdater_SOURCES = kabcdistlistupdater.cpp
autostart_DATA = kabcdistlistupdater.desktop
autostartdir = $(datadir)/autostart

4
kaddressbook/Makefile.am

@ -17,14 +17,14 @@ INCLUDES= -I$(top_srcdir)/kaddressbook/interfaces \
bin_PROGRAMS = kaddressbook
kaddressbook_SOURCES = main.cpp kaddressbookmain.cpp
kaddressbook_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kaddressbook_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kaddressbook_LDADD = libkaddressbook.la
kde_module_LTLIBRARIES = libkaddressbookpart.la
libkaddressbookpart_la_SOURCES = kaddressbook_part.cpp
libkaddressbookpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
libkaddressbookpart_la_LIBADD = libkaddressbook.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) -lDCOP
libkaddressbookpart_la_LIBADD = libkaddressbook.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) -lDCOP
lib_LTLIBRARIES = libkaddressbook.la
libkaddressbook_la_SOURCES = addresseeconfig.cpp addresseeeditordialog.cpp \

6
kaddressbook/kabcore.cpp

@ -272,10 +272,10 @@ TQStringList KABCore::selectedUIDs() const
TDEABC::Resource *KABCore::requestResource( TQWidget *parent )
{
TQPtrList<TDEABC::Resource> kabcResources = addressBook()->resources();
TQPtrList<TDEABC::Resource> tdeabcResources = addressBook()->resources();
TQPtrList<KRES::Resource> kresResources;
TQPtrListIterator<TDEABC::Resource> resIt( kabcResources );
TQPtrListIterator<TDEABC::Resource> resIt( tdeabcResources );
TDEABC::Resource *resource;
while ( ( resource = resIt.current() ) != 0 ) {
++resIt;
@ -320,7 +320,7 @@ TDEAboutData *KABCore::createAboutData()
about->addAuthor( "Tobias Koenig", I18N_NOOP( "Previous maintainer" ), "tokoe@kde.org" );
about->addAuthor( "Don Sanders", I18N_NOOP( "Original author" ) );
about->addAuthor( "Cornelius Schumacher",
I18N_NOOP( "Co-maintainer, libkabc port, CSV import/export" ),
I18N_NOOP( "Co-maintainer, libtdeabc port, CSV import/export" ),
"schumacher@kde.org" );
about->addAuthor( "Mike Pilone", I18N_NOOP( "GUI and framework redesign" ),
"mpilone@slac.com" );

4
kaddressbook/kcmconfigs/Makefile.am

@ -10,7 +10,7 @@ kcm_kabconfig_la_SOURCES = kcmkabconfig.cpp kabconfigwidget.cpp \
extensionconfigdialog.cpp addresseewidget.cpp
kcm_kabconfig_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
-avoid-version -no-undefined
kcm_kabconfig_la_LIBADD = $(LIB_KIO) \
kcm_kabconfig_la_LIBADD = $(LIB_TDEIO) \
$(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \
$(top_builddir)/libtdepim/libtdepim.la \
$(top_builddir)/kaddressbook/common/libkabcommon.la
@ -20,7 +20,7 @@ kcm_kabldapconfig_la_SOURCES = addhostdialog.cpp kcmkabldapconfig.cpp \
ldapoptionswidget.cpp
kcm_kabldapconfig_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
-avoid-version -no-undefined
kcm_kabldapconfig_la_LIBADD = $(LIB_KIO) $(LIB_TDEABC) $(top_builddir)/libtdepim/libtdepim.la
kcm_kabldapconfig_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEABC) $(top_builddir)/libtdepim/libtdepim.la
kcm_kabcustomfields_la_SOURCES = kcmkabcustomfields.cpp
kcm_kabcustomfields_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \

4
kaddressbook/kcmconfigs/addresseewidget.cpp

@ -169,7 +169,7 @@ AddresseeWidget::~AddresseeWidget()
void AddresseeWidget::restoreSettings()
{
TDEConfig config( "kabcrc" );
TDEConfig config( "tdeabcrc" );
config.setGroup( "General" );
mPrefix->setNameParts( config.readListEntry( "Prefixes" ) );
@ -183,7 +183,7 @@ void AddresseeWidget::restoreSettings()
void AddresseeWidget::saveSettings()
{
TDEConfig config( "kabcrc" );
TDEConfig config( "tdeabcrc" );
config.setGroup( "General" );
config.writeEntry( "Prefixes", mPrefix->nameParts() );

4
kaddressbook/kcmconfigs/kabconfigwidget.cpp

@ -174,7 +174,7 @@ void KABConfigWidget::restoreSettings()
mLocationMapURL->setCurrentText( KABPrefs::instance()->locationMapURL().arg( TDEGlobal::locale()->country() ) );
mLocationMapURL->lineEdit()->setCursorPosition( 0 );
TDEConfig config( "kabcrc", false, false );
TDEConfig config( "tdeabcrc", false, false );
config.setGroup( "General" );
mTradeAsFamilyName->setChecked( config.readBoolEntry( "TradeAsFamilyName", true ) );
mLimitContactDisplay->setChecked( config.readBoolEntry( "LimitContactDisplay", true ) );
@ -197,7 +197,7 @@ void KABConfigWidget::saveSettings()
KABPrefs::instance()->writeConfig();
TDEConfig config( "kabcrc", false, false );
TDEConfig config( "tdeabcrc", false, false );
config.setGroup( "General" );
config.writeEntry( "TradeAsFamilyName", mTradeAsFamilyName->isChecked() );
config.writeEntry( "LimitContactDisplay", mLimitContactDisplay->isChecked() );

2
kaddressbook/nameeditdialog.cpp

@ -124,7 +124,7 @@ NameEditDialog::NameEditDialog( const TDEABC::Addressee &addr, int type,
mFormattedNameEdit->setText( addr.formattedName() );
// Prefix and suffix combos
TDEConfig config( "kabcrc" );
TDEConfig config( "tdeabcrc" );
config.setGroup( "General" );
TQStringList sTitle;

6
kaddressbook/views/Makefile.am

@ -12,17 +12,17 @@ libkaddrbk_cardview_la_SOURCES = cardview.cpp colorlistbox.cpp \
configurecardviewdialog.cpp \
kaddressbookcardview.cpp
libkaddrbk_cardview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
libkaddrbk_cardview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_TDEABC)
libkaddrbk_cardview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEABC)
libkaddrbk_iconview_la_SOURCES = kaddressbookiconview.cpp
libkaddrbk_iconview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
libkaddrbk_iconview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_TDEABC)
libkaddrbk_iconview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEABC)
libkaddrbk_tableview_la_SOURCES = configuretableviewdialog.cpp \
contactlistview.cpp \
kaddressbooktableview.cpp
libkaddrbk_tableview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
libkaddrbk_tableview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_TDEABC) $(LIB_KIO) $(LIB_KIMPROXY)
libkaddrbk_tableview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEABC) $(LIB_TDEIO) $(LIB_TDEIMPROXY)
noinst_HEADERS = cardview.h colorlistbox.h configurecardviewdialog.h \
configuretableviewdialog.h contactlistview.h \

18
kaddressbook/xxport/Makefile.am

@ -21,33 +21,33 @@ XXLIBS = $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \
$(top_builddir)/libtdepim/libtdepim.la
libkaddrbk_csv_xxport_la_SOURCES = csv_xxport.cpp csvimportdialog.cpp dateparser.cpp
libkaddrbk_csv_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
libkaddrbk_csv_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
libkaddrbk_vcard_xxport_la_SOURCES = vcard_xxport.cpp
libkaddrbk_vcard_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO) \
libkaddrbk_vcard_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO) \
$(top_builddir)/kaddressbook/libkaddressbook.la \
$(top_builddir)/libtdenetwork/qgpgme/libqgpgme.la
libkaddrbk_kde2_xxport_la_SOURCES = kde2_xxport.cpp
libkaddrbk_kde2_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
libkaddrbk_kde2_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
libkaddrbk_bookmark_xxport_la_SOURCES = bookmark_xxport.cpp
libkaddrbk_bookmark_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
libkaddrbk_bookmark_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
libkaddrbk_eudora_xxport_la_SOURCES = eudora_xxport.cpp
libkaddrbk_eudora_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
libkaddrbk_eudora_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
libkaddrbk_ldif_xxport_la_SOURCES = ldif_xxport.cpp
libkaddrbk_ldif_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
libkaddrbk_ldif_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
libkaddrbk_gnokii_xxport_la_SOURCES = gnokii_xxport.cpp
libkaddrbk_gnokii_xxport_la_LIBADD = $(XPMLIB) $(LIB_GNOKII) $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
libkaddrbk_gnokii_xxport_la_LIBADD = $(XPMLIB) $(LIB_GNOKII) $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
libkaddrbk_opera_xxport_la_SOURCES = opera_xxport.cpp
libkaddrbk_opera_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
libkaddrbk_opera_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
libkaddrbk_pab_xxport_la_SOURCES = pab_xxport.cpp pab_mapihd.cpp pab_pablib.cpp
libkaddrbk_pab_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
libkaddrbk_pab_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
noinst_HEADERS = csvimportdialog.h

2
kaddressbook/xxport/bookmark_xxport.cpp

@ -64,7 +64,7 @@ bool BookmarkXXPort::exportContacts( const TDEABC::AddresseeList &list, const TQ
menu.location = fileName;
menu.type = "xbel";
menu.show = true;
KBookmarkMenu::setDynamicBookmarks( "kabc", menu );
KBookmarkMenu::setDynamicBookmarks( "tdeabc", menu );
return true;
}

4
kalarm/kalarmd/Makefile.am

@ -2,13 +2,13 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kalarm $(all_includes)
noinst_LTLIBRARIES = libkalarmd.la
libkalarmd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
libkalarmd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
libkalarmd_la_LIBADD = $(LIB_TDECORE) $(top_builddir)/libkcal/libkcal.la
libkalarmd_la_SOURCES = alarmdaemoniface.stub alarmguiiface.stub
bin_PROGRAMS = kalarmd
kalarmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kalarmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kalarmd_LDADD = $(LIB_TDEUI) $(top_builddir)/libkcal/libkcal.la libkalarmd.la
kalarmd_SOURCES = alarmdaemon.cpp admain.cpp adapp.cpp \
adcalendar.cpp adconfigdata.cpp clientinfo.cpp \

4
kandy/src/Makefile.am

@ -2,7 +2,7 @@ bin_PROGRAMS = kandy kandy_client
INCLUDES = -I$(top_srcdir) $(all_includes)
kandy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kandy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kandy_LDADD = $(KANDY_LIBLOCKDEV) $(LIB_TDEFILE) -ltdeabc $(top_builddir)/libtdepim/libtdepim.la
kandy_SOURCES = main.cpp kandy.cpp \
cmdpropertiesdialog_base.ui cmdpropertiesdialog.cpp \
@ -19,7 +19,7 @@ KDE_ICON = kandy
noinst_HEADERS = kandy.h kandyview.h modem.h atcommand.h \
commanditem.h mobilegui.h commandscheduler.h
kandy_client_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kandy_client_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kandy_client_LDADD = $(LIB_TDECORE)
kandy_client_SOURCES = kandy_client.cpp

4
karm/Makefile.am

@ -23,7 +23,7 @@ libkarm_shared_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
$(top_builddir)/libtdepim/libtdepim.la $(LIBXSS) -ltdeprint
karm_SOURCES = main.cpp
karm_LDADD = libkarm_shared.la
karm_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
karm_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
noinst_HEADERS = desktoptracker.h edittaskdialog.h printdialog.h \
idletimedetector.h tdeaccelmenuwatch.h timekard.h \
karmutility.h ktimewidget.h karmstorage.h mainwindow.h \
@ -56,7 +56,7 @@ kde_module_LTLIBRARIES = libkarmpart.la
# the Part's source, library search path, and link libraries
libkarmpart_la_SOURCES = karm_part.cpp
libkarmpart_la_LDFLAGS = -module -avoid-version -no-undefined $(KDE_PLUGIN) $(all_libraries)
libkarmpart_la_LIBADD = libkarm_shared.la $(LIB_KPARTS)
libkarmpart_la_LIBADD = libkarm_shared.la $(LIB_TDEPARTS)
# this is where the desktop file will go
partdesktopdir = $(kde_servicesdir)

4
karm/tdeaccelmenuwatch.h

@ -2,8 +2,8 @@
* tdeaccelmenuwatch.h -- Declaration of class TDEAccelMenuWatch.
* Generated by newclass on Thu Jan 7 15:05:26 EST 1999.
*/
#ifndef KARM_K_ACCEL_MENU_WATCH_H
#define KARM_K_ACCEL_MENU_WATCH_H
#ifndef KARM_TDE_ACCEL_MENU_WATCH_H
#define KARM_TDE_ACCEL_MENU_WATCH_H
#include <tqobject.h>
#include <tqptrlist.h>

4
karm/test/Makefile.am

@ -3,11 +3,11 @@ METASOURCES = AUTO
check_PROGRAMS = runscripts locking
runscripts_SOURCES = script.cpp runscripts.cpp
runscripts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
runscripts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
runscripts_LDADD = $(LIB_QT) $(LIB_TDECORE)
locking_SOURCES = locking.cpp lockerthread.cpp
locking_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
locking_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
locking_LDADD = $(LIB_QT) $(top_builddir)/libkcal/libkcal.la
KDE_CXXFLAGS = $(USE_EXCEPTIONS)

6
kitchensync/src/Makefile.am

@ -10,7 +10,7 @@ INCLUDES = -I$(top_srcdir)/kitchensync/src \
bin_PROGRAMS = kitchensync
kitchensync_SOURCES = main.cpp mainwindow.cpp
kitchensync_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kitchensync_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kitchensync_LDADD = libkitchensync.la
xdg_apps_DATA = kitchensync.desktop
@ -32,7 +32,7 @@ libkitchensync_la_SOURCES = aboutpage.cpp mainwidget.cpp groupconfigdialog.cpp \
configguijescs.cpp configguievo2.cpp configguimoto.cpp configguisynce.cpp \
configguisunbird.cpp
libkitchensync_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
libkitchensync_la_LIBADD = $(LIB_KIO) $(LIB_TDEHTML) $(top_builddir)/kitchensync/libqopensync/libqopensync.la \
libkitchensync_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEHTML) $(top_builddir)/kitchensync/libqopensync/libqopensync.la \
$(LIB_TDEABC) $(top_builddir)/libtdepim/libtdepim.la $(top_builddir)/libkcal/libkcal.la \
$(LIB_QT)
@ -41,7 +41,7 @@ kde_module_LTLIBRARIES = libkitchensyncpart.la
libkitchensyncpart_la_SOURCES = part.cpp
libkitchensyncpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
libkitchensyncpart_la_LIBADD = $(LIB_KPARTS) libkitchensync.la $(LIB_QT) $(LIB_KIO) $(LIB_TDEHTML) $(LIB_TDEABC) $(LIB_TDECORE) $(LIB_TDEUI)
libkitchensyncpart_la_LIBADD = $(LIB_TDEPARTS) libkitchensync.la $(LIB_QT) $(LIB_TDEIO) $(LIB_TDEHTML) $(LIB_TDEABC) $(LIB_TDECORE) $(LIB_TDEUI)
# Resources
kitchensyncdatadir = $(kde_datadir)/kitchensync

4
kitchensync/src/memberinfo.cpp

@ -52,7 +52,7 @@ TQString MemberInfo::name() const
nameMap.insert( "file-sync", i18n( "File" ) );
nameMap.insert( "palm-sync", i18n( "Palm" ) );
nameMap.insert( "tdepim-sync", i18n( "TDE PIM" ) );
nameMap.insert( "kio-sync", i18n( "Remote File" ) );
nameMap.insert( "tdeio-sync", i18n( "Remote File" ) );
nameMap.insert( "irmc-sync", i18n( "Mobile Phone" ) );
nameMap.insert( "evo2-sync", i18n( "Evolution" ) );
nameMap.insert( "opie-sync", i18n( "Handheld" ) );
@ -79,7 +79,7 @@ TQString MemberInfo::pluginIconName( const TQString &pluginName )
if ( pluginName == "file-sync" ) return "folder";
if ( pluginName == "palm-sync" ) return "pda_black";
if ( pluginName == "tdepim-sync" ) return "kontact";
if ( pluginName == "kio-sync" ) return "network";
if ( pluginName == "tdeio-sync" ) return "network";
if ( pluginName == "irmc-sync" ) return "mobile_phone";
if ( pluginName == "evo2-sync" ) return "evolution";
if ( pluginName == "opie-sync" ) return "pda_blue";

2
kmail/CMakeLists.txt

@ -141,7 +141,7 @@ set( ${target}_SRCS
kmcomposewin.cpp kmfolder.cpp kmmsgpartdlg.cpp kmreaderwin.cpp htmlstatusbar.cpp
kmgroupware.cpp folderstorage.cpp listjob.cpp csshelper.cpp tdelistboxdialog.cpp
kmmsginfo.cpp actionscheduler.cpp messageproperty.cpp accountmanager.cpp kmacctfolder.cpp
tdemdict.cpp kmsystemtray.cpp kmacctlocal.cpp kmfolderdir.cpp kmfoldermgr.cpp
kmdict.cpp kmsystemtray.cpp kmacctlocal.cpp kmfolderdir.cpp kmfoldermgr.cpp
kmfoldernode.cpp kmsender.cpp kmacctseldlg.cpp kmfiltermgr.cpp kmfilterdlg.cpp
filterimporterexporter.cpp kmsearchpatternedit.cpp encodingdetector.cpp encodingdetector_ja.cpp
kmfilteraction.cpp kmsearchpattern.cpp kmfolderimap.cpp kmfolderseldlg.cpp kmfilter.cpp

8
kmail/Makefile.am

@ -32,7 +32,7 @@ libkmailprivate_la_LIBADD = \
../libksieve/libksieve.la ../libemailfunctions/libemailfunctions.la \
../certmanager/lib/libkleopatra.la $(INDEXLIB) \
../libkcal/libkcal.la \
$(LIB_TDEHTML) $(LIB_KSPELL) $(LIB_TDEABC)
$(LIB_TDEHTML) $(LIB_TDESPELL) $(LIB_TDEABC)
kde_module_LTLIBRARIES = kcm_kmail.la libkmailpart.la libkmail_bodypartformatter_application_octetstream.la
libkmailpart_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined
@ -65,7 +65,7 @@ libkmailprivate_la_SOURCES = kmmessage.cpp kmmainwin.cpp configuredialog.cpp \
csshelper.cpp tdelistboxdialog.cpp \
actionscheduler.cpp messageproperty.cpp \
kmmsgpart.cpp kmmsginfo.cpp \
accountmanager.cpp kmacctfolder.cpp tdemdict.cpp \
accountmanager.cpp kmacctfolder.cpp kmdict.cpp \
kmsystemtray.cpp kmacctlocal.cpp kmfolderdir.cpp \
kmfoldermgr.cpp kmfoldernode.cpp kmsender.cpp \
kmacctseldlg.cpp kmfiltermgr.cpp kmsearchpatternedit.cpp \
@ -176,11 +176,11 @@ check_PROGRAMS = dcoptest recipienteditortest
METASOURCES = AUTO
dcoptest_SOURCES = dcoptest.cpp kmailIface.skel kmailIface.stub mailcomposerIface.skel mailcomposerIface.stub
dcoptest_LDADD = $(LIB_KIO)
dcoptest_LDADD = $(LIB_TDEIO)
dcoptest_LDFLAGS = $(all_libraries)
recipienteditortest_SOURCES = recipientseditortest.cpp
recipienteditortest_LDADD = libkmailprivate.la ../libtdepim/libtdepim.la $(LIB_KIO) $(LIB_TDEABC)
recipienteditortest_LDADD = libkmailprivate.la ../libtdepim/libtdepim.la $(LIB_TDEIO) $(LIB_TDEABC)
recipienteditortest_LDFLAGS = $(all_libraries)
kmailIface_DCOPIDLNG = true

2
kmail/folderdiaacltab.h

@ -99,7 +99,7 @@ public:
static bool supports( KMFolder* refFolder );
private slots:
// Network (KIO) slots
// Network (TDEIO) slots
void slotConnectionResult( int, const TQString& );
void slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& );
void slotMultiSetACLResult(TDEIO::Job *);

2
kmail/folderdiaquotatab.h

@ -68,7 +68,7 @@ private:
void initializeWithValuesFromFolder( KMFolder* folder );
void showQuotaWidget();
private slots:
// Network (KIO) slots
// Network (TDEIO) slots
void slotConnectionResult( int, const TQString& );
void slotReceivedQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& );

30
kmail/headerstyle.cpp

@ -276,14 +276,14 @@ namespace KMail {
#if 0
// Get Instant Messaging presence
TQString presence;
TQString kabcUid;
TQString tdeabcUid;
if ( strategy->showHeader( "status" ) )
{
TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self( true );
TDEABC::AddresseeList addresses = addressBook->findByEmail( KPIM::getFirstEmailAddress( message->from() ) );
::KIMProxy *imProxy = KMKernel::self()->imProxy();
kabcUid = addresses[0].uid();
presence = imProxy->presenceString( kabcUid );
tdeabcUid = addresses[0].uid();
presence = imProxy->presenceString( tdeabcUid );
}
#endif
@ -298,7 +298,7 @@ namespace KMail {
"\">" + i18n("[vCard]") + "</a>" );
#if 0
if ( !presence.isEmpty() && strategy->showHeader( "status" ) )
headerStr.append("&nbsp;&nbsp;(<span name=\"presence-" + kabcUid + "\">" + presence + "</span>)" );
headerStr.append("&nbsp;&nbsp;(<span name=\"presence-" + tdeabcUid + "\">" + presence + "</span>)" );
#endif
if ( strategy->showHeader( "organization" )
@ -473,10 +473,10 @@ namespace KMail {
TQString userHTML;
TQString presence;
// IM presence and kabc photo
// IM presence and tdeabc photo
::KIMProxy *imProxy = KMKernel::self()->imProxy();
TQString kabcUid;
TQString tdeabcUid;
TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self( true );
TDEABC::AddresseeList addresses = addressBook->findByEmail( KPIM::getFirstEmailAddress( message->from() ) );
@ -485,16 +485,16 @@ namespace KMail {
int photoHeight = 60;
if( addresses.count() == 1 )
{
// kabcUid is embedded in im: URIs to indicate which IM contact to message
kabcUid = addresses[0].uid();
// tdeabcUid is embedded in im: URIs to indicate which IM contact to message
tdeabcUid = addresses[0].uid();
if ( imProxy->initialize() ) {
// im status
presence = imProxy->presenceString( kabcUid );
presence = imProxy->presenceString( tdeabcUid );
if ( !presence.isEmpty() )
{
TQString presenceIcon = TQString::fromLatin1( " <img src=\"%1\"/>" )
.arg( imgToDataUrl( imProxy->presenceIcon( kabcUid ).convertToImage() ) );
.arg( imgToDataUrl( imProxy->presenceIcon( tdeabcUid ).convertToImage() ) );
presence += presenceIcon;
}
}
@ -592,9 +592,9 @@ namespace KMail {
userHTML = TQString( "<div class=\"senderpic\">"
"<a href=\"im:%1\">%2<div class=\"senderstatus\">"
"<span name=\"presence-%3\">%4</span></div></a>"
"</div>" ).arg( kabcUid )
"</div>" ).arg( tdeabcUid )
.arg( userHTML )
.arg( kabcUid )
.arg( tdeabcUid )
.arg( presence );
}
} else {
@ -602,8 +602,8 @@ namespace KMail {
if ( !presence.isEmpty() )
userHTML = TQString( "<a href=\"im:%1\"><div class=\"senderstatus\">"
"<span name=\"presence-%2\">%3</span></div></a>" )
.arg( kabcUid )
.arg( kabcUid )
.arg( tdeabcUid )
.arg( tdeabcUid )
.arg( presence );
}
#if 0
@ -766,7 +766,7 @@ namespace KMail {
: TQString("") )
#if 0
+ ( ( !presence.isEmpty() )
? "&nbsp;&nbsp;(<span name=\"presence-" + kabcUid + "\">" + presence + "</span>)"
? "&nbsp;&nbsp;(<span name=\"presence-" + tdeabcUid + "\">" + presence + "</span>)"
: TQString("") )
#endif
+ ( message->headerField("Organization").isEmpty()

2
kmail/imapaccountbase.cpp

@ -373,7 +373,7 @@ namespace KMail {
else
stream << (int) 'U' << url;
// create the KIO-job
// create the TDEIO-job
if ( makeConnection() != Connected )
return;// ## doesn't handle Connecting
TDEIO::SimpleJob *job = TDEIO::special(url, packedArgs, false);

10
kmail/imapaccountbase.h

@ -240,7 +240,7 @@ namespace KMail {
void setImapSeenStatus( KMFolder* folder, const TQString& path, bool seen );
/**
* The KIO-Slave died
* The TDEIO-Slave died
*/
void slaveDied() { mSlave = 0; killAllJobs(); }
@ -430,9 +430,9 @@ namespace KMail {
protected slots:
virtual void slotCheckQueuedFolders();
/// Handle a message coming from the KIO scheduler saying that the slave is now connected
/// Handle a message coming from the TDEIO scheduler saying that the slave is now connected
void slotSchedulerSlaveConnected(TDEIO::Slave *aSlave);
/// Handle an error coming from the KIO scheduler
/// Handle an error coming from the TDEIO scheduler
void slotSchedulerSlaveError(TDEIO::Slave *aSlave, int, const TQString &errorMsg);
/**
@ -484,14 +484,14 @@ namespace KMail {
protected:
/**
* Handle an error coming from a KIO job or from a KIO slave (via the scheduler)
* Handle an error coming from a TDEIO job or from a TDEIO slave (via the scheduler)
* and abort everything (in all cases) if abortSync is true [this is for slotSchedulerSlaveError].
* Otherwise (abortSync==false), dimap will only abort in case of severe errors (connection broken),
* but on "normal" errors (no permission to delete, etc.) it will ask the user.
*
* @param error the error code, usually job->error())
* @param errorMsg the error message, usually job->errorText()
* @param job the kio job (can be 0). If set, removeJob will be called automatically.
* @param job the tdeio job (can be 0). If set, removeJob will be called automatically.
* This is important! It means you should not call removeJob yourself in case of errors.
* We can't let the caller do that, since it should only be done afterwards, and only if we didn't abort.
*

2
kmail/imapjob.cpp

@ -259,7 +259,7 @@ ImapJob::~ImapJob()
mit.current()->setTransferInProgress( false );
}
}
account->removeJob( mJob ); // remove the associated kio job
account->removeJob( mJob ); // remove the associated tdeio job
}
account->mJobList.remove( this ); // remove the folderjob
}

2
kmail/keyresolver.cpp

@ -586,7 +586,7 @@ struct Kleo::KeyResolver::Private {
std::map<CryptoMessageFormat,FormatInfo> mFormatInfoMap;
// key=email address, value=crypto preferences for this contact (from kabc)
// key=email address, value=crypto preferences for this contact (from tdeabc)
typedef std::map<TQString, ContactPreferences> ContactPreferencesMap;
ContactPreferencesMap mContactPreferencesMap;
};

2
kmail/kmacctimap.cpp

@ -232,7 +232,7 @@ void KMAcctImap::ignoreJobsForFolder( KMFolder* folder )
//-----------------------------------------------------------------------------
void KMAcctImap::removeSlaveJobsForFolder( KMFolder* folder )
{
// Make sure the folder is not referenced in any kio slave jobs
// Make sure the folder is not referenced in any tdeio slave jobs
TQMap<TDEIO::Job*, jobData>::Iterator it = mapJobData.begin();
while ( it != mapJobData.end() ) {
TQMap<TDEIO::Job*, jobData>::Iterator i = it;

2
kmail/kmacctimap.h

@ -106,7 +106,7 @@ protected:
friend class ::AccountManager;
KMAcctImap(AccountManager* owner, const TQString& accountName, uint id);
/**
* Handle an error coming from a KIO job
* Handle an error coming from a TDEIO job
* See ImapAccountBase::handleJobError for details.
*/
virtual bool handleError( int error, const TQString &errorMsg, TDEIO::Job* job, const TQString& context, bool abortSync = false );

2
kmail/kmail_part.cpp

@ -154,7 +154,7 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName,
KMailPart::~KMailPart()
{
kdDebug(5006) << "Closing last KMMainWin: stopping mail check" << endl;
// Running KIO jobs prevent kapp from exiting, so we need to kill them
// Running TDEIO jobs prevent kapp from exiting, so we need to kill them
// if they are only about checking mail (not important stuff like moving messages)
kmkernel->abortMailCheck();
kmkernel->acctMgr()->cancelMailCheck();

4
kmail/kmcommands.cpp

@ -75,7 +75,7 @@
#include <tdetempfile.h>
#include <tdeimproxy.h>
#include <kuserprofile.h>
// KIO headers
// TDEIO headers
#include <tdeio/job.h>
#include <tdeio/netaccess.h>
@ -932,7 +932,7 @@ void KMSaveMsgCommand::slotMessageRetrievedForSaving(KMMessage *msg)
mOffset = 0;
TQByteArray data;
int size;
// Unless it is great than 64 k send the whole message. kio buffers for us.
// Unless it is great than 64 k send the whole message. tdeio buffers for us.
if( mData.size() > (unsigned int) MAX_CHUNK_SIZE )
size = MAX_CHUNK_SIZE;
else

2
kmail/kmcomposewin.cpp

@ -2623,7 +2623,7 @@ void KMComposeWin::addrBookSelIntoOld()
dlg.setSelectedBCC( lst );
}
dlg.setRecentAddresses( RecentAddresses::self( KMKernel::config() )->kabcAddresses() );
dlg.setRecentAddresses( RecentAddresses::self( KMKernel::config() )->tdeabcAddresses() );
if (dlg.exec()==TQDialog::Rejected) return;

2
kmail/kmcomposewin.h

@ -486,7 +486,7 @@ private slots:
void slotIdentityChanged(uint);
/**
* KIO slots for attachment insertion
* TDEIO slots for attachment insertion
*/
void slotAttachFileData(TDEIO::Job *, const TQByteArray &);
void slotAttachFileResult(TDEIO::Job *);

2
kmail/tdemdict.cpp → kmail/kmdict.cpp

@ -5,7 +5,7 @@
#include <config.h>
#endif
#include "tdemdict.h"
#include "kmdict.h"
#include "kmglobal.h"
#include <kdebug.h>

0
kmail/tdemdict.h → kmail/kmdict.h

4
kmail/kmfolderdia.h

@ -60,7 +60,7 @@ namespace KMail {
* This is the base class for tabs in the folder dialog.
* It uses the API from ConfigModuleTab (basically: it's a widget that can load and save)
* but it also adds support for delayed-saving:
* when save() needs to use async jobs (e.g. KIO) for saving,
* when save() needs to use async jobs (e.g. TDEIO) for saving,
* we need to delay the closing until after the jobs are finished,
* and to cancel the saving on error.
*
@ -87,7 +87,7 @@ public:
/// Called when clicking OK.
/// If a module returns Delayed, the closing is cancelled for now,
/// and the module can close the dialog later on (i.e. after an async
/// operation like a KIO job).
/// operation like a TDEIO job).
virtual AccepStatus accept() {
return save() ? Accepted : Canceled;
}

2
kmail/kmmainwin.cpp

@ -103,7 +103,7 @@ KMMainWin::~KMMainWin()
if ( not_withdrawn == 0 ) {
kdDebug(5006) << "Closing last KMMainWin: stopping mail check" << endl;
// Running KIO jobs prevent kapp from exiting, so we need to kill them
// Running TDEIO jobs prevent kapp from exiting, so we need to kill them
// if they are only about checking mail (not important stuff like moving messages)
kmkernel->abortMailCheck();
kmkernel->acctMgr()->cancelMailCheck();

2
kmail/kmmsgdict.cpp

@ -4,7 +4,7 @@
#include "kmfolderindex.h"
#include "kmfolder.h"
#include "kmmsgdict.h"
#include "tdemdict.h"
#include "kmdict.h"
#include "globalsettings.h"
#include "folderstorage.h"

2
kmail/kmreaderwin.cpp

@ -1671,7 +1671,7 @@ kdDebug(5006) << "KMReaderWin - composing unencrypted message" << endl;
void KMReaderWin::updateHeader()
{
/*
* TODO: mess around with KHTML DOM some more and figure out how to
* TODO: mess around with TDEHTML DOM some more and figure out how to
* replace the entire header div w/out flickering to hell and back
*
* DOM::NodeList divs(mViewer->document().documentElement().getElementsByTagName("div"));

2
kmail/networkaccount.h

@ -107,7 +107,7 @@ namespace KMail {
/** @return an URL for this account */
virtual KURL getUrl() const;
/** @return the KIO slave for this account */
/** @return the TDEIO slave for this account */
TDEIO::Slave * slave() const { return mSlave; }
/** Kill all jobs that are currently in progress */

10
kmail/popaccount.h

@ -102,12 +102,12 @@ protected:
PopAccount(AccountManager* owner, const TQString& accountName, uint id);
/**
* Start a KIO Job to get a list of messages on the pop server
* Start a TDEIO Job to get a list of messages on the pop server
*/
void startJob();
/**
* Connect up the standard signals/slots for the KIO Jobs
* Connect up the standard signals/slots for the TDEIO Jobs
*/