From 38188136cc426b4bb00abf6f8c7c90b4bb27c453 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 5 Nov 2011 21:46:25 -0500 Subject: Rename kde libraries to tde --- kmail/CMakeLists.txt | 4 ++-- kmail/Makefile.am | 10 +++++----- kmail/bodypartformatterfactory.cpp | 4 ++-- kmail/csshelper.h | 2 +- kmail/distributionlistdialog.cpp | 4 ++-- kmail/favoritefolderview.cpp | 4 ++-- kmail/folderdiaacltab.cpp | 2 +- kmail/foldertreebase.cpp | 2 +- kmail/foldertreebase.h | 2 +- kmail/headerstyle.cpp | 2 +- kmail/identitydialog.cpp | 4 ++-- kmail/kmcommands.cpp | 2 +- kmail/kmcomposewin.cpp | 2 +- kmail/kmcomposewin.h | 2 +- kmail/kmedit.cpp | 2 +- kmail/kmfilteraction.cpp | 4 ++-- kmail/kmfoldermaildir.cpp | 2 +- kmail/kmkernel.cpp | 2 +- kmail/kmlineeditspell.cpp | 2 +- kmail/kmlineeditspell.h | 2 +- kmail/kmreaderwin.cpp | 6 +++--- kmail/kmstartup.cpp | 2 +- kmail/mailserviceimpl.h | 4 ++-- kmail/objecttreeparser.cpp | 2 +- kmail/recipientspicker.cpp | 4 ++-- kmail/recipientspicker.h | 2 +- 26 files changed, 40 insertions(+), 40 deletions(-) (limited to 'kmail') diff --git a/kmail/CMakeLists.txt b/kmail/CMakeLists.txt index c2edd2380..27b716654 100644 --- a/kmail/CMakeLists.txt +++ b/kmail/CMakeLists.txt @@ -23,7 +23,7 @@ tde_import( ktnef ) tde_import( libkcal ) tde_import( libkmime ) tde_import( libkpgp ) -tde_import( libkdepim ) +tde_import( libtdepim ) tde_import( mimelib ) tde_import( libkpimidentities ) tde_import( libksieve ) @@ -44,7 +44,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/libemailfunctions ${CMAKE_SOURCE_DIR}/mimelib ${CMAKE_SOURCE_DIR}/libkmime - ${CMAKE_SOURCE_DIR}/libkdepim + ${CMAKE_SOURCE_DIR}/libtdepim ${CMAKE_SOURCE_DIR}/libkpgp ${CMAKE_SOURCE_DIR}/libkdenetwork ${CMAKE_SOURCE_DIR}/certmanager/lib diff --git a/kmail/Makefile.am b/kmail/Makefile.am index 7d0ed2382..d6165c9bc 100644 --- a/kmail/Makefile.am +++ b/kmail/Makefile.am @@ -6,7 +6,7 @@ SUBDIRS = interfaces . about pics profiles avscripts tests INCLUDES = -I$(top_srcdir)/libkmime \ -I$(top_srcdir)/libkpgp \ -I$(top_srcdir)/libkdenetwork \ - -I$(top_srcdir)/libkdepim \ + -I$(top_srcdir)/libtdepim \ -I$(top_srcdir)/libkpimidentities \ -I$(top_srcdir)/libemailfunctions \ -I$(top_srcdir)/libksieve \ @@ -25,9 +25,9 @@ INDEXLIB=../indexlib/libindex.la endif lib_LTLIBRARIES = libkmailprivate.la -libkmailprivate_la_LDFLAGS = $(all_libraries) -avoid-version -no-undefined -L$(top_builddir)/libkdepim +libkmailprivate_la_LDFLAGS = $(all_libraries) -avoid-version -no-undefined -L$(top_builddir)/libtdepim libkmailprivate_la_LIBADD = \ - ../libkmime/libkmime.la ../libkpgp/libkpgp.la ../libkdepim/libkdepim.la \ + ../libkmime/libkmime.la ../libkpgp/libkpgp.la ../libtdepim/libtdepim.la \ ../libkpimidentities/libkpimidentities.la ../mimelib/libmimelib.la \ ../libksieve/libksieve.la ../libemailfunctions/libemailfunctions.la \ ../certmanager/lib/libkleopatra.la $(INDEXLIB) \ @@ -49,7 +49,7 @@ linkdir = $(kde_datadir)/kmail/plugins/bodypartformatter link_DATA = application_octetstream.desktop bin_PROGRAMS = kmail -kmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) -L$(top_builddir)/libkdepim -lkdepim +kmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) -L$(top_builddir)/libtdepim -lkdepim kmail_LDADD = libkmailprivate.la libkmailprivate_la_SOURCES = kmmessage.cpp kmmainwin.cpp configuredialog.cpp \ @@ -180,7 +180,7 @@ dcoptest_LDADD = $(LIB_KIO) dcoptest_LDFLAGS = $(all_libraries) recipienteditortest_SOURCES = recipientseditortest.cpp -recipienteditortest_LDADD = libkmailprivate.la ../libkdepim/libkdepim.la $(LIB_KIO) $(LIB_KABC) +recipienteditortest_LDADD = libkmailprivate.la ../libtdepim/libtdepim.la $(LIB_KIO) $(LIB_KABC) recipienteditortest_LDFLAGS = $(all_libraries) kmailIface_DCOPIDLNG = true diff --git a/kmail/bodypartformatterfactory.cpp b/kmail/bodypartformatterfactory.cpp index 5f6feea7e..62a929531 100644 --- a/kmail/bodypartformatterfactory.cpp +++ b/kmail/bodypartformatterfactory.cpp @@ -38,8 +38,8 @@ using namespace KMail::BodyPartFormatterFactoryPrivate; #include "interfaces/bodypartformatter.h" #include "urlhandlermanager.h" -// libkdepim -#include +// libtdepim +#include // KDE #include diff --git a/kmail/csshelper.h b/kmail/csshelper.h index 9e87f5dfb..9bff99ca3 100644 --- a/kmail/csshelper.h +++ b/kmail/csshelper.h @@ -32,7 +32,7 @@ #ifndef __KMAIL_CSSHELPER_H__ #define __KMAIL_CSSHELPER_H__ -#include +#include namespace KMail { diff --git a/kmail/distributionlistdialog.cpp b/kmail/distributionlistdialog.cpp index cc947e8eb..6c21e8ba6 100644 --- a/kmail/distributionlistdialog.cpp +++ b/kmail/distributionlistdialog.cpp @@ -29,9 +29,9 @@ #include #ifdef KDEPIM_NEW_DISTRLISTS -#include +#include #endif -#include +#include #include #include diff --git a/kmail/favoritefolderview.cpp b/kmail/favoritefolderview.cpp index 148c2278f..e1689a9af 100644 --- a/kmail/favoritefolderview.cpp +++ b/kmail/favoritefolderview.cpp @@ -30,8 +30,8 @@ #include "folderviewtooltip.h" #include "korghelper.h" -#include -#include +#include +#include #include #include diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp index 5ba25472e..2bfa189c9 100644 --- a/kmail/folderdiaacltab.cpp +++ b/kmail/folderdiaacltab.cpp @@ -42,7 +42,7 @@ #include #include #ifdef KDEPIM_NEW_DISTRLISTS -#include // libkdepim +#include // libtdepim #else #include #endif diff --git a/kmail/foldertreebase.cpp b/kmail/foldertreebase.cpp index 0363f1fc2..8557388ac 100644 --- a/kmail/foldertreebase.cpp +++ b/kmail/foldertreebase.cpp @@ -27,7 +27,7 @@ #include "messagecopyhelper.h" #include "folderstorage.h" -#include +#include using KPIM::MailList; using KPIM::MailListDrag; diff --git a/kmail/foldertreebase.h b/kmail/foldertreebase.h index 3a1b21aad..b8ee71493 100644 --- a/kmail/foldertreebase.h +++ b/kmail/foldertreebase.h @@ -19,7 +19,7 @@ #ifndef KMAIL_FOLDERTREEBASE_H #define KMAIL_FOLDERTREEBASE_H -#include +#include class KMFolder; class KMMainWidget; diff --git a/kmail/headerstyle.cpp b/kmail/headerstyle.cpp index 437fc3fd5..ac45aeeb6 100644 --- a/kmail/headerstyle.cpp +++ b/kmail/headerstyle.cpp @@ -43,7 +43,7 @@ #include "globalsettings.h" #include -#include +#include using namespace KPIM; #include diff --git a/kmail/identitydialog.cpp b/kmail/identitydialog.cpp index ec0559fc0..8e8cbe9f4 100644 --- a/kmail/identitydialog.cpp +++ b/kmail/identitydialog.cpp @@ -51,9 +51,9 @@ using KMail::FolderRequester; #include "simplestringlisteditor.h" // other kdepim headers: -// libkdepim +// libtdepim #include -#include +#include // libkleopatra: #include #include diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp index 5990a4873..19661be97 100644 --- a/kmail/kmcommands.cpp +++ b/kmail/kmcommands.cpp @@ -120,7 +120,7 @@ using KMail::RedirectDialog; #include "broadcaststatus.h" #include "globalsettings.h" -#include +#include #include "kcalendariface_stub.h" #include "progressmanager.h" diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp index 2e0906396..06010fb31 100644 --- a/kmail/kmcomposewin.cpp +++ b/kmail/kmcomposewin.cpp @@ -58,7 +58,7 @@ using KRecentAddress::RecentAddresses; #include #include #include -#include +#include #include #include #include diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h index bd15cbbdd..015bf30d0 100644 --- a/kmail/kmcomposewin.h +++ b/kmail/kmcomposewin.h @@ -37,7 +37,7 @@ #include "mailcomposerIface.h" #include "accountmanager.h" -#include +#include #include #include diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp index c77250c53..df9582436 100644 --- a/kmail/kmedit.cpp +++ b/kmail/kmedit.cpp @@ -18,7 +18,7 @@ #include using KPIM::MailListDrag; -#include +#include #include #include diff --git a/kmail/kmfilteraction.cpp b/kmail/kmfilteraction.cpp index d10a509b5..6a5e12324 100644 --- a/kmail/kmfilteraction.cpp +++ b/kmail/kmfilteraction.cpp @@ -21,8 +21,8 @@ #include #include #include -#include -#include +#include +#include using KPIM::CollectingProcess; #include #include "kmfawidgets.h" diff --git a/kmail/kmfoldermaildir.cpp b/kmail/kmfoldermaildir.cpp index 117e84e3b..6947bc78a 100644 --- a/kmail/kmfoldermaildir.cpp +++ b/kmail/kmfoldermaildir.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include "kmfoldermaildir.h" #include "kmfoldermgr.h" #include "kmfolder.h" diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp index f93f4ae5c..5bc83e7c9 100644 --- a/kmail/kmkernel.cpp +++ b/kmail/kmkernel.cpp @@ -30,7 +30,7 @@ using KPIM::BroadcastStatus; #include "undostack.h" #include "accountmanager.h" using KMail::AccountManager; -#include +#include #include "kmversion.h" #include "kmreaderwin.h" #include "kmmainwidget.h" diff --git a/kmail/kmlineeditspell.cpp b/kmail/kmlineeditspell.cpp index 2b17d2170..db2763b93 100644 --- a/kmail/kmlineeditspell.cpp +++ b/kmail/kmlineeditspell.cpp @@ -10,7 +10,7 @@ #include "globalsettings.h" #include "stringutil.h" -#include +#include #include #include diff --git a/kmail/kmlineeditspell.h b/kmail/kmlineeditspell.h index 5537b0063..c5681573e 100644 --- a/kmail/kmlineeditspell.h +++ b/kmail/kmlineeditspell.h @@ -5,7 +5,7 @@ #ifndef __KMAIL_KMLINEEDITSPELL_H__ #define __KMAIL_KMLINEEDITSPELL_H__ -#include +#include class TQPopupMenu; diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp index 342b0fb3f..505bd6128 100644 --- a/kmail/kmreaderwin.cpp +++ b/kmail/kmreaderwin.cpp @@ -14,7 +14,7 @@ #include "kmversion.h" #include "kmmainwidget.h" #include "kmreadermainwin.h" -#include +#include #include "kmfolderindex.h" #include "kmcommands.h" #include "kmmsgpartdlg.h" @@ -1285,9 +1285,9 @@ void KMReaderWin::displaySplashPage( const TQString &info ) TQString location = locate("data", "kmail/about/main.html"); TQString content = KPIM::kFileToString(location); - content = content.tqarg( locate( "data", "libkdepim/about/kde_infopage.css" ) ); + content = content.tqarg( locate( "data", "libtdepim/about/kde_infopage.css" ) ); if ( kapp->reverseLayout() ) - content = content.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "libkdepim/about/kde_infopage_rtl.css" ) ); + content = content.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) ); else content = content.tqarg( "" ); diff --git a/kmail/kmstartup.cpp b/kmail/kmstartup.cpp index 4d82e9e19..b5b0680da 100644 --- a/kmail/kmstartup.cpp +++ b/kmail/kmstartup.cpp @@ -244,7 +244,7 @@ void lockOrDie() { void insertLibraryCataloguesAndIcons() { static const char * const catalogues[] = { - "libkdepim", + "libtdepim", "libksieve", "libkleopatra", "libkmime" diff --git a/kmail/mailserviceimpl.h b/kmail/mailserviceimpl.h index 9e25a4278..6dc5224a8 100644 --- a/kmail/mailserviceimpl.h +++ b/kmail/mailserviceimpl.h @@ -49,7 +49,7 @@ namespace KMail { const KURL::List& attachments ); // FIXME KDE 4.0: Remove this. - // (cf. libkdepim/interfaces/MailTransportServiceIface.h) + // (cf. libtdepim/interfaces/MailTransportServiceIface.h) bool sendMessage( const TQString& to, const TQString& cc, const TQString& bcc, const TQString& subject, const TQString& body, @@ -61,7 +61,7 @@ namespace KMail { const TQByteArray& attachment ); // FIXME KDE 4.0: Remove this. - // (cf. libkdepim/interfaces/MailTransportServiceIface.h) + // (cf. libtdepim/interfaces/MailTransportServiceIface.h) bool sendMessage( const TQString& to, const TQString& cc, const TQString& bcc, const TQString& subject, const TQString& body, diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp index a9b2caa5a..0955fdd69 100644 --- a/kmail/objecttreeparser.cpp +++ b/kmail/objecttreeparser.cpp @@ -40,7 +40,7 @@ #include "kmkernel.h" #include "kmreaderwin.h" #include "partNode.h" -#include +#include #include #include "partmetadata.h" #include "attachmentstrategy.h" diff --git a/kmail/recipientspicker.cpp b/kmail/recipientspicker.cpp index 097cedd0b..4a77d97c5 100644 --- a/kmail/recipientspicker.cpp +++ b/kmail/recipientspicker.cpp @@ -23,8 +23,8 @@ #include "globalsettings.h" -#include -#include +#include +#include #include diff --git a/kmail/recipientspicker.h b/kmail/recipientspicker.h index 6e3d7998e..7ab05b40b 100644 --- a/kmail/recipientspicker.h +++ b/kmail/recipientspicker.h @@ -37,7 +37,7 @@ class TQComboBox; #ifdef KDEPIM_NEW_DISTRLISTS -#include +#include #else namespace KABC { class DistributionList; -- cgit v1.2.1