From 7cb24f16beba124f021091c4b7bcf8565a06fb95 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 6 Nov 2011 21:47:32 -0600 Subject: Rename additional instances of KDE to TDE --- kresources/caldav/export.h | 4 ++-- kresources/carddav/export.h | 4 ++-- kresources/exchange/resourceexchangeconfig.h | 4 ++-- kresources/featureplan/Makefile.am | 8 ++++---- kresources/groupwise/soap/Makefile.am | 2 +- kresources/groupwise/soap/groupwiseserver.cpp | 2 +- kresources/newexchange/exchangeconvertercalendar.cpp | 4 ++-- kresources/newexchange/exchangeconvertercontact.cpp | 4 ++-- kresources/newexchange/exchangeglobals.cpp | 8 ++++---- kresources/scalix/scalixadmin/Makefile.am | 2 +- kresources/slox/Makefile.am | 2 +- 11 files changed, 22 insertions(+), 22 deletions(-) (limited to 'kresources') diff --git a/kresources/caldav/export.h b/kresources/caldav/export.h index 40dde1264..e747b58a7 100644 --- a/kresources/caldav/export.h +++ b/kresources/caldav/export.h @@ -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. diff --git a/kresources/carddav/export.h b/kresources/carddav/export.h index 40dde1264..e747b58a7 100644 --- a/kresources/carddav/export.h +++ b/kresources/carddav/export.h @@ -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. diff --git a/kresources/exchange/resourceexchangeconfig.h b/kresources/exchange/resourceexchangeconfig.h index b0cf15a13..3fb49231f 100644 --- a/kresources/exchange/resourceexchangeconfig.h +++ b/kresources/exchange/resourceexchangeconfig.h @@ -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 diff --git a/kresources/featureplan/Makefile.am b/kresources/featureplan/Makefile.am index 8c5a1999c..dffee0bf5 100644 --- a/kresources/featureplan/Makefile.am +++ b/kresources/featureplan/Makefile.am @@ -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 diff --git a/kresources/groupwise/soap/Makefile.am b/kresources/groupwise/soap/Makefile.am index 219737768..3f3cd84cf 100644 --- a/kresources/groupwise/soap/Makefile.am +++ b/kresources/groupwise/soap/Makefile.am @@ -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 diff --git a/kresources/groupwise/soap/groupwiseserver.cpp b/kresources/groupwise/soap/groupwiseserver.cpp index d13e5cd80..67c0da6e7 100644 --- a/kresources/groupwise/soap/groupwiseserver.cpp +++ b/kresources/groupwise/soap/groupwiseserver.cpp @@ -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" ); diff --git a/kresources/newexchange/exchangeconvertercalendar.cpp b/kresources/newexchange/exchangeconvertercalendar.cpp index d093faf18..53cc7e78d 100644 --- a/kresources/newexchange/exchangeconvertercalendar.cpp +++ b/kresources/newexchange/exchangeconvertercalendar.cpp @@ -221,9 +221,9 @@ kdDebug()<<"ExchangeConverterCalendar::readIncidencd"<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 ) ) diff --git a/kresources/newexchange/exchangeconvertercontact.cpp b/kresources/newexchange/exchangeconvertercontact.cpp index 1c2828c10..e8de19cb8 100644 --- a/kresources/newexchange/exchangeconvertercontact.cpp +++ b/kresources/newexchange/exchangeconvertercontact.cpp @@ -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 */ diff --git a/kresources/newexchange/exchangeglobals.cpp b/kresources/newexchange/exchangeglobals.cpp index aaef31bcd..5cb2eee77 100644 --- a/kresources/newexchange/exchangeglobals.cpp +++ b/kresources/newexchange/exchangeglobals.cpp @@ -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; } diff --git a/kresources/scalix/scalixadmin/Makefile.am b/kresources/scalix/scalixadmin/Makefile.am index ebde37e2e..3ec92c4f6 100644 --- a/kresources/scalix/scalixadmin/Makefile.am +++ b/kresources/scalix/scalixadmin/Makefile.am @@ -2,7 +2,7 @@ bin_PROGRAMS = scalixadmin INCLUDES = $(all_includes) -scalixadmin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -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 \ diff --git a/kresources/slox/Makefile.am b/kresources/slox/Makefile.am index ef0f84ab1..2367ec786 100644 --- a/kresources/slox/Makefile.am +++ b/kresources/slox/Makefile.am @@ -34,7 +34,7 @@ kabc_slox_la_LIBADD = libkabc_slox.la EXTRA_PROGRAMS = testsloxaccounts -testsloxaccounts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -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 -- cgit v1.2.1