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 --- CMakeLists.txt | 4 +- Makefile.am.in | 2 +- README | 2 +- README.Kolab | 2 +- akregator/src/Makefile.am | 10 +- akregator/src/librss/Makefile.am | 2 +- akregator/src/librss/loader.h | 4 +- certmanager/Makefile.am | 4 +- certmanager/aboutdata.cpp | 2 +- certmanager/certificatewizardimpl.cpp | 2 +- certmanager/kwatchgnupg/Makefile.am | 4 +- certmanager/lib/Makefile.am | 2 +- certmanager/lib/kleo/tdeconfigbasedkeyfilter.h | 6 +- certmanager/storedtransferjob.cpp | 6 +- certmanager/storedtransferjob.h | 2 +- cvs.sh.diff | 2 +- doc/kaddressbook/index.docbook | 4 +- kabc/CMakeLists.txt | 13 - kabc/Makefile.am | 5 - kabc/README | 1 - kabc/frontend/Makefile.am | 10 - kabc/frontend/main.cpp | 20 - kabc/frontend/mainWindow.ui | 1409 -------------------- kabc/frontend/mainWindow.ui.h | 658 --------- kabc/kabc2mutt/CMakeLists.txt | 29 - kabc/kabc2mutt/Makefile.am | 13 - kabc/kabc2mutt/README | 19 - kabc/kabc2mutt/kabc2mutt.cpp | 160 --- kabc/kabc2mutt/kabc2mutt.h | 57 - kabc/kabc2mutt/main.cpp | 80 -- kabc/kabcdistlistupdater/CMakeLists.txt | 42 - kabc/kabcdistlistupdater/Makefile.am | 12 - kabc/kabcdistlistupdater/kabcdistlistupdater.cpp | 95 -- .../kabcdistlistupdater.desktop | 10 - kaddressbook/Makefile.am | 4 +- kaddressbook/kabcore.cpp | 6 +- kaddressbook/kcmconfigs/Makefile.am | 4 +- kaddressbook/kcmconfigs/addresseewidget.cpp | 4 +- kaddressbook/kcmconfigs/kabconfigwidget.cpp | 4 +- kaddressbook/nameeditdialog.cpp | 2 +- kaddressbook/views/Makefile.am | 6 +- kaddressbook/xxport/Makefile.am | 18 +- kaddressbook/xxport/bookmark_xxport.cpp | 2 +- kalarm/kalarmd/Makefile.am | 4 +- kandy/src/Makefile.am | 4 +- karm/Makefile.am | 4 +- karm/tdeaccelmenuwatch.h | 4 +- karm/test/Makefile.am | 4 +- kitchensync/src/Makefile.am | 6 +- kitchensync/src/memberinfo.cpp | 4 +- kmail/CMakeLists.txt | 2 +- kmail/Makefile.am | 8 +- kmail/folderdiaacltab.h | 2 +- kmail/folderdiaquotatab.h | 2 +- kmail/headerstyle.cpp | 30 +- kmail/imapaccountbase.cpp | 2 +- kmail/imapaccountbase.h | 10 +- kmail/imapjob.cpp | 2 +- kmail/keyresolver.cpp | 2 +- kmail/kmacctimap.cpp | 2 +- kmail/kmacctimap.h | 2 +- kmail/kmail_part.cpp | 2 +- kmail/kmcommands.cpp | 4 +- kmail/kmcomposewin.cpp | 2 +- kmail/kmcomposewin.h | 2 +- kmail/kmdict.cpp | 117 ++ kmail/kmdict.h | 68 + kmail/kmfolderdia.h | 4 +- kmail/kmmainwin.cpp | 2 +- kmail/kmmsgdict.cpp | 2 +- kmail/kmreaderwin.cpp | 2 +- kmail/networkaccount.h | 2 +- kmail/popaccount.h | 10 +- kmail/recipientspicker.cpp | 2 +- kmail/redirectdialog.cpp | 2 +- kmail/tdelistboxdialog.h | 4 +- kmail/tdelistviewindexedsearchline.h | 6 +- kmail/tdemdict.cpp | 117 -- kmail/tdemdict.h | 68 - kmail/tests/Makefile.am | 2 +- kmail/tests/messagedicttests.cpp | 2 +- kmail/tests/mimelibtests.cpp | 4 +- kmail/tests/storagelayermodule.cpp | 4 +- kmail/tests/utiltests.cpp | 4 +- kmailcvt/Makefile.am | 2 +- kmobile/Makefile.am | 4 +- kmobile/tdeioslave/Makefile.am | 2 +- kmobile/tdeioslave/tdeio_mobile.cpp | 4 +- kmobile/tdeioslave/tdeio_mobile.h | 4 +- knode/Makefile.am | 6 +- knode/kncomposer.cpp | 2 +- knotes/Makefile.am | 6 +- kode/Makefile.am | 2 +- kode/kodemain.cpp | 4 +- kode/kwsdl/Makefile.am | 2 +- kode/kwsdl/converter.cpp | 2 +- kode/kwsdl/kung/Makefile.am | 2 +- kode/kwsdl/kung/transport.cpp | 2 +- kode/kwsdl/schema/Makefile.am | 2 +- kode/kwsdl/tests/google/Makefile.am | 2 +- kode/kwsdl/tests/google/transport.cpp | 2 +- kode/kwsdl/wscl/Makefile.am | 2 +- kode/kxml_compiler/Makefile.am | 2 +- konsolekalendar/Makefile.am | 2 +- kontact/Thoughts | 2 +- kontact/interfaces/Makefile.am | 2 +- kontact/plugins/akregator/Makefile.am | 2 +- kontact/plugins/kmail/Makefile.am | 2 +- kontact/plugins/knode/Makefile.am | 2 +- kontact/plugins/knotes/Makefile.am | 2 +- kontact/plugins/korganizer/Makefile.am | 6 +- kontact/plugins/kpilot/Makefile.am | 2 +- kontact/plugins/newsticker/Makefile.am | 2 +- kontact/plugins/summary/Makefile.am | 4 +- kontact/plugins/test/Makefile.am | 2 +- kontact/plugins/weather/Makefile.am | 2 +- kontact/src/Makefile.am | 4 +- korganizer/Makefile.am | 18 +- korganizer/korgac/Makefile.am | 4 +- korganizer/plugins/exchange/Makefile.am | 2 +- korganizer/plugins/projectview/Makefile.am | 2 +- korganizer/plugins/timespanview/Makefile.am | 2 +- korn/CMakeLists.txt | 2 +- korn/Makefile.am | 8 +- korn/accountmanager.cpp | 2 +- korn/dcop_proto.h | 6 +- korn/imap_proto.h | 4 +- korn/imaps_proto.h | 2 +- korn/kio.cpp | 561 -------- korn/kio.h | 208 --- korn/kmail_proto.cpp | 2 +- korn/maildir_proto.h | 4 +- korn/maildrop.h | 2 +- korn/mbox_proto.cpp | 2 +- korn/mbox_proto.h | 2 +- korn/nntp_proto.cpp | 2 +- korn/nntp_proto.h | 4 +- korn/polldrop.h | 2 +- korn/pop3_proto.cpp | 2 +- korn/pop3_proto.h | 4 +- korn/pop3s_proto.h | 2 +- korn/process_proto.cpp | 2 +- korn/process_proto.h | 4 +- korn/protocol.h | 4 +- korn/qmail_proto.cpp | 2 +- korn/qmail_proto.h | 4 +- korn/stringid.h | 2 +- korn/tdeconf_update/Makefile.am | 2 +- korn/tdeconf_update/korn-3-4-config_change.cpp | 8 +- korn/tdeio.cpp | 561 ++++++++ korn/tdeio.h | 208 +++ korn/tdeio_count.cpp | 84 +- korn/tdeio_count.h | 18 +- korn/tdeio_delete.cpp | 52 +- korn/tdeio_delete.h | 22 +- korn/tdeio_proto.cpp | 6 +- korn/tdeio_proto.h | 18 +- korn/tdeio_read.cpp | 24 +- korn/tdeio_read.h | 16 +- korn/tdeio_single_subject.cpp | 14 +- korn/tdeio_single_subject.h | 16 +- korn/tdeio_subjects.cpp | 64 +- korn/tdeio_subjects.h | 24 +- ktnef/gui/Makefile.am | 2 +- ktnef/lib/Makefile.am | 2 +- ktnef/tests/Makefile.am | 2 +- libemailfunctions/tests/Makefile.am | 4 +- libkcal/Makefile.am | 2 +- libkcal/tests/Makefile.am | 28 +- libkholidays/Makefile.am | 2 +- libkholidays/holidays/holiday_it | 2 +- libkmime/tests/run_codec_tests | 2 +- libkmime/tests/test_kmime_codec.cpp | 10 +- libkpimexchange/Makefile.am | 2 +- libkpimexchange/core/Makefile.am | 2 +- 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 +- tdeabc/CMakeLists.txt | 13 + tdeabc/Makefile.am | 5 + tdeabc/README | 1 + tdeabc/frontend/Makefile.am | 10 + tdeabc/frontend/main.cpp | 20 + tdeabc/frontend/mainWindow.ui | 1409 ++++++++++++++++++++ tdeabc/frontend/mainWindow.ui.h | 658 +++++++++ tdeabc/tdeabc2mutt/CMakeLists.txt | 29 + tdeabc/tdeabc2mutt/Makefile.am | 13 + tdeabc/tdeabc2mutt/README | 19 + tdeabc/tdeabc2mutt/main.cpp | 80 ++ tdeabc/tdeabc2mutt/tdeabc2mutt.cpp | 160 +++ tdeabc/tdeabc2mutt/tdeabc2mutt.h | 57 + tdeabc/tdeabcdistlistupdater/CMakeLists.txt | 42 + tdeabc/tdeabcdistlistupdater/Makefile.am | 12 + .../tdeabcdistlistupdater.cpp | 95 ++ .../tdeabcdistlistupdater.desktop | 10 + tdefile-plugins/ics/Makefile.am | 2 +- tdefile-plugins/palm-databases/Makefile.am | 2 +- tdefile-plugins/rfc822/Makefile.am | 2 +- tdefile-plugins/vcf/Makefile.am | 2 +- tdeioslaves/imap4/Makefile.am | 2 +- tdeioslaves/mbox/Makefile.am | 2 +- tdeioslaves/opengroupware/Makefile.am | 2 +- tdeioslaves/sieve/Makefile.am | 2 +- tdeioslaves/sieve/sieve.cpp | 2 +- tderesources/birthdays/CMakeLists.txt | 10 +- tderesources/birthdays/Makefile.am | 10 +- tderesources/birthdays/kabc.desktop | 61 - tderesources/birthdays/resourcekabc.cpp | 528 -------- tderesources/birthdays/resourcekabc.h | 185 --- tderesources/birthdays/resourcekabcconfig.cpp | 135 -- tderesources/birthdays/resourcekabcconfig.h | 68 - tderesources/birthdays/resourcetdeabc.cpp | 528 ++++++++ tderesources/birthdays/resourcetdeabc.h | 185 +++ tderesources/birthdays/resourcetdeabcconfig.cpp | 135 ++ tderesources/birthdays/resourcetdeabcconfig.h | 68 + tderesources/birthdays/tdeabc.desktop | 61 + tderesources/blogging/xmlrpcjob.cpp | 2 +- tderesources/egroupware/Makefile.am | 6 +- tderesources/egroupware/synchronizer.h | 2 +- tderesources/egroupware/tdeabc_resourcexmlrpc.h | 4 +- tderesources/egroupware/xmlrpciface.cpp | 2 +- tderesources/featureplan/Makefile.am | 4 +- tderesources/groupdav/tdeabc_resourcegroupdav.h | 4 +- tderesources/groupware/tdeabc_resourcegroupware.h | 4 +- .../groupware/tdeabc_resourcegroupwareconfig.h | 4 +- tderesources/groupwise/soap/Makefile.am | 2 +- tderesources/groupwise/tdeabc_resourcegroupwise.h | 4 +- .../groupwise/tdeabc_resourcegroupwiseconfig.h | 4 +- tderesources/groupwise/tdeioslave/Makefile.am | 2 +- tderesources/kolab/kcal/resourcekolab.cpp | 2 +- tderesources/kolab/kcal/resourcekolab_plugin.cpp | 2 +- tderesources/kolab/knotes/resourcekolab_plugin.cpp | 2 +- tderesources/kolab/shared/subresource.cpp | 2 +- tderesources/kolab/shared/subresource.h | 2 +- tderesources/kolab/tdeabc/CMakeLists.txt | 6 +- tderesources/kolab/tdeabc/Makefile.am | 10 +- tderesources/kolab/tdeabc/contact.cpp | 2 +- tderesources/kolab/tdeabc/contact.h | 2 +- tderesources/kolab/tdeabc/resourcekolab.cpp | 2 +- tderesources/kolab/tdeabc/resourcekolab.h | 4 +- tderesources/kolab/tdeabc/resourcekolab_plugin.cpp | 2 +- tderesources/lib/tdeabc_resourcegroupwarebase.h | 4 +- .../lib/tdeabc_resourcegroupwarebaseconfig.h | 4 +- tderesources/newexchange/Person.mapping | 2 +- .../newexchange/exchangeconvertercontact.cpp | 4 +- tderesources/newexchange/tdeabc_resourceexchange.h | 4 +- tderesources/scalix/README | 2 +- tderesources/scalix/kcal/resourcescalix.cpp | 2 +- tderesources/scalix/scalixadmin/Makefile.am | 2 +- tderesources/scalix/tdeabc/CMakeLists.txt | 6 +- tderesources/scalix/tdeabc/Makefile.am | 10 +- tderesources/scalix/tdeabc/resourcescalix.h | 2 +- tderesources/scalix/tdeioslave/Makefile.am | 2 +- tderesources/scalix/tdeioslave/scalix.cpp | 2 +- tderesources/slox/Makefile.am | 2 +- tderesources/slox/tdeabcresourceslox.h | 4 +- wizards/CMakeLists.txt | 4 +- wizards/Makefile.am | 18 +- wizards/egroupwarewizard.cpp | 24 +- wizards/exchangewizard.cpp | 18 +- wizards/groupwise.kcfg | 4 +- wizards/groupwisewizard.cpp | 18 +- wizards/slox.kcfg | 4 +- wizards/sloxwizard.cpp | 18 +- 281 files changed, 5188 insertions(+), 5188 deletions(-) delete mode 100644 kabc/CMakeLists.txt delete mode 100644 kabc/Makefile.am delete mode 100644 kabc/README delete mode 100644 kabc/frontend/Makefile.am delete mode 100644 kabc/frontend/main.cpp delete mode 100644 kabc/frontend/mainWindow.ui delete mode 100644 kabc/frontend/mainWindow.ui.h delete mode 100644 kabc/kabc2mutt/CMakeLists.txt delete mode 100644 kabc/kabc2mutt/Makefile.am delete mode 100644 kabc/kabc2mutt/README delete mode 100644 kabc/kabc2mutt/kabc2mutt.cpp delete mode 100644 kabc/kabc2mutt/kabc2mutt.h delete mode 100644 kabc/kabc2mutt/main.cpp delete mode 100644 kabc/kabcdistlistupdater/CMakeLists.txt delete mode 100644 kabc/kabcdistlistupdater/Makefile.am delete mode 100644 kabc/kabcdistlistupdater/kabcdistlistupdater.cpp delete mode 100644 kabc/kabcdistlistupdater/kabcdistlistupdater.desktop create mode 100644 kmail/kmdict.cpp create mode 100644 kmail/kmdict.h delete mode 100644 kmail/tdemdict.cpp delete mode 100644 kmail/tdemdict.h delete mode 100644 korn/kio.cpp delete mode 100644 korn/kio.h create mode 100644 korn/tdeio.cpp create mode 100644 korn/tdeio.h create mode 100644 tdeabc/CMakeLists.txt create mode 100644 tdeabc/Makefile.am create mode 100644 tdeabc/README create mode 100644 tdeabc/frontend/Makefile.am create mode 100644 tdeabc/frontend/main.cpp create mode 100644 tdeabc/frontend/mainWindow.ui create mode 100644 tdeabc/frontend/mainWindow.ui.h create mode 100644 tdeabc/tdeabc2mutt/CMakeLists.txt create mode 100644 tdeabc/tdeabc2mutt/Makefile.am create mode 100644 tdeabc/tdeabc2mutt/README create mode 100644 tdeabc/tdeabc2mutt/main.cpp create mode 100644 tdeabc/tdeabc2mutt/tdeabc2mutt.cpp create mode 100644 tdeabc/tdeabc2mutt/tdeabc2mutt.h create mode 100644 tdeabc/tdeabcdistlistupdater/CMakeLists.txt create mode 100644 tdeabc/tdeabcdistlistupdater/Makefile.am create mode 100644 tdeabc/tdeabcdistlistupdater/tdeabcdistlistupdater.cpp create mode 100644 tdeabc/tdeabcdistlistupdater/tdeabcdistlistupdater.desktop delete mode 100644 tderesources/birthdays/kabc.desktop delete mode 100644 tderesources/birthdays/resourcekabc.cpp delete mode 100644 tderesources/birthdays/resourcekabc.h delete mode 100644 tderesources/birthdays/resourcekabcconfig.cpp delete mode 100644 tderesources/birthdays/resourcekabcconfig.h create mode 100644 tderesources/birthdays/resourcetdeabc.cpp create mode 100644 tderesources/birthdays/resourcetdeabc.h create mode 100644 tderesources/birthdays/resourcetdeabcconfig.cpp create mode 100644 tderesources/birthdays/resourcetdeabcconfig.h create mode 100644 tderesources/birthdays/tdeabc.desktop diff --git a/CMakeLists.txt b/CMakeLists.txt index cdfdcb3d..a1935af4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -112,7 +112,7 @@ option( BUILD_KNOTES "Build knotes" ${BUILD_ALL} ) option( BUILD_KODE "Build kode" ${BUILD_ALL} ) option( BUILD_TDERESOURCES "Build tderesources" ${BUILD_ALL} ) option( BUILD_WIZARDS "Build wizards" ${BUILD_ALL} ) -option( BUILD_KABC "Build kabc" ${BUILD_ALL} ) +option( BUILD_TDEABC "Build tdeabc" ${BUILD_ALL} ) option( BUILD_KONSOLEKALENDAR "Build konsolekalendar" ${BUILD_ALL} ) option( BUILD_KMAILCVT "Build kmailcvt" ${BUILD_ALL} ) option( BUILD_KARM "Build karm" ${BUILD_ALL} ) @@ -184,7 +184,7 @@ tde_conditional_add_subdirectory( BUILD_KNOTES knotes ) tde_conditional_add_subdirectory( BUILD_KODE kode ) tde_conditional_add_subdirectory( BUILD_TDERESOURCES tderesources ) tde_conditional_add_subdirectory( BUILD_WIZARDS wizards ) -tde_conditional_add_subdirectory( BUILD_KABC kabc ) +tde_conditional_add_subdirectory( BUILD_TDEABC tdeabc ) tde_conditional_add_subdirectory( BUILD_KONSOLEKALENDAR konsolekalendar ) tde_conditional_add_subdirectory( BUILD_KMAILCVT kmailcvt ) tde_conditional_add_subdirectory( BUILD_KARM karm ) diff --git a/Makefile.am.in b/Makefile.am.in index 77bd7367..429c9ee7 100644 --- a/Makefile.am.in +++ b/Makefile.am.in @@ -38,7 +38,7 @@ COMPILE_BEFORE_kitchensync = libtdepim COMPILE_BEFORE_akregator = libtdepim COMPILE_BEFORE_knotes = libtdepim COMPILE_BEFORE_konsolekalendar = libtdepim -COMPILE_BEFORE_kabc = libtdepim +COMPILE_BEFORE_tdeabc = libtdepim AUTOMAKE_OPTIONS = foreign 1.6.1 DISTCLEANFILES = inst-apps diff --git a/README b/README index c06e866e..7d71a059 100644 --- a/README +++ b/README @@ -48,7 +48,7 @@ There is also quite an amount of infrastructure in this package: * libkcal: C++ api for the iCalendar and vCalendar formats * libkcal/libical: a basic iCalendar protocol implementation, see RFCs 2245,2246 * libkpimexchange: connecting to Exchange2000 servers -* tdeabc/frontend: A GUI frontend for libkabc, not intended for end users. +* tdeabc/frontend: A GUI frontend for libtdeabc, not intended for end users. * kgantt: lib to display and manage Gantt diagrams used by the project view plugin of KOrganizer * kdgantt: alternative lib for Gantt diagrams, used by the free/busy view of diff --git a/README.Kolab b/README.Kolab index 85181185..a3cde687 100644 --- a/README.Kolab +++ b/README.Kolab @@ -76,7 +76,7 @@ General Notes: ============== Autocompletion: Works in both KMail and KOrganizer. The order of resources used for completion is as follows: - 1. All available addressbook resources as seen in "tdecmshell tderesources", section "kabc" + 1. All available addressbook resources as seen in "tdecmshell tderesources", section "tdeabc" 2. LDAP Nothing special, AFAIK diff --git a/akregator/src/Makefile.am b/akregator/src/Makefile.am index f88d0eab..9af5fb09 100644 --- a/akregator/src/Makefile.am +++ b/akregator/src/Makefile.am @@ -20,9 +20,9 @@ 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -akregator_LDADD = $(LIB_KPARTS) libakregatorprivate.la -#akregator_LDADD = $(LIB_KPARTS) libakregatorprivate.la $(top_builddir)/libtdepim/libtdepim.la +akregator_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +akregator_LDADD = $(LIB_TDEPARTS) libakregatorprivate.la +#akregator_LDADD = $(LIB_TDEPARTS) libakregatorprivate.la $(top_builddir)/libtdepim/libtdepim.la # this is where the desktop file will go xdg_apps_DATA = akregator.desktop @@ -145,8 +145,8 @@ libakregatorpart_la_SOURCES = \ kspeechsink.skel \ 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_TDECORE) $(LIB_TDEUI) $(LIB_TDEHTML) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -L$(top_builddir)/libtdepim -ltdepim +libakregatorpart_la_LDFLAGS = $(KDE_RPATH) $(KDE_PLUGIN) $(LIB_TDEUTILS) -avoid-version -no-undefined $(all_libraries) +libakregatorpart_la_LIBADD = libakregatorprivate.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEHTML) $(LIB_TDEIO) $(LIB_TDEPARTS) -lDCOP -L$(top_builddir)/libtdepim -ltdepim # this is where the desktop file will go partdesktopdir = $(kde_servicesdir) diff --git a/akregator/src/librss/Makefile.am b/akregator/src/librss/Makefile.am index 87930b47..27d1fd68 100644 --- a/akregator/src/librss/Makefile.am +++ b/akregator/src/librss/Makefile.am @@ -16,7 +16,7 @@ librsslocal_la_METASOURCES = AUTO check_PROGRAMS = testlibrss testlibrss_SOURCES = testlibrss.cpp testlibrss_LDFLAGS = $(all_libraries) -testlibrss_LDADD = librsslocal.la $(LIB_KIO) +testlibrss_LDADD = librsslocal.la $(LIB_TDEIO) DOXYGEN_REFERENCES = tdeui include $(top_srcdir)/admin/Doxyfile.am diff --git a/akregator/src/librss/loader.h b/akregator/src/librss/loader.h index 0d5ec596..670ed9d3 100644 --- a/akregator/src/librss/loader.h +++ b/akregator/src/librss/loader.h @@ -114,8 +114,8 @@ namespace RSS /** * @return The error code for the last process of retrieving data. * The returned numbers correspond directly to the error codes - * as - * defined by KIO. + * as + * defined by TDEIO. */ virtual int errorCode() const; diff --git a/certmanager/Makefile.am b/certmanager/Makefile.am index 68ab9ae0..6d23b5ea 100644 --- a/certmanager/Makefile.am +++ b/certmanager/Makefile.am @@ -17,8 +17,8 @@ kleopatra_SOURCES = \ METASOURCES = AUTO -kleopatra_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kleopatra_LDADD = conf/libconf.la lib/libkleopatra.la $(LIB_KUTILS) $(LIB_TDEABC) +kleopatra_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kleopatra_LDADD = conf/libconf.la lib/libkleopatra.la $(LIB_TDEUTILS) $(LIB_TDEABC) rcdir = $(kde_datadir)/kleopatra rc_DATA = kleopatraui.rc diff --git a/certmanager/aboutdata.cpp b/certmanager/aboutdata.cpp index 21cae228..80501dae 100644 --- a/certmanager/aboutdata.cpp +++ b/certmanager/aboutdata.cpp @@ -58,7 +58,7 @@ static const about_data authors[] = { static const about_data credits[] = { { "David Faure", - I18N_NOOP("Backend configuration framework, KIO integration"), + I18N_NOOP("Backend configuration framework, TDEIO integration"), "faure@kde.org", 0 }, { "Michel Boyer de la Giroday", I18N_NOOP("Key-state dependant colors and fonts in the key list"), diff --git a/certmanager/certificatewizardimpl.cpp b/certmanager/certificatewizardimpl.cpp index 12eebf96..e1d47f99 100644 --- a/certmanager/certificatewizardimpl.cpp +++ b/certmanager/certificatewizardimpl.cpp @@ -498,7 +498,7 @@ void CertificateWizardImpl::accept() } /** - This slot is invoked by the KIO job used in newCertificate + This slot is invoked by the TDEIO job used in newCertificate to save/upload the certificate, when finished (success or error). */ void CertificateWizardImpl::slotUploadResult( TDEIO::Job* job ) diff --git a/certmanager/kwatchgnupg/Makefile.am b/certmanager/kwatchgnupg/Makefile.am index 990ce7d3..07702a24 100644 --- a/certmanager/kwatchgnupg/Makefile.am +++ b/certmanager/kwatchgnupg/Makefile.am @@ -13,8 +13,8 @@ kwatchgnupg_SOURCES = \ METASOURCES = AUTO -kwatchgnupg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kwatchgnupg_LDADD = ../conf/libconf.la ../lib/libkleopatra.la $(LIB_KUTILS) $(LIB_TDEABC) +kwatchgnupg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kwatchgnupg_LDADD = ../conf/libconf.la ../lib/libkleopatra.la $(LIB_TDEUTILS) $(LIB_TDEABC) rcdir = $(kde_datadir)/kwatchgnupg rc_DATA = kwatchgnupgui.rc diff --git a/certmanager/lib/Makefile.am b/certmanager/lib/Makefile.am index 4512f42f..0de1f06c 100644 --- a/certmanager/lib/Makefile.am +++ b/certmanager/lib/Makefile.am @@ -17,7 +17,7 @@ libkleopatra_la_LIBADD = \ ui/libkleopatra_ui.la \ \ $(top_builddir)/libtdenetwork/qgpgme/libqgpgme.la \ - $(LIB_KIO) $(LIB_TDEUI) + $(LIB_TDEIO) $(LIB_TDEUI) # Disabled for tdepim-3.3, see also kleo/cryptobackendfactory.cpp # backends/kpgp/libkleopatra_backend_kpgp.la diff --git a/certmanager/lib/kleo/tdeconfigbasedkeyfilter.h b/certmanager/lib/kleo/tdeconfigbasedkeyfilter.h index 3d65e7a2..53a40413 100644 --- a/certmanager/lib/kleo/tdeconfigbasedkeyfilter.h +++ b/certmanager/lib/kleo/tdeconfigbasedkeyfilter.h @@ -30,8 +30,8 @@ your version. */ -#ifndef __KLEO_KCONFIGBASEDKEYFILTER_H__ -#define __KLEO_KCONFIGBASEDKEYFILTER_H__ +#ifndef __KLEO_TDECONFIGBASEDKEYFILTER_H__ +#define __KLEO_TDECONFIGBASEDKEYFILTER_H__ #include "keyfilter.h" @@ -101,4 +101,4 @@ namespace Kleo { } -#endif // __KLEO_KCONFIGBASEDKEYFILTER_H__ +#endif // __KLEO_TDECONFIGBASEDKEYFILTER_H__ diff --git a/certmanager/storedtransferjob.cpp b/certmanager/storedtransferjob.cpp index bae0d397..b9816c89 100644 --- a/certmanager/storedtransferjob.cpp +++ b/certmanager/storedtransferjob.cpp @@ -21,7 +21,7 @@ using namespace TDEIOext; -#define KIO_ARGS TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); stream +#define TDEIO_ARGS TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); stream StoredTransferJob::StoredTransferJob(const KURL& url, int command, const TQByteArray &packedArgs, @@ -79,7 +79,7 @@ void StoredTransferJob::slotDataReq( TDEIO::Job *, TQByteArray &data ) StoredTransferJob *TDEIOext::storedGet( const KURL& url, bool reload, bool showProgressInfo ) { // Send decoded path and encoded query - KIO_ARGS << url; + TDEIO_ARGS << url; StoredTransferJob * job = new StoredTransferJob( url, TDEIO::CMD_GET, packedArgs, TQByteArray(), showProgressInfo ); if (reload) job->addMetaData("cache", "reload"); @@ -89,7 +89,7 @@ StoredTransferJob *TDEIOext::storedGet( const KURL& url, bool reload, bool showP StoredTransferJob *TDEIOext::put( const TQByteArray& arr, const KURL& url, int permissions, bool overwrite, bool resume, bool showProgressInfo ) { - KIO_ARGS << url << TQ_INT8( overwrite ? 1 : 0 ) << TQ_INT8( resume ? 1 : 0 ) << permissions; + TDEIO_ARGS << url << TQ_INT8( overwrite ? 1 : 0 ) << TQ_INT8( resume ? 1 : 0 ) << permissions; StoredTransferJob * job = new StoredTransferJob( url, TDEIO::CMD_PUT, packedArgs, TQByteArray(), showProgressInfo ); job->setData( arr ); return job; diff --git a/certmanager/storedtransferjob.h b/certmanager/storedtransferjob.h index 163c431e..cfbc6811 100644 --- a/certmanager/storedtransferjob.h +++ b/certmanager/storedtransferjob.h @@ -22,7 +22,7 @@ #include -// To be moved to KIO? +// To be moved to TDEIO? namespace TDEIOext { /** diff --git a/cvs.sh.diff b/cvs.sh.diff index 79b780d2..313956b0 100644 --- a/cvs.sh.diff +++ b/cvs.sh.diff @@ -7,7 +7,7 @@ Index: admin/cvs.sh done for i in `ls -1 po/*.pot 2>/dev/null | sed -e "s#po/##"`; do - sed -e 's,^"Content-Type: text/plain; charset=CHARSET\\n"$,"Content-Type: text/plain; charset=UTF-8\\n",' po/$i > po/$i.new && mv po/$i.new po/$i -+ sed -e 's,^"Content-Type: text/plain; charset=CHARSET\\n"$,"Content-Type: text/plain; charset=UTF-8\\n",; s,"Content-Transfer-Encoding: ENCODING\\n","Content-Transfer-Encoding: 8bit\\n", ; s,"Language-Team: LANGUAGE \\n","Language-Team: LANGUAGE \\n",' po/$i > po/$i.new && mv po/$i.new po/$i ++ sed -e 's,^"Content-Type: text/plain; charset=CHARSET\\n"$,"Content-Type: text/plain; charset=UTF-8\\n",; s,"Content-Transfer-Encoding: ENCODING\\n","Content-Transfer-Encoding: 8bit\\n", ; s,"Language-Team: LANGUAGE \\n","Language-Team: LANGUAGE \\n",' po/$i > po/$i.new && mv po/$i.new po/$i #msgmerge -q -o po/$i po/$i po/$i egrep -v '^#[^,]' po/$i | egrep '^.*[^ ]+.*$' | grep -v "\"POT-Creation" > temp.pot if test -f po.backup/$i && ! cmp -s temp.pot po.backup/$i; then diff --git a/doc/kaddressbook/index.docbook b/doc/kaddressbook/index.docbook index b7156ca7..ec5029ee 100644 --- a/doc/kaddressbook/index.docbook +++ b/doc/kaddressbook/index.docbook @@ -69,7 +69,7 @@ &kaddressbook; is the main address book application for &kde;; it enables you to manage your contacts efficiently and comfortably. -Since it is based on the kabc library it supports resources, +Since it is based on the tdeabc library it supports resources, which can be used to load and save your contacts to many different locations — not just the local file system, but also to LDAP servers and SQL databases. @@ -79,7 +79,7 @@ The user interface is similar to MS Outlook and it supports different views for to represent the contact data differently; it also provides an incremental search over all fields and a jump button bar to quickly access single entries. -Since the underlying kabc library uses the vCard format (specified in RFC +Since the underlying tdeabc library uses the vCard format (specified in RFC 2426) as its default storage medium, &kaddressbook; mainly reflects the supported entry fields in its graphical user interface. diff --git a/kabc/CMakeLists.txt b/kabc/CMakeLists.txt deleted file mode 100644 index 486dec53..00000000 --- a/kabc/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -add_subdirectory( kabc2mutt ) -tde_conditional_add_subdirectory( WITH_NEWDISTRLISTS kabcdistlistupdater ) diff --git a/kabc/Makefile.am b/kabc/Makefile.am deleted file mode 100644 index 252d071a..00000000 --- a/kabc/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -if compile_newdistrlists -KABCDISTLISTUPDATER=kabcdistlistupdater -endif - -SUBDIRS = kabc2mutt $(KABCDISTLISTUPDATER) diff --git a/kabc/README b/kabc/README deleted file mode 100644 index 96fcd6fe..00000000 --- a/kabc/README +++ /dev/null @@ -1 +0,0 @@ -This directory contains test code for kabc. diff --git a/kabc/frontend/Makefile.am b/kabc/frontend/Makefile.am deleted file mode 100644 index 6cec9546..00000000 --- a/kabc/frontend/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -INCLUDES = -I$(includedir)/tdeabc $(all_includes) - -METASOURCES = AUTO - -bin_PROGRAMS = kabcfrontend - -kabcfrontend_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kabcfrontend_LDADD = -ltdeabc $(LIB_TDECORE) -kabcfrontend_SOURCES = main.cpp mainWindow.ui - diff --git a/kabc/frontend/main.cpp b/kabc/frontend/main.cpp deleted file mode 100644 index 0e941e01..00000000 --- a/kabc/frontend/main.cpp +++ /dev/null @@ -1,20 +0,0 @@ -#include -#include -#include -#include -#include - -#include "mainWindow.h" - -int main( int argc, char ** argv ) -{ - TDEAboutData aboutData("testkabc",I18N_NOOP("TestKabc"),"0.1"); - TDECmdLineArgs::init(argc,argv,&aboutData); - - TDEApplication app; - - MainWindow *w = new MainWindow; - w->show(); - app.connect( &app, TQT_SIGNAL( lastWindowClosed() ), &app, TQT_SLOT( quit() ) ); - return app.exec(); -} diff --git a/kabc/frontend/mainWindow.ui b/kabc/frontend/mainWindow.ui deleted file mode 100644 index 240114a6..00000000 --- a/kabc/frontend/mainWindow.ui +++ /dev/null @@ -1,1409 +0,0 @@ - -MainWindow - - - MainWindow - - - - 0 - 0 - 570 - 534 - - - - KABC Frontend - - - - unnamed - - - - - Name - - - true - - - true - - - - - UID - - - true - - - true - - - - mAddresseeList - - - - 7 - 7 - 1 - 0 - - - - StyledPanel - - - Sunken - - - AllColumns - - - - - TabWidget2 - - - - 7 - 7 - 2 - 0 - - - - Top - - - Rounded - - - - tab - - - &General - - - - unnamed - - - 11 - - - 6 - - - - mNameEdit - - - - - TextLabel1 - - - Name: - - - - - TextLabel1_2 - - - URL: - - - - - mUrlEdit - - - - - mAdditionalNameEdit - - - - - mSuffixEdit - - - - - mGivenNameEdit - - - - - mPrefixEdit - - - - - mFamilyNameEdit - - - - - mFormattedNameEdit - - - - - mNickNameEdit - - - - - TextLabel7 - - - Nickname: - - - - - TextLabel5 - - - Honorific suffixes: - - - - - TextLabel3_2 - - - Family name: - - - - - TextLabel4 - - - Additional names: - - - - - TextLabel6 - - - Given name: - - - - - TextLabel1_3 - - - Honorific prefixes: - - - - - TextLabel8 - - - Formatted name: - - - - - TextLabel15 - - - Sort string: - - - - - mSortStringEdit - - - - - TextLabel11 - - - Role: - - - - - TextLabel12 - - - Organization: - - - - - TextLabel10 - - - Title: - - - - - mTitleEdit - - - - - mRoleEdit - - - - - mOrganizationEdit - - - - - Spacer1 - - - Vertical - - - Expanding - - - - 20 - 20 - - - - - - - - tab - - - Phone && &Mail - - - - unnamed - - - - GroupBox1 - - - &Phone - - - - unnamed - - - 11 - - - 6 - - - - TextLabel2_3 - - - Id: - - - - - mPhoneIdCombo - - - - - PushButton3 - - - Remove - - - - - PushButton4 - - - New - - - - - mPhoneNumberEdit - - - - - TextLabel1_5 - - - Number: - - - - - ButtonGroup2 - - - Type - - - - unnamed - - - 11 - - - 6 - - - - mPhoneWorkCheck - - - Work - - - - - mPhonePrefCheck - - - Pref - - - - - mPhoneHomeCheck - - - Home - - - - - mPhoneCellCheck - - - Cell - - - - - mPhoneFaxCheck - - - Fax - - - - - mPhoneBbsCheck - - - BBS - - - - - mPhoneCarCheck - - - Car - - - - - mPhoneVideoCheck - - - Video - - - - - mPhoneIsdnCheck - - - ISDN - - - - - mPhoneVoiceCheck - - - Voice - - - - - mPhonePcsCheck - - - PCS - - - - - mPhoneModemCheck - - - Modem - - - - - mPhonePagerCheck - - - Pager - - - - - mPhoneMsgCheck - - - Msg - - - - - - - - - GroupBox2 - - - Ema&il - - - - unnamed - - - 11 - - - 6 - - - - PushButton7 - - - &New - - - - - PushButton5 - - - &Edit - - - - - PushButton6 - - - &Remove - - - - - Spacer2 - - - Vertical - - - Expanding - - - - 20 - 20 - - - - - - - Address - - - true - - - true - - - - mEmailListView - - - AllColumns - - - - - - - - - tab - - - A&ddress - - - - unnamed - - - - TextLabel16 - - - Id: - - - - - TextLabel1_4 - - - Post office box: - - - - - TextLabel2_2 - - - Extended: - - - - - TextLabel3_3 - - - Street: - - - - - TextLabel4_2 - - - Locality: - - - - - mAddressPostOfficeBoxEdit - - - - - mAddressExtendedEdit - - - - - mAddressStreetEdit - - - - - mAddressLocalityEdit - - - - - mAddressRegionEdit - - - - - TextLabel5_2 - - - Region: - - - - - TextLabel7_2 - - - Country: - - - - - TextLabel6_2 - - - Postal code: - - - - - mAddressLabelEdit - - - - - TextLabel13 - - - Label: - - - - - mAddressPostalCodeEdit - - - - - mAddressCountryEdit - - - - - ButtonGroup1 - - - Type - - - - unnamed - - - 11 - - - 6 - - - - mAddressDomCheck - - - Dom - - - - - mAddressIntlCheck - - - Intl - - - - - mAddressParcelCheck - - - Parcel - - - - - mAddressPostalCheck - - - Postal - - - - - mAddressHomeCheck - - - Home - - - - - mAddressPrefCheck - - - Pref - - - - - mAddressWorkCheck - - - Work - - - - - - - PushButton1 - - - &New - - - - - PushButton2 - - - &Remove - - - - - mAddressIdCombo - - - - - - - tab - - - &Special - - - - unnamed - - - 11 - - - 6 - - - - mNoteEdit - - - - - TextLabel14 - - - Note: - - - - - GroupBox2_2 - - - Categories - - - - unnamed - - - 11 - - - 6 - - - - - Name - - - true - - - true - - - - mCategoryListView - - - AllColumns - - - - - Spacer2_2 - - - Vertical - - - Expanding - - - - 20 - 20 - - - - - - PushButton6_2 - - - &Remove - - - - - PushButton5_2 - - - &Edit - - - - - PushButton7_2 - - - &New - - - - - - - - - tab - - - &Custom - - - - unnamed - - - 11 - - - 6 - - - - GroupBox2_2_2 - - - Custom Entries - - - - unnamed - - - 11 - - - 6 - - - - - App - - - true - - - true - - - - - Name - - - true - - - true - - - - - Value - - - true - - - true - - - - mCustomListView - - - AllColumns - - - - - PushButton7_2_2 - - - &New - - - - - PushButton5_2_2 - - - &Edit - - - - - PushButton6_2_2 - - - &Remove - - - - - Spacer2_2_2 - - - Vertical - - - Expanding - - - - 20 - 20 - - - - - - - - - - - - - menubar - - - - - - - - - - - - - - - - - Toolbar_3 - - - Toolbar_3 - - - - - - - - - open - - - image0 - - - Action - - - &Open - - - Open Address Book - - - - - save - - - image1 - - - Action - - - &Save - - - Save Address Book - - - - - addressee_new - - - Action - - - &New - - - New Addressee - - - - - addressee_remove - - - Action - - - &Remove - - - Remove Addressee - - - - - dump - - - Dump - - - &Dump - - - Dump Addressbook - - - - - open_std - - - Open Standard Addressbook - - - Open Standard &Addressbook - - - - - - 789cad92cf0ac2300cc6ef7d8ab0dc866c6eb231101f41f12888873673e8610a3a0f22bebbfdb3d6ced583e09742f3f54792429bc6b0592f214ed9b5e3dd91800efc02717d6bdbfb76b778b028cf41ae12b268c2a2040856e7d35ee528739c6a294bca56b32a33b656960a2aa950962bdb48192aac6d1add36a87f1094d2fb2731a7a856b81b7e23e8886dee0143900b2ed0c9bb1b0aeec580f880ff548343bd6b10c9534f42c0cd19013b670cfa9a003024047a1200b6463d898b5a87fe4e4928a2e79cbd00444d9e3f - - - 789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523232520022330543251d2e253d856405bffcbc54105b19c856360003103711c4b530b63084709340dc64d364a36453103705ca35837093c1dc9424b31430570f2b00cb2863015099c444e5242400e49026930c1446372d3919a607c8275206610fed641291fd9f8822830688925146350e9b0c6e17d0500614dd7aa830052c93a2870d2ad55a7301002caeaa93 - - - - - mAddresseeList - selectionChanged(TQListViewItem*) - MainWindow - updateAddressee(TQListViewItem*) - - - save - activated() - MainWindow - fileSave() - - - open - activated() - MainWindow - fileOpen() - - - addressee_remove - activated() - MainWindow - removeEntry() - - - addressee_new - activated() - MainWindow - newEntry() - - - PushButton1 - clicked() - MainWindow - newAddress() - - - PushButton2 - pressed() - MainWindow - removeAddress() - - - mAddressIdCombo - activated(int) - MainWindow - updateAddress(int) - - - dump - activated() - MainWindow - dumpAddressBook() - - - PushButton3 - clicked() - MainWindow - removePhoneNumber() - - - PushButton4 - clicked() - MainWindow - newPhoneNumber() - - - PushButton5 - clicked() - MainWindow - editEmail() - - - PushButton7 - clicked() - MainWindow - newEmail() - - - PushButton6 - clicked() - MainWindow - removeEmail() - - - mPhoneIdCombo - activated(int) - MainWindow - updatePhone(int) - - - PushButton7_2 - clicked() - MainWindow - newCategory() - - - PushButton5_2 - clicked() - MainWindow - editCategory() - - - PushButton6_2 - clicked() - MainWindow - removeCategory() - - - PushButton7_2_2 - clicked() - MainWindow - newCustom() - - - PushButton5_2_2 - clicked() - MainWindow - editCustom() - - - PushButton6_2_2 - clicked() - MainWindow - removeCustom() - - - open_std - activated() - MainWindow - fileOpenStd() - - - - mAddresseeList - TabWidget2 - mNameEdit - mUrlEdit - mFormattedNameEdit - mPrefixEdit - mGivenNameEdit - mAdditionalNameEdit - mFamilyNameEdit - mSuffixEdit - mNickNameEdit - mSortStringEdit - mTitleEdit - mRoleEdit - mOrganizationEdit - mEmailListView - PushButton7 - PushButton5 - PushButton6 - mPhoneIdCombo - PushButton3 - PushButton4 - mPhoneNumberEdit - mPhoneFaxCheck - mPhoneCarCheck - mPhoneIsdnCheck - mPhoneVoiceCheck - mPhoneHomeCheck - mPhoneCellCheck - mPhonePcsCheck - mPhoneModemCheck - mPhoneWorkCheck - mPhoneVideoCheck - mPhonePagerCheck - mPhoneMsgCheck - mPhonePrefCheck - mPhoneBbsCheck - mAddressIdCombo - PushButton2 - PushButton1 - mAddressPrefCheck - mAddressHomeCheck - mAddressParcelCheck - mAddressDomCheck - mAddressWorkCheck - mAddressPostalCheck - mAddressIntlCheck - mAddressPostOfficeBoxEdit - mAddressExtendedEdit - mAddressStreetEdit - mAddressLocalityEdit - mAddressRegionEdit - mAddressPostalCodeEdit - mAddressCountryEdit - mAddressLabelEdit - mCategoryListView - PushButton7_2 - PushButton5_2 - PushButton6_2 - mNoteEdit - mCustomListView - PushButton7_2_2 - PushButton5_2_2 - PushButton6_2_2 - - - resourcefile.h - addressbook.h - mainWindow.ui.h - - - class AddresseeItem - - - TDEABC::ResourceFile *mResourceFile - AddresseeItem *mCurrentItem - TDEABC::AddressBook *mAddressBook - TQString mCurrentAddress - TQString mCurrentPhone - - - init() - destroy() - fileSave() - fileOpen() - loadAddressBook( const TQString & fileName ) - updateAddressee( TQListViewItem * item ) - readAddressee( const TDEABC::Addressee & a ) - writeAddressee( const TDEABC::Addressee & addressee ) - newEntry() - removeEntry() - updateAddress( int id ) - writeAddress( const TDEABC::Address & address ) - writeAddress( const TQString & id ) - readAddress( const TDEABC::Address & a ) - readAddress( const TQString & id ) - updatePhone( int id ) - writePhone( const TDEABC::PhoneNumber & phoneNumber ) - writePhone( const TQString & id ) - readPhone( const TDEABC::PhoneNumber & p ) - readPhone( const TQString & id ) - newAddress() - removeAddress() - dumpAddressBook() - newEmail() - editEmail() - removeEmail() - newPhoneNumber() - removePhoneNumber() - newCategory() - editCategory() - removeCategory() - editCustom() - newCustom() - removeCustom() - addressBookChanged() - addressBookLocked() - addressBookUnlocked() - fileOpenStd() - - - diff --git a/kabc/frontend/mainWindow.ui.h b/kabc/frontend/mainWindow.ui.h deleted file mode 100644 index 8e678b93..00000000 --- a/kabc/frontend/mainWindow.ui.h +++ /dev/null @@ -1,658 +0,0 @@ -/**************************************************************************** -** ui.h extension file, included from the uic-generated form implementation. -** -** If you wish to add, delete or rename slots use TQt Designer which will -** update this file, preserving your code. Create an init() slot in place of -** a constructor, and a destroy() slot in place of a destructor. -*****************************************************************************/ - -#include -#include -#include - -#include -#include - -#include - -using namespace TDEABC; - -class AddresseeItem : public TQListViewItem -{ - public: - AddresseeItem( TQListView *parent, const Addressee &a ) : - TQListViewItem( parent, a.realName(), a.uid() ), mAddressee( a ) {} - - void setAddressee( const Addressee &a ) { mAddressee = a; } - Addressee &addressee() { return mAddressee; } - - private: - Addressee mAddressee; -}; - -void MainWindow::init() -{ - mAddressBook = TDEABC::StdAddressBook::self( true ); - - mCurrentItem = 0; - - mEmailListView->header()->hide(); - mCategoryListView->header()->hide(); - - connect( mAddressBook, TQT_SIGNAL( addressBookChanged( AddressBook * ) ), - TQT_SLOT( addressBookChanged() ) ); - connect( mAddressBook, TQT_SIGNAL( addressBookLocked( AddressBook * ) ), - TQT_SLOT( addressBookLocked() ) ); - connect( mAddressBook, TQT_SIGNAL( addressBookUnlocked( AddressBook * ) ), - TQT_SLOT( addressBookUnlocked() ) ); -} - -void MainWindow::destroy() -{ - delete mAddressBook; -} - -void MainWindow::fileSave() -{ - updateAddressee( mAddresseeList->selectedItem() ); - - StdAddressBook::save(); -} - -void MainWindow::fileOpen() -{ - TQString fileName = TQFileDialog::getOpenFileName(); - - loadAddressBook( fileName ); -} - -void MainWindow::loadAddressBook( const TQString &fileName ) -{ - kdDebug() << "loadAddressBook(): '" << fileName << "'" << endl; - - mAddresseeList->clear(); - mCurrentItem = 0; - mCurrentAddress = TQString(); - readAddressee( Addressee() ); - - TDEABC::AddressBook::Iterator it; - for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { - new AddresseeItem( mAddresseeList, (*it) ); - } -} - -void MainWindow::updateAddressee( TQListViewItem *item ) -{ - AddresseeItem *addresseeItem = dynamic_cast( item ); - if ( !addresseeItem ) return; - - if (mCurrentItem ) { - writeAddress( mCurrentAddress ); - writePhone( mCurrentPhone ); - Addressee a = writeAddressee( mCurrentItem->addressee() ); - mCurrentItem->setAddressee( a ); - mAddressBook->insertAddressee( a ); - } - mCurrentItem = addresseeItem; - - readAddressee( addresseeItem->addressee() ); - updateAddress( mAddressIdCombo->currentItem() ); - updatePhone( mPhoneIdCombo->currentItem() ); -} - - -void MainWindow::readAddressee( const TDEABC::Addressee &a ) -{ - kdDebug() << "MainWindow::readAddressee(): " << a.name() << endl; - - mNameEdit->setText( a.name() ); - mUrlEdit->setText( a.url().url() ); - mAdditionalNameEdit->setText( a.additionalName() ); - mSuffixEdit->setText( a.suffix() ); - mGivenNameEdit->setText( a.givenName() ); - mPrefixEdit->setText( a.prefix() ); - mFamilyNameEdit->setText( a.familyName() ); - mFormattedNameEdit->setText( a.formattedName() ); - mNickNameEdit->setText( a.nickName() ); - mSortStringEdit->setText( a.sortString() ); - mTitleEdit->setText( a.title() ); - mRoleEdit->setText( a.role() ); - mOrganizationEdit->setText( a.organization() ); - mNoteEdit->setText( a.note() ); -// mLabelEdit->setText( a.label() ); - - mEmailListView->clear(); - TQStringList emails = a.emails(); - TQStringList::ConstIterator it3; - for( it3 = emails.begin(); it3 != emails.end(); ++it3 ) { - new TQListViewItem( mEmailListView, *it3 ); - } - - mCategoryListView->clear(); - TQStringList categories = a.categories(); - TQStringList::ConstIterator it4; - for( it4 = categories.begin(); it4 != categories.end(); ++it4 ) { - new TQListViewItem( mCategoryListView, *it4 ); - } - - mCustomListView->clear(); - TQStringList customs = a.customs(); - TQStringList::ConstIterator it5; - for( it5 = customs.begin(); it5 != customs.end(); ++it5 ) { - int posDash = (*it5).find( "-" ); - int posColon = (*it5).find( ":" ); - - TQString app = (*it5).left( posDash ); - TQString cname = (*it5).mid( posDash + 1, posColon - posDash - 1 ); - TQString value = (*it5).mid( posColon + 1 ); - - new TQListViewItem( mCustomListView, app, cname, value ); - } - - Address::List addresses = a.addresses(); - mAddressIdCombo->clear(); - Address::List::ConstIterator it; - for( it = addresses.begin(); it != addresses.end(); ++it ) { - mAddressIdCombo->insertItem( (*it).id() ); - } - if ( mAddressIdCombo->count() > 0 ) mCurrentAddress = mAddressIdCombo->currentText(); - else mCurrentAddress = TQString(); - readAddress( mCurrentAddress ); - - mPhoneIdCombo->clear(); - PhoneNumber::List pl = a.phoneNumbers(); - PhoneNumber::List::ConstIterator it2; - for( it2 = pl.begin(); it2 != pl.end(); ++it2) { - mPhoneIdCombo->insertItem( (*it2).id() ); - } - if ( mPhoneIdCombo->count() > 0 ) mCurrentPhone = mPhoneIdCombo->currentText(); - readPhone( mCurrentPhone ); -} - -TDEABC::Addressee MainWindow::writeAddressee( const TDEABC::Addressee &addressee ) -{ - Addressee a( addressee ); - a.setName( mNameEdit->text() ); - if ( !mUrlEdit->text().isEmpty() ) { - a.setUrl( KURL( mUrlEdit->text() ) ); - } - - a.setAdditionalName( mAdditionalNameEdit->text() ); - a.setSuffix( mSuffixEdit->text() ); - a.setGivenName( mGivenNameEdit->text() ); - a.setPrefix( mPrefixEdit->text() ); - a.setFamilyName( mFamilyNameEdit->text() ); - a.setFormattedName( mFormattedNameEdit->text() ); - a.setNickName( mNickNameEdit->text() ); - a.setSortString( mSortStringEdit->text() ); - a.setTitle( mTitleEdit->text() ); - a.setRole( mRoleEdit->text() ); - a.setOrganization( mOrganizationEdit->text() ); - a.setNote( mNoteEdit->text() ); -// a.setLabel( mLabelEdit->text() ); - - kdDebug() << "MainWindow::writeAddressee()" << endl; - a.dump(); - - return a; -} - -void MainWindow::newEntry() -{ - bool ok = false; - TQString name = KInputDialog::getText( i18n("New Address Book Entry"), - i18n("Please enter name:"), - TQString(), &ok, - this ); - if ( !ok || name.isEmpty() ) return; - - Addressee a; - a.setName( name ); - mAddressBook->insertAddressee( a ); - - new AddresseeItem( mAddresseeList, a ); -} - -void MainWindow::removeEntry() -{ - AddresseeItem *item = dynamic_cast(mAddresseeList->selectedItem()); - if ( item ) { - mAddressBook->removeAddressee( item->addressee() ); - delete item; - mCurrentItem = 0; - } -} - - -void MainWindow::updateAddress( int id ) -{ - if( !mCurrentItem ) return; - - writeAddress( mCurrentAddress ); - if ( mAddressIdCombo->count() > 0 ) { - mCurrentAddress = mAddressIdCombo->text( id ); - } else { - mCurrentAddress = TQString(); - } - readAddress( mCurrentAddress ); -} - -TDEABC::Address MainWindow::writeAddress( const TDEABC::Address &address ) -{ - Address a( address ); - - a.setPostOfficeBox( mAddressPostOfficeBoxEdit->text() ); - a.setExtended( mAddressExtendedEdit->text() ); - a.setStreet( mAddressStreetEdit->text() ); - a.setLocality( mAddressLocalityEdit->text() ); - a.setRegion( mAddressRegionEdit->text() ); - a.setLabel( mAddressLabelEdit->text() ); - a.setPostalCode( mAddressPostalCodeEdit->text() ); - a.setCountry( mAddressCountryEdit->text() ); - - int type = 0; - if ( mAddressDomCheck->isChecked() ) type |= Address::Dom; - if ( mAddressIntlCheck->isChecked() ) type |= Address::Intl; - if ( mAddressParcelCheck->isChecked() ) type |= Address::Parcel; - if ( mAddressPostalCheck->isChecked() ) type |= Address::Postal; - if ( mAddressHomeCheck->isChecked() ) type |= Address::Home; - if ( mAddressPrefCheck->isChecked() ) type |= Address::Pref; - if ( mAddressWorkCheck->isChecked() ) type |= Address::Work; - a.setType( type ); - - return a; -} - -void MainWindow::writeAddress( const TQString &id ) -{ - if ( !mCurrentItem ) return; - - if ( id.isEmpty() ) return; - - Address address; - address.setId( id ); - address = writeAddress( address ); - - mCurrentItem->addressee().insertAddress( address ); -} - -void MainWindow::readAddress( const TDEABC::Address &a ) -{ - mAddressPostOfficeBoxEdit->setText( a.postOfficeBox() ); - mAddressExtendedEdit->setText( a.extended() ); - mAddressStreetEdit->setText( a.street() ); - mAddressLocalityEdit->setText( a.locality() ); - mAddressRegionEdit->setText( a.region() ); - mAddressLabelEdit->setText( a.label() ); - mAddressPostalCodeEdit->setText( a.postalCode() ); - mAddressCountryEdit->setText( a.country() ); - - int type = a.type(); - if ( type & Address::Dom ) mAddressDomCheck->setChecked( true ); - else mAddressDomCheck->setChecked( false ); - if ( type & Address::Intl ) mAddressIntlCheck->setChecked( true ); - else mAddressIntlCheck->setChecked( false ); - if ( type & Address::Parcel ) mAddressParcelCheck->setChecked( true ); - else mAddressParcelCheck->setChecked( false ); - if ( type & Address::Postal ) mAddressPostalCheck->setChecked( true ); - else mAddressPostalCheck->setChecked( false ); - if ( type & Address::Home ) mAddressHomeCheck->setChecked( true ); - else mAddressHomeCheck->setChecked( false ); - if ( type & Address::Pref ) mAddressPrefCheck->setChecked( true ); - else mAddressPrefCheck->setChecked( false ); - if ( type & Address::Work ) mAddressWorkCheck->setChecked( true ); - else mAddressWorkCheck->setChecked( false ); -} - -void MainWindow::readAddress( const TQString &id ) -{ - if ( !mCurrentItem || id.isEmpty() ) { - readAddress( Address() ); - return; - } - - Address address = mCurrentItem->addressee().findAddress( id ); - readAddress( address ); -} - -void MainWindow::updatePhone( int id ) -{ - if( !mCurrentItem ) return; - - writePhone( mCurrentPhone ); - if ( mPhoneIdCombo->count() > 0 ) { - mCurrentPhone = mPhoneIdCombo->text( id ); - } else { - mCurrentPhone = TQString(); - } - readPhone( mCurrentPhone ); -} - -TDEABC::PhoneNumber MainWindow::writePhone( const TDEABC::PhoneNumber &phoneNumber ) -{ - PhoneNumber p( phoneNumber ); - - p.setNumber( mPhoneNumberEdit->text() ); - - int type = 0; - if ( mPhoneMsgCheck->isChecked() ) type |= PhoneNumber::Msg; - if ( mPhoneVoiceCheck->isChecked() ) type |= PhoneNumber::Voice; - if ( mPhoneFaxCheck->isChecked() ) type |= PhoneNumber::Fax; - if ( mPhoneCellCheck->isChecked() ) type |= PhoneNumber::Cell; - if ( mPhoneHomeCheck->isChecked() ) type |= PhoneNumber::Home; - if ( mPhonePrefCheck->isChecked() ) type |= PhoneNumber::Pref; - if ( mPhoneWorkCheck->isChecked() ) type |= PhoneNumber::Work; - if ( mPhoneVideoCheck->isChecked() ) type |= PhoneNumber::Video; - if ( mPhoneBbsCheck->isChecked() ) type |= PhoneNumber::Bbs; - if ( mPhoneModemCheck->isChecked() ) type |= PhoneNumber::Modem; - if ( mPhoneCarCheck->isChecked() ) type |= PhoneNumber::Car; - if ( mPhoneIsdnCheck->isChecked() ) type |= PhoneNumber::Isdn; - if ( mPhonePcsCheck->isChecked() ) type |= PhoneNumber::Pcs; - if ( mPhonePagerCheck->isChecked() ) type |= PhoneNumber::Pager; - p.setType( type ); - - return p; -} - -void MainWindow::writePhone( const TQString &id ) -{ - if ( !mCurrentItem ) return; - - if ( id.isEmpty() ) return; - - PhoneNumber p; - p.setId( id ); - p = writePhone( p ); - - mCurrentItem->addressee().insertPhoneNumber( p ); -} - -void MainWindow::readPhone( const TDEABC::PhoneNumber &p ) -{ - mPhoneNumberEdit->setText( p.number() ); - - int type = p.type(); - if ( type & PhoneNumber::Msg ) mPhoneMsgCheck->setChecked( true ); - else mPhoneMsgCheck->setChecked( false ); - if ( type & PhoneNumber::Voice ) mPhoneVoiceCheck->setChecked( true ); - else mPhoneVoiceCheck->setChecked( false ); - if ( type & PhoneNumber::Fax ) mPhoneFaxCheck->setChecked( true ); - else mPhoneFaxCheck->setChecked( false ); - if ( type & PhoneNumber::Cell ) mPhoneCellCheck->setChecked( true ); - else mPhoneCellCheck->setChecked( false ); - if ( type & PhoneNumber::Home ) mPhoneHomeCheck->setChecked( true ); - else mPhoneHomeCheck->setChecked( false ); - if ( type & PhoneNumber::Pref ) mPhonePrefCheck->setChecked( true ); - else mPhonePrefCheck->setChecked( false ); - if ( type & PhoneNumber::Work ) mPhoneWorkCheck->setChecked( true ); - else mPhoneWorkCheck->setChecked( false ); - if ( type & PhoneNumber::Video ) mPhoneVideoCheck->setChecked( true ); - else mPhoneVideoCheck->setChecked( false ); - if ( type & PhoneNumber::Bbs ) mPhoneBbsCheck->setChecked( true ); - else mPhoneBbsCheck->setChecked( false ); - if ( type & PhoneNumber::Modem ) mPhoneModemCheck->setChecked( true ); - else mPhoneModemCheck->setChecked( false ); - if ( type & PhoneNumber::Car ) mPhoneCarCheck->setChecked( true ); - else mPhoneCarCheck->setChecked( false ); - if ( type & PhoneNumber::Isdn ) mPhoneIsdnCheck->setChecked( true ); - else mPhoneIsdnCheck->setChecked( false ); - if ( type & PhoneNumber::Pcs ) mPhonePcsCheck->setChecked( true ); - else mPhonePcsCheck->setChecked( false ); - if ( type & PhoneNumber::Pager ) mPhonePagerCheck->setChecked( true ); - else mPhonePagerCheck->setChecked( false ); -} - -void MainWindow::readPhone( const TQString &id ) -{ - if ( !mCurrentItem || id.isEmpty() ) { - readPhone( PhoneNumber() ); - return; - } - - PhoneNumber p = mCurrentItem->addressee().findPhoneNumber( id ); - readPhone( p ); -} - - -void MainWindow::newAddress() -{ - if( !mCurrentItem ) return; - - Address address; - mCurrentItem->addressee().insertAddress( address ); - - mAddressIdCombo->insertItem( address.id() ); -} - -void MainWindow::removeAddress() -{ - if ( !mCurrentItem ) return; - - TQString id = mAddressIdCombo->currentText(); - if ( id.isEmpty() ) return; - - Address address; - address.setId( id ); - mCurrentItem->addressee().removeAddress( address ); - - readAddressee( mCurrentItem->addressee() ); -} - - -void MainWindow::dumpAddressBook() -{ - mAddressBook->dump(); -} - - -void MainWindow::newEmail() -{ - if ( !mCurrentItem ) return; - - bool ok = false; - TQString name = KInputDialog::getText( i18n("New Email Address"), - i18n("Please enter email address:"), - TQString(), &ok, - this ); - if ( !ok || name.isEmpty() ) return; - - new TQListViewItem( mEmailListView, name ); - mCurrentItem->addressee().insertEmail( name ); -} - -void MainWindow::editEmail() -{ - if ( !mCurrentItem ) return; - - TQListViewItem *item = mEmailListView->selectedItem(); - if( !item ) return; - - TQString oldName = item->text( 0 ); - - bool ok = false; - TQString name = KInputDialog::getText( i18n("Edit Email Address"), - i18n("Please enter new email address:"), - oldName, &ok, - this ); - if ( !ok || name.isEmpty() ) return; - - item->setText( 0, name ); - mCurrentItem->addressee().removeEmail( oldName ); - mCurrentItem->addressee().insertEmail( name ); -} - -void MainWindow::removeEmail() -{ - if ( !mCurrentItem ) return; - - TQListViewItem *item = mEmailListView->selectedItem(); - if( !item ) return; - - mCurrentItem->addressee().removeEmail( item->text( 0 ) ); - delete item; -} - -void MainWindow::newPhoneNumber() -{ - if ( !mCurrentItem ) return; - - PhoneNumber p; - mCurrentItem->addressee().insertPhoneNumber( p ); - - mPhoneIdCombo->insertItem( p.id() ); -} - -void MainWindow::removePhoneNumber() -{ - if ( !mCurrentItem ) return; - - TQString id = mPhoneIdCombo->currentText(); - if ( id.isEmpty() ) return; - - PhoneNumber p; - p.setId( id ); - mCurrentItem->addressee().removePhoneNumber( p ); - - readAddressee( mCurrentItem->addressee() ); -} - - -void MainWindow::newCategory() -{ - if ( !mCurrentItem ) return; - - bool ok = false; - TQString name = KInputDialog::getText( i18n("New Category"), - i18n("Please enter category name:"), - TQString(), &ok, - this ); - if ( !ok || name.isEmpty() ) return; - - new TQListViewItem( mCategoryListView, name ); - mCurrentItem->addressee().insertCategory( name ); -} - -void MainWindow::editCategory() -{ - if ( !mCurrentItem ) return; - - TQListViewItem *item = mCategoryListView->selectedItem(); - if( !item ) return; - - TQString oldName = item->text( 0 ); - - bool ok = false; - TQString name = KInputDialog::getText( i18n("Edit Category"), - i18n("Please enter new category name:"), - oldName, &ok, - this ); - if ( !ok || name.isEmpty() ) return; - - item->setText( 0, name ); - mCurrentItem->addressee().removeCategory( oldName ); - mCurrentItem->addressee().insertCategory( name ); -} - -void MainWindow::removeCategory() -{ - if ( !mCurrentItem ) return; - - TQListViewItem *item = mCategoryListView->selectedItem(); - if( !item ) return; - - mCurrentItem->addressee().removeCategory( item->text( 0 ) ); - delete item; -} - - -void MainWindow::editCustom() -{ - if ( !mCurrentItem ) return; - - TQListViewItem *item = mCustomListView->selectedItem(); - if( !item ) return; - - TQString oldName = item->text( 0 ) + "-" + item->text( 1 ) + ":" + - item->text( 2 ); - - bool ok = false; - TQString name = KInputDialog::getText( i18n("New Custom Entry"), - i18n("Please enter custom entry.\n" - "Format: APP-NAME:VALUE"), - oldName, &ok, - this ); - if ( !ok || name.isEmpty() ) return; - - int posDash = name.find( "-" ); - int posColon = name.find( ":" ); - - TQString app = name.left( posDash ); - TQString cname = name.mid( posDash + 1, posColon - posDash - 1 ); - TQString value = name.mid( posColon + 1 ); - - item->setText( 0, app ); - item->setText( 1, cname ); - item->setText( 2, value ); - - mCurrentItem->addressee().removeCustom( app, cname ); - mCurrentItem->addressee().insertCustom( app, cname, value ); -} - -void MainWindow::newCustom() -{ - if ( !mCurrentItem ) return; - - bool ok = false; - TQString name = KInputDialog::getText( i18n("New Custom Entry"), - i18n("Please enter custom entry.\n" - "Format: APP-NAME:VALUE"), - TQString(), &ok, - this ); - if ( !ok || name.isEmpty() ) return; - - int posDash = name.find( "-" ); - int posColon = name.find( ":" ); - - TQString app = name.left( posDash ); - TQString cname = name.mid( posDash + 1, posColon - posDash - 1 ); - TQString value = name.mid( posColon + 1 ); - - new TQListViewItem( mCustomListView, app, cname, value ); - - mCurrentItem->addressee().insertCustom( app, cname, value ); -} - -void MainWindow::removeCustom() -{ - if ( !mCurrentItem ) return; - - TQListViewItem *item = mCustomListView->selectedItem(); - if( !item ) return; - - mCurrentItem->addressee().removeCustom( item->text( 0 ), item->text( 1 ) ); - delete item; -} - -void MainWindow::addressBookChanged() -{ - TQMessageBox::warning( this, i18n("Address Book Changed"), - i18n("The address book has changed on disk."), - i18n("Reload") ); - loadAddressBook( "dummy" ); -} - -void MainWindow::addressBookLocked() -{ - kdDebug() << "AddressBook locked()" << endl; -} - -void MainWindow::addressBookUnlocked() -{ - kdDebug() << "AddressBook unlocked()" << endl; -} - - -void MainWindow::fileOpenStd() -{ - loadAddressBook( StdAddressBook::fileName() ); -} diff --git a/kabc/kabc2mutt/CMakeLists.txt b/kabc/kabc2mutt/CMakeLists.txt deleted file mode 100644 index 98c30f0b..00000000 --- a/kabc/kabc2mutt/CMakeLists.txt +++ /dev/null @@ -1,29 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ${TDE_INCLUDE_DIR} - ${TQT_INCLUDE_DIRS} -) - -link_directories( - ${TQT_LIBRARY_DIRS} -) - - -##### kabc2mutt (executable) #################### - -tde_add_executable( kabc2mutt AUTOMOC - SOURCES kabc2mutt.cpp main.cpp - LINK tdeabc-shared - DESTINATION ${BIN_INSTALL_DIR} -) diff --git a/kabc/kabc2mutt/Makefile.am b/kabc/kabc2mutt/Makefile.am deleted file mode 100644 index 5713ff00..00000000 --- a/kabc/kabc2mutt/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -INCLUDES = -I$(includedir)/tdeabc $(all_includes) - -METASOURCES = AUTO - -bin_PROGRAMS = kabc2mutt - -kabc2mutt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kabc2mutt_LDADD = -ltdeabc $(LIB_TDECORE) -kabc2mutt_SOURCES = kabc2mutt.cpp main.cpp - -messages: rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/tdeabc2mutt.pot - diff --git a/kabc/kabc2mutt/README b/kabc/kabc2mutt/README deleted file mode 100644 index 5d82fdfe..00000000 --- a/kabc/kabc2mutt/README +++ /dev/null @@ -1,19 +0,0 @@ -KAbc2Mutt ------------ - -kabc2mutt is a small programm to make the email addresses, stored in -kaddressbook, available in mutt. -You only have to add the following line to your .muttrc - - source "kabc2mutt |" - -You can also configure mutt to query kabc2mutt when typing a substring -of an email address (see the docu for query_command). -To do this, add the following line to your .muttrc - - set query_command = "kabc2mutt --query '%s' --format query" - -Have fun with it - -Ciao, -Tobias diff --git a/kabc/kabc2mutt/kabc2mutt.cpp b/kabc/kabc2mutt/kabc2mutt.cpp deleted file mode 100644 index 01ae6fd2..00000000 --- a/kabc/kabc2mutt/kabc2mutt.cpp +++ /dev/null @@ -1,160 +0,0 @@ -/* - KAbc2Mutt - - Copyright (c) 2003 - 2004 Tobias Koenig - - This program is free software; you can redistribute it and/or - modify it under the terms of version 2 of the GNU General Public - License as published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ - -#include -#include -#include - -#include - -#include - -#include "kabc2mutt.h" - -static std::ostream & operator<< ( std::ostream &os, const TQString &s ); - -KABC2Mutt::KABC2Mutt( TQObject *parent, const char *name ) - : TQObject( parent, name ), mFormat( Aliases ), - mIgnoreCase( false ), mAllAddresses( false ), - mAlternateKeyFormat( false ), - mAddressBook( 0 ) -{ -} - -void KABC2Mutt::run() -{ - mAddressBook = TDEABC::StdAddressBook::self( true ); - TDEABC::StdAddressBook::setAutomaticSave( false ); - - connect( mAddressBook, TQT_SIGNAL( addressBookChanged( AddressBook* ) ), - this, TQT_SLOT( loadingFinished() ) ); -} - -void KABC2Mutt::loadingFinished() -{ - // print addressees - TDEABC::AddressBook::ConstIterator iaddr; - for ( iaddr = mAddressBook->begin(); iaddr != mAddressBook->end(); ++iaddr ) { - const TQString name = (*iaddr).givenName() + ' ' + (*iaddr).familyName(); - if ( !mQuery.isEmpty() ) { - bool match = (name.find(mQuery, 0, mIgnoreCase) > -1) || - ((*iaddr).preferredEmail().find( mQuery, 0, mIgnoreCase ) > -1 ); - if ( !match ) - continue; - } - - const TQStringList &allAddresses = (*iaddr).emails(); - TQStringList::const_iterator from, to; - bool multiple = false; - - if ( mAllAddresses ) { - // use all entries - multiple = allAddresses.size() > 1; - from = allAddresses.begin(); - to = allAddresses.end(); - } else { - // use only the first entry, the one returned by preferredEmail() - from = to = allAddresses.begin(); // start with empty list - if ( to != allAddresses.end() ) - ++to; - } - - size_t index = 0; - if ( mFormat == Aliases ) { - static const TQChar space = TQChar( ' ' ); - static const TQChar underscore = TQChar( '_' ); - - TQString key; - if ( !mAlternateKeyFormat ) - key = (*iaddr).givenName().left( 3 ) + (*iaddr).familyName().left( 3 ); - else - if ( !(*iaddr).familyName().isEmpty() ) - key = (*iaddr).givenName().left( 1 ).lower() + - (*iaddr).familyName().lower().replace( space, underscore ); - else - key = (*iaddr).givenName().lower().replace( space, underscore ); - - while ( from != to ) { - std::cout << "alias " << key; - if ( index ) - std::cout << index; - std::cout << '\t' << name << " <" << (*from) << '>' << std::endl; - ++index; - ++from; - } - - if ( !(*iaddr).nickName().isEmpty() ) { - std::cout << "alias " - << (*iaddr).nickName().lower().replace( space, underscore ) - << '\t' << name << " <" - << (*iaddr).preferredEmail() << '>' << std::endl; - } - } else { - while ( from != to ) { - std::cout << (*from) << '\t' << name; - if ( multiple ) { - if ( index ) - std::cout << "\t#" << index; - else - std::cout << '\t' << i18n( "preferred" ); - ++index; - } - std::cout << std::endl; - ++from; - } - } - } - - // print all distribution lists - TDEABC::DistributionListManager manager( mAddressBook ); - manager.load(); - - TQStringList dists = manager.listNames(); - for ( TQStringList::Iterator iaddr = dists.begin(); iaddr != dists.end(); ++iaddr ) { - TDEABC::DistributionList *list = manager.list( *iaddr ); - if ( list ) { - if ( !mQuery.isEmpty() ) { - bool match = ((*iaddr).find(mQuery) > -1); - if ( !match ) - continue; - } - - TQStringList emails = list->emails(); - if ( emails.isEmpty() ) - continue; - - if ( mFormat == Aliases ) { - std::cout << "alias " << (*iaddr).replace( TQRegExp( " " ), "_" ) - << '\t' << emails.join( "," ) << std::endl; - } else { - std::cout << emails.join( "," ) << '\t' << (*iaddr) << '\t' << std::endl; - } - } - } - - kapp->quit(); -} - -static std::ostream & operator<< ( std::ostream &os, const TQString &s ) -{ - os << s.local8Bit().data(); - return os; -} - -#include "kabc2mutt.moc" diff --git a/kabc/kabc2mutt/kabc2mutt.h b/kabc/kabc2mutt/kabc2mutt.h deleted file mode 100644 index 92b7e968..00000000 --- a/kabc/kabc2mutt/kabc2mutt.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - KAbc2Mutt - - Copyright (c) 2003 - 2004 Tobias Koenig - - This program is free software; you can redistribute it and/or - modify it under the terms of version 2 of the GNU General Public - License as published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ - -#ifndef KABC2MUTT_H -#define KABC2MUTT_H - -#include - -class KABC2Mutt : public TQObject -{ - Q_OBJECT - - - public: - - enum Format { Aliases, Query }; - - KABC2Mutt( TQObject *parent, const char *name = 0 ); - - void setQuery( const TQString &query ) { mQuery = query; } - void setFormat( Format format ) { mFormat = format; } - void setIgnoreCase( bool ignoreCase ) { mIgnoreCase = ignoreCase; } - void setAllAddresses( bool allAddresses ) { mAllAddresses = allAddresses; } - void setAlternateKeyFormat( bool alternateKeyFormat ) { mAlternateKeyFormat = alternateKeyFormat; } - - void run(); - - private slots: - void loadingFinished(); - - private: - TQString mQuery; - Format mFormat; - bool mIgnoreCase; - bool mAllAddresses; - bool mAlternateKeyFormat; - - TDEABC::AddressBook *mAddressBook; -}; - -#endif diff --git a/kabc/kabc2mutt/main.cpp b/kabc/kabc2mutt/main.cpp deleted file mode 100644 index d1aefd6e..00000000 --- a/kabc/kabc2mutt/main.cpp +++ /dev/null @@ -1,80 +0,0 @@ -/* - KAbc2Mutt - - Copyright (c) 2003 - 2004 Tobias Koenig - - This program is free software; you can redistribute it and/or - modify it under the terms of version 2 of the GNU General Public - License as published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ - -#include -#include -#include - -#include - -#include "kabc2mutt.h" - -static const char version[] = "0.2"; -static const char appName[] = "kabc2mutt"; -static const char programName[] = I18N_NOOP( "kabc2mutt" ); -static const char description[] = I18N_NOOP( "kabc - mutt converter" ); - -static TDECmdLineOptions k2moptions[] = -{ - { "query ", I18N_NOOP( "Only show contacts where name or address matches " ), 0 }, - { "format ", I18N_NOOP( "Default format is 'alias'. 'query' returns emailname, as needed by mutt's query_command" ), "alias" }, - { "alternate-key-format", I18N_NOOP( "Default key format is 'JohDoe', this option turns it into 'jdoe'" ), 0 }, - { "ignore-case", I18N_NOOP( "Make queries case insensitive" ), 0 }, - { "all-addresses", I18N_NOOP( "Return all mail addresses, not just the preferred one" ), 0}, - TDECmdLineLastOption -}; - - -int main( int argc, char **argv ) -{ - TDEApplication::disableAutoDcopRegistration(); - TDECmdLineArgs::init( argc, argv, appName, programName, description, version ); - TDECmdLineArgs::addCmdLineOptions( k2moptions ); - - TDEApplication app( false, false ); - - TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); - - KABC2Mutt *object = new KABC2Mutt( 0 ); - - // Handle --format option - object->setFormat( (args->getOption("format") == "query") ? KABC2Mutt::Query : KABC2Mutt::Aliases ); - - // Handle --alternate-key-format option - object->setAlternateKeyFormat( args->isSet( "alternate-key-format" ) ); - - // Handle --all-addresses option - object->setAllAddresses( args->isSet( "all-addresses" ) ); - - // Handle --query option - const TQString subString = TQString::fromLocal8Bit( args->getOption( "query" ) ); - if ( !subString.isEmpty() ) { - // Mutt wants a first line with some status message on it - // See http://mutt.org/doc/manual/manual-4.html#ss4.5 - std::cout << i18n( "Searching KDE addressbook" ).latin1() << std::endl; - } - object->setQuery( subString ); - - // Handle --ignore-case option - object->setIgnoreCase( !args->isSet( "ignore-case" ) ); - - object->run(); - - return app.exec(); -} diff --git a/kabc/kabcdistlistupdater/CMakeLists.txt b/kabc/kabcdistlistupdater/CMakeLists.txt deleted file mode 100644 index be5e77d4..00000000 --- a/kabc/kabcdistlistupdater/CMakeLists.txt +++ /dev/null @@ -1,42 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -tde_import( libkmime ) -tde_import( ktnef ) -tde_import( libkcal ) -tde_import( libtdepim ) - -include_directories( - ${CMAKE_SOURCE_DIR} - ${TDE_INCLUDE_DIR} - ${TQT_INCLUDE_DIRS} -) - -link_directories( - ${TQT_LIBRARY_DIRS} -) - - -##### other data ################################ - -install( - FILES kabcdistlistupdater.desktop - DESTINATION ${AUTOSTART_INSTALL_DIR} -) - - -##### kabcdistlistupdater (executable) #################### - -tde_add_executable( kabcdistlistupdater - SOURCES kabcdistlistupdater.cpp - LINK tdepim-shared - DESTINATION ${BIN_INSTALL_DIR} -) diff --git a/kabc/kabcdistlistupdater/Makefile.am b/kabc/kabcdistlistupdater/Makefile.am deleted file mode 100644 index 691ec277..00000000 --- a/kabc/kabcdistlistupdater/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -INCLUDES = -I$(includedir)/tdeabc -I$(top_srcdir) $(all_includes) - -METASOURCES = AUTO - -bin_PROGRAMS = kabcdistlistupdater - -kabcdistlistupdater_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kabcdistlistupdater_LDADD = $(LIB_TDEABC) $(top_builddir)/libtdepim/libtdepim.la -kabcdistlistupdater_SOURCES = kabcdistlistupdater.cpp - -autostart_DATA = kabcdistlistupdater.desktop -autostartdir = $(datadir)/autostart diff --git a/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp b/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp deleted file mode 100644 index 9455e88b..00000000 --- a/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp +++ /dev/null @@ -1,95 +0,0 @@ -/* - This file is part of libkabc. - Copyright (c) 2008 Tobias Koenig - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -static const TDECmdLineOptions options[] = -{ - { "disable-autostart", "Disable automatic startup on login", 0 }, - TDECmdLineLastOption -}; - -void convertDistributionLists() -{ - KSimpleConfig cfg( locateLocal( "data", "tdeabc/distlists" ) ); - const TQMap entryMap = cfg.entryMap( "DistributionLists" ); - - if ( entryMap.isEmpty() ) // nothing to convert - return; - - TQMapConstIterator it; - for ( it = entryMap.begin(); it != entryMap.end(); ++it ) { - const TQString listName = it.key(); - const TQStringList entries = TQStringList::split( ',', it.data(), true ); - - KPIM::DistributionList distList; - distList.setUid( TDEApplication::randomString( 10 ) ); - distList.setName( listName ); - - if ( entries.count() > 1 ) { - for ( uint i = 0; i < entries.count(); i += 2 ) { - const TQString uid = entries[ i ]; - const TQString preferredEMail = entries[ i + 1 ]; - - distList.insertEntry( uid, preferredEMail ); - } - } - - TDEABC::StdAddressBook::self()->insertAddressee( distList ); - } - - TDEABC::StdAddressBook::self()->save(); -} - -int main( int argc, char **argv ) -{ - TDEApplication::disableAutoDcopRegistration(); - - TDEAboutData aboutData( "kabcdistlistupdater", "Converter tool for distribution lists", "0.1" ); - aboutData.addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" ); - - TDECmdLineArgs::init( argc, argv, &aboutData ); - TDECmdLineArgs::addCmdLineOptions( options ); - - TDEApplication app( false, false ); - - TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); - - if ( args->isSet( "disable-autostart" ) ) { - kdDebug() << "Disable autostart." << endl; - - TDEConfig *config = app.config(); - config->setGroup( "Startup" ); - config->writeEntry( "EnableAutostart", false ); - } - - convertDistributionLists(); -} - diff --git a/kabc/kabcdistlistupdater/kabcdistlistupdater.desktop b/kabc/kabcdistlistupdater/kabcdistlistupdater.desktop deleted file mode 100644 index b4694dbc..00000000 --- a/kabc/kabcdistlistupdater/kabcdistlistupdater.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=kabcdistlistupdater -Exec=kabcdistlistupdater --disable-autostart -Icon=misc -Type=Application -Comment=Tool to update the old distribution lists to the new ones. -Terminal=false -NoDisplay=true -X-TDE-autostart-condition=kabcdistlistupdaterrc:Startup:EnableAutostart:true -OnlyShowIn=TDE; diff --git a/kaddressbook/Makefile.am b/kaddressbook/Makefile.am index 3ae6e636..16026aca 100644 --- a/kaddressbook/Makefile.am +++ b/kaddressbook/Makefile.am @@ -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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kaddressbook_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor 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_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) -lDCOP +libkaddressbookpart_la_LIBADD = libkaddressbook.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) -lDCOP lib_LTLIBRARIES = libkaddressbook.la libkaddressbook_la_SOURCES = addresseeconfig.cpp addresseeeditordialog.cpp \ diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 6a7ece0e..27b71139 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -272,10 +272,10 @@ TQStringList KABCore::selectedUIDs() const TDEABC::Resource *KABCore::requestResource( TQWidget *parent ) { - TQPtrList kabcResources = addressBook()->resources(); + TQPtrList tdeabcResources = addressBook()->resources(); TQPtrList kresResources; - TQPtrListIterator resIt( kabcResources ); + TQPtrListIterator resIt( tdeabcResources ); TDEABC::Resource *resource; while ( ( resource = resIt.current() ) != 0 ) { ++resIt; @@ -320,7 +320,7 @@ TDEAboutData *KABCore::createAboutData() about->addAuthor( "Tobias Koenig", I18N_NOOP( "Previous maintainer" ), "tokoe@kde.org" ); about->addAuthor( "Don Sanders", I18N_NOOP( "Original author" ) ); about->addAuthor( "Cornelius Schumacher", - I18N_NOOP( "Co-maintainer, libkabc port, CSV import/export" ), + I18N_NOOP( "Co-maintainer, libtdeabc port, CSV import/export" ), "schumacher@kde.org" ); about->addAuthor( "Mike Pilone", I18N_NOOP( "GUI and framework redesign" ), "mpilone@slac.com" ); diff --git a/kaddressbook/kcmconfigs/Makefile.am b/kaddressbook/kcmconfigs/Makefile.am index d066dfed..d7659639 100644 --- a/kaddressbook/kcmconfigs/Makefile.am +++ b/kaddressbook/kcmconfigs/Makefile.am @@ -10,7 +10,7 @@ kcm_kabconfig_la_SOURCES = kcmkabconfig.cpp kabconfigwidget.cpp \ extensionconfigdialog.cpp addresseewidget.cpp kcm_kabconfig_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \ -avoid-version -no-undefined -kcm_kabconfig_la_LIBADD = $(LIB_KIO) \ +kcm_kabconfig_la_LIBADD = $(LIB_TDEIO) \ $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \ $(top_builddir)/libtdepim/libtdepim.la \ $(top_builddir)/kaddressbook/common/libkabcommon.la @@ -20,7 +20,7 @@ kcm_kabldapconfig_la_SOURCES = addhostdialog.cpp kcmkabldapconfig.cpp \ ldapoptionswidget.cpp kcm_kabldapconfig_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \ -avoid-version -no-undefined -kcm_kabldapconfig_la_LIBADD = $(LIB_KIO) $(LIB_TDEABC) $(top_builddir)/libtdepim/libtdepim.la +kcm_kabldapconfig_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEABC) $(top_builddir)/libtdepim/libtdepim.la kcm_kabcustomfields_la_SOURCES = kcmkabcustomfields.cpp kcm_kabcustomfields_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \ diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp index 226bb309..ad1364f5 100644 --- a/kaddressbook/kcmconfigs/addresseewidget.cpp +++ b/kaddressbook/kcmconfigs/addresseewidget.cpp @@ -169,7 +169,7 @@ AddresseeWidget::~AddresseeWidget() void AddresseeWidget::restoreSettings() { - TDEConfig config( "kabcrc" ); + TDEConfig config( "tdeabcrc" ); config.setGroup( "General" ); mPrefix->setNameParts( config.readListEntry( "Prefixes" ) ); @@ -183,7 +183,7 @@ void AddresseeWidget::restoreSettings() void AddresseeWidget::saveSettings() { - TDEConfig config( "kabcrc" ); + TDEConfig config( "tdeabcrc" ); config.setGroup( "General" ); config.writeEntry( "Prefixes", mPrefix->nameParts() ); diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp index 83e0bc89..b41bdf84 100644 --- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp +++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp @@ -174,7 +174,7 @@ void KABConfigWidget::restoreSettings() mLocationMapURL->setCurrentText( KABPrefs::instance()->locationMapURL().arg( TDEGlobal::locale()->country() ) ); mLocationMapURL->lineEdit()->setCursorPosition( 0 ); - TDEConfig config( "kabcrc", false, false ); + TDEConfig config( "tdeabcrc", false, false ); config.setGroup( "General" ); mTradeAsFamilyName->setChecked( config.readBoolEntry( "TradeAsFamilyName", true ) ); mLimitContactDisplay->setChecked( config.readBoolEntry( "LimitContactDisplay", true ) ); @@ -197,7 +197,7 @@ void KABConfigWidget::saveSettings() KABPrefs::instance()->writeConfig(); - TDEConfig config( "kabcrc", false, false ); + TDEConfig config( "tdeabcrc", false, false ); config.setGroup( "General" ); config.writeEntry( "TradeAsFamilyName", mTradeAsFamilyName->isChecked() ); config.writeEntry( "LimitContactDisplay", mLimitContactDisplay->isChecked() ); diff --git a/kaddressbook/nameeditdialog.cpp b/kaddressbook/nameeditdialog.cpp index 7724dd87..0d350ae7 100644 --- a/kaddressbook/nameeditdialog.cpp +++ b/kaddressbook/nameeditdialog.cpp @@ -124,7 +124,7 @@ NameEditDialog::NameEditDialog( const TDEABC::Addressee &addr, int type, mFormattedNameEdit->setText( addr.formattedName() ); // Prefix and suffix combos - TDEConfig config( "kabcrc" ); + TDEConfig config( "tdeabcrc" ); config.setGroup( "General" ); TQStringList sTitle; diff --git a/kaddressbook/views/Makefile.am b/kaddressbook/views/Makefile.am index 37440a44..09ee3878 100644 --- a/kaddressbook/views/Makefile.am +++ b/kaddressbook/views/Makefile.am @@ -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_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_TDEABC) +libkaddrbk_cardview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEABC) 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_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_TDEABC) +libkaddrbk_iconview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEABC) 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_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_TDEABC) $(LIB_KIO) $(LIB_KIMPROXY) +libkaddrbk_tableview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEABC) $(LIB_TDEIO) $(LIB_TDEIMPROXY) noinst_HEADERS = cardview.h colorlistbox.h configurecardviewdialog.h \ configuretableviewdialog.h contactlistview.h \ diff --git a/kaddressbook/xxport/Makefile.am b/kaddressbook/xxport/Makefile.am index ecf0372c..c91a0945 100644 --- a/kaddressbook/xxport/Makefile.am +++ b/kaddressbook/xxport/Makefile.am @@ -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_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO) +libkaddrbk_csv_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO) libkaddrbk_vcard_xxport_la_SOURCES = vcard_xxport.cpp -libkaddrbk_vcard_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO) \ +libkaddrbk_vcard_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO) \ $(top_builddir)/kaddressbook/libkaddressbook.la \ $(top_builddir)/libtdenetwork/qgpgme/libqgpgme.la libkaddrbk_kde2_xxport_la_SOURCES = kde2_xxport.cpp -libkaddrbk_kde2_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO) +libkaddrbk_kde2_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO) libkaddrbk_bookmark_xxport_la_SOURCES = bookmark_xxport.cpp -libkaddrbk_bookmark_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO) +libkaddrbk_bookmark_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO) libkaddrbk_eudora_xxport_la_SOURCES = eudora_xxport.cpp -libkaddrbk_eudora_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO) +libkaddrbk_eudora_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO) libkaddrbk_ldif_xxport_la_SOURCES = ldif_xxport.cpp -libkaddrbk_ldif_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO) +libkaddrbk_ldif_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO) libkaddrbk_gnokii_xxport_la_SOURCES = gnokii_xxport.cpp -libkaddrbk_gnokii_xxport_la_LIBADD = $(XPMLIB) $(LIB_GNOKII) $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO) +libkaddrbk_gnokii_xxport_la_LIBADD = $(XPMLIB) $(LIB_GNOKII) $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO) libkaddrbk_opera_xxport_la_SOURCES = opera_xxport.cpp -libkaddrbk_opera_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO) +libkaddrbk_opera_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO) libkaddrbk_pab_xxport_la_SOURCES = pab_xxport.cpp pab_mapihd.cpp pab_pablib.cpp -libkaddrbk_pab_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO) +libkaddrbk_pab_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO) noinst_HEADERS = csvimportdialog.h diff --git a/kaddressbook/xxport/bookmark_xxport.cpp b/kaddressbook/xxport/bookmark_xxport.cpp index 39c709b3..f2249526 100644 --- a/kaddressbook/xxport/bookmark_xxport.cpp +++ b/kaddressbook/xxport/bookmark_xxport.cpp @@ -64,7 +64,7 @@ bool BookmarkXXPort::exportContacts( const TDEABC::AddresseeList &list, const TQ menu.location = fileName; menu.type = "xbel"; menu.show = true; - KBookmarkMenu::setDynamicBookmarks( "kabc", menu ); + KBookmarkMenu::setDynamicBookmarks( "tdeabc", menu ); return true; } diff --git a/kalarm/kalarmd/Makefile.am b/kalarm/kalarmd/Makefile.am index f6dd508d..3b8eafff 100644 --- a/kalarm/kalarmd/Makefile.am +++ b/kalarm/kalarmd/Makefile.am @@ -2,13 +2,13 @@ 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +libkalarmd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kalarmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor 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 \ diff --git a/kandy/src/Makefile.am b/kandy/src/Makefile.am index 31ba417f..7691d37b 100644 --- a/kandy/src/Makefile.am +++ b/kandy/src/Makefile.am @@ -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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kandy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kandy_LDADD = $(KANDY_LIBLOCKDEV) $(LIB_TDEFILE) -ltdeabc $(top_builddir)/libtdepim/libtdepim.la kandy_SOURCES = main.cpp kandy.cpp \ cmdpropertiesdialog_base.ui cmdpropertiesdialog.cpp \ @@ -19,7 +19,7 @@ KDE_ICON = kandy 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kandy_client_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kandy_client_LDADD = $(LIB_TDECORE) kandy_client_SOURCES = kandy_client.cpp diff --git a/karm/Makefile.am b/karm/Makefile.am index 76ae9acf..257bf2e0 100644 --- a/karm/Makefile.am +++ b/karm/Makefile.am @@ -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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +karm_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor noinst_HEADERS = desktoptracker.h edittaskdialog.h printdialog.h \ idletimedetector.h tdeaccelmenuwatch.h timekard.h \ karmutility.h ktimewidget.h karmstorage.h mainwindow.h \ @@ -56,7 +56,7 @@ kde_module_LTLIBRARIES = libkarmpart.la # the Part's source, library search path, and link libraries libkarmpart_la_SOURCES = karm_part.cpp libkarmpart_la_LDFLAGS = -module -avoid-version -no-undefined $(KDE_PLUGIN) $(all_libraries) -libkarmpart_la_LIBADD = libkarm_shared.la $(LIB_KPARTS) +libkarmpart_la_LIBADD = libkarm_shared.la $(LIB_TDEPARTS) # this is where the desktop file will go partdesktopdir = $(kde_servicesdir) diff --git a/karm/tdeaccelmenuwatch.h b/karm/tdeaccelmenuwatch.h index 6e432f34..89f96d94 100644 --- a/karm/tdeaccelmenuwatch.h +++ b/karm/tdeaccelmenuwatch.h @@ -2,8 +2,8 @@ * tdeaccelmenuwatch.h -- Declaration of class TDEAccelMenuWatch. * Generated by newclass on Thu Jan 7 15:05:26 EST 1999. */ -#ifndef KARM_K_ACCEL_MENU_WATCH_H -#define KARM_K_ACCEL_MENU_WATCH_H +#ifndef KARM_TDE_ACCEL_MENU_WATCH_H +#define KARM_TDE_ACCEL_MENU_WATCH_H #include #include diff --git a/karm/test/Makefile.am b/karm/test/Makefile.am index 50699139..b8da6ca6 100644 --- a/karm/test/Makefile.am +++ b/karm/test/Makefile.am @@ -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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +runscripts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor runscripts_LDADD = $(LIB_QT) $(LIB_TDECORE) locking_SOURCES = locking.cpp lockerthread.cpp -locking_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +locking_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor locking_LDADD = $(LIB_QT) $(top_builddir)/libkcal/libkcal.la KDE_CXXFLAGS = $(USE_EXCEPTIONS) diff --git a/kitchensync/src/Makefile.am b/kitchensync/src/Makefile.am index 08e458c9..1e6c55a5 100644 --- a/kitchensync/src/Makefile.am +++ b/kitchensync/src/Makefile.am @@ -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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kitchensync_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kitchensync_LDADD = libkitchensync.la xdg_apps_DATA = kitchensync.desktop @@ -32,7 +32,7 @@ libkitchensync_la_SOURCES = aboutpage.cpp mainwidget.cpp groupconfigdialog.cpp \ configguijescs.cpp configguievo2.cpp configguimoto.cpp configguisynce.cpp \ configguisunbird.cpp libkitchensync_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -libkitchensync_la_LIBADD = $(LIB_KIO) $(LIB_TDEHTML) $(top_builddir)/kitchensync/libqopensync/libqopensync.la \ +libkitchensync_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEHTML) $(top_builddir)/kitchensync/libqopensync/libqopensync.la \ $(LIB_TDEABC) $(top_builddir)/libtdepim/libtdepim.la $(top_builddir)/libkcal/libkcal.la \ $(LIB_QT) @@ -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_TDEHTML) $(LIB_TDEABC) $(LIB_TDECORE) $(LIB_TDEUI) +libkitchensyncpart_la_LIBADD = $(LIB_TDEPARTS) libkitchensync.la $(LIB_QT) $(LIB_TDEIO) $(LIB_TDEHTML) $(LIB_TDEABC) $(LIB_TDECORE) $(LIB_TDEUI) # Resources kitchensyncdatadir = $(kde_datadir)/kitchensync diff --git a/kitchensync/src/memberinfo.cpp b/kitchensync/src/memberinfo.cpp index 87a17ec1..fb52c7a7 100644 --- a/kitchensync/src/memberinfo.cpp +++ b/kitchensync/src/memberinfo.cpp @@ -52,7 +52,7 @@ TQString MemberInfo::name() const nameMap.insert( "file-sync", i18n( "File" ) ); nameMap.insert( "palm-sync", i18n( "Palm" ) ); nameMap.insert( "tdepim-sync", i18n( "TDE PIM" ) ); - nameMap.insert( "kio-sync", i18n( "Remote File" ) ); + nameMap.insert( "tdeio-sync", i18n( "Remote File" ) ); nameMap.insert( "irmc-sync", i18n( "Mobile Phone" ) ); nameMap.insert( "evo2-sync", i18n( "Evolution" ) ); nameMap.insert( "opie-sync", i18n( "Handheld" ) ); @@ -79,7 +79,7 @@ TQString MemberInfo::pluginIconName( const TQString &pluginName ) if ( pluginName == "file-sync" ) return "folder"; if ( pluginName == "palm-sync" ) return "pda_black"; if ( pluginName == "tdepim-sync" ) return "kontact"; - if ( pluginName == "kio-sync" ) return "network"; + if ( pluginName == "tdeio-sync" ) return "network"; if ( pluginName == "irmc-sync" ) return "mobile_phone"; if ( pluginName == "evo2-sync" ) return "evolution"; if ( pluginName == "opie-sync" ) return "pda_blue"; diff --git a/kmail/CMakeLists.txt b/kmail/CMakeLists.txt index 75b32fc2..d3c1d7a7 100644 --- a/kmail/CMakeLists.txt +++ b/kmail/CMakeLists.txt @@ -141,7 +141,7 @@ set( ${target}_SRCS kmcomposewin.cpp kmfolder.cpp kmmsgpartdlg.cpp kmreaderwin.cpp htmlstatusbar.cpp kmgroupware.cpp folderstorage.cpp listjob.cpp csshelper.cpp tdelistboxdialog.cpp kmmsginfo.cpp actionscheduler.cpp messageproperty.cpp accountmanager.cpp kmacctfolder.cpp - tdemdict.cpp kmsystemtray.cpp kmacctlocal.cpp kmfolderdir.cpp kmfoldermgr.cpp + kmdict.cpp kmsystemtray.cpp kmacctlocal.cpp kmfolderdir.cpp kmfoldermgr.cpp kmfoldernode.cpp kmsender.cpp kmacctseldlg.cpp kmfiltermgr.cpp kmfilterdlg.cpp filterimporterexporter.cpp kmsearchpatternedit.cpp encodingdetector.cpp encodingdetector_ja.cpp kmfilteraction.cpp kmsearchpattern.cpp kmfolderimap.cpp kmfolderseldlg.cpp kmfilter.cpp diff --git a/kmail/Makefile.am b/kmail/Makefile.am index f96fdc40..4c74b1b7 100644 --- a/kmail/Makefile.am +++ b/kmail/Makefile.am @@ -32,7 +32,7 @@ libkmailprivate_la_LIBADD = \ ../libksieve/libksieve.la ../libemailfunctions/libemailfunctions.la \ ../certmanager/lib/libkleopatra.la $(INDEXLIB) \ ../libkcal/libkcal.la \ - $(LIB_TDEHTML) $(LIB_KSPELL) $(LIB_TDEABC) + $(LIB_TDEHTML) $(LIB_TDESPELL) $(LIB_TDEABC) kde_module_LTLIBRARIES = kcm_kmail.la libkmailpart.la libkmail_bodypartformatter_application_octetstream.la libkmailpart_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined @@ -65,7 +65,7 @@ libkmailprivate_la_SOURCES = kmmessage.cpp kmmainwin.cpp configuredialog.cpp \ csshelper.cpp tdelistboxdialog.cpp \ actionscheduler.cpp messageproperty.cpp \ kmmsgpart.cpp kmmsginfo.cpp \ - accountmanager.cpp kmacctfolder.cpp tdemdict.cpp \ + accountmanager.cpp kmacctfolder.cpp kmdict.cpp \ kmsystemtray.cpp kmacctlocal.cpp kmfolderdir.cpp \ kmfoldermgr.cpp kmfoldernode.cpp kmsender.cpp \ kmacctseldlg.cpp kmfiltermgr.cpp kmsearchpatternedit.cpp \ @@ -176,11 +176,11 @@ check_PROGRAMS = dcoptest recipienteditortest METASOURCES = AUTO dcoptest_SOURCES = dcoptest.cpp kmailIface.skel kmailIface.stub mailcomposerIface.skel mailcomposerIface.stub -dcoptest_LDADD = $(LIB_KIO) +dcoptest_LDADD = $(LIB_TDEIO) dcoptest_LDFLAGS = $(all_libraries) recipienteditortest_SOURCES = recipientseditortest.cpp -recipienteditortest_LDADD = libkmailprivate.la ../libtdepim/libtdepim.la $(LIB_KIO) $(LIB_TDEABC) +recipienteditortest_LDADD = libkmailprivate.la ../libtdepim/libtdepim.la $(LIB_TDEIO) $(LIB_TDEABC) recipienteditortest_LDFLAGS = $(all_libraries) kmailIface_DCOPIDLNG = true diff --git a/kmail/folderdiaacltab.h b/kmail/folderdiaacltab.h index 6ae09fec..bc619c4e 100644 --- a/kmail/folderdiaacltab.h +++ b/kmail/folderdiaacltab.h @@ -99,7 +99,7 @@ public: static bool supports( KMFolder* refFolder ); private slots: - // Network (KIO) slots + // Network (TDEIO) slots void slotConnectionResult( int, const TQString& ); void slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& ); void slotMultiSetACLResult(TDEIO::Job *); diff --git a/kmail/folderdiaquotatab.h b/kmail/folderdiaquotatab.h index dd36cf97..6b260035 100644 --- a/kmail/folderdiaquotatab.h +++ b/kmail/folderdiaquotatab.h @@ -68,7 +68,7 @@ private: void initializeWithValuesFromFolder( KMFolder* folder ); void showQuotaWidget(); private slots: - // Network (KIO) slots + // Network (TDEIO) slots void slotConnectionResult( int, const TQString& ); void slotReceivedQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& ); diff --git a/kmail/headerstyle.cpp b/kmail/headerstyle.cpp index 9e654d68..f7c2973e 100644 --- a/kmail/headerstyle.cpp +++ b/kmail/headerstyle.cpp @@ -276,14 +276,14 @@ namespace KMail { #if 0 // Get Instant Messaging presence TQString presence; - TQString kabcUid; + TQString tdeabcUid; if ( strategy->showHeader( "status" ) ) { TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self( true ); TDEABC::AddresseeList addresses = addressBook->findByEmail( KPIM::getFirstEmailAddress( message->from() ) ); ::KIMProxy *imProxy = KMKernel::self()->imProxy(); - kabcUid = addresses[0].uid(); - presence = imProxy->presenceString( kabcUid ); + tdeabcUid = addresses[0].uid(); + presence = imProxy->presenceString( tdeabcUid ); } #endif @@ -298,7 +298,7 @@ namespace KMail { "\">" + i18n("[vCard]") + "" ); #if 0 if ( !presence.isEmpty() && strategy->showHeader( "status" ) ) - headerStr.append("  (" + presence + ")" ); + headerStr.append("  (" + presence + ")" ); #endif if ( strategy->showHeader( "organization" ) @@ -473,10 +473,10 @@ namespace KMail { TQString userHTML; TQString presence; - // IM presence and kabc photo + // IM presence and tdeabc photo ::KIMProxy *imProxy = KMKernel::self()->imProxy(); - TQString kabcUid; + TQString tdeabcUid; TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self( true ); TDEABC::AddresseeList addresses = addressBook->findByEmail( KPIM::getFirstEmailAddress( message->from() ) ); @@ -485,16 +485,16 @@ namespace KMail { int photoHeight = 60; if( addresses.count() == 1 ) { - // kabcUid is embedded in im: URIs to indicate which IM contact to message - kabcUid = addresses[0].uid(); + // tdeabcUid is embedded in im: URIs to indicate which IM contact to message + tdeabcUid = addresses[0].uid(); if ( imProxy->initialize() ) { // im status - presence = imProxy->presenceString( kabcUid ); + presence = imProxy->presenceString( tdeabcUid ); if ( !presence.isEmpty() ) { TQString presenceIcon = TQString::fromLatin1( " " ) - .arg( imgToDataUrl( imProxy->presenceIcon( kabcUid ).convertToImage() ) ); + .arg( imgToDataUrl( imProxy->presenceIcon( tdeabcUid ).convertToImage() ) ); presence += presenceIcon; } } @@ -592,9 +592,9 @@ namespace KMail { userHTML = TQString( "
" "%2
" "%4
" - "
" ).arg( kabcUid ) + "" ).arg( tdeabcUid ) .arg( userHTML ) - .arg( kabcUid ) + .arg( tdeabcUid ) .arg( presence ); } } else { @@ -602,8 +602,8 @@ namespace KMail { if ( !presence.isEmpty() ) userHTML = TQString( "
" "%3
" ) - .arg( kabcUid ) - .arg( kabcUid ) + .arg( tdeabcUid ) + .arg( tdeabcUid ) .arg( presence ); } #if 0 @@ -766,7 +766,7 @@ namespace KMail { : TQString("") ) #if 0 + ( ( !presence.isEmpty() ) - ? "  (" + presence + ")" + ? "  (" + presence + ")" : TQString("") ) #endif + ( message->headerField("Organization").isEmpty() diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp index e1568b11..1350da29 100644 --- a/kmail/imapaccountbase.cpp +++ b/kmail/imapaccountbase.cpp @@ -373,7 +373,7 @@ namespace KMail { else stream << (int) 'U' << url; - // create the KIO-job + // create the TDEIO-job if ( makeConnection() != Connected ) return;// ## doesn't handle Connecting TDEIO::SimpleJob *job = TDEIO::special(url, packedArgs, false); diff --git a/kmail/imapaccountbase.h b/kmail/imapaccountbase.h index f1bf03f0..2d239d96 100644 --- a/kmail/imapaccountbase.h +++ b/kmail/imapaccountbase.h @@ -240,7 +240,7 @@ namespace KMail { void setImapSeenStatus( KMFolder* folder, const TQString& path, bool seen ); /** - * The KIO-Slave died + * The TDEIO-Slave died */ void slaveDied() { mSlave = 0; killAllJobs(); } @@ -430,9 +430,9 @@ namespace KMail { protected slots: virtual void slotCheckQueuedFolders(); - /// Handle a message coming from the KIO scheduler saying that the slave is now connected + /// Handle a message coming from the TDEIO scheduler saying that the slave is now connected void slotSchedulerSlaveConnected(TDEIO::Slave *aSlave); - /// Handle an error coming from the KIO scheduler + /// Handle an error coming from the TDEIO scheduler void slotSchedulerSlaveError(TDEIO::Slave *aSlave, int, const TQString &errorMsg); /** @@ -484,14 +484,14 @@ namespace KMail { protected: /** - * Handle an error coming from a KIO job or from a KIO slave (via the scheduler) + * Handle an error coming from a TDEIO job or from a TDEIO slave (via the scheduler) * and abort everything (in all cases) if abortSync is true [this is for slotSchedulerSlaveError]. * Otherwise (abortSync==false), dimap will only abort in case of severe errors (connection broken), * but on "normal" errors (no permission to delete, etc.) it will ask the user. * * @param error the error code, usually job->error()) * @param errorMsg the error message, usually job->errorText() - * @param job the kio job (can be 0). If set, removeJob will be called automatically. + * @param job the tdeio job (can be 0). If set, removeJob will be called automatically. * This is important! It means you should not call removeJob yourself in case of errors. * We can't let the caller do that, since it should only be done afterwards, and only if we didn't abort. * diff --git a/kmail/imapjob.cpp b/kmail/imapjob.cpp index c50663ed..dc9a98f5 100644 --- a/kmail/imapjob.cpp +++ b/kmail/imapjob.cpp @@ -259,7 +259,7 @@ ImapJob::~ImapJob() mit.current()->setTransferInProgress( false ); } } - account->removeJob( mJob ); // remove the associated kio job + account->removeJob( mJob ); // remove the associated tdeio job } account->mJobList.remove( this ); // remove the folderjob } diff --git a/kmail/keyresolver.cpp b/kmail/keyresolver.cpp index 1aa6f877..76d4ae8f 100644 --- a/kmail/keyresolver.cpp +++ b/kmail/keyresolver.cpp @@ -586,7 +586,7 @@ struct Kleo::KeyResolver::Private { std::map mFormatInfoMap; - // key=email address, value=crypto preferences for this contact (from kabc) + // key=email address, value=crypto preferences for this contact (from tdeabc) typedef std::map ContactPreferencesMap; ContactPreferencesMap mContactPreferencesMap; }; diff --git a/kmail/kmacctimap.cpp b/kmail/kmacctimap.cpp index d6b55332..8fd2bea0 100644 --- a/kmail/kmacctimap.cpp +++ b/kmail/kmacctimap.cpp @@ -232,7 +232,7 @@ void KMAcctImap::ignoreJobsForFolder( KMFolder* folder ) //----------------------------------------------------------------------------- void KMAcctImap::removeSlaveJobsForFolder( KMFolder* folder ) { - // Make sure the folder is not referenced in any kio slave jobs + // Make sure the folder is not referenced in any tdeio slave jobs TQMap::Iterator it = mapJobData.begin(); while ( it != mapJobData.end() ) { TQMap::Iterator i = it; diff --git a/kmail/kmacctimap.h b/kmail/kmacctimap.h index 99f07f16..3e10332a 100644 --- a/kmail/kmacctimap.h +++ b/kmail/kmacctimap.h @@ -106,7 +106,7 @@ protected: friend class ::AccountManager; KMAcctImap(AccountManager* owner, const TQString& accountName, uint id); /** - * Handle an error coming from a KIO job + * Handle an error coming from a TDEIO job * See ImapAccountBase::handleJobError for details. */ virtual bool handleError( int error, const TQString &errorMsg, TDEIO::Job* job, const TQString& context, bool abortSync = false ); diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp index 69ccfc9b..23918a04 100644 --- a/kmail/kmail_part.cpp +++ b/kmail/kmail_part.cpp @@ -154,7 +154,7 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName, KMailPart::~KMailPart() { kdDebug(5006) << "Closing last KMMainWin: stopping mail check" << endl; - // Running KIO jobs prevent kapp from exiting, so we need to kill them + // Running TDEIO jobs prevent kapp from exiting, so we need to kill them // if they are only about checking mail (not important stuff like moving messages) kmkernel->abortMailCheck(); kmkernel->acctMgr()->cancelMailCheck(); diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp index d4fead48..8b477924 100644 --- a/kmail/kmcommands.cpp +++ b/kmail/kmcommands.cpp @@ -75,7 +75,7 @@ #include #include #include -// KIO headers +// TDEIO headers #include #include @@ -932,7 +932,7 @@ void KMSaveMsgCommand::slotMessageRetrievedForSaving(KMMessage *msg) mOffset = 0; TQByteArray data; int size; - // Unless it is great than 64 k send the whole message. kio buffers for us. + // Unless it is great than 64 k send the whole message. tdeio buffers for us. if( mData.size() > (unsigned int) MAX_CHUNK_SIZE ) size = MAX_CHUNK_SIZE; else diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp index 27a76c72..7863b01b 100644 --- a/kmail/kmcomposewin.cpp +++ b/kmail/kmcomposewin.cpp @@ -2623,7 +2623,7 @@ void KMComposeWin::addrBookSelIntoOld() dlg.setSelectedBCC( lst ); } - dlg.setRecentAddresses( RecentAddresses::self( KMKernel::config() )->kabcAddresses() ); + dlg.setRecentAddresses( RecentAddresses::self( KMKernel::config() )->tdeabcAddresses() ); if (dlg.exec()==TQDialog::Rejected) return; diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h index 7e43749f..123f112b 100644 --- a/kmail/kmcomposewin.h +++ b/kmail/kmcomposewin.h @@ -486,7 +486,7 @@ private slots: void slotIdentityChanged(uint); /** - * KIO slots for attachment insertion + * TDEIO slots for attachment insertion */ void slotAttachFileData(TDEIO::Job *, const TQByteArray &); void slotAttachFileResult(TDEIO::Job *); diff --git a/kmail/kmdict.cpp b/kmail/kmdict.cpp new file mode 100644 index 00000000..0ad9367b --- /dev/null +++ b/kmail/kmdict.cpp @@ -0,0 +1,117 @@ +/* simple hash table for kmail. inspired by TQDict */ +/* Author: Ronen Tzur */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include "kmdict.h" +#include "kmglobal.h" +#include + +#include +//----------------------------------------------------------------------------- + +KMDict::KMDict( int size ) +{ + init( ( int ) KMail::nextPrime( size ) ); + //kdDebug( 5006 ) << "KMMDict::KMDict Size: " << mSize << endl; +} + +//----------------------------------------------------------------------------- + +KMDict::~KMDict() +{ + clear(); +} + +//----------------------------------------------------------------------------- + +void KMDict::init(int size) +{ + mSize = size; + mVecs = new KMDictItem *[mSize]; + memset(mVecs, 0, mSize * sizeof(KMDictItem *)); +} + +//----------------------------------------------------------------------------- + +void KMDict::clear() +{ + if (!mVecs) + return; + for (int i = 0; i < mSize; i++) { + KMDictItem *item = mVecs[i]; + while (item) { + KMDictItem *nextItem = item->next; + delete item; + item = nextItem; + } + } + delete [] mVecs; + mVecs = 0; +} + +//----------------------------------------------------------------------------- + +void KMDict::replace( long key, KMDictItem *item ) +{ + insert( key, item ); + removeFollowing( item, key ); // remove other items with same key +} + +//----------------------------------------------------------------------------- + + +void KMDict::insert( long key, KMDictItem *item ) +{ + item->key = key; + int idx = (unsigned long)key % mSize; // insert in + item->next = mVecs[idx]; // appropriate + mVecs[idx] = item; // column +} + +//----------------------------------------------------------------------------- + +void KMDict::remove(long key) +{ + int idx = (unsigned long)key % mSize; + KMDictItem *item = mVecs[idx]; + + if (item) { + if (item->key == key) { // if first in the column + mVecs[idx] = item->next; + delete item; + } else + removeFollowing(item, key); // if deep in the column + } +} + +//----------------------------------------------------------------------------- + +void KMDict::removeFollowing(KMDictItem *item, long key) +{ + while (item) { + KMDictItem *itemNext = item->next; + if (itemNext && itemNext->key == key) { + KMDictItem *itemNextNext = itemNext->next; + delete itemNext; + item->next = itemNextNext; + } else + item = itemNext; + } +} + +//----------------------------------------------------------------------------- + +KMDictItem *KMDict::find(long key) +{ + int idx = (unsigned long)key % mSize; + KMDictItem *item = mVecs[idx]; + while (item) { + if (item->key == key) + break; + item = item->next; + } + return item; +} diff --git a/kmail/kmdict.h b/kmail/kmdict.h new file mode 100644 index 00000000..6cbbefd5 --- /dev/null +++ b/kmail/kmdict.h @@ -0,0 +1,68 @@ +/* + * simple hash table for kmail. inspired by TQDict + */ + +#ifndef __KMDICT +#define __KMDICT + +/** + * @short Class representing items in a KMDict + */ +class KMDictItem +{ +public: + long key; + KMDictItem *next; +}; + +/** + * @short KMDict implements a lightweight dictionary with serial numbers as keys. + * + * KMDict is a leightweight dictionary used exclusively by KMMsgDict. It uses + * serial numbers as keys. + * + * @author Ronen Tzur + */ +class KMDict +{ + friend class MessageDictTester; +public: + /** Creates a hash table with @p size columns. */ + KMDict(int size = 17); + + /** Destroys the hash table object. */ + ~KMDict(); + + /** Clears the hash table, removing all items. */ + void clear(); + + /** Returns the size of the hash table. */ + int size() { return mSize; } + + /** Inserts an item, replacing old ones with the same key. */ + void replace(long key, KMDictItem *item); + + /** Inserts an item without replacing ones with the same key. */ + void insert(long key, KMDictItem *item); + + /** Removes an item. */ + void remove(long key); + + /** Find an item by key. Returns pointer to it, or 0 if not found. */ + KMDictItem *find(long key); + +private: + /** Removes all items _following_ @p item with key @p key. */ + void removeFollowing(KMDictItem *item, long key); + + /** Initializes the hash table to @p size colums. */ + void init(int size); + + /** The size of the hash. */ + int mSize; + + /** The buckets. */ + KMDictItem **mVecs; +}; + +#endif /* __KMDICT */ diff --git a/kmail/kmfolderdia.h b/kmail/kmfolderdia.h index 764ea897..5f3ea967 100644 --- a/kmail/kmfolderdia.h +++ b/kmail/kmfolderdia.h @@ -60,7 +60,7 @@ namespace KMail { * This is the base class for tabs in the folder dialog. * It uses the API from ConfigModuleTab (basically: it's a widget that can load and save) * but it also adds support for delayed-saving: - * when save() needs to use async jobs (e.g. KIO) for saving, + * when save() needs to use async jobs (e.g. TDEIO) for saving, * we need to delay the closing until after the jobs are finished, * and to cancel the saving on error. * @@ -87,7 +87,7 @@ public: /// Called when clicking OK. /// If a module returns Delayed, the closing is cancelled for now, /// and the module can close the dialog later on (i.e. after an async - /// operation like a KIO job). + /// operation like a TDEIO job). virtual AccepStatus accept() { return save() ? Accepted : Canceled; } diff --git a/kmail/kmmainwin.cpp b/kmail/kmmainwin.cpp index 67965db5..613864b9 100644 --- a/kmail/kmmainwin.cpp +++ b/kmail/kmmainwin.cpp @@ -103,7 +103,7 @@ KMMainWin::~KMMainWin() if ( not_withdrawn == 0 ) { kdDebug(5006) << "Closing last KMMainWin: stopping mail check" << endl; - // Running KIO jobs prevent kapp from exiting, so we need to kill them + // Running TDEIO jobs prevent kapp from exiting, so we need to kill them // if they are only about checking mail (not important stuff like moving messages) kmkernel->abortMailCheck(); kmkernel->acctMgr()->cancelMailCheck(); diff --git a/kmail/kmmsgdict.cpp b/kmail/kmmsgdict.cpp index fdf2e1b2..729a3663 100644 --- a/kmail/kmmsgdict.cpp +++ b/kmail/kmmsgdict.cpp @@ -4,7 +4,7 @@ #include "kmfolderindex.h" #include "kmfolder.h" #include "kmmsgdict.h" -#include "tdemdict.h" +#include "kmdict.h" #include "globalsettings.h" #include "folderstorage.h" diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp index 3aadb963..32483b19 100644 --- a/kmail/kmreaderwin.cpp +++ b/kmail/kmreaderwin.cpp @@ -1671,7 +1671,7 @@ kdDebug(5006) << "KMReaderWin - composing unencrypted message" << endl; void KMReaderWin::updateHeader() { /* - * TODO: mess around with KHTML DOM some more and figure out how to + * TODO: mess around with TDEHTML DOM some more and figure out how to * replace the entire header div w/out flickering to hell and back * * DOM::NodeList divs(mViewer->document().documentElement().getElementsByTagName("div")); diff --git a/kmail/networkaccount.h b/kmail/networkaccount.h index dd62b0cd..503a312d 100644 --- a/kmail/networkaccount.h +++ b/kmail/networkaccount.h @@ -107,7 +107,7 @@ namespace KMail { /** @return an URL for this account */ virtual KURL getUrl() const; - /** @return the KIO slave for this account */ + /** @return the TDEIO slave for this account */ TDEIO::Slave * slave() const { return mSlave; } /** Kill all jobs that are currently in progress */ diff --git a/kmail/popaccount.h b/kmail/popaccount.h index afa0acf2..f8cb0e92 100644 --- a/kmail/popaccount.h +++ b/kmail/popaccount.h @@ -102,12 +102,12 @@ protected: PopAccount(AccountManager* owner, const TQString& accountName, uint id); /** - * Start a KIO Job to get a list of messages on the pop server + * Start a TDEIO Job to get a list of messages on the pop server */ void startJob(); /** - * Connect up the standard signals/slots for the KIO Jobs + * Connect up the standard signals/slots for the TDEIO Jobs */ void connectJob(); @@ -185,7 +185,7 @@ protected slots: void slotProcessPendingMsgs(); /** - * If there are more messages to be downloaded then start a new kio job + * If there are more messages to be downloaded then start a new tdeio job * to get the message whose id is at the head of the queue */ void slotGetNextMsg(); @@ -202,7 +202,7 @@ protected slots: void slotData( TDEIO::Job*, const TQByteArray &); /** - * Finished downloading the current kio job, either due to an error + * Finished downloading the current tdeio job, either due to an error * or because the job has been canceled or because the complete message * has been downloaded */ @@ -230,7 +230,7 @@ protected slots: void slotSlaveError(TDEIO::Slave *, int, const TQString &); /** - * If there are more headers to be downloaded then start a new kio job + * If there are more headers to be downloaded then start a new tdeio job * to get the next header */ void slotGetNextHdr(); diff --git a/kmail/recipientspicker.cpp b/kmail/recipientspicker.cpp index 26fe7213..04cc50e1 100644 --- a/kmail/recipientspicker.cpp +++ b/kmail/recipientspicker.cpp @@ -579,7 +579,7 @@ void RecipientsPicker::insertRecentAddresses() TDEConfig config( "kmailrc" ); TDEABC::Addressee::List recents = - TDERecentAddress::RecentAddresses::self( &config )->kabcAddresses(); + TDERecentAddress::RecentAddresses::self( &config )->tdeabcAddresses(); TDEABC::Addressee::List::ConstIterator it; for( it = recents.begin(); it != recents.end(); ++it ) { diff --git a/kmail/redirectdialog.cpp b/kmail/redirectdialog.cpp index f29b7947..ca6d5a24 100644 --- a/kmail/redirectdialog.cpp +++ b/kmail/redirectdialog.cpp @@ -132,7 +132,7 @@ void RedirectDialog::slotAddrBook() } dlg.setRecentAddresses( - RecentAddresses::self( KMKernel::config() )->kabcAddresses() ); + RecentAddresses::self( KMKernel::config() )->tdeabcAddresses() ); // Make it impossible to specify Cc or Bcc addresses as we support // only the Redirect-To header! diff --git a/kmail/tdelistboxdialog.h b/kmail/tdelistboxdialog.h index 30a67286..a9e949ac 100644 --- a/kmail/tdelistboxdialog.h +++ b/kmail/tdelistboxdialog.h @@ -1,5 +1,5 @@ -#ifndef KLISTBOXDIALOG_H -#define KLISTBOXDIALOG_H +#ifndef TDELISTBOXDIALOG_H +#define TDELISTBOXDIALOG_H #include diff --git a/kmail/tdelistviewindexedsearchline.h b/kmail/tdelistviewindexedsearchline.h index 6f109892..73d5d6f3 100644 --- a/kmail/tdelistviewindexedsearchline.h +++ b/kmail/tdelistviewindexedsearchline.h @@ -1,5 +1,5 @@ -#ifndef LPC_KLISTVIEWINDEXEDSEARCHLINE_H1107549660_INCLUDE_GUARD_ -#define LPC_KLISTVIEWINDEXEDSEARCHLINE_H1107549660_INCLUDE_GUARD_ +#ifndef LPC_TDELISTVIEWINDEXEDSEARCHLINE_H1107549660_INCLUDE_GUARD_ +#define LPC_TDELISTVIEWINDEXEDSEARCHLINE_H1107549660_INCLUDE_GUARD_ /* This file is part of KMail * Copyright (C) 2005 Lus Pedro Coelho @@ -74,4 +74,4 @@ private: -#endif /* LPC_KLISTVIEWINDEXEDSEARCHLINE_H1107549660_INCLUDE_GUARD_ */ +#endif /* LPC_TDELISTVIEWINDEXEDSEARCHLINE_H1107549660_INCLUDE_GUARD_ */ diff --git a/kmail/tdemdict.cpp b/kmail/tdemdict.cpp deleted file mode 100644 index a1c73e6d..00000000 --- a/kmail/tdemdict.cpp +++ /dev/null @@ -1,117 +0,0 @@ -/* simple hash table for kmail. inspired by TQDict */ -/* Author: Ronen Tzur */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "tdemdict.h" -#include "kmglobal.h" -#include - -#include -//----------------------------------------------------------------------------- - -KMDict::KMDict( int size ) -{ - init( ( int ) KMail::nextPrime( size ) ); - //kdDebug( 5006 ) << "KMMDict::KMDict Size: " << mSize << endl; -} - -//----------------------------------------------------------------------------- - -KMDict::~KMDict() -{ - clear(); -} - -//----------------------------------------------------------------------------- - -void KMDict::init(int size) -{ - mSize = size; - mVecs = new KMDictItem *[mSize]; - memset(mVecs, 0, mSize * sizeof(KMDictItem *)); -} - -//----------------------------------------------------------------------------- - -void KMDict::clear() -{ - if (!mVecs) - return; - for (int i = 0; i < mSize; i++) { - KMDictItem *item = mVecs[i]; - while (item) { - KMDictItem *nextItem = item->next; - delete item; - item = nextItem; - } - } - delete [] mVecs; - mVecs = 0; -} - -//----------------------------------------------------------------------------- - -void KMDict::replace( long key, KMDictItem *item ) -{ - insert( key, item ); - removeFollowing( item, key ); // remove other items with same key -} - -//----------------------------------------------------------------------------- - - -void KMDict::insert( long key, KMDictItem *item ) -{ - item->key = key; - int idx = (unsigned long)key % mSize; // insert in - item->next = mVecs[idx]; // appropriate - mVecs[idx] = item; // column -} - -//----------------------------------------------------------------------------- - -void KMDict::remove(long key) -{ - int idx = (unsigned long)key % mSize; - KMDictItem *item = mVecs[idx]; - - if (item) { - if (item->key == key) { // if first in the column - mVecs[idx] = item->next; - delete item; - } else - removeFollowing(item, key); // if deep in the column - } -} - -//----------------------------------------------------------------------------- - -void KMDict::removeFollowing(KMDictItem *item, long key) -{ - while (item) { - KMDictItem *itemNext = item->next; - if (itemNext && itemNext->key == key) { - KMDictItem *itemNextNext = itemNext->next; - delete itemNext; - item->next = itemNextNext; - } else - item = itemNext; - } -} - -//----------------------------------------------------------------------------- - -KMDictItem *KMDict::find(long key) -{ - int idx = (unsigned long)key % mSize; - KMDictItem *item = mVecs[idx]; - while (item) { - if (item->key == key) - break; - item = item->next; - } - return item; -} diff --git a/kmail/tdemdict.h b/kmail/tdemdict.h deleted file mode 100644 index 6cbbefd5..00000000 --- a/kmail/tdemdict.h +++ /dev/null @@ -1,68 +0,0 @@ -/* - * simple hash table for kmail. inspired by TQDict - */ - -#ifndef __KMDICT -#define __KMDICT - -/** - * @short Class representing items in a KMDict - */ -class KMDictItem -{ -public: - long key; - KMDictItem *next; -}; - -/** - * @short KMDict implements a lightweight dictionary with serial numbers as keys. - * - * KMDict is a leightweight dictionary used exclusively by KMMsgDict. It uses - * serial numbers as keys. - * - * @author Ronen Tzur - */ -class KMDict -{ - friend class MessageDictTester; -public: - /** Creates a hash table with @p size columns. */ - KMDict(int size = 17); - - /** Destroys the hash table object. */ - ~KMDict(); - - /** Clears the hash table, removing all items. */ - void clear(); - - /** Returns the size of the hash table. */ - int size() { return mSize; } - - /** Inserts an item, replacing old ones with the same key. */ - void replace(long key, KMDictItem *item); - - /** Inserts an item without replacing ones with the same key. */ - void insert(long key, KMDictItem *item); - - /** Removes an item. */ - void remove(long key); - - /** Find an item by key. Returns pointer to it, or 0 if not found. */ - KMDictItem *find(long key); - -private: - /** Removes all items _following_ @p item with key @p key. */ - void removeFollowing(KMDictItem *item, long key); - - /** Initializes the hash table to @p size colums. */ - void init(int size); - - /** The size of the hash. */ - int mSize; - - /** The buckets. */ - KMDictItem **mVecs; -}; - -#endif /* __KMDICT */ diff --git a/kmail/tests/Makefile.am b/kmail/tests/Makefile.am index c07ad623..bd8a86b1 100644 --- a/kmail/tests/Makefile.am +++ b/kmail/tests/Makefile.am @@ -6,7 +6,7 @@ check_LTLIBRARIES = tdeunittest_storagelayermodule.la \ tdeunittest_utilmodule.la \ tdeunittest_mimelibmodule.la -tdeunittest_storagelayermodule_la_SOURCES = storagelayermodule.cpp messagedicttests.cpp ../tdemdict.cpp +tdeunittest_storagelayermodule_la_SOURCES = storagelayermodule.cpp messagedicttests.cpp ../kmdict.cpp tdeunittest_storagelayermodule_la_LIBADD = -ltdeunittest tdeunittest_utilmodule_la_SOURCES = utiltests.cpp ../util.cpp tdeunittest_utilmodule_la_LIBADD = -ltdeunittest ../../mimelib/libmimelib.la diff --git a/kmail/tests/messagedicttests.cpp b/kmail/tests/messagedicttests.cpp index 4565f10c..0771aa1c 100644 --- a/kmail/tests/messagedicttests.cpp +++ b/kmail/tests/messagedicttests.cpp @@ -7,7 +7,7 @@ #include #include -#include "tdemdict.h" +#include "kmdict.h" #include "messagedicttests.h" diff --git a/kmail/tests/mimelibtests.cpp b/kmail/tests/mimelibtests.cpp index e1162093..84b3af16 100644 --- a/kmail/tests/mimelibtests.cpp +++ b/kmail/tests/mimelibtests.cpp @@ -26,8 +26,8 @@ using namespace KUnitTest; -KUNITTEST_MODULE( tdeunittest_mimelibmodule, "Mimelib Tests" ); -KUNITTEST_MODULE_REGISTER_TESTER( MimeLibTester ); +TDEUNITTEST_MODULE( tdeunittest_mimelibmodule, "Mimelib Tests" ); +TDEUNITTEST_MODULE_REGISTER_TESTER( MimeLibTester ); #include #include diff --git a/kmail/tests/storagelayermodule.cpp b/kmail/tests/storagelayermodule.cpp index fcfb884e..c8858e42 100644 --- a/kmail/tests/storagelayermodule.cpp +++ b/kmail/tests/storagelayermodule.cpp @@ -12,5 +12,5 @@ using namespace KUnitTest; -KUNITTEST_MODULE( tdeunittest_storagelayermodule, "KMail Storage Layer Tests" ); -KUNITTEST_MODULE_REGISTER_TESTER( MessageDictTester ); +TDEUNITTEST_MODULE( tdeunittest_storagelayermodule, "KMail Storage Layer Tests" ); +TDEUNITTEST_MODULE_REGISTER_TESTER( MessageDictTester ); diff --git a/kmail/tests/utiltests.cpp b/kmail/tests/utiltests.cpp index 936cc3ab..31a43179 100644 --- a/kmail/tests/utiltests.cpp +++ b/kmail/tests/utiltests.cpp @@ -10,8 +10,8 @@ using namespace KUnitTest; -KUNITTEST_MODULE( tdeunittest_utilmodule, "KMail::Util Tests" ); -KUNITTEST_MODULE_REGISTER_TESTER( UtilTester ); +TDEUNITTEST_MODULE( tdeunittest_utilmodule, "KMail::Util Tests" ); +TDEUNITTEST_MODULE_REGISTER_TESTER( UtilTester ); #include "util.h" #include diff --git a/kmailcvt/Makefile.am b/kmailcvt/Makefile.am index 4bb4a997..7c49b36a 100644 --- a/kmailcvt/Makefile.am +++ b/kmailcvt/Makefile.am @@ -40,7 +40,7 @@ INCLUDES= $(all_includes) kmailcvt_METASOURCES = AUTO # the library search path. -kmailcvt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kmailcvt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor KDE_ICON=AUTO diff --git a/kmobile/Makefile.am b/kmobile/Makefile.am index 268cd6ab..6d2640ee 100644 --- a/kmobile/Makefile.am +++ b/kmobile/Makefile.am @@ -8,7 +8,7 @@ lib_LTLIBRARIES = libkmobiledevice.la libkmobileclient.la INCLUDES = $(all_includes) -kmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kmobile_LDADD = $(LIB_TDEFILE) $(LIB_TDEABC) libkmobiledevice.la kmobile_SOURCES = main.cpp kmobile.cpp kmobileview.cpp kmobileitem.cpp\ pref.cpp kmobileiface.skel kmobile_selectiondialog.ui \ @@ -29,7 +29,7 @@ libkmobileclient_la_LDFLAGS = $(all_libraries) -no-undefined -avoid-version libkmobileclient_la_LIBADD = $(LIB_TDECORE) -lDCOP EXTRA_PROGRAMS = testlibkmobile -testlibkmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +testlibkmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor testlibkmobile_LDADD = libkmobileclient.la testlibkmobile_SOURCES = testlibkmobile.cpp diff --git a/kmobile/tdeioslave/Makefile.am b/kmobile/tdeioslave/Makefile.am index 2e2fc943..175c8834 100644 --- a/kmobile/tdeioslave/Makefile.am +++ b/kmobile/tdeioslave/Makefile.am @@ -5,7 +5,7 @@ INCLUDES = -I$(top_srcdir)/kmobile -I$(top_srcdir) $(all_includes) kde_module_LTLIBRARIES = tdeio_mobile.la tdeio_mobile_la_SOURCES = tdeio_mobile.cpp -tdeio_mobile_la_LIBADD = $(LIB_KIO) ../libkmobileclient.la +tdeio_mobile_la_LIBADD = $(LIB_TDEIO) ../libkmobileclient.la tdeio_mobile_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN) kde_services_DATA = mobile.protocol cellphone.protocol \ diff --git a/kmobile/tdeioslave/tdeio_mobile.cpp b/kmobile/tdeioslave/tdeio_mobile.cpp index f30742fe..db531417 100644 --- a/kmobile/tdeioslave/tdeio_mobile.cpp +++ b/kmobile/tdeioslave/tdeio_mobile.cpp @@ -37,8 +37,8 @@ using namespace TDEIO; -#define KIO_MOBILE_DEBUG_AREA 7126 -#define PRINT_DEBUG kdDebug(KIO_MOBILE_DEBUG_AREA) << "tdeio_mobile: " +#define TDEIO_MOBILE_DEBUG_AREA 7126 +#define PRINT_DEBUG kdDebug(TDEIO_MOBILE_DEBUG_AREA) << "tdeio_mobile: " extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); } diff --git a/kmobile/tdeioslave/tdeio_mobile.h b/kmobile/tdeioslave/tdeio_mobile.h index 05a30a22..c825f877 100644 --- a/kmobile/tdeioslave/tdeio_mobile.h +++ b/kmobile/tdeioslave/tdeio_mobile.h @@ -16,8 +16,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef __KIO_MOBILE_H__ -#define __KIO_MOBILE_H__ +#ifndef __TDEIO_MOBILE_H__ +#define __TDEIO_MOBILE_H__ #include #include diff --git a/knode/Makefile.am b/knode/Makefile.am index 610c4f73..c2eff0d3 100644 --- a/knode/Makefile.am +++ b/knode/Makefile.am @@ -11,13 +11,13 @@ 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_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -L$(top_builddir)/libtdepim -ltdepim +libknodepart_la_LIBADD = libknodecommon.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEPARTS) -lDCOP -L$(top_builddir)/libtdepim -ltdepim SUBDIRS = pics filters bin_PROGRAMS = knode -knode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +knode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor knode_LDADD = libknodecommon.la kcm_knode_la_SOURCES = knconfigpages.cpp @@ -26,7 +26,7 @@ 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) -libknodecommon_la_LIBADD = $(top_builddir)/libkmime/libkmime.la $(top_builddir)/libkpgp/libkpgp.la $(top_builddir)/libtdepim/libtdepim.la $(LIB_KSPELL) $(LIB_TDEABC) $(LIB_TDEFILE) $(LIB_KUTILS) $(LIBRESOLV) $(LIB_TDEHTML) +libknodecommon_la_LIBADD = $(top_builddir)/libkmime/libkmime.la $(top_builddir)/libkpgp/libkpgp.la $(top_builddir)/libtdepim/libtdepim.la $(LIB_TDESPELL) $(LIB_TDEABC) $(LIB_TDEFILE) $(LIB_TDEUTILS) $(LIBRESOLV) $(LIB_TDEHTML) libknodecommon_la_SOURCES = knconfigmanager.cpp \ knconfig.cpp \ knconfigwidgets.cpp \ diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp index 678b38eb..2756f621 100644 --- a/knode/kncomposer.cpp +++ b/knode/kncomposer.cpp @@ -1474,7 +1474,7 @@ void KNComposer::slotToBtnClicked() dlg.setSelectedTo( lst ); } #endif - dlg.setRecentAddresses( RecentAddresses::self(knGlobals.config())->kabcAddresses() ); + dlg.setRecentAddresses( RecentAddresses::self(knGlobals.config())->tdeabcAddresses() ); if (dlg.exec()==TQDialog::Rejected) return; if(!to.isEmpty()) diff --git a/knotes/Makefile.am b/knotes/Makefile.am index 2e600e66..9de836c7 100644 --- a/knotes/Makefile.am +++ b/knotes/Makefile.am @@ -27,15 +27,15 @@ libknote_la_SOURCES = knote.cpp knotebutton.cpp knoteconfigdlg.cpp knotehostdlg. 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) -ltderesources -ltdeprint -ltdeutils -knotes_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor + $(top_builddir)/libtdepim/libtdepim.la $(LIB_TDEIO) -ltderesources -ltdeprint -ltdeutils +knotes_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor 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_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -ltderesources + $(top_builddir)/libkcal/libkcal.la -ltdeprint $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -ltderesources METASOURCES = AUTO diff --git a/kode/Makefile.am b/kode/Makefile.am index 877a17e9..f20e86dc 100644 --- a/kode/Makefile.am +++ b/kode/Makefile.am @@ -14,7 +14,7 @@ libkode_la_LIBADD = -ltdecore bin_PROGRAMS = kode -kode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kode_LDADD = libkode.la -ltdeabc kode_SOURCES = kodemain.cpp diff --git a/kode/kodemain.cpp b/kode/kodemain.cpp index ab332c2b..84882054 100644 --- a/kode/kodemain.cpp +++ b/kode/kodemain.cpp @@ -443,7 +443,7 @@ int create( TDECmdLineArgs *args ) } else if ( createKioslave ) { c.setDocs( "This class implements a tdeioslave for ..." ); - c.addBaseClass( KODE::Class( "SlaveBase", "KIO" ) ); + c.addBaseClass( KODE::Class( "SlaveBase", "TDEIO" ) ); c.addHeaderInclude( "tdeio/slavebase.h" ); KODE::Function get( "get", "void" ); @@ -573,7 +573,7 @@ int create( TDECmdLineArgs *args ) KODE::AutoMakefile::Target t( "kde_module_LTLIBRARIES", "tdeio_" + protocol + ".la" ); t.setSources( className.lower() + ".cpp" ); - t.setLibAdd( "$(LIB_KIO)" ); + t.setLibAdd( "$(LIB_TDEIO)" ); t.setLdFlags( "$(all_libraries) -module $(KDE_PLUGIN)" ); am.addTarget( t ); diff --git a/kode/kwsdl/Makefile.am b/kode/kwsdl/Makefile.am index 0accfcc6..86716e47 100644 --- a/kode/kwsdl/Makefile.am +++ b/kode/kwsdl/Makefile.am @@ -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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kwsdl_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kwsdl_compiler_LDADD = ../libkode.la libwsdl.la kwsdl_compiler_SOURCES = compiler.cpp converter.cpp creator.cpp main.cpp \ namemapper.cpp diff --git a/kode/kwsdl/converter.cpp b/kode/kwsdl/converter.cpp index f5d90478..2117c59c 100644 --- a/kode/kwsdl/converter.cpp +++ b/kode/kwsdl/converter.cpp @@ -938,7 +938,7 @@ void Converter::createTransportClass() queryCode += "TDEIO::TransferJob* job = TDEIO::http_post( KURL( " + url.name() + " ), postData, false );"; queryCode += "if ( !job ) {"; queryCode.indent(); - queryCode += "kdWarning() << \"Unable to create KIO job for \" << " + url.name() + " << endl;"; + queryCode += "kdWarning() << \"Unable to create TDEIO job for \" << " + url.name() + " << endl;"; queryCode += "return;"; queryCode.unindent(); queryCode += "}"; diff --git a/kode/kwsdl/kung/Makefile.am b/kode/kwsdl/kung/Makefile.am index 4a56da13..cbff637a 100644 --- a/kode/kwsdl/kung/Makefile.am +++ b/kode/kwsdl/kung/Makefile.am @@ -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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kung_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kung_SOURCES = binaryinputfield.cpp boolinputfield.cpp complexbaseinputfield.cpp dateinputfield.cpp dispatcher.cpp \ doubleinputfield.cpp enuminputfield.cpp generalconversationmanager.cpp \ inputdialog.cpp inputfield.cpp inputfieldfactory.cpp \ diff --git a/kode/kwsdl/kung/transport.cpp b/kode/kwsdl/kung/transport.cpp index 32cfbe6e..e9dabf3c 100644 --- a/kode/kwsdl/kung/transport.cpp +++ b/kode/kwsdl/kung/transport.cpp @@ -38,7 +38,7 @@ void Transport::query( const TQString &xml ) TDEIO::TransferJob* job = TDEIO::http_post( KURL( mUrl ), postData, false ); if ( !job ) { - kdWarning() << "Unable to create KIO job for " << mUrl << endl; + kdWarning() << "Unable to create TDEIO job for " << mUrl << endl; return; } diff --git a/kode/kwsdl/schema/Makefile.am b/kode/kwsdl/schema/Makefile.am index 87884af0..bdde93a4 100644 --- a/kode/kwsdl/schema/Makefile.am +++ b/kode/kwsdl/schema/Makefile.am @@ -8,7 +8,7 @@ libschema_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined libschema_la_LIBADD = -lqt-mt -ltdecore -ltdeio #bin_PROGRAMS = schematest -#schematest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +#schematest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor #schematest_SOURCES = main.cpp #schematest_LDADD = libschema.la diff --git a/kode/kwsdl/tests/google/Makefile.am b/kode/kwsdl/tests/google/Makefile.am index 28e37586..68f084a3 100644 --- a/kode/kwsdl/tests/google/Makefile.am +++ b/kode/kwsdl/tests/google/Makefile.am @@ -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 -ltdeio -googletest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +googletest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor diff --git a/kode/kwsdl/tests/google/transport.cpp b/kode/kwsdl/tests/google/transport.cpp index a37e5fc1..30b9645e 100644 --- a/kode/kwsdl/tests/google/transport.cpp +++ b/kode/kwsdl/tests/google/transport.cpp @@ -41,7 +41,7 @@ void Transport::query( const TQString &xml ) TDEIO::TransferJob* job = TDEIO::http_post( KURL( mUrl ), postData, false ); if ( !job ) { - kdWarning() << "Unable to create KIO job for " << mUrl << endl; + kdWarning() << "Unable to create TDEIO job for " << mUrl << endl; return; } diff --git a/kode/kwsdl/wscl/Makefile.am b/kode/kwsdl/wscl/Makefile.am index 67bf1720..782d912d 100644 --- a/kode/kwsdl/wscl/Makefile.am +++ b/kode/kwsdl/wscl/Makefile.am @@ -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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +#wscltest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor #wscltest_SOURCES = main.cpp #wscltest_LDADD = libwscl.la diff --git a/kode/kxml_compiler/Makefile.am b/kode/kxml_compiler/Makefile.am index fceb5aaf..a8352a38 100644 --- a/kode/kxml_compiler/Makefile.am +++ b/kode/kxml_compiler/Makefile.am @@ -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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kxml_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kxml_compiler_LDADD = ../libkode.la -ltdecore kxml_compiler_SOURCES = parser.cpp creator.cpp kxml_compiler.cpp diff --git a/konsolekalendar/Makefile.am b/konsolekalendar/Makefile.am index a08cbb0c..aa549271 100644 --- a/konsolekalendar/Makefile.am +++ b/konsolekalendar/Makefile.am @@ -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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +konsolekalendar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor appsdir = $(kde_appsdir)/Utilities xdg_apps_DATA = konsolekalendar.desktop diff --git a/kontact/Thoughts b/kontact/Thoughts index f3416484..c4332425 100644 --- a/kontact/Thoughts +++ b/kontact/Thoughts @@ -257,7 +257,7 @@ z last used part on startup. Make sure its loading finishes and then z load the rest once the user can already interact with the last used z loaded part. -g why do we always need the addressbook? Is libkabc not sufficient? +g why do we always need the addressbook? Is libtdeabc not sufficient? Don: I guess my machine is too fast, starting parts is pretty quick here :-) diff --git a/kontact/interfaces/Makefile.am b/kontact/interfaces/Makefile.am index d7c9f340..1677b2a3 100644 --- a/kontact/interfaces/Makefile.am +++ b/kontact/interfaces/Makefile.am @@ -4,7 +4,7 @@ lib_LTLIBRARIES = libkpinterfaces.la libkpinterfaces_la_SOURCES = core.cpp plugin.cpp summary.cpp uniqueapphandler.cpp libkpinterfaces_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0:0 -libkpinterfaces_la_LIBADD = ../../libtdepim/libtdepim.la $(LIB_KPARTS) +libkpinterfaces_la_LIBADD = ../../libtdepim/libtdepim.la $(LIB_TDEPARTS) kpincludedir = $(includedir)/kontact kpinclude_HEADERS = core.h plugin.h summary.h diff --git a/kontact/plugins/akregator/Makefile.am b/kontact/plugins/akregator/Makefile.am index d97f1434..a41148c6 100644 --- a/kontact/plugins/akregator/Makefile.am +++ b/kontact/plugins/akregator/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir)/akregator/src -I$( kde_module_LTLIBRARIES = libkontact_akregator.la libkontact_akregator_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libkontact_akregator_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_KPARTS) +libkontact_akregator_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_TDEPARTS) libkontact_akregator_la_SOURCES = akregator_plugin.cpp akregator_partiface.stub METASOURCES = AUTO diff --git a/kontact/plugins/kmail/Makefile.am b/kontact/plugins/kmail/Makefile.am index 82302548..2bab941c 100644 --- a/kontact/plugins/kmail/Makefile.am +++ b/kontact/plugins/kmail/Makefile.am @@ -7,7 +7,7 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir)/kmail -I$(top_buil kde_module_LTLIBRARIES = libkontact_kmailplugin.la kcm_kmailsummary.la libkontact_kmailplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libkontact_kmailplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(top_builddir)/libkcal/libkcal.la $(LIB_KPARTS) +libkontact_kmailplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(top_builddir)/libkcal/libkcal.la $(LIB_TDEPARTS) libkontact_kmailplugin_la_SOURCES = kmail_plugin.cpp kmailIface.stub \ summarywidget.cpp summarywidget.skel diff --git a/kontact/plugins/knode/Makefile.am b/kontact/plugins/knode/Makefile.am index bf4ba753..76b72ec9 100644 --- a/kontact/plugins/knode/Makefile.am +++ b/kontact/plugins/knode/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir)/knode -I$(top_srcd kde_module_LTLIBRARIES = libkontact_knodeplugin.la libkontact_knodeplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libkontact_knodeplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_KPARTS) +libkontact_knodeplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_TDEPARTS) libkontact_knodeplugin_la_SOURCES = knode_plugin.cpp knodeiface.stub diff --git a/kontact/plugins/knotes/Makefile.am b/kontact/plugins/knotes/Makefile.am index 2b2dc9ed..00147c8c 100644 --- a/kontact/plugins/knotes/Makefile.am +++ b/kontact/plugins/knotes/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir) $(all_includes) kde_module_LTLIBRARIES = libkontact_knotesplugin.la libkontact_knotesplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) libkontact_knotesplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la \ - $(LIB_KPARTS) $(top_builddir)/libtdepim/libtdepim.la \ + $(LIB_TDEPARTS) $(top_builddir)/libtdepim/libtdepim.la \ $(top_builddir)/libkcal/libkcal.la -ltderesources -ltdeprint \ $(top_builddir)/knotes/libknotesresources.la \ $(top_builddir)/knotes/libknoteseditor.la \ diff --git a/kontact/plugins/korganizer/Makefile.am b/kontact/plugins/korganizer/Makefile.am index fd9ac631..48582012 100644 --- a/kontact/plugins/korganizer/Makefile.am +++ b/kontact/plugins/korganizer/Makefile.am @@ -15,7 +15,7 @@ libcommon_la_SOURCES = korg_uniqueapp.cpp libkontact_korganizerplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) libkontact_korganizerplugin_la_LIBADD = libcommon.la \ - $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_KPARTS) \ + $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_TDEPARTS) \ $(top_builddir)/korganizer/libkorganizer_calendar.la libkontact_korganizerplugin_la_SOURCES = korganizerplugin.cpp \ kcalendariface.stub \ @@ -27,7 +27,7 @@ korganizeriface_DCOPIDLNG = true libkontact_todoplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) libkontact_todoplugin_la_LIBADD = libcommon.la \ - $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_KPARTS) \ + $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_TDEPARTS) \ $(top_builddir)/korganizer/libkorganizer_calendar.la \ $(top_builddir)/korganizer/libkorganizer.la libkontact_todoplugin_la_SOURCES = todoplugin.cpp \ @@ -37,7 +37,7 @@ libkontact_todoplugin_la_SOURCES = todoplugin.cpp \ libkontact_journalplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) libkontact_journalplugin_la_LIBADD = libcommon.la \ - $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_KPARTS) \ + $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_TDEPARTS) \ $(top_builddir)/korganizer/libkorganizer_calendar.la libkontact_journalplugin_la_SOURCES = journalplugin.cpp kcalendariface.stub diff --git a/kontact/plugins/kpilot/Makefile.am b/kontact/plugins/kpilot/Makefile.am index c02ba572..9dfe36f3 100644 --- a/kontact/plugins/kpilot/Makefile.am +++ b/kontact/plugins/kpilot/Makefile.am @@ -8,7 +8,7 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces \ kde_module_LTLIBRARIES = libkontact_kpilotplugin.la libkontact_kpilotplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) libkontact_kpilotplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la \ - $(LIB_KPARTS) \ + $(LIB_TDEPARTS) \ $(top_builddir)/libtdepim/libtdepim.la \ $(top_builddir)/kpilot/lib/libkpilot.la diff --git a/kontact/plugins/newsticker/Makefile.am b/kontact/plugins/newsticker/Makefile.am index 5c707cf1..a889887a 100644 --- a/kontact/plugins/newsticker/Makefile.am +++ b/kontact/plugins/newsticker/Makefile.am @@ -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_TDEUI) \ +libkontact_newstickerplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEUI) \ $(top_builddir)/libtdepim/libtdepim.la ../../interfaces/libkpinterfaces.la libkontact_newstickerplugin_la_SOURCES = newsticker_plugin.cpp \ diff --git a/kontact/plugins/summary/Makefile.am b/kontact/plugins/summary/Makefile.am index 32fcdfc9..056d8c82 100644 --- a/kontact/plugins/summary/Makefile.am +++ b/kontact/plugins/summary/Makefile.am @@ -5,7 +5,7 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir)/certmanager/lib \ kde_module_LTLIBRARIES = libkontact_summaryplugin.la kcm_kontactsummary.la libkontact_summaryplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) libkontact_summaryplugin_la_LIBADD = -ltdeutils \ - $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_KPARTS) \ + $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_TDEPARTS) \ $(top_builddir)/libtdepim/libtdepim.la $(top_builddir)/libkpimidentities/libkpimidentities.la libkontact_summaryplugin_la_SOURCES = summaryview_plugin.cpp summaryview_part.cpp dropwidget.cpp @@ -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_TDEUI) $(LIB_KUTILS) +kcm_kontactsummary_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEUTILS) METASOURCES = AUTO diff --git a/kontact/plugins/test/Makefile.am b/kontact/plugins/test/Makefile.am index 3fbac9eb..7b1343e7 100644 --- a/kontact/plugins/test/Makefile.am +++ b/kontact/plugins/test/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces $(all_includes) kde_module_LTLIBRARIES = libkptestplugin.la libkptestplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libkptestplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_KPARTS) +libkptestplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_TDEPARTS) libkptestplugin_la_SOURCES = test_plugin.cpp test_part.cpp kaddressbookiface.stub diff --git a/kontact/plugins/weather/Makefile.am b/kontact/plugins/weather/Makefile.am index 2bd4cfbf..a803f12d 100644 --- a/kontact/plugins/weather/Makefile.am +++ b/kontact/plugins/weather/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir)/libtdepim -I$(top_ kde_module_LTLIBRARIES = libkontact_weatherplugin.la libkontact_weatherplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libkontact_weatherplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_KPARTS) $(top_builddir)/libtdepim/libtdepim.la +libkontact_weatherplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_TDEPARTS) $(top_builddir)/libtdepim/libtdepim.la libkontact_weatherplugin_la_SOURCES = weather_plugin.cpp summarywidget.cpp \ summarywidget.skel diff --git a/kontact/src/Makefile.am b/kontact/src/Makefile.am index 96513a5a..46fd81ef 100644 --- a/kontact/src/Makefile.am +++ b/kontact/src/Makefile.am @@ -10,10 +10,10 @@ libkontact_la_SOURCES = prefs.kcfgc bin_PROGRAMS = kontact kontact_METASOURCES = AUTO -kontact_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kontact_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kontact_LDADD = $(top_builddir)/libtdepim/libtdepim.la \ $(top_builddir)/kontact/interfaces/libkpinterfaces.la libkontact.la \ - $(LIB_KPARTS) $(LIB_KUTILS) $(LIB_TDEHTML) + $(LIB_TDEPARTS) $(LIB_TDEUTILS) $(LIB_TDEHTML) kontact_SOURCES = main.cpp mainwindow.cpp sidepanebase.cpp \ iconsidepane.cpp aboutdialog.cpp profilemanager.cpp profiledialog.cpp \ kontactiface.skel diff --git a/korganizer/Makefile.am b/korganizer/Makefile.am index ff334a4d..853e3459 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +korganizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor korganizer_LDADD = libkorganizer.la korganizer_SOURCES = main.cpp korganizer.cpp koapp.cpp korganizer_COMPILE_FIRST = koprefs_base.h @@ -29,20 +29,20 @@ kcm_korganizer_la_LIBADD = libkorganizer.la $(top_builddir)/libtdepim/libtdepim. 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_TDECORE) $(LIB_KPARTS) $(LIB_KIO) $(LIB_TDEHTML) $(LIB_TDEUI) -L$(top_builddir)/libtdepim/ -ltdepim -L$(top_builddir)/libkcal/ -lkcal -lkorganizer_calendar +libkorganizerpart_la_LIBADD = libkorganizer.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEPARTS) $(LIB_TDEIO) $(LIB_TDEHTML) $(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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -korgplugins_LDADD = libkorganizer.la $(LIB_KSYCOCA) +korgplugins_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +korgplugins_LDADD = libkorganizer.la $(LIB_TDESYCOCA) korgplugins_SOURCES = korgplugins.cpp korgplugins_COMPILE_FIRST = koprefs_base.h -timezone_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -timezone_LDADD = libkorganizer.la $(LIB_KSYCOCA) +timezone_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +timezone_LDADD = libkorganizer.la $(LIB_TDESYCOCA) timezone_SOURCES = timezone.cpp timezone_COMPILE_FIRST = koprefs_base.h @@ -62,7 +62,7 @@ libkorganizer_la_LIBADD = \ $(top_builddir)/libemailfunctions/libemailfunctions.la \ $(top_builddir)/libkholidays/libkholidays.la \ $(top_builddir)/libkmime/libkmime.la \ - $(LIB_KPARTS) $(LIB_TDEFILE) $(LIB_KNEWSTUFF) \ + $(LIB_TDEPARTS) $(LIB_TDEFILE) $(LIB_KNEWSTUFF) \ -ltdeprint -ltdeabc -ltdeutils libkorganizer_la_COMPILE_FIRST = \ @@ -116,14 +116,14 @@ libkorganizer_la_SOURCES = komessagebox.cpp \ libkorganizer_eventviewer_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) \ -no-undefined -version-info 1:0 -libkorganizer_eventviewer_la_LIBADD = $(LIB_KPARTS) \ +libkorganizer_eventviewer_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/libkcal/libkcal.la libkorganizer_eventviewer_la_SOURCES = koeventviewer.cpp urihandler.cpp \ kmailIface.stub koeventviewerdialog.cpp libkorganizer_calendar_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) \ -no-undefined -version-info 1:0 -libkorganizer_calendar_la_LIBADD = $(LIB_KPARTS) \ +libkorganizer_calendar_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/libtdepim/libtdepim.la \ $(top_builddir)/libkcal/libkcal.la libkorganizer_calendar_la_SOURCES = stdcalendar.cpp diff --git a/korganizer/korgac/Makefile.am b/korganizer/korgac/Makefile.am index 817cc95f..91009062 100644 --- a/korganizer/korgac/Makefile.am +++ b/korganizer/korgac/Makefile.am @@ -2,7 +2,7 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/korganizer $(all_includes) bin_PROGRAMS = korgac -korgac_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +korgac_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor korgac_LDADD = $(LIB_TDEUI) \ $(top_builddir)/korganizer/libkorganizer_eventviewer.la korgac_SOURCES = korgacmain.cpp alarmdialog.cpp \ @@ -11,7 +11,7 @@ korgac_SOURCES = korgacmain.cpp alarmdialog.cpp \ check_PROGRAMS = testalarmdlg -testalarmdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +testalarmdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor 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/exchange/Makefile.am b/korganizer/plugins/exchange/Makefile.am index e022c354..d1edf5ba 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_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) \ + $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) \ $(top_builddir)/libkcal/libkcal.la noinst_HEADERS = exchange.h exchangedialog.h exchangeconfig.h diff --git a/korganizer/plugins/projectview/Makefile.am b/korganizer/plugins/projectview/Makefile.am index f84cf708..ef6b42ad 100644 --- a/korganizer/plugins/projectview/Makefile.am +++ b/korganizer/plugins/projectview/Makefile.am @@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = libkorg_projectview.la libkorg_projectview_la_SOURCES = projectview.cpp koprojectview.cpp libkorg_projectview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -libkorg_projectview_la_LIBADD = $(top_builddir)/kgantt/kgantt/libkgantt.la $(top_builddir)/korganizer/libkorganizer.la $(LIB_KPARTS) +libkorg_projectview_la_LIBADD = $(top_builddir)/kgantt/kgantt/libkgantt.la $(top_builddir)/korganizer/libkorganizer.la $(LIB_TDEPARTS) noinst_HEADERS = projectview.h koprojectview.h diff --git a/korganizer/plugins/timespanview/Makefile.am b/korganizer/plugins/timespanview/Makefile.am index a4431c6a..1567c9b3 100644 --- a/korganizer/plugins/timespanview/Makefile.am +++ b/korganizer/plugins/timespanview/Makefile.am @@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = libkorg_timespanview.la libkorg_timespanview_la_SOURCES = lineview.cpp timeline.cpp timespanview.cpp timespanwidget.cpp kotimespanview.cpp libkorg_timespanview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -libkorg_timespanview_la_LIBADD = $(top_builddir)/korganizer/libkorganizer.la $(LIB_KPARTS) +libkorg_timespanview_la_LIBADD = $(top_builddir)/korganizer/libkorganizer.la $(LIB_TDEPARTS) noinst_HEADERS = timespanview.h timespanwidget.h kotimespanview.h diff --git a/korn/CMakeLists.txt b/korn/CMakeLists.txt index 081d1aaf..7cdffec9 100644 --- a/korn/CMakeLists.txt +++ b/korn/CMakeLists.txt @@ -45,7 +45,7 @@ tde_add_executable( korn AUTOMOC keditlistboxman.cpp nntp_proto.cpp maildrop.cpp main.cpp polldrop.cpp protocols.cpp kornshell.cpp subjectsdlg.cpp maildlg.cpp mailid.cpp mailsubject.cpp mbox_proto.cpp imap_proto.cpp intid.cpp stringid.cpp - kornapp.cpp kio.cpp tdeio_count.cpp tdeio_proto.cpp tdeio_subjects.cpp + kornapp.cpp tdeio.cpp tdeio_count.cpp tdeio_proto.cpp tdeio_subjects.cpp tdeio_single_subject.cpp tdeio_read.cpp tdeio_delete.cpp kmail_proto.cpp sortedmailsubject.cpp korncfgimpl.cpp kornaccountcfgimpl.cpp kornboxcfgimpl.cpp kornaccountcfg.ui kornboxcfg.ui korncfg.ui password.cpp pop3_proto.cpp diff --git a/korn/Makefile.am b/korn/Makefile.am index 9dafb61c..bed6770d 100644 --- a/korn/Makefile.am +++ b/korn/Makefile.am @@ -3,12 +3,12 @@ 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor METASOURCES = AUTO bin_PROGRAMS = korn -korn_LDADD = $(LIB_KIO) $(top_builddir)/libkmime/libkmime.la +korn_LDADD = $(LIB_TDEIO) $(top_builddir)/libkmime/libkmime.la #korn_LDADD = $(top_builddir)/mimelib/libmimelib.la $(LIB_TDEFILE) $(LIBSOCKET) $(top_builddir)/libkmime/libkmime.la korn_SOURCES = \ @@ -39,7 +39,7 @@ korn_SOURCES = \ intid.cpp \ stringid.cpp \ kornapp.cpp \ - kio.cpp \ + tdeio.cpp \ tdeio_count.cpp \ tdeio_proto.cpp \ tdeio_subjects.cpp \ @@ -91,7 +91,7 @@ noinst_HEADERS = \ intid.h \ stringid.h \ kornapp.h \ - kio.h \ + tdeio.h \ tdeio_count.h \ tdeio_subjects.h \ tdeio_single_subject.h \ diff --git a/korn/accountmanager.cpp b/korn/accountmanager.cpp index a31dd4c1..187f79bd 100644 --- a/korn/accountmanager.cpp +++ b/korn/accountmanager.cpp @@ -19,7 +19,7 @@ #include "accountmanager.h" #include "dcopdrop.h" -#include "kio.h" +#include "tdeio.h" #include "maildrop.h" #include "password.h" #include "protocol.h" diff --git a/korn/dcop_proto.h b/korn/dcop_proto.h index 18e01e99..defcf0c2 100644 --- a/korn/dcop_proto.h +++ b/korn/dcop_proto.h @@ -24,7 +24,7 @@ class AccountInput; class TDEConfigGroup; -class KIO_Protocol; +class TDEIO_Protocol; class KMailDrop; class Protocol; @@ -106,12 +106,12 @@ public: //Functions that return a derived class. //This way, no explicit cast is needed /** - * This function returns a cast to a KIO_Protocol. Because this isn't a KIO_Protocol, + * This function returns a cast to a TDEIO_Protocol. Because this isn't a TDEIO_Protocol, * it returns 0. * * @return 0 */ - virtual const KIO_Protocol* getKIOProtocol() const { return 0; } + virtual const TDEIO_Protocol* getKIOProtocol() const { return 0; } }; #endif diff --git a/korn/imap_proto.h b/korn/imap_proto.h index 4030c5cc..6bd90d40 100644 --- a/korn/imap_proto.h +++ b/korn/imap_proto.h @@ -30,10 +30,10 @@ /** * This class define the way a imap-protocol works. - * It implements function of KIO_Protocol to make the kio-modules work with it, + * It implements function of TDEIO_Protocol to make the tdeio-modules work with it, * as well as function of Protocol, to configure it. */ -class Imap_Protocol : public KIO_Protocol +class Imap_Protocol : public TDEIO_Protocol { public: /** diff --git a/korn/imaps_proto.h b/korn/imaps_proto.h index 07f3cfdb..65b59e64 100644 --- a/korn/imaps_proto.h +++ b/korn/imaps_proto.h @@ -29,7 +29,7 @@ public: Imaps_Protocol() {} virtual ~Imaps_Protocol() {} - virtual KIO_Protocol * clone() const { return new Imaps_Protocol; } + virtual TDEIO_Protocol * clone() const { return new Imaps_Protocol; } virtual TQString protocol() const { return "imaps"; } virtual TQString configName() const { return "imaps"; } diff --git a/korn/kio.cpp b/korn/kio.cpp deleted file mode 100644 index 678b3848..00000000 --- a/korn/kio.cpp +++ /dev/null @@ -1,561 +0,0 @@ -/* - * Copyright (C) Sirtaj Singh Kang - * Copyright (C) Kurt Granroth - * Copyright (C) 2004, Mart Kelder (mart.kde@hccnet.nl) - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/* - * kio.cpp -- Implementation of class KKIODrop. - * It is copyied from imap.cpp, with was writed by: - * Author: Kurt Granroth - * Version: $Id$ - * Changed by: - * Mart Kelder , 2004 - */ - -#include "kio.h" -#include "tdeio_count.h" -#include "tdeio_subjects.h" -#include "tdeio_read.h" -#include "tdeio_delete.h" -#include "protocol.h" -#include "protocols.h" -#include "stringid.h" -#include"utils.h" -//#include"kiocfg.h" -//#include"dropdlg.h" -#include "mailsubject.h" - -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#include -#include -#include -#include - -//Headers of protocols -#include"tdeio_proto.h" -//#include"pop3_proto.h" -//#include"pop3s_proto.h" -//#include"imap_proto.h" -//#include"imaps_proto.h" -//#include"nntp_proto.h" -//#include"maildir_proto.h" -//#include"qmail_proto.h" -//#include"process_proto.h" -#include"mbox_proto.h" - -/* - * The 'process' maildrop is a lot different than the other protocols: - * it haven't a tdeioslave and could not result in file list. To prevent - * trowing it away, that functionality is hacked in this file. - */ - -KKioDrop::KKioDrop() - : KPollableDrop(), - _kurl( 0 ), - _metadata( 0 ), - _valid(false), - _protocol( 0 ), - _ssl(false), - _count( 0 ), - _subjects( 0 ), - _read( 0 ), - _readSubjectsTotalSteps( 0 ), - _deleteMailsTotalSteps( 0 ), - _process( 0 ), - _mailurls( 0 ) -{ - _kurl = new KURL; - _metadata = new TDEIO::MetaData; - - //Initialising protocol; if no protocol is set before first use, it will use the first protocol - _protocol = Protocols::firstProtocol()->getKIOProtocol(); //The first protocol is the default - _kurl->setPort( _protocol->defaultPort( _ssl ) ); - - //Creating children and connect them to the outside world; this class passes the messages for them... - //This class handles all the counting. - _count = new KIO_Count( this, "tdeio_count" ); - - //This class is responsible for providing the available subjects - _subjects = new KIO_Subjects( this, "tdeio_subjects" ); - - //This class is used when a full message has to be read. - _read = new KIO_Read( this, "tdeio_read" ); - - //This class can delete mails. - _delete = new KIO_Delete( this, "tdeio_delete" ); - - _mailurls = new TQValueList; -} - -KKioDrop::KKioDrop( TDEConfigGroup* ) - : KPollableDrop(), - _kurl( 0 ), - _metadata( 0 ), - _valid(false), - _protocol( 0 ), - _ssl(false), - _count( 0 ), - _subjects( 0 ), - _read( 0 ), - _readSubjectsTotalSteps( 0 ), - _deleteMailsTotalSteps( 0 ), - _process( 0 ), - _mailurls( 0 ) -{ - _kurl = new KURL; - _metadata = new TDEIO::MetaData; - - //Initialising protocol; if no protocol is set before first use, it will use the first protocol - _protocol = Protocols::firstProtocol()->getKIOProtocol(); //The first protocol is the default - _kurl->setPort( _protocol->defaultPort( _ssl ) ); - - //Creating children and connect them to the outside world; this class passes the messages for them... - //This class handles all the counting. - _count = new KIO_Count( this, "tdeio_count" ); - - //This class is responsible for providing the available subjects - _subjects = new KIO_Subjects( this, "tdeio_subjects" ); - - //This class is used when a full message has to be read. - _read = new KIO_Read( this, "tdeio_read" ); - - //This class can delete mails. - _delete = new KIO_Delete( this, "tdeio_delete" ); - - _mailurls = new TQValueList; - - //readConfigGroup( *config ); -} - -void KKioDrop::setKioServer( const TQString & proto, const TQString & server, int port ) -{ - //Settings default for last vars; could not inline because TDEIO::MetaData-object is not defined in header. - setKioServer( proto, server, port, TDEIO::MetaData(), false, true ); -} - -void KKioDrop::setKioServer(const TQString & proto, const TQString & server, int port, const TDEIO::MetaData metadata, bool ssl, - bool setProtocol ) -{ - TQString auth; - - if( port == -1 ) - port = _protocol->defaultPort( ssl ); - - if( setProtocol ) //false if _protocol already made - { - _protocol = Protocols::getProto( proto )->getKIOProtocol(); - - if( ! _protocol ) - _protocol = Protocols::firstProtocol()->getKIOProtocol(); - } - - _kurl->setProtocol( _protocol->protocol( ssl ) ); - _kurl->setHost ( server ); - _kurl->setPort ( port ); - _ssl = ssl; - - //Checking for authentication-settings. - //if( _metadata->contains("auth") ) - //{ - // auth = (*_metadata)["auth"]; - // *_metadata = metadata; - // if( ! _metadata->contains("auth") ) - // (*_metadata)["auth"] = auth; - //} else - *_metadata = metadata; - - _count->stopActiveCount(); -} - -void KKioDrop::setUser(const TQString & user, const TQString & password, - const TQString & mailbox, const TQString & auth ) -{ - _kurl->setUser( user ); - _password = password ; - _kurl->setPass( _password ); - _kurl->setPath( mailbox ); - if( ! auth.isEmpty() && auth != "Plain" ) - (*_metadata)["auth"] = auth; - else if( _metadata->contains( "auth" ) ) - _metadata->erase( "auth" ); - - _valid = _kurl->isValid(); - emit validChanged( valid() ); - - if( ! _valid ) - kdWarning() << i18n( "url is not valid" ) << endl; - - _count->stopActiveCount(); -} - -TQString KKioDrop::protocol() const -{ - return _protocol->configName(); -} - -TQString KKioDrop::server() const -{ - return _kurl->host(); -} -int KKioDrop::port() const -{ - return _kurl->port(); -} - -TQString KKioDrop::user() const -{ - return _kurl->user(); -} -TQString KKioDrop::password() const -{ - return _password ; -} -TQString KKioDrop::mailbox() const -{ - return _kurl->path(); -} -TQString KKioDrop::auth() const -{ - return ( _metadata->contains("auth")?(*_metadata)["auth"]:"" ); -} - -void KKioDrop::recheck() -{ - if( _protocol->configName() == "process" ) //Process isn't pollable - { - emit rechecked(); - return; - } - - _count->count( this ); - - return; -} - -void KKioDrop::forceRecheck() -{ - if( _protocol->configName() == "process" ) - return; - - _count->stopActiveCount(); - _count->count( this ); - - return; -} - -bool KKioDrop::valid() -{ - return _valid && _count->valid() && _subjects->valid(); -} - -KKioDrop::~KKioDrop() -{ - delete _count; - delete _subjects; - delete _kurl; - delete _metadata; - delete _mailurls; -} - -bool KKioDrop::canReadSubjects( ) -{ - return (_protocol!=0?_protocol->canReadSubjects():false); -} - -TQValueVector * KKioDrop::doReadSubjects(bool * ) -{ - _subjects->doReadSubjects( this ); - - /* - * A empty TQValueVector is made here. - * After that, the size is expanded to the expected number of subjects. - * This way, reallocation of memmory is minimized, and thus more efficient. - */ - TQValueVector *vector = new TQValueVector( ); - vector->reserve( _mailurls->count() ); - return vector; -} - -bool KKioDrop::canReadMail( ) -{ - return (_protocol!=0?_protocol->canReadMail():false); -} - -bool KKioDrop::deleteMails(TQPtrList * ids, bool * /*stop*/) -{ - _delete->deleteMails( ids, this ); - return _delete->valid(); -} - -bool KKioDrop::canDeleteMails () -{ - return (_protocol!=0?_protocol->canDeleteMail():false); -} - -TQString KKioDrop::readMail(const KornMailId * item, bool * ) -{ - _read->readMail( item, this ); - - return ""; -} - -KMailDrop* KKioDrop::clone() const -{ - KKioDrop *clone = new KKioDrop; - - *clone = *this; - - return clone; -} - -bool KKioDrop::readConfigGroup( const TQMap< TQString, TQString > &map, const Protocol* protocol ) -{ - TQString val, val2; - - if( !map.contains( "server" ) || !map.contains( "port" ) || !map.contains( "ssl" ) || !map.contains( "username" ) || - !map.contains( "mailbox" ) || !map.contains( "password" ) || !map.contains( "metadata" ) || !map.contains( "name" ) ) - { - kdWarning() << "Bug: map niet compleet" << endl; - return false; - } - - this->setName( (*map.find( "name" )).utf8() ); - - _protocol = protocol->getKIOProtocol(); - if( !_protocol ) - _protocol = Protocols::firstProtocol()->getKIOProtocol(); - - val = *map.find( "server" ); - setKioServer( val2, val, (*map.find( "port" )).toInt(), TDEIO::MetaData(), *map.find( "ssl" ) == "true", false ); - - _kurl->setUser( *map.find( "username" ) ); - _kurl->setPath( *map.find( "mailbox" ) ); - - _kurl->setPass( *map.find( "password" ) ); - - TQStringList list = TQStringList::split( ',', *map.find( "metadata" ) ); - TQStringList::Iterator it; - for( it = list.begin(); it != list.end(); ++it ) - { - int split = (*it).find( "=" ); - if( split > 0 ) - _metadata->insert( (*it).left( split ), (*it).right( (*it).length() - split - 1 ) ); - } - - _valid = true; - emitValidChanged(); - - return true; -} - -bool KKioDrop::writeConfigGroup( TDEConfigBase& cfg ) const -{ - KPollableDrop::writeConfigGroup( cfg ); - /*TQString p; - - if( _kurl->hasPass() ) { - p = _kurl->pass(); - //encrypt ( p ); - } - - cfg.writeEntry(fu(ProtoConfigKey), _protocol->configName() ); - if( ( _protocol->fields() | _protocol->urlFields() ) & KIO_Protocol::server ) - cfg.writeEntry(fu(HostConfigKey), _kurl->host() ); - if( ( _protocol->fields() | _protocol->urlFields() ) & KIO_Protocol::port ) - cfg.writeEntry(fu(PortConfigKey), _kurl->port() ); - if( ( _protocol->fields() | _protocol->urlFields() ) & KIO_Protocol::username ) - cfg.writeEntry(fu(UserConfigKey), _kurl->user() ); - if( ( _protocol->fields() | _protocol->urlFields() ) & KIO_Protocol::mailbox ) - cfg.writeEntry(fu(MailboxConfigKey), _kurl->path() ); - if( ( _protocol->fields() | _protocol->urlFields() ) & KIO_Protocol::password ) - cfg.writeEntry(fu(PassConfigKey), p ); - if( ( _protocol->fields() | _protocol->urlFields() ) & KIO_Protocol::auth ) - cfg.writeEntry(fu(AuthConfigKey), auth() ); - */ - return true; -} - -KKioDrop& KKioDrop::operator = ( const KKioDrop& other ) -{ - *_kurl=*other._kurl; - setFreq( other.freq() ); - - if( other._protocol ) - _protocol = other._protocol->getKIOProtocol(); - _ssl = other._ssl; - - return *this; -} - -//Public slots -void KKioDrop::readSubjectsCanceled() -{ - _subjects->cancelled(); -} - -void KKioDrop::readMailCanceled() -{ - _read->canceled( ); -} - -void KKioDrop::deleteMailsCanceled() -{ - _delete->canceled( ); -} - -//Private slots for displaying connection errors -void KKioDrop::slotConnectionError( int number, const TQString& arg ) -{ - kdError() << TDEIO::buildErrorString( number, arg ) << endl; -// if( passivePopup() ) - emitShowPassivePopup( TDEIO::buildErrorString( number, arg ) ); -} - -void KKioDrop::slotConnectionWarning( const TQString& msg ) -{ - kdWarning() << msg << endl; -} - -void KKioDrop::slotConnectionInfoMessage( const TQString& msg ) -{ - kdDebug() << msg << endl; //Display only in debug modes -} - -//Private slots - -//The next functions are needed for process maildrops. -bool KKioDrop::startProcess() -{ //code copyied from edrop.cpp - - if( _protocol->configName() != "process" ) - return true; - - if( _process != 0 ) { - return false; - } - - // debug( "proc start: %s", _command.data() ); - - _process = new TDEProcess; - _process->setUseShell( true ); - - // only reading stdin yet - - connect( _process,TQT_SIGNAL(receivedStdout( TDEProcess *, char *, int)), - this, TQT_SLOT(receivedStdout( TDEProcess *,char *,int)) ); - connect( _process, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(processExit(TDEProcess*)) ); - *_process << _kurl->path(); - _process->start( TDEProcess::NotifyOnExit, TDEProcess::Stdout ); - - return true; -} - -bool KKioDrop::stopProcess() -{ //code copied from edrop.cpp - if( _protocol->configName() != "process" ) - return true; - - if( _process != 0 ) { - // debug( "proc stop" ); - _process->kill( SIGHUP ); - delete _process; - _process = 0; - } - - return true; -} - -void KKioDrop::receivedStdout( TDEProcess *proc, char * buffer, int /*len*/ ) -{ - assert(static_cast(proc) == static_cast(_process)); - - //Original code - /*char *buf = new char[ len + 1 ]; - memcpy( buf, buffer, len ); - buf[ len ] = '\0'; - - char *ptr = buf, *start = buf; - int num = 0; - - while( *ptr ) { - // find number - while( *ptr && !isdigit( *ptr ) ) { - ptr++; - } - start = ptr; - if( *ptr == 0 ) { - break; - } - - // find end - while( *ptr && isdigit( *ptr ) ) { - ptr++; - } - - // atoi number - char back = *ptr; - *ptr = 0; - num = atoi( start ); - *ptr = back; - } - - emit changed( num ); - delete [] buf;*/ - - //Alternatieve code - TQString buf = buffer; - TQRegExp regexp( "^(.*\\D+|\\D*)(\\d+)\\D*$" ); - - if( regexp.search( buf ) == 0 ) - { //Number found - emit changed( regexp.cap( 2 ).toInt(), this ); - } - - -} - -void KKioDrop::processExit(TDEProcess* proc) -{ - assert(static_cast(proc) == static_cast(_process)); - - _process = 0; - -// debug( "proc exited" ); -} - -const char *KKioDrop::ProtoConfigKey = "protocol"; -const char *KKioDrop::HostConfigKey = "server"; -const char *KKioDrop::PortConfigKey = "port"; -const char *KKioDrop::UserConfigKey = "username"; -const char *KKioDrop::PassConfigKey = "password"; -const char *KKioDrop::MailboxConfigKey = "mailbox"; -const char *KKioDrop::SavePassConfigKey = "savepass"; -const char *KKioDrop::MetadataConfigKey = "metadata"; - -#include "kio.moc" diff --git a/korn/kio.h b/korn/kio.h deleted file mode 100644 index a2ac796a..00000000 --- a/korn/kio.h +++ /dev/null @@ -1,208 +0,0 @@ -/* - * Copyright (C) Kurt Granroth - * Copyright (C) 2004, Mart Kelder (mart.kde@hccnet.nl) - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/* - * kio.h -- Declaration of class KKIODrop. - */ -#ifndef KEG_KIODROP_H -#define KEG_KIODROP_H - -#include "polldrop.h" - -class TQWidget; -class KDropDialog; -class KornMailSubject; -class TDEProcess; -class KIO_Count; -class KIO_Protocol; -class KIO_Subjects; -class KIO_Read; -class KIO_Delete; -class TDEConfigGroup; -class KURL; -template class TQPtrList; -template class TQValueList; -namespace TDEIO { class Job; class MetaData; class Slave; class TransferJob; } - -/** - * Polling monitor for IMAP4 maildrops. - * @author Kurt Granroth (granroth@kde.org) - * Changes to poll with KIO - * @author Mart Kelder (mart.kde@hccnet.nl) - * $version $Id$ - */ -class KKioDrop : public KPollableDrop -{ - Q_OBJECT - -private: - KURL *_kurl; - TDEIO::MetaData *_metadata; - - TQString _password; - - bool _valid; - - const KIO_Protocol * _protocol; - bool _ssl; - - KIO_Count *_count; - KIO_Subjects *_subjects; - KIO_Read *_read; - KIO_Delete *_delete; - - int _readSubjectsTotalSteps; - int _deleteMailsTotalSteps; - //For process - TDEProcess *_process; - - //List of mailurls fetched by the last time emails were counted - struct FileInfo { - TQString name; - long size; - }; - TQValueList *_mailurls; - - /* - * The help-classes of this functions are friend functions, because this way, they can - * access the _kurl and _metadata-values without a function; and this way, no signal or - * public functions are neccesairy to emit a signal from KKioDrop. - */ - friend class KIO_Count; - friend class KIO_Subjects; - friend class KIO_Read; - friend class KIO_Delete; - friend class KIO_Single_Subjects; -public: - static const char *ProtoConfigKey; - static const char *HostConfigKey; - static const char *PortConfigKey; - static const char *UserConfigKey; - static const char *MailboxConfigKey; - static const char *PassConfigKey; - static const char *SavePassConfigKey; - static const char *MetadataConfigKey; - -public: - /** - * KKioDrop Constructor - */ - KKioDrop(); - KKioDrop( TDEConfigGroup* ); - - /** - * Set the server that will be checked for new mail. - */ - void setKioServer( const TQString & proto, const TQString & server, int port = -1 ); - void setKioServer( const TQString & proto, const TQString & server, int port, - const TDEIO::MetaData metadata, bool ssl, bool setProtocol = true ); //Last argument inits _protocol - - /** Set the account information for the PROTO server. */ - void setUser( const TQString & user, const TQString & password, const TQString & mailbox, const TQString & auth ); - - // The next functions return settings - TQString protocol() const; - TQString server() const; - int port() const; - - TQString user() const; - TQString password() const; - TQString mailbox() const; - TQString auth() const; - - virtual void recheck(); - virtual void forceRecheck(); - - virtual bool valid(); - - /** - * KKioDrop Destructor - */ - virtual ~KKioDrop(); - - virtual bool canReadSubjects(void); - virtual TQValueVector * doReadSubjects(bool * stop); - - virtual bool canDeleteMails(); - virtual bool deleteMails(TQPtrList * ids, bool * stop); - - virtual bool canReadMail (); - virtual TQString readMail(const KornMailId * id, bool * stop); - - virtual KMailDrop* clone () const ; - virtual bool readConfigGroup ( const TQMap< TQString, TQString >& map, const Protocol * protocol ); - virtual bool writeConfigGroup ( TDEConfigBase& cfg ) const; - virtual TQString type() const { return TQString::fromUtf8("kio"); } - - virtual bool synchrone() const { return false; } //class is not synchrone - - //virtual void addConfigPage( KDropCfgDialog * ); - - virtual bool asynchrone() const { return true; } - -private: - KKioDrop& operator = ( const KKioDrop& ); - //static void encrypt( TQString& str ); - //static void decrypt( TQString& str ); - - /* - * The next functions are called from the help-classes (which are friend of the class). - * The only thing this functions do is emitting signals. - */ - void emitRechecked() { emit rechecked(); } - void emitChanged( int value ) { emit changed( value, this ); } - - void emitReadSubjectsReady( bool success ) { emit readSubjectsReady( success ); } - void emitReadSubjectsRead( KornMailSubject * subject ) { emit readSubject( subject ); } - void emitReadSubjectsTotalSteps( int value ) { _readSubjectsTotalSteps = value; emit readSubjectsTotalSteps( value ); } - void emitReadSubjectsProgress( int value ) { emit readSubjectsProgress( _readSubjectsTotalSteps - value ); } - - void emitReadMailReady( TQString* msg ) { emit readMailReady( msg ); } - - void emitDeleteMailsReady( bool value ) { emit deleteMailsReady( value ); } - void emitDeleteMailsTotalSteps( int value ) { _deleteMailsTotalSteps = value; emit deleteMailsTotalSteps( value ); } - void emitDeleteMailsProgress( int value ) { emit deleteMailsProgress( _deleteMailsTotalSteps - value ); } - - void emitShowPassivePopup( TQPtrList< KornMailSubject > *subject, int total ) - { emit showPassivePopup( subject, total, passiveDate(), this->realName() ); } - void emitShowPassivePopup( const TQString& error ) - { if( passivePopup() ) { emit showPassivePopup( error, this->realName() ); } } - void emitValidChanged() { emit validChanged( valid() ); } - -private slots: - void slotConnectionError( int, const TQString& ); - void slotConnectionWarning( const TQString& ); - void slotConnectionInfoMessage( const TQString& ); - -protected: - //The next functions are needed for Process; - virtual bool startProcess(); - virtual bool stopProcess(); - -public slots: - virtual void readSubjectsCanceled(); - virtual void readMailCanceled(); - virtual void deleteMailsCanceled(); - -private slots: - //For Process too - void processExit(TDEProcess*); - void receivedStdout( TDEProcess *, char *, int); -}; -#endif // KEG_KIODROP_H diff --git a/korn/kmail_proto.cpp b/korn/kmail_proto.cpp index a3fddad3..b53dae5b 100644 --- a/korn/kmail_proto.cpp +++ b/korn/kmail_proto.cpp @@ -20,7 +20,7 @@ #include "kmail_proto.h" #include "account_input.h" -#include "kio.h" +#include "tdeio.h" #include "password.h" #include "protocols.h" diff --git a/korn/maildir_proto.h b/korn/maildir_proto.h index b06564e9..bb1b0e8a 100644 --- a/korn/maildir_proto.h +++ b/korn/maildir_proto.h @@ -25,13 +25,13 @@ * Protocol for (postfix?) maildir * Only tested with a copy of a maildir forder */ -class Maildir_Protocol : public KIO_Protocol +class Maildir_Protocol : public TDEIO_Protocol { public: Maildir_Protocol() {} virtual ~Maildir_Protocol() {} - virtual KIO_Protocol * clone() const { return new Maildir_Protocol; } + virtual TDEIO_Protocol * clone() const { return new Maildir_Protocol; } virtual TQString protocol() const { return "file"; } virtual TQString configName() const { return "maildir"; } diff --git a/korn/maildrop.h b/korn/maildrop.h index e0f1a46d..9b755d4a 100644 --- a/korn/maildrop.h +++ b/korn/maildrop.h @@ -314,7 +314,7 @@ class KMailDrop : public TQObject virtual void forceCountZero(); /* - * The next slots are used by kio; the present at this places + * The next slots are used by tdeio; the present at this places * prevent warnings at runtime. */ virtual void readSubjectsCanceled() {} diff --git a/korn/mbox_proto.cpp b/korn/mbox_proto.cpp index eb53449d..e466c926 100644 --- a/korn/mbox_proto.cpp +++ b/korn/mbox_proto.cpp @@ -43,5 +43,5 @@ void MBox_Protocol::readEntries( TQMap< TQString, TQString >*, TQMap< TQString, void MBox_Protocol::writeEntries( TQMap< TQString, TQString >* map ) const { - clearFields( map, (KIO_Protocol::Fields)( server | port | username | password | save_password | metadata ) ); + clearFields( map, (TDEIO_Protocol::Fields)( server | port | username | password | save_password | metadata ) ); } diff --git a/korn/mbox_proto.h b/korn/mbox_proto.h index 5375413c..afeac818 100644 --- a/korn/mbox_proto.h +++ b/korn/mbox_proto.h @@ -24,7 +24,7 @@ /* * Protocol for mbox */ -class MBox_Protocol : public KIO_Protocol +class MBox_Protocol : public TDEIO_Protocol { public: MBox_Protocol() {} diff --git a/korn/nntp_proto.cpp b/korn/nntp_proto.cpp index bc2f8525..f5c59a77 100644 --- a/korn/nntp_proto.cpp +++ b/korn/nntp_proto.cpp @@ -52,6 +52,6 @@ void Nntp_Protocol::readEntries( TQMap< TQString, TQString >*, TQMap< TQString, void Nntp_Protocol::writeEntries( TQMap< TQString, TQString >* map ) const { - clearFields( map, (KIO_Protocol::Fields)( KIO_Protocol::mailbox | KIO_Protocol::metadata ) ); + clearFields( map, (TDEIO_Protocol::Fields)( TDEIO_Protocol::mailbox | TDEIO_Protocol::metadata ) ); } diff --git a/korn/nntp_proto.h b/korn/nntp_proto.h index d42e2609..91b3b69d 100644 --- a/korn/nntp_proto.h +++ b/korn/nntp_proto.h @@ -21,13 +21,13 @@ #include "tdeio_proto.h" -class Nntp_Protocol : public KIO_Protocol +class Nntp_Protocol : public TDEIO_Protocol { public: Nntp_Protocol() { } virtual ~Nntp_Protocol() { } - virtual KIO_Protocol * clone() const { return new Nntp_Protocol; } + virtual TDEIO_Protocol * clone() const { return new Nntp_Protocol; } virtual bool connectionBased() const { return true; } diff --git a/korn/polldrop.h b/korn/polldrop.h index b45cdb4d..a1a3bc89 100644 --- a/korn/polldrop.h +++ b/korn/polldrop.h @@ -39,7 +39,7 @@ public: virtual bool startMonitor(); virtual bool stopMonitor(); - virtual bool startProcess() { return true; } //Start en stop-functions for progress; it is not pollable, but a member of kio + virtual bool startProcess() { return true; } //Start en stop-functions for progress; it is not pollable, but a member of tdeio virtual bool stopProcess() { return true; } virtual bool running() { return _timerRunning; }; diff --git a/korn/pop3_proto.cpp b/korn/pop3_proto.cpp index b42a63ec..732f85cf 100644 --- a/korn/pop3_proto.cpp +++ b/korn/pop3_proto.cpp @@ -97,6 +97,6 @@ void Pop3_Protocol::writeEntries( TQMap< TQString, TQString >* map ) const map->insert( "metadata", metadata ); - clearFields( map, KIO_Protocol::mailbox ); + clearFields( map, TDEIO_Protocol::mailbox ); } diff --git a/korn/pop3_proto.h b/korn/pop3_proto.h index 8fd0f001..f3a00889 100644 --- a/korn/pop3_proto.h +++ b/korn/pop3_proto.h @@ -22,13 +22,13 @@ #include "tdeio_proto.h" #include -class Pop3_Protocol : public KIO_Protocol +class Pop3_Protocol : public TDEIO_Protocol { public: Pop3_Protocol() {} virtual ~Pop3_Protocol() {} - virtual KIO_Protocol * clone() const { return new Pop3_Protocol; } + virtual TDEIO_Protocol * clone() const { return new Pop3_Protocol; } virtual bool connectionBased() const { return true; } diff --git a/korn/pop3s_proto.h b/korn/pop3s_proto.h index 4e10dca1..2fc1afa1 100644 --- a/korn/pop3s_proto.h +++ b/korn/pop3s_proto.h @@ -29,7 +29,7 @@ public: Pop3s_Protocol() {} virtual ~Pop3s_Protocol() {} - virtual KIO_Protocol * clone() const { return new Pop3s_Protocol; } + virtual TDEIO_Protocol * clone() const { return new Pop3s_Protocol; } virtual TQString protocol() const { return "pop3s"; } virtual TQString configName() const { return "pop3s"; } diff --git a/korn/process_proto.cpp b/korn/process_proto.cpp index 2d4885fd..bb016a86 100644 --- a/korn/process_proto.cpp +++ b/korn/process_proto.cpp @@ -43,5 +43,5 @@ void Process_Protocol::readEntries( TQMap< TQString, TQString >*, TQMap< TQStrin void Process_Protocol::writeEntries( TQMap< TQString, TQString >* map ) const { - clearFields( map, (KIO_Protocol::Fields)( server | port | username | password | save_password | metadata ) ); + clearFields( map, (TDEIO_Protocol::Fields)( server | port | username | password | save_password | metadata ) ); } diff --git a/korn/process_proto.h b/korn/process_proto.h index ddea2a0b..f446149c 100644 --- a/korn/process_proto.h +++ b/korn/process_proto.h @@ -21,13 +21,13 @@ #include "tdeio_proto.h" -class Process_Protocol : public KIO_Protocol +class Process_Protocol : public TDEIO_Protocol { public: Process_Protocol() { } virtual ~Process_Protocol() { } - virtual KIO_Protocol * clone() const { return new Process_Protocol; } + virtual TDEIO_Protocol * clone() const { return new Process_Protocol; } virtual TQString protocol() const { return "process"; } virtual TQString configName() const { return "process"; } diff --git a/korn/protocol.h b/korn/protocol.h index 700cd597..423d1ba0 100644 --- a/korn/protocol.h +++ b/korn/protocol.h @@ -22,7 +22,7 @@ class AccountInput; class TDEConfigGroup; -class KIO_Protocol; +class TDEIO_Protocol; class KMailDrop; class TQGroupBox; @@ -56,7 +56,7 @@ public: //Functions that return a derived class. //This way, no explicit cast is needed - virtual const KIO_Protocol* getKIOProtocol() const { return 0; } + virtual const TDEIO_Protocol* getKIOProtocol() const { return 0; } }; #endif //PROTOCOL_H diff --git a/korn/qmail_proto.cpp b/korn/qmail_proto.cpp index c902ad49..96452d44 100644 --- a/korn/qmail_proto.cpp +++ b/korn/qmail_proto.cpp @@ -45,5 +45,5 @@ void TQMail_Protocol::readEntries( TQMap< TQString, TQString >*, TQMap< TQString void TQMail_Protocol::writeEntries( TQMap< TQString, TQString >* map ) const { - clearFields( map, (KIO_Protocol::Fields)( server | port | username | password | save_password | metadata ) ); + clearFields( map, (TDEIO_Protocol::Fields)( server | port | username | password | save_password | metadata ) ); } diff --git a/korn/qmail_proto.h b/korn/qmail_proto.h index 60483b7e..090ff09b 100644 --- a/korn/qmail_proto.h +++ b/korn/qmail_proto.h @@ -21,13 +21,13 @@ #include "tdeio_proto.h" -class TQMail_Protocol : public KIO_Protocol +class TQMail_Protocol : public TDEIO_Protocol { public: TQMail_Protocol() {} virtual ~TQMail_Protocol() {} - virtual KIO_Protocol * clone() const { return new TQMail_Protocol; } + virtual TDEIO_Protocol * clone() const { return new TQMail_Protocol; } virtual bool connectionBased() const { return false; } diff --git a/korn/stringid.h b/korn/stringid.h index f60b21d2..1c637690 100644 --- a/korn/stringid.h +++ b/korn/stringid.h @@ -21,7 +21,7 @@ /* * This class provides a identification with string, - * because in KIO, I don't know if emails return in the same order. + * because in TDEIO, I don't know if emails return in the same order. * Author Mart Kelder */ diff --git a/korn/tdeconf_update/Makefile.am b/korn/tdeconf_update/Makefile.am index 214f0c81..a30fb244 100644 --- a/korn/tdeconf_update/Makefile.am +++ b/korn/tdeconf_update/Makefile.am @@ -8,5 +8,5 @@ tdeconf_PROGRAMS = korn-3-4-config_change tdeconfdir = $(libdir)/tdeconf_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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +korn_3_4_config_change_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor korn_3_4_config_change_LDADD = $(LIB_QT) diff --git a/korn/tdeconf_update/korn-3-4-config_change.cpp b/korn/tdeconf_update/korn-3-4-config_change.cpp index 7eff3ad3..67639362 100644 --- a/korn/tdeconf_update/korn-3-4-config_change.cpp +++ b/korn/tdeconf_update/korn-3-4-config_change.cpp @@ -77,7 +77,7 @@ void printToprint( TQTextStream &out, TQMap &to_printed, cons { out << "mailbox=" << to_printed[ "command" ] << endl; } - else if( type == "kio" ) + else if( type == "tdeio" ) { out << "host=" << to_printed[ "host" ] << endl; out << "port=" << to_printed[ "port" ] << endl; @@ -202,7 +202,7 @@ int main( int, char** ) { to_printed.insert( key_value.cap( 1 ), key_value.cap( 2 ) ); } - else if( key_value.cap( 1 ) == "type" && key_value.cap( 2 ) != "kio" ) + else if( key_value.cap( 1 ) == "type" && key_value.cap( 2 ) != "tdeio" ) { out << currentGroup2 << endl; if( key_value.cap( 2 ) == "imap4" ) @@ -212,9 +212,9 @@ int main( int, char** ) type = key_value.cap( 2 ); } - else if( key_value.cap( 1 ) == "type" && key_value.cap( 2 ) == "kio" ) + else if( key_value.cap( 1 ) == "type" && key_value.cap( 2 ) == "tdeio" ) { - type = "kio"; + type = "tdeio"; } else if( key_value.cap( 1 ) == "displaystyle" ) { diff --git a/korn/tdeio.cpp b/korn/tdeio.cpp new file mode 100644 index 00000000..faf05214 --- /dev/null +++ b/korn/tdeio.cpp @@ -0,0 +1,561 @@ +/* + * Copyright (C) Sirtaj Singh Kang + * Copyright (C) Kurt Granroth + * Copyright (C) 2004, Mart Kelder (mart.kde@hccnet.nl) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/* + * tdeio.cpp -- Implementation of class KKIODrop. + * It is copyied from imap.cpp, with was writed by: + * Author: Kurt Granroth + * Version: $Id$ + * Changed by: + * Mart Kelder , 2004 + */ + +#include "tdeio.h" +#include "tdeio_count.h" +#include "tdeio_subjects.h" +#include "tdeio_read.h" +#include "tdeio_delete.h" +#include "protocol.h" +#include "protocols.h" +#include "stringid.h" +#include"utils.h" +//#include"kiocfg.h" +//#include"dropdlg.h" +#include "mailsubject.h" + +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include +#include +#include +#include + +//Headers of protocols +#include"tdeio_proto.h" +//#include"pop3_proto.h" +//#include"pop3s_proto.h" +//#include"imap_proto.h" +//#include"imaps_proto.h" +//#include"nntp_proto.h" +//#include"maildir_proto.h" +//#include"qmail_proto.h" +//#include"process_proto.h" +#include"mbox_proto.h" + +/* + * The 'process' maildrop is a lot different than the other protocols: + * it haven't a tdeioslave and could not result in file list. To prevent + * trowing it away, that functionality is hacked in this file. + */ + +KKioDrop::KKioDrop() + : KPollableDrop(), + _kurl( 0 ), + _metadata( 0 ), + _valid(false), + _protocol( 0 ), + _ssl(false), + _count( 0 ), + _subjects( 0 ), + _read( 0 ), + _readSubjectsTotalSteps( 0 ), + _deleteMailsTotalSteps( 0 ), + _process( 0 ), + _mailurls( 0 ) +{ + _kurl = new KURL; + _metadata = new TDEIO::MetaData; + + //Initialising protocol; if no protocol is set before first use, it will use the first protocol + _protocol = Protocols::firstProtocol()->getKIOProtocol(); //The first protocol is the default + _kurl->setPort( _protocol->defaultPort( _ssl ) ); + + //Creating children and connect them to the outside world; this class passes the messages for them... + //This class handles all the counting. + _count = new TDEIO_Count( this, "tdeio_count" ); + + //This class is responsible for providing the available subjects + _subjects = new TDEIO_Subjects( this, "tdeio_subjects" ); + + //This class is used when a full message has to be read. + _read = new TDEIO_Read( this, "tdeio_read" ); + + //This class can delete mails. + _delete = new TDEIO_Delete( this, "tdeio_delete" ); + + _mailurls = new TQValueList; +} + +KKioDrop::KKioDrop( TDEConfigGroup* ) + : KPollableDrop(), + _kurl( 0 ), + _metadata( 0 ), + _valid(false), + _protocol( 0 ), + _ssl(false), + _count( 0 ), + _subjects( 0 ), + _read( 0 ), + _readSubjectsTotalSteps( 0 ), + _deleteMailsTotalSteps( 0 ), + _process( 0 ), + _mailurls( 0 ) +{ + _kurl = new KURL; + _metadata = new TDEIO::MetaData; + + //Initialising protocol; if no protocol is set before first use, it will use the first protocol + _protocol = Protocols::firstProtocol()->getKIOProtocol(); //The first protocol is the default + _kurl->setPort( _protocol->defaultPort( _ssl ) ); + + //Creating children and connect them to the outside world; this class passes the messages for them... + //This class handles all the counting. + _count = new TDEIO_Count( this, "tdeio_count" ); + + //This class is responsible for providing the available subjects + _subjects = new TDEIO_Subjects( this, "tdeio_subjects" ); + + //This class is used when a full message has to be read. + _read = new TDEIO_Read( this, "tdeio_read" ); + + //This class can delete mails. + _delete = new TDEIO_Delete( this, "tdeio_delete" ); + + _mailurls = new TQValueList; + + //readConfigGroup( *config ); +} + +void KKioDrop::setKioServer( const TQString & proto, const TQString & server, int port ) +{ + //Settings default for last vars; could not inline because TDEIO::MetaData-object is not defined in header. + setKioServer( proto, server, port, TDEIO::MetaData(), false, true ); +} + +void KKioDrop::setKioServer(const TQString & proto, const TQString & server, int port, const TDEIO::MetaData metadata, bool ssl, + bool setProtocol ) +{ + TQString auth; + + if( port == -1 ) + port = _protocol->defaultPort( ssl ); + + if( setProtocol ) //false if _protocol already made + { + _protocol = Protocols::getProto( proto )->getKIOProtocol(); + + if( ! _protocol ) + _protocol = Protocols::firstProtocol()->getKIOProtocol(); + } + + _kurl->setProtocol( _protocol->protocol( ssl ) ); + _kurl->setHost ( server ); + _kurl->setPort ( port ); + _ssl = ssl; + + //Checking for authentication-settings. + //if( _metadata->contains("auth") ) + //{ + // auth = (*_metadata)["auth"]; + // *_metadata = metadata; + // if( ! _metadata->contains("auth") ) + // (*_metadata)["auth"] = auth; + //} else + *_metadata = metadata; + + _count->stopActiveCount(); +} + +void KKioDrop::setUser(const TQString & user, const TQString & password, + const TQString & mailbox, const TQString & auth ) +{ + _kurl->setUser( user ); + _password = password ; + _kurl->setPass( _password ); + _kurl->setPath( mailbox ); + if( ! auth.isEmpty() && auth != "Plain" ) + (*_metadata)["auth"] = auth; + else if( _metadata->contains( "auth" ) ) + _metadata->erase( "auth" ); + + _valid = _kurl->isValid(); + emit validChanged( valid() ); + + if( ! _valid ) + kdWarning() << i18n( "url is not valid" ) << endl; + + _count->stopActiveCount(); +} + +TQString KKioDrop::protocol() const +{ + return _protocol->configName(); +} + +TQString KKioDrop::server() const +{ + return _kurl->host(); +} +int KKioDrop::port() const +{ + return _kurl->port(); +} + +TQString KKioDrop::user() const +{ + return _kurl->user(); +} +TQString KKioDrop::password() const +{ + return _password ; +} +TQString KKioDrop::mailbox() const +{ + return _kurl->path(); +} +TQString KKioDrop::auth() const +{ + return ( _metadata->contains("auth")?(*_metadata)["auth"]:"" ); +} + +void KKioDrop::recheck() +{ + if( _protocol->configName() == "process" ) //Process isn't pollable + { + emit rechecked(); + return; + } + + _count->count( this ); + + return; +} + +void KKioDrop::forceRecheck() +{ + if( _protocol->configName() == "process" ) + return; + + _count->stopActiveCount(); + _count->count( this ); + + return; +} + +bool KKioDrop::valid() +{ + return _valid && _count->valid() && _subjects->valid(); +} + +KKioDrop::~KKioDrop() +{ + delete _count; + delete _subjects; + delete _kurl; + delete _metadata; + delete _mailurls; +} + +bool KKioDrop::canReadSubjects( ) +{ + return (_protocol!=0?_protocol->canReadSubjects():false); +} + +TQValueVector * KKioDrop::doReadSubjects(bool * ) +{ + _subjects->doReadSubjects( this ); + + /* + * A empty TQValueVector is made here. + * After that, the size is expanded to the expected number of subjects. + * This way, reallocation of memmory is minimized, and thus more efficient. + */ + TQValueVector *vector = new TQValueVector( ); + vector->reserve( _mailurls->count() ); + return vector; +} + +bool KKioDrop::canReadMail( ) +{ + return (_protocol!=0?_protocol->canReadMail():false); +} + +bool KKioDrop::deleteMails(TQPtrList * ids, bool * /*stop*/) +{ + _delete->deleteMails( ids, this ); + return _delete->valid(); +} + +bool KKioDrop::canDeleteMails () +{ + return (_protocol!=0?_protocol->canDeleteMail():false); +} + +TQString KKioDrop::readMail(const KornMailId * item, bool * ) +{ + _read->readMail( item, this ); + + return ""; +} + +KMailDrop* KKioDrop::clone() const +{ + KKioDrop *clone = new KKioDrop; + + *clone = *this; + + return clone; +} + +bool KKioDrop::readConfigGroup( const TQMap< TQString, TQString > &map, const Protocol* protocol ) +{ + TQString val, val2; + + if( !map.contains( "server" ) || !map.contains( "port" ) || !map.contains( "ssl" ) || !map.contains( "username" ) || + !map.contains( "mailbox" ) || !map.contains( "password" ) || !map.contains( "metadata" ) || !map.contains( "name" ) ) + { + kdWarning() << "Bug: map niet compleet" << endl; + return false; + } + + this->setName( (*map.find( "name" )).utf8() ); + + _protocol = protocol->getKIOProtocol(); + if( !_protocol ) + _protocol = Protocols::firstProtocol()->getKIOProtocol(); + + val = *map.find( "server" ); + setKioServer( val2, val, (*map.find( "port" )).toInt(), TDEIO::MetaData(), *map.find( "ssl" ) == "true", false ); + + _kurl->setUser( *map.find( "username" ) ); + _kurl->setPath( *map.find( "mailbox" ) ); + + _kurl->setPass( *map.find( "password" ) ); + + TQStringList list = TQStringList::split( ',', *map.find( "metadata" ) ); + TQStringList::Iterator it; + for( it = list.begin(); it != list.end(); ++it ) + { + int split = (*it).find( "=" ); + if( split > 0 ) + _metadata->insert( (*it).left( split ), (*it).right( (*it).length() - split - 1 ) ); + } + + _valid = true; + emitValidChanged(); + + return true; +} + +bool KKioDrop::writeConfigGroup( TDEConfigBase& cfg ) const +{ + KPollableDrop::writeConfigGroup( cfg ); + /*TQString p; + + if( _kurl->hasPass() ) { + p = _kurl->pass(); + //encrypt ( p ); + } + + cfg.writeEntry(fu(ProtoConfigKey), _protocol->configName() ); + if( ( _protocol->fields() | _protocol->urlFields() ) & TDEIO_Protocol::server ) + cfg.writeEntry(fu(HostConfigKey), _kurl->host() ); + if( ( _protocol->fields() | _protocol->urlFields() ) & TDEIO_Protocol::port ) + cfg.writeEntry(fu(PortConfigKey), _kurl->port() ); + if( ( _protocol->fields() | _protocol->urlFields() ) & TDEIO_Protocol::username ) + cfg.writeEntry(fu(UserConfigKey), _kurl->user() ); + if( ( _protocol->fields() | _protocol->urlFields() ) & TDEIO_Protocol::mailbox ) + cfg.writeEntry(fu(MailboxConfigKey), _kurl->path() ); + if( ( _protocol->fields() | _protocol->urlFields() ) & TDEIO_Protocol::password ) + cfg.writeEntry(fu(PassConfigKey), p ); + if( ( _protocol->fields() | _protocol->urlFields() ) & TDEIO_Protocol::auth ) + cfg.writeEntry(fu(AuthConfigKey), auth() ); + */ + return true; +} + +KKioDrop& KKioDrop::operator = ( const KKioDrop& other ) +{ + *_kurl=*other._kurl; + setFreq( other.freq() ); + + if( other._protocol ) + _protocol = other._protocol->getKIOProtocol(); + _ssl = other._ssl; + + return *this; +} + +//Public slots +void KKioDrop::readSubjectsCanceled() +{ + _subjects->cancelled(); +} + +void KKioDrop::readMailCanceled() +{ + _read->canceled( ); +} + +void KKioDrop::deleteMailsCanceled() +{ + _delete->canceled( ); +} + +//Private slots for displaying connection errors +void KKioDrop::slotConnectionError( int number, const TQString& arg ) +{ + kdError() << TDEIO::buildErrorString( number, arg ) << endl; +// if( passivePopup() ) + emitShowPassivePopup( TDEIO::buildErrorString( number, arg ) ); +} + +void KKioDrop::slotConnectionWarning( const TQString& msg ) +{ + kdWarning() << msg << endl; +} + +void KKioDrop::slotConnectionInfoMessage( const TQString& msg ) +{ + kdDebug() << msg << endl; //Display only in debug modes +} + +//Private slots + +//The next functions are needed for process maildrops. +bool KKioDrop::startProcess() +{ //code copyied from edrop.cpp + + if( _protocol->configName() != "process" ) + return true; + + if( _process != 0 ) { + return false; + } + + // debug( "proc start: %s", _command.data() ); + + _process = new TDEProcess; + _process->setUseShell( true ); + + // only reading stdin yet + + connect( _process,TQT_SIGNAL(receivedStdout( TDEProcess *, char *, int)), + this, TQT_SLOT(receivedStdout( TDEProcess *,char *,int)) ); + connect( _process, TQT_SIGNAL(processExited(TDEProcess*)), + this, TQT_SLOT(processExit(TDEProcess*)) ); + *_process << _kurl->path(); + _process->start( TDEProcess::NotifyOnExit, TDEProcess::Stdout ); + + return true; +} + +bool KKioDrop::stopProcess() +{ //code copied from edrop.cpp + if( _protocol->configName() != "process" ) + return true; + + if( _process != 0 ) { + // debug( "proc stop" ); + _process->kill( SIGHUP ); + delete _process; + _process = 0; + } + + return true; +} + +void KKioDrop::receivedStdout( TDEProcess *proc, char * buffer, int /*len*/ ) +{ + assert(static_cast(proc) == static_cast(_process)); + + //Original code + /*char *buf = new char[ len + 1 ]; + memcpy( buf, buffer, len ); + buf[ len ] = '\0'; + + char *ptr = buf, *start = buf; + int num = 0; + + while( *ptr ) { + // find number + while( *ptr && !isdigit( *ptr ) ) { + ptr++; + } + start = ptr; + if( *ptr == 0 ) { + break; + } + + // find end + while( *ptr && isdigit( *ptr ) ) { + ptr++; + } + + // atoi number + char back = *ptr; + *ptr = 0; + num = atoi( start ); + *ptr = back; + } + + emit changed( num ); + delete [] buf;*/ + + //Alternatieve code + TQString buf = buffer; + TQRegExp regexp( "^(.*\\D+|\\D*)(\\d+)\\D*$" ); + + if( regexp.search( buf ) == 0 ) + { //Number found + emit changed( regexp.cap( 2 ).toInt(), this ); + } + + +} + +void KKioDrop::processExit(TDEProcess* proc) +{ + assert(static_cast(proc) == static_cast(_process)); + + _process = 0; + +// debug( "proc exited" ); +} + +const char *KKioDrop::ProtoConfigKey = "protocol"; +const char *KKioDrop::HostConfigKey = "server"; +const char *KKioDrop::PortConfigKey = "port"; +const char *KKioDrop::UserConfigKey = "username"; +const char *KKioDrop::PassConfigKey = "password"; +const char *KKioDrop::MailboxConfigKey = "mailbox"; +const char *KKioDrop::SavePassConfigKey = "savepass"; +const char *KKioDrop::MetadataConfigKey = "metadata"; + +#include "tdeio.moc" diff --git a/korn/tdeio.h b/korn/tdeio.h new file mode 100644 index 00000000..2f8f2d8e --- /dev/null +++ b/korn/tdeio.h @@ -0,0 +1,208 @@ +/* + * Copyright (C) Kurt Granroth + * Copyright (C) 2004, Mart Kelder (mart.kde@hccnet.nl) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/* + * tdeio.h -- Declaration of class KKIODrop. + */ +#ifndef KEG_TDEIODROP_H +#define KEG_TDEIODROP_H + +#include "polldrop.h" + +class TQWidget; +class KDropDialog; +class KornMailSubject; +class TDEProcess; +class TDEIO_Count; +class TDEIO_Protocol; +class TDEIO_Subjects; +class TDEIO_Read; +class TDEIO_Delete; +class TDEConfigGroup; +class KURL; +template class TQPtrList; +template class TQValueList; +namespace TDEIO { class Job; class MetaData; class Slave; class TransferJob; } + +/** + * Polling monitor for IMAP4 maildrops. + * @author Kurt Granroth (granroth@kde.org) + * Changes to poll with TDEIO + * @author Mart Kelder (mart.kde@hccnet.nl) + * $version $Id$ + */ +class KKioDrop : public KPollableDrop +{ + Q_OBJECT + +private: + KURL *_kurl; + TDEIO::MetaData *_metadata; + + TQString _password; + + bool _valid; + + const TDEIO_Protocol * _protocol; + bool _ssl; + + TDEIO_Count *_count; + TDEIO_Subjects *_subjects; + TDEIO_Read *_read; + TDEIO_Delete *_delete; + + int _readSubjectsTotalSteps; + int _deleteMailsTotalSteps; + //For process + TDEProcess *_process; + + //List of mailurls fetched by the last time emails were counted + struct FileInfo { + TQString name; + long size; + }; + TQValueList *_mailurls; + + /* + * The help-classes of this functions are friend functions, because this way, they can + * access the _kurl and _metadata-values without a function; and this way, no signal or + * public functions are neccesairy to emit a signal from KKioDrop. + */ + friend class TDEIO_Count; + friend class TDEIO_Subjects; + friend class TDEIO_Read; + friend class TDEIO_Delete; + friend class TDEIO_Single_Subjects; +public: + static const char *ProtoConfigKey; + static const char *HostConfigKey; + static const char *PortConfigKey; + static const char *UserConfigKey; + static const char *MailboxConfigKey; + static const char *PassConfigKey; + static const char *SavePassConfigKey; + static const char *MetadataConfigKey; + +public: + /** + * KKioDrop Constructor + */ + KKioDrop(); + KKioDrop( TDEConfigGroup* ); + + /** + * Set the server that will be checked for new mail. + */ + void setKioServer( const TQString & proto, const TQString & server, int port = -1 ); + void setKioServer( const TQString & proto, const TQString & server, int port, + const TDEIO::MetaData metadata, bool ssl, bool setProtocol = true ); //Last argument inits _protocol + + /** Set the account information for the PROTO server. */ + void setUser( const TQString & user, const TQString & password, const TQString & mailbox, const TQString & auth ); + + // The next functions return settings + TQString protocol() const; + TQString server() const; + int port() const; + + TQString user() const; + TQString password() const; + TQString mailbox() const; + TQString auth() const; + + virtual void recheck(); + virtual void forceRecheck(); + + virtual bool valid(); + + /** + * KKioDrop Destructor + */ + virtual ~KKioDrop(); + + virtual bool canReadSubjects(void); + virtual TQValueVector * doReadSubjects(bool * stop); + + virtual bool canDeleteMails(); + virtual bool deleteMails(TQPtrList * ids, bool * stop); + + virtual bool canReadMail (); + virtual TQString readMail(const KornMailId * id, bool * stop); + + virtual KMailDrop* clone () const ; + virtual bool readConfigGroup ( const TQMap< TQString, TQString >& map, const Protocol * protocol ); + virtual bool writeConfigGroup ( TDEConfigBase& cfg ) const; + virtual TQString type() const { return TQString::fromUtf8("tdeio"); } + + virtual bool synchrone() const { return false; } //class is not synchrone + + //virtual void addConfigPage( KDropCfgDialog * ); + + virtual bool asynchrone() const { return true; } + +private: + KKioDrop& operator = ( const KKioDrop& ); + //static void encrypt( TQString& str ); + //static void decrypt( TQString& str ); + + /* + * The next functions are called from the help-classes (which are friend of the class). + * The only thing this functions do is emitting signals. + */ + void emitRechecked() { emit rechecked(); } + void emitChanged( int value ) { emit changed( value, this ); } + + void emitReadSubjectsReady( bool success ) { emit readSubjectsReady( success ); } + void emitReadSubjectsRead( KornMailSubject * subject ) { emit readSubject( subject ); } + void emitReadSubjectsTotalSteps( int value ) { _readSubjectsTotalSteps = value; emit readSubjectsTotalSteps( value ); } + void emitReadSubjectsProgress( int value ) { emit readSubjectsProgress( _readSubjectsTotalSteps - value ); } + + void emitReadMailReady( TQString* msg ) { emit readMailReady( msg ); } + + void emitDeleteMailsReady( bool value ) { emit deleteMailsReady( value ); } + void emitDeleteMailsTotalSteps( int value ) { _deleteMailsTotalSteps = value; emit deleteMailsTotalSteps( value ); } + void emitDeleteMailsProgress( int value ) { emit deleteMailsProgress( _deleteMailsTotalSteps - value ); } + + void emitShowPassivePopup( TQPtrList< KornMailSubject > *subject, int total ) + { emit showPassivePopup( subject, total, passiveDate(), this->realName() ); } + void emitShowPassivePopup( const TQString& error ) + { if( passivePopup() ) { emit showPassivePopup( error, this->realName() ); } } + void emitValidChanged() { emit validChanged( valid() ); } + +private slots: + void slotConnectionError( int, const TQString& ); + void slotConnectionWarning( const TQString& ); + void slotConnectionInfoMessage( const TQString& ); + +protected: + //The next functions are needed for Process; + virtual bool startProcess(); + virtual bool stopProcess(); + +public slots: + virtual void readSubjectsCanceled(); + virtual void readMailCanceled(); + virtual void deleteMailsCanceled(); + +private slots: + //For Process too + void processExit(TDEProcess*); + void receivedStdout( TDEProcess *, char *, int); +}; +#endif // KEG_TDEIODROP_H diff --git a/korn/tdeio_count.cpp b/korn/tdeio_count.cpp index 8ad07dcf..515e322b 100644 --- a/korn/tdeio_count.cpp +++ b/korn/tdeio_count.cpp @@ -18,7 +18,7 @@ #include "tdeio_count.h" -#include "kio.h" +#include "tdeio.h" #include "tdeio_proto.h" #include "tdeio_single_subject.h" #include "mailsubject.h" @@ -34,7 +34,7 @@ #include -KIO_Count::KIO_Count( TQObject * parent, const char * name ) +TDEIO_Count::TDEIO_Count( TQObject * parent, const char * name ) : TQObject ( parent, name ), _kurl( 0 ), _metadata( 0 ), @@ -47,21 +47,21 @@ KIO_Count::KIO_Count( TQObject * parent, const char * name ) { } -KIO_Count::~KIO_Count() +TDEIO_Count::~TDEIO_Count() { // Delete copies of urls. delete _kurl; delete _metadata; } -void KIO_Count::count( KKioDrop *drop ) +void TDEIO_Count::count( KKioDrop *drop ) { if( _new_mailurls ) return; //A counting is pending, so no new one is started. delete _kurl; delete _metadata; - _kio = drop; + _tdeio = drop; /* * Saving current settings: all actions are asynchroon, so if someone @@ -69,9 +69,9 @@ void KIO_Count::count( KKioDrop *drop ) * finished with counten. To be able to track back te staring values; * these are saved in the class. */ - _kurl = new KURL( *_kio->_kurl ); - _metadata = new TDEIO::MetaData( *_kio->_metadata ); - _protocol = _kio->_protocol; + _kurl = new KURL( *_tdeio->_kurl ); + _metadata = new TDEIO::MetaData( *_tdeio->_metadata ); + _protocol = _tdeio->_protocol; KURL kurl = *_kurl; TDEIO::MetaData metadata = *_metadata; @@ -82,22 +82,22 @@ void KIO_Count::count( KKioDrop *drop ) _protocol->recheckConnectKURL( kurl, metadata ); if( kurl.port() == 0 ) - kurl.setPort( _protocol->defaultPort( _kio->_ssl ) ); + kurl.setPort( _protocol->defaultPort( _tdeio->_ssl ) ); if( ! ( _slave = TDEIO::Scheduler::getConnectedSlave( kurl, metadata ) ) ) //Forcing reload { - kdWarning() << i18n( "Not able to open a kio slave for %1." ).arg( _protocol->configName() ) << endl; - _kio->emitShowPassivePopup( i18n( "Not able to open a kio slave for %1." ).arg( _protocol->configName() ) ); + kdWarning() << i18n( "Not able to open a tdeio slave for %1." ).arg( _protocol->configName() ) << endl; + _tdeio->emitShowPassivePopup( i18n( "Not able to open a tdeio slave for %1." ).arg( _protocol->configName() ) ); _valid = false; - _kio->emitValidChanged(); + _tdeio->emitValidChanged(); _slave = 0; //delete _new_mailurls; _new_mailurls = 0; //No connection pending return; } - connect( _slave, TQT_SIGNAL( error( int, const TQString& ) ), _kio, TQT_SLOT( slotConnectionError( int, const TQString& ) ) ); - connect( _slave, TQT_SIGNAL( warning( const TQString& ) ), _kio, TQT_SLOT( slotConnectionWarning( const TQString& ) ) ); - connect( _slave, TQT_SIGNAL( infoMessage( const TQString& ) ), _kio, TQT_SLOT( slotConnectionInfoMessage( const TQString& ) ) ); + connect( _slave, TQT_SIGNAL( error( int, const TQString& ) ), _tdeio, TQT_SLOT( slotConnectionError( int, const TQString& ) ) ); + connect( _slave, TQT_SIGNAL( warning( const TQString& ) ), _tdeio, TQT_SLOT( slotConnectionWarning( const TQString& ) ) ); + connect( _slave, TQT_SIGNAL( infoMessage( const TQString& ) ), _tdeio, TQT_SLOT( slotConnectionInfoMessage( const TQString& ) ) ); /* * _protocol->recheckConnectKURL could have change kurl and metadata in order to have the right @@ -118,7 +118,7 @@ void KIO_Count::count( KKioDrop *drop ) _protocol->recheckKURL( kurl, metadata ); if( kurl.port() == 0 ) - kurl.setPort( _protocol->defaultPort( _kio->_ssl ) ); + kurl.setPort( _protocol->defaultPort( _tdeio->_ssl ) ); //Making job to fetch file-list @@ -135,7 +135,7 @@ void KIO_Count::count( KKioDrop *drop ) TDEIO::Scheduler::scheduleJob( _job ); } -void KIO_Count::stopActiveCount() +void TDEIO_Count::stopActiveCount() { if( !_new_mailurls ) return; @@ -160,26 +160,26 @@ void KIO_Count::stopActiveCount() delete _new_mailurls; _new_mailurls = 0; } -void KIO_Count::showPassive( const TQString& id ) +void TDEIO_Count::showPassive( const TQString& id ) { - KURL kurl = *_kio->_kurl; - TDEIO::MetaData metadata = *_kio->_metadata; + KURL kurl = *_tdeio->_kurl; + TDEIO::MetaData metadata = *_tdeio->_metadata; kurl = id; //TDEIO::Slave *slave = 0; - _kio->_protocol->readSubjectKURL( kurl, metadata ); + _tdeio->_protocol->readSubjectKURL( kurl, metadata ); if( kurl.port() == 0 ) - kurl.setPort( _kio->_protocol->defaultPort( _kio->_ssl ) ); + kurl.setPort( _tdeio->_protocol->defaultPort( _tdeio->_ssl ) ); - KIO_Single_Subject *subject = new KIO_Single_Subject( this, id.latin1(), kurl, metadata, _kio->_protocol, _slave, id, 0 ); + TDEIO_Single_Subject *subject = new TDEIO_Single_Subject( this, id.latin1(), kurl, metadata, _tdeio->_protocol, _slave, id, 0 ); _subjects_pending++; connect( subject, TQT_SIGNAL( readSubject( KornMailSubject* ) ), this, TQT_SLOT( addtoPassivePopup( KornMailSubject* ) ) ); - connect( subject, TQT_SIGNAL( finished( KIO_Single_Subject* ) ), this, TQT_SLOT( deleteSingleSubject( KIO_Single_Subject* ) ) ); + connect( subject, TQT_SIGNAL( finished( TDEIO_Single_Subject* ) ), this, TQT_SLOT( deleteSingleSubject( TDEIO_Single_Subject* ) ) ); } -void KIO_Count::disconnectSlave() +void TDEIO_Count::disconnectSlave() { if( _subjects_pending > 0 ) return; //Still getting data @@ -197,7 +197,7 @@ void KIO_Count::disconnectSlave() } //This function is called when fetching is over -void KIO_Count::result( TDEIO::Job* job ) +void TDEIO_Count::result( TDEIO::Job* job ) { //job should be the latest job; elsewise: print an error. if( job != _job ) @@ -207,10 +207,10 @@ void KIO_Count::result( TDEIO::Job* job ) //This could be very useful by resolving bugs. if( job->error() ) { - kdError() << i18n( "The next KIO-error occurred by counting: %1" ).arg( job->errorString() ) << endl; - _kio->emitShowPassivePopup( i18n( "The next KIO-error occurred by counting: %1" ).arg( job->errorString() ) ); + kdError() << i18n( "The next TDEIO-error occurred by counting: %1" ).arg( job->errorString() ) << endl; + _tdeio->emitShowPassivePopup( i18n( "The next TDEIO-error occurred by counting: %1" ).arg( job->errorString() ) ); _valid = false; - _kio->emitValidChanged(); + _tdeio->emitValidChanged(); } disconnect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( result( TDEIO::Job* ) ) ); @@ -223,24 +223,24 @@ void KIO_Count::result( TDEIO::Job* job ) delete _kurl; _kurl = 0; delete _metadata; _metadata = 0; - if( _kio->_mailurls->count() != _new_mailurls->count() ) + if( _tdeio->_mailurls->count() != _new_mailurls->count() ) { - *_kio->_mailurls = *_new_mailurls; - _kio->emitChanged(_kio->_mailurls->count()); + *_tdeio->_mailurls = *_new_mailurls; + _tdeio->emitChanged(_tdeio->_mailurls->count()); } else { - *_kio->_mailurls = *_new_mailurls; + *_tdeio->_mailurls = *_new_mailurls; } delete _new_mailurls; _new_mailurls = 0; _valid = true; - _kio->emitValidChanged(); - _kio->emitRechecked(); + _tdeio->emitValidChanged(); + _tdeio->emitRechecked(); } -//An file list is ready; now save it in _kio->_mailurls. -void KIO_Count::entries( TDEIO::Job* job, const TDEIO::UDSEntryList &list ) +//An file list is ready; now save it in _tdeio->_mailurls. +void TDEIO_Count::entries( TDEIO::Job* job, const TDEIO::UDSEntryList &list ) { TQStringList old_list; TDEIO::UDSEntryListConstIterator it1 ; @@ -253,7 +253,7 @@ void KIO_Count::entries( TDEIO::Job* job, const TDEIO::UDSEntryList &list ) if( job != _job ) kdError() << i18n( "Got unknown job; something must be wrong..." ) << endl; - for( TQValueListConstIterator it = _kio->_mailurls->begin(); it != _kio->_mailurls->end(); ++it ) + for( TQValueListConstIterator it = _tdeio->_mailurls->begin(); it != _tdeio->_mailurls->end(); ++it ) old_list.append( (*it).name ); for ( it1 = list.begin() ; it1 != list.end() ; it1++ ) @@ -292,13 +292,13 @@ void KIO_Count::entries( TDEIO::Job* job, const TDEIO::UDSEntryList &list ) if( ! fileinfo.name.isNull() && isFile ) { _new_mailurls->append( fileinfo ); - if( ! old_list.contains( fileinfo.name ) && _kio->passivePopup() ) + if( ! old_list.contains( fileinfo.name ) && _tdeio->passivePopup() ) showPassive( fileinfo.name ); } } } -void KIO_Count::addtoPassivePopup( KornMailSubject* subject ) +void TDEIO_Count::addtoPassivePopup( KornMailSubject* subject ) { if( ! _popup_subjects ) { @@ -314,7 +314,7 @@ void KIO_Count::addtoPassivePopup( KornMailSubject* subject ) _total_new_messages++; if( _subjects_pending == 0 ) { - _kio->emitShowPassivePopup( dynamic_cast< TQPtrList* >( _popup_subjects ), _total_new_messages ); + _tdeio->emitShowPassivePopup( dynamic_cast< TQPtrList* >( _popup_subjects ), _total_new_messages ); delete _popup_subjects; _popup_subjects = 0; _total_new_messages = 0; @@ -322,7 +322,7 @@ void KIO_Count::addtoPassivePopup( KornMailSubject* subject ) } } -void KIO_Count::deleteSingleSubject( KIO_Single_Subject* single_subject ) +void TDEIO_Count::deleteSingleSubject( TDEIO_Single_Subject* single_subject ) { delete single_subject; } diff --git a/korn/tdeio_count.h b/korn/tdeio_count.h index e575864e..51258694 100644 --- a/korn/tdeio_count.h +++ b/korn/tdeio_count.h @@ -23,12 +23,12 @@ #include -#include "kio.h" //Alsewise, no access to KKioDrop::FileInfo (needed in template) +#include "tdeio.h" //Alsewise, no access to KKioDrop::FileInfo (needed in template) #include //FIXME: without this, moc-compiler fails. -class KIO_Protocol; -class KIO_Single_Subject; +class TDEIO_Protocol; +class TDEIO_Single_Subject; class KKioDrop; class KornMailSubject; @@ -41,12 +41,12 @@ class KURL; class TQString; -class KIO_Count : public TQObject +class TDEIO_Count : public TQObject { Q_OBJECT public: - KIO_Count( TQObject * parent = 0, const char * name = 0 ); - ~KIO_Count(); + TDEIO_Count( TQObject * parent = 0, const char * name = 0 ); + ~TDEIO_Count(); //This function starts counting void count( KKioDrop* ); @@ -56,12 +56,12 @@ public: void stopActiveCount(); private: - KKioDrop *_kio; + KKioDrop *_tdeio; TDEIO::ListJob *_job; TDEIO::Slave *_slave; KURL *_kurl; TDEIO::MetaData *_metadata; - const KIO_Protocol *_protocol; + const TDEIO_Protocol *_protocol; bool _valid; TQValueList *_new_mailurls; //entries can come with more function calls. int _subjects_pending; @@ -76,7 +76,7 @@ private slots: void entries( TDEIO::Job*, const TDEIO::UDSEntryList &list ); void addtoPassivePopup( KornMailSubject* ); - void deleteSingleSubject( KIO_Single_Subject* ); + void deleteSingleSubject( TDEIO_Single_Subject* ); }; #endif diff --git a/korn/tdeio_delete.cpp b/korn/tdeio_delete.cpp index 1bb87d25..f26b5fe3 100644 --- a/korn/tdeio_delete.cpp +++ b/korn/tdeio_delete.cpp @@ -20,7 +20,7 @@ #include "mailid.h" #include "stringid.h" -#include "kio.h" +#include "tdeio.h" #include "tdeio_proto.h" #include @@ -32,8 +32,8 @@ #include -KIO_Delete::KIO_Delete( TQObject * parent, const char * name ) : TQObject( parent, name ), - _kio( 0 ), +TDEIO_Delete::TDEIO_Delete( TQObject * parent, const char * name ) : TQObject( parent, name ), + _tdeio( 0 ), _total( 0 ), _jobs( 0 ), _slave( 0 ), @@ -42,25 +42,25 @@ KIO_Delete::KIO_Delete( TQObject * parent, const char * name ) : TQObject( paren _jobs = new TQPtrList< TDEIO::Job >; } -KIO_Delete::~KIO_Delete( ) +TDEIO_Delete::~TDEIO_Delete( ) { disConnect( ); delete _jobs; } -bool KIO_Delete::deleteMails( TQPtrList< const KornMailId > * ids, KKioDrop *drop ) +bool TDEIO_Delete::deleteMails( TQPtrList< const KornMailId > * ids, KKioDrop *drop ) { KURL kurl = *drop->_kurl; TDEIO::MetaData metadata = *drop->_metadata; - _kio = drop; + _tdeio = drop; _valid = true; //disConnect earlier operations disConnect( ); - if( _kio->_protocol->connectionBased( ) ) + if( _tdeio->_protocol->connectionBased( ) ) { - if( ! setupSlave( kurl, metadata, _kio->_protocol ) ) + if( ! setupSlave( kurl, metadata, _tdeio->_protocol ) ) { _valid = false; return false; @@ -70,24 +70,24 @@ bool KIO_Delete::deleteMails( TQPtrList< const KornMailId > * ids, KKioDrop *dro _total = ids->count( ); for( const KornMailId * item = ids->first(); item; item = ids->next() ) - deleteItem( item, kurl, metadata, _kio->_protocol ); + deleteItem( item, kurl, metadata, _tdeio->_protocol ); if( _jobs->count() == 0 ) { - _kio->emitDeleteMailsReady( true ); + _tdeio->emitDeleteMailsReady( true ); disConnect( ); return true; } - if( _kio->_protocol->commitDelete() ) - commitDelete( kurl, metadata, _kio->_protocol ); + if( _tdeio->_protocol->commitDelete() ) + commitDelete( kurl, metadata, _tdeio->_protocol ); - _kio->emitDeleteMailsTotalSteps( _total ); + _tdeio->emitDeleteMailsTotalSteps( _total ); return true; } -void KIO_Delete::disConnect( ) +void TDEIO_Delete::disConnect( ) { _jobs->clear( ); @@ -98,12 +98,12 @@ void KIO_Delete::disConnect( ) } } -bool KIO_Delete::setupSlave( KURL kurl, TDEIO::MetaData metadata, const KIO_Protocol *& protocol ) +bool TDEIO_Delete::setupSlave( KURL kurl, TDEIO::MetaData metadata, const TDEIO_Protocol *& protocol ) { protocol->deleteMailConnectKURL( kurl, metadata ); if( kurl.port() == 0 ) - kurl.setPort( protocol->defaultPort( _kio->_ssl ) ); + kurl.setPort( protocol->defaultPort( _tdeio->_ssl ) ); if( ! ( _slave = TDEIO::Scheduler::getConnectedSlave( kurl, metadata ) ) ) { @@ -115,7 +115,7 @@ bool KIO_Delete::setupSlave( KURL kurl, TDEIO::MetaData metadata, const KIO_Prot return true; } -void KIO_Delete::deleteItem( const KornMailId *item, KURL kurl, TDEIO::MetaData metadata, const KIO_Protocol *& protocol ) +void TDEIO_Delete::deleteItem( const KornMailId *item, KURL kurl, TDEIO::MetaData metadata, const TDEIO_Protocol *& protocol ) { TDEIO::Job* job = 0; @@ -124,9 +124,9 @@ void KIO_Delete::deleteItem( const KornMailId *item, KURL kurl, TDEIO::MetaData protocol->deleteMailKURL( kurl, metadata ); if( kurl.port() == 0 ) - kurl.setPort( protocol->defaultPort( _kio->_ssl ) ); + kurl.setPort( protocol->defaultPort( _tdeio->_ssl ) ); - if( protocol->deleteFunction() == KIO_Protocol::get ) + if( protocol->deleteFunction() == TDEIO_Protocol::get ) { job = TDEIO::get( kurl, true, false ); @@ -135,7 +135,7 @@ void KIO_Delete::deleteItem( const KornMailId *item, KURL kurl, TDEIO::MetaData else TDEIO::Scheduler::scheduleJob( dynamic_cast< TDEIO::SimpleJob* >( job ) ); } - else if( protocol->deleteFunction() == KIO_Protocol::del ) + else if( protocol->deleteFunction() == TDEIO_Protocol::del ) { job = TDEIO::del( kurl, false, false ); } @@ -152,12 +152,12 @@ void KIO_Delete::deleteItem( const KornMailId *item, KURL kurl, TDEIO::MetaData /* * Some protocols needs to a command to commit protocols. */ -void KIO_Delete::commitDelete( KURL kurl, TDEIO::MetaData metadata, const KIO_Protocol *& protocol ) +void TDEIO_Delete::commitDelete( KURL kurl, TDEIO::MetaData metadata, const TDEIO_Protocol *& protocol ) { protocol->deleteCommitKURL( kurl, metadata ); if( kurl.port() == 0 ) - kurl.setPort( protocol->defaultPort( _kio->_ssl ) ); + kurl.setPort( protocol->defaultPort( _tdeio->_ssl ) ); TDEIO::TransferJob *job = TDEIO::get( kurl, true, false ); job->addMetaData( metadata ); @@ -173,12 +173,12 @@ void KIO_Delete::commitDelete( KURL kurl, TDEIO::MetaData metadata, const KIO_Pr _total++; } -void KIO_Delete::canceled( ) +void TDEIO_Delete::canceled( ) { disConnect( ); } -void KIO_Delete::slotResult( TDEIO::Job* job ) +void TDEIO_Delete::slotResult( TDEIO::Job* job ) { if( job->error() ) { @@ -188,11 +188,11 @@ void KIO_Delete::slotResult( TDEIO::Job* job ) _jobs->remove( job ); - _kio->emitDeleteMailsProgress( _total - _jobs->count() ); + _tdeio->emitDeleteMailsProgress( _total - _jobs->count() ); if( _jobs->isEmpty() ) { - _kio->emitDeleteMailsReady( _valid ); + _tdeio->emitDeleteMailsReady( _valid ); disConnect(); } } diff --git a/korn/tdeio_delete.h b/korn/tdeio_delete.h index c084a58d..3a23f447 100644 --- a/korn/tdeio_delete.h +++ b/korn/tdeio_delete.h @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef MK_KIO_DELETE_H -#define MK_KIO_DELETE_H +#ifndef MK_TDEIO_DELETE_H +#define MK_TDEIO_DELETE_H /* * This class handles removing of selected messages. @@ -26,7 +26,7 @@ #include class KKioDrop; -class KIO_Protocol; +class TDEIO_Protocol; class KornMailId; class KURL; @@ -34,13 +34,13 @@ namespace TDEIO { class MetaData; class Job; class Slave; } template class TQPtrList; -class KIO_Delete : public TQObject +class TDEIO_Delete : public TQObject { Q_OBJECT public: //constructors - KIO_Delete( TQObject * parent = 0, const char * name = 0 ); - ~KIO_Delete( ); + TDEIO_Delete( TQObject * parent = 0, const char * name = 0 ); + ~TDEIO_Delete( ); //This function should be called if there are messages to be deleted. bool deleteMails( TQPtrList< const KornMailId > *, KKioDrop* ); @@ -56,15 +56,15 @@ private slots: private: void disConnect( ); - bool setupSlave( KURL kurl, TDEIO::MetaData metadata, const KIO_Protocol *& protocol ); - void deleteItem( const KornMailId *item, KURL, TDEIO::MetaData, const KIO_Protocol *&); - void commitDelete( KURL, TDEIO::MetaData, const KIO_Protocol *& ); + bool setupSlave( KURL kurl, TDEIO::MetaData metadata, const TDEIO_Protocol *& protocol ); + void deleteItem( const KornMailId *item, KURL, TDEIO::MetaData, const TDEIO_Protocol *&); + void commitDelete( KURL, TDEIO::MetaData, const TDEIO_Protocol *& ); - KKioDrop *_kio; + KKioDrop *_tdeio; unsigned int _total; TQPtrList< TDEIO::Job > *_jobs; TDEIO::Slave *_slave; bool _valid; }; -#endif //MK_KIO_DELETE_H +#endif //MK_TDEIO_DELETE_H diff --git a/korn/tdeio_proto.cpp b/korn/tdeio_proto.cpp index c6ebe85c..cbd97bb6 100644 --- a/korn/tdeio_proto.cpp +++ b/korn/tdeio_proto.cpp @@ -24,7 +24,7 @@ #include -TQMap< TQString, TQString >* KIO_Protocol::createConfig( TDEConfigGroup * group, const TQString& password ) const +TQMap< TQString, TQString >* TDEIO_Protocol::createConfig( TDEConfigGroup * group, const TQString& password ) const { TQMap< TQString, TQString > *result = new TQMap< TQString, TQString >; @@ -41,7 +41,7 @@ TQMap< TQString, TQString >* KIO_Protocol::createConfig( TDEConfigGroup * group, return result; } -void KIO_Protocol::clearFields( TQMap *map, const KIO_Protocol::Fields fields ) const +void TDEIO_Protocol::clearFields( TQMap *map, const TDEIO_Protocol::Fields fields ) const { if( fields & server ) map->insert( "server", "" ); @@ -59,7 +59,7 @@ void KIO_Protocol::clearFields( TQMap *map, const KIO_Protoc map->insert( "metadata", "" ); } -void KIO_Protocol::readEntries( TQMap< TQString, TQString >* map ) const +void TDEIO_Protocol::readEntries( TQMap< TQString, TQString >* map ) const { TQMap< TQString, TQString> *metadata = new TQMap< TQString, TQString >; diff --git a/korn/tdeio_proto.h b/korn/tdeio_proto.h index 67e673e7..38409768 100644 --- a/korn/tdeio_proto.h +++ b/korn/tdeio_proto.h @@ -16,11 +16,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef MK_KIO_PROTO_H -#define MK_KIO_PROTO_H +#ifndef MK_TDEIO_PROTO_H +#define MK_TDEIO_PROTO_H /* - * KIO can handle multiple protocols. But some protocols have their own + * TDEIO can handle multiple protocols. But some protocols have their own * manipulations of KURL or MetaData , and some protocols could do more then other * protocols. So, this class is the generic class of a class specified * by a protocol. @@ -32,20 +32,20 @@ class TQString; #include #include "protocol.h" -#include "kio.h" +#include "tdeio.h" -class KIO_Protocol : public Protocol +class TDEIO_Protocol : public Protocol { public: /* * Constuctor; empty */ - KIO_Protocol() {} + TDEIO_Protocol() {} /* * Destructor; empty too */ - virtual ~KIO_Protocol() {} + virtual ~TDEIO_Protocol() {} /* * Public enumeration @@ -139,7 +139,7 @@ public: virtual void readMailKURL ( KURL &, TDEIO::MetaData & ) const { } - virtual const KIO_Protocol* getKIOProtocol() const { return this; } + virtual const TDEIO_Protocol* getKIOProtocol() const { return this; } virtual void readEntries( TQMap< TQString, TQString >* ) const; virtual void readEntries( TQMap< TQString, TQString >*, TQMap< TQString, TQString >* ) const = 0; @@ -154,4 +154,4 @@ protected: void clearFields( TQMap< TQString, TQString > *map, const Fields fields ) const; }; -#endif //MK_KIO_PROTO_H +#endif //MK_TDEIO_PROTO_H diff --git a/korn/tdeio_read.cpp b/korn/tdeio_read.cpp index 4d8cbf6c..c34e7429 100644 --- a/korn/tdeio_read.cpp +++ b/korn/tdeio_read.cpp @@ -18,7 +18,7 @@ #include "tdeio_read.h" -#include "kio.h" +#include "tdeio.h" #include "tdeio_proto.h" #include "mailid.h" #include "stringid.h" @@ -33,7 +33,7 @@ #include #include -KIO_Read::KIO_Read( TQObject * parent, const char * name ) +TDEIO_Read::TDEIO_Read( TQObject * parent, const char * name ) : TQObject( parent, name ), _job( 0 ), _message( 0 ) @@ -41,21 +41,21 @@ KIO_Read::KIO_Read( TQObject * parent, const char * name ) _message = new TQString; } -KIO_Read::~KIO_Read() +TDEIO_Read::~TDEIO_Read() { delete _message; delete _job; } -void KIO_Read::readMail( const KornMailId *& mailid, KKioDrop* drop ) +void TDEIO_Read::readMail( const KornMailId *& mailid, KKioDrop* drop ) { - _kio = drop; - KURL kurl = *_kio->_kurl; - TDEIO::MetaData metadata = *_kio->_metadata; + _tdeio = drop; + KURL kurl = *_tdeio->_kurl; + TDEIO::MetaData metadata = *_tdeio->_metadata; kurl = dynamic_cast(mailid)->getId( ); - _kio->_protocol->readMailKURL( kurl, metadata ); + _tdeio->_protocol->readMailKURL( kurl, metadata ); _job = TDEIO::get( kurl, false, false ); _job->addMetaData( metadata ); @@ -64,14 +64,14 @@ void KIO_Read::readMail( const KornMailId *& mailid, KKioDrop* drop ) connect( _job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray & ) ) ); } -void KIO_Read::canceled( ) +void TDEIO_Read::canceled( ) { if( _job ) delete _job; _job = 0; } -void KIO_Read::slotResult( TDEIO::Job* job ) +void TDEIO_Read::slotResult( TDEIO::Job* job ) { if( job != _job ) kdWarning() << i18n( "Unknown job returned; I will try if this one will do... " ) << endl; @@ -79,13 +79,13 @@ void KIO_Read::slotResult( TDEIO::Job* job ) if( job->error() ) kdWarning() << i18n( "An error occurred when fetching the requested email: %1." ).arg( job->errorString() ) << endl; - _kio->emitReadMailReady( _message ); + _tdeio->emitReadMailReady( _message ); *_message = ""; _job = 0; } -void KIO_Read::slotData( TDEIO::Job* job, const TQByteArray & data ) +void TDEIO_Read::slotData( TDEIO::Job* job, const TQByteArray & data ) { if( job != _job ) kdWarning() << i18n( "Unknown job returned; I will try if this one will do... " ) << endl; diff --git a/korn/tdeio_read.h b/korn/tdeio_read.h index 3b1ddec8..fc5f9e99 100644 --- a/korn/tdeio_read.h +++ b/korn/tdeio_read.h @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef MK_KIO_READ_H -#define MK_KIO_READ_H +#ifndef MK_TDEIO_READ_H +#define MK_TDEIO_READ_H //This class should be used if someone wants to read the Full Message @@ -28,16 +28,16 @@ class KornMailId; class KURL; namespace TDEIO { class MetaData; class Job; } -class KIO_Protocol; +class TDEIO_Protocol; class TQString; -class KIO_Read : public TQObject +class TDEIO_Read : public TQObject { Q_OBJECT public: - KIO_Read( TQObject * parent = 0, const char * name = 0 ); - ~KIO_Read(); + TDEIO_Read( TQObject * parent = 0, const char * name = 0 ); + ~TDEIO_Read(); public slots: //This is the function which makes the nessesairy slaves for reading a message @@ -45,7 +45,7 @@ public slots: //This function should be called if the user presses canceled. void canceled(); private: - KKioDrop *_kio; + KKioDrop *_tdeio; TDEIO::Job *_job; TQString *_message; @@ -58,4 +58,4 @@ private slots: void slotData( TDEIO::Job*, const TQByteArray& ); }; -#endif //MK_KIO_READ_H +#endif //MK_TDEIO_READ_H diff --git a/korn/tdeio_single_subject.cpp b/korn/tdeio_single_subject.cpp index 022dac49..3ac765de 100644 --- a/korn/tdeio_single_subject.cpp +++ b/korn/tdeio_single_subject.cpp @@ -35,8 +35,8 @@ #include #include -KIO_Single_Subject::KIO_Single_Subject( TQObject * parent, const char * name, - KURL &kurl, TDEIO::MetaData &metadata, const KIO_Protocol * protocol, TDEIO::Slave *& slave, +TDEIO_Single_Subject::TDEIO_Single_Subject( TQObject * parent, const char * name, + KURL &kurl, TDEIO::MetaData &metadata, const TDEIO_Protocol * protocol, TDEIO::Slave *& slave, const TQString &url, const long size ) : TQObject( parent, name ) { @@ -50,7 +50,7 @@ KIO_Single_Subject::KIO_Single_Subject( TQObject * parent, const char * name, init( slave ); } -KIO_Single_Subject::~KIO_Single_Subject( ) +TDEIO_Single_Subject::~TDEIO_Single_Subject( ) { if( _job ) TDEIO::Scheduler::cancelJob( _job ); @@ -60,7 +60,7 @@ KIO_Single_Subject::~KIO_Single_Subject( ) delete _message; } -void KIO_Single_Subject::init( TDEIO::Slave *& slave) +void TDEIO_Single_Subject::init( TDEIO::Slave *& slave) { _job = TDEIO::get( *_kurl, false, false ); _job->addMetaData( *_metadata ); @@ -76,7 +76,7 @@ void KIO_Single_Subject::init( TDEIO::Slave *& slave) } -void KIO_Single_Subject::parseMail( TQString * message, KornMailSubject *subject, bool fullMessage ) +void TDEIO_Single_Subject::parseMail( TQString * message, KornMailSubject *subject, bool fullMessage ) { TQTextStream stream( message, IO_ReadOnly ); TQString line; @@ -122,7 +122,7 @@ void KIO_Single_Subject::parseMail( TQString * message, KornMailSubject *subject subject->setHeader( *message, fullMessage ); } -void KIO_Single_Subject::slotData( TDEIO::Job* job, const TQByteArray& data ) +void TDEIO_Single_Subject::slotData( TDEIO::Job* job, const TQByteArray& data ) { if( job != _job ) kdWarning() << i18n( "Got invalid job; something strange happened?" ) << endl; @@ -131,7 +131,7 @@ void KIO_Single_Subject::slotData( TDEIO::Job* job, const TQByteArray& data ) } //TDEIO::Scheduler::disconnectSlave missing if connection stops -void KIO_Single_Subject::slotResult( TDEIO::Job *job ) +void TDEIO_Single_Subject::slotResult( TDEIO::Job *job ) { if( job != _job ) kdWarning() << i18n( "Got invalid job; something strange happened?" ) << endl; diff --git a/korn/tdeio_single_subject.h b/korn/tdeio_single_subject.h index 9aac8baa..61641536 100644 --- a/korn/tdeio_single_subject.h +++ b/korn/tdeio_single_subject.h @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef MK_KIO_SINGEL_SUBJECT_H -#define MK_KIO_SINGEL_SUBJECT_H +#ifndef MK_TDEIO_SINGEL_SUBJECT_H +#define MK_TDEIO_SINGEL_SUBJECT_H //This function reads a single subject @@ -28,17 +28,17 @@ class KornMailSubject; class KURL; namespace TDEIO { class MetaData; class Job; class TransferJob; class Slave; } -class KIO_Protocol; +class TDEIO_Protocol; class TQString; -class KIO_Single_Subject : public TQObject +class TDEIO_Single_Subject : public TQObject { Q_OBJECT public: - KIO_Single_Subject( TQObject * parent, const char * name, KURL &, TDEIO::MetaData &, const KIO_Protocol *, + TDEIO_Single_Subject( TQObject * parent, const char * name, KURL &, TDEIO::MetaData &, const TDEIO_Protocol *, TDEIO::Slave *&, const TQString &, const long ); - ~KIO_Single_Subject( ); + ~TDEIO_Single_Subject( ); //This functions try's te parse EMail; data, sender names and so on... static void parseMail( TQString * message, KornMailSubject *subject, bool ); @@ -47,7 +47,7 @@ private: TQString *_message; TQString *_name; KURL *_kurl; - const KIO_Protocol *_protocol; + const TDEIO_Protocol *_protocol; TDEIO::MetaData *_metadata; TDEIO::TransferJob* _job; long _size; @@ -62,7 +62,7 @@ signals: //This signal is emitted if the headers are read and put into a KornMailSubject* void readSubject( KornMailSubject* ); //This signal is emitted if this class could be destroyed. - void finished( KIO_Single_Subject* ); + void finished( TDEIO_Single_Subject* ); }; #endif diff --git a/korn/tdeio_subjects.cpp b/korn/tdeio_subjects.cpp index f76a1c99..985a89e5 100644 --- a/korn/tdeio_subjects.cpp +++ b/korn/tdeio_subjects.cpp @@ -18,7 +18,7 @@ #include "tdeio_subjects.h" -#include "kio.h" +#include "tdeio.h" #include "tdeio_single_subject.h" #include "tdeio_proto.h" #include "mailsubject.h" @@ -31,20 +31,20 @@ #include #include -KIO_Subjects::KIO_Subjects( TQObject * parent, const char * name ) +TDEIO_Subjects::TDEIO_Subjects( TQObject * parent, const char * name ) : TQObject( parent, name ), _protocol( 0 ), _slave( 0 ), _valid( true ) { - _jobs = new TQPtrList; + _jobs = new TQPtrList; _kurl = new KURL; _metadata = new TDEIO::MetaData; _jobs->setAutoDelete( true ); } -KIO_Subjects::~KIO_Subjects( ) +TDEIO_Subjects::~TDEIO_Subjects( ) { delete _jobs; delete _kurl; @@ -52,15 +52,15 @@ KIO_Subjects::~KIO_Subjects( ) _protocol = 0; } -void KIO_Subjects::doReadSubjects( KKioDrop *drop ) +void TDEIO_Subjects::doReadSubjects( KKioDrop *drop ) { TQValueList::ConstIterator it; TQValueList::ConstIterator end_it = drop->_mailurls->end(); - _kio = drop; - _protocol = _kio->_protocol; - *_kurl = *_kio->_kurl; - *_metadata = *_kio->_metadata; + _tdeio = drop; + _protocol = _tdeio->_protocol; + *_kurl = *_tdeio->_kurl; + *_metadata = *_tdeio->_metadata; if( _jobs->count() > 0 ) kdWarning() << i18n( "Already a slave pending." ) << endl; @@ -71,17 +71,17 @@ void KIO_Subjects::doReadSubjects( KKioDrop *drop ) getConnection( ); //Open jobs for easy item in the list - for( it = _kio->_mailurls->begin(); it != end_it; it++ ) + for( it = _tdeio->_mailurls->begin(); it != end_it; it++ ) startJob( (*it).name, (*it).size ); //close connection for trivial situations (empty list) disConnect( true ); //passing number of subjects for progress bar. - _kio->emitReadSubjectsTotalSteps( _jobs->count() ); + _tdeio->emitReadSubjectsTotalSteps( _jobs->count() ); } -void KIO_Subjects::getConnection( ) +void TDEIO_Subjects::getConnection( ) { KURL kurl = *_kurl; TDEIO::MetaData metadata = *_metadata; @@ -97,43 +97,43 @@ void KIO_Subjects::getConnection( ) _protocol->readSubjectConnectKURL( kurl, metadata ); if( kurl.port() == 0 ) - kurl.setPort( _protocol->defaultPort( _kio->_ssl ) ); + kurl.setPort( _protocol->defaultPort( _tdeio->_ssl ) ); if( ! ( _slave = TDEIO::Scheduler::getConnectedSlave( kurl, metadata ) ) ) { - kdWarning() << i18n( "Not able to open a kio-slave for %1." ).arg( _protocol->configName() ); - _kio->emitShowPassivePopup( i18n( "Not able to open a kio-slave for %1." ).arg( _protocol->configName() ) ); + kdWarning() << i18n( "Not able to open a tdeio-slave for %1." ).arg( _protocol->configName() ); + _tdeio->emitShowPassivePopup( i18n( "Not able to open a tdeio-slave for %1." ).arg( _protocol->configName() ) ); _valid = false; - _kio->emitValidChanged(); + _tdeio->emitValidChanged(); _slave = 0; - _kio->emitReadSubjectsReady( false ); + _tdeio->emitReadSubjectsReady( false ); return; } } } -void KIO_Subjects::startJob( const TQString &name, const long size ) +void TDEIO_Subjects::startJob( const TQString &name, const long size ) { KURL kurl = *_kurl; TDEIO::MetaData metadata = *_metadata; - KIO_Single_Subject *subject; + TDEIO_Single_Subject *subject; kurl = name; _protocol->readSubjectKURL( kurl, metadata ); if( kurl.port() == 0 ) - kurl.setPort( _protocol->defaultPort( _kio->_ssl ) ); + kurl.setPort( _protocol->defaultPort( _tdeio->_ssl ) ); - subject = new KIO_Single_Subject( this, name.latin1(), kurl, metadata, _protocol, _slave, name, size ); + subject = new TDEIO_Single_Subject( this, name.latin1(), kurl, metadata, _protocol, _slave, name, size ); connect( subject, TQT_SIGNAL( readSubject( KornMailSubject* ) ), this, TQT_SLOT( slotReadSubject( KornMailSubject* ) ) ); - connect( subject, TQT_SIGNAL( finished( KIO_Single_Subject* ) ), this, TQT_SLOT( slotFinished( KIO_Single_Subject* ) ) ); + connect( subject, TQT_SIGNAL( finished( TDEIO_Single_Subject* ) ), this, TQT_SLOT( slotFinished( TDEIO_Single_Subject* ) ) ); _jobs->append( subject ); } -void KIO_Subjects::disConnect( bool result ) +void TDEIO_Subjects::disConnect( bool result ) { if( _jobs->isEmpty() ) { @@ -142,33 +142,33 @@ void KIO_Subjects::disConnect( bool result ) TDEIO::Scheduler::disconnectSlave( _slave ); _slave = 0; } - _kio->emitReadSubjectsReady( result ); + _tdeio->emitReadSubjectsReady( result ); } } -void KIO_Subjects::cancelled( ) +void TDEIO_Subjects::cancelled( ) { _jobs->clear(); - //_slave died in cancelJob with is by called from the destructor of KIO_Single_Subject, + //_slave died in cancelJob with is by called from the destructor of TDEIO_Single_Subject, //withs is by called by _jobs->clear because autoRemove equals true. _slave = 0; disConnect( false ); } -void KIO_Subjects::slotReadSubject( KornMailSubject* subject ) +void TDEIO_Subjects::slotReadSubject( KornMailSubject* subject ) { _valid = true; - _kio->emitValidChanged(); - subject->setMailDrop( _kio ); - _kio->emitReadSubjectsRead( subject ); + _tdeio->emitValidChanged(); + subject->setMailDrop( _tdeio ); + _tdeio->emitReadSubjectsRead( subject ); } -void KIO_Subjects::slotFinished( KIO_Single_Subject* item ) +void TDEIO_Subjects::slotFinished( TDEIO_Single_Subject* item ) { //Remove sender.... I didn't know of the computer gonna like me, but it seems he does :) _jobs->remove( item ); - _kio->emitReadSubjectsProgress( _jobs->count( ) ); + _tdeio->emitReadSubjectsProgress( _jobs->count( ) ); disConnect( true ); //Only works when all jobs are finished. } diff --git a/korn/tdeio_subjects.h b/korn/tdeio_subjects.h index 018369de..bb1f50e0 100644 --- a/korn/tdeio_subjects.h +++ b/korn/tdeio_subjects.h @@ -16,15 +16,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef MK_KIO_SUBJECTS_H -#define MK_KIO_SUBJECTS_H +#ifndef MK_TDEIO_SUBJECTS_H +#define MK_TDEIO_SUBJECTS_H //This class calls other class to read all the subjects #include class KKioDrop; -class KIO_Single_Subject; -class KIO_Protocol; +class TDEIO_Single_Subject; +class TDEIO_Protocol; class KornMailSubject; namespace TDEIO { class MetaData; class Slave; } @@ -34,12 +34,12 @@ template class TQPtrList; class TQString; template class TQValueList; -class KIO_Subjects : public TQObject +class TDEIO_Subjects : public TQObject { Q_OBJECT public: - KIO_Subjects( TQObject * parent, const char * name ); - ~KIO_Subjects( ); + TDEIO_Subjects( TQObject * parent, const char * name ); + ~TDEIO_Subjects( ); //This function let it start fetching headers. void doReadSubjects( KKioDrop* ); @@ -48,17 +48,17 @@ public: bool valid( ) { return _valid; } private: - KKioDrop *_kio; + KKioDrop *_tdeio; KURL *_kurl; TDEIO::MetaData *_metadata; - const KIO_Protocol *_protocol; - TQPtrList *_jobs; + const TDEIO_Protocol *_protocol; + TQPtrList *_jobs; TDEIO::Slave *_slave; bool _valid; //Opens a connection. void getConnection( ); - //Start a job; the job itself is executed in KIO_Single_Subject + //Start a job; the job itself is executed in TDEIO_Single_Subject void startJob( const TQString&, const long ); //Disconnect the connection void disConnect( bool ); @@ -69,7 +69,7 @@ public slots: private slots: void slotReadSubject( KornMailSubject* ); - void slotFinished( KIO_Single_Subject* ); + void slotFinished( TDEIO_Single_Subject* ); }; #endif diff --git a/ktnef/gui/Makefile.am b/ktnef/gui/Makefile.am index 774da4d6..ebaa6407 100644 --- a/ktnef/gui/Makefile.am +++ b/ktnef/gui/Makefile.am @@ -4,7 +4,7 @@ SUBDIRS = pics bin_PROGRAMS = ktnef -ktnef_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +ktnef_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor ktnef_LDADD = $(LIB_TDEFILE) $(top_builddir)/ktnef/lib/libktnef.la ktnef_SOURCES = ktnefmain.cpp ktnefview.cpp attachpropertydialogbase.ui \ attachpropertydialog.cpp messagepropertydialog.cpp \ diff --git a/ktnef/lib/Makefile.am b/ktnef/lib/Makefile.am index 374f8533..6d461fe7 100644 --- a/ktnef/lib/Makefile.am +++ b/ktnef/lib/Makefile.am @@ -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_TDECORE) $(LIB_KIO) +libktnef_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEIO) libktnef_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined libktnef_la_METASOURCES = AUTO diff --git a/ktnef/tests/Makefile.am b/ktnef/tests/Makefile.am index 42fbf205..6a6cecbe 100644 --- a/ktnef/tests/Makefile.am +++ b/ktnef/tests/Makefile.am @@ -4,7 +4,7 @@ LDADD = ../lib/libktnef.la $(LIB_TDECORE) check_PROGRAMS = parsertest TESTS = parsertest -parsertest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +parsertest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor parsertest_SOURCES = parsertest.cpp METASOURCES = AUTO diff --git a/libemailfunctions/tests/Makefile.am b/libemailfunctions/tests/Makefile.am index b83f64b1..05d3b820 100644 --- a/libemailfunctions/tests/Makefile.am +++ b/libemailfunctions/tests/Makefile.am @@ -4,10 +4,10 @@ LDADD = ../libemailfunctions.la ../../libkmime/libkmime.la $(LIB_TDECORE) check_PROGRAMS = testidmapper testemail TESTS = testemail -testidmapper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +testidmapper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor testidmapper_SOURCES = testidmapper.cpp -testemail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +testemail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor testemail_SOURCES = testemail.cpp METASOURCES = AUTO diff --git a/libkcal/Makefile.am b/libkcal/Makefile.am index 3840dd75..0dc28201 100644 --- a/libkcal/Makefile.am +++ b/libkcal/Makefile.am @@ -7,7 +7,7 @@ INCLUDES = -I$(srcdir)/versit -I$(top_srcdir)/ \ lib_LTLIBRARIES = libkcal.la libkcal_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 2:0:0 $(LIB_QT) -ltdecore -libkcal_la_LIBADD = versit/libversit.la $(LIB_KIO) \ +libkcal_la_LIBADD = versit/libversit.la $(LIB_TDEIO) \ -lical -licalss \ $(top_builddir)/ktnef/lib/libktnef.la \ ../libkmime/libkmime.la \ diff --git a/libkcal/tests/Makefile.am b/libkcal/tests/Makefile.am index 83a5a8cf..81658ad5 100644 --- a/libkcal/tests/Makefile.am +++ b/libkcal/tests/Makefile.am @@ -25,60 +25,60 @@ check_PROGRAMS = testtostring \ METASOURCES = AUTO testincidence_SOURCES = testincidence.cpp -testincidence_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +testincidence_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor testincidence_LDADD = ../libkcal.la testcalendar_SOURCES = testcalendar.cpp -testcalendar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +testcalendar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor testcalendar_LDADD = ../libkcal.la testtostring_SOURCES = testtostring.cpp -testtostring_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +testtostring_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor testtostring_LDADD = ../libkcal.la fbrecurring_SOURCES = fbrecurring.cpp -fbrecurring_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +fbrecurring_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor fbrecurring_LDADD = ../libkcal.la readandwrite_SOURCES = readandwrite.cpp -readandwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +readandwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor readandwrite_LDADD = ../libkcal.la testresource_SOURCES = testresource.cpp -testresource_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +testresource_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor testresource_LDADD = ../libkcal.la testrecurrence_SOURCES = testrecurrence.cpp -testrecurrence_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +testrecurrence_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor testrecurrence_LDADD = ../libkcal.la testrecurprevious_SOURCES = testrecurprevious.cpp -testrecurprevious_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +testrecurprevious_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor testrecurprevious_LDADD = ../libkcal.la testrecurson_SOURCES = testrecurson.cpp -testrecurson_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +testrecurson_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor testrecurson_LDADD = ../libkcal.la testrecurrencetype_SOURCES = testrecurrencetype.cpp -testrecurrencetype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +testrecurrencetype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor testrecurrencetype_LDADD = ../libkcal.la testvcalexport_SOURCES = testvcalexport.cpp -testvcalexport_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +testvcalexport_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor testvcalexport_LDADD = ../libkcal.la testfields_SOURCES = testfields.cpp -testfields_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +testfields_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +testfb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor testfb_LDADD = ../libkcal.la testcalselectdialog_SOURCES = testcalselectdialog.cpp -testcalselectdialog_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +testcalselectdialog_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor testcalselectdialog_LDADD = ../libkcal.la TESTFILES = test1.ics test2.ics test3.ics test4.ics test5.ics test_Mozilla.ics diff --git a/libkholidays/Makefile.am b/libkholidays/Makefile.am index aeef6fcf..0b2a6a55 100644 --- a/libkholidays/Makefile.am +++ b/libkholidays/Makefile.am @@ -7,7 +7,7 @@ INCLUDES = -I$(top_srcdir) $(all_includes) lib_LTLIBRARIES = libkholidays.la libkholidays_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0:0 -libkholidays_la_LIBADD = $(LIB_KIO) +libkholidays_la_LIBADD = $(LIB_TDEIO) libkholidays_la_SOURCES = kholidays.cpp scanholiday.c parseholiday.h parseholiday.c lunarphase.cpp #the lex/flex and yacc/bison files are in CVS and NOT generated diff --git a/libkholidays/holidays/holiday_it b/libkholidays/holidays/holiday_it index fed9d140..2428122a 100644 --- a/libkholidays/holidays/holiday_it +++ b/libkholidays/holidays/holiday_it @@ -1,7 +1,7 @@ : : Italian holiday file. : by Riccardo Scateni (riccardo@crs4.it) -: Updated and maintained by the Italian l10n team (tde-i18n-it@kde.org) +: Updated and maintained by the Italian l10n team (kde-i18n-it@kde.org) : : "weekend" or "red" indicate a "proper" holiday (i.e. you do not work) : Other colours (black, green, yellow, blue, magenta, cyan, white) diff --git a/libkmime/tests/run_codec_tests b/libkmime/tests/run_codec_tests index 62908eee..ccc27b94 100755 --- a/libkmime/tests/run_codec_tests +++ b/libkmime/tests/run_codec_tests @@ -4,7 +4,7 @@ TEST="./test_kmime_codec" #BUFFER_SIZES="$(seq 7)" #BUFFER_SIZES="$(seq 5) 15 16 17 23 24 25 31 32 33 4096" BUFFER_SIZES="$(seq 17) 23 24 25 31 32 33 4096" -USAGE_PATTERNS="chunkwise kio" +USAGE_PATTERNS="chunkwise tdeio" oldDirName="" encoding="" diff --git a/libkmime/tests/test_kmime_codec.cpp b/libkmime/tests/test_kmime_codec.cpp index eb758ea7..3d32f36b 100644 --- a/libkmime/tests/test_kmime_codec.cpp +++ b/libkmime/tests/test_kmime_codec.cpp @@ -58,7 +58,7 @@ void usage( const char * msg=0 ) { " --with-crlf use CRLF instead of LF in output\n" " --iterations do more than one iteration\n" " default: 1\n" - " --usage-pattern { kio | chunkwise | convenience-qba }\n" + " --usage-pattern { tdeio | chunkwise | convenience-qba }\n" " use a certain usage pattern to be tested\n" " (default: chunkwise)\n" " --without-finish don't call the finish() method\n" @@ -81,7 +81,7 @@ static bool withCRLF = false; static bool withFinish = true; static bool verbose = false; -void encode_decode_kio( bool, const Codec *, const TQByteArray &, TQFile & ); +void encode_decode_tdeio( bool, const Codec *, const TQByteArray &, TQFile & ); void encode_decode_chunkwise( bool, const Codec *, const TQByteArray &, TQFile & ); void encode_decode_convenience_qba( bool, const Codec *, const TQByteArray &, @@ -138,7 +138,7 @@ int main( int argc, char * argv[] ) { verbose = true; break; case 9: // usage-pattern - if ( !tqstricmp( "kio", optarg ) ) + if ( !tqstricmp( "tdeio", optarg ) ) pattern = Kio; else if ( !tqstricmp( "chunkwise", optarg ) ) pattern = ChunkWise; @@ -216,7 +216,7 @@ int main( int argc, char * argv[] ) { encode_decode_chunkwise( encode, codec, infile_buffer, outfile ); break; case Kio: - encode_decode_kio( encode, codec, infile_buffer, outfile ); + encode_decode_tdeio( encode, codec, infile_buffer, outfile ); break; case ConvenienceTQBA: encode_decode_convenience_qba( encode, codec, infile_buffer, outfile ); @@ -277,7 +277,7 @@ void decode_tdeio_internal( Decoder * dec, TQByteArray::ConstIterator & iit, out.truncate( oit - out.begin() ); } -void encode_decode_kio( bool encode, const Codec * codec, +void encode_decode_tdeio( bool encode, const Codec * codec, const TQByteArray & infile_buffer, TQFile & outfile ) { diff --git a/libkpimexchange/Makefile.am b/libkpimexchange/Makefile.am index 01224c05..135f4599 100644 --- a/libkpimexchange/Makefile.am +++ b/libkpimexchange/Makefile.am @@ -11,7 +11,7 @@ lib_LTLIBRARIES = libkpimexchange.la libkpimexchange_la_SOURCES = dummy.cpp libkpimexchange_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0:0 libkpimexchange_la_LIBADD = core/libkpimexchangecore.la \ - $(LIB_KIO) $(top_builddir)/libkcal/libkcal.la + $(LIB_TDEIO) $(top_builddir)/libkcal/libkcal.la dummy.cpp: echo >dummy.cpp diff --git a/libkpimexchange/core/Makefile.am b/libkpimexchange/core/Makefile.am index 2c8b8bff..64766f05 100644 --- a/libkpimexchange/core/Makefile.am +++ b/libkpimexchange/core/Makefile.am @@ -18,7 +18,7 @@ libkpimexchangecore_la_SOURCES = exchangeclient.cpp exchangeaccount.cpp \ utils.cpp exchangeprogress.cpp exchangemonitor.cpp #libkpimexchange_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0:0 -module -#libkpimexchange_la_LIBADD = $(LIB_KIO) $(top_builddir)/libkcal/libkcal.la +#libkpimexchange_la_LIBADD = $(LIB_TDEIO) $(top_builddir)/libkcal/libkcal.la tdepimincludedir = $(includedir)/tdepim tdepiminclude_HEADERS = exchangeclient.h exchangeaccount.h diff --git a/libtdepim/Makefile.am b/libtdepim/Makefile.am index b8657d3f..529a54a1 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 4be538e6..d0a0e34f 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 adb3a730..1af06c84 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 fd8c900b..15cc7490 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 3083cdf4..0afd9a81 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 f0bcd7ce..64815d27 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 7b82ad5b..5bca85cd 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 17561b36..49df950c 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 2befdded..c0122923 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 764ec052..3e9dcd33 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 829fb309..a6174496 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 7ae32dc0..27cb1e0c 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 6bdebcf2..68fc85f4 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 9a6281e2..4207105b 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 b187b6fb..b86108b4 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 043a10cf..5e9897d6 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 92f9565f..32d50e9d 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 7eaaeda9..67b76d9c 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 bd3d5bf5..8ca60702 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 328f068d..0af1a25a 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 diff --git a/tdeabc/CMakeLists.txt b/tdeabc/CMakeLists.txt new file mode 100644 index 00000000..a5954191 --- /dev/null +++ b/tdeabc/CMakeLists.txt @@ -0,0 +1,13 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +add_subdirectory( tdeabc2mutt ) +tde_conditional_add_subdirectory( WITH_NEWDISTRLISTS tdeabcdistlistupdater ) diff --git a/tdeabc/Makefile.am b/tdeabc/Makefile.am new file mode 100644 index 00000000..9d721845 --- /dev/null +++ b/tdeabc/Makefile.am @@ -0,0 +1,5 @@ +if compile_newdistrlists +KABCDISTLISTUPDATER=tdeabcdistlistupdater +endif + +SUBDIRS = tdeabc2mutt $(KABCDISTLISTUPDATER) diff --git a/tdeabc/README b/tdeabc/README new file mode 100644 index 00000000..5fac637a --- /dev/null +++ b/tdeabc/README @@ -0,0 +1 @@ +This directory contains test code for tdeabc. diff --git a/tdeabc/frontend/Makefile.am b/tdeabc/frontend/Makefile.am new file mode 100644 index 00000000..3b97d910 --- /dev/null +++ b/tdeabc/frontend/Makefile.am @@ -0,0 +1,10 @@ +INCLUDES = -I$(includedir)/tdeabc $(all_includes) + +METASOURCES = AUTO + +bin_PROGRAMS = tdeabcfrontend + +tdeabcfrontend_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +tdeabcfrontend_LDADD = -ltdeabc $(LIB_TDECORE) +tdeabcfrontend_SOURCES = main.cpp mainWindow.ui + diff --git a/tdeabc/frontend/main.cpp b/tdeabc/frontend/main.cpp new file mode 100644 index 00000000..0e941e01 --- /dev/null +++ b/tdeabc/frontend/main.cpp @@ -0,0 +1,20 @@ +#include +#include +#include +#include +#include + +#include "mainWindow.h" + +int main( int argc, char ** argv ) +{ + TDEAboutData aboutData("testkabc",I18N_NOOP("TestKabc"),"0.1"); + TDECmdLineArgs::init(argc,argv,&aboutData); + + TDEApplication app; + + MainWindow *w = new MainWindow; + w->show(); + app.connect( &app, TQT_SIGNAL( lastWindowClosed() ), &app, TQT_SLOT( quit() ) ); + return app.exec(); +} diff --git a/tdeabc/frontend/mainWindow.ui b/tdeabc/frontend/mainWindow.ui new file mode 100644 index 00000000..240114a6 --- /dev/null +++ b/tdeabc/frontend/mainWindow.ui @@ -0,0 +1,1409 @@ + +MainWindow + + + MainWindow + + + + 0 + 0 + 570 + 534 + + + + KABC Frontend + + + + unnamed + + + + + Name + + + true + + + true + + + + + UID + + + true + + + true + + + + mAddresseeList + + + + 7 + 7 + 1 + 0 + + + + StyledPanel + + + Sunken + + + AllColumns + + + + + TabWidget2 + + + + 7 + 7 + 2 + 0 + + + + Top + + + Rounded + + + + tab + + + &General + + + + unnamed + + + 11 + + + 6 + + + + mNameEdit + + + + + TextLabel1 + + + Name: + + + + + TextLabel1_2 + + + URL: + + + + + mUrlEdit + + + + + mAdditionalNameEdit + + + + + mSuffixEdit + + + + + mGivenNameEdit + + + + + mPrefixEdit + + + + + mFamilyNameEdit + + + + + mFormattedNameEdit + + + + + mNickNameEdit + + + + + TextLabel7 + + + Nickname: + + + + + TextLabel5 + + + Honorific suffixes: + + + + + TextLabel3_2 + + + Family name: + + + + + TextLabel4 + + + Additional names: + + + + + TextLabel6 + + + Given name: + + + + + TextLabel1_3 + + + Honorific prefixes: + + + + + TextLabel8 + + + Formatted name: + + + + + TextLabel15 + + + Sort string: + + + + + mSortStringEdit + + + + + TextLabel11 + + + Role: + + + + + TextLabel12 + + + Organization: + + + + + TextLabel10 + + + Title: + + + + + mTitleEdit + + + + + mRoleEdit + + + + + mOrganizationEdit + + + + + Spacer1 + + + Vertical + + + Expanding + + + + 20 + 20 + + + + + + + + tab + + + Phone && &Mail + + + + unnamed + + + + GroupBox1 + + + &Phone + + + + unnamed + + + 11 + + + 6 + + + + TextLabel2_3 + + + Id: + + + + + mPhoneIdCombo + + + + + PushButton3 + + + Remove + + + + + PushButton4 + + + New + + + + + mPhoneNumberEdit + + + + + TextLabel1_5 + + + Number: + + + + + ButtonGroup2 + + + Type + + + + unnamed + + + 11 + + + 6 + + + + mPhoneWorkCheck + + + Work + + + + + mPhonePrefCheck + + + Pref + + + + + mPhoneHomeCheck + + + Home + + + + + mPhoneCellCheck + + + Cell + + + + + mPhoneFaxCheck + + + Fax + + + + + mPhoneBbsCheck + + + BBS + + + + + mPhoneCarCheck + + + Car + + + + + mPhoneVideoCheck + + + Video + + + + + mPhoneIsdnCheck + + + ISDN + + + + + mPhoneVoiceCheck + + + Voice + + + + + mPhonePcsCheck + + + PCS + + + + + mPhoneModemCheck + + + Modem + + + + + mPhonePagerCheck + + + Pager + + + + + mPhoneMsgCheck + + + Msg + + + + + + + + + GroupBox2 + + + Ema&il + + + + unnamed + + + 11 + + + 6 + + + + PushButton7 + + + &New + + + + + PushButton5 + + + &Edit + + + + + PushButton6 + + + &Remove + + + + + Spacer2 + + + Vertical + + + Expanding + + + + 20 + 20 + + + + + + + Address + + + true + + + true + + + + mEmailListView + + + AllColumns + + + + + + + + + tab + + + A&ddress + + + + unnamed + + + + TextLabel16 + + + Id: + + + + + TextLabel1_4 + + + Post office box: + + + + + TextLabel2_2 + + + Extended: + + + + + TextLabel3_3 + + + Street: + + + + + TextLabel4_2 + + + Locality: + + + + + mAddressPostOfficeBoxEdit + + + + + mAddressExtendedEdit + + + + + mAddressStreetEdit + + + + + mAddressLocalityEdit + + + + + mAddressRegionEdit + + + + + TextLabel5_2 + + + Region: + + + + + TextLabel7_2 + + + Country: + + + + + TextLabel6_2 + + + Postal code: + + + + + mAddressLabelEdit + + + + + TextLabel13 + + + Label: + + + + + mAddressPostalCodeEdit + + + + + mAddressCountryEdit + + + + + ButtonGroup1 + + + Type + + + + unnamed + + + 11 + + + 6 + + + + mAddressDomCheck + + + Dom + + + + + mAddressIntlCheck + + + Intl + + + + + mAddressParcelCheck + + + Parcel + + + + + mAddressPostalCheck + + + Postal + + + + + mAddressHomeCheck + + + Home + + + + + mAddressPrefCheck + + + Pref + + + + + mAddressWorkCheck + + + Work + + + + + + + PushButton1 + + + &New + + + + + PushButton2 + + + &Remove + + + + + mAddressIdCombo + + + + + + + tab + + + &Special + + + + unnamed + + + 11 + + + 6 + + + + mNoteEdit + + + + + TextLabel14 + + + Note: + + + + + GroupBox2_2 + + + Categories + + + + unnamed + + + 11 + + + 6 + + + + + Name + + + true + + + true + + + + mCategoryListView + + + AllColumns + + + + + Spacer2_2 + + + Vertical + + + Expanding + + + + 20 + 20 + + + + + + PushButton6_2 + + + &Remove + + + + + PushButton5_2 + + + &Edit + + + + + PushButton7_2 + + + &New + + + + + + + + + tab + + + &Custom + + + + unnamed + + + 11 + + + 6 + + + + GroupBox2_2_2 + + + Custom Entries + + + + unnamed + + + 11 + + + 6 + + + + + App + + + true + + + true + + + + + Name + + + true + + + true + + + + + Value + + + true + + + true + + + + mCustomListView + + + AllColumns + + + + + PushButton7_2_2 + + + &New + + + + + PushButton5_2_2 + + + &Edit + + + + + PushButton6_2_2 + + + &Remove + + + + + Spacer2_2_2 + + + Vertical + + + Expanding + + + + 20 + 20 + + + + + + + + + + + + + menubar + + + + + + + + + + + + + + + + + Toolbar_3 + + + Toolbar_3 + + + + + + + + + open + + + image0 + + + Action + + + &Open + + + Open Address Book + + + + + save + + + image1 + + + Action + + + &Save + + + Save Address Book + + + + + addressee_new + + + Action + + + &New + + + New Addressee + + + + + addressee_remove + + + Action + + + &Remove + + + Remove Addressee + + + + + dump + + + Dump + + + &Dump + + + Dump Addressbook + + + + + open_std + + + Open Standard Addressbook + + + Open Standard &Addressbook + + + + + + 789cad92cf0ac2300cc6ef7d8ab0dc866c6eb231101f41f12888873673e8610a3a0f22bebbfdb3d6ced583e09742f3f54792429bc6b0592f214ed9b5e3dd91800efc02717d6bdbfb76b778b028cf41ae12b268c2a2040856e7d35ee528739c6a294bca56b32a33b656960a2aa950962bdb48192aac6d1add36a87f1094d2fb2731a7a856b81b7e23e8886dee0143900b2ed0c9bb1b0aeec580f880ff548343bd6b10c9534f42c0cd19013b670cfa9a003024047a1200b6463d898b5a87fe4e4928a2e79cbd00444d9e3f + + + 789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523232520022330543251d2e253d856405bffcbc54105b19c856360003103711c4b530b63084709340dc64d364a36453103705ca35837093c1dc9424b31430570f2b00cb2863015099c444e5242400e49026930c1446372d3919a607c8275206610fed641291fd9f8822830688925146350e9b0c6e17d0500614dd7aa830052c93a2870d2ad55a7301002caeaa93 + + + + + mAddresseeList + selectionChanged(TQListViewItem*) + MainWindow + updateAddressee(TQListViewItem*) + + + save + activated() + MainWindow + fileSave() + + + open + activated() + MainWindow + fileOpen() + + + addressee_remove + activated() + MainWindow + removeEntry() + + + addressee_new + activated() + MainWindow + newEntry() + + + PushButton1 + clicked() + MainWindow + newAddress() + + + PushButton2 + pressed() + MainWindow + removeAddress() + + + mAddressIdCombo + activated(int) + MainWindow + updateAddress(int) + + + dump + activated() + MainWindow + dumpAddressBook() + + + PushButton3 + clicked() + MainWindow + removePhoneNumber() + + + PushButton4 + clicked() + MainWindow + newPhoneNumber() + + + PushButton5 + clicked() + MainWindow + editEmail() + + + PushButton7 + clicked() + MainWindow + newEmail() + + + PushButton6 + clicked() + MainWindow + removeEmail() + + + mPhoneIdCombo + activated(int) + MainWindow + updatePhone(int) + + + PushButton7_2 + clicked() + MainWindow + newCategory() + + + PushButton5_2 + clicked() + MainWindow + editCategory() + + + PushButton6_2 + clicked() + MainWindow + removeCategory() + + + PushButton7_2_2 + clicked() + MainWindow + newCustom() + + + PushButton5_2_2 + clicked() + MainWindow + editCustom() + + + PushButton6_2_2 + clicked() + MainWindow + removeCustom() + + + open_std + activated() + MainWindow + fileOpenStd() + + + + mAddresseeList + TabWidget2 + mNameEdit + mUrlEdit + mFormattedNameEdit + mPrefixEdit + mGivenNameEdit + mAdditionalNameEdit + mFamilyNameEdit + mSuffixEdit + mNickNameEdit + mSortStringEdit + mTitleEdit + mRoleEdit + mOrganizationEdit + mEmailListView + PushButton7 + PushButton5 + PushButton6 + mPhoneIdCombo + PushButton3 + PushButton4 + mPhoneNumberEdit + mPhoneFaxCheck + mPhoneCarCheck + mPhoneIsdnCheck + mPhoneVoiceCheck + mPhoneHomeCheck + mPhoneCellCheck + mPhonePcsCheck + mPhoneModemCheck + mPhoneWorkCheck + mPhoneVideoCheck + mPhonePagerCheck + mPhoneMsgCheck + mPhonePrefCheck + mPhoneBbsCheck + mAddressIdCombo + PushButton2 + PushButton1 + mAddressPrefCheck + mAddressHomeCheck + mAddressParcelCheck + mAddressDomCheck + mAddressWorkCheck + mAddressPostalCheck + mAddressIntlCheck + mAddressPostOfficeBoxEdit + mAddressExtendedEdit + mAddressStreetEdit + mAddressLocalityEdit + mAddressRegionEdit + mAddressPostalCodeEdit + mAddressCountryEdit + mAddressLabelEdit + mCategoryListView + PushButton7_2 + PushButton5_2 + PushButton6_2 + mNoteEdit + mCustomListView + PushButton7_2_2 + PushButton5_2_2 + PushButton6_2_2 + + + resourcefile.h + addressbook.h + mainWindow.ui.h + + + class AddresseeItem + + + TDEABC::ResourceFile *mResourceFile + AddresseeItem *mCurrentItem + TDEABC::AddressBook *mAddressBook + TQString mCurrentAddress + TQString mCurrentPhone + + + init() + destroy() + fileSave() + fileOpen() + loadAddressBook( const TQString & fileName ) + updateAddressee( TQListViewItem * item ) + readAddressee( const TDEABC::Addressee & a ) + writeAddressee( const TDEABC::Addressee & addressee ) + newEntry() + removeEntry() + updateAddress( int id ) + writeAddress( const TDEABC::Address & address ) + writeAddress( const TQString & id ) + readAddress( const TDEABC::Address & a ) + readAddress( const TQString & id ) + updatePhone( int id ) + writePhone( const TDEABC::PhoneNumber & phoneNumber ) + writePhone( const TQString & id ) + readPhone( const TDEABC::PhoneNumber & p ) + readPhone( const TQString & id ) + newAddress() + removeAddress() + dumpAddressBook() + newEmail() + editEmail() + removeEmail() + newPhoneNumber() + removePhoneNumber() + newCategory() + editCategory() + removeCategory() + editCustom() + newCustom() + removeCustom() + addressBookChanged() + addressBookLocked() + addressBookUnlocked() + fileOpenStd() + + + diff --git a/tdeabc/frontend/mainWindow.ui.h b/tdeabc/frontend/mainWindow.ui.h new file mode 100644 index 00000000..8e678b93 --- /dev/null +++ b/tdeabc/frontend/mainWindow.ui.h @@ -0,0 +1,658 @@ +/**************************************************************************** +** ui.h extension file, included from the uic-generated form implementation. +** +** If you wish to add, delete or rename slots use TQt Designer which will +** update this file, preserving your code. Create an init() slot in place of +** a constructor, and a destroy() slot in place of a destructor. +*****************************************************************************/ + +#include +#include +#include + +#include +#include + +#include + +using namespace TDEABC; + +class AddresseeItem : public TQListViewItem +{ + public: + AddresseeItem( TQListView *parent, const Addressee &a ) : + TQListViewItem( parent, a.realName(), a.uid() ), mAddressee( a ) {} + + void setAddressee( const Addressee &a ) { mAddressee = a; } + Addressee &addressee() { return mAddressee; } + + private: + Addressee mAddressee; +}; + +void MainWindow::init() +{ + mAddressBook = TDEABC::StdAddressBook::self( true ); + + mCurrentItem = 0; + + mEmailListView->header()->hide(); + mCategoryListView->header()->hide(); + + connect( mAddressBook, TQT_SIGNAL( addressBookChanged( AddressBook * ) ), + TQT_SLOT( addressBookChanged() ) ); + connect( mAddressBook, TQT_SIGNAL( addressBookLocked( AddressBook * ) ), + TQT_SLOT( addressBookLocked() ) ); + connect( mAddressBook, TQT_SIGNAL( addressBookUnlocked( AddressBook * ) ), + TQT_SLOT( addressBookUnlocked() ) ); +} + +void MainWindow::destroy() +{ + delete mAddressBook; +} + +void MainWindow::fileSave() +{ + updateAddressee( mAddresseeList->selectedItem() ); + + StdAddressBook::save(); +} + +void MainWindow::fileOpen() +{ + TQString fileName = TQFileDialog::getOpenFileName(); + + loadAddressBook( fileName ); +} + +void MainWindow::loadAddressBook( const TQString &fileName ) +{ + kdDebug() << "loadAddressBook(): '" << fileName << "'" << endl; + + mAddresseeList->clear(); + mCurrentItem = 0; + mCurrentAddress = TQString(); + readAddressee( Addressee() ); + + TDEABC::AddressBook::Iterator it; + for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { + new AddresseeItem( mAddresseeList, (*it) ); + } +} + +void MainWindow::updateAddressee( TQListViewItem *item ) +{ + AddresseeItem *addresseeItem = dynamic_cast( item ); + if ( !addresseeItem ) return; + + if (mCurrentItem ) { + writeAddress( mCurrentAddress ); + writePhone( mCurrentPhone ); + Addressee a = writeAddressee( mCurrentItem->addressee() ); + mCurrentItem->setAddressee( a ); + mAddressBook->insertAddressee( a ); + } + mCurrentItem = addresseeItem; + + readAddressee( addresseeItem->addressee() ); + updateAddress( mAddressIdCombo->currentItem() ); + updatePhone( mPhoneIdCombo->currentItem() ); +} + + +void MainWindow::readAddressee( const TDEABC::Addressee &a ) +{ + kdDebug() << "MainWindow::readAddressee(): " << a.name() << endl; + + mNameEdit->setText( a.name() ); + mUrlEdit->setText( a.url().url() ); + mAdditionalNameEdit->setText( a.additionalName() ); + mSuffixEdit->setText( a.suffix() ); + mGivenNameEdit->setText( a.givenName() ); + mPrefixEdit->setText( a.prefix() ); + mFamilyNameEdit->setText( a.familyName() ); + mFormattedNameEdit->setText( a.formattedName() ); + mNickNameEdit->setText( a.nickName() ); + mSortStringEdit->setText( a.sortString() ); + mTitleEdit->setText( a.title() ); + mRoleEdit->setText( a.role() ); + mOrganizationEdit->setText( a.organization() ); + mNoteEdit->setText( a.note() ); +// mLabelEdit->setText( a.label() ); + + mEmailListView->clear(); + TQStringList emails = a.emails(); + TQStringList::ConstIterator it3; + for( it3 = emails.begin(); it3 != emails.end(); ++it3 ) { + new TQListViewItem( mEmailListView, *it3 ); + } + + mCategoryListView->clear(); + TQStringList categories = a.categories(); + TQStringList::ConstIterator it4; + for( it4 = categories.begin(); it4 != categories.end(); ++it4 ) { + new TQListViewItem( mCategoryListView, *it4 ); + } + + mCustomListView->clear(); + TQStringList customs = a.customs(); + TQStringList::ConstIterator it5; + for( it5 = customs.begin(); it5 != customs.end(); ++it5 ) { + int posDash = (*it5).find( "-" ); + int posColon = (*it5).find( ":" ); + + TQString app = (*it5).left( posDash ); + TQString cname = (*it5).mid( posDash + 1, posColon - posDash - 1 ); + TQString value = (*it5).mid( posColon + 1 ); + + new TQListViewItem( mCustomListView, app, cname, value ); + } + + Address::List addresses = a.addresses(); + mAddressIdCombo->clear(); + Address::List::ConstIterator it; + for( it = addresses.begin(); it != addresses.end(); ++it ) { + mAddressIdCombo->insertItem( (*it).id() ); + } + if ( mAddressIdCombo->count() > 0 ) mCurrentAddress = mAddressIdCombo->currentText(); + else mCurrentAddress = TQString(); + readAddress( mCurrentAddress ); + + mPhoneIdCombo->clear(); + PhoneNumber::List pl = a.phoneNumbers(); + PhoneNumber::List::ConstIterator it2; + for( it2 = pl.begin(); it2 != pl.end(); ++it2) { + mPhoneIdCombo->insertItem( (*it2).id() ); + } + if ( mPhoneIdCombo->count() > 0 ) mCurrentPhone = mPhoneIdCombo->currentText(); + readPhone( mCurrentPhone ); +} + +TDEABC::Addressee MainWindow::writeAddressee( const TDEABC::Addressee &addressee ) +{ + Addressee a( addressee ); + a.setName( mNameEdit->text() ); + if ( !mUrlEdit->text().isEmpty() ) { + a.setUrl( KURL( mUrlEdit->text() ) ); + } + + a.setAdditionalName( mAdditionalNameEdit->text() ); + a.setSuffix( mSuffixEdit->text() ); + a.setGivenName( mGivenNameEdit->text() ); + a.setPrefix( mPrefixEdit->text() ); + a.setFamilyName( mFamilyNameEdit->text() ); + a.setFormattedName( mFormattedNameEdit->text() ); + a.setNickName( mNickNameEdit->text() ); + a.setSortString( mSortStringEdit->text() ); + a.setTitle( mTitleEdit->text() ); + a.setRole( mRoleEdit->text() ); + a.setOrganization( mOrganizationEdit->text() ); + a.setNote( mNoteEdit->text() ); +// a.setLabel( mLabelEdit->text() ); + + kdDebug() << "MainWindow::writeAddressee()" << endl; + a.dump(); + + return a; +} + +void MainWindow::newEntry() +{ + bool ok = false; + TQString name = KInputDialog::getText( i18n("New Address Book Entry"), + i18n("Please enter name:"), + TQString(), &ok, + this ); + if ( !ok || name.isEmpty() ) return; + + Addressee a; + a.setName( name ); + mAddressBook->insertAddressee( a ); + + new AddresseeItem( mAddresseeList, a ); +} + +void MainWindow::removeEntry() +{ + AddresseeItem *item = dynamic_cast(mAddresseeList->selectedItem()); + if ( item ) { + mAddressBook->removeAddressee( item->addressee() ); + delete item; + mCurrentItem = 0; + } +} + + +void MainWindow::updateAddress( int id ) +{ + if( !mCurrentItem ) return; + + writeAddress( mCurrentAddress ); + if ( mAddressIdCombo->count() > 0 ) { + mCurrentAddress = mAddressIdCombo->text( id ); + } else { + mCurrentAddress = TQString(); + } + readAddress( mCurrentAddress ); +} + +TDEABC::Address MainWindow::writeAddress( const TDEABC::Address &address ) +{ + Address a( address ); + + a.setPostOfficeBox( mAddressPostOfficeBoxEdit->text() ); + a.setExtended( mAddressExtendedEdit->text() ); + a.setStreet( mAddressStreetEdit->text() ); + a.setLocality( mAddressLocalityEdit->text() ); + a.setRegion( mAddressRegionEdit->text() ); + a.setLabel( mAddressLabelEdit->text() ); + a.setPostalCode( mAddressPostalCodeEdit->text() ); + a.setCountry( mAddressCountryEdit->text() ); + + int type = 0; + if ( mAddressDomCheck->isChecked() ) type |= Address::Dom; + if ( mAddressIntlCheck->isChecked() ) type |= Address::Intl; + if ( mAddressParcelCheck->isChecked() ) type |= Address::Parcel; + if ( mAddressPostalCheck->isChecked() ) type |= Address::Postal; + if ( mAddressHomeCheck->isChecked() ) type |= Address::Home; + if ( mAddressPrefCheck->isChecked() ) type |= Address::Pref; + if ( mAddressWorkCheck->isChecked() ) type |= Address::Work; + a.setType( type ); + + return a; +} + +void MainWindow::writeAddress( const TQString &id ) +{ + if ( !mCurrentItem ) return; + + if ( id.isEmpty() ) return; + + Address address; + address.setId( id ); + address = writeAddress( address ); + + mCurrentItem->addressee().insertAddress( address ); +} + +void MainWindow::readAddress( const TDEABC::Address &a ) +{ + mAddressPostOfficeBoxEdit->setText( a.postOfficeBox() ); + mAddressExtendedEdit->setText( a.extended() ); + mAddressStreetEdit->setText( a.street() ); + mAddressLocalityEdit->setText( a.locality() ); + mAddressRegionEdit->setText( a.region() ); + mAddressLabelEdit->setText( a.label() ); + mAddressPostalCodeEdit->setText( a.postalCode() ); + mAddressCountryEdit->setText( a.country() ); + + int type = a.type(); + if ( type & Address::Dom ) mAddressDomCheck->setChecked( true ); + else mAddressDomCheck->setChecked( false ); + if ( type & Address::Intl ) mAddressIntlCheck->setChecked( true ); + else mAddressIntlCheck->setChecked( false ); + if ( type & Address::Parcel ) mAddressParcelCheck->setChecked( true ); + else mAddressParcelCheck->setChecked( false ); + if ( type & Address::Postal ) mAddressPostalCheck->setChecked( true ); + else mAddressPostalCheck->setChecked( false ); + if ( type & Address::Home ) mAddressHomeCheck->setChecked( true ); + else mAddressHomeCheck->setChecked( false ); + if ( type & Address::Pref ) mAddressPrefCheck->setChecked( true ); + else mAddressPrefCheck->setChecked( false ); + if ( type & Address::Work ) mAddressWorkCheck->setChecked( true ); + else mAddressWorkCheck->setChecked( false ); +} + +void MainWindow::readAddress( const TQString &id ) +{ + if ( !mCurrentItem || id.isEmpty() ) { + readAddress( Address() ); + return; + } + + Address address = mCurrentItem->addressee().findAddress( id ); + readAddress( address ); +} + +void MainWindow::updatePhone( int id ) +{ + if( !mCurrentItem ) return; + + writePhone( mCurrentPhone ); + if ( mPhoneIdCombo->count() > 0 ) { + mCurrentPhone = mPhoneIdCombo->text( id ); + } else { + mCurrentPhone = TQString(); + } + readPhone( mCurrentPhone ); +} + +TDEABC::PhoneNumber MainWindow::writePhone( const TDEABC::PhoneNumber &phoneNumber ) +{ + PhoneNumber p( phoneNumber ); + + p.setNumber( mPhoneNumberEdit->text() ); + + int type = 0; + if ( mPhoneMsgCheck->isChecked() ) type |= PhoneNumber::Msg; + if ( mPhoneVoiceCheck->isChecked() ) type |= PhoneNumber::Voice; + if ( mPhoneFaxCheck->isChecked() ) type |= PhoneNumber::Fax; + if ( mPhoneCellCheck->isChecked() ) type |= PhoneNumber::Cell; + if ( mPhoneHomeCheck->isChecked() ) type |= PhoneNumber::Home; + if ( mPhonePrefCheck->isChecked() ) type |= PhoneNumber::Pref; + if ( mPhoneWorkCheck->isChecked() ) type |= PhoneNumber::Work; + if ( mPhoneVideoCheck->isChecked() ) type |= PhoneNumber::Video; + if ( mPhoneBbsCheck->isChecked() ) type |= PhoneNumber::Bbs; + if ( mPhoneModemCheck->isChecked() ) type |= PhoneNumber::Modem; + if ( mPhoneCarCheck->isChecked() ) type |= PhoneNumber::Car; + if ( mPhoneIsdnCheck->isChecked() ) type |= PhoneNumber::Isdn; + if ( mPhonePcsCheck->isChecked() ) type |= PhoneNumber::Pcs; + if ( mPhonePagerCheck->isChecked() ) type |= PhoneNumber::Pager; + p.setType( type ); + + return p; +} + +void MainWindow::writePhone( const TQString &id ) +{ + if ( !mCurrentItem ) return; + + if ( id.isEmpty() ) return; + + PhoneNumber p; + p.setId( id ); + p = writePhone( p ); + + mCurrentItem->addressee().insertPhoneNumber( p ); +} + +void MainWindow::readPhone( const TDEABC::PhoneNumber &p ) +{ + mPhoneNumberEdit->setText( p.number() ); + + int type = p.type(); + if ( type & PhoneNumber::Msg ) mPhoneMsgCheck->setChecked( true ); + else mPhoneMsgCheck->setChecked( false ); + if ( type & PhoneNumber::Voice ) mPhoneVoiceCheck->setChecked( true ); + else mPhoneVoiceCheck->setChecked( false ); + if ( type & PhoneNumber::Fax ) mPhoneFaxCheck->setChecked( true ); + else mPhoneFaxCheck->setChecked( false ); + if ( type & PhoneNumber::Cell ) mPhoneCellCheck->setChecked( true ); + else mPhoneCellCheck->setChecked( false ); + if ( type & PhoneNumber::Home ) mPhoneHomeCheck->setChecked( true ); + else mPhoneHomeCheck->setChecked( false ); + if ( type & PhoneNumber::Pref ) mPhonePrefCheck->setChecked( true ); + else mPhonePrefCheck->setChecked( false ); + if ( type & PhoneNumber::Work ) mPhoneWorkCheck->setChecked( true ); + else mPhoneWorkCheck->setChecked( false ); + if ( type & PhoneNumber::Video ) mPhoneVideoCheck->setChecked( true ); + else mPhoneVideoCheck->setChecked( false ); + if ( type & PhoneNumber::Bbs ) mPhoneBbsCheck->setChecked( true ); + else mPhoneBbsCheck->setChecked( false ); + if ( type & PhoneNumber::Modem ) mPhoneModemCheck->setChecked( true ); + else mPhoneModemCheck->setChecked( false ); + if ( type & PhoneNumber::Car ) mPhoneCarCheck->setChecked( true ); + else mPhoneCarCheck->setChecked( false ); + if ( type & PhoneNumber::Isdn ) mPhoneIsdnCheck->setChecked( true ); + else mPhoneIsdnCheck->setChecked( false ); + if ( type & PhoneNumber::Pcs ) mPhonePcsCheck->setChecked( true ); + else mPhonePcsCheck->setChecked( false ); + if ( type & PhoneNumber::Pager ) mPhonePagerCheck->setChecked( true ); + else mPhonePagerCheck->setChecked( false ); +} + +void MainWindow::readPhone( const TQString &id ) +{ + if ( !mCurrentItem || id.isEmpty() ) { + readPhone( PhoneNumber() ); + return; + } + + PhoneNumber p = mCurrentItem->addressee().findPhoneNumber( id ); + readPhone( p ); +} + + +void MainWindow::newAddress() +{ + if( !mCurrentItem ) return; + + Address address; + mCurrentItem->addressee().insertAddress( address ); + + mAddressIdCombo->insertItem( address.id() ); +} + +void MainWindow::removeAddress() +{ + if ( !mCurrentItem ) return; + + TQString id = mAddressIdCombo->currentText(); + if ( id.isEmpty() ) return; + + Address address; + address.setId( id ); + mCurrentItem->addressee().removeAddress( address ); + + readAddressee( mCurrentItem->addressee() ); +} + + +void MainWindow::dumpAddressBook() +{ + mAddressBook->dump(); +} + + +void MainWindow::newEmail() +{ + if ( !mCurrentItem ) return; + + bool ok = false; + TQString name = KInputDialog::getText( i18n("New Email Address"), + i18n("Please enter email address:"), + TQString(), &ok, + this ); + if ( !ok || name.isEmpty() ) return; + + new TQListViewItem( mEmailListView, name ); + mCurrentItem->addressee().insertEmail( name ); +} + +void MainWindow::editEmail() +{ + if ( !mCurrentItem ) return; + + TQListViewItem *item = mEmailListView->selectedItem(); + if( !item ) return; + + TQString oldName = item->text( 0 ); + + bool ok = false; + TQString name = KInputDialog::getText( i18n("Edit Email Address"), + i18n("Please enter new email address:"), + oldName, &ok, + this ); + if ( !ok || name.isEmpty() ) return; + + item->setText( 0, name ); + mCurrentItem->addressee().removeEmail( oldName ); + mCurrentItem->addressee().insertEmail( name ); +} + +void MainWindow::removeEmail() +{ + if ( !mCurrentItem ) return; + + TQListViewItem *item = mEmailListView->selectedItem(); + if( !item ) return; + + mCurrentItem->addressee().removeEmail( item->text( 0 ) ); + delete item; +} + +void MainWindow::newPhoneNumber() +{ + if ( !mCurrentItem ) return; + + PhoneNumber p; + mCurrentItem->addressee().insertPhoneNumber( p ); + + mPhoneIdCombo->insertItem( p.id() ); +} + +void MainWindow::removePhoneNumber() +{ + if ( !mCurrentItem ) return; + + TQString id = mPhoneIdCombo->currentText(); + if ( id.isEmpty() ) return; + + PhoneNumber p; + p.setId( id ); + mCurrentItem->addressee().removePhoneNumber( p ); + + readAddressee( mCurrentItem->addressee() ); +} + + +void MainWindow::newCategory() +{ + if ( !mCurrentItem ) return; + + bool ok = false; + TQString name = KInputDialog::getText( i18n("New Category"), + i18n("Please enter category name:"), + TQString(), &ok, + this ); + if ( !ok || name.isEmpty() ) return; + + new TQListViewItem( mCategoryListView, name ); + mCurrentItem->addressee().insertCategory( name ); +} + +void MainWindow::editCategory() +{ + if ( !mCurrentItem ) return; + + TQListViewItem *item = mCategoryListView->selectedItem(); + if( !item ) return; + + TQString oldName = item->text( 0 ); + + bool ok = false; + TQString name = KInputDialog::getText( i18n("Edit Category"), + i18n("Please enter new category name:"), + oldName, &ok, + this ); + if ( !ok || name.isEmpty() ) return; + + item->setText( 0, name ); + mCurrentItem->addressee().removeCategory( oldName ); + mCurrentItem->addressee().insertCategory( name ); +} + +void MainWindow::removeCategory() +{ + if ( !mCurrentItem ) return; + + TQListViewItem *item = mCategoryListView->selectedItem(); + if( !item ) return; + + mCurrentItem->addressee().removeCategory( item->text( 0 ) ); + delete item; +} + + +void MainWindow::editCustom() +{ + if ( !mCurrentItem ) return; + + TQListViewItem *item = mCustomListView->selectedItem(); + if( !item ) return; + + TQString oldName = item->text( 0 ) + "-" + item->text( 1 ) + ":" + + item->text( 2 ); + + bool ok = false; + TQString name = KInputDialog::getText( i18n("New Custom Entry"), + i18n("Please enter custom entry.\n" + "Format: APP-NAME:VALUE"), + oldName, &ok, + this ); + if ( !ok || name.isEmpty() ) return; + + int posDash = name.find( "-" ); + int posColon = name.find( ":" ); + + TQString app = name.left( posDash ); + TQString cname = name.mid( posDash + 1, posColon - posDash - 1 ); + TQString value = name.mid( posColon + 1 ); + + item->setText( 0, app ); + item->setText( 1, cname ); + item->setText( 2, value ); + + mCurrentItem->addressee().removeCustom( app, cname ); + mCurrentItem->addressee().insertCustom( app, cname, value ); +} + +void MainWindow::newCustom() +{ + if ( !mCurrentItem ) return; + + bool ok = false; + TQString name = KInputDialog::getText( i18n("New Custom Entry"), + i18n("Please enter custom entry.\n" + "Format: APP-NAME:VALUE"), + TQString(), &ok, + this ); + if ( !ok || name.isEmpty() ) return; + + int posDash = name.find( "-" ); + int posColon = name.find( ":" ); + + TQString app = name.left( posDash ); + TQString cname = name.mid( posDash + 1, posColon - posDash - 1 ); + TQString value = name.mid( posColon + 1 ); + + new TQListViewItem( mCustomListView, app, cname, value ); + + mCurrentItem->addressee().insertCustom( app, cname, value ); +} + +void MainWindow::removeCustom() +{ + if ( !mCurrentItem ) return; + + TQListViewItem *item = mCustomListView->selectedItem(); + if( !item ) return; + + mCurrentItem->addressee().removeCustom( item->text( 0 ), item->text( 1 ) ); + delete item; +} + +void MainWindow::addressBookChanged() +{ + TQMessageBox::warning( this, i18n("Address Book Changed"), + i18n("The address book has changed on disk."), + i18n("Reload") ); + loadAddressBook( "dummy" ); +} + +void MainWindow::addressBookLocked() +{ + kdDebug() << "AddressBook locked()" << endl; +} + +void MainWindow::addressBookUnlocked() +{ + kdDebug() << "AddressBook unlocked()" << endl; +} + + +void MainWindow::fileOpenStd() +{ + loadAddressBook( StdAddressBook::fileName() ); +} diff --git a/tdeabc/tdeabc2mutt/CMakeLists.txt b/tdeabc/tdeabc2mutt/CMakeLists.txt new file mode 100644 index 00000000..035c3894 --- /dev/null +++ b/tdeabc/tdeabc2mutt/CMakeLists.txt @@ -0,0 +1,29 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} +) + + +##### tdeabc2mutt (executable) #################### + +tde_add_executable( tdeabc2mutt AUTOMOC + SOURCES tdeabc2mutt.cpp main.cpp + LINK tdeabc-shared + DESTINATION ${BIN_INSTALL_DIR} +) diff --git a/tdeabc/tdeabc2mutt/Makefile.am b/tdeabc/tdeabc2mutt/Makefile.am new file mode 100644 index 00000000..d921711b --- /dev/null +++ b/tdeabc/tdeabc2mutt/Makefile.am @@ -0,0 +1,13 @@ +INCLUDES = -I$(includedir)/tdeabc $(all_includes) + +METASOURCES = AUTO + +bin_PROGRAMS = tdeabc2mutt + +tdeabc2mutt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +tdeabc2mutt_LDADD = -ltdeabc $(LIB_TDECORE) +tdeabc2mutt_SOURCES = tdeabc2mutt.cpp main.cpp + +messages: rc.cpp + $(XGETTEXT) *.cpp -o $(podir)/tdeabc2mutt.pot + diff --git a/tdeabc/tdeabc2mutt/README b/tdeabc/tdeabc2mutt/README new file mode 100644 index 00000000..2da528a9 --- /dev/null +++ b/tdeabc/tdeabc2mutt/README @@ -0,0 +1,19 @@ +KAbc2Mutt +----------- + +tdeabc2mutt is a small programm to make the email addresses, stored in +kaddressbook, available in mutt. +You only have to add the following line to your .muttrc + + source "tdeabc2mutt |" + +You can also configure mutt to query tdeabc2mutt when typing a substring +of an email address (see the docu for query_command). +To do this, add the following line to your .muttrc + + set query_command = "tdeabc2mutt --query '%s' --format query" + +Have fun with it + +Ciao, +Tobias diff --git a/tdeabc/tdeabc2mutt/main.cpp b/tdeabc/tdeabc2mutt/main.cpp new file mode 100644 index 00000000..0515c37d --- /dev/null +++ b/tdeabc/tdeabc2mutt/main.cpp @@ -0,0 +1,80 @@ +/* + KAbc2Mutt + + Copyright (c) 2003 - 2004 Tobias Koenig + + This program is free software; you can redistribute it and/or + modify it under the terms of version 2 of the GNU General Public + License as published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ + +#include +#include +#include + +#include + +#include "tdeabc2mutt.h" + +static const char version[] = "0.2"; +static const char appName[] = "tdeabc2mutt"; +static const char programName[] = I18N_NOOP( "tdeabc2mutt" ); +static const char description[] = I18N_NOOP( "tdeabc - mutt converter" ); + +static TDECmdLineOptions k2moptions[] = +{ + { "query ", I18N_NOOP( "Only show contacts where name or address matches " ), 0 }, + { "format ", I18N_NOOP( "Default format is 'alias'. 'query' returns emailname, as needed by mutt's query_command" ), "alias" }, + { "alternate-key-format", I18N_NOOP( "Default key format is 'JohDoe', this option turns it into 'jdoe'" ), 0 }, + { "ignore-case", I18N_NOOP( "Make queries case insensitive" ), 0 }, + { "all-addresses", I18N_NOOP( "Return all mail addresses, not just the preferred one" ), 0}, + TDECmdLineLastOption +}; + + +int main( int argc, char **argv ) +{ + TDEApplication::disableAutoDcopRegistration(); + TDECmdLineArgs::init( argc, argv, appName, programName, description, version ); + TDECmdLineArgs::addCmdLineOptions( k2moptions ); + + TDEApplication app( false, false ); + + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); + + KABC2Mutt *object = new KABC2Mutt( 0 ); + + // Handle --format option + object->setFormat( (args->getOption("format") == "query") ? KABC2Mutt::Query : KABC2Mutt::Aliases ); + + // Handle --alternate-key-format option + object->setAlternateKeyFormat( args->isSet( "alternate-key-format" ) ); + + // Handle --all-addresses option + object->setAllAddresses( args->isSet( "all-addresses" ) ); + + // Handle --query option + const TQString subString = TQString::fromLocal8Bit( args->getOption( "query" ) ); + if ( !subString.isEmpty() ) { + // Mutt wants a first line with some status message on it + // See http://mutt.org/doc/manual/manual-4.html#ss4.5 + std::cout << i18n( "Searching KDE addressbook" ).latin1() << std::endl; + } + object->setQuery( subString ); + + // Handle --ignore-case option + object->setIgnoreCase( !args->isSet( "ignore-case" ) ); + + object->run(); + + return app.exec(); +} diff --git a/tdeabc/tdeabc2mutt/tdeabc2mutt.cpp b/tdeabc/tdeabc2mutt/tdeabc2mutt.cpp new file mode 100644 index 00000000..d36582ba --- /dev/null +++ b/tdeabc/tdeabc2mutt/tdeabc2mutt.cpp @@ -0,0 +1,160 @@ +/* + KAbc2Mutt + + Copyright (c) 2003 - 2004 Tobias Koenig + + This program is free software; you can redistribute it and/or + modify it under the terms of version 2 of the GNU General Public + License as published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ + +#include +#include +#include + +#include + +#include + +#include "tdeabc2mutt.h" + +static std::ostream & operator<< ( std::ostream &os, const TQString &s ); + +KABC2Mutt::KABC2Mutt( TQObject *parent, const char *name ) + : TQObject( parent, name ), mFormat( Aliases ), + mIgnoreCase( false ), mAllAddresses( false ), + mAlternateKeyFormat( false ), + mAddressBook( 0 ) +{ +} + +void KABC2Mutt::run() +{ + mAddressBook = TDEABC::StdAddressBook::self( true ); + TDEABC::StdAddressBook::setAutomaticSave( false ); + + connect( mAddressBook, TQT_SIGNAL( addressBookChanged( AddressBook* ) ), + this, TQT_SLOT( loadingFinished() ) ); +} + +void KABC2Mutt::loadingFinished() +{ + // print addressees + TDEABC::AddressBook::ConstIterator iaddr; + for ( iaddr = mAddressBook->begin(); iaddr != mAddressBook->end(); ++iaddr ) { + const TQString name = (*iaddr).givenName() + ' ' + (*iaddr).familyName(); + if ( !mQuery.isEmpty() ) { + bool match = (name.find(mQuery, 0, mIgnoreCase) > -1) || + ((*iaddr).preferredEmail().find( mQuery, 0, mIgnoreCase ) > -1 ); + if ( !match ) + continue; + } + + const TQStringList &allAddresses = (*iaddr).emails(); + TQStringList::const_iterator from, to; + bool multiple = false; + + if ( mAllAddresses ) { + // use all entries + multiple = allAddresses.size() > 1; + from = allAddresses.begin(); + to = allAddresses.end(); + } else { + // use only the first entry, the one returned by preferredEmail() + from = to = allAddresses.begin(); // start with empty list + if ( to != allAddresses.end() ) + ++to; + } + + size_t index = 0; + if ( mFormat == Aliases ) { + static const TQChar space = TQChar( ' ' ); + static const TQChar underscore = TQChar( '_' ); + + TQString key; + if ( !mAlternateKeyFormat ) + key = (*iaddr).givenName().left( 3 ) + (*iaddr).familyName().left( 3 ); + else + if ( !(*iaddr).familyName().isEmpty() ) + key = (*iaddr).givenName().left( 1 ).lower() + + (*iaddr).familyName().lower().replace( space, underscore ); + else + key = (*iaddr).givenName().lower().replace( space, underscore ); + + while ( from != to ) { + std::cout << "alias " << key; + if ( index ) + std::cout << index; + std::cout << '\t' << name << " <" << (*from) << '>' << std::endl; + ++index; + ++from; + } + + if ( !(*iaddr).nickName().isEmpty() ) { + std::cout << "alias " + << (*iaddr).nickName().lower().replace( space, underscore ) + << '\t' << name << " <" + << (*iaddr).preferredEmail() << '>' << std::endl; + } + } else { + while ( from != to ) { + std::cout << (*from) << '\t' << name; + if ( multiple ) { + if ( index ) + std::cout << "\t#" << index; + else + std::cout << '\t' << i18n( "preferred" ); + ++index; + } + std::cout << std::endl; + ++from; + } + } + } + + // print all distribution lists + TDEABC::DistributionListManager manager( mAddressBook ); + manager.load(); + + TQStringList dists = manager.listNames(); + for ( TQStringList::Iterator iaddr = dists.begin(); iaddr != dists.end(); ++iaddr ) { + TDEABC::DistributionList *list = manager.list( *iaddr ); + if ( list ) { + if ( !mQuery.isEmpty() ) { + bool match = ((*iaddr).find(mQuery) > -1); + if ( !match ) + continue; + } + + TQStringList emails = list->emails(); + if ( emails.isEmpty() ) + continue; + + if ( mFormat == Aliases ) { + std::cout << "alias " << (*iaddr).replace( TQRegExp( " " ), "_" ) + << '\t' << emails.join( "," ) << std::endl; + } else { + std::cout << emails.join( "," ) << '\t' << (*iaddr) << '\t' << std::endl; + } + } + } + + kapp->quit(); +} + +static std::ostream & operator<< ( std::ostream &os, const TQString &s ) +{ + os << s.local8Bit().data(); + return os; +} + +#include "tdeabc2mutt.moc" diff --git a/tdeabc/tdeabc2mutt/tdeabc2mutt.h b/tdeabc/tdeabc2mutt/tdeabc2mutt.h new file mode 100644 index 00000000..a0e58a59 --- /dev/null +++ b/tdeabc/tdeabc2mutt/tdeabc2mutt.h @@ -0,0 +1,57 @@ +/* + KAbc2Mutt + + Copyright (c) 2003 - 2004 Tobias Koenig + + This program is free software; you can redistribute it and/or + modify it under the terms of version 2 of the GNU General Public + License as published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ + +#ifndef TDEABC2MUTT_H +#define TDEABC2MUTT_H + +#include + +class KABC2Mutt : public TQObject +{ + Q_OBJECT + + + public: + + enum Format { Aliases, Query }; + + KABC2Mutt( TQObject *parent, const char *name = 0 ); + + void setQuery( const TQString &query ) { mQuery = query; } + void setFormat( Format format ) { mFormat = format; } + void setIgnoreCase( bool ignoreCase ) { mIgnoreCase = ignoreCase; } + void setAllAddresses( bool allAddresses ) { mAllAddresses = allAddresses; } + void setAlternateKeyFormat( bool alternateKeyFormat ) { mAlternateKeyFormat = alternateKeyFormat; } + + void run(); + + private slots: + void loadingFinished(); + + private: + TQString mQuery; + Format mFormat; + bool mIgnoreCase; + bool mAllAddresses; + bool mAlternateKeyFormat; + + TDEABC::AddressBook *mAddressBook; +}; + +#endif diff --git a/tdeabc/tdeabcdistlistupdater/CMakeLists.txt b/tdeabc/tdeabcdistlistupdater/CMakeLists.txt new file mode 100644 index 00000000..ddbdd7c9 --- /dev/null +++ b/tdeabc/tdeabcdistlistupdater/CMakeLists.txt @@ -0,0 +1,42 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +tde_import( libkmime ) +tde_import( ktnef ) +tde_import( libkcal ) +tde_import( libtdepim ) + +include_directories( + ${CMAKE_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} +) + + +##### other data ################################ + +install( + FILES tdeabcdistlistupdater.desktop + DESTINATION ${AUTOSTART_INSTALL_DIR} +) + + +##### tdeabcdistlistupdater (executable) #################### + +tde_add_executable( tdeabcdistlistupdater + SOURCES tdeabcdistlistupdater.cpp + LINK tdepim-shared + DESTINATION ${BIN_INSTALL_DIR} +) diff --git a/tdeabc/tdeabcdistlistupdater/Makefile.am b/tdeabc/tdeabcdistlistupdater/Makefile.am new file mode 100644 index 00000000..b60e0065 --- /dev/null +++ b/tdeabc/tdeabcdistlistupdater/Makefile.am @@ -0,0 +1,12 @@ +INCLUDES = -I$(includedir)/tdeabc -I$(top_srcdir) $(all_includes) + +METASOURCES = AUTO + +bin_PROGRAMS = tdeabcdistlistupdater + +tdeabcdistlistupdater_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +tdeabcdistlistupdater_LDADD = $(LIB_TDEABC) $(top_builddir)/libtdepim/libtdepim.la +tdeabcdistlistupdater_SOURCES = tdeabcdistlistupdater.cpp + +autostart_DATA = tdeabcdistlistupdater.desktop +autostartdir = $(datadir)/autostart diff --git a/tdeabc/tdeabcdistlistupdater/tdeabcdistlistupdater.cpp b/tdeabc/tdeabcdistlistupdater/tdeabcdistlistupdater.cpp new file mode 100644 index 00000000..9228e1f4 --- /dev/null +++ b/tdeabc/tdeabcdistlistupdater/tdeabcdistlistupdater.cpp @@ -0,0 +1,95 @@ +/* + This file is part of libtdeabc. + Copyright (c) 2008 Tobias Koenig + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +static const TDECmdLineOptions options[] = +{ + { "disable-autostart", "Disable automatic startup on login", 0 }, + TDECmdLineLastOption +}; + +void convertDistributionLists() +{ + KSimpleConfig cfg( locateLocal( "data", "tdeabc/distlists" ) ); + const TQMap entryMap = cfg.entryMap( "DistributionLists" ); + + if ( entryMap.isEmpty() ) // nothing to convert + return; + + TQMapConstIterator it; + for ( it = entryMap.begin(); it != entryMap.end(); ++it ) { + const TQString listName = it.key(); + const TQStringList entries = TQStringList::split( ',', it.data(), true ); + + KPIM::DistributionList distList; + distList.setUid( TDEApplication::randomString( 10 ) ); + distList.setName( listName ); + + if ( entries.count() > 1 ) { + for ( uint i = 0; i < entries.count(); i += 2 ) { + const TQString uid = entries[ i ]; + const TQString preferredEMail = entries[ i + 1 ]; + + distList.insertEntry( uid, preferredEMail ); + } + } + + TDEABC::StdAddressBook::self()->insertAddressee( distList ); + } + + TDEABC::StdAddressBook::self()->save(); +} + +int main( int argc, char **argv ) +{ + TDEApplication::disableAutoDcopRegistration(); + + TDEAboutData aboutData( "tdeabcdistlistupdater", "Converter tool for distribution lists", "0.1" ); + aboutData.addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" ); + + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); + + TDEApplication app( false, false ); + + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); + + if ( args->isSet( "disable-autostart" ) ) { + kdDebug() << "Disable autostart." << endl; + + TDEConfig *config = app.config(); + config->setGroup( "Startup" ); + config->writeEntry( "EnableAutostart", false ); + } + + convertDistributionLists(); +} + diff --git a/tdeabc/tdeabcdistlistupdater/tdeabcdistlistupdater.desktop b/tdeabc/tdeabcdistlistupdater/tdeabcdistlistupdater.desktop new file mode 100644 index 00000000..f481a0aa --- /dev/null +++ b/tdeabc/tdeabcdistlistupdater/tdeabcdistlistupdater.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=tdeabcdistlistupdater +Exec=tdeabcdistlistupdater --disable-autostart +Icon=misc +Type=Application +Comment=Tool to update the old distribution lists to the new ones. +Terminal=false +NoDisplay=true +X-TDE-autostart-condition=tdeabcdistlistupdaterrc:Startup:EnableAutostart:true +OnlyShowIn=TDE; diff --git a/tdefile-plugins/ics/Makefile.am b/tdefile-plugins/ics/Makefile.am index 96a1a7f7..8cb1a415 100644 --- a/tdefile-plugins/ics/Makefile.am +++ b/tdefile-plugins/ics/Makefile.am @@ -12,7 +12,7 @@ kde_module_LTLIBRARIES = tdefile_ics.la tdefile_ics_la_SOURCES = tdefile_ics.cpp tdefile_ics_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -tdefile_ics_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(LIB_KSYCOCA) +tdefile_ics_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(LIB_TDESYCOCA) METASOURCES = AUTO diff --git a/tdefile-plugins/palm-databases/Makefile.am b/tdefile-plugins/palm-databases/Makefile.am index 552a2a4f..7711d192 100644 --- a/tdefile-plugins/palm-databases/Makefile.am +++ b/tdefile-plugins/palm-databases/Makefile.am @@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = tdefile_palm.la tdefile_palm_la_SOURCES = tdefile_palm.cpp tdefile_palm_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -tdefile_palm_la_LIBADD = $(LIB_KSYCOCA) $(PISOCK_LIB) +tdefile_palm_la_LIBADD = $(LIB_TDESYCOCA) $(PISOCK_LIB) # let automoc handle all of the meta source files (moc) METASOURCES = AUTO diff --git a/tdefile-plugins/rfc822/Makefile.am b/tdefile-plugins/rfc822/Makefile.am index f7cf8969..45bbb537 100644 --- a/tdefile-plugins/rfc822/Makefile.am +++ b/tdefile-plugins/rfc822/Makefile.am @@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = tdefile_rfc822.la tdefile_rfc822_la_SOURCES = tdefile_rfc822.cpp tdefile_rfc822_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -tdefile_rfc822_la_LIBADD = $(LIB_KSYCOCA) +tdefile_rfc822_la_LIBADD = $(LIB_TDESYCOCA) # let automoc handle all of the meta source files (moc) METASOURCES = AUTO diff --git a/tdefile-plugins/vcf/Makefile.am b/tdefile-plugins/vcf/Makefile.am index fd21fb80..5b210eed 100644 --- a/tdefile-plugins/vcf/Makefile.am +++ b/tdefile-plugins/vcf/Makefile.am @@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = tdefile_vcf.la tdefile_vcf_la_SOURCES = tdefile_vcf.cpp tdefile_vcf_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -tdefile_vcf_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDEABC) +tdefile_vcf_la_LIBADD = $(LIB_TDESYCOCA) $(LIB_TDEABC) # let automoc handle all of the meta source files (moc) METASOURCES = AUTO diff --git a/tdeioslaves/imap4/Makefile.am b/tdeioslaves/imap4/Makefile.am index 4df28303..f52af2c6 100644 --- a/tdeioslaves/imap4/Makefile.am +++ b/tdeioslaves/imap4/Makefile.am @@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = tdeio_imap4.la tdeio_imap4_la_SOURCES = imapcommand.cc imaplist.cc mailaddress.cc \ mimeheader.cc rfcdecoder.cc imap4.cc imapinfo.cc imapparser.cc mailheader.cc \ mimehdrline.cc mimeio.cc -tdeio_imap4_la_LIBADD = $(LIB_KIO) $(SASL2_LIBS) ../../libkmime/libkmime.la \ +tdeio_imap4_la_LIBADD = $(LIB_TDEIO) $(SASL2_LIBS) ../../libkmime/libkmime.la \ ../../libemailfunctions/libemailfunctions.la tdeio_imap4_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN) diff --git a/tdeioslaves/mbox/Makefile.am b/tdeioslaves/mbox/Makefile.am index eb1cb3b5..4dea4644 100644 --- a/tdeioslaves/mbox/Makefile.am +++ b/tdeioslaves/mbox/Makefile.am @@ -12,7 +12,7 @@ tdeio_mbox_la_SOURCES = \ readmbox.cc \ stat.cc \ urlinfo.cc -tdeio_mbox_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) +tdeio_mbox_la_LIBADD = $(LIB_TDEIO) $(LIB_QT) $(LIB_TDECORE) tdeio_mbox_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN) noinst_HEADERS = \ diff --git a/tdeioslaves/opengroupware/Makefile.am b/tdeioslaves/opengroupware/Makefile.am index deae4861..fbe8cee1 100644 --- a/tdeioslaves/opengroupware/Makefile.am +++ b/tdeioslaves/opengroupware/Makefile.am @@ -12,6 +12,6 @@ kde_module_LTLIBRARIES = tdeio_opengroupware.la tdeio_opengroupware_la_SOURCES = opengroupware.cpp webdavhandler.cpp tdeio_opengroupware_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \ - $(top_builddir)/libtdepim/libtdepim.la $(LIB_KIO) + $(top_builddir)/libtdepim/libtdepim.la $(LIB_TDEIO) tdeio_opengroupware_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) diff --git a/tdeioslaves/sieve/Makefile.am b/tdeioslaves/sieve/Makefile.am index 082a15a1..0db2e374 100644 --- a/tdeioslaves/sieve/Makefile.am +++ b/tdeioslaves/sieve/Makefile.am @@ -3,7 +3,7 @@ INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/.. $(all_includes) kde_module_LTLIBRARIES = tdeio_sieve.la tdeio_sieve_la_SOURCES = sieve.cpp -tdeio_sieve_la_LIBADD = $(LIB_KIO) $(SASL2_LIBS) $(LIB_QT) $(LIB_TDECORE) +tdeio_sieve_la_LIBADD = $(LIB_TDEIO) $(SASL2_LIBS) $(LIB_QT) $(LIB_TDECORE) tdeio_sieve_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) noinst_HEADERS = sieve.h diff --git a/tdeioslaves/sieve/sieve.cpp b/tdeioslaves/sieve/sieve.cpp index 77b262fd..b3633640 100644 --- a/tdeioslaves/sieve/sieve.cpp +++ b/tdeioslaves/sieve/sieve.cpp @@ -573,7 +573,7 @@ void tdeio_sieveProtocol::put(const KURL& url, int /*permissions*/, bool /*overw append_lf2crlf( data, buffer ); if ( newSize < 0 ) { // read error: network in unknown state so disconnect - error(ERR_COULD_NOT_READ, i18n("KIO data supply error.")); + error(ERR_COULD_NOT_READ, i18n("TDEIO data supply error.")); return; } if ( newSize == 0 ) diff --git a/tderesources/birthdays/CMakeLists.txt b/tderesources/birthdays/CMakeLists.txt index bdde602b..7ac1be77 100644 --- a/tderesources/birthdays/CMakeLists.txt +++ b/tderesources/birthdays/CMakeLists.txt @@ -27,20 +27,20 @@ link_directories( ##### headers ################################### install( FILES - resourcekabc.h resourcekabcconfig.h + resourcetdeabc.h resourcetdeabcconfig.h DESTINATION ${INCLUDE_INSTALL_DIR}/libkcal ) ##### other data ################################ -install( FILES kabc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) +install( FILES tdeabc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) -##### kcal_kabc (module) ####################### +##### kcal_tdeabc (module) ####################### -tde_add_kpart( kcal_kabc AUTOMOC +tde_add_kpart( kcal_tdeabc AUTOMOC SOURCES - resourcekabc.cpp resourcekabcconfig.cpp + resourcetdeabc.cpp resourcetdeabcconfig.cpp LINK kabcommon-static tdepim-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/tderesources/birthdays/Makefile.am b/tderesources/birthdays/Makefile.am index c31fc047..08d3504f 100644 --- a/tderesources/birthdays/Makefile.am +++ b/tderesources/birthdays/Makefile.am @@ -3,22 +3,22 @@ INCLUDES = -I$(top_srcdir) -I$(top_builddir) \ -I$(top_srcdir)/kaddressbook/common \ $(all_includes) -kde_module_LTLIBRARIES = kcal_kabc.la +kde_module_LTLIBRARIES = kcal_tdeabc.la -kcal_tdeabc_la_SOURCES = resourcekabc.cpp resourcekabcconfig.cpp +kcal_tdeabc_la_SOURCES = resourcetdeabc.cpp resourcetdeabcconfig.cpp kcal_tdeabc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) kcal_tdeabc_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \ $(top_builddir)/kaddressbook/common/libkabcommon.la libkcalincludedir = $(includedir)/libkcal -libkcalinclude_HEADERS = resourcekabc.h resourcekabcconfig.h +libkcalinclude_HEADERS = resourcetdeabc.h resourcetdeabcconfig.h servicedir = $(kde_servicesdir)/tderesources/kcal -service_DATA = kabc.desktop +service_DATA = tdeabc.desktop METASOURCES = AUTO messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kres_birthday.pot -resourcekabcconfig.lo: ../../kaddressbook/common/kabprefs_base.h +resourcetdeabcconfig.lo: ../../kaddressbook/common/kabprefs_base.h diff --git a/tderesources/birthdays/kabc.desktop b/tderesources/birthdays/kabc.desktop deleted file mode 100644 index 8fadcb2b..00000000 --- a/tderesources/birthdays/kabc.desktop +++ /dev/null @@ -1,61 +0,0 @@ -[Desktop Entry] -Name=Birthdays From KAddressBook -Name[af]=Verjaarsdae uit KAddressBook -Name[ar]=تواريخ الميلد من KAddressBook -Name[be]=Дні нараджэння з K Адраснай кнігі -Name[bg]=Рождени дни от адресника -Name[br]=Deizioù-ha-bloazioù eus KAddressBook -Name[bs]=Rođendani iz KAddressBook adresara -Name[ca]=Aniversaris des de KAddressBook -Name[cs]=Narozeniny z Knihy adres -Name[cy]=Penblwyddi o KLlyfrCyfeiriadau -Name[da]=Fødselsdage fra KAddressBook -Name[de]=Geburtstage aus dem Adressbuch -Name[el]=Γενέθλια από το KAddressBook -Name[eo]=Naskiĝdatoj de KAdresaro -Name[es]=Cumpleaños desde KAddressBook -Name[et]=Sünnipäevad TDE aadressiraamatust -Name[eu]=Urtebetetzeak KAddressBook-etik -Name[fa]=تولدها از KAddressBook -Name[fi]=Syntymäpäivät TDE:n osoitekirjasta -Name[fr]=Dates de naissance de KAddressBook -Name[fy]=Jierddagen út KAddressBook -Name[ga]=Breithlaethanta ó KAddressBook -Name[gl]=Cumpreanos de KAddressBook -Name[he]=ימי הולדת מתוך KAddressBook -Name[hi]=के-एड्रेस-बुक से जन्मतिथि -Name[hu]=Születésnapok a KAddressBookból -Name[is]=Afmælisdagar úr KAddressBook -Name[it]=Compleanni da KAddessBook -Name[ja]=アドレス帳の誕生日 -Name[kk]=KAddressBook-тағы туған күндер -Name[km]=ថ្ងៃ​ខួប​កំណើត​ពី KAddressBook -Name[lt]=Gimtadieniai iš KAddressBook -Name[mk]=Родендени од КАдресар -Name[ms]=Tarikh Lahir dari KAddressBook -Name[nb]=Bursdagsimport fra KAddressbook -Name[nds]=Geboortsdaag ut KAdressbook -Name[ne]=केडीई ठेगाना पुस्तिकामा भएका जन्मदिन -Name[nl]=Verjaardagen uit KAddressBook -Name[nn]=Fødselsdagar frå TDE-adresseboka -Name[pl]=Urodziny z Książki adresowej -Name[pt]=Aniversários do KAddressBook -Name[pt_BR]=Datas de Nascimento do KAddressBook -Name[ro]=Date de naştere din KAddressBook -Name[ru]=Дни рождения из адресной книги TDE -Name[sk]=Dátumy narodenia z adresára TDE -Name[sl]=Rojstni dnevi iz Adresarja -Name[sr]=Рођендани из KAddressBook-а -Name[sr@Latn]=Rođendani iz KAddressBook-a -Name[sv]=Födelsedagar från adressboken -Name[ta]=கேமுகவரிபுத்தகத்தில் இருந்து பிறந்ததேதிகள் -Name[tg]=Рӯзҳои таваллуд аз китоби адресии TDE -Name[tr]=TDE Adres Defterinden Doğum Günleri -Name[uk]=Дні народження з KAddressBook -Name[zh_CN]=KAddressBook 中的生日 -Name[zh_TW]=自 KaddressBook 匯入生日 -X-TDE-Library=kcal_kabc -Type=Service -ServiceTypes=KResources/Plugin -X-TDE-ResourceFamily=calendar -X-TDE-ResourceType=birthdays diff --git a/tderesources/birthdays/resourcekabc.cpp b/tderesources/birthdays/resourcekabc.cpp deleted file mode 100644 index 68ef6339..00000000 --- a/tderesources/birthdays/resourcekabc.cpp +++ /dev/null @@ -1,528 +0,0 @@ -/* - This file is part of libkcal. - - Copyright (c) 2003 Cornelius Schumacher - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include -#include - -#include -#include -#include - -#include -#include -#include -#include -#include - -#include -#include - -#include "libkcal/vcaldrag.h" -#include "libkcal/vcalformat.h" -#include "libkcal/icalformat.h" -#include "libkcal/exceptions.h" -#include "libkcal/incidence.h" -#include "libkcal/event.h" -#include "libkcal/todo.h" -#include "libkcal/journal.h" -#include "libkcal/filestorage.h" -#include "libkcal/alarm.h" - -#include - -#include - -#include "resourcekabcconfig.h" - -#include "resourcekabc.h" - -using namespace KCal; - -extern "C" -{ - void *init_kcal_kabc() - { - TDEGlobal::locale()->insertCatalogue( "kres_birthday" ); - TDEGlobal::locale()->insertCatalogue( "libkcal" ); - return new KRES::PluginFactory(); - } -} - -ResourceTDEABC::ResourceTDEABC( const TDEConfig* config ) - : ResourceCalendar( config ), mCalendar( TQString::fromLatin1( "UTC" ) ), - mAlarmDays( 0 ), mAlarm( true ), mUseCategories( false ) -{ - if ( config ) { - readConfig( config ); - } else { - setResourceName( i18n( "Birthdays" ) ); - } - - init(); -} - -ResourceTDEABC::ResourceTDEABC() - : ResourceCalendar( 0 ), mCalendar( TQString::fromLatin1( "UTC" ) ), - mAlarmDays( 0 ), mAlarm( true ), mUseCategories( false ) -{ - init(); -} - -ResourceTDEABC::~ResourceTDEABC() -{ - delete mLock; -} - -void ResourceTDEABC::init() -{ - setType( "birthdays" ); - - setReadOnly( true ); - - mLock = new TDEABC::LockNull( false ); - - mAddressbook = 0; -} - -void ResourceTDEABC::readConfig( const TDEConfig *config ) -{ - mAlarmDays = config->readNumEntry( "AlarmDays", 0 ); - mAlarm = config->readBoolEntry( "Alarm", true ); - mCategories = config->readListEntry( "Categories" ); - mUseCategories = config->readBoolEntry( "UseCategories", false ); -} - -void ResourceTDEABC::writeConfig( TDEConfig *config ) -{ - ResourceCalendar::writeConfig( config ); - config->writeEntry( "AlarmDays", mAlarmDays ); - config->writeEntry( "Alarm", mAlarm ); - config->writeEntry( "Categories", mCategories ); - config->writeEntry( "UseCategories", mUseCategories ); -} - - -bool ResourceTDEABC::doOpen() -{ - kdDebug(5800) << "ResourceTDEABC::doOpen()" << endl; - - mAddressbook = TDEABC::StdAddressBook::self( true ); - connect( mAddressbook, TQT_SIGNAL(addressBookChanged(AddressBook*)), TQT_SLOT( reload() ) ); - - return true; -} - -bool ResourceTDEABC::doLoad() -{ - kdDebug(5800) << "ResourceTDEABC::load()" << endl; - - mCalendar.close(); - - // import from kabc - TQString summary; - TQStringList::ConstIterator strIt; - const TQStringList::ConstIterator endStrIt = mCategories.end(); - TDEABC::Addressee::List anniversaries; - TDEABC::Addressee::List::Iterator addrIt; - - TDEABC::AddressBook::Iterator it; - const TDEABC::AddressBook::Iterator endIt = mAddressbook->end(); - for ( it = mAddressbook->begin(); it != endIt; ++it ) { - - if ( mUseCategories ) { - bool hasCategory = false; - TQStringList categories = (*it).categories(); - for ( strIt = mCategories.begin(); strIt != endStrIt; ++strIt ) - if ( categories.contains( *strIt ) ) { - hasCategory = true; - break; - } - - if ( !hasCategory ) - continue; - } - - TQDate birthdate = (*it).birthday().date(); - TQString name_1, email_1, uid_1; - if ( birthdate.isValid() ) { - kdDebug(5800) << "found a birthday " << TQString(birthdate.toString()) << endl; - - name_1 = (*it).nickName(); - email_1 = (*it).fullEmail(); - uid_1 = (*it).uid(); - if (name_1.isEmpty()) name_1 = (*it).realName(); - summary = i18n("%1's birthday").arg( name_1 ); - - - Event *ev = new Event(); - ev->setUid( uid_1+"_KABC_Birthday"); - - ev->setDtStart(birthdate); - ev->setDtEnd(birthdate); - ev->setHasEndDate(true); - ev->setFloats(true); - ev->setTransparency( Event::Transparent ); - - ev->setCustomProperty("KABC", "BIRTHDAY", "YES"); - ev->setCustomProperty("KABC", "UID-1", uid_1 ); - ev->setCustomProperty("KABC", "NAME-1", name_1 ); - ev->setCustomProperty("KABC", "EMAIL-1", email_1 ); - kdDebug(5800) << "ResourceTDEABC::doLoad: uid:" << uid_1 << " name: " << name_1 - << " email: " << email_1 << endl; - ev->setSummary(summary); - - // Set the recurrence - Recurrence *vRecurrence = ev->recurrence(); - vRecurrence->setStartDate( birthdate ); - vRecurrence->setYearly( 1 ); - if ( birthdate.month()==2 && birthdate.day()==29 ) { - vRecurrence->addYearlyDay( 60 ); - } - - ev->clearAlarms(); - - if ( mAlarm ) { - // Set the alarm - Alarm* vAlarm = ev->newAlarm(); - vAlarm->setText(summary); - vAlarm->setTime(birthdate); - // 24 hours before. duration is in seconds. - vAlarm->setStartOffset( -86400 * mAlarmDays ); - vAlarm->setEnabled(true); - } - - // insert category - ev->setCategories(i18n("Birthday")); - - ev->setReadOnly( true ); - mCalendar.addEvent(ev); - kdDebug(5800) << "imported " << TQString(birthdate.toString()) << endl; - } - - TQString anniversary_string = (*it).custom( "KADDRESSBOOK", "X-Anniversary" ); - if (anniversary_string.isEmpty() ) - continue; - TQDateTime anniversary = TQDate::fromString( anniversary_string, Qt::ISODate ); - if ( !anniversary.isValid() ) - continue; - - TQString name = (*it).custom( "KADDRESSBOOK", "X-SpousesName" ); - if ( name.isEmpty() ) - anniversaries.append( *it ); - else { - bool found = false; - for ( addrIt = anniversaries.begin(); addrIt != anniversaries.end(); ++addrIt ) { - if ( name == (*addrIt).realName() ) { - TQDate spouseAnniversary = - TQDate::fromString( (*addrIt).custom( "KADDRESSBOOK", "X-Anniversary" ), Qt::ISODate ); - if ( anniversary == TQDateTime(spouseAnniversary) ) { - found = true; - break; - - } - } - } - - if ( !found ) - anniversaries.append( *it ); - } - } - - for ( addrIt = anniversaries.begin(); addrIt != anniversaries.end(); ++addrIt ) { - TQDate anniversary = TQDate::fromString( (*addrIt).custom( "KADDRESSBOOK", "X-Anniversary" ), Qt::ISODate ); - kdDebug(5800) << "found a anniversary " << TQString(anniversary.toString()) << endl; - TQString name; - TQString name_1 = (*addrIt).nickName(); - TQString uid_1 = (*addrIt).uid(); - TQString email_1 = (*addrIt).fullEmail(); - if ( name_1.isEmpty() ) - name_1 = (*addrIt).realName(); - - - TQString spouseName = (*addrIt).custom( "KADDRESSBOOK", "X-SpousesName" ); - TQString name_2,email_2,uid_2; - if ( !spouseName.isEmpty() ) { - TQString tname, temail; - KPIM::getNameAndMail( spouseName, tname, temail ); - tname = KPIM::quoteNameIfNecessary( tname ); - if ( ( tname[0] == '"' ) && ( tname[tname.length() - 1] == '"' ) ) { - tname.remove( 0, 1 ); - tname.truncate( tname.length() - 1 ); - } - TDEABC::Addressee spouse; - spouse.setNameFromString( tname ); - name_2 = spouse.nickName(); - uid_2 = spouse.uid(); - email_2 = spouse.fullEmail(); - if ( name_2.isEmpty() ) { - name_2 = spouse.realName(); - } - summary = i18n("insert names of both spouses", - "%1's & %2's anniversary").arg( name_1 ).arg( name_2 ); - } else { - summary = i18n("only one spouse in addressbook, insert the name", - "%1's anniversary").arg( name_1 ); - } - - Event *ev = new Event(); - ev->setUid( uid_1+"_KABC_Anniversary" ); - - ev->setDtStart(anniversary); - ev->setDtEnd(anniversary); - ev->setHasEndDate(true); - ev->setFloats(true); - - ev->setSummary(summary); - - ev->setCustomProperty( "KABC", "BIRTHDAY", "YES" ); - - ev->setCustomProperty( "KABC", "UID-1", uid_1 ); - ev->setCustomProperty( "KABC", "NAME-1", name_1 ); - ev->setCustomProperty( "KABC", "EMAIL-1", email_1 ); - ev->setCustomProperty( "KABC", "ANNIVERSARY", "YES" ); - if ( !spouseName.isEmpty() ) { - ev->setCustomProperty("KABC", "UID-2", uid_2 ); - ev->setCustomProperty("KABC", "NAME-2", spouseName ); - ev->setCustomProperty("KABC", "EMAIL-2", email_2 ); - } - // Set the recurrence - Recurrence *vRecurrence = ev->recurrence(); - vRecurrence->setStartDate( anniversary ); - vRecurrence->setYearly( 1 ); - if ( anniversary.month()==2 && anniversary.day()==29 ) { - vRecurrence->addYearlyDay( 60 ); - } - - ev->clearAlarms(); - - if ( mAlarm ) { - // Set the alarm - Alarm* vAlarm = ev->newAlarm(); - vAlarm->setText(summary); - vAlarm->setTime(anniversary); - // 24 hours before. duration is in seconds. - vAlarm->setStartOffset( -86400 * mAlarmDays ); - vAlarm->setEnabled(true); - } - - // insert category - ev->setCategories(i18n("Anniversary")); - - ev->setReadOnly( true ); - mCalendar.addEvent(ev); - kdDebug(5800) << "imported " << TQString(anniversary.toString()) << endl; - } - - return true; -} - -void ResourceTDEABC::setAlarm( bool a ) -{ - mAlarm = a; -} - -bool ResourceTDEABC::alarm() -{ - return mAlarm; -} - -void ResourceTDEABC::setAlarmDays( int ad ) -{ - mAlarmDays = ad; -} - -int ResourceTDEABC::alarmDays() -{ - return mAlarmDays; -} - -void ResourceTDEABC::setCategories( const TQStringList &categories ) -{ - mCategories = categories; -} - -TQStringList ResourceTDEABC::categories() const -{ - return mCategories; -} - -void ResourceTDEABC::setUseCategories( bool useCategories ) -{ - mUseCategories = useCategories; -} - -bool ResourceTDEABC::useCategories() const -{ - return mUseCategories; -} - -bool ResourceTDEABC::doSave() -{ - // is always read only! - return true; -} - -bool ResourceTDEABC::isSaving() -{ - return false; -} - -TDEABC::Lock *ResourceTDEABC::lock() -{ - return mLock; -} - - -bool ResourceTDEABC::addEvent( Event * ) -{ - return false; -} - -bool ResourceTDEABC::addEvent( Event *, const TQString & ) -{ - return false; -} - -bool ResourceTDEABC::deleteEvent( Event * ) -{ - return false; -} - - -Event *ResourceTDEABC::event( const TQString &uid ) -{ - return mCalendar.event( uid ); -} - -Event::List ResourceTDEABC::rawEventsForDate( const TQDate &date, - EventSortField sortField, - SortDirection sortDirection ) -{ - return mCalendar.rawEventsForDate( date, sortField, sortDirection ); -} - -Event::List ResourceTDEABC::rawEvents( const TQDate &start, const TQDate &end, - bool inclusive ) -{ - return mCalendar.rawEvents( start, end, inclusive ); -} - -Event::List ResourceTDEABC::rawEventsForDate(const TQDateTime &qdt) -{ - return mCalendar.rawEventsForDate( qdt.date() ); -} - -Event::List ResourceTDEABC::rawEvents( EventSortField sortField, SortDirection sortDirection ) -{ - return mCalendar.rawEvents( sortField, sortDirection ); -} - -bool ResourceTDEABC::addTodo( Todo * ) -{ - return false; -} - -bool ResourceTDEABC::addTodo( Todo *, const TQString & ) -{ - return false; -} - -bool ResourceTDEABC::deleteTodo( Todo * ) -{ - return false; -} - - -Todo::List ResourceTDEABC::rawTodos( TodoSortField sortField, SortDirection sortDirection ) -{ - return mCalendar.rawTodos( sortField, sortDirection ); -} - -Todo *ResourceTDEABC::todo( const TQString &uid ) -{ - return mCalendar.todo( uid ); -} - -Todo::List ResourceTDEABC::rawTodosForDate( const TQDate &date ) -{ - return mCalendar.rawTodosForDate( date ); -} - - -bool ResourceTDEABC::addJournal( Journal * ) -{ - return false; -} - -bool ResourceTDEABC::addJournal( Journal *, const TQString & ) -{ - return false; -} - -bool ResourceTDEABC::deleteJournal( Journal * ) -{ - return false; -} - -Journal *ResourceTDEABC::journal(const TQString &uid) -{ - return mCalendar.journal( uid ); -} - -Journal::List ResourceTDEABC::rawJournals( JournalSortField sortField, SortDirection sortDirection ) -{ - return mCalendar.rawJournals( sortField, sortDirection ); -} - -Journal::List ResourceTDEABC::rawJournalsForDate( const TQDate &date ) -{ - return mCalendar.rawJournalsForDate( date ); -} - -Alarm::List ResourceTDEABC::alarmsTo( const TQDateTime &to ) -{ - return mCalendar.alarmsTo( to ); -} - -Alarm::List ResourceTDEABC::alarms( const TQDateTime &from, const TQDateTime &to ) -{ -// kdDebug(5800) << "ResourceTDEABC::alarms(" << from.toString() << " - " << to.toString() << ")\n"; - - return mCalendar.alarms( from, to ); -} - -void ResourceTDEABC::dump() const -{ - ResourceCalendar::dump(); -} - -void ResourceTDEABC::reload() -{ - load(); - emit resourceChanged( this ); -} - -void ResourceTDEABC::setTimeZoneId( const TQString& tzid ) -{ - mCalendar.setTimeZoneId( tzid ); -} - -#include "resourcekabc.moc" diff --git a/tderesources/birthdays/resourcekabc.h b/tderesources/birthdays/resourcekabc.h deleted file mode 100644 index bea4b463..00000000 --- a/tderesources/birthdays/resourcekabc.h +++ /dev/null @@ -1,185 +0,0 @@ -/* - This file is part of libkcal. - - Copyright (c) 2003 Cornelius Schumacher - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ -#ifndef KCAL_RESOURCEKABC_H -#define KCAL_RESOURCEKABC_H - -#include -#include -#include - -#include - -#include "libkcal/incidence.h" -#include "libkcal/calendarlocal.h" -#include - -#include "libkcal/resourcecalendar.h" - -#include "libtdepim/tdepimmacros.h" - -namespace TDEIO { -class FileCopyJob; -class Job; -} - -namespace KCal { - -/** - Resource providing birthdays and anniversaries as events. -*/ -class KDE_EXPORT ResourceTDEABC : public ResourceCalendar -{ - Q_OBJECT - - - friend class ResourceTDEABCConfig; - - public: - ResourceTDEABC( const TDEConfig * ); - ResourceTDEABC( ); - virtual ~ResourceTDEABC(); - - void readConfig( const TDEConfig *config ); - void writeConfig( TDEConfig* config ); - - void setAlarm( bool ); - bool alarm(); - - void setAlarmDays( int ); - int alarmDays(); - - void setCategories( const TQStringList &categories ); - TQStringList categories() const; - - void setUseCategories( bool useCategories ); - bool useCategories() const; - - bool isSaving(); - - TDEABC::Lock *lock(); - - /** Add Event to calendar. */ - KDE_DEPRECATED bool addEvent(Event *event); - bool addEvent( Event *event, const TQString &subresource ); - /** deletes an event from this calendar. */ - bool deleteEvent(Event *); - - /** - Retrieves an event on the basis of the unique string ID. - */ - Event *event(const TQString &UniqueStr); - /** - Return unfiltered list of all events in calendar. - */ - Event::List rawEvents( EventSortField sortField = EventSortUnsorted, SortDirection sortDirection = SortDirectionAscending ); - /** - Builds and then returns a list of all events that match for the - date specified. useful for dayView, etc. etc. - */ - Event::List rawEventsForDate( const TQDate &date, EventSortField sortField = EventSortUnsorted, SortDirection sortDirection = SortDirectionAscending ); - /** - Get unfiltered events for date \a qdt. - */ - Event::List rawEventsForDate( const TQDateTime &qdt ); - /** - Get unfiltered events in a range of dates. If inclusive is set to true, - only events are returned, which are completely included in the range. - */ - Event::List rawEvents( const TQDate &start, const TQDate &end, - bool inclusive = false ); - - /** - Add a todo to the todolist. - */ - KDE_DEPRECATED bool addTodo( Todo *todo ); - bool addTodo( Todo *todo, const TQString &subresource ); - /** - Remove a todo from the todolist. - */ - bool deleteTodo( Todo * ); - /** - Searches todolist for an event with this unique string identifier, - returns a pointer or null. - */ - Todo *todo( const TQString &uid ); - /** - Return list of all todos. - */ - Todo::List rawTodos( TodoSortField sortField = TodoSortUnsorted, SortDirection sortDirection = SortDirectionAscending ); - /** - Returns list of todos due on the specified date. - */ - Todo::List rawTodosForDate( const TQDate &date ); - /** Add a Journal entry to calendar */ - KDE_DEPRECATED bool addJournal( Journal *journal ); - bool addJournal( Journal *journal, const TQString &subresource ); - - /** Remove journal from the calendar. */ - bool deleteJournal( Journal * ); - /** Return Journal with given UID */ - virtual Journal *journal(const TQString &uid); - /** - Return list of all journals. - */ - Journal::List rawJournals( JournalSortField sortField = JournalSortUnsorted, SortDirection sortDirection = SortDirectionAscending ); - /** - Returns list of journals for the given date. - */ - Journal::List rawJournalsForDate( const TQDate &date ); - - /** Return all alarms, which ocur in the given time interval. */ - Alarm::List alarms( const TQDateTime &from, const TQDateTime &to ); - - /** Return all alarms, which ocur before given date. */ - Alarm::List alarmsTo( const TQDateTime &to ); - - void dump() const; - - void setTimeZoneId( const TQString &timeZoneId ); - - protected: - bool doOpen(); - bool doLoad(); - bool doSave(); - - private slots: - void reload(); - - private: - void init(); - - CalendarLocal mCalendar; - - int mAlarmDays; - bool mAlarm; - TQStringList mCategories; - bool mUseCategories; - TDEABC::AddressBook *mAddressbook; - - TDEABC::Lock *mLock; - - class Private; - Private *d; -}; - -} - -#endif diff --git a/tderesources/birthdays/resourcekabcconfig.cpp b/tderesources/birthdays/resourcekabcconfig.cpp deleted file mode 100644 index 6bead14b..00000000 --- a/tderesources/birthdays/resourcekabcconfig.cpp +++ /dev/null @@ -1,135 +0,0 @@ -/* - This file is part of libkcal. - - Copyright (c) 2003 Cornelius Schumacher - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include - -#include -#include - -#include -#include -#include - -#include "resourcekabc.h" -#include "resourcekabcconfig.h" - -using namespace KCal; - -ResourceTDEABCConfig::ResourceTDEABCConfig( TQWidget* parent, const char* name ) - : KRES::ConfigWidget( parent, name ) -{ - TQGridLayout *topLayout = new TQGridLayout( this, 5, 1, 11, 6 ); - - mAlarm = new TQCheckBox(i18n("Set reminder"), this); - topLayout->addWidget(mAlarm, 0, 0); - TQBoxLayout *alarmLayout = new TQHBoxLayout(topLayout); - - mALabel = new TQLabel(i18n("Reminder before (in days):"), this); - alarmLayout->addWidget(mALabel); - mAlarmTimeEdit = new KRestrictedLine(this, "alarmTimeEdit", "1234567890"); - mAlarmTimeEdit->setText("0"); - alarmLayout->addWidget(mAlarmTimeEdit); - - TQFrame *line = new TQFrame( this ); - line->setFrameStyle( TQFrame::Sunken | TQFrame::HLine ); - topLayout->addMultiCellWidget( line, 2, 2, 0, 1 ); - - mUseCategories = new TQCheckBox( i18n( "Filter by categories" ), this ); - topLayout->addMultiCellWidget( mUseCategories, 3, 3, 0, 1 ); - - mCategoryView = new TDEListView( this ); - mCategoryView->addColumn( "" ); - mCategoryView->header()->hide(); - mCategoryView->setEnabled( false ); - topLayout->addMultiCellWidget( mCategoryView, 4, 4, 0, 1 ); - - connect( mUseCategories, TQT_SIGNAL( toggled( bool ) ), - mCategoryView, TQT_SLOT( setEnabled( bool ) ) ); - - mAlarmTimeEdit->setDisabled(true); - mALabel->setDisabled(true); - - connect(mAlarm, TQT_SIGNAL(clicked()), TQT_SLOT(alarmClicked())); - - setReadOnly( true ); - - KABPrefs *prefs = KABPrefs::instance(); - const TQStringList categories = prefs->customCategories(); - TQStringList::ConstIterator it; - for ( it = categories.begin(); it != categories.end(); ++it ) - new TQCheckListItem( mCategoryView, *it, TQCheckListItem::CheckBox ); -} - -void ResourceTDEABCConfig::loadSettings( KRES::Resource *resource ) -{ - ResourceTDEABC *res = static_cast( resource ); - if ( res ) { - mAlarm->setChecked( res->alarm() ); - TQString days; - mAlarmTimeEdit->setText( days.setNum(res->alarmDays()) ); - - mAlarmTimeEdit->setEnabled( res->alarm() ); - mALabel->setEnabled( res->alarm() ); - - const TQStringList categories = res->categories(); - TQListViewItemIterator it( mCategoryView ); - while ( it.current() ) { - if ( categories.contains( it.current()->text( 0 ) ) ) { - TQCheckListItem *item = static_cast( it.current() ); - item->setOn( true ); - } - ++it; - } - - mUseCategories->setChecked( res->useCategories() ); - } else { - kdDebug(5700) << "ERROR: ResourceTDEABCConfig::loadSettings(): no ResourceTDEABC, cast failed" << endl; - } -} - -void ResourceTDEABCConfig::saveSettings( KRES::Resource *resource ) -{ - ResourceTDEABC *res = static_cast( resource ); - if ( res ) { - res->setAlarm( mAlarm->isChecked() ); - res->setAlarmDays( mAlarmTimeEdit->text().toInt() ); - setReadOnly( true ); - - TQStringList categories; - TQListViewItemIterator it( mCategoryView, TQListViewItemIterator::Checked ); - while ( it.current() ) { - categories.append( it.current()->text( 0 ) ); - ++it; - } - res->setCategories( categories ); - res->setUseCategories( mUseCategories->isChecked() ); - } else { - kdDebug(5700) << "ERROR: ResourceTDEABCConfig::saveSettings(): no ResourceTDEABC, cast failed" << endl; - } -} - -void ResourceTDEABCConfig::alarmClicked() -{ - mAlarmTimeEdit->setDisabled(!mAlarm->isChecked()); - mALabel->setDisabled(!mAlarm->isChecked()); -} - -#include "resourcekabcconfig.moc" diff --git a/tderesources/birthdays/resourcekabcconfig.h b/tderesources/birthdays/resourcekabcconfig.h deleted file mode 100644 index c62037c2..00000000 --- a/tderesources/birthdays/resourcekabcconfig.h +++ /dev/null @@ -1,68 +0,0 @@ -/* - This file is part of libkcal. - - Copyright (c) 2002 Tobias Koenig - Copyright (c) 2002 Jan-Pascal van Best - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef KCAL_RESOURCEKABCCONFIG_H -#define KCAL_RESOURCEKABCCONFIG_H - -#include -#include - -#include -#include -#include -#include - -namespace KCal { - -/** - Configuration widget for birtday/anniversaries resource. - - @see ResourceTDEABC -*/ -class ResourceTDEABCConfig : public KRES::ConfigWidget -{ - Q_OBJECT - - public: - ResourceTDEABCConfig( TQWidget* parent = 0, const char* name = 0 ); - - public slots: - virtual void loadSettings( KRES::Resource *resource); - virtual void saveSettings( KRES::Resource *resource ); - - private slots: - void alarmClicked(); - - private: - TQCheckBox *mAlarm; - KRestrictedLine *mAlarmTimeEdit; - TQLabel *mALabel; - TQCheckBox *mUseCategories; - TDEListView *mCategoryView; - - class Private; - Private *d; -}; - -} - -#endif diff --git a/tderesources/birthdays/resourcetdeabc.cpp b/tderesources/birthdays/resourcetdeabc.cpp new file mode 100644 index 00000000..d36ebddd --- /dev/null +++ b/tderesources/birthdays/resourcetdeabc.cpp @@ -0,0 +1,528 @@ +/* + This file is part of libkcal. + + Copyright (c) 2003 Cornelius Schumacher + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include +#include + +#include +#include +#include + +#include +#include +#include +#include +#include + +#include +#include + +#include "libkcal/vcaldrag.h" +#include "libkcal/vcalformat.h" +#include "libkcal/icalformat.h" +#include "libkcal/exceptions.h" +#include "libkcal/incidence.h" +#include "libkcal/event.h" +#include "libkcal/todo.h" +#include "libkcal/journal.h" +#include "libkcal/filestorage.h" +#include "libkcal/alarm.h" + +#include + +#include + +#include "resourcetdeabcconfig.h" + +#include "resourcetdeabc.h" + +using namespace KCal; + +extern "C" +{ + void *init_kcal_tdeabc() + { + TDEGlobal::locale()->insertCatalogue( "kres_birthday" ); + TDEGlobal::locale()->insertCatalogue( "libkcal" ); + return new KRES::PluginFactory(); + } +} + +ResourceTDEABC::ResourceTDEABC( const TDEConfig* config ) + : ResourceCalendar( config ), mCalendar( TQString::fromLatin1( "UTC" ) ), + mAlarmDays( 0 ), mAlarm( true ), mUseCategories( false ) +{ + if ( config ) { + readConfig( config ); + } else { + setResourceName( i18n( "Birthdays" ) ); + } + + init(); +} + +ResourceTDEABC::ResourceTDEABC() + : ResourceCalendar( 0 ), mCalendar( TQString::fromLatin1( "UTC" ) ), + mAlarmDays( 0 ), mAlarm( true ), mUseCategories( false ) +{ + init(); +} + +ResourceTDEABC::~ResourceTDEABC() +{ + delete mLock; +} + +void ResourceTDEABC::init() +{ + setType( "birthdays" ); + + setReadOnly( true ); + + mLock = new TDEABC::LockNull( false ); + + mAddressbook = 0; +} + +void ResourceTDEABC::readConfig( const TDEConfig *config ) +{ + mAlarmDays = config->readNumEntry( "AlarmDays", 0 ); + mAlarm = config->readBoolEntry( "Alarm", true ); + mCategories = config->readListEntry( "Categories" ); + mUseCategories = config->readBoolEntry( "UseCategories", false ); +} + +void ResourceTDEABC::writeConfig( TDEConfig *config ) +{ + ResourceCalendar::writeConfig( config ); + config->writeEntry( "AlarmDays", mAlarmDays ); + config->writeEntry( "Alarm", mAlarm ); + config->writeEntry( "Categories", mCategories ); + config->writeEntry( "UseCategories", mUseCategories ); +} + + +bool ResourceTDEABC::doOpen() +{ + kdDebug(5800) << "ResourceTDEABC::doOpen()" << endl; + + mAddressbook = TDEABC::StdAddressBook::self( true ); + connect( mAddressbook, TQT_SIGNAL(addressBookChanged(AddressBook*)), TQT_SLOT( reload() ) ); + + return true; +} + +bool ResourceTDEABC::doLoad() +{ + kdDebug(5800) << "ResourceTDEABC::load()" << endl; + + mCalendar.close(); + + // import from tdeabc + TQString summary; + TQStringList::ConstIterator strIt; + const TQStringList::ConstIterator endStrIt = mCategories.end(); + TDEABC::Addressee::List anniversaries; + TDEABC::Addressee::List::Iterator addrIt; + + TDEABC::AddressBook::Iterator it; + const TDEABC::AddressBook::Iterator endIt = mAddressbook->end(); + for ( it = mAddressbook->begin(); it != endIt; ++it ) { + + if ( mUseCategories ) { + bool hasCategory = false; + TQStringList categories = (*it).categories(); + for ( strIt = mCategories.begin(); strIt != endStrIt; ++strIt ) + if ( categories.contains( *strIt ) ) { + hasCategory = true; + break; + } + + if ( !hasCategory ) + continue; + } + + TQDate birthdate = (*it).birthday().date(); + TQString name_1, email_1, uid_1; + if ( birthdate.isValid() ) { + kdDebug(5800) << "found a birthday " << TQString(birthdate.toString()) << endl; + + name_1 = (*it).nickName(); + email_1 = (*it).fullEmail(); + uid_1 = (*it).uid(); + if (name_1.isEmpty()) name_1 = (*it).realName(); + summary = i18n("%1's birthday").arg( name_1 ); + + + Event *ev = new Event(); + ev->setUid( uid_1+"_KABC_Birthday"); + + ev->setDtStart(birthdate); + ev->setDtEnd(birthdate); + ev->setHasEndDate(true); + ev->setFloats(true); + ev->setTransparency( Event::Transparent ); + + ev->setCustomProperty("KABC", "BIRTHDAY", "YES"); + ev->setCustomProperty("KABC", "UID-1", uid_1 ); + ev->setCustomProperty("KABC", "NAME-1", name_1 ); + ev->setCustomProperty("KABC", "EMAIL-1", email_1 ); + kdDebug(5800) << "ResourceTDEABC::doLoad: uid:" << uid_1 << " name: " << name_1 + << " email: " << email_1 << endl; + ev->setSummary(summary); + + // Set the recurrence + Recurrence *vRecurrence = ev->recurrence(); + vRecurrence->setStartDate( birthdate ); + vRecurrence->setYearly( 1 ); + if ( birthdate.month()==2 && birthdate.day()==29 ) { + vRecurrence->addYearlyDay( 60 ); + } + + ev->clearAlarms(); + + if ( mAlarm ) { + // Set the alarm + Alarm* vAlarm = ev->newAlarm(); + vAlarm->setText(summary); + vAlarm->setTime(birthdate); + // 24 hours before. duration is in seconds. + vAlarm->setStartOffset( -86400 * mAlarmDays ); + vAlarm->setEnabled(true); + } + + // insert category + ev->setCategories(i18n("Birthday")); + + ev->setReadOnly( true ); + mCalendar.addEvent(ev); + kdDebug(5800) << "imported " << TQString(birthdate.toString()) << endl; + } + + TQString anniversary_string = (*it).custom( "KADDRESSBOOK", "X-Anniversary" ); + if (anniversary_string.isEmpty() ) + continue; + TQDateTime anniversary = TQDate::fromString( anniversary_string, Qt::ISODate ); + if ( !anniversary.isValid() ) + continue; + + TQString name = (*it).custom( "KADDRESSBOOK", "X-SpousesName" ); + if ( name.isEmpty() ) + anniversaries.append( *it ); + else { + bool found = false; + for ( addrIt = anniversaries.begin(); addrIt != anniversaries.end(); ++addrIt ) { + if ( name == (*addrIt).realName() ) { + TQDate spouseAnniversary = + TQDate::fromString( (*addrIt).custom( "KADDRESSBOOK", "X-Anniversary" ), Qt::ISODate ); + if ( anniversary == TQDateTime(spouseAnniversary) ) { + found = true; + break; + + } + } + } + + if ( !found ) + anniversaries.append( *it ); + } + } + + for ( addrIt = anniversaries.begin(); addrIt != anniversaries.end(); ++addrIt ) { + TQDate anniversary = TQDate::fromString( (*addrIt).custom( "KADDRESSBOOK", "X-Anniversary" ), Qt::ISODate ); + kdDebug(5800) << "found a anniversary " << TQString(anniversary.toString()) << endl; + TQString name; + TQString name_1 = (*addrIt).nickName(); + TQString uid_1 = (*addrIt).uid(); + TQString email_1 = (*addrIt).fullEmail(); + if ( name_1.isEmpty() ) + name_1 = (*addrIt).realName(); + + + TQString spouseName = (*addrIt).custom( "KADDRESSBOOK", "X-SpousesName" ); + TQString name_2,email_2,uid_2; + if ( !spouseName.isEmpty() ) { + TQString tname, temail; + KPIM::getNameAndMail( spouseName, tname, temail ); + tname = KPIM::quoteNameIfNecessary( tname ); + if ( ( tname[0] == '"' ) && ( tname[tname.length() - 1] == '"' ) ) { + tname.remove( 0, 1 ); + tname.truncate( tname.length() - 1 ); + } + TDEABC::Addressee spouse; + spouse.setNameFromString( tname ); + name_2 = spouse.nickName(); + uid_2 = spouse.uid(); + email_2 = spouse.fullEmail(); + if ( name_2.isEmpty() ) { + name_2 = spouse.realName(); + } + summary = i18n("insert names of both spouses", + "%1's & %2's anniversary").arg( name_1 ).arg( name_2 ); + } else { + summary = i18n("only one spouse in addressbook, insert the name", + "%1's anniversary").arg( name_1 ); + } + + Event *ev = new Event(); + ev->setUid( uid_1+"_KABC_Anniversary" ); + + ev->setDtStart(anniversary); + ev->setDtEnd(anniversary); + ev->setHasEndDate(true); + ev->setFloats(true); + + ev->setSummary(summary); + + ev->setCustomProperty( "KABC", "BIRTHDAY", "YES" ); + + ev->setCustomProperty( "KABC", "UID-1", uid_1 ); + ev->setCustomProperty( "KABC", "NAME-1", name_1 ); + ev->setCustomProperty( "KABC", "EMAIL-1", email_1 ); + ev->setCustomProperty( "KABC", "ANNIVERSARY", "YES" ); + if ( !spouseName.isEmpty() ) { + ev->setCustomProperty("KABC", "UID-2", uid_2 ); + ev->setCustomProperty("KABC", "NAME-2", spouseName ); + ev->setCustomProperty("KABC", "EMAIL-2", email_2 ); + } + // Set the recurrence + Recurrence *vRecurrence = ev->recurrence(); + vRecurrence->setStartDate( anniversary ); + vRecurrence->setYearly( 1 ); + if ( anniversary.month()==2 && anniversary.day()==29 ) { + vRecurrence->addYearlyDay( 60 ); + } + + ev->clearAlarms(); + + if ( mAlarm ) { + // Set the alarm + Alarm* vAlarm = ev->newAlarm(); + vAlarm->setText(summary); + vAlarm->setTime(anniversary); + // 24 hours before. duration is in seconds. + vAlarm->setStartOffset( -86400 * mAlarmDays ); + vAlarm->setEnabled(true); + } + + // insert category + ev->setCategories(i18n("Anniversary")); + + ev->setReadOnly( true ); + mCalendar.addEvent(ev); + kdDebug(5800) << "imported " << TQString(anniversary.toString()) << endl; + } + + return true; +} + +void ResourceTDEABC::setAlarm( bool a ) +{ + mAlarm = a; +} + +bool ResourceTDEABC::alarm() +{ + return mAlarm; +} + +void ResourceTDEABC::setAlarmDays( int ad ) +{ + mAlarmDays = ad; +} + +int ResourceTDEABC::alarmDays() +{ + return mAlarmDays; +} + +void ResourceTDEABC::setCategories( const TQStringList &categories ) +{ + mCategories = categories; +} + +TQStringList ResourceTDEABC::categories() const +{ + return mCategories; +} + +void ResourceTDEABC::setUseCategories( bool useCategories ) +{ + mUseCategories = useCategories; +} + +bool ResourceTDEABC::useCategories() const +{ + return mUseCategories; +} + +bool ResourceTDEABC::doSave() +{ + // is always read only! + return true; +} + +bool ResourceTDEABC::isSaving() +{ + return false; +} + +TDEABC::Lock *ResourceTDEABC::lock() +{ + return mLock; +} + + +bool ResourceTDEABC::addEvent( Event * ) +{ + return false; +} + +bool ResourceTDEABC::addEvent( Event *, const TQString & ) +{ + return false; +} + +bool ResourceTDEABC::deleteEvent( Event * ) +{ + return false; +} + + +Event *ResourceTDEABC::event( const TQString &uid ) +{ + return mCalendar.event( uid ); +} + +Event::List ResourceTDEABC::rawEventsForDate( const TQDate &date, + EventSortField sortField, + SortDirection sortDirection ) +{ + return mCalendar.rawEventsForDate( date, sortField, sortDirection ); +} + +Event::List ResourceTDEABC::rawEvents( const TQDate &start, const TQDate &end, + bool inclusive ) +{ + return mCalendar.rawEvents( start, end, inclusive ); +} + +Event::List ResourceTDEABC::rawEventsForDate(const TQDateTime &qdt) +{ + return mCalendar.rawEventsForDate( qdt.date() ); +} + +Event::List ResourceTDEABC::rawEvents( EventSortField sortField, SortDirection sortDirection ) +{ + return mCalendar.rawEvents( sortField, sortDirection ); +} + +bool ResourceTDEABC::addTodo( Todo * ) +{ + return false; +} + +bool ResourceTDEABC::addTodo( Todo *, const TQString & ) +{ + return false; +} + +bool ResourceTDEABC::deleteTodo( Todo * ) +{ + return false; +} + + +Todo::List ResourceTDEABC::rawTodos( TodoSortField sortField, SortDirection sortDirection ) +{ + return mCalendar.rawTodos( sortField, sortDirection ); +} + +Todo *ResourceTDEABC::todo( const TQString &uid ) +{ + return mCalendar.todo( uid ); +} + +Todo::List ResourceTDEABC::rawTodosForDate( const TQDate &date ) +{ + return mCalendar.rawTodosForDate( date ); +} + + +bool ResourceTDEABC::addJournal( Journal * ) +{ + return false; +} + +bool ResourceTDEABC::addJournal( Journal *, const TQString & ) +{ + return false; +} + +bool ResourceTDEABC::deleteJournal( Journal * ) +{ + return false; +} + +Journal *ResourceTDEABC::journal(const TQString &uid) +{ + return mCalendar.journal( uid ); +} + +Journal::List ResourceTDEABC::rawJournals( JournalSortField sortField, SortDirection sortDirection ) +{ + return mCalendar.rawJournals( sortField, sortDirection ); +} + +Journal::List ResourceTDEABC::rawJournalsForDate( const TQDate &date ) +{ + return mCalendar.rawJournalsForDate( date ); +} + +Alarm::List ResourceTDEABC::alarmsTo( const TQDateTime &to ) +{ + return mCalendar.alarmsTo( to ); +} + +Alarm::List ResourceTDEABC::alarms( const TQDateTime &from, const TQDateTime &to ) +{ +// kdDebug(5800) << "ResourceTDEABC::alarms(" << from.toString() << " - " << to.toString() << ")\n"; + + return mCalendar.alarms( from, to ); +} + +void ResourceTDEABC::dump() const +{ + ResourceCalendar::dump(); +} + +void ResourceTDEABC::reload() +{ + load(); + emit resourceChanged( this ); +} + +void ResourceTDEABC::setTimeZoneId( const TQString& tzid ) +{ + mCalendar.setTimeZoneId( tzid ); +} + +#include "resourcetdeabc.moc" diff --git a/tderesources/birthdays/resourcetdeabc.h b/tderesources/birthdays/resourcetdeabc.h new file mode 100644 index 00000000..5ba80ca1 --- /dev/null +++ b/tderesources/birthdays/resourcetdeabc.h @@ -0,0 +1,185 @@ +/* + This file is part of libkcal. + + Copyright (c) 2003 Cornelius Schumacher + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ +#ifndef KCAL_RESOURCETDEABC_H +#define KCAL_RESOURCETDEABC_H + +#include +#include +#include + +#include + +#include "libkcal/incidence.h" +#include "libkcal/calendarlocal.h" +#include + +#include "libkcal/resourcecalendar.h" + +#include "libtdepim/tdepimmacros.h" + +namespace TDEIO { +class FileCopyJob; +class Job; +} + +namespace KCal { + +/** + Resource providing birthdays and anniversaries as events. +*/ +class KDE_EXPORT ResourceTDEABC : public ResourceCalendar +{ + Q_OBJECT + + + friend class ResourceTDEABCConfig; + + public: + ResourceTDEABC( const TDEConfig * ); + ResourceTDEABC( ); + virtual ~ResourceTDEABC(); + + void readConfig( const TDEConfig *config ); + void writeConfig( TDEConfig* config ); + + void setAlarm( bool ); + bool alarm(); + + void setAlarmDays( int ); + int alarmDays(); + + void setCategories( const TQStringList &categories ); + TQStringList categories() const; + + void setUseCategories( bool useCategories ); + bool useCategories() const; + + bool isSaving(); + + TDEABC::Lock *lock(); + + /** Add Event to calendar. */ + KDE_DEPRECATED bool addEvent(Event *event); + bool addEvent( Event *event, const TQString &subresource ); + /** deletes an event from this calendar. */ + bool deleteEvent(Event *); + + /** + Retrieves an event on the basis of the unique string ID. + */ + Event *event(const TQString &UniqueStr); + /** + Return unfiltered list of all events in calendar. + */ + Event::List rawEvents( EventSortField sortField = EventSortUnsorted, SortDirection sortDirection = SortDirectionAscending ); + /** + Builds and then returns a list of all events that match for the + date specified. useful for dayView, etc. etc. + */ + Event::List rawEventsForDate( const TQDate &date, EventSortField sortField = EventSortUnsorted, SortDirection sortDirection = SortDirectionAscending ); + /** + Get unfiltered events for date \a qdt. + */ + Event::List rawEventsForDate( const TQDateTime &qdt ); + /** + Get unfiltered events in a range of dates. If inclusive is set to true, + only events are returned, which are completely included in the range. + */ + Event::List rawEvents( const TQDate &start, const TQDate &end, + bool inclusive = false ); + + /** + Add a todo to the todolist. + */ + KDE_DEPRECATED bool addTodo( Todo *todo ); + bool addTodo( Todo *todo, const TQString &subresource ); + /** + Remove a todo from the todolist. + */ + bool deleteTodo( Todo * ); + /** + Searches todolist for an event with this unique string identifier, + returns a pointer or null. + */ + Todo *todo( const TQString &uid ); + /** + Return list of all todos. + */ + Todo::List rawTodos( TodoSortField sortField = TodoSortUnsorted, SortDirection sortDirection = SortDirectionAscending ); + /** + Returns list of todos due on the specified date. + */ + Todo::List rawTodosForDate( const TQDate &date ); + /** Add a Journal entry to calendar */ + KDE_DEPRECATED bool addJournal( Journal *journal ); + bool addJournal( Journal *journal, const TQString &subresource ); + + /** Remove journal from the calendar. */ + bool deleteJournal( Journal * ); + /** Return Journal with given UID */ + virtual Journal *journal(const TQString &uid); + /** + Return list of all journals. + */ + Journal::List rawJournals( JournalSortField sortField = JournalSortUnsorted, SortDirection sortDirection = SortDirectionAscending ); + /** + Returns list of journals for the given date. + */ + Journal::List rawJournalsForDate( const TQDate &date ); + + /** Return all alarms, which ocur in the given time interval. */ + Alarm::List alarms( const TQDateTime &from, const TQDateTime &to ); + + /** Return all alarms, which ocur before given date. */ + Alarm::List alarmsTo( const TQDateTime &to ); + + void dump() const; + + void setTimeZoneId( const TQString &timeZoneId ); + + protected: + bool doOpen(); + bool doLoad(); + bool doSave(); + + private slots: + void reload(); + + private: + void init(); + + CalendarLocal mCalendar; + + int mAlarmDays; + bool mAlarm; + TQStringList mCategories; + bool mUseCategories; + TDEABC::AddressBook *mAddressbook; + + TDEABC::Lock *mLock; + + class Private; + Private *d; +}; + +} + +#endif diff --git a/tderesources/birthdays/resourcetdeabcconfig.cpp b/tderesources/birthdays/resourcetdeabcconfig.cpp new file mode 100644 index 00000000..0f9b3279 --- /dev/null +++ b/tderesources/birthdays/resourcetdeabcconfig.cpp @@ -0,0 +1,135 @@ +/* + This file is part of libkcal. + + Copyright (c) 2003 Cornelius Schumacher + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include + +#include +#include + +#include +#include +#include + +#include "resourcetdeabc.h" +#include "resourcetdeabcconfig.h" + +using namespace KCal; + +ResourceTDEABCConfig::ResourceTDEABCConfig( TQWidget* parent, const char* name ) + : KRES::ConfigWidget( parent, name ) +{ + TQGridLayout *topLayout = new TQGridLayout( this, 5, 1, 11, 6 ); + + mAlarm = new TQCheckBox(i18n("Set reminder"), this); + topLayout->addWidget(mAlarm, 0, 0); + TQBoxLayout *alarmLayout = new TQHBoxLayout(topLayout); + + mALabel = new TQLabel(i18n("Reminder before (in days):"), this); + alarmLayout->addWidget(mALabel); + mAlarmTimeEdit = new KRestrictedLine(this, "alarmTimeEdit", "1234567890"); + mAlarmTimeEdit->setText("0"); + alarmLayout->addWidget(mAlarmTimeEdit); + + TQFrame *line = new TQFrame( this ); + line->setFrameStyle( TQFrame::Sunken | TQFrame::HLine ); + topLayout->addMultiCellWidget( line, 2, 2, 0, 1 ); + + mUseCategories = new TQCheckBox( i18n( "Filter by categories" ), this ); + topLayout->addMultiCellWidget( mUseCategories, 3, 3, 0, 1 ); + + mCategoryView = new TDEListView( this ); + mCategoryView->addColumn( "" ); + mCategoryView->header()->hide(); + mCategoryView->setEnabled( false ); + topLayout->addMultiCellWidget( mCategoryView, 4, 4, 0, 1 ); + + connect( mUseCategories, TQT_SIGNAL( toggled( bool ) ), + mCategoryView, TQT_SLOT( setEnabled( bool ) ) ); + + mAlarmTimeEdit->setDisabled(true); + mALabel->setDisabled(true); + + connect(mAlarm, TQT_SIGNAL(clicked()), TQT_SLOT(alarmClicked())); + + setReadOnly( true ); + + KABPrefs *prefs = KABPrefs::instance(); + const TQStringList categories = prefs->customCategories(); + TQStringList::ConstIterator it; + for ( it = categories.begin(); it != categories.end(); ++it ) + new TQCheckListItem( mCategoryView, *it, TQCheckListItem::CheckBox ); +} + +void ResourceTDEABCConfig::loadSettings( KRES::Resource *resource ) +{ + ResourceTDEABC *res = static_cast( resource ); + if ( res ) { + mAlarm->setChecked( res->alarm() ); + TQString days; + mAlarmTimeEdit->setText( days.setNum(res->alarmDays()) ); + + mAlarmTimeEdit->setEnabled( res->alarm() ); + mALabel->setEnabled( res->alarm() ); + + const TQStringList categories = res->categories(); + TQListViewItemIterator it( mCategoryView ); + while ( it.current() ) { + if ( categories.contains( it.current()->text( 0 ) ) ) { + TQCheckListItem *item = static_cast( it.current() ); + item->setOn( true ); + } + ++it; + } + + mUseCategories->setChecked( res->useCategories() ); + } else { + kdDebug(5700) << "ERROR: ResourceTDEABCConfig::loadSettings(): no ResourceTDEABC, cast failed" << endl; + } +} + +void ResourceTDEABCConfig::saveSettings( KRES::Resource *resource ) +{ + ResourceTDEABC *res = static_cast( resource ); + if ( res ) { + res->setAlarm( mAlarm->isChecked() ); + res->setAlarmDays( mAlarmTimeEdit->text().toInt() ); + setReadOnly( true ); + + TQStringList categories; + TQListViewItemIterator it( mCategoryView, TQListViewItemIterator::Checked ); + while ( it.current() ) { + categories.append( it.current()->text( 0 ) ); + ++it; + } + res->setCategories( categories ); + res->setUseCategories( mUseCategories->isChecked() ); + } else { + kdDebug(5700) << "ERROR: ResourceTDEABCConfig::saveSettings(): no ResourceTDEABC, cast failed" << endl; + } +} + +void ResourceTDEABCConfig::alarmClicked() +{ + mAlarmTimeEdit->setDisabled(!mAlarm->isChecked()); + mALabel->setDisabled(!mAlarm->isChecked()); +} + +#include "resourcetdeabcconfig.moc" diff --git a/tderesources/birthdays/resourcetdeabcconfig.h b/tderesources/birthdays/resourcetdeabcconfig.h new file mode 100644 index 00000000..80efd02b --- /dev/null +++ b/tderesources/birthdays/resourcetdeabcconfig.h @@ -0,0 +1,68 @@ +/* + This file is part of libkcal. + + Copyright (c) 2002 Tobias Koenig + Copyright (c) 2002 Jan-Pascal van Best + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef KCAL_RESOURCETDEABCCONFIG_H +#define KCAL_RESOURCETDEABCCONFIG_H + +#include +#include + +#include +#include +#include +#include + +namespace KCal { + +/** + Configuration widget for birtday/anniversaries resource. + + @see ResourceTDEABC +*/ +class ResourceTDEABCConfig : public KRES::ConfigWidget +{ + Q_OBJECT + + public: + ResourceTDEABCConfig( TQWidget* parent = 0, const char* name = 0 ); + + public slots: + virtual void loadSettings( KRES::Resource *resource); + virtual void saveSettings( KRES::Resource *resource ); + + private slots: + void alarmClicked(); + + private: + TQCheckBox *mAlarm; + KRestrictedLine *mAlarmTimeEdit; + TQLabel *mALabel; + TQCheckBox *mUseCategories; + TDEListView *mCategoryView; + + class Private; + Private *d; +}; + +} + +#endif diff --git a/tderesources/birthdays/tdeabc.desktop b/tderesources/birthdays/tdeabc.desktop new file mode 100644 index 00000000..d9aaa420 --- /dev/null +++ b/tderesources/birthdays/tdeabc.desktop @@ -0,0 +1,61 @@ +[Desktop Entry] +Name=Birthdays From KAddressBook +Name[af]=Verjaarsdae uit KAddressBook +Name[ar]=تواريخ الميلد من KAddressBook +Name[be]=Дні нараджэння з K Адраснай кнігі +Name[bg]=Рождени дни от адресника +Name[br]=Deizioù-ha-bloazioù eus KAddressBook +Name[bs]=Rođendani iz KAddressBook adresara +Name[ca]=Aniversaris des de KAddressBook +Name[cs]=Narozeniny z Knihy adres +Name[cy]=Penblwyddi o KLlyfrCyfeiriadau +Name[da]=Fødselsdage fra KAddressBook +Name[de]=Geburtstage aus dem Adressbuch +Name[el]=Γενέθλια από το KAddressBook +Name[eo]=Naskiĝdatoj de KAdresaro +Name[es]=Cumpleaños desde KAddressBook +Name[et]=Sünnipäevad TDE aadressiraamatust +Name[eu]=Urtebetetzeak KAddressBook-etik +Name[fa]=تولدها از KAddressBook +Name[fi]=Syntymäpäivät TDE:n osoitekirjasta +Name[fr]=Dates de naissance de KAddressBook +Name[fy]=Jierddagen út KAddressBook +Name[ga]=Breithlaethanta ó KAddressBook +Name[gl]=Cumpreanos de KAddressBook +Name[he]=ימי הולדת מתוך KAddressBook +Name[hi]=के-एड्रेस-बुक से जन्मतिथि +Name[hu]=Születésnapok a KAddressBookból +Name[is]=Afmælisdagar úr KAddressBook +Name[it]=Compleanni da KAddessBook +Name[ja]=アドレス帳の誕生日 +Name[kk]=KAddressBook-тағы туған күндер +Name[km]=ថ្ងៃ​ខួប​កំណើត​ពី KAddressBook +Name[lt]=Gimtadieniai iš KAddressBook +Name[mk]=Родендени од КАдресар +Name[ms]=Tarikh Lahir dari KAddressBook +Name[nb]=Bursdagsimport fra KAddressbook +Name[nds]=Geboortsdaag ut KAdressbook +Name[ne]=केडीई ठेगाना पुस्तिकामा भएका जन्मदिन +Name[nl]=Verjaardagen uit KAddressBook +Name[nn]=Fødselsdagar frå TDE-adresseboka +Name[pl]=Urodziny z Książki adresowej +Name[pt]=Aniversários do KAddressBook +Name[pt_BR]=Datas de Nascimento do KAddressBook +Name[ro]=Date de naştere din KAddressBook +Name[ru]=Дни рождения из адресной книги TDE +Name[sk]=Dátumy narodenia z adresára TDE +Name[sl]=Rojstni dnevi iz Adresarja +Name[sr]=Рођендани из KAddressBook-а +Name[sr@Latn]=Rođendani iz KAddressBook-a +Name[sv]=Födelsedagar från adressboken +Name[ta]=கேமுகவரிபுத்தகத்தில் இருந்து பிறந்ததேதிகள் +Name[tg]=Рӯзҳои таваллуд аз китоби адресии TDE +Name[tr]=TDE Adres Defterinden Doğum Günleri +Name[uk]=Дні народження з KAddressBook +Name[zh_CN]=KAddressBook 中的生日 +Name[zh_TW]=自 KaddressBook 匯入生日 +X-TDE-Library=kcal_tdeabc +Type=Service +ServiceTypes=KResources/Plugin +X-TDE-ResourceFamily=calendar +X-TDE-ResourceType=birthdays diff --git a/tderesources/blogging/xmlrpcjob.cpp b/tderesources/blogging/xmlrpcjob.cpp index cd9a0fa4..5f57f1f6 100644 --- a/tderesources/blogging/xmlrpcjob.cpp +++ b/tderesources/blogging/xmlrpcjob.cpp @@ -36,7 +36,7 @@ #include -#define KIO_ARGS TQByteArray packedArgs; \ +#define TDEIO_ARGS TQByteArray packedArgs; \ TQDataStream stream( packedArgs, IO_WriteOnly ); stream using namespace TDEIO; diff --git a/tderesources/egroupware/Makefile.am b/tderesources/egroupware/Makefile.am index 644b68a3..b1ead510 100644 --- a/tderesources/egroupware/Makefile.am +++ b/tderesources/egroupware/Makefile.am @@ -20,7 +20,7 @@ lib_LTLIBRARIES = libtdeabc_xmlrpc.la libkcal_xmlrpc.la libknotes_xmlrpc.la libtdeabc_xmlrpc_la_SOURCES = tdeabc_resourcexmlrpc.cpp tdeabc_resourcexmlrpcconfig.cpp \ tdeabc_egroupwareprefs.kcfgc libtdeabc_xmlrpc_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined -libtdeabc_xmlrpc_la_LIBADD = $(LIB_KIO) -ltdeabc $(top_builddir)/libtdepim/libtdepim.la \ +libtdeabc_xmlrpc_la_LIBADD = $(LIB_TDEIO) -ltdeabc $(top_builddir)/libtdepim/libtdepim.la \ $(top_builddir)/kaddressbook/common/libkabcommon.la \ libegwcommon.la @@ -39,8 +39,8 @@ libknotes_xmlrpc_la_LIBADD = $(top_builddir)/libkcal/libkcal.la -ltdeprint \ $(top_builddir)/libtdepim/libtdepim.la \ libegwcommon.la -kabcincludedir = $(includedir)/tdeabc -kabcinclude_HEADERS = tdeabc_resourcexmlrpc.h kcal_resourcexmlrpc.h +tdeabcincludedir = $(includedir)/tdeabc +tdeabcinclude_HEADERS = tdeabc_resourcexmlrpc.h kcal_resourcexmlrpc.h kde_module_LTLIBRARIES = tdeabc_xmlrpc.la kcal_xmlrpc.la knotes_xmlrpc.la diff --git a/tderesources/egroupware/synchronizer.h b/tderesources/egroupware/synchronizer.h index e9183bd2..ed9fd135 100644 --- a/tderesources/egroupware/synchronizer.h +++ b/tderesources/egroupware/synchronizer.h @@ -25,7 +25,7 @@ #include /** - A small helper class which blocks an asynchronous operation (e.g. a KIO request) + A small helper class which blocks an asynchronous operation (e.g. a TDEIO request) so that it can be used in a synchronous environment. Example: diff --git a/tderesources/egroupware/tdeabc_resourcexmlrpc.h b/tderesources/egroupware/tdeabc_resourcexmlrpc.h index d4d6e233..719c35c0 100644 --- a/tderesources/egroupware/tdeabc_resourcexmlrpc.h +++ b/tderesources/egroupware/tdeabc_resourcexmlrpc.h @@ -18,8 +18,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef KABC_RESOURCEXMLRPC_H -#define KABC_RESOURCEXMLRPC_H +#ifndef TDEABC_RESOURCEXMLRPC_H +#define TDEABC_RESOURCEXMLRPC_H #include #include diff --git a/tderesources/egroupware/xmlrpciface.cpp b/tderesources/egroupware/xmlrpciface.cpp index 06ad93e0..dbbabc68 100644 --- a/tderesources/egroupware/xmlrpciface.cpp +++ b/tderesources/egroupware/xmlrpciface.cpp @@ -71,7 +71,7 @@ void Query::call( const TQString &server, const TQString &method, TDEIO::TransferJob *job = TDEIO::http_post( KURL( server ), postData, false ); if ( !job ) { - kdWarning() << "Unable to create KIO job for " << server << endl; + kdWarning() << "Unable to create TDEIO job for " << server << endl; return; } job->addMetaData( "UserAgent", userAgent ); diff --git a/tderesources/featureplan/Makefile.am b/tderesources/featureplan/Makefile.am index f37d5c6b..9e85cd05 100644 --- a/tderesources/featureplan/Makefile.am +++ b/tderesources/featureplan/Makefile.am @@ -28,12 +28,12 @@ kcal_service_DATA = kcal_resourcefeatureplan.desktop check_PROGRAMS = dumpfeaturelist benchmarkfeaturelist -dumpfeaturelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +dumpfeaturelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +benchmarkfeaturelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor benchmarkfeaturelist_LDADD = libfeatureplancommon.la $(LIB_TDECORE) benchmarkfeaturelist_SOURCES = benchmarkfeaturelist.cpp benchmarkfeaturelist_COMPILE_FIRST = kde-features.h diff --git a/tderesources/groupdav/tdeabc_resourcegroupdav.h b/tderesources/groupdav/tdeabc_resourcegroupdav.h index dba61bf8..36b0456c 100644 --- a/tderesources/groupdav/tdeabc_resourcegroupdav.h +++ b/tderesources/groupdav/tdeabc_resourcegroupdav.h @@ -19,8 +19,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef KABC_RESOURCEGROUPDAV_H -#define KABC_RESOURCEGROUPDAV_H +#ifndef TDEABC_RESOURCEGROUPDAV_H +#define TDEABC_RESOURCEGROUPDAV_H #include "tdeabc_resourcegroupwarebase.h" #include diff --git a/tderesources/groupware/tdeabc_resourcegroupware.h b/tderesources/groupware/tdeabc_resourcegroupware.h index 06088f5d..59bbc9a4 100644 --- a/tderesources/groupware/tdeabc_resourcegroupware.h +++ b/tderesources/groupware/tdeabc_resourcegroupware.h @@ -17,8 +17,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef KABC_RESOURCEGROUPWARE_H -#define KABC_RESOURCEGROUPWARE_H +#ifndef TDEABC_RESOURCEGROUPWARE_H +#define TDEABC_RESOURCEGROUPWARE_H #include diff --git a/tderesources/groupware/tdeabc_resourcegroupwareconfig.h b/tderesources/groupware/tdeabc_resourcegroupwareconfig.h index a52b0fa0..86825bbf 100644 --- a/tderesources/groupware/tdeabc_resourcegroupwareconfig.h +++ b/tderesources/groupware/tdeabc_resourcegroupwareconfig.h @@ -17,8 +17,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef KABC_RESOURCEGROUPWARECONFIG_H -#define KABC_RESOURCEGROUPWARECONFIG_H +#ifndef TDEABC_RESOURCEGROUPWARECONFIG_H +#define TDEABC_RESOURCEGROUPWARECONFIG_H #include diff --git a/tderesources/groupwise/soap/Makefile.am b/tderesources/groupwise/soap/Makefile.am index bd05c6de..7ec46924 100644 --- a/tderesources/groupwise/soap/Makefile.am +++ b/tderesources/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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +soapdebug_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor soapdebug_LDADD = libgwsoap.la -ltdecore \ $(top_builddir)/libkcal/libkcal.la \ $(top_builddir)/libtdepim/libtdepim.la diff --git a/tderesources/groupwise/tdeabc_resourcegroupwise.h b/tderesources/groupwise/tdeabc_resourcegroupwise.h index 8e0867bc..fb1d075a 100644 --- a/tderesources/groupwise/tdeabc_resourcegroupwise.h +++ b/tderesources/groupwise/tdeabc_resourcegroupwise.h @@ -17,8 +17,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef KABC_RESOURCEGROUPWISE_H -#define KABC_RESOURCEGROUPWISE_H +#ifndef TDEABC_RESOURCEGROUPWISE_H +#define TDEABC_RESOURCEGROUPWISE_H #include "soap/groupwiseserver.h" diff --git a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h index 41022196..df62753a 100644 --- a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h +++ b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h @@ -17,8 +17,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef KABC_RESOURCEGROUPWISECONFIG_H -#define KABC_RESOURCEGROUPWISECONFIG_H +#ifndef TDEABC_RESOURCEGROUPWISECONFIG_H +#define TDEABC_RESOURCEGROUPWISECONFIG_H #include "soap/groupwiseserver.h" diff --git a/tderesources/groupwise/tdeioslave/Makefile.am b/tderesources/groupwise/tdeioslave/Makefile.am index 8ae6220c..5f5f012d 100644 --- a/tderesources/groupwise/tdeioslave/Makefile.am +++ b/tderesources/groupwise/tdeioslave/Makefile.am @@ -12,7 +12,7 @@ kde_module_LTLIBRARIES = tdeio_groupwise.la tdeio_groupwise_la_SOURCES = groupwise.cpp tdeio_groupwise_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \ - ../soap/libgwsoap.la $(top_builddir)/libtdepim/libtdepim.la $(LIB_KIO) + ../soap/libgwsoap.la $(top_builddir)/libtdepim/libtdepim.la $(LIB_TDEIO) tdeio_groupwise_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) messages: rc.cpp diff --git a/tderesources/kolab/kcal/resourcekolab.cpp b/tderesources/kolab/kcal/resourcekolab.cpp index 5371ac11..869ddca8 100644 --- a/tderesources/kolab/kcal/resourcekolab.cpp +++ b/tderesources/kolab/kcal/resourcekolab.cpp @@ -165,7 +165,7 @@ bool ResourceKolab::loadSubResource( const TQString& subResource, if ( !count ) return true; - const int nbMessages = 200; // read 200 mails at a time (see kabc resource) + const int nbMessages = 200; // read 200 mails at a time (see tdeabc resource) const TQString labelTxt = !strcmp(mimetype, "application/x-vnd.kolab.task") ? i18n( "Loading tasks..." ) : !strcmp(mimetype, "application/x-vnd.kolab.journal") ? i18n( "Loading journals..." ) diff --git a/tderesources/kolab/kcal/resourcekolab_plugin.cpp b/tderesources/kolab/kcal/resourcekolab_plugin.cpp index eb56897a..7b9e85d0 100644 --- a/tderesources/kolab/kcal/resourcekolab_plugin.cpp +++ b/tderesources/kolab/kcal/resourcekolab_plugin.cpp @@ -1,5 +1,5 @@ /* - This file is part of libkabc and/or kaddressbook. + This file is part of libtdeabc and/or kaddressbook. Copyright (c) 2002 - 2004 Klarlvdalens Datakonsult AB diff --git a/tderesources/kolab/knotes/resourcekolab_plugin.cpp b/tderesources/kolab/knotes/resourcekolab_plugin.cpp index f589986c..0cd126bd 100644 --- a/tderesources/kolab/knotes/resourcekolab_plugin.cpp +++ b/tderesources/kolab/knotes/resourcekolab_plugin.cpp @@ -1,5 +1,5 @@ /* - This file is part of libkabc and/or kaddressbook. + This file is part of libtdeabc and/or kaddressbook. Copyright (c) 2002 - 2004 Klarlvdalens Datakonsult AB diff --git a/tderesources/kolab/shared/subresource.cpp b/tderesources/kolab/shared/subresource.cpp index 7520d275..cc51c640 100644 --- a/tderesources/kolab/shared/subresource.cpp +++ b/tderesources/kolab/shared/subresource.cpp @@ -1,5 +1,5 @@ /* - This file is part of libkabc and/or kaddressbook. + This file is part of libtdeabc and/or kaddressbook. Copyright (c) 2004 Klarälvdalens Datakonsult AB diff --git a/tderesources/kolab/shared/subresource.h b/tderesources/kolab/shared/subresource.h index 79104a74..4c79632d 100644 --- a/tderesources/kolab/shared/subresource.h +++ b/tderesources/kolab/shared/subresource.h @@ -1,5 +1,5 @@ /* - This file is part of libkabc and/or kaddressbook. + This file is part of libtdeabc and/or kaddressbook. Copyright (c) 2004 Klarälvdalens Datakonsult AB diff --git a/tderesources/kolab/tdeabc/CMakeLists.txt b/tderesources/kolab/tdeabc/CMakeLists.txt index f3a5596e..9a77705c 100644 --- a/tderesources/kolab/tdeabc/CMakeLists.txt +++ b/tderesources/kolab/tdeabc/CMakeLists.txt @@ -39,14 +39,14 @@ install( tde_add_kpart( tdeabc_kolab AUTOMOC SOURCES resourcekolab_plugin.cpp - LINK kabckolab-shared + LINK tdeabckolab-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) -##### kabckolab (shared) ######################## +##### tdeabckolab (shared) ######################## -tde_add_library( kabckolab SHARED AUTOMOC +tde_add_library( tdeabckolab SHARED AUTOMOC SOURCES resourcekolab.cpp contact.cpp VERSION 0.0.0 LINK resourcekolabshared-static kgroupwarebase-shared diff --git a/tderesources/kolab/tdeabc/Makefile.am b/tderesources/kolab/tdeabc/Makefile.am index e750d546..64df12be 100644 --- a/tderesources/kolab/tdeabc/Makefile.am +++ b/tderesources/kolab/tdeabc/Makefile.am @@ -3,11 +3,11 @@ METASOURCES = AUTO INCLUDES = -I$(top_srcdir)/tderesources/kolab/shared -I$(top_srcdir) $(all_includes) # The kolab wizard links to this library too -lib_LTLIBRARIES = libkabckolab.la +lib_LTLIBRARIES = libtdeabckolab.la -libkabckolab_la_SOURCES = resourcekolab.cpp contact.cpp -libkabckolab_la_LDFLAGS = $(all_libraries) -no-undefined -libkabckolab_la_LIBADD = \ +libtdeabckolab_la_SOURCES = resourcekolab.cpp contact.cpp +libtdeabckolab_la_LDFLAGS = $(all_libraries) -no-undefined +libtdeabckolab_la_LIBADD = \ $(top_builddir)/tderesources/kolab/shared/libresourcekolabshared.la \ -ltderesources -ltdeabc @@ -17,7 +17,7 @@ noinst_HEADERS = resourcekolab.h contact.h tdeabc_kolab_la_SOURCES = resourcekolab_plugin.cpp tdeabc_kolab_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined -tdeabc_kolab_la_LIBADD = libkabckolab.la +tdeabc_kolab_la_LIBADD = libtdeabckolab.la servicedir = $(kde_servicesdir)/tderesources/tdeabc service_DATA = kolab.desktop diff --git a/tderesources/kolab/tdeabc/contact.cpp b/tderesources/kolab/tdeabc/contact.cpp index 337dbe5c..13f679b9 100644 --- a/tderesources/kolab/tdeabc/contact.cpp +++ b/tderesources/kolab/tdeabc/contact.cpp @@ -1,5 +1,5 @@ /* - This file is part of libkabc and/or kaddressbook. + This file is part of libtdeabc and/or kaddressbook. Copyright (c) 2004 Klarälvdalens Datakonsult AB diff --git a/tderesources/kolab/tdeabc/contact.h b/tderesources/kolab/tdeabc/contact.h index f13b0a7c..bed71b44 100644 --- a/tderesources/kolab/tdeabc/contact.h +++ b/tderesources/kolab/tdeabc/contact.h @@ -1,5 +1,5 @@ /* - This file is part of libkabc and/or kaddressbook. + This file is part of libtdeabc and/or kaddressbook. Copyright (c) 2002 - 2004 Klarälvdalens Datakonsult AB diff --git a/tderesources/kolab/tdeabc/resourcekolab.cpp b/tderesources/kolab/tdeabc/resourcekolab.cpp index f4391f76..7476212e 100644 --- a/tderesources/kolab/tdeabc/resourcekolab.cpp +++ b/tderesources/kolab/tdeabc/resourcekolab.cpp @@ -1,5 +1,5 @@ /* - This file is part of libkabc and/or kaddressbook. + This file is part of libtdeabc and/or kaddressbook. Copyright (c) 2002 - 2004 Klarälvdalens Datakonsult AB diff --git a/tderesources/kolab/tdeabc/resourcekolab.h b/tderesources/kolab/tdeabc/resourcekolab.h index 52fa93d3..a19dfbaa 100644 --- a/tderesources/kolab/tdeabc/resourcekolab.h +++ b/tderesources/kolab/tdeabc/resourcekolab.h @@ -1,5 +1,5 @@ /* - This file is part of libkabc and/or kaddressbook. + This file is part of libtdeabc and/or kaddressbook. Copyright (c) 2002 - 2004 Klarälvdalens Datakonsult AB @@ -162,7 +162,7 @@ protected: TQ_UINT32 sernum, const KMailICalIface::StorageFormat format ); TQString configFile() const { - return Kolab::ResourceKolabBase::configFile( "kabc" ); + return Kolab::ResourceKolabBase::configFile( "tdeabc" ); } void writeConfig(); diff --git a/tderesources/kolab/tdeabc/resourcekolab_plugin.cpp b/tderesources/kolab/tdeabc/resourcekolab_plugin.cpp index a66cb9bd..67f2408b 100644 --- a/tderesources/kolab/tdeabc/resourcekolab_plugin.cpp +++ b/tderesources/kolab/tdeabc/resourcekolab_plugin.cpp @@ -1,5 +1,5 @@ /* - This file is part of libkabc and/or kaddressbook. + This file is part of libtdeabc and/or kaddressbook. Copyright (c) 2002 - 2004 Klarlvdalens Datakonsult AB diff --git a/tderesources/lib/tdeabc_resourcegroupwarebase.h b/tderesources/lib/tdeabc_resourcegroupwarebase.h index f24a7602..7835d3d2 100644 --- a/tderesources/lib/tdeabc_resourcegroupwarebase.h +++ b/tderesources/lib/tdeabc_resourcegroupwarebase.h @@ -19,8 +19,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef KABC_RESOURCEGROUPWARE_H -#define KABC_RESOURCEGROUPWARE_H +#ifndef TDEABC_RESOURCEGROUPWARE_H +#define TDEABC_RESOURCEGROUPWARE_H #include #include diff --git a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h index c8f4646e..7b832623 100644 --- a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h +++ b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h @@ -19,8 +19,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef KABC_RESOURCEGROUPWAREBASECONFIG_H -#define KABC_RESOURCEGROUPWAREBASECONFIG_H +#ifndef TDEABC_RESOURCEGROUPWAREBASECONFIG_H +#define TDEABC_RESOURCEGROUPWAREBASECONFIG_H #include #include diff --git a/tderesources/newexchange/Person.mapping b/tderesources/newexchange/Person.mapping index ac0f0b3a..e2b8c8f9 100644 --- a/tderesources/newexchange/Person.mapping +++ b/tderesources/newexchange/Person.mapping @@ -2,7 +2,7 @@ http://msdn.microsoft.com/library/default.asp?url=/library/en-us/e2k3/e2k3/_cdo_ http://msdn.microsoft.com/library/default.asp?url=/library/en-us/e2k3/e2k3/_exch2k_urn_content-classes_person.asp /* KDE4: addressee does not have any creation or modification date :-(( */ -/* KDE4: read-only not supported by libkabc */ +/* KDE4: read-only not supported by libtdeabc */ WebDAV property | Addressee:: method ---------------------------------------------+---------------------- diff --git a/tderesources/newexchange/exchangeconvertercontact.cpp b/tderesources/newexchange/exchangeconvertercontact.cpp index dae14567..5551516e 100644 --- a/tderesources/newexchange/exchangeconvertercontact.cpp +++ b/tderesources/newexchange/exchangeconvertercontact.cpp @@ -226,7 +226,7 @@ bool ExchangeConverterContact::readAddressee( const TQDomElement &node, Addresse addressee.insertCustom( "TDEPIM-Exchange-Resource", "href", tmpstr ); /* KDE4: addressee does not have any creation or modification date :-(( */ -/* KDE4: read-only not supported by libkabc */ +/* KDE4: read-only not supported by libtdeabc */ // Name: first, family, pre/postfixes, common name if ( WebdavHandler::extractString( node, "fileas", tmpstr ) || @@ -278,7 +278,7 @@ bool ExchangeConverterContact::readAddressee( const TQDomElement &node, Addresse if ( WebdavHandler::extractString( node, "email3", tmpstr ) ) addressee.insertEmail( tmpstr ); - // No kabc field for personalHomePage + // No tdeabc field for personalHomePage if ( WebdavHandler::extractString( node, "businesshomepage", tmpstr ) ) addressee.setUrl( tmpstr ); diff --git a/tderesources/newexchange/tdeabc_resourceexchange.h b/tderesources/newexchange/tdeabc_resourceexchange.h index 732ed981..a5ae0e5e 100644 --- a/tderesources/newexchange/tdeabc_resourceexchange.h +++ b/tderesources/newexchange/tdeabc_resourceexchange.h @@ -18,8 +18,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef KABC_RESOURCEEXCHANGE_H -#define KABC_RESOURCEEXCHANGE_H +#ifndef TDEABC_RESOURCEEXCHANGE_H +#define TDEABC_RESOURCEEXCHANGE_H #include diff --git a/tderesources/scalix/README b/tderesources/scalix/README index 34a00e9a..d2519102 100644 --- a/tderesources/scalix/README +++ b/tderesources/scalix/README @@ -3,7 +3,7 @@ groupware servers use a similar storage concept (storing pim items as email attachments on an IMAP server). However the Scalix Resource has several modifications, e.g. the XML storage -type was removed and freebusy handling is done via a separated KIO slave. +type was removed and freebusy handling is done via a separated TDEIO slave. If you have any problems, questions or suggestions contact me under Tobias Koenig diff --git a/tderesources/scalix/kcal/resourcescalix.cpp b/tderesources/scalix/kcal/resourcescalix.cpp index 25963a29..ff9158d1 100644 --- a/tderesources/scalix/kcal/resourcescalix.cpp +++ b/tderesources/scalix/kcal/resourcescalix.cpp @@ -154,7 +154,7 @@ bool ResourceScalix::loadSubResource( const TQString& subResource, if ( !count ) return true; - const int nbMessages = 200; // read 200 mails at a time (see kabc resource) + const int nbMessages = 200; // read 200 mails at a time (see tdeabc resource) const TQString labelTxt = !strcmp(mimetype, "application/x-vnd.kolab.task") ? i18n( "Loading tasks..." ) : !strcmp(mimetype, "application/x-vnd.kolab.journal") ? i18n( "Loading journals..." ) diff --git a/tderesources/scalix/scalixadmin/Makefile.am b/tderesources/scalix/scalixadmin/Makefile.am index 4d072ac4..0758ccfc 100644 --- a/tderesources/scalix/scalixadmin/Makefile.am +++ b/tderesources/scalix/scalixadmin/Makefile.am @@ -2,7 +2,7 @@ bin_PROGRAMS = scalixadmin INCLUDES = $(all_includes) -scalixadmin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +scalixadmin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor scalixadmin_LDADD = $(LIB_TDEABC) 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/tderesources/scalix/tdeabc/CMakeLists.txt b/tderesources/scalix/tdeabc/CMakeLists.txt index bfdaa347..5875d5ac 100644 --- a/tderesources/scalix/tdeabc/CMakeLists.txt +++ b/tderesources/scalix/tdeabc/CMakeLists.txt @@ -38,14 +38,14 @@ install( tde_add_kpart( tdeabc_scalix AUTOMOC SOURCES resourcescalix_plugin.cpp - LINK kabcscalix-shared + LINK tdeabcscalix-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) -##### kabcscalix (shared) ####################### +##### tdeabcscalix (shared) ####################### -tde_add_library( kabcscalix SHARED AUTOMOC +tde_add_library( tdeabcscalix SHARED AUTOMOC SOURCES resourcescalix.cpp contact.cpp VERSION 0.0.0 LINK resourcescalixshared-static kgroupwarebase-shared diff --git a/tderesources/scalix/tdeabc/Makefile.am b/tderesources/scalix/tdeabc/Makefile.am index 88cf96d1..79577d8d 100644 --- a/tderesources/scalix/tdeabc/Makefile.am +++ b/tderesources/scalix/tdeabc/Makefile.am @@ -3,11 +3,11 @@ METASOURCES = AUTO INCLUDES = -I$(top_srcdir)/tderesources/scalix/shared -I$(top_srcdir) $(all_includes) # The scalix wizard links to this library too -lib_LTLIBRARIES = libkabcscalix.la +lib_LTLIBRARIES = libtdeabcscalix.la -libkabcscalix_la_SOURCES = resourcescalix.cpp contact.cpp -libkabcscalix_la_LDFLAGS = $(all_libraries) -no-undefined -libkabcscalix_la_LIBADD = \ +libtdeabcscalix_la_SOURCES = resourcescalix.cpp contact.cpp +libtdeabcscalix_la_LDFLAGS = $(all_libraries) -no-undefined +libtdeabcscalix_la_LIBADD = \ $(top_builddir)/tderesources/scalix/shared/libresourcescalixshared.la \ -ltderesources -ltdeabc @@ -17,7 +17,7 @@ noinst_HEADERS = resourcescalix.h tdeabc_scalix_la_SOURCES = resourcescalix_plugin.cpp tdeabc_scalix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined -tdeabc_scalix_la_LIBADD = libkabcscalix.la +tdeabc_scalix_la_LIBADD = libtdeabcscalix.la servicedir = $(kde_servicesdir)/tderesources/tdeabc service_DATA = scalix.desktop diff --git a/tderesources/scalix/tdeabc/resourcescalix.h b/tderesources/scalix/tdeabc/resourcescalix.h index 0fa58cdf..f9d4c309 100644 --- a/tderesources/scalix/tdeabc/resourcescalix.h +++ b/tderesources/scalix/tdeabc/resourcescalix.h @@ -157,7 +157,7 @@ protected: TQ_UINT32 sernum, const KMailICalIface::StorageFormat format ); TQString configFile() const { - return Scalix::ResourceScalixBase::configFile( "kabc" ); + return Scalix::ResourceScalixBase::configFile( "tdeabc" ); } // The list of subresources diff --git a/tderesources/scalix/tdeioslave/Makefile.am b/tderesources/scalix/tdeioslave/Makefile.am index 70c0951b..7b306ea3 100644 --- a/tderesources/scalix/tdeioslave/Makefile.am +++ b/tderesources/scalix/tdeioslave/Makefile.am @@ -10,7 +10,7 @@ kdelnk_DATA = scalix.protocol scalixs.protocol kde_module_LTLIBRARIES = tdeio_scalix.la tdeio_scalix_la_SOURCES = scalix.cpp -tdeio_scalix_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la $(LIB_KIO) +tdeio_scalix_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la $(LIB_TDEIO) tdeio_scalix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) messages: rc.cpp diff --git a/tderesources/scalix/tdeioslave/scalix.cpp b/tderesources/scalix/tdeioslave/scalix.cpp index 268b164b..5ce8dca1 100644 --- a/tderesources/scalix/tdeioslave/scalix.cpp +++ b/tderesources/scalix/tdeioslave/scalix.cpp @@ -157,7 +157,7 @@ void Scalix::publishFreeBusy( const KURL &url ) const int newSize = readData(buffer); if ( newSize < 0 ) { // read error: network in unknown state so disconnect - error( TDEIO::ERR_COULD_NOT_READ, i18n("KIO data supply error.") ); + error( TDEIO::ERR_COULD_NOT_READ, i18n("TDEIO data supply error.") ); return; } diff --git a/tderesources/slox/Makefile.am b/tderesources/slox/Makefile.am index 6175de16..31904188 100644 --- a/tderesources/slox/Makefile.am +++ b/tderesources/slox/Makefile.am @@ -34,7 +34,7 @@ tdeabc_slox_la_LIBADD = libtdeabc_slox.la EXTRA_PROGRAMS = testsloxaccounts -testsloxaccounts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +testsloxaccounts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor testsloxaccounts_LDADD = libkslox.la testsloxaccounts_SOURCES = testsloxaccounts.cpp diff --git a/tderesources/slox/tdeabcresourceslox.h b/tderesources/slox/tdeabcresourceslox.h index af2686f6..35a71be2 100644 --- a/tderesources/slox/tdeabcresourceslox.h +++ b/tderesources/slox/tdeabcresourceslox.h @@ -17,8 +17,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef KABC_RESOURCESLOX_H -#define KABC_RESOURCESLOX_H +#ifndef TDEABC_RESOURCESLOX_H +#define TDEABC_RESOURCESLOX_H #include "sloxbase.h" #include "webdavhandler.h" diff --git a/wizards/CMakeLists.txt b/wizards/CMakeLists.txt index a82b735f..443a9022 100644 --- a/wizards/CMakeLists.txt +++ b/wizards/CMakeLists.txt @@ -143,7 +143,7 @@ if( WITH_KOLAB ) kolabwizard.cpp kmailchanges.cpp kolabconfig.kcfgc kolabkmailchanges.cpp LINK - kcalkolab-shared kabckolab-shared knoteskolab-shared + kcalkolab-shared tdeabckolab-shared knoteskolab-shared kpimidentities-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -212,7 +212,7 @@ if( WITH_SCALIX ) SOURCES scalixwizard.cpp kmailchanges.cpp scalixconfig.kcfgc scalixkmailchanges.cpp - LINK kcalscalix-shared kabcscalix-shared kpimidentities-shared + LINK kcalscalix-shared tdeabcscalix-shared kpimidentities-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) tde_add_executable( scalixwizard diff --git a/wizards/Makefile.am b/wizards/Makefile.am index 0df70a16..bdb4e29e 100644 --- a/wizards/Makefile.am +++ b/wizards/Makefile.am @@ -19,7 +19,7 @@ kde_module_LTLIBRARIES = libegroupwarewizard.la libsloxwizard.la \ libscalixwizard.la -groupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +groupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor groupwarewizard_LDADD = libegroupwarewizard.la libsloxwizard.la $(LIB_TDEUI) \ libkolabwizard.la \ libexchangewizard.la \ @@ -29,7 +29,7 @@ groupwarewizard_SOURCES = groupwarewizard.cpp main.cpp overviewpage.cpp # Kolab libkolabwizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) libkolabwizard_la_LIBADD = $(top_builddir)/tderesources/kolab/kcal/libkcalkolab.la \ - $(top_builddir)/tderesources/kolab/tdeabc/libkabckolab.la \ + $(top_builddir)/tderesources/kolab/tdeabc/libtdeabckolab.la \ $(top_builddir)/tderesources/kolab/knotes/libknoteskolab.la \ $(top_builddir)/libkcal/libkcal.la \ $(top_builddir)/libtdepim/libtdepim.la \ @@ -39,7 +39,7 @@ libkolabwizard_la_SOURCES = kolabwizard.cpp kmailchanges.cpp kolabconfig.kcfgc \ kolabkmailchanges.cpp kolabwizard_LDADD = libkolabwizard.la $(LIB_TDEUI) -kolabwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kolabwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kolabwizard_SOURCES = kolabmain.cpp # eGroupware @@ -53,7 +53,7 @@ libegroupwarewizard_la_LIBADD = $(top_builddir)/tderesources/egroupware/libtdeab $(LIB_TDEUI) egroupwarewizard_LDADD = libegroupwarewizard.la -egroupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +egroupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor egroupwarewizard_SOURCES = egroupwaremain.cpp # SLOX @@ -64,7 +64,7 @@ libsloxwizard_la_LIBADD = $(top_builddir)/tderesources/slox/libkcal_slox.la \ $(top_builddir)/libtdepim/libtdepim.la sloxwizard_LDADD = libsloxwizard.la -sloxwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +sloxwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor sloxwizard_SOURCES = sloxmain.cpp # GroupWise @@ -80,7 +80,7 @@ libgroupwisewizard_la_COMPILE_FIRST = $(top_builddir)/tderesources/groupwise/tde groupwisewizard_LDADD = libgroupwisewizard.la -groupwisewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +groupwisewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor groupwisewizard_SOURCES = groupwisemain.cpp # Exchange @@ -91,13 +91,13 @@ libexchangewizard_la_LIBADD = $(top_builddir)/tderesources/newexchange/libkcal_n $(top_builddir)/libtdepim/libtdepim.la exchangewizard_LDADD = libexchangewizard.la -exchangewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +exchangewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor exchangewizard_SOURCES = exchangemain.cpp # Scalix libscalixwizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) libscalixwizard_la_LIBADD = $(top_builddir)/tderesources/scalix/kcal/libkcalscalix.la \ - $(top_builddir)/tderesources/scalix/tdeabc/libkabcscalix.la \ + $(top_builddir)/tderesources/scalix/tdeabc/libtdeabcscalix.la \ $(top_builddir)/libkcal/libkcal.la \ $(top_builddir)/libtdepim/libtdepim.la \ $(top_builddir)/libkpimidentities/libkpimidentities.la @@ -106,7 +106,7 @@ libscalixwizard_la_SOURCES = scalixwizard.cpp kmailchanges.cpp scalixconfig.kcfg scalixkmailchanges.cpp scalixwizard_LDADD = libscalixwizard.la $(LIB_TDEUI) -scalixwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +scalixwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor scalixwizard_SOURCES = scalixmain.cpp noinst_HEADERS = egroupwarewizard.h kmailchanges.h kolabwizard.h sloxwizard.h \ diff --git a/wizards/egroupwarewizard.cpp b/wizards/egroupwarewizard.cpp index fc4f68a1..647d1bf5 100644 --- a/wizards/egroupwarewizard.cpp +++ b/wizards/egroupwarewizard.cpp @@ -55,10 +55,10 @@ static TQString createURL( const TQString &server, bool useSSL, const TQString & return url.url(); } -class CreateEGroupwareKabcResource : public TDEConfigPropagator::Change +class CreateEGroupwareTdeabcResource : public TDEConfigPropagator::Change { public: - CreateEGroupwareKabcResource() + CreateEGroupwareTdeabcResource() : TDEConfigPropagator::Change( i18n("Create eGroupware Addressbook Resource") ) { } @@ -82,10 +82,10 @@ class CreateEGroupwareKabcResource : public TDEConfigPropagator::Change }; // TODO: fix the i18n strings after freeze... -class ChangeEGroupwareKabcResource : public TDEConfigPropagator::Change +class ChangeEGroupwareTdeabcResource : public TDEConfigPropagator::Change { public: - ChangeEGroupwareKabcResource( const TQString &identifier ) + ChangeEGroupwareTdeabcResource( const TQString &identifier ) : TDEConfigPropagator::Change( i18n("Create eGroupware Addressbook Resource") ), mIdentifier( identifier ) { @@ -273,16 +273,16 @@ class EGroupwarePropagator : public TDEConfigPropagator changes.append( new ChangeEGroupwareKcalResource( (*kcalIt)->identifier() ) ); } - KRES::Manager kabcManager( "contact" ); - kabcManager.readConfig(); - KRES::Manager::Iterator kabcIt; - for ( kabcIt = kabcManager.begin(); kabcIt != kabcManager.end(); ++kabcIt ) { - if ( (*kabcIt)->type() == "xmlrpc" ) break; + KRES::Manager tdeabcManager( "contact" ); + tdeabcManager.readConfig(); + KRES::Manager::Iterator tdeabcIt; + for ( tdeabcIt = tdeabcManager.begin(); tdeabcIt != tdeabcManager.end(); ++tdeabcIt ) { + if ( (*tdeabcIt)->type() == "xmlrpc" ) break; } - if ( kabcIt == kabcManager.end() ) { - changes.append( new CreateEGroupwareKabcResource ); + if ( tdeabcIt == tdeabcManager.end() ) { + changes.append( new CreateEGroupwareTdeabcResource ); } else { - changes.append( new ChangeEGroupwareKabcResource( (*kabcIt)->identifier() ) ); + changes.append( new ChangeEGroupwareTdeabcResource( (*tdeabcIt)->identifier() ) ); } KRES::Manager knotesManager( "notes" ); diff --git a/wizards/exchangewizard.cpp b/wizards/exchangewizard.cpp index 58ca9400..35c8fe3b 100644 --- a/wizards/exchangewizard.cpp +++ b/wizards/exchangewizard.cpp @@ -107,10 +107,10 @@ class UpdateExchangeKcalResource : public TDEConfigPropagator::Change } }; -class CreateExchangeKabcResource : public TDEConfigPropagator::Change +class CreateExchangeTdeabcResource : public TDEConfigPropagator::Change { public: - CreateExchangeKabcResource() + CreateExchangeTdeabcResource() : TDEConfigPropagator::Change( i18n("Create Exchange Addressbook Resource") ) { } @@ -130,15 +130,15 @@ class CreateExchangeKabcResource : public TDEConfigPropagator::Change m.add( r ); m.writeConfig(); - ExchangeConfig::self()->setKabcResource( r->identifier() ); + ExchangeConfig::self()->setTdeabcResource( r->identifier() ); #endif } }; -class UpdateExchangeKabcResource : public TDEConfigPropagator::Change +class UpdateExchangeTdeabcResource : public TDEConfigPropagator::Change { public: - UpdateExchangeKabcResource() + UpdateExchangeTdeabcResource() : TDEConfigPropagator::Change( i18n("Update Exchange Addressbook Resource") ) { } @@ -153,7 +153,7 @@ class UpdateExchangeKabcResource : public TDEConfigPropagator::Change KRES::Manager::Iterator it; for ( it = m.begin(); it != m.end(); ++it ) { - if ( (*it)->identifier() == ExchangeConfig::kabcResource() ) { + if ( (*it)->identifier() == ExchangeConfig::tdeabcResource() ) { TDEABC::ResourceExchange *r = static_cast( *it ); r->prefs()->setUrl( url.url() ); r->prefs()->setUser( ExchangeConfig::self()->user() ); @@ -208,14 +208,14 @@ class ExchangePropagator : public TDEConfigPropagator if ( (*it2)->type() == "exchange" ) break; } if ( it2 == m2.end() ) { - changes.append( new CreateExchangeKabcResource ); + changes.append( new CreateExchangeTdeabcResource ); } else { - if ( (*it2)->identifier() == ExchangeConfig::kabcResource() ) { + if ( (*it2)->identifier() == ExchangeConfig::tdeabcResource() ) { TDEABC::ExchangePrefs *prefs = static_cast( *it2 )->prefs(); if ( prefs->url() != exchangeUrl() || prefs->user() != ExchangeConfig::user() || prefs->password() != ExchangeConfig::password() ) { - changes.append( new UpdateExchangeKabcResource ); + changes.append( new UpdateExchangeTdeabcResource ); } } } diff --git a/wizards/groupwise.kcfg b/wizards/groupwise.kcfg index 8885e0ec..3f01eb1c 100644 --- a/wizards/groupwise.kcfg +++ b/wizards/groupwise.kcfg @@ -52,8 +52,8 @@ - - + + diff --git a/wizards/groupwisewizard.cpp b/wizards/groupwisewizard.cpp index 44a96292..4e828291 100644 --- a/wizards/groupwisewizard.cpp +++ b/wizards/groupwisewizard.cpp @@ -109,10 +109,10 @@ class UpdateGroupwiseKcalResource : public TDEConfigPropagator::Change } }; -class CreateGroupwiseKabcResource : public TDEConfigPropagator::Change +class CreateGroupwiseTdeabcResource : public TDEConfigPropagator::Change { public: - CreateGroupwiseKabcResource() + CreateGroupwiseTdeabcResource() : TDEConfigPropagator::Change( i18n("Create GroupWise Addressbook Resource") ) { } @@ -134,14 +134,14 @@ class CreateGroupwiseKabcResource : public TDEConfigPropagator::Change m.add( r ); m.writeConfig(); - GroupwiseConfig::self()->setKabcResource( r->identifier() ); + GroupwiseConfig::self()->setTdeabcResource( r->identifier() ); } }; -class UpdateGroupwiseKabcResource : public TDEConfigPropagator::Change +class UpdateGroupwiseTdeabcResource : public TDEConfigPropagator::Change { public: - UpdateGroupwiseKabcResource() + UpdateGroupwiseTdeabcResource() : TDEConfigPropagator::Change( i18n("Update GroupWise Addressbook Resource") ) { } @@ -153,7 +153,7 @@ class UpdateGroupwiseKabcResource : public TDEConfigPropagator::Change KRES::Manager::Iterator it; for ( it = m.begin(); it != m.end(); ++it ) { - if ( (*it)->identifier() == GroupwiseConfig::kabcResource() ) { + if ( (*it)->identifier() == GroupwiseConfig::tdeabcResource() ) { TDEABC::ResourceGroupwise *r = static_cast( *it ); r->prefs()->setUrl( serverUrl() ); r->prefs()->setUser( GroupwiseConfig::self()->user() ); @@ -228,14 +228,14 @@ class GroupwisePropagator : public TDEConfigPropagator if ( (*it2)->type() == "groupwise" ) break; } if ( it2 == m2.end() ) { - changes.append( new CreateGroupwiseKabcResource ); + changes.append( new CreateGroupwiseTdeabcResource ); } else { - if ( (*it2)->identifier() == GroupwiseConfig::kabcResource() ) { + if ( (*it2)->identifier() == GroupwiseConfig::tdeabcResource() ) { TDEABC::GroupwisePrefs *prefs = static_cast( *it2 )->prefs(); if ( prefs->url() != serverUrl() || prefs->user() != GroupwiseConfig::user() || prefs->password() != GroupwiseConfig::password() ) { - changes.append( new UpdateGroupwiseKabcResource ); + changes.append( new UpdateGroupwiseTdeabcResource ); } } } diff --git a/wizards/slox.kcfg b/wizards/slox.kcfg index 4f27f8a3..d47cf740 100644 --- a/wizards/slox.kcfg +++ b/wizards/slox.kcfg @@ -35,8 +35,8 @@ - - + + diff --git a/wizards/sloxwizard.cpp b/wizards/sloxwizard.cpp index 6107f75c..7d8ccf32 100644 --- a/wizards/sloxwizard.cpp +++ b/wizards/sloxwizard.cpp @@ -108,10 +108,10 @@ class UpdateSloxKcalResource : public TDEConfigPropagator::Change } }; -class CreateSloxKabcResource : public TDEConfigPropagator::Change +class CreateSloxTdeabcResource : public TDEConfigPropagator::Change { public: - CreateSloxKabcResource() + CreateSloxTdeabcResource() : TDEConfigPropagator::Change( i18n("Create SLOX Addressbook Resource") ) { } @@ -130,14 +130,14 @@ class CreateSloxKabcResource : public TDEConfigPropagator::Change m.add( r ); m.writeConfig(); - SloxConfig::self()->setKabcResource( r->identifier() ); + SloxConfig::self()->setTdeabcResource( r->identifier() ); } }; -class UpdateSloxKabcResource : public TDEConfigPropagator::Change +class UpdateSloxTdeabcResource : public TDEConfigPropagator::Change { public: - UpdateSloxKabcResource() + UpdateSloxTdeabcResource() : TDEConfigPropagator::Change( i18n("Update SLOX Addressbook Resource") ) { } @@ -151,7 +151,7 @@ class UpdateSloxKabcResource : public TDEConfigPropagator::Change KRES::Manager::Iterator it; for ( it = m.begin(); it != m.end(); ++it ) { - if ( (*it)->identifier() == SloxConfig::kabcResource() ) { + if ( (*it)->identifier() == SloxConfig::tdeabcResource() ) { TDEABC::ResourceSlox *r = static_cast( *it ); r->prefs()->setUrl( url.url() ); r->prefs()->setUser( SloxConfig::self()->user() ); @@ -205,14 +205,14 @@ class SloxPropagator : public TDEConfigPropagator if ( (*it2)->type() == "slox" ) break; } if ( it2 == m2.end() ) { - changes.append( new CreateSloxKabcResource ); + changes.append( new CreateSloxTdeabcResource ); } else { - if ( (*it2)->identifier() == SloxConfig::kabcResource() ) { + if ( (*it2)->identifier() == SloxConfig::tdeabcResource() ) { TDEABC::SloxPrefs *prefs = static_cast( *it2 )->prefs(); if ( prefs->url() != sloxUrl() || prefs->user() != SloxConfig::user() || prefs->password() != SloxConfig::password() ) { - changes.append( new UpdateSloxKabcResource ); + changes.append( new UpdateSloxTdeabcResource ); } } } -- cgit v1.2.3