diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-06 02:31:44 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-06 02:31:44 -0600 |
| commit | d70ce47c224b328c429a5f2406e5e793b009541d (patch) | |
| tree | cef1f2b51b5429229c2c5fad2436b60dddbcf6cc | |
| parent | 480ccc4ed6441c8e663dc62be689c19499d806ea (diff) | |
| download | tdepim-d70ce47c224b328c429a5f2406e5e793b009541d.tar.gz tdepim-d70ce47c224b328c429a5f2406e5e793b009541d.zip | |
Additional kde to tde renaming
649 files changed, 869 insertions, 869 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 42eaa21e0..c89bfbf6c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,8 +14,8 @@ cmake_minimum_required( VERSION 2.8 ) ##### general package setup ##################### -project( kdepim ) -set( PACKAGE kdepim ) +project( tdepim ) +set( PACKAGE tdepim ) set( VERSION "3.5.13" ) @@ -152,7 +152,7 @@ if( BUILD_KADDRESSBOOK OR (BUILD_KRESOURCES AND (WITH_EGROUPWARE OR WITH_BIRTHDA endif() -##### kdepim directories ######################## +##### tdepim directories ######################## tde_conditional_add_subdirectory( BUILD_INDEXLIB indexlib ) tde_conditional_add_subdirectory( BUILD_LIBKMIME libkmime ) diff --git a/Makefile.am.in b/Makefile.am.in index ed7e23e31..518440daf 100644 --- a/Makefile.am.in +++ b/Makefile.am.in @@ -1,4 +1,4 @@ -## kdepim/Makefile.am +## tdepim/Makefile.am ## (C) 1997 Stephan Kulow # these are here to control the compilation order, but are only textual diff --git a/NewsLog.txt b/NewsLog.txt index f918f75eb..3748e00c1 100644 --- a/NewsLog.txt +++ b/NewsLog.txt @@ -1270,7 +1270,7 @@ Problems addressed Merges ------ -* Enterprise branch is in sync with kdepim 3.5 branch +* Enterprise branch is in sync with tdepim 3.5 branch * Bugfixes from enterprise ported to 3.5 branch Friday, July 4th 2008 @@ -1284,7 +1284,7 @@ Problems addressed Merges ------ -* Enterprise branch is in sync with kdepim 3.5 branch +* Enterprise branch is in sync with tdepim 3.5 branch Friday, June 27th 2008 @@ -1316,7 +1316,7 @@ Problems addressed Merges -------- -* Enterprise branch is in sync with kdepim 3.5 branch +* Enterprise branch is in sync with tdepim 3.5 branch Friday, May 30th 2008 @@ -1327,7 +1327,7 @@ Problems addressed Merges ------- -* Enterprise in sync with kdepim 3.5 branch. +* Enterprise in sync with tdepim 3.5 branch. @@ -1341,7 +1341,7 @@ Problems addressed Merges ------- -* Enterprise in sync with kdepim 3.5 branch. +* Enterprise in sync with tdepim 3.5 branch. Friday, May 9th 2008 @@ -1359,7 +1359,7 @@ Problems addressed Merges -------- -* Enterprise in sync with kdepim 3.5 branch. +* Enterprise in sync with tdepim 3.5 branch. Saturday, May 3rd 2008 @@ -1367,7 +1367,7 @@ Saturday, May 3rd 2008 Merges ------- -* Enterprise in sync with kdepim 3.5 branch. +* Enterprise in sync with tdepim 3.5 branch. Monday, April 28th 2008 @@ -1630,7 +1630,7 @@ Problems addressed Merges ------- -* More merges from all of kdepim. +* More merges from all of tdepim. Monday, December 4th 2007 @@ -41,7 +41,7 @@ What it is 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 kdepim apps +* libtdepim: Common code for different tdepim apps * libkdenetwork: Common code for apps previously being in the kdenetwork CVS module (KMail, KNode). This will be merged with libtdepim. * mimelib: MIME messages library @@ -56,7 +56,7 @@ There is also quite an amount of infrastructure in this package: * kioslaves/sieve: Sieve kioslave * ktnef: handling of tnef data -The following subdirectories have been moved to kdenonbeta/kdepim: +The following subdirectories have been moved to kdenonbeta/tdepim: * empath: a modular e-mail client, designed for reuse, needs a Qt with threading support @@ -77,7 +77,7 @@ subscribe my@email.address If you have questions relating to development of this module please post them on the developers mailing list (kde-pim@kde.org). If you have user questions, -please use kdepim-users@kde.org +please use tdepim-users@kde.org If you are interested in kmail development use the mailing list kmail-devel@kde.org. diff --git a/README.Kolab b/README.Kolab index 46fc111b5..2007b7a3f 100644 --- a/README.Kolab +++ b/README.Kolab @@ -1,4 +1,4 @@ -These are preliminary instructions on how to set up kdepim to work +These are preliminary instructions on how to set up tdepim to work with a kolab server. It is meant to be a help for people setting up for testing. It is also meant as a list of things to set up in the upcoming Kolab setup wizard. diff --git a/akregator/src/CMakeLists.txt b/akregator/src/CMakeLists.txt index b5dce8f75..01889b54a 100644 --- a/akregator/src/CMakeLists.txt +++ b/akregator/src/CMakeLists.txt @@ -92,7 +92,7 @@ tde_add_library( akregatorprivate SHARED AUTOMOC tde_add_executable( akregator AUTOMOC SOURCES main.cpp mainwindow.cpp - LINK akregatorprivate-shared kdepim-shared kparts-shared + LINK akregatorprivate-shared tdepim-shared kparts-shared DESTINATION ${BIN_INSTALL_DIR} ) @@ -117,6 +117,6 @@ tde_add_kpart( libakregatorpart AUTOMOC tagpropertieswidgetbase.ui treenodeitem.cpp viewer.cpp ${TDE_INCLUDE_DIR}/kspeechsink.skel ${TDE_INCLUDE_DIR}/kspeech.stub listtabwidget.cpp - LINK akregatorprivate-shared kdepim-shared khtml-shared + LINK akregatorprivate-shared tdepim-shared khtml-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/akregator/src/Makefile.am b/akregator/src/Makefile.am index 2ee3f3794..2f770a87e 100644 --- a/akregator/src/Makefile.am +++ b/akregator/src/Makefile.am @@ -20,7 +20,7 @@ bin_PROGRAMS = akregator # the application source, library search path, and link libraries akregator_SOURCES = main.cpp mainwindow.cpp -akregator_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +akregator_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor akregator_LDADD = $(LIB_KPARTS) libakregatorprivate.la #akregator_LDADD = $(LIB_KPARTS) libakregatorprivate.la $(top_builddir)/libtdepim/libtdepim.la @@ -146,7 +146,7 @@ libakregatorpart_la_SOURCES = \ kspeech.stub libakregatorpart_la_LDFLAGS = $(KDE_RPATH) $(KDE_PLUGIN) $(LIB_KUTILS) -avoid-version -no-undefined $(all_libraries) -libakregatorpart_la_LIBADD = libakregatorprivate.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KHTML) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -L$(top_builddir)/libtdepim -lkdepim +libakregatorpart_la_LIBADD = libakregatorprivate.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KHTML) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -L$(top_builddir)/libtdepim -ltdepim # this is where the desktop file will go partdesktopdir = $(kde_servicesdir) @@ -161,6 +161,6 @@ kde_servicetypes_DATA = akregator_plugin.desktop SUBDIRS = librss about . mk4storage pics -DOXYGEN_REFERENCES = kdeui +DOXYGEN_REFERENCES = tdeui include $(top_srcdir)/admin/Doxyfile.am diff --git a/akregator/src/aboutdata.h b/akregator/src/aboutdata.h index 8f88079ea..cae660b56 100644 --- a/akregator/src/aboutdata.h +++ b/akregator/src/aboutdata.h @@ -26,7 +26,7 @@ #define ABOUTDATA_H #include <kaboutdata.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #define AKREGATOR_VERSION "1.2.9" diff --git a/akregator/src/akregator_export.h b/akregator/src/akregator_export.h index 9ac198266..00fead928 100644 --- a/akregator/src/akregator_export.h +++ b/akregator/src/akregator_export.h @@ -21,7 +21,7 @@ #ifndef AKREGATOR_AKREGATOREXPORT_H #define AKREGATOR_AKREGATOREXPORT_H -#include <kdepimmacros.h> +#include <tdepimmacros.h> #define AKREGATOR_EXPORT KDE_EXPORT diff --git a/akregator/src/librss/Makefile.am b/akregator/src/librss/Makefile.am index 060d393f9..87930b478 100644 --- a/akregator/src/librss/Makefile.am +++ b/akregator/src/librss/Makefile.am @@ -18,5 +18,5 @@ testlibrss_SOURCES = testlibrss.cpp testlibrss_LDFLAGS = $(all_libraries) testlibrss_LDADD = librsslocal.la $(LIB_KIO) -DOXYGEN_REFERENCES = kdeui +DOXYGEN_REFERENCES = tdeui include $(top_srcdir)/admin/Doxyfile.am diff --git a/akregator/src/librss/global.h b/akregator/src/librss/global.h index 397a4aac0..c714f5663 100644 --- a/akregator/src/librss/global.h +++ b/akregator/src/librss/global.h @@ -11,7 +11,7 @@ #ifndef LIBRSS_GLOBAL_H #define LIBRSS_GLOBAL_H -#include <kdepimmacros.h> +#include <tdepimmacros.h> template <class> class TQValueList; diff --git a/akregator/src/pics/action-rss_tag.svg b/akregator/src/pics/action-rss_tag.svg index 94b116540..fa2764885 100644 --- a/akregator/src/pics/action-rss_tag.svg +++ b/akregator/src/pics/action-rss_tag.svg @@ -4,7 +4,7 @@ <!-- Created with Inkscape (http://www.inkscape.org/) --> <svg sodipodi:docname="action-rss_tag.svg" - sodipodi:docbase="/mnt/ablage01/frank/cvs-mirror/kde_3.5_branch/kdepim/akregator/src/pics" + sodipodi:docbase="/mnt/ablage01/frank/cvs-mirror/kde_3.5_branch/tdepim/akregator/src/pics" inkscape:version="0.40" sodipodi:version="0.32" id="svg1291" diff --git a/certmanager/Makefile.am b/certmanager/Makefile.am index 2aae486ec..8a86deb0a 100644 --- a/certmanager/Makefile.am +++ b/certmanager/Makefile.am @@ -17,7 +17,7 @@ kleopatra_SOURCES = \ METASOURCES = AUTO -kleopatra_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kleopatra_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kleopatra_LDADD = conf/libconf.la lib/libkleopatra.la $(LIB_KUTILS) $(LIB_KABC) rcdir = $(kde_datadir)/kleopatra diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp index 5304b131a..6d9557031 100644 --- a/certmanager/certmanager.cpp +++ b/certmanager/certmanager.cpp @@ -96,7 +96,7 @@ // other #include <algorithm> #include <assert.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <kinputdialog.h> namespace { diff --git a/certmanager/certmanager.h b/certmanager/certmanager.h index 2ef6b78fb..6df2a9f61 100644 --- a/certmanager/certmanager.h +++ b/certmanager/certmanager.h @@ -36,7 +36,7 @@ //#include <gpgme.h> #include <kmainwindow.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <kurl.h> #include <tqcstring.h> #include <tqptrlist.h> diff --git a/certmanager/conf/appearanceconfigpage.cpp b/certmanager/conf/appearanceconfigpage.cpp index cbb64ef21..4656ac641 100644 --- a/certmanager/conf/appearanceconfigpage.cpp +++ b/certmanager/conf/appearanceconfigpage.cpp @@ -36,7 +36,7 @@ #include <klocale.h> #include <kdebug.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> AppearanceConfigurationPage::AppearanceConfigurationPage( TQWidget * parent, const char * name ) : KCModule( parent, name ) diff --git a/certmanager/conf/dirservconfigpage.cpp b/certmanager/conf/dirservconfigpage.cpp index b4babc504..db8673464 100644 --- a/certmanager/conf/dirservconfigpage.cpp +++ b/certmanager/conf/dirservconfigpage.cpp @@ -47,7 +47,7 @@ #include <tqcheckbox.h> #include <tqlayout.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #if 0 // disabled, since it is apparently confusing // For sync'ing kabldaprc diff --git a/certmanager/conf/dirservconfigpage.h b/certmanager/conf/dirservconfigpage.h index be278643e..0cb0547d9 100644 --- a/certmanager/conf/dirservconfigpage.h +++ b/certmanager/conf/dirservconfigpage.h @@ -34,7 +34,7 @@ #include <kcmodule.h> #include <kleo/cryptoconfig.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class TQCheckBox; class TQTimeEdit; diff --git a/certmanager/conf/dnorderconfigpage.cpp b/certmanager/conf/dnorderconfigpage.cpp index 8db3a005d..e9c300359 100644 --- a/certmanager/conf/dnorderconfigpage.cpp +++ b/certmanager/conf/dnorderconfigpage.cpp @@ -34,7 +34,7 @@ #include <ui/dnattributeorderconfigwidget.h> #include <kleo/dn.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <tqlayout.h> diff --git a/certmanager/kwatchgnupg/Makefile.am b/certmanager/kwatchgnupg/Makefile.am index 62630d1b2..0dcad2005 100644 --- a/certmanager/kwatchgnupg/Makefile.am +++ b/certmanager/kwatchgnupg/Makefile.am @@ -13,7 +13,7 @@ kwatchgnupg_SOURCES = \ METASOURCES = AUTO -kwatchgnupg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kwatchgnupg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kwatchgnupg_LDADD = ../conf/libconf.la ../lib/libkleopatra.la $(LIB_KUTILS) $(LIB_KABC) rcdir = $(kde_datadir)/kwatchgnupg diff --git a/certmanager/lib/Makefile.am b/certmanager/lib/Makefile.am index ae101fd0e..66e2ece95 100644 --- a/certmanager/lib/Makefile.am +++ b/certmanager/lib/Makefile.am @@ -19,7 +19,7 @@ libkleopatra_la_LIBADD = \ $(top_builddir)/libkdenetwork/qgpgme/libqgpgme.la \ $(LIB_KIO) $(LIB_KDEUI) -# Disabled for kdepim-3.3, see also kleo/cryptobackendfactory.cpp +# Disabled for tdepim-3.3, see also kleo/cryptobackendfactory.cpp # backends/kpgp/libkleopatra_backend_kpgp.la # --version-info CURRENT:REVISION:AGE diff --git a/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h b/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h index 31db6a6ff..ed3dd07a6 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h @@ -38,7 +38,7 @@ #include "qgpgmejob.h" #include <tqcstring.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace GpgME { class Error; diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.h b/certmanager/lib/backends/qgpgme/qgpgmejob.h index 4f393cfb9..49ec68346 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmejob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmejob.h @@ -43,7 +43,7 @@ #include <tqstring.h> #include <vector> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace GpgME { class Data; diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h b/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h index 93e2efb00..4a7288098 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h @@ -36,7 +36,7 @@ #include <kleo/keygenerationjob.h> #include "qgpgmejob.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace GpgME { class Error; diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h index a48f32534..0f2e7657d 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h @@ -44,7 +44,7 @@ #include <utility> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace GpgME { class Error; class Context; diff --git a/certmanager/lib/cryptplug.h b/certmanager/lib/cryptplug.h index 081702a7a..d633e6396 100644 --- a/certmanager/lib/cryptplug.h +++ b/certmanager/lib/cryptplug.h @@ -26,7 +26,7 @@ #include <gpgmepp/context.h> #include <gpgme.h> // need it for gpgme_protocol_t :( -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace GpgME { class ImportResult; diff --git a/certmanager/lib/cryptplugfactory.h b/certmanager/lib/cryptplugfactory.h index 333ae027a..c7d2783a0 100644 --- a/certmanager/lib/cryptplugfactory.h +++ b/certmanager/lib/cryptplugfactory.h @@ -35,7 +35,7 @@ #include "kleo/cryptobackendfactory.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> #ifndef LIBKLEOPATRA_NO_COMPAT namespace Kleo { diff --git a/certmanager/lib/cryptplugwrapper.h b/certmanager/lib/cryptplugwrapper.h index 882c43ddf..2275f3756 100644 --- a/certmanager/lib/cryptplugwrapper.h +++ b/certmanager/lib/cryptplugwrapper.h @@ -54,7 +54,7 @@ #include <tqpair.h> #include <tqstringlist.h> #include <tqstring.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KConfigBase; diff --git a/certmanager/lib/kleo/cryptobackendfactory.h b/certmanager/lib/kleo/cryptobackendfactory.h index c6dd53f7d..f5076e95e 100644 --- a/certmanager/lib/kleo/cryptobackendfactory.h +++ b/certmanager/lib/kleo/cryptobackendfactory.h @@ -36,7 +36,7 @@ #include <tqobject.h> #include "cryptobackend.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <vector> #include <map> diff --git a/certmanager/lib/kleo/dn.h b/certmanager/lib/kleo/dn.h index 3375e8f48..c9bdbffda 100644 --- a/certmanager/lib/kleo/dn.h +++ b/certmanager/lib/kleo/dn.h @@ -35,7 +35,7 @@ #include <tqstring.h> #include <tqvaluevector.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class TQStringList; class TQWidget; diff --git a/certmanager/lib/kleo/enum.h b/certmanager/lib/kleo/enum.h index 1f1864566..07e93c497 100644 --- a/certmanager/lib/kleo/enum.h +++ b/certmanager/lib/kleo/enum.h @@ -33,7 +33,7 @@ #ifndef __KLEO_ENUM_H__ #define __KLEO_ENUM_H__ -#include <kdepimmacros.h> +#include <tdepimmacros.h> class TQString; class TQStringList; diff --git a/certmanager/lib/kleo/hierarchicalkeylistjob.h b/certmanager/lib/kleo/hierarchicalkeylistjob.h index 42d037ef0..506b54774 100644 --- a/certmanager/lib/kleo/hierarchicalkeylistjob.h +++ b/certmanager/lib/kleo/hierarchicalkeylistjob.h @@ -35,7 +35,7 @@ #include <kleo/keylistjob.h> #include <kleo/cryptobackend.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <gpgmepp/keylistresult.h> diff --git a/certmanager/lib/kleo/keyfiltermanager.h b/certmanager/lib/kleo/keyfiltermanager.h index 6a6960d35..7663cbb8b 100644 --- a/certmanager/lib/kleo/keyfiltermanager.h +++ b/certmanager/lib/kleo/keyfiltermanager.h @@ -34,7 +34,7 @@ #define __KLEO_KEYFILTERMANAGER_H__ #include <tqobject.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace GpgME { class Key; } diff --git a/certmanager/lib/kleo/multideletejob.h b/certmanager/lib/kleo/multideletejob.h index d67494777..73612e2db 100644 --- a/certmanager/lib/kleo/multideletejob.h +++ b/certmanager/lib/kleo/multideletejob.h @@ -36,7 +36,7 @@ #include <kleo/job.h> #include <kleo/cryptobackend.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <tqguardedptr.h> #include <vector> diff --git a/certmanager/lib/ui/backendconfigwidget.h b/certmanager/lib/ui/backendconfigwidget.h index bdac0cf06..1cc9362f2 100644 --- a/certmanager/lib/ui/backendconfigwidget.h +++ b/certmanager/lib/ui/backendconfigwidget.h @@ -35,7 +35,7 @@ #define __KLEO_UI_BACKENDCONFIGWIDGET_H__ #include <tqwidget.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace Kleo { class CryptoBackendFactory; diff --git a/certmanager/lib/ui/cryptoconfigdialog.h b/certmanager/lib/ui/cryptoconfigdialog.h index 8a4c07e9f..dc0dca753 100644 --- a/certmanager/lib/ui/cryptoconfigdialog.h +++ b/certmanager/lib/ui/cryptoconfigdialog.h @@ -33,7 +33,7 @@ #define CRYPTOCONFIGDIALOG_H #include <kdialogbase.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace Kleo { diff --git a/certmanager/lib/ui/directoryserviceswidget.h b/certmanager/lib/ui/directoryserviceswidget.h index bfefcec82..3b20bb324 100644 --- a/certmanager/lib/ui/directoryserviceswidget.h +++ b/certmanager/lib/ui/directoryserviceswidget.h @@ -34,7 +34,7 @@ #define DIRECTORYSERVICESWIDGET_H #include "directoryserviceswidgetbase.h" #include <kurl.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class CryptPlugWrapper; namespace Kleo { diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.h b/certmanager/lib/ui/dnattributeorderconfigwidget.h index b433c35ba..4f87c4e61 100644 --- a/certmanager/lib/ui/dnattributeorderconfigwidget.h +++ b/certmanager/lib/ui/dnattributeorderconfigwidget.h @@ -34,7 +34,7 @@ #define __KLEO_UI_DNATTRIBUTEORDERCONFIGWIDGET_H__ #include <tqwidget.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace Kleo { class DNAttributeMapper; } diff --git a/certmanager/lib/ui/keyapprovaldialog.h b/certmanager/lib/ui/keyapprovaldialog.h index 0452743b7..5498e27ac 100644 --- a/certmanager/lib/ui/keyapprovaldialog.h +++ b/certmanager/lib/ui/keyapprovaldialog.h @@ -40,7 +40,7 @@ #include <kleo/enum.h> #include <kdialogbase.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <kpgpkey.h> // for EncryptPref #include <gpgmepp/key.h> diff --git a/certmanager/lib/ui/keylistview.h b/certmanager/lib/ui/keylistview.h index d59211313..38ad0f5ab 100644 --- a/certmanager/lib/ui/keylistview.h +++ b/certmanager/lib/ui/keylistview.h @@ -36,7 +36,7 @@ #include <klistview.h> #include <gpgmepp/key.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class TQPainter; class TQColorGroup; diff --git a/certmanager/lib/ui/keyrequester.h b/certmanager/lib/ui/keyrequester.h index 68bdd7038..7e23b4b69 100644 --- a/certmanager/lib/ui/keyrequester.h +++ b/certmanager/lib/ui/keyrequester.h @@ -53,7 +53,7 @@ #include <kleo/cryptobackend.h> #include <vector> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace Kleo { class KeyListView; diff --git a/certmanager/lib/ui/keyselectiondialog.h b/certmanager/lib/ui/keyselectiondialog.h index 44634a396..f4d369b1c 100644 --- a/certmanager/lib/ui/keyselectiondialog.h +++ b/certmanager/lib/ui/keyselectiondialog.h @@ -41,7 +41,7 @@ #include <kleo/cryptobackend.h> #include <gpgmepp/key.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <vector> class TQVBoxLayout; diff --git a/certmanager/lib/ui/progressbar.h b/certmanager/lib/ui/progressbar.h index f5a9644fe..bf804b58e 100644 --- a/certmanager/lib/ui/progressbar.h +++ b/certmanager/lib/ui/progressbar.h @@ -34,7 +34,7 @@ #define __KLEO_PROGRESSBAR_H__ #include <tqprogressbar.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class TQTimer; namespace Kleo { diff --git a/certmanager/lib/ui/progressdialog.h b/certmanager/lib/ui/progressdialog.h index c3cad24d9..0c05cdbd3 100644 --- a/certmanager/lib/ui/progressdialog.h +++ b/certmanager/lib/ui/progressdialog.h @@ -35,7 +35,7 @@ #include <tqprogressdialog.h> #include <tqstring.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace Kleo { class Job; diff --git a/configure.in.in b/configure.in.in index f62d3d95d..baf4c5476 100644 --- a/configure.in.in +++ b/configure.in.in @@ -80,7 +80,7 @@ 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 and noone can say which tests are needed and which are obsolete for kdepim ;( +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/dependency-graph.dot b/dependency-graph.dot index 72d0dc727..397570890 100644 --- a/dependency-graph.dot +++ b/dependency-graph.dot @@ -1,5 +1,5 @@ # to create a ps file use 'dot -Tps -o dependency-graph.ps dependency-graph.dot' (dot is part of the graphviz package) -digraph "inter-dependency graph for kdepim" { +digraph "inter-dependency graph for tdepim" { "akregator" -> "kaddressbook"; "akregator" -> "kontact"; "certmanager" -> "kaddressbook"; diff --git a/doc/akregator/index.docbook b/doc/akregator/index.docbook index 54b653de5..c460a0eec 100644 --- a/doc/akregator/index.docbook +++ b/doc/akregator/index.docbook @@ -2,7 +2,7 @@ <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ <!ENTITY akregator "<application>Akregator</application>"> <!ENTITY kappname "&akregator;"> - <!ENTITY package "kdepim"> + <!ENTITY package "tdepim"> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE"> ]> diff --git a/doc/kaddressbook/index.docbook b/doc/kaddressbook/index.docbook index 9473fc520..b583de509 100644 --- a/doc/kaddressbook/index.docbook +++ b/doc/kaddressbook/index.docbook @@ -2,7 +2,7 @@ <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ <!ENTITY kappname "&kaddressbook;"> - <!ENTITY package "kdepim"> + <!ENTITY package "tdepim"> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE" > <!-- change language only here --> ]> diff --git a/doc/kalarm/index.docbook b/doc/kalarm/index.docbook index 28f44e788..d641da1fe 100644 --- a/doc/kalarm/index.docbook +++ b/doc/kalarm/index.docbook @@ -1,7 +1,7 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ <!ENTITY kappname "&kalarm;"> - <!ENTITY package "kdepim"> + <!ENTITY package "tdepim"> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE"><!-- change language only here --> ]> @@ -51,7 +51,7 @@ <keywordset> <keyword>KDE</keyword> -<keyword>kdepim</keyword> +<keyword>tdepim</keyword> <keyword>kalarm</keyword> <keyword>alarm</keyword> <keyword>reminder</keyword> @@ -3964,7 +3964,7 @@ together with details of the &kalarm; client application.</para> files whose format is defined by the document <ulink url="http://www.w3.org/2002/12/cal/rfc2445.html">RFC2445 - Internet Calendaring and Scheduling Core Object Specification -(iCalendar)</ulink>. This is the standard format used by all kdepim +(iCalendar)</ulink>. This is the standard format used by all tdepim applications. &kalarm; uses certain non-standard properties in the Alarm component, in conformance with RFC2445: <literal>X-KDE-KALARM-NEXTRECUR</literal>, @@ -4088,7 +4088,7 @@ url="http://www.astrojar.org.uk/kalarm">http://www.astrojar.org.uk/kalarm</ulink <para>If you cannot obtain a suitable precompiled binary package, you need to compile &kalarm; yourself from source files. Get the source -package file <filename>kdepim-x.x.tar.bz2</filename> or +package file <filename>tdepim-x.x.tar.bz2</filename> or <filename>kalarm-x.x.tar.bz2</filename> (or similar), depending on whether you want to install &package; or just &kalarm;. Unpack it in a new folder using a command similar to diff --git a/doc/kandy/index.docbook b/doc/kandy/index.docbook index c1a952a33..db2e15005 100644 --- a/doc/kandy/index.docbook +++ b/doc/kandy/index.docbook @@ -1,7 +1,7 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ <!ENTITY kappname "&kandy;"> - <!ENTITY package "kdepim"> + <!ENTITY package "tdepim"> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE" > <!-- change language only here --> ]> @@ -27,7 +27,7 @@ with the data on the desktop.</para> </abstract> <keywordset> <keyword>KDE</keyword> -<keyword>kdepim</keyword> +<keyword>tdepim</keyword> <keyword>kandy</keyword> <keyword>synchronizing</keyword> <keyword>phone</keyword> @@ -294,12 +294,12 @@ Watts <email>lauri@kde.org</email>.</para> <title>Requirements</title> <para>You will need to have the kdelibs package installed in order to -successfully compile the kdepim package that contains &kandy;. The -kdelibs package may be found at the same location as the kdepim +successfully compile the tdepim package that contains &kandy;. The +kdelibs 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 -be found at the same location as the kdepim package.</para> +be found at the same location as the tdepim package.</para> </sect1> diff --git a/doc/karm/index.docbook b/doc/karm/index.docbook index be0faf1ee..75cebfdcd 100644 --- a/doc/karm/index.docbook +++ b/doc/karm/index.docbook @@ -1,7 +1,7 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ <!ENTITY kappname "&karm;"> - <!ENTITY package "kdepim"> + <!ENTITY package "tdepim"> <!ENTITY % English "INCLUDE" > <!-- change language only here --> <!ENTITY % addindex "IGNORE"> ]> diff --git a/doc/kleopatra/index.docbook b/doc/kleopatra/index.docbook index 09f9531b3..f7e5b610e 100644 --- a/doc/kleopatra/index.docbook +++ b/doc/kleopatra/index.docbook @@ -6,7 +6,7 @@ <!ENTITY gpg "<application>GPG</application>"> <!ENTITY gpgconf "<application>GpgConf</application>"> <!ENTITY kappname "&kleopatra;"> - <!ENTITY package "kdepim"> + <!ENTITY package "tdepim"> <!ENTITY smime "<acronym>S/MIME</acronym>"> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE"> diff --git a/doc/kmail/index.docbook b/doc/kmail/index.docbook index 06faeb065..028c85790 100644 --- a/doc/kmail/index.docbook +++ b/doc/kmail/index.docbook @@ -1,7 +1,7 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ <!ENTITY kappname "&kmail;"> - <!ENTITY package "kdepim"> + <!ENTITY package "tdepim"> <!ENTITY kmail-intro SYSTEM "intro.docbook"> <!ENTITY kmail-getting-started SYSTEM "getting-started.docbook"> <!ENTITY kmail-using-kmail SYSTEM "using-kmail.docbook"> @@ -36,7 +36,7 @@ --> <!-- TODO: -*index (see kdegames/kpat/) +*index (see tdegames/kpat/) * guisubmenu vs. guititem ?? * more about security? diff --git a/doc/kmail/menus.docbook b/doc/kmail/menus.docbook index ff281f053..b8e808f34 100644 --- a/doc/kmail/menus.docbook +++ b/doc/kmail/menus.docbook @@ -1256,7 +1256,7 @@ the &kde; address book.</para> <listitem> <para> Starts up <application>kmailcvt</application> (which is - part of kdepim). This application lets you import + part of tdepim). This application lets you import messages from several email clients &kmail;. </para> </listitem> diff --git a/doc/knode/index.docbook b/doc/knode/index.docbook index 29eeb14ba..7c5250e57 100644 --- a/doc/knode/index.docbook +++ b/doc/knode/index.docbook @@ -1,7 +1,7 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ <!ENTITY kappname "&knode;"> - <!ENTITY package "kdepim"> + <!ENTITY package "tdepim"> <!ENTITY introduction SYSTEM "introduction.docbook"> <!ENTITY commands SYSTEM "commands.docbook"> <!ENTITY faq SYSTEM "faq.docbook"> diff --git a/doc/knotes/index.docbook b/doc/knotes/index.docbook index 89ff880f6..e0a6040cf 100644 --- a/doc/knotes/index.docbook +++ b/doc/knotes/index.docbook @@ -1,7 +1,7 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ <!ENTITY kappname "&knotes;"> - <!ENTITY package "kdepim"> + <!ENTITY package "tdepim"> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE" > <!-- change language only here --> ]> diff --git a/doc/konsolekalendar/index.docbook b/doc/konsolekalendar/index.docbook index d3c7b26a4..5a4d6c9f8 100644 --- a/doc/konsolekalendar/index.docbook +++ b/doc/konsolekalendar/index.docbook @@ -8,7 +8,7 @@ <!ENTITY konsolekalendar "<application>KonsoleKalendar</application>"> <!ENTITY kappname "KonsoleKalendar"> - <!ENTITY package "kdepim"> + <!ENTITY package "tdepim"> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE"> ]> @@ -828,7 +828,7 @@ Compiling &kde; 3.2.x</ulink> for complete instructions.</para> <para>If you cannot obtain a suitable precompiled binary package, you need to compile &konsolekalendar; yourself from source files. Get the source -package file <filename>kdepim-x.x.tar.bz2</filename>. +package file <filename>tdepim-x.x.tar.bz2</filename>. Unpack it in a new folder using a command similar to <userinput><command>tar</command> <option>xvfj <replaceable>package.tar.bz2</replaceable></option></userinput>, and diff --git a/doc/kontact/index.docbook b/doc/kontact/index.docbook index 25b0a31f6..70d94e394 100644 --- a/doc/kontact/index.docbook +++ b/doc/kontact/index.docbook @@ -3,7 +3,7 @@ "dtd/kdex.dtd" [ <!ENTITY PIM "<acronym>PIM</acronym>"> <!ENTITY kappname "&kontact;"> - <!ENTITY package "kdepim"> + <!ENTITY package "tdepim"> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE"> <!ENTITY akregator "<application>Akregator</application>"> @@ -54,7 +54,7 @@ address book and other &PIM; functionality. </para></abstract> <keywordset> <keyword>KDE</keyword> -<keyword>kdepim</keyword> +<keyword>tdepim</keyword> <keyword>KMail</keyword> <keyword>Organizer</keyword> <keyword>KAddressBook</keyword> diff --git a/doc/korganizer/index.docbook b/doc/korganizer/index.docbook index 83b207e14..1444890c0 100644 --- a/doc/korganizer/index.docbook +++ b/doc/korganizer/index.docbook @@ -2,7 +2,7 @@ <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ <!ENTITY kappname "&korganizer;"> - <!ENTITY package "kdepim"> + <!ENTITY package "tdepim"> <!ENTITY plugins-chapter SYSTEM "plugins-chapter.docbook"> <!ENTITY outlook-to-vcalendar-workshop SYSTEM "outlook-to-vcalendar.docbook"> <!ENTITY % addindex "IGNORE"> @@ -114,7 +114,7 @@ help you keep your schedule. </para></abstract> <keywordset> <keyword>KDE</keyword> <keyword>KOrganizer</keyword> -<keyword>kdepim</keyword> +<keyword>tdepim</keyword> <keyword>manager</keyword> <keyword>time</keyword> <keyword>schedule</keyword> @@ -4631,7 +4631,7 @@ computer.</para> <title>Command Line</title> <para>A nice program to access a &kde; calendar from the command line is konsolekalendar, which -is included in the kdepim package together with &korganizer;.</para> +is included in the tdepim package together with &korganizer;.</para> </sect1> @@ -4826,7 +4826,7 @@ 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 localization preferences like date and time formats. &korganizer; itself -is in the kdepim package. All packages can be found on <ulink +is in the tdepim package. All packages can be found on <ulink url="http://www.kde.org">&kde; home page</ulink>.</para> <para>The &korganizer; homepage is at <ulink diff --git a/doc/korganizer/outlook-to-vcalendar.docbook b/doc/korganizer/outlook-to-vcalendar.docbook index 1c5d51eec..3d3c4f527 100644 --- a/doc/korganizer/outlook-to-vcalendar.docbook +++ b/doc/korganizer/outlook-to-vcalendar.docbook @@ -32,7 +32,7 @@ to vCalendar</quote> was released on October 17, 2002. See the </abstract> <keywordset> -<keyword>kdepim</keyword> +<keyword>tdepim</keyword> <keyword>KOrganizer</keyword> <keyword>KOrganizer workshop</keyword> <keyword>Outlook</keyword> diff --git a/doc/korn/index.docbook b/doc/korn/index.docbook index 9ac4d7d03..535ce323b 100644 --- a/doc/korn/index.docbook +++ b/doc/korn/index.docbook @@ -1,7 +1,7 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ <!ENTITY appname "&korn;" > - <!ENTITY package "kdepim"> + <!ENTITY package "tdepim"> <!ENTITY % English "INCLUDE"> <!ENTITY % addindex "IGNORE"> ]> diff --git a/doc/kpilot/index.docbook b/doc/kpilot/index.docbook index e59ca9cd8..e787e5a25 100644 --- a/doc/kpilot/index.docbook +++ b/doc/kpilot/index.docbook @@ -3,7 +3,7 @@ "dtd/kdex.dtd" [ <!ENTITY kappname "&kpilot;"> <!ENTITY kpilotver "4.4.6"> -<!ENTITY package "kdepim"> +<!ENTITY package "tdepim"> <!ENTITY USB "<acronym>USB</acronym>"> <!ENTITY PalmOS '<trademark class="registered">Palm OS</trademark>'> <!ENTITY PalmOne '<trademark class="registered">PalmOne</trademark>'> @@ -87,7 +87,7 @@ <keywordset> <keyword>KDE</keyword> <keyword>KPilot</keyword> -<keyword>kdepim</keyword> +<keyword>tdepim</keyword> <keyword>palm pilot</keyword> <keyword>synchronization</keyword> </keywordset> @@ -111,7 +111,7 @@ There is a web page for &kpilot;: the <ulink url="http://www.kpilot.org/">Official &kpilot; Home Page</ulink>. The <ulink url="http://pim.kde.org/">KDE-PIM website</ulink> also offers useful information on the subject of <acronym>PIM</acronym> in general. &kpilot; shares the -kdepim-users mailing list, <email>kdepim-users@kde.org</email>. See <ulink +tdepim-users mailing list, <email>tdepim-users@kde.org</email>. See <ulink url="http://www.kde.org/mailinglists"> the mailing lists page</ulink> for more information on subscribing and unsubscribing from the list. </para> diff --git a/doc/ktnef/index.docbook b/doc/ktnef/index.docbook index 8e6e33943..78bf7c9b4 100644 --- a/doc/ktnef/index.docbook +++ b/doc/ktnef/index.docbook @@ -1,7 +1,7 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ <!ENTITY kappname "&ktnef;"> - <!ENTITY package "kdepim"> + <!ENTITY package "tdepim"> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE" > <!-- change language only here --> ]> diff --git a/doc/kwatchgnupg/index.docbook b/doc/kwatchgnupg/index.docbook index 21b614b19..6e40f6bca 100644 --- a/doc/kwatchgnupg/index.docbook +++ b/doc/kwatchgnupg/index.docbook @@ -5,7 +5,7 @@ <!ENTITY watchgnupg "<application>WatchGnuPG</application>"> <!ENTITY kwatchgnupg "<application>KWatchGnuPG</application>"> <!ENTITY kappname "&kwatchgnupg;"> - <!ENTITY package "kdepim"> + <!ENTITY package "tdepim"> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE"> ]> diff --git a/kabc/frontend/Makefile.am b/kabc/frontend/Makefile.am index dabde6533..df4d2a2cd 100644 --- a/kabc/frontend/Makefile.am +++ b/kabc/frontend/Makefile.am @@ -4,7 +4,7 @@ METASOURCES = AUTO bin_PROGRAMS = kabcfrontend -kabcfrontend_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kabcfrontend_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kabcfrontend_LDADD = -lkabc $(LIB_KDECORE) kabcfrontend_SOURCES = main.cpp mainWindow.ui diff --git a/kabc/kabc2mutt/Makefile.am b/kabc/kabc2mutt/Makefile.am index 7e99528cf..1ba25f41b 100644 --- a/kabc/kabc2mutt/Makefile.am +++ b/kabc/kabc2mutt/Makefile.am @@ -4,7 +4,7 @@ METASOURCES = AUTO bin_PROGRAMS = kabc2mutt -kabc2mutt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kabc2mutt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kabc2mutt_LDADD = -lkabc $(LIB_KDECORE) kabc2mutt_SOURCES = kabc2mutt.cpp main.cpp diff --git a/kabc/kabcdistlistupdater/CMakeLists.txt b/kabc/kabcdistlistupdater/CMakeLists.txt index 6d427f87c..be5e77d48 100644 --- a/kabc/kabcdistlistupdater/CMakeLists.txt +++ b/kabc/kabcdistlistupdater/CMakeLists.txt @@ -37,6 +37,6 @@ install( tde_add_executable( kabcdistlistupdater SOURCES kabcdistlistupdater.cpp - LINK kdepim-shared + LINK tdepim-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kabc/kabcdistlistupdater/Makefile.am b/kabc/kabcdistlistupdater/Makefile.am index b504fe9dc..ab42e7a89 100644 --- a/kabc/kabcdistlistupdater/Makefile.am +++ b/kabc/kabcdistlistupdater/Makefile.am @@ -4,7 +4,7 @@ METASOURCES = AUTO bin_PROGRAMS = kabcdistlistupdater -kabcdistlistupdater_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kabcdistlistupdater_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kabcdistlistupdater_LDADD = $(LIB_KABC) $(top_builddir)/libtdepim/libtdepim.la kabcdistlistupdater_SOURCES = kabcdistlistupdater.cpp diff --git a/kaddressbook/CMakeLists.txt b/kaddressbook/CMakeLists.txt index ba095f2e3..e198127a0 100644 --- a/kaddressbook/CMakeLists.txt +++ b/kaddressbook/CMakeLists.txt @@ -103,6 +103,6 @@ tde_add_library( kaddressbook SHARED AUTOMOC LINK kabcommon-static kabim-static printer-static kabinterfaces-shared - kdepim-shared kabc_file-shared kdeprint-shared kutils-shared + tdepim-shared kabc_file-shared tdeprint-shared kutils-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kaddressbook/Makefile.am b/kaddressbook/Makefile.am index e091cbd11..b0c2d96cc 100644 --- a/kaddressbook/Makefile.am +++ b/kaddressbook/Makefile.am @@ -17,7 +17,7 @@ INCLUDES= -I$(top_srcdir)/kaddressbook/interfaces \ bin_PROGRAMS = kaddressbook kaddressbook_SOURCES = main.cpp kaddressbookmain.cpp -kaddressbook_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kaddressbook_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kaddressbook_LDADD = libkaddressbook.la kde_module_LTLIBRARIES = libkaddressbookpart.la @@ -48,7 +48,7 @@ libkaddressbook_la_LIBADD = $(top_builddir)/kaddressbook/printing/libprinter.la -lkabc_file $(LIB_KABC) $(LIB_KHTML) \ $(top_builddir)/kaddressbook/common/libkabcommon.la \ $(top_builddir)/kaddressbook/editors/libkabim.la \ - -lkdeprint + -ltdeprint libkaddressbook_la_COMPILE_FIRST = $(top_srcdir)/libtdepim/categoryselectdialog.h \ $(top_srcdir)/libtdepim/categoryeditdialog.h \ $(top_builddir)/kaddressbook/common/kabprefs_base.h diff --git a/kaddressbook/common/kabprefs.h b/kaddressbook/common/kabprefs.h index bab2cb70b..35abdd04b 100644 --- a/kaddressbook/common/kabprefs.h +++ b/kaddressbook/common/kabprefs.h @@ -25,7 +25,7 @@ #define KABPREFS_H #include <tqstringlist.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include "kabprefs_base.h" class KConfig; diff --git a/kaddressbook/common/kaddressbook.kcfg b/kaddressbook/common/kaddressbook.kcfg index d0a48c251..5f8080c9c 100644 --- a/kaddressbook/common/kaddressbook.kcfg +++ b/kaddressbook/common/kaddressbook.kcfg @@ -21,7 +21,7 @@ <entry type="String" name="FaxHookApplication"> <label>Fax</label> <whatsthis></whatsthis> - <default>kdeprintfax --phone %N</default> + <default>tdeprintfax --phone %N</default> </entry> <entry type="String" name="SMSHookApplication"> <label>SMS</label> diff --git a/kaddressbook/features/CMakeLists.txt b/kaddressbook/features/CMakeLists.txt index e2fcee1fe..f85bbf7e4 100644 --- a/kaddressbook/features/CMakeLists.txt +++ b/kaddressbook/features/CMakeLists.txt @@ -46,7 +46,7 @@ install( FILES tde_add_kpart( ${TARGET} AUTOMOC SOURCES ${SOURCE} - LINK kabinterfaces-shared kdepim-shared kabc-shared + LINK kabinterfaces-shared tdepim-shared kabc-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -55,6 +55,6 @@ tde_add_kpart( ${TARGET} AUTOMOC tde_add_kpart( libkaddrbk_resourceselection AUTOMOC SOURCES resourceselection.cpp - LINK kabinterfaces-shared kdepim-shared kabc-shared + LINK kabinterfaces-shared tdepim-shared kabc-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kaddressbook/interfaces/configurewidget.h b/kaddressbook/interfaces/configurewidget.h index 04cea9cf7..10eb3de88 100644 --- a/kaddressbook/interfaces/configurewidget.h +++ b/kaddressbook/interfaces/configurewidget.h @@ -27,7 +27,7 @@ #include <tqwidget.h> #include <kconfig.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KABC { class AddressBook; diff --git a/kaddressbook/interfaces/contacteditorwidget.h b/kaddressbook/interfaces/contacteditorwidget.h index 5903981dd..6f57d2002 100644 --- a/kaddressbook/interfaces/contacteditorwidget.h +++ b/kaddressbook/interfaces/contacteditorwidget.h @@ -28,7 +28,7 @@ #include <kabc/addressbook.h> #include <klibloader.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #define KAB_CEW_PLUGIN_VERSION 1 diff --git a/kaddressbook/interfaces/core.h b/kaddressbook/interfaces/core.h index d94e2cee9..3b5e1cf34 100644 --- a/kaddressbook/interfaces/core.h +++ b/kaddressbook/interfaces/core.h @@ -35,7 +35,7 @@ #include <kabc/field.h> #include <kcommand.h> #include <kxmlguiclient.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KABC { class AddressBook; diff --git a/kaddressbook/interfaces/extensionwidget.h b/kaddressbook/interfaces/extensionwidget.h index 8302c5b9a..400472e34 100644 --- a/kaddressbook/interfaces/extensionwidget.h +++ b/kaddressbook/interfaces/extensionwidget.h @@ -28,7 +28,7 @@ #include <kabc/addressbook.h> #include <klibloader.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #define KAB_EXTENSIONWIDGET_PLUGIN_VERSION 1 diff --git a/kaddressbook/interfaces/xxport.h b/kaddressbook/interfaces/xxport.h index 996767185..73710d82b 100644 --- a/kaddressbook/interfaces/xxport.h +++ b/kaddressbook/interfaces/xxport.h @@ -30,7 +30,7 @@ #include <kabc/addresseelist.h> #include <klibloader.h> #include <kxmlguiclient.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #define KAB_XXPORT_PLUGIN_VERSION 1 diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index f8c166a2a..47e55243f 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h @@ -33,7 +33,7 @@ #include <tqwidget.h> #include "core.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KABC { class AddressBook; diff --git a/kaddressbook/kaddressbookiface.h b/kaddressbook/kaddressbookiface.h index 2b70849f7..b7fa5f5c8 100644 --- a/kaddressbook/kaddressbookiface.h +++ b/kaddressbook/kaddressbookiface.h @@ -27,7 +27,7 @@ #include <dcopobject.h> #include <kurl.h> #include <tqstringlist.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KDE_EXPORT KAddressBookIface : virtual public DCOPObject { diff --git a/kaddressbook/kaddressbookview.h b/kaddressbook/kaddressbookview.h index ed4cfc6c4..3df35eacf 100644 --- a/kaddressbook/kaddressbookview.h +++ b/kaddressbook/kaddressbookview.h @@ -31,7 +31,7 @@ #include <kabc/field.h> #include <klibloader.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include "filter.h" #include "viewconfigurewidget.h" diff --git a/kaddressbook/kcmconfigs/CMakeLists.txt b/kaddressbook/kcmconfigs/CMakeLists.txt index c273a9e3c..82d494cd8 100644 --- a/kaddressbook/kcmconfigs/CMakeLists.txt +++ b/kaddressbook/kcmconfigs/CMakeLists.txt @@ -38,7 +38,7 @@ tde_add_kpart( kcm_kabconfig AUTOMOC SOURCES kcmkabconfig.cpp kabconfigwidget.cpp extensionconfigdialog.cpp addresseewidget.cpp - LINK kabcommon-static kdepim-shared + LINK kabcommon-static tdepim-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -48,7 +48,7 @@ tde_add_kpart( kcm_kabconfig AUTOMOC tde_add_kpart( kcm_kabldapconfig AUTOMOC SOURCES addhostdialog.cpp kcmkabldapconfig.cpp ldapoptionswidget.cpp - LINK kdepim-shared + LINK tdepim-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -57,6 +57,6 @@ tde_add_kpart( kcm_kabldapconfig AUTOMOC tde_add_kpart( kcm_kabcustomfields AUTOMOC SOURCES kcmkabcustomfields.cpp - LINK kabcommon-static kdepim-shared + LINK kabcommon-static tdepim-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp index 3ceca5b52..4217a0a82 100644 --- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp +++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp @@ -31,7 +31,7 @@ #include "kcmkabconfig.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> extern "C" { diff --git a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp index d6974a1b8..e397f01f6 100644 --- a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp +++ b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp @@ -29,7 +29,7 @@ #include <tqregexp.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> extern "C" { diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp index e6f25529c..e9541ea9f 100644 --- a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp +++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp @@ -32,7 +32,7 @@ #include "kcmkabldapconfig.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> extern "C" { diff --git a/kaddressbook/thumbnailcreator/Makefile.am b/kaddressbook/thumbnailcreator/Makefile.am index 2e37c0098..1140f1df4 100644 --- a/kaddressbook/thumbnailcreator/Makefile.am +++ b/kaddressbook/thumbnailcreator/Makefile.am @@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = ldifvcardthumbnail.la ldifvcardthumbnail_la_SOURCES = ldifvcardcreator.cpp ldifvcardthumbnail_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined -ldifvcardthumbnail_la_LIBADD = $(LIB_KDECORE) $(LIB_KABC) -lkdefx +ldifvcardthumbnail_la_LIBADD = $(LIB_KDECORE) $(LIB_KABC) -ltdefx noinst_HEADERS = ldifvcardcreator.h diff --git a/kaddressbook/viewconfigurewidget.h b/kaddressbook/viewconfigurewidget.h index 63ed11167..d5f8a1d4b 100644 --- a/kaddressbook/viewconfigurewidget.h +++ b/kaddressbook/viewconfigurewidget.h @@ -25,7 +25,7 @@ #define VIEWCONFIGUREWIDGET_H #include <kdialogbase.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <tqpixmap.h> #include "configurewidget.h" diff --git a/kaddressbook/xxport/HACKING b/kaddressbook/xxport/HACKING index fb02930cd..f0bbc1790 100644 --- a/kaddressbook/xxport/HACKING +++ b/kaddressbook/xxport/HACKING @@ -1,7 +1,7 @@ Coding Style ============= -Please use the coding style conventions from kdepim/kaddressbook/HACKING +Please use the coding style conventions from tdepim/kaddressbook/HACKING if you want to commit your xxport plugin into the cvs. diff --git a/kaddressbook/xxportmanager.h b/kaddressbook/xxportmanager.h index 116326617..593436ed7 100644 --- a/kaddressbook/xxportmanager.h +++ b/kaddressbook/xxportmanager.h @@ -29,7 +29,7 @@ #include <kurl.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include "xxport.h" diff --git a/kalarm/daemon.cpp b/kalarm/daemon.cpp index 012725022..1f8820bff 100644 --- a/kalarm/daemon.cpp +++ b/kalarm/daemon.cpp @@ -141,7 +141,7 @@ bool Daemon::start() kdError() << "Daemon::startApp(): " DAEMON_APP_NAME " not found" << endl; return false; } - KApplication::kdeinitExec(execStr); + KApplication::tdeinitExec(execStr); kdDebug(5950) << "Daemon::start(): Alarm daemon started" << endl; mStartTimeout = 5000/startCheckInterval + 1; // check daemon status for 5 seconds before giving up mStartTimer = new TQTimer(mInstance); diff --git a/kalarm/kalarmd/Makefile.am b/kalarm/kalarmd/Makefile.am index 9dc911376..6435d3c9f 100644 --- a/kalarm/kalarmd/Makefile.am +++ b/kalarm/kalarmd/Makefile.am @@ -2,13 +2,13 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kalarm $(all_includes) noinst_LTLIBRARIES = libkalarmd.la -libkalarmd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +libkalarmd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor libkalarmd_la_LIBADD = $(LIB_KDECORE) $(top_builddir)/libkcal/libkcal.la libkalarmd_la_SOURCES = alarmdaemoniface.stub alarmguiiface.stub bin_PROGRAMS = kalarmd -kalarmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kalarmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kalarmd_LDADD = $(LIB_KDEUI) $(top_builddir)/libkcal/libkcal.la libkalarmd.la kalarmd_SOURCES = alarmdaemon.cpp admain.cpp adapp.cpp \ adcalendar.cpp adconfigdata.cpp clientinfo.cpp \ diff --git a/kalarm/kalarmd/alarmdaemon.cpp b/kalarm/kalarmd/alarmdaemon.cpp index 099dcd87a..0fad7935f 100644 --- a/kalarm/kalarmd/alarmdaemon.cpp +++ b/kalarm/kalarmd/alarmdaemon.cpp @@ -120,7 +120,7 @@ void AlarmDaemon::autostartKAlarm() kdDebug(5900) << "AlarmDaemon::autostartKAlarm(): starting KAlarm\n"; TQStringList args; args << TQString::tqfromLatin1("--tray"); - int ret = KApplication::kdeinitExec(TQString::tqfromLatin1("kalarm"), args); + int ret = KApplication::tdeinitExec(TQString::tqfromLatin1("kalarm"), args); if (ret) kdError(5900) << "AlarmDaemon::autostartKAlarm(): error=" << ret << endl; else diff --git a/kalarm/lib/Makefile.am b/kalarm/lib/Makefile.am index 7d236b5a2..675021d50 100644 --- a/kalarm/lib/Makefile.am +++ b/kalarm/lib/Makefile.am @@ -18,5 +18,5 @@ noinst_HEADERS = \ timeperiod.h shellprocess.h slider.h spinbox.h spinbox2.h \ synchtimer.h spinbox2private.h -DOXYGEN_REFERENCES=kdecore kdeui libtdepim +DOXYGEN_REFERENCES=tdecore tdeui libtdepim include $(top_srcdir)/admin/Doxyfile.am diff --git a/kalarm/lib/colourcombo.cpp b/kalarm/lib/colourcombo.cpp index 4d10f6e63..621f3e837 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/kdeui/kcolorcombo.cpp in the KDE libraries: + * Some code taken from kdelibs/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/kandy/src/CMakeLists.txt b/kandy/src/CMakeLists.txt index f788acfa9..9fe0ea410 100644 --- a/kandy/src/CMakeLists.txt +++ b/kandy/src/CMakeLists.txt @@ -46,7 +46,7 @@ tde_add_executable( kandy AUTOMOC atcommand.cpp commanditem.cpp mobilegui_base.ui mobilegui.cpp commandscheduler.cpp commandset.cpp kandyprefs.kcfgc kandyprefsdialog.cpp mobilemain.cpp - LINK kdepim-shared ${LOCKDEV_LIBRARY} + LINK tdepim-shared ${LOCKDEV_LIBRARY} DESTINATION ${BIN_INSTALL_DIR} ) @@ -55,6 +55,6 @@ tde_add_executable( kandy AUTOMOC tde_add_executable( kandy_client AUTOMOC SOURCES kandy_client.cpp - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kandy/src/Makefile.am b/kandy/src/Makefile.am index 401c1729d..a0b49885c 100644 --- a/kandy/src/Makefile.am +++ b/kandy/src/Makefile.am @@ -2,7 +2,7 @@ bin_PROGRAMS = kandy kandy_client INCLUDES = -I$(top_srcdir) $(all_includes) -kandy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kandy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kandy_LDADD = $(KANDY_LIBLOCKDEV) $(LIB_KFILE) -lkabc $(top_builddir)/libtdepim/libtdepim.la kandy_SOURCES = main.cpp kandy.cpp \ cmdpropertiesdialog_base.ui cmdpropertiesdialog.cpp \ @@ -17,7 +17,7 @@ kandy_SOURCES = main.cpp kandy.cpp \ noinst_HEADERS = kandy.h kandyview.h modem.h atcommand.h \ commanditem.h mobilegui.h commandscheduler.h -kandy_client_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kandy_client_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kandy_client_LDADD = $(LIB_KDECORE) kandy_client_SOURCES = kandy_client.cpp diff --git a/karm/CMakeLists.txt b/karm/CMakeLists.txt index 430179ce9..8b1b64323 100644 --- a/karm/CMakeLists.txt +++ b/karm/CMakeLists.txt @@ -55,7 +55,7 @@ tde_add_library( karm SHARED AUTOMOC csvexportdialog.cpp plannerparser.cpp karmdcopiface.skel taskviewwhatsthis.cpp VERSION 0.0.0 - LINK kcal_resourceremote-shared kdeprint-shared + LINK kcal_resourceremote-shared tdeprint-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/karm/Makefile.am b/karm/Makefile.am index 603b03b73..ee16051c1 100644 --- a/karm/Makefile.am +++ b/karm/Makefile.am @@ -20,10 +20,10 @@ libkarm_shared_la_SOURCES = kaccelmenuwatch.cpp desktoptracker.cpp \ karmdcopiface.skel taskviewwhatsthis.cpp libkarm_shared_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \ $(top_builddir)/kresources/remote/libkcal_resourceremote.la \ - $(top_builddir)/libtdepim/libtdepim.la $(LIBXSS) -lkdeprint + $(top_builddir)/libtdepim/libtdepim.la $(LIBXSS) -ltdeprint karm_SOURCES = main.cpp karm_LDADD = libkarm_shared.la -karm_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +karm_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor noinst_HEADERS = desktoptracker.h edittaskdialog.h printdialog.h \ idletimedetector.h kaccelmenuwatch.h timekard.h \ karmutility.h ktimewidget.h karmstorage.h mainwindow.h \ @@ -43,9 +43,9 @@ messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/karm.pot srcdoc: - kdoc -a -p -H -d $(HOME)/web/src/karm karm *.h -lkdecore -lkdeui -lqt + kdoc -a -p -H -d $(HOME)/web/src/karm karm *.h -ltdecore -ltdeui -lqt -DOXYGEN_REFERENCES = kdeui +DOXYGEN_REFERENCES = tdeui include $(top_srcdir)/admin/Doxyfile.am ######################################################################### diff --git a/karm/karmstorage.h b/karm/karmstorage.h index 65caafd7c..573c55239 100644 --- a/karm/karmstorage.h +++ b/karm/karmstorage.h @@ -34,7 +34,7 @@ #include <calendarresources.h> #include <vector> #include "resourcecalendar.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> class TQDateTime; class Preferences; diff --git a/karm/test/Makefile.am b/karm/test/Makefile.am index 8fff3ee56..a860e9a4f 100644 --- a/karm/test/Makefile.am +++ b/karm/test/Makefile.am @@ -3,11 +3,11 @@ METASOURCES = AUTO check_PROGRAMS = runscripts locking runscripts_SOURCES = script.cpp runscripts.cpp -runscripts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +runscripts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor runscripts_LDADD = $(LIB_QT) $(LIB_KDECORE) locking_SOURCES = locking.cpp lockerthread.cpp -locking_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +locking_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor locking_LDADD = $(LIB_QT) $(top_builddir)/libkcal/libkcal.la KDE_CXXFLAGS = $(USE_EXCEPTIONS) diff --git a/karm/test/README b/karm/test/README index c245b182b..a5307e6ee 100644 --- a/karm/test/README +++ b/karm/test/README @@ -5,7 +5,7 @@ It's in very rough tqshape. How you start: - (1) get and install kdepim including karm + (1) get and install tdepim including karm (2) get and install xautomation from http://hoopajoo.net/projects/xautomation.html diff --git a/kdepim.lsm b/kdepim.lsm index 797bf766e..22a6aba6c 100644 --- a/kdepim.lsm +++ b/kdepim.lsm @@ -1,5 +1,5 @@ Begin4 -Title: kdepim +Title: tdepim Version: 3.5.10 Entered-date: 2008-08-26 Description: PIM (Personal Information Management) programs diff --git a/kfile-plugins/ics/Makefile.am b/kfile-plugins/ics/Makefile.am index 694f207f4..1a2378e5c 100644 --- a/kfile-plugins/ics/Makefile.am +++ b/kfile-plugins/ics/Makefile.am @@ -1,6 +1,6 @@ # Makefile.am for ics file meta info plugin -# set the include path for X, kdepim, qt and KDE +# set the include path for X, tdepim, qt and KDE INCLUDES = \ -I$(top_srcdir) \ $(all_includes) @@ -11,7 +11,7 @@ noinst_HEADERS = kfile_ics.h kde_module_LTLIBRARIES = kfile_ics.la kfile_ics_la_SOURCES = kfile_ics.cpp -kfile_ics_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore +kfile_ics_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore kfile_ics_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(LIB_KSYCOCA) diff --git a/kfile-plugins/palm-databases/Makefile.am b/kfile-plugins/palm-databases/Makefile.am index fa4ea63db..fa60fd228 100644 --- a/kfile-plugins/palm-databases/Makefile.am +++ b/kfile-plugins/palm-databases/Makefile.am @@ -9,7 +9,7 @@ noinst_HEADERS = kfile_palm.h kde_module_LTLIBRARIES = kfile_palm.la kfile_palm_la_SOURCES = kfile_palm.cpp -kfile_palm_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore +kfile_palm_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore kfile_palm_la_LIBADD = $(LIB_KSYCOCA) $(PISOCK_LIB) # let automoc handle all of the meta source files (moc) diff --git a/kfile-plugins/vcf/Makefile.am b/kfile-plugins/vcf/Makefile.am index e447e6faf..087600d7c 100644 --- a/kfile-plugins/vcf/Makefile.am +++ b/kfile-plugins/vcf/Makefile.am @@ -9,7 +9,7 @@ noinst_HEADERS = kfile_vcf.h kde_module_LTLIBRARIES = kfile_vcf.la kfile_vcf_la_SOURCES = kfile_vcf.cpp -kfile_vcf_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore +kfile_vcf_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore kfile_vcf_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KABC) # let automoc handle all of the meta source files (moc) diff --git a/kgantt/kgantt/CMakeLists.txt b/kgantt/kgantt/CMakeLists.txt index 9577ead8c..ad5af137f 100644 --- a/kgantt/kgantt/CMakeLists.txt +++ b/kgantt/kgantt/CMakeLists.txt @@ -37,6 +37,6 @@ tde_add_library( kgantt SHARED AUTOMOC KGanttRelation.cpp xQGanttBarViewPort_Events.cpp xQGanttBarView.cpp xQGanttListView.cpp KGanttBarConfig.cpp VERSION 0.0.2 - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kgantt/kgantt/KGantt.h b/kgantt/kgantt/KGantt.h index 5fc77fe4d..ca02a066d 100644 --- a/kgantt/kgantt/KGantt.h +++ b/kgantt/kgantt/KGantt.h @@ -38,7 +38,7 @@ #include <tqsplitter.h> #include <kpopupmenu.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include "KGanttItem.h" #include "xQGanttListView.h" diff --git a/kgantt/kgantt/KGanttItem.h b/kgantt/kgantt/KGanttItem.h index a01763a50..1113c9d00 100644 --- a/kgantt/kgantt/KGanttItem.h +++ b/kgantt/kgantt/KGanttItem.h @@ -38,7 +38,7 @@ #include <tqptrlist.h> #include <tqpainter.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include "KGanttRelation.h" diff --git a/kioslaves/imap4/imap4.cc b/kioslaves/imap4/imap4.cc index 6e9b1f3ee..6671981eb 100644 --- a/kioslaves/imap4/imap4.cc +++ b/kioslaves/imap4/imap4.cc @@ -91,7 +91,7 @@ extern "C" { #include <kmimetype.h> #include <kmdcodec.h> -#include "kdepimmacros.h" +#include "tdepimmacros.h" #define IMAP_PROTOCOL "imap" #define IMAP_SSL_PROTOCOL "imaps" diff --git a/kioslaves/mbox/mbox.cc b/kioslaves/mbox/mbox.cc index 1828401b6..1f9989218 100644 --- a/kioslaves/mbox/mbox.cc +++ b/kioslaves/mbox/mbox.cc @@ -34,7 +34,7 @@ #include <stdlib.h> -#include "kdepimmacros.h" +#include "tdepimmacros.h" #include "mbox.h" diff --git a/kioslaves/opengroupware/opengroupware.cpp b/kioslaves/opengroupware/opengroupware.cpp index 6e798c64e..0032e4440 100644 --- a/kioslaves/opengroupware/opengroupware.cpp +++ b/kioslaves/opengroupware/opengroupware.cpp @@ -45,7 +45,7 @@ #include <unistd.h> #include <stdlib.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KABC { diff --git a/kioslaves/opengroupware/webdavhandler.cpp b/kioslaves/opengroupware/webdavhandler.cpp index 406687ccb..2f98d915d 100644 --- a/kioslaves/opengroupware/webdavhandler.cpp +++ b/kioslaves/opengroupware/webdavhandler.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/kioslaves/opengroupware/webdavhandler.h b/kioslaves/opengroupware/webdavhandler.h index eebb7b03b..a86332a32 100644 --- a/kioslaves/opengroupware/webdavhandler.h +++ b/kioslaves/opengroupware/webdavhandler.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/kioslaves/sieve/sieve.cpp b/kioslaves/sieve/sieve.cpp index 8e6a5bcd7..0b547fd0a 100644 --- a/kioslaves/sieve/sieve.cpp +++ b/kioslaves/sieve/sieve.cpp @@ -49,7 +49,7 @@ using std::exit; #include <sys/stat.h> #include <cassert> -#include <kdepimmacros.h> +#include <tdepimmacros.h> static const int debugArea = 7122; diff --git a/kitchensync/libqopensync/CMakeLists.txt b/kitchensync/libqopensync/CMakeLists.txt index 5b8a0ebfe..c933d2862 100644 --- a/kitchensync/libqopensync/CMakeLists.txt +++ b/kitchensync/libqopensync/CMakeLists.txt @@ -33,6 +33,6 @@ tde_add_library( qopensync SHARED AUTOMOC filter.cpp group.cpp member.cpp plugin.cpp result.cpp syncmapping.cpp syncupdates.cpp syncchange.cpp VERSION 0.0.0 - LINK kdeui-shared ${OSENGINE_LIBRARIES} ${OPENSYNC_LIBRARIES} + LINK tdeui-shared ${OSENGINE_LIBRARIES} ${OPENSYNC_LIBRARIES} DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kitchensync/src/CMakeLists.txt b/kitchensync/src/CMakeLists.txt index 9e074773f..29aae78c6 100644 --- a/kitchensync/src/CMakeLists.txt +++ b/kitchensync/src/CMakeLists.txt @@ -72,6 +72,6 @@ tde_add_library( kitchensync SHARED AUTOMOC configguijescs.cpp configguievo2.cpp configguimoto.cpp configguisynce.cpp configguisunbird.cpp VERSION 0.0.0 - LINK qopensync-shared kdepim-shared khtml-shared + LINK qopensync-shared tdepim-shared khtml-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kitchensync/src/Makefile.am b/kitchensync/src/Makefile.am index 6f2e51527..b6139edd1 100644 --- a/kitchensync/src/Makefile.am +++ b/kitchensync/src/Makefile.am @@ -10,7 +10,7 @@ INCLUDES = -I$(top_srcdir)/kitchensync/src \ bin_PROGRAMS = kitchensync kitchensync_SOURCES = main.cpp mainwindow.cpp -kitchensync_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kitchensync_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kitchensync_LDADD = libkitchensync.la xdg_apps_DATA = kitchensync.desktop diff --git a/kitchensync/src/configgui.cpp b/kitchensync/src/configgui.cpp index 6e2aa5d70..553b2f5e5 100644 --- a/kitchensync/src/configgui.cpp +++ b/kitchensync/src/configgui.cpp @@ -99,7 +99,7 @@ ConfigGui *ConfigGui::Factory::create( const QSync::Member &member, return new ConfigGuiGoogleCalendar( member, parent ); } else if ( name == "ldap-sync" ) { return new ConfigGuiLdap( member, parent ); - } else if ( name == "kdepim-sync" ) { + } else if ( name == "tdepim-sync" ) { return new ConfigGuiBlank( member, parent ); } else if ( name == "jescs-sync" ) { return new ConfigGuiJescs( member, parent ); diff --git a/kitchensync/src/memberinfo.cpp b/kitchensync/src/memberinfo.cpp index d8c672d6e..35fd9272e 100644 --- a/kitchensync/src/memberinfo.cpp +++ b/kitchensync/src/memberinfo.cpp @@ -51,7 +51,7 @@ TQString MemberInfo::name() const if ( nameMap.isEmpty() ) { nameMap.insert( "file-sync", i18n( "File" ) ); nameMap.insert( "palm-sync", i18n( "Palm" ) ); - nameMap.insert( "kdepim-sync", i18n( "KDE PIM" ) ); + nameMap.insert( "tdepim-sync", i18n( "KDE PIM" ) ); nameMap.insert( "kio-sync", i18n( "Remote File" ) ); nameMap.insert( "irmc-sync", i18n( "Mobile Phone" ) ); nameMap.insert( "evo2-sync", i18n( "Evolution" ) ); @@ -78,7 +78,7 @@ TQString MemberInfo::pluginIconName( const TQString &pluginName ) { if ( pluginName == "file-sync" ) return "folder"; if ( pluginName == "palm-sync" ) return "pda_black"; - if ( pluginName == "kdepim-sync" ) return "kontact"; + if ( pluginName == "tdepim-sync" ) return "kontact"; if ( pluginName == "kio-sync" ) return "network"; if ( pluginName == "irmc-sync" ) return "mobile_phone"; if ( pluginName == "evo2-sync" ) return "evolution"; diff --git a/kmail/CMakeLists.txt b/kmail/CMakeLists.txt index 27b716654..8f32abcbb 100644 --- a/kmail/CMakeLists.txt +++ b/kmail/CMakeLists.txt @@ -190,7 +190,7 @@ tde_restore( KDE3_DCOPIDL_EXECUTABLE ) tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} LINK - emailfunctions-static kmime-shared kpgp-shared kdepim-shared kpimidentities-shared + emailfunctions-static kmime-shared kpgp-shared tdepim-shared kpimidentities-shared mimelib-shared ksieve-shared khtml-shared ${INDEX_LIBRARY} DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kmail/ChangeLog b/kmail/ChangeLog index d3e1a7e5e..c055ab4cf 100644 --- a/kmail/ChangeLog +++ b/kmail/ChangeLog @@ -343,7 +343,7 @@ please visit http://webcvs.kde.org * Pop: Fixed problems in pop authentication code. * Pop: Enabled POP3 LAST command which was committed to - kdesupport some time ago. + tdesupport some time ago. 1998-11-15 Alex Zepeda <garbanzo@hooked.net> diff --git a/kmail/Makefile.am b/kmail/Makefile.am index d6165c9bc..58a42297e 100644 --- a/kmail/Makefile.am +++ b/kmail/Makefile.am @@ -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)/libtdepim -lkdepim +kmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) -L$(top_builddir)/libtdepim -ltdepim kmail_LDADD = libkmailprivate.la libkmailprivate_la_SOURCES = kmmessage.cpp kmmainwin.cpp configuredialog.cpp \ @@ -243,5 +243,5 @@ messages: rc.cpp kde_kcfg_DATA = kmail.kcfg replyphrases.kcfg custommimeheader.kcfg \ templatesconfiguration_kfg.kcfg customtemplates_kfg.kcfg -DOXYGEN_REFERENCES = kdeui +DOXYGEN_REFERENCES = tdeui include $(top_srcdir)/admin/Doxyfile.am diff --git a/kmail/aboutdata.h b/kmail/aboutdata.h index 513f9483b..843e7aa69 100644 --- a/kmail/aboutdata.h +++ b/kmail/aboutdata.h @@ -33,7 +33,7 @@ #define __KMAIL_ABOUTDATA_H__ #include <kaboutdata.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KMail { diff --git a/kmail/accountmanager.h b/kmail/accountmanager.h index f8a8079f7..a9ba747dd 100644 --- a/kmail/accountmanager.h +++ b/kmail/accountmanager.h @@ -22,7 +22,7 @@ #include <tqobject.h> #include "kmaccount.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> class TQString; class TQStringList; diff --git a/kmail/app_octetstream.cpp b/kmail/app_octetstream.cpp index 9a5db05b4..526fbb543 100644 --- a/kmail/app_octetstream.cpp +++ b/kmail/app_octetstream.cpp @@ -32,7 +32,7 @@ #include "interfaces/bodypartformatter.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace { diff --git a/kmail/callback.h b/kmail/callback.h index a7e9af792..a3fccc4ed 100644 --- a/kmail/callback.h +++ b/kmail/callback.h @@ -38,7 +38,7 @@ class KMMessage; class KMReaderWin; -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <libkcal/attendee.h> // only for an enum, we are not linking diff --git a/kmail/configuredialog_p.h b/kmail/configuredialog_p.h index 455f8579f..e095b1756 100644 --- a/kmail/configuredialog_p.h +++ b/kmail/configuredialog_p.h @@ -18,7 +18,7 @@ #include <klistview.h> #include <kcmodule.h> #include <klocale.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class TQPushButton; class TQLabel; diff --git a/kmail/identitydialog.cpp b/kmail/identitydialog.cpp index 8e8cbe9f4..f32c014ae 100644 --- a/kmail/identitydialog.cpp +++ b/kmail/identitydialog.cpp @@ -50,7 +50,7 @@ using KMail::FolderRequester; #include "templatesconfiguration_kfg.h" #include "simplestringlisteditor.h" -// other kdepim headers: +// other tdepim headers: // libtdepim #include <libkpimidentities/identity.h> #include <libtdepim/addresseelineedit.h> diff --git a/kmail/kmail_part.h b/kmail/kmail_part.h index ff80c19bd..647beb8b8 100644 --- a/kmail/kmail_part.h +++ b/kmail/kmail_part.h @@ -35,7 +35,7 @@ #include <kparts/part.h> #include <tqwidget.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KInstance; class KAboutData; diff --git a/kmail/kmcommands.h b/kmail/kmcommands.h index 4bc86ec05..b3de87f75 100644 --- a/kmail/kmcommands.h +++ b/kmail/kmcommands.h @@ -13,7 +13,7 @@ #include <kio/job.h> #include "kmmsgbase.h" // for KMMsgtqStatus #include <mimelib/string.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <kservice.h> #include <ktempfile.h> diff --git a/kmail/kmfoldertree.h b/kmail/kmfoldertree.h index f953f0290..58932c17f 100644 --- a/kmail/kmfoldertree.h +++ b/kmail/kmfoldertree.h @@ -21,7 +21,7 @@ #include "foldertreebase.h" #include <klocale.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <tqguardedptr.h> #include <tqwidget.h> diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h index d94451237..05dac4a19 100644 --- a/kmail/kmkernel.h +++ b/kmail/kmkernel.h @@ -12,7 +12,7 @@ #include <kconfig.h> #include <kdeversion.h> #include <kimproxy.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include "kmailIface.h" #include "kmmsgbase.h" diff --git a/kmail/kmstartup.h b/kmail/kmstartup.h index 45c63be99..456a39a4a 100644 --- a/kmail/kmstartup.h +++ b/kmail/kmstartup.h @@ -18,7 +18,7 @@ #ifndef KMSTARTUP #define KMSTARTUP -#include <kdepimmacros.h> +#include <tdepimmacros.h> extern "C" { diff --git a/kmail/snippetdlg.h b/kmail/snippetdlg.h index 6aa62d0fa..bc845a90f 100644 --- a/kmail/snippetdlg.h +++ b/kmail/snippetdlg.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Form interface generated from reading ui file '/Users/till/Documents/Code/kde/enterprise/kdepim/kmail/snippetdlg.ui' +** Form interface generated from reading ui file '/Users/till/Documents/Code/kde/enterprise/tdepim/kmail/snippetdlg.ui' ** ** Created: Tue Sep 25 16:03:02 2007 ** by: The User Interface Compiler ($Id: qt/main.cpp 3.3.8 edited Jan 11 14:47 $) diff --git a/kmail/treebase.cpp b/kmail/treebase.cpp index 19aff3155..d3e8a045b 100644 --- a/kmail/treebase.cpp +++ b/kmail/treebase.cpp @@ -1,6 +1,6 @@ /* Copyright (c) 2008 Pradeepto K. Bhattacharya <pradeepto@kde.org> - ( adapted from kdepim/kmail/kmfolderseldlg.cpp and simplefoldertree.h ) + ( adapted from tdepim/kmail/kmfolderseldlg.cpp and simplefoldertree.h ) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/kmail/treebase.h b/kmail/treebase.h index f786377b7..b89461e2d 100644 --- a/kmail/treebase.h +++ b/kmail/treebase.h @@ -1,6 +1,6 @@ /* Copyright (c) 2008 Pradeepto K. Bhattacharya <pradeepto@kde.org> - ( adapted from kdepim/kmail/kmfolderseldlg.cpp and simplefoldertree.h ) + ( adapted from tdepim/kmail/kmfolderseldlg.cpp and simplefoldertree.h ) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/kmailcvt/Makefile.am b/kmailcvt/Makefile.am index 2d0d3330c..e4e83e72b 100644 --- a/kmailcvt/Makefile.am +++ b/kmailcvt/Makefile.am @@ -40,7 +40,7 @@ INCLUDES= $(all_includes) kmailcvt_METASOURCES = AUTO # the library search path. -kmailcvt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kmailcvt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor KDE_ICON=AUTO diff --git a/kmailcvt/README b/kmailcvt/README index dbdf247a8..d8322ed49 100644 --- a/kmailcvt/README +++ b/kmailcvt/README @@ -11,7 +11,7 @@ Writing a filter and add "filter_myformat.cxx" to the end of the kmailcvt_SOURCES line in Makefile.am and "filter_myformat.cxx filter_myformat.hxx" to the end of the EXTRA_DIST line in Makefile.am. Now run "make -f Makefile.cvs; ./configure" in -your kdepim source directory. +your tdepim source directory. In the import method of your filter you are passed a FilterInfo object. This has the following methods that you may want to use: diff --git a/kmobile/CMakeLists.txt b/kmobile/CMakeLists.txt index 7a160afd1..1c5cf0c07 100644 --- a/kmobile/CMakeLists.txt +++ b/kmobile/CMakeLists.txt @@ -60,6 +60,6 @@ tde_add_library( kmobiledevice SHARED AUTOMOC tde_add_library( kmobileclient SHARED AUTOMOC SOURCES kmobileclient.cpp - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kmobile/Makefile.am b/kmobile/Makefile.am index a5638cd86..46a0725d0 100644 --- a/kmobile/Makefile.am +++ b/kmobile/Makefile.am @@ -8,7 +8,7 @@ lib_LTLIBRARIES = libkmobiledevice.la libkmobileclient.la INCLUDES = $(all_includes) -kmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kmobile_LDADD = $(LIB_KFILE) $(LIB_KABC) libkmobiledevice.la kmobile_SOURCES = main.cpp kmobile.cpp kmobileview.cpp kmobileitem.cpp\ pref.cpp kmobileiface.skel kmobile_selectiondialog.ui \ @@ -29,7 +29,7 @@ libkmobileclient_la_LDFLAGS = $(all_libraries) -no-undefined -avoid-version libkmobileclient_la_LIBADD = $(LIB_KDECORE) -lDCOP EXTRA_PROGRAMS = testlibkmobile -testlibkmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testlibkmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testlibkmobile_LDADD = libkmobileclient.la testlibkmobile_SOURCES = testlibkmobile.cpp diff --git a/kmobile/kioslave/kio_mobile.cpp b/kmobile/kioslave/kio_mobile.cpp index cc7482072..ed570196d 100644 --- a/kmobile/kioslave/kio_mobile.cpp +++ b/kmobile/kioslave/kio_mobile.cpp @@ -33,7 +33,7 @@ #include "kio_mobile.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> using namespace KIO; diff --git a/kmobile/kmobileclient.cpp b/kmobile/kmobileclient.cpp index f587ee2c7..5a3ab8a6a 100644 --- a/kmobile/kmobileclient.cpp +++ b/kmobile/kmobileclient.cpp @@ -72,7 +72,7 @@ bool KMobileClient::startKMobileApplication() arg << TQString("kmobile") << params; TQCString replyType; TQByteArray replyData; - bool ok = call("klauncher", "klauncher", "kdeinit_exec_wait(TQString,TQStringList)", data, replyType, replyData); + bool ok = call("klauncher", "klauncher", "tdeinit_exec_wait(TQString,TQStringList)", data, replyType, replyData); PRINT_DEBUG << TQString("DCOP-CALL to klauncher: %1\n").tqarg(ok?"ok.":"failed."); return ok; } diff --git a/kmobile/kmobileclient.h b/kmobile/kmobileclient.h index 1a813a453..6e5f26b78 100644 --- a/kmobile/kmobileclient.h +++ b/kmobile/kmobileclient.h @@ -6,7 +6,7 @@ #define _KMOBILECLIENT_H_ #include <dcopclient.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KDE_EXPORT KMobileClient : public DCOPClient { diff --git a/kmobile/kmobiledevice.h b/kmobile/kmobiledevice.h index 5cf19092d..88a4bc10f 100644 --- a/kmobile/kmobiledevice.h +++ b/kmobile/kmobiledevice.h @@ -24,7 +24,7 @@ #include <tqstringlist.h> #include <tqmutex.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <klibloader.h> #include <kabc/addressee.h> diff --git a/kmobile/kmobileview.h b/kmobile/kmobileview.h index 4c0826f53..16d2b2e2d 100644 --- a/kmobile/kmobileview.h +++ b/kmobile/kmobileview.h @@ -9,7 +9,7 @@ #include "kmobileiface.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KConfig; class KMobileItem; diff --git a/knode/CMakeLists.txt b/knode/CMakeLists.txt index 82c924bea..86246a514 100644 --- a/knode/CMakeLists.txt +++ b/knode/CMakeLists.txt @@ -80,7 +80,7 @@ tde_add_library( knodecommon SHARED AUTOMOC kncollectionview.cpp articlewidget.cpp csshelper.cpp smtpaccountwidget_base.ui VERSION 3.0.0 - LINK emailfunctions-static kdepim-shared kpgp-shared khtml-shared + LINK emailfunctions-static tdepim-shared kpgp-shared khtml-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/knode/Makefile.am b/knode/Makefile.am index e17fa2f93..c93deeced 100644 --- a/knode/Makefile.am +++ b/knode/Makefile.am @@ -11,13 +11,13 @@ lib_LTLIBRARIES = libknodecommon.la kde_module_LTLIBRARIES = kcm_knode.la libknodepart.la libknodepart_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(KDE_RPATH) $(KDE_PLUGIN) -libknodepart_la_LIBADD = libknodecommon.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -L$(top_builddir)/libtdepim -lkdepim +libknodepart_la_LIBADD = libknodecommon.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -L$(top_builddir)/libtdepim -ltdepim SUBDIRS = pics filters bin_PROGRAMS = knode -knode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +knode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor knode_LDADD = libknodecommon.la kcm_knode_la_SOURCES = knconfigpages.cpp diff --git a/knode/aboutdata.h b/knode/aboutdata.h index 443877a86..05f8dc3f0 100644 --- a/knode/aboutdata.h +++ b/knode/aboutdata.h @@ -15,7 +15,7 @@ */ #include <kaboutdata.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #ifndef KNODE_ABOUTDATA_H #define KNODE_ABOUTDATA_H diff --git a/knode/knconfigpages.cpp b/knode/knconfigpages.cpp index 030838acb..c44b96954 100644 --- a/knode/knconfigpages.cpp +++ b/knode/knconfigpages.cpp @@ -23,7 +23,7 @@ #include "knconfigpages.h" #include "knconfigwidgets.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> // // common config page with tabs (code mostly taken from kmail) diff --git a/knode/knconvert.h b/knode/knconvert.h index 4db14718a..af0e91dcd 100644 --- a/knode/knconvert.h +++ b/knode/knconvert.h @@ -21,7 +21,7 @@ #include <tqglobal.h> #include <tqvaluelist.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class TQListBox; class TQLabel; diff --git a/knode/knglobals.h b/knode/knglobals.h index 2cb801e80..c8371b46e 100644 --- a/knode/knglobals.h +++ b/knode/knglobals.h @@ -20,7 +20,7 @@ #include <kconfig.h> #include "resource.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KInstance; class KNConfigManager; diff --git a/knode/knmainwidget.h b/knode/knmainwidget.h index b41894900..c00c69982 100644 --- a/knode/knmainwidget.h +++ b/knode/knmainwidget.h @@ -21,7 +21,7 @@ #include "resource.h" #include <tqglobal.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class TQListViewItem; diff --git a/knotes/CMakeLists.txt b/knotes/CMakeLists.txt index 88259383a..72ab93b22 100644 --- a/knotes/CMakeLists.txt +++ b/knotes/CMakeLists.txt @@ -76,7 +76,7 @@ tde_add_library( knotes SHARED AUTOMOC knotebutton.cpp knoteconfigdlg.cpp knotehostdlg.cpp knotealarmdlg.cpp knotesalarm.cpp VERSION 0.0.0 - LINK kdepim-shared kutils-shared kdeprint-shared + LINK tdepim-shared kutils-shared tdeprint-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/knotes/Makefile.am b/knotes/Makefile.am index cfa8266ab..d67ecce58 100644 --- a/knotes/Makefile.am +++ b/knotes/Makefile.am @@ -27,15 +27,15 @@ libknote_la_SOURCES = knote.cpp knotebutton.cpp knoteconfigdlg.cpp knotehostdlg. knotes_SOURCES = main.cpp knotesapp.cpp KNotesAppIface.skel knotes_LDADD = libknote.la libknoteseditor.la libknotesnetwork.la libknotesresources.la \ libknoteslegacy.la libknotesconfig.la libknotesprinting.la $(top_builddir)/libkcal/libkcal.la \ - $(top_builddir)/libtdepim/libtdepim.la $(LIB_KIO) -lkresources -lkdeprint -lkutils -knotes_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor + $(top_builddir)/libtdepim/libtdepim.la $(LIB_KIO) -lkresources -ltdeprint -lkutils +knotes_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor knotes_COMPILE_FIRST = knoteconfig.h kde_module_LTLIBRARIES = knotes_local.la knotes_local_la_SOURCES = resourcelocal_plugin.cpp knotes_local_la_LDFLAGS = $(KDE_LDFLAGS) $(all_libraries) -module $(KDE_PLUGIN) knotes_local_la_LIBADD = libknotesresources.la libknotesconfig.la libknotesprinting.la \ - $(top_builddir)/libkcal/libkcal.la -lkdeprint $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) -lkresources + $(top_builddir)/libkcal/libkcal.la -ltdeprint $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) -lkresources METASOURCES = AUTO diff --git a/knotes/resourcenotes.h b/knotes/resourcenotes.h index 4fbf3b98b..65cf1acbe 100644 --- a/knotes/resourcenotes.h +++ b/knotes/resourcenotes.h @@ -34,7 +34,7 @@ #define RESOURCENOTES_H #include <kresources/resource.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <libkcal/alarm.h> class KConfig; diff --git a/kode/CMakeLists.txt b/kode/CMakeLists.txt index 616f2f942..179a539e1 100644 --- a/kode/CMakeLists.txt +++ b/kode/CMakeLists.txt @@ -39,6 +39,6 @@ tde_add_library( kode SHARED function.cpp variable.cpp membervariable.cpp typedef.cpp statemachine.cpp automakefile.cpp VERSION 1.0.0 - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kode/Makefile.am b/kode/Makefile.am index af8e61573..c33d78335 100644 --- a/kode/Makefile.am +++ b/kode/Makefile.am @@ -10,11 +10,11 @@ libkode_la_SOURCES = code.cpp enum.cpp style.cpp printer.cpp license.cpp file.cp typedef.cpp statemachine.cpp automakefile.cpp libkode_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \ -version-info 1:0:0 -no-undefined -libkode_la_LIBADD = -lkdecore +libkode_la_LIBADD = -ltdecore bin_PROGRAMS = kode -kode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kode_LDADD = libkode.la -lkabc kode_SOURCES = kodemain.cpp diff --git a/kode/automakefile.h b/kode/automakefile.h index 5f22a7570..418851ade 100644 --- a/kode/automakefile.h +++ b/kode/automakefile.h @@ -26,7 +26,7 @@ #include <tqmap.h> #include <tqstringlist.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KODE { diff --git a/kode/class.cpp b/kode/class.cpp index dc443c20d..5df86582a 100644 --- a/kode/class.cpp +++ b/kode/class.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/kode/class.h b/kode/class.h index ac7570ef6..f3f44114b 100644 --- a/kode/class.h +++ b/kode/class.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> @@ -26,7 +26,7 @@ #include "membervariable.h" #include "typedef.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <tqvaluelist.h> #include <tqstring.h> #include <tqstringlist.h> diff --git a/kode/code.cpp b/kode/code.cpp index 0b28e546f..ce4e9708a 100644 --- a/kode/code.cpp +++ b/kode/code.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/kode/code.h b/kode/code.h index 9f056df2b..97a1b8d34 100644 --- a/kode/code.h +++ b/kode/code.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> @@ -26,7 +26,7 @@ #include <tqvaluelist.h> #include <tqstring.h> #include <tqstringlist.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KODE { class KDE_EXPORT Code diff --git a/kode/enum.h b/kode/enum.h index cc75b2c03..56681724f 100644 --- a/kode/enum.h +++ b/kode/enum.h @@ -22,7 +22,7 @@ #define KODE_ENUM_H #include <tqstringlist.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KODE { diff --git a/kode/file.cpp b/kode/file.cpp index ce8d2a3e8..b6e7619fe 100644 --- a/kode/file.cpp +++ b/kode/file.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/kode/file.h b/kode/file.h index 0520d7872..f4fe555e8 100644 --- a/kode/file.h +++ b/kode/file.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> @@ -28,7 +28,7 @@ #include <tqstring.h> #include <tqstringlist.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KODE { diff --git a/kode/function.cpp b/kode/function.cpp index 2cea97368..37629c559 100644 --- a/kode/function.cpp +++ b/kode/function.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/kode/function.h b/kode/function.h index ad1fea45c..305838eb4 100644 --- a/kode/function.h +++ b/kode/function.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> @@ -26,7 +26,7 @@ #include <tqvaluelist.h> #include <tqstring.h> #include <tqstringlist.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KODE { diff --git a/kode/kodemain.cpp b/kode/kodemain.cpp index 63746effe..6e9b62225 100644 --- a/kode/kodemain.cpp +++ b/kode/kodemain.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/kode/kwsdl/Makefile.am b/kode/kwsdl/Makefile.am index 62bea4553..1b980da7e 100644 --- a/kode/kwsdl/Makefile.am +++ b/kode/kwsdl/Makefile.am @@ -7,11 +7,11 @@ lib_LTLIBRARIES = libwsdl.la libwsdl_la_SOURCES = binding.cpp message.cpp parser.cpp port.cpp service.cpp \ typemapper.cpp wsdl.cpp libwsdl_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined -libwsdl_la_LIBADD = -lkdecore schema/libschema.la +libwsdl_la_LIBADD = -ltdecore schema/libschema.la bin_PROGRAMS = kwsdl_compiler -kwsdl_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kwsdl_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kwsdl_compiler_LDADD = ../libkode.la libwsdl.la kwsdl_compiler_SOURCES = compiler.cpp converter.cpp creator.cpp main.cpp \ namemapper.cpp diff --git a/kode/kwsdl/creator.cpp b/kode/kwsdl/creator.cpp index 4c108693a..0f16a5eec 100644 --- a/kode/kwsdl/creator.cpp +++ b/kode/kwsdl/creator.cpp @@ -60,7 +60,7 @@ void Creator::create( const KODE::Class::List &list ) KODE::AutoMakefile::Target libTarget( "bin_PROGRAMS", "kwsdl" ); libTarget.setSources( "main.cc " + cppFiles.join( " " ) ); libTarget.setLdFlags( "$(all_libraries) $(KDE_RPATH)" ); - libTarget.setLdAdd( "-lkdecore -lkio" ); + libTarget.setLdAdd( "-ltdecore -lkio" ); KODE::AutoMakefile makefile; makefile.addTarget( libTarget ); diff --git a/kode/kwsdl/kung/Makefile.am b/kode/kwsdl/kung/Makefile.am index 4e044bc06..81e8dd751 100644 --- a/kode/kwsdl/kung/Makefile.am +++ b/kode/kwsdl/kung/Makefile.am @@ -1,7 +1,7 @@ INCLUDES = -I$(top_srcdir) -I.. -I$(top_srcdir)/kode -I$(top_srcdir)/kode/kwsdl -I$(top_srcdir)/libtdepim $(all_includes) bin_PROGRAMS = kung -kung_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kung_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kung_SOURCES = binaryinputfield.cpp boolinputfield.cpp complexbaseinputfield.cpp dateinputfield.cpp dispatcher.cpp \ doubleinputfield.cpp enuminputfield.cpp generalconversationmanager.cpp \ inputdialog.cpp inputfield.cpp inputfieldfactory.cpp \ diff --git a/kode/kwsdl/schema/Makefile.am b/kode/kwsdl/schema/Makefile.am index b03033073..481183ab8 100644 --- a/kode/kwsdl/schema/Makefile.am +++ b/kode/kwsdl/schema/Makefile.am @@ -5,10 +5,10 @@ lib_LTLIBRARIES = libschema.la libschema_la_SOURCES = attribute.cpp complextype.cpp element.cpp fileprovider.cpp \ parser.cpp qualifiedname.cpp simpletype.cpp types.cpp typestable.cpp libschema_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined -libschema_la_LIBADD = -lqt-mt -lkdecore -lkio +libschema_la_LIBADD = -lqt-mt -ltdecore -lkio #bin_PROGRAMS = schematest -#schematest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +#schematest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor #schematest_SOURCES = main.cpp #schematest_LDADD = libschema.la diff --git a/kode/kwsdl/tests/google/Makefile.am b/kode/kwsdl/tests/google/Makefile.am index a7ef04a05..5ad1784cf 100644 --- a/kode/kwsdl/tests/google/Makefile.am +++ b/kode/kwsdl/tests/google/Makefile.am @@ -4,6 +4,6 @@ METASOURCES = AUTO bin_PROGRAMS = googletest googletest_SOURCES = main.cc googlesearch.cc transport.cpp resultelementarray.cpp directorycategoryarray.cpp googlesearchresult.cpp directorycategory.cpp resultelement.cpp serializer.cpp googlesearchservice.cpp -googletest_LDADD = -lkdecore -lkio -googletest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +googletest_LDADD = -ltdecore -lkio +googletest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor diff --git a/kode/kwsdl/wscl/Makefile.am b/kode/kwsdl/wscl/Makefile.am index 7867decbf..f550c95c9 100644 --- a/kode/kwsdl/wscl/Makefile.am +++ b/kode/kwsdl/wscl/Makefile.am @@ -7,7 +7,7 @@ libwscl_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined libwscl_la_LIBADD = -lqt-mt #bin_PROGRAMS = wscltest -#wscltest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +#wscltest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor #wscltest_SOURCES = main.cpp #wscltest_LDADD = libwscl.la diff --git a/kode/kxml_compiler/Makefile.am b/kode/kxml_compiler/Makefile.am index 76829a271..57d3fdce7 100644 --- a/kode/kxml_compiler/Makefile.am +++ b/kode/kxml_compiler/Makefile.am @@ -2,8 +2,8 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libtdepim $(all_includes) bin_PROGRAMS = kxml_compiler -kxml_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -kxml_compiler_LDADD = ../libkode.la -lkdecore +kxml_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kxml_compiler_LDADD = ../libkode.la -ltdecore kxml_compiler_SOURCES = parser.cpp creator.cpp kxml_compiler.cpp METASOURCES = AUTO diff --git a/kode/license.cpp b/kode/license.cpp index 1cec5cab6..744b51c32 100644 --- a/kode/license.cpp +++ b/kode/license.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/kode/license.h b/kode/license.h index 3cdeff1fa..6474babc8 100644 --- a/kode/license.h +++ b/kode/license.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> @@ -22,7 +22,7 @@ #define KODE_LICENSE_H #include <tqstring.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KODE { diff --git a/kode/membervariable.cpp b/kode/membervariable.cpp index ac8f2c25e..b915eeb37 100644 --- a/kode/membervariable.cpp +++ b/kode/membervariable.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/kode/membervariable.h b/kode/membervariable.h index 957df34a4..fe5e889db 100644 --- a/kode/membervariable.h +++ b/kode/membervariable.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> @@ -25,7 +25,7 @@ #include <tqvaluelist.h> #include <tqstring.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KODE { diff --git a/kode/printer.cpp b/kode/printer.cpp index 6f36d30eb..f36b1c38f 100644 --- a/kode/printer.cpp +++ b/kode/printer.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/kode/printer.h b/kode/printer.h index 65cbddaa8..1d3f103ef 100644 --- a/kode/printer.h +++ b/kode/printer.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> @@ -26,7 +26,7 @@ #include "style.h" #include "automakefile.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <tqvaluelist.h> #include <tqstring.h> #include <tqstringlist.h> diff --git a/kode/statemachine.h b/kode/statemachine.h index e6593c942..5c977293f 100644 --- a/kode/statemachine.h +++ b/kode/statemachine.h @@ -25,7 +25,7 @@ #include <tqstring.h> #include <tqmap.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KODE { diff --git a/kode/style.cpp b/kode/style.cpp index 8f4d255bd..e92c36919 100644 --- a/kode/style.cpp +++ b/kode/style.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/kode/style.h b/kode/style.h index f8a260221..26921f716 100644 --- a/kode/style.h +++ b/kode/style.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> @@ -27,7 +27,7 @@ #include <tqstring.h> #include <tqstringlist.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KODE { diff --git a/kode/typedef.h b/kode/typedef.h index 860d0081d..9cc696357 100644 --- a/kode/typedef.h +++ b/kode/typedef.h @@ -22,7 +22,7 @@ #define KODE_TYPEDEF_H #include <tqvaluelist.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KODE { diff --git a/kode/variable.cpp b/kode/variable.cpp index 9fa985ab2..c767ad6d8 100644 --- a/kode/variable.cpp +++ b/kode/variable.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/kode/variable.h b/kode/variable.h index 4cc66aa5a..1eda384f1 100644 --- a/kode/variable.h +++ b/kode/variable.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> @@ -24,7 +24,7 @@ #include <tqvaluelist.h> #include <tqstring.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KODE { diff --git a/konsolekalendar/CMakeLists.txt b/konsolekalendar/CMakeLists.txt index 107c87a7c..2c736bc50 100644 --- a/konsolekalendar/CMakeLists.txt +++ b/konsolekalendar/CMakeLists.txt @@ -64,6 +64,6 @@ tde_add_executable( konsolekalendar AUTOMOC konsolekalendarchange.cpp konsolekalendarvariables.cpp konsolekalendaradd.cpp konsolekalendarexports.cpp konsolekalendar.cpp stdcalendar.cpp main.cpp - LINK kdepim-shared + LINK tdepim-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/konsolekalendar/Makefile.am b/konsolekalendar/Makefile.am index 4aae26b67..fb19ffee4 100644 --- a/konsolekalendar/Makefile.am +++ b/konsolekalendar/Makefile.am @@ -13,7 +13,7 @@ konsolekalendar_SOURCES = konsolekalendarepoch.cpp konsolekalendardelete.cpp \ konsolekalendaradd.cpp konsolekalendarexports.cpp konsolekalendar.cpp \ stdcalendar.cpp main.cpp konsolekalendar_LDADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la -konsolekalendar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +konsolekalendar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor appsdir = $(kde_appsdir)/Utilities xdg_apps_DATA = konsolekalendar.desktop diff --git a/kontact/DESIGN.dcopinteraction b/kontact/DESIGN.dcopinteraction index 4f7d1185b..76f7f714c 100644 --- a/kontact/DESIGN.dcopinteraction +++ b/kontact/DESIGN.dcopinteraction @@ -66,10 +66,10 @@ Don't forget to =============== * Define the service type, using a "Type=ServiceType" .desktop file, with "X-KDE-ServiceType=DCOP/Foo". -See e.g. kdepim/kaddressbook/dcopaddressbook.desktop +See e.g. tdepim/kaddressbook/dcopaddressbook.desktop * Add DCOP/Foo to the application's ServiceTypes list, in its .desktop file -See e.g. kdepim/kaddressbook/kaddressbook.desktop +See e.g. tdepim/kaddressbook/kaddressbook.desktop * Make sure that X-DCOP-ServiceType and X-DCOP-ServiceName are specified too. Designing DCOP interfaces diff --git a/kontact/Makefile.am b/kontact/Makefile.am index eede263a0..a9ebbdc64 100644 --- a/kontact/Makefile.am +++ b/kontact/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = interfaces plugins src pics profiles -DOXYGEN_REFERENCES = kdeui kparts libkcal +DOXYGEN_REFERENCES = tdeui kparts libkcal include $(top_srcdir)/admin/Doxyfile.am diff --git a/kontact/Thoughts b/kontact/Thoughts index 32a627584..f228e1f86 100644 --- a/kontact/Thoughts +++ b/kontact/Thoughts @@ -188,8 +188,8 @@ Don: If kontact is not running and is not the users preferred application Don: then a standalone version of X should be started, and an iface for Don: that standalone app returned. Don: -Don: I think this library should be in libtdepim ad all the kdepim apps -Don: should be moved into kdepim, so their iface files all be in one +Don: I think this library should be in libtdepim ad all the tdepim apps +Don: should be moved into tdepim, so their iface files all be in one Don: package. Or alternatively a new kdeinterfaces package be created Don: and used as a general repository for interface files. Don: diff --git a/kontact/interfaces/CMakeLists.txt b/kontact/interfaces/CMakeLists.txt index 74b590d8b..7cda8c197 100644 --- a/kontact/interfaces/CMakeLists.txt +++ b/kontact/interfaces/CMakeLists.txt @@ -42,6 +42,6 @@ tde_add_library( kpinterfaces SHARED AUTOMOC SOURCES core.cpp plugin.cpp summary.cpp uniqueapphandler.cpp VERSION 1.0.0 - LINK kdepim-shared + LINK tdepim-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kontact/interfaces/core.h b/kontact/interfaces/core.h index d43e78f5d..343132d03 100644 --- a/kontact/interfaces/core.h +++ b/kontact/interfaces/core.h @@ -24,7 +24,7 @@ #define KONTACT_CORE_H #include <tqdatetime.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <kparts/mainwindow.h> #include <kparts/part.h> diff --git a/kontact/interfaces/plugin.h b/kontact/interfaces/plugin.h index c532f86f1..aaa400786 100644 --- a/kontact/interfaces/plugin.h +++ b/kontact/interfaces/plugin.h @@ -26,7 +26,7 @@ #include <tqobject.h> #include <kxmlguiclient.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <tqptrlist.h> class TQStringList; diff --git a/kontact/interfaces/summary.h b/kontact/interfaces/summary.h index f6efa3087..f50507ce7 100644 --- a/kontact/interfaces/summary.h +++ b/kontact/interfaces/summary.h @@ -23,7 +23,7 @@ #include <tqwidget.h> #include <tqpixmap.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KStatusBar; diff --git a/kontact/interfaces/uniqueapphandler.h b/kontact/interfaces/uniqueapphandler.h index b93b59657..3de543f03 100644 --- a/kontact/interfaces/uniqueapphandler.h +++ b/kontact/interfaces/uniqueapphandler.h @@ -24,7 +24,7 @@ #include <dcopobject.h> #include <plugin.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace Kontact { diff --git a/kontact/plugins/CMakeLists.txt b/kontact/plugins/CMakeLists.txt index 54b60cd82..9f54acbc0 100644 --- a/kontact/plugins/CMakeLists.txt +++ b/kontact/plugins/CMakeLists.txt @@ -9,7 +9,7 @@ # ################################################# -# NOTE kpilot was moved from kdepim +# NOTE kpilot was moved from tdepim add_subdirectory( kaddressbook ) add_subdirectory( kmail ) diff --git a/kontact/plugins/kmail/CMakeLists.txt b/kontact/plugins/kmail/CMakeLists.txt index 75f6ad2f5..f84e7a572 100644 --- a/kontact/plugins/kmail/CMakeLists.txt +++ b/kontact/plugins/kmail/CMakeLists.txt @@ -87,6 +87,6 @@ tde_add_kpart( libkontact_kmailplugin AUTOMOC tde_add_kpart( kcm_kmailsummary AUTOMOC SOURCES kcmkmailsummary.cpp - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp index 989ab6198..16146f2c7 100644 --- a/kontact/plugins/kmail/kcmkmailsummary.cpp +++ b/kontact/plugins/kmail/kcmkmailsummary.cpp @@ -37,7 +37,7 @@ #include "kcmkmailsummary.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> extern "C" { diff --git a/kontact/plugins/knotes/Makefile.am b/kontact/plugins/knotes/Makefile.am index 095be66de..84e219b7c 100644 --- a/kontact/plugins/knotes/Makefile.am +++ b/kontact/plugins/knotes/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libkontact_knotesplugin.la libkontact_knotesplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) libkontact_knotesplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la \ $(LIB_KPARTS) $(top_builddir)/libtdepim/libtdepim.la \ - $(top_builddir)/libkcal/libkcal.la -lkresources -lkdeprint \ + $(top_builddir)/libkcal/libkcal.la -lkresources -ltdeprint \ $(top_builddir)/knotes/libknotesresources.la \ $(top_builddir)/knotes/libknoteseditor.la \ $(top_builddir)/knotes/libknotesprinting.la diff --git a/kontact/plugins/korganizer/CMakeLists.txt b/kontact/plugins/korganizer/CMakeLists.txt index 82a83ba38..fb270e854 100644 --- a/kontact/plugins/korganizer/CMakeLists.txt +++ b/kontact/plugins/korganizer/CMakeLists.txt @@ -78,7 +78,7 @@ tde_add_kpart( libkontact_journalplugin AUTOMOC tde_add_kpart( kcm_korgsummary AUTOMOC SOURCES kcmkorgsummary.cpp - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kontact/plugins/korganizer/journalplugin.cpp b/kontact/plugins/korganizer/journalplugin.cpp index 87347f189..0bdb167f8 100644 --- a/kontact/plugins/korganizer/journalplugin.cpp +++ b/kontact/plugins/korganizer/journalplugin.cpp @@ -47,7 +47,7 @@ JournalPlugin::JournalPlugin( Kontact::Core *core, const char *, const TQStringL mIface( 0 ) { setInstance( JournalPluginFactory::instance() ); - instance()->iconLoader()->addAppDir("kdepim"); + instance()->iconLoader()->addAppDir("tdepim"); insertNewAction( new KAction( i18n( "New Journal..." ), "newjournal", CTRL+SHIFT+Key_J, this, TQT_SLOT( slotNewJournal() ), actionCollection(), diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp index 7aa684f45..4466c5c6d 100644 --- a/kontact/plugins/korganizer/kcmkorgsummary.cpp +++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp @@ -37,7 +37,7 @@ #include "kcmkorgsummary.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> extern "C" { diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp index 7e67e5f54..7c2140b36 100644 --- a/kontact/plugins/korganizer/korganizerplugin.cpp +++ b/kontact/plugins/korganizer/korganizerplugin.cpp @@ -62,7 +62,7 @@ KOrganizerPlugin::KOrganizerPlugin( Kontact::Core *core, const char *, const TQS { setInstance( KOrganizerPluginFactory::instance() ); - instance()->iconLoader()->addAppDir("kdepim"); + instance()->iconLoader()->addAppDir("tdepim"); insertNewAction( new KAction( i18n( "New Event..." ), "newappointment", CTRL+SHIFT+Key_E, this, TQT_SLOT( slotNewEvent() ), actionCollection(), diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp index ed17e3177..7c3a1bed9 100644 --- a/kontact/plugins/korganizer/summarywidget.cpp +++ b/kontact/plugins/korganizer/summarywidget.cpp @@ -83,7 +83,7 @@ void SummaryWidget::updateView() mLabels.clear(); mLabels.setAutoDelete( false ); - KIconLoader loader( "kdepim" ); + KIconLoader loader( "tdepim" ); KConfig config( "kcmkorgsummaryrc" ); diff --git a/kontact/plugins/korganizer/todoplugin.cpp b/kontact/plugins/korganizer/todoplugin.cpp index 4994c5151..caaaaf91d 100644 --- a/kontact/plugins/korganizer/todoplugin.cpp +++ b/kontact/plugins/korganizer/todoplugin.cpp @@ -59,7 +59,7 @@ TodoPlugin::TodoPlugin( Kontact::Core *core, const char *, const TQStringList& ) mIface( 0 ) { setInstance( TodoPluginFactory::instance() ); - instance()->iconLoader()->addAppDir("kdepim"); + instance()->iconLoader()->addAppDir("tdepim"); insertNewAction( new KAction( i18n( "New To-do..." ), "newtodo", CTRL+SHIFT+Key_T, this, TQT_SLOT( slotNewTodo() ), actionCollection(), diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp index 15731dd47..0849dde74 100644 --- a/kontact/plugins/korganizer/todosummarywidget.cpp +++ b/kontact/plugins/korganizer/todosummarywidget.cpp @@ -89,7 +89,7 @@ void TodoSummaryWidget::updateView() config.setGroup( "Todo" ); bool showAllTodos = config.readBoolEntry( "ShowAllTodos", false ); - KIconLoader loader( "kdepim" ); + KIconLoader loader( "tdepim" ); TQLabel *label = 0; int counter = 0; diff --git a/kontact/plugins/kpilot/summarywidget.cpp b/kontact/plugins/kpilot/summarywidget.cpp index 0d63bafd0..46ec7fdfe 100644 --- a/kontact/plugins/kpilot/summarywidget.cpp +++ b/kontact/plugins/kpilot/summarywidget.cpp @@ -222,7 +222,7 @@ void SummaryWidget::startKPilot() { TQString error; TQCString appID; - if ( !KApplication::kdeinitExec( "kpilotDaemon", TQString( "--fail-silently" ) ) ) { + if ( !KApplication::tdeinitExec( "kpilotDaemon", TQString( "--fail-silently" ) ) ) { kdDebug(5602) << "No service available..." << endl; mStartedDaemon = true; } diff --git a/kontact/plugins/newsticker/CMakeLists.txt b/kontact/plugins/newsticker/CMakeLists.txt index 1415a3545..cea04661d 100644 --- a/kontact/plugins/newsticker/CMakeLists.txt +++ b/kontact/plugins/newsticker/CMakeLists.txt @@ -42,6 +42,6 @@ tde_add_kpart( libkontact_newstickerplugin AUTOMOC tde_add_kpart( kcm_kontactknt AUTOMOC SOURCES kcmkontactknt.cpp - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp index 6795ffb5b..fe2a20c63 100644 --- a/kontact/plugins/newsticker/kcmkontactknt.cpp +++ b/kontact/plugins/newsticker/kcmkontactknt.cpp @@ -45,7 +45,7 @@ #include "newsfeeds.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> extern "C" { diff --git a/kontact/plugins/specialdates/CMakeLists.txt b/kontact/plugins/specialdates/CMakeLists.txt index 34b6bb9f8..d760fd121 100644 --- a/kontact/plugins/specialdates/CMakeLists.txt +++ b/kontact/plugins/specialdates/CMakeLists.txt @@ -45,6 +45,6 @@ tde_add_kpart( libkontact_specialdatesplugin AUTOMOC tde_add_kpart( kcm_sdsummary AUTOMOC SOURCES kcmsdsummary.cpp - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kontact/plugins/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp index b659cdb45..a59406590 100644 --- a/kontact/plugins/specialdates/kcmsdsummary.cpp +++ b/kontact/plugins/specialdates/kcmsdsummary.cpp @@ -39,7 +39,7 @@ #include "kcmsdsummary.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> extern "C" { diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp index 4df2d664a..3fbac9d2e 100644 --- a/kontact/plugins/specialdates/sdsummarywidget.cpp +++ b/kontact/plugins/specialdates/sdsummarywidget.cpp @@ -219,7 +219,7 @@ void SDSummaryWidget::updateView() mLabels.clear(); mLabels.setAutoDelete( false ); - KIconLoader loader( "kdepim" ); + KIconLoader loader( "tdepim" ); KABC::StdAddressBook *ab = KABC::StdAddressBook::self( true ); TQValueList<SDEntry> dates; diff --git a/kontact/plugins/specialdates/specialdates_plugin.cpp b/kontact/plugins/specialdates/specialdates_plugin.cpp index 9dc5e9828..c71b9e722 100644 --- a/kontact/plugins/specialdates/specialdates_plugin.cpp +++ b/kontact/plugins/specialdates/specialdates_plugin.cpp @@ -42,7 +42,7 @@ SpecialdatesPlugin::SpecialdatesPlugin( Kontact::Core *core, const char *name, c mAboutData( 0 ) { setInstance( SpecialdatesPluginFactory::instance() ); - instance()->iconLoader()->addAppDir( "kdepim" ); + instance()->iconLoader()->addAppDir( "tdepim" ); } SpecialdatesPlugin::~SpecialdatesPlugin() diff --git a/kontact/plugins/summary/CMakeLists.txt b/kontact/plugins/summary/CMakeLists.txt index 4d7f2b730..9c5228fcf 100644 --- a/kontact/plugins/summary/CMakeLists.txt +++ b/kontact/plugins/summary/CMakeLists.txt @@ -36,7 +36,7 @@ install( FILES kontactsummary_part.rc DESTINATION ${DATA_INSTALL_DIR}/kontactsum tde_add_kpart( libkontact_summaryplugin AUTOMOC SOURCES summaryview_plugin.cpp summaryview_part.cpp dropwidget.cpp - LINK kpinterfaces-shared kdepim-shared kpimidentities-shared kutils-shared + LINK kpinterfaces-shared tdepim-shared kpimidentities-shared kutils-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -45,6 +45,6 @@ tde_add_kpart( libkontact_summaryplugin AUTOMOC tde_add_kpart( kcm_kontactsummary AUTOMOC SOURCES kcmkontactsummary.cpp - LINK kdeui-shared kutils-shared + LINK tdeui-shared kutils-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp index 156014ca0..47c9bca64 100644 --- a/kontact/plugins/summary/kcmkontactsummary.cpp +++ b/kontact/plugins/summary/kcmkontactsummary.cpp @@ -39,7 +39,7 @@ #include "kcmkontactsummary.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> extern "C" { diff --git a/kontact/src/CMakeLists.txt b/kontact/src/CMakeLists.txt index 3a0dadeb0..38076fe44 100644 --- a/kontact/src/CMakeLists.txt +++ b/kontact/src/CMakeLists.txt @@ -38,7 +38,7 @@ install( FILES kontactui.rc kontact.setdlg DESTINATION ${DATA_INSTALL_DIR}/konta tde_add_kpart( kcm_kontact AUTOMOC SOURCES kcmkontact.cpp - LINK kontact-shared kdepim-shared + LINK kontact-shared tdepim-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -60,6 +60,6 @@ tde_add_executable( kontact AUTOMOC tde_add_library( kontact SHARED SOURCES prefs.kcfgc VERSION 1.0.0 - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kontact/src/Makefile.am b/kontact/src/Makefile.am index f4bf13c50..3eb9de10d 100644 --- a/kontact/src/Makefile.am +++ b/kontact/src/Makefile.am @@ -10,7 +10,7 @@ libkontact_la_SOURCES = prefs.kcfgc bin_PROGRAMS = kontact kontact_METASOURCES = AUTO -kontact_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kontact_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kontact_LDADD = $(top_builddir)/libtdepim/libtdepim.la \ $(top_builddir)/kontact/interfaces/libkpinterfaces.la libkontact.la \ $(LIB_KPARTS) $(LIB_KUTILS) $(LIB_KHTML) diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp index 03c59d65c..7bfed9cd4 100644 --- a/kontact/src/kcmkontact.cpp +++ b/kontact/src/kcmkontact.cpp @@ -38,7 +38,7 @@ #include <tqlabel.h> #include <tqlayout.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> extern "C" { diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp index 8d2f3623f..a2ebad5e8 100644 --- a/kontact/src/main.cpp +++ b/kontact/src/main.cpp @@ -53,7 +53,7 @@ class KontactApp : public KUniqueApplication { public: KontactApp() : mMainWindow( 0 ), mSessionRestored( false ) { - KGlobal::iconLoader()->addAppDir( "kdepim" ); + KGlobal::iconLoader()->addAppDir( "tdepim" ); } ~KontactApp() {} diff --git a/korganizer/CMakeLists.txt b/korganizer/CMakeLists.txt index cf09ee458..85f49c577 100644 --- a/korganizer/CMakeLists.txt +++ b/korganizer/CMakeLists.txt @@ -133,7 +133,7 @@ tde_add_kpart( libkorganizerpart AUTOMOC tde_add_library( korganizer_calendar SHARED SOURCES stdcalendar.cpp VERSION 1.0.0 - LINK kdepim-shared kcal-shared + LINK tdepim-shared kcal-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/korganizer/Makefile.am b/korganizer/Makefile.am index b33321285..0d79f4c0a 100644 --- a/korganizer/Makefile.am +++ b/korganizer/Makefile.am @@ -14,7 +14,7 @@ INCLUDES = \ bin_PROGRAMS = korganizer -korganizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +korganizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor korganizer_LDADD = libkorganizer.la korganizer_SOURCES = main.cpp korganizer.cpp koapp.cpp korganizer_COMPILE_FIRST = koprefs_base.h @@ -29,19 +29,19 @@ kcm_korganizer_la_LIBADD = libkorganizer.la $(top_builddir)/libtdepim/libtdepim. kcm_korganizer_la_COMPILE_FIRST = koprefs_base.h kogroupwareprefspage.h libkorganizerpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -libkorganizerpart_la_LIBADD = libkorganizer.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KPARTS) $(LIB_KIO) $(LIB_KHTML) $(LIB_KDEUI) -L$(top_builddir)/libtdepim/ -lkdepim -L$(top_builddir)/libkcal/ -lkcal -lkorganizer_calendar +libkorganizerpart_la_LIBADD = libkorganizer.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KPARTS) $(LIB_KIO) $(LIB_KHTML) $(LIB_KDEUI) -L$(top_builddir)/libtdepim/ -ltdepim -L$(top_builddir)/libkcal/ -lkcal -lkorganizer_calendar libkorganizerpart_la_SOURCES = korganizer_part.cpp libkorganizerpart_la_COMPILE_FIRST = publishdialog_base.h koprefs_base.h check_PROGRAMS = korgplugins timezone -korgplugins_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +korgplugins_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor korgplugins_LDADD = libkorganizer.la $(LIB_KSYCOCA) korgplugins_SOURCES = korgplugins.cpp korgplugins_COMPILE_FIRST = koprefs_base.h -timezone_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +timezone_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor timezone_LDADD = libkorganizer.la $(LIB_KSYCOCA) timezone_SOURCES = timezone.cpp timezone_COMPILE_FIRST = koprefs_base.h @@ -63,7 +63,7 @@ libkorganizer_la_LIBADD = \ $(top_builddir)/libkholidays/libkholidays.la \ $(top_builddir)/libkmime/libkmime.la \ $(LIB_KPARTS) $(LIB_KFILE) $(LIB_KNEWSTUFF) \ - -lkdeprint -lkabc -lkutils + -ltdeprint -lkabc -lkutils libkorganizer_la_COMPILE_FIRST = \ kogroupwareprefspage.ui \ @@ -198,7 +198,7 @@ kde_services_DATA = korganizer_configmain.desktop \ update_DATA = korganizer.upd updatedir = $(kde_datadir)/kconf_update -DOXYGEN_REFERENCES=libkcal kdeui +DOXYGEN_REFERENCES=libkcal tdeui include $(top_srcdir)/admin/Doxyfile.am install-data-local: diff --git a/korganizer/aboutdata.h b/korganizer/aboutdata.h index 73a9b98ee..ef3f19de3 100644 --- a/korganizer/aboutdata.h +++ b/korganizer/aboutdata.h @@ -25,7 +25,7 @@ #define KORG_ABOUTDATA_H #include <kaboutdata.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KOrg { diff --git a/korganizer/actionmanager.h b/korganizer/actionmanager.h index 6ee1727fa..66f66bcab 100644 --- a/korganizer/actionmanager.h +++ b/korganizer/actionmanager.h @@ -30,7 +30,7 @@ #include <tqobject.h> #include <kurl.h> #include <korganizer/part.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include "kcalendariface.h" diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index 9a180bb02..c10d92414 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h @@ -31,7 +31,7 @@ #include <kfile.h> #include <korganizer/koeventviewer.h> #include <libkcal/scheduler.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include "koglobals.h" #include "interfaces/korganizer/calendarviewbase.h" diff --git a/korganizer/interfaces/korganizer/baseview.h b/korganizer/interfaces/korganizer/baseview.h index f14ecf490..b1f6afa1d 100644 --- a/korganizer/interfaces/korganizer/baseview.h +++ b/korganizer/interfaces/korganizer/baseview.h @@ -29,7 +29,7 @@ #include <klocale.h> #include <kdebug.h> #include <kmessagebox.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include "korganizer/incidencechangerbase.h" #include "printplugin.h" diff --git a/korganizer/kocore.h b/korganizer/kocore.h index 3b1a756fc..5ce1843dd 100644 --- a/korganizer/kocore.h +++ b/korganizer/kocore.h @@ -29,7 +29,7 @@ #include <korganizer/part.h> #include <korganizer/printplugin.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <ktrader.h> namespace KPIM { class IdentityManager; } diff --git a/korganizer/koeditorattachments.cpp b/korganizer/koeditorattachments.cpp index 8a2c47c2b..812b499f9 100644 --- a/korganizer/koeditorattachments.cpp +++ b/korganizer/koeditorattachments.cpp @@ -29,10 +29,10 @@ #include <libkcal/incidence.h> #include <libtdepim/kpimurlrequesterdlg.h> #include <libtdepim/kfileio.h> -#include <libtdepim/kdepimprotocols.h> +#include <libtdepim/tdepimprotocols.h> #include <libtdepim/maillistdrag.h> #include <libtdepim/kvcarddrag.h> -#include <libtdepim/kdepimprotocols.h> +#include <libtdepim/tdepimprotocols.h> #include <klocale.h> #include <kdebug.h> diff --git a/korganizer/koeventviewer.h b/korganizer/koeventviewer.h index e8cceb1ff..bebbb4ed2 100644 --- a/korganizer/koeventviewer.h +++ b/korganizer/koeventviewer.h @@ -24,7 +24,7 @@ #ifndef KOEVENTVIEWER_H #define KOEVENTVIEWER_H -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <kconfig.h> #include <tqtextbrowser.h> diff --git a/korganizer/koeventviewerdialog.h b/korganizer/koeventviewerdialog.h index cf1bd5caa..346471dff 100644 --- a/korganizer/koeventviewerdialog.h +++ b/korganizer/koeventviewerdialog.h @@ -25,7 +25,7 @@ #define KOEVENTVIEWERDIALOG_H #include <kdialogbase.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include "koeventviewer.h" namespace KCal { diff --git a/korganizer/koglobals.cpp b/korganizer/koglobals.cpp index dd22ade4b..e4caf058f 100644 --- a/korganizer/koglobals.cpp +++ b/korganizer/koglobals.cpp @@ -71,8 +71,8 @@ KOGlobals::KOGlobals() // in case we are a KPart mOwnInstance = new KInstance( "korganizer" ); mOwnInstance->config()->setGroup( "General" ); - mOwnInstance->iconLoader()->addAppDir( "kdepim" ); - KGlobal::iconLoader()->addAppDir( "kdepim" ); + mOwnInstance->iconLoader()->addAppDir( "tdepim" ); + KGlobal::iconLoader()->addAppDir( "tdepim" ); mAlarmClient = new AlarmClient; } diff --git a/korganizer/koglobals.h b/korganizer/koglobals.h index 74a2006c3..f32488628 100644 --- a/korganizer/koglobals.h +++ b/korganizer/koglobals.h @@ -23,7 +23,7 @@ #ifndef KORG_GLOBALS_H #define KORG_GLOBALS_H -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <tqwidget.h> class TQDate; diff --git a/korganizer/kogroupwareprefspage.ui b/korganizer/kogroupwareprefspage.ui index c8bcfbcec..feec8d710 100644 --- a/korganizer/kogroupwareprefspage.ui +++ b/korganizer/kogroupwareprefspage.ui @@ -617,7 +617,7 @@ For security reasons, it is not recommended to store your password in the config <tabstop>retrieveSavePassword</tabstop> </tabstops> <includes> - <include location="global" impldecl="in declaration">kdepimmacros.h</include> + <include location="global" impldecl="in declaration">tdepimmacros.h</include> <include location="local" impldecl="in implementation">kogroupwareprefspage.ui.h</include> </includes> <Q_SIGNALS> diff --git a/korganizer/kohelper.h b/korganizer/kohelper.h index 049459b4f..329de2a60 100644 --- a/korganizer/kohelper.h +++ b/korganizer/kohelper.h @@ -25,7 +25,7 @@ #ifndef KOHELPER_H #define KOHELPER_H -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KCal { class Calendar; diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h index 013407e38..4d96b5b3b 100644 --- a/korganizer/koprefs.h +++ b/korganizer/koprefs.h @@ -26,7 +26,7 @@ #include <tqdict.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include "koprefs_base.h" diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index 6ceadd8f5..1f3ede91a 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp @@ -77,7 +77,7 @@ #include "ktimeedit.h" #include "koglobals.h" #include "stdcalendar.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> KOPrefsDialogMain::KOPrefsDialogMain( TQWidget *parent, const char *name ) diff --git a/korganizer/korgac/Makefile.am b/korganizer/korgac/Makefile.am index 844af647e..49d32fd63 100644 --- a/korganizer/korgac/Makefile.am +++ b/korganizer/korgac/Makefile.am @@ -2,7 +2,7 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/korganizer $(all_includes) bin_PROGRAMS = korgac -korgac_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +korgac_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor korgac_LDADD = $(LIB_KDEUI) \ $(top_builddir)/korganizer/libkorganizer_eventviewer.la korgac_SOURCES = korgacmain.cpp alarmdialog.cpp \ @@ -11,7 +11,7 @@ korgac_SOURCES = korgacmain.cpp alarmdialog.cpp \ check_PROGRAMS = testalarmdlg -testalarmdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testalarmdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testalarmdlg_LDADD = $(LIB_KDEUI) $(top_builddir)/libkcal/libkcal.la \ $(top_builddir)/korganizer/libkorganizer_eventviewer.la testalarmdlg_SOURCES = testalarmdlg.cpp alarmdialog.cpp diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp index d539d6676..43370a039 100644 --- a/korganizer/korgac/alarmdialog.cpp +++ b/korganizer/korgac/alarmdialog.cpp @@ -112,7 +112,7 @@ AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *parent, c connect( calendar, TQT_SIGNAL(calendarChanged()), this, TQT_SLOT(slotCalendarChanged()) ); - KGlobal::iconLoader()->addAppDir( "kdepim" ); + KGlobal::iconLoader()->addAppDir( "tdepim" ); setButtonOK( i18n( "Suspend" ) ); TQWidget *topBox = plainPage(); diff --git a/korganizer/korganizerifaceimpl.h b/korganizer/korganizerifaceimpl.h index 1d81ac0d5..4873ef631 100644 --- a/korganizer/korganizerifaceimpl.h +++ b/korganizer/korganizerifaceimpl.h @@ -34,7 +34,7 @@ #include "korganizeriface.h" #include <tqobject.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class ActionManager; diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp index a698edfe1..c98c6c31d 100644 --- a/korganizer/kowhatsnextview.cpp +++ b/korganizer/kowhatsnextview.cpp @@ -88,9 +88,9 @@ int KOWhatsNextView::tqcurrentDateCount() void KOWhatsNextView::updateView() { - KIconLoader kil("kdepim"); + KIconLoader kil("tdepim"); TQString *ipath = new TQString(); - kil.loadIcon("kdepim",KIcon::NoGroup,32,KIcon::DefaultState,ipath); + kil.loadIcon("tdepim",KIcon::NoGroup,32,KIcon::DefaultState,ipath); mText = "<table width=\"100%\">\n"; mText += "<tr bgcolor=\"#3679AD\"><td><h1>"; diff --git a/korganizer/plugins/hebrew/CMakeLists.txt b/korganizer/plugins/hebrew/CMakeLists.txt index 02f98faaf..1f397d7b6 100644 --- a/korganizer/plugins/hebrew/CMakeLists.txt +++ b/korganizer/plugins/hebrew/CMakeLists.txt @@ -32,6 +32,6 @@ install( FILES hebrew.desktop DESTINATION ${SERVICES_INSTALL_DIR}/korganizer ) tde_add_kpart( libkorg_hebrew AUTOMOC SOURCES hebrew.cpp configdialog.cpp holiday.cpp parsha.cpp converter.cpp - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/korganizer/plugins/printing/journal/Makefile.am b/korganizer/plugins/printing/journal/Makefile.am index 6574222fd..29189bacf 100644 --- a/korganizer/plugins/printing/journal/Makefile.am +++ b/korganizer/plugins/printing/journal/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libkorg_journalprint.la libkorg_journalprint_la_SOURCES =calprintjournalconfig_base.ui journalprint.cpp libkorg_journalprint_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -libkorg_journalprint_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(top_builddir)/korganizer/printing/libkorg_stdprinting.la -L$(top_builddir)/libtdepim/ -lkdepim +libkorg_journalprint_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(top_builddir)/korganizer/printing/libkorg_stdprinting.la -L$(top_builddir)/libtdepim/ -ltdepim noinst_HEADERS = diff --git a/korganizer/printing/CMakeLists.txt b/korganizer/printing/CMakeLists.txt index 22948aec9..67ff04850 100644 --- a/korganizer/printing/CMakeLists.txt +++ b/korganizer/printing/CMakeLists.txt @@ -35,7 +35,7 @@ install( FILES tde_add_library( kocorehelper SHARED SOURCES cellitem.cpp VERSION 1.0.0 - LINK kdepim-shared + LINK tdepim-shared DESTINATION ${LIB_INSTALL_DIR} ) @@ -49,6 +49,6 @@ tde_add_library( korg_stdprinting SHARED AUTOMOC calprinttodoconfig_base.ui calprintweekconfig_base.ui calprintincidenceconfig_base.ui VERSION 1.0.0 - LINK kocorehelper-shared kdeprint-shared + LINK kocorehelper-shared tdeprint-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/korganizer/printing/Makefile.am b/korganizer/printing/Makefile.am index 4303579bf..40d17e1c7 100644 --- a/korganizer/printing/Makefile.am +++ b/korganizer/printing/Makefile.am @@ -25,7 +25,7 @@ libkorg_stdprinting_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \ libkorg_stdprinting_la_LIBADD = $(LIB_KDEUI) libkocorehelper.la \ $(top_builddir)/libtdepim/libtdepim.la \ $(top_builddir)/libkcal/libkcal.la \ - -lkdeprint + -ltdeprint calprintdir = $(includedir)/korganizer diff --git a/korganizer/printing/calprinter.h b/korganizer/printing/calprinter.h index 7a0f257ba..edb83bd3e 100644 --- a/korganizer/printing/calprinter.h +++ b/korganizer/printing/calprinter.h @@ -31,7 +31,7 @@ #include <kdialogbase.h> #include <korganizer/baseview.h> #include <korganizer/printplugin.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KOrg { class CoreHelper; diff --git a/korganizer/printing/calprintpluginbase.h b/korganizer/printing/calprintpluginbase.h index 592151946..3684e2f12 100644 --- a/korganizer/printing/calprintpluginbase.h +++ b/korganizer/printing/calprintpluginbase.h @@ -30,7 +30,7 @@ #include <tqdatetime.h> #include <kprinter.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <libkcal/calendar.h> #include <libkcal/event.h> #include <libkcal/todo.h> diff --git a/korganizer/printing/cellitem.h b/korganizer/printing/cellitem.h index 4217e8b9e..9e1beb6ca 100644 --- a/korganizer/printing/cellitem.h +++ b/korganizer/printing/cellitem.h @@ -27,7 +27,7 @@ #include <tqstring.h> #include <tqptrlist.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KOrg { diff --git a/korganizer/urihandler.h b/korganizer/urihandler.h index aa3c6de28..572a67a55 100644 --- a/korganizer/urihandler.h +++ b/korganizer/urihandler.h @@ -24,7 +24,7 @@ #ifndef URIHANDLER_H #define URIHANDLER_H -#include <kdepimmacros.h> +#include <tdepimmacros.h> class TQString; class TQWidget; diff --git a/korn/Makefile.am b/korn/Makefile.am index 7768c61b8..d4aac1443 100644 --- a/korn/Makefile.am +++ b/korn/Makefile.am @@ -3,7 +3,7 @@ KDE_CXXFLAGS = $(USE_RTTI) INCLUDES = -I$(top_srcdir)/libkmime \ $(all_includes) #INCLUDES = -I$(top_srcdir)/mimelib -I$(top_srcdir)/libkmime $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor METASOURCES = AUTO @@ -112,7 +112,7 @@ noinst_HEADERS = \ srcdoc: kdoc -p -u "/~ssk/src/korn/" -n korn -d /home/ssk/web/src/korn *.h \ - -lqt -lkdeui -lkdecore + -lqt -ltdeui -ltdecore messages: rc.cpp $(XGETTEXT) *.h *.cpp -o $(podir)/korn.pot diff --git a/korn/kconf_update/Makefile.am b/korn/kconf_update/Makefile.am index 1d85dc9f7..3c273253a 100644 --- a/korn/kconf_update/Makefile.am +++ b/korn/kconf_update/Makefile.am @@ -8,5 +8,5 @@ kconf_PROGRAMS = korn-3-4-config_change kconfdir = $(libdir)/kconf_update_bin korn_3_4_config_change_SOURCES = korn-3-4-config_change.cpp -korn_3_4_config_change_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +korn_3_4_config_change_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor korn_3_4_config_change_LDADD = $(LIB_QT) diff --git a/kresources/birthdays/CMakeLists.txt b/kresources/birthdays/CMakeLists.txt index 4836da70d..99fd0ecd1 100644 --- a/kresources/birthdays/CMakeLists.txt +++ b/kresources/birthdays/CMakeLists.txt @@ -41,6 +41,6 @@ install( FILES kabc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kcal tde_add_kpart( kcal_kabc AUTOMOC SOURCES resourcekabc.cpp resourcekabcconfig.cpp - LINK kabcommon-static kdepim-shared + LINK kabcommon-static tdepim-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kresources/birthdays/resourcekabc.h b/kresources/birthdays/resourcekabc.h index 6c69a01a6..30c0814d2 100644 --- a/kresources/birthdays/resourcekabc.h +++ b/kresources/birthdays/resourcekabc.h @@ -33,7 +33,7 @@ #include "libkcal/resourcecalendar.h" -#include "libtdepim/kdepimmacros.h" +#include "libtdepim/tdepimmacros.h" namespace KIO { class FileCopyJob; diff --git a/kresources/blogging/API_Blogger.cpp b/kresources/blogging/API_Blogger.cpp index 5cdeec257..0745467b8 100644 --- a/kresources/blogging/API_Blogger.cpp +++ b/kresources/blogging/API_Blogger.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Reinhold Kainhofer <reinhold@kainhofer.com> diff --git a/kresources/blogging/API_Blogger.h b/kresources/blogging/API_Blogger.h index 32610bf60..04950338d 100644 --- a/kresources/blogging/API_Blogger.h +++ b/kresources/blogging/API_Blogger.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Reinhold Kainhofer <reinhold@kainhofer.com> diff --git a/kresources/blogging/bloggingcalendaradaptor.cpp b/kresources/blogging/bloggingcalendaradaptor.cpp index 1255cab38..bb91edb07 100644 --- a/kresources/blogging/bloggingcalendaradaptor.cpp +++ b/kresources/blogging/bloggingcalendaradaptor.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2005 Reinhold Kainhofer <reinhold@kainhofer.com> diff --git a/kresources/blogging/bloggingcalendaradaptor.h b/kresources/blogging/bloggingcalendaradaptor.h index 9baedfdae..f193f8794 100644 --- a/kresources/blogging/bloggingcalendaradaptor.h +++ b/kresources/blogging/bloggingcalendaradaptor.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (C) 2004-05 Reinhold Kainhofer <reinhold@kainhofer.com> diff --git a/kresources/blogging/bloggingglobals.cpp b/kresources/blogging/bloggingglobals.cpp index b6b4c4228..53743e9a6 100644 --- a/kresources/blogging/bloggingglobals.cpp +++ b/kresources/blogging/bloggingglobals.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Reinhold Kainhofer <reinhold@kainhofer.com> diff --git a/kresources/blogging/bloggingglobals.h b/kresources/blogging/bloggingglobals.h index 004ed4d9a..74eafdf75 100644 --- a/kresources/blogging/bloggingglobals.h +++ b/kresources/blogging/bloggingglobals.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2005 Reinhold Kainhofer <reinhold@kainhofer.com> diff --git a/kresources/blogging/kcal_resourceblogging.cpp b/kresources/blogging/kcal_resourceblogging.cpp index 07d097db9..c8b016620 100644 --- a/kresources/blogging/kcal_resourceblogging.cpp +++ b/kresources/blogging/kcal_resourceblogging.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Reinhold Kainhofer <reinhold@kainhofer.com>> diff --git a/kresources/blogging/kcal_resourceblogging.h b/kresources/blogging/kcal_resourceblogging.h index ac3820abb..36942d521 100644 --- a/kresources/blogging/kcal_resourceblogging.h +++ b/kresources/blogging/kcal_resourceblogging.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Reinhold Kainhofer <reinhold@kainhofer.com> @@ -22,7 +22,7 @@ #define KCAL_RESOURCEBLOGGING_H #include <kcal_resourcegroupwarebase.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KBlog { class APIBlog; diff --git a/kresources/blogging/kcal_resourceblogging_plugin.cpp b/kresources/blogging/kcal_resourceblogging_plugin.cpp index 108d5e896..b3eaf9378 100644 --- a/kresources/blogging/kcal_resourceblogging_plugin.cpp +++ b/kresources/blogging/kcal_resourceblogging_plugin.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Reinhold Kainhofer <reinhold@kainhofer.com> @@ -34,7 +34,7 @@ extern "C" { void *init_kcal_blogging() { - KGlobal::locale()->insertCatalogue( "kdepimresources" ); + KGlobal::locale()->insertCatalogue( "tdepimresources" ); KGlobal::locale()->insertCatalogue( "kres_blogging" ); return new BloggingFactory; } diff --git a/kresources/blogging/kcal_resourcebloggingconfig.cpp b/kresources/blogging/kcal_resourcebloggingconfig.cpp index d68584a2b..bd999ffe3 100644 --- a/kresources/blogging/kcal_resourcebloggingconfig.cpp +++ b/kresources/blogging/kcal_resourcebloggingconfig.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2005 Reinhold Kainhofer <reinhold@kainhofer.com> diff --git a/kresources/blogging/kcal_resourcebloggingconfig.h b/kresources/blogging/kcal_resourcebloggingconfig.h index c8ff2aa67..b9509e9bd 100644 --- a/kresources/blogging/kcal_resourcebloggingconfig.h +++ b/kresources/blogging/kcal_resourcebloggingconfig.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2005 Reinhold Kainhofer <reinhold@kainhofer.com> @@ -20,7 +20,7 @@ #ifndef KCAL_RESOURCEBLOGGINGCONFIG_H #define KCAL_RESOURCEBLOGGINGCONFIG_H -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <kcal_resourcegroupwarebaseconfig.h> namespace KCal { diff --git a/kresources/caldav/CMakeLists.txt b/kresources/caldav/CMakeLists.txt index da220c139..960f086f9 100644 --- a/kresources/caldav/CMakeLists.txt +++ b/kresources/caldav/CMakeLists.txt @@ -49,6 +49,6 @@ tde_add_library( kcal_caldav SHARED AUTOMOC resource.cpp config.cpp configwidgets.cpp preferences.cpp job.cpp reader.cpp writer.cpp prefsskel.kcfgc VERSION 1.0.0 - LINK kdepim-shared ${CALDAV_LIBRARIES} + LINK tdepim-shared ${CALDAV_LIBRARIES} DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kresources/caldav/resource.h b/kresources/caldav/resource.h index 417767663..fd028f7a3 100644 --- a/kresources/caldav/resource.h +++ b/kresources/caldav/resource.h @@ -26,7 +26,7 @@ #include <kabc/locknull.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <kconfig.h> namespace KCal { diff --git a/kresources/carddav/CMakeLists.txt b/kresources/carddav/CMakeLists.txt index e1c637945..c5d3e3cee 100644 --- a/kresources/carddav/CMakeLists.txt +++ b/kresources/carddav/CMakeLists.txt @@ -49,6 +49,6 @@ tde_add_library( kabc_carddav SHARED AUTOMOC resource.cpp config.cpp configwidgets.cpp preferences.cpp job.cpp reader.cpp writer.cpp prefsskel.kcfgc VERSION 1.0.0 - LINK kdepim-shared ${CARDDAV_LIBRARIES} + LINK tdepim-shared ${CARDDAV_LIBRARIES} DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kresources/carddav/plugin.cpp b/kresources/carddav/plugin.cpp index f167e7f5c..8d51e53b9 100644 --- a/kresources/carddav/plugin.cpp +++ b/kresources/carddav/plugin.cpp @@ -38,7 +38,7 @@ extern "C" { void *init_kabc_carddav() { - KGlobal::locale()->insertCatalogue( "kdepimresources" ); + KGlobal::locale()->insertCatalogue( "tdepimresources" ); KGlobal::locale()->insertCatalogue( "kres_caldav" ); return new CardDavFactory; } diff --git a/kresources/carddav/resource.h b/kresources/carddav/resource.h index 608d09cb1..cfe0f4da8 100644 --- a/kresources/carddav/resource.h +++ b/kresources/carddav/resource.h @@ -25,7 +25,7 @@ #include <kabc/locknull.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <kconfig.h> namespace KABC { diff --git a/kresources/egroupware/CMakeLists.txt b/kresources/egroupware/CMakeLists.txt index 065e9a9c0..bdc95298f 100644 --- a/kresources/egroupware/CMakeLists.txt +++ b/kresources/egroupware/CMakeLists.txt @@ -53,7 +53,7 @@ tde_add_library( kabc_xmlrpc SHARED AUTOMOC kabc_resourcexmlrpc.cpp kabc_resourcexmlrpcconfig.cpp kabc_egroupwareprefs.kcfgc VERSION 1.0.0 - LINK egwcommon-static kabcommon-static kdepim-shared + LINK egwcommon-static kabcommon-static tdepim-shared DESTINATION ${LIB_INSTALL_DIR} ) @@ -65,7 +65,7 @@ tde_add_library( kcal_xmlrpc SHARED AUTOMOC kcal_resourcexmlrpc.cpp kcal_resourcexmlrpcconfig.cpp todostatemapper.cpp kcal_egroupwareprefs.kcfgc VERSION 1.0.0 - LINK egwcommon-static kdepim-shared + LINK egwcommon-static tdepim-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kresources/egroupware/Makefile.am b/kresources/egroupware/Makefile.am index 23e5232e7..a3effa7fb 100644 --- a/kresources/egroupware/Makefile.am +++ b/kresources/egroupware/Makefile.am @@ -34,7 +34,7 @@ libkcal_xmlrpc_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \ libknotes_xmlrpc_la_SOURCES = knotes_resourcexmlrpc.cpp knotes_resourcexmlrpcconfig.cpp \ knotes_egroupwareprefs.kcfgc libknotes_xmlrpc_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined -libknotes_xmlrpc_la_LIBADD = $(top_builddir)/libkcal/libkcal.la -lkdeprint \ +libknotes_xmlrpc_la_LIBADD = $(top_builddir)/libkcal/libkcal.la -ltdeprint \ $(top_builddir)/knotes/libknotesresources.la \ $(top_builddir)/libtdepim/libtdepim.la \ libegwcommon.la diff --git a/kresources/egroupware/access.h b/kresources/egroupware/access.h index 8ed6a6afe..aab787796 100644 --- a/kresources/egroupware/access.h +++ b/kresources/egroupware/access.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2005 Tobias Koenig <tokoe@kde.org> This library is free software; you can redistribute it and/or diff --git a/kresources/egroupware/debugdialog.cpp b/kresources/egroupware/debugdialog.cpp index 57a6479f4..0b2764c64 100644 --- a/kresources/egroupware/debugdialog.cpp +++ b/kresources/egroupware/debugdialog.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2005 Tobias Koenig <tokoe@kde.org> This library is free software; you can redistribute it and/or diff --git a/kresources/egroupware/debugdialog.h b/kresources/egroupware/debugdialog.h index 52ddb2273..dc3124a7b 100644 --- a/kresources/egroupware/debugdialog.h +++ b/kresources/egroupware/debugdialog.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2005 Tobias Koenig <tokoe@kde.org> This library is free software; you can redistribute it and/or diff --git a/kresources/egroupware/kabc_resourcexmlrpc.cpp b/kresources/egroupware/kabc_resourcexmlrpc.cpp index 35d38ea70..1247975f7 100644 --- a/kresources/egroupware/kabc_resourcexmlrpc.cpp +++ b/kresources/egroupware/kabc_resourcexmlrpc.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2003 - 2004 Tobias Koenig <tokoe@kde.org> This library is free software; you can redistribute it and/or diff --git a/kresources/egroupware/kabc_resourcexmlrpc.h b/kresources/egroupware/kabc_resourcexmlrpc.h index 749296163..73b083d1b 100644 --- a/kresources/egroupware/kabc_resourcexmlrpc.h +++ b/kresources/egroupware/kabc_resourcexmlrpc.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2003 - 2004 Tobias Koenig <tokoe@kde.org> This library is free software; you can redistribute it and/or @@ -22,7 +22,7 @@ #define KABC_RESOURCEXMLRPC_H #include <tqmap.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include "libtdepim/kabcresourcecached.h" diff --git a/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp b/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp index 02a2f1ad3..ddafbd1f2 100644 --- a/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp +++ b/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2002 - 2004 Tobias Koenig <tokoe@kde.org> This library is free software; you can redistribute it and/or diff --git a/kresources/egroupware/kabc_resourcexmlrpcconfig.h b/kresources/egroupware/kabc_resourcexmlrpcconfig.h index 084f92109..7ed608aa8 100644 --- a/kresources/egroupware/kabc_resourcexmlrpcconfig.h +++ b/kresources/egroupware/kabc_resourcexmlrpcconfig.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2002 - 2004 Tobias Koenig <tokoe@kde.org> This library is free software; you can redistribute it and/or @@ -22,7 +22,7 @@ #define RESOURCEXMLRPCCONFIG_H #include <kresources/configwidget.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KLineEdit; class KURLRequester; diff --git a/kresources/egroupware/kabc_resourcexmlrpcplugin.cpp b/kresources/egroupware/kabc_resourcexmlrpcplugin.cpp index 9fd5611e6..68918f8c0 100644 --- a/kresources/egroupware/kabc_resourcexmlrpcplugin.cpp +++ b/kresources/egroupware/kabc_resourcexmlrpcplugin.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2003 - 2004 Tobias Koenig <tokoe@kde.org> This library is free software; you can redistribute it and/or diff --git a/kresources/egroupware/kcal_resourcexmlrpc.cpp b/kresources/egroupware/kcal_resourcexmlrpc.cpp index 8b68b4cbe..f47df2718 100644 --- a/kresources/egroupware/kcal_resourcexmlrpc.cpp +++ b/kresources/egroupware/kcal_resourcexmlrpc.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2003 - 2004 Tobias Koenig <tokoe@kde.org> diff --git a/kresources/egroupware/kcal_resourcexmlrpc.h b/kresources/egroupware/kcal_resourcexmlrpc.h index 6d538d73c..b95f13446 100644 --- a/kresources/egroupware/kcal_resourcexmlrpc.h +++ b/kresources/egroupware/kcal_resourcexmlrpc.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2003 - 2004 Tobias Koenig <tokoe@kde.org> @@ -29,7 +29,7 @@ #include <kconfig.h> #include <kurl.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include "libkcal/calendarlocal.h" #include "libkcal/incidence.h" diff --git a/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp b/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp index 36e3b9486..213da26e3 100644 --- a/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp +++ b/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2003 - 2004 Tobias Koenig <tokoe@kde.org> This library is free software; you can redistribute it and/or diff --git a/kresources/egroupware/kcal_resourcexmlrpcconfig.h b/kresources/egroupware/kcal_resourcexmlrpcconfig.h index 13e359b00..7b38bbad9 100644 --- a/kresources/egroupware/kcal_resourcexmlrpcconfig.h +++ b/kresources/egroupware/kcal_resourcexmlrpcconfig.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2003 - 2004 Tobias Koenig <tokoe@kde.org> This library is free software; you can redistribute it and/or @@ -22,7 +22,7 @@ #define RESOURCEXMLRPCCONFIG_H #include <kresources/configwidget.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KIntSpinBox; class KLineEdit; diff --git a/kresources/egroupware/kcal_resourcexmlrpcplugin.cpp b/kresources/egroupware/kcal_resourcexmlrpcplugin.cpp index 1cc867b62..a22e55a0e 100644 --- a/kresources/egroupware/kcal_resourcexmlrpcplugin.cpp +++ b/kresources/egroupware/kcal_resourcexmlrpcplugin.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2003 - 2004 Tobias Koenig <tokoe@kde.org> This library is free software; you can redistribute it and/or diff --git a/kresources/egroupware/knotes_resourcexmlrpc.cpp b/kresources/egroupware/knotes_resourcexmlrpc.cpp index 6446a833d..8b50c3b8e 100644 --- a/kresources/egroupware/knotes_resourcexmlrpc.cpp +++ b/kresources/egroupware/knotes_resourcexmlrpc.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Tobias Koenig <tokoe@kde.org> diff --git a/kresources/egroupware/knotes_resourcexmlrpc.h b/kresources/egroupware/knotes_resourcexmlrpc.h index eeb47e139..c44700c34 100644 --- a/kresources/egroupware/knotes_resourcexmlrpc.h +++ b/kresources/egroupware/knotes_resourcexmlrpc.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Tobias Koenig <tokoe@kde.org> @@ -27,7 +27,7 @@ #include <kconfig.h> #include <kurl.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include "libkcal/calendarlocal.h" #include "libkcal/journal.h" diff --git a/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp b/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp index 224cb9914..8cf2a35c8 100644 --- a/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp +++ b/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Tobias Koenig <tokoe@kde.org> This library is free software; you can redistribute it and/or diff --git a/kresources/egroupware/knotes_resourcexmlrpcconfig.h b/kresources/egroupware/knotes_resourcexmlrpcconfig.h index dac45f818..f55a66021 100644 --- a/kresources/egroupware/knotes_resourcexmlrpcconfig.h +++ b/kresources/egroupware/knotes_resourcexmlrpcconfig.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Tobias Koenig <tokoe@kde.org> This library is free software; you can redistribute it and/or @@ -22,7 +22,7 @@ #define RESOURCEXMLRPCCONFIG_H #include <kresources/configwidget.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KIntSpinBox; class KLineEdit; diff --git a/kresources/egroupware/knotes_resourcexmlrpcplugin.cpp b/kresources/egroupware/knotes_resourcexmlrpcplugin.cpp index b3b6aabe3..db8cfdc4c 100644 --- a/kresources/egroupware/knotes_resourcexmlrpcplugin.cpp +++ b/kresources/egroupware/knotes_resourcexmlrpcplugin.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Tobias Koenig <tokoe@kde.org> This library is free software; you can redistribute it and/or diff --git a/kresources/egroupware/synchronizer.cpp b/kresources/egroupware/synchronizer.cpp index f48542467..8152828cb 100644 --- a/kresources/egroupware/synchronizer.cpp +++ b/kresources/egroupware/synchronizer.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2005 Tobias Koenig <tokoe@kde.org> diff --git a/kresources/egroupware/synchronizer.h b/kresources/egroupware/synchronizer.h index ccb34d7cb..97270e318 100644 --- a/kresources/egroupware/synchronizer.h +++ b/kresources/egroupware/synchronizer.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2005 Tobias Koenig <tokoe@kde.org> diff --git a/kresources/egroupware/todostatemapper.cpp b/kresources/egroupware/todostatemapper.cpp index ed87e9db6..81c517d0c 100644 --- a/kresources/egroupware/todostatemapper.cpp +++ b/kresources/egroupware/todostatemapper.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2005 Tobias Koenig <tokoe@kde.org> diff --git a/kresources/egroupware/todostatemapper.h b/kresources/egroupware/todostatemapper.h index 46c531cfc..fb82b4786 100644 --- a/kresources/egroupware/todostatemapper.h +++ b/kresources/egroupware/todostatemapper.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Tobias Koenig <tokoe@kde.org> diff --git a/kresources/featureplan/CMakeLists.txt b/kresources/featureplan/CMakeLists.txt index c365c8cbb..7d07c761e 100644 --- a/kresources/featureplan/CMakeLists.txt +++ b/kresources/featureplan/CMakeLists.txt @@ -69,6 +69,6 @@ tde_add_library( kcal_resourcefeatureplan SHARED AUTOMOC SOURCES kcal_resourcefeatureplan.cpp kcal_resourcefeatureplanconfig.cpp VERSION 1.0.0 - LINK featureplancommon-static kdepim-shared + LINK featureplancommon-static tdepim-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kresources/featureplan/Makefile.am b/kresources/featureplan/Makefile.am index 70bddac30..8c5a1999c 100644 --- a/kresources/featureplan/Makefile.am +++ b/kresources/featureplan/Makefile.am @@ -28,12 +28,12 @@ kcal_service_DATA = kcal_resourcefeatureplan.desktop check_PROGRAMS = dumpfeaturelist benchmarkfeaturelist -dumpfeaturelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +dumpfeaturelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor dumpfeaturelist_LDADD = libfeatureplancommon.la $(LIB_KDECORE) dumpfeaturelist_SOURCES = dumpfeaturelist.cpp dumpfeaturelist_COMPILE_FIRST = kde-features.h -benchmarkfeaturelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +benchmarkfeaturelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor benchmarkfeaturelist_LDADD = libfeatureplancommon.la $(LIB_KDECORE) benchmarkfeaturelist_SOURCES = benchmarkfeaturelist.cpp benchmarkfeaturelist_COMPILE_FIRST = kde-features.h diff --git a/kresources/featureplan/benchmarkfeaturelist.cpp b/kresources/featureplan/benchmarkfeaturelist.cpp index 2ae4432a0..f30ec2700 100644 --- a/kresources/featureplan/benchmarkfeaturelist.cpp +++ b/kresources/featureplan/benchmarkfeaturelist.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/kresources/featureplan/dumpfeaturelist.cpp b/kresources/featureplan/dumpfeaturelist.cpp index fd5a5a01a..08f6fdf0a 100644 --- a/kresources/featureplan/dumpfeaturelist.cpp +++ b/kresources/featureplan/dumpfeaturelist.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/kresources/featureplan/kcal_resourcefeatureplan.cpp b/kresources/featureplan/kcal_resourcefeatureplan.cpp index 2b54b0267..349e4ad56 100644 --- a/kresources/featureplan/kcal_resourcefeatureplan.cpp +++ b/kresources/featureplan/kcal_resourcefeatureplan.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/kresources/featureplan/kcal_resourcefeatureplan.h b/kresources/featureplan/kcal_resourcefeatureplan.h index 67799044e..41eb54af9 100644 --- a/kresources/featureplan/kcal_resourcefeatureplan.h +++ b/kresources/featureplan/kcal_resourcefeatureplan.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> @@ -29,7 +29,7 @@ #include <kabc/locknull.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <kconfig.h> namespace KCal { diff --git a/kresources/featureplan/kcal_resourcefeatureplanconfig.cpp b/kresources/featureplan/kcal_resourcefeatureplanconfig.cpp index 42043a5dd..55d12cbd9 100644 --- a/kresources/featureplan/kcal_resourcefeatureplanconfig.cpp +++ b/kresources/featureplan/kcal_resourcefeatureplanconfig.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/kresources/featureplan/kcal_resourcefeatureplanconfig.h b/kresources/featureplan/kcal_resourcefeatureplanconfig.h index e27ea94c2..94e31313f 100644 --- a/kresources/featureplan/kcal_resourcefeatureplanconfig.h +++ b/kresources/featureplan/kcal_resourcefeatureplanconfig.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> @@ -23,7 +23,7 @@ #define RESOURCEFEATUREPLANCONFIG_H #include <kresources/configwidget.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KLineEdit; class KURLRequester; diff --git a/kresources/featureplan/kcal_resourcefeatureplanplugin.cpp b/kresources/featureplan/kcal_resourcefeatureplanplugin.cpp index cee41809f..8f384ac97 100644 --- a/kresources/featureplan/kcal_resourcefeatureplanplugin.cpp +++ b/kresources/featureplan/kcal_resourcefeatureplanplugin.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/kresources/groupdav/groupdavaddressbookadaptor.cpp b/kresources/groupdav/groupdavaddressbookadaptor.cpp index 538d07159..f8f30f659 100644 --- a/kresources/groupdav/groupdavaddressbookadaptor.cpp +++ b/kresources/groupdav/groupdavaddressbookadaptor.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2004 Till Adam <adam@kde.org> diff --git a/kresources/groupdav/groupdavaddressbookadaptor.h b/kresources/groupdav/groupdavaddressbookadaptor.h index f66d7b863..7a716800b 100644 --- a/kresources/groupdav/groupdavaddressbookadaptor.h +++ b/kresources/groupdav/groupdavaddressbookadaptor.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2004 Till Adam <adam@kde.org> diff --git a/kresources/groupdav/groupdavcalendaradaptor.cpp b/kresources/groupdav/groupdavcalendaradaptor.cpp index b83a9d4e5..2556e3d02 100644 --- a/kresources/groupdav/groupdavcalendaradaptor.cpp +++ b/kresources/groupdav/groupdavcalendaradaptor.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2004 Till Adam <adam@kde.org> diff --git a/kresources/groupdav/groupdavcalendaradaptor.h b/kresources/groupdav/groupdavcalendaradaptor.h index 64e8e86ed..15b41de80 100644 --- a/kresources/groupdav/groupdavcalendaradaptor.h +++ b/kresources/groupdav/groupdavcalendaradaptor.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2004 Till Adam <adam@kde.org> diff --git a/kresources/groupdav/groupdavglobals.cpp b/kresources/groupdav/groupdavglobals.cpp index 10716000d..5fb9d6d3a 100644 --- a/kresources/groupdav/groupdavglobals.cpp +++ b/kresources/groupdav/groupdavglobals.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2004 Till Adam <adam@kde.org> diff --git a/kresources/groupdav/groupdavglobals.h b/kresources/groupdav/groupdavglobals.h index 7a89f1def..14ae7a3c8 100644 --- a/kresources/groupdav/groupdavglobals.h +++ b/kresources/groupdav/groupdavglobals.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2004 Till Adam <adam@kde.org> diff --git a/kresources/groupdav/kabc_resourcegroupdav.cpp b/kresources/groupdav/kabc_resourcegroupdav.cpp index b1fb46aa2..568f6fc5a 100644 --- a/kresources/groupdav/kabc_resourcegroupdav.cpp +++ b/kresources/groupdav/kabc_resourcegroupdav.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2004 Till Adam <adam@kde.org> diff --git a/kresources/groupdav/kabc_resourcegroupdav.h b/kresources/groupdav/kabc_resourcegroupdav.h index c3724424b..082eb2a5f 100644 --- a/kresources/groupdav/kabc_resourcegroupdav.h +++ b/kresources/groupdav/kabc_resourcegroupdav.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2004 Till Adam <adam@kde.org> @@ -23,7 +23,7 @@ #define KABC_RESOURCEGROUPDAV_H #include "kabc_resourcegroupwarebase.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KABC { diff --git a/kresources/groupdav/kabc_resourcegroupdav_plugin.cpp b/kresources/groupdav/kabc_resourcegroupdav_plugin.cpp index 15e12e63b..63614979d 100644 --- a/kresources/groupdav/kabc_resourcegroupdav_plugin.cpp +++ b/kresources/groupdav/kabc_resourcegroupdav_plugin.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2004 Till Adam <adam@kde.org> @@ -35,7 +35,7 @@ extern "C" { void *init_kabc_groupdav() { - KGlobal::locale()->insertCatalogue( "kdepimresources" ); + KGlobal::locale()->insertCatalogue( "tdepimresources" ); KGlobal::locale()->insertCatalogue( "kres_groupdav" ); return new GroupDavFactory; } diff --git a/kresources/groupdav/kcal_resourcegroupdav.cpp b/kresources/groupdav/kcal_resourcegroupdav.cpp index 293cb66fa..eef95c6e0 100644 --- a/kresources/groupdav/kcal_resourcegroupdav.cpp +++ b/kresources/groupdav/kcal_resourcegroupdav.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2004 Till Adam <adam@kde.org> diff --git a/kresources/groupdav/kcal_resourcegroupdav.h b/kresources/groupdav/kcal_resourcegroupdav.h index 2ff54695e..35d76c605 100644 --- a/kresources/groupdav/kcal_resourcegroupdav.h +++ b/kresources/groupdav/kcal_resourcegroupdav.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2004 Till Adam <adam@kde.org> diff --git a/kresources/groupdav/kcal_resourcegroupdav_plugin.cpp b/kresources/groupdav/kcal_resourcegroupdav_plugin.cpp index 6ab8eaee2..10b751a3d 100644 --- a/kresources/groupdav/kcal_resourcegroupdav_plugin.cpp +++ b/kresources/groupdav/kcal_resourcegroupdav_plugin.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2004 Till Adam <adam@kde.org> @@ -36,7 +36,7 @@ extern "C" { void *init_kcal_groupdav() { - KGlobal::locale()->insertCatalogue( "kdepimresources" ); + KGlobal::locale()->insertCatalogue( "tdepimresources" ); KGlobal::locale()->insertCatalogue( "kres_groupdav" ); return new GroupDavFactory; } diff --git a/kresources/groupware/kabc_resourcegroupware.cpp b/kresources/groupware/kabc_resourcegroupware.cpp index 251b9a530..c7950bcb0 100644 --- a/kresources/groupware/kabc_resourcegroupware.cpp +++ b/kresources/groupware/kabc_resourcegroupware.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/kresources/groupware/kabc_resourcegroupware.h b/kresources/groupware/kabc_resourcegroupware.h index db87254ac..70875f1da 100644 --- a/kresources/groupware/kabc_resourcegroupware.h +++ b/kresources/groupware/kabc_resourcegroupware.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/kresources/groupware/kabc_resourcegroupware_plugin.cpp b/kresources/groupware/kabc_resourcegroupware_plugin.cpp index b486f7839..38b156fd9 100644 --- a/kresources/groupware/kabc_resourcegroupware_plugin.cpp +++ b/kresources/groupware/kabc_resourcegroupware_plugin.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/kresources/groupware/kabc_resourcegroupwareconfig.cpp b/kresources/groupware/kabc_resourcegroupwareconfig.cpp index a930219cb..956ee4321 100644 --- a/kresources/groupware/kabc_resourcegroupwareconfig.cpp +++ b/kresources/groupware/kabc_resourcegroupwareconfig.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/kresources/groupware/kabc_resourcegroupwareconfig.h b/kresources/groupware/kabc_resourcegroupwareconfig.h index 06ef4186c..04900ca7b 100644 --- a/kresources/groupware/kabc_resourcegroupwareconfig.h +++ b/kresources/groupware/kabc_resourcegroupwareconfig.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/kresources/groupware/kcal_resourcegroupware.cpp b/kresources/groupware/kcal_resourcegroupware.cpp index 9bf03b191..6af5dce26 100644 --- a/kresources/groupware/kcal_resourcegroupware.cpp +++ b/kresources/groupware/kcal_resourcegroupware.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/kresources/groupware/kcal_resourcegroupware.h b/kresources/groupware/kcal_resourcegroupware.h index 81cd71180..072487a34 100644 --- a/kresources/groupware/kcal_resourcegroupware.h +++ b/kresources/groupware/kcal_resourcegroupware.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/kresources/groupware/kcal_resourcegroupware_plugin.cpp b/kresources/groupware/kcal_resourcegroupware_plugin.cpp index a30f47a94..bfa4f9f6d 100644 --- a/kresources/groupware/kcal_resourcegroupware_plugin.cpp +++ b/kresources/groupware/kcal_resourcegroupware_plugin.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/kresources/groupware/kcal_resourcegroupwareconfig.cpp b/kresources/groupware/kcal_resourcegroupwareconfig.cpp index 2d5cffe00..9a191bc30 100644 --- a/kresources/groupware/kcal_resourcegroupwareconfig.cpp +++ b/kresources/groupware/kcal_resourcegroupwareconfig.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/kresources/groupware/kcal_resourcegroupwareconfig.h b/kresources/groupware/kcal_resourcegroupwareconfig.h index b55febc8b..b43d1bc1a 100644 --- a/kresources/groupware/kcal_resourcegroupwareconfig.h +++ b/kresources/groupware/kcal_resourcegroupwareconfig.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/kresources/groupwise/groupwisesettingswidget.cpp b/kresources/groupwise/groupwisesettingswidget.cpp index 60d047123..ec1bc178d 100644 --- a/kresources/groupwise/groupwisesettingswidget.cpp +++ b/kresources/groupwise/groupwisesettingswidget.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2005 Will Stephenson <wstephenson@suse.de> diff --git a/kresources/groupwise/groupwisesettingswidget.h b/kresources/groupwise/groupwisesettingswidget.h index 46c6ca6d9..03b688730 100644 --- a/kresources/groupwise/groupwisesettingswidget.h +++ b/kresources/groupwise/groupwisesettingswidget.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2005 Will Stephenson <wstephenson@suse.de> diff --git a/kresources/groupwise/kabc_resourcegroupwise.cpp b/kresources/groupwise/kabc_resourcegroupwise.cpp index e6570b46e..8291b2bfc 100644 --- a/kresources/groupwise/kabc_resourcegroupwise.cpp +++ b/kresources/groupwise/kabc_resourcegroupwise.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/kresources/groupwise/kabc_resourcegroupwise.h b/kresources/groupwise/kabc_resourcegroupwise.h index b300336c1..d5c6734ba 100644 --- a/kresources/groupwise/kabc_resourcegroupwise.h +++ b/kresources/groupwise/kabc_resourcegroupwise.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> @@ -23,7 +23,7 @@ #include "soap/groupwiseserver.h" #include <kabcresourcecached.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <libtdepim/progressmanager.h> diff --git a/kresources/groupwise/kabc_resourcegroupwise_plugin.cpp b/kresources/groupwise/kabc_resourcegroupwise_plugin.cpp index 8fb53d09a..bacd1a7b5 100644 --- a/kresources/groupwise/kabc_resourcegroupwise_plugin.cpp +++ b/kresources/groupwise/kabc_resourcegroupwise_plugin.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp b/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp index 42896bb01..483268cc2 100644 --- a/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp +++ b/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/kresources/groupwise/kabc_resourcegroupwiseconfig.h b/kresources/groupwise/kabc_resourcegroupwiseconfig.h index 06278834e..4db0a705d 100644 --- a/kresources/groupwise/kabc_resourcegroupwiseconfig.h +++ b/kresources/groupwise/kabc_resourcegroupwiseconfig.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> @@ -23,7 +23,7 @@ #include "soap/groupwiseserver.h" #include <kresources/configwidget.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <tqmap.h> diff --git a/kresources/groupwise/kcal_resourcegroupwise.cpp b/kresources/groupwise/kcal_resourcegroupwise.cpp index ae56576ea..026cf9b6c 100644 --- a/kresources/groupwise/kcal_resourcegroupwise.cpp +++ b/kresources/groupwise/kcal_resourcegroupwise.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/kresources/groupwise/kcal_resourcegroupwise.h b/kresources/groupwise/kcal_resourcegroupwise.h index e99a04029..7baf07295 100644 --- a/kresources/groupwise/kcal_resourcegroupwise.h +++ b/kresources/groupwise/kcal_resourcegroupwise.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> @@ -30,7 +30,7 @@ #include <kabc/locknull.h> #include <kio/job.h> #include <kconfig.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class ngwt__Settings; diff --git a/kresources/groupwise/kcal_resourcegroupwise_plugin.cpp b/kresources/groupwise/kcal_resourcegroupwise_plugin.cpp index 930e907fc..8cce68e7e 100644 --- a/kresources/groupwise/kcal_resourcegroupwise_plugin.cpp +++ b/kresources/groupwise/kcal_resourcegroupwise_plugin.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp b/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp index 78f049e85..26689315e 100644 --- a/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp +++ b/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/kresources/groupwise/kcal_resourcegroupwiseconfig.h b/kresources/groupwise/kcal_resourcegroupwiseconfig.h index c27ac5dbb..2bf07c83b 100644 --- a/kresources/groupwise/kcal_resourcegroupwiseconfig.h +++ b/kresources/groupwise/kcal_resourcegroupwiseconfig.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> @@ -21,7 +21,7 @@ #define KCALRESOURCEGROUPWISECONFIG_H #include <kurlrequester.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <kresources/resource.h> #include <kresources/configwidget.h> diff --git a/kresources/groupwise/kioslave/groupwise.cpp b/kresources/groupwise/kioslave/groupwise.cpp index 5e182283e..a2f305a21 100644 --- a/kresources/groupwise/kioslave/groupwise.cpp +++ b/kresources/groupwise/kioslave/groupwise.cpp @@ -44,7 +44,7 @@ #include <unistd.h> #include <stdlib.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include "groupwise.h" diff --git a/kresources/groupwise/soap/CMakeLists.txt b/kresources/groupwise/soap/CMakeLists.txt index 64509638e..be5c8205f 100644 --- a/kresources/groupwise/soap/CMakeLists.txt +++ b/kresources/groupwise/soap/CMakeLists.txt @@ -33,6 +33,6 @@ tde_add_library( gwsoap SHARED AUTOMOC contactconverter.cpp gwconverter.cpp incidenceconverter.cpp groupwiseserver.cpp gwjobs.cpp ksslsocket.cpp soapC.cpp soapClient.cpp stdsoap2.cpp VERSION 0.0.0 - LINK kdepim-shared + LINK tdepim-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kresources/groupwise/soap/Makefile.am b/kresources/groupwise/soap/Makefile.am index 8ea5074e8..219737768 100644 --- a/kresources/groupwise/soap/Makefile.am +++ b/kresources/groupwise/soap/Makefile.am @@ -5,8 +5,8 @@ KDE_CXXFLAGS = -Wno-non-virtual-dtor check_PROGRAMS = soapdebug -soapdebug_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -soapdebug_LDADD = libgwsoap.la -lkdecore \ +soapdebug_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +soapdebug_LDADD = libgwsoap.la -ltdecore \ $(top_builddir)/libkcal/libkcal.la \ $(top_builddir)/libtdepim/libtdepim.la soapdebug_SOURCES = soapdebug.cpp diff --git a/kresources/groupwise/soap/contactconverter.cpp b/kresources/groupwise/soap/contactconverter.cpp index d4ab5f6a4..4f4454399 100644 --- a/kresources/groupwise/soap/contactconverter.cpp +++ b/kresources/groupwise/soap/contactconverter.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Tobias Koenig <tokoe@kde.org> This library is free software; you can redistribute it and/or diff --git a/kresources/groupwise/soap/contactconverter.h b/kresources/groupwise/soap/contactconverter.h index 6594c6d0e..7dbc8c79c 100644 --- a/kresources/groupwise/soap/contactconverter.h +++ b/kresources/groupwise/soap/contactconverter.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Tobias Koenig <tokoe@kde.org> This library is free software; you can redistribute it and/or diff --git a/kresources/groupwise/soap/gwconverter.cpp b/kresources/groupwise/soap/gwconverter.cpp index 4e848b7e3..2f7d5e03b 100644 --- a/kresources/groupwise/soap/gwconverter.cpp +++ b/kresources/groupwise/soap/gwconverter.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Tobias Koenig <tokoe@kde.org> This library is free software; you can redistribute it and/or diff --git a/kresources/groupwise/soap/gwconverter.h b/kresources/groupwise/soap/gwconverter.h index f57171dcc..d240ffec9 100644 --- a/kresources/groupwise/soap/gwconverter.h +++ b/kresources/groupwise/soap/gwconverter.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Tobias Koenig <tokoe@kde.org> This library is free software; you can redistribute it and/or diff --git a/kresources/groupwise/soap/incidenceconverter.cpp b/kresources/groupwise/soap/incidenceconverter.cpp index 85143da3b..7360d8a42 100644 --- a/kresources/groupwise/soap/incidenceconverter.cpp +++ b/kresources/groupwise/soap/incidenceconverter.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Tobias Koenig <tokoe@kde.org> This library is free software; you can redistribute it and/or diff --git a/kresources/groupwise/soap/incidenceconverter.h b/kresources/groupwise/soap/incidenceconverter.h index 305f19258..317562fa3 100644 --- a/kresources/groupwise/soap/incidenceconverter.h +++ b/kresources/groupwise/soap/incidenceconverter.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Tobias Koenig <tokoe@kde.org> This library is free software; you can redistribute it and/or diff --git a/kresources/groupwise/soap/patches/socklen.diff b/kresources/groupwise/soap/patches/socklen.diff index 87b283804..74c2bbce0 100644 --- a/kresources/groupwise/soap/patches/socklen.diff +++ b/kresources/groupwise/soap/patches/socklen.diff @@ -1,6 +1,6 @@ Index: soap/stdsoap2.cpp =================================================================== -RCS file: /home/kde/kdepim/kresources/groupwise/soap/stdsoap2.cpp,v +RCS file: /home/kde/tdepim/kresources/groupwise/soap/stdsoap2.cpp,v retrieving revision 1.3 diff -u -3 -p -r1.3 stdsoap2.cpp --- soap/stdsoap2.cpp 3 Dec 2004 17:15:43 -0000 1.3 diff --git a/kresources/groupwise/soap/patches/type_typo.diff b/kresources/groupwise/soap/patches/type_typo.diff index c663dad14..6e0f47929 100644 --- a/kresources/groupwise/soap/patches/type_typo.diff +++ b/kresources/groupwise/soap/patches/type_typo.diff @@ -1,6 +1,6 @@ Index: soap/soapC.cpp =================================================================== -RCS file: /home/kde/kdepim/kresources/groupwise/soap/soapC.cpp,v +RCS file: /home/kde/tdepim/kresources/groupwise/soap/soapC.cpp,v retrieving revision 1.4.2.3 diff -u -3 -p -r1.4.2.3 soapC.cpp --- soap/soapC.cpp 25 Oct 2004 13:58:20 -0000 1.4.2.3 diff --git a/kresources/kolab/kabc/resourcekolab.h b/kresources/kolab/kabc/resourcekolab.h index c6a27b6bf..95fdf3abe 100644 --- a/kresources/kolab/kabc/resourcekolab.h +++ b/kresources/kolab/kabc/resourcekolab.h @@ -38,7 +38,7 @@ #include "../shared/resourcekolabbase.h" #include "../shared/subresource.h" #include <kmail/kmailicalIface.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KABC { diff --git a/kresources/kolab/kcal/resourcekolab.h b/kresources/kolab/kcal/resourcekolab.h index 872fbda4c..8d5672f96 100644 --- a/kresources/kolab/kcal/resourcekolab.h +++ b/kresources/kolab/kcal/resourcekolab.h @@ -37,7 +37,7 @@ #include <tqtimer.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <libkcal/calendarlocal.h> #include <libkcal/icalformat.h> #include <libkcal/resourcecalendar.h> diff --git a/kresources/kolab/knotes/Makefile.am b/kresources/kolab/knotes/Makefile.am index 0315f3365..b95c261d3 100644 --- a/kresources/kolab/knotes/Makefile.am +++ b/kresources/kolab/knotes/Makefile.am @@ -12,7 +12,7 @@ libknoteskolab_la_LIBADD = \ $(top_builddir)/kresources/kolab/shared/libresourcekolabshared.la \ $(top_builddir)/knotes/libknotesresources.la \ $(top_builddir)/libkcal/libkcal.la \ - -lkresources -lkdeprint + -lkresources -ltdeprint kde_module_LTLIBRARIES = knotes_kolab.la diff --git a/kresources/kolab/knotes/resourcekolab.h b/kresources/kolab/knotes/resourcekolab.h index 3b61d6ec9..cc77d25d2 100644 --- a/kresources/kolab/knotes/resourcekolab.h +++ b/kresources/kolab/knotes/resourcekolab.h @@ -39,7 +39,7 @@ #include <libkcal/calendarlocal.h> #include "../shared/resourcekolabbase.h" #include "../shared/subresource.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace Kolab { diff --git a/kresources/lib/CMakeLists.txt b/kresources/lib/CMakeLists.txt index 3d1753b20..a604c51b6 100644 --- a/kresources/lib/CMakeLists.txt +++ b/kresources/lib/CMakeLists.txt @@ -34,7 +34,7 @@ tde_add_library( kgroupwarebase SHARED AUTOMOC kresources_groupwareprefs.kcfgc kcal_resourcegroupwarebaseconfig.cpp kabc_resourcegroupwarebaseconfig.cpp kcal_cachesettingsdlg.cpp VERSION 0.0.0 - LINK kdepim-shared + LINK tdepim-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kresources/lib/Makefile.am b/kresources/lib/Makefile.am index 0fb1dd857..10719ed53 100644 --- a/kresources/lib/Makefile.am +++ b/kresources/lib/Makefile.am @@ -31,5 +31,5 @@ METASOURCES = AUTO KDE_OPTIONS = nofinal messages: rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/kdepimresources.pot + $(XGETTEXT) *.cpp -o $(podir)/tdepimresources.pot diff --git a/kresources/lib/addressbookadaptor.cpp b/kresources/lib/addressbookadaptor.cpp index 626867c74..8cc28f67a 100644 --- a/kresources/lib/addressbookadaptor.cpp +++ b/kresources/lib/addressbookadaptor.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2004 Till Adam <adam@kde.org> diff --git a/kresources/lib/addressbookadaptor.h b/kresources/lib/addressbookadaptor.h index fb4408eca..b029ff60d 100644 --- a/kresources/lib/addressbookadaptor.h +++ b/kresources/lib/addressbookadaptor.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2004 Till Adam <adam@kde.org> @@ -26,7 +26,7 @@ #include "groupwaredataadaptor.h" #include <kabc/addressee.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <kurl.h> namespace KABC { diff --git a/kresources/lib/calendaradaptor.cpp b/kresources/lib/calendaradaptor.cpp index 88685bdfe..f2e255f0d 100644 --- a/kresources/lib/calendaradaptor.cpp +++ b/kresources/lib/calendaradaptor.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2004 Till Adam <adam@kde.org> diff --git a/kresources/lib/calendaradaptor.h b/kresources/lib/calendaradaptor.h index b8df62f9d..12e7d3ae7 100644 --- a/kresources/lib/calendaradaptor.h +++ b/kresources/lib/calendaradaptor.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2004 Till Adam <adam@kde.org> @@ -27,7 +27,7 @@ #include <libkcal/incidence.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <kurl.h> namespace KPIM { diff --git a/kresources/lib/davaddressbookadaptor.cpp b/kresources/lib/davaddressbookadaptor.cpp index b6f54c1e1..f96e353dd 100644 --- a/kresources/lib/davaddressbookadaptor.cpp +++ b/kresources/lib/davaddressbookadaptor.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2004 Till Adam <adam@kde.org> diff --git a/kresources/lib/davaddressbookadaptor.h b/kresources/lib/davaddressbookadaptor.h index bdf9e35b8..55bb18193 100644 --- a/kresources/lib/davaddressbookadaptor.h +++ b/kresources/lib/davaddressbookadaptor.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (C) 2004 Reinhold Kainhofer <reinhold@kainhofer.com> @@ -24,7 +24,7 @@ #include "addressbookadaptor.h" #include "folderlister.h" #include <tqdom.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KABC { diff --git a/kresources/lib/davcalendaradaptor.cpp b/kresources/lib/davcalendaradaptor.cpp index 0bd64a838..206bb7e96 100644 --- a/kresources/lib/davcalendaradaptor.cpp +++ b/kresources/lib/davcalendaradaptor.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Reinhold Kainhofer <reinhold@kainhofer.com> diff --git a/kresources/lib/davcalendaradaptor.h b/kresources/lib/davcalendaradaptor.h index b7aba04ea..00134eda9 100644 --- a/kresources/lib/davcalendaradaptor.h +++ b/kresources/lib/davcalendaradaptor.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (C) 2004 Reinhold Kainhofer <reinhold@kainhofer.com> @@ -24,7 +24,7 @@ #include "calendaradaptor.h" #include "folderlister.h" #include <tqdom.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KCal { diff --git a/kresources/lib/davgroupwareglobals.cpp b/kresources/lib/davgroupwareglobals.cpp index 5795c97ba..5d9a37206 100644 --- a/kresources/lib/davgroupwareglobals.cpp +++ b/kresources/lib/davgroupwareglobals.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004-2005 Reinhold Kainhofer <reinhold@kainhofer.com> diff --git a/kresources/lib/davgroupwareglobals.h b/kresources/lib/davgroupwareglobals.h index a899370fc..67eb22801 100644 --- a/kresources/lib/davgroupwareglobals.h +++ b/kresources/lib/davgroupwareglobals.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004-2005 Reinhold Kainhofer <reinhold@kainhofer.com> diff --git a/kresources/lib/folderconfig.h b/kresources/lib/folderconfig.h index 6ed2ae591..0c6fb7951 100644 --- a/kresources/lib/folderconfig.h +++ b/kresources/lib/folderconfig.h @@ -24,7 +24,7 @@ #define KPIM_FOLDERCONFIG_H #include <kurl.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <tqwidget.h> // class KListView; diff --git a/kresources/lib/folderlister.h b/kresources/lib/folderlister.h index e2f55953c..81121ff61 100644 --- a/kresources/lib/folderlister.h +++ b/kresources/lib/folderlister.h @@ -26,7 +26,7 @@ // #include "kresources_groupwareprefs.h" /*#include "groupwareresourcejob.h"*/ #include <kurl.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <tqvaluelist.h> #include <tqstring.h> diff --git a/kresources/lib/folderselectdialog.cpp b/kresources/lib/folderselectdialog.cpp index 189506182..f05dccf0a 100644 --- a/kresources/lib/folderselectdialog.cpp +++ b/kresources/lib/folderselectdialog.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2008 Kevin Ottens <ervin@kde.org> diff --git a/kresources/lib/folderselectdialog.h b/kresources/lib/folderselectdialog.h index 884b91328..e33ac80a4 100644 --- a/kresources/lib/folderselectdialog.h +++ b/kresources/lib/folderselectdialog.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2008 Kevin Ottens <ervin@kde.org> diff --git a/kresources/lib/groupwaredataadaptor.cpp b/kresources/lib/groupwaredataadaptor.cpp index d77c0e550..da012b158 100644 --- a/kresources/lib/groupwaredataadaptor.cpp +++ b/kresources/lib/groupwaredataadaptor.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2004 Till Adam <adam@kde.org> diff --git a/kresources/lib/groupwaredataadaptor.h b/kresources/lib/groupwaredataadaptor.h index 203c62782..09fef6597 100644 --- a/kresources/lib/groupwaredataadaptor.h +++ b/kresources/lib/groupwaredataadaptor.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2004 Till Adam <adam@kde.org> @@ -29,7 +29,7 @@ #include <tqstring.h> #include <libkcal/listbase.h> #include <tqobject.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KIO { diff --git a/kresources/lib/groupwaredownloadjob.cpp b/kresources/lib/groupwaredownloadjob.cpp index e3756ebba..3bdead675 100644 --- a/kresources/lib/groupwaredownloadjob.cpp +++ b/kresources/lib/groupwaredownloadjob.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2004 Till Adam <adam@kde.org> diff --git a/kresources/lib/groupwaredownloadjob.h b/kresources/lib/groupwaredownloadjob.h index 58f473ef9..e611d286c 100644 --- a/kresources/lib/groupwaredownloadjob.h +++ b/kresources/lib/groupwaredownloadjob.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2004 Till Adam <adam@kde.org> diff --git a/kresources/lib/groupwareresourcejob.cpp b/kresources/lib/groupwareresourcejob.cpp index c1b23d16d..b7e4b57b0 100644 --- a/kresources/lib/groupwareresourcejob.cpp +++ b/kresources/lib/groupwareresourcejob.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2004 Till Adam <adam@kde.org> diff --git a/kresources/lib/groupwareresourcejob.h b/kresources/lib/groupwareresourcejob.h index 5260b485a..6b9cd9700 100644 --- a/kresources/lib/groupwareresourcejob.h +++ b/kresources/lib/groupwareresourcejob.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2004 Till Adam <adam@kde.org> diff --git a/kresources/lib/groupwareuploadjob.cpp b/kresources/lib/groupwareuploadjob.cpp index 4714a7f99..60e4a53e6 100644 --- a/kresources/lib/groupwareuploadjob.cpp +++ b/kresources/lib/groupwareuploadjob.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2004 Till Adam <adam@kde.org> diff --git a/kresources/lib/groupwareuploadjob.h b/kresources/lib/groupwareuploadjob.h index 80816d153..273ab77cd 100644 --- a/kresources/lib/groupwareuploadjob.h +++ b/kresources/lib/groupwareuploadjob.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2004 Till Adam <adam@kde.org> diff --git a/kresources/lib/kabc_resourcegroupwarebase.cpp b/kresources/lib/kabc_resourcegroupwarebase.cpp index 8af4cf837..0d8f197c4 100644 --- a/kresources/lib/kabc_resourcegroupwarebase.cpp +++ b/kresources/lib/kabc_resourcegroupwarebase.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2004 Till Adam <adam@kde.org> diff --git a/kresources/lib/kabc_resourcegroupwarebase.h b/kresources/lib/kabc_resourcegroupwarebase.h index b8d7fe71a..872a52e83 100644 --- a/kresources/lib/kabc_resourcegroupwarebase.h +++ b/kresources/lib/kabc_resourcegroupwarebase.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2004 Till Adam <adam@kde.org> @@ -24,7 +24,7 @@ #include <kurl.h> #include <kabcresourcecached.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KConfig; diff --git a/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp b/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp index 803037342..6609a3b28 100644 --- a/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp +++ b/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2004 Till Adam <adam@kde.org> diff --git a/kresources/lib/kabc_resourcegroupwarebaseconfig.h b/kresources/lib/kabc_resourcegroupwarebaseconfig.h index dbb57ed65..88b9f6db7 100644 --- a/kresources/lib/kabc_resourcegroupwarebaseconfig.h +++ b/kresources/lib/kabc_resourcegroupwarebaseconfig.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2004 Till Adam <adam@kde.org> @@ -23,7 +23,7 @@ #define KABC_RESOURCEGROUPWAREBASECONFIG_H #include <kresources/configwidget.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KLineEdit; class KURLRequester; diff --git a/kresources/lib/kcal_cachesettingsdlg.cpp b/kresources/lib/kcal_cachesettingsdlg.cpp index 808a16734..20b48ad9e 100644 --- a/kresources/lib/kcal_cachesettingsdlg.cpp +++ b/kresources/lib/kcal_cachesettingsdlg.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2004 Till Adam <adam@kde.org> diff --git a/kresources/lib/kcal_cachesettingsdlg.h b/kresources/lib/kcal_cachesettingsdlg.h index 3de47e9a8..920bde0cb 100644 --- a/kresources/lib/kcal_cachesettingsdlg.h +++ b/kresources/lib/kcal_cachesettingsdlg.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2004 Till Adam <adam@kde.org> @@ -23,7 +23,7 @@ #define KCAL_CACHESETTINGSDLG_H #include <kdialogbase.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KRES { diff --git a/kresources/lib/kcal_resourcegroupwarebase.cpp b/kresources/lib/kcal_resourcegroupwarebase.cpp index cf149b66b..bae91bf61 100644 --- a/kresources/lib/kcal_resourcegroupwarebase.cpp +++ b/kresources/lib/kcal_resourcegroupwarebase.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2004 Till Adam <adam@kde.org> diff --git a/kresources/lib/kcal_resourcegroupwarebase.h b/kresources/lib/kcal_resourcegroupwarebase.h index ac2bc3303..800469c14 100644 --- a/kresources/lib/kcal_resourcegroupwarebase.h +++ b/kresources/lib/kcal_resourcegroupwarebase.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2004 Till Adam <adam@kde.org> @@ -25,7 +25,7 @@ #include <kurl.h> #include <libkcal/resourcecached.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <kabc/locknull.h> namespace KIO { diff --git a/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp b/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp index 9ae91a0d8..ed8a63f92 100644 --- a/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp +++ b/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2004 Till Adam <adam@kde.org> diff --git a/kresources/lib/kcal_resourcegroupwarebaseconfig.h b/kresources/lib/kcal_resourcegroupwarebaseconfig.h index eb2522ecc..d51092812 100644 --- a/kresources/lib/kcal_resourcegroupwarebaseconfig.h +++ b/kresources/lib/kcal_resourcegroupwarebaseconfig.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2004 Till Adam <adam@kde.org> @@ -23,7 +23,7 @@ #define KCAL_RESOURCEGROUPWAREBASECONFIG_H #include <kresources/configwidget.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KPushButton; class KLineEdit; diff --git a/kresources/lib/webdavhandler.cpp b/kresources/lib/webdavhandler.cpp index 180740662..fea7a0b16 100644 --- a/kresources/lib/webdavhandler.cpp +++ b/kresources/lib/webdavhandler.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2004 Till Adam <adam@kde.org> diff --git a/kresources/lib/webdavhandler.h b/kresources/lib/webdavhandler.h index f978759f8..0bfb33e90 100644 --- a/kresources/lib/webdavhandler.h +++ b/kresources/lib/webdavhandler.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2004 Till Adam <adam@kde.org> @@ -27,7 +27,7 @@ #include <tqdom.h> #include <tqdatetime.h> #include <kurl.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KDE_EXPORT WebdavHandler { diff --git a/kresources/newexchange/exchangeaddressbookadaptor.cpp b/kresources/newexchange/exchangeaddressbookadaptor.cpp index 13ad362df..bd22858a5 100644 --- a/kresources/newexchange/exchangeaddressbookadaptor.cpp +++ b/kresources/newexchange/exchangeaddressbookadaptor.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (C) 2004 Reinhold Kainhofer <reinhold@kainhofer.com> diff --git a/kresources/newexchange/exchangeaddressbookadaptor.h b/kresources/newexchange/exchangeaddressbookadaptor.h index 2d3df7420..576427645 100644 --- a/kresources/newexchange/exchangeaddressbookadaptor.h +++ b/kresources/newexchange/exchangeaddressbookadaptor.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (C) 2004 Reinhold Kainhofer <reinhold@kainhofer.com> diff --git a/kresources/newexchange/exchangecalendaradaptor.cpp b/kresources/newexchange/exchangecalendaradaptor.cpp index 43e1dfdb3..c0882ab1a 100644 --- a/kresources/newexchange/exchangecalendaradaptor.cpp +++ b/kresources/newexchange/exchangecalendaradaptor.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (C) 2004 Reinhold Kainhofer <reinhold@kainhofer.com> diff --git a/kresources/newexchange/exchangecalendaradaptor.h b/kresources/newexchange/exchangecalendaradaptor.h index 08bad45f0..3a4acab99 100644 --- a/kresources/newexchange/exchangecalendaradaptor.h +++ b/kresources/newexchange/exchangecalendaradaptor.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (C) 2004 Reinhold Kainhofer <reinhold@kainhofer.com> diff --git a/kresources/newexchange/exchangeglobals.cpp b/kresources/newexchange/exchangeglobals.cpp index ef27580f0..aaef31bcd 100644 --- a/kresources/newexchange/exchangeglobals.cpp +++ b/kresources/newexchange/exchangeglobals.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2005 Reinhold Kainhofer <reinhold@kainhofer.com> diff --git a/kresources/newexchange/exchangeglobals.h b/kresources/newexchange/exchangeglobals.h index f8ad33178..a1e12f4c1 100644 --- a/kresources/newexchange/exchangeglobals.h +++ b/kresources/newexchange/exchangeglobals.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2005 Reinhold Kainhofer <reinhold@kainhofer.com> diff --git a/kresources/newexchange/kabc_resourceexchange.cpp b/kresources/newexchange/kabc_resourceexchange.cpp index 7b08423a5..db773f2f4 100644 --- a/kresources/newexchange/kabc_resourceexchange.cpp +++ b/kresources/newexchange/kabc_resourceexchange.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (C) 2004 Reinhold Kainhofer <reinhold@kainhofer.com> diff --git a/kresources/newexchange/kabc_resourceexchange.h b/kresources/newexchange/kabc_resourceexchange.h index 0ef4677af..9f967c55d 100644 --- a/kresources/newexchange/kabc_resourceexchange.h +++ b/kresources/newexchange/kabc_resourceexchange.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (C) 2004 Reinhold Kainhofer <reinhold@kainhofer.com> diff --git a/kresources/newexchange/kabc_resourceexchange_plugin.cpp b/kresources/newexchange/kabc_resourceexchange_plugin.cpp index d324be10d..adc0b6859 100644 --- a/kresources/newexchange/kabc_resourceexchange_plugin.cpp +++ b/kresources/newexchange/kabc_resourceexchange_plugin.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (C) 2004 Reinhold Kainhofer <reinhold@kainhofer.com> diff --git a/kresources/newexchange/kcal_resourceexchange.cpp b/kresources/newexchange/kcal_resourceexchange.cpp index 37d99d376..953e30c31 100644 --- a/kresources/newexchange/kcal_resourceexchange.cpp +++ b/kresources/newexchange/kcal_resourceexchange.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (C) 2004 Reinhold Kainhofer <reinhold@kainhofer.com> diff --git a/kresources/newexchange/kcal_resourceexchange.h b/kresources/newexchange/kcal_resourceexchange.h index 94ef8901e..7c7c3a705 100644 --- a/kresources/newexchange/kcal_resourceexchange.h +++ b/kresources/newexchange/kcal_resourceexchange.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (C) 2004 Reinhold Kainhofer <reinhold@kainhofer.com> diff --git a/kresources/newexchange/kcal_resourceexchange_plugin.cpp b/kresources/newexchange/kcal_resourceexchange_plugin.cpp index e2b1d5396..6130e0dc0 100644 --- a/kresources/newexchange/kcal_resourceexchange_plugin.cpp +++ b/kresources/newexchange/kcal_resourceexchange_plugin.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (C) 2004 Reinhold Kainhofer <reinhold@kainhofer.com> diff --git a/kresources/remote/CMakeLists.txt b/kresources/remote/CMakeLists.txt index 19dfcb7b1..d1a4b57b1 100644 --- a/kresources/remote/CMakeLists.txt +++ b/kresources/remote/CMakeLists.txt @@ -51,6 +51,6 @@ tde_add_library( kcal_resourceremote SHARED AUTOMOC SOURCES resourceremote.cpp resourceremoteconfig.cpp VERSION 1.0.0 - LINK kdepim-shared + LINK tdepim-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kresources/remote/resourceremote.h b/kresources/remote/resourceremote.h index 255fa687c..0a7ccef6d 100644 --- a/kresources/remote/resourceremote.h +++ b/kresources/remote/resourceremote.h @@ -28,7 +28,7 @@ #include <kurl.h> #include <kconfig.h> #include <kdirwatch.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <libtdepim/progressmanager.h> diff --git a/kresources/remote/resourceremoteconfig.h b/kresources/remote/resourceremoteconfig.h index 7c7d5124a..e741510d2 100644 --- a/kresources/remote/resourceremoteconfig.h +++ b/kresources/remote/resourceremoteconfig.h @@ -30,7 +30,7 @@ #include <kresources/resource.h> #include <kresources/configwidget.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KCal { diff --git a/kresources/scalix/kabc/resourcescalix.h b/kresources/scalix/kabc/resourcescalix.h index 9693b5259..613c186af 100644 --- a/kresources/scalix/kabc/resourcescalix.h +++ b/kresources/scalix/kabc/resourcescalix.h @@ -39,7 +39,7 @@ #include "../shared/resourcescalixbase.h" #include "../shared/subresource.h" #include <kmail/kmailicalIface.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KABC { diff --git a/kresources/scalix/kcal/resourcescalix.h b/kresources/scalix/kcal/resourcescalix.h index 67ecac365..1f409069a 100644 --- a/kresources/scalix/kcal/resourcescalix.h +++ b/kresources/scalix/kcal/resourcescalix.h @@ -36,7 +36,7 @@ #include <tqtimer.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <libkcal/calendarlocal.h> #include <libkcal/icalformat.h> #include <libkcal/resourcecalendar.h> diff --git a/kresources/scalix/kioslave/CMakeLists.txt b/kresources/scalix/kioslave/CMakeLists.txt index f210891ff..7ba76f672 100644 --- a/kresources/scalix/kioslave/CMakeLists.txt +++ b/kresources/scalix/kioslave/CMakeLists.txt @@ -32,6 +32,6 @@ install( tde_add_kpart( kio_scalix AUTOMOC SOURCES scalix.cpp - LINK kdepim-shared + LINK tdepim-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kresources/scalix/kioslave/scalix.cpp b/kresources/scalix/kioslave/scalix.cpp index 36b2aa776..8b8c15c5c 100644 --- a/kresources/scalix/kioslave/scalix.cpp +++ b/kresources/scalix/kioslave/scalix.cpp @@ -28,7 +28,7 @@ #include <kio/global.h> #include <klocale.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <stdlib.h> diff --git a/kresources/scalix/knotes/Makefile.am b/kresources/scalix/knotes/Makefile.am index f04c03940..56d7efe3e 100644 --- a/kresources/scalix/knotes/Makefile.am +++ b/kresources/scalix/knotes/Makefile.am @@ -12,7 +12,7 @@ libknotesscalix_la_LIBADD = \ $(top_builddir)/kresources/scalix/shared/libresourcescalixshared.la \ $(top_builddir)/knotes/libknotesresources.la \ $(top_builddir)/libkcal/libkcal.la \ - -lkresources -lkdeprint + -lkresources -ltdeprint kde_module_LTLIBRARIES = knotes_scalix.la diff --git a/kresources/scalix/knotes/resourcescalix.h b/kresources/scalix/knotes/resourcescalix.h index fc1309b98..96b11b399 100644 --- a/kresources/scalix/knotes/resourcescalix.h +++ b/kresources/scalix/knotes/resourcescalix.h @@ -38,7 +38,7 @@ #include <libkcal/calendarlocal.h> #include "../shared/resourcescalixbase.h" #include "../shared/subresource.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace Scalix { diff --git a/kresources/scalix/scalixadmin/Makefile.am b/kresources/scalix/scalixadmin/Makefile.am index fb748a0fb..ebde37e2e 100644 --- a/kresources/scalix/scalixadmin/Makefile.am +++ b/kresources/scalix/scalixadmin/Makefile.am @@ -2,7 +2,7 @@ bin_PROGRAMS = scalixadmin INCLUDES = $(all_includes) -scalixadmin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +scalixadmin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor scalixadmin_LDADD = $(LIB_KABC) scalixadmin_SOURCES = main.cpp mainwindow.cpp passwordpage.cpp settings.cpp jobs.cpp \ otherusermanager.cpp otheruserview.cpp otheruserpage.cpp ldapview.cpp ldapdialog.cpp \ diff --git a/kresources/slox/CMakeLists.txt b/kresources/slox/CMakeLists.txt index 045e5fa95..423569785 100644 --- a/kresources/slox/CMakeLists.txt +++ b/kresources/slox/CMakeLists.txt @@ -54,7 +54,7 @@ tde_add_library( kslox SHARED AUTOMOC sloxaccounts.cpp webdavhandler.cpp sloxfolder.cpp sloxfoldermanager.cpp sloxfolderdialog.cpp sloxbase.cpp VERSION 0.0.0 - LINK kdepim-shared + LINK tdepim-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kresources/slox/Makefile.am b/kresources/slox/Makefile.am index 97da13403..ef0f84ab1 100644 --- a/kresources/slox/Makefile.am +++ b/kresources/slox/Makefile.am @@ -34,7 +34,7 @@ kabc_slox_la_LIBADD = libkabc_slox.la EXTRA_PROGRAMS = testsloxaccounts -testsloxaccounts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testsloxaccounts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testsloxaccounts_LDADD = libkslox.la testsloxaccounts_SOURCES = testsloxaccounts.cpp diff --git a/kresources/slox/kabcresourceslox.cpp b/kresources/slox/kabcresourceslox.cpp index d45ead3e5..f45108b42 100644 --- a/kresources/slox/kabcresourceslox.cpp +++ b/kresources/slox/kabcresourceslox.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2005 Volker Krause <volker.krause@rwth-aachen.de> diff --git a/kresources/slox/kabcresourceslox.h b/kresources/slox/kabcresourceslox.h index 605c8dea5..cede17177 100644 --- a/kresources/slox/kabcresourceslox.h +++ b/kresources/slox/kabcresourceslox.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> @@ -24,7 +24,7 @@ #include "webdavhandler.h" #include <libtdepim/kabcresourcecached.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <kabc/addressee.h> #include <tqmap.h> diff --git a/kresources/slox/kabcresourceslox_plugin.cpp b/kresources/slox/kabcresourceslox_plugin.cpp index 73152673a..f570cff9f 100644 --- a/kresources/slox/kabcresourceslox_plugin.cpp +++ b/kresources/slox/kabcresourceslox_plugin.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/kresources/slox/kabcresourcesloxconfig.cpp b/kresources/slox/kabcresourcesloxconfig.cpp index abacaf718..d9e32a556 100644 --- a/kresources/slox/kabcresourcesloxconfig.cpp +++ b/kresources/slox/kabcresourcesloxconfig.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/kresources/slox/kabcresourcesloxconfig.h b/kresources/slox/kabcresourcesloxconfig.h index 79b255a1c..203985622 100644 --- a/kresources/slox/kabcresourcesloxconfig.h +++ b/kresources/slox/kabcresourcesloxconfig.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> @@ -21,7 +21,7 @@ #define RESOURCESLOXCONFIG_H #include <kresources/configwidget.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class TQCheckBox; class KLineEdit; diff --git a/kresources/slox/kcalresourceslox.cpp b/kresources/slox/kcalresourceslox.cpp index d3a87c169..a47c64b6f 100644 --- a/kresources/slox/kcalresourceslox.cpp +++ b/kresources/slox/kcalresourceslox.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2005 Volker Krause <volker.krause@rwth-aachen.de> diff --git a/kresources/slox/kcalresourceslox.h b/kresources/slox/kcalresourceslox.h index 17eb8789a..93d05370b 100644 --- a/kresources/slox/kcalresourceslox.h +++ b/kresources/slox/kcalresourceslox.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> @@ -31,7 +31,7 @@ #include <kurl.h> #include <kconfig.h> #include <kdirwatch.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <libkcal/incidence.h> #include <libkcal/todo.h> diff --git a/kresources/slox/kcalresourceslox_plugin.cpp b/kresources/slox/kcalresourceslox_plugin.cpp index 57aa9dc58..e141892d5 100644 --- a/kresources/slox/kcalresourceslox_plugin.cpp +++ b/kresources/slox/kcalresourceslox_plugin.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/kresources/slox/kcalresourcesloxconfig.cpp b/kresources/slox/kcalresourcesloxconfig.cpp index 441ea5336..e09cf85c1 100644 --- a/kresources/slox/kcalresourcesloxconfig.cpp +++ b/kresources/slox/kcalresourcesloxconfig.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/kresources/slox/kcalresourcesloxconfig.h b/kresources/slox/kcalresourcesloxconfig.h index 63526070c..cbba2a458 100644 --- a/kresources/slox/kcalresourcesloxconfig.h +++ b/kresources/slox/kcalresourcesloxconfig.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> @@ -21,7 +21,7 @@ #define KCALRESOURCESLOXCONFIG_H #include <kurlrequester.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <kresources/resource.h> #include <kresources/configwidget.h> diff --git a/kresources/slox/sloxaccounts.cpp b/kresources/slox/sloxaccounts.cpp index a32df5fa2..616197936 100644 --- a/kresources/slox/sloxaccounts.cpp +++ b/kresources/slox/sloxaccounts.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2005 Volker Krause <volker.krause@rwth-aachen.de> diff --git a/kresources/slox/sloxaccounts.h b/kresources/slox/sloxaccounts.h index f971360cb..4860bfd6b 100644 --- a/kresources/slox/sloxaccounts.h +++ b/kresources/slox/sloxaccounts.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> @@ -21,7 +21,7 @@ #define SLOXACCOUNTS_H #include <kabc/addressee.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <tqobject.h> namespace KIO { diff --git a/kresources/slox/sloxbase.h b/kresources/slox/sloxbase.h index 3a6e70555..6f291c8f6 100644 --- a/kresources/slox/sloxbase.h +++ b/kresources/slox/sloxbase.h @@ -21,7 +21,7 @@ #define SLOXUTILS_H #include <tqstring.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KRES { class Resource; diff --git a/kresources/slox/sloxfolder.h b/kresources/slox/sloxfolder.h index e27399a66..e722dfd4c 100644 --- a/kresources/slox/sloxfolder.h +++ b/kresources/slox/sloxfolder.h @@ -21,7 +21,7 @@ #define SLOXFOLDER_H #include <tqstring.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KListViewItem; diff --git a/kresources/slox/sloxfoldermanager.h b/kresources/slox/sloxfoldermanager.h index ee21c150d..1ccecc386 100644 --- a/kresources/slox/sloxfoldermanager.h +++ b/kresources/slox/sloxfoldermanager.h @@ -25,7 +25,7 @@ #include <kurl.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KIO { class Job; diff --git a/kresources/slox/testsloxaccounts.cpp b/kresources/slox/testsloxaccounts.cpp index 6ad10c1b1..2884703d8 100644 --- a/kresources/slox/testsloxaccounts.cpp +++ b/kresources/slox/testsloxaccounts.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/kresources/slox/webdavhandler.cpp b/kresources/slox/webdavhandler.cpp index 1758c09e5..cb8acde02 100644 --- a/kresources/slox/webdavhandler.cpp +++ b/kresources/slox/webdavhandler.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/kresources/slox/webdavhandler.h b/kresources/slox/webdavhandler.h index bbaf897f7..8dedf0a72 100644 --- a/kresources/slox/webdavhandler.h +++ b/kresources/slox/webdavhandler.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> @@ -25,7 +25,7 @@ #include <tqdatetime.h> #include <tqdom.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <kabc/addressee.h> namespace KCal { diff --git a/kresources/tvanytime/kcal_resourcetvanytime.cpp b/kresources/tvanytime/kcal_resourcetvanytime.cpp index 81461d644..f819bba5a 100644 --- a/kresources/tvanytime/kcal_resourcetvanytime.cpp +++ b/kresources/tvanytime/kcal_resourcetvanytime.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2005 Will Stephenson <wstephenson@kde.org> diff --git a/kresources/tvanytime/kcal_resourcetvanytime.h b/kresources/tvanytime/kcal_resourcetvanytime.h index ea1650827..23922e703 100644 --- a/kresources/tvanytime/kcal_resourcetvanytime.h +++ b/kresources/tvanytime/kcal_resourcetvanytime.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2005 Will Stephenson <wstephenson@kde.org> @@ -30,7 +30,7 @@ #include <kabc/locknull.h> #include <kio/job.h> #include <kconfig.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include "service.h" diff --git a/kresources/tvanytime/kcal_resourcetvanytime_plugin.cpp b/kresources/tvanytime/kcal_resourcetvanytime_plugin.cpp index a9d7bcc14..481a62b51 100644 --- a/kresources/tvanytime/kcal_resourcetvanytime_plugin.cpp +++ b/kresources/tvanytime/kcal_resourcetvanytime_plugin.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp b/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp index 47d62d376..110a62f9e 100644 --- a/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp +++ b/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2005 Will Stephenson <wstephenson@kde.org> diff --git a/kresources/tvanytime/kcal_resourcetvanytimeconfig.h b/kresources/tvanytime/kcal_resourcetvanytimeconfig.h index e88ce6f0b..6e23ee851 100644 --- a/kresources/tvanytime/kcal_resourcetvanytimeconfig.h +++ b/kresources/tvanytime/kcal_resourcetvanytimeconfig.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2005 Will Stephenson <wstephenson@kde.org> @@ -21,7 +21,7 @@ #define KCALRESOURCETVANYTIMECONFIG_H #include <kurlrequester.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <kresources/resource.h> #include <kresources/configwidget.h> diff --git a/kresources/tvanytime/tvanytime.kdevelop b/kresources/tvanytime/tvanytime.kdevelop index 9af3eb4cf..c938252bc 100644 --- a/kresources/tvanytime/tvanytime.kdevelop +++ b/kresources/tvanytime/tvanytime.kdevelop @@ -37,13 +37,13 @@ </optimized> <debug> <configargs>--enable-debug=full</configargs> - <builddir>/space/kde/svn/head/build/kdepim/kresources/tvanytime</builddir> + <builddir>/space/kde/svn/head/build/tdepim/kresources/tvanytime</builddir> <ccompiler>kdevgccoptions</ccompiler> <cxxcompiler>kdevgppoptions</cxxcompiler> <f77compiler>kdevg77options</f77compiler> <cxxflags>-O0 -g3</cxxflags> <envvars/> - <topsourcedir>/space/kde/svn/head/src/kdepim/kresources/tvanytime</topsourcedir> + <topsourcedir>/space/kde/svn/head/src/tdepim/kresources/tvanytime</topsourcedir> <cppflags/> <ldflags/> <ccompilerbinary/> @@ -159,7 +159,7 @@ <LICENSEFILE>COPYING</LICENSEFILE> <VERSION>0.1</VERSION> <YEAR>2005</YEAR> - <dest>/space/kde/head/src/kdepim/kresources/tvanytime</dest> + <dest>/space/kde/head/src/tdepim/kresources/tvanytime</dest> </substmap> <kdevcppsupport> <references> diff --git a/ktnef/AUTHORS b/ktnef/AUTHORS index dfb1b0df6..8628953dc 100644 --- a/ktnef/AUTHORS +++ b/ktnef/AUTHORS @@ -1,2 +1,2 @@ -Michael Goffioul <kdeprint@swing.be> +Michael Goffioul <tdeprint@swing.be> - Main developer diff --git a/ktnef/gui/Makefile.am b/ktnef/gui/Makefile.am index 144f0b244..e82074c25 100644 --- a/ktnef/gui/Makefile.am +++ b/ktnef/gui/Makefile.am @@ -4,7 +4,7 @@ SUBDIRS = pics bin_PROGRAMS = ktnef -ktnef_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +ktnef_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor ktnef_LDADD = $(LIB_KFILE) $(top_builddir)/ktnef/lib/libktnef.la ktnef_SOURCES = ktnefmain.cpp ktnefview.cpp attachpropertydialogbase.ui \ attachpropertydialog.cpp messagepropertydialog.cpp \ diff --git a/ktnef/gui/attachpropertydialog.cpp b/ktnef/gui/attachpropertydialog.cpp index dc8e47607..fbf4d6e36 100644 --- a/ktnef/gui/attachpropertydialog.cpp +++ b/ktnef/gui/attachpropertydialog.cpp @@ -1,7 +1,7 @@ /* attachpropertydialog.cpp - Copyright (C) 2002 Michael Goffioul <kdeprint@swing.be> + Copyright (C) 2002 Michael Goffioul <tdeprint@swing.be> This file is part of KTNEF, the KDE TNEF support library/program. diff --git a/ktnef/gui/attachpropertydialog.h b/ktnef/gui/attachpropertydialog.h index aa5e2bf3a..970a7e39c 100644 --- a/ktnef/gui/attachpropertydialog.h +++ b/ktnef/gui/attachpropertydialog.h @@ -1,7 +1,7 @@ /* attachpropertydialog.h - Copyright (C) 2002 Michael Goffioul <kdeprint@swing.be> + Copyright (C) 2002 Michael Goffioul <tdeprint@swing.be> This file is part of KTNEF, the KDE TNEF support library/program. diff --git a/ktnef/gui/ktnefmain.cpp b/ktnef/gui/ktnefmain.cpp index 41e2d590f..923257773 100644 --- a/ktnef/gui/ktnefmain.cpp +++ b/ktnef/gui/ktnefmain.cpp @@ -1,7 +1,7 @@ /* ktnefmain.cpp - Copyright (C) 2002 Michael Goffioul <kdeprint@swing.be> + Copyright (C) 2002 Michael Goffioul <tdeprint@swing.be> This file is part of KTNEF, the KDE TNEF support library/program. diff --git a/ktnef/gui/ktnefmain.h b/ktnef/gui/ktnefmain.h index ba7993d44..7fe89b32d 100644 --- a/ktnef/gui/ktnefmain.h +++ b/ktnef/gui/ktnefmain.h @@ -1,7 +1,7 @@ /* ktnefmain.h - Copyright (C) 2002 Michael Goffioul <kdeprint@swing.be> + Copyright (C) 2002 Michael Goffioul <tdeprint@swing.be> This file is part of KTNEF, the KDE TNEF support library/program. diff --git a/ktnef/gui/ktnefview.cpp b/ktnef/gui/ktnefview.cpp index 871de9e04..676dd4b9f 100644 --- a/ktnef/gui/ktnefview.cpp +++ b/ktnef/gui/ktnefview.cpp @@ -1,7 +1,7 @@ /* ktnefview.cpp - Copyright (C) 2002 Michael Goffioul <kdeprint@swing.be> + Copyright (C) 2002 Michael Goffioul <tdeprint@swing.be> This file is part of KTNEF, the KDE TNEF support library/program. diff --git a/ktnef/gui/ktnefview.h b/ktnef/gui/ktnefview.h index 25504f87a..e150595de 100644 --- a/ktnef/gui/ktnefview.h +++ b/ktnef/gui/ktnefview.h @@ -1,7 +1,7 @@ /* ktnefview.h - Copyright (C) 2002 Michael Goffioul <kdeprint@swing.be> + Copyright (C) 2002 Michael Goffioul <tdeprint@swing.be> This file is part of KTNEF, the KDE TNEF support library/program. @@ -20,7 +20,7 @@ #include <klistview.h> #include <tqptrlist.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KTNEFAttach; diff --git a/ktnef/gui/main.cpp b/ktnef/gui/main.cpp index e975630df..0ba04cc1b 100644 --- a/ktnef/gui/main.cpp +++ b/ktnef/gui/main.cpp @@ -1,7 +1,7 @@ /* main.cpp - Copyright (C) 2002 Michael Goffioul <kdeprint@swing.be> + Copyright (C) 2002 Michael Goffioul <tdeprint@swing.be> This file is part of KTNEF, the KDE TNEF support library/program. @@ -39,7 +39,7 @@ int main(int argc, char *argv[]) KAboutData aboutData( "ktnef", I18N_NOOP("KTnef"), "1.0", description, KAboutData::License_GPL, "(c) 2000, Michael Goffioul"); - aboutData.addAuthor("Michael Goffioul",0, "kdeprint@swing.be"); + aboutData.addAuthor("Michael Goffioul",0, "tdeprint@swing.be"); KCmdLineArgs::init( argc, argv, &aboutData ); KCmdLineArgs::addCmdLineOptions( options ); // Add our own options. KApplication::addCmdLineOptions(); diff --git a/ktnef/gui/messagepropertydialog.cpp b/ktnef/gui/messagepropertydialog.cpp index a2b1f75f9..7f4d61e6b 100644 --- a/ktnef/gui/messagepropertydialog.cpp +++ b/ktnef/gui/messagepropertydialog.cpp @@ -1,7 +1,7 @@ /* messagepropertydialog.cpp - Copyright (C) 2003 Michael Goffioul <kdeprint@swing.be> + Copyright (C) 2003 Michael Goffioul <tdeprint@swing.be> This file is part of KTNEF, the KDE TNEF support library/program. diff --git a/ktnef/gui/messagepropertydialog.h b/ktnef/gui/messagepropertydialog.h index b7060d880..d48f3a265 100644 --- a/ktnef/gui/messagepropertydialog.h +++ b/ktnef/gui/messagepropertydialog.h @@ -1,7 +1,7 @@ /* messagepropertydialog.h - Copyright (C) 2003 Michael Goffioul <kdeprint@swing.be> + Copyright (C) 2003 Michael Goffioul <tdeprint@swing.be> This file is part of KTNEF, the KDE TNEF support library/program. diff --git a/ktnef/ktnef/ktnefattach.h b/ktnef/ktnef/ktnefattach.h index f7f9f0862..280c862fe 100644 --- a/ktnef/ktnef/ktnefattach.h +++ b/ktnef/ktnef/ktnefattach.h @@ -1,7 +1,7 @@ /* ktnefattach.h - Copyright (C) 2002 Michael Goffioul <kdeprint@swing.be> + Copyright (C) 2002 Michael Goffioul <tdeprint@swing.be> This file is part of KTNEF, the KDE TNEF support library/program. @@ -22,7 +22,7 @@ #include <tqmap.h> #include <tqvariant.h> #include <ktnef/ktnefpropertyset.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KTNEFProperty; diff --git a/ktnef/ktnef/ktnefmessage.h b/ktnef/ktnef/ktnefmessage.h index 059c64f6d..afc372e27 100644 --- a/ktnef/ktnef/ktnefmessage.h +++ b/ktnef/ktnef/ktnefmessage.h @@ -1,7 +1,7 @@ /* ktnefmessage.h - Copyright (C) 2002 Michael Goffioul <kdeprint@swing.be> + Copyright (C) 2002 Michael Goffioul <tdeprint@swing.be> This file is part of KTNEF, the KDE TNEF support library/program. @@ -20,7 +20,7 @@ #include <ktnef/ktnefpropertyset.h> #include <tqptrlist.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KTNEFAttach; diff --git a/ktnef/ktnef/ktnefparser.h b/ktnef/ktnef/ktnefparser.h index 06754df55..92c44dc22 100644 --- a/ktnef/ktnef/ktnefparser.h +++ b/ktnef/ktnef/ktnefparser.h @@ -1,7 +1,7 @@ /* ktnefparser.h - Copyright (C) 2002 Michael Goffioul <kdeprint@swing.be> + Copyright (C) 2002 Michael Goffioul <tdeprint@swing.be> This file is part of KTNEF, the KDE TNEF support library/program. @@ -21,7 +21,7 @@ #include <tqptrlist.h> #include <tqstring.h> #include <tqmap.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KTNEFAttach; class KTNEFMessage; diff --git a/ktnef/ktnef/ktnefproperty.h b/ktnef/ktnef/ktnefproperty.h index bf5ab8a2e..7b9d9d204 100644 --- a/ktnef/ktnef/ktnefproperty.h +++ b/ktnef/ktnef/ktnefproperty.h @@ -1,7 +1,7 @@ /* ktnefproperty.h - Copyright (C) 2002 Michael Goffioul <kdeprint@swing.be> + Copyright (C) 2002 Michael Goffioul <tdeprint@swing.be> This file is part of KTNEF, the KDE TNEF support library/program. @@ -20,7 +20,7 @@ #include <tqvariant.h> #include <tqstring.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KDE_EXPORT KTNEFProperty { diff --git a/ktnef/ktnef/ktnefpropertyset.h b/ktnef/ktnef/ktnefpropertyset.h index 6a5ec75a6..44166e312 100644 --- a/ktnef/ktnef/ktnefpropertyset.h +++ b/ktnef/ktnef/ktnefpropertyset.h @@ -1,7 +1,7 @@ /* ktnefpropertyset.h - Copyright (C) 2002 Michael Goffioul <kdeprint@swing.be> + Copyright (C) 2002 Michael Goffioul <tdeprint@swing.be> This file is part of KTNEF, the KDE TNEF support library/program. @@ -20,7 +20,7 @@ #include <tqmap.h> #include <tqvariant.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KTNEFProperty; diff --git a/ktnef/lib/ktnefattach.cpp b/ktnef/lib/ktnefattach.cpp index b6dad60d6..3e721cfaf 100644 --- a/ktnef/lib/ktnefattach.cpp +++ b/ktnef/lib/ktnefattach.cpp @@ -1,7 +1,7 @@ /* ktnefattach.cpp - Copyright (C) 2002 Michael Goffioul <kdeprint@swing.be> + Copyright (C) 2002 Michael Goffioul <tdeprint@swing.be> This file is part of KTNEF, the KDE TNEF support library/program. diff --git a/ktnef/lib/ktnefmessage.cpp b/ktnef/lib/ktnefmessage.cpp index 202f080a1..27f98606e 100644 --- a/ktnef/lib/ktnefmessage.cpp +++ b/ktnef/lib/ktnefmessage.cpp @@ -1,7 +1,7 @@ /* ktnefmessage.cpp - Copyright (C) 2002 Michael Goffioul <kdeprint@swing.be> + Copyright (C) 2002 Michael Goffioul <tdeprint@swing.be> This file is part of KTNEF, the KDE TNEF support library/program. diff --git a/ktnef/lib/ktnefparser.cpp b/ktnef/lib/ktnefparser.cpp index 7ca17b331..a05e05721 100644 --- a/ktnef/lib/ktnefparser.cpp +++ b/ktnef/lib/ktnefparser.cpp @@ -1,7 +1,7 @@ /* ktnefparser.cpp - Copyright (C) 2002 Michael Goffioul <kdeprint@swing.be> + Copyright (C) 2002 Michael Goffioul <tdeprint@swing.be> This file is part of KTNEF, the KDE TNEF support library/program. diff --git a/ktnef/lib/ktnefproperty.cpp b/ktnef/lib/ktnefproperty.cpp index ae43236fb..95edcc887 100644 --- a/ktnef/lib/ktnefproperty.cpp +++ b/ktnef/lib/ktnefproperty.cpp @@ -1,7 +1,7 @@ /* ktnefproperty.cpp - Copyright (C) 2002 Michael Goffioul <kdeprint@swing.be> + Copyright (C) 2002 Michael Goffioul <tdeprint@swing.be> This file is part of KTNEF, the KDE TNEF support library/program. diff --git a/ktnef/lib/ktnefpropertyset.cpp b/ktnef/lib/ktnefpropertyset.cpp index ec3ee2b51..7801d7264 100644 --- a/ktnef/lib/ktnefpropertyset.cpp +++ b/ktnef/lib/ktnefpropertyset.cpp @@ -1,7 +1,7 @@ /* ktnefpropertyset.cpp - Copyright (C) 2002 Michael Goffioul <kdeprint@swing.be> + Copyright (C) 2002 Michael Goffioul <tdeprint@swing.be> This file is part of KTNEF, the KDE TNEF support library/program. diff --git a/ktnef/lib/lzfu.cpp b/ktnef/lib/lzfu.cpp index cc66cbbbd..df121aeac 100644 --- a/ktnef/lib/lzfu.cpp +++ b/ktnef/lib/lzfu.cpp @@ -1,7 +1,7 @@ /* lzfu.cpp - Copyright (C) 2003 Michael Goffioul <kdeprint@swing.be> + Copyright (C) 2003 Michael Goffioul <tdeprint@swing.be> This file is part of KTNEF, the KDE TNEF support library/program. diff --git a/ktnef/lib/lzfu.h b/ktnef/lib/lzfu.h index 8047e9286..7304243f6 100644 --- a/ktnef/lib/lzfu.h +++ b/ktnef/lib/lzfu.h @@ -1,7 +1,7 @@ /* lzfu.h - Copyright (C) 2003 Michael Goffioul <kdeprint@swing.be> + Copyright (C) 2003 Michael Goffioul <tdeprint@swing.be> This file is part of KTNEF, the KDE TNEF support library/program. diff --git a/ktnef/lib/mapi.cpp b/ktnef/lib/mapi.cpp index bf84f1fd7..449c41770 100644 --- a/ktnef/lib/mapi.cpp +++ b/ktnef/lib/mapi.cpp @@ -1,7 +1,7 @@ /* mapi.cpp - Copyright (C) 2002 Michael Goffioul <kdeprint@swing.be> + Copyright (C) 2002 Michael Goffioul <tdeprint@swing.be> This file is part of KTNEF, the KDE TNEF support library/program. diff --git a/ktnef/lib/mapi.h b/ktnef/lib/mapi.h index 829f7d62f..6b94ac52f 100644 --- a/ktnef/lib/mapi.h +++ b/ktnef/lib/mapi.h @@ -1,7 +1,7 @@ /* mapi.h - Copyright (C) 2002 Michael Goffioul <kdeprint@swing.be> + Copyright (C) 2002 Michael Goffioul <tdeprint@swing.be> This file is part of KTNEF, the KDE TNEF support library/program. diff --git a/ktnef/tests/Makefile.am b/ktnef/tests/Makefile.am index 103d7eb7e..7b349f86a 100644 --- a/ktnef/tests/Makefile.am +++ b/ktnef/tests/Makefile.am @@ -4,7 +4,7 @@ LDADD = ../lib/libktnef.la $(LIB_KDECORE) check_PROGRAMS = parsertest TESTS = parsertest -parsertest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +parsertest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor parsertest_SOURCES = parsertest.cpp METASOURCES = AUTO diff --git a/libemailfunctions/email.cpp b/libemailfunctions/email.cpp index cf3e4196b..b11b1837c 100644 --- a/libemailfunctions/email.cpp +++ b/libemailfunctions/email.cpp @@ -1,6 +1,6 @@ /* -*- mode: C++; c-file-style: "gnu" -*- - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 KDEPIM developers This library is free software; you can redistribute it and/or diff --git a/libemailfunctions/email.h b/libemailfunctions/email.h index 5e5e665b9..79797f4ac 100644 --- a/libemailfunctions/email.h +++ b/libemailfunctions/email.h @@ -1,6 +1,6 @@ /* -*- mode: C++; c-file-style: "gnu" -*- - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 KDEPIM developers This library is free software; you can redistribute it and/or @@ -25,7 +25,7 @@ #include <tqstringlist.h> #include <tqcstring.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> /** @file */ diff --git a/libemailfunctions/idmapper.cpp b/libemailfunctions/idmapper.cpp index 52cfeed83..62bcc7efe 100644 --- a/libemailfunctions/idmapper.cpp +++ b/libemailfunctions/idmapper.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Tobias Koenig <tokoe@kde.org> Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/libemailfunctions/idmapper.h b/libemailfunctions/idmapper.h index dcb306979..9e9faadf5 100644 --- a/libemailfunctions/idmapper.h +++ b/libemailfunctions/idmapper.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Tobias Koenig <tokoe@kde.org> Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> @@ -25,7 +25,7 @@ #include <tqmap.h> #include <tqvariant.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KPIM { diff --git a/libemailfunctions/kasciistricmp.cpp b/libemailfunctions/kasciistricmp.cpp index 1a66a52b5..2852bb42a 100644 --- a/libemailfunctions/kasciistricmp.cpp +++ b/libemailfunctions/kasciistricmp.cpp @@ -20,7 +20,7 @@ #if ! KDE_IS_VERSION(3,3,89) -static unsigned char kdepim_ASCIIToLower( unsigned char ch ) +static unsigned char tdepim_ASCIIToLower( unsigned char ch ) { if ( ch >= 'A' && ch <= 'Z' ) return ch - 'A' + 'a'; @@ -28,7 +28,7 @@ static unsigned char kdepim_ASCIIToLower( unsigned char ch ) return ch; } -int kdepim_kasciistricmp( const char *str1, const char *str2 ) +int tdepim_kasciistricmp( const char *str1, const char *str2 ) { const unsigned char *s1 = (const unsigned char *) str1; const unsigned char *s2 = (const unsigned char *) str2; @@ -37,7 +37,7 @@ int kdepim_kasciistricmp( const char *str1, const char *str2 ) if ( !s1 || !s2 ) return s1 ? 1 : ( s2 ? -1 : 0 ); - for ( ; !( res = ( c = kdepim_ASCIIToLower( *s1 ) ) - kdepim_ASCIIToLower( *s2 ) ); + for ( ; !( res = ( c = tdepim_ASCIIToLower( *s1 ) ) - tdepim_ASCIIToLower( *s2 ) ); ++s1, ++s2 ) if ( !c ) // strings are equal break; diff --git a/libemailfunctions/kasciistricmp.h b/libemailfunctions/kasciistricmp.h index 852fd266a..8d423d42c 100644 --- a/libemailfunctions/kasciistricmp.h +++ b/libemailfunctions/kasciistricmp.h @@ -22,7 +22,7 @@ // get kasciistricmp from kglobal.h #include <kglobal.h> #else -// define kasciistricmp to this kdepim symbol (renamed to avoid problems when upgrading kdelibs later) -int kdepim_kasciistricmp( const char *str1, const char *str2 ); -#define kasciistricmp kdepim_kasciistricmp +// define kasciistricmp to this tdepim symbol (renamed to avoid problems when upgrading kdelibs later) +int tdepim_kasciistricmp( const char *str1, const char *str2 ); +#define kasciistricmp tdepim_kasciistricmp #endif diff --git a/libemailfunctions/tests/Makefile.am b/libemailfunctions/tests/Makefile.am index 366725aaf..0bfb9ca08 100644 --- a/libemailfunctions/tests/Makefile.am +++ b/libemailfunctions/tests/Makefile.am @@ -4,10 +4,10 @@ LDADD = ../libemailfunctions.la ../../libkmime/libkmime.la $(LIB_KDECORE) check_PROGRAMS = testidmapper testemail TESTS = testemail -testidmapper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testidmapper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testidmapper_SOURCES = testidmapper.cpp -testemail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testemail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testemail_SOURCES = testemail.cpp METASOURCES = AUTO diff --git a/libkcal/Mainpage.dox b/libkcal/Mainpage.dox index c1d800c4b..8950e299e 100644 --- a/libkcal/Mainpage.dox +++ b/libkcal/Mainpage.dox @@ -6,7 +6,7 @@ standard formats iCalendar and vCalendar and the group scheduling standard iTIP. <b>Important:</b> This is mainly a KDE PIM internal library. The API might be subject to source and binary incompatible changes. -If you use this library for kdepim-external projects, please let us know, so we +If you use this library for tdepim-external projects, please let us know, so we can coordinate possible changes. libkcal development is discussed on the <a diff --git a/libkcal/Makefile.am b/libkcal/Makefile.am index 2fa8c2889..7ecd005a5 100644 --- a/libkcal/Makefile.am +++ b/libkcal/Makefile.am @@ -6,7 +6,7 @@ INCLUDES = -I$(srcdir)/versit -I$(top_srcdir)/ \ $(all_includes) lib_LTLIBRARIES = libkcal.la -libkcal_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 2:0:0 $(LIB_QT) -lkdecore +libkcal_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 2:0:0 $(LIB_QT) -ltdecore libkcal_la_LIBADD = versit/libversit.la $(LIB_KIO) \ -lical -licalss \ $(top_builddir)/ktnef/lib/libktnef.la \ @@ -54,11 +54,11 @@ libkcalinclude_HEADERS = alarm.h attachment.h attendee.h calendar.h \ kde_module_LTLIBRARIES = kcal_local.la kcal_localdir.la kcal_local_la_SOURCES = resourcelocal_plugin.cpp -kcal_local_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore +kcal_local_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore kcal_local_la_LIBADD = libkcal.la kcal_localdir_la_SOURCES = resourcelocaldir_plugin.cpp -kcal_localdir_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore +kcal_localdir_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore kcal_localdir_la_LIBADD = libkcal.la EXTRA_PROGRAMS = convertqtopia diff --git a/libkcal/README.libical b/libkcal/README.libical index 3e1365b53..c59301ba2 100644 --- a/libkcal/README.libical +++ b/libkcal/README.libical @@ -1,4 +1,4 @@ The directory libical contains version 0.23 of libical with a few minor -modifications to let it compile in the kdepim module. You can get the original +modifications to let it compile in the tdepim module. You can get the original distribution from http://www.softwarestudio.org/download. More information about libical can be found at http://www.softwarestudio.org/libical. diff --git a/libkcal/alarm.h b/libkcal/alarm.h index efe047d62..f667cf6b0 100644 --- a/libkcal/alarm.h +++ b/libkcal/alarm.h @@ -33,7 +33,7 @@ #include "listbase.h" #include "libkcal_export.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KCal { diff --git a/libkcal/calendar.h b/libkcal/calendar.h index c2a4e6e66..01d65038b 100644 --- a/libkcal/calendar.h +++ b/libkcal/calendar.h @@ -39,7 +39,7 @@ #include "kcalversion.h" #include "person.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <tqobject.h> #include <tqstring.h> diff --git a/libkcal/calendarlocal.h b/libkcal/calendarlocal.h index 5a8e3cd76..a77238e47 100644 --- a/libkcal/calendarlocal.h +++ b/libkcal/calendarlocal.h @@ -24,7 +24,7 @@ #include "calendar.h" #include <tqdict.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KCal { diff --git a/libkcal/confirmsavedialog.h b/libkcal/confirmsavedialog.h index c20a4951b..2cdb6c8b1 100644 --- a/libkcal/confirmsavedialog.h +++ b/libkcal/confirmsavedialog.h @@ -23,7 +23,7 @@ #include <libkcal/incidence.h> #include <kdialogbase.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KListView; diff --git a/libkcal/customproperties.h b/libkcal/customproperties.h index d43473890..c840f69e6 100644 --- a/libkcal/customproperties.h +++ b/libkcal/customproperties.h @@ -24,7 +24,7 @@ #include <tqstring.h> #include <tqmap.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include "libkcal_export.h" diff --git a/libkcal/event.h b/libkcal/event.h index fed0e41a0..9bd217e1c 100644 --- a/libkcal/event.h +++ b/libkcal/event.h @@ -22,7 +22,7 @@ #define KCAL_EVENT_H #include "incidence.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KCal { diff --git a/libkcal/icalformat.h b/libkcal/icalformat.h index 425e80d54..8da2868ab 100644 --- a/libkcal/icalformat.h +++ b/libkcal/icalformat.h @@ -26,7 +26,7 @@ #include "scheduler.h" #include "calformat.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KCal { diff --git a/libkcal/incidence.h b/libkcal/incidence.h index 8b6ddd1a8..089056fba 100644 --- a/libkcal/incidence.h +++ b/libkcal/incidence.h @@ -32,7 +32,7 @@ #include "libkcal_export.h" #include "incidencebase.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KCal { diff --git a/libkcal/journal.h b/libkcal/journal.h index 52d2d8dd3..a3289d57d 100644 --- a/libkcal/journal.h +++ b/libkcal/journal.h @@ -23,7 +23,7 @@ #define KCAL_JOURNAL_H #include "incidence.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KCal { diff --git a/libkcal/libkcal_export.h b/libkcal/libkcal_export.h index 0a1f184cc..88f270d01 100644 --- a/libkcal/libkcal_export.h +++ b/libkcal/libkcal_export.h @@ -21,7 +21,7 @@ #ifndef KCAL_KCALEXPORT_H #define KCAL_KCALEXPORT_H -#include <kdepimmacros.h> +#include <tdepimmacros.h> #define LIBKCAL_EXPORT KDE_EXPORT diff --git a/libkcal/resourcecached.h b/libkcal/resourcecached.h index f43023720..be6fc2ae4 100644 --- a/libkcal/resourcecached.h +++ b/libkcal/resourcecached.h @@ -34,7 +34,7 @@ #include <tqdatetime.h> #include <tqtimer.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KCal { diff --git a/libkcal/resourcecachedconfig.h b/libkcal/resourcecachedconfig.h index 13ea648bf..4fac644fb 100644 --- a/libkcal/resourcecachedconfig.h +++ b/libkcal/resourcecachedconfig.h @@ -22,7 +22,7 @@ #define KCAL_RESOURCECACHEDCONFIG_H #include <tqwidget.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class TQButtonGroup; class TQSpinBox; diff --git a/libkcal/resourcecalendar.h b/libkcal/resourcecalendar.h index ef1acb2d1..8ec25ff71 100644 --- a/libkcal/resourcecalendar.h +++ b/libkcal/resourcecalendar.h @@ -41,7 +41,7 @@ #include <kresources/resource.h> #include <kresources/manager.h> #include <kabc/lock.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KCal { diff --git a/libkcal/resourcelocal.h b/libkcal/resourcelocal.h index a5043a3fd..d03f824ca 100644 --- a/libkcal/resourcelocal.h +++ b/libkcal/resourcelocal.h @@ -27,7 +27,7 @@ #include <kurl.h> #include <kdirwatch.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KConfig; #include "calendarlocal.h" diff --git a/libkcal/resourcelocalconfig.h b/libkcal/resourcelocalconfig.h index f6cba16f2..46e267117 100644 --- a/libkcal/resourcelocalconfig.h +++ b/libkcal/resourcelocalconfig.h @@ -28,7 +28,7 @@ #include <kresources/resource.h> #include <kresources/configwidget.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include "libkcal_export.h" diff --git a/libkcal/resourcelocaldir.h b/libkcal/resourcelocaldir.h index c83d51282..ea59546f9 100644 --- a/libkcal/resourcelocaldir.h +++ b/libkcal/resourcelocaldir.h @@ -23,7 +23,7 @@ #include <kurl.h> #include <kdirwatch.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include "resourcecached.h" diff --git a/libkcal/tests/Makefile.am b/libkcal/tests/Makefile.am index 3bdd6df89..6b2066307 100644 --- a/libkcal/tests/Makefile.am +++ b/libkcal/tests/Makefile.am @@ -25,60 +25,60 @@ check_PROGRAMS = testtostring \ METASOURCES = AUTO testincidence_SOURCES = testincidence.cpp -testincidence_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testincidence_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testincidence_LDADD = ../libkcal.la testcalendar_SOURCES = testcalendar.cpp -testcalendar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testcalendar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testcalendar_LDADD = ../libkcal.la testtostring_SOURCES = testtostring.cpp -testtostring_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testtostring_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testtostring_LDADD = ../libkcal.la fbrecurring_SOURCES = fbrecurring.cpp -fbrecurring_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +fbrecurring_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor fbrecurring_LDADD = ../libkcal.la readandwrite_SOURCES = readandwrite.cpp -readandwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +readandwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor readandwrite_LDADD = ../libkcal.la testresource_SOURCES = testresource.cpp -testresource_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testresource_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testresource_LDADD = ../libkcal.la testrecurrence_SOURCES = testrecurrence.cpp -testrecurrence_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testrecurrence_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testrecurrence_LDADD = ../libkcal.la testrecurprevious_SOURCES = testrecurprevious.cpp -testrecurprevious_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testrecurprevious_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testrecurprevious_LDADD = ../libkcal.la testrecurson_SOURCES = testrecurson.cpp -testrecurson_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testrecurson_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testrecurson_LDADD = ../libkcal.la testrecurrencetype_SOURCES = testrecurrencetype.cpp -testrecurrencetype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testrecurrencetype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testrecurrencetype_LDADD = ../libkcal.la testvcalexport_SOURCES = testvcalexport.cpp -testvcalexport_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testvcalexport_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testvcalexport_LDADD = ../libkcal.la testfields_SOURCES = testfields.cpp -testfields_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testfields_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testfields_LDADD = ../libkcal.la testfields_CXXFLAGS= -DINPUT='"$(srcdir)/data/test_pilot.ics"' testfb_SOURCES = testfb.cpp -testfb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testfb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testfb_LDADD = ../libkcal.la testcalselectdialog_SOURCES = testcalselectdialog.cpp -testcalselectdialog_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testcalselectdialog_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testcalselectdialog_LDADD = ../libkcal.la TESTFILES = test1.ics test2.ics test3.ics test4.ics test5.ics test_Mozilla.ics diff --git a/libkdenetwork/gpgmepp/configure.in.bot b/libkdenetwork/gpgmepp/configure.in.bot index fba6871d5..100cc65c7 100644 --- a/libkdenetwork/gpgmepp/configure.in.bot +++ b/libkdenetwork/gpgmepp/configure.in.bot @@ -1,4 +1,4 @@ -if test -z "$GPGME_LIBS" || test -n "$kdepim_needs_gpgme_copy" ; then +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." diff --git a/libkdenetwork/gpgmepp/configure.in.in b/libkdenetwork/gpgmepp/configure.in.in index 7ffaa1e67..e277b73bd 100644 --- a/libkdenetwork/gpgmepp/configure.in.in +++ b/libkdenetwork/gpgmepp/configure.in.in @@ -90,12 +90,12 @@ dnl END inline of gpgme.m4 # It was the first useable one for C++ (class keyword) and KDE (largefile support). # If you change this minimum version here, update also configure.in.bot -kdepim_needs_gpgme_copy="" +tdepim_needs_gpgme_copy="" KDEPIM_PATH_GPGME(0.4.5,[ AC_LANG_SAVE AC_LANG_C - kdepim_gpgmepp_save_cflags="$CFLAGS" - kdepim_gpgmepp_save_libs="$LIBS" + tdepim_gpgmepp_save_cflags="$CFLAGS" + tdepim_gpgmepp_save_libs="$LIBS" CFLAGS="$GPGME_CFLAGS" LIBS="$GPGME_LIBS" @@ -165,12 +165,12 @@ KDEPIM_PATH_GPGME(0.4.5,[ AC_MSG_RESULT([no]) ]) - CFLAGS="$kdepim_gpgmepp_save_cflags" - LIBS="$kdepim_gpgmepp_save_libs" + CFLAGS="$tdepim_gpgmepp_save_cflags" + LIBS="$tdepim_gpgmepp_save_libs" AC_LANG_RESTORE ],[ - kdepim_needs_gpgme_copy="true" + 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_LIBS_DEP='$(GPGME_LIBS)' @@ -182,7 +182,7 @@ KDEPIM_PATH_GPGME(0.4.5,[ AC_SUBST(GPGME_LIBS_DEP) -AM_CONDITIONAL(needs_gpgme_copy, test -n "$kdepim_needs_gpgme_copy") +AM_CONDITIONAL(needs_gpgme_copy, test -n "$tdepim_needs_gpgme_copy") dnl Always true - either from the local copy or from the system lib. dnl Still used in gpgmepp/gpgmefw.h for some reason. diff --git a/libkdenetwork/gpgmepp/context.h b/libkdenetwork/gpgmepp/context.h index b07e722ef..054f8bee7 100644 --- a/libkdenetwork/gpgmepp/context.h +++ b/libkdenetwork/gpgmepp/context.h @@ -27,7 +27,7 @@ #include <utility> #include <iosfwd> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace GpgME { diff --git a/libkdenetwork/gpgmepp/data.h b/libkdenetwork/gpgmepp/data.h index 143bde5ff..e12064729 100644 --- a/libkdenetwork/gpgmepp/data.h +++ b/libkdenetwork/gpgmepp/data.h @@ -25,7 +25,7 @@ #include <sys/types.h> // for size_t, off_t #include <cstdio> // FILE -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace GpgME { diff --git a/libkdenetwork/gpgmepp/decryptionresult.h b/libkdenetwork/gpgmepp/decryptionresult.h index b97f59aed..da4833bbd 100644 --- a/libkdenetwork/gpgmepp/decryptionresult.h +++ b/libkdenetwork/gpgmepp/decryptionresult.h @@ -26,7 +26,7 @@ #include <iosfwd> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace GpgME { diff --git a/libkdenetwork/gpgmepp/encryptionresult.h b/libkdenetwork/gpgmepp/encryptionresult.h index 7267afc01..4339bef56 100644 --- a/libkdenetwork/gpgmepp/encryptionresult.h +++ b/libkdenetwork/gpgmepp/encryptionresult.h @@ -27,7 +27,7 @@ #include <vector> #include <iosfwd> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace GpgME { diff --git a/libkdenetwork/gpgmepp/engineinfo.h b/libkdenetwork/gpgmepp/engineinfo.h index d41706eab..c07d2817a 100644 --- a/libkdenetwork/gpgmepp/engineinfo.h +++ b/libkdenetwork/gpgmepp/engineinfo.h @@ -24,7 +24,7 @@ #include <gpgmepp/gpgmefw.h> #include <gpgmepp/context.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace GpgME { diff --git a/libkdenetwork/gpgmepp/eventloopinteractor.h b/libkdenetwork/gpgmepp/eventloopinteractor.h index f924569e6..c3688833c 100644 --- a/libkdenetwork/gpgmepp/eventloopinteractor.h +++ b/libkdenetwork/gpgmepp/eventloopinteractor.h @@ -21,7 +21,7 @@ #ifndef __GPGMEPP_EVENTLOOPINTERACTOR_H__ #define __GPGMEPP_EVENTLOOPINTERACTOR_H__ -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace GpgME { diff --git a/libkdenetwork/gpgmepp/importresult.h b/libkdenetwork/gpgmepp/importresult.h index 9a79b7b30..61675a299 100644 --- a/libkdenetwork/gpgmepp/importresult.h +++ b/libkdenetwork/gpgmepp/importresult.h @@ -25,7 +25,7 @@ #include <gpgmepp/result.h> #include <vector> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace GpgME { diff --git a/libkdenetwork/gpgmepp/interfaces/dataprovider.h b/libkdenetwork/gpgmepp/interfaces/dataprovider.h index c13ed19b6..34dd4a7e1 100644 --- a/libkdenetwork/gpgmepp/interfaces/dataprovider.h +++ b/libkdenetwork/gpgmepp/interfaces/dataprovider.h @@ -23,7 +23,7 @@ #include <sys/types.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace GpgME { diff --git a/libkdenetwork/gpgmepp/key.h b/libkdenetwork/gpgmepp/key.h index e143b47e0..15d09371e 100644 --- a/libkdenetwork/gpgmepp/key.h +++ b/libkdenetwork/gpgmepp/key.h @@ -27,7 +27,7 @@ #include <sys/time.h> #include <vector> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace GpgME { diff --git a/libkdenetwork/gpgmepp/keygenerationresult.h b/libkdenetwork/gpgmepp/keygenerationresult.h index 4b5dd96fb..7b2d98e84 100644 --- a/libkdenetwork/gpgmepp/keygenerationresult.h +++ b/libkdenetwork/gpgmepp/keygenerationresult.h @@ -23,7 +23,7 @@ #include <gpgmepp/gpgmefw.h> #include <gpgmepp/result.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace GpgME { class Error; diff --git a/libkdenetwork/gpgmepp/keylistresult.h b/libkdenetwork/gpgmepp/keylistresult.h index 6b13417e4..068210c02 100644 --- a/libkdenetwork/gpgmepp/keylistresult.h +++ b/libkdenetwork/gpgmepp/keylistresult.h @@ -23,7 +23,7 @@ #include <gpgmepp/gpgmefw.h> #include <gpgmepp/result.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace GpgME { diff --git a/libkdenetwork/gpgmepp/signingresult.h b/libkdenetwork/gpgmepp/signingresult.h index 202d09b41..1ee7a8def 100644 --- a/libkdenetwork/gpgmepp/signingresult.h +++ b/libkdenetwork/gpgmepp/signingresult.h @@ -30,7 +30,7 @@ #include <vector> #include <iosfwd> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace GpgME { diff --git a/libkdenetwork/gpgmepp/verificationresult.h b/libkdenetwork/gpgmepp/verificationresult.h index edcd02787..e572ecfee 100644 --- a/libkdenetwork/gpgmepp/verificationresult.h +++ b/libkdenetwork/gpgmepp/verificationresult.h @@ -29,7 +29,7 @@ #include <vector> #include <iosfwd> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace GpgME { diff --git a/libkdenetwork/qgpgme/dataprovider.h b/libkdenetwork/qgpgme/dataprovider.h index 6f1c9ca93..58c097d1e 100644 --- a/libkdenetwork/qgpgme/dataprovider.h +++ b/libkdenetwork/qgpgme/dataprovider.h @@ -24,7 +24,7 @@ #include <gpgmepp/interfaces/dataprovider.h> #include <tqcstring.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace QGpgME { diff --git a/libkdenetwork/qgpgme/eventloopinteractor.h b/libkdenetwork/qgpgme/eventloopinteractor.h index 2a36993a0..c1e5859a4 100644 --- a/libkdenetwork/qgpgme/eventloopinteractor.h +++ b/libkdenetwork/qgpgme/eventloopinteractor.h @@ -24,7 +24,7 @@ #include <gpgmepp/eventloopinteractor.h> #include <tqobject.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace GpgME { class Context; diff --git a/libkdepim/CMakeLists.txt b/libkdepim/CMakeLists.txt index e5acc9dc9..19ca1d524 100644 --- a/libkdepim/CMakeLists.txt +++ b/libkdepim/CMakeLists.txt @@ -39,7 +39,7 @@ link_directories( ##### headers ################################### install( FILES - kdepimmacros.h kpimprefs.h + tdepimmacros.h kpimprefs.h DESTINATION ${INCLUDE_INSTALL_DIR}/kde ) @@ -48,30 +48,30 @@ install( FILES install( FILES pimemoticons.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) -##### kdepimwidgets (module) #################### +##### tdepimwidgets (module) #################### -add_custom_command( OUTPUT kdepimwidgets.cpp +add_custom_command( OUTPUT tdepimwidgets.cpp COMMAND ${KDE3_MAKEKDEWIDGETS_EXECUTABLE} - -o kdepimwidgets.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/kdepim.widgets + -o tdepimwidgets.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/tdepim.widgets DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/kdepim.widgets ) + ${CMAKE_CURRENT_SOURCE_DIR}/tdepim.widgets ) -set_source_files_properties( kdepimwidgets.cpp PROPERTIES COMPILE_FLAGS "-DQT_PLUGIN" ) +set_source_files_properties( tdepimwidgets.cpp PROPERTIES COMPILE_FLAGS "-DQT_PLUGIN" ) -tde_add_kpart( kdepimwidgets - SOURCES kdepimwidgets.cpp - LINK kdepim-shared +tde_add_kpart( tdepimwidgets + SOURCES tdepimwidgets.cpp + LINK tdepim-shared DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer ) -##### kdepim (shared) ########################### +##### tdepim (shared) ########################### set( KDE3_DCOPIDL_EXECUTABLE ${KDE3_DCOPIDLNG_EXECUTABLE} ) -tde_add_library( kdepim SHARED AUTOMOC +tde_add_library( tdepim SHARED AUTOMOC SOURCES ktimeedit.cpp alarmclient.cpp kprefsdialog.cpp kpimprefs.cpp categoryselectdialog_base.ui categoryselectdialog.cpp diff --git a/libkdepim/Makefile.am b/libkdepim/Makefile.am index 772cf2ab1..b5db77f6f 100644 --- a/libkdepim/Makefile.am +++ b/libkdepim/Makefile.am @@ -42,24 +42,24 @@ MailTransportServiceIface_DIR = $(srcdir)/interfaces AddressBookServiceIface_DIR = $(srcdir)/interfaces -libtdepim_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0:0 $(LIB_QT) -lkdecore +libtdepim_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0:0 $(LIB_QT) -ltdecore libtdepim_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \ $(top_builddir)/libemailfunctions/libemailfunctions.la \ $(LIB_KIO) $(LIB_KABC) $(LIB_KPARTS) $(LIB_KIMPROXY) $(LIB_POLL) -lqui # $top_builddir)/libtdepim/resources/libkpimresources.la -include_HEADERS = kdepimmacros.h kpimprefs.h +include_HEADERS = tdepimmacros.h kpimprefs.h AM_CXXFLAGS = -DQT_PLUGIN -kde_widget_LTLIBRARIES = kdepimwidgets.la -kdepimwidgets_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries) $(LIB_QT) -lkdecore -kdepimwidgets_la_LIBADD = $(LIB_KIO) libtdepim.la -kdepimwidgets_la_SOURCES = kdepimwidgets.cpp +kde_widget_LTLIBRARIES = tdepimwidgets.la +tdepimwidgets_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries) $(LIB_QT) -ltdecore +tdepimwidgets_la_LIBADD = $(LIB_KIO) libtdepim.la +tdepimwidgets_la_SOURCES = tdepimwidgets.cpp -kdepimwidgets.cpp: $(srcdir)/kdepim.widgets - $(MAKEKDEWIDGETS) -o kdepimwidgets.cpp $(srcdir)/kdepim.widgets +tdepimwidgets.cpp: $(srcdir)/tdepim.widgets + $(MAKEKDEWIDGETS) -o tdepimwidgets.cpp $(srcdir)/tdepim.widgets -CLEANFILES = kdepimwidgets.cpp +CLEANFILES = tdepimwidgets.cpp kde_kcfg_DATA = pimemoticons.kcfg diff --git a/libkdepim/about/Makefile.am b/libkdepim/about/Makefile.am index a141dfbe4..6481c5bcb 100644 --- a/libkdepim/about/Makefile.am +++ b/libkdepim/about/Makefile.am @@ -1,6 +1,6 @@ -kdepim_infopage_datadir = $(kde_datadir)/libtdepim/about -kdepim_infopage_data_DATA = \ +tdepim_infopage_datadir = $(kde_datadir)/libtdepim/about +tdepim_infopage_data_DATA = \ bar-bottom-left.png bar-top-right.png bar-bottom-middle.png bottom-left.png \ box-middle-left.png top-left.png bar-bottom-right.png bottom-middle.png \ box-middle-right.png top-middle.png bar-middle-left.png bottom-right.png \ diff --git a/libkdepim/addresseelineedit.h b/libkdepim/addresseelineedit.h index c4b92ad30..209151b6e 100644 --- a/libkdepim/addresseelineedit.h +++ b/libkdepim/addresseelineedit.h @@ -37,7 +37,7 @@ #include "clicklineedit.h" #include "kmailcompletion.h" #include <dcopobject.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KConfig; diff --git a/libkdepim/addresseeselector.h b/libkdepim/addresseeselector.h index cabf0cf71..7ce70fb84 100644 --- a/libkdepim/addresseeselector.h +++ b/libkdepim/addresseeselector.h @@ -26,7 +26,7 @@ #include <kabc/distributionlist.h> #include <kabc/resource.h> #include <kdialogbase.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <tqbitarray.h> #include <tqpixmap.h> diff --git a/libkdepim/addresseeview.cpp b/libkdepim/addresseeview.cpp index 4d297ebbf..15c7215ed 100644 --- a/libkdepim/addresseeview.cpp +++ b/libkdepim/addresseeview.cpp @@ -633,7 +633,7 @@ void AddresseeView::faxNumberClicked( const TQString &number ) { KConfig config( "kaddressbookrc" ); config.setGroup( "General" ); - TQString commandLine = config.readEntry( "FaxHookApplication", "kdeprintfax --phone %N" ); + TQString commandLine = config.readEntry( "FaxHookApplication", "tdeprintfax --phone %N" ); if ( commandLine.isEmpty() ) { KMessageBox::sorry( this, i18n( "There is no application set which could be executed. Please go to the settings dialog and configure one." ) ); diff --git a/libkdepim/addresseeview.h b/libkdepim/addresseeview.h index f415358f5..0b7c13b05 100644 --- a/libkdepim/addresseeview.h +++ b/libkdepim/addresseeview.h @@ -27,7 +27,7 @@ #include <kabc/addressee.h> #include <ktextbrowser.h> #include <kimproxy.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KIO { class Job; diff --git a/libkdepim/addressesdialog.h b/libkdepim/addressesdialog.h index cdb1eaf94..c553c6421 100644 --- a/libkdepim/addressesdialog.h +++ b/libkdepim/addressesdialog.h @@ -31,7 +31,7 @@ #include <tqstringlist.h> #include <tqptrlist.h> #include <tqptrdict.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KPIM { diff --git a/libkdepim/broadcaststatus.h b/libkdepim/broadcaststatus.h index 93e789430..c29e0ff05 100644 --- a/libkdepim/broadcaststatus.h +++ b/libkdepim/broadcaststatus.h @@ -14,7 +14,7 @@ #include <tqobject.h> #include <tqmap.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #undef None diff --git a/libkdepim/categoryeditdialog.h b/libkdepim/categoryeditdialog.h index a9d15c5fd..064f8b682 100644 --- a/libkdepim/categoryeditdialog.h +++ b/libkdepim/categoryeditdialog.h @@ -23,7 +23,7 @@ #define KPIM_CATEGORYEDITDIALOG_H #include <kdialogbase.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KPimPrefs; diff --git a/libkdepim/categoryselectdialog.h b/libkdepim/categoryselectdialog.h index a530c7012..3cff0313c 100644 --- a/libkdepim/categoryselectdialog.h +++ b/libkdepim/categoryselectdialog.h @@ -23,7 +23,7 @@ #define KPIM_CATEGORYSELECTDIALOG_H #include <kdialogbase.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KPimPrefs; class CategorySelectDialog_base; diff --git a/libkdepim/cfgc/Makefile.am b/libkdepim/cfgc/Makefile.am index d6e77392f..ec9f505f0 100644 --- a/libkdepim/cfgc/Makefile.am +++ b/libkdepim/cfgc/Makefile.am @@ -3,11 +3,11 @@ AM_CPPFLAGS = -I$(top_builddir)/libtdepim -I$(top_srcdir) $(all_includes) check_PROGRAMS = example #autoexample -example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor example_LDADD = ../libtdepim.la $(LIB_KDECORE) example_SOURCES = example.cpp exampleprefs_base.kcfgc -#autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +#autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor #autoexample_LDADD = ../libtdepim.la $(LIB_KDECORE) #autoexample_SOURCES = general_base.ui myoptions_base.ui autoexample.cpp diff --git a/libkdepim/clicklineedit.h b/libkdepim/clicklineedit.h index 3b9ffca45..28b771ff5 100644 --- a/libkdepim/clicklineedit.h +++ b/libkdepim/clicklineedit.h @@ -22,7 +22,7 @@ #define CLICKLINEEDIT_H #include <klineedit.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KPIM { diff --git a/libkdepim/collectingprocess.h b/libkdepim/collectingprocess.h index 5c5036633..ae7378264 100644 --- a/libkdepim/collectingprocess.h +++ b/libkdepim/collectingprocess.h @@ -34,7 +34,7 @@ #define __KPIM_COLLECTINGPROCESS_H__ #include <kprocess.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KPIM { diff --git a/libkdepim/configmanager.h b/libkdepim/configmanager.h index b2612639f..832a0f70f 100644 --- a/libkdepim/configmanager.h +++ b/libkdepim/configmanager.h @@ -19,7 +19,7 @@ #include <tqobject.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KMKernel; diff --git a/libkdepim/designerfields.h b/libkdepim/designerfields.h index 57e2203a9..c7c2d22ca 100644 --- a/libkdepim/designerfields.h +++ b/libkdepim/designerfields.h @@ -28,7 +28,7 @@ #include <tqpair.h> #include <tqstringlist.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KPIM { diff --git a/libkdepim/diffalgo.h b/libkdepim/diffalgo.h index eaa9459db..513db7e33 100644 --- a/libkdepim/diffalgo.h +++ b/libkdepim/diffalgo.h @@ -23,7 +23,7 @@ #define DIFFALGO_H #include <tqvaluelist.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KPIM { diff --git a/libkdepim/embeddedurlpage.h b/libkdepim/embeddedurlpage.h index e3eb6d00b..c306466cd 100644 --- a/libkdepim/embeddedurlpage.h +++ b/libkdepim/embeddedurlpage.h @@ -22,7 +22,7 @@ #define KPIM_EMBEDDEDURLPAGE_H #include <tqwidget.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <kurl.h> namespace KParts { class ReadOnlyPart; } diff --git a/libkdepim/htmldiffalgodisplay.h b/libkdepim/htmldiffalgodisplay.h index dafb013df..35d95f5c8 100644 --- a/libkdepim/htmldiffalgodisplay.h +++ b/libkdepim/htmldiffalgodisplay.h @@ -25,7 +25,7 @@ #include "diffalgo.h" #include <ktextbrowser.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KPIM { diff --git a/libkdepim/infoextension.h b/libkdepim/infoextension.h index 0f2c4889a..b857dc4a5 100644 --- a/libkdepim/infoextension.h +++ b/libkdepim/infoextension.h @@ -23,7 +23,7 @@ #define INFOEXTENSION_H #include <tqobject.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class TQWidget; diff --git a/libkdepim/interfaces/AddressBookServiceIface.h b/libkdepim/interfaces/AddressBookServiceIface.h index ff0deb1d3..e07ac3e76 100644 --- a/libkdepim/interfaces/AddressBookServiceIface.h +++ b/libkdepim/interfaces/AddressBookServiceIface.h @@ -27,7 +27,7 @@ #include <kurl.h> #include <tqstring.h> #include <tqcstring.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KPIM { diff --git a/libkdepim/interfaces/MailTransportServiceIface.h b/libkdepim/interfaces/MailTransportServiceIface.h index 3b594979d..d256775a3 100644 --- a/libkdepim/interfaces/MailTransportServiceIface.h +++ b/libkdepim/interfaces/MailTransportServiceIface.h @@ -28,7 +28,7 @@ #include <tqstring.h> #include <tqcstring.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KPim { diff --git a/libkdepim/kabcresourcecached.h b/libkdepim/kabcresourcecached.h index be71bb730..2cf0352ef 100644 --- a/libkdepim/kabcresourcecached.h +++ b/libkdepim/kabcresourcecached.h @@ -22,7 +22,7 @@ #define KABC_RESOURCECACHED_H #include <kabc/resource.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <tqdatetime.h> #include <tqtimer.h> diff --git a/libkdepim/kaccount.h b/libkdepim/kaccount.h index 7da944624..d0a1b7f21 100644 --- a/libkdepim/kaccount.h +++ b/libkdepim/kaccount.h @@ -33,7 +33,7 @@ #define __KACCOUNT #include <tqstring.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KConfig; diff --git a/libkdepim/kaddrbook.h b/libkdepim/kaddrbook.h index 374753e54..f2bab1003 100644 --- a/libkdepim/kaddrbook.h +++ b/libkdepim/kaddrbook.h @@ -9,7 +9,7 @@ #include <kdeversion.h> #include <kabc/addressee.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KABC { class AddressBook; diff --git a/libkdepim/kcmdesignerfields.h b/libkdepim/kcmdesignerfields.h index e14f24f6b..820506f93 100644 --- a/libkdepim/kcmdesignerfields.h +++ b/libkdepim/kcmdesignerfields.h @@ -23,7 +23,7 @@ #define KPIM_KCMDESIGNERFIELDS_H #include <kcmodule.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KListView; diff --git a/libkdepim/kconfigpropagator.h b/libkdepim/kconfigpropagator.h index 2a100024d..3e52eb7c4 100644 --- a/libkdepim/kconfigpropagator.h +++ b/libkdepim/kconfigpropagator.h @@ -26,7 +26,7 @@ #include <tqdom.h> #include <tqptrlist.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KConfigSkeleton; class KConfigSkeletonItem; diff --git a/libkdepim/kconfigwizard.h b/libkdepim/kconfigwizard.h index 84da3386a..71455277c 100644 --- a/libkdepim/kconfigwizard.h +++ b/libkdepim/kconfigwizard.h @@ -22,7 +22,7 @@ #define KCONFIGWIZARD_H #include <kconfigpropagator.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <kdialogbase.h> class TQListView; diff --git a/libkdepim/kdateedit.h b/libkdepim/kdateedit.h index d047b3432..02a7701cc 100644 --- a/libkdepim/kdateedit.h +++ b/libkdepim/kdateedit.h @@ -28,7 +28,7 @@ #include <tqdatetime.h> #include <tqmap.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include "kdatepickerpopup.h" diff --git a/libkdepim/kdatepickerpopup.h b/libkdepim/kdatepickerpopup.h index 8a65cf5bd..44dc7c668 100644 --- a/libkdepim/kdatepickerpopup.h +++ b/libkdepim/kdatepickerpopup.h @@ -24,7 +24,7 @@ #include <tqdatetime.h> #include <tqpopupmenu.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <kdatepicker.h> /** diff --git a/libkdepim/kdepim.widgets b/libkdepim/kdepim.widgets index 02d1de282..765abc23b 100644 --- a/libkdepim/kdepim.widgets +++ b/libkdepim/kdepim.widgets @@ -1,7 +1,7 @@ [Global] PluginName=KDEPimWidgets Includes=kinstance.h -Init=new KInstance("kdepimwidgets"); +Init=new KInstance("tdepimwidgets"); [KPIM::AddresseeLineEdit] ToolTip=Addressee Line Edit (KDE-PIM) diff --git a/libkdepim/kfileio.cpp b/libkdepim/kfileio.cpp index 8addb772a..e167662bb 100644 --- a/libkdepim/kfileio.cpp +++ b/libkdepim/kfileio.cpp @@ -21,7 +21,7 @@ #include <sys/stat.h> #include <sys/types.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KPIM { diff --git a/libkdepim/kfileio.h b/libkdepim/kfileio.h index 915528888..15db09338 100644 --- a/libkdepim/kfileio.h +++ b/libkdepim/kfileio.h @@ -11,7 +11,7 @@ #include <tqcstring.h> #include <tqwidget.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class TQString; diff --git a/libkdepim/kfoldertree.h b/libkdepim/kfoldertree.h index d54db75d4..5ee255731 100644 --- a/libkdepim/kfoldertree.h +++ b/libkdepim/kfoldertree.h @@ -27,7 +27,7 @@ #include <tqdragobject.h> #include <tqcolor.h> #include <klistview.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KFolderTree; diff --git a/libkdepim/komposer/core/prefsmodule.cpp b/libkdepim/komposer/core/prefsmodule.cpp index af9df085b..77e1c264b 100644 --- a/libkdepim/komposer/core/prefsmodule.cpp +++ b/libkdepim/komposer/core/prefsmodule.cpp @@ -31,7 +31,7 @@ #include <tqlabel.h> #include <tqbuttongroup.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> extern "C" { diff --git a/libkdepim/komposer/core/tests/Makefile.am b/libkdepim/komposer/core/tests/Makefile.am index f26c9ee7c..fbf127956 100644 --- a/libkdepim/komposer/core/tests/Makefile.am +++ b/libkdepim/komposer/core/tests/Makefile.am @@ -5,15 +5,15 @@ check_PROGRAMS = testfactory testmanager testkomposer METASOURCES = AUTO testfactory_SOURCES = main.cpp managertest.cpp -testfactory_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testfactory_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testfactory_LDADD = ../libkomposer.la testmanager_SOURCES = testmanager.cpp -testmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testmanager_LDADD = ../libkomposer.la testkomposer_SOURCES = testkomposer.cpp -testkomposer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testkomposer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testkomposer_LDADD = ../libkomposer.la check: testfactory diff --git a/libkdepim/komposer/test/Makefile.am b/libkdepim/komposer/test/Makefile.am index bec410613..af51004e8 100644 --- a/libkdepim/komposer/test/Makefile.am +++ b/libkdepim/komposer/test/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS = -I$(top_srcdir) -I../core $(all_includes) LDADD = $(LIB_KPARTS) ../core/libkomposer.la -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor check_PROGRAMS = test diff --git a/libkdepim/kpartsdesignerplugin/Makefile.am b/libkdepim/kpartsdesignerplugin/Makefile.am index 75f6e89d5..ebbfbfba2 100644 --- a/libkdepim/kpartsdesignerplugin/Makefile.am +++ b/libkdepim/kpartsdesignerplugin/Makefile.am @@ -3,6 +3,6 @@ METASOURCES = AUTO INCLUDES = $(all_includes) kde_widget_LTLIBRARIES = kpartsdesignerplugin.la -kpartsdesignerplugin_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries) $(LIB_QT) -lkdecore -lkio +kpartsdesignerplugin_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries) $(LIB_QT) -ltdecore -lkio kpartsdesignerplugin_la_LIBADD = $(LIB_KPARTS) kpartsdesignerplugin_la_SOURCES = kpartsdesignerplugin.cpp diff --git a/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp b/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp index afe8bad6d..c3eedc329 100644 --- a/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp +++ b/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp @@ -24,7 +24,7 @@ #include <kmimetype.h> #include <tqlayout.h> #include <kapplication.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> KPartsGenericPart::KPartsGenericPart( TQWidget* parentWidget, const char* name ) : TQWidget( parentWidget, name ), m_part( 0 ) @@ -103,7 +103,7 @@ bool KPartsWidgetPlugin::isContainer( const TQString & /*key*/ ) const { return false; } -/// Duplicated from kdelibs/kdecore/kdemacros.h.in for those with kdelibs < 3.4 +/// Duplicated from kdelibs/tdecore/kdemacros.h.in for those with kdelibs < 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/libkdepim/kpimprefs.h b/libkdepim/kpimprefs.h index 7f0f1f0e2..1d88a8d8f 100644 --- a/libkdepim/kpimprefs.h +++ b/libkdepim/kpimprefs.h @@ -24,7 +24,7 @@ #include <tqstringlist.h> #include <kconfigskeleton.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class TQString; diff --git a/libkdepim/kpimurlrequesterdlg.h b/libkdepim/kpimurlrequesterdlg.h index ccbccc88b..6a00cf4ef 100644 --- a/libkdepim/kpimurlrequesterdlg.h +++ b/libkdepim/kpimurlrequesterdlg.h @@ -20,7 +20,7 @@ #ifndef KPIMURLREQUESTDLG_H_INCLUDED #define KPIMURLREQUESTDLG_H_INCLUDED -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <kurl.h> #include <tqstring.h> diff --git a/libkdepim/kpixmapregionselectordialog.h b/libkdepim/kpixmapregionselectordialog.h index 712ed8c90..ee864391a 100644 --- a/libkdepim/kpixmapregionselectordialog.h +++ b/libkdepim/kpixmapregionselectordialog.h @@ -25,7 +25,7 @@ #include <kdialogbase.h> #include <libtdepim/kpixmapregionselectorwidget.h> #include <tqimage.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KPIM { diff --git a/libkdepim/kpixmapregionselectorwidget.cpp b/libkdepim/kpixmapregionselectorwidget.cpp index 90952e74f..d687ae8a1 100644 --- a/libkdepim/kpixmapregionselectorwidget.cpp +++ b/libkdepim/kpixmapregionselectorwidget.cpp @@ -20,8 +20,8 @@ */ /* NOTE: There are two copies of this .h and the .cpp file, with subtle differences. - * One copy is in kdelibs/kdeui, and the other copy is in kdepim/libtdepim - * This is because kdepim has to remain backwards compatible. Any changes + * One copy is in kdelibs/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/libkdepim/kpixmapregionselectorwidget.h b/libkdepim/kpixmapregionselectorwidget.h index 353267f1f..7b75c98b2 100644 --- a/libkdepim/kpixmapregionselectorwidget.h +++ b/libkdepim/kpixmapregionselectorwidget.h @@ -37,8 +37,8 @@ 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/kdeui, and the other copy is in kdepim/libtdepim - * This is because kdepim has to remain backwards compatible. Any changes + * One copy is in kdelibs/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. * * @author Antonio Larrosa <larrosa@kde.org> diff --git a/libkdepim/kprefsdialog.h b/libkdepim/kprefsdialog.h index 5e5dfcb85..b1fffcdd7 100644 --- a/libkdepim/kprefsdialog.h +++ b/libkdepim/kprefsdialog.h @@ -32,7 +32,7 @@ #include <kcmodule.h> #include <kconfigskeleton.h> #include <kfile.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KColorButton; diff --git a/libkdepim/kregexp3.h b/libkdepim/kregexp3.h index c58feb9d1..e5013366c 100644 --- a/libkdepim/kregexp3.h +++ b/libkdepim/kregexp3.h @@ -34,7 +34,7 @@ #include <tqstring.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> /** @short A TQRegExp (TQt3.x) with a replace() method. diff --git a/libkdepim/kresourceprefs.h b/libkdepim/kresourceprefs.h index 2941f6292..6d96deadb 100644 --- a/libkdepim/kresourceprefs.h +++ b/libkdepim/kresourceprefs.h @@ -23,7 +23,7 @@ #define KRESOURCEPREFS_H #include <kconfigskeleton.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class TQString; diff --git a/libkdepim/krsqueezedtextlabel.h b/libkdepim/krsqueezedtextlabel.h index f6a745275..36bd209b6 100644 --- a/libkdepim/krsqueezedtextlabel.h +++ b/libkdepim/krsqueezedtextlabel.h @@ -22,7 +22,7 @@ #define KRSTQUEEZEDTEXTLABEL_H #include <tqlabel.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> /** * @short A replacement for TQLabel that squeezes its text diff --git a/libkdepim/kscoring.h b/libkdepim/kscoring.h index 766591ed1..7225eb93f 100644 --- a/libkdepim/kscoring.h +++ b/libkdepim/kscoring.h @@ -38,7 +38,7 @@ #include <klineedit.h> #include <knuminput.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class TQDomNode; class TQDomDocument; diff --git a/libkdepim/kscoringeditor.h b/libkdepim/kscoringeditor.h index fae5f21fe..ba0ee190e 100644 --- a/libkdepim/kscoringeditor.h +++ b/libkdepim/kscoringeditor.h @@ -25,7 +25,7 @@ #include "kwidgetlister.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KComboBox; class KLineEdit; diff --git a/libkdepim/ksubscription.h b/libkdepim/ksubscription.h index f3bd4eb5b..c819701d1 100644 --- a/libkdepim/ksubscription.h +++ b/libkdepim/ksubscription.h @@ -29,7 +29,7 @@ #include <tqcheckbox.h> #include <kdialogbase.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include "kfoldertree.h" class KSubscription; diff --git a/libkdepim/ktimeedit.h b/libkdepim/ktimeedit.h index 1d4727e08..11190842a 100644 --- a/libkdepim/ktimeedit.h +++ b/libkdepim/ktimeedit.h @@ -32,7 +32,7 @@ #include <tqcombobox.h> #include <kapplication.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> /** This is a class that provides an easy, user friendly way to edit times. diff --git a/libkdepim/kvcarddrag.h b/libkdepim/kvcarddrag.h index bb7ff4a2f..31885f6ad 100644 --- a/libkdepim/kvcarddrag.h +++ b/libkdepim/kvcarddrag.h @@ -27,7 +27,7 @@ #include <kabc/addressee.h> #include <kabc/vcardparser.h> // for KABC_VCARD_ENCODING_FIX define -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KVCardDragPrivate; diff --git a/libkdepim/kwidgetlister.h b/libkdepim/kwidgetlister.h index c350ed4b7..db993297f 100644 --- a/libkdepim/kwidgetlister.h +++ b/libkdepim/kwidgetlister.h @@ -34,7 +34,7 @@ #include <tqwidget.h> #include <tqptrlist.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class TQPushButton; class TQVBoxLayout; diff --git a/libkdepim/kxface.h b/libkdepim/kxface.h index a27219e7a..770232306 100644 --- a/libkdepim/kxface.h +++ b/libkdepim/kxface.h @@ -30,7 +30,7 @@ #include <tqobject.h> #include <setjmp.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> // #define WIDTH 48 // #define HEIGHT WIDTH diff --git a/libkdepim/ldapclient.h b/libkdepim/ldapclient.h index d9b889556..a2a85f1e3 100644 --- a/libkdepim/ldapclient.h +++ b/libkdepim/ldapclient.h @@ -35,7 +35,7 @@ #include <kabc/ldif.h> #include <kconfig.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KPIM { diff --git a/libkdepim/linklocator.h b/libkdepim/linklocator.h index 662202e44..4597d836b 100644 --- a/libkdepim/linklocator.h +++ b/libkdepim/linklocator.h @@ -26,7 +26,7 @@ #include <tqstring.h> #include <tqmap.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> /** * LinkLocator assists in identifying sections of text that can diff --git a/libkdepim/maillistdrag.h b/libkdepim/maillistdrag.h index ec2fe447e..f13e59ebf 100644 --- a/libkdepim/maillistdrag.h +++ b/libkdepim/maillistdrag.h @@ -27,7 +27,7 @@ #include "tqglobal.h" #include "time.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> /** * KDEPIM classes for drag and drop of mails diff --git a/libkdepim/pics/CMakeLists.txt b/libkdepim/pics/CMakeLists.txt index 04f64a51a..7cbe71d0a 100644 --- a/libkdepim/pics/CMakeLists.txt +++ b/libkdepim/pics/CMakeLists.txt @@ -12,4 +12,4 @@ install( FILES addresseelineedit.png clicklineedit.png kdateedit.png ktimeedit.png - DESTINATION ${DATA_INSTALL_DIR}/kdepimwidgets/pics ) + DESTINATION ${DATA_INSTALL_DIR}/tdepimwidgets/pics ) diff --git a/libkdepim/pics/Makefile.am b/libkdepim/pics/Makefile.am index 4fcd1dd87..c4c611966 100644 --- a/libkdepim/pics/Makefile.am +++ b/libkdepim/pics/Makefile.am @@ -1,6 +1,6 @@ -kdepimwidgetsdata_DATA = addresseelineedit.png \ +tdepimwidgetsdata_DATA = addresseelineedit.png \ clicklineedit.png kdateedit.png ktimeedit.png -kdepimwidgetsdatadir = $(kde_datadir)/kdepimwidgets/pics +tdepimwidgetsdatadir = $(kde_datadir)/tdepimwidgets/pics -EXTRA_DIST = $(kdepimwidgetsdata_DATA) +EXTRA_DIST = $(tdepimwidgetsdata_DATA) diff --git a/libkdepim/pluginloaderbase.h b/libkdepim/pluginloaderbase.h index 88e654053..766372787 100644 --- a/libkdepim/pluginloaderbase.h +++ b/libkdepim/pluginloaderbase.h @@ -25,7 +25,7 @@ #include <tqstring.h> #include <tqmap.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KLibrary; class TQStringList; diff --git a/libkdepim/progressdialog.h b/libkdepim/progressdialog.h index 91fa771f8..b2511624e 100644 --- a/libkdepim/progressdialog.h +++ b/libkdepim/progressdialog.h @@ -38,7 +38,7 @@ #include <tqlabel.h> #include <tqvbox.h> #include "overlaywidget.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> class TQProgressBar; class TQScrollView; diff --git a/libkdepim/progressmanager.h b/libkdepim/progressmanager.h index 7798162d3..a447d49fb 100644 --- a/libkdepim/progressmanager.h +++ b/libkdepim/progressmanager.h @@ -28,7 +28,7 @@ #include <tqdict.h> #include <tqstring.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KPIM { diff --git a/libkdepim/qutf7codec.h b/libkdepim/qutf7codec.h index 6bb5117ec..4057d276c 100644 --- a/libkdepim/qutf7codec.h +++ b/libkdepim/qutf7codec.h @@ -27,7 +27,7 @@ #include "tqtextcodec.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> #ifndef TQT_NO_TEXTCODEC diff --git a/libkdepim/recentaddresses.h b/libkdepim/recentaddresses.h index be7633694..446f6c684 100644 --- a/libkdepim/recentaddresses.h +++ b/libkdepim/recentaddresses.h @@ -35,7 +35,7 @@ #include <kdialogbase.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KConfig; class KEditListBox; diff --git a/libkdepim/resourceabc.h b/libkdepim/resourceabc.h index af7848419..b6ef3ec98 100644 --- a/libkdepim/resourceabc.h +++ b/libkdepim/resourceabc.h @@ -27,7 +27,7 @@ #include <kabc/resource.h> #include <tqmap.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> // This is here because it can't go to kdelibs/kabc yet, but ultimately // it should probably go there (maybe redesigned to have a real object diff --git a/libkdepim/sidebarextension.h b/libkdepim/sidebarextension.h index 02422ad0c..fc39ef6c6 100644 --- a/libkdepim/sidebarextension.h +++ b/libkdepim/sidebarextension.h @@ -22,7 +22,7 @@ #define SIDEBAREXTENSION_H #include <tqobject.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class TQWidget; diff --git a/libkdepim/spellingfilter.h b/libkdepim/spellingfilter.h index ac0fe02d7..4178a888e 100644 --- a/libkdepim/spellingfilter.h +++ b/libkdepim/spellingfilter.h @@ -27,7 +27,7 @@ #include <tqstringlist.h> #include "linklocator.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KDE_EXPORT SpellingFilter { diff --git a/libkdepim/statusbarprogresswidget.h b/libkdepim/statusbarprogresswidget.h index 1c8365426..8b08d2cf9 100644 --- a/libkdepim/statusbarprogresswidget.h +++ b/libkdepim/statusbarprogresswidget.h @@ -36,7 +36,7 @@ * kio_littleprogress_dlg (it looks similar) */ -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KMMainWidget; class KProgress; diff --git a/libkdepim/tests/Makefile.am b/libkdepim/tests/Makefile.am index 249d764eb..217676cae 100644 --- a/libkdepim/tests/Makefile.am +++ b/libkdepim/tests/Makefile.am @@ -1,5 +1,5 @@ AM_CPPFLAGS = -I$(top_builddir)/libtdepim -I$(top_srcdir)/libtdepim -I$(top_srcdir)/libemailfunctions $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor LDADD = ../libtdepim.la $(LIB_KDECORE) check_PROGRAMS = testwizard testaddresseelineedit \ @@ -29,7 +29,7 @@ testkincidencechooser_SOURCES = testkincidencechooser.cpp METASOURCES = AUTO -#example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +#example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor #example_LDADD = ../libtdepim.la $(LIB_KDECORE) #example_SOURCES = example.cpp exampleprefs_base.kcfgc diff --git a/libkdepim/weaver.h b/libkdepim/weaver.h index 33989e126..8e82b5811 100644 --- a/libkdepim/weaver.h +++ b/libkdepim/weaver.h @@ -30,7 +30,7 @@ extern "C" #include <tqmutex.h> #include <tqevent.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KPIM { namespace ThreadWeaver { diff --git a/libkholidays/CMakeLists.txt b/libkholidays/CMakeLists.txt index cbc2d24a4..7bd4dc9ee 100644 --- a/libkholidays/CMakeLists.txt +++ b/libkholidays/CMakeLists.txt @@ -32,7 +32,7 @@ tde_add_library( kholidays SHARED AUTOMOC SOURCES kholidays.cpp scanholiday.c parseholiday.h parseholiday.c lunarphase.cpp VERSION 1.0.0 - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/libkholidays/kholidays.h b/libkholidays/kholidays.h index f612f8389..fca42d86b 100644 --- a/libkholidays/kholidays.h +++ b/libkholidays/kholidays.h @@ -25,7 +25,7 @@ #include <tqdatetime.h> #include <tqvaluelist.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> struct KHoliday { TQString text; diff --git a/libkmime/CMakeLists.txt b/libkmime/CMakeLists.txt index 5b54fde0c..4c6e54d9b 100644 --- a/libkmime/CMakeLists.txt +++ b/libkmime/CMakeLists.txt @@ -38,7 +38,7 @@ tde_add_library( kmime SHARED kmime_message.cpp kmime_newsarticle.cpp boolflags.cpp kqcstringsplitter.cpp VERSION 2.2.0 - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/libkmime/boolflags.h b/libkmime/boolflags.h index 586071eb3..ccd4e8529 100644 --- a/libkmime/boolflags.h +++ b/libkmime/boolflags.h @@ -17,7 +17,7 @@ #ifndef __KMIME_BOOLFLAGS_H__ #define __KMIME_BOOLFLAGS_H__ -#include <kdepimmacros.h> +#include <tdepimmacros.h> /** This class stores boolean values in single bytes. It provides a similar functionality as TQBitArray diff --git a/libkmime/kmime_charfreq.h b/libkmime/kmime_charfreq.h index 125fac223..745428480 100644 --- a/libkmime/kmime_charfreq.h +++ b/libkmime/kmime_charfreq.h @@ -16,7 +16,7 @@ #define __KMIME_CHARFRETQ_H__ #include <tqcstring.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #undef None namespace KMime { diff --git a/libkmime/kmime_codecs.h b/libkmime/kmime_codecs.h index b60d8bb8d..1bd8c9ecf 100644 --- a/libkmime/kmime_codecs.h +++ b/libkmime/kmime_codecs.h @@ -40,7 +40,7 @@ #include <tqcstring.h> // TQByteArray #include <kdebug.h> // for kdFatal() -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KMime { diff --git a/libkmime/kmime_header_parsing.h b/libkmime/kmime_header_parsing.h index 2454c5876..d567e5fe3 100644 --- a/libkmime/kmime_header_parsing.h +++ b/libkmime/kmime_header_parsing.h @@ -38,7 +38,7 @@ #include <time.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> template <typename K, typename V> class TQMap; class TQStringList; diff --git a/libkmime/kmime_headers.h b/libkmime/kmime_headers.h index 458258640..4c2b73136 100644 --- a/libkmime/kmime_headers.h +++ b/libkmime/kmime_headers.h @@ -35,7 +35,7 @@ #include <time.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KMime { diff --git a/libkmime/kmime_headers_obs.h b/libkmime/kmime_headers_obs.h index 3455c00a9..a167e1f86 100644 --- a/libkmime/kmime_headers_obs.h +++ b/libkmime/kmime_headers_obs.h @@ -20,7 +20,7 @@ #error You cannot use this file with the new header classes! #endif -#include <kdepimmacros.h> +#include <tdepimmacros.h> /** Represents a "Message-Id" header */ class KDE_EXPORT MessageID : public Base { diff --git a/libkmime/kmime_mdn.h b/libkmime/kmime_mdn.h index bc1a65aa4..30fa238a6 100644 --- a/libkmime/kmime_mdn.h +++ b/libkmime/kmime_mdn.h @@ -35,7 +35,7 @@ #include <tqvaluelist.h> #include <tqstring.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class TQCString; diff --git a/libkmime/kmime_newsarticle.h b/libkmime/kmime_newsarticle.h index 57e3733a7..bbca34d83 100644 --- a/libkmime/kmime_newsarticle.h +++ b/libkmime/kmime_newsarticle.h @@ -18,7 +18,7 @@ #include "kmime_message.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KMime { diff --git a/libkmime/kmime_util.h b/libkmime/kmime_util.h index 2cfe135ac..e561eb0d8 100644 --- a/libkmime/kmime_util.h +++ b/libkmime/kmime_util.h @@ -21,7 +21,7 @@ #include "tqcstring.h" #include "tqvaluelist.h" #include "time.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> typedef TQValueList<TQCString> QCStringList; diff --git a/libkmime/kqcstringsplitter.h b/libkmime/kqcstringsplitter.h index 652ec633f..117f05108 100644 --- a/libkmime/kqcstringsplitter.h +++ b/libkmime/kqcstringsplitter.h @@ -19,7 +19,7 @@ #include <tqcstring.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KDE_EXPORT KTQCStringSplitter { diff --git a/libkmime/tests/test_kmime_codec.cpp b/libkmime/tests/test_kmime_codec.cpp index f27bc5b9b..6562cbc25 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 -lkdecore -lkdenetwork -O2 -pthread -DTQT_THREAD_SUPPORT \ + -lqt-mt -ltdecore -lkdenetwork -O2 -pthread -DTQT_THREAD_SUPPORT \ -o test_kmime_codec{,.cpp} */ diff --git a/libkpgp/CMakeLists.txt b/libkpgp/CMakeLists.txt index 8737af288..6f778efe4 100644 --- a/libkpgp/CMakeLists.txt +++ b/libkpgp/CMakeLists.txt @@ -39,7 +39,7 @@ tde_add_library( kpgp SHARED AUTOMOC kpgpblock.cpp kpgpui.cpp kpgpkey.cpp kpgp.cpp kpgpbase.cpp kpgpbaseG.cpp kpgpbase2.cpp kpgpbase5.cpp kpgpbase6.cpp VERSION 2.2.0 - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/libkpgp/kpgp.h b/libkpgp/kpgp.h index da6c02e17..f9f492360 100644 --- a/libkpgp/kpgp.h +++ b/libkpgp/kpgp.h @@ -36,7 +36,7 @@ #include <kdialogbase.h> #include "kpgpkey.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> class TQLineEdit; class TQCursor; diff --git a/libkpgp/kpgpblock.h b/libkpgp/kpgpblock.h index bb36e3fd9..e3308eab9 100644 --- a/libkpgp/kpgpblock.h +++ b/libkpgp/kpgpblock.h @@ -23,7 +23,7 @@ #include <tqstring.h> #include <tqstrlist.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> //#include <tqstringlist.h> class TQStringList; diff --git a/libkpgp/kpgpui.h b/libkpgp/kpgpui.h index 4644edcf1..219ed1480 100644 --- a/libkpgp/kpgpui.h +++ b/libkpgp/kpgpui.h @@ -29,7 +29,7 @@ #include "kpgp.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> class TQString; class TQRegExp; diff --git a/libkpimexchange/core/CMakeLists.txt b/libkpimexchange/core/CMakeLists.txt index de31d2a13..fc5cc2550 100644 --- a/libkpimexchange/core/CMakeLists.txt +++ b/libkpimexchange/core/CMakeLists.txt @@ -30,7 +30,7 @@ link_directories( install( FILES exchangeclient.h exchangeaccount.h - DESTINATION ${INCLUDE_INSTALL_DIR}/kde/kdepim ) + DESTINATION ${INCLUDE_INSTALL_DIR}/kde/tdepim ) ##### kpimexchange (shared) ##################### diff --git a/libkpimexchange/core/Makefile.am b/libkpimexchange/core/Makefile.am index 128ed5cf4..2c8b8bff2 100644 --- a/libkpimexchange/core/Makefile.am +++ b/libkpimexchange/core/Makefile.am @@ -20,8 +20,8 @@ libkpimexchangecore_la_SOURCES = exchangeclient.cpp exchangeaccount.cpp \ #libkpimexchange_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0:0 -module #libkpimexchange_la_LIBADD = $(LIB_KIO) $(top_builddir)/libkcal/libkcal.la -kdepimincludedir = $(includedir)/kdepim -kdepiminclude_HEADERS = exchangeclient.h exchangeaccount.h +tdepimincludedir = $(includedir)/tdepim +tdepiminclude_HEADERS = exchangeclient.h exchangeaccount.h noinst_HEADERS = exchangedownload.h exchangeupload.h exchangedelete.h exchangeprogress.h utils.h diff --git a/libkpimexchange/core/exchangeaccount.h b/libkpimexchange/core/exchangeaccount.h index 3dfc266da..c05f41bef 100644 --- a/libkpimexchange/core/exchangeaccount.h +++ b/libkpimexchange/core/exchangeaccount.h @@ -26,7 +26,7 @@ #include <tqobject.h> #include <tqstring.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <kurl.h> #include <kio/job.h> diff --git a/libkpimexchange/core/exchangeclient.h b/libkpimexchange/core/exchangeclient.h index 056bcaa1f..d1f7d4bc2 100644 --- a/libkpimexchange/core/exchangeclient.h +++ b/libkpimexchange/core/exchangeclient.h @@ -26,7 +26,7 @@ #include <tqhostaddress.h> #include <tqptrlist.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KCal { class Event; diff --git a/libkpimexchange/core/exchangedelete.h b/libkpimexchange/core/exchangedelete.h index 9c82d86be..a5da5b263 100644 --- a/libkpimexchange/core/exchangedelete.h +++ b/libkpimexchange/core/exchangedelete.h @@ -24,7 +24,7 @@ #include <tqwidget.h> #include <kio/job.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <libkcal/calendar.h> #include <libkcal/event.h> diff --git a/libkpimexchange/core/exchangeupload.h b/libkpimexchange/core/exchangeupload.h index f2ab403c7..0c8aa1699 100644 --- a/libkpimexchange/core/exchangeupload.h +++ b/libkpimexchange/core/exchangeupload.h @@ -24,7 +24,7 @@ #include <tqwidget.h> #include <kio/job.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <libkcal/calendar.h> #include <libkcal/event.h> diff --git a/libkpimidentities/CMakeLists.txt b/libkpimidentities/CMakeLists.txt index f7a58d7a9..9c4118127 100644 --- a/libkpimidentities/CMakeLists.txt +++ b/libkpimidentities/CMakeLists.txt @@ -40,7 +40,7 @@ tde_add_library( kpimidentities SHARED AUTOMOC identitymanager.cpp identity.cpp identitymanager.skel identitycombo.cpp VERSION 1.0.0 - LINK kleopatra-shared kdepim-shared + LINK kleopatra-shared tdepim-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/libkpimidentities/identity.h b/libkpimidentities/identity.h index e4d289c2a..a05ab61ce 100644 --- a/libkpimidentities/identity.h +++ b/libkpimidentities/identity.h @@ -9,7 +9,7 @@ #include <kleo/enum.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <tqstring.h> #include <tqcstring.h> diff --git a/libkpimidentities/identitycombo.h b/libkpimidentities/identitycombo.h index 7e0aafd75..7d0408669 100644 --- a/libkpimidentities/identitycombo.h +++ b/libkpimidentities/identitycombo.h @@ -34,7 +34,7 @@ #include <tqcombobox.h> #include <tqvaluelist.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class TQString; diff --git a/libkpimidentities/identitymanager.h b/libkpimidentities/identitymanager.h index 1802dce80..3285091c2 100644 --- a/libkpimidentities/identitymanager.h +++ b/libkpimidentities/identitymanager.h @@ -35,7 +35,7 @@ #include <tqvaluelist.h> #include <dcopobject.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KConfigBase; class KConfig; diff --git a/libksieve/CMakeLists.txt b/libksieve/CMakeLists.txt index d28674d9d..352dadb0d 100644 --- a/libksieve/CMakeLists.txt +++ b/libksieve/CMakeLists.txt @@ -32,7 +32,7 @@ tde_add_library( ksieve SHARED SOURCES dummy.cpp VERSION 0.0.0 EMBED ksieve_parser-static ksieve_shared-static - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/libksieve/ksieve/error.h b/libksieve/ksieve/error.h index dc6b63bc8..d2adcd8bd 100644 --- a/libksieve/ksieve/error.h +++ b/libksieve/ksieve/error.h @@ -35,7 +35,7 @@ #include <tqstring.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #ifdef None // X headers # undef None diff --git a/libksieve/ksieve/parser.h b/libksieve/ksieve/parser.h index 26e55a059..88bb94189 100644 --- a/libksieve/ksieve/parser.h +++ b/libksieve/ksieve/parser.h @@ -33,7 +33,7 @@ #ifndef __KSIEVE_PARSING_H__ #define __KSIEVE_PARSING_H__ -#include <kdepimmacros.h> +#include <tdepimmacros.h> class TQString; diff --git a/mimelib/Makefile.am b/mimelib/Makefile.am index 3f2b5b97f..10421d3fe 100644 --- a/mimelib/Makefile.am +++ b/mimelib/Makefile.am @@ -57,7 +57,7 @@ libmimelib_la_SOURCES = \ uuencode.cpp \ binhex.cpp -libmimelib_la_LDFLAGS = -L$(kde_libraries) -lkdefakes_pic -version-info 1:1 -no-undefined +libmimelib_la_LDFLAGS = -L$(kde_libraries) -ltdefakes_pic -version-info 1:1 -no-undefined check_PROGRAMS = test_boyermor diff --git a/pixmaps/CMakeLists.txt b/pixmaps/CMakeLists.txt index 44e5b2570..0e1fdcd39 100644 --- a/pixmaps/CMakeLists.txt +++ b/pixmaps/CMakeLists.txt @@ -9,4 +9,4 @@ # ################################################# -tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/kdepim/icons ) +tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/tdepim/icons ) diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am index 5ba371b66..a9027a567 100644 --- a/pixmaps/Makefile.am +++ b/pixmaps/Makefile.am @@ -1,2 +1,2 @@ -kdepimicondir = $(kde_datadir)/kdepim/icons -kdepimicon_ICON = AUTO +tdepimicondir = $(kde_datadir)/tdepim/icons +tdepimicon_ICON = AUTO diff --git a/plugins/kmail/bodypartformatter/CMakeLists.txt b/plugins/kmail/bodypartformatter/CMakeLists.txt index 5e85d348b..e8affade9 100644 --- a/plugins/kmail/bodypartformatter/CMakeLists.txt +++ b/plugins/kmail/bodypartformatter/CMakeLists.txt @@ -55,7 +55,7 @@ install( FILES tde_add_kpart( libkmail_bodypartformatter_text_vcard AUTOMOC SOURCES text_vcard.cpp - LINK kdepim-shared + LINK tdepim-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/plugins/kmail/bodypartformatter/text_calendar.cpp b/plugins/kmail/bodypartformatter/text_calendar.cpp index 55898d372..6a8e01996 100644 --- a/plugins/kmail/bodypartformatter/text_calendar.cpp +++ b/plugins/kmail/bodypartformatter/text_calendar.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2007 Volker Krause <vkrause@kde.org> @@ -80,7 +80,7 @@ #include <tqdir.h> #include <tqtextstream.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <dcopclient.h> #include <dcopref.h> diff --git a/plugins/kmail/bodypartformatter/text_vcard.cpp b/plugins/kmail/bodypartformatter/text_vcard.cpp index beac201f3..c99fd1c08 100644 --- a/plugins/kmail/bodypartformatter/text_vcard.cpp +++ b/plugins/kmail/bodypartformatter/text_vcard.cpp @@ -63,7 +63,7 @@ using KABC::Addressee; #include "addresseeview.h" using KPIM::AddresseeView; -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace { diff --git a/plugins/kmail/bodypartformatter/text_xdiff.cpp b/plugins/kmail/bodypartformatter/text_xdiff.cpp index 6da849bd1..df89306f6 100644 --- a/plugins/kmail/bodypartformatter/text_xdiff.cpp +++ b/plugins/kmail/bodypartformatter/text_xdiff.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Till Adam <adam@kde.org> diff --git a/release_howto b/release_howto index c4bbcb456..49b847b06 100644 --- a/release_howto +++ b/release_howto @@ -3,7 +3,7 @@ David Faure <faure@kde.org>, 02-Aug-2005, last update 12-Mar-2007. # First ensure that translations are uptodate, running "translate". -# Packing kdepim doesn't pack the translations themselves, but still, +# Packing tdepim doesn't pack the translations themselves, but still, # at release time we have to ensure they are ok. # @@ -11,7 +11,7 @@ David Faure <faure@kde.org>, 02-Aug-2005, last update 12-Mar-2007. cd kde-common/release mkdir clean cache dirty sources sources-old -echo kdepim > modules +echo tdepim > modules # Now save the patch below to a file, and apply it. @@ -23,7 +23,7 @@ Index: common koffice-l10n) version=1.3.98 ;; -+ kdepim) ++ tdepim) + version=3.5.6.enterprise.0.20070227.637543 + ;; *) @@ -38,9 +38,9 @@ Index: versions DESTURL=tags/koffice/1.4.0/$1 subname=$1 ;; -+ kdepim) -+ HEADURL=branches/kdepim/enterprise/$1 -+ DESTURL=tags/kdepim/enterprise.0.20070227.637543/$1 ++ tdepim) ++ HEADURL=branches/tdepim/enterprise/$1 ++ DESTURL=tags/tdepim/enterprise.0.20070227.637543/$1 + subname=$1 + export UNSERMAKE= + ;; @@ -64,21 +64,21 @@ Index: versions ./tag_all -# tag_all checks out the enterprise branch of kdepim into a temporary tagging directory +# tag_all checks out the enterprise branch of tdepim into a temporary tagging directory # and then allows to commit - to create the tag. # The script needs the variables SVNUSER and SVNPROTOCOL to be set. # If you used the "cache" feature with an older release, remove it first -rm -rf cache/kdepim +rm -rf cache/tdepim # Ready? OK, let's pack it: -./pack kdepim +./pack tdepim # On failure it's always possible to restart from where it stopped, e.g. with -# cd dirty ; ../dist kdepim +# cd dirty ; ../dist tdepim # if the "dist" step failed -# (and then ../taritup kdepim for the last step) +# (and then ../taritup tdepim for the last step) # But if all goes well, "pack" will have done it all. # You can find the resulting tar.bz2 in sources/, scp it somewhere. @@ -11,13 +11,13 @@ if ! grep -q Language-Team admin/cvs.sh; then patch admin/cvs.sh < cvs.sh.diff fi -test -L po || ( rm -f po ; ln -s ../kde-l10n/templates/messages/kdepim po ) +test -L po || ( rm -f po ; ln -s ../kde-l10n/templates/messages/tdepim po ) # I tried setting podir to get the output directly into kde-l10n but then # we run old code in cvs.sh; scripty doesn't use that anymore, but the scripts in l10n. -# However those are harder to reduce to kdepim only, so let's keep the old way +# However those are harder to reduce to tdepim only, so let's keep the old way # of doing it: with a po subdir, like a 3rd-party app and not like a real kde module. -#export podir="$KDEL10N/templates/messages/kdepim" +#export podir="$KDEL10N/templates/messages/tdepim" if ! test -d "po"; then echo "po doesn't exist" exit 1 @@ -42,13 +42,13 @@ if test -z "$gettext_version"; then exit 1 fi -kdepim="$PWD" +tdepim="$PWD" -# I assume kdepim is uptodate, but kde-l10n is probably not +# I assume tdepim is uptodate, but kde-l10n is probably not cd "$KDEL10N" || exit 1 svn update -cd "$kdepim" +cd "$tdepim" make -f admin/Makefile.common package-messages || exit 1 # ? make -f admin/Makefile.common package-merge || exit 1 @@ -58,7 +58,7 @@ scripts/merge_all.sh svn diff -for i in `find -name kdepim`; do +for i in `find -name tdepim`; do cd $i || exit 1 for t in `svn status 2>&1 | grep '^M' | gawk '{print $2}'`; do diff --git a/wizards/Makefile.am b/wizards/Makefile.am index d12e43fe1..7efc28935 100644 --- a/wizards/Makefile.am +++ b/wizards/Makefile.am @@ -19,7 +19,7 @@ kde_module_LTLIBRARIES = libegroupwarewizard.la libsloxwizard.la \ libscalixwizard.la -groupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +groupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor groupwarewizard_LDADD = libegroupwarewizard.la libsloxwizard.la $(LIB_KDEUI) \ libkolabwizard.la \ libexchangewizard.la \ @@ -39,7 +39,7 @@ libkolabwizard_la_SOURCES = kolabwizard.cpp kmailchanges.cpp kolabconfig.kcfgc \ kolabkmailchanges.cpp kolabwizard_LDADD = libkolabwizard.la $(LIB_KDEUI) -kolabwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kolabwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kolabwizard_SOURCES = kolabmain.cpp # eGroupware @@ -53,7 +53,7 @@ libegroupwarewizard_la_LIBADD = $(top_builddir)/kresources/egroupware/libkabc_xm $(LIB_KDEUI) egroupwarewizard_LDADD = libegroupwarewizard.la -egroupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +egroupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor egroupwarewizard_SOURCES = egroupwaremain.cpp # SLOX @@ -64,7 +64,7 @@ libsloxwizard_la_LIBADD = $(top_builddir)/kresources/slox/libkcal_slox.la \ $(top_builddir)/libtdepim/libtdepim.la sloxwizard_LDADD = libsloxwizard.la -sloxwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +sloxwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor sloxwizard_SOURCES = sloxmain.cpp # GroupWise @@ -80,7 +80,7 @@ libgroupwisewizard_la_COMPILE_FIRST = $(top_builddir)/kresources/groupwise/kabc_ groupwisewizard_LDADD = libgroupwisewizard.la -groupwisewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +groupwisewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor groupwisewizard_SOURCES = groupwisemain.cpp # Exchange @@ -91,7 +91,7 @@ libexchangewizard_la_LIBADD = $(top_builddir)/kresources/newexchange/libkcal_new $(top_builddir)/libtdepim/libtdepim.la exchangewizard_LDADD = libexchangewizard.la -exchangewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +exchangewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor exchangewizard_SOURCES = exchangemain.cpp # Scalix @@ -106,7 +106,7 @@ libscalixwizard_la_SOURCES = scalixwizard.cpp kmailchanges.cpp scalixconfig.kcfg scalixkmailchanges.cpp scalixwizard_LDADD = libscalixwizard.la $(LIB_KDEUI) -scalixwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +scalixwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor scalixwizard_SOURCES = scalixmain.cpp noinst_HEADERS = egroupwarewizard.h kmailchanges.h kolabwizard.h sloxwizard.h \ @@ -115,7 +115,7 @@ noinst_HEADERS = egroupwarewizard.h kmailchanges.h kolabwizard.h sloxwizard.h \ kde_kcfg_DATA = egroupware.kcfg slox.kcfg kolab.kcfg groupwise.kcfg scalix.kcfg messages: rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/kdepimwizards.pot + $(XGETTEXT) *.cpp -o $(podir)/tdepimwizards.pot egroupwarewizard.lo: ../kresources/egroupware/kabc_egroupwareprefs.h ../kresources/egroupware/kcal_egroupwareprefs.h ../kresources/egroupware/knotes_egroupwareprefs.h exchangewizard.lo: ../kresources/lib/kresources_groupwareprefs.h diff --git a/wizards/egroupwaremain.cpp b/wizards/egroupwaremain.cpp index fa3d81c79..e45624445 100644 --- a/wizards/egroupwaremain.cpp +++ b/wizards/egroupwaremain.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> @@ -34,7 +34,7 @@ static const KCmdLineOptions options[] = int main(int argc,char **argv) { - KLocale::setMainCatalogue( "kdepimwizards" ); + KLocale::setMainCatalogue( "tdepimwizards" ); KAboutData aboutData( "egroupwarewizard", "eGroupware Server Configuration Wizard", diff --git a/wizards/egroupwarewizard.cpp b/wizards/egroupwarewizard.cpp index 8fbb579a9..444e2d453 100644 --- a/wizards/egroupwarewizard.cpp +++ b/wizards/egroupwarewizard.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Tobias Koenig <tokoe@kde.org> diff --git a/wizards/egroupwarewizard.h b/wizards/egroupwarewizard.h index 08d7cffa0..e01305df8 100644 --- a/wizards/egroupwarewizard.h +++ b/wizards/egroupwarewizard.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Tobias Koenig <tokoe@kde.org> @@ -22,7 +22,7 @@ #define EGROUPWAREWIZARD_H #include <kconfigwizard.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KLineEdit; class TQCheckBox; diff --git a/wizards/exchangemain.cpp b/wizards/exchangemain.cpp index d271e70c9..34c4988ba 100644 --- a/wizards/exchangemain.cpp +++ b/wizards/exchangemain.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2005 Daniel Molkentin <molkentin@kde.org> @@ -35,7 +35,7 @@ static const KCmdLineOptions options[] = int main(int argc,char **argv) { - KLocale::setMainCatalogue( "kdepimwizards" ); + KLocale::setMainCatalogue( "tdepimwizards" ); KAboutData aboutData( "exchangewizard", I18N_NOOP( "Microsoft Exchange Server Configuration Wizard" ), "0.1" ); diff --git a/wizards/exchangewizard.cpp b/wizards/exchangewizard.cpp index d4aae80af..84c2a13d1 100644 --- a/wizards/exchangewizard.cpp +++ b/wizards/exchangewizard.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/wizards/exchangewizard.h b/wizards/exchangewizard.h index c951c4be2..d608f23ba 100644 --- a/wizards/exchangewizard.h +++ b/wizards/exchangewizard.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> @@ -21,7 +21,7 @@ #define EXCHANGEWIZARD_H #include <kconfigwizard.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KLineEdit; class TQCheckBox; diff --git a/wizards/groupwarewizard.cpp b/wizards/groupwarewizard.cpp index 48ac3b5a7..ef8a2b514 100644 --- a/wizards/groupwarewizard.cpp +++ b/wizards/groupwarewizard.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Tobias Koenig <tokoe@kde.org> diff --git a/wizards/groupwarewizard.h b/wizards/groupwarewizard.h index 1461a6a7f..f63397189 100644 --- a/wizards/groupwarewizard.h +++ b/wizards/groupwarewizard.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Tobias Koenig <tokoe@kde.org> diff --git a/wizards/groupwisemain.cpp b/wizards/groupwisemain.cpp index fbefe56f7..83a7cbf58 100644 --- a/wizards/groupwisemain.cpp +++ b/wizards/groupwisemain.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> @@ -35,7 +35,7 @@ static const KCmdLineOptions options[] = int main(int argc,char **argv) { - KLocale::setMainCatalogue( "kdepimwizards" ); + KLocale::setMainCatalogue( "tdepimwizards" ); KAboutData aboutData( "groupwisewizard", I18N_NOOP( "Novell GroupWise Configuration Wizard" ), diff --git a/wizards/groupwisewizard.cpp b/wizards/groupwisewizard.cpp index 47126b0ad..b28095bce 100644 --- a/wizards/groupwisewizard.cpp +++ b/wizards/groupwisewizard.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/wizards/groupwisewizard.h b/wizards/groupwisewizard.h index bd8252b1d..8abf53b81 100644 --- a/wizards/groupwisewizard.h +++ b/wizards/groupwisewizard.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> @@ -21,7 +21,7 @@ #define GROUPWISEWIZARD_H #include <kconfigwizard.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KLineEdit; class TQCheckBox; diff --git a/wizards/kmailchanges.cpp b/wizards/kmailchanges.cpp index d5a9fc8c2..160b63eae 100644 --- a/wizards/kmailchanges.cpp +++ b/wizards/kmailchanges.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Bo Thorsen <bo@sonofthor.dk> Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/wizards/kmailchanges.h b/wizards/kmailchanges.h index 953f4a8f2..7622608d5 100644 --- a/wizards/kmailchanges.h +++ b/wizards/kmailchanges.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Bo Thorsen <bo@sonofthor.dk> Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/wizards/kolabkmailchanges.cpp b/wizards/kolabkmailchanges.cpp index a0eef1fa9..8f66e5b33 100644 --- a/wizards/kolabkmailchanges.cpp +++ b/wizards/kolabkmailchanges.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Bo Thorsen <bo@sonofthor.dk> diff --git a/wizards/kolabkmailchanges.h b/wizards/kolabkmailchanges.h index b1503f442..4ccf69c4b 100644 --- a/wizards/kolabkmailchanges.h +++ b/wizards/kolabkmailchanges.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Bo Thorsen <bo@sonofthor.dk> diff --git a/wizards/kolabmain.cpp b/wizards/kolabmain.cpp index 8a7b881f6..ecb6a6073 100644 --- a/wizards/kolabmain.cpp +++ b/wizards/kolabmain.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> @@ -36,7 +36,7 @@ static const KCmdLineOptions options[] = int main(int argc,char **argv) { - KLocale::setMainCatalogue( "kdepimwizards" ); + KLocale::setMainCatalogue( "tdepimwizards" ); KAboutData aboutData( "kolabwizard", I18N_NOOP( "Kolab Configuration Wizard" ), "0.1" ); KCmdLineArgs::init( argc, argv, &aboutData ); diff --git a/wizards/kolabwizard.cpp b/wizards/kolabwizard.cpp index 651336a85..36e99bfba 100644 --- a/wizards/kolabwizard.cpp +++ b/wizards/kolabwizard.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2004 Daniel Molkentin <molkentin@kde.org> diff --git a/wizards/kolabwizard.h b/wizards/kolabwizard.h index b1b074674..6a5539ab8 100644 --- a/wizards/kolabwizard.h +++ b/wizards/kolabwizard.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2004 Bo Thorsen <bo@sonofthor.dk> @@ -23,7 +23,7 @@ #define KOLABWIZARD_H #include <kconfigwizard.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KLineEdit; class TQCheckBox; diff --git a/wizards/main.cpp b/wizards/main.cpp index ade994390..eb4eddcbb 100644 --- a/wizards/main.cpp +++ b/wizards/main.cpp @@ -14,7 +14,7 @@ static const KCmdLineOptions options[] = int main( int argc, char **argv ) { - KLocale::setMainCatalogue( "kdepimwizards" ); + KLocale::setMainCatalogue( "tdepimwizards" ); KAboutData aboutData( "groupwarewizard", I18N_NOOP( "KDE-PIM Groupware Configuration Wizard" ), "0.1" ); diff --git a/wizards/overviewpage.cpp b/wizards/overviewpage.cpp index a15b580eb..15df0246f 100644 --- a/wizards/overviewpage.cpp +++ b/wizards/overviewpage.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Tobias Koenig <tokoe@kde.org> diff --git a/wizards/overviewpage.h b/wizards/overviewpage.h index f5baa323d..723a8a25b 100644 --- a/wizards/overviewpage.h +++ b/wizards/overviewpage.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Tobias Koenig <tokoe@kde.org> diff --git a/wizards/scalixkmailchanges.cpp b/wizards/scalixkmailchanges.cpp index 38c3ecfb3..221e53d61 100644 --- a/wizards/scalixkmailchanges.cpp +++ b/wizards/scalixkmailchanges.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Bo Thorsen <bo@sonofthor.dk> diff --git a/wizards/scalixkmailchanges.h b/wizards/scalixkmailchanges.h index b746a01af..85279e089 100644 --- a/wizards/scalixkmailchanges.h +++ b/wizards/scalixkmailchanges.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Bo Thorsen <bo@sonofthor.dk> diff --git a/wizards/scalixmain.cpp b/wizards/scalixmain.cpp index 49b2726bd..89e40d3ab 100644 --- a/wizards/scalixmain.cpp +++ b/wizards/scalixmain.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> @@ -36,7 +36,7 @@ static const KCmdLineOptions options[] = int main(int argc,char **argv) { - KLocale::setMainCatalogue( "kdepimwizards" ); + KLocale::setMainCatalogue( "tdepimwizards" ); KAboutData aboutData( "scalixwizard", I18N_NOOP( "Scalix Configuration Wizard" ), "0.1" ); KCmdLineArgs::init( argc, argv, &aboutData ); diff --git a/wizards/scalixwizard.cpp b/wizards/scalixwizard.cpp index 100370508..b9ecfa10f 100644 --- a/wizards/scalixwizard.cpp +++ b/wizards/scalixwizard.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2004 Daniel Molkentin <molkentin@kde.org> diff --git a/wizards/scalixwizard.h b/wizards/scalixwizard.h index 71de08a06..ae8816290 100644 --- a/wizards/scalixwizard.h +++ b/wizards/scalixwizard.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> Copyright (c) 2004 Bo Thorsen <bo@sonofthor.dk> @@ -23,7 +23,7 @@ #define SCALIXWIZARD_H #include <kconfigwizard.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KComboBox; class KLineEdit; diff --git a/wizards/servertype.h b/wizards/servertype.h index c726ea391..632bdd420 100644 --- a/wizards/servertype.h +++ b/wizards/servertype.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Tobias Koenig <tokoe@kde.org> diff --git a/wizards/servertypemanager.cpp b/wizards/servertypemanager.cpp index 3e55a3947..e91374ae0 100644 --- a/wizards/servertypemanager.cpp +++ b/wizards/servertypemanager.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Tobias Koenig <tokoe@kde.org> diff --git a/wizards/servertypemanager.h b/wizards/servertypemanager.h index 9dcfdfdf7..5e1e11b50 100644 --- a/wizards/servertypemanager.h +++ b/wizards/servertypemanager.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Tobias Koenig <tokoe@kde.org> diff --git a/wizards/sloxmain.cpp b/wizards/sloxmain.cpp index 486326953..c17cced10 100644 --- a/wizards/sloxmain.cpp +++ b/wizards/sloxmain.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> @@ -35,7 +35,7 @@ static const KCmdLineOptions options[] = int main(int argc,char **argv) { - KLocale::setMainCatalogue( "kdepimwizards" ); + KLocale::setMainCatalogue( "tdepimwizards" ); KAboutData aboutData( "sloxwizard", I18N_NOOP( "SUSE LINUX Openexchange Server Configuration Wizard" ), "0.1" ); diff --git a/wizards/sloxwizard.cpp b/wizards/sloxwizard.cpp index d717f24c2..5d5481b94 100644 --- a/wizards/sloxwizard.cpp +++ b/wizards/sloxwizard.cpp @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> diff --git a/wizards/sloxwizard.h b/wizards/sloxwizard.h index e744c7691..e5f7f5d3a 100644 --- a/wizards/sloxwizard.h +++ b/wizards/sloxwizard.h @@ -1,5 +1,5 @@ /* - This file is part of kdepim. + This file is part of tdepim. Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org> @@ -21,7 +21,7 @@ #define SLOXWIZARD_H #include <kconfigwizard.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KLineEdit; class TQCheckBox; |
