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 --- korganizer/Makefile.am | 10 +++++----- korganizer/README | 2 +- korganizer/koattendeeeditor.cpp | 6 +++--- korganizer/koeditorattachments.cpp | 10 +++++----- korganizer/korgac/Makefile.am | 8 ++++---- korganizer/plugins/datenums/Makefile.am | 2 +- korganizer/plugins/exchange/Makefile.am | 2 +- korganizer/plugins/hebrew/Makefile.am | 2 +- korganizer/plugins/printing/journal/Makefile.am | 2 +- korganizer/plugins/printing/list/Makefile.am | 2 +- korganizer/plugins/printing/whatsnext/Makefile.am | 2 +- korganizer/plugins/printing/year/Makefile.am | 2 +- korganizer/printing/Makefile.am | 4 ++-- 13 files changed, 27 insertions(+), 27 deletions(-) (limited to 'korganizer') diff --git a/korganizer/Makefile.am b/korganizer/Makefile.am index 0d79f4c0a..98312ec7d 100644 --- a/korganizer/Makefile.am +++ b/korganizer/Makefile.am @@ -14,7 +14,7 @@ INCLUDES = \ bin_PROGRAMS = korganizer -korganizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -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 diff --git a/korganizer/README b/korganizer/README index 07453be9b..31508d9e7 100644 --- a/korganizer/README +++ b/korganizer/README @@ -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: diff --git a/korganizer/koattendeeeditor.cpp b/korganizer/koattendeeeditor.cpp index 6683df591..497f10982 100644 --- a/korganizer/koattendeeeditor.cpp +++ b/korganizer/koattendeeeditor.cpp @@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include // for KDEPIM_NEW_DISTRLISTS +#include // for TDEPIM_NEW_DISTRLISTS #include "koattendeeeditor.h" #include "koprefs.h" @@ -34,7 +34,7 @@ #include -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS #include "distributionlist.h" #else #include @@ -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 eList = KPIM::DistributionList::findByName( abook, text ).entries( abook ); TQValueList::ConstIterator eit; diff --git a/korganizer/koeditorattachments.cpp b/korganizer/koeditorattachments.cpp index 812b499f9..b39d5fe53 100644 --- a/korganizer/koeditorattachments.cpp +++ b/korganizer/koeditorattachments.cpp @@ -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() ); diff --git a/korganizer/korgac/Makefile.am b/korganizer/korgac/Makefile.am index 49d32fd63..d5ac531a1 100644 --- a/korganizer/korgac/Makefile.am +++ b/korganizer/korgac/Makefile.am @@ -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 diff --git a/korganizer/plugins/datenums/Makefile.am b/korganizer/plugins/datenums/Makefile.am index 9924bf459..3810225b4 100644 --- a/korganizer/plugins/datenums/Makefile.am +++ b/korganizer/plugins/datenums/Makefile.am @@ -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 diff --git a/korganizer/plugins/exchange/Makefile.am b/korganizer/plugins/exchange/Makefile.am index ab3eb1777..e022c354f 100644 --- a/korganizer/plugins/exchange/Makefile.am +++ b/korganizer/plugins/exchange/Makefile.am @@ -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 diff --git a/korganizer/plugins/hebrew/Makefile.am b/korganizer/plugins/hebrew/Makefile.am index 3326ba1f6..8324e6e38 100644 --- a/korganizer/plugins/hebrew/Makefile.am +++ b/korganizer/plugins/hebrew/Makefile.am @@ -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 diff --git a/korganizer/plugins/printing/journal/Makefile.am b/korganizer/plugins/printing/journal/Makefile.am index 29189bacf..b2a1e2fb4 100644 --- a/korganizer/plugins/printing/journal/Makefile.am +++ b/korganizer/plugins/printing/journal/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libkorg_journalprint.la libkorg_journalprint_la_SOURCES =calprintjournalconfig_base.ui journalprint.cpp libkorg_journalprint_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -libkorg_journalprint_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(top_builddir)/korganizer/printing/libkorg_stdprinting.la -L$(top_builddir)/libtdepim/ -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 = diff --git a/korganizer/plugins/printing/list/Makefile.am b/korganizer/plugins/printing/list/Makefile.am index cd41be7ed..a3a47da9a 100644 --- a/korganizer/plugins/printing/list/Makefile.am +++ b/korganizer/plugins/printing/list/Makefile.am @@ -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 = diff --git a/korganizer/plugins/printing/whatsnext/Makefile.am b/korganizer/plugins/printing/whatsnext/Makefile.am index f1b1d5aab..c0ca7fcd3 100644 --- a/korganizer/plugins/printing/whatsnext/Makefile.am +++ b/korganizer/plugins/printing/whatsnext/Makefile.am @@ -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 = diff --git a/korganizer/plugins/printing/year/Makefile.am b/korganizer/plugins/printing/year/Makefile.am index 5d6913578..5021550f6 100644 --- a/korganizer/plugins/printing/year/Makefile.am +++ b/korganizer/plugins/printing/year/Makefile.am @@ -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 = diff --git a/korganizer/printing/Makefile.am b/korganizer/printing/Makefile.am index 40d17e1c7..10170ca74 100644 --- a/korganizer/printing/Makefile.am +++ b/korganizer/printing/Makefile.am @@ -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 -- cgit v1.2.1