diff options
Diffstat (limited to 'kmail')
39 files changed, 42 insertions, 42 deletions
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 * |