Browse Source

Additional renaming of kde to tde

pull/21/head
Timothy Pearson 10 years ago
parent
commit
7dba3110aa
  1. 4
      CMakeLists.txt
  2. 2
      MAINTAINERS
  3. 2
      Mainpage.dox
  4. 6
      Makefile.am.in
  5. 4
      NewsLog.txt
  6. 2
      README
  7. 2
      akregator/src/pageviewer.cpp
  8. 4
      certmanager/CMakeLists.txt
  9. 2
      certmanager/Makefile.am
  10. 2
      certmanager/conf/Makefile.am
  11. 2
      certmanager/conf/appearanceconfigpage.cpp
  12. 2
      certmanager/conf/dirservconfigpage.cpp
  13. 2
      certmanager/conf/dnorderconfigpage.cpp
  14. 2
      certmanager/kwatchgnupg/Makefile.am
  15. 2
      certmanager/lib/CMakeLists.txt
  16. 4
      certmanager/lib/Makefile.am
  17. 2
      certmanager/lib/backends/chiasmus/CMakeLists.txt
  18. 2
      certmanager/lib/backends/chiasmus/Makefile.am
  19. 2
      certmanager/lib/backends/kpgp/Makefile.am
  20. 2
      certmanager/lib/backends/qgpgme/CMakeLists.txt
  21. 2
      certmanager/lib/backends/qgpgme/Makefile.am
  22. 2
      certmanager/lib/kleo/CMakeLists.txt
  23. 2
      certmanager/lib/kleo/Makefile.am
  24. 2
      certmanager/lib/tests/Makefile.am
  25. 2
      certmanager/lib/tests/test_cryptoconfig.cpp
  26. 2
      certmanager/lib/ui/CMakeLists.txt
  27. 2
      certmanager/lib/ui/Makefile.am
  28. 2
      certmanager/lib/ui/keyapprovaldialog.cpp
  29. 2
      certmanager/lib/ui/keyapprovaldialog.h
  30. 2
      certmanager/lib/ui/keyrequester.cpp
  31. 2
      certmanager/lib/ui/keyrequester.h
  32. 2
      certmanager/lib/ui/keyselectiondialog.cpp
  33. 2
      certmanager/lib/ui/keyselectiondialog.h
  34. 2
      certmanager/lib/ui/passphrasedialog.cpp
  35. 2
      certmanager/lib/ui/passphrasedialog.h
  36. 2
      configure.in.in
  37. 2
      cvs.sh.diff
  38. 8
      dependency-graph.dot
  39. 10
      doc/kalarm/index.docbook
  40. 8
      doc/kandy/index.docbook
  41. 2
      doc/karm/index.docbook
  42. 4
      doc/kmail/faq.docbook
  43. 2
      doc/knode/faq.docbook
  44. 2
      doc/knode/index.docbook
  45. 4
      doc/knode/install.docbook
  46. 2
      doc/knotes/index.docbook
  47. 4
      doc/konsolekalendar/index.docbook
  48. 2
      doc/korganizer/index.docbook
  49. 2
      kaddressbook/CMakeLists.txt
  50. 2
      kaddressbook/addresseditwidget.cpp
  51. 2
      kaddressbook/common/locationmap.cpp
  52. 2
      kaddressbook/editors/CMakeLists.txt
  53. 2
      kaddressbook/editors/Makefile.am
  54. 2
      kaddressbook/kabcore.cpp
  55. 2
      kaddressbook/kcmconfigs/kabconfigwidget.cpp
  56. 2
      kaddressbook/printing/printsortmode.h
  57. 2
      kaddressbook/searchmanager.cpp
  58. 2
      kaddressbook/viewmanager.cpp
  59. 2
      kaddressbook/views/configuretableviewdialog.cpp
  60. 2
      kaddressbook/xxport/CMakeLists.txt
  61. 4
      kaddressbook/xxport/Makefile.am
  62. 2
      kalarm/BUGS
  63. 2
      kalarm/CMakeLists.txt
  64. 2
      kalarm/Makefile.am
  65. 4
      kalarm/configure.in.bot
  66. 2
      kalarm/fontcolour.h
  67. 2
      kalarm/kalarm.h
  68. 2
      kalarm/kamail.cpp
  69. 2
      kalarm/lib/colourcombo.cpp
  70. 2
      kalarm/lib/spinbox.cpp
  71. 2
      kalarm/mainwindowbase.cpp
  72. 2
      kandy/Makefile.am
  73. 4
      karm/karm.kdevelop
  74. 2
      kioslaves/imap4/imaps.protocol
  75. 2
      kioslaves/mbox/mbox.cc
  76. 4
      kmail/CMakeLists.txt
  77. 2
      kmail/ChangeLog
  78. 2
      kmail/Mainpage.dox
  79. 2
      kmail/Makefile.am
  80. 2
      kmail/cachedimapjob.cpp
  81. 2
      kmail/configure.in.in
  82. 4
      kmail/configuredialog.cpp
  83. 2
      kmail/configuredialog_p.cpp
  84. 2
      kmail/editorwatcher.cpp
  85. 2
      kmail/filterlogdlg.cpp
  86. 2
      kmail/folderdiaacltab.cpp
  87. 2
      kmail/imapaccountbase.cpp
  88. 2
      kmail/keyresolver.cpp
  89. 2
      kmail/keyresolver.h
  90. 2
      kmail/kmaddrbook.h
  91. 2
      kmail/kmail_part.cpp
  92. 2
      kmail/kmail_part.h
  93. 2
      kmail/kmcomposewin.cpp
  94. 2
      kmail/kmcomposewin.h
  95. 2
      kmail/kmedit.h
  96. 2
      kmail/kmfilteraction.h
  97. 4
      kmail/kmkernel.cpp
  98. 2
      kmail/kmkernel.h
  99. 2
      kmail/kmmainwidget.cpp
  100. 2
      kmail/kmmainwin.h
  101. 2
      kmail/kmmsgpartdlg.cpp
  102. 2
      kmail/kmsender.cpp
  103. 2
      kmail/kmsender.h
  104. 2
      kmail/kmsender_p.h
  105. 2
      kmail/objecttreeparser.cpp
  106. 2
      kmail/snippetconfig.cpp
  107. 2
      kmail/snippetconfig.h
  108. 2
      kmail/snippetdlg.cpp
  109. 2
      kmail/snippetitem.cpp
  110. 2
      kmail/snippetitem.h
  111. 2
      kmail/snippetsettings.cpp
  112. 2
      kmail/snippetsettings.h
  113. 2
      kmail/snippetwidget.cpp
  114. 2
      kmail/snippetwidget.h
  115. 2
      kmobile/TODO
  116. 2
      knode/headerview.cpp
  117. 2
      knode/kncomposer.cpp
  118. 2
      knode/kncomposer.h
  119. 2
      knode/knhdrviewitem.cpp
  120. 2
      knode/knode_part.h
  121. 4
      knotes/ChangeLog
  122. 2
      knotes/knote.cpp
  123. 2
      kontact/CMakeLists.txt
  124. 6
      kontact/Thoughts
  125. 2
      kontact/plugins/kmail/CMakeLists.txt
  126. 2
      kontact/plugins/kmail/Makefile.am
  127. 2
      korganizer/CMakeLists.txt
  128. 2
      korganizer/actionmanager.cpp
  129. 2
      korganizer/korgac/alarmdockwindow.cpp
  130. 2
      korganizer/printing/calprinter.cpp
  131. 2
      korganizer/version.h
  132. 2
      kresources/groupwise/kioslave/groupwise.cpp
  133. 2
      kresources/scalix/kioslave/scalix.cpp
  134. 6
      kresources/tvanytime/tvanytime.kdevelop
  135. 4
      libemailfunctions/kasciistricmp.h
  136. 2
      libkcal/HACKING
  137. 2
      libkdenetwork/CMakeLists.txt
  138. 2
      libkdenetwork/gpgmepp/CMakeLists.txt
  139. 2
      libkdenetwork/gpgmepp/Makefile.am
  140. 2
      libkdenetwork/gpgmepp/configure.in.bot
  141. 4
      libkdenetwork/gpgmepp/configure.in.in
  142. 2
      libkdenetwork/qgpgme/CMakeLists.txt
  143. 2
      libkdenetwork/qgpgme/Makefile.am
  144. 2
      libkdenetwork/qgpgme/tests/Makefile.am
  145. 2
      libkholidays/holidays/holiday_it
  146. 2
      libkmime/kmime_util.cpp
  147. 2
      libkmime/tests/test_kmime_codec.cpp
  148. 2
      libkpimexchange/configure.in.in
  149. 2
      libkpimidentities/CMakeLists.txt
  150. 2
      libkpimidentities/identitymanager.cpp
  151. 2
      libtdepim/README
  152. 2
      libtdepim/completionordereditor.cpp
  153. 2
      libtdepim/distributionlist.h
  154. 2
      libtdepim/kaddrbook.cpp
  155. 2
      libtdepim/kaddrbook.h
  156. 2
      libtdepim/kpartsdesignerplugin/README
  157. 2
      libtdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp
  158. 2
      libtdepim/kpimurlrequesterdlg.cpp
  159. 2
      libtdepim/kpixmapregionselectorwidget.cpp
  160. 2
      libtdepim/kpixmapregionselectorwidget.h
  161. 2
      libtdepim/kregexp3.cpp
  162. 2
      libtdepim/kregexp3.h
  163. 2
      libtdepim/krsqueezedtextlabel.cpp
  164. 2
      libtdepim/krsqueezedtextlabel.h
  165. 2
      libtdepim/kwidgetlister.cpp
  166. 2
      libtdepim/kwidgetlister.h
  167. 2
      libtdepim/resourceabc.h
  168. 2
      libtdepim/tdepimmacros.h
  169. 2
      plugins/kmail/bodypartformatter/CMakeLists.txt
  170. 2
      wizards/CMakeLists.txt

4
CMakeLists.txt

@ -90,7 +90,7 @@ option( BUILD_KTNEF "Build ktnef" ${BUILD_ALL} )
option( BUILD_LIBKCAL "Build libkcal" ${BUILD_ALL} )
option( BUILD_LIBTDEPIM "Build libtdepim" ${BUILD_ALL} )
option( BUILD_LIBKPIMIDENTITIES "Build libkpimidentities" ${BUILD_ALL} )
option( BUILD_LIBKDENETWORK "Build libkdenetwork" ${BUILD_ALL} )
option( BUILD_LIBKDENETWORK "Build libtdenetwork" ${BUILD_ALL} )
option( BUILD_CERTMANAGER "Build certmanager" ${BUILD_ALL} )
option( BUILD_LIBKPGP "Build libkpgp" ${BUILD_ALL} )
option( BUILD_MIMELIB "Build mimelib" ${BUILD_ALL} )
@ -161,7 +161,7 @@ tde_conditional_add_subdirectory( BUILD_LIBKCAL libkcal )
tde_conditional_add_subdirectory( BUILD_LIBTDEPIM pixmaps )
tde_conditional_add_subdirectory( BUILD_LIBTDEPIM libtdepim )
tde_conditional_add_subdirectory( BUILD_LIBKPIMIDENTITIES libkpimidentities )
tde_conditional_add_subdirectory( BUILD_LIBKDENETWORK libkdenetwork )
tde_conditional_add_subdirectory( BUILD_LIBKDENETWORK libtdenetwork )
tde_conditional_add_subdirectory( BUILD_CERTMANAGER certmanager )
tde_conditional_add_subdirectory( BUILD_LIBKPGP libkpgp )
tde_conditional_add_subdirectory( BUILD_MIMELIB mimelib )

2
MAINTAINERS

@ -31,7 +31,7 @@ libical Cornelius Schumacher <schumacher@kde.org>
Reinhold Kainhofer <reinhold@kainhofer.com>
libkcal Cornelius Schumacher <schumacher@kde.org>
Reinhold Kainhofer <reinhold@kainhofer.com>
libkdenetwork Marc Mutz <mutz@kde.org>
libtdenetwork Marc Mutz <mutz@kde.org>
Mathias Waack <mathias@atoll-net.de> (Scoring)
Ingo Klöcker <ingo.kloecker@epost.de> (kpgp)
Carsten Burghardt <burghardt@kde.org> (kfoldertree, ksubscription, kaccount)

2
Mainpage.dox

@ -65,7 +65,7 @@
* - <a href="libkcal/html/index.html"><b>libkcal</b></a>
* (<a href="libkcal/html/classes.html">classes</a>)\n
* <i>A library of calendaring classes.</i>
* - <a href="libkdenetwork/html/index.html"><b>libkdenetwork</b></a>
* - <a href="libtdenetwork/html/index.html"><b>libtdenetwork</b></a>
* <i>A library of networkworking classes.</i>
* - <a href="libtdepim/html/index.html"><b>libtdepim</b></a>
* (<a href="libtdepim/html/classes.html">classes</a>)\n

6
Makefile.am.in

@ -13,13 +13,13 @@ COMPILE_AFTER_libemailfunctions = libkcal libkpimidentities kmail korganizer
COMPILE_AFTER_libkholidays = korganizer kontact
COMPILE_AFTER_libkcal = kalarm kitchensync konsolekalendar korganizer libkpimexchange libtdepim karm knotes kresources kfile-plugins
COMPILE_AFTER_mimelib = korn kmail
COMPILE_AFTER_libkdenetwork = kmail knode
COMPILE_AFTER_libtdenetwork = kmail knode
COMPILE_AFTER_libksieve = kmail
#
# Applications and their downward dependencies (ie. the libs they use)
#
COMPILE_BEFORE_libkpimidentities = libtdepim certmanager
COMPILE_BEFORE_certmanager = libkdenetwork libkpgp
COMPILE_BEFORE_certmanager = libtdenetwork libkpgp
COMPILE_BEFORE_korganizer = libtdepim libkpimidentities libkpimexchange kgantt
COMPILE_BEFORE_kaddressbook = libtdepim certmanager akregator
COMPILE_BEFORE_kandy = libtdepim
@ -33,7 +33,7 @@ COMPILE_BEFORE_libkpimexchange = libtdepim
COMPILE_BEFORE_kalarm = libtdepim libkmime
COMPILE_BEFORE_kresources = libkpimexchange knotes kaddressbook kode
COMPILE_BEFORE_wizards = libtdepim kresources korganizer kaddressbook kmail
COMPILE_BEFORE_korn = libkdenetwork
COMPILE_BEFORE_korn = libtdenetwork
COMPILE_BEFORE_kitchensync = libtdepim
COMPILE_BEFORE_akregator = libtdepim
COMPILE_BEFORE_knotes = libtdepim

4
NewsLog.txt

@ -281,7 +281,7 @@ Problems addressed
* kolab/issue4207: alarm time textfield in advanced alarm dialog should be 5-digits (rt#6055)
* kolab/issue4200: Reminder date sorting doesn't recognize different month (rt#6047)
* kolab/issue4215: Events ending at 00h appear in the wrong day in day-view
* kolab/issue4054(needs to patch kdelibs, see issue): Umlauts and sending contacts problem (rt#5956)
* kolab/issue4054(needs to patch tdelibs, see issue): Umlauts and sending contacts problem (rt#5956)
* kolab/issue4060: Wish: Auto-spellchecking: action to add new suggestion in context menu (rt#5969)
* kolab/issue4224: event viewer dialog to small (rt#6060)
* kolab/issue4218: Tasks: Copy to of a recurring event forgets the recurrence
@ -787,7 +787,7 @@ Problems addressed
------------------
* Fix problems with Free/Busy passwords that have a '!' in them.
This fix is in kdelibs, not in the enterprise branch.
This fix is in tdelibs, not in the enterprise branch.
* Fix incompatibility with GPGME 1.2

2
README

@ -42,7 +42,7 @@ There is also quite an amount of infrastructure in this package:
* calendarsystem: library for handling of non-gregorian calendar systems
* libtdepim: Common code for different tdepim apps
* libkdenetwork: Common code for apps previously being in the kdenetwork CVS
* libtdenetwork: Common code for apps previously being in the tdenetwork CVS
module (KMail, KNode). This will be merged with libtdepim.
* mimelib: MIME messages library
* libkcal: C++ api for the iCalendar and vCalendar formats

2
akregator/src/pageviewer.cpp

@ -384,7 +384,7 @@ void PageViewer::slotSetCaption(const TQString& cap)
void PageViewer::slotPaletteOrFontChanged()
{
kdDebug() << "PageViewer::slotPaletteOrFontChanged()" << endl;
// taken from KonqView (kdebase/konqueror/konq_view.cc)
// taken from KonqView (tdebase/konqueror/konq_view.cc)
TQObject *obj = KParts::BrowserExtension::childObject(this);
if ( !obj ) // not all views have a browser extension !

4
certmanager/CMakeLists.txt

@ -13,7 +13,7 @@ project( certmanager )
include( ConfigureChecks.cmake )
tde_import( libkdenetwork )
tde_import( libtdenetwork )
add_subdirectory( lib )
add_subdirectory( conf )
@ -26,7 +26,7 @@ include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/lib
${CMAKE_SOURCE_DIR}/libtdepim
${CMAKE_SOURCE_DIR}/libkdenetwork
${CMAKE_SOURCE_DIR}/libtdenetwork
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)

2
certmanager/Makefile.am

@ -2,7 +2,7 @@ SUBDIRS = lib conf kwatchgnupg .
KDE_CXXFLAGS = -DLIBKLEOPATRA_NO_COMPAT
INCLUDES = -I$(srcdir)/lib -I$(top_srcdir)/libkdenetwork $(GPGME_CFLAGS) $(all_includes)
INCLUDES = -I$(srcdir)/lib -I$(top_srcdir)/libtdenetwork $(GPGME_CFLAGS) $(all_includes)
bin_PROGRAMS = kleopatra

2
certmanager/conf/Makefile.am

@ -1,5 +1,5 @@
AM_CPPFLAGS = -DLIBKLEOPATRA_NO_COMPAT -I$(srcdir)/../lib -I$(srcdir)/../lib/ui -I../lib/ui \
-I$(top_srcdir)/libkdenetwork $(GPGME_CFLAGS) $(all_includes)
-I$(top_srcdir)/libtdenetwork $(GPGME_CFLAGS) $(all_includes)
METASOURCES = AUTO

2
certmanager/conf/appearanceconfigpage.cpp

@ -78,7 +78,7 @@ extern "C"
}
}
// kdelibs-3.2 didn't have the changed signal in KCModule...
// tdelibs-3.2 didn't have the changed signal in KCModule...
void AppearanceConfigurationPage::slotChanged()
{
emit changed(true);

2
certmanager/conf/dirservconfigpage.cpp

@ -267,7 +267,7 @@ extern "C"
}
}
// kdelibs-3.2 didn't have the changed signal in KCModule...
// tdelibs-3.2 didn't have the changed signal in KCModule...
void DirectoryServicesConfigurationPage::slotChanged()
{
emit changed(true);

2
certmanager/conf/dnorderconfigpage.cpp

@ -65,7 +65,7 @@ void DNOrderConfigPage::defaults() {
mWidget->defaults();
}
// kdelibs-3.2 didn't have the changed signal in KCModule...
// tdelibs-3.2 didn't have the changed signal in KCModule...
void DNOrderConfigPage::slotChanged() {
emit changed(true);
}

2
certmanager/kwatchgnupg/Makefile.am

@ -1,6 +1,6 @@
KDE_CXXFLAGS = -DLIBKLEOPATRA_NO_COMPAT
INCLUDES = -I$(top_srcdir)/certmanager/lib -I$(top_srcdir)/libkdenetwork $(GPGME_CFLAGS) $(all_includes)
INCLUDES = -I$(top_srcdir)/certmanager/lib -I$(top_srcdir)/libtdenetwork $(GPGME_CFLAGS) $(all_includes)
bin_PROGRAMS = kwatchgnupg

2
certmanager/lib/CMakeLists.txt

@ -19,7 +19,7 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/libtdepim
${CMAKE_SOURCE_DIR}/libkdenetwork
${CMAKE_SOURCE_DIR}/libtdenetwork
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
${GPGME_INCLUDE_DIRS}

4
certmanager/lib/Makefile.am

@ -1,4 +1,4 @@
INCLUDES = -I$(top_srcdir)/libkdenetwork $(GPGME_CFLAGS) $(all_includes)
INCLUDES = -I$(top_srcdir)/libtdenetwork $(GPGME_CFLAGS) $(all_includes)
SUBDIRS = pics kleo backends ui . tests
@ -16,7 +16,7 @@ libkleopatra_la_LIBADD = \
backends/chiasmus/libkleopatra_backend_chiasmus.la \
ui/libkleopatra_ui.la \
\
$(top_builddir)/libkdenetwork/qgpgme/libqgpgme.la \
$(top_builddir)/libtdenetwork/qgpgme/libqgpgme.la \
$(LIB_KIO) $(LIB_TDEUI)
# Disabled for tdepim-3.3, see also kleo/cryptobackendfactory.cpp

2
certmanager/lib/backends/chiasmus/CMakeLists.txt

@ -18,7 +18,7 @@ include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/certmanager/lib
${CMAKE_SOURCE_DIR}/libtdepim
${CMAKE_SOURCE_DIR}/libkdenetwork
${CMAKE_SOURCE_DIR}/libtdenetwork
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)

2
certmanager/lib/backends/chiasmus/Makefile.am

@ -1,4 +1,4 @@
INCLUDES = -I$(top_srcdir)/certmanager/lib -I$(top_srcdir)/libkdenetwork $(GPGME_CFLAGS) $(all_includes)
INCLUDES = -I$(top_srcdir)/certmanager/lib -I$(top_srcdir)/libtdenetwork $(GPGME_CFLAGS) $(all_includes)
KDE_CXXFLAGS = '-DGPG_ERR_SOURCE_DEFAULT=((gpg_err_source_t)176)'

2
certmanager/lib/backends/kpgp/Makefile.am

@ -1,4 +1,4 @@
INCLUDES = -I$(top_srcdir)/libkdenetwork \
INCLUDES = -I$(top_srcdir)/libtdenetwork \
-I$(top_srcdir)/certmanager/lib \
-I$(top_srcdir)/libkpgp \
$(GPGME_CFLAGS) $(all_includes)

2
certmanager/lib/backends/qgpgme/CMakeLists.txt

@ -13,7 +13,7 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/certmanager/lib
${CMAKE_SOURCE_DIR}/libkdenetwork
${CMAKE_SOURCE_DIR}/libtdenetwork
${CMAKE_SOURCE_DIR}/libtdepim
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}

2
certmanager/lib/backends/qgpgme/Makefile.am

@ -1,6 +1,6 @@
#KDE_OPTIONS = nofinal
INCLUDES = -I$(top_srcdir)/libkdenetwork \
INCLUDES = -I$(top_srcdir)/libtdenetwork \
-I$(top_srcdir)/certmanager/lib \
$(GPGME_CFLAGS) $(all_includes)

2
certmanager/lib/kleo/CMakeLists.txt

@ -14,7 +14,7 @@ include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/certmanager/lib
${CMAKE_SOURCE_DIR}/libtdepim
${CMAKE_SOURCE_DIR}/libkdenetwork
${CMAKE_SOURCE_DIR}/libtdenetwork
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)

2
certmanager/lib/kleo/Makefile.am

@ -1,4 +1,4 @@
INCLUDES = -I$(top_srcdir)/libkdenetwork \
INCLUDES = -I$(top_srcdir)/libtdenetwork \
-I$(top_srcdir)/certmanager/lib \
$(GPGME_CFLAGS) $(all_includes)

2
certmanager/lib/tests/Makefile.am

@ -1,5 +1,5 @@
AM_CPPFLAGS = -I$(top_srcdir)/certmanager/lib \
-I$(top_srcdir)/libkdenetwork \
-I$(top_srcdir)/libtdenetwork \
$(GPGME_CFLAGS) $(all_includes) -DKDESRCDIR=\"$(srcdir)\"
check_PROGRAMS = test_keylister test_keygen test_keyselectiondialog \

2
certmanager/lib/tests/test_cryptoconfig.cpp

@ -307,7 +307,7 @@ int main( int argc, char** argv ) {
// Test setting the option, sync'ing, then querying again
KURL::List lst;
// We use non-empty paths to workaround a bug in KURL (kdelibs-3.2)
// We use non-empty paths to workaround a bug in KURL (tdelibs-3.2)
lst << KURL( "ldap://a:389/?b" );
// Test with query containing a litteral ':' (KURL supports this)
// and a ' ' (KURL will escape it, see issue119)

2
certmanager/lib/ui/CMakeLists.txt

@ -13,7 +13,7 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/certmanager/lib
${CMAKE_SOURCE_DIR}/libkdenetwork
${CMAKE_SOURCE_DIR}/libtdenetwork
${CMAKE_SOURCE_DIR}/libtdepim
${CMAKE_SOURCE_DIR}/libkpgp
${TDE_INCLUDE_DIR}

2
certmanager/lib/ui/Makefile.am

@ -1,5 +1,5 @@
INCLUDES = -I$(top_srcdir)/libkdenetwork \
INCLUDES = -I$(top_srcdir)/libtdenetwork \
-I$(top_srcdir)/libkpgp \
-I$(top_srcdir)/certmanager/lib \
$(GPGME_CFLAGS) $(all_includes)

2
certmanager/lib/ui/keyapprovaldialog.cpp

@ -6,7 +6,7 @@
Based on kpgpui.h
Copyright (C) 2001,2002 the KPGP authors
See file libkdenetwork/AUTHORS.kpgp for details
See file libtdenetwork/AUTHORS.kpgp for details
Libkleopatra is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as

2
certmanager/lib/ui/keyapprovaldialog.h

@ -6,7 +6,7 @@
Based on kpgpui.h
Copyright (C) 2001,2002 the KPGP authors
See file libkdenetwork/AUTHORS.kpgp for details
See file libtdenetwork/AUTHORS.kpgp for details
Libkleopatra is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as

2
certmanager/lib/ui/keyrequester.cpp

@ -32,7 +32,7 @@
Based on kpgpui.cpp
Copyright (C) 2001,2002 the KPGP authors
See file libkdenetwork/AUTHORS.kpgp for details
See file libtdenetwork/AUTHORS.kpgp for details
This file is part of KPGP, the KDE PGP/GnuPG support library.

2
certmanager/lib/ui/keyrequester.h

@ -32,7 +32,7 @@
Based on kpgpui.h
Copyright (C) 2001,2002 the KPGP authors
See file libkdenetwork/AUTHORS.kpgp for details
See file libtdenetwork/AUTHORS.kpgp for details
This file is part of KPGP, the KDE PGP/GnuPG support library.

2
certmanager/lib/ui/keyselectiondialog.cpp

@ -6,7 +6,7 @@
Based on kpgpui.cpp
Copyright (C) 2001,2002 the KPGP authors
See file libkdenetwork/AUTHORS.kpgp for details
See file libtdenetwork/AUTHORS.kpgp for details
Libkleopatra is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as

2
certmanager/lib/ui/keyselectiondialog.h

@ -6,7 +6,7 @@
Based on kpgpui.h
Copyright (C) 2001,2002 the KPGP authors
See file libkdenetwork/AUTHORS.kpgp for details
See file libtdenetwork/AUTHORS.kpgp for details
Libkleopatra is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as

2
certmanager/lib/ui/passphrasedialog.cpp

@ -32,7 +32,7 @@
Based on kpgpui.cpp
Copyright (C) 2001,2002 the KPGP authors
See file libkdenetwork/AUTHORS.kpgp for details
See file libtdenetwork/AUTHORS.kpgp for details
This file is part of KPGP, the KDE PGP/GnuPG support library.

2
certmanager/lib/ui/passphrasedialog.h

@ -32,7 +32,7 @@
Based on kpgpui.h
Copyright (C) 2001,2002 the KPGP authors
See file libkdenetwork/AUTHORS.kpgp for details
See file libtdenetwork/AUTHORS.kpgp for details
This file is part of KPGP, the KDE PGP/GnuPG support library.

2
configure.in.in

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

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 <kde-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 <tde-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

8
dependency-graph.dot

@ -35,10 +35,10 @@ digraph "inter-dependency graph for tdepim" {
"libkcal" -> "libtdepim";
"libkcal" -> "libkpimexchange";
"libkcal" -> "plugins";
"libkdenetwork" -> "certmanager";
"libkdenetwork" -> "kmail";
"libkdenetwork" -> "knode";
"libkdenetwork" -> "korn";
"libtdenetwork" -> "certmanager";
"libtdenetwork" -> "kmail";
"libtdenetwork" -> "knode";
"libtdenetwork" -> "korn";
"libtdepim" -> "akregator";
"libtdepim" -> "kaddressbook";
"libtdepim" -> "kalarm";

10
doc/kalarm/index.docbook

@ -750,7 +750,7 @@ displayed. Choose:</para>
<listitem>
<para><guilabel>Speak</guilabel> to have the alarm message spoken as
well as being displayed. This option is only available if you have
<application>KTTSD</application> (from the kdeaccessibility package)
<application>KTTSD</application> (from the tdeaccessibility package)
installed and configured, together with a compatible speech
synthesizer, &eg; <application>Festival</application>.</para>
</listitem>
@ -4052,8 +4052,8 @@ who kindly agreed to allow the name &kalarm; to be used by this
<title>Requirements</title>
<para>&kalarm; requires the standard &kde; libraries to be installed
(the <filename>kdelibs</filename> package). To compile from source,
you also need the &Qt; and <filename>kdelibs</filename> development
(the <filename>tdelibs</filename> package). To compile from source,
you also need the &Qt; and <filename>tdelibs</filename> development
packages. The X11 development package, if present, is used to improve
&kalarm;'s ability to function under &kde; without a system
tray.</para>
@ -4062,13 +4062,13 @@ tray.</para>
they are installed:</para>
<itemizedlist>
<listitem><para>&kmix; (from kdemultimedia package): if installed, it
<listitem><para>&kmix; (from tdemultimedia package): if installed, it
allows &kalarm; to set the absolute sound volume when playing audio
files.</para>
</listitem>
<listitem><para><application>KTTSD</application> (from
kdeaccessibility package): if installed and configured, together with
tdeaccessibility package): if installed and configured, together with
a compatible speech synthesizer package, it allows &kalarm; to speak
alarm messages when they are displayed.</para>
</listitem>

8
doc/kandy/index.docbook

@ -293,12 +293,12 @@ Watts <email>lauri@kde.org</email>.</para>
<sect1 id="kandy-requirements">
<title>Requirements</title>
<para>You will need to have the kdelibs package installed in order to
<para>You will need to have the tdelibs package installed in order to
successfully compile the tdepim package that contains &kandy;. The
kdelibs package may be found at the same location as the tdepim
tdelibs package may be found at the same location as the tdepim
package.</para>
<para>The &kaddressbook; is part of the kdebase package. This can also
<para>The &kaddressbook; is part of the tdebase package. This can also
be found at the same location as the tdepim package.</para>
</sect1>
@ -308,7 +308,7 @@ be found at the same location as the tdepim package.</para>
&install.compile.documentation;
<para>Compiling and installing the required kdelibs package follows the
<para>Compiling and installing the required tdelibs package follows the
same process. If you encounter any problems compiling or installing
&kandy;, help may be obtained from the <ulink
url="http://www.kde.org/mailinglists.html">&kde; mailing lists </ulink>

2
doc/karm/index.docbook

@ -64,7 +64,7 @@
<keywordset>
<keyword>KDE</keyword>
<keyword>karm</keyword>
<keyword>kdeutils</keyword>
<keyword>tdeutils</keyword>
<keyword>time</keyword>
<keyword>tracker</keyword>
<keyword>project</keyword>

4
doc/kmail/faq.docbook

@ -530,8 +530,8 @@ Is there any documentation on the available interfaces?</para></question>
<answer><para>You can get a list of functions by using this command in a shell:
<userinput><command>dcop</command>
<option>kmail KMailIface</option></userinput>. Some documentation is also
available in <filename>kdenetwork/kmail/kmailIface.h</filename> and
<filename>kdenetwork/kmail/mailcomposerIface.h</filename>.</para></answer>
available in <filename>tdenetwork/kmail/kmailIface.h</filename> and
<filename>tdenetwork/kmail/mailcomposerIface.h</filename>.</para></answer>
</qandaentry>
<qandaentry>

2
doc/knode/faq.docbook

@ -12,7 +12,7 @@
</question>
<answer>
<para>Does the <guisubmenu>Internet</guisubmenu>entry exist? If not,
maybe the kdenetwork package isn't installed (perhaps because your
maybe the tdenetwork package isn't installed (perhaps because your
distribution possibly doesn't do this for you); if the entry is there,
but you do not have a <guimenuitem>KNode</guimenuitem> item
in it, you should try to open a &konsole; and run &knode; from

2
doc/knode/index.docbook

@ -95,7 +95,7 @@
<keywordset>
<keyword>KDE</keyword>
<keyword>KNode</keyword>
<keyword>kdenetwork</keyword>
<keyword>tdenetwork</keyword>
<keyword>newsreader</keyword>
</keywordset>
</bookinfo>

4
doc/knode/install.docbook

@ -22,9 +22,9 @@ url="http://www.leafnode.org"><application>leafnode</application></ulink>.</para
<sect1 id="compilation">
<title>Compile and install</title>
<para>&knode; is part of the kdenetwork package of &kde; 3.x and is
<para>&knode; is part of the tdenetwork package of &kde; 3.x and is
installed together with it, provided you have chosen to install the
kdenetwork package; so, in general, there is no need for a user
tdenetwork package; so, in general, there is no need for a user
to compile the sources of &knode;.</para>
&install.compile.documentation;

2
doc/knotes/index.docbook

@ -55,7 +55,7 @@ desktop.</para></abstract>
<keywordset>
<keyword>KDE</keyword>
<keyword>Knotes</keyword>
<keyword>kdeutils</keyword>
<keyword>tdeutils</keyword>
<keyword>notes</keyword>
<keyword>popup</keyword>
<keyword>pop-up</keyword>

4
doc/konsolekalendar/index.docbook

@ -811,8 +811,8 @@ If you do not want to see event <acronym>UIDs</acronym> then use the
<title>Requirements</title>
<para>&konsolekalendar; requires the standard &kde; libraries to be installed
(the <filename>kdelibs</filename> package). To compile from source,
you also need the &Qt; and <filename>kdelibs</filename> development
(the <filename>tdelibs</filename> package). To compile from source,
you also need the &Qt; and <filename>tdelibs</filename> development
packages.</para>
<para>You can find a list of changes in the

2
doc/korganizer/index.docbook

@ -4824,7 +4824,7 @@ space in your home folder. Very large calendars slow down
on your platform and the size of your calendar(s).</para>
<para>All required libraries are part of standard &kde; libraries
(kdelibs). &kde; base package (kdebase) must also be installed to change
(tdelibs). &kde; base package (tdebase) must also be installed to change
localization preferences like date and time formats. &korganizer; itself
is in the tdepim package. All packages can be found on <ulink
url="http://www.kde.org">&kde; home page</ulink>.</para>

2
kaddressbook/CMakeLists.txt

@ -9,7 +9,7 @@
#
#################################################
tde_import( libkdenetwork )
tde_import( libtdenetwork )
tde_import( certmanager )
tde_import( libkmime )
tde_import( ktnef )

2
kaddressbook/addresseditwidget.cpp

@ -640,7 +640,7 @@ int AddressTypeDialog::type() const
/**
Small helper class, I hope we can remove it as soon as a general solution has
been committed to kdelibs
been committed to tdelibs
*/
class LocaleAwareString : public TQString
{

2
kaddressbook/common/locationmap.cpp

@ -23,7 +23,7 @@
#include <kapplication.h>
#include <kconfig.h>
#include <kdeversion.h>
#include <tdeversion.h>
#include <kglobal.h>
#include <klocale.h>
#include <kmessagebox.h>

2
kaddressbook/editors/CMakeLists.txt

@ -16,7 +16,7 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/libkdenetwork
${CMAKE_SOURCE_DIR}/libtdenetwork
${CMAKE_SOURCE_DIR}/kaddressbook/interfaces
${CMAKE_SOURCE_DIR}/libtdepim
${CMAKE_SOURCE_DIR}/certmanager/lib

2
kaddressbook/editors/Makefile.am

@ -1,7 +1,7 @@
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kaddressbook/interfaces \
-I$(top_srcdir)/kaddressbook \
-I$(top_srcdir)/certmanager/lib \
-I$(top_srcdir)/libkdenetwork \
-I$(top_srcdir)/libtdenetwork \
-I$(top_builddir)/kaddressbook/editors \
$(GPGME_CFLAGS) \
$(all_includes)

2
kaddressbook/kabcore.cpp

@ -51,7 +51,7 @@
#include <kcmdlineargs.h>
#include <kcmultidialog.h>
#include <kdebug.h>
#include <kdeversion.h>
#include <tdeversion.h>
#include <kimproxy.h>
#include <klocale.h>
#include <kmessagebox.h>

2
kaddressbook/kcmconfigs/kabconfigwidget.cpp

@ -72,7 +72,7 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name )
mTradeAsFamilyName = new TQCheckBox( i18n( "Trade single name component as family name" ), groupBox, "mtrade" );
boxLayout->addWidget( mTradeAsFamilyName );
/**
TODO: show the checkbox when we can compile agains kdelibs from HEAD, atm it
TODO: show the checkbox when we can compile agains tdelibs from HEAD, atm it
doesn't work and would just confuse the users ;)
*/
mTradeAsFamilyName->hide();

2
kaddressbook/printing/printsortmode.h

@ -24,7 +24,7 @@
#ifndef PRINTSORTMODE_H
#define PRINTSORTMODE_H
#include <kdeversion.h>
#include <tdeversion.h>
#if KDE_IS_VERSION(3,3,91)

2
kaddressbook/searchmanager.cpp

@ -23,7 +23,7 @@
#include <config.h> // FOR TDEPIM_NEW_DISTRLISTS
#include <kabc/addresseelist.h>
#include <kdeversion.h>
#include <tdeversion.h>
#include "searchmanager.h"

2
kaddressbook/viewmanager.cpp

@ -31,7 +31,7 @@
#include <kactionclasses.h>
#include <kconfig.h>
#include <kdebug.h>
#include <kdeversion.h>
#include <tdeversion.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kmessagebox.h>

2
kaddressbook/views/configuretableviewdialog.cpp

@ -29,7 +29,7 @@
#include <tqvbox.h>
#include <tqbuttongroup.h>
#include <kdeversion.h>
#include <tdeversion.h>
#include <kglobal.h>
#include <klocale.h>
#include <klineedit.h>

2
kaddressbook/xxport/CMakeLists.txt

@ -15,7 +15,7 @@ include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/kaddressbook
${CMAKE_SOURCE_DIR}/kaddressbook/interfaces
${CMAKE_SOURCE_DIR}/libkdenetwork
${CMAKE_SOURCE_DIR}/libtdenetwork
${CMAKE_SOURCE_DIR}/libtdepim
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}

4
kaddressbook/xxport/Makefile.am

@ -1,7 +1,7 @@
INCLUDES = -I$(top_srcdir) \
-I$(top_srcdir)/kaddressbook/interfaces \
-I$(top_srcdir)/kaddressbook \
-I$(top_srcdir)/libkdenetwork \
-I$(top_srcdir)/libtdenetwork \
$(GPGME_CFLAGS) \
$(all_includes)
@ -26,7 +26,7 @@ libkaddrbk_csv_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI
libkaddrbk_vcard_xxport_la_SOURCES = vcard_xxport.cpp
libkaddrbk_vcard_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO) \
$(top_builddir)/kaddressbook/libkaddressbook.la \
$(top_builddir)/libkdenetwork/qgpgme/libqgpgme.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_KABC) $(LIB_KIO)

2
kalarm/BUGS

@ -6,7 +6,7 @@ The following bugs are known to exist in KAlarm:
-- Bug 79247: Summer/winter time changes (daylight savings time changes), are
not handled well. KAlarm needs to use time zones in scheduling alarms instead
of a simple local time which it currently uses. This requires improved
timezone handling in kdelibs and libkcal. This is fixed in KAlarm version 1.9.
timezone handling in tdelibs and libkcal. This is fixed in KAlarm version 1.9.
The following bugs appear to be KAlarm bugs but are actually due to other software:

2
kalarm/CMakeLists.txt

@ -12,7 +12,7 @@
tde_import( libkmime )
tde_import( ktnef )
tde_import( libtdepim )
tde_import( libkdenetwork )
tde_import( libtdenetwork )
tde_import( certmanager )
tde_import( libkcal )
tde_import( libkpimidentities )

2
kalarm/Makefile.am

@ -21,7 +21,7 @@ kalarm_SOURCES = birthdaydlg.cpp main.cpp alarmevent.cpp editdlg.cpp \
templatelistview.cpp templatepickdlg.cpp templatedlg.cpp \
templatemenuaction.cpp latecancel.cpp repetition.cpp alarmtext.cpp \
emailidcombo.cpp find.cpp pickfileradio.cpp calendarcompat.cpp
kalarm_LDFLAGS = $(all_libraries) $(KDE_RPATH) -L$(top_builddir)/libkdenetwork/qgpgme
kalarm_LDFLAGS = $(all_libraries) $(KDE_RPATH) -L$(top_builddir)/libtdenetwork/qgpgme
if include_ARTS
ARTSLIB = -lartskde
endif

4
kalarm/configure.in.bot

@ -1,7 +1,7 @@
if test -z "$KMIX"; then
echo ""
echo "================================================================="
echo "kmix (from the kdemultimedia package) is missing."
echo "kmix (from the tdemultimedia package) is missing."
echo "KAlarm will not be able to set the absolute sound volume when"
echo "playing audio files until you install kmix."
echo "================================================================="
@ -9,7 +9,7 @@ fi
if test -z "$KTTSD"; then
echo ""
echo "================================================================="
echo "kttsd (from the kdeaccessibility package) is missing."
echo "kttsd (from the tdeaccessibility package) is missing."
echo "KAlarm will not be able to speak alarm messages until you install"
echo "kttsd together with appropriate speech synthesis application(s)."
echo "================================================================="

2
kalarm/fontcolour.h

@ -21,7 +21,7 @@
#ifndef FONTCOLOUR_H
#define FONTCOLOUR_H
#include <kdeversion.h>
#include <tdeversion.h>
#include <tqwidget.h>
#include <tqstringlist.h>
#include <kfontdialog.h>

2
kalarm/kalarm.h

@ -29,7 +29,7 @@
#define KALARM_VERSION "1.5.5"
#define KALARM_NAME "KAlarm"
#include <kdeversion.h>
#include <tdeversion.h>
#define AUTOSTART_BY_KALARMD // temporary fix for autostart before session restoration

2
kalarm/kamail.cpp

@ -972,7 +972,7 @@ TQString getHostName()
/*=============================================================================
= HeaderParsing : modified and additional functions.
= The following functions are modified from, or additional to, those in
= libkdenetwork kmime_header_parsing.cpp.
= libtdenetwork kmime_header_parsing.cpp.
=============================================================================*/
namespace HeaderParsing

2
kalarm/lib/colourcombo.cpp

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

2
kalarm/lib/spinbox.cpp

@ -18,7 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <kdeversion.h>
#include <tdeversion.h>
#include <tqlineedit.h>
#include <tqobjectlist.h>
#include "spinbox.moc"

2
kalarm/mainwindowbase.cpp

@ -19,7 +19,7 @@
*/
#include "kalarm.h"
#include <kdeversion.h>
#include <tdeversion.h>
#include "kalarmapp.h"
#include "mainwindowbase.moc"

2
kandy/Makefile.am

@ -1,4 +1,4 @@
## kdebase/Makefile.am
## tdebase/Makefile.am
## (C) 1997 Stephan Kulow
SUBDIRS = src profiles

4
karm/karm.kdevelop

@ -1,5 +1,5 @@
<?xml version = '1.0'?>
<kdevelop>
<tdevelop>
<general>
<author>root</author>
<email>root@duffman</email>
@ -139,4 +139,4 @@
</creategettersetter>
<references/>
</kdevcppsupport>
</kdevelop>
</tdevelop>

2
kioslaves/imap4/imaps.protocol

@ -3,7 +3,7 @@
#### Temporary name
exec=kio_imap4
# protocol that will appear in URLs
#### This ioslave is temporarily named imaps, while imaps remains in kdebase
#### This ioslave is temporarily named imaps, while imaps remains in tdebase
protocol=imaps
# input/output can be one of: filesystem, stream, none

2
kioslaves/mbox/mbox.cc

@ -42,7 +42,7 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char* argv[]); }
int kdemain( int argc, char * argv[] )
{
KLocale::setMainCatalogue("kdelibs");
KLocale::setMainCatalogue("tdelibs");
KInstance instance("kio_mbox");
(void) KGlobal::locale();

4
kmail/CMakeLists.txt

@ -17,7 +17,7 @@ if( WITH_INDEXLIB )
set( INDEX_LIBRARY index-shared )
endif( )
tde_import( libkdenetwork )
tde_import( libtdenetwork )
tde_import( certmanager )
tde_import( ktnef )
tde_import( libkcal )
@ -46,7 +46,7 @@ include_directories(
${CMAKE_SOURCE_DIR}/libkmime
${CMAKE_SOURCE_DIR}/libtdepim
${CMAKE_SOURCE_DIR}/libkpgp
${CMAKE_SOURCE_DIR}/libkdenetwork
${CMAKE_SOURCE_DIR}/libtdenetwork
${CMAKE_SOURCE_DIR}/certmanager/lib
${CMAKE_SOURCE_DIR}/libksieve
${CMAKE_SOURCE_DIR}/ktnef

2
kmail/ChangeLog

@ -69,7 +69,7 @@ please visit http://webcvs.kde.org
panes. (Currently have to restart kmail for this to take effect due
to HTML widget renovations). Fixed width fonts starting working too.
* Ported all the changes made to KMail 1.0.x.
* Ported KMail to QT 2.1 and KDE 2 kdelibs (that is it runs and works
* Ported KMail to QT 2.1 and KDE 2 tdelibs (that is it runs and works
now rather than just compiling)
Privacy

2
kmail/Mainpage.dox

@ -183,7 +183,7 @@ call the same functions for each tab.
\section mdn MDNs
Files: libkdenetwork/kmime_mdn.{h,cpp} and kmmessage.{h,cpp}, mostly
Files: libtdenetwork/kmime_mdn.{h,cpp} and kmmessage.{h,cpp}, mostly
Contact Marc Mutz <mutz@kde.org> on questions...

2
kmail/Makefile.am

@ -5,7 +5,7 @@ SUBDIRS = interfaces . about pics profiles avscripts tests
INCLUDES = -I$(top_srcdir)/libkmime \
-I$(top_srcdir)/libkpgp \
-I$(top_srcdir)/libkdenetwork \
-I$(top_srcdir)/libtdenetwork \
-I$(top_srcdir)/libtdepim \
-I$(top_srcdir)/libkpimidentities \
-I$(top_srcdir)/libemailfunctions \

2
kmail/cachedimapjob.cpp

@ -432,7 +432,7 @@ void CachedImapJob::slotPutNextMessage()
}
//-----------------------------------------------------------------------------
// TODO: port to KIO::StoredTransferJob once it's ok to require kdelibs-3.3
// TODO: port to KIO::StoredTransferJob once it's ok to require tdelibs-3.3
void CachedImapJob::slotPutMessageDataReq(KIO::Job *job, TQByteArray &data)
{
KMAcctCachedImap::JobIterator it = mAccount->findJob(job);

2
kmail/configure.in.in

@ -19,7 +19,7 @@ AM_CONDITIONAL(add_indexlib, test no = "$missing_indexlib")
])
dnl The following test is taken from kdelibs/kio/kio
dnl The following test is taken from tdelibs/kio/kio
dnl ------------------------------------------------------------------------
dnl Try to find if we have Linux Inode based Dir Notification
dnl ------------------------------------------------------------------------

4
kmail/configuredialog.cpp

@ -71,7 +71,7 @@ using KMail::IdentityListViewItem;
#include "identitydialog.h"
using KMail::IdentityDialog;
// other kdenetwork headers:
// other tdenetwork headers:
#include <libkpimidentities/identity.h>
#include <kmime_util.h>
using KMime::DateFormatter;
@ -1018,7 +1018,7 @@ void AccountsPage::SendingTab::doLoadOther() {
if( str.isEmpty() )
{
//### FIXME: Use the global convenience function instead of the homebrewed
// solution once we can rely on HEAD kdelibs.
// solution once we can rely on HEAD tdelibs.
//str = KGlobal::hostname(); ???????
char buffer[256];
if ( !gethostname( buffer, 255 ) )

2
kmail/configuredialog_p.cpp

@ -17,7 +17,7 @@
#include "globalsettings.h"
#include "kmacctcachedimap.h"
// other kdenetwork headers: (none)
// other tdenetwork headers: (none)
// other KDE headers:
#include <ksimpleconfig.h>

2
kmail/editorwatcher.cpp

@ -31,7 +31,7 @@
#include <cassert>
// inotify stuff taken from kdelibs/kio/kio/kdirwatch.cpp
// inotify stuff taken from tdelibs/kio/kio/kdirwatch.cpp
#ifdef HAVE_SYS_INOTIFY
#include <sys/ioctl.h>
#include <sys/inotify.h>

2
kmail/filterlogdlg.cpp

@ -31,7 +31,7 @@
#include "filterlog.h"
#include <kdebug.h>
#include <kdeversion.h>
#include <tdeversion.h>
#include <kfiledialog.h>
#include <klocale.h>
#include <kmessagebox.h>

2
kmail/folderdiaacltab.cpp

@ -65,7 +65,7 @@
using namespace KMail;
// In case your kdelibs is < 3.3
// In case your tdelibs is < 3.3
#ifndef I18N_NOOP2
#define I18N_NOOP2( comment,x ) x
#endif

2
kmail/imapaccountbase.cpp

@ -921,7 +921,7 @@ namespace KMail {
{
// Copy job's data before a possible killAllJobs
TQStringList errors;
if ( job && job->error() != KIO::ERR_SLAVE_DEFINED /*workaround for kdelibs-3.2*/)
if ( job && job->error() != KIO::ERR_SLAVE_DEFINED /*workaround for tdelibs-3.2*/)
errors = job->detailedErrorStrings();
bool jobsKilled = true;

2
kmail/keyresolver.cpp

@ -6,7 +6,7 @@
Based on kpgp.cpp
Copyright (C) 2001,2002 the KPGP authors
See file libkdenetwork/AUTHORS.kpgp for details
See file libtdenetwork/AUTHORS.kpgp for details
Libkleopatra is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as

2
kmail/keyresolver.h

@ -6,7 +6,7 @@
Based on kpgp.h
Copyright (C) 2001,2002 the KPGP authors
See file libkdenetwork/AUTHORS.kpgp for details
See file libtdenetwork/AUTHORS.kpgp for details
Libkleopatra is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as