From 533bad2a1503973aaf8186691422c2eda91d02d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 3 Sep 2013 20:02:55 +0200 Subject: Additional k => tde renaming and fixes --- libtdepim/Makefile.am | 4 ++-- libtdepim/addresseeemailselection.cpp | 2 +- libtdepim/addresseelineedit.cpp | 2 +- libtdepim/addresseeview.h | 2 +- libtdepim/addressesdialog.cpp | 8 ++++---- libtdepim/cfgc/Makefile.am | 4 ++-- libtdepim/completionordereditor.cpp | 2 +- libtdepim/groupwarejob.h | 4 ++-- libtdepim/kaddrbook.cpp | 20 ++++++++++---------- libtdepim/komposer/core/Makefile.am | 2 +- libtdepim/komposer/core/tests/Makefile.am | 6 +++--- libtdepim/komposer/plugins/default/Makefile.am | 2 +- libtdepim/komposer/test/Makefile.am | 4 ++-- libtdepim/recentaddresses.h | 2 +- libtdepim/tdeabcresourcecached.h | 4 ++-- libtdepim/tdeabcresourcenull.h | 4 ++-- libtdepim/tdeconfigpropagator.h | 4 ++-- libtdepim/tdeconfigwizard.h | 4 ++-- libtdepim/tdepartsdesignerplugin/Makefile.am | 2 +- libtdepim/tests/Makefile.am | 4 ++-- 20 files changed, 43 insertions(+), 43 deletions(-) (limited to 'libtdepim') diff --git a/libtdepim/Makefile.am b/libtdepim/Makefile.am index b8657d3f8..529a54a19 100644 --- a/libtdepim/Makefile.am +++ b/libtdepim/Makefile.am @@ -45,7 +45,7 @@ AddressBookServiceIface_DIR = $(srcdir)/interfaces libtdepim_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0:0 $(LIB_QT) -ltdecore libtdepim_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \ $(top_builddir)/libemailfunctions/libemailfunctions.la \ - $(LIB_KIO) $(LIB_TDEABC) $(LIB_KPARTS) $(LIB_KIMPROXY) $(LIB_POLL) $(LIB_QUI) + $(LIB_TDEIO) $(LIB_TDEABC) $(LIB_TDEPARTS) $(LIB_TDEIMPROXY) $(LIB_POLL) $(LIB_QUI) # $top_builddir)/libtdepim/resources/libkpimresources.la include_HEADERS = tdepimmacros.h kpimprefs.h @@ -53,7 +53,7 @@ include_HEADERS = tdepimmacros.h kpimprefs.h AM_CXXFLAGS = -DQT_PLUGIN kde_widget_LTLIBRARIES = tdepimwidgets.la tdepimwidgets_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries) $(LIB_QT) -ltdecore -tdepimwidgets_la_LIBADD = $(LIB_KIO) libtdepim.la +tdepimwidgets_la_LIBADD = $(LIB_TDEIO) libtdepim.la tdepimwidgets_la_SOURCES = tdepimwidgets.cpp tdepimwidgets.cpp: $(srcdir)/tdepim.widgets diff --git a/libtdepim/addresseeemailselection.cpp b/libtdepim/addresseeemailselection.cpp index 4be538e6e..d0a0e34ff 100644 --- a/libtdepim/addresseeemailselection.cpp +++ b/libtdepim/addresseeemailselection.cpp @@ -202,7 +202,7 @@ TDEABC::Addressee::List AddresseeEmailSelection::addressBookContent( uint index { if ( index == 0 ) { TDEConfig config( "kmailrc" ); - return RecentAddresses::self( &config )->kabcAddresses(); + return RecentAddresses::self( &config )->tdeabcAddresses(); } else { return TDEABC::Addressee::List(); } diff --git a/libtdepim/addresseelineedit.cpp b/libtdepim/addresseelineedit.cpp index adb3a7300..1af06c842 100644 --- a/libtdepim/addresseelineedit.cpp +++ b/libtdepim/addresseelineedit.cpp @@ -552,7 +552,7 @@ void AddresseeLineEdit::loadContacts() TQApplication::setOverrideCursor( KCursor::waitCursor() ); // loading might take a while - TDEConfig config( "kpimcompletionorder" ); // The weights for non-imap kabc resources is there. + TDEConfig config( "kpimcompletionorder" ); // The weights for non-imap tdeabc resources is there. config.setGroup( "CompletionWeights" ); TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self( true ); diff --git a/libtdepim/addresseeview.h b/libtdepim/addresseeview.h index fd8c900b6..15cc74909 100644 --- a/libtdepim/addresseeview.h +++ b/libtdepim/addresseeview.h @@ -132,7 +132,7 @@ class KDE_EXPORT AddresseeView : public KTextBrowser bool internalLoading = true, FieldMask fieldMask = DefaultFields ); /** - * Encodes a TQPixmap as a PNG into a data: URL (rfc2397), readable by the data kio protocol + * Encodes a TQPixmap as a PNG into a data: URL (rfc2397), readable by the data tdeio protocol * @param pixmap the pixmap to encode * @return a data: URL */ diff --git a/libtdepim/addressesdialog.cpp b/libtdepim/addressesdialog.cpp index 3083cdf46..0afd9a81f 100644 --- a/libtdepim/addressesdialog.cpp +++ b/libtdepim/addressesdialog.cpp @@ -852,14 +852,14 @@ AddressesDialog::removeEntry() #ifdef TDEPIM_NEW_DISTRLISTS -// copied from kabcore.cpp :( -// KDE4: should be in libkabc I think +// copied from tdeabcore.cpp :( +// KDE4: should be in libtdeabc I think static TDEABC::Resource *requestResource( TDEABC::AddressBook* abook, TQWidget *parent ) { - TQPtrList kabcResources = abook->resources(); + TQPtrList tdeabcResources = abook->resources(); TQPtrList kresResources; - TQPtrListIterator resIt( kabcResources ); + TQPtrListIterator resIt( tdeabcResources ); TDEABC::Resource *resource; while ( ( resource = resIt.current() ) != 0 ) { ++resIt; diff --git a/libtdepim/cfgc/Makefile.am b/libtdepim/cfgc/Makefile.am index f0bcd7ceb..64815d272 100644 --- a/libtdepim/cfgc/Makefile.am +++ b/libtdepim/cfgc/Makefile.am @@ -3,11 +3,11 @@ AM_CPPFLAGS = -I$(top_builddir)/libtdepim -I$(top_srcdir) $(all_includes) check_PROGRAMS = example #autoexample -example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor example_LDADD = ../libtdepim.la $(LIB_TDECORE) example_SOURCES = example.cpp exampleprefs_base.kcfgc -#autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +#autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor #autoexample_LDADD = ../libtdepim.la $(LIB_TDECORE) #autoexample_SOURCES = general_base.ui myoptions_base.ui autoexample.cpp diff --git a/libtdepim/completionordereditor.cpp b/libtdepim/completionordereditor.cpp index 7b82ad5ba..5bca85cd5 100644 --- a/libtdepim/completionordereditor.cpp +++ b/libtdepim/completionordereditor.cpp @@ -134,7 +134,7 @@ void SimpleCompletionItem::save( CompletionOrderEditor* editor ) group.writeEntry( mIdentifier, mWeight ); } -// An imap subresource for kabc +// An imap subresource for tdeabc class KABCImapSubResCompletionItem : public CompletionItem { public: diff --git a/libtdepim/groupwarejob.h b/libtdepim/groupwarejob.h index 17561b36f..49df950cc 100644 --- a/libtdepim/groupwarejob.h +++ b/libtdepim/groupwarejob.h @@ -18,8 +18,8 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef KIO_GROUPWAREJOB_H -#define KIO_GROUPWAREJOB_H +#ifndef TDEIO_GROUPWAREJOB_H +#define TDEIO_GROUPWAREJOB_H #include diff --git a/libtdepim/kaddrbook.cpp b/libtdepim/kaddrbook.cpp index 2befdded5..c0122923a 100644 --- a/libtdepim/kaddrbook.cpp +++ b/libtdepim/kaddrbook.cpp @@ -207,14 +207,14 @@ bool KAddrBookExternal::addVCard( const TDEABC::Addressee& addressee, TQWidget * bool KAddrBookExternal::addAddressee( const TDEABC::Addressee& addr ) { TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self( true ); - TDEABC::Resource *kabcResource = selectResourceForSaving( addressBook ); - if( !kabcResource ) + TDEABC::Resource *tdeabcResource = selectResourceForSaving( addressBook ); + if( !tdeabcResource ) return false; - TDEABC::Ticket *ticket = addressBook->requestSaveTicket( kabcResource ); + TDEABC::Ticket *ticket = addressBook->requestSaveTicket( tdeabcResource ); bool saved = false; if ( ticket ) { TDEABC::Addressee addressee( addr ); - addressee.setResource( kabcResource ); + addressee.setResource( tdeabcResource ); addressBook->insertAddressee( addressee ); saved = addressBook->save( ticket ); if ( !saved ) @@ -267,15 +267,15 @@ TDEABC::Resource* KAddrBookExternal::selectResourceForSaving( TDEABC::AddressBoo #endif // Select a resource - TQPtrList kabcResources = addressBook->resources(); + TQPtrList tdeabcResources = addressBook->resources(); TQPtrList kresResources; - TQPtrListIterator resIt( kabcResources ); - TDEABC::Resource *kabcResource; - while ( ( kabcResource = resIt.current() ) != 0 ) { + TQPtrListIterator resIt( tdeabcResources ); + TDEABC::Resource *tdeabcResource; + while ( ( tdeabcResource = resIt.current() ) != 0 ) { ++resIt; - if ( !kabcResource->readOnly() ) { - KRES::Resource *res = static_cast( kabcResource ); + if ( !tdeabcResource->readOnly() ) { + KRES::Resource *res = static_cast( tdeabcResource ); if ( res ) kresResources.append( res ); } diff --git a/libtdepim/komposer/core/Makefile.am b/libtdepim/komposer/core/Makefile.am index 764ec052b..3e9dcd338 100644 --- a/libtdepim/komposer/core/Makefile.am +++ b/libtdepim/komposer/core/Makefile.am @@ -6,7 +6,7 @@ lib_LTLIBRARIES = libkomposer.la libkomposer_la_SOURCES = plugin.cpp editor.cpp core.cpp attachment.cpp corewidget.cpp \ settings.kcfgc pluginmanager.cpp komposerIface.skel libkomposer_la_LDFLAGS = -no-undefined $(KDE_RPATH) -version-info 1:0:0 $(all_libraries) -libkomposer_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/libtdepim/libtdepim.la -ltdeutils +libkomposer_la_LIBADD = $(LIB_TDEPARTS) $(top_builddir)/libtdepim/libtdepim.la -ltdeutils #kde_module_LTLIBRARIES = kcm_komposer.la diff --git a/libtdepim/komposer/core/tests/Makefile.am b/libtdepim/komposer/core/tests/Makefile.am index 829fb3097..a61744968 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +testfactory_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor testfactory_LDADD = ../libkomposer.la testmanager_SOURCES = testmanager.cpp -testmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +testmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor testmanager_LDADD = ../libkomposer.la testkomposer_SOURCES = testkomposer.cpp -testkomposer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +testkomposer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor testkomposer_LDADD = ../libkomposer.la check: testfactory diff --git a/libtdepim/komposer/plugins/default/Makefile.am b/libtdepim/komposer/plugins/default/Makefile.am index 7ae32dc08..27cb1e0c6 100644 --- a/libtdepim/komposer/plugins/default/Makefile.am +++ b/libtdepim/komposer/plugins/default/Makefile.am @@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_builddir)/libtdepim/komposer/core $(all_includes) kde_module_LTLIBRARIES = libkomposer_defaulteditor.la libkomposer_defaulteditor_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -libkomposer_defaulteditor_la_LIBADD = ../../core/libkomposer.la $(LIB_KPARTS) +libkomposer_defaulteditor_la_LIBADD = ../../core/libkomposer.la $(LIB_TDEPARTS) libkomposer_defaulteditor_la_SOURCES = defaulteditor.cpp diff --git a/libtdepim/komposer/test/Makefile.am b/libtdepim/komposer/test/Makefile.am index 6bdebcf2e..68fc85f4b 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +LDADD = $(LIB_TDEPARTS) ../core/libkomposer.la +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor check_PROGRAMS = test diff --git a/libtdepim/recentaddresses.h b/libtdepim/recentaddresses.h index 9a6281e23..4207105ba 100644 --- a/libtdepim/recentaddresses.h +++ b/libtdepim/recentaddresses.h @@ -78,7 +78,7 @@ public: * like "Foo , Bar Baz ". */ TQStringList addresses() const; - const TDEABC::Addressee::List& kabcAddresses() const { return m_addresseeList; } + const TDEABC::Addressee::List& tdeabcAddresses() const { return m_addresseeList; } /** * Adds an entry to the list. diff --git a/libtdepim/tdeabcresourcecached.h b/libtdepim/tdeabcresourcecached.h index b187b6fb0..b86108b40 100644 --- a/libtdepim/tdeabcresourcecached.h +++ b/libtdepim/tdeabcresourcecached.h @@ -18,8 +18,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef KABC_RESOURCECACHED_H -#define KABC_RESOURCECACHED_H +#ifndef TDEABC_RESOURCECACHED_H +#define TDEABC_RESOURCECACHED_H #include #include diff --git a/libtdepim/tdeabcresourcenull.h b/libtdepim/tdeabcresourcenull.h index 043a10cf1..5e9897d69 100644 --- a/libtdepim/tdeabcresourcenull.h +++ b/libtdepim/tdeabcresourcenull.h @@ -18,8 +18,8 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef KABC_RESOURCENULL_H -#define KABC_RESOURCENULL_H +#ifndef TDEABC_RESOURCENULL_H +#define TDEABC_RESOURCENULL_H #include diff --git a/libtdepim/tdeconfigpropagator.h b/libtdepim/tdeconfigpropagator.h index 92f9565f2..32d50e9d1 100644 --- a/libtdepim/tdeconfigpropagator.h +++ b/libtdepim/tdeconfigpropagator.h @@ -18,8 +18,8 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef KCONFIGPROPAGATOR_H -#define KCONFIGPROPAGATOR_H +#ifndef TDECONFIGPROPAGATOR_H +#define TDECONFIGPROPAGATOR_H #include #include diff --git a/libtdepim/tdeconfigwizard.h b/libtdepim/tdeconfigwizard.h index 7eaaeda95..67b76d9c6 100644 --- a/libtdepim/tdeconfigwizard.h +++ b/libtdepim/tdeconfigwizard.h @@ -18,8 +18,8 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef KCONFIGWIZARD_H -#define KCONFIGWIZARD_H +#ifndef TDECONFIGWIZARD_H +#define TDECONFIGWIZARD_H #include #include diff --git a/libtdepim/tdepartsdesignerplugin/Makefile.am b/libtdepim/tdepartsdesignerplugin/Makefile.am index bd3d5bf5f..8ca60702c 100644 --- a/libtdepim/tdepartsdesignerplugin/Makefile.am +++ b/libtdepim/tdepartsdesignerplugin/Makefile.am @@ -4,5 +4,5 @@ INCLUDES = $(all_includes) kde_widget_LTLIBRARIES = tdepartsdesignerplugin.la tdepartsdesignerplugin_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries) $(LIB_QT) -ltdecore -ltdeio -tdepartsdesignerplugin_la_LIBADD = $(LIB_KPARTS) +tdepartsdesignerplugin_la_LIBADD = $(LIB_TDEPARTS) tdepartsdesignerplugin_la_SOURCES = tdepartsdesignerplugin.cpp diff --git a/libtdepim/tests/Makefile.am b/libtdepim/tests/Makefile.am index 328f068d7..0af1a25ab 100644 --- a/libtdepim/tests/Makefile.am +++ b/libtdepim/tests/Makefile.am @@ -1,5 +1,5 @@ AM_CPPFLAGS = -I$(top_builddir)/libtdepim -I$(top_srcdir)/libtdepim -I$(top_srcdir)/libemailfunctions $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor LDADD = ../libtdepim.la $(LIB_TDECORE) check_PROGRAMS = testwizard testaddresseelineedit \ @@ -29,7 +29,7 @@ testkincidencechooser_SOURCES = testkincidencechooser.cpp METASOURCES = AUTO -#example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +#example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor #example_LDADD = ../libtdepim.la $(LIB_TDECORE) #example_SOURCES = example.cpp exampleprefs_base.kcfgc -- cgit v1.2.1