diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-16 13:52:38 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-16 13:52:38 -0600 |
| commit | 7dba3110aacdb3220d54c3fe0c2947c25406b700 (patch) | |
| tree | 28c064cf5647b2e8654cb4d5330d8e64afff27e2 | |
| parent | c0fc75368b41146e605536e973e1d635b9d64ced (diff) | |
| download | tdepim-7dba3110aacdb3220d54c3fe0c2947c25406b700.tar.gz tdepim-7dba3110aacdb3220d54c3fe0c2947c25406b700.zip | |
Additional renaming of kde to tde
170 files changed, 202 insertions, 202 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 29c87773e..269178378 100644 --- a/CMakeLists.txt +++ b/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 ) diff --git a/MAINTAINERS b/MAINTAINERS index 7b6caa885..a4ee9665b 100644 --- a/MAINTAINERS +++ b/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) diff --git a/Mainpage.dox b/Mainpage.dox index 8649736a3..eaf9f1f2c 100644 --- a/Mainpage.dox +++ b/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 diff --git a/Makefile.am.in b/Makefile.am.in index 518440daf..0f9cb6e5b 100644 --- a/Makefile.am.in +++ b/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 diff --git a/NewsLog.txt b/NewsLog.txt index 3748e00c1..9bd2bde62 100644 --- a/NewsLog.txt +++ b/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 @@ -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 diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp index 70e0e413f..7a0423913 100644 --- a/akregator/src/pageviewer.cpp +++ b/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 ! diff --git a/certmanager/CMakeLists.txt b/certmanager/CMakeLists.txt index 3f9b3595f..d98988bc3 100644 --- a/certmanager/CMakeLists.txt +++ b/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} ) diff --git a/certmanager/Makefile.am b/certmanager/Makefile.am index ed9b7ba26..8f7371162 100644 --- a/certmanager/Makefile.am +++ b/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 diff --git a/certmanager/conf/Makefile.am b/certmanager/conf/Makefile.am index de5be5747..f2c134a4f 100644 --- a/certmanager/conf/Makefile.am +++ b/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 diff --git a/certmanager/conf/appearanceconfigpage.cpp b/certmanager/conf/appearanceconfigpage.cpp index 4656ac641..9e5d0f74a 100644 --- a/certmanager/conf/appearanceconfigpage.cpp +++ b/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); diff --git a/certmanager/conf/dirservconfigpage.cpp b/certmanager/conf/dirservconfigpage.cpp index db8673464..436ef28ec 100644 --- a/certmanager/conf/dirservconfigpage.cpp +++ b/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); diff --git a/certmanager/conf/dnorderconfigpage.cpp b/certmanager/conf/dnorderconfigpage.cpp index e9c300359..a224b6f7a 100644 --- a/certmanager/conf/dnorderconfigpage.cpp +++ b/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); } diff --git a/certmanager/kwatchgnupg/Makefile.am b/certmanager/kwatchgnupg/Makefile.am index 02f0e3b4b..0c25605fa 100644 --- a/certmanager/kwatchgnupg/Makefile.am +++ b/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 diff --git a/certmanager/lib/CMakeLists.txt b/certmanager/lib/CMakeLists.txt index e0e29b93e..79c729f33 100644 --- a/certmanager/lib/CMakeLists.txt +++ b/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} diff --git a/certmanager/lib/Makefile.am b/certmanager/lib/Makefile.am index 57799827a..4512f42fe 100644 --- a/certmanager/lib/Makefile.am +++ b/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 diff --git a/certmanager/lib/backends/chiasmus/CMakeLists.txt b/certmanager/lib/backends/chiasmus/CMakeLists.txt index 5822d658a..71ac855ca 100644 --- a/certmanager/lib/backends/chiasmus/CMakeLists.txt +++ b/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} ) diff --git a/certmanager/lib/backends/chiasmus/Makefile.am b/certmanager/lib/backends/chiasmus/Makefile.am index 8a5d85bd4..408405a1c 100644 --- a/certmanager/lib/backends/chiasmus/Makefile.am +++ b/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)' diff --git a/certmanager/lib/backends/kpgp/Makefile.am b/certmanager/lib/backends/kpgp/Makefile.am index ad350f22c..6cf33c6aa 100644 --- a/certmanager/lib/backends/kpgp/Makefile.am +++ b/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) diff --git a/certmanager/lib/backends/qgpgme/CMakeLists.txt b/certmanager/lib/backends/qgpgme/CMakeLists.txt index 1df57990a..1093399b5 100644 --- a/certmanager/lib/backends/qgpgme/CMakeLists.txt +++ b/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} diff --git a/certmanager/lib/backends/qgpgme/Makefile.am b/certmanager/lib/backends/qgpgme/Makefile.am index a7336a029..156671f7d 100644 --- a/certmanager/lib/backends/qgpgme/Makefile.am +++ b/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) diff --git a/certmanager/lib/kleo/CMakeLists.txt b/certmanager/lib/kleo/CMakeLists.txt index 21cc0cd8c..8f9da9470 100644 --- a/certmanager/lib/kleo/CMakeLists.txt +++ b/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} ) diff --git a/certmanager/lib/kleo/Makefile.am b/certmanager/lib/kleo/Makefile.am index 0465bb2da..ad9054d15 100644 --- a/certmanager/lib/kleo/Makefile.am +++ b/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) diff --git a/certmanager/lib/tests/Makefile.am b/certmanager/lib/tests/Makefile.am index 3fa819f76..331d4d8e9 100644 --- a/certmanager/lib/tests/Makefile.am +++ b/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 \ diff --git a/certmanager/lib/tests/test_cryptoconfig.cpp b/certmanager/lib/tests/test_cryptoconfig.cpp index 6a8720703..f3c27d0ce 100644 --- a/certmanager/lib/tests/test_cryptoconfig.cpp +++ b/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) diff --git a/certmanager/lib/ui/CMakeLists.txt b/certmanager/lib/ui/CMakeLists.txt index b276022de..dc02268e2 100644 --- a/certmanager/lib/ui/CMakeLists.txt +++ b/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} diff --git a/certmanager/lib/ui/Makefile.am b/certmanager/lib/ui/Makefile.am index f381fb64d..0f13c47ea 100644 --- a/certmanager/lib/ui/Makefile.am +++ b/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) diff --git a/certmanager/lib/ui/keyapprovaldialog.cpp b/certmanager/lib/ui/keyapprovaldialog.cpp index 402235ddd..afad1fb8e 100644 --- a/certmanager/lib/ui/keyapprovaldialog.cpp +++ b/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 diff --git a/certmanager/lib/ui/keyapprovaldialog.h b/certmanager/lib/ui/keyapprovaldialog.h index 5498e27ac..0b368635d 100644 --- a/certmanager/lib/ui/keyapprovaldialog.h +++ b/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 diff --git a/certmanager/lib/ui/keyrequester.cpp b/certmanager/lib/ui/keyrequester.cpp index 01e6902f5..ebde2c163 100644 --- a/certmanager/lib/ui/keyrequester.cpp +++ b/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. diff --git a/certmanager/lib/ui/keyrequester.h b/certmanager/lib/ui/keyrequester.h index 7e23b4b69..5a3d53754 100644 --- a/certmanager/lib/ui/keyrequester.h +++ b/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. diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp index bd4496485..f017f2024 100644 --- a/certmanager/lib/ui/keyselectiondialog.cpp +++ b/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 diff --git a/certmanager/lib/ui/keyselectiondialog.h b/certmanager/lib/ui/keyselectiondialog.h index f4d369b1c..b638947ee 100644 --- a/certmanager/lib/ui/keyselectiondialog.h +++ b/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 diff --git a/certmanager/lib/ui/passphrasedialog.cpp b/certmanager/lib/ui/passphrasedialog.cpp index d88278878..c97493d31 100644 --- a/certmanager/lib/ui/passphrasedialog.cpp +++ b/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. diff --git a/certmanager/lib/ui/passphrasedialog.h b/certmanager/lib/ui/passphrasedialog.h index 15e6c132e..5b969a1ea 100644 --- a/certmanager/lib/ui/passphrasedialog.h +++ b/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. diff --git a/configure.in.in b/configure.in.in index baf4c5476..51e5dc8f9 100644 --- a/configure.in.in +++ b/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) diff --git a/cvs.sh.diff b/cvs.sh.diff index 313956b05..79b780d26 100644 --- a/cvs.sh.diff +++ b/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 diff --git a/dependency-graph.dot b/dependency-graph.dot index 397570890..8403e4d62 100644 --- a/dependency-graph.dot +++ b/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"; diff --git a/doc/kalarm/index.docbook b/doc/kalarm/index.docbook index d641da1fe..0e0d6844f 100644 --- a/doc/kalarm/index.docbook +++ b/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, ⪚ <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> diff --git a/doc/kandy/index.docbook b/doc/kandy/index.docbook index db2e15005..834df10ba 100644 --- a/doc/kandy/index.docbook +++ b/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> diff --git a/doc/karm/index.docbook b/doc/karm/index.docbook index 75cebfdcd..b1465c753 100644 --- a/doc/karm/index.docbook +++ b/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> diff --git a/doc/kmail/faq.docbook b/doc/kmail/faq.docbook index f7ef1e682..10b41e00c 100644 --- a/doc/kmail/faq.docbook +++ b/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> diff --git a/doc/knode/faq.docbook b/doc/knode/faq.docbook index 6f37d8765..1de27ec8e 100644 --- a/doc/knode/faq.docbook +++ b/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 diff --git a/doc/knode/index.docbook b/doc/knode/index.docbook index 7c5250e57..07370490b 100644 --- a/doc/knode/index.docbook +++ b/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> diff --git a/doc/knode/install.docbook b/doc/knode/install.docbook index 6a5f11499..f22390257 100644 --- a/doc/knode/install.docbook +++ b/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; diff --git a/doc/knotes/index.docbook b/doc/knotes/index.docbook index e0a6040cf..73d60ba9e 100644 --- a/doc/knotes/index.docbook +++ b/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> diff --git a/doc/konsolekalendar/index.docbook b/doc/konsolekalendar/index.docbook index 5a4d6c9f8..a20664c34 100644 --- a/doc/konsolekalendar/index.docbook +++ b/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 diff --git a/doc/korganizer/index.docbook b/doc/korganizer/index.docbook index 1444890c0..3097067ea 100644 --- a/doc/korganizer/index.docbook +++ b/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> diff --git a/kaddressbook/CMakeLists.txt b/kaddressbook/CMakeLists.txt index e198127a0..7b000d3a9 100644 --- a/kaddressbook/CMakeLists.txt +++ b/kaddressbook/CMakeLists.txt @@ -9,7 +9,7 @@ # ################################################# -tde_import( libkdenetwork ) +tde_import( libtdenetwork ) tde_import( certmanager ) tde_import( libkmime ) tde_import( ktnef ) diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp index cf9fd767c..cc71bd4f9 100644 --- a/kaddressbook/addresseditwidget.cpp +++ b/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 { diff --git a/kaddressbook/common/locationmap.cpp b/kaddressbook/common/locationmap.cpp index 5023f4608..0e1d4e9cf 100644 --- a/kaddressbook/common/locationmap.cpp +++ b/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> diff --git a/kaddressbook/editors/CMakeLists.txt b/kaddressbook/editors/CMakeLists.txt index 3d7ce5ed3..0fd3d0f8c 100644 --- a/kaddressbook/editors/CMakeLists.txt +++ b/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 diff --git a/kaddressbook/editors/Makefile.am b/kaddressbook/editors/Makefile.am index 378c19b6e..6c1096c02 100644 --- a/kaddressbook/editors/Makefile.am +++ b/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) diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index de847b0e5..bb2408f79 100644 --- a/kaddressbook/kabcore.cpp +++ b/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> diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp index a3775b369..6f99bbcde 100644 --- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp +++ b/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(); diff --git a/kaddressbook/printing/printsortmode.h b/kaddressbook/printing/printsortmode.h index 69125419b..d8ec920df 100644 --- a/kaddressbook/printing/printsortmode.h +++ b/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) diff --git a/kaddressbook/searchmanager.cpp b/kaddressbook/searchmanager.cpp index 1213b8a59..79d77ead7 100644 --- a/kaddressbook/searchmanager.cpp +++ b/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" diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp index 5404fd5cb..b6ab807ba 100644 --- a/kaddressbook/viewmanager.cpp +++ b/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> diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp index b5fb9ded2..404746dc1 100644 --- a/kaddressbook/views/configuretableviewdialog.cpp +++ b/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> diff --git a/kaddressbook/xxport/CMakeLists.txt b/kaddressbook/xxport/CMakeLists.txt index c6c095fbc..2811f5175 100644 --- a/kaddressbook/xxport/CMakeLists.txt +++ b/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} diff --git a/kaddressbook/xxport/Makefile.am b/kaddressbook/xxport/Makefile.am index 8cef2fc77..bdf1e86f5 100644 --- a/kaddressbook/xxport/Makefile.am +++ b/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) diff --git a/kalarm/BUGS b/kalarm/BUGS index ff0c38397..6fd4b388d 100644 --- a/kalarm/BUGS +++ b/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: diff --git a/kalarm/CMakeLists.txt b/kalarm/CMakeLists.txt index 1aac18990..d6a8e052f 100644 --- a/kalarm/CMakeLists.txt +++ b/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 ) diff --git a/kalarm/Makefile.am b/kalarm/Makefile.am index ed8156915..98385f9e6 100644 --- a/kalarm/Makefile.am +++ b/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 diff --git a/kalarm/configure.in.bot b/kalarm/configure.in.bot index 9af89064a..243eb2efb 100644 --- a/kalarm/configure.in.bot +++ b/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 "=================================================================" diff --git a/kalarm/fontcolour.h b/kalarm/fontcolour.h index c4b3a5517..15c051075 100644 --- a/kalarm/fontcolour.h +++ b/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> diff --git a/kalarm/kalarm.h b/kalarm/kalarm.h index f433b3ff0..ddf6ad648 100644 --- a/kalarm/kalarm.h +++ b/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 diff --git a/kalarm/kamail.cpp b/kalarm/kamail.cpp index 261e3865d..2b476d811 100644 --- a/kalarm/kamail.cpp +++ b/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 diff --git a/kalarm/lib/colourcombo.cpp b/kalarm/lib/colourcombo.cpp index 621f3e837..992556848 100644 --- a/kalarm/lib/colourcombo.cpp +++ b/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 diff --git a/kalarm/lib/spinbox.cpp b/kalarm/lib/spinbox.cpp index 625186ca9..a55492ec7 100644 --- a/kalarm/lib/spinbox.cpp +++ b/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" diff --git a/kalarm/mainwindowbase.cpp b/kalarm/mainwindowbase.cpp index 80c68c532..16486e481 100644 --- a/kalarm/mainwindowbase.cpp +++ b/kalarm/mainwindowbase.cpp @@ -19,7 +19,7 @@ */ #include "kalarm.h" -#include <kdeversion.h> +#include <tdeversion.h> #include "kalarmapp.h" #include "mainwindowbase.moc" diff --git a/kandy/Makefile.am b/kandy/Makefile.am index 625eeeca1..2f4462a8e 100644 --- a/kandy/Makefile.am +++ b/kandy/Makefile.am @@ -1,4 +1,4 @@ -## kdebase/Makefile.am +## tdebase/Makefile.am ## (C) 1997 Stephan Kulow SUBDIRS = src profiles diff --git a/karm/karm.kdevelop b/karm/karm.kdevelop index c64212df4..e0436fba1 100644 --- a/karm/karm.kdevelop +++ b/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> diff --git a/kioslaves/imap4/imaps.protocol b/kioslaves/imap4/imaps.protocol index 1846bd3cb..8d3ebac82 100644 --- a/kioslaves/imap4/imaps.protocol +++ b/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 diff --git a/kioslaves/mbox/mbox.cc b/kioslaves/mbox/mbox.cc index 1f9989218..250fbe1c6 100644 --- a/kioslaves/mbox/mbox.cc +++ b/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(); diff --git a/kmail/CMakeLists.txt b/kmail/CMakeLists.txt index 372a05233..9fc6e3f93 100644 --- a/kmail/CMakeLists.txt +++ b/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 diff --git a/kmail/ChangeLog b/kmail/ChangeLog index c055ab4cf..a744dcf7b 100644 --- a/kmail/ChangeLog +++ b/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 diff --git a/kmail/Mainpage.dox b/kmail/Mainpage.dox index cc1111582..9c24f4598 100644 --- a/kmail/Mainpage.dox +++ b/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... diff --git a/kmail/Makefile.am b/kmail/Makefile.am index 0bcdbefac..9dd1dc0db 100644 --- a/kmail/Makefile.am +++ b/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 \ diff --git a/kmail/cachedimapjob.cpp b/kmail/cachedimapjob.cpp index 6dcae58c1..f47cc9ddf 100644 --- a/kmail/cachedimapjob.cpp +++ b/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); diff --git a/kmail/configure.in.in b/kmail/configure.in.in index bcf4e8bcc..694a8359e 100644 --- a/kmail/configure.in.in +++ b/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 ------------------------------------------------------------------------ diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp index 03bd834d8..59223cf89 100644 --- a/kmail/configuredialog.cpp +++ b/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 ) ) diff --git a/kmail/configuredialog_p.cpp b/kmail/configuredialog_p.cpp index a7fe20419..6357e1e86 100644 --- a/kmail/configuredialog_p.cpp +++ b/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> diff --git a/kmail/editorwatcher.cpp b/kmail/editorwatcher.cpp index 48facf1f4..56282fed2 100644 --- a/kmail/editorwatcher.cpp +++ b/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> diff --git a/kmail/filterlogdlg.cpp b/kmail/filterlogdlg.cpp index bd0d15d69..33bfa8d39 100644 --- a/kmail/filterlogdlg.cpp +++ b/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> diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp index c714789cc..26daf6a23 100644 --- a/kmail/folderdiaacltab.cpp +++ b/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 diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp index 5470084a8..f1dbaae11 100644 --- a/kmail/imapaccountbase.cpp +++ b/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; diff --git a/kmail/keyresolver.cpp b/kmail/keyresolver.cpp index 5d156f8ec..c6abdd95e 100644 --- a/kmail/keyresolver.cpp +++ b/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 diff --git a/kmail/keyresolver.h b/kmail/keyresolver.h index c7ec0430d..c7bdfe25c 100644 --- a/kmail/keyresolver.h +++ b/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 diff --git a/kmail/kmaddrbook.h b/kmail/kmaddrbook.h index ea767d421..1a7c9222e 100644 --- a/kmail/kmaddrbook.h +++ b/kmail/kmaddrbook.h @@ -22,7 +22,7 @@ #include <tqstringlist.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kabc/addressee.h> class TQWidget; diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp index f14a6faa7..452f3fe43 100644 --- a/kmail/kmail_part.cpp +++ b/kmail/kmail_part.cpp @@ -205,7 +205,7 @@ void KMailPart::slotNameChanged( KMFolderTreeItem *fti ) // method KParts::MainWindow::createGUI() since we need to call it so that // the toolbar is redrawn when necessary. // It can be removed once createGUI() has been made public _and_ we don't -// longer rely on kdelibs 3.2. +// longer rely on tdelibs 3.2. class KPartsMainWindowWithPublicizedCreateGUI : public KParts::MainWindow { public: diff --git a/kmail/kmail_part.h b/kmail/kmail_part.h index 647beb8b8..6d0a53827 100644 --- a/kmail/kmail_part.h +++ b/kmail/kmail_part.h @@ -27,7 +27,7 @@ #include "kmailpartIface.h" -#include <kdeversion.h> +#include <tdeversion.h> #include <kparts/browserextension.h> #include <kparts/statusbarextension.h> #include <kparts/factory.h> diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp index cc8059ccd..a161070df 100644 --- a/kmail/kmcomposewin.cpp +++ b/kmail/kmcomposewin.cpp @@ -1659,7 +1659,7 @@ void KMComposeWin::setupEditor(void) // Font setup slotUpdateFont(); - /* installRBPopup() is broken in kdelibs, we should wait for + /* installRBPopup() is broken in tdelibs, we should wait for the new klibtextedit (dnaber, 2002-01-01) menu = new TQPopupMenu(this); //#ifdef BROKEN diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h index 015bf30d0..6193e8cb7 100644 --- a/kmail/kmcomposewin.h +++ b/kmail/kmcomposewin.h @@ -30,7 +30,7 @@ #include <kio/job.h> #include <kglobalsettings.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <keditcl.h> #include <ktempdir.h> diff --git a/kmail/kmedit.h b/kmail/kmedit.h index a27a44804..4d2535e4d 100644 --- a/kmail/kmedit.h +++ b/kmail/kmedit.h @@ -5,7 +5,7 @@ #ifndef __KMAIL_KMEDIT_H__ #define __KMAIL_KMEDIT_H__ -#include <kdeversion.h> +#include <tdeversion.h> #include <keditcl.h> #include <kspell.h> #include <ksyntaxhighlighter.h> diff --git a/kmail/kmfilteraction.h b/kmail/kmfilteraction.h index 451c9b5b6..0f635bad5 100644 --- a/kmail/kmfilteraction.h +++ b/kmail/kmfilteraction.h @@ -494,7 +494,7 @@ public: /** Abstract base class for KMail's filter actions that need a command line as parameter, e.g. 'forward to'. Can create a TQLineEdit - (are there better widgets in the depths of the kdelibs?) as + (are there better widgets in the depths of the tdelibs?) as parameter widget. A subclass of this must provide at least implementations for the following methods: diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp index 54334d8ac..3caa18c23 100644 --- a/kmail/kmkernel.cpp +++ b/kmail/kmkernel.cpp @@ -146,10 +146,10 @@ KMKernel::KMKernel (TQObject *parent, const char *name) : new Kpgp::Module(); - // register our own (libkdenetwork) utf-7 codec as long as TQt + // register our own (libtdenetwork) utf-7 codec as long as TQt // doesn't have it's own: if ( !TQTextCodec::codecForName("utf-7") ) { - kdDebug(5006) << "No TQt-native utf-7 codec found; registering TQUtf7Codec from libkdenetwork" << endl; + kdDebug(5006) << "No TQt-native utf-7 codec found; registering TQUtf7Codec from libtdenetwork" << endl; (void) new TQUtf7Codec(); } diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h index 05dac4a19..ef1688a66 100644 --- a/kmail/kmkernel.h +++ b/kmail/kmkernel.h @@ -10,7 +10,7 @@ #include <weaverlogger.h> #include <kconfig.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kimproxy.h> #include <tdepimmacros.h> diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp index fc782fbb2..1dc08d053 100644 --- a/kmail/kmmainwidget.cpp +++ b/kmail/kmmainwidget.cpp @@ -183,7 +183,7 @@ KMMainWidget::KMMainWidget(TQWidget *parent, const char *name, mCustomForwardMapper = 0; // FIXME This should become a line separator as soon as the API - // is extended in kdelibs. + // is extended in tdelibs. mToolbarActionSeparator = new KActionSeparator( actionCollection ); if( !s_mainWidgetList ) diff --git a/kmail/kmmainwin.h b/kmail/kmmainwin.h index 4e784e121..e4c9fa043 100644 --- a/kmail/kmmainwin.h +++ b/kmail/kmmainwin.h @@ -21,7 +21,7 @@ #define __KMMAINWIN #include <kmainwindow.h> -#include "kdeversion.h" +#include "tdeversion.h" #include "tqstring.h" class KMMainWidget; diff --git a/kmail/kmmsgpartdlg.cpp b/kmail/kmmsgpartdlg.cpp index 4a1b94fbc..31a1e9321 100644 --- a/kmail/kmmsgpartdlg.cpp +++ b/kmail/kmmsgpartdlg.cpp @@ -10,7 +10,7 @@ #include "kmmsgpart.h" #include "kcursorsaver.h" -// other kdenetwork includes: (none) +// other tdenetwork includes: (none) // other KDE includes: #include <kmimetype.h> diff --git a/kmail/kmsender.cpp b/kmail/kmsender.cpp index 86e931cf9..761f4d60a 100644 --- a/kmail/kmsender.cpp +++ b/kmail/kmsender.cpp @@ -14,7 +14,7 @@ using namespace KMime::Types; #include <kio/scheduler.h> #include <kapplication.h> #include <kmessagebox.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <klocale.h> #include <kdebug.h> #include <kconfig.h> diff --git a/kmail/kmsender.h b/kmail/kmsender.h index 3c7c6c0ec..a94059761 100644 --- a/kmail/kmsender.h +++ b/kmail/kmsender.h @@ -32,7 +32,7 @@ #include <tqstringlist.h> #include <tqmap.h> #include <tqobject.h> -#include <kdeversion.h> +#include <tdeversion.h> class KMMessage; class KMFolder; diff --git a/kmail/kmsender_p.h b/kmail/kmsender_p.h index a541e1530..ddfb56f98 100644 --- a/kmail/kmsender_p.h +++ b/kmail/kmsender_p.h @@ -10,7 +10,7 @@ #include <tqstringlist.h> #include <tqobject.h> #include <kio/global.h> -#include <kdeversion.h> +#include <tdeversion.h> class KProcess; diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp index 0955fdd69..0e5103e29 100644 --- a/kmail/objecttreeparser.cpp +++ b/kmail/objecttreeparser.cpp @@ -2144,7 +2144,7 @@ TQString ObjectTreeParser::sigStatusToString( const Kleo::CryptoBackend::Protoco } else if ( cryptProto == Kleo::CryptoBackendFactory::instance()->smime() ) { // process status bits according to SigStatus_... - // definitions in kdenetwork/libkdenetwork/cryptplug.h + // definitions in tdenetwork/libtdenetwork/cryptplug.h if( summary == GpgME::Signature::None ) { result = i18n("No status information available."); diff --git a/kmail/snippetconfig.cpp b/kmail/snippetconfig.cpp index 2424bbd23..7d58dff56 100644 --- a/kmail/snippetconfig.cpp +++ b/kmail/snippetconfig.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * snippet feature from kdevelop/plugins/snippet/ * + * snippet feature from tdevelop/plugins/snippet/ * * * * Copyright (C) 2007 by Robert Gruber * * rgruber@users.sourceforge.net * diff --git a/kmail/snippetconfig.h b/kmail/snippetconfig.h index 48738b7a1..ec3135757 100644 --- a/kmail/snippetconfig.h +++ b/kmail/snippetconfig.h @@ -1,5 +1,5 @@ /*************************************************************************** - * snippet feature from kdevelop/plugins/snippet/ * + * snippet feature from tdevelop/plugins/snippet/ * * * * Copyright (C) 2007 by Robert Gruber * * rgruber@users.sourceforge.net * diff --git a/kmail/snippetdlg.cpp b/kmail/snippetdlg.cpp index 25a64ae65..4197fa196 100644 --- a/kmail/snippetdlg.cpp +++ b/kmail/snippetdlg.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * snippet feature from kdevelop/plugins/snippet/ * + * snippet feature from tdevelop/plugins/snippet/ * * * * Copyright (C) 2007 by Robert Gruber * * rgruber@users.sourceforge.net * diff --git a/kmail/snippetitem.cpp b/kmail/snippetitem.cpp index f9f3aa871..7839511ae 100644 --- a/kmail/snippetitem.cpp +++ b/kmail/snippetitem.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * snippet feature from kdevelop/plugins/snippet/ * + * snippet feature from tdevelop/plugins/snippet/ * * * * Copyright (C) 2007 by Robert Gruber * * rgruber@users.sourceforge.net * diff --git a/kmail/snippetitem.h b/kmail/snippetitem.h index f15fb07d6..4274fde85 100644 --- a/kmail/snippetitem.h +++ b/kmail/snippetitem.h @@ -1,5 +1,5 @@ /*************************************************************************** - * snippet feature from kdevelop/plugins/snippet/ * + * snippet feature from tdevelop/plugins/snippet/ * * * * Copyright (C) 2007 by Robert Gruber * * rgruber@users.sourceforge.net * diff --git a/kmail/snippetsettings.cpp b/kmail/snippetsettings.cpp index e61ebf43c..749943887 100644 --- a/kmail/snippetsettings.cpp +++ b/kmail/snippetsettings.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * snippet feature from kdevelop/plugins/snippet/ * + * snippet feature from tdevelop/plugins/snippet/ * * * * Copyright (C) 2007 by Robert Gruber * * rgruber@users.sourceforge.net * diff --git a/kmail/snippetsettings.h b/kmail/snippetsettings.h index ca0eccc80..6d908a9f8 100644 --- a/kmail/snippetsettings.h +++ b/kmail/snippetsettings.h @@ -1,5 +1,5 @@ /*************************************************************************** - * snippet feature from kdevelop/plugins/snippet/ * + * snippet feature from tdevelop/plugins/snippet/ * * * * Copyright (C) 2007 by Robert Gruber * * rgruber@users.sourceforge.net * diff --git a/kmail/snippetwidget.cpp b/kmail/snippetwidget.cpp index 920434aa7..aff2e8067 100644 --- a/kmail/snippetwidget.cpp +++ b/kmail/snippetwidget.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * snippet feature from kdevelop/plugins/snippet/ * + * snippet feature from tdevelop/plugins/snippet/ * * * * Copyright (C) 2007 by Robert Gruber * * rgruber@users.sourceforge.net * diff --git a/kmail/snippetwidget.h b/kmail/snippetwidget.h index a55b91e09..45d684ec8 100644 --- a/kmail/snippetwidget.h +++ b/kmail/snippetwidget.h @@ -1,5 +1,5 @@ /*************************************************************************** - * snippet feature from kdevelop/plugins/snippet/ * + * snippet feature from tdevelop/plugins/snippet/ * * * * Copyright (C) 2007 by Robert Gruber * * rgruber@users.sourceforge.net * diff --git a/kmobile/TODO b/kmobile/TODO index c3cd68d86..308ce6744 100644 --- a/kmobile/TODO +++ b/kmobile/TODO @@ -15,7 +15,7 @@ TODO: - kitchensync driver/plugin (starting...) - a plugin for the left side of the "Open File Dialog". -> makes direct access to mobile tqdevices really easy -- make the daemon a KDED (KDE Meta Daemon) module (kdelibs/kded/HOWTO, README.kded) +- make the daemon a KDED (KDE Meta Daemon) module (tdelibs/kded/HOWTO, README.kded) - more drivers (always) General Interface TODO: diff --git a/knode/headerview.cpp b/knode/headerview.cpp index 1451844df..78b46a4cf 100644 --- a/knode/headerview.cpp +++ b/knode/headerview.cpp @@ -19,7 +19,7 @@ #include <klocale.h> #include <kdebug.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kpopupmenu.h> #include "knglobals.h" diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp index af9132d70..de354ef76 100644 --- a/knode/kncomposer.cpp +++ b/knode/kncomposer.cpp @@ -17,7 +17,7 @@ #include <tqclipboard.h> #include <tqapplication.h> #include <kspelldlg.h> -#include <kdeversion.h> +#include <tdeversion.h> #include "addressesdialog.h" using KPIM::AddressesDialog; #include "recentaddresses.h" diff --git a/knode/kncomposer.h b/knode/kncomposer.h index d4a4c2a87..f72f43988 100644 --- a/knode/kncomposer.h +++ b/knode/kncomposer.h @@ -23,7 +23,7 @@ #include <tqlineedit.h> #include <tqregexp.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <keditcl.h> #include <kabc/addresslineedit.h> diff --git a/knode/knhdrviewitem.cpp b/knode/knhdrviewitem.cpp index 207d22ba4..cf2713b8d 100644 --- a/knode/knhdrviewitem.cpp +++ b/knode/knhdrviewitem.cpp @@ -17,7 +17,7 @@ #include <tqdragobject.h> #include <tqpainter.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kdebug.h> #include <kstringhandler.h> diff --git a/knode/knode_part.h b/knode/knode_part.h index b0ed4afae..4b0043f32 100644 --- a/knode/knode_part.h +++ b/knode/knode_part.h @@ -25,7 +25,7 @@ #define KNODE_PART_H -#include <kdeversion.h> +#include <tdeversion.h> #include <kparts/browserextension.h> #include <kparts/factory.h> #include <kparts/event.h> diff --git a/knotes/ChangeLog b/knotes/ChangeLog index b50317249..82d42d7f4 100644 --- a/knotes/ChangeLog +++ b/knotes/ChangeLog @@ -117,7 +117,7 @@ ChangeLog for KNotes 2004/09/27 Michael Brade <brade@kde.org> - * no compile-time dependency on kdebase allowed, so read twinrc directly + * no compile-time dependency on tdebase allowed, so read twinrc directly 2004/08/31 Michael Brade <brade@kde.org> @@ -229,7 +229,7 @@ ChangeLog for KNotes 2004/04/20 Michael Brade <brade@kde.org> - * revert dependency on kdelibs-HEAD, we need KDE 3.2.x for the KDE PIM 3.3 + * revert dependency on tdelibs-HEAD, we need KDE 3.2.x for the KDE PIM 3.3 release * add a hack to work around inconsistency/limitation in KConfig XT: it is not possible to make one KCXT-generated class inherit another diff --git a/knotes/knote.cpp b/knotes/knote.cpp index b2a804be5..430a5dca5 100644 --- a/knotes/knote.cpp +++ b/knotes/knote.cpp @@ -227,7 +227,7 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char * if ( newNote ) { - // until kdelibs provides copying of KConfigSkeletons (KDE 3.4) + // until tdelibs provides copying of KConfigSkeletons (KDE 3.4) KNotesGlobalConfig *globalConfig = KNotesGlobalConfig::self(); m_config->setBgColor( globalConfig->bgColor() ); m_config->setFgColor( globalConfig->fgColor() ); diff --git a/kontact/CMakeLists.txt b/kontact/CMakeLists.txt index cb7aff9c7..587d01049 100644 --- a/kontact/CMakeLists.txt +++ b/kontact/CMakeLists.txt @@ -9,7 +9,7 @@ # ################################################# -tde_import( libkdenetwork ) +tde_import( libtdenetwork ) tde_import( libkmime ) tde_import( ktnef ) tde_import( libkcal ) diff --git a/kontact/Thoughts b/kontact/Thoughts index f228e1f86..6fca8f43c 100644 --- a/kontact/Thoughts +++ b/kontact/Thoughts @@ -19,8 +19,8 @@ d predefined type as page in a KDialogBase or offer a pointer to a KDialogBase d -> requires a Kontact part or an external lib per part m I believe this is a more general problem. Please take a look at -m kdegraphics/kview/kpreferences{dialog,module}.{h,cpp}. I'd like to generalize -m these classes and include them into kdelibs (the same configuration merge is +m tdegraphics/kview/kpreferences{dialog,module}.{h,cpp}. I'd like to generalize +m these classes and include them into tdelibs (the same configuration merge is m being done in Kate, Noatun, Kopete, KView and probably more). # The problem is even more generic. We also have to merge about boxes, tips of @@ -210,7 +210,7 @@ d We need a more sophisticated handling (progressbar, etc) Don: Definitely. -# We now have kdelibs/kparts/statusbarextension. This is intended to solve these +# We now have tdelibs/kparts/statusbarextension. This is intended to solve these # problems, right? d: Right. Simply add it as childobject in your part and use it's API. Works even diff --git a/kontact/plugins/kmail/CMakeLists.txt b/kontact/plugins/kmail/CMakeLists.txt index f84e7a572..b50f2e9c9 100644 --- a/kontact/plugins/kmail/CMakeLists.txt +++ b/kontact/plugins/kmail/CMakeLists.txt @@ -18,7 +18,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/libtdepim ${CMAKE_SOURCE_DIR}/kmail ${CMAKE_SOURCE_DIR}/certmanager/lib - ${CMAKE_SOURCE_DIR}/libkdenetwork + ${CMAKE_SOURCE_DIR}/libtdenetwork ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ${GPGME_INCLUDE_DIRS} diff --git a/kontact/plugins/kmail/Makefile.am b/kontact/plugins/kmail/Makefile.am index 2dceb467a..823025482 100644 --- a/kontact/plugins/kmail/Makefile.am +++ b/kontact/plugins/kmail/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir)/kmail -I$(top_builddir)/kmail \ -I$(top_srcdir)/libtdepim \ - -I$(top_srcdir)/libkdenetwork \ + -I$(top_srcdir)/libtdenetwork \ -I$(top_srcdir)/certmanager/lib \ -I$(top_srcdir) $(all_includes) diff --git a/korganizer/CMakeLists.txt b/korganizer/CMakeLists.txt index 85f49c577..62055d0c0 100644 --- a/korganizer/CMakeLists.txt +++ b/korganizer/CMakeLists.txt @@ -18,7 +18,7 @@ tde_import( libtdepim ) tde_import( libkmime ) tde_import( ktnef ) tde_import( libkcal ) -tde_import( libkdenetwork ) +tde_import( libtdenetwork ) tde_import( certmanager ) tde_import( libkpimidentities ) tde_import( libkholidays ) diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp index ce8521a13..7a27df738 100644 --- a/korganizer/actionmanager.cpp +++ b/korganizer/actionmanager.cpp @@ -68,7 +68,7 @@ #include <twin.h> #include <knotifyclient.h> #include <kstdguiitem.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kactionclasses.h> #include <kcmdlineargs.h> diff --git a/korganizer/korgac/alarmdockwindow.cpp b/korganizer/korgac/alarmdockwindow.cpp index 85673ef03..9e4e9c238 100644 --- a/korganizer/korgac/alarmdockwindow.cpp +++ b/korganizer/korgac/alarmdockwindow.cpp @@ -27,7 +27,7 @@ #include <kapplication.h> #include <kdebug.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <klocale.h> #include <kiconloader.h> #include <kconfig.h> diff --git a/korganizer/printing/calprinter.cpp b/korganizer/printing/calprinter.cpp index c990dccd5..e87f3c5a3 100644 --- a/korganizer/printing/calprinter.cpp +++ b/korganizer/printing/calprinter.cpp @@ -36,7 +36,7 @@ #include <kprinter.h> #include <ksimpleconfig.h> #include <kdebug.h> -#include <kdeversion.h> +#include <tdeversion.h> #include "korganizer/corehelper.h" diff --git a/korganizer/version.h b/korganizer/version.h index 2ab3ba546..c74a7ed34 100644 --- a/korganizer/version.h +++ b/korganizer/version.h @@ -32,7 +32,7 @@ y is the major release number. z is the minor release number. - "x.y.z" follow the kdelibs version KOrganizer is released with. + "x.y.z" follow the tdelibs version KOrganizer is released with. If "z" is 0, it the version is "x.y" diff --git a/kresources/groupwise/kioslave/groupwise.cpp b/kresources/groupwise/kioslave/groupwise.cpp index a2f305a21..4ebb2e387 100644 --- a/kresources/groupwise/kioslave/groupwise.cpp +++ b/kresources/groupwise/kioslave/groupwise.cpp @@ -38,7 +38,7 @@ #include <kdebug.h> #include <klocale.h> #include <ktempfile.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <sys/types.h> #include <unistd.h> diff --git a/kresources/scalix/kioslave/scalix.cpp b/kresources/scalix/kioslave/scalix.cpp index 8b8c15c5c..acfa088e6 100644 --- a/kresources/scalix/kioslave/scalix.cpp +++ b/kresources/scalix/kioslave/scalix.cpp @@ -24,7 +24,7 @@ #include <kapplication.h> #include <kcmdlineargs.h> #include <kdebug.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kio/global.h> #include <klocale.h> diff --git a/kresources/tvanytime/tvanytime.kdevelop b/kresources/tvanytime/tvanytime.kdevelop index c938252bc..aba23b3af 100644 --- a/kresources/tvanytime/tvanytime.kdevelop +++ b/kresources/tvanytime/tvanytime.kdevelop @@ -1,5 +1,5 @@ <?xml version = '1.0'?> -<kdevelop> +<tdevelop> <general> <author>Will Stephenson</author> <email>wstephenson@kde.org</email> @@ -163,7 +163,7 @@ </substmap> <kdevcppsupport> <references> - <pcs>kdelibs</pcs> + <pcs>tdelibs</pcs> <pcs>project</pcs> <pcs>libkcal</pcs> </references> @@ -199,4 +199,4 @@ <implementationsuffix>.cpp</implementationsuffix> </filetemplates> </cppsupportpart> -</kdevelop> +</tdevelop> diff --git a/libemailfunctions/kasciistricmp.h b/libemailfunctions/kasciistricmp.h index 8d423d42c..a7abc104e 100644 --- a/libemailfunctions/kasciistricmp.h +++ b/libemailfunctions/kasciistricmp.h @@ -16,13 +16,13 @@ Boston, MA 02110-1301, USA. */ -#include <kdeversion.h> +#include <tdeversion.h> #if KDE_IS_VERSION(3,3,89) // get kasciistricmp from kglobal.h #include <kglobal.h> #else -// define kasciistricmp to this tdepim symbol (renamed to avoid problems when upgrading kdelibs later) +// define kasciistricmp to this tdepim symbol (renamed to avoid problems when upgrading tdelibs later) int tdepim_kasciistricmp( const char *str1, const char *str2 ); #define kasciistricmp tdepim_kasciistricmp #endif diff --git a/libkcal/HACKING b/libkcal/HACKING index 1029d1b42..fc431906e 100644 --- a/libkcal/HACKING +++ b/libkcal/HACKING @@ -1,4 +1,4 @@ -See kdelibs/kabc/HACKING or http://korganizer.kde.org/develop/hacking.html for +See tdelibs/kabc/HACKING or http://korganizer.kde.org/develop/hacking.html for general coding style conventions. Additional conventions for libkcal and KOrganizer: diff --git a/libkdenetwork/CMakeLists.txt b/libkdenetwork/CMakeLists.txt index 5c0290f15..1eaefeaa5 100644 --- a/libkdenetwork/CMakeLists.txt +++ b/libkdenetwork/CMakeLists.txt @@ -9,7 +9,7 @@ # ################################################# -project( libkdenetwork ) +project( libtdenetwork ) add_subdirectory( gpgmepp ) add_subdirectory( qgpgme ) diff --git a/libkdenetwork/gpgmepp/CMakeLists.txt b/libkdenetwork/gpgmepp/CMakeLists.txt index 02b50d7a7..cf4efc7f7 100644 --- a/libkdenetwork/gpgmepp/CMakeLists.txt +++ b/libkdenetwork/gpgmepp/CMakeLists.txt @@ -15,7 +15,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/libkdenetwork + ${CMAKE_SOURCE_DIR}/libtdenetwork ${CMAKE_SOURCE_DIR}/libtdepim ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} diff --git a/libkdenetwork/gpgmepp/Makefile.am b/libkdenetwork/gpgmepp/Makefile.am index 01d72de3f..d4ebfde99 100644 --- a/libkdenetwork/gpgmepp/Makefile.am +++ b/libkdenetwork/gpgmepp/Makefile.am @@ -3,7 +3,7 @@ KDE_OPTIONS = foreign SUBDIRS = interfaces . -INCLUDES = -I$(top_srcdir)/libkdenetwork -I$(top_srcdir)/libkdenetwork/gpgmepp \ +INCLUDES = -I$(top_srcdir)/libtdenetwork -I$(top_srcdir)/libtdenetwork/gpgmepp \ $(GPGME_CFLAGS) $(all_includes) gpgmeppdir = $(includedir)/gpgme++ diff --git a/libkdenetwork/gpgmepp/configure.in.bot b/libkdenetwork/gpgmepp/configure.in.bot index 100cc65c7..e4b1a8842 100644 --- a/libkdenetwork/gpgmepp/configure.in.bot +++ b/libkdenetwork/gpgmepp/configure.in.bot @@ -1,7 +1,7 @@ if test -z "$GPGME_LIBS" || test -n "$tdepim_needs_gpgme_copy" ; then echo echo "You are missing gpgme 0.4.5 or higher." - echo "Gpgme will be built statically from libkdenetwork/libgpgme-copy." + echo "Gpgme will be built statically from libtdenetwork/libgpgme-copy." echo "If you are a packager, we most strongly recommend to build against" echo "the system's shared gpgme." echo "Consider downloading gpgme >= 0.4.5 from ftp://ftp.gnupg.org/gcrypt/alpha/gpgme" diff --git a/libkdenetwork/gpgmepp/configure.in.in b/libkdenetwork/gpgmepp/configure.in.in index 74ebc4d36..6361be451 100644 --- a/libkdenetwork/gpgmepp/configure.in.in +++ b/libkdenetwork/gpgmepp/configure.in.in @@ -171,8 +171,8 @@ TDEPIM_PATH_GPGME(0.4.5,[ ],[ tdepim_needs_gpgme_copy="true" - GPGME_CFLAGS='-I$(top_srcdir)/libkdenetwork/libgpgme-copy/gpgme -I$(top_srcdir)/libkdenetwork/libgpg-error-copy -I$(top_builddir)/libkdenetwork/libgpg-error-copy' - GPGME_LIBS='$(top_builddir)/libkdenetwork/libgpgme-copy/gpgme/libgpgme.la' + GPGME_CFLAGS='-I$(top_srcdir)/libtdenetwork/libgpgme-copy/gpgme -I$(top_srcdir)/libtdenetwork/libgpg-error-copy -I$(top_builddir)/libtdenetwork/libgpg-error-copy' + GPGME_LIBS='$(top_builddir)/libtdenetwork/libgpgme-copy/gpgme/libgpgme.la' GPGME_LIBS_DEP='$(GPGME_LIBS)' # All of this is in gpgme-copy AC_DEFINE(HAVE_GPGME_KEYLIST_MODE_VALIDATE, 1, [Define to 1 if your gpgme supports GPGME_KEYLIST_MODE_VALIDATE]) diff --git a/libkdenetwork/qgpgme/CMakeLists.txt b/libkdenetwork/qgpgme/CMakeLists.txt index d7a55a5a1..1de99beb5 100644 --- a/libkdenetwork/qgpgme/CMakeLists.txt +++ b/libkdenetwork/qgpgme/CMakeLists.txt @@ -12,7 +12,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/libkdenetwork + ${CMAKE_SOURCE_DIR}/libtdenetwork ${CMAKE_SOURCE_DIR}/libtdepim ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} diff --git a/libkdenetwork/qgpgme/Makefile.am b/libkdenetwork/qgpgme/Makefile.am index 87ff793f4..108760a05 100644 --- a/libkdenetwork/qgpgme/Makefile.am +++ b/libkdenetwork/qgpgme/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = . tests -INCLUDES = -I$(top_srcdir)/libkdenetwork $(all_includes) +INCLUDES = -I$(top_srcdir)/libtdenetwork $(all_includes) lib_LTLIBRARIES = libqgpgme.la diff --git a/libkdenetwork/qgpgme/tests/Makefile.am b/libkdenetwork/qgpgme/tests/Makefile.am index 1f3100e65..5c2436d04 100644 --- a/libkdenetwork/qgpgme/tests/Makefile.am +++ b/libkdenetwork/qgpgme/tests/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_srcdir)/libkdenetwork $(GPGME_CFLAGS) $(all_includes) +INCLUDES = -I$(top_srcdir)/libtdenetwork $(GPGME_CFLAGS) $(all_includes) check_PROGRAMS = dataprovidertest diff --git a/libkholidays/holidays/holiday_it b/libkholidays/holidays/holiday_it index 2428122a4..fed9d1407 100644 --- a/libkholidays/holidays/holiday_it +++ b/libkholidays/holidays/holiday_it @@ -1,7 +1,7 @@ : : Italian holiday file. : by Riccardo Scateni (riccardo@crs4.it) -: Updated and maintained by the Italian l10n team (kde-i18n-it@kde.org) +: Updated and maintained by the Italian l10n team (tde-i18n-it@kde.org) : : "weekend" or "red" indicate a "proper" holiday (i.e. you do not work) : Other colours (black, green, yellow, blue, magenta, cyan, white) diff --git a/libkmime/kmime_util.cpp b/libkmime/kmime_util.cpp index 624e0dae3..8110227e5 100644 --- a/libkmime/kmime_util.cpp +++ b/libkmime/kmime_util.cpp @@ -24,7 +24,7 @@ #include <kglobal.h> #include <klocale.h> #include <kcharsets.h> -#include <kdeversion.h> +#include <tdeversion.h> #if KDE_IS_VERSION( 3, 1, 90 ) #include <kcalendarsystem.h> #endif diff --git a/libkmime/tests/test_kmime_codec.cpp b/libkmime/tests/test_kmime_codec.cpp index 6562cbc25..57b1343e2 100644 --- a/libkmime/tests/test_kmime_codec.cpp +++ b/libkmime/tests/test_kmime_codec.cpp @@ -1,7 +1,7 @@ /* test program for KMime::Codec's: compile with: g++ -I$TQTDIR/include -I$KDEDIR/include -L$TQTDIR/lib -L$KDEDIR/lib \ - -lqt-mt -ltdecore -lkdenetwork -O2 -pthread -DTQT_THREAD_SUPPORT \ + -lqt-mt -ltdecore -ltdenetwork -O2 -pthread -DTQT_THREAD_SUPPORT \ -o test_kmime_codec{,.cpp} */ diff --git a/libkpimexchange/configure.in.in b/libkpimexchange/configure.in.in index ddfaf162b..43906b311 100644 --- a/libkpimexchange/configure.in.in +++ b/libkpimexchange/configure.in.in @@ -1,6 +1,6 @@ dnl build with exchange support -AC_MSG_CHECKING([if kdelibs has recent webdav]) +AC_MSG_CHECKING([if tdelibs has recent webdav]) AC_LANG_SAVE kde_safe_cppflags=$CPPFLAGS CPPFLAGS="$CPPFLAGS $all_includes" diff --git a/libkpimidentities/CMakeLists.txt b/libkpimidentities/CMakeLists.txt index 9c4118127..033bce841 100644 --- a/libkpimidentities/CMakeLists.txt +++ b/libkpimidentities/CMakeLists.txt @@ -14,7 +14,7 @@ project( libkpimidentities ) tde_import( ktnef ) tde_import( libkmime ) tde_import( libkcal ) -tde_import( libkdenetwork ) +tde_import( libtdenetwork ) tde_import( certmanager ) tde_import( libtdepim ) diff --git a/libkpimidentities/identitymanager.cpp b/libkpimidentities/identitymanager.cpp index 22036f8d0..2c63d0534 100644 --- a/libkpimidentities/identitymanager.cpp +++ b/libkpimidentities/identitymanager.cpp @@ -74,7 +74,7 @@ IdentityManager::IdentityManager( bool readonly, TQObject * parent, const char * readConfig(mConfig); if ( mIdentities.isEmpty() ) { kdDebug(5006) << "emailidentities is empty -> convert from kmailrc" << endl; - // No emailidentities file, or an empty one due to broken conversion (kconf_update bug in kdelibs <= 3.2.2) + // No emailidentities file, or an empty one due to broken conversion (kconf_update bug in tdelibs <= 3.2.2) // => convert it, i.e. read settings from kmailrc KConfig kmailConf( "kmailrc", true ); readConfig( &kmailConf ); diff --git a/libtdepim/README b/libtdepim/README index dfaefe79f..ea30f224a 100644 --- a/libtdepim/README +++ b/libtdepim/README @@ -1,4 +1,4 @@ -This directory contains the library for the kdenetwork package. +This directory contains the library for the tdenetwork package. Contents: ksieve_* The beginning of a Sieve parser and interpreter diff --git a/libtdepim/completionordereditor.cpp b/libtdepim/completionordereditor.cpp index 994eb09b3..0ee36a290 100644 --- a/libtdepim/completionordereditor.cpp +++ b/libtdepim/completionordereditor.cpp @@ -129,7 +129,7 @@ private: void SimpleCompletionItem::save( CompletionOrderEditor* editor ) { // Maybe KABC::Resource could have a completionWeight setting (for readConfig/writeConfig) - // But for kdelibs-3.2 compat purposes I can't do that. + // But for tdelibs-3.2 compat purposes I can't do that. KConfigGroup group( editor->configFile(), "CompletionWeights" ); group.writeEntry( mIdentifier, mWeight ); } diff --git a/libtdepim/distributionlist.h b/libtdepim/distributionlist.h index 99391fca3..afc5a5bd2 100644 --- a/libtdepim/distributionlist.h +++ b/libtdepim/distributionlist.h @@ -36,7 +36,7 @@ namespace KPIM { * associated with an address book entry. If the address book entry changes, the * entry in the distribution list is automatically updated. * - * This should go into kdelibs in KDE4. + * This should go into tdelibs in KDE4. * * @author David Faure <faure@kde.org> */ diff --git a/libtdepim/kaddrbook.cpp b/libtdepim/kaddrbook.cpp index e929bbe00..7854be1d1 100644 --- a/libtdepim/kaddrbook.cpp +++ b/libtdepim/kaddrbook.cpp @@ -17,7 +17,7 @@ #include <kdebug.h> #include <klocale.h> #include <kmessagebox.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kabc/resource.h> #include <kabc/stdaddressbook.h> #include <kabc/vcardconverter.h> diff --git a/libtdepim/kaddrbook.h b/libtdepim/kaddrbook.h index f2bab1003..e15d7a9f8 100644 --- a/libtdepim/kaddrbook.h +++ b/libtdepim/kaddrbook.h @@ -7,7 +7,7 @@ #include <tqstringlist.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kabc/addressee.h> #include <tdepimmacros.h> diff --git a/libtdepim/kpartsdesignerplugin/README b/libtdepim/kpartsdesignerplugin/README index fb9f42837..0dbcb2ecf 100644 --- a/libtdepim/kpartsdesignerplugin/README +++ b/libtdepim/kpartsdesignerplugin/README @@ -1,2 +1,2 @@ -When moving this to kdelibs: the KPartsGenericPart class should move to libkparts so +When moving this to tdelibs: the KPartsGenericPart class should move to libkparts so that it's possible to add an accessor for m_part there. diff --git a/libtdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp b/libtdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp index c3eedc329..a83a5a7a2 100644 --- a/libtdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp +++ b/libtdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp @@ -103,7 +103,7 @@ bool KPartsWidgetPlugin::isContainer( const TQString & /*key*/ ) const { return false; } -/// Duplicated from kdelibs/tdecore/kdemacros.h.in for those with kdelibs < 3.4 +/// Duplicated from tdelibs/tdecore/kdemacros.h.in for those with tdelibs < 3.4 #ifndef KDE_TQ_EXPORT_PLUGIN #define KDE_TQ_EXPORT_PLUGIN(PLUGIN) \ TQ_EXTERN_C KDE_EXPORT const char* qt_ucm_query_verification_data(); \ diff --git a/libtdepim/kpimurlrequesterdlg.cpp b/libtdepim/kpimurlrequesterdlg.cpp index 553ca659f..7f4a71f20 100644 --- a/libtdepim/kpimurlrequesterdlg.cpp +++ b/libtdepim/kpimurlrequesterdlg.cpp @@ -23,7 +23,7 @@ #include <kurlrequesterdlg.h> #include <klocale.h> -// KDE3.4 or KDE4.0: FIXME: Move to kdelibs! +// KDE3.4 or KDE4.0: FIXME: Move to tdelibs! KURL KPimURLRequesterDlg::getURL( const TQString& dir, const TQString &label, TQWidget *parent, const TQString& caption ) { diff --git a/libtdepim/kpixmapregionselectorwidget.cpp b/libtdepim/kpixmapregionselectorwidget.cpp index d687ae8a1..04ef9c8f4 100644 --- a/libtdepim/kpixmapregionselectorwidget.cpp +++ b/libtdepim/kpixmapregionselectorwidget.cpp @@ -20,7 +20,7 @@ */ /* NOTE: There are two copies of this .h and the .cpp file, with subtle differences. - * One copy is in kdelibs/tdeui, and the other copy is in tdepim/libtdepim + * One copy is in tdelibs/tdeui, and the other copy is in tdepim/libtdepim * This is because tdepim has to remain backwards compatible. Any changes * to either file should be made to the other. */ diff --git a/libtdepim/kpixmapregionselectorwidget.h b/libtdepim/kpixmapregionselectorwidget.h index 7b75c98b2..ac399dd05 100644 --- a/libtdepim/kpixmapregionselectorwidget.h +++ b/libtdepim/kpixmapregionselectorwidget.h @@ -37,7 +37,7 @@ namespace KPIM { * user with a friendly way to select a rectangular subregion of the pixmap. * * NOTE: There are two copies of this .h and the .cpp file, with subtle differences. - * One copy is in kdelibs/tdeui, and the other copy is in tdepim/libtdepim + * One copy is in tdelibs/tdeui, and the other copy is in tdepim/libtdepim * This is because tdepim has to remain backwards compatible. Any changes * to either file should be made to the other. * diff --git a/libtdepim/kregexp3.cpp b/libtdepim/kregexp3.cpp index c4efa96f1..bffc491ea 100644 --- a/libtdepim/kregexp3.cpp +++ b/libtdepim/kregexp3.cpp @@ -1,7 +1,7 @@ /* -*- c++ -*- kregexp3.cpp - This file is part of libkdenetwork. + This file is part of libtdenetwork. Copyright (c) 2001 Marc Mutz <mutz@kde.org> This library is free software; you can redistribute it and/or diff --git a/libtdepim/kregexp3.h b/libtdepim/kregexp3.h index e5013366c..4622e16db 100644 --- a/libtdepim/kregexp3.h +++ b/libtdepim/kregexp3.h @@ -1,7 +1,7 @@ /* -*- c++ -*- kregexp3.h - This file is part of libkdenetwork. + This file is part of libtdenetwork. Copyright (c) 2001 Marc Mutz <mutz@kde.org> This library is free software; you can redistribute it and/or diff --git a/libtdepim/krsqueezedtextlabel.cpp b/libtdepim/krsqueezedtextlabel.cpp index ef9746ee0..968b56d20 100644 --- a/libtdepim/krsqueezedtextlabel.cpp +++ b/libtdepim/krsqueezedtextlabel.cpp @@ -1,5 +1,5 @@ /* This file has been copied from the KDE libraries and slightly modified. - This can be removed as soon as kdelibs provides the same functionality. + This can be removed as soon as tdelibs provides the same functionality. Copyright (C) 2000 Ronny Standtke <Ronny.Standtke@gmx.de> diff --git a/libtdepim/krsqueezedtextlabel.h b/libtdepim/krsqueezedtextlabel.h index 36bd209b6..3e216e72d 100644 --- a/libtdepim/krsqueezedtextlabel.h +++ b/libtdepim/krsqueezedtextlabel.h @@ -1,5 +1,5 @@ /* This file has been copied from the KDE libraries and slightly modified. - This can be removed as soon as kdelibs provides the same functionality. + This can be removed as soon as tdelibs provides the same functionality. Copyright (C) 2000 Ronny Standtke <Ronny.Standtke@gmx.de> diff --git a/libtdepim/kwidgetlister.cpp b/libtdepim/kwidgetlister.cpp index b2b839f43..458292bc0 100644 --- a/libtdepim/kwidgetlister.cpp +++ b/libtdepim/kwidgetlister.cpp @@ -1,7 +1,7 @@ /* -*- c++ -*- kwidgetlister.cpp - This file is part of libkdenetwork. + This file is part of libtdenetwork. Copyright (c) 2001 Marc Mutz <mutz@kde.org> This library is free software; you can redistribute it and/or diff --git a/libtdepim/kwidgetlister.h b/libtdepim/kwidgetlister.h index db993297f..6bfeec157 100644 --- a/libtdepim/kwidgetlister.h +++ b/libtdepim/kwidgetlister.h @@ -1,7 +1,7 @@ /* -*- c++ -*- kwidgetlister.h - This file is part of libkdenetwork. + This file is part of libtdenetwork. Copyright (c) 2001 Marc Mutz <mutz@kde.org> This library is free software; you can redistribute it and/or diff --git a/libtdepim/resourceabc.h b/libtdepim/resourceabc.h index b6ef3ec98..6ac177213 100644 --- a/libtdepim/resourceabc.h +++ b/libtdepim/resourceabc.h @@ -29,7 +29,7 @@ #include <tqmap.h> #include <tdepimmacros.h> -// This is here because it can't go to kdelibs/kabc yet, but ultimately +// This is here because it can't go to tdelibs/kabc yet, but ultimately // it should probably go there (maybe redesigned to have a real object // for subresources). diff --git a/libtdepim/tdepimmacros.h b/libtdepim/tdepimmacros.h index b341ee7ba..5336af1b8 100644 --- a/libtdepim/tdepimmacros.h +++ b/libtdepim/tdepimmacros.h @@ -21,7 +21,7 @@ // WARNING Don't add include guards here, they were removed on purpose -#include <kdeversion.h> +#include <tdeversion.h> #include <kdemacros.h> #if KDE_IS_VERSION( 3,3,90 ) diff --git a/plugins/kmail/bodypartformatter/CMakeLists.txt b/plugins/kmail/bodypartformatter/CMakeLists.txt index e8affade9..910dbb2e0 100644 --- a/plugins/kmail/bodypartformatter/CMakeLists.txt +++ b/plugins/kmail/bodypartformatter/CMakeLists.txt @@ -18,7 +18,7 @@ tde_import( libtdepim ) tde_import( libksieve ) tde_import( mimelib ) -tde_import( libkdenetwork ) +tde_import( libtdenetwork ) tde_import( certmanager ) tde_import( libkpimidentities ) tde_import( libkpgp ) diff --git a/wizards/CMakeLists.txt b/wizards/CMakeLists.txt index 7f193ddf1..7f2dd2dfc 100644 --- a/wizards/CMakeLists.txt +++ b/wizards/CMakeLists.txt @@ -25,7 +25,7 @@ tde_import( knotes ) tde_import( kresources ) if( WITH_KOLAB OR WITH_GROUPWISE OR WITH_SCALIX ) - tde_import( libkdenetwork ) + tde_import( libtdenetwork ) tde_import( certmanager ) tde_import( libkpimidentities ) endif() |