summaryrefslogtreecommitdiffstats
path: root/libtdepim
diff options
context:
space:
mode:
Diffstat (limited to 'libtdepim')
-rw-r--r--libtdepim/addresseelineedit.cpp6
-rw-r--r--libtdepim/addressesdialog.cpp22
-rw-r--r--libtdepim/broadcaststatus.cpp2
-rw-r--r--libtdepim/broadcaststatus.h2
-rw-r--r--libtdepim/cfgc/Makefile.am8
-rw-r--r--libtdepim/completionordereditor.cpp4
-rw-r--r--libtdepim/configure.in.in2
-rw-r--r--libtdepim/kaddrbook.cpp4
-rw-r--r--libtdepim/komposer/core/Makefile.am2
-rw-r--r--libtdepim/komposer/core/tests/Makefile.am6
-rw-r--r--libtdepim/komposer/test/Makefile.am2
-rw-r--r--libtdepim/maillistdrag.h2
-rw-r--r--libtdepim/pluginloaderbase.h6
-rw-r--r--libtdepim/progressmanager.cpp2
-rw-r--r--libtdepim/progressmanager.h2
-rw-r--r--libtdepim/tdepimprotocols.h12
-rw-r--r--libtdepim/tests/Makefile.am8
17 files changed, 46 insertions, 46 deletions
diff --git a/libtdepim/addresseelineedit.cpp b/libtdepim/addresseelineedit.cpp
index 50d19e07b..687943ec5 100644
--- a/libtdepim/addresseelineedit.cpp
+++ b/libtdepim/addresseelineedit.cpp
@@ -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;
diff --git a/libtdepim/addressesdialog.cpp b/libtdepim/addressesdialog.cpp
index 27f601833..a8d993bf8 100644
--- a/libtdepim/addressesdialog.cpp
+++ b/libtdepim/addressesdialog.cpp
@@ -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;
diff --git a/libtdepim/broadcaststatus.cpp b/libtdepim/broadcaststatus.cpp
index a50479195..1c1613795 100644
--- a/libtdepim/broadcaststatus.cpp
+++ b/libtdepim/broadcaststatus.cpp
@@ -1,7 +1,7 @@
/*
broadcaststatus.cpp
- This file is part of KDEPIM.
+ This file is part of TDEPIM.
Author: Don Sanders <sanders@kde.org>
diff --git a/libtdepim/broadcaststatus.h b/libtdepim/broadcaststatus.h
index c29e0ff05..9173feaad 100644
--- a/libtdepim/broadcaststatus.h
+++ b/libtdepim/broadcaststatus.h
@@ -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>
diff --git a/libtdepim/cfgc/Makefile.am b/libtdepim/cfgc/Makefile.am
index ec9f505f0..c5a394828 100644
--- a/libtdepim/cfgc/Makefile.am
+++ b/libtdepim/cfgc/Makefile.am
@@ -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
diff --git a/libtdepim/completionordereditor.cpp b/libtdepim/completionordereditor.cpp
index 2687188d0..994eb09b3 100644
--- a/libtdepim/completionordereditor.cpp
+++ b/libtdepim/completionordereditor.cpp
@@ -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
diff --git a/libtdepim/configure.in.in b/libtdepim/configure.in.in
index c405f31c4..74914a26a 100644
--- a/libtdepim/configure.in.in
+++ b/libtdepim/configure.in.in
@@ -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)
diff --git a/libtdepim/kaddrbook.cpp b/libtdepim/kaddrbook.cpp
index 1036a263b..e929bbe00 100644
--- a/libtdepim/kaddrbook.cpp
+++ b/libtdepim/kaddrbook.cpp
@@ -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( ", " );
diff --git a/libtdepim/komposer/core/Makefile.am b/libtdepim/komposer/core/Makefile.am
index b494e7151..2898c0774 100644
--- a/libtdepim/komposer/core/Makefile.am
+++ b/libtdepim/komposer/core/Makefile.am
@@ -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
diff --git a/libtdepim/komposer/core/tests/Makefile.am b/libtdepim/komposer/core/tests/Makefile.am
index fbf127956..4958c55ed 100644
--- a/libtdepim/komposer/core/tests/Makefile.am
+++ b/libtdepim/komposer/core/tests/Makefile.am
@@ -5,15 +5,15 @@ check_PROGRAMS = testfactory testmanager testkomposer
METASOURCES = AUTO
testfactory_SOURCES = main.cpp managertest.cpp
-testfactory_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -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
diff --git a/libtdepim/komposer/test/Makefile.am b/libtdepim/komposer/test/Makefile.am
index af51004e8..7006ec178 100644
--- a/libtdepim/komposer/test/Makefile.am
+++ b/libtdepim/komposer/test/Makefile.am
@@ -1,6 +1,6 @@
AM_CPPFLAGS = -I$(top_srcdir) -I../core $(all_includes)
LDADD = $(LIB_KPARTS) ../core/libkomposer.la
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
check_PROGRAMS = test
diff --git a/libtdepim/maillistdrag.h b/libtdepim/maillistdrag.h
index f13e59ebf..9ec1cba20 100644
--- a/libtdepim/maillistdrag.h
+++ b/libtdepim/maillistdrag.h
@@ -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
*
diff --git a/libtdepim/pluginloaderbase.h b/libtdepim/pluginloaderbase.h
index 766372787..919a3121b 100644
--- a/libtdepim/pluginloaderbase.h
+++ b/libtdepim/pluginloaderbase.h
@@ -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__
diff --git a/libtdepim/progressmanager.cpp b/libtdepim/progressmanager.cpp
index a00970c5e..544b62cef 100644
--- a/libtdepim/progressmanager.cpp
+++ b/libtdepim/progressmanager.cpp
@@ -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
diff --git a/libtdepim/progressmanager.h b/libtdepim/progressmanager.h
index a447d49fb..2e4f4ee2a 100644
--- a/libtdepim/progressmanager.h
+++ b/libtdepim/progressmanager.h
@@ -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
diff --git a/libtdepim/tdepimprotocols.h b/libtdepim/tdepimprotocols.h
index e269fcabd..4ed653307 100644
--- a/libtdepim/tdepimprotocols.h
+++ b/libtdepim/tdepimprotocols.h
@@ -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
diff --git a/libtdepim/tests/Makefile.am b/libtdepim/tests/Makefile.am
index 217676cae..34ecb179f 100644
--- a/libtdepim/tests/Makefile.am
+++ b/libtdepim/tests/Makefile.am
@@ -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
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-06 00:44:30 +0000