TDE
/
tdepim
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdepim
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename additional instances of KDE to TDE

Browse Source
pull/21/head
Timothy Pearson 13 years ago
parent dbb49d72f7
commit 7cb24f16be
132 changed files with 341 additions and 341 deletions
Show Stats Download Patch File Download Diff File

10
CMakeLists.txt
Unescape View File

@ -77,7 +77,7 @@ if( NOT WITH_ARTS )
endif( )
if( WITH_NEWDISTRLISTS )
set( KDEPIM_NEW_DISTRLISTS 1 )
set( TDEPIM_NEW_DISTRLISTS 1 )
endif( )
@ -88,7 +88,7 @@ option( BUILD_INDEXLIB "Build indexlib" ${BUILD_ALL} )
option( BUILD_LIBKMIME "Build libkmime" ${BUILD_ALL} )
option( BUILD_KTNEF "Build ktnef" ${BUILD_ALL} )
option( BUILD_LIBKCAL "Build libkcal" ${BUILD_ALL} )
option( BUILD_LIBKDEPIM "Build libtdepim" ${BUILD_ALL} )
option( BUILD_LIBTDEPIM "Build libtdepim" ${BUILD_ALL} )
option( BUILD_LIBKPIMIDENTITIES "Build libkpimidentities" ${BUILD_ALL} )
option( BUILD_LIBKDENETWORK "Build libkdenetwork" ${BUILD_ALL} )
option( BUILD_CERTMANAGER "Build certmanager" ${BUILD_ALL} )
@ -143,7 +143,7 @@ set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" )
##### activate dependencies #####################
if( BUILD_LIBKCAL OR BUILD_LIBKDEPIM OR BUILD_LIBKPIMIDENTITIES OR BUILD_KIOSLAVES OR BUILD_KMAIL OR BUILD_KNODE )
if( BUILD_LIBKCAL OR BUILD_LIBTDEPIM OR BUILD_LIBKPIMIDENTITIES OR BUILD_KIOSLAVES OR BUILD_KMAIL OR BUILD_KNODE )
add_subdirectory( libemailfunctions )
endif()
@ -158,8 +158,8 @@ tde_conditional_add_subdirectory( BUILD_INDEXLIB indexlib )
tde_conditional_add_subdirectory( BUILD_LIBKMIME libkmime )
tde_conditional_add_subdirectory( BUILD_KTNEF ktnef )
tde_conditional_add_subdirectory( BUILD_LIBKCAL libkcal )
tde_conditional_add_subdirectory( BUILD_LIBKDEPIM pixmaps )
tde_conditional_add_subdirectory( BUILD_LIBKDEPIM libtdepim )
tde_conditional_add_subdirectory( BUILD_LIBTDEPIM pixmaps )
tde_conditional_add_subdirectory( BUILD_LIBTDEPIM libtdepim )
tde_conditional_add_subdirectory( BUILD_LIBKPIMIDENTITIES libkpimidentities )
tde_conditional_add_subdirectory( BUILD_LIBKDENETWORK libkdenetwork )
tde_conditional_add_subdirectory( BUILD_CERTMANAGER certmanager )

4
ConfigureChecks.cmake
Unescape View File

@ -9,8 +9,8 @@
#
#################################################
if( BUILD_LIBKDEPIM OR BUILD_KMAIL )
option( KDEPIM_NEW_DISTRLISTS "Define if you want to use the new distribution lists" ON )
if( BUILD_LIBTDEPIM OR BUILD_KMAIL )
option( TDEPIM_NEW_DISTRLISTS "Define if you want to use the new distribution lists" ON )
endif( )

2
akregator/ChangeLog
Unescape View File

@ -163,7 +163,7 @@ New features:
Changes:
- Added new about page, designed by Lokheed, lokheed at gmail.com -fo
- Use KDEPIM's progressbar -tpr
- Use TDEPIM's progressbar -tpr
- Update unread count when stopping fetching before it's finished -tpr
- Added "Keep flag set" to the search combobox -fo
- Added optional close buttons on browser tabs -fo

4
akregator/src/Makefile.am
Unescape View File

@ -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) -ltdefx $(LIB_KIO) -lktexteditor
akregator_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -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 -ltdepim
libakregatorpart_la_LIBADD = libakregatorprivate.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KHTML) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -L$(top_builddir)/libtdepim -ltdepim
# this is where the desktop file will go
partdesktopdir = $(kde_servicesdir)

4
akregator/src/mk4storage/Makefile.am
Unescape View File

@ -12,9 +12,9 @@ libakregator_mk4storage_plugin_la_LIBADD = \
$(top_builddir)/akregator/src/librss/librsslocal.la \
../libakregatorprivate.la \
$(LIB_KFILE) \
$(LIB_KDECORE) \
$(LIB_TDECORE) \
$(LIB_QT) \
$(LIB_KDEUI)
$(LIB_TDEUI)
libakregator_mk4storage_plugin_la_LDFLAGS = \
$(KDE_PLUGIN) \

2
certmanager/Makefile.am
Unescape View File

@ -17,7 +17,7 @@ kleopatra_SOURCES = \
METASOURCES = AUTO
kleopatra_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kleopatra_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kleopatra_LDADD = conf/libconf.la lib/libkleopatra.la $(LIB_KUTILS) $(LIB_KABC)
rcdir = $(kde_datadir)/kleopatra

2
certmanager/conf/Makefile.am
Unescape View File

@ -16,7 +16,7 @@ kcm_kleopatra_la_SOURCES = dirservconfigpage.cpp \
dnorderconfigpage.cpp
kcm_kleopatra_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_kleopatra_la_LIBADD = ../lib/libkleopatra.la $(LIB_KDEUI)
kcm_kleopatra_la_LIBADD = ../lib/libkleopatra.la $(LIB_TDEUI)
kde_services_DATA = \
kleopatra_config_dirserv.desktop \

2
certmanager/kwatchgnupg/Makefile.am
Unescape View File

@ -13,7 +13,7 @@ kwatchgnupg_SOURCES = \
METASOURCES = AUTO
kwatchgnupg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kwatchgnupg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kwatchgnupg_LDADD = ../conf/libconf.la ../lib/libkleopatra.la $(LIB_KUTILS) $(LIB_KABC)
rcdir = $(kde_datadir)/kwatchgnupg

2
certmanager/lib/Makefile.am
Unescape View File

@ -17,7 +17,7 @@ libkleopatra_la_LIBADD = \
ui/libkleopatra_ui.la \
\
$(top_builddir)/libkdenetwork/qgpgme/libqgpgme.la \
$(LIB_KIO) $(LIB_KDEUI)
$(LIB_KIO) $(LIB_TDEUI)
# Disabled for tdepim-3.3, see also kleo/cryptobackendfactory.cpp
# backends/kpgp/libkleopatra_backend_kpgp.la

4
config.h.cmake
Unescape View File

@ -12,7 +12,7 @@
#cmakedefine SIZEOF_UINT64_T @SIZEOF_UINT64_T@
// libtdepim, kmail
#cmakedefine KDEPIM_NEW_DISTRLISTS 1
#cmakedefine TDEPIM_NEW_DISTRLISTS 1
// libkdemanager, certmanager
#cmakedefine HAVE_GPGME_0_4_BRANCH 1
@ -29,7 +29,7 @@
#cmakedefine STD_NAMESPACE_PREFIX @STD_NAMESPACE_PREFIX@
// kaddressbook
#cmakedefine KDEPIM_NEW_DISTRLISTS 1
#cmakedefine TDEPIM_NEW_DISTRLISTS 1
// kandy
#cmakedefine HAVE_LOCKDEV 1

4
kabc/frontend/Makefile.am
Unescape View File

@ -4,7 +4,7 @@ METASOURCES = AUTO
bin_PROGRAMS = kabcfrontend
kabcfrontend_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kabcfrontend_LDADD = -lkabc $(LIB_KDECORE)
kabcfrontend_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kabcfrontend_LDADD = -lkabc $(LIB_TDECORE)
kabcfrontend_SOURCES = main.cpp mainWindow.ui

4
kabc/kabc2mutt/Makefile.am
Unescape View File

@ -4,8 +4,8 @@ METASOURCES = AUTO
bin_PROGRAMS = kabc2mutt
kabc2mutt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kabc2mutt_LDADD = -lkabc $(LIB_KDECORE)
kabc2mutt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kabc2mutt_LDADD = -lkabc $(LIB_TDECORE)
kabc2mutt_SOURCES = kabc2mutt.cpp main.cpp
messages: rc.cpp

2
kabc/kabcdistlistupdater/Makefile.am
Unescape View File

@ -4,7 +4,7 @@ METASOURCES = AUTO
bin_PROGRAMS = kabcdistlistupdater
kabcdistlistupdater_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kabcdistlistupdater_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kabcdistlistupdater_LDADD = $(LIB_KABC) $(top_builddir)/libtdepim/libtdepim.la
kabcdistlistupdater_SOURCES = kabcdistlistupdater.cpp

4
kaddressbook/Makefile.am
Unescape View File

@ -17,14 +17,14 @@ 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) -ltdefx $(LIB_KIO) -lktexteditor
kaddressbook_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kaddressbook_LDADD = libkaddressbook.la
kde_module_LTLIBRARIES = libkaddressbookpart.la
libkaddressbookpart_la_SOURCES = kaddressbook_part.cpp
libkaddressbookpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
libkaddressbookpart_la_LIBADD = libkaddressbook.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) -lDCOP
libkaddressbookpart_la_LIBADD = libkaddressbook.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) -lDCOP
lib_LTLIBRARIES = libkaddressbook.la
libkaddressbook_la_SOURCES = addresseeconfig.cpp addresseeeditordialog.cpp \

6
kaddressbook/distributionlistpicker.cpp
Unescape View File

@ -23,7 +23,7 @@
#include "distributionlistpicker.h"
#include "config.h"
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
#include <libtdepim/distributionlist.h>
#endif
@ -59,7 +59,7 @@ KPIM::DistributionListPickerDialog::DistributionListPickerDialog( KABC::AddressB
connect( m_listBox, TQT_SIGNAL( selected( const TQString& ) ),
this, TQT_SLOT( entrySelected( const TQString& ) ) );
setMainWidget( main );
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
typedef TQValueList<KPIM::DistributionList> DistListList;
const DistListList lists = KPIM::DistributionList::allDistributionLists( m_book );
for ( DistListList::ConstIterator it = lists.begin(); it != lists.end(); ++it )
@ -81,7 +81,7 @@ void KPIM::DistributionListPickerDialog::setLabelText( const TQString& text )
void KPIM::DistributionListPickerDialog::slotUser1()
{
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
const TQValueList<KPIM::DistributionList> lists = KPIM::DistributionList::allDistributionLists( m_book );
TQStringList listNames;
for ( TQValueList<KPIM::DistributionList>::ConstIterator it = lists.begin(); it != lists.end(); ++it )

2
kaddressbook/editors/Makefile.am
Unescape View File

@ -13,7 +13,7 @@ XXLIBS = $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \
libkaddrbk_cryptosettings_la_SOURCES = cryptowidget.cpp
libkaddrbk_cryptosettings_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) # -no-undefined
libkaddrbk_cryptosettings_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC)
libkaddrbk_cryptosettings_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC)
noinst_HEADERS = cryptowidget.h imeditorwidget.h imaddresswidget.h

6
kaddressbook/features/Makefile.am
Unescape View File

@ -17,16 +17,16 @@ XXLIBS = $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \
if compile_newdistrlists
libkaddrbk_distributionlistng_la_SOURCES = distributionlistngwidget.cpp
libkaddrbk_distributionlistng_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
libkaddrbk_distributionlistng_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC)
libkaddrbk_distributionlistng_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC)
else
libkaddrbk_distributionlist_la_SOURCES = distributionlistwidget.cpp
libkaddrbk_distributionlist_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
libkaddrbk_distributionlist_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC)
libkaddrbk_distributionlist_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC)
endif
libkaddrbk_resourceselection_la_SOURCES = resourceselection.cpp
libkaddrbk_resourceselection_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
libkaddrbk_resourceselection_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) -lkresources
libkaddrbk_resourceselection_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) -lkresources
noinst_HEADERS = distributionlistwidget.h distributionlistngwidget.h resourceselection.h

44
kaddressbook/features/distributionlistwidget.cpp
Unescape View File

@ -39,7 +39,7 @@
#include <kmessagebox.h>
#include <kabc/addresseedialog.h>
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
#include <libtdepim/distributionlist.h>
typedef KPIM::DistributionList DistributionList;
#else
@ -149,7 +149,7 @@ class ContactItem : public TQListViewItem
DistributionListWidget::DistributionListWidget( KAB::Core *core, TQWidget *parent,
const char *name )
: KAB::ExtensionWidget( core, parent, name )
#ifndef KDEPIM_NEW_DISTRLISTS
#ifndef TDEPIM_NEW_DISTRLISTS
, mManager( 0 )
#endif
{
@ -201,7 +201,7 @@ DistributionListWidget::DistributionListWidget( KAB::Core *core, TQWidget *paren
topLayout->addWidget( mRemoveContactButton, 2, 3 );
connect( mRemoveContactButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeContact() ) );
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
// When contacts are changed, update both distr list combo and contents of displayed distr list
connect( core, TQT_SIGNAL( contactsUpdated() ),
this, TQT_SLOT( updateNameCombo() ) );
@ -228,7 +228,7 @@ DistributionListWidget::DistributionListWidget( KAB::Core *core, TQWidget *paren
DistributionListWidget::~DistributionListWidget()
{
#ifndef KDEPIM_NEW_DISTRLISTS
#ifndef TDEPIM_NEW_DISTRLISTS
delete mManager;
#endif
@ -237,7 +237,7 @@ DistributionListWidget::~DistributionListWidget()
void DistributionListWidget::save()
{
#ifndef KDEPIM_NEW_DISTRLISTS
#ifndef TDEPIM_NEW_DISTRLISTS
mManager->save();
#endif
}
@ -254,7 +254,7 @@ void DistributionListWidget::selectionContactViewChanged()
bool DistributionListWidget::alreadyExists( const TQString& distrListName ) const
{
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
return core()->distributionListNames().contains( distrListName );
#else
return mManager->listNames().contains( distrListName );
@ -273,7 +273,7 @@ void DistributionListWidget::createList()
KMessageBox::sorry( this, i18n( "The name already exists" ) );
return;
}
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
KABC::Resource* resource = core()->requestResource( this );
if ( !resource )
return;
@ -313,7 +313,7 @@ void DistributionListWidget::editList()
KMessageBox::sorry( this, i18n( "The name already exists." ) );
return;
}
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
KPIM::DistributionList dist = KPIM::DistributionList::findByName(
core()->addressBook(), mNameCombo->currentText() );
if ( dist.isEmpty() ) // not found [should be impossible]
@ -335,7 +335,7 @@ void DistributionListWidget::editList()
// Display the contents of the list we just selected
updateContactView();
#ifndef KDEPIM_NEW_DISTRLISTS
#ifndef TDEPIM_NEW_DISTRLISTS
changed();
#endif
}
@ -349,7 +349,7 @@ void DistributionListWidget::removeList()
if ( result != KMessageBox::Continue )
return;
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
KPIM::DistributionList dist = KPIM::DistributionList::findByName(
core()->addressBook(), mNameCombo->currentText() );
if ( dist.isEmpty() ) // not found [should be impossible]
@ -369,7 +369,7 @@ void DistributionListWidget::removeList()
void DistributionListWidget::addContact()
{
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
KPIM::DistributionList dist = KPIM::DistributionList::findByName(
core()->addressBook(), mNameCombo->currentText() );
if ( dist.isEmpty() ) { // not found
@ -388,7 +388,7 @@ void DistributionListWidget::addContact()
for ( it = addrList.begin(); it != addrList.end(); ++it )
dist.insertEntry( *it );
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
core()->addressBook()->insertAddressee( dist );
changed( dist );
#else
@ -399,7 +399,7 @@ void DistributionListWidget::addContact()
void DistributionListWidget::removeContact()
{
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
KPIM::DistributionList dist = KPIM::DistributionList::findByName(
core()->addressBook(), mNameCombo->currentText() );
if ( dist.isEmpty() ) // not found
@ -419,7 +419,7 @@ void DistributionListWidget::removeContact()
dist.removeEntry( contactItem->addressee(), contactItem->email() );
delete contactItem;
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
core()->addressBook()->insertAddressee( dist );
changed( dist );
#else
@ -429,7 +429,7 @@ void DistributionListWidget::removeContact()
void DistributionListWidget::changeEmail()
{
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
KPIM::DistributionList dist = KPIM::DistributionList::findByName(
core()->addressBook(), mNameCombo->currentText() );
if ( dist.isEmpty() ) // not found
@ -454,7 +454,7 @@ void DistributionListWidget::changeEmail()
dist.removeEntry( contactItem->addressee(), contactItem->email() );
dist.insertEntry( contactItem->addressee(), email );
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
core()->addressBook()->insertAddressee( dist );
changed( dist );
#else
@ -468,7 +468,7 @@ void DistributionListWidget::updateContactView()
mContactView->clear();
bool isListSelected = false;
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
KPIM::DistributionList dist;
if ( mNameCombo->count() != 0 )
dist = KPIM::DistributionList::findByName(
@ -491,7 +491,7 @@ void DistributionListWidget::updateContactView()
mContactView->setEnabled( true );
uint entryCount = 0;
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
const KPIM::DistributionList::Entry::List entries = dist.entries( core()->addressBook() );
KPIM::DistributionList::Entry::List::ConstIterator it;
#else
@ -512,7 +512,7 @@ void DistributionListWidget::updateNameCombo()
{
int pos = mNameCombo->currentItem();
mNameCombo->clear();
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
const TQStringList names = core()->distributionListNames();
#else
mManager->load();
@ -529,7 +529,7 @@ void DistributionListWidget::dropEvent( TQDropEvent *e )
if ( mNameCombo->count() == 0 )
return;
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
KPIM::DistributionList dist = KPIM::DistributionList::findByName(
core()->addressBook(), mNameCombo->currentText() );
if ( dist.isEmpty() )
@ -548,7 +548,7 @@ void DistributionListWidget::dropEvent( TQDropEvent *e )
for ( KABC::Addressee::List::ConstIterator it = lst.begin(); it != lst.end(); ++it )
dist.insertEntry( *it );
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
core()->addressBook()->insertAddressee( dist );
changed( dist );
#else
@ -578,7 +578,7 @@ void DistributionListWidget::dropped( TQDropEvent *e, TQListViewItem* )
dropEvent( e );
}
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
void DistributionListWidget::changed( const KABC::Addressee& dist )
{
emit modified( KABC::Addressee::List() << dist );

6
kaddressbook/features/distributionlistwidget.h
Unescape View File

@ -24,7 +24,7 @@
#ifndef DISTRIBUTIONLISTWIDGET_H
#define DISTRIBUTIONLISTWIDGET_H
#include <config.h> // for KDEPIM_NEW_DISTRLISTS
#include <config.h> // for TDEPIM_NEW_DISTRLISTS
#include <kdialogbase.h>
#include <klistview.h>
@ -76,7 +76,7 @@ class DistributionListWidget : public KAB::ExtensionWidget
void selectionContactViewChanged();
private:
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
void changed( const KABC::Addressee& dist );
#else
void changed();
@ -91,7 +91,7 @@ class DistributionListWidget : public KAB::ExtensionWidget
TQLabel *mEntryCountLabel;
DistributionListView *mContactView;
#ifndef KDEPIM_NEW_DISTRLISTS
#ifndef TDEPIM_NEW_DISTRLISTS
KABC::DistributionListManager *mManager;
#endif
TQPushButton *mCreateListButton;

6
kaddressbook/interfaces/core.h
Unescape View File

@ -24,9 +24,9 @@
#ifndef KAB_CORE_H
#define KAB_CORE_H
#include <config.h> // for KDEPIM_NEW_DISTRLISTS
#include <config.h> // for TDEPIM_NEW_DISTRLISTS
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
#include <libtdepim/distributionlist.h>
#endif
@ -117,7 +117,7 @@ class KDE_EXPORT Core : public TQObject
*/
virtual void deleteDistributionLists( const TQStringList &uids ) = 0;
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
/**
Returns all the distribution lists.
*/

18
kaddressbook/kabcore.cpp
Unescape View File

@ -354,7 +354,7 @@ void KABCore::setContactSelected( const TQString &uid )
KABC::Addressee addr = mAddressBook->findByUid( uid );
if ( !mDetailsViewer->isHidden() )
mDetailsViewer->setAddressee( addr );
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
if ( !mSelectedDistributionList.isNull() && mDistListEntryView->isShown() ) {
showDistributionListEntry( uid );
}
@ -439,7 +439,7 @@ void KABCore::setContactSelected( const TQString &uid )
#endif
mActionPaste->setEnabled( !list.isEmpty() );
}
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
mAddDistListButton->setEnabled( writable );
mRemoveDistListButton->setEnabled( someSelected && writable );
#endif
@ -709,7 +709,7 @@ void KABCore::contactModified( const KABC::Addressee &addr )
void KABCore::newDistributionList()
{
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
KABC::Resource *resource = requestResource( mWidget );
if ( !resource )
return;
@ -1230,7 +1230,7 @@ void KABCore::initGUI()
mViewManager = new ViewManager( this, viewWidget );
viewLayout->addWidget( mViewManager, 1 );
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
mDistListButtonWidget = new TQWidget( viewWidget );
TQHBoxLayout *buttonLayout = new TQHBoxLayout( mDistListButtonWidget );
buttonLayout->setSpacing( KDialog::spacingHint() );
@ -1604,7 +1604,7 @@ bool KABCore::handleCommandLine( KAddressBookIface* iface )
void KABCore::removeSelectedContactsFromDistList()
{
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
KPIM::DistributionList dist = KPIM::DistributionList::findByName( addressBook(), mSelectedDistributionList );
if ( dist.isEmpty() )
@ -1656,7 +1656,7 @@ void KABCore::removeSelectedContactsFromDistList()
void KABCore::sendMailToDistributionList( const TQString &name )
{
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
KPIM::DistributionList dist = KPIM::DistributionList::findByName( addressBook(), name );
if ( dist.isEmpty() )
return;
@ -1671,7 +1671,7 @@ void KABCore::sendMailToDistributionList( const TQString &name )
void KABCore::editSelectedDistributionList()
{
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
editDistributionList( KPIM::DistributionList::findByName( addressBook(), mSelectedDistributionList ) );
#endif
}
@ -1679,12 +1679,12 @@ void KABCore::editSelectedDistributionList()
void KABCore::editDistributionList( const TQString &name )
{
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
editDistributionList( KPIM::DistributionList::findByName( addressBook(), name ) );
#endif
}
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
void KABCore::showDistributionListEntry( const TQString& uid )
{

8
kaddressbook/kabcore.h
Unescape View File

@ -24,7 +24,7 @@
#ifndef KABCORE_H
#define KABCORE_H
#include <config.h> // FOR KDEPIM_NEW_DISTRLISTS
#include <config.h> // FOR TDEPIM_NEW_DISTRLISTS
#include <kabc/field.h>
@ -148,7 +148,7 @@ class KDE_EXPORT KABCore : public KAB::Core
KCommandHistory *commandHistory() const { return mCommandHistory; }
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
/**
Returns all the distribution lists.
*/
@ -395,7 +395,7 @@ class KDE_EXPORT KABCore : public KAB::Core
private:
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
void editDistributionList( const KPIM::DistributionList &list );
void showDistributionListEntry( const TQString &uid );
#endif
@ -445,7 +445,7 @@ class KDE_EXPORT KABCore : public KAB::Core
ViewManager *mViewManager;
TQLabel *mViewHeaderLabel;
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
TQString mSelectedDistributionList;
KPushButton *mAddDistListButton;
KPushButton *mRemoveDistListButton;

2
kaddressbook/kcmconfigs/Makefile.am
Unescape View File

@ -25,7 +25,7 @@ kcm_kabldapconfig_la_LIBADD = $(LIB_KIO) $(LIB_KABC) $(top_builddir)/libtdepim/l
kcm_kabcustomfields_la_SOURCES = kcmkabcustomfields.cpp
kcm_kabcustomfields_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
-avoid-version -no-undefined
kcm_kabcustomfields_la_LIBADD = $(LIB_KDEUI) -lqui \
kcm_kabcustomfields_la_LIBADD = $(LIB_TDEUI) -lqui \
$(top_builddir)/kaddressbook/common/libkabcommon.la
kcm_kabcustomfields_la_COMPILE_FIRST = $(top_builddir)/kaddressbook/common/kabprefs_base.h

8
kaddressbook/ldapsearchdialog.cpp
Unescape View File

@ -42,7 +42,7 @@
#include "ldapsearchdialog.h"
#include "kablock.h"
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
#include "distributionlistpicker.h"
#endif
@ -214,7 +214,7 @@ LDAPSearchDialog::LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core,
showButton( User2, false );
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
showButton( User2, true );
setButtonText( User2, i18n( "Add to Distribution List..." ) );
#endif
@ -543,7 +543,7 @@ KABC::Addressee LDAPSearchDialog::convertLdapAttributesToAddressee( const KPIM::
return addr;
}
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
KPIM::DistributionList LDAPSearchDialog::selectDistributionList()
{
TQGuardedPtr<KPIM::DistributionListPickerDialog> picker = new KPIM::DistributionListPickerDialog( mCore->addressBook(), this );
@ -601,7 +601,7 @@ KABC::Addressee::List LDAPSearchDialog::importContactsUnlessTheyExist( const TQV
void LDAPSearchDialog::slotUser2()
{
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
const TQValueList<ContactListItem*> selectedItems = d->selectedItems( mResultListView );
if ( selectedItems.isEmpty() ) {
KMessageBox::information( this, i18n( "Please select the contacts you want to add to the distribution list." ), i18n( "No Contacts Selected" ) );

4
kaddressbook/ldapsearchdialog.h
Unescape View File

@ -29,7 +29,7 @@
#include <ldapclient.h>
#include <kdialogbase.h>
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
#include <libtdepim/distributionlist.h>
#endif
@ -90,7 +90,7 @@ class LDAPSearchDialog : public KDialogBase
private:
void saveSettings();
static KABC::Addressee convertLdapAttributesToAddressee( const KPIM::LdapAttrMap& attrs );
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
KPIM::DistributionList selectDistributionList();
#endif

8
kaddressbook/searchmanager.cpp
Unescape View File

@ -20,7 +20,7 @@
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/
#include <config.h> // FOR KDEPIM_NEW_DISTRLISTS
#include <config.h> // FOR TDEPIM_NEW_DISTRLISTS
#include <kabc/addresseelist.h>
#include <kdeversion.h>
@ -57,7 +57,7 @@ void SearchManager::search( const TQString &pattern, const KABC::Field::List &fi
allContacts.append( *abIt );
#endif
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
// Extract distribution lists from allContacts
mDistributionLists.clear();
KABC::Addressee::List::Iterator rmIt( allContacts.begin() );
@ -98,7 +98,7 @@ void SearchManager::search( const TQString &pattern, const KABC::Field::List &fi
KABC::Addressee::List::ConstIterator it( allContacts.begin() );
const KABC::Addressee::List::ConstIterator endIt( allContacts.end() );
for ( ; it != endIt; ++it ) {
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
if ( KPIM::DistributionList::isDistributionList( *it ) )
continue;
#endif
@ -169,7 +169,7 @@ void SearchManager::reload()
search( mPattern, mFields, mType );
}
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
void KAB::SearchManager::setSelectedDistributionList( const TQString &name )
{

8
kaddressbook/searchmanager.h
Unescape View File

@ -24,11 +24,11 @@
#ifndef SEARCHMANAGER_H
#define SEARCHMANAGER_H
#include <config.h> // for KDEPIM_NEW_DISTRLISTS
#include <config.h> // for TDEPIM_NEW_DISTRLISTS
#include <tqobject.h>
#include <kabc/stdaddressbook.h>
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
#include <libtdepim/distributionlist.h>
#endif
@ -67,7 +67,7 @@ class SearchManager : public TQObject
KABC::Addressee::List contacts() const;
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
/**
sets the distribution list to be shown
*/
@ -95,7 +95,7 @@ class SearchManager : public TQObject
private:
KABC::Addressee::List mContacts;
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
TQString mSelectedDistributionList;
KPIM::DistributionList::List mDistributionLists;
#endif

2
kaddressbook/thumbnailcreator/Makefile.am
Unescape View File

@ -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) -ltdefx
ldifvcardthumbnail_la_LIBADD = $(LIB_TDECORE) $(LIB_KABC) -ltdefx
noinst_HEADERS = ldifvcardcreator.h

6
kaddressbook/views/Makefile.am
Unescape View File

@ -12,17 +12,17 @@ libkaddrbk_cardview_la_SOURCES = cardview.cpp colorlistbox.cpp \
configurecardviewdialog.cpp \
kaddressbookcardview.cpp
libkaddrbk_cardview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
libkaddrbk_cardview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) $(LIB_KABC)
libkaddrbk_cardview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_KABC)
libkaddrbk_iconview_la_SOURCES = kaddressbookiconview.cpp
libkaddrbk_iconview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
libkaddrbk_iconview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) $(LIB_KABC)
libkaddrbk_iconview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_KABC)
libkaddrbk_tableview_la_SOURCES = configuretableviewdialog.cpp \
contactlistview.cpp \
kaddressbooktableview.cpp
libkaddrbk_tableview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
libkaddrbk_tableview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) $(LIB_KABC) $(LIB_KIO) $(LIB_KIMPROXY)
libkaddrbk_tableview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_KABC) $(LIB_KIO) $(LIB_KIMPROXY)
noinst_HEADERS = cardview.h colorlistbox.h configurecardviewdialog.h \
configuretableviewdialog.h contactlistview.h \

18
kaddressbook/xxport/Makefile.am
Unescape View File

@ -21,33 +21,33 @@ XXLIBS = $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \
$(top_builddir)/libtdepim/libtdepim.la
libkaddrbk_csv_xxport_la_SOURCES = csv_xxport.cpp csvimportdialog.cpp dateparser.cpp
libkaddrbk_csv_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO)
libkaddrbk_csv_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO)
libkaddrbk_vcard_xxport_la_SOURCES = vcard_xxport.cpp
libkaddrbk_vcard_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO) \
libkaddrbk_vcard_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO) \
$(top_builddir)/kaddressbook/libkaddressbook.la \
$(top_builddir)/libkdenetwork/qgpgme/libqgpgme.la
libkaddrbk_kde2_xxport_la_SOURCES = kde2_xxport.cpp
libkaddrbk_kde2_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO)
libkaddrbk_kde2_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO)
libkaddrbk_bookmark_xxport_la_SOURCES = bookmark_xxport.cpp
libkaddrbk_bookmark_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO)
libkaddrbk_bookmark_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO)
libkaddrbk_eudora_xxport_la_SOURCES = eudora_xxport.cpp
libkaddrbk_eudora_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO)
libkaddrbk_eudora_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO)
libkaddrbk_ldif_xxport_la_SOURCES = ldif_xxport.cpp
libkaddrbk_ldif_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO)
libkaddrbk_ldif_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO)
libkaddrbk_gnokii_xxport_la_SOURCES = gnokii_xxport.cpp
libkaddrbk_gnokii_xxport_la_LIBADD = $(XPMLIB) $(LIB_GNOKII) $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO)
libkaddrbk_gnokii_xxport_la_LIBADD = $(XPMLIB) $(LIB_GNOKII) $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO)
libkaddrbk_opera_xxport_la_SOURCES = opera_xxport.cpp
libkaddrbk_opera_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO)
libkaddrbk_opera_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO)
libkaddrbk_pab_xxport_la_SOURCES = pab_xxport.cpp pab_mapihd.cpp pab_pablib.cpp
libkaddrbk_pab_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO)
libkaddrbk_pab_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO)
noinst_HEADERS = csvimportdialog.h

2
kalarm/Makefile.am
Unescape View File

@ -31,7 +31,7 @@ kalarm_LDADD = $(top_builddir)/kalarm/lib/libkalarm.la \
$(top_builddir)/kalarm/kalarmd/libkalarmd.la \
$(top_builddir)/libtdepim/libtdepim.la \
$(top_builddir)/libkpimidentities/libkpimidentities.la \
-lkabc -lkutils $(LIB_KDEUI) $(ARTSLIB) $(LIBXTST)
-lkabc -lkutils $(LIB_TDEUI) $(ARTSLIB) $(LIBXTST)
noinst_HEADERS = alarmcalendar.h alarmevent.h alarmlistview.h alarmtext.h \
alarmtimewidget.h birthdaydlg.h daemon.h dcophandler.h deferdlg.h \
editdlg.h editdlgprivate.h emailidcombo.h eventlistviewbase.h find.h \

8
kalarm/kalarmd/Makefile.am
Unescape View File

@ -2,14 +2,14 @@ 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) -ltdefx $(LIB_KIO) -lktexteditor
libkalarmd_la_LIBADD = $(LIB_KDECORE) $(top_builddir)/libkcal/libkcal.la
libkalarmd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
libkalarmd_la_LIBADD = $(LIB_TDECORE) $(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) -ltdefx $(LIB_KIO) -lktexteditor
kalarmd_LDADD = $(LIB_KDEUI) $(top_builddir)/libkcal/libkcal.la libkalarmd.la
kalarmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kalarmd_LDADD = $(LIB_TDEUI) $(top_builddir)/libkcal/libkcal.la libkalarmd.la
kalarmd_SOURCES = alarmdaemon.cpp admain.cpp adapp.cpp \
adcalendar.cpp adconfigdata.cpp clientinfo.cpp \
alarmdaemoniface.skel

6
kandy/src/Makefile.am
Unescape View File

@ -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) -ltdefx $(LIB_KIO) -lktexteditor
kandy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -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,8 +17,8 @@ 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) -ltdefx $(LIB_KIO) -lktexteditor
kandy_client_LDADD = $(LIB_KDECORE)
kandy_client_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kandy_client_LDADD = $(LIB_TDECORE)
kandy_client_SOURCES = kandy_client.cpp
METASOURCES = AUTO

2
karm/Makefile.am
Unescape View File

@ -23,7 +23,7 @@ libkarm_shared_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
$(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) -ltdefx $(LIB_KIO) -lktexteditor
karm_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -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 \

6
karm/test/Makefile.am
Unescape View File

@ -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) -ltdefx $(LIB_KIO) -lktexteditor
runscripts_LDADD = $(LIB_QT) $(LIB_KDECORE)
runscripts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
runscripts_LDADD = $(LIB_QT) $(LIB_TDECORE)
locking_SOURCES = locking.cpp lockerthread.cpp
locking_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
locking_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
locking_LDADD = $(LIB_QT) $(top_builddir)/libkcal/libkcal.la
KDE_CXXFLAGS = $(USE_EXCEPTIONS)

2
kdgantt/Makefile.am
Unescape View File

@ -16,7 +16,7 @@ libkdgantt_la_SOURCES = \
KDGanttXMLTools.cpp \
itemAttributeDialog.ui
libkdgantt_la_LDFLAGS = $(all_libraries) -no-undefined
libkdgantt_la_LIBADD = $(LIB_KDEUI)
libkdgantt_la_LIBADD = $(LIB_TDEUI)
noinst_HEADERS = \
KDGanttViewSubwidgets.h \

2
kgantt/kgantt/Makefile.am
Unescape View File

@ -7,7 +7,7 @@ xQGanttBarViewPort_Events.cpp \
xQGanttBarView.cpp xQGanttListView.cpp KGanttBarConfig.cpp
libkgantt_la_LDFLAGS = -version-info 0:2:0 $(all_libraries) -no-undefined
libkgantt_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
libkgantt_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
# set the include path for X, qt and KDE
INCLUDES= $(all_includes)

2
kioslaves/mbox/Makefile.am
Unescape View File

@ -12,7 +12,7 @@ kio_mbox_la_SOURCES = \
readmbox.cc \
stat.cc \
urlinfo.cc
kio_mbox_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
kio_mbox_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE)
kio_mbox_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN)
noinst_HEADERS = \

2
kioslaves/sieve/Makefile.am
Unescape View File

@ -3,7 +3,7 @@ INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/.. $(all_includes)
kde_module_LTLIBRARIES = kio_sieve.la
kio_sieve_la_SOURCES = sieve.cpp
kio_sieve_la_LIBADD = $(LIB_KIO) $(SASL2_LIBS) $(LIB_QT) $(LIB_KDECORE)
kio_sieve_la_LIBADD = $(LIB_KIO) $(SASL2_LIBS) $(LIB_QT) $(LIB_TDECORE)
kio_sieve_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
noinst_HEADERS = sieve.h

2
kitchensync/libqopensync/Makefile.am
Unescape View File

@ -11,7 +11,7 @@ libqopensync_la_SOURCES = callbackhandler.cpp conversion.cpp engine.cpp environm
member.cpp plugin.cpp result.cpp syncmapping.cpp syncupdates.cpp \
syncchange.cpp
libqopensync_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
libqopensync_la_LIBADD = $(LIB_KDEUI) $(OPENSYNC_LIBS) $(OPENSYNCENGINE_LIBS)
libqopensync_la_LIBADD = $(LIB_TDEUI) $(OPENSYNC_LIBS) $(OPENSYNCENGINE_LIBS)
METASOURCES = AUTO

4
kitchensync/src/Makefile.am
Unescape View File

@ -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) -ltdefx $(LIB_KIO) -lktexteditor
kitchensync_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kitchensync_LDADD = libkitchensync.la
xdg_apps_DATA = kitchensync.desktop
@ -41,7 +41,7 @@ kde_module_LTLIBRARIES = libkitchensyncpart.la
libkitchensyncpart_la_SOURCES = part.cpp
libkitchensyncpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
libkitchensyncpart_la_LIBADD = $(LIB_KPARTS) libkitchensync.la $(LIB_QT) $(LIB_KIO) $(LIB_KHTML) $(LIB_KABC) $(LIB_KDECORE) $(LIB_KDEUI)
libkitchensyncpart_la_LIBADD = $(LIB_KPARTS) libkitchensync.la $(LIB_QT) $(LIB_KIO) $(LIB_KHTML) $(LIB_KABC) $(LIB_TDECORE) $(LIB_TDEUI)
# Resources
kitchensyncdatadir = $(kde_datadir)/kitchensync

2
kmail/Makefile.am
Unescape View File

@ -40,7 +40,7 @@ libkmailpart_la_LIBADD = libkmailprivate.la
kcm_kmail_la_SOURCES = kcm_kmail.cpp
kcm_kmail_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_kmail_la_LIBADD = libkmailprivate.la $(LIB_KDECORE)
kcm_kmail_la_LIBADD = libkmailprivate.la $(LIB_TDECORE)
libkmail_bodypartformatter_application_octetstream_la_SOURCES = app_octetstream.cpp
libkmail_bodypartformatter_application_octetstream_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)

14
kmail/distributionlistdialog.cpp
Unescape View File

@ -19,7 +19,7 @@
Boston, MA 02110-1301, USA.
*/
#include <config.h> // for KDEPIM_NEW_DISTRLISTS
#include <config.h> // for TDEPIM_NEW_DISTRLISTS
#include "distributionlistdialog.h"
@ -28,7 +28,7 @@
#include <kabc/stdaddressbook.h>
#include <kabc/distributionlist.h>
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
#include <libtdepim/distributionlist.h>
#endif
#include <libtdepim/kaddrbook.h>
@ -172,7 +172,7 @@ void DistributionListDialog::slotUser1()
return;
}
#ifndef KDEPIM_NEW_DISTRLISTS
#ifndef TDEPIM_NEW_DISTRLISTS
KABC::DistributionListManager manager( ab );
manager.load();
#endif
@ -189,7 +189,7 @@ void DistributionListDialog::slotUser1()
KABC::AddressBook *ab = KABC::StdAddressBook::self( true );
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
if ( !KPIM::DistributionList::findByName( ab, name ).isEmpty() ) {
#else
if ( manager.list( name ) ) {
@ -212,7 +212,7 @@ void DistributionListDialog::slotUser1()
return;
}
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
KPIM::DistributionList dlist;
dlist.setName( name );
@ -260,13 +260,13 @@ void DistributionListDialog::slotUser1()
return;
}
#ifndef KDEPIM_NEW_DISTRLISTS
#ifndef TDEPIM_NEW_DISTRLISTS
manager.save();
#endif
// Only accept when the dist list is really in the addressbook, since we can't detect if the
// user aborted saving in another way, since insertAddressee() lacks a return code.
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
if ( !KPIM::DistributionList::findByName( ab, name ).isEmpty() ) {
#else
if ( manager.list( name ) ) {

14
kmail/folderdiaacltab.cpp
Unescape View File

@ -30,7 +30,7 @@
* your version.
*/
#include <config.h> // FOR KDEPIM_NEW_DISTRLISTS
#include <config.h> // FOR TDEPIM_NEW_DISTRLISTS
#include "folderdiaacltab.h"
#include "acljobs.h"
@ -41,7 +41,7 @@
#include <addressesdialog.h>
#include <kabc/addresseelist.h>
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
#include <libtdepim/distributionlist.h> // libtdepim
#else
#include <kabc/distributionlist.h>
@ -204,7 +204,7 @@ public:
void load( const ACLListEntry& entry );
void save( ACLList& list,
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
KABC::AddressBook* abook,
#else
KABC::DistributionListManager& manager,
@ -270,7 +270,7 @@ void KMail::FolderDiaACLTab::ListViewItem::load( const ACLListEntry& entry )
}
void KMail::FolderDiaACLTab::ListViewItem::save( ACLList& aclList,
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
KABC::AddressBook* addressBook,
#else
KABC::DistributionListManager& manager,
@ -278,7 +278,7 @@ void KMail::FolderDiaACLTab::ListViewItem::save( ACLList& aclList,
IMAPUserIdFormat userIdFormat )
{
// expand distribution lists
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
KPIM::DistributionList list = KPIM::DistributionList::findByName( addressBook, userId(), false );
if ( !list.isEmpty() ) {
Q_ASSERT( mModified ); // it has to be new, it couldn't be stored as a distr list name....
@ -675,7 +675,7 @@ bool KMail::FolderDiaACLTab::save()
// listviewitems at the same time sounds dangerous, so let's just save into
// ACLList and reload that.
KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true );
#ifndef KDEPIM_NEW_DISTRLISTS
#ifndef TDEPIM_NEW_DISTRLISTS
KABC::DistributionListManager manager( addressBook );
manager.load();
#endif
@ -683,7 +683,7 @@ bool KMail::FolderDiaACLTab::save()
for ( TQListViewItem* item = mListView->firstChild(); item; item = item->nextSibling() ) {
ListViewItem* ACLitem = static_cast<ListViewItem *>( item );
ACLitem->save( aclList,
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
addressBook,
#else
manager,

6
kmail/kleo_util.h
Unescape View File

@ -29,8 +29,8 @@
your version.
*/
#ifndef __KDEPIM_KMAIL_KLEO_UTIL_H__
#define __KDEPIM_KMAIL_KLEO_UTIL_H__
#ifndef __TDEPIM_KMAIL_KLEO_UTIL_H__
#define __TDEPIM_KMAIL_KLEO_UTIL_H__
#include <kleo/enum.h>
@ -85,4 +85,4 @@ static inline bool containsOpenPGP( unsigned int f ) {
return f & (Kleo::OpenPGPMIMEFormat|Kleo::InlineOpenPGPFormat) ;
}
#endif // __KDEPIM_KMAIL_KLEO_UTIL_H__
#endif // __TDEPIM_KMAIL_KLEO_UTIL_H__

2
kmail/klistviewindexedsearchline.h
Unescape View File

@ -46,7 +46,7 @@ class KListViewSearchLine;
* Extends HeaderListQuickSearch to also search inside message bodies using KMMsgIndex
*/
class KDEUI_EXPORT KListViewIndexedSearchLine: public KMail::HeaderListQuickSearch
class TDEUI_EXPORT KListViewIndexedSearchLine: public KMail::HeaderListQuickSearch
{
Q_OBJECT
TQ_OBJECT

26
kmail/recipientspicker.cpp
Unescape View File

@ -28,7 +28,7 @@
#include <libemailfunctions/email.h>
#ifndef KDEPIM_NEW_DISTRLISTS
#ifndef TDEPIM_NEW_DISTRLISTS
#include <kabc/distributionlist.h>
#endif
@ -46,7 +46,7 @@
#include <tqtoolbutton.h>
#include <tqlabel.h>
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
RecipientItem::RecipientItem( KABC::AddressBook *ab )
: mAddressBook( ab )
{
@ -58,7 +58,7 @@ RecipientItem::RecipientItem()
}
#endif
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
void RecipientItem::setDistributionList( KPIM::DistributionList &list )
{
mDistributionList = list;
@ -142,7 +142,7 @@ TQString RecipientItem::tooltip() const
return mTooltip;
}
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
KPIM::DistributionList& RecipientItem::distributionList() {
return mDistributionList;
}
@ -152,7 +152,7 @@ KABC::DistributionList * RecipientItem::distributionList() {
}
#endif
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
TQString RecipientItem::createTooltip( KPIM::DistributionList &distributionList ) const
{
TQString txt = "<qt>";
@ -342,7 +342,7 @@ void SearchLine::keyPressEvent( TQKeyEvent *ev )
RecipientsPicker::RecipientsPicker( TQWidget *parent )
: TQDialog( parent, "RecipientsPicker" )
#ifndef KDEPIM_NEW_DISTRLISTS
#ifndef TDEPIM_NEW_DISTRLISTS
, mDistributionListManager( 0 )
#endif
,mLdapSearchDialog( 0 )
@ -452,7 +452,7 @@ RecipientsPicker::~RecipientsPicker()
{
writeConfig();
#ifndef KDEPIM_NEW_DISTRLISTS
#ifndef TDEPIM_NEW_DISTRLISTS
delete mDistributionListManager;
#endif
@ -497,7 +497,7 @@ void RecipientsPicker::insertAddressBook( KABC::AddressBook *addressbook )
TQStringList emails = (*it).emails();
TQStringList::ConstIterator it3;
for( it3 = emails.begin(); it3 != emails.end(); ++it3 ) {
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
RecipientItem *item = new RecipientItem( mAddressBook );
#else
RecipientItem *item = new RecipientItem;
@ -547,7 +547,7 @@ void RecipientsPicker::insertDistributionLists()
{
mDistributionLists->deleteAll();
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
TQValueList<KPIM::DistributionList> lists = KPIM::DistributionList::allDistributionLists( mAddressBook );
for ( uint i = 0; i < lists.count(); ++i ) {
RecipientItem *item = new RecipientItem( mAddressBook );
@ -583,7 +583,7 @@ void RecipientsPicker::insertRecentAddresses()
KABC::Addressee::List::ConstIterator it;
for( it = recents.begin(); it != recents.end(); ++it ) {
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
RecipientItem *item = new RecipientItem( mAddressBook );
#else
RecipientItem *item = new RecipientItem;
@ -637,7 +637,7 @@ void RecipientsPicker::setRecipients( const Recipient::List &recipients )
// a detached copy.
RecipientItem::List items = mDistributionLists->items();
RecipientItem::List::ConstIterator distIt;
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
for ( distIt = items.begin(); distIt != items.end(); ++distIt ) {
if ( (*it).email() == (*distIt)->name() ) {
item = new RecipientItem( mAddressBook );
@ -661,7 +661,7 @@ void RecipientsPicker::setRecipients( const Recipient::List &recipients )
a.setNameFromString( name );
a.insertEmail( email );
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
item = new RecipientItem( mAddressBook );
#else
item = new RecipientItem;
@ -865,7 +865,7 @@ void RecipientsPicker::ldapSearchResult()
KABC::Addressee ad;
ad.setNameFromString( name );
ad.insertEmail( email );
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
RecipientItem *item = new RecipientItem( mAddressBook );
#else
RecipientItem *item = new RecipientItem;

12
kmail/recipientspicker.h
Unescape View File

@ -21,7 +21,7 @@
#ifndef RECIPIENTSPICKER_H
#define RECIPIENTSPICKER_H
#include <config.h> // for KDEPIM_NEW_DISTRLISTS
#include <config.h> // for TDEPIM_NEW_DISTRLISTS
#include "recipientseditor.h"
@ -36,7 +36,7 @@
class TQComboBox;
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
#include <libtdepim/distributionlist.h>
#else
namespace KABC {
@ -54,7 +54,7 @@ class RecipientItem
public:
typedef TQValueList<RecipientItem *> List;
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
RecipientItem( KABC::AddressBook *ab );
void setDistributionList( KPIM::DistributionList& );
KPIM::DistributionList& distributionList();
@ -79,7 +79,7 @@ class RecipientItem
TQString tooltip() const;
private:
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
TQString createTooltip( KPIM::DistributionList & ) const;
#else
TQString createTooltip( KABC::DistributionList * ) const;
@ -89,7 +89,7 @@ class RecipientItem
TQString mName;
TQString mEmail;
TQString mRecipient;
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
KPIM::DistributionList mDistributionList;
KABC::AddressBook *mAddressBook;
#else
@ -240,7 +240,7 @@ class RecipientsPicker : public TQDialog
RecipientsCollection *mDistributionLists;
RecipientsCollection *mSelectedRecipients;
#ifndef KDEPIM_NEW_DISTRLISTS
#ifndef TDEPIM_NEW_DISTRLISTS
KABC::DistributionListManager *mDistributionListManager;
#endif

6
kmail/stl_util.h
Unescape View File

@ -29,8 +29,8 @@
your version.
*/
#ifndef __KDEPIM__KMAIL__STL_UTIL_H__
#define __KDEPIM__KMAIL__STL_UTIL_H__
#ifndef __TDEPIM__KMAIL__STL_UTIL_H__
#define __TDEPIM__KMAIL__STL_UTIL_H__
#include <algorithm>
@ -61,4 +61,4 @@ namespace kdtools {
} // namespace kdtools
#endif // __KDEPIM__KMAIL__STL_UTIL_H__
#endif // __TDEPIM__KMAIL__STL_UTIL_H__

2
kmailcvt/Makefile.am
Unescape View File

@ -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) -ltdefx $(LIB_KIO) -lktexteditor
kmailcvt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
KDE_ICON=AUTO

6
kmobile/Makefile.am
Unescape View File

@ -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) -ltdefx $(LIB_KIO) -lktexteditor
kmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -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 \
@ -26,10 +26,10 @@ libkmobiledevice_la_LIBADD = $(LIB_KABC) $(LIB_LOCKDEV) ../libkcal/libkcal.la
# the KDE application's client library to KMobile
libkmobileclient_la_SOURCES = kmobileclient.cpp
libkmobileclient_la_LDFLAGS = $(all_libraries) -no-undefined -avoid-version
libkmobileclient_la_LIBADD = $(LIB_KDECORE) -lDCOP
libkmobileclient_la_LIBADD = $(LIB_TDECORE) -lDCOP
EXTRA_PROGRAMS = testlibkmobile
testlibkmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testlibkmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testlibkmobile_LDADD = libkmobileclient.la
testlibkmobile_SOURCES = testlibkmobile.cpp

6
knode/Makefile.am
Unescape View File

@ -11,18 +11,18 @@ 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 -ltdepim
libknodepart_la_LIBADD = libknodecommon.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(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) -ltdefx $(LIB_KIO) -lktexteditor
knode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
knode_LDADD = libknodecommon.la
kcm_knode_la_SOURCES = knconfigpages.cpp
kcm_knode_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_knode_la_LIBADD = libknodecommon.la $(LIB_KDECORE)
kcm_knode_la_LIBADD = libknodecommon.la $(LIB_TDECORE)
knconfigpages.lo: smtpaccountwidget_base.h
libknodecommon_la_LDFLAGS = -version-info 3:0:0 -no-undefined $(all_libraries)

4
knotes/Makefile.am
Unescape View File

@ -28,14 +28,14 @@ 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 -ltdeprint -lkutils
knotes_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
knotes_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -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 -ltdeprint $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) -lkresources
$(top_builddir)/libkcal/libkcal.la -ltdeprint $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -lkresources
METASOURCES = AUTO

2
kode/Makefile.am
Unescape View File

@ -14,7 +14,7 @@ libkode_la_LIBADD = -ltdecore
bin_PROGRAMS = kode
kode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kode_LDADD = libkode.la -lkabc
kode_SOURCES = kodemain.cpp

2
kode/kwsdl/Makefile.am
Unescape View File

@ -11,7 +11,7 @@ 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) -ltdefx $(LIB_KIO) -lktexteditor
kwsdl_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kwsdl_compiler_LDADD = ../libkode.la libwsdl.la
kwsdl_compiler_SOURCES = compiler.cpp converter.cpp creator.cpp main.cpp \
namemapper.cpp

2
kode/kwsdl/kung/Makefile.am
Unescape View File

@ -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) -ltdefx $(LIB_KIO) -lktexteditor
kung_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -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 \

2
kode/kwsdl/schema/Makefile.am
Unescape View File

@ -8,7 +8,7 @@ libschema_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
libschema_la_LIBADD = -lqt-mt -ltdecore -lkio
#bin_PROGRAMS = schematest
#schematest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
#schematest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
#schematest_SOURCES = main.cpp
#schematest_LDADD = libschema.la

2
kode/kwsdl/tests/google/Makefile.am
Unescape View File

@ -5,5 +5,5 @@ 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 = -ltdecore -lkio
googletest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
googletest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor

2
kode/kwsdl/wscl/Makefile.am
Unescape View File

@ -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) -ltdefx $(LIB_KIO) -lktexteditor
#wscltest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
#wscltest_SOURCES = main.cpp
#wscltest_LDADD = libwscl.la

2
kode/kxml_compiler/Makefile.am
Unescape View File

@ -2,7 +2,7 @@ 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) -ltdefx $(LIB_KIO) -lktexteditor
kxml_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kxml_compiler_LDADD = ../libkode.la -ltdecore
kxml_compiler_SOURCES = parser.cpp creator.cpp kxml_compiler.cpp

2
konsolekalendar/Makefile.am
Unescape View File

@ -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) -ltdefx $(LIB_KIO) -lktexteditor
konsolekalendar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
appsdir = $(kde_appsdir)/Utilities
xdg_apps_DATA = konsolekalendar.desktop

2
kontact/TODO
Unescape View File

@ -2,7 +2,7 @@ UNTIL KDE 3.2
==============
- merge config of parts into a unified config dialog
* Unified Identity handling (Name, Mail address, SMTP, use KMIdentity KDEPIM wide?)
* Unified Identity handling (Name, Mail address, SMTP, use KMIdentity TDEPIM wide?)
Currently this is dublicated in at least KMail, KNode and KOrganizer
* Molularize KOrganizer and KMail Settings and turn them into kcm's
* Think about extending the kcm idea and add a framework to locate kcm's for apps via KTrader

2
kontact/plugins/kmail/Makefile.am
Unescape View File

@ -15,7 +15,7 @@ libkontact_kmailplugin_la_SOURCES = kmail_plugin.cpp kmailIface.stub \
kcm_kmailsummary_la_SOURCES = kcmkmailsummary.cpp
kcm_kmailsummary_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
-avoid-version -no-undefined
kcm_kmailsummary_la_LIBADD = $(LIB_KDEUI)
kcm_kmailsummary_la_LIBADD = $(LIB_TDEUI)
kmailIface_DCOPIDLNG = true

2
kontact/plugins/korganizer/Makefile.am
Unescape View File

@ -45,7 +45,7 @@ kcm_korgsummary_la_SOURCES = kcmkorgsummary.cpp
kcm_korgsummary_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) \
$(all_libraries) \
-avoid-version -no-undefined
kcm_korgsummary_la_LIBADD = $(LIB_KDEUI)
kcm_korgsummary_la_LIBADD = $(LIB_TDEUI)
METASOURCES = AUTO

4
kontact/plugins/newsticker/Makefile.am
Unescape View File

@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces \
kde_module_LTLIBRARIES = libkontact_newstickerplugin.la kcm_kontactknt.la
libkontact_newstickerplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
libkontact_newstickerplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KDEUI) \
libkontact_newstickerplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEUI) \
$(top_builddir)/libtdepim/libtdepim.la ../../interfaces/libkpinterfaces.la
libkontact_newstickerplugin_la_SOURCES = newsticker_plugin.cpp \
@ -13,7 +13,7 @@ libkontact_newstickerplugin_la_SOURCES = newsticker_plugin.cpp \
kcm_kontactknt_la_SOURCES = kcmkontactknt.cpp
kcm_kontactknt_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
-avoid-version -no-undefined
kcm_kontactknt_la_LIBADD = $(LIB_KDEUI)
kcm_kontactknt_la_LIBADD = $(LIB_TDEUI)
METASOURCES = AUTO

2
kontact/plugins/specialdates/Makefile.am
Unescape View File

@ -17,7 +17,7 @@ libkontact_specialdatesplugin_la_SOURCES = specialdates_plugin.cpp \
kcm_sdsummary_la_SOURCES = kcmsdsummary.cpp
kcm_sdsummary_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
-avoid-version -no-undefined
kcm_sdsummary_la_LIBADD = $(LIB_KDEUI)
kcm_sdsummary_la_LIBADD = $(LIB_TDEUI)
METASOURCES = AUTO

2
kontact/plugins/summary/Makefile.am
Unescape View File

@ -13,7 +13,7 @@ libkontact_summaryplugin_la_SOURCES = summaryview_plugin.cpp summaryview_part.cp
kcm_kontactsummary_la_SOURCES = kcmkontactsummary.cpp
kcm_kontactsummary_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
-avoid-version -no-undefined
kcm_kontactsummary_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS)
kcm_kontactsummary_la_LIBADD = $(LIB_TDEUI) $(LIB_KUTILS)
METASOURCES = AUTO

4
kontact/src/Makefile.am
Unescape View File

@ -4,13 +4,13 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir) $(all_includes)
lib_LTLIBRARIES = libkontact.la
libkontact_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
libkontact_la_LIBADD = $(LIB_KDECORE)
libkontact_la_LIBADD = $(LIB_TDECORE)
libkontact_la_SOURCES = prefs.kcfgc
bin_PROGRAMS = kontact
kontact_METASOURCES = AUTO
kontact_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kontact_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -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)

10
korganizer/Makefile.am
Unescape View File

@ -14,7 +14,7 @@ INCLUDES = \
bin_PROGRAMS = korganizer
korganizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
korganizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
korganizer_LDADD = libkorganizer.la
korganizer_SOURCES = main.cpp korganizer.cpp koapp.cpp
korganizer_COMPILE_FIRST = koprefs_base.h
@ -25,23 +25,23 @@ kde_module_LTLIBRARIES = kcm_korganizer.la libkorganizerpart.la
kcm_korganizer_la_SOURCES = koprefsdialog.cpp
kcm_korganizer_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_korganizer_la_LIBADD = libkorganizer.la $(top_builddir)/libtdepim/libtdepim.la \
$(LIB_KDECORE)
$(LIB_TDECORE)
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/ -ltdepim -L$(top_builddir)/libkcal/ -lkcal -lkorganizer_calendar
libkorganizerpart_la_LIBADD = libkorganizer.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KPARTS) $(LIB_KIO) $(LIB_KHTML) $(LIB_TDEUI) -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) -ltdefx $(LIB_KIO) -lktexteditor
korgplugins_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -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) -ltdefx $(LIB_KIO) -lktexteditor
timezone_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
timezone_LDADD = libkorganizer.la $(LIB_KSYCOCA)
timezone_SOURCES = timezone.cpp
timezone_COMPILE_FIRST = koprefs_base.h

2
korganizer/README
Unescape View File

@ -6,7 +6,7 @@
http://korganizer.kde.org
Next release: KDEPIM-3.3 (something like May 2004)
Next release: TDEPIM-3.3 (something like May 2004)
QUICK NOTES ON WHAT'S NEW IN THE DIFFERENT VERSIONS:

6
korganizer/koattendeeeditor.cpp
Unescape View File

@ -18,7 +18,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <config.h> // for KDEPIM_NEW_DISTRLISTS
#include <config.h> // for TDEPIM_NEW_DISTRLISTS
#include "koattendeeeditor.h"
#include "koprefs.h"
@ -34,7 +34,7 @@
#include <libemailfunctions/email.h>
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
#include "distributionlist.h"
#else
#include <kabc/distributionlist.h>
@ -560,7 +560,7 @@ KABC::Addressee::List KOAttendeeEditor::expandDistList( const TQString &text )
KABC::Addressee::List aList;
KABC::AddressBook *abook = KABC::StdAddressBook::self( true );
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
const TQValueList<KPIM::DistributionList::Entry> eList =
KPIM::DistributionList::findByName( abook, text ).entries( abook );
TQValueList<KPIM::DistributionList::Entry>::ConstIterator eit;

10
korganizer/koeditorattachments.cpp
Unescape View File

@ -553,7 +553,7 @@ void KOEditorAttachments::handlePasteOrDrop( TQMimeSource* source )
KVCardDrag::decode( source, addressees );
for ( KABC::Addressee::List::ConstIterator it = addressees.constBegin();
it != addressees.constEnd(); ++it ) {
urls.append( KDEPIMPROTOCOL_CONTACT + ( *it ).uid() );
urls.append( TDEPIMPROTOCOL_CONTACT + ( *it ).uid() );
// there is some weirdness about realName(), hence fromUtf8
labels.append( TQString::fromUtf8( ( *it ).realName().latin1() ) );
}
@ -788,13 +788,13 @@ void KOEditorAttachments::addUriAttachment( const TQString &uri,
item->setUri( uri );
item->setLabel( label );
if ( mimeType.isEmpty() ) {
if ( uri.startsWith( KDEPIMPROTOCOL_CONTACT ) ) {
if ( uri.startsWith( TDEPIMPROTOCOL_CONTACT ) ) {
item->setMimeType( "text/directory" );
} else if ( uri.startsWith( KDEPIMPROTOCOL_EMAIL ) ) {
} else if ( uri.startsWith( TDEPIMPROTOCOL_EMAIL ) ) {
item->setMimeType( "message/rfc822" );
} else if ( uri.startsWith( KDEPIMPROTOCOL_INCIDENCE ) ) {
} else if ( uri.startsWith( TDEPIMPROTOCOL_INCIDENCE ) ) {
item->setMimeType( "text/calendar" );
} else if ( uri.startsWith( KDEPIMPROTOCOL_NEWSARTICLE ) ) {
} else if ( uri.startsWith( TDEPIMPROTOCOL_NEWSARTICLE ) ) {
item->setMimeType( "message/news" );
} else {
item->setMimeType( KMimeType::findByURL( uri )->name() );

8
korganizer/korgac/Makefile.am
Unescape View File

@ -2,8 +2,8 @@ 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) -ltdefx $(LIB_KIO) -lktexteditor
korgac_LDADD = $(LIB_KDEUI) \
korgac_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
korgac_LDADD = $(LIB_TDEUI) \
$(top_builddir)/korganizer/libkorganizer_eventviewer.la
korgac_SOURCES = korgacmain.cpp alarmdialog.cpp \
alarmdockwindow.cpp koalarmclient.cpp \
@ -11,8 +11,8 @@ korgac_SOURCES = korgacmain.cpp alarmdialog.cpp \
check_PROGRAMS = testalarmdlg
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 \
testalarmdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testalarmdlg_LDADD = $(LIB_TDEUI) $(top_builddir)/libkcal/libkcal.la \
$(top_builddir)/korganizer/libkorganizer_eventviewer.la
testalarmdlg_SOURCES = testalarmdlg.cpp alarmdialog.cpp

2
korganizer/plugins/datenums/Makefile.am
Unescape View File

@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libkorg_datenums.la
libkorg_datenums_la_SOURCES = configdialog.cpp datenums.cpp
libkorg_datenums_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries)
libkorg_datenums_la_LIBADD = $(top_builddir)/korganizer/libkorganizer.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
libkorg_datenums_la_LIBADD = $(top_builddir)/korganizer/libkorganizer.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
noinst_HEADERS = datenums.h

2
korganizer/plugins/exchange/Makefile.am
Unescape View File

@ -15,7 +15,7 @@ libkorg_exchange_la_SOURCES = exchange.cpp exchangedialog.cpp exchangeconfig.cp
libkorg_exchange_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries)
libkorg_exchange_la_LIBADD = $(top_builddir)/korganizer/libkorganizer.la \
$(top_builddir)/libkpimexchange/libkpimexchange.la \
$(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) \
$(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) \
$(top_builddir)/libkcal/libkcal.la
noinst_HEADERS = exchange.h exchangedialog.h exchangeconfig.h

2
korganizer/plugins/hebrew/Makefile.am
Unescape View File

@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = libkorg_hebrew.la
libkorg_hebrew_la_SOURCES = hebrew.cpp configdialog.cpp holiday.cpp parsha.cpp converter.cpp
libkorg_hebrew_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries)
libkorg_hebrew_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
libkorg_hebrew_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
noinst_HEADERS = hebrew.h configdialog.h parsha.h converter.h holiday.h

2
korganizer/plugins/printing/journal/Makefile.am
Unescape View File

@ -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/ -ltdepim
libkorg_journalprint_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(top_builddir)/korganizer/printing/libkorg_stdprinting.la -L$(top_builddir)/libtdepim/ -ltdepim
noinst_HEADERS =

2
korganizer/plugins/printing/list/Makefile.am
Unescape View File

@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libkorg_listprint.la
libkorg_listprint_la_SOURCES = calprintlistconfig_base.ui listprint.cpp
libkorg_listprint_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries)
libkorg_listprint_la_LIBADD = $(LIB_KDECORE) $(LIB_KDEUI) $(top_builddir)/korganizer/printing/libkorg_stdprinting.la
libkorg_listprint_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEUI) $(top_builddir)/korganizer/printing/libkorg_stdprinting.la
noinst_HEADERS =

2
korganizer/plugins/printing/whatsnext/Makefile.am
Unescape View File

@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libkorg_whatsnextprint.la
libkorg_whatsnextprint_la_SOURCES = calprintwhatsnextconfig_base.ui whatsnextprint.cpp
libkorg_whatsnextprint_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries)
libkorg_whatsnextprint_la_LIBADD = $(LIB_KDECORE) $(LIB_KDEUI) $(top_builddir)/korganizer/printing/libkorg_stdprinting.la
libkorg_whatsnextprint_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEUI) $(top_builddir)/korganizer/printing/libkorg_stdprinting.la
noinst_HEADERS =

2
korganizer/plugins/printing/year/Makefile.am
Unescape View File

@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libkorg_yearlyprint.la
libkorg_yearlyprint_la_SOURCES =calprintyearconfig_base.ui yearprint.cpp
libkorg_yearlyprint_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries)
libkorg_yearlyprint_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KDEPRINT) $(top_builddir)/korganizer/printing/libkorg_stdprinting.la
libkorg_yearlyprint_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPRINT) $(top_builddir)/korganizer/printing/libkorg_stdprinting.la
noinst_HEADERS =

4
korganizer/printing/Makefile.am
Unescape View File

@ -12,7 +12,7 @@ lib_LTLIBRARIES = libkocorehelper.la libkorg_stdprinting.la
libkocorehelper_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) \
-no-undefined -version-info 1:0
libkocorehelper_la_LIBADD = $(LIB_KDEUI)
libkocorehelper_la_LIBADD = $(LIB_TDEUI)
libkocorehelper_la_SOURCES = cellitem.cpp
libkorg_stdprinting_la_SOURCES = calprinter.cpp calprintpluginbase.cpp \
@ -22,7 +22,7 @@ libkorg_stdprinting_la_SOURCES = calprinter.cpp calprintpluginbase.cpp \
calprintincidenceconfig_base.ui
libkorg_stdprinting_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \
-no-undefined -version-info 1:0
libkorg_stdprinting_la_LIBADD = $(LIB_KDEUI) libkocorehelper.la \
libkorg_stdprinting_la_LIBADD = $(LIB_TDEUI) libkocorehelper.la \
$(top_builddir)/libtdepim/libtdepim.la \
$(top_builddir)/libkcal/libkcal.la \
-ltdeprint

2
korn/Makefile.am
Unescape View File

@ -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) -ltdefx $(LIB_KIO) -lktexteditor
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
METASOURCES = AUTO

2
korn/kconf_update/Makefile.am
Unescape View File

@ -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) -ltdefx $(LIB_KIO) -lktexteditor
korn_3_4_config_change_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
korn_3_4_config_change_LDADD = $(LIB_QT)

4
kresources/caldav/export.h
Unescape View File

@ -30,8 +30,8 @@
Boston, MA 02110-1301, USA.
*/
#ifndef KRESOURCES_KDEPIM_EXPORT_H
#define KRESOURCES_KDEPIM_EXPORT_H
#ifndef KRESOURCES_TDEPIM_EXPORT_H
#define KRESOURCES_TDEPIM_EXPORT_H
/** Exports a function returning kresources plugin factory, for resource class @a resourceclass,
* @a resourceconfigclass config class and @a catalog catalog.

4
kresources/carddav/export.h
Unescape View File

@ -30,8 +30,8 @@
Boston, MA 02110-1301, USA.
*/
#ifndef KRESOURCES_KDEPIM_EXPORT_H
#define KRESOURCES_KDEPIM_EXPORT_H
#ifndef KRESOURCES_TDEPIM_EXPORT_H
#define KRESOURCES_TDEPIM_EXPORT_H
/** Exports a function returning kresources plugin factory, for resource class @a resourceclass,
* @a resourceconfigclass config class and @a catalog catalog.

4
kresources/exchange/resourceexchangeconfig.h
Unescape View File

@ -19,8 +19,8 @@
Boston, MA 02110-1301, USA.
*/
#ifndef KDEPIM_RESOURCECALENDAREXCHANGECONFIG_H
#define KDEPIM_RESOURCECALENDAREXCHANGECONFIG_H
#ifndef TDEPIM_RESOURCECALENDAREXCHANGECONFIG_H
#define TDEPIM_RESOURCECALENDAREXCHANGECONFIG_H
#include <tqcheckbox.h>

8
kresources/featureplan/Makefile.am
Unescape View File

@ -28,13 +28,13 @@ kcal_service_DATA = kcal_resourcefeatureplan.desktop
check_PROGRAMS = dumpfeaturelist benchmarkfeaturelist
dumpfeaturelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
dumpfeaturelist_LDADD = libfeatureplancommon.la $(LIB_KDECORE)
dumpfeaturelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
dumpfeaturelist_LDADD = libfeatureplancommon.la $(LIB_TDECORE)
dumpfeaturelist_SOURCES = dumpfeaturelist.cpp
dumpfeaturelist_COMPILE_FIRST = kde-features.h
benchmarkfeaturelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
benchmarkfeaturelist_LDADD = libfeatureplancommon.la $(LIB_KDECORE)
benchmarkfeaturelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
benchmarkfeaturelist_LDADD = libfeatureplancommon.la $(LIB_TDECORE)
benchmarkfeaturelist_SOURCES = benchmarkfeaturelist.cpp
benchmarkfeaturelist_COMPILE_FIRST = kde-features.h

2
kresources/groupwise/soap/Makefile.am
Unescape View File

@ -5,7 +5,7 @@ KDE_CXXFLAGS = -Wno-non-virtual-dtor
check_PROGRAMS = soapdebug
soapdebug_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
soapdebug_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
soapdebug_LDADD = libgwsoap.la -ltdecore \
$(top_builddir)/libkcal/libkcal.la \
$(top_builddir)/libtdepim/libtdepim.la

2
kresources/groupwise/soap/groupwiseserver.cpp
Unescape View File

@ -307,7 +307,7 @@ bool GroupwiseServer::login()
_ngwm__loginResponse loginResp;
_ngwm__loginRequest loginReq;
loginReq.application = soap_new_std__string( mSoap, -1 );
loginReq.application->append( "KDEPIM" );
loginReq.application->append( "TDEPIM" );
loginReq.language.append( "us" );
loginReq.version.append( "1" );

4
kresources/newexchange/exchangeconvertercalendar.cpp
Unescape View File

@ -221,9 +221,9 @@ kdDebug()<<"ExchangeConverterCalendar::readIncidencd"<<endl;
readTZ( node, incidence );
if ( WebdavHandler::extractString( node, "getetag", tmpstr ) )
incidence->setCustomProperty( "KDEPIM-Exchange-Resource", "fingerprint", tmpstr );
incidence->setCustomProperty( "TDEPIM-Exchange-Resource", "fingerprint", tmpstr );
if ( WebdavHandler::extractString( node, "href", tmpstr ) )
incidence->setCustomProperty( "KDEPIM-Exchange-Resource", "href", tmpstr );
incidence->setCustomProperty( "TDEPIM-Exchange-Resource", "href", tmpstr );
// FIXME: use repl-uid as scheduling id?
if ( WebdavHandler::extractString( node, "textdescription", tmpstr ) )

4
kresources/newexchange/exchangeconvertercontact.cpp
Unescape View File

@ -221,9 +221,9 @@ bool ExchangeConverterContact::readAddressee( const TQDomElement &node, Addresse
return false;
}
if ( WebdavHandler::extractString( node, "getetag", tmpstr ) )
addressee.insertCustom( "KDEPIM-Exchange-Resource", "fingerprint", tmpstr );
addressee.insertCustom( "TDEPIM-Exchange-Resource", "fingerprint", tmpstr );
if ( WebdavHandler::extractString( node, "href", tmpstr ) )
addressee.insertCustom( "KDEPIM-Exchange-Resource", "href", tmpstr );
addressee.insertCustom( "TDEPIM-Exchange-Resource", "href", tmpstr );
/* KDE4: addressee does not have any creation or modification date :-(( */
/* KDE4: read-only not supported by libkabc */

8
kresources/newexchange/exchangeglobals.cpp
Unescape View File

@ -251,8 +251,8 @@ kdDebug() << "ExchangeGlobals::interpretCalendarDownloadItemsJob(): TQDomDocumen
bool res = false;
KCal::Incidence::List::Iterator it = incidences.begin();
for ( ; it != incidences.end(); ++it ) {
TQString fpr = (*it)->customProperty( "KDEPIM-Exchange-Resource", "fingerprint" );
KURL href( (*it)->customProperty( "KDEPIM-Exchange-Resource", "href" ) );
TQString fpr = (*it)->customProperty( "TDEPIM-Exchange-Resource", "fingerprint" );
KURL href( (*it)->customProperty( "TDEPIM-Exchange-Resource", "href" ) );
adaptor->calendarItemDownloaded( (*it), (*it)->uid(), href, fpr, href.prettyURL() );
res = true;
}
@ -274,8 +274,8 @@ kdDebug() << "ExchangeGlobals::interpretAddressBookDownloadItemsJob(): TQDomDocu
bool res = false;
KABC::Addressee::List::Iterator it = addressees.begin();
for ( ; it != addressees.end(); ++it ) {
TQString fpr = (*it).custom( "KDEPIM-Exchange-Resource", "fingerprint" );
KURL href( (*it).custom( "KDEPIM-Exchange-Resource", "href" ) );
TQString fpr = (*it).custom( "TDEPIM-Exchange-Resource", "fingerprint" );
KURL href( (*it).custom( "TDEPIM-Exchange-Resource", "href" ) );
adaptor->addressbookItemDownloaded( (*it), (*it).uid(), href, fpr, href.prettyURL() );
res = true;
}

2
kresources/scalix/scalixadmin/Makefile.am
Unescape View File

@ -2,7 +2,7 @@ bin_PROGRAMS = scalixadmin
INCLUDES = $(all_includes)
scalixadmin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
scalixadmin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -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 \

2
kresources/slox/Makefile.am
Unescape View File

@ -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) -ltdefx $(LIB_KIO) -lktexteditor
testsloxaccounts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testsloxaccounts_LDADD = libkslox.la
testsloxaccounts_SOURCES = testsloxaccounts.cpp

2
ktnef/gui/Makefile.am
Unescape View File

@ -4,7 +4,7 @@ SUBDIRS = pics
bin_PROGRAMS = ktnef
ktnef_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
ktnef_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -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 \

2
ktnef/lib/Makefile.am
Unescape View File

@ -4,7 +4,7 @@ lib_LTLIBRARIES = libktnef.la
libktnef_la_SOURCES = ktnefparser.cpp ktnefproperty.cpp ktnefattach.cpp mapi.cpp \
ktnefpropertyset.cpp ktnefmessage.cpp ktnefwriter.cpp lzfu.cpp
libktnef_la_LIBADD = $(LIB_KDECORE) $(LIB_KIO)
libktnef_la_LIBADD = $(LIB_TDECORE) $(LIB_KIO)
libktnef_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
libktnef_la_METASOURCES = AUTO

4
ktnef/tests/Makefile.am
Unescape View File

@ -1,10 +1,10 @@
AM_CPPFLAGS = -I$(top_srcdir)/ktnef $(all_includes) -DKDESRCDIR=\"$(srcdir)\"
LDADD = ../lib/libktnef.la $(LIB_KDECORE)
LDADD = ../lib/libktnef.la $(LIB_TDECORE)
check_PROGRAMS = parsertest
TESTS = parsertest
parsertest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
parsertest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
parsertest_SOURCES = parsertest.cpp
METASOURCES = AUTO

2
libemailfunctions/CMakeLists.txt
Unescape View File

@ -24,7 +24,7 @@ link_directories(
##### header files ################################
if( BUILD_LIBKDEPIM )
if( BUILD_LIBTDEPIM )
install( FILES idmapper.h DESTINATION ${INCLUDE_INSTALL_DIR}/kde/libemailfunctions )
endif()

2
libemailfunctions/Makefile.am
Unescape View File

@ -7,7 +7,7 @@ libemailfunctions_la_SOURCES = email.cpp idmapper.cpp kasciistricmp.cpp \
libemailfunctions_la_LDFLAGS = $(all_libraries) -no-undefined
## Since this is a noinst library, in case of --enable-closure we need
## to link it explicitly to the libraries that it uses.
libemailfunctions_la_LIBADD = ../libkmime/libkmime.la $(LIB_QT) $(LIB_KDECORE)
libemailfunctions_la_LIBADD = ../libkmime/libkmime.la $(LIB_QT) $(LIB_TDECORE)
emailfunctionsincludedir = $(includedir)/libemailfunctions
emailfunctionsinclude_HEADERS = idmapper.h

2
libemailfunctions/email.cpp
Unescape View File

@ -1,7 +1,7 @@
/* -*- mode: C++; c-file-style: "gnu" -*-
This file is part of tdepim.
Copyright (c) 2004 KDEPIM developers
Copyright (c) 2004 TDEPIM developers
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public

2
libemailfunctions/email.h
Unescape View File

@ -1,7 +1,7 @@
/* -*- mode: C++; c-file-style: "gnu" -*-
This file is part of tdepim.
Copyright (c) 2004 KDEPIM developers
Copyright (c) 2004 TDEPIM developers
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public

6
libemailfunctions/tests/Makefile.am
Unescape View File

@ -1,13 +1,13 @@
AM_CPPFLAGS = -I$(top_srcdir)/libemailfunctions $(all_includes)
LDADD = ../libemailfunctions.la ../../libkmime/libkmime.la $(LIB_KDECORE)
LDADD = ../libemailfunctions.la ../../libkmime/libkmime.la $(LIB_TDECORE)
check_PROGRAMS = testidmapper testemail
TESTS = testemail
testidmapper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testidmapper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testidmapper_SOURCES = testidmapper.cpp
testemail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testemail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testemail_SOURCES = testemail.cpp
METASOURCES = AUTO

28
libkcal/tests/Makefile.am
Unescape View File

@ -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) -ltdefx $(LIB_KIO) -lktexteditor
testincidence_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -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) -ltdefx $(LIB_KIO) -lktexteditor
testcalendar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -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) -ltdefx $(LIB_KIO) -lktexteditor
testtostring_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -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) -ltdefx $(LIB_KIO) -lktexteditor
fbrecurring_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -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) -ltdefx $(LIB_KIO) -lktexteditor
readandwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -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) -ltdefx $(LIB_KIO) -lktexteditor
testresource_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -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) -ltdefx $(LIB_KIO) -lktexteditor
testrecurrence_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -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) -ltdefx $(LIB_KIO) -lktexteditor
testrecurprevious_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -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) -ltdefx $(LIB_KIO) -lktexteditor
testrecurson_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -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) -ltdefx $(LIB_KIO) -lktexteditor
testrecurrencetype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -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) -ltdefx $(LIB_KIO) -lktexteditor
testvcalexport_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -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) -ltdefx $(LIB_KIO) -lktexteditor
testfields_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -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) -ltdefx $(LIB_KIO) -lktexteditor
testfb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -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) -ltdefx $(LIB_KIO) -lktexteditor
testcalselectdialog_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testcalselectdialog_LDADD = ../libkcal.la
TESTFILES = test1.ics test2.ics test3.ics test4.ics test5.ics test_Mozilla.ics

10
libkdenetwork/gpgmepp/configure.in.in
Unescape View File

@ -1,11 +1,11 @@
dnl BEGIN inline of gpgme.m4 from gpgme 0.4.4
dnl remaned from AM_PATH_GPGME to KDEPIM_PATH_GPGME and inlined here
dnl remaned from AM_PATH_GPGME to TDEPIM_PATH_GPGME and inlined here
dnl to not require aclocal fiddling...
dnl Autoconf macros for libgpgme
dnl Id: gpgme.m4,v 1.6 2003/09/03 01:15:56 marcus Exp
AC_DEFUN([_KDEPIM_PATH_GPGME_CONFIG],
AC_DEFUN([_TDEPIM_PATH_GPGME_CONFIG],
[ AC_ARG_WITH(gpgme-prefix,
AC_HELP_STRING([--with-gpgme-prefix=PFX],
[prefix where GPGME is installed (optional)]),
@ -32,8 +32,8 @@ dnl AM_PATH_GPGME([MINIMUM-VERSION,
dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
dnl Test for libgpgme and define GPGME_CFLAGS and GPGME_LIBS.
dnl
AC_DEFUN([KDEPIM_PATH_GPGME],
[ AC_REQUIRE([_KDEPIM_PATH_GPGME_CONFIG])dnl
AC_DEFUN([TDEPIM_PATH_GPGME],
[ AC_REQUIRE([_TDEPIM_PATH_GPGME_CONFIG])dnl
min_gpgme_version=ifelse([$1], ,0.4.2,$1)
AC_MSG_CHECKING(for GPGME - version >= $min_gpgme_version)
ok=no
@ -91,7 +91,7 @@ dnl END inline of gpgme.m4
# If you change this minimum version here, update also configure.in.bot
tdepim_needs_gpgme_copy=""
KDEPIM_PATH_GPGME(0.4.5,[
TDEPIM_PATH_GPGME(0.4.5,[
AC_LANG_SAVE
AC_LANG_C
tdepim_gpgmepp_save_cflags="$CFLAGS"

2
libkmime/Makefile.am
Unescape View File

@ -22,7 +22,7 @@ libkmime_la_SOURCES = \
libkmime_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 4:0:2
libkmime_la_LIBADD = $(LIB_KDECORE) $(LIB_POLL)
libkmime_la_LIBADD = $(LIB_TDECORE) $(LIB_POLL)
METASOURCES = AUTO

2
libkpgp/Makefile.am
Unescape View File

@ -16,7 +16,7 @@ libkpgp_la_SOURCES = \
libkpgp_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 4:0:2
libkpgp_la_LIBADD = $(LIB_KDEUI) $(LIB_POLL)
libkpgp_la_LIBADD = $(LIB_TDEUI) $(LIB_POLL)
METASOURCES = AUTO

2
libkpimexchange/configure.in.in
Unescape View File

@ -30,6 +30,6 @@ if test "x$ac_use_exchange" != "xyes" || test "x$ac_has_recent_webdav" != "xyes"
DO_NOT_COMPILE="$DO_NOT_COMPILE libkpimexchange"
AC_MSG_WARN([Exchange 2000 support disabled])
else
AC_DEFINE(KDEPIM_ENABLE_EXCHANGE, 1, [Define if you want Microsoft Exchange 2000 support])
AC_DEFINE(TDEPIM_ENABLE_EXCHANGE, 1, [Define if you want Microsoft Exchange 2000 support])
fi

4
libkpimexchange/core/exchangeclient.h
Unescape View File

@ -17,8 +17,8 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
#ifndef KDEPIM_EXCHANGE_CLIENT_H
#define KDEPIM_EXCHANGE_CLIENT_H
#ifndef TDEPIM_EXCHANGE_CLIENT_H
#define TDEPIM_EXCHANGE_CLIENT_H
#include <tqstring.h>
#include <tqdatetime.h>

4
libkpimexchange/core/exchangedelete.h
Unescape View File

@ -17,8 +17,8 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
#ifndef KDEPIM_EXCHANGE_DELETE_H
#define KDEPIM_EXCHANGE_DELETE_H
#ifndef TDEPIM_EXCHANGE_DELETE_H
#define TDEPIM_EXCHANGE_DELETE_H
#include <tqstring.h>
#include <tqwidget.h>

4
libkpimexchange/core/exchangedownload.h
Unescape View File

@ -17,8 +17,8 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
#ifndef KDEPIM_EXCHANGE_DOWNLOAD_H
#define KDEPIM_EXCHANGE_DOWNLOAD_H
#ifndef TDEPIM_EXCHANGE_DOWNLOAD_H
#define TDEPIM_EXCHANGE_DOWNLOAD_H
#include <tqstring.h>
#include <tqptrlist.h>

4
libkpimexchange/core/exchangemonitor.h
Unescape View File

@ -17,8 +17,8 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
#ifndef KDEPIM_EXCHANGE_MONITOR_H
#define KDEPIM_EXCHANGE_MONITOR_H
#ifndef TDEPIM_EXCHANGE_MONITOR_H
#define TDEPIM_EXCHANGE_MONITOR_H
#include <tqstring.h>
#include <tqmap.h>

4
libkpimexchange/core/exchangeupload.h
Unescape View File

@ -17,8 +17,8 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
#ifndef KDEPIM_EXCHANGE_UPLOAD_H
#define KDEPIM_EXCHANGE_UPLOAD_H
#ifndef TDEPIM_EXCHANGE_UPLOAD_H
#define TDEPIM_EXCHANGE_UPLOAD_H
#include <tqstring.h>
#include <tqwidget.h>

4
libkpimexchange/core/utils.h
Unescape View File

@ -18,8 +18,8 @@
Boston, MA 02110-1301, USA.
*/
#ifndef KDEPIM_EXCHANGE_UTILS_H
#define KDEPIM_EXCHANGE_UTILS_H
#ifndef TDEPIM_EXCHANGE_UTILS_H
#define TDEPIM_EXCHANGE_UTILS_H
#include <tqstring.h>
#include <tqdom.h>

2
libksieve/shared/Makefile.am
Unescape View File

@ -3,6 +3,6 @@ INCLUDES = -I$(top_srcdir)/libksieve $(all_includes)
noinst_LTLIBRARIES = libksieve_shared.la
libksieve_shared_la_SOURCES = error.cpp
libksieve_shared_la_LIBADD = $(LIB_KDECORE)
libksieve_shared_la_LIBADD = $(LIB_TDECORE)
libksieve_shared_la_LDFLAGS = $(all_libraries) -no-undefined

6
libtdepim/addresseelineedit.cpp
Unescape View File

@ -31,7 +31,7 @@
#include <config.h>
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
#include "distributionlist.h"
#else
#include <kabc/distributionlist.h>
@ -585,7 +585,7 @@ void AddresseeLineEdit::loadContacts()
}
}
#ifndef KDEPIM_NEW_DISTRLISTS // new distr lists are normal contact, already done above
#ifndef TDEPIM_NEW_DISTRLISTS // new distr lists are normal contact, already done above
int weight = config.readNumEntry( "DistributionLists", 60 );
KABC::DistributionListManager manager( addressBook );
manager.load();
@ -614,7 +614,7 @@ void AddresseeLineEdit::loadContacts()
void AddresseeLineEdit::addContact( const KABC::Addressee& addr, int weight, int source )
{
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
if ( KPIM::DistributionList::isDistributionList( addr ) ) {
//kdDebug(5300) << "AddresseeLineEdit::addContact() distribution list \"" << addr.formattedName() << "\" weight=" << weight << endl;

22
libtdepim/addressesdialog.cpp
Unescape View File

@ -30,7 +30,7 @@
#include <libemailfunctions/email.h>
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
#include "distributionlist.h"
#include <kresources/selectdialog.h>
#include <kabc/resource.h>
@ -395,7 +395,7 @@ AddressesDialog::allToAddressesNoDuplicates() const
KABC::Addressee::List aList = allAddressee( d->toItem );
const TQStringList dList = toDistributionLists();
KABC::AddressBook* abook = KABC::StdAddressBook::self( true );
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
for ( TQStringList::ConstIterator it = dList.begin(); it != dList.end(); ++it ) {
const TQValueList<KPIM::DistributionList::Entry> eList
= KPIM::DistributionList::findByName(abook, *it).entries(abook);
@ -593,7 +593,7 @@ AddressesDialog::initConnections()
connect( d->ui->mSelectedView, TQT_SIGNAL(doubleClicked(TQListViewItem*)),
TQT_SLOT(removeEntry()) );
#ifndef KDEPIM_NEW_DISTRLISTS
#ifndef TDEPIM_NEW_DISTRLISTS
connect( KABC::DistributionListWatcher::self(), TQT_SIGNAL( changed() ),
this, TQT_SLOT( updateAvailableAddressees() ) );
#endif
@ -850,7 +850,7 @@ AddressesDialog::removeEntry()
d->ui->mSaveAs->setEnabled(d->ui->mSelectedView->firstChild() != 0);
}
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
// copied from kabcore.cpp :(
// KDE4: should be in libkabc I think
@ -878,7 +878,7 @@ static KABC::Resource *requestResource( KABC::AddressBook* abook, TQWidget *pare
void
AddressesDialog::saveAs()
{
#ifndef KDEPIM_NEW_DISTRLISTS
#ifndef TDEPIM_NEW_DISTRLISTS
KABC::DistributionListManager manager( KABC::StdAddressBook::self( true ) );
manager.load();
#endif
@ -900,7 +900,7 @@ AddressesDialog::saveAs()
return;
bool alreadyExists = false;
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
KABC::AddressBook* abook = KABC::StdAddressBook::self( true );
KPIM::DistributionList dlist = KPIM::DistributionList::findByName( abook, name );
alreadyExists = !dlist.isEmpty();
@ -916,7 +916,7 @@ AddressesDialog::saveAs()
return;
}
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
KABC::Resource* resource = requestResource( abook, this );
if ( !resource )
return;
@ -1135,7 +1135,7 @@ AddressesDialog::addDistributionLists()
{
KABC::AddressBook* abook = KABC::StdAddressBook::self( true );
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
const TQValueList<KPIM::DistributionList> distLists =
KPIM::DistributionList::allDistributionLists( abook );
#else
@ -1152,14 +1152,14 @@ AddressesDialog::addDistributionLists()
d->topdist = new AddresseeViewItem( d->ui->mAvailableView, i18n( "Distribution Lists" ) );
}
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
TQValueList<KPIM::DistributionList>::ConstIterator listIt;
#else
TQStringList::Iterator listIt;
#endif
int total = 0;
for ( listIt = distLists.begin(); listIt != distLists.end(); ++listIt ) {
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
KPIM::DistributionList dlist = *listIt;
KPIM::DistributionList::Entry::List entries = dlist.entries(abook);
#else
@ -1172,7 +1172,7 @@ AddressesDialog::addDistributionLists()
connect( item, TQT_SIGNAL( addressSelected( AddresseeViewItem*, bool ) ),
this, TQT_SLOT( availableAddressSelected( AddresseeViewItem*, bool ) ) );
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
KPIM::DistributionList::Entry::List::Iterator itemIt;
#else
KABC::DistributionList::Entry::List::Iterator itemIt;

2
libtdepim/broadcaststatus.cpp
Unescape View File

@ -1,7 +1,7 @@
/*
broadcaststatus.cpp
This file is part of KDEPIM.
This file is part of TDEPIM.
Author: Don Sanders <sanders@kde.org>

2
libtdepim/broadcaststatus.h
Unescape View File

@ -1,7 +1,7 @@
/*
broadcaststatus.h
This file is part of KDEPIM.
This file is part of TDEPIM.
Copyright (C) 2000 Don Sanders <sanders@kde.org>

8
libtdepim/cfgc/Makefile.am
Unescape View File

@ -3,12 +3,12 @@ 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) -ltdefx $(LIB_KIO) -lktexteditor
example_LDADD = ../libtdepim.la $(LIB_KDECORE)
example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
example_LDADD = ../libtdepim.la $(LIB_TDECORE)
example_SOURCES = example.cpp exampleprefs_base.kcfgc
#autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
#autoexample_LDADD = ../libtdepim.la $(LIB_KDECORE)
#autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
#autoexample_LDADD = ../libtdepim.la $(LIB_TDECORE)
#autoexample_SOURCES = general_base.ui myoptions_base.ui autoexample.cpp
METASOURCES = AUTO

4
libtdepim/completionordereditor.cpp
Unescape View File

@ -27,7 +27,7 @@
* you do not wish to do so, delete this exception statement from
* your version.
*/
#include <config.h> // FOR KDEPIM_NEW_DISTRLISTS
#include <config.h> // FOR TDEPIM_NEW_DISTRLISTS
#include "completionordereditor.h"
#include "ldapclient.h"
@ -200,7 +200,7 @@ CompletionOrderEditor::CompletionOrderEditor( KPIM::LdapSearch* ldapSearch,
}
}
#ifndef KDEPIM_NEW_DISTRLISTS // new distr lists are normal contact, so no separate item if using them
#ifndef TDEPIM_NEW_DISTRLISTS // new distr lists are normal contact, so no separate item if using them
// Add an item for distribution lists
mItems.append( new SimpleCompletionItem( this, i18n( "Distribution Lists" ), "DistributionLists" ), 60 );
#endif

2
libtdepim/configure.in.in
Unescape View File

@ -4,7 +4,7 @@ AC_HELP_STRING([--disable-newdistrlists],
[Disables the new distribution lists (which are saved as addressee in the address book as normal contacts, useful for Kolab)]),
[ enable_new_distrlists=$enableval], [enable_new_distrlists=yes])dnl
if test "$enable_new_distrlists" = "yes" ; then
AC_DEFINE_UNQUOTED(KDEPIM_NEW_DISTRLISTS, 1, [Define if you want to use the new distribution lists])
AC_DEFINE_UNQUOTED(TDEPIM_NEW_DISTRLISTS, 1, [Define if you want to use the new distribution lists])
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)

4
libtdepim/kaddrbook.cpp
Unescape View File

@ -7,7 +7,7 @@
#include "kaddrbook.h"
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
#include "distributionlist.h"
#else
#include <kabc/distributionlist.h>
@ -233,7 +233,7 @@ TQString KAddrBookExternal::expandDistributionList( const TQString& listName )
const TQString lowerListName = listName.lower();
KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true );
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
KPIM::DistributionList distrList = KPIM::DistributionList::findByName( addressBook, lowerListName, false );
if ( !distrList.isEmpty() ) {
return distrList.emails( addressBook ).join( ", " );

2
libtdepim/komposer/core/Makefile.am
Unescape View File

@ -12,7 +12,7 @@ libkomposer_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/libtdepim/libtdepim.la -lk
#kcm_komposer_la_SOURCES = prefsmodule.cpp
#kcm_komposer_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries)
#kcm_komposer_la_LIBADD = libkomposer.la $(top_builddir)/libtdepim/libtdepim.la $(LIB_KDECORE)
#kcm_komposer_la_LIBADD = libkomposer.la $(top_builddir)/libtdepim/libtdepim.la $(LIB_TDECORE)
kpincludedir = $(includedir)/komposer
kpinclude_HEADERS = plugin.h editor.h core.h

6
libtdepim/komposer/core/tests/Makefile.am
Unescape View File

@ -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) -ltdefx $(LIB_KIO) -lktexteditor
testfactory_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -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) -ltdefx $(LIB_KIO) -lktexteditor
testmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -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) -ltdefx $(LIB_KIO) -lktexteditor
testkomposer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testkomposer_LDADD = ../libkomposer.la
check: testfactory

2
libtdepim/komposer/test/Makefile.am
Unescape View File

@ -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) -ltdefx $(LIB_KIO) -lktexteditor
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
check_PROGRAMS = test

2
libtdepim/maillistdrag.h
Unescape View File

@ -30,7 +30,7 @@
#include <tdepimmacros.h>
/**
* KDEPIM classes for drag and drop of mails
* TDEPIM classes for drag and drop of mails
*
* // Code example for drag and drop enabled widget
*

6
libtdepim/pluginloaderbase.h
Unescape View File

@ -19,8 +19,8 @@
Boston, MA 02110-1301, USA.
*/
#ifndef __LIBKDEPIM_PLUGINLOADERBASE_H__
#define __LIBKDEPIM_PLUGINLOADERBASE_H__
#ifndef __LIBTDEPIM_PLUGINLOADERBASE_H__
#define __LIBTDEPIM_PLUGINLOADERBASE_H__
#include <tqstring.h>
#include <tqmap.h>
@ -83,4 +83,4 @@ namespace KPIM {
} // namespace KMime
#endif // __LIBKDEPIM_PLUGINLOADERBASE_H__
#endif // __LIBTDEPIM_PLUGINLOADERBASE_H__

2
libtdepim/progressmanager.cpp
Unescape View File

@ -1,7 +1,7 @@
/*
progressmanager.cpp
This file is part of KDEPIM.
This file is part of TDEPIM.
Author: Till Adam <adam@kde.org> (C) 2004

2
libtdepim/progressmanager.h
Unescape View File

@ -1,7 +1,7 @@
/*
progressmanager.h
This file is part of KDEPIM.
This file is part of TDEPIM.
Author: Till Adam <adam@kde.org> (C) 2004

12
libtdepim/tdepimprotocols.h
Unescape View File

@ -19,14 +19,14 @@
Boston, MA 02110-1301, USA.
*/
#ifndef KDEPIM_KDEPIMPROTOCOLS_H
#define KDEPIM_KDEPIMPROTOCOLS_H
#ifndef TDEPIM_TDEPIMPROTOCOLS_H
#define TDEPIM_TDEPIMPROTOCOLS_H
/* a central place to store protocol strings to avoid knowledge duplication */
#define KDEPIMPROTOCOL_CONTACT "uid:"
#define KDEPIMPROTOCOL_EMAIL "kmail:"
#define KDEPIMPROTOCOL_INCIDENCE "urn:x-ical"
#define KDEPIMPROTOCOL_NEWSARTICLE "news:"
#define TDEPIMPROTOCOL_CONTACT "uid:"
#define TDEPIMPROTOCOL_EMAIL "kmail:"
#define TDEPIMPROTOCOL_INCIDENCE "urn:x-ical"
#define TDEPIMPROTOCOL_NEWSARTICLE "news:"
#endif

8
libtdepim/tests/Makefile.am
Unescape View File

@ -1,6 +1,6 @@
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) -ltdefx $(LIB_KIO) -lktexteditor
LDADD = ../libtdepim.la $(LIB_KDECORE)
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
LDADD = ../libtdepim.la $(LIB_TDECORE)
check_PROGRAMS = testwizard testaddresseelineedit \
testaddresseeselector \
@ -29,7 +29,7 @@ testkincidencechooser_SOURCES = testkincidencechooser.cpp
METASOURCES = AUTO
#example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
#example_LDADD = ../libtdepim.la $(LIB_KDECORE)
#example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
#example_LDADD = ../libtdepim.la $(LIB_TDECORE)
#example_SOURCES = example.cpp exampleprefs_base.kcfgc

22
wizards/Makefile.am
Unescape View File

@ -19,8 +19,8 @@ kde_module_LTLIBRARIES = libegroupwarewizard.la libsloxwizard.la \
libscalixwizard.la
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) \
groupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
groupwarewizard_LDADD = libegroupwarewizard.la libsloxwizard.la $(LIB_TDEUI) \
libkolabwizard.la \
libexchangewizard.la \
libgroupwisewizard.la
@ -38,8 +38,8 @@ libkolabwizard_la_LIBADD = $(top_builddir)/kresources/kolab/kcal/libkcalkolab.la
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) -ltdefx $(LIB_KIO) -lktexteditor
kolabwizard_LDADD = libkolabwizard.la $(LIB_TDEUI)
kolabwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kolabwizard_SOURCES = kolabmain.cpp
# eGroupware
@ -50,10 +50,10 @@ libegroupwarewizard_la_LIBADD = $(top_builddir)/kresources/egroupware/libkabc_xm
$(top_builddir)/kresources/egroupware/libknotes_xmlrpc.la \
$(top_builddir)/libkcal/libkcal.la \
$(top_builddir)/libtdepim/libtdepim.la \
$(LIB_KDEUI)
$(LIB_TDEUI)
egroupwarewizard_LDADD = libegroupwarewizard.la
egroupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
egroupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -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) -ltdefx $(LIB_KIO) -lktexteditor
sloxwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -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) -ltdefx $(LIB_KIO) -lktexteditor
groupwisewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -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) -ltdefx $(LIB_KIO) -lktexteditor
exchangewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
exchangewizard_SOURCES = exchangemain.cpp
# Scalix
@ -105,8 +105,8 @@ libscalixwizard_la_LIBADD = $(top_builddir)/kresources/scalix/kcal/libkcalscalix
libscalixwizard_la_SOURCES = scalixwizard.cpp kmailchanges.cpp scalixconfig.kcfgc \
scalixkmailchanges.cpp
scalixwizard_LDADD = libscalixwizard.la $(LIB_KDEUI)
scalixwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
scalixwizard_LDADD = libscalixwizard.la $(LIB_TDEUI)
scalixwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
scalixwizard_SOURCES = scalixmain.cpp
noinst_HEADERS = egroupwarewizard.h kmailchanges.h kolabwizard.h sloxwizard.h \

Write Preview
Loading…
Cancel
Save