diff options
-rw-r--r-- | CMakeLists.txt | 4 | ||||
-rw-r--r-- | Makefile.am.in | 8 | ||||
-rw-r--r-- | README.Kolab | 2 | ||||
-rw-r--r-- | akregator/src/CMakeLists.txt | 4 | ||||
-rw-r--r-- | akregator/src/Makefile.am | 2 | ||||
-rw-r--r-- | akregator/src/akregator_part.cpp | 8 | ||||
-rw-r--r-- | akregator/src/akregator_part.h | 4 | ||||
-rw-r--r-- | akregator/src/akregator_run.h | 2 | ||||
-rw-r--r-- | akregator/src/akregator_view.cpp | 6 | ||||
-rw-r--r-- | akregator/src/articleviewer.cpp | 2 | ||||
-rw-r--r-- | akregator/src/feedlistview.cpp | 2 | ||||
-rw-r--r-- | akregator/src/frame.cpp | 4 | ||||
-rw-r--r-- | akregator/src/listtabwidget.cpp | 2 | ||||
-rw-r--r-- | akregator/src/mainwindow.cpp | 4 | ||||
-rw-r--r-- | akregator/src/mainwindow.h | 6 | ||||
-rw-r--r-- | akregator/src/pageviewer.cpp | 6 | ||||
-rw-r--r-- | akregator/src/tabwidget.cpp | 4 | ||||
-rw-r--r-- | akregator/src/viewer.cpp | 4 | ||||
-rw-r--r-- | akregator/src/viewer.h | 2 | ||||
-rw-r--r-- | certmanager/CMakeLists.txt | 2 | ||||
-rw-r--r-- | certmanager/Makefile.am | 2 | ||||
-rw-r--r-- | certmanager/kwatchgnupg/Makefile.am | 2 | ||||
-rw-r--r-- | dependency-graph.dot | 14 | ||||
-rw-r--r-- | doc/kmail/menus.docbook | 6 | ||||
-rw-r--r-- | doc/kmail/using-kmail.docbook | 2 | ||||
-rw-r--r-- | kabc/frontend/Makefile.am | 2 | ||||
-rw-r--r-- | kabc/kabc2mutt/Makefile.am | 2 | ||||
-rw-r--r-- | kabc/kabcdistlistupdater/Makefile.am | 2 | ||||
-rw-r--r-- | kaddressbook/CMakeLists.txt | 2 | ||||
-rw-r--r-- | kaddressbook/Makefile.am | 2 | ||||
-rw-r--r-- | kaddressbook/features/Makefile.am | 2 | ||||
-rw-r--r-- | kaddressbook/features/resourceselection.cpp | 2 | ||||
-rw-r--r-- | kaddressbook/kabcore.cpp | 4 | ||||
-rw-r--r-- | kaddressbook/kaddressbook_part.cpp | 4 | ||||
-rw-r--r-- | kaddressbook/kaddressbook_part.h | 6 | ||||
-rw-r--r-- | kaddressbook/viewmanager.cpp | 2 | ||||
-rw-r--r-- | kaddressbook/views/contactlistview.cpp | 2 | ||||
-rw-r--r-- | kaddressbook/views/kaddressbooktableview.cpp | 2 | ||||
-rw-r--r-- | kalarm/CMakeLists.txt | 2 | ||||
-rw-r--r-- | kalarm/Makefile.am | 2 | ||||
-rw-r--r-- | kalarm/kalarmd/Makefile.am | 4 | ||||
-rw-r--r-- | kandy/src/Makefile.am | 4 | ||||
-rw-r--r-- | karm/CMakeLists.txt | 4 | ||||
-rw-r--r-- | karm/Makefile.am | 8 | ||||
-rw-r--r-- | karm/karm_part.cpp | 2 | ||||
-rw-r--r-- | karm/karm_part.h | 4 | ||||
-rw-r--r-- | karm/mainwindow.cpp | 2 | ||||
-rw-r--r-- | karm/mainwindow.h | 2 | ||||
-rw-r--r-- | karm/test/Makefile.am | 4 | ||||
-rw-r--r-- | karm/test/locking.cpp | 2 | ||||
-rwxr-xr-x | karm/test/remote_storage.sh | 2 | ||||
-rw-r--r-- | kioslaves/opengroupware/Makefile.am | 2 | ||||
-rw-r--r-- | kitchensync/src/CMakeLists.txt | 2 | ||||
-rw-r--r-- | kitchensync/src/Makefile.am | 2 | ||||
-rw-r--r-- | kitchensync/src/aboutpage.cpp | 4 | ||||
-rw-r--r-- | kitchensync/src/part.cpp | 2 | ||||
-rw-r--r-- | kitchensync/src/part.h | 6 | ||||
-rw-r--r-- | kmail/CMakeLists.txt | 6 | ||||
-rw-r--r-- | kmail/Mainpage.dox | 2 | ||||
-rw-r--r-- | kmail/Makefile.am | 4 | ||||
-rw-r--r-- | kmail/encodingdetector.cpp | 2 | ||||
-rw-r--r-- | kmail/encodingdetector_ja_p.h | 6 | ||||
-rw-r--r-- | kmail/headerstyle.cpp | 2 | ||||
-rw-r--r-- | kmail/kmail_part.cpp | 4 | ||||
-rw-r--r-- | kmail/kmail_part.h | 10 | ||||
-rw-r--r-- | kmail/kmcommands.cpp | 4 | ||||
-rw-r--r-- | kmail/kmcomposewin.cpp | 4 | ||||
-rw-r--r-- | kmail/kmedit.cpp | 4 | ||||
-rw-r--r-- | kmail/kmedit.h | 2 | ||||
-rw-r--r-- | kmail/kmheaders.cpp | 2 | ||||
-rw-r--r-- | kmail/kmkernel.cpp | 2 | ||||
-rw-r--r-- | kmail/kmkernel.h | 2 | ||||
-rw-r--r-- | kmail/kmmessage.cpp | 2 | ||||
-rw-r--r-- | kmail/kmmsgdict.cpp | 2 | ||||
-rw-r--r-- | kmail/kmreaderwin.cpp | 8 | ||||
-rw-r--r-- | kmail/kmtransport.cpp | 4 | ||||
-rw-r--r-- | kmail/networkaccount.cpp | 2 | ||||
-rw-r--r-- | kmail/objecttreeparser.cpp | 2 | ||||
-rw-r--r-- | kmail/regexplineedit.cpp | 2 | ||||
-rw-r--r-- | kmail/searchwindow.cpp | 2 | ||||
-rw-r--r-- | kmail/snippetwidget.h | 4 | ||||
-rw-r--r-- | kmail/tdehtmlparthtmlwriter.cpp (renamed from kmail/khtmlparthtmlwriter.cpp) | 10 | ||||
-rw-r--r-- | kmail/tdehtmlparthtmlwriter.h (renamed from kmail/khtmlparthtmlwriter.h) | 2 | ||||
-rw-r--r-- | kmail/tdemdict.cpp (renamed from kmail/kmdict.cpp) | 2 | ||||
-rw-r--r-- | kmail/tdemdict.h (renamed from kmail/kmdict.h) | 0 | ||||
-rw-r--r-- | kmail/tests/Makefile.am | 24 | ||||
-rw-r--r-- | kmail/tests/messagedicttests.cpp | 6 | ||||
-rw-r--r-- | kmail/tests/messagedicttests.h | 2 | ||||
-rw-r--r-- | kmail/tests/mimelibtests.cpp | 8 | ||||
-rw-r--r-- | kmail/tests/mimelibtests.h | 2 | ||||
-rw-r--r-- | kmail/tests/storagelayermodule.cpp | 6 | ||||
-rw-r--r-- | kmail/tests/utiltests.cpp | 6 | ||||
-rw-r--r-- | kmail/tests/utiltests.h | 2 | ||||
-rw-r--r-- | kmail/urlhandlermanager.cpp | 4 | ||||
-rw-r--r-- | kmailcvt/Makefile.am | 2 | ||||
-rw-r--r-- | kmobile/Makefile.am | 4 | ||||
-rw-r--r-- | knode/CMakeLists.txt | 2 | ||||
-rw-r--r-- | knode/Makefile.am | 2 | ||||
-rw-r--r-- | knode/articlewidget.cpp | 4 | ||||
-rw-r--r-- | knode/knaccountmanager.cpp | 2 | ||||
-rw-r--r-- | knode/kncomposer.cpp | 4 | ||||
-rw-r--r-- | knode/knconfigwidgets.cpp | 2 | ||||
-rw-r--r-- | knode/knode_part.cpp | 4 | ||||
-rw-r--r-- | knode/knode_part.h | 8 | ||||
-rw-r--r-- | knode/knserverinfo.cpp | 2 | ||||
-rw-r--r-- | knotes/CMakeLists.txt | 6 | ||||
-rw-r--r-- | knotes/ChangeLog | 2 | ||||
-rw-r--r-- | knotes/Makefile.am | 10 | ||||
-rw-r--r-- | knotes/resourcelocalconfig.cpp | 2 | ||||
-rw-r--r-- | knotes/resourcelocalconfig.h | 2 | ||||
-rw-r--r-- | knotes/resourcemanager.h | 2 | ||||
-rw-r--r-- | knotes/resourcenotes.h | 4 | ||||
-rw-r--r-- | kode/Makefile.am | 2 | ||||
-rw-r--r-- | kode/kwsdl/Makefile.am | 2 | ||||
-rw-r--r-- | kode/kwsdl/kung/Makefile.am | 4 | ||||
-rw-r--r-- | kode/kwsdl/kung/binaryinputfield.cpp | 4 | ||||
-rw-r--r-- | kode/kwsdl/schema/Makefile.am | 2 | ||||
-rw-r--r-- | kode/kwsdl/tests/google/Makefile.am | 2 | ||||
-rw-r--r-- | kode/kwsdl/wscl/Makefile.am | 2 | ||||
-rw-r--r-- | kode/kxml_compiler/Makefile.am | 2 | ||||
-rw-r--r-- | konsolekalendar/Makefile.am | 2 | ||||
-rw-r--r-- | kontact/Makefile.am | 2 | ||||
-rw-r--r-- | kontact/Thoughts | 6 | ||||
-rw-r--r-- | kontact/interfaces/core.cpp | 4 | ||||
-rw-r--r-- | kontact/interfaces/core.h | 4 | ||||
-rw-r--r-- | kontact/interfaces/plugin.cpp | 2 | ||||
-rw-r--r-- | kontact/plugins/akregator/akregator_plugin.cpp | 2 | ||||
-rw-r--r-- | kontact/plugins/akregator/akregator_plugin.h | 4 | ||||
-rw-r--r-- | kontact/plugins/kaddressbook/kaddressbook_plugin.cpp | 2 | ||||
-rw-r--r-- | kontact/plugins/kaddressbook/kaddressbook_plugin.h | 2 | ||||
-rw-r--r-- | kontact/plugins/karm/karm_plugin.cpp | 2 | ||||
-rw-r--r-- | kontact/plugins/karm/karm_plugin.h | 2 | ||||
-rw-r--r-- | kontact/plugins/kitchensync/kitchensync_plugin.cpp | 2 | ||||
-rw-r--r-- | kontact/plugins/kitchensync/kitchensync_plugin.h | 2 | ||||
-rw-r--r-- | kontact/plugins/kmail/kmail_plugin.cpp | 2 | ||||
-rw-r--r-- | kontact/plugins/kmail/kmail_plugin.h | 2 | ||||
-rw-r--r-- | kontact/plugins/kmail/summarywidget.cpp | 2 | ||||
-rw-r--r-- | kontact/plugins/kmail/summarywidget.h | 2 | ||||
-rw-r--r-- | kontact/plugins/knode/knode_plugin.cpp | 2 | ||||
-rw-r--r-- | kontact/plugins/knode/knode_plugin.h | 2 | ||||
-rw-r--r-- | kontact/plugins/knotes/Makefile.am | 2 | ||||
-rw-r--r-- | kontact/plugins/knotes/knotes_part.h | 2 | ||||
-rw-r--r-- | kontact/plugins/korganizer/journalplugin.h | 2 | ||||
-rw-r--r-- | kontact/plugins/korganizer/korganizerplugin.h | 2 | ||||
-rw-r--r-- | kontact/plugins/korganizer/summarywidget.cpp | 2 | ||||
-rw-r--r-- | kontact/plugins/korganizer/todoplugin.h | 2 | ||||
-rw-r--r-- | kontact/plugins/korganizer/todosummarywidget.cpp | 2 | ||||
-rw-r--r-- | kontact/plugins/kpilot/kpilot_plugin.cpp | 2 | ||||
-rw-r--r-- | kontact/plugins/newsticker/newsticker_plugin.cpp | 2 | ||||
-rw-r--r-- | kontact/plugins/specialdates/sdsummarywidget.cpp | 2 | ||||
-rw-r--r-- | kontact/plugins/specialdates/specialdates_plugin.cpp | 2 | ||||
-rw-r--r-- | kontact/plugins/summary/CMakeLists.txt | 4 | ||||
-rw-r--r-- | kontact/plugins/summary/Makefile.am | 2 | ||||
-rw-r--r-- | kontact/plugins/summary/summaryview_part.cpp | 4 | ||||
-rw-r--r-- | kontact/plugins/summary/summaryview_part.h | 2 | ||||
-rw-r--r-- | kontact/plugins/summary/summaryview_plugin.cpp | 2 | ||||
-rw-r--r-- | kontact/plugins/summary/summaryview_plugin.h | 2 | ||||
-rw-r--r-- | kontact/plugins/test/test_part.h | 2 | ||||
-rw-r--r-- | kontact/plugins/weather/weather_plugin.cpp | 2 | ||||
-rw-r--r-- | kontact/src/CMakeLists.txt | 2 | ||||
-rw-r--r-- | kontact/src/Makefile.am | 2 | ||||
-rw-r--r-- | kontact/src/mainwindow.cpp | 6 | ||||
-rw-r--r-- | kontact/src/mainwindow.h | 6 | ||||
-rw-r--r-- | korganizer/CMakeLists.txt | 2 | ||||
-rw-r--r-- | korganizer/Makefile.am | 8 | ||||
-rw-r--r-- | korganizer/interfaces/korganizer/part.h | 2 | ||||
-rw-r--r-- | korganizer/korgac/Makefile.am | 4 | ||||
-rw-r--r-- | korganizer/korganizer.h | 2 | ||||
-rw-r--r-- | korganizer/korganizer_part.cpp | 6 | ||||
-rw-r--r-- | korganizer/korganizer_part.h | 2 | ||||
-rw-r--r-- | korganizer/resourceview.cpp | 4 | ||||
-rw-r--r-- | korn/Makefile.am | 2 | ||||
-rw-r--r-- | korn/kconf_update/Makefile.am | 2 | ||||
-rw-r--r-- | korn/password.cpp | 2 | ||||
-rw-r--r-- | ktnef/gui/Makefile.am | 2 | ||||
-rw-r--r-- | ktnef/tests/Makefile.am | 2 | ||||
-rw-r--r-- | libemailfunctions/tests/Makefile.am | 4 | ||||
-rw-r--r-- | libkcal/CMakeLists.txt | 4 | ||||
-rw-r--r-- | libkcal/Makefile.am | 8 | ||||
-rw-r--r-- | libkcal/calendarresources.cpp | 4 | ||||
-rw-r--r-- | libkcal/calendarresources.h | 2 | ||||
-rw-r--r-- | libkcal/resourcecached.cpp | 2 | ||||
-rw-r--r-- | libkcal/resourcecalendar.h | 6 | ||||
-rw-r--r-- | libkcal/resourcelocal.cpp | 2 | ||||
-rw-r--r-- | libkcal/resourcelocalconfig.h | 4 | ||||
-rw-r--r-- | libkcal/resourcelocaldir.cpp | 2 | ||||
-rw-r--r-- | libkcal/resourcelocaldirconfig.h | 4 | ||||
-rw-r--r-- | libkcal/tests/Makefile.am | 28 | ||||
-rw-r--r-- | libkcal/tests/testresource.cpp | 4 | ||||
-rw-r--r-- | libkpimidentities/identity.cpp | 2 | ||||
-rw-r--r-- | libtdepim/CMakeLists.txt | 4 | ||||
-rw-r--r-- | libtdepim/Makefile.am | 2 | ||||
-rw-r--r-- | libtdepim/addresseeview.h | 2 | ||||
-rw-r--r-- | libtdepim/addressesdialog.cpp | 2 | ||||
-rw-r--r-- | libtdepim/cfgc/Makefile.am | 4 | ||||
-rw-r--r-- | libtdepim/completionordereditor.cpp | 2 | ||||
-rw-r--r-- | libtdepim/csshelper.cpp | 2 | ||||
-rw-r--r-- | libtdepim/embeddedurlpage.cpp | 8 | ||||
-rw-r--r-- | libtdepim/infoextension.cpp | 2 | ||||
-rw-r--r-- | libtdepim/kabcresourcecached.cpp | 2 | ||||
-rw-r--r-- | libtdepim/kaddrbook.cpp | 2 | ||||
-rw-r--r-- | libtdepim/komposer/core/Makefile.am | 2 | ||||
-rw-r--r-- | libtdepim/komposer/core/pluginmanager.cpp | 2 | ||||
-rw-r--r-- | libtdepim/komposer/core/tests/Makefile.am | 6 | ||||
-rw-r--r-- | libtdepim/komposer/test/Makefile.am | 2 | ||||
-rw-r--r-- | libtdepim/kpartsdesignerplugin/Makefile.am | 8 | ||||
-rw-r--r-- | libtdepim/kscoringeditor.cpp | 2 | ||||
-rw-r--r-- | libtdepim/sidebarextension.cpp | 2 | ||||
-rw-r--r-- | libtdepim/tdepartsdesignerplugin/CMakeLists.txt (renamed from libtdepim/kpartsdesignerplugin/CMakeLists.txt) | 8 | ||||
-rw-r--r-- | libtdepim/tdepartsdesignerplugin/Makefile.am | 8 | ||||
-rw-r--r-- | libtdepim/tdepartsdesignerplugin/README (renamed from libtdepim/kpartsdesignerplugin/README) | 2 | ||||
-rw-r--r-- | libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp (renamed from libtdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp) | 8 | ||||
-rw-r--r-- | libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.h (renamed from libtdepim/kpartsdesignerplugin/kpartsdesignerplugin.h) | 0 | ||||
-rw-r--r-- | libtdepim/tests/Makefile.am | 4 | ||||
-rw-r--r-- | libtdepim/tests/testdistrlist.cpp | 2 | ||||
-rw-r--r-- | plugins/kmail/bodypartformatter/text_calendar.cpp | 2 | ||||
-rw-r--r-- | plugins/kmail/bodypartformatter/text_vcard.cpp | 4 | ||||
-rw-r--r-- | plugins/kmail/bodypartformatter/text_xdiff.cpp | 4 | ||||
-rw-r--r-- | tderesources/CMakeLists.txt (renamed from kresources/CMakeLists.txt) | 2 | ||||
-rw-r--r-- | tderesources/Makefile.am (renamed from kresources/Makefile.am) | 0 | ||||
-rw-r--r-- | tderesources/birthdays/CMakeLists.txt (renamed from kresources/birthdays/CMakeLists.txt) | 2 | ||||
-rw-r--r-- | tderesources/birthdays/Makefile.am (renamed from kresources/birthdays/Makefile.am) | 2 | ||||
-rw-r--r-- | tderesources/birthdays/kabc.desktop (renamed from kresources/birthdays/kabc.desktop) | 0 | ||||
-rw-r--r-- | tderesources/birthdays/resourcekabc.cpp (renamed from kresources/birthdays/resourcekabc.cpp) | 2 | ||||
-rw-r--r-- | tderesources/birthdays/resourcekabc.h (renamed from kresources/birthdays/resourcekabc.h) | 0 | ||||
-rw-r--r-- | tderesources/birthdays/resourcekabcconfig.cpp (renamed from kresources/birthdays/resourcekabcconfig.cpp) | 0 | ||||
-rw-r--r-- | tderesources/birthdays/resourcekabcconfig.h (renamed from kresources/birthdays/resourcekabcconfig.h) | 4 | ||||
-rw-r--r-- | tderesources/blogging/API_Blog.cpp (renamed from kresources/blogging/API_Blog.cpp) | 0 | ||||
-rw-r--r-- | tderesources/blogging/API_Blog.h (renamed from kresources/blogging/API_Blog.h) | 0 | ||||
-rw-r--r-- | tderesources/blogging/API_Blogger.cpp (renamed from kresources/blogging/API_Blogger.cpp) | 0 | ||||
-rw-r--r-- | tderesources/blogging/API_Blogger.h (renamed from kresources/blogging/API_Blogger.h) | 0 | ||||
-rw-r--r-- | tderesources/blogging/Makefile.am (renamed from kresources/blogging/Makefile.am) | 6 | ||||
-rw-r--r-- | tderesources/blogging/blogging.desktop (renamed from kresources/blogging/blogging.desktop) | 0 | ||||
-rw-r--r-- | tderesources/blogging/bloggingcalendaradaptor.cpp (renamed from kresources/blogging/bloggingcalendaradaptor.cpp) | 0 | ||||
-rw-r--r-- | tderesources/blogging/bloggingcalendaradaptor.h (renamed from kresources/blogging/bloggingcalendaradaptor.h) | 0 | ||||
-rw-r--r-- | tderesources/blogging/bloggingglobals.cpp (renamed from kresources/blogging/bloggingglobals.cpp) | 0 | ||||
-rw-r--r-- | tderesources/blogging/bloggingglobals.h (renamed from kresources/blogging/bloggingglobals.h) | 0 | ||||
-rw-r--r-- | tderesources/blogging/kcal_resourceblogging.cpp (renamed from kresources/blogging/kcal_resourceblogging.cpp) | 2 | ||||
-rw-r--r-- | tderesources/blogging/kcal_resourceblogging.h (renamed from kresources/blogging/kcal_resourceblogging.h) | 0 | ||||
-rw-r--r-- | tderesources/blogging/kcal_resourceblogging_plugin.cpp (renamed from kresources/blogging/kcal_resourceblogging_plugin.cpp) | 0 | ||||
-rw-r--r-- | tderesources/blogging/kcal_resourcebloggingconfig.cpp (renamed from kresources/blogging/kcal_resourcebloggingconfig.cpp) | 0 | ||||
-rw-r--r-- | tderesources/blogging/kcal_resourcebloggingconfig.h (renamed from kresources/blogging/kcal_resourcebloggingconfig.h) | 0 | ||||
-rw-r--r-- | tderesources/blogging/resourcebloggingsettings.ui (renamed from kresources/blogging/resourcebloggingsettings.ui) | 0 | ||||
-rw-r--r-- | tderesources/blogging/xmlrpcjob.cpp (renamed from kresources/blogging/xmlrpcjob.cpp) | 0 | ||||
-rw-r--r-- | tderesources/blogging/xmlrpcjob.h (renamed from kresources/blogging/xmlrpcjob.h) | 0 | ||||
-rw-r--r-- | tderesources/caldav/CMakeLists.txt (renamed from kresources/caldav/CMakeLists.txt) | 2 | ||||
-rw-r--r-- | tderesources/caldav/ConfigureChecks.cmake (renamed from kresources/caldav/ConfigureChecks.cmake) | 0 | ||||
-rw-r--r-- | tderesources/caldav/Makefile.am (renamed from kresources/caldav/Makefile.am) | 2 | ||||
-rw-r--r-- | tderesources/caldav/config.cpp (renamed from kresources/caldav/config.cpp) | 0 | ||||
-rw-r--r-- | tderesources/caldav/config.h (renamed from kresources/caldav/config.h) | 2 | ||||
-rw-r--r-- | tderesources/caldav/configwidgets.cpp (renamed from kresources/caldav/configwidgets.cpp) | 0 | ||||
-rw-r--r-- | tderesources/caldav/configwidgets.h (renamed from kresources/caldav/configwidgets.h) | 0 | ||||
-rw-r--r-- | tderesources/caldav/export.h (renamed from kresources/carddav/export.h) | 2 | ||||
-rw-r--r-- | tderesources/caldav/job.cpp (renamed from kresources/caldav/job.cpp) | 0 | ||||
-rw-r--r-- | tderesources/caldav/job.h (renamed from kresources/caldav/job.h) | 0 | ||||
-rw-r--r-- | tderesources/caldav/kcal_caldav.desktop (renamed from kresources/caldav/kcal_caldav.desktop) | 0 | ||||
-rw-r--r-- | tderesources/caldav/plugin.cpp (renamed from kresources/caldav/plugin.cpp) | 0 | ||||
-rw-r--r-- | tderesources/caldav/preferences.cpp (renamed from kresources/caldav/preferences.cpp) | 2 | ||||
-rw-r--r-- | tderesources/caldav/preferences.h (renamed from kresources/caldav/preferences.h) | 2 | ||||
-rw-r--r-- | tderesources/caldav/prefsskel.kcfg (renamed from kresources/caldav/prefsskel.kcfg) | 2 | ||||
-rw-r--r-- | tderesources/caldav/prefsskel.kcfgc (renamed from kresources/caldav/prefsskel.kcfgc) | 0 | ||||
-rw-r--r-- | tderesources/caldav/reader.cpp (renamed from kresources/caldav/reader.cpp) | 0 | ||||
-rw-r--r-- | tderesources/caldav/reader.h (renamed from kresources/caldav/reader.h) | 0 | ||||
-rw-r--r-- | tderesources/caldav/resource.cpp (renamed from kresources/caldav/resource.cpp) | 0 | ||||
-rw-r--r-- | tderesources/caldav/resource.h (renamed from kresources/caldav/resource.h) | 0 | ||||
-rw-r--r-- | tderesources/caldav/uninstall.desktop (renamed from kresources/caldav/uninstall.desktop) | 0 | ||||
-rw-r--r-- | tderesources/caldav/writer.cpp (renamed from kresources/caldav/writer.cpp) | 0 | ||||
-rw-r--r-- | tderesources/caldav/writer.h (renamed from kresources/caldav/writer.h) | 0 | ||||
-rw-r--r-- | tderesources/carddav/CMakeLists.txt (renamed from kresources/carddav/CMakeLists.txt) | 2 | ||||
-rw-r--r-- | tderesources/carddav/ConfigureChecks.cmake (renamed from kresources/carddav/ConfigureChecks.cmake) | 0 | ||||
-rw-r--r-- | tderesources/carddav/Makefile.am (renamed from kresources/carddav/Makefile.am) | 2 | ||||
-rw-r--r-- | tderesources/carddav/config.cpp (renamed from kresources/carddav/config.cpp) | 0 | ||||
-rw-r--r-- | tderesources/carddav/config.h (renamed from kresources/carddav/config.h) | 2 | ||||
-rw-r--r-- | tderesources/carddav/configwidgets.cpp (renamed from kresources/carddav/configwidgets.cpp) | 0 | ||||
-rw-r--r-- | tderesources/carddav/configwidgets.h (renamed from kresources/carddav/configwidgets.h) | 0 | ||||
-rw-r--r-- | tderesources/carddav/export.h (renamed from kresources/caldav/export.h) | 2 | ||||
-rw-r--r-- | tderesources/carddav/job.cpp (renamed from kresources/carddav/job.cpp) | 0 | ||||
-rw-r--r-- | tderesources/carddav/job.h (renamed from kresources/carddav/job.h) | 0 | ||||
-rw-r--r-- | tderesources/carddav/kabc_carddav.desktop (renamed from kresources/carddav/kabc_carddav.desktop) | 0 | ||||
-rw-r--r-- | tderesources/carddav/plugin.cpp (renamed from kresources/carddav/plugin.cpp) | 0 | ||||
-rw-r--r-- | tderesources/carddav/preferences.cpp (renamed from kresources/carddav/preferences.cpp) | 2 | ||||
-rw-r--r-- | tderesources/carddav/preferences.h (renamed from kresources/carddav/preferences.h) | 2 | ||||
-rw-r--r-- | tderesources/carddav/prefsskel.kcfg (renamed from kresources/carddav/prefsskel.kcfg) | 2 | ||||
-rw-r--r-- | tderesources/carddav/prefsskel.kcfgc (renamed from kresources/carddav/prefsskel.kcfgc) | 0 | ||||
-rw-r--r-- | tderesources/carddav/reader.cpp (renamed from kresources/carddav/reader.cpp) | 0 | ||||
-rw-r--r-- | tderesources/carddav/reader.h (renamed from kresources/carddav/reader.h) | 0 | ||||
-rw-r--r-- | tderesources/carddav/resource.cpp (renamed from kresources/carddav/resource.cpp) | 0 | ||||
-rw-r--r-- | tderesources/carddav/resource.h (renamed from kresources/carddav/resource.h) | 0 | ||||
-rw-r--r-- | tderesources/carddav/uninstall.desktop (renamed from kresources/carddav/uninstall.desktop) | 0 | ||||
-rw-r--r-- | tderesources/carddav/writer.cpp (renamed from kresources/carddav/writer.cpp) | 0 | ||||
-rw-r--r-- | tderesources/carddav/writer.h (renamed from kresources/carddav/writer.h) | 0 | ||||
-rw-r--r-- | tderesources/egroupware/CMakeLists.txt (renamed from kresources/egroupware/CMakeLists.txt) | 6 | ||||
-rw-r--r-- | tderesources/egroupware/Makefile.am (renamed from kresources/egroupware/Makefile.am) | 8 | ||||
-rw-r--r-- | tderesources/egroupware/access.h (renamed from kresources/egroupware/access.h) | 0 | ||||
-rw-r--r-- | tderesources/egroupware/debugdialog.cpp (renamed from kresources/egroupware/debugdialog.cpp) | 0 | ||||
-rw-r--r-- | tderesources/egroupware/debugdialog.h (renamed from kresources/egroupware/debugdialog.h) | 0 | ||||
-rw-r--r-- | tderesources/egroupware/kabc_egroupwareprefs.kcfgc (renamed from kresources/egroupware/kabc_egroupwareprefs.kcfgc) | 2 | ||||
-rw-r--r-- | tderesources/egroupware/kabc_resourcexmlrpc.cpp (renamed from kresources/egroupware/kabc_resourcexmlrpc.cpp) | 0 | ||||
-rw-r--r-- | tderesources/egroupware/kabc_resourcexmlrpc.h (renamed from kresources/egroupware/kabc_resourcexmlrpc.h) | 0 | ||||
-rw-r--r-- | tderesources/egroupware/kabc_resourcexmlrpcconfig.cpp (renamed from kresources/egroupware/kabc_resourcexmlrpcconfig.cpp) | 0 | ||||
-rw-r--r-- | tderesources/egroupware/kabc_resourcexmlrpcconfig.h (renamed from kresources/egroupware/kabc_resourcexmlrpcconfig.h) | 2 | ||||
-rw-r--r-- | tderesources/egroupware/kabc_resourcexmlrpcplugin.cpp (renamed from kresources/egroupware/kabc_resourcexmlrpcplugin.cpp) | 0 | ||||
-rw-r--r-- | tderesources/egroupware/kabc_xmlrpc.desktop (renamed from kresources/egroupware/kabc_xmlrpc.desktop) | 0 | ||||
-rw-r--r-- | tderesources/egroupware/kcal_egroupwareprefs.kcfgc (renamed from kresources/egroupware/kcal_egroupwareprefs.kcfgc) | 2 | ||||
-rw-r--r-- | tderesources/egroupware/kcal_resourcexmlrpc.cpp (renamed from kresources/egroupware/kcal_resourcexmlrpc.cpp) | 2 | ||||
-rw-r--r-- | tderesources/egroupware/kcal_resourcexmlrpc.h (renamed from kresources/egroupware/kcal_resourcexmlrpc.h) | 0 | ||||
-rw-r--r-- | tderesources/egroupware/kcal_resourcexmlrpcconfig.cpp (renamed from kresources/egroupware/kcal_resourcexmlrpcconfig.cpp) | 0 | ||||
-rw-r--r-- | tderesources/egroupware/kcal_resourcexmlrpcconfig.h (renamed from kresources/egroupware/kcal_resourcexmlrpcconfig.h) | 2 | ||||
-rw-r--r-- | tderesources/egroupware/kcal_resourcexmlrpcplugin.cpp (renamed from kresources/egroupware/kcal_resourcexmlrpcplugin.cpp) | 0 | ||||
-rw-r--r-- | tderesources/egroupware/kcal_xmlrpc.desktop (renamed from kresources/egroupware/kcal_xmlrpc.desktop) | 0 | ||||
-rw-r--r-- | tderesources/egroupware/knotes_egroupwareprefs.kcfgc (renamed from kresources/egroupware/knotes_egroupwareprefs.kcfgc) | 2 | ||||
-rw-r--r-- | tderesources/egroupware/knotes_resourcexmlrpc.cpp (renamed from kresources/egroupware/knotes_resourcexmlrpc.cpp) | 0 | ||||
-rw-r--r-- | tderesources/egroupware/knotes_resourcexmlrpc.h (renamed from kresources/egroupware/knotes_resourcexmlrpc.h) | 0 | ||||
-rw-r--r-- | tderesources/egroupware/knotes_resourcexmlrpcconfig.cpp (renamed from kresources/egroupware/knotes_resourcexmlrpcconfig.cpp) | 0 | ||||
-rw-r--r-- | tderesources/egroupware/knotes_resourcexmlrpcconfig.h (renamed from kresources/egroupware/knotes_resourcexmlrpcconfig.h) | 2 | ||||
-rw-r--r-- | tderesources/egroupware/knotes_resourcexmlrpcplugin.cpp (renamed from kresources/egroupware/knotes_resourcexmlrpcplugin.cpp) | 0 | ||||
-rw-r--r-- | tderesources/egroupware/knotes_xmlrpc.desktop (renamed from kresources/egroupware/knotes_xmlrpc.desktop) | 0 | ||||
-rw-r--r-- | tderesources/egroupware/synchronizer.cpp (renamed from kresources/egroupware/synchronizer.cpp) | 0 | ||||
-rw-r--r-- | tderesources/egroupware/synchronizer.h (renamed from kresources/egroupware/synchronizer.h) | 0 | ||||
-rw-r--r-- | tderesources/egroupware/tderesources_kabc_egroupware.kcfg (renamed from kresources/egroupware/kresources_kabc_egroupware.kcfg) | 2 | ||||
-rw-r--r-- | tderesources/egroupware/tderesources_kcal_egroupware.kcfg (renamed from kresources/egroupware/kresources_knotes_egroupware.kcfg) | 2 | ||||
-rw-r--r-- | tderesources/egroupware/tderesources_knotes_egroupware.kcfg (renamed from kresources/egroupware/kresources_kcal_egroupware.kcfg) | 2 | ||||
-rw-r--r-- | tderesources/egroupware/todostatemapper.cpp (renamed from kresources/egroupware/todostatemapper.cpp) | 0 | ||||
-rw-r--r-- | tderesources/egroupware/todostatemapper.h (renamed from kresources/egroupware/todostatemapper.h) | 0 | ||||
-rw-r--r-- | tderesources/egroupware/xmlrpciface.cpp (renamed from kresources/egroupware/xmlrpciface.cpp) | 0 | ||||
-rw-r--r-- | tderesources/egroupware/xmlrpciface.h (renamed from kresources/egroupware/xmlrpciface.h) | 0 | ||||
-rw-r--r-- | tderesources/exchange/CMakeLists.txt (renamed from kresources/exchange/CMakeLists.txt) | 2 | ||||
-rw-r--r-- | tderesources/exchange/Makefile.am (renamed from kresources/exchange/Makefile.am) | 4 | ||||
-rw-r--r-- | tderesources/exchange/dateset.cpp (renamed from kresources/exchange/dateset.cpp) | 0 | ||||
-rw-r--r-- | tderesources/exchange/dateset.h (renamed from kresources/exchange/dateset.h) | 0 | ||||
-rw-r--r-- | tderesources/exchange/exchange.desktop (renamed from kresources/exchange/exchange.desktop) | 0 | ||||
-rw-r--r-- | tderesources/exchange/exchange_deprecated.desktop (renamed from kresources/exchange/exchange_deprecated.desktop) | 0 | ||||
-rw-r--r-- | tderesources/exchange/resourceexchange.cpp (renamed from kresources/exchange/resourceexchange.cpp) | 2 | ||||
-rw-r--r-- | tderesources/exchange/resourceexchange.h (renamed from kresources/exchange/resourceexchange.h) | 0 | ||||
-rw-r--r-- | tderesources/exchange/resourceexchangeconfig.cpp (renamed from kresources/exchange/resourceexchangeconfig.cpp) | 0 | ||||
-rw-r--r-- | tderesources/exchange/resourceexchangeconfig.h (renamed from kresources/exchange/resourceexchangeconfig.h) | 4 | ||||
-rw-r--r-- | tderesources/featureplan/CMakeLists.txt (renamed from kresources/featureplan/CMakeLists.txt) | 2 | ||||
-rw-r--r-- | tderesources/featureplan/Makefile.am (renamed from kresources/featureplan/Makefile.am) | 6 | ||||
-rw-r--r-- | tderesources/featureplan/benchmarkfeaturelist.cpp (renamed from kresources/featureplan/benchmarkfeaturelist.cpp) | 0 | ||||
-rw-r--r-- | tderesources/featureplan/dumpfeaturelist.cpp (renamed from kresources/featureplan/dumpfeaturelist.cpp) | 0 | ||||
-rw-r--r-- | tderesources/featureplan/kcal_resourcefeatureplan.cpp (renamed from kresources/featureplan/kcal_resourcefeatureplan.cpp) | 2 | ||||
-rw-r--r-- | tderesources/featureplan/kcal_resourcefeatureplan.desktop (renamed from kresources/featureplan/kcal_resourcefeatureplan.desktop) | 0 | ||||
-rw-r--r-- | tderesources/featureplan/kcal_resourcefeatureplan.h (renamed from kresources/featureplan/kcal_resourcefeatureplan.h) | 0 | ||||
-rw-r--r-- | tderesources/featureplan/kcal_resourcefeatureplanconfig.cpp (renamed from kresources/featureplan/kcal_resourcefeatureplanconfig.cpp) | 0 | ||||
-rw-r--r-- | tderesources/featureplan/kcal_resourcefeatureplanconfig.h (renamed from kresources/featureplan/kcal_resourcefeatureplanconfig.h) | 2 | ||||
-rw-r--r-- | tderesources/featureplan/kcal_resourcefeatureplanplugin.cpp (renamed from kresources/featureplan/kcal_resourcefeatureplanplugin.cpp) | 0 | ||||
-rw-r--r-- | tderesources/featureplan/kde-features.dtd (renamed from kresources/featureplan/kde-features.dtd) | 0 | ||||
-rw-r--r-- | tderesources/featureplan/kde-features.rng (renamed from kresources/featureplan/kde-features.rng) | 0 | ||||
-rw-r--r-- | tderesources/featureplan/prefs.kcfgc (renamed from kresources/featureplan/prefs.kcfgc) | 2 | ||||
-rw-r--r-- | tderesources/featureplan/tderesources_kcal_featureplan.kcfg (renamed from kresources/featureplan/kresources_kcal_featureplan.kcfg) | 2 | ||||
-rw-r--r-- | tderesources/groupdav/CMakeLists.txt (renamed from kresources/groupdav/CMakeLists.txt) | 8 | ||||
-rw-r--r-- | tderesources/groupdav/Makefile.am (renamed from kresources/groupdav/Makefile.am) | 16 | ||||
-rw-r--r-- | tderesources/groupdav/groupdavaddressbookadaptor.cpp (renamed from kresources/groupdav/groupdavaddressbookadaptor.cpp) | 0 | ||||
-rw-r--r-- | tderesources/groupdav/groupdavaddressbookadaptor.h (renamed from kresources/groupdav/groupdavaddressbookadaptor.h) | 0 | ||||
-rw-r--r-- | tderesources/groupdav/groupdavcalendaradaptor.cpp (renamed from kresources/groupdav/groupdavcalendaradaptor.cpp) | 0 | ||||
-rw-r--r-- | tderesources/groupdav/groupdavcalendaradaptor.h (renamed from kresources/groupdav/groupdavcalendaradaptor.h) | 0 | ||||
-rw-r--r-- | tderesources/groupdav/groupdavglobals.cpp (renamed from kresources/groupdav/groupdavglobals.cpp) | 0 | ||||
-rw-r--r-- | tderesources/groupdav/groupdavglobals.h (renamed from kresources/groupdav/groupdavglobals.h) | 0 | ||||
-rw-r--r-- | tderesources/groupdav/kabc_groupdav.desktop (renamed from kresources/groupdav/kabc_groupdav.desktop) | 0 | ||||
-rw-r--r-- | tderesources/groupdav/kabc_resourcegroupdav.cpp (renamed from kresources/groupdav/kabc_resourcegroupdav.cpp) | 2 | ||||
-rw-r--r-- | tderesources/groupdav/kabc_resourcegroupdav.h (renamed from kresources/groupdav/kabc_resourcegroupdav.h) | 0 | ||||
-rw-r--r-- | tderesources/groupdav/kabc_resourcegroupdav_plugin.cpp (renamed from kresources/groupdav/kabc_resourcegroupdav_plugin.cpp) | 0 | ||||
-rw-r--r-- | tderesources/groupdav/kcal_groupdav.desktop (renamed from kresources/groupdav/kcal_groupdav.desktop) | 0 | ||||
-rw-r--r-- | tderesources/groupdav/kcal_resourcegroupdav.cpp (renamed from kresources/groupdav/kcal_resourcegroupdav.cpp) | 0 | ||||
-rw-r--r-- | tderesources/groupdav/kcal_resourcegroupdav.h (renamed from kresources/groupdav/kcal_resourcegroupdav.h) | 0 | ||||
-rw-r--r-- | tderesources/groupdav/kcal_resourcegroupdav_plugin.cpp (renamed from kresources/groupdav/kcal_resourcegroupdav_plugin.cpp) | 0 | ||||
-rw-r--r-- | tderesources/groupdav/uninstall.desktop (renamed from kresources/groupdav/uninstall.desktop) | 0 | ||||
-rw-r--r-- | tderesources/groupware/Makefile.am (renamed from kresources/groupware/Makefile.am) | 4 | ||||
-rw-r--r-- | tderesources/groupware/kabc_groupware.desktop (renamed from kresources/groupware/kabc_groupware.desktop) | 0 | ||||
-rw-r--r-- | tderesources/groupware/kabc_groupwareprefs.kcfgc (renamed from kresources/groupware/kabc_groupwareprefs.kcfgc) | 2 | ||||
-rw-r--r-- | tderesources/groupware/kabc_resourcegroupware.cpp (renamed from kresources/groupware/kabc_resourcegroupware.cpp) | 0 | ||||
-rw-r--r-- | tderesources/groupware/kabc_resourcegroupware.h (renamed from kresources/groupware/kabc_resourcegroupware.h) | 0 | ||||
-rw-r--r-- | tderesources/groupware/kabc_resourcegroupware_plugin.cpp (renamed from kresources/groupware/kabc_resourcegroupware_plugin.cpp) | 0 | ||||
-rw-r--r-- | tderesources/groupware/kabc_resourcegroupwareconfig.cpp (renamed from kresources/groupware/kabc_resourcegroupwareconfig.cpp) | 0 | ||||
-rw-r--r-- | tderesources/groupware/kabc_resourcegroupwareconfig.h (renamed from kresources/groupware/kabc_resourcegroupwareconfig.h) | 2 | ||||
-rw-r--r-- | tderesources/groupware/kcal_groupware.desktop (renamed from kresources/groupware/kcal_groupware.desktop) | 0 | ||||
-rw-r--r-- | tderesources/groupware/kcal_groupwareprefsbase.kcfgc (renamed from kresources/groupware/kcal_groupwareprefsbase.kcfgc) | 2 | ||||
-rw-r--r-- | tderesources/groupware/kcal_resourcegroupware.cpp (renamed from kresources/groupware/kcal_resourcegroupware.cpp) | 2 | ||||
-rw-r--r-- | tderesources/groupware/kcal_resourcegroupware.h (renamed from kresources/groupware/kcal_resourcegroupware.h) | 0 | ||||
-rw-r--r-- | tderesources/groupware/kcal_resourcegroupware_plugin.cpp (renamed from kresources/groupware/kcal_resourcegroupware_plugin.cpp) | 0 | ||||
-rw-r--r-- | tderesources/groupware/kcal_resourcegroupwareconfig.cpp (renamed from kresources/groupware/kcal_resourcegroupwareconfig.cpp) | 0 | ||||
-rw-r--r-- | tderesources/groupware/kcal_resourcegroupwareconfig.h (renamed from kresources/groupware/kcal_resourcegroupwareconfig.h) | 4 | ||||
-rw-r--r-- | tderesources/groupware/tderesources_kabc_groupware.kcfg (renamed from kresources/groupware/kresources_kabc_groupware.kcfg) | 2 | ||||
-rw-r--r-- | tderesources/groupware/tderesources_kcal_groupware.kcfg (renamed from kresources/groupware/kresources_kcal_groupware.kcfg) | 2 | ||||
-rw-r--r-- | tderesources/groupwise/CMakeLists.txt (renamed from kresources/groupwise/CMakeLists.txt) | 4 | ||||
-rw-r--r-- | tderesources/groupwise/Makefile.am (renamed from kresources/groupwise/Makefile.am) | 4 | ||||
-rw-r--r-- | tderesources/groupwise/TODO (renamed from kresources/groupwise/TODO) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/groupwisesettingswidget.cpp (renamed from kresources/groupwise/groupwisesettingswidget.cpp) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/groupwisesettingswidget.h (renamed from kresources/groupwise/groupwisesettingswidget.h) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/groupwisesettingswidgetbase.ui (renamed from kresources/groupwise/groupwisesettingswidgetbase.ui) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/kabc_groupwise.desktop (renamed from kresources/groupwise/kabc_groupwise.desktop) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/kabc_groupwiseprefs.kcfgc (renamed from kresources/groupwise/kabc_groupwiseprefs.kcfgc) | 2 | ||||
-rw-r--r-- | tderesources/groupwise/kabc_resourcegroupwise.cpp (renamed from kresources/groupwise/kabc_resourcegroupwise.cpp) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/kabc_resourcegroupwise.h (renamed from kresources/groupwise/kabc_resourcegroupwise.h) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/kabc_resourcegroupwise_plugin.cpp (renamed from kresources/groupwise/kabc_resourcegroupwise_plugin.cpp) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/kabc_resourcegroupwiseconfig.cpp (renamed from kresources/groupwise/kabc_resourcegroupwiseconfig.cpp) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/kabc_resourcegroupwiseconfig.h (renamed from kresources/groupwise/kabc_resourcegroupwiseconfig.h) | 2 | ||||
-rw-r--r-- | tderesources/groupwise/kcal_groupwise.desktop (renamed from kresources/groupwise/kcal_groupwise.desktop) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/kcal_groupwiseprefs.cpp (renamed from kresources/groupwise/kcal_groupwiseprefs.cpp) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/kcal_groupwiseprefs.h (renamed from kresources/groupwise/kcal_groupwiseprefs.h) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/kcal_groupwiseprefsbase.kcfgc (renamed from kresources/groupwise/kcal_groupwiseprefsbase.kcfgc) | 2 | ||||
-rw-r--r-- | tderesources/groupwise/kcal_resourcegroupwise.cpp (renamed from kresources/groupwise/kcal_resourcegroupwise.cpp) | 2 | ||||
-rw-r--r-- | tderesources/groupwise/kcal_resourcegroupwise.h (renamed from kresources/groupwise/kcal_resourcegroupwise.h) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/kcal_resourcegroupwise_plugin.cpp (renamed from kresources/groupwise/kcal_resourcegroupwise_plugin.cpp) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp (renamed from kresources/groupwise/kcal_resourcegroupwiseconfig.cpp) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/kcal_resourcegroupwiseconfig.h (renamed from kresources/groupwise/kcal_resourcegroupwiseconfig.h) | 4 | ||||
-rw-r--r-- | tderesources/groupwise/kioslave/CMakeLists.txt (renamed from kresources/groupwise/kioslave/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/kioslave/Makefile.am (renamed from kresources/groupwise/kioslave/Makefile.am) | 2 | ||||
-rw-r--r-- | tderesources/groupwise/kioslave/groupwise.cpp (renamed from kresources/groupwise/kioslave/groupwise.cpp) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/kioslave/groupwise.h (renamed from kresources/groupwise/kioslave/groupwise.h) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/kioslave/groupwise.protocol (renamed from kresources/groupwise/kioslave/groupwise.protocol) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/kioslave/groupwises.protocol (renamed from kresources/groupwise/kioslave/groupwises.protocol) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/soap/CMakeLists.txt (renamed from kresources/groupwise/soap/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/soap/GroupWiseBinding.nsmap (renamed from kresources/groupwise/soap/GroupWiseBinding.nsmap) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/soap/Makefile.am (renamed from kresources/groupwise/soap/Makefile.am) | 4 | ||||
-rw-r--r-- | tderesources/groupwise/soap/README (renamed from kresources/groupwise/soap/README) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/soap/contactconverter.cpp (renamed from kresources/groupwise/soap/contactconverter.cpp) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/soap/contactconverter.h (renamed from kresources/groupwise/soap/contactconverter.h) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/soap/events.xsd (renamed from kresources/groupwise/soap/events.xsd) | 0 | ||||
-rwxr-xr-x | tderesources/groupwise/soap/extractxml.pl (renamed from kresources/groupwise/soap/extractxml.pl) | 0 | ||||
-rwxr-xr-x | tderesources/groupwise/soap/fixup_groupwise.h.pl (renamed from kresources/groupwise/soap/fixup_groupwise.h.pl) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/soap/groupwise.wsdl (renamed from kresources/groupwise/soap/groupwise.wsdl) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/soap/groupwiseserver.cpp (renamed from kresources/groupwise/soap/groupwiseserver.cpp) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/soap/groupwiseserver.h (renamed from kresources/groupwise/soap/groupwiseserver.h) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/soap/gwconverter.cpp (renamed from kresources/groupwise/soap/gwconverter.cpp) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/soap/gwconverter.h (renamed from kresources/groupwise/soap/gwconverter.h) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/soap/gwjobs.cpp (renamed from kresources/groupwise/soap/gwjobs.cpp) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/soap/gwjobs.h (renamed from kresources/groupwise/soap/gwjobs.h) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/soap/incidenceconverter.cpp (renamed from kresources/groupwise/soap/incidenceconverter.cpp) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/soap/incidenceconverter.h (renamed from kresources/groupwise/soap/incidenceconverter.h) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/soap/ksslsocket.cpp (renamed from kresources/groupwise/soap/ksslsocket.cpp) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/soap/ksslsocket.h (renamed from kresources/groupwise/soap/ksslsocket.h) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/soap/methods.xsd (renamed from kresources/groupwise/soap/methods.xsd) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/soap/patches/README (renamed from kresources/groupwise/soap/patches/README) | 2 | ||||
-rw-r--r-- | tderesources/groupwise/soap/patches/broken_namespace.diff (renamed from kresources/groupwise/soap/patches/broken_namespace.diff) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/soap/patches/socklen.diff (renamed from kresources/groupwise/soap/patches/socklen.diff) | 2 | ||||
-rw-r--r-- | tderesources/groupwise/soap/patches/type_typo.diff (renamed from kresources/groupwise/soap/patches/type_typo.diff) | 2 | ||||
-rw-r--r-- | tderesources/groupwise/soap/patches/utf8_entities.diff (renamed from kresources/groupwise/soap/patches/utf8_entities.diff) | 4 | ||||
-rw-r--r-- | tderesources/groupwise/soap/soapC.cpp (renamed from kresources/groupwise/soap/soapC.cpp) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/soap/soapClient.cpp (renamed from kresources/groupwise/soap/soapClient.cpp) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/soap/soapGroupWiseBindingProxy.h (renamed from kresources/groupwise/soap/soapGroupWiseBindingProxy.h) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/soap/soapH.h (renamed from kresources/groupwise/soap/soapH.h) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/soap/soapStub.h (renamed from kresources/groupwise/soap/soapStub.h) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/soap/soapdebug.cpp (renamed from kresources/groupwise/soap/soapdebug.cpp) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/soap/stdsoap2.cpp (renamed from kresources/groupwise/soap/stdsoap2.cpp) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/soap/stdsoap2.h (renamed from kresources/groupwise/soap/stdsoap2.h) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/soap/stl.h (renamed from kresources/groupwise/soap/stl.h) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/soap/stldeque.h (renamed from kresources/groupwise/soap/stldeque.h) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/soap/stllist.h (renamed from kresources/groupwise/soap/stllist.h) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/soap/stlset.h (renamed from kresources/groupwise/soap/stlset.h) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/soap/stlvector.h (renamed from kresources/groupwise/soap/stlvector.h) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/soap/typemap.dat (renamed from kresources/groupwise/soap/typemap.dat) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/soap/types.xsd (renamed from kresources/groupwise/soap/types.xsd) | 0 | ||||
-rw-r--r-- | tderesources/groupwise/tderesources_kabc_groupwise.kcfg (renamed from kresources/groupwise/kresources_kabc_groupwise.kcfg) | 2 | ||||
-rw-r--r-- | tderesources/groupwise/tderesources_kcal_groupwise.kcfg (renamed from kresources/groupwise/kresources_kcal_groupwise.kcfg) | 2 | ||||
-rw-r--r-- | tderesources/kolab/CMakeLists.txt (renamed from kresources/kolab/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | tderesources/kolab/Makefile.am (renamed from kresources/kolab/Makefile.am) | 0 | ||||
-rw-r--r-- | tderesources/kolab/kabc/CMakeLists.txt (renamed from kresources/kolab/kabc/CMakeLists.txt) | 4 | ||||
-rw-r--r-- | tderesources/kolab/kabc/Makefile.am (renamed from kresources/kolab/kabc/Makefile.am) | 8 | ||||
-rw-r--r-- | tderesources/kolab/kabc/contact.cpp (renamed from kresources/kolab/kabc/contact.cpp) | 0 | ||||
-rw-r--r-- | tderesources/kolab/kabc/contact.h (renamed from kresources/kolab/kabc/contact.h) | 0 | ||||
-rw-r--r-- | tderesources/kolab/kabc/kolab.desktop (renamed from kresources/kolab/kabc/kolab.desktop) | 0 | ||||
-rw-r--r-- | tderesources/kolab/kabc/resourcekolab.cpp (renamed from kresources/kolab/kabc/resourcekolab.cpp) | 0 | ||||
-rw-r--r-- | tderesources/kolab/kabc/resourcekolab.h (renamed from kresources/kolab/kabc/resourcekolab.h) | 0 | ||||
-rw-r--r-- | tderesources/kolab/kabc/resourcekolab_plugin.cpp (renamed from kresources/kolab/kabc/resourcekolab_plugin.cpp) | 0 | ||||
-rw-r--r-- | tderesources/kolab/kcal/CMakeLists.txt (renamed from kresources/kolab/kcal/CMakeLists.txt) | 4 | ||||
-rw-r--r-- | tderesources/kolab/kcal/Makefile.am (renamed from kresources/kolab/kcal/Makefile.am) | 8 | ||||
-rw-r--r-- | tderesources/kolab/kcal/event.cpp (renamed from kresources/kolab/kcal/event.cpp) | 0 | ||||
-rw-r--r-- | tderesources/kolab/kcal/event.h (renamed from kresources/kolab/kcal/event.h) | 0 | ||||
-rw-r--r-- | tderesources/kolab/kcal/incidence.cpp (renamed from kresources/kolab/kcal/incidence.cpp) | 0 | ||||
-rw-r--r-- | tderesources/kolab/kcal/incidence.h (renamed from kresources/kolab/kcal/incidence.h) | 0 | ||||
-rw-r--r-- | tderesources/kolab/kcal/journal.cpp (renamed from kresources/kolab/kcal/journal.cpp) | 0 | ||||
-rw-r--r-- | tderesources/kolab/kcal/journal.h (renamed from kresources/kolab/kcal/journal.h) | 0 | ||||
-rw-r--r-- | tderesources/kolab/kcal/kolab.desktop (renamed from kresources/kolab/kcal/kolab.desktop) | 0 | ||||
-rw-r--r-- | tderesources/kolab/kcal/resourcekolab.cpp (renamed from kresources/kolab/kcal/resourcekolab.cpp) | 0 | ||||
-rw-r--r-- | tderesources/kolab/kcal/resourcekolab.h (renamed from kresources/kolab/kcal/resourcekolab.h) | 0 | ||||
-rw-r--r-- | tderesources/kolab/kcal/resourcekolab_plugin.cpp (renamed from kresources/kolab/kcal/resourcekolab_plugin.cpp) | 0 | ||||
-rw-r--r-- | tderesources/kolab/kcal/task.cpp (renamed from kresources/kolab/kcal/task.cpp) | 0 | ||||
-rw-r--r-- | tderesources/kolab/kcal/task.h (renamed from kresources/kolab/kcal/task.h) | 0 | ||||
-rw-r--r-- | tderesources/kolab/knotes/CMakeLists.txt (renamed from kresources/kolab/knotes/CMakeLists.txt) | 4 | ||||
-rw-r--r-- | tderesources/kolab/knotes/Makefile.am (renamed from kresources/kolab/knotes/Makefile.am) | 8 | ||||
-rw-r--r-- | tderesources/kolab/knotes/kolabresource.desktop (renamed from kresources/kolab/knotes/kolabresource.desktop) | 0 | ||||
-rw-r--r-- | tderesources/kolab/knotes/note.cpp (renamed from kresources/kolab/knotes/note.cpp) | 0 | ||||
-rw-r--r-- | tderesources/kolab/knotes/note.h (renamed from kresources/kolab/knotes/note.h) | 0 | ||||
-rw-r--r-- | tderesources/kolab/knotes/resourcekolab.cpp (renamed from kresources/kolab/knotes/resourcekolab.cpp) | 0 | ||||
-rw-r--r-- | tderesources/kolab/knotes/resourcekolab.h (renamed from kresources/kolab/knotes/resourcekolab.h) | 0 | ||||
-rw-r--r-- | tderesources/kolab/knotes/resourcekolab_plugin.cpp (renamed from kresources/kolab/knotes/resourcekolab_plugin.cpp) | 0 | ||||
-rw-r--r-- | tderesources/kolab/kolab-resource.upd (renamed from kresources/kolab/kolab-resource.upd) | 6 | ||||
-rw-r--r-- | tderesources/kolab/shared/CMakeLists.txt (renamed from kresources/kolab/shared/CMakeLists.txt) | 2 | ||||
-rw-r--r-- | tderesources/kolab/shared/Makefile.am (renamed from kresources/kolab/shared/Makefile.am) | 2 | ||||
-rw-r--r-- | tderesources/kolab/shared/kmailconnection.cpp (renamed from kresources/kolab/shared/kmailconnection.cpp) | 0 | ||||
-rw-r--r-- | tderesources/kolab/shared/kmailconnection.h (renamed from kresources/kolab/shared/kmailconnection.h) | 0 | ||||
-rw-r--r-- | tderesources/kolab/shared/kolabbase.cpp (renamed from kresources/kolab/shared/kolabbase.cpp) | 0 | ||||
-rw-r--r-- | tderesources/kolab/shared/kolabbase.h (renamed from kresources/kolab/shared/kolabbase.h) | 0 | ||||
-rw-r--r-- | tderesources/kolab/shared/resourcekolabbase.cpp (renamed from kresources/kolab/shared/resourcekolabbase.cpp) | 2 | ||||
-rw-r--r-- | tderesources/kolab/shared/resourcekolabbase.h (renamed from kresources/kolab/shared/resourcekolabbase.h) | 0 | ||||
-rw-r--r-- | tderesources/kolab/shared/subresource.cpp (renamed from kresources/kolab/shared/subresource.cpp) | 0 | ||||
-rw-r--r-- | tderesources/kolab/shared/subresource.h (renamed from kresources/kolab/shared/subresource.h) | 0 | ||||
-rw-r--r-- | tderesources/kolab/uninstall.desktop (renamed from kresources/kolab/uninstall.desktop) | 0 | ||||
-rw-r--r-- | tderesources/kolab/upgrade-resourcetype.pl (renamed from kresources/kolab/upgrade-resourcetype.pl) | 0 | ||||
-rw-r--r-- | tderesources/lib/CMakeLists.txt (renamed from kresources/lib/CMakeLists.txt) | 2 | ||||
-rw-r--r-- | tderesources/lib/Makefile.am (renamed from kresources/lib/Makefile.am) | 2 | ||||
-rw-r--r-- | tderesources/lib/TODO (renamed from kresources/lib/TODO) | 8 | ||||
-rw-r--r-- | tderesources/lib/addressbookadaptor.cpp (renamed from kresources/lib/addressbookadaptor.cpp) | 0 | ||||
-rw-r--r-- | tderesources/lib/addressbookadaptor.h (renamed from kresources/lib/addressbookadaptor.h) | 0 | ||||
-rw-r--r-- | tderesources/lib/calendaradaptor.cpp (renamed from kresources/lib/calendaradaptor.cpp) | 0 | ||||
-rw-r--r-- | tderesources/lib/calendaradaptor.h (renamed from kresources/lib/calendaradaptor.h) | 0 | ||||
-rw-r--r-- | tderesources/lib/davaddressbookadaptor.cpp (renamed from kresources/lib/davaddressbookadaptor.cpp) | 0 | ||||
-rw-r--r-- | tderesources/lib/davaddressbookadaptor.h (renamed from kresources/lib/davaddressbookadaptor.h) | 0 | ||||
-rw-r--r-- | tderesources/lib/davcalendaradaptor.cpp (renamed from kresources/lib/davcalendaradaptor.cpp) | 0 | ||||
-rw-r--r-- | tderesources/lib/davcalendaradaptor.h (renamed from kresources/lib/davcalendaradaptor.h) | 0 | ||||
-rw-r--r-- | tderesources/lib/davgroupwareglobals.cpp (renamed from kresources/lib/davgroupwareglobals.cpp) | 0 | ||||
-rw-r--r-- | tderesources/lib/davgroupwareglobals.h (renamed from kresources/lib/davgroupwareglobals.h) | 0 | ||||
-rw-r--r-- | tderesources/lib/folderconfig.cpp (renamed from kresources/lib/folderconfig.cpp) | 0 | ||||
-rw-r--r-- | tderesources/lib/folderconfig.h (renamed from kresources/lib/folderconfig.h) | 0 | ||||
-rw-r--r-- | tderesources/lib/folderlister.cpp (renamed from kresources/lib/folderlister.cpp) | 2 | ||||
-rw-r--r-- | tderesources/lib/folderlister.h (renamed from kresources/lib/folderlister.h) | 2 | ||||
-rw-r--r-- | tderesources/lib/folderlistview.cpp (renamed from kresources/lib/folderlistview.cpp) | 0 | ||||
-rw-r--r-- | tderesources/lib/folderlistview.h (renamed from kresources/lib/folderlistview.h) | 0 | ||||
-rw-r--r-- | tderesources/lib/folderselectdialog.cpp (renamed from kresources/lib/folderselectdialog.cpp) | 0 | ||||
-rw-r--r-- | tderesources/lib/folderselectdialog.h (renamed from kresources/lib/folderselectdialog.h) | 0 | ||||
-rw-r--r-- | tderesources/lib/groupwaredataadaptor.cpp (renamed from kresources/lib/groupwaredataadaptor.cpp) | 0 | ||||
-rw-r--r-- | tderesources/lib/groupwaredataadaptor.h (renamed from kresources/lib/groupwaredataadaptor.h) | 0 | ||||
-rw-r--r-- | tderesources/lib/groupwaredownloadjob.cpp (renamed from kresources/lib/groupwaredownloadjob.cpp) | 0 | ||||
-rw-r--r-- | tderesources/lib/groupwaredownloadjob.h (renamed from kresources/lib/groupwaredownloadjob.h) | 0 | ||||
-rw-r--r-- | tderesources/lib/groupwareresourcejob.cpp (renamed from kresources/lib/groupwareresourcejob.cpp) | 0 | ||||
-rw-r--r-- | tderesources/lib/groupwareresourcejob.h (renamed from kresources/lib/groupwareresourcejob.h) | 0 | ||||
-rw-r--r-- | tderesources/lib/groupwareuploadjob.cpp (renamed from kresources/lib/groupwareuploadjob.cpp) | 0 | ||||
-rw-r--r-- | tderesources/lib/groupwareuploadjob.h (renamed from kresources/lib/groupwareuploadjob.h) | 0 | ||||
-rw-r--r-- | tderesources/lib/kabc_resourcegroupwarebase.cpp (renamed from kresources/lib/kabc_resourcegroupwarebase.cpp) | 2 | ||||
-rw-r--r-- | tderesources/lib/kabc_resourcegroupwarebase.h (renamed from kresources/lib/kabc_resourcegroupwarebase.h) | 0 | ||||
-rw-r--r-- | tderesources/lib/kabc_resourcegroupwarebaseconfig.cpp (renamed from kresources/lib/kabc_resourcegroupwarebaseconfig.cpp) | 2 | ||||
-rw-r--r-- | tderesources/lib/kabc_resourcegroupwarebaseconfig.h (renamed from kresources/lib/kabc_resourcegroupwarebaseconfig.h) | 2 | ||||
-rw-r--r-- | tderesources/lib/kcal_cachesettingsdlg.cpp (renamed from kresources/lib/kcal_cachesettingsdlg.cpp) | 2 | ||||
-rw-r--r-- | tderesources/lib/kcal_cachesettingsdlg.h (renamed from kresources/lib/kcal_cachesettingsdlg.h) | 0 | ||||
-rw-r--r-- | tderesources/lib/kcal_resourcegroupwarebase.cpp (renamed from kresources/lib/kcal_resourcegroupwarebase.cpp) | 2 | ||||
-rw-r--r-- | tderesources/lib/kcal_resourcegroupwarebase.h (renamed from kresources/lib/kcal_resourcegroupwarebase.h) | 0 | ||||
-rw-r--r-- | tderesources/lib/kcal_resourcegroupwarebaseconfig.cpp (renamed from kresources/lib/kcal_resourcegroupwarebaseconfig.cpp) | 2 | ||||
-rw-r--r-- | tderesources/lib/kcal_resourcegroupwarebaseconfig.h (renamed from kresources/lib/kcal_resourcegroupwarebaseconfig.h) | 2 | ||||
-rw-r--r-- | tderesources/lib/tderesources_groupwareprefs.kcfg (renamed from kresources/lib/kresources_groupwareprefs.kcfg) | 2 | ||||
-rw-r--r-- | tderesources/lib/tderesources_groupwareprefs.kcfgc (renamed from kresources/lib/kresources_groupwareprefs.kcfgc) | 2 | ||||
-rw-r--r-- | tderesources/lib/webdavhandler.cpp (renamed from kresources/lib/webdavhandler.cpp) | 0 | ||||
-rw-r--r-- | tderesources/lib/webdavhandler.h (renamed from kresources/lib/webdavhandler.h) | 0 | ||||
-rw-r--r-- | tderesources/newexchange/CMakeLists.txt (renamed from kresources/newexchange/CMakeLists.txt) | 4 | ||||
-rw-r--r-- | tderesources/newexchange/Incidence.mapping (renamed from kresources/newexchange/Incidence.mapping) | 0 | ||||
-rw-r--r-- | tderesources/newexchange/Makefile.am (renamed from kresources/newexchange/Makefile.am) | 10 | ||||
-rw-r--r-- | tderesources/newexchange/Person.mapping (renamed from kresources/newexchange/Person.mapping) | 0 | ||||
-rw-r--r-- | tderesources/newexchange/exchangeaddressbookadaptor.cpp (renamed from kresources/newexchange/exchangeaddressbookadaptor.cpp) | 0 | ||||
-rw-r--r-- | tderesources/newexchange/exchangeaddressbookadaptor.h (renamed from kresources/newexchange/exchangeaddressbookadaptor.h) | 0 | ||||
-rw-r--r-- | tderesources/newexchange/exchangecalendaradaptor.cpp (renamed from kresources/newexchange/exchangecalendaradaptor.cpp) | 0 | ||||
-rw-r--r-- | tderesources/newexchange/exchangecalendaradaptor.h (renamed from kresources/newexchange/exchangecalendaradaptor.h) | 0 | ||||
-rw-r--r-- | tderesources/newexchange/exchangeconvertercalendar.cpp (renamed from kresources/newexchange/exchangeconvertercalendar.cpp) | 0 | ||||
-rw-r--r-- | tderesources/newexchange/exchangeconvertercalendar.h (renamed from kresources/newexchange/exchangeconvertercalendar.h) | 0 | ||||
-rw-r--r-- | tderesources/newexchange/exchangeconvertercontact.cpp (renamed from kresources/newexchange/exchangeconvertercontact.cpp) | 0 | ||||
-rw-r--r-- | tderesources/newexchange/exchangeconvertercontact.h (renamed from kresources/newexchange/exchangeconvertercontact.h) | 0 | ||||
-rw-r--r-- | tderesources/newexchange/exchangeglobals.cpp (renamed from kresources/newexchange/exchangeglobals.cpp) | 0 | ||||
-rw-r--r-- | tderesources/newexchange/exchangeglobals.h (renamed from kresources/newexchange/exchangeglobals.h) | 0 | ||||
-rw-r--r-- | tderesources/newexchange/kabc_newexchange.desktop (renamed from kresources/newexchange/kabc_newexchange.desktop) | 0 | ||||
-rw-r--r-- | tderesources/newexchange/kabc_newexchange_final.desktop (renamed from kresources/newexchange/kabc_newexchange_final.desktop) | 0 | ||||
-rw-r--r-- | tderesources/newexchange/kabc_resourceexchange.cpp (renamed from kresources/newexchange/kabc_resourceexchange.cpp) | 2 | ||||
-rw-r--r-- | tderesources/newexchange/kabc_resourceexchange.h (renamed from kresources/newexchange/kabc_resourceexchange.h) | 0 | ||||
-rw-r--r-- | tderesources/newexchange/kabc_resourceexchange_plugin.cpp (renamed from kresources/newexchange/kabc_resourceexchange_plugin.cpp) | 0 | ||||
-rw-r--r-- | tderesources/newexchange/kcal_newexchange.desktop (renamed from kresources/newexchange/kcal_newexchange.desktop) | 0 | ||||
-rw-r--r-- | tderesources/newexchange/kcal_newexchange_final.desktop (renamed from kresources/newexchange/kcal_newexchange_final.desktop) | 0 | ||||
-rw-r--r-- | tderesources/newexchange/kcal_resourceexchange.cpp (renamed from kresources/newexchange/kcal_resourceexchange.cpp) | 2 | ||||
-rw-r--r-- | tderesources/newexchange/kcal_resourceexchange.h (renamed from kresources/newexchange/kcal_resourceexchange.h) | 0 | ||||
-rw-r--r-- | tderesources/newexchange/kcal_resourceexchange_plugin.cpp (renamed from kresources/newexchange/kcal_resourceexchange_plugin.cpp) | 0 | ||||
-rw-r--r-- | tderesources/remote/CMakeLists.txt (renamed from kresources/remote/CMakeLists.txt) | 2 | ||||
-rw-r--r-- | tderesources/remote/Makefile.am (renamed from kresources/remote/Makefile.am) | 2 | ||||
-rw-r--r-- | tderesources/remote/remote.desktop (renamed from kresources/remote/remote.desktop) | 0 | ||||
-rw-r--r-- | tderesources/remote/resourceremote.cpp (renamed from kresources/remote/resourceremote.cpp) | 2 | ||||
-rw-r--r-- | tderesources/remote/resourceremote.h (renamed from kresources/remote/resourceremote.h) | 0 | ||||
-rw-r--r-- | tderesources/remote/resourceremote_plugin.cpp (renamed from kresources/remote/resourceremote_plugin.cpp) | 0 | ||||
-rw-r--r-- | tderesources/remote/resourceremoteconfig.cpp (renamed from kresources/remote/resourceremoteconfig.cpp) | 0 | ||||
-rw-r--r-- | tderesources/remote/resourceremoteconfig.h (renamed from kresources/remote/resourceremoteconfig.h) | 4 | ||||
-rw-r--r-- | tderesources/scalix/CMakeLists.txt (renamed from kresources/scalix/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | tderesources/scalix/Makefile.am (renamed from kresources/scalix/Makefile.am) | 0 | ||||
-rw-r--r-- | tderesources/scalix/README (renamed from kresources/scalix/README) | 0 | ||||
-rw-r--r-- | tderesources/scalix/kabc/CMakeLists.txt (renamed from kresources/scalix/kabc/CMakeLists.txt) | 4 | ||||
-rw-r--r-- | tderesources/scalix/kabc/Makefile.am (renamed from kresources/scalix/kabc/Makefile.am) | 8 | ||||
-rw-r--r-- | tderesources/scalix/kabc/contact.cpp (renamed from kresources/scalix/kabc/contact.cpp) | 0 | ||||
-rw-r--r-- | tderesources/scalix/kabc/contact.h (renamed from kresources/scalix/kabc/contact.h) | 0 | ||||
-rw-r--r-- | tderesources/scalix/kabc/resourcescalix.cpp (renamed from kresources/scalix/kabc/resourcescalix.cpp) | 0 | ||||
-rw-r--r-- | tderesources/scalix/kabc/resourcescalix.h (renamed from kresources/scalix/kabc/resourcescalix.h) | 0 | ||||
-rw-r--r-- | tderesources/scalix/kabc/resourcescalix_plugin.cpp (renamed from kresources/scalix/kabc/resourcescalix_plugin.cpp) | 0 | ||||
-rw-r--r-- | tderesources/scalix/kabc/scalix.desktop (renamed from kresources/scalix/kabc/scalix.desktop) | 0 | ||||
-rw-r--r-- | tderesources/scalix/kcal/CMakeLists.txt (renamed from kresources/scalix/kcal/CMakeLists.txt) | 4 | ||||
-rw-r--r-- | tderesources/scalix/kcal/Makefile.am (renamed from kresources/scalix/kcal/Makefile.am) | 8 | ||||
-rw-r--r-- | tderesources/scalix/kcal/resourcescalix.cpp (renamed from kresources/scalix/kcal/resourcescalix.cpp) | 0 | ||||
-rw-r--r-- | tderesources/scalix/kcal/resourcescalix.h (renamed from kresources/scalix/kcal/resourcescalix.h) | 0 | ||||
-rw-r--r-- | tderesources/scalix/kcal/resourcescalix_plugin.cpp (renamed from kresources/scalix/kcal/resourcescalix_plugin.cpp) | 0 | ||||
-rw-r--r-- | tderesources/scalix/kcal/scalix.desktop (renamed from kresources/scalix/kcal/scalix.desktop) | 0 | ||||
-rw-r--r-- | tderesources/scalix/kioslave/CMakeLists.txt (renamed from kresources/scalix/kioslave/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | tderesources/scalix/kioslave/Makefile.am (renamed from kresources/scalix/kioslave/Makefile.am) | 0 | ||||
-rw-r--r-- | tderesources/scalix/kioslave/scalix.cpp (renamed from kresources/scalix/kioslave/scalix.cpp) | 0 | ||||
-rw-r--r-- | tderesources/scalix/kioslave/scalix.h (renamed from kresources/scalix/kioslave/scalix.h) | 0 | ||||
-rw-r--r-- | tderesources/scalix/kioslave/scalix.protocol (renamed from kresources/scalix/kioslave/scalix.protocol) | 0 | ||||
-rw-r--r-- | tderesources/scalix/kioslave/scalixs.protocol (renamed from kresources/scalix/kioslave/scalixs.protocol) | 0 | ||||
-rw-r--r-- | tderesources/scalix/knotes/CMakeLists.txt (renamed from kresources/scalix/knotes/CMakeLists.txt) | 4 | ||||
-rw-r--r-- | tderesources/scalix/knotes/Makefile.am (renamed from kresources/scalix/knotes/Makefile.am) | 8 | ||||
-rw-r--r-- | tderesources/scalix/knotes/resourcescalix.cpp (renamed from kresources/scalix/knotes/resourcescalix.cpp) | 0 | ||||
-rw-r--r-- | tderesources/scalix/knotes/resourcescalix.h (renamed from kresources/scalix/knotes/resourcescalix.h) | 0 | ||||
-rw-r--r-- | tderesources/scalix/knotes/resourcescalix_plugin.cpp (renamed from kresources/scalix/knotes/resourcescalix_plugin.cpp) | 0 | ||||
-rw-r--r-- | tderesources/scalix/knotes/scalix.desktop (renamed from kresources/scalix/knotes/scalix.desktop) | 0 | ||||
-rw-r--r-- | tderesources/scalix/scalixadmin/CMakeLists.txt (renamed from kresources/scalix/scalixadmin/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | tderesources/scalix/scalixadmin/Makefile.am (renamed from kresources/scalix/scalixadmin/Makefile.am) | 2 | ||||
-rw-r--r-- | tderesources/scalix/scalixadmin/delegatedialog.cpp (renamed from kresources/scalix/scalixadmin/delegatedialog.cpp) | 0 | ||||
-rw-r--r-- | tderesources/scalix/scalixadmin/delegatedialog.h (renamed from kresources/scalix/scalixadmin/delegatedialog.h) | 0 | ||||
-rw-r--r-- | tderesources/scalix/scalixadmin/delegatemanager.cpp (renamed from kresources/scalix/scalixadmin/delegatemanager.cpp) | 0 | ||||
-rw-r--r-- | tderesources/scalix/scalixadmin/delegatemanager.h (renamed from kresources/scalix/scalixadmin/delegatemanager.h) | 0 | ||||
-rw-r--r-- | tderesources/scalix/scalixadmin/delegatepage.cpp (renamed from kresources/scalix/scalixadmin/delegatepage.cpp) | 0 | ||||
-rw-r--r-- | tderesources/scalix/scalixadmin/delegatepage.h (renamed from kresources/scalix/scalixadmin/delegatepage.h) | 0 | ||||
-rw-r--r-- | tderesources/scalix/scalixadmin/delegateview.cpp (renamed from kresources/scalix/scalixadmin/delegateview.cpp) | 0 | ||||
-rw-r--r-- | tderesources/scalix/scalixadmin/delegateview.h (renamed from kresources/scalix/scalixadmin/delegateview.h) | 0 | ||||
-rw-r--r-- | tderesources/scalix/scalixadmin/jobs.cpp (renamed from kresources/scalix/scalixadmin/jobs.cpp) | 0 | ||||
-rw-r--r-- | tderesources/scalix/scalixadmin/jobs.h (renamed from kresources/scalix/scalixadmin/jobs.h) | 0 | ||||
-rw-r--r-- | tderesources/scalix/scalixadmin/ldapdialog.cpp (renamed from kresources/scalix/scalixadmin/ldapdialog.cpp) | 0 | ||||
-rw-r--r-- | tderesources/scalix/scalixadmin/ldapdialog.h (renamed from kresources/scalix/scalixadmin/ldapdialog.h) | 0 | ||||
-rw-r--r-- | tderesources/scalix/scalixadmin/ldapview.cpp (renamed from kresources/scalix/scalixadmin/ldapview.cpp) | 0 | ||||
-rw-r--r-- | tderesources/scalix/scalixadmin/ldapview.h (renamed from kresources/scalix/scalixadmin/ldapview.h) | 0 | ||||
-rw-r--r-- | tderesources/scalix/scalixadmin/main.cpp (renamed from kresources/scalix/scalixadmin/main.cpp) | 0 | ||||
-rw-r--r-- | tderesources/scalix/scalixadmin/mainwindow.cpp (renamed from kresources/scalix/scalixadmin/mainwindow.cpp) | 0 | ||||
-rw-r--r-- | tderesources/scalix/scalixadmin/mainwindow.h (renamed from kresources/scalix/scalixadmin/mainwindow.h) | 0 | ||||
-rw-r--r-- | tderesources/scalix/scalixadmin/otherusermanager.cpp (renamed from kresources/scalix/scalixadmin/otherusermanager.cpp) | 0 | ||||
-rw-r--r-- | tderesources/scalix/scalixadmin/otherusermanager.h (renamed from kresources/scalix/scalixadmin/otherusermanager.h) | 0 | ||||
-rw-r--r-- | tderesources/scalix/scalixadmin/otheruserpage.cpp (renamed from kresources/scalix/scalixadmin/otheruserpage.cpp) | 0 | ||||
-rw-r--r-- | tderesources/scalix/scalixadmin/otheruserpage.h (renamed from kresources/scalix/scalixadmin/otheruserpage.h) | 0 | ||||
-rw-r--r-- | tderesources/scalix/scalixadmin/otheruserview.cpp (renamed from kresources/scalix/scalixadmin/otheruserview.cpp) | 0 | ||||
-rw-r--r-- | tderesources/scalix/scalixadmin/otheruserview.h (renamed from kresources/scalix/scalixadmin/otheruserview.h) | 0 | ||||
-rw-r--r-- | tderesources/scalix/scalixadmin/outofofficepage.cpp (renamed from kresources/scalix/scalixadmin/outofofficepage.cpp) | 0 | ||||
-rw-r--r-- | tderesources/scalix/scalixadmin/outofofficepage.h (renamed from kresources/scalix/scalixadmin/outofofficepage.h) | 0 | ||||
-rw-r--r-- | tderesources/scalix/scalixadmin/passwordpage.cpp (renamed from kresources/scalix/scalixadmin/passwordpage.cpp) | 2 | ||||
-rw-r--r-- | tderesources/scalix/scalixadmin/passwordpage.h (renamed from kresources/scalix/scalixadmin/passwordpage.h) | 0 | ||||
-rw-r--r-- | tderesources/scalix/scalixadmin/settings.cpp (renamed from kresources/scalix/scalixadmin/settings.cpp) | 0 | ||||
-rw-r--r-- | tderesources/scalix/scalixadmin/settings.h (renamed from kresources/scalix/scalixadmin/settings.h) | 0 | ||||
-rw-r--r-- | tderesources/scalix/shared/CMakeLists.txt (renamed from kresources/scalix/shared/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | tderesources/scalix/shared/Makefile.am (renamed from kresources/scalix/shared/Makefile.am) | 2 | ||||
-rw-r--r-- | tderesources/scalix/shared/kmailconnection.cpp (renamed from kresources/scalix/shared/kmailconnection.cpp) | 0 | ||||
-rw-r--r-- | tderesources/scalix/shared/kmailconnection.h (renamed from kresources/scalix/shared/kmailconnection.h) | 0 | ||||
-rw-r--r-- | tderesources/scalix/shared/resourcescalixbase.cpp (renamed from kresources/scalix/shared/resourcescalixbase.cpp) | 2 | ||||
-rw-r--r-- | tderesources/scalix/shared/resourcescalixbase.h (renamed from kresources/scalix/shared/resourcescalixbase.h) | 0 | ||||
-rw-r--r-- | tderesources/scalix/shared/scalixbase.cpp (renamed from kresources/scalix/shared/scalixbase.cpp) | 0 | ||||
-rw-r--r-- | tderesources/scalix/shared/scalixbase.h (renamed from kresources/scalix/shared/scalixbase.h) | 0 | ||||
-rw-r--r-- | tderesources/scalix/shared/subresource.cpp (renamed from kresources/scalix/shared/subresource.cpp) | 0 | ||||
-rw-r--r-- | tderesources/scalix/shared/subresource.h (renamed from kresources/scalix/shared/subresource.h) | 0 | ||||
-rw-r--r-- | tderesources/scalix/uninstall.desktop (renamed from kresources/scalix/uninstall.desktop) | 0 | ||||
-rw-r--r-- | tderesources/slox/CMakeLists.txt (renamed from kresources/slox/CMakeLists.txt) | 4 | ||||
-rw-r--r-- | tderesources/slox/Makefile.am (renamed from kresources/slox/Makefile.am) | 6 | ||||
-rw-r--r-- | tderesources/slox/kabc_ox.desktop (renamed from kresources/slox/kabc_ox.desktop) | 0 | ||||
-rw-r--r-- | tderesources/slox/kabc_slox.desktop (renamed from kresources/slox/kabc_slox.desktop) | 0 | ||||
-rw-r--r-- | tderesources/slox/kabcresourceslox.cpp (renamed from kresources/slox/kabcresourceslox.cpp) | 8 | ||||
-rw-r--r-- | tderesources/slox/kabcresourceslox.h (renamed from kresources/slox/kabcresourceslox.h) | 0 | ||||
-rw-r--r-- | tderesources/slox/kabcresourceslox_plugin.cpp (renamed from kresources/slox/kabcresourceslox_plugin.cpp) | 0 | ||||
-rw-r--r-- | tderesources/slox/kabcresourcesloxconfig.cpp (renamed from kresources/slox/kabcresourcesloxconfig.cpp) | 0 | ||||
-rw-r--r-- | tderesources/slox/kabcresourcesloxconfig.h (renamed from kresources/slox/kabcresourcesloxconfig.h) | 2 | ||||
-rw-r--r-- | tderesources/slox/kabcsloxprefs.kcfgc (renamed from kresources/slox/kabcsloxprefs.kcfgc) | 2 | ||||
-rw-r--r-- | tderesources/slox/kcal_ox.desktop (renamed from kresources/slox/kcal_ox.desktop) | 0 | ||||
-rw-r--r-- | tderesources/slox/kcal_slox.desktop (renamed from kresources/slox/kcal_slox.desktop) | 0 | ||||
-rw-r--r-- | tderesources/slox/kcalresourceslox.cpp (renamed from kresources/slox/kcalresourceslox.cpp) | 2 | ||||
-rw-r--r-- | tderesources/slox/kcalresourceslox.h (renamed from kresources/slox/kcalresourceslox.h) | 0 | ||||
-rw-r--r-- | tderesources/slox/kcalresourceslox_plugin.cpp (renamed from kresources/slox/kcalresourceslox_plugin.cpp) | 0 | ||||
-rw-r--r-- | tderesources/slox/kcalresourcesloxconfig.cpp (renamed from kresources/slox/kcalresourcesloxconfig.cpp) | 0 | ||||
-rw-r--r-- | tderesources/slox/kcalresourcesloxconfig.h (renamed from kresources/slox/kcalresourcesloxconfig.h) | 4 | ||||
-rw-r--r-- | tderesources/slox/kcalsloxprefs.kcfgc (renamed from kresources/slox/kcalsloxprefs.kcfgc) | 2 | ||||
-rw-r--r-- | tderesources/slox/sloxaccounts.cpp (renamed from kresources/slox/sloxaccounts.cpp) | 0 | ||||
-rw-r--r-- | tderesources/slox/sloxaccounts.h (renamed from kresources/slox/sloxaccounts.h) | 0 | ||||
-rw-r--r-- | tderesources/slox/sloxbase.cpp (renamed from kresources/slox/sloxbase.cpp) | 2 | ||||
-rw-r--r-- | tderesources/slox/sloxbase.h (renamed from kresources/slox/sloxbase.h) | 0 | ||||
-rw-r--r-- | tderesources/slox/sloxfolder.cpp (renamed from kresources/slox/sloxfolder.cpp) | 0 | ||||
-rw-r--r-- | tderesources/slox/sloxfolder.h (renamed from kresources/slox/sloxfolder.h) | 0 | ||||
-rw-r--r-- | tderesources/slox/sloxfolderdialog.cpp (renamed from kresources/slox/sloxfolderdialog.cpp) | 0 | ||||
-rw-r--r-- | tderesources/slox/sloxfolderdialog.h (renamed from kresources/slox/sloxfolderdialog.h) | 0 | ||||
-rw-r--r-- | tderesources/slox/sloxfoldermanager.cpp (renamed from kresources/slox/sloxfoldermanager.cpp) | 0 | ||||
-rw-r--r-- | tderesources/slox/sloxfoldermanager.h (renamed from kresources/slox/sloxfoldermanager.h) | 0 | ||||
-rw-r--r-- | tderesources/slox/tderesources_kabc_slox.kcfg (renamed from kresources/slox/kresources_kabc_slox.kcfg) | 2 | ||||
-rw-r--r-- | tderesources/slox/tderesources_kcal_slox.kcfg (renamed from kresources/slox/kresources_kcal_slox.kcfg) | 2 | ||||
-rw-r--r-- | tderesources/slox/testsloxaccounts.cpp (renamed from kresources/slox/testsloxaccounts.cpp) | 0 | ||||
-rw-r--r-- | tderesources/slox/webdavhandler.cpp (renamed from kresources/slox/webdavhandler.cpp) | 0 | ||||
-rw-r--r-- | tderesources/slox/webdavhandler.h (renamed from kresources/slox/webdavhandler.h) | 0 | ||||
-rw-r--r-- | tderesources/tvanytime/AUTHORS (renamed from kresources/tvanytime/AUTHORS) | 0 | ||||
-rw-r--r-- | tderesources/tvanytime/COPYING (renamed from kresources/tvanytime/COPYING) | 0 | ||||
-rw-r--r-- | tderesources/tvanytime/ChangeLog (renamed from kresources/tvanytime/ChangeLog) | 0 | ||||
-rw-r--r-- | tderesources/tvanytime/DESIGN (renamed from kresources/tvanytime/DESIGN) | 0 | ||||
-rw-r--r-- | tderesources/tvanytime/Makefile.am (renamed from kresources/tvanytime/Makefile.am) | 2 | ||||
-rw-r--r-- | tderesources/tvanytime/README (renamed from kresources/tvanytime/README) | 0 | ||||
-rw-r--r-- | tderesources/tvanytime/TODO (renamed from kresources/tvanytime/TODO) | 0 | ||||
-rw-r--r-- | tderesources/tvanytime/kcal_resourcetvanytime.cpp (renamed from kresources/tvanytime/kcal_resourcetvanytime.cpp) | 2 | ||||
-rw-r--r-- | tderesources/tvanytime/kcal_resourcetvanytime.h (renamed from kresources/tvanytime/kcal_resourcetvanytime.h) | 0 | ||||
-rw-r--r-- | tderesources/tvanytime/kcal_resourcetvanytime_plugin.cpp (renamed from kresources/tvanytime/kcal_resourcetvanytime_plugin.cpp) | 0 | ||||
-rw-r--r-- | tderesources/tvanytime/kcal_resourcetvanytimeconfig.cpp (renamed from kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp) | 0 | ||||
-rw-r--r-- | tderesources/tvanytime/kcal_resourcetvanytimeconfig.h (renamed from kresources/tvanytime/kcal_resourcetvanytimeconfig.h) | 4 | ||||
-rw-r--r-- | tderesources/tvanytime/kcal_tvanytime.desktop (renamed from kresources/tvanytime/kcal_tvanytime.desktop) | 0 | ||||
-rw-r--r-- | tderesources/tvanytime/kcal_tvanytimeprefs.cpp (renamed from kresources/tvanytime/kcal_tvanytimeprefs.cpp) | 0 | ||||
-rw-r--r-- | tderesources/tvanytime/kcal_tvanytimeprefs.h (renamed from kresources/tvanytime/kcal_tvanytimeprefs.h) | 0 | ||||
-rw-r--r-- | tderesources/tvanytime/kcal_tvanytimeprefsbase.kcfgc (renamed from kresources/tvanytime/kcal_tvanytimeprefsbase.kcfgc) | 2 | ||||
-rw-r--r-- | tderesources/tvanytime/service.cpp (renamed from kresources/tvanytime/service.cpp) | 0 | ||||
-rw-r--r-- | tderesources/tvanytime/service.h (renamed from kresources/tvanytime/service.h) | 0 | ||||
-rw-r--r-- | tderesources/tvanytime/tderesources_kcal_tvanytime.kcfg (renamed from kresources/tvanytime/kresources_kcal_tvanytime.kcfg) | 2 | ||||
-rw-r--r-- | tderesources/tvanytime/tvanytime.tdevelop (renamed from kresources/tvanytime/tvanytime.tdevelop) | 6 | ||||
-rw-r--r-- | wizards/CMakeLists.txt | 32 | ||||
-rw-r--r-- | wizards/Makefile.am | 60 | ||||
-rw-r--r-- | wizards/egroupwarewizard.cpp | 12 | ||||
-rw-r--r-- | wizards/exchangewizard.cpp | 6 | ||||
-rw-r--r-- | wizards/groupwisewizard.cpp | 8 | ||||
-rw-r--r-- | wizards/kmailchanges.cpp | 2 | ||||
-rw-r--r-- | wizards/kolabwizard.cpp | 6 | ||||
-rw-r--r-- | wizards/scalixwizard.cpp | 4 | ||||
-rw-r--r-- | wizards/sloxwizard.cpp | 8 |
708 files changed, 652 insertions, 652 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 36f6ee02..259b7320 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,7 +109,7 @@ option( BUILD_KORGANIZER "Build korganizer" ${BUILD_ALL} ) option( BUILD_PLUGINS "Build plugins" ${BUILD_ALL} ) option( BUILD_KNOTES "Build knotes" ${BUILD_ALL} ) option( BUILD_KODE "Build kode" ${BUILD_ALL} ) -option( BUILD_KRESOURCES "Build kresources" ${BUILD_ALL} ) +option( BUILD_KRESOURCES "Build tderesources" ${BUILD_ALL} ) option( BUILD_WIZARDS "Build wizards" ${BUILD_ALL} ) option( BUILD_KABC "Build kabc" ${BUILD_ALL} ) option( BUILD_KONSOLEKALENDAR "Build konsolekalendar" ${BUILD_ALL} ) @@ -181,7 +181,7 @@ tde_conditional_add_subdirectory( BUILD_KORGANIZER korganizer ) tde_conditional_add_subdirectory( BUILD_PLUGINS plugins ) tde_conditional_add_subdirectory( BUILD_KNOTES knotes ) tde_conditional_add_subdirectory( BUILD_KODE kode ) -tde_conditional_add_subdirectory( BUILD_KRESOURCES kresources ) +tde_conditional_add_subdirectory( BUILD_KRESOURCES tderesources ) tde_conditional_add_subdirectory( BUILD_WIZARDS wizards ) tde_conditional_add_subdirectory( BUILD_KABC kabc ) tde_conditional_add_subdirectory( BUILD_KONSOLEKALENDAR konsolekalendar ) diff --git a/Makefile.am.in b/Makefile.am.in index 0f9cb6e5..dd70a20c 100644 --- a/Makefile.am.in +++ b/Makefile.am.in @@ -11,7 +11,7 @@ COMPILE_AFTER_libkmime = libemailfunctions COMPILE_AFTER_libemailfunctions = libkcal libkpimidentities kmail korganizer COMPILE_AFTER_libkholidays = korganizer kontact -COMPILE_AFTER_libkcal = kalarm kitchensync konsolekalendar korganizer libkpimexchange libtdepim karm knotes kresources kfile-plugins +COMPILE_AFTER_libkcal = kalarm kitchensync konsolekalendar korganizer libkpimexchange libtdepim karm knotes tderesources kfile-plugins COMPILE_AFTER_mimelib = korn kmail COMPILE_AFTER_libtdenetwork = kmail knode COMPILE_AFTER_libksieve = kmail @@ -25,14 +25,14 @@ COMPILE_BEFORE_kaddressbook = libtdepim certmanager akregator COMPILE_BEFORE_kandy = libtdepim COMPILE_BEFORE_kmail= libtdepim libkpimidentities certmanager libkpgp libkmime COMPILE_BEFORE_knode= libtdepim libkpgp libkmime -COMPILE_BEFORE_karm = libtdepim kresources +COMPILE_BEFORE_karm = libtdepim tderesources COMPILE_BEFORE_plugins = kmail libtdepim libkcal COMPILE_BEFORE_kontact = kaddressbook knotes korganizer akregator karm COMPILE_BEFORE_kioslaves = libkmime libtdepim COMPILE_BEFORE_libkpimexchange = libtdepim COMPILE_BEFORE_kalarm = libtdepim libkmime -COMPILE_BEFORE_kresources = libkpimexchange knotes kaddressbook kode -COMPILE_BEFORE_wizards = libtdepim kresources korganizer kaddressbook kmail +COMPILE_BEFORE_tderesources = libkpimexchange knotes kaddressbook kode +COMPILE_BEFORE_wizards = libtdepim tderesources korganizer kaddressbook kmail COMPILE_BEFORE_korn = libtdenetwork COMPILE_BEFORE_kitchensync = libtdepim COMPILE_BEFORE_akregator = libtdepim diff --git a/README.Kolab b/README.Kolab index 05f81135..8253c447 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 "kcmshell kresources", section "kabc" + 1. All available addressbook resources as seen in "kcmshell tderesources", section "kabc" 2. LDAP Nothing special, AFAIK diff --git a/akregator/src/CMakeLists.txt b/akregator/src/CMakeLists.txt index 2a154391..621880eb 100644 --- a/akregator/src/CMakeLists.txt +++ b/akregator/src/CMakeLists.txt @@ -92,7 +92,7 @@ tde_add_library( akregatorprivate SHARED AUTOMOC tde_add_executable( akregator AUTOMOC SOURCES main.cpp mainwindow.cpp - LINK akregatorprivate-shared tdepim-shared kparts-shared + LINK akregatorprivate-shared tdepim-shared tdeparts-shared DESTINATION ${BIN_INSTALL_DIR} ) @@ -117,6 +117,6 @@ tde_add_kpart( libakregatorpart AUTOMOC tagpropertieswidgetbase.ui treenodeitem.cpp viewer.cpp ${TDE_INCLUDE_DIR}/kspeechsink.skel ${TDE_INCLUDE_DIR}/kspeech.stub listtabwidget.cpp - LINK akregatorprivate-shared tdepim-shared khtml-shared + LINK akregatorprivate-shared tdepim-shared tdehtml-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/akregator/src/Makefile.am b/akregator/src/Makefile.am index 5cfde7d3..e212b260 100644 --- a/akregator/src/Makefile.am +++ b/akregator/src/Makefile.am @@ -20,7 +20,7 @@ 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) -lktexteditor +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 diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp index 41632adb..3ea4e798 100644 --- a/akregator/src/akregator_part.cpp +++ b/akregator/src/akregator_part.cpp @@ -32,7 +32,7 @@ #include <kconfigdialog.h> #include <kfiledialog.h> #include <kglobalsettings.h> -#include <khtmldefaults.h> +#include <tdehtmldefaults.h> #include <kinstance.h> #include <kmainwindow.h> #include <kmessagebox.h> @@ -45,9 +45,9 @@ #include <ktempfile.h> #include <ktrader.h> #include <kio/netaccess.h> -#include <kparts/browserinterface.h> -#include <kparts/genericfactory.h> -#include <kparts/partmanager.h> +#include <tdeparts/browserinterface.h> +#include <tdeparts/genericfactory.h> +#include <tdeparts/partmanager.h> #include <tqfile.h> #include <tqobjectlist.h> diff --git a/akregator/src/akregator_part.h b/akregator/src/akregator_part.h index 68062a0c..1e17c05f 100644 --- a/akregator/src/akregator_part.h +++ b/akregator/src/akregator_part.h @@ -26,8 +26,8 @@ #ifndef _AKREGATORPART_H_ #define _AKREGATORPART_H_ -#include <kparts/browserextension.h> -#include <kparts/part.h> +#include <tdeparts/browserextension.h> +#include <tdeparts/part.h> #include <kurl.h> #include "config.h" diff --git a/akregator/src/akregator_run.h b/akregator/src/akregator_run.h index 6f8308b9..e819dc13 100644 --- a/akregator/src/akregator_run.h +++ b/akregator/src/akregator_run.h @@ -25,7 +25,7 @@ #ifndef AKREGATOR_RUN_H #define AKREGATOR_RUN_H -#include <kparts/browserrun.h> +#include <tdeparts/browserrun.h> namespace Akregator { diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp index e1ed5a1d..3066760a 100644 --- a/akregator/src/akregator_view.cpp +++ b/akregator/src/akregator_view.cpp @@ -67,8 +67,8 @@ #include <kdialog.h> #include <kfiledialog.h> #include <kfileitem.h> -#include <khtml_part.h> -#include <khtmlview.h> +#include <tdehtml_part.h> +#include <tdehtmlview.h> #include <kiconloader.h> #include <kinputdialog.h> #include <klineedit.h> @@ -82,7 +82,7 @@ #include <kstandarddirs.h> #include <kurl.h> #include <kxmlguifactory.h> -#include <kparts/partmanager.h> +#include <tdeparts/partmanager.h> #include <tqbuttongroup.h> #include <tqcheckbox.h> diff --git a/akregator/src/articleviewer.cpp b/akregator/src/articleviewer.cpp index 32d931f8..dfd48ffe 100644 --- a/akregator/src/articleviewer.cpp +++ b/akregator/src/articleviewer.cpp @@ -31,7 +31,7 @@ #include <kapplication.h> #include <kdebug.h> #include <kglobalsettings.h> -#include <khtmlview.h> +#include <tdehtmlview.h> #include <klocale.h> #include <kprocess.h> #include <krun.h> diff --git a/akregator/src/feedlistview.cpp b/akregator/src/feedlistview.cpp index 8998882f..117d94c0 100644 --- a/akregator/src/feedlistview.cpp +++ b/akregator/src/feedlistview.cpp @@ -43,7 +43,7 @@ #include <kiconeffect.h> #include <kiconloader.h> #include <klocale.h> -#include <kmultipledrag.h> +#include <tdemultipledrag.h> #include <kstringhandler.h> #include <kurldrag.h> diff --git a/akregator/src/frame.cpp b/akregator/src/frame.cpp index 14b32522..8f1a6512 100644 --- a/akregator/src/frame.cpp +++ b/akregator/src/frame.cpp @@ -28,8 +28,8 @@ #include <kactioncollection.h> #include <kdebug.h> #include <klocale.h> -#include <kparts/browserextension.h> -#include <kparts/part.h> +#include <tdeparts/browserextension.h> +#include <tdeparts/part.h> #include <libtdepim/progressmanager.h> diff --git a/akregator/src/listtabwidget.cpp b/akregator/src/listtabwidget.cpp index f071cd95..1920a5ff 100644 --- a/akregator/src/listtabwidget.cpp +++ b/akregator/src/listtabwidget.cpp @@ -27,7 +27,7 @@ #include "folder.h" #include "treenode.h" -#include <kmultitabbar.h> +#include <tdemultitabbar.h> #include <tqiconset.h> #include <tqlayout.h> diff --git a/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp index 3e520842..f6e5ec18 100644 --- a/akregator/src/mainwindow.cpp +++ b/akregator/src/mainwindow.cpp @@ -41,7 +41,7 @@ #include <klibloader.h> #include <klocale.h> #include <kmessagebox.h> -#include <kparts/partmanager.h> +#include <tdeparts/partmanager.h> #include <ksqueezedtextlabel.h> #include <kstandarddirs.h> #include <kstatusbar.h> @@ -237,7 +237,7 @@ bool MainWindow::queryExit() kdDebug() << "MainWindow::queryExit()" << endl; if ( !kapp->sessionSaving() ) { - delete m_part; // delete that here instead of dtor to ensure nested khtmlparts are deleted before singleton objects like KHTMLPageCache + delete m_part; // delete that here instead of dtor to ensure nested tdehtmlparts are deleted before singleton objects like KHTMLPageCache m_part = 0; } else diff --git a/akregator/src/mainwindow.h b/akregator/src/mainwindow.h index c7321dbd..bb3ca733 100644 --- a/akregator/src/mainwindow.h +++ b/akregator/src/mainwindow.h @@ -30,9 +30,9 @@ #endif #include <kapplication.h> -#include <kparts/mainwindow.h> -#include <kparts/browserinterface.h> -#include <kparts/browserextension.h> +#include <tdeparts/mainwindow.h> +#include <tdeparts/browserinterface.h> +#include <tdeparts/browserextension.h> #include <kio/job.h> class KActionCollection; diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp index 0506906b..d80cccfb 100644 --- a/akregator/src/pageviewer.cpp +++ b/akregator/src/pageviewer.cpp @@ -35,14 +35,14 @@ #include <kbookmarkmanager.h> #include <kconfig.h> #include <kglobalsettings.h> -#include <khtml_settings.h> -#include <khtmlview.h> +#include <tdehtml_settings.h> +#include <tdehtmlview.h> #include <kiconloader.h> #include <klocale.h> #include <kpopupmenu.h> #include <kstandarddirs.h> #include <kstdaccel.h> -#include <kparts/browserinterface.h> +#include <tdeparts/browserinterface.h> #include <tqclipboard.h> #include <tqcstring.h> diff --git a/akregator/src/tabwidget.cpp b/akregator/src/tabwidget.cpp index eeeb3cbd..6e7527d2 100644 --- a/akregator/src/tabwidget.cpp +++ b/akregator/src/tabwidget.cpp @@ -41,8 +41,8 @@ #include <kpopupmenu.h> #include <krun.h> #include <klocale.h> -#include <khtmlview.h> -#include <khtml_part.h> +#include <tdehtmlview.h> +#include <tdehtml_part.h> #include <kiconloader.h> #include <kurl.h> #include <kurldrag.h> diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp index fa62e128..299cedd1 100644 --- a/akregator/src/viewer.cpp +++ b/akregator/src/viewer.cpp @@ -26,7 +26,7 @@ #include <kaction.h> #include <kapplication.h> #include <kfiledialog.h> -#include <khtmlview.h> +#include <tdehtmlview.h> #include <kiconloader.h> #include <klocale.h> #include <kmessagebox.h> @@ -35,7 +35,7 @@ #include <krun.h> #include <kshell.h> #include <kurl.h> -#include <kparts/browserextension.h> +#include <tdeparts/browserextension.h> #include <tqaccel.h> #include <tqclipboard.h> diff --git a/akregator/src/viewer.h b/akregator/src/viewer.h index e7e0722d..d1d407f9 100644 --- a/akregator/src/viewer.h +++ b/akregator/src/viewer.h @@ -25,7 +25,7 @@ #ifndef VIEWER_H #define VIEWER_H -#include <khtml_part.h> +#include <tdehtml_part.h> class KURL; diff --git a/certmanager/CMakeLists.txt b/certmanager/CMakeLists.txt index d98988bc..8ff147bb 100644 --- a/certmanager/CMakeLists.txt +++ b/certmanager/CMakeLists.txt @@ -50,7 +50,7 @@ tde_add_executable( kleopatra AUTOMOC hierarchyanalyser.cpp certificatewizard.ui certificatewizardimpl.cpp certificateinfowidget.ui certificateinfowidgetimpl.cpp crlview.cpp storedtransferjob.cpp certlistview.cpp - LINK conf-static kleopatra-shared kutils-shared kabc-shared + LINK conf-static kleopatra-shared tdeutils-shared kabc-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/certmanager/Makefile.am b/certmanager/Makefile.am index 8f737116..0c37f3fa 100644 --- a/certmanager/Makefile.am +++ b/certmanager/Makefile.am @@ -17,7 +17,7 @@ kleopatra_SOURCES = \ METASOURCES = AUTO -kleopatra_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +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_KABC) rcdir = $(kde_datadir)/kleopatra diff --git a/certmanager/kwatchgnupg/Makefile.am b/certmanager/kwatchgnupg/Makefile.am index 0c25605f..f5b28ba4 100644 --- a/certmanager/kwatchgnupg/Makefile.am +++ b/certmanager/kwatchgnupg/Makefile.am @@ -13,7 +13,7 @@ kwatchgnupg_SOURCES = \ METASOURCES = AUTO -kwatchgnupg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +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_KABC) rcdir = $(kde_datadir)/kwatchgnupg diff --git a/dependency-graph.dot b/dependency-graph.dot index 8403e4d6..5cd9d0cf 100644 --- a/dependency-graph.dot +++ b/dependency-graph.dot @@ -6,18 +6,18 @@ digraph "inter-dependency graph for tdepim" { "certmanager" -> "kmail"; "certmanager" -> "libkpimidentities"; "kaddressbook" -> "kontact"; - "kaddressbook" -> "kresources"; + "kaddressbook" -> "tderesources"; "kaddressbook" -> "wizards"; "kgantt" -> "korganizer"; "kmail" -> "plugins"; "kmail" -> "wizards"; "knotes" -> "kontact"; - "knotes" -> "kresources"; - "kode" -> "kresources"; + "knotes" -> "tderesources"; + "kode" -> "tderesources"; "korganizer" -> "kontact"; "korganizer" -> "wizards"; - "kresources" -> "karm"; - "kresources" -> "wizards"; + "tderesources" -> "karm"; + "tderesources" -> "wizards"; "ktnef" -> "libkcal"; "libemailfunctions" -> "kmail"; "libemailfunctions" -> "korganizer"; @@ -31,7 +31,7 @@ digraph "inter-dependency graph for tdepim" { "libkcal" -> "konsolekalendar"; "libkcal" -> "korganizer"; "libkcal" -> "kpilot"; - "libkcal" -> "kresources"; + "libkcal" -> "tderesources"; "libkcal" -> "libtdepim"; "libkcal" -> "libkpimexchange"; "libkcal" -> "plugins"; @@ -64,7 +64,7 @@ digraph "inter-dependency graph for tdepim" { "libkpgp" -> "kmail"; "libkpgp" -> "knode"; "libkpimexchange" -> "korganizer"; - "libkpimexchange" -> "kresources"; + "libkpimexchange" -> "tderesources"; "libkpimidentities" -> "kmail"; "libkpimidentities" -> "korganizer"; "libksieve" -> "kmail"; diff --git a/doc/kmail/menus.docbook b/doc/kmail/menus.docbook index b8e808f3..38d96e6f 100644 --- a/doc/kmail/menus.docbook +++ b/doc/kmail/menus.docbook @@ -2100,9 +2100,9 @@ attachment window.</para> </menuchoice> </term> <listitem> -<para>Uses <ulink url="/kspell/">&kspell;</ulink> to check the spelling in the body of your +<para>Uses <ulink url="/tdespell/">&tdespell;</ulink> to check the spelling in the body of your message. Note that -you have to configure &kspell; with <menuchoice><guimenu>Settings</guimenu> +you have to configure &tdespell; with <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Spellchecker...</guimenuitem></menuchoice> if you use it for the first time.</para> </listitem> @@ -2163,7 +2163,7 @@ tools to change certain properties of the composed text.</para> </menuchoice> </term> <listitem> -<para>Allows you to configure <ulink url="/kspell/">&kspell;</ulink>, &kde;'s spellchecker.</para> +<para>Allows you to configure <ulink url="/tdespell/">&tdespell;</ulink>, &kde;'s spellchecker.</para> </listitem> </varlistentry> diff --git a/doc/kmail/using-kmail.docbook b/doc/kmail/using-kmail.docbook index bd9de909..999bd6d9 100644 --- a/doc/kmail/using-kmail.docbook +++ b/doc/kmail/using-kmail.docbook @@ -366,7 +366,7 @@ automatic spellchecking in the <menuchoice><guimenu>Options</guimenu></menuchoic <para>To check the spelling of your message using a dialog, select <menuchoice><guimenu>Tools</guimenu> <guimenuitem>Spelling...</guimenuitem></menuchoice>. &kmail; uses -<ulink url="/kspell/">&kspell;</ulink> to +<ulink url="/tdespell/">&tdespell;</ulink> to check spelling, which is the &kde; frontend to the <application>ispell</application> or <application>aspell</application> spelling checker. Note that you may first need to configure the spellchecker using diff --git a/kabc/frontend/Makefile.am b/kabc/frontend/Makefile.am index a41a4363..675c6da1 100644 --- a/kabc/frontend/Makefile.am +++ b/kabc/frontend/Makefile.am @@ -4,7 +4,7 @@ METASOURCES = AUTO bin_PROGRAMS = kabcfrontend -kabcfrontend_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kabcfrontend_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kabcfrontend_LDADD = -lkabc $(LIB_TDECORE) kabcfrontend_SOURCES = main.cpp mainWindow.ui diff --git a/kabc/kabc2mutt/Makefile.am b/kabc/kabc2mutt/Makefile.am index 41d0fb71..84d4fa7e 100644 --- a/kabc/kabc2mutt/Makefile.am +++ b/kabc/kabc2mutt/Makefile.am @@ -4,7 +4,7 @@ METASOURCES = AUTO bin_PROGRAMS = kabc2mutt -kabc2mutt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kabc2mutt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kabc2mutt_LDADD = -lkabc $(LIB_TDECORE) kabc2mutt_SOURCES = kabc2mutt.cpp main.cpp diff --git a/kabc/kabcdistlistupdater/Makefile.am b/kabc/kabcdistlistupdater/Makefile.am index c8cdc3cb..d97fdc3f 100644 --- a/kabc/kabcdistlistupdater/Makefile.am +++ b/kabc/kabcdistlistupdater/Makefile.am @@ -4,7 +4,7 @@ METASOURCES = AUTO bin_PROGRAMS = kabcdistlistupdater -kabcdistlistupdater_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kabcdistlistupdater_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kabcdistlistupdater_LDADD = $(LIB_KABC) $(top_builddir)/libtdepim/libtdepim.la kabcdistlistupdater_SOURCES = kabcdistlistupdater.cpp diff --git a/kaddressbook/CMakeLists.txt b/kaddressbook/CMakeLists.txt index 7b000d3a..1cea8dd8 100644 --- a/kaddressbook/CMakeLists.txt +++ b/kaddressbook/CMakeLists.txt @@ -103,6 +103,6 @@ tde_add_library( kaddressbook SHARED AUTOMOC LINK kabcommon-static kabim-static printer-static kabinterfaces-shared - tdepim-shared kabc_file-shared tdeprint-shared kutils-shared + tdepim-shared kabc_file-shared tdeprint-shared tdeutils-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kaddressbook/Makefile.am b/kaddressbook/Makefile.am index 7978319b..4b2d1bef 100644 --- a/kaddressbook/Makefile.am +++ b/kaddressbook/Makefile.am @@ -17,7 +17,7 @@ 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) -lktexteditor +kaddressbook_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kaddressbook_LDADD = libkaddressbook.la kde_module_LTLIBRARIES = libkaddressbookpart.la diff --git a/kaddressbook/features/Makefile.am b/kaddressbook/features/Makefile.am index 6258a6a7..c4e8c247 100644 --- a/kaddressbook/features/Makefile.am +++ b/kaddressbook/features/Makefile.am @@ -26,7 +26,7 @@ endif libkaddrbk_resourceselection_la_SOURCES = resourceselection.cpp libkaddrbk_resourceselection_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined -libkaddrbk_resourceselection_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) -lkresources +libkaddrbk_resourceselection_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) -ltderesources noinst_HEADERS = distributionlistwidget.h distributionlistngwidget.h resourceselection.h diff --git a/kaddressbook/features/resourceselection.cpp b/kaddressbook/features/resourceselection.cpp index 03e7f1f4..82d81de4 100644 --- a/kaddressbook/features/resourceselection.cpp +++ b/kaddressbook/features/resourceselection.cpp @@ -36,7 +36,7 @@ #include <kinputdialog.h> #include <klocale.h> #include <kmessagebox.h> -#include <kresources/configdialog.h> +#include <tderesources/configdialog.h> #include "core.h" diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 0b517bf0..f88be3c3 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -52,13 +52,13 @@ #include <kcmultidialog.h> #include <kdebug.h> #include <tdeversion.h> -#include <kimproxy.h> +#include <tdeimproxy.h> #include <klocale.h> #include <kmessagebox.h> #include <kprinter.h> #include <kprotocolinfo.h> #include <kpushbutton.h> -#include <kresources/selectdialog.h> +#include <tderesources/selectdialog.h> #include <kstandarddirs.h> #include <kstatusbar.h> #include <kstdguiitem.h> diff --git a/kaddressbook/kaddressbook_part.cpp b/kaddressbook/kaddressbook_part.cpp index 88f55d31..cd1c15c7 100644 --- a/kaddressbook/kaddressbook_part.cpp +++ b/kaddressbook/kaddressbook_part.cpp @@ -29,8 +29,8 @@ #include <kiconloader.h> #include <kinstance.h> #include <klocale.h> -#include <kparts/genericfactory.h> -#include <kparts/statusbarextension.h> +#include <tdeparts/genericfactory.h> +#include <tdeparts/statusbarextension.h> #include <kstatusbar.h> #include "kabcore.h" diff --git a/kaddressbook/kaddressbook_part.h b/kaddressbook/kaddressbook_part.h index 5ab27d3a..1a161c11 100644 --- a/kaddressbook/kaddressbook_part.h +++ b/kaddressbook/kaddressbook_part.h @@ -23,9 +23,9 @@ #ifndef KADDRESSBOOK_PART_H #define KADDRESSBOOK_PART_H -#include <kparts/event.h> -#include <kparts/factory.h> -#include <kparts/part.h> +#include <tdeparts/event.h> +#include <tdeparts/factory.h> +#include <tdeparts/part.h> #include "kaddressbookiface.h" diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp index 2616bf33..edafa411 100644 --- a/kaddressbook/viewmanager.cpp +++ b/kaddressbook/viewmanager.cpp @@ -35,7 +35,7 @@ #include <kiconloader.h> #include <klocale.h> #include <kmessagebox.h> -#include <kmultipledrag.h> +#include <tdemultipledrag.h> #include <ktempdir.h> #include <ktrader.h> #include <kurldrag.h> diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp index fbd98f02..c4552232 100644 --- a/kaddressbook/views/contactlistview.cpp +++ b/kaddressbook/views/contactlistview.cpp @@ -38,7 +38,7 @@ #include <kurl.h> #include <kabc/addressbook.h> #include <kabc/addressee.h> -#include <kimproxy.h> +#include <tdeimproxy.h> #include "kaddressbooktableview.h" diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp index 9432dafa..d951655b 100644 --- a/kaddressbook/views/kaddressbooktableview.cpp +++ b/kaddressbook/views/kaddressbooktableview.cpp @@ -48,7 +48,7 @@ #include <kmessagebox.h> #include <kurl.h> #include <kurlrequester.h> -#include <kimproxy.h> +#include <tdeimproxy.h> #include "configuretableviewdialog.h" #include "contactlistview.h" diff --git a/kalarm/CMakeLists.txt b/kalarm/CMakeLists.txt index d6a8e052..b93cc671 100644 --- a/kalarm/CMakeLists.txt +++ b/kalarm/CMakeLists.txt @@ -74,6 +74,6 @@ tde_add_executable( kalarm AUTOMOC kalarmd/alarmguiiface.skel LINK kalarm-static kalarmd-static - kpimidentities-shared kutils-shared ${ARTS_LIBRARIES} + kpimidentities-shared tdeutils-shared ${ARTS_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kalarm/Makefile.am b/kalarm/Makefile.am index 98385f9e..a8e0e8bd 100644 --- a/kalarm/Makefile.am +++ b/kalarm/Makefile.am @@ -31,7 +31,7 @@ kalarm_LDADD = $(top_builddir)/kalarm/lib/libkalarm.la \ $(top_builddir)/kalarm/kalarmd/libkalarmd.la \ $(top_builddir)/libtdepim/libtdepim.la \ $(top_builddir)/libkpimidentities/libkpimidentities.la \ - -lkabc -lkutils $(LIB_TDEUI) $(ARTSLIB) $(LIBXTST) + -lkabc -ltdeutils $(LIB_TDEUI) $(ARTSLIB) $(LIBXTST) noinst_HEADERS = alarmcalendar.h alarmevent.h alarmlistview.h alarmtext.h \ alarmtimewidget.h birthdaydlg.h daemon.h dcophandler.h deferdlg.h \ editdlg.h editdlgprivate.h emailidcombo.h eventlistviewbase.h find.h \ diff --git a/kalarm/kalarmd/Makefile.am b/kalarm/kalarmd/Makefile.am index 1badcb66..f6dd508d 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) -lktexteditor +libkalarmd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -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) -lktexteditor +kalarmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -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 0bfbd3eb..1ae8c396 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) -lktexteditor +kandy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kandy_LDADD = $(KANDY_LIBLOCKDEV) $(LIB_KFILE) -lkabc $(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) -lktexteditor +kandy_client_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kandy_client_LDADD = $(LIB_TDECORE) kandy_client_SOURCES = kandy_client.cpp diff --git a/karm/CMakeLists.txt b/karm/CMakeLists.txt index 8b1b6432..996a5883 100644 --- a/karm/CMakeLists.txt +++ b/karm/CMakeLists.txt @@ -13,7 +13,7 @@ tde_import( libkmime ) tde_import( ktnef ) tde_import( libkcal ) tde_import( libtdepim ) -tde_import( kresources ) +tde_import( tderesources ) add_subdirectory( support ) add_subdirectory( pics ) @@ -25,7 +25,7 @@ include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/libkcal ${CMAKE_SOURCE_DIR}/libtdepim - ${CMAKE_SOURCE_DIR}/kresources/remote + ${CMAKE_SOURCE_DIR}/tderesources/remote ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/karm/Makefile.am b/karm/Makefile.am index 9f8d1d87..cb7760f0 100644 --- a/karm/Makefile.am +++ b/karm/Makefile.am @@ -1,13 +1,13 @@ ############ Autoconf-generated variables ################### -INCLUDES = -I$(top_srcdir)/libkcal -I$(top_srcdir)/kresources/remote -I$(top_srcdir) $(all_includes) +INCLUDES = -I$(top_srcdir)/libkcal -I$(top_srcdir)/tderesources/remote -I$(top_srcdir) $(all_includes) bin_PROGRAMS = karm SUBDIRS = support pics test METASOURCES = AUTO -COMPILE_BEFORE_karm = libtdepim kresources +COMPILE_BEFORE_karm = libtdepim tderesources noinst_LTLIBRARIES = libkarm_shared.la @@ -19,11 +19,11 @@ libkarm_shared_la_SOURCES = kaccelmenuwatch.cpp desktoptracker.cpp \ csvexportdialog_base.ui csvexportdialog.cpp plannerparser.cpp \ karmdcopiface.skel taskviewwhatsthis.cpp libkarm_shared_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \ - $(top_builddir)/kresources/remote/libkcal_resourceremote.la \ + $(top_builddir)/tderesources/remote/libkcal_resourceremote.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) -lktexteditor +karm_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor noinst_HEADERS = desktoptracker.h edittaskdialog.h printdialog.h \ idletimedetector.h kaccelmenuwatch.h timekard.h \ karmutility.h ktimewidget.h karmstorage.h mainwindow.h \ diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp index b278d9f2..b8426f22 100644 --- a/karm/karm_part.cpp +++ b/karm/karm_part.cpp @@ -156,7 +156,7 @@ void karmPart::makeMenus() TQT_SLOT( newTask() ), actionCollection(), "new_task"); actionNewSub = new KAction( i18n("New &Subtask..."), - TQString::fromLatin1("kmultiple"), CTRL+ALT+Key_N, + TQString::fromLatin1("tdemultiple"), CTRL+ALT+Key_N, TQT_TQOBJECT(_taskView), TQT_SLOT( newSubTask() ), actionCollection(), "new_sub_task"); diff --git a/karm/karm_part.h b/karm/karm_part.h index f04d48ff..444b6f42 100644 --- a/karm/karm_part.h +++ b/karm/karm_part.h @@ -1,9 +1,9 @@ #ifndef _KARMPART_H_ #define _KARMPART_H_ -#include <kparts/part.h> +#include <tdeparts/part.h> #include "karmerrors.h" -#include <kparts/factory.h> +#include <tdeparts/factory.h> #include <karmdcopiface.h> #include "reportcriteria.h" #include <tqlistview.h> diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp index c7e717e4..7e692092 100644 --- a/karm/mainwindow.cpp +++ b/karm/mainwindow.cpp @@ -294,7 +294,7 @@ void MainWindow::makeMenus() TQT_SLOT( newTask() ), actionCollection(), "new_task"); actionNewSub = new KAction( i18n("New &Subtask..."), - TQString::fromLatin1("kmultiple"), CTRL+ALT+Key_N, + TQString::fromLatin1("tdemultiple"), CTRL+ALT+Key_N, TQT_TQOBJECT(_taskView), TQT_SLOT( newSubTask() ), actionCollection(), "new_sub_task"); diff --git a/karm/mainwindow.h b/karm/mainwindow.h index 366af3d7..ba1194f4 100644 --- a/karm/mainwindow.h +++ b/karm/mainwindow.h @@ -1,7 +1,7 @@ #ifndef KARM_MAIN_WINDOW_H #define KARM_MAIN_WINDOW_H -#include <kparts/mainwindow.h> +#include <tdeparts/mainwindow.h> #include "karmerrors.h" #include <karmdcopiface.h> diff --git a/karm/test/Makefile.am b/karm/test/Makefile.am index 3940fb37..50699139 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) -lktexteditor +runscripts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -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) -lktexteditor +locking_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor locking_LDADD = $(LIB_QT) $(top_builddir)/libkcal/libkcal.la KDE_CXXFLAGS = $(USE_EXCEPTIONS) diff --git a/karm/test/locking.cpp b/karm/test/locking.cpp index ac1de23e..448e7c1d 100644 --- a/karm/test/locking.cpp +++ b/karm/test/locking.cpp @@ -128,7 +128,7 @@ int main( int argc, char *argv[] ) short rval = 0; // Use another directory than the real one, just to keep things clean - // TDEHOME needs to be writable though, for a ksycoca database + // TDEHOME needs to be writable though, for a tdesycoca database // FIXME: Delete this directory when done with test. setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.tde-testresource" ), true ); diff --git a/karm/test/remote_storage.sh b/karm/test/remote_storage.sh index a4335b6c..84af71c5 100755 --- a/karm/test/remote_storage.sh +++ b/karm/test/remote_storage.sh @@ -15,7 +15,7 @@ DCOPID=`dcop | grep karm 2>/dev/null` if [ -n $DCOPID ]; then dcop $DCOPID KarmDCOPIface quit; fi; if [ -e $TESTFILE_LOCAL ]; then rm $TESTFILE_LOCAL; fi -# if the file does not exist, kresources pops up a modal dialog box +# if the file does not exist, tderesources pops up a modal dialog box # telling us that a file does not exist. touch $TESTFILE_LOCAL diff --git a/kioslaves/opengroupware/Makefile.am b/kioslaves/opengroupware/Makefile.am index 9ec6d230..007d74c3 100644 --- a/kioslaves/opengroupware/Makefile.am +++ b/kioslaves/opengroupware/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kresources/opengroupware/soap \ +INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tderesources/opengroupware/soap \ $(all_includes) noinst_HEADERS = opengroupware.h diff --git a/kitchensync/src/CMakeLists.txt b/kitchensync/src/CMakeLists.txt index 29aae78c..6820e250 100644 --- a/kitchensync/src/CMakeLists.txt +++ b/kitchensync/src/CMakeLists.txt @@ -72,6 +72,6 @@ tde_add_library( kitchensync SHARED AUTOMOC configguijescs.cpp configguievo2.cpp configguimoto.cpp configguisynce.cpp configguisunbird.cpp VERSION 0.0.0 - LINK qopensync-shared tdepim-shared khtml-shared + LINK qopensync-shared tdepim-shared tdehtml-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kitchensync/src/Makefile.am b/kitchensync/src/Makefile.am index 43568e7f..779aec82 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) -lktexteditor +kitchensync_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kitchensync_LDADD = libkitchensync.la xdg_apps_DATA = kitchensync.desktop diff --git a/kitchensync/src/aboutpage.cpp b/kitchensync/src/aboutpage.cpp index fe252460..50f4d1de 100644 --- a/kitchensync/src/aboutpage.cpp +++ b/kitchensync/src/aboutpage.cpp @@ -24,8 +24,8 @@ #include <kaboutdata.h> #include <kapplication.h> #include <kdebug.h> -#include <khtml_part.h> -#include <khtmlview.h> +#include <tdehtml_part.h> +#include <tdehtmlview.h> #include <kiconloader.h> #include <klocale.h> #include <krun.h> diff --git a/kitchensync/src/part.cpp b/kitchensync/src/part.cpp index 1cf4d7a6..0c015e10 100644 --- a/kitchensync/src/part.cpp +++ b/kitchensync/src/part.cpp @@ -27,7 +27,7 @@ #include <kiconloader.h> #include <kinstance.h> #include <klocale.h> -#include <kparts/genericfactory.h> +#include <tdeparts/genericfactory.h> #include "mainwidget.h" diff --git a/kitchensync/src/part.h b/kitchensync/src/part.h index 7a716de1..b799cea5 100644 --- a/kitchensync/src/part.h +++ b/kitchensync/src/part.h @@ -21,9 +21,9 @@ #ifndef PART_H #define PART_H -#include <kparts/event.h> -#include <kparts/factory.h> -#include <kparts/part.h> +#include <tdeparts/event.h> +#include <tdeparts/factory.h> +#include <tdeparts/part.h> class TDEAboutData; diff --git a/kmail/CMakeLists.txt b/kmail/CMakeLists.txt index 7e1ac19e..ebd61ef8 100644 --- a/kmail/CMakeLists.txt +++ b/kmail/CMakeLists.txt @@ -140,7 +140,7 @@ set( ${target}_SRCS kmcomposewin.cpp kmfolder.cpp kmmsgpartdlg.cpp kmreaderwin.cpp htmlstatusbar.cpp kmgroupware.cpp folderstorage.cpp listjob.cpp csshelper.cpp klistboxdialog.cpp kmmsginfo.cpp actionscheduler.cpp messageproperty.cpp accountmanager.cpp kmacctfolder.cpp - kmdict.cpp kmsystemtray.cpp kmacctlocal.cpp kmfolderdir.cpp kmfoldermgr.cpp + tdemdict.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 @@ -151,7 +151,7 @@ set( ${target}_SRCS kmkernel.cpp accountdialog.cpp searchwindow.cpp vcardviewer.cpp vacationdialog.cpp vacation.cpp sievedebugdialog.cpp sieveconfig.cpp sievejob.cpp kmpopheaders.cpp kmpopfiltercnfrmdlg.cpp kmmimeparttree.cpp mailinglist-magic.cpp kmacctmaildir.cpp - headerstyle.cpp headerstrategy.cpp khtmlparthtmlwriter.cpp filehtmlwriter.cpp + headerstyle.cpp headerstrategy.cpp tdehtmlparthtmlwriter.cpp filehtmlwriter.cpp teehtmlwriter.cpp mailcomposerIface.skel objecttreeparser.cpp objecttreeparser_p.cpp attachmentcollector.cpp bodypartformatterfactory.cpp bodypartformatter.cpp partNode.cpp mailsourceviewer.cpp kmcommands.cpp kmreadermainwin.cpp kmstartup.cpp kmmainwidget.cpp @@ -191,7 +191,7 @@ tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} LINK emailfunctions-static kmime-shared kpgp-shared tdepim-shared kpimidentities-shared - mimelib-shared ksieve-shared khtml-shared ${INDEX_LIBRARY} + mimelib-shared ksieve-shared tdehtml-shared ${INDEX_LIBRARY} DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kmail/Mainpage.dox b/kmail/Mainpage.dox index 927acc7e..42201dad 100644 --- a/kmail/Mainpage.dox +++ b/kmail/Mainpage.dox @@ -42,7 +42,7 @@ access to all the core KMail functionality. FIXME this has moved to libkpimidentities, right? -Files: identity*, kmidentity.{h,cpp}, configuredialog.cpp, +Files: identity*, tdemidentity.{h,cpp}, configuredialog.cpp, signatureconfigurator.{h,cpp} Contact Marc Mutz <mutz@kde.org> on questions... diff --git a/kmail/Makefile.am b/kmail/Makefile.am index 9dd1dc0d..6fcc46de 100644 --- a/kmail/Makefile.am +++ b/kmail/Makefile.am @@ -65,7 +65,7 @@ libkmailprivate_la_SOURCES = kmmessage.cpp kmmainwin.cpp configuredialog.cpp \ csshelper.cpp klistboxdialog.cpp \ actionscheduler.cpp messageproperty.cpp \ kmmsgpart.cpp kmmsginfo.cpp \ - accountmanager.cpp kmacctfolder.cpp kmdict.cpp \ + accountmanager.cpp kmacctfolder.cpp tdemdict.cpp \ kmsystemtray.cpp kmacctlocal.cpp kmfolderdir.cpp \ kmfoldermgr.cpp kmfoldernode.cpp kmsender.cpp \ kmacctseldlg.cpp kmfiltermgr.cpp kmsearchpatternedit.cpp \ @@ -88,7 +88,7 @@ libkmailprivate_la_SOURCES = kmmessage.cpp kmmainwin.cpp configuredialog.cpp \ kmmimeparttree.cpp \ mailinglist-magic.cpp kmacctmaildir.cpp \ attachmentstrategy.cpp \ - headerstrategy.cpp headerstyle.cpp khtmlparthtmlwriter.cpp \ + headerstrategy.cpp headerstyle.cpp tdehtmlparthtmlwriter.cpp \ filehtmlwriter.cpp teehtmlwriter.cpp \ mailcomposerIface.skel objecttreeparser.cpp \ objecttreeparser_p.cpp \ diff --git a/kmail/encodingdetector.cpp b/kmail/encodingdetector.cpp index d5ffd5dc..01a60d88 100644 --- a/kmail/encodingdetector.cpp +++ b/kmail/encodingdetector.cpp @@ -1135,7 +1135,7 @@ bool EncodingDetector::analyze(const char *data, int len) case EncodingDetector::WesternEuropean: if (setEncoding(automaticDetectionForWesternEuropean( (const unsigned char*) data, len ), AutoDetectedEncoding)) return true; - else if (d->m_defaultCodec->mibEnum()==MibLatin1) //detection for khtml + else if (d->m_defaultCodec->mibEnum()==MibLatin1) //detection for tdehtml { return setEncoding("iso-8859-15",AutoDetectedEncoding); } diff --git a/kmail/encodingdetector_ja_p.h b/kmail/encodingdetector_ja_p.h index dac255d5..26eaa523 100644 --- a/kmail/encodingdetector_ja_p.h +++ b/kmail/encodingdetector_ja_p.h @@ -42,7 +42,7 @@ #ifdef TQ_WS_WIN #undef UNICODE #endif -namespace khtml { +namespace tdehtml { class guess_arc { public: unsigned int next; /* next state */ @@ -50,7 +50,7 @@ namespace khtml { }; } -using namespace khtml; +using namespace tdehtml; typedef signed char dfa_table[256]; @@ -62,7 +62,7 @@ extern guess_arc guess_sjis_ar[6]; extern const dfa_table guess_utf8_st[]; extern guess_arc guess_utf8_ar[11]; -namespace khtml { +namespace tdehtml { class guess_dfa { public: diff --git a/kmail/headerstyle.cpp b/kmail/headerstyle.cpp index 5c4108ee..1bf75f09 100644 --- a/kmail/headerstyle.cpp +++ b/kmail/headerstyle.cpp @@ -53,7 +53,7 @@ using namespace KPIM; #include <kdebug.h> #include <klocale.h> #include <kglobal.h> -#include <kimproxy.h> +#include <tdeimproxy.h> #include <kabc/stdaddressbook.h> #include <kabc/addresseelist.h> #include <kmdcodec.h> diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp index 1f42a82a..b7857493 100644 --- a/kmail/kmail_part.cpp +++ b/kmail/kmail_part.cpp @@ -44,8 +44,8 @@ using KMail::AccountManager; using KRecentAddress::RecentAddresses; #include <kapplication.h> -#include <kparts/mainwindow.h> -#include <kparts/genericfactory.h> +#include <tdeparts/mainwindow.h> +#include <tdeparts/genericfactory.h> #include <knotifyclient.h> #include <dcopclient.h> #include <kiconloader.h> diff --git a/kmail/kmail_part.h b/kmail/kmail_part.h index dd5d261a..46f08f68 100644 --- a/kmail/kmail_part.h +++ b/kmail/kmail_part.h @@ -28,11 +28,11 @@ #include "kmailpartIface.h" #include <tdeversion.h> -#include <kparts/browserextension.h> -#include <kparts/statusbarextension.h> -#include <kparts/factory.h> -#include <kparts/event.h> -#include <kparts/part.h> +#include <tdeparts/browserextension.h> +#include <tdeparts/statusbarextension.h> +#include <tdeparts/factory.h> +#include <tdeparts/event.h> +#include <tdeparts/part.h> #include <tqwidget.h> #include <tdepimmacros.h> diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp index 9c1d25f9..023c887d 100644 --- a/kmail/kmcommands.cpp +++ b/kmail/kmcommands.cpp @@ -67,13 +67,13 @@ #include <kdirselectdialog.h> #include <klocale.h> #include <kmessagebox.h> -#include <kparts/browserextension.h> +#include <tdeparts/browserextension.h> #include <kprogress.h> #include <krun.h> #include <kbookmarkmanager.h> #include <kstandarddirs.h> #include <ktempfile.h> -#include <kimproxy.h> +#include <tdeimproxy.h> #include <kuserprofile.h> // KIO headers #include <kio/job.h> diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp index 0857ae2b..d635b647 100644 --- a/kmail/kmcomposewin.cpp +++ b/kmail/kmcomposewin.cpp @@ -109,8 +109,8 @@ using KRecentAddress::RecentAddresses; #include "globalsettings.h" #include "replyphrases.h" -#include <kspell.h> -#include <kspelldlg.h> +#include <tdespell.h> +#include <tdespelldlg.h> #include <spellingfilter.h> #include <ksyntaxhighlighter.h> #include <kcolordialog.h> diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp index 044e0541..8301a12c 100644 --- a/kmail/kmedit.cpp +++ b/kmail/kmedit.cpp @@ -38,8 +38,8 @@ using KPIM::MailListDrag; #include "globalsettings.h" #include "replyphrases.h" -#include <kspell.h> -#include <kspelldlg.h> +#include <tdespell.h> +#include <tdespelldlg.h> #include <spellingfilter.h> #include <ksyntaxhighlighter.h> diff --git a/kmail/kmedit.h b/kmail/kmedit.h index 24458cd3..f545a136 100644 --- a/kmail/kmedit.h +++ b/kmail/kmedit.h @@ -7,7 +7,7 @@ #include <tdeversion.h> #include <keditcl.h> -#include <kspell.h> +#include <tdespell.h> #include <ksyntaxhighlighter.h> #include <tqmap.h> #include <tqstringlist.h> diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp index 8e142c91..2ed379c9 100644 --- a/kmail/kmheaders.cpp +++ b/kmail/kmheaders.cpp @@ -2401,7 +2401,7 @@ void KMHeaders::contentsMouseMoveEvent( TQMouseEvent* e ) if( count == 1 ) pixmap = TQPixmap( DesktopIcon("message", KIcon::SizeSmall) ); else - pixmap = TQPixmap( DesktopIcon("kmultiple", KIcon::SizeSmall) ); + pixmap = TQPixmap( DesktopIcon("tdemultiple", KIcon::SizeSmall) ); // Calculate hotspot (as in Konqueror) if( !pixmap.isNull() ) { diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp index e5dd7072..354fe768 100644 --- a/kmail/kmkernel.cpp +++ b/kmail/kmkernel.cpp @@ -69,7 +69,7 @@ using KMail::FolderIface; #include <kpgp.h> #include <kdebug.h> #include <kio/netaccess.h> -#include <kwallet.h> +#include <tdewallet.h> using KWallet::Wallet; #include "actionscheduler.h" diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h index fb01231b..9d2b5070 100644 --- a/kmail/kmkernel.h +++ b/kmail/kmkernel.h @@ -11,7 +11,7 @@ #include <kconfig.h> #include <tdeversion.h> -#include <kimproxy.h> +#include <tdeimproxy.h> #include <tdepimmacros.h> #include "kmailIface.h" diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp index 20f9ce4c..aabc14bc 100644 --- a/kmail/kmmessage.cpp +++ b/kmail/kmmessage.cpp @@ -38,7 +38,7 @@ using KMail::HeaderStrategy; #include <kglobalsettings.h> #include <kdebug.h> #include <kconfig.h> -#include <khtml_part.h> +#include <tdehtml_part.h> #include <kuser.h> #include <kidna.h> #include <kasciistricmp.h> diff --git a/kmail/kmmsgdict.cpp b/kmail/kmmsgdict.cpp index 729a3663..fdf2e1b2 100644 --- a/kmail/kmmsgdict.cpp +++ b/kmail/kmmsgdict.cpp @@ -4,7 +4,7 @@ #include "kmfolderindex.h" #include "kmfolder.h" #include "kmmsgdict.h" -#include "kmdict.h" +#include "tdemdict.h" #include "globalsettings.h" #include "folderstorage.h" diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp index 2ce6c862..0568035b 100644 --- a/kmail/kmreaderwin.cpp +++ b/kmail/kmreaderwin.cpp @@ -37,7 +37,7 @@ using KMail::AttachmentStrategy; using KMail::HeaderStrategy; #include "headerstyle.h" using KMail::HeaderStyle; -#include "khtmlparthtmlwriter.h" +#include "tdehtmlparthtmlwriter.h" using KMail::HtmlWriter; using KMail::KHtmlPartHtmlWriter; #include "htmlstatusbar.h" @@ -80,9 +80,9 @@ using KMail::TeeHtmlWriter; #include <kabc/addressee.h> #include <kabc/vcardconverter.h> -// khtml headers -#include <khtml_part.h> -#include <khtmlview.h> // So that we can get rid of the frames +// tdehtml headers +#include <tdehtml_part.h> +#include <tdehtmlview.h> // So that we can get rid of the frames #include <dom/html_element.h> #include <dom/html_block.h> #include <dom/html_document.h> diff --git a/kmail/kmtransport.cpp b/kmail/kmtransport.cpp index e17fdaf0..2092376f 100644 --- a/kmail/kmtransport.cpp +++ b/kmail/kmtransport.cpp @@ -38,7 +38,7 @@ #include <kmessagebox.h> #include <kseparator.h> #include <kdebug.h> -#include <kwallet.h> +#include <tdewallet.h> using KWallet::Wallet; #include <kprotocolinfo.h> @@ -87,7 +87,7 @@ void KMTransportInfo::readConfig(int id) return; if ( !mPasswd.isEmpty() ) { - // migration to kwallet if available + // migration to tdewallet if available if ( Wallet::isEnabled() ) { config->deleteEntry( "pass" ); mPasswdDirty = true; diff --git a/kmail/networkaccount.cpp b/kmail/networkaccount.cpp index e0b68274..62581bf9 100644 --- a/kmail/networkaccount.cpp +++ b/kmail/networkaccount.cpp @@ -37,7 +37,7 @@ #include <klocale.h> #include <kmessagebox.h> #include <kdebug.h> -#include <kwallet.h> +#include <tdewallet.h> using TDEIO::MetaData; using KWallet::Wallet; diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp index 9c8c673a..6ea48bf0 100644 --- a/kmail/objecttreeparser.cpp +++ b/kmail/objecttreeparser.cpp @@ -89,7 +89,7 @@ #include <klocale.h> #include <kmimetype.h> #include <kglobal.h> -#include <khtml_part.h> +#include <tdehtml_part.h> #include <ktempfile.h> #include <kstandarddirs.h> #include <kapplication.h> diff --git a/kmail/regexplineedit.cpp b/kmail/regexplineedit.cpp index 3d292182..a6d86ec3 100644 --- a/kmail/regexplineedit.cpp +++ b/kmail/regexplineedit.cpp @@ -38,7 +38,7 @@ #include <klocale.h> #include <klineedit.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <kregexpeditorinterface.h> #include <kdialog.h> diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp index de5e2d7e..15bf5f07 100644 --- a/kmail/searchwindow.cpp +++ b/kmail/searchwindow.cpp @@ -95,7 +95,7 @@ class MatchListView : public KListView if( mailList.count() == 1 ) pixmap = TQPixmap( DesktopIcon("message", KIcon::SizeSmall) ); else - pixmap = TQPixmap( DesktopIcon("kmultiple", KIcon::SizeSmall) ); + pixmap = TQPixmap( DesktopIcon("tdemultiple", KIcon::SizeSmall) ); d->setPixmap( pixmap ); return d; diff --git a/kmail/snippetwidget.h b/kmail/snippetwidget.h index 18573c38..88a96719 100644 --- a/kmail/snippetwidget.h +++ b/kmail/snippetwidget.h @@ -19,8 +19,8 @@ #include <tqtooltip.h> #include <tqrect.h> -#include <ktexteditor/editinterface.h> -#include <ktexteditor/view.h> +#include <tdetexteditor/editinterface.h> +#include <tdetexteditor/view.h> #include "snippetconfig.h" class KDevProject; diff --git a/kmail/khtmlparthtmlwriter.cpp b/kmail/tdehtmlparthtmlwriter.cpp index 3c8ee388..7321e128 100644 --- a/kmail/khtmlparthtmlwriter.cpp +++ b/kmail/tdehtmlparthtmlwriter.cpp @@ -1,5 +1,5 @@ /* -*- c++ -*- - khtmlparthtmlwriter.cpp + tdehtmlparthtmlwriter.cpp This file is part of KMail, the KDE mail client. Copyright (c) 2003 Marc Mutz <mutz@kde.org> @@ -31,11 +31,11 @@ #include <config.h> -#include "khtmlparthtmlwriter.h" +#include "tdehtmlparthtmlwriter.h" #include <kdebug.h> -#include <khtml_part.h> -#include <khtmlview.h> +#include <tdehtml_part.h> +#include <tdehtmlview.h> #include <dom/dom_string.h> #include <dom/html_document.h> @@ -151,4 +151,4 @@ namespace KMail { } // namespace KMail -#include "khtmlparthtmlwriter.moc" +#include "tdehtmlparthtmlwriter.moc" diff --git a/kmail/khtmlparthtmlwriter.h b/kmail/tdehtmlparthtmlwriter.h index 52fad112..52f16fd4 100644 --- a/kmail/khtmlparthtmlwriter.h +++ b/kmail/tdehtmlparthtmlwriter.h @@ -1,5 +1,5 @@ /* -*- c++ -*- - khtmlparthtmlwriter.h + tdehtmlparthtmlwriter.h This file is part of KMail, the KDE mail client. Copyright (c) 2003 Marc Mutz <mutz@kde.org> diff --git a/kmail/kmdict.cpp b/kmail/tdemdict.cpp index 0ad9367b..a1c73e6d 100644 --- a/kmail/kmdict.cpp +++ b/kmail/tdemdict.cpp @@ -5,7 +5,7 @@ #include <config.h> #endif -#include "kmdict.h" +#include "tdemdict.h" #include "kmglobal.h" #include <kdebug.h> diff --git a/kmail/kmdict.h b/kmail/tdemdict.h index 6cbbefd5..6cbbefd5 100644 --- a/kmail/kmdict.h +++ b/kmail/tdemdict.h diff --git a/kmail/tests/Makefile.am b/kmail/tests/Makefile.am index 2d492283..c07ad623 100644 --- a/kmail/tests/Makefile.am +++ b/kmail/tests/Makefile.am @@ -2,22 +2,22 @@ INCLUDES = -I$(top_srcdir)/kmail -I$(top_srcdir)/mimelib $(all_includes) AM_CPPFLAGS = -DTDESRCDIR=\"$(srcdir)\" METASOURCES = AUTO -check_LTLIBRARIES = kunittest_storagelayermodule.la \ - kunittest_utilmodule.la \ - kunittest_mimelibmodule.la +check_LTLIBRARIES = tdeunittest_storagelayermodule.la \ + tdeunittest_utilmodule.la \ + tdeunittest_mimelibmodule.la -kunittest_storagelayermodule_la_SOURCES = storagelayermodule.cpp messagedicttests.cpp ../kmdict.cpp -kunittest_storagelayermodule_la_LIBADD = -lkunittest -kunittest_utilmodule_la_SOURCES = utiltests.cpp ../util.cpp -kunittest_utilmodule_la_LIBADD = -lkunittest ../../mimelib/libmimelib.la -kunittest_mimelibmodule_la_SOURCES = mimelibtests.cpp ../util.cpp -kunittest_mimelibmodule_la_LIBADD = -lkunittest ../../mimelib/libmimelib.la +tdeunittest_storagelayermodule_la_SOURCES = storagelayermodule.cpp messagedicttests.cpp ../tdemdict.cpp +tdeunittest_storagelayermodule_la_LIBADD = -ltdeunittest +tdeunittest_utilmodule_la_SOURCES = utiltests.cpp ../util.cpp +tdeunittest_utilmodule_la_LIBADD = -ltdeunittest ../../mimelib/libmimelib.la +tdeunittest_mimelibmodule_la_SOURCES = mimelibtests.cpp ../util.cpp +tdeunittest_mimelibmodule_la_LIBADD = -ltdeunittest ../../mimelib/libmimelib.la -#LIBADD = -lkunittest +#LIBADD = -ltdeunittest AM_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) check-local: - kunittestmodrunner + tdeunittestmodrunner guicheck: - kunittestguimodrunner + tdeunittestguimodrunner diff --git a/kmail/tests/messagedicttests.cpp b/kmail/tests/messagedicttests.cpp index cdb24f6d..4565f10c 100644 --- a/kmail/tests/messagedicttests.cpp +++ b/kmail/tests/messagedicttests.cpp @@ -4,10 +4,10 @@ */ #include <kdebug.h> -#include <kunittest/runner.h> -#include <kunittest/module.h> +#include <tdeunittest/runner.h> +#include <tdeunittest/module.h> -#include "kmdict.h" +#include "tdemdict.h" #include "messagedicttests.h" diff --git a/kmail/tests/messagedicttests.h b/kmail/tests/messagedicttests.h index abff55da..f60a3b2f 100644 --- a/kmail/tests/messagedicttests.h +++ b/kmail/tests/messagedicttests.h @@ -7,7 +7,7 @@ #ifndef MESSAGEDICTTESTS_H #define MESSAGEDICTTESTS_H -#include <kunittest/tester.h> +#include <tdeunittest/tester.h> class KMDict; diff --git a/kmail/tests/mimelibtests.cpp b/kmail/tests/mimelibtests.cpp index 6f4cf189..e1162093 100644 --- a/kmail/tests/mimelibtests.cpp +++ b/kmail/tests/mimelibtests.cpp @@ -21,12 +21,12 @@ #include "mimelibtests.moc" #include <kdebug.h> -#include <kunittest/runner.h> -#include <kunittest/module.h> +#include <tdeunittest/runner.h> +#include <tdeunittest/module.h> using namespace KUnitTest; -KUNITTEST_MODULE( kunittest_mimelibmodule, "Mimelib Tests" ); +KUNITTEST_MODULE( tdeunittest_mimelibmodule, "Mimelib Tests" ); KUNITTEST_MODULE_REGISTER_TESTER( MimeLibTester ); #include <mimelib/string.h> @@ -56,7 +56,7 @@ static TQString makePrintable( const DwString& str ) TQCString MimeLibTester::readFile(const TQString& fileName) { TQFile file( fileName ); - // #!@#$& kunittest... VERIFY() does nothing in setUp. Using assert instead. + // #!@#$& tdeunittest... VERIFY() does nothing in setUp. Using assert instead. bool ok = file.open( IO_ReadOnly ); if ( !ok ) { kdError() << fileName << " not found!" << endl; diff --git a/kmail/tests/mimelibtests.h b/kmail/tests/mimelibtests.h index 0f503324..8fd06124 100644 --- a/kmail/tests/mimelibtests.h +++ b/kmail/tests/mimelibtests.h @@ -20,7 +20,7 @@ #ifndef MIMELIBTEST_H #define MIMELIBTEST_H -#include <kunittest/tester.h> +#include <tdeunittest/tester.h> class DwString; class MimeLibTester : public KUnitTest::SlotTester diff --git a/kmail/tests/storagelayermodule.cpp b/kmail/tests/storagelayermodule.cpp index 91362471..fcfb884e 100644 --- a/kmail/tests/storagelayermodule.cpp +++ b/kmail/tests/storagelayermodule.cpp @@ -5,12 +5,12 @@ * have to fix it" license. */ -#include <kunittest/runner.h> -#include <kunittest/module.h> +#include <tdeunittest/runner.h> +#include <tdeunittest/module.h> #include "messagedicttests.h" using namespace KUnitTest; -KUNITTEST_MODULE( kunittest_storagelayermodule, "KMail Storage Layer Tests" ); +KUNITTEST_MODULE( tdeunittest_storagelayermodule, "KMail Storage Layer Tests" ); KUNITTEST_MODULE_REGISTER_TESTER( MessageDictTester ); diff --git a/kmail/tests/utiltests.cpp b/kmail/tests/utiltests.cpp index d0b3135b..936cc3ab 100644 --- a/kmail/tests/utiltests.cpp +++ b/kmail/tests/utiltests.cpp @@ -4,13 +4,13 @@ */ #include <kdebug.h> -#include <kunittest/runner.h> -#include <kunittest/module.h> +#include <tdeunittest/runner.h> +#include <tdeunittest/module.h> #include "utiltests.h" using namespace KUnitTest; -KUNITTEST_MODULE( kunittest_utilmodule, "KMail::Util Tests" ); +KUNITTEST_MODULE( tdeunittest_utilmodule, "KMail::Util Tests" ); KUNITTEST_MODULE_REGISTER_TESTER( UtilTester ); #include "util.h" diff --git a/kmail/tests/utiltests.h b/kmail/tests/utiltests.h index b2cb8c69..0bcbcdf1 100644 --- a/kmail/tests/utiltests.h +++ b/kmail/tests/utiltests.h @@ -7,7 +7,7 @@ #ifndef UTILTESTS_H #define UTILTESTS_H -#include <kunittest/tester.h> +#include <tdeunittest/tester.h> class UtilTester : public KUnitTest::SlotTester { diff --git a/kmail/urlhandlermanager.cpp b/kmail/urlhandlermanager.cpp index 8e72b8ab..65c18d73 100644 --- a/kmail/urlhandlermanager.cpp +++ b/kmail/urlhandlermanager.cpp @@ -47,7 +47,7 @@ #include <kstandarddirs.h> #include <kurldrag.h> -#include <kimproxy.h> +#include <tdeimproxy.h> #include <kurl.h> #include <algorithm> @@ -399,7 +399,7 @@ TQString KMail::URLHandlerManager::statusBarMessage( const KURL & url, KMReaderW #include <klocale.h> #include <kprocess.h> #include <kmessagebox.h> -#include <khtml_part.h> +#include <tdehtml_part.h> #include <tqstring.h> diff --git a/kmailcvt/Makefile.am b/kmailcvt/Makefile.am index d902dac2..4276b3fa 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) -lktexteditor +kmailcvt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor KDE_ICON=AUTO diff --git a/kmobile/Makefile.am b/kmobile/Makefile.am index 53a0c150..69f90bd9 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) -lktexteditor +kmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kmobile_LDADD = $(LIB_KFILE) $(LIB_KABC) 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) -lktexteditor +testlibkmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor testlibkmobile_LDADD = libkmobileclient.la testlibkmobile_SOURCES = testlibkmobile.cpp diff --git a/knode/CMakeLists.txt b/knode/CMakeLists.txt index 86246a51..8b926946 100644 --- a/knode/CMakeLists.txt +++ b/knode/CMakeLists.txt @@ -80,7 +80,7 @@ tde_add_library( knodecommon SHARED AUTOMOC kncollectionview.cpp articlewidget.cpp csshelper.cpp smtpaccountwidget_base.ui VERSION 3.0.0 - LINK emailfunctions-static tdepim-shared kpgp-shared khtml-shared + LINK emailfunctions-static tdepim-shared kpgp-shared tdehtml-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/knode/Makefile.am b/knode/Makefile.am index 61139f41..7d043e7b 100644 --- a/knode/Makefile.am +++ b/knode/Makefile.am @@ -17,7 +17,7 @@ SUBDIRS = pics filters bin_PROGRAMS = knode -knode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +knode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor knode_LDADD = libknodecommon.la kcm_knode_la_SOURCES = knconfigpages.cpp diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp index d5975dad..b66b1a6f 100644 --- a/knode/articlewidget.cpp +++ b/knode/articlewidget.cpp @@ -32,8 +32,8 @@ #include <kapplication.h> #include <kbookmarkmanager.h> #include <kcharsets.h> -#include <khtml_part.h> -#include <khtmlview.h> +#include <tdehtml_part.h> +#include <tdehtmlview.h> #include <kiconloader.h> #include <klocale.h> #include <kmdcodec.h> diff --git a/knode/knaccountmanager.cpp b/knode/knaccountmanager.cpp index 29376f9c..ddc66afd 100644 --- a/knode/knaccountmanager.cpp +++ b/knode/knaccountmanager.cpp @@ -21,7 +21,7 @@ #include <klocale.h> #include <kmessagebox.h> #include <kstandarddirs.h> -#include <kwallet.h> +#include <tdewallet.h> #include "kngroupmanager.h" #include "knnntpaccount.h" diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp index 38a18a34..fa92c045 100644 --- a/knode/kncomposer.cpp +++ b/knode/kncomposer.cpp @@ -16,7 +16,7 @@ #include <tqtextcodec.h> #include <tqclipboard.h> #include <tqapplication.h> -#include <kspelldlg.h> +#include <tdespelldlg.h> #include <tdeversion.h> #include "addressesdialog.h" using KPIM::AddressesDialog; @@ -35,7 +35,7 @@ using KRecentAddress::RecentAddresses; #include <kdebug.h> #include <klineedit.h> #include <kcombobox.h> -#include <kspell.h> +#include <tdespell.h> #include <ktempfile.h> #include <kpgp.h> #include <kpgpblock.h> diff --git a/knode/knconfigwidgets.cpp b/knode/knconfigwidgets.cpp index af92a8d7..9e80e1b8 100644 --- a/knode/knconfigwidgets.cpp +++ b/knode/knconfigwidgets.cpp @@ -27,7 +27,7 @@ #include <kuserprofile.h> #include <kopenwith.h> #include <kscoringeditor.h> -#include <kspell.h> +#include <tdespell.h> #include <kcombobox.h> #include <kpgpui.h> #include <kurlcompletion.h> diff --git a/knode/knode_part.cpp b/knode/knode_part.cpp index 4ada858c..1d09376f 100644 --- a/knode/knode_part.cpp +++ b/knode/knode_part.cpp @@ -32,8 +32,8 @@ #include "sidebarextension.h" #include <kapplication.h> -#include <kparts/genericfactory.h> -#include <kparts/statusbarextension.h> +#include <tdeparts/genericfactory.h> +#include <tdeparts/statusbarextension.h> #include <knotifyclient.h> #include <dcopclient.h> #include <kiconloader.h> diff --git a/knode/knode_part.h b/knode/knode_part.h index badfbee5..b1136db4 100644 --- a/knode/knode_part.h +++ b/knode/knode_part.h @@ -26,10 +26,10 @@ #include <tdeversion.h> -#include <kparts/browserextension.h> -#include <kparts/factory.h> -#include <kparts/event.h> -#include <kparts/part.h> +#include <tdeparts/browserextension.h> +#include <tdeparts/factory.h> +#include <tdeparts/event.h> +#include <tdeparts/part.h> #include <tqwidget.h> diff --git a/knode/knserverinfo.cpp b/knode/knserverinfo.cpp index 30f0b863..307c72ff 100644 --- a/knode/knserverinfo.cpp +++ b/knode/knserverinfo.cpp @@ -17,7 +17,7 @@ #include <kconfig.h> #include <klocale.h> #include <kdebug.h> -#include <kwallet.h> +#include <tdewallet.h> using namespace KWallet; #include "knglobals.h" diff --git a/knotes/CMakeLists.txt b/knotes/CMakeLists.txt index 7ef23ca4..198d124e 100644 --- a/knotes/CMakeLists.txt +++ b/knotes/CMakeLists.txt @@ -42,8 +42,8 @@ install( FILES KNotesIface.h KNotesAppIface.h DESTINATION ${INCLUDE_INSTALL_DIR} install( FILES knotes.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) install( FILES knoteconfig.kcfg knotesglobalconfig.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) install( FILES knotesappui.rc knotesui.rc DESTINATION ${DATA_INSTALL_DIR}/knotes ) -install( FILES local.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/knotes ) -install( FILES knotes_manager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources ) +install( FILES local.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/knotes ) +install( FILES knotes_manager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources ) ##### knotes (executable) ####################### @@ -76,7 +76,7 @@ tde_add_library( knotes SHARED AUTOMOC knotebutton.cpp knoteconfigdlg.cpp knotehostdlg.cpp knotealarmdlg.cpp knotesalarm.cpp VERSION 0.0.0 - LINK tdepim-shared kutils-shared tdeprint-shared + LINK tdepim-shared tdeutils-shared tdeprint-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/knotes/ChangeLog b/knotes/ChangeLog index ef73afec..3c4161dc 100644 --- a/knotes/ChangeLog +++ b/knotes/ChangeLog @@ -219,7 +219,7 @@ ChangeLog for KNotes 2004/04/23 Michael Brade <brade@kde.org> * fixed adding a new resource every start of KNotes. Please delete - your .kde/share/config/kresources/notes/stdrc file to make KNotes start + your .kde/share/config/tderesources/notes/stdrc file to make KNotes start fast again. KNotes is ready for release now :) 2004/04/21 Michael Brade <brade@kde.org> diff --git a/knotes/Makefile.am b/knotes/Makefile.am index a18d2198..2e600e66 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) -lkresources -ltdeprint -lkutils -knotes_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor + $(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 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) -lkresources + $(top_builddir)/libkcal/libkcal.la -ltdeprint $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -ltderesources METASOURCES = AUTO @@ -46,10 +46,10 @@ ui_DATA = knotesappui.rc knotesui.rc uidir = $(kde_datadir)/knotes service_DATA = local.desktop -servicedir = $(kde_servicesdir)/kresources/knotes +servicedir = $(kde_servicesdir)/tderesources/knotes manager_DATA = knotes_manager.desktop -managerdir = $(kde_servicesdir)/kresources +managerdir = $(kde_servicesdir)/tderesources KDE_OPTIONS = nofinal diff --git a/knotes/resourcelocalconfig.cpp b/knotes/resourcelocalconfig.cpp index 417f81a0..1214e0ad 100644 --- a/knotes/resourcelocalconfig.cpp +++ b/knotes/resourcelocalconfig.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <klocale.h> -#include <kresources/configwidget.h> +#include <tderesources/configwidget.h> #include <kurlrequester.h> #include "resourcelocal.h" diff --git a/knotes/resourcelocalconfig.h b/knotes/resourcelocalconfig.h index bdfeea30..ab78cd68 100644 --- a/knotes/resourcelocalconfig.h +++ b/knotes/resourcelocalconfig.h @@ -21,7 +21,7 @@ #ifndef RESOURCELOCALCONFIG_H #define RESOURCELOCALCONFIG_H -#include <kresources/configwidget.h> +#include <tderesources/configwidget.h> class KURLRequester; diff --git a/knotes/resourcemanager.h b/knotes/resourcemanager.h index 350d7c7d..423ee7a9 100644 --- a/knotes/resourcemanager.h +++ b/knotes/resourcemanager.h @@ -35,7 +35,7 @@ #define KNOTES_RESOURCEMANAGER_H #include <knotes/resourcenotes.h> -#include <kresources/manager.h> +#include <tderesources/manager.h> #include <libkcal/alarm.h> diff --git a/knotes/resourcenotes.h b/knotes/resourcenotes.h index 1e0d07d1..d33b3423 100644 --- a/knotes/resourcenotes.h +++ b/knotes/resourcenotes.h @@ -33,7 +33,7 @@ #ifndef RESOURCENOTES_H #define RESOURCENOTES_H -#include <kresources/resource.h> +#include <tderesources/resource.h> #include <tdepimmacros.h> #include <libkcal/alarm.h> @@ -47,7 +47,7 @@ namespace KCal { /** * This class provides the interfaces for a KNotes resource. It makes use of - * the kresources framework. + * the tderesources framework. * * \warning This code is still under heavy development. Don't expect source or * binary compatibility in future versions. diff --git a/kode/Makefile.am b/kode/Makefile.am index ea830ef6..2303052d 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) -lktexteditor +kode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kode_LDADD = libkode.la -lkabc kode_SOURCES = kodemain.cpp diff --git a/kode/kwsdl/Makefile.am b/kode/kwsdl/Makefile.am index f4667a59..0accfcc6 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) -lktexteditor +kwsdl_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -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/kung/Makefile.am b/kode/kwsdl/kung/Makefile.am index 12f25ea6..4a56da13 100644 --- a/kode/kwsdl/kung/Makefile.am +++ b/kode/kwsdl/kung/Makefile.am @@ -1,12 +1,12 @@ 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) -lktexteditor +kung_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -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 \ integerinputfield.cpp listinputfield.cpp loader.cpp main.cpp outputdialog.cpp pageinputfield.cpp simplebaseinputfield.cpp \ stringinputfield.cpp timeinputfield.cpp transport.cpp wsclconversationmanager.cpp -kung_LDADD = ../schema/libschema.la ../wscl/libwscl.la ../libwsdl.la -lkparts +kung_LDADD = ../schema/libschema.la ../wscl/libwscl.la ../libwsdl.la -ltdeparts METASOURCES = AUTO diff --git a/kode/kwsdl/kung/binaryinputfield.cpp b/kode/kwsdl/kung/binaryinputfield.cpp index b053f5d1..4512edbe 100644 --- a/kode/kwsdl/kung/binaryinputfield.cpp +++ b/kode/kwsdl/kung/binaryinputfield.cpp @@ -25,8 +25,8 @@ #include <kmessagebox.h> #include <kmimemagic.h> #include <klocale.h> -#include <kparts/part.h> -#include <kparts/componentfactory.h> +#include <tdeparts/part.h> +#include <tdeparts/componentfactory.h> #include <ktempfile.h> #include <tqfile.h> diff --git a/kode/kwsdl/schema/Makefile.am b/kode/kwsdl/schema/Makefile.am index 6eb3b4c8..fd1e3e24 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 -lkio #bin_PROGRAMS = schematest -#schematest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +#schematest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -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 cc8be262..1993223f 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 -lkio -googletest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +googletest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor diff --git a/kode/kwsdl/wscl/Makefile.am b/kode/kwsdl/wscl/Makefile.am index 6ebd23e1..67bf1720 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) -lktexteditor +#wscltest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor #wscltest_SOURCES = main.cpp #wscltest_LDADD = libwscl.la diff --git a/kode/kxml_compiler/Makefile.am b/kode/kxml_compiler/Makefile.am index 625acb4e..fceb5aaf 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) -lktexteditor +kxml_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -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 36c9d58a..a08cbb0c 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) -lktexteditor +konsolekalendar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor appsdir = $(kde_appsdir)/Utilities xdg_apps_DATA = konsolekalendar.desktop diff --git a/kontact/Makefile.am b/kontact/Makefile.am index a9ebbdc6..8493e611 100644 --- a/kontact/Makefile.am +++ b/kontact/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = interfaces plugins src pics profiles -DOXYGEN_REFERENCES = tdeui kparts libkcal +DOXYGEN_REFERENCES = tdeui tdeparts libkcal include $(top_srcdir)/admin/Doxyfile.am diff --git a/kontact/Thoughts b/kontact/Thoughts index 16aa9c4a..1fb22c9c 100644 --- a/kontact/Thoughts +++ b/kontact/Thoughts @@ -154,7 +154,7 @@ Don: I agree that it is desireable to have common actions always Don: available (and parts too like the todo list) Don: Don: But are you sure Kparts is limited in this way? KOrganizer can load -Don: multiple plugins simultaneously. And all of these plugins are kparts +Don: multiple plugins simultaneously. And all of these plugins are tdeparts Don: (eg. birthday import), and kactions for all loaded plugins are Don: created and made available simultaneously. Don: @@ -210,7 +210,7 @@ d We need a more sophisticated handling (progressbar, etc) Don: Definitely. -# We now have tdelibs/kparts/statusbarextension. This is intended to solve these +# We now have tdelibs/tdeparts/statusbarextension. This is intended to solve these # problems, right? d: Right. Simply add it as childobject in your part and use it's API. Works even @@ -348,7 +348,7 @@ h: see Opies OPimRecord for a bit too huge base class Security -------- -d If we use the kparts (ktrader) approach to find a parts by looking +d If we use the tdeparts (ktrader) approach to find a parts by looking d for an application with the correct mime type this might raise security d problems. (Martin's concern) diff --git a/kontact/interfaces/core.cpp b/kontact/interfaces/core.cpp index 92e0f624..772ecc81 100644 --- a/kontact/interfaces/core.cpp +++ b/kontact/interfaces/core.cpp @@ -23,8 +23,8 @@ #include "core.h" -#include <kparts/part.h> -#include <kparts/componentfactory.h> +#include <tdeparts/part.h> +#include <tdeparts/componentfactory.h> #include <kdebug.h> #include <tqtimer.h> #include <klocale.h> diff --git a/kontact/interfaces/core.h b/kontact/interfaces/core.h index 2c8a5a4d..c92aca5d 100644 --- a/kontact/interfaces/core.h +++ b/kontact/interfaces/core.h @@ -25,8 +25,8 @@ #include <tqdatetime.h> #include <tdepimmacros.h> -#include <kparts/mainwindow.h> -#include <kparts/part.h> +#include <tdeparts/mainwindow.h> +#include <tdeparts/part.h> class KAction; diff --git a/kontact/interfaces/plugin.cpp b/kontact/interfaces/plugin.cpp index 82f2bbbe..9d9445e9 100644 --- a/kontact/interfaces/plugin.cpp +++ b/kontact/interfaces/plugin.cpp @@ -25,7 +25,7 @@ #include <dcopclient.h> #include <kaboutdata.h> #include <kglobal.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <kdebug.h> #include <kinstance.h> #include <krun.h> diff --git a/kontact/plugins/akregator/akregator_plugin.cpp b/kontact/plugins/akregator/akregator_plugin.cpp index f5942309..bf4e2b17 100644 --- a/kontact/plugins/akregator/akregator_plugin.cpp +++ b/kontact/plugins/akregator/akregator_plugin.cpp @@ -34,7 +34,7 @@ #include <kgenericfactory.h> #include <kiconloader.h> #include <kmessagebox.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <core.h> #include <plugin.h> diff --git a/kontact/plugins/akregator/akregator_plugin.h b/kontact/plugins/akregator/akregator_plugin.h index 657cbc4d..82ae6ea1 100644 --- a/kontact/plugins/akregator/akregator_plugin.h +++ b/kontact/plugins/akregator/akregator_plugin.h @@ -26,9 +26,9 @@ #define AKREGATOR_PLUGIN_H #include <klocale.h> -#include <kparts/part.h> +#include <tdeparts/part.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include <plugin.h> #include "akregator_partiface_stub.h" #include <uniqueapphandler.h> diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp index eec79275..159962e7 100644 --- a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp +++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp @@ -31,7 +31,7 @@ #include <kgenericfactory.h> #include <kiconloader.h> #include <kmessagebox.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <kaddrbook.h> #include <kabc/addressbook.h> diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.h b/kontact/plugins/kaddressbook/kaddressbook_plugin.h index 3295dc14..f9a7fff3 100644 --- a/kontact/plugins/kaddressbook/kaddressbook_plugin.h +++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.h @@ -26,7 +26,7 @@ #define KADDRESSBOOK_PLUGIN_H #include <klocale.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include "kaddressbookiface_stub.h" #include "plugin.h" diff --git a/kontact/plugins/karm/karm_plugin.cpp b/kontact/plugins/karm/karm_plugin.cpp index 5e5ecbb6..93d89493 100644 --- a/kontact/plugins/karm/karm_plugin.cpp +++ b/kontact/plugins/karm/karm_plugin.cpp @@ -24,7 +24,7 @@ */ #include <kgenericfactory.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include "core.h" #include "plugin.h" diff --git a/kontact/plugins/karm/karm_plugin.h b/kontact/plugins/karm/karm_plugin.h index 9eb867d2..1b4c80bd 100644 --- a/kontact/plugins/karm/karm_plugin.h +++ b/kontact/plugins/karm/karm_plugin.h @@ -27,7 +27,7 @@ #define KARM_PLUGIN_H #include <klocale.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include "karmdcopiface_stub.h" #include "plugin.h" diff --git a/kontact/plugins/kitchensync/kitchensync_plugin.cpp b/kontact/plugins/kitchensync/kitchensync_plugin.cpp index 677972d3..dfea5944 100644 --- a/kontact/plugins/kitchensync/kitchensync_plugin.cpp +++ b/kontact/plugins/kitchensync/kitchensync_plugin.cpp @@ -31,7 +31,7 @@ #include <kgenericfactory.h> #include <kiconloader.h> #include <kmessagebox.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include "core.h" #include "plugin.h" diff --git a/kontact/plugins/kitchensync/kitchensync_plugin.h b/kontact/plugins/kitchensync/kitchensync_plugin.h index dcd867ae..e14ee9a0 100644 --- a/kontact/plugins/kitchensync/kitchensync_plugin.h +++ b/kontact/plugins/kitchensync/kitchensync_plugin.h @@ -26,7 +26,7 @@ #define KITCHENSYNC_PLUGIN_H #include <klocale.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include "plugin.h" diff --git a/kontact/plugins/kmail/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp index 30026936..e6a1fae2 100644 --- a/kontact/plugins/kmail/kmail_plugin.cpp +++ b/kontact/plugins/kmail/kmail_plugin.cpp @@ -28,7 +28,7 @@ #include <kdebug.h> #include <kgenericfactory.h> #include <kiconloader.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <kstandarddirs.h> #include <dcopclient.h> #include <ktempfile.h> diff --git a/kontact/plugins/kmail/kmail_plugin.h b/kontact/plugins/kmail/kmail_plugin.h index 59b66add..d2c5f4a3 100644 --- a/kontact/plugins/kmail/kmail_plugin.h +++ b/kontact/plugins/kmail/kmail_plugin.h @@ -25,7 +25,7 @@ #define KMAIL_PLUGIN_H #include <klocale.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include "kmailIface_stub.h" #include <plugin.h> diff --git a/kontact/plugins/kmail/summarywidget.cpp b/kontact/plugins/kmail/summarywidget.cpp index 0c4e765c..89e572bf 100644 --- a/kontact/plugins/kmail/summarywidget.cpp +++ b/kontact/plugins/kmail/summarywidget.cpp @@ -33,7 +33,7 @@ #include <kglobal.h> #include <kiconloader.h> #include <klocale.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include "core.h" #include "summary.h" diff --git a/kontact/plugins/kmail/summarywidget.h b/kontact/plugins/kmail/summarywidget.h index 28bb63ab..3813ee03 100644 --- a/kontact/plugins/kmail/summarywidget.h +++ b/kontact/plugins/kmail/summarywidget.h @@ -30,7 +30,7 @@ #include <dcopobject.h> #include <kurllabel.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include "plugin.h" #include "summary.h" diff --git a/kontact/plugins/knode/knode_plugin.cpp b/kontact/plugins/knode/knode_plugin.cpp index 8046288f..9713d853 100644 --- a/kontact/plugins/knode/knode_plugin.cpp +++ b/kontact/plugins/knode/knode_plugin.cpp @@ -27,7 +27,7 @@ #include "core.h" #include <kapplication.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <kgenericfactory.h> #include <kapplication.h> #include <kaction.h> diff --git a/kontact/plugins/knode/knode_plugin.h b/kontact/plugins/knode/knode_plugin.h index c6ed79b4..1062ff62 100644 --- a/kontact/plugins/knode/knode_plugin.h +++ b/kontact/plugins/knode/knode_plugin.h @@ -26,7 +26,7 @@ #define KNODE_PLUGIN_H #include <klocale.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include "knodeiface_stub.h" #include "plugin.h" diff --git a/kontact/plugins/knotes/Makefile.am b/kontact/plugins/knotes/Makefile.am index 84e219b7..2b2dc9ed 100644 --- a/kontact/plugins/knotes/Makefile.am +++ b/kontact/plugins/knotes/Makefile.am @@ -4,7 +4,7 @@ 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 \ - $(top_builddir)/libkcal/libkcal.la -lkresources -ltdeprint \ + $(top_builddir)/libkcal/libkcal.la -ltderesources -ltdeprint \ $(top_builddir)/knotes/libknotesresources.la \ $(top_builddir)/knotes/libknoteseditor.la \ $(top_builddir)/knotes/libknotesprinting.la diff --git a/kontact/plugins/knotes/knotes_part.h b/kontact/plugins/knotes/knotes_part.h index a3c7c790..b83c677f 100644 --- a/kontact/plugins/knotes/knotes_part.h +++ b/kontact/plugins/knotes/knotes_part.h @@ -29,7 +29,7 @@ #include <kiconloader.h> #include <libkcal/journal.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include "knotes/KNotesIface.h" diff --git a/kontact/plugins/korganizer/journalplugin.h b/kontact/plugins/korganizer/journalplugin.h index 8387df65..e8cb6051 100644 --- a/kontact/plugins/korganizer/journalplugin.h +++ b/kontact/plugins/korganizer/journalplugin.h @@ -25,7 +25,7 @@ #define KONTACT_JOURNALPLUGIN_H #include <klocale.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include "kcalendariface_stub.h" #include "plugin.h" diff --git a/kontact/plugins/korganizer/korganizerplugin.h b/kontact/plugins/korganizer/korganizerplugin.h index e5a32295..3dd21fb3 100644 --- a/kontact/plugins/korganizer/korganizerplugin.h +++ b/kontact/plugins/korganizer/korganizerplugin.h @@ -26,7 +26,7 @@ #define KORGANIZER_PLUGIN_H #include <klocale.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include "kcalendariface_stub.h" #include "korganizeriface_stub.h" diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp index d12081d6..451d8df5 100644 --- a/kontact/plugins/korganizer/summarywidget.cpp +++ b/kontact/plugins/korganizer/summarywidget.cpp @@ -30,7 +30,7 @@ #include <kglobal.h> #include <kiconloader.h> #include <klocale.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include <kpopupmenu.h> #include <kstandarddirs.h> #include <kurllabel.h> diff --git a/kontact/plugins/korganizer/todoplugin.h b/kontact/plugins/korganizer/todoplugin.h index 4775fbeb..8fd45391 100644 --- a/kontact/plugins/korganizer/todoplugin.h +++ b/kontact/plugins/korganizer/todoplugin.h @@ -25,7 +25,7 @@ #define KONTACT_TODOPLUGIN_H #include <klocale.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include "kcalendariface_stub.h" #include "plugin.h" diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp index 26ce828e..818eac7c 100644 --- a/kontact/plugins/korganizer/todosummarywidget.cpp +++ b/kontact/plugins/korganizer/todosummarywidget.cpp @@ -30,7 +30,7 @@ #include <kglobal.h> #include <kiconloader.h> #include <klocale.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include <kpopupmenu.h> #include <kstandarddirs.h> #include <kurllabel.h> diff --git a/kontact/plugins/kpilot/kpilot_plugin.cpp b/kontact/plugins/kpilot/kpilot_plugin.cpp index fa3bc182..43ffb629 100644 --- a/kontact/plugins/kpilot/kpilot_plugin.cpp +++ b/kontact/plugins/kpilot/kpilot_plugin.cpp @@ -23,7 +23,7 @@ #include <kaboutdata.h> #include <kgenericfactory.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include "core.h" #include "summarywidget.h" diff --git a/kontact/plugins/newsticker/newsticker_plugin.cpp b/kontact/plugins/newsticker/newsticker_plugin.cpp index 671ed5a2..79e03770 100644 --- a/kontact/plugins/newsticker/newsticker_plugin.cpp +++ b/kontact/plugins/newsticker/newsticker_plugin.cpp @@ -20,7 +20,7 @@ #include <kgenericfactory.h> #include <klocale.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include "core.h" #include "summarywidget.h" diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp index 4ab89a32..4857f103 100644 --- a/kontact/plugins/specialdates/sdsummarywidget.cpp +++ b/kontact/plugins/specialdates/sdsummarywidget.cpp @@ -37,7 +37,7 @@ #include <kglobal.h> #include <kiconloader.h> #include <klocale.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include <kpopupmenu.h> #include <kstandarddirs.h> #include <kurllabel.h> diff --git a/kontact/plugins/specialdates/specialdates_plugin.cpp b/kontact/plugins/specialdates/specialdates_plugin.cpp index f9d850ac..97b4d810 100644 --- a/kontact/plugins/specialdates/specialdates_plugin.cpp +++ b/kontact/plugins/specialdates/specialdates_plugin.cpp @@ -26,7 +26,7 @@ #include <kgenericfactory.h> #include <kiconloader.h> #include <klocale.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include "core.h" #include "sdsummarywidget.h" diff --git a/kontact/plugins/summary/CMakeLists.txt b/kontact/plugins/summary/CMakeLists.txt index 9c5228fc..d7fad7af 100644 --- a/kontact/plugins/summary/CMakeLists.txt +++ b/kontact/plugins/summary/CMakeLists.txt @@ -36,7 +36,7 @@ install( FILES kontactsummary_part.rc DESTINATION ${DATA_INSTALL_DIR}/kontactsum tde_add_kpart( libkontact_summaryplugin AUTOMOC SOURCES summaryview_plugin.cpp summaryview_part.cpp dropwidget.cpp - LINK kpinterfaces-shared tdepim-shared kpimidentities-shared kutils-shared + LINK kpinterfaces-shared tdepim-shared kpimidentities-shared tdeutils-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -45,6 +45,6 @@ tde_add_kpart( libkontact_summaryplugin AUTOMOC tde_add_kpart( kcm_kontactsummary AUTOMOC SOURCES kcmkontactsummary.cpp - LINK tdeui-shared kutils-shared + LINK tdeui-shared tdeutils-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kontact/plugins/summary/Makefile.am b/kontact/plugins/summary/Makefile.am index 0886be49..32fcdfc9 100644 --- a/kontact/plugins/summary/Makefile.am +++ b/kontact/plugins/summary/Makefile.am @@ -4,7 +4,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 = -lkutils \ +libkontact_summaryplugin_la_LIBADD = -ltdeutils \ $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_KPARTS) \ $(top_builddir)/libtdepim/libtdepim.la $(top_builddir)/libkpimidentities/libkpimidentities.la diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp index b1da7d0f..de5902b0 100644 --- a/kontact/plugins/summary/summaryview_part.cpp +++ b/kontact/plugins/summary/summaryview_part.cpp @@ -43,8 +43,8 @@ #include <klocale.h> #include <kcmultidialog.h> -#include <kparts/componentfactory.h> -#include <kparts/event.h> +#include <tdeparts/componentfactory.h> +#include <tdeparts/event.h> #include <libkpimidentities/identity.h> #include <libkpimidentities/identitymanager.h> diff --git a/kontact/plugins/summary/summaryview_part.h b/kontact/plugins/summary/summaryview_part.h index 5b57d45c..9de42432 100644 --- a/kontact/plugins/summary/summaryview_part.h +++ b/kontact/plugins/summary/summaryview_part.h @@ -27,7 +27,7 @@ #include <tqdatetime.h> #include <tqmap.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include "core.h" #include "dropwidget.h" diff --git a/kontact/plugins/summary/summaryview_plugin.cpp b/kontact/plugins/summary/summaryview_plugin.cpp index 8f4b7065..a7bb8996 100644 --- a/kontact/plugins/summary/summaryview_plugin.cpp +++ b/kontact/plugins/summary/summaryview_plugin.cpp @@ -23,7 +23,7 @@ #include <dcopref.h> #include <kgenericfactory.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <kaboutdata.h> #include <kaction.h> diff --git a/kontact/plugins/summary/summaryview_plugin.h b/kontact/plugins/summary/summaryview_plugin.h index 450980dc..336f43db 100644 --- a/kontact/plugins/summary/summaryview_plugin.h +++ b/kontact/plugins/summary/summaryview_plugin.h @@ -24,7 +24,7 @@ #include "plugin.h" #include <klocale.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include <tqmap.h> diff --git a/kontact/plugins/test/test_part.h b/kontact/plugins/test/test_part.h index c70b9895..af7da8f8 100644 --- a/kontact/plugins/test/test_part.h +++ b/kontact/plugins/test/test_part.h @@ -26,7 +26,7 @@ -#include <kparts/part.h> +#include <tdeparts/part.h> class TQTextEdit; class KAddressBookIface_stub; diff --git a/kontact/plugins/weather/weather_plugin.cpp b/kontact/plugins/weather/weather_plugin.cpp index af4f9f5c..6c1f57d9 100644 --- a/kontact/plugins/weather/weather_plugin.cpp +++ b/kontact/plugins/weather/weather_plugin.cpp @@ -20,7 +20,7 @@ #include <kaboutdata.h> #include <kgenericfactory.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include "core.h" #include "summarywidget.h" diff --git a/kontact/src/CMakeLists.txt b/kontact/src/CMakeLists.txt index 38076fe4..39ea8df9 100644 --- a/kontact/src/CMakeLists.txt +++ b/kontact/src/CMakeLists.txt @@ -50,7 +50,7 @@ tde_add_executable( kontact AUTOMOC main.cpp mainwindow.cpp sidepanebase.cpp iconsidepane.cpp aboutdialog.cpp profilemanager.cpp profiledialog.cpp kontactiface.skel - LINK kontact-shared kpinterfaces-shared kutils-shared khtml-shared + LINK kontact-shared kpinterfaces-shared tdeutils-shared tdehtml-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kontact/src/Makefile.am b/kontact/src/Makefile.am index 082f9f24..daec1fa3 100644 --- a/kontact/src/Makefile.am +++ b/kontact/src/Makefile.am @@ -10,7 +10,7 @@ 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) -lktexteditor +kontact_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kontact_LDADD = $(top_builddir)/libtdepim/libtdepim.la \ $(top_builddir)/kontact/interfaces/libkpinterfaces.la libkontact.la \ $(LIB_KPARTS) $(LIB_KUTILS) $(LIB_KHTML) diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp index 8a6a7f35..d3642b6a 100644 --- a/kontact/src/mainwindow.cpp +++ b/kontact/src/mainwindow.cpp @@ -46,7 +46,7 @@ #include <klistbox.h> #include <klocale.h> #include <kmessagebox.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <kplugininfo.h> #include <kpopupmenu.h> #include <ksettings/dialog.h> @@ -60,8 +60,8 @@ #include <ksettings/componentsdialog.h> #include <kstringhandler.h> #include <krsqueezedtextlabel.h> -#include <khtml_part.h> -#include <khtmlview.h> +#include <tdehtml_part.h> +#include <tdehtmlview.h> #include <libtdepim/kfileio.h> #include <kcursor.h> #include <krun.h> diff --git a/kontact/src/mainwindow.h b/kontact/src/mainwindow.h index 42b55420..de23b19a 100644 --- a/kontact/src/mainwindow.h +++ b/kontact/src/mainwindow.h @@ -28,9 +28,9 @@ #include <tqptrlist.h> #include <tqwidgetstack.h> -#include <kparts/mainwindow.h> -#include <kparts/part.h> -#include <kparts/partmanager.h> +#include <tdeparts/mainwindow.h> +#include <tdeparts/part.h> +#include <tdeparts/partmanager.h> #include <kdcopservicestarter.h> #include "core.h" diff --git a/korganizer/CMakeLists.txt b/korganizer/CMakeLists.txt index 62055d0c..cea61845 100644 --- a/korganizer/CMakeLists.txt +++ b/korganizer/CMakeLists.txt @@ -205,7 +205,7 @@ tde_add_library( korganizer SHARED AUTOMOC kdgantt-static korganizer_eventviewer-shared korganizer_calendar-shared korg_stdprinting-shared kholidays-shared kpimidentities-shared - kutils-shared knewstuff-shared + tdeutils-shared knewstuff-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/korganizer/Makefile.am b/korganizer/Makefile.am index 98312ec7..a8667126 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) -lktexteditor +korganizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor korganizer_LDADD = libkorganizer.la korganizer_SOURCES = main.cpp korganizer.cpp koapp.cpp korganizer_COMPILE_FIRST = koprefs_base.h @@ -36,12 +36,12 @@ 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) -lktexteditor +korgplugins_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor korgplugins_LDADD = libkorganizer.la $(LIB_KSYCOCA) korgplugins_SOURCES = korgplugins.cpp korgplugins_COMPILE_FIRST = koprefs_base.h -timezone_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +timezone_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor timezone_LDADD = libkorganizer.la $(LIB_KSYCOCA) timezone_SOURCES = timezone.cpp timezone_COMPILE_FIRST = koprefs_base.h @@ -63,7 +63,7 @@ libkorganizer_la_LIBADD = \ $(top_builddir)/libkholidays/libkholidays.la \ $(top_builddir)/libkmime/libkmime.la \ $(LIB_KPARTS) $(LIB_KFILE) $(LIB_KNEWSTUFF) \ - -ltdeprint -lkabc -lkutils + -ltdeprint -lkabc -ltdeutils libkorganizer_la_COMPILE_FIRST = \ kogroupwareprefspage.ui \ diff --git a/korganizer/interfaces/korganizer/part.h b/korganizer/interfaces/korganizer/part.h index 35e426d8..0e723048 100644 --- a/korganizer/interfaces/korganizer/part.h +++ b/korganizer/interfaces/korganizer/part.h @@ -24,7 +24,7 @@ #include <tqstring.h> #include <klibloader.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include <korganizer/mainwindow.h> diff --git a/korganizer/korgac/Makefile.am b/korganizer/korgac/Makefile.am index d5ac531a..817cc95f 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) -lktexteditor +korgac_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -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) -lktexteditor +testalarmdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -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/korganizer.h b/korganizer/korganizer.h index b4c2e9b2..4c15fb39 100644 --- a/korganizer/korganizer.h +++ b/korganizer/korganizer.h @@ -35,7 +35,7 @@ #include <korganizer/mainwindow.h> #include <korganizer/part.h> -#include <kparts/mainwindow.h> +#include <tdeparts/mainwindow.h> class KTempFile; class KRecentFilesAction; diff --git a/korganizer/korganizer_part.cpp b/korganizer/korganizer_part.cpp index 6886358f..184e142c 100644 --- a/korganizer/korganizer_part.cpp +++ b/korganizer/korganizer_part.cpp @@ -51,9 +51,9 @@ #include <kprocess.h> #include <ktempfile.h> #include <kstatusbar.h> -#include <kparts/genericfactory.h> -#include <kparts/partmanager.h> -#include <kparts/statusbarextension.h> +#include <tdeparts/genericfactory.h> +#include <tdeparts/partmanager.h> +#include <tdeparts/statusbarextension.h> #include <sidebarextension.h> #include <infoextension.h> diff --git a/korganizer/korganizer_part.h b/korganizer/korganizer_part.h index 1596c4d8..416e39b9 100644 --- a/korganizer/korganizer_part.h +++ b/korganizer/korganizer_part.h @@ -26,7 +26,7 @@ #define KORGANIZER_PART_H #include <kurl.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include <korganizer/mainwindow.h> diff --git a/korganizer/resourceview.cpp b/korganizer/resourceview.cpp index 11787630..a325add5 100644 --- a/korganizer/resourceview.cpp +++ b/korganizer/resourceview.cpp @@ -37,8 +37,8 @@ #include <kmessagebox.h> #include <kinputdialog.h> #include <kiconloader.h> -#include <kresources/resource.h> -#include <kresources/configdialog.h> +#include <tderesources/resource.h> +#include <tderesources/configdialog.h> #include <libkcal/calendarresources.h> #include <kconfig.h> diff --git a/korn/Makefile.am b/korn/Makefile.am index 362e8606..39cc8ae5 100644 --- a/korn/Makefile.am +++ b/korn/Makefile.am @@ -3,7 +3,7 @@ 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) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor METASOURCES = AUTO diff --git a/korn/kconf_update/Makefile.am b/korn/kconf_update/Makefile.am index 3a5c028d..74991a93 100644 --- a/korn/kconf_update/Makefile.am +++ b/korn/kconf_update/Makefile.am @@ -8,5 +8,5 @@ kconf_PROGRAMS = korn-3-4-config_change kconfdir = $(libdir)/kconf_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) -lktexteditor +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_LDADD = $(LIB_QT) diff --git a/korn/password.cpp b/korn/password.cpp index 96622139..50f31e8d 100644 --- a/korn/password.cpp +++ b/korn/password.cpp @@ -21,7 +21,7 @@ #include <kconfig.h> #include <kdebug.h> -#include <kwallet.h> +#include <tdewallet.h> #include <tqstring.h> #include <tqstringlist.h> diff --git a/ktnef/gui/Makefile.am b/ktnef/gui/Makefile.am index cd2aaa0e..89295fbe 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) -lktexteditor +ktnef_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor ktnef_LDADD = $(LIB_KFILE) $(top_builddir)/ktnef/lib/libktnef.la ktnef_SOURCES = ktnefmain.cpp ktnefview.cpp attachpropertydialogbase.ui \ attachpropertydialog.cpp messagepropertydialog.cpp \ diff --git a/ktnef/tests/Makefile.am b/ktnef/tests/Makefile.am index 15ef5076..42fbf205 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) -lktexteditor +parsertest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor parsertest_SOURCES = parsertest.cpp METASOURCES = AUTO diff --git a/libemailfunctions/tests/Makefile.am b/libemailfunctions/tests/Makefile.am index d53eb271..b83f64b1 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) -lktexteditor +testidmapper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor testidmapper_SOURCES = testidmapper.cpp -testemail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +testemail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor testemail_SOURCES = testemail.cpp METASOURCES = AUTO diff --git a/libkcal/CMakeLists.txt b/libkcal/CMakeLists.txt index 81a5b8be..a4113e36 100644 --- a/libkcal/CMakeLists.txt +++ b/libkcal/CMakeLists.txt @@ -54,8 +54,8 @@ install( FILES ##### other data ################################ -install( FILES local.desktop localdir.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kcal ) -install( FILES kcal_manager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources ) +install( FILES local.desktop localdir.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) +install( FILES kcal_manager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources ) ##### kcal_local (module) ####################### diff --git a/libkcal/Makefile.am b/libkcal/Makefile.am index 7ecd005a..75aa7d8a 100644 --- a/libkcal/Makefile.am +++ b/libkcal/Makefile.am @@ -12,7 +12,7 @@ libkcal_la_LIBADD = versit/libversit.la $(LIB_KIO) \ $(top_builddir)/ktnef/lib/libktnef.la \ ../libkmime/libkmime.la \ ../libemailfunctions/libemailfunctions.la \ - -lkresources -lkabc + -ltderesources -lkabc libkcal_la_SOURCES = \ assignmentvisitor.cpp comparisonvisitor.cpp \ @@ -65,16 +65,16 @@ EXTRA_PROGRAMS = convertqtopia convertqtopia_SOURCES = convertqtopia.cpp convertqtopia_LDADD = libkcal.la -servicedir = $(kde_servicesdir)/kresources/kcal +servicedir = $(kde_servicesdir)/tderesources/kcal service_DATA = local.desktop localdir.desktop manager_DATA = kcal_manager.desktop -managerdir = $(kde_servicesdir)/kresources +managerdir = $(kde_servicesdir)/tderesources METASOURCES = AUTO messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/libkcal.pot -DOXYGEN_REFERENCES=kresources +DOXYGEN_REFERENCES=tderesources include $(top_srcdir)/admin/Doxyfile.am diff --git a/libkcal/calendarresources.cpp b/libkcal/calendarresources.cpp index 5ab08bd7..d39564e9 100644 --- a/libkcal/calendarresources.cpp +++ b/libkcal/calendarresources.cpp @@ -44,8 +44,8 @@ #include "journal.h" #include "filestorage.h" -#include <kresources/manager.h> -#include <kresources/selectdialog.h> +#include <tderesources/manager.h> +#include <tderesources/selectdialog.h> #include <kabc/lock.h> #include "resourcecalendar.h" diff --git a/libkcal/calendarresources.h b/libkcal/calendarresources.h index 921fb227..c9d2e334 100644 --- a/libkcal/calendarresources.h +++ b/libkcal/calendarresources.h @@ -37,7 +37,7 @@ #include "libkcal_export.h" -#include <kresources/manager.h> +#include <tderesources/manager.h> class TQWidget; diff --git a/libkcal/resourcecached.cpp b/libkcal/resourcecached.cpp index aab9216d..5be335e9 100644 --- a/libkcal/resourcecached.cpp +++ b/libkcal/resourcecached.cpp @@ -417,7 +417,7 @@ KPIM::IdMapper& ResourceCached::idMapper() TQString ResourceCached::cacheFile() const { - return locateLocal( "cache", "kcal/kresources/" + identifier() ); + return locateLocal( "cache", "kcal/tderesources/" + identifier() ); } TQString ResourceCached::changesCacheFile( const TQString &type ) const diff --git a/libkcal/resourcecalendar.h b/libkcal/resourcecalendar.h index e63a2ad6..5202563b 100644 --- a/libkcal/resourcecalendar.h +++ b/libkcal/resourcecalendar.h @@ -38,8 +38,8 @@ #include "calendar.h" #include "exceptions.h" -#include <kresources/resource.h> -#include <kresources/manager.h> +#include <tderesources/resource.h> +#include <tderesources/manager.h> #include <kabc/lock.h> #include <tdepimmacros.h> @@ -49,7 +49,7 @@ class CalFormat; /** This class provides the interfaces for a calendar resource. It makes use of - the kresources framework. + the tderesources framework. \warning This code is still under heavy development. Don't expect source or binary compatibility in future versions. diff --git a/libkcal/resourcelocal.cpp b/libkcal/resourcelocal.cpp index 8b0bc1cc..8cfb3a9c 100644 --- a/libkcal/resourcelocal.cpp +++ b/libkcal/resourcelocal.cpp @@ -42,7 +42,7 @@ #include "journal.h" #include "filestorage.h" -#include <kresources/configwidget.h> +#include <tderesources/configwidget.h> #include "resourcelocalconfig.h" diff --git a/libkcal/resourcelocalconfig.h b/libkcal/resourcelocalconfig.h index 3fd42a6f..7a1e7f72 100644 --- a/libkcal/resourcelocalconfig.h +++ b/libkcal/resourcelocalconfig.h @@ -26,8 +26,8 @@ #include <tqbuttongroup.h> #include <kurlrequester.h> -#include <kresources/resource.h> -#include <kresources/configwidget.h> +#include <tderesources/resource.h> +#include <tderesources/configwidget.h> #include <tdepimmacros.h> #include "libkcal_export.h" diff --git a/libkcal/resourcelocaldir.cpp b/libkcal/resourcelocaldir.cpp index 63221ca0..47b19d7c 100644 --- a/libkcal/resourcelocaldir.cpp +++ b/libkcal/resourcelocaldir.cpp @@ -44,7 +44,7 @@ #include "journal.h" #include "filestorage.h" -#include <kresources/configwidget.h> +#include <tderesources/configwidget.h> #include "resourcelocaldirconfig.h" diff --git a/libkcal/resourcelocaldirconfig.h b/libkcal/resourcelocaldirconfig.h index 7e223320..46994ef4 100644 --- a/libkcal/resourcelocaldirconfig.h +++ b/libkcal/resourcelocaldirconfig.h @@ -27,8 +27,8 @@ #include <tqbuttongroup.h> #include <kurlrequester.h> -#include <kresources/resource.h> -#include <kresources/configwidget.h> +#include <tderesources/resource.h> +#include <tderesources/configwidget.h> #include "libkcal_export.h" diff --git a/libkcal/tests/Makefile.am b/libkcal/tests/Makefile.am index 56347360..83a5a8cf 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) -lktexteditor +testincidence_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -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) -lktexteditor +testcalendar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -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) -lktexteditor +testtostring_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -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) -lktexteditor +fbrecurring_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -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) -lktexteditor +readandwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -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) -lktexteditor +testresource_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -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) -lktexteditor +testrecurrence_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -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) -lktexteditor +testrecurprevious_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -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) -lktexteditor +testrecurson_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -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) -lktexteditor +testrecurrencetype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -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) -lktexteditor +testvcalexport_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -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) -lktexteditor +testfields_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -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) -lktexteditor +testfb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -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) -lktexteditor +testcalselectdialog_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor testcalselectdialog_LDADD = ../libkcal.la TESTFILES = test1.ics test2.ics test3.ics test4.ics test5.ics test_Mozilla.ics diff --git a/libkcal/tests/testresource.cpp b/libkcal/tests/testresource.cpp index 25c9e5d6..fbd42da6 100644 --- a/libkcal/tests/testresource.cpp +++ b/libkcal/tests/testresource.cpp @@ -29,7 +29,7 @@ #include <kdebug.h> #include <kcmdlineargs.h> #include <kinputdialog.h> -#include <kresources/factory.h> +#include <tderesources/factory.h> #include <tqdir.h> #include <tqfileinfo.h> @@ -55,7 +55,7 @@ static const KCmdLineOptions options[] = int main(int argc, char *argv[]) { // Use another directory than the real one, just to keep things clean - // TDEHOME needs to be writable though, for a ksycoca database + // TDEHOME needs to be writable though, for a tdesycoca database setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.tde-testresource" ), true ); setenv( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup diff --git a/libkpimidentities/identity.cpp b/libkpimidentities/identity.cpp index 761236f5..c467599a 100644 --- a/libkpimidentities/identity.cpp +++ b/libkpimidentities/identity.cpp @@ -1,5 +1,5 @@ // -*- mode: C++; c-file-style: "gnu" -*- -// kmidentity.cpp +// tdemidentity.cpp // License: GPL #ifdef HAVE_CONFIG_H diff --git a/libtdepim/CMakeLists.txt b/libtdepim/CMakeLists.txt index ba68d5c1..84f57a93 100644 --- a/libtdepim/CMakeLists.txt +++ b/libtdepim/CMakeLists.txt @@ -19,7 +19,7 @@ tde_import( ktnef ) add_subdirectory( icons ) add_subdirectory( pics ) -add_subdirectory( kpartsdesignerplugin ) +add_subdirectory( tdepartsdesignerplugin ) add_subdirectory( about ) include_directories( @@ -98,7 +98,7 @@ tde_add_library( tdepim SHARED AUTOMOC csshelper.cpp distributionlist.cpp kpimurlrequesterdlg.cpp sendsmsdialog.cpp kmailcompletion.cpp VERSION 1.0.0 - LINK kcal-shared kimproxy-shared kparts-shared ${TQUI_LIBRARIES} + LINK kcal-shared tdeimproxy-shared tdeparts-shared ${TQUI_LIBRARIES} DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/libtdepim/Makefile.am b/libtdepim/Makefile.am index d8da6066..24942c72 100644 --- a/libtdepim/Makefile.am +++ b/libtdepim/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = cfgc interfaces tests icons pics kpartsdesignerplugin about +SUBDIRS = cfgc interfaces tests icons pics tdepartsdesignerplugin about INCLUDES = -I$(top_srcdir) $(all_includes) diff --git a/libtdepim/addresseeview.h b/libtdepim/addresseeview.h index 782f4416..25b97487 100644 --- a/libtdepim/addresseeview.h +++ b/libtdepim/addresseeview.h @@ -26,7 +26,7 @@ #include <kabc/addressee.h> #include <ktextbrowser.h> -#include <kimproxy.h> +#include <tdeimproxy.h> #include <tdepimmacros.h> namespace TDEIO { diff --git a/libtdepim/addressesdialog.cpp b/libtdepim/addressesdialog.cpp index 4e46705b..d8699540 100644 --- a/libtdepim/addressesdialog.cpp +++ b/libtdepim/addressesdialog.cpp @@ -32,7 +32,7 @@ #ifdef TDEPIM_NEW_DISTRLISTS #include "distributionlist.h" -#include <kresources/selectdialog.h> +#include <tderesources/selectdialog.h> #include <kabc/resource.h> #else #include <kabc/distributionlist.h> diff --git a/libtdepim/cfgc/Makefile.am b/libtdepim/cfgc/Makefile.am index c5a39482..f0bcd7ce 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) -lktexteditor +example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -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) -lktexteditor +#autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -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 2e455fe1..1796933f 100644 --- a/libtdepim/completionordereditor.cpp +++ b/libtdepim/completionordereditor.cpp @@ -59,7 +59,7 @@ The default completion weights are as follow: LDAP: 50, 49, 48 etc. (see ldapclient.cpp) KABC non-imap resources: 60 (see addresseelineedit.cpp and SimpleCompletionItem here) Distribution lists: 60 (see addresseelineedit.cpp and SimpleCompletionItem here) - KABC imap resources: 80 (see kresources/imap/kabc/resourceimap.cpp) + KABC imap resources: 80 (see tderesources/imap/kabc/resourceimap.cpp) This dialog allows to change those weights, by showing one item per: - LDAP server diff --git a/libtdepim/csshelper.cpp b/libtdepim/csshelper.cpp index 20de40de..3c0ba38d 100644 --- a/libtdepim/csshelper.cpp +++ b/libtdepim/csshelper.cpp @@ -591,7 +591,7 @@ namespace KPIM { "}\n\n" "div.fancy.header table {\n" - " padding: 2px ! important;\n" // ### khtml bug: this is ignored + " padding: 2px ! important;\n" // ### tdehtml bug: this is ignored " text-align: left ! important\n" "}\n\n" diff --git a/libtdepim/embeddedurlpage.cpp b/libtdepim/embeddedurlpage.cpp index 7a459530..b8567d77 100644 --- a/libtdepim/embeddedurlpage.cpp +++ b/libtdepim/embeddedurlpage.cpp @@ -2,7 +2,7 @@ This file is part of libtdepim. Copyright (c) 2005 Reinhold Kainhofer <reinhold@kainhofer.com> - Part of loadContents() copied from the kpartsdesignerplugin: + Part of loadContents() copied from the tdepartsdesignerplugin: Copyright (C) 2005, David Faure <faure@kde.org> This library is free software; you can redistribute it and/or @@ -22,9 +22,9 @@ */ #include "embeddedurlpage.h" -#include <kparts/componentfactory.h> -#include <kparts/browserextension.h> -#include <kparts/part.h> +#include <tdeparts/componentfactory.h> +#include <tdeparts/browserextension.h> +#include <tdeparts/part.h> #include <kmimetype.h> #include <klocale.h> #include <tqlayout.h> diff --git a/libtdepim/infoextension.cpp b/libtdepim/infoextension.cpp index 25f7e8ba..80f53010 100644 --- a/libtdepim/infoextension.cpp +++ b/libtdepim/infoextension.cpp @@ -22,7 +22,7 @@ #include "infoextension.h" #include <tqwidget.h> -#include <kparts/part.h> +#include <tdeparts/part.h> using namespace KParts; diff --git a/libtdepim/kabcresourcecached.cpp b/libtdepim/kabcresourcecached.cpp index 510ef2f8..df8ecbca 100644 --- a/libtdepim/kabcresourcecached.cpp +++ b/libtdepim/kabcresourcecached.cpp @@ -342,7 +342,7 @@ KABC::Addressee::List ResourceCached::deletedAddressees() const TQString ResourceCached::cacheFile() const { - return locateLocal( "cache", "kabc/kresources/" + identifier() ); + return locateLocal( "cache", "kabc/tderesources/" + identifier() ); } TQString ResourceCached::changesCacheFile( const TQString &type ) const diff --git a/libtdepim/kaddrbook.cpp b/libtdepim/kaddrbook.cpp index 44e1488b..72fa4f3d 100644 --- a/libtdepim/kaddrbook.cpp +++ b/libtdepim/kaddrbook.cpp @@ -22,7 +22,7 @@ #include <kabc/stdaddressbook.h> #include <kabc/vcardconverter.h> #include <kabc/errorhandler.h> -#include <kresources/selectdialog.h> +#include <tderesources/selectdialog.h> #include <dcopref.h> #include <dcopclient.h> diff --git a/libtdepim/komposer/core/Makefile.am b/libtdepim/komposer/core/Makefile.am index 2898c077..764ec052 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 -lkutils +libkomposer_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/libtdepim/libtdepim.la -ltdeutils #kde_module_LTLIBRARIES = kcm_komposer.la diff --git a/libtdepim/komposer/core/pluginmanager.cpp b/libtdepim/komposer/core/pluginmanager.cpp index b19ead44..f2778178 100644 --- a/libtdepim/komposer/core/pluginmanager.cpp +++ b/libtdepim/komposer/core/pluginmanager.cpp @@ -32,7 +32,7 @@ #include <kapplication.h> #include <kdebug.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <kplugininfo.h> #include <ksettings/dispatcher.h> #include <ksimpleconfig.h> diff --git a/libtdepim/komposer/core/tests/Makefile.am b/libtdepim/komposer/core/tests/Makefile.am index 4958c55e..829fb309 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) -lktexteditor +testfactory_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -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) -lktexteditor +testmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -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) -lktexteditor +testkomposer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor testkomposer_LDADD = ../libkomposer.la check: testfactory diff --git a/libtdepim/komposer/test/Makefile.am b/libtdepim/komposer/test/Makefile.am index 7006ec17..6bdebcf2 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) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor check_PROGRAMS = test diff --git a/libtdepim/kpartsdesignerplugin/Makefile.am b/libtdepim/kpartsdesignerplugin/Makefile.am deleted file mode 100644 index ebbfbfba..00000000 --- a/libtdepim/kpartsdesignerplugin/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -AM_CXXFLAGS = -DQT_PLUGIN -METASOURCES = AUTO -INCLUDES = $(all_includes) - -kde_widget_LTLIBRARIES = kpartsdesignerplugin.la -kpartsdesignerplugin_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries) $(LIB_QT) -ltdecore -lkio -kpartsdesignerplugin_la_LIBADD = $(LIB_KPARTS) -kpartsdesignerplugin_la_SOURCES = kpartsdesignerplugin.cpp diff --git a/libtdepim/kscoringeditor.cpp b/libtdepim/kscoringeditor.cpp index 95c82035..37c9abc5 100644 --- a/libtdepim/kscoringeditor.cpp +++ b/libtdepim/kscoringeditor.cpp @@ -27,7 +27,7 @@ #include <kiconloader.h> #include <kregexpeditorinterface.h> #include <ktrader.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <tqlabel.h> diff --git a/libtdepim/sidebarextension.cpp b/libtdepim/sidebarextension.cpp index db49dc71..86279281 100644 --- a/libtdepim/sidebarextension.cpp +++ b/libtdepim/sidebarextension.cpp @@ -22,7 +22,7 @@ #include "sidebarextension.h" #include <tqwidget.h> -#include <kparts/part.h> +#include <tdeparts/part.h> using namespace KParts; diff --git a/libtdepim/kpartsdesignerplugin/CMakeLists.txt b/libtdepim/tdepartsdesignerplugin/CMakeLists.txt index 55c75251..01bba1d8 100644 --- a/libtdepim/kpartsdesignerplugin/CMakeLists.txt +++ b/libtdepim/tdepartsdesignerplugin/CMakeLists.txt @@ -23,10 +23,10 @@ link_directories( ) -##### kpartsdesignerplugin (module) ############# +##### tdepartsdesignerplugin (module) ############# -tde_add_kpart( kpartsdesignerplugin AUTOMOC - SOURCES kpartsdesignerplugin.cpp - LINK kparts-shared kio-shared +tde_add_kpart( tdepartsdesignerplugin AUTOMOC + SOURCES tdepartsdesignerplugin.cpp + LINK tdeparts-shared kio-shared DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer ) diff --git a/libtdepim/tdepartsdesignerplugin/Makefile.am b/libtdepim/tdepartsdesignerplugin/Makefile.am new file mode 100644 index 00000000..24d32ca7 --- /dev/null +++ b/libtdepim/tdepartsdesignerplugin/Makefile.am @@ -0,0 +1,8 @@ +AM_CXXFLAGS = -DQT_PLUGIN +METASOURCES = AUTO +INCLUDES = $(all_includes) + +kde_widget_LTLIBRARIES = tdepartsdesignerplugin.la +tdepartsdesignerplugin_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries) $(LIB_QT) -ltdecore -lkio +tdepartsdesignerplugin_la_LIBADD = $(LIB_KPARTS) +tdepartsdesignerplugin_la_SOURCES = tdepartsdesignerplugin.cpp diff --git a/libtdepim/kpartsdesignerplugin/README b/libtdepim/tdepartsdesignerplugin/README index 0dbcb2ec..da5c58f2 100644 --- a/libtdepim/kpartsdesignerplugin/README +++ b/libtdepim/tdepartsdesignerplugin/README @@ -1,2 +1,2 @@ -When moving this to tdelibs: the KPartsGenericPart class should move to libkparts so +When moving this to tdelibs: the KPartsGenericPart class should move to libtdeparts so that it's possible to add an accessor for m_part there. diff --git a/libtdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp b/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp index f25ec3cd..97dec07e 100644 --- a/libtdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp +++ b/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp @@ -17,10 +17,10 @@ Boston, MA 02110-1301, USA. */ -#include "kpartsdesignerplugin.h" +#include "tdepartsdesignerplugin.h" -#include <kparts/componentfactory.h> -#include <kparts/part.h> +#include <tdeparts/componentfactory.h> +#include <tdeparts/part.h> #include <kmimetype.h> #include <tqlayout.h> #include <kapplication.h> @@ -113,5 +113,5 @@ bool KPartsWidgetPlugin::isContainer( const TQString & /*key*/ ) const { KDE_TQ_EXPORT_PLUGIN( KPartsWidgetPlugin ) -#include "kpartsdesignerplugin.moc" +#include "tdepartsdesignerplugin.moc" diff --git a/libtdepim/kpartsdesignerplugin/kpartsdesignerplugin.h b/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.h index 91c96d2f..91c96d2f 100644 --- a/libtdepim/kpartsdesignerplugin/kpartsdesignerplugin.h +++ b/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.h diff --git a/libtdepim/tests/Makefile.am b/libtdepim/tests/Makefile.am index 34ecb179..328f068d 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) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -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) -lktexteditor +#example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor #example_LDADD = ../libtdepim.la $(LIB_TDECORE) #example_SOURCES = example.cpp exampleprefs_base.kcfgc diff --git a/libtdepim/tests/testdistrlist.cpp b/libtdepim/tests/testdistrlist.cpp index b6962d51..895dc537 100644 --- a/libtdepim/tests/testdistrlist.cpp +++ b/libtdepim/tests/testdistrlist.cpp @@ -42,7 +42,7 @@ using KPIM::DistributionList; int main(int argc, char *argv[]) { // Use another directory than the real one, just to keep things clean - // TDEHOME needs to be writable though, for a ksycoca database + // TDEHOME needs to be writable though, for a tdesycoca database setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.tde-testdistrlist" ), true ); setenv( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup diff --git a/plugins/kmail/bodypartformatter/text_calendar.cpp b/plugins/kmail/bodypartformatter/text_calendar.cpp index 843c01f1..1cb2a8f5 100644 --- a/plugins/kmail/bodypartformatter/text_calendar.cpp +++ b/plugins/kmail/bodypartformatter/text_calendar.cpp @@ -36,7 +36,7 @@ #include <interfaces/bodypartformatter.h> #include <interfaces/bodypart.h> #include <interfaces/bodyparturlhandler.h> -#include <khtmlparthtmlwriter.h> +#include <tdehtmlparthtmlwriter.h> #include <libtdepim/kfileio.h> diff --git a/plugins/kmail/bodypartformatter/text_vcard.cpp b/plugins/kmail/bodypartformatter/text_vcard.cpp index 769a4d8e..ce6d38a3 100644 --- a/plugins/kmail/bodypartformatter/text_vcard.cpp +++ b/plugins/kmail/bodypartformatter/text_vcard.cpp @@ -51,8 +51,8 @@ #include "interfaces/bodypart.h" using KMail::Interface::BodyPart; #include "interfaces/bodyparturlhandler.h" -#include "khtmlparthtmlwriter.h" -#include <kimproxy.h> +#include "tdehtmlparthtmlwriter.h" +#include <tdeimproxy.h> #include <kpopupmenu.h> #include <kabc/vcardconverter.h> diff --git a/plugins/kmail/bodypartformatter/text_xdiff.cpp b/plugins/kmail/bodypartformatter/text_xdiff.cpp index 9da709b5..c5c57764 100644 --- a/plugins/kmail/bodypartformatter/text_xdiff.cpp +++ b/plugins/kmail/bodypartformatter/text_xdiff.cpp @@ -32,7 +32,7 @@ #include <interfaces/bodypartformatter.h> #include <interfaces/bodypart.h> #include <interfaces/bodyparturlhandler.h> -#include <khtmlparthtmlwriter.h> +#include <tdehtmlparthtmlwriter.h> #include <kmail/callback.h> #include <kmail/kmmessage.h> @@ -85,7 +85,7 @@ namespace { TQString tableStyle = TQString::fromLatin1( "style=\"" - "text-align: -khtml-auto; " + "text-align: -tdehtml-auto; " "border: solid black 1px; " "padding: 0.5em; " "margin: 0em;\""); diff --git a/kresources/CMakeLists.txt b/tderesources/CMakeLists.txt index 83673371..3f06c868 100644 --- a/kresources/CMakeLists.txt +++ b/tderesources/CMakeLists.txt @@ -9,7 +9,7 @@ # ################################################# -project( kresources ) +project( tderesources ) tde_import( libkmime ) tde_import( ktnef ) diff --git a/kresources/Makefile.am b/tderesources/Makefile.am index c0ca6cd2..c0ca6cd2 100644 --- a/kresources/Makefile.am +++ b/tderesources/Makefile.am diff --git a/kresources/birthdays/CMakeLists.txt b/tderesources/birthdays/CMakeLists.txt index 99fd0ecd..bdde602b 100644 --- a/kresources/birthdays/CMakeLists.txt +++ b/tderesources/birthdays/CMakeLists.txt @@ -33,7 +33,7 @@ install( FILES ##### other data ################################ -install( FILES kabc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kcal ) +install( FILES kabc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) ##### kcal_kabc (module) ####################### diff --git a/kresources/birthdays/Makefile.am b/tderesources/birthdays/Makefile.am index b7c2285f..6a583005 100644 --- a/kresources/birthdays/Makefile.am +++ b/tderesources/birthdays/Makefile.am @@ -13,7 +13,7 @@ kcal_kabc_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \ libkcalincludedir = $(includedir)/libkcal libkcalinclude_HEADERS = resourcekabc.h resourcekabcconfig.h -servicedir = $(kde_servicesdir)/kresources/kcal +servicedir = $(kde_servicesdir)/tderesources/kcal service_DATA = kabc.desktop METASOURCES = AUTO diff --git a/kresources/birthdays/kabc.desktop b/tderesources/birthdays/kabc.desktop index 8fadcb2b..8fadcb2b 100644 --- a/kresources/birthdays/kabc.desktop +++ b/tderesources/birthdays/kabc.desktop diff --git a/kresources/birthdays/resourcekabc.cpp b/tderesources/birthdays/resourcekabc.cpp index b98d49e0..f3b191e1 100644 --- a/kresources/birthdays/resourcekabc.cpp +++ b/tderesources/birthdays/resourcekabc.cpp @@ -48,7 +48,7 @@ #include <libemailfunctions/email.h> -#include <kresources/configwidget.h> +#include <tderesources/configwidget.h> #include "resourcekabcconfig.h" diff --git a/kresources/birthdays/resourcekabc.h b/tderesources/birthdays/resourcekabc.h index 169a0294..169a0294 100644 --- a/kresources/birthdays/resourcekabc.h +++ b/tderesources/birthdays/resourcekabc.h diff --git a/kresources/birthdays/resourcekabcconfig.cpp b/tderesources/birthdays/resourcekabcconfig.cpp index 2f7671dc..2f7671dc 100644 --- a/kresources/birthdays/resourcekabcconfig.cpp +++ b/tderesources/birthdays/resourcekabcconfig.cpp diff --git a/kresources/birthdays/resourcekabcconfig.h b/tderesources/birthdays/resourcekabcconfig.h index b8ae916e..ff6178b7 100644 --- a/kresources/birthdays/resourcekabcconfig.h +++ b/tderesources/birthdays/resourcekabcconfig.h @@ -28,8 +28,8 @@ #include <klistview.h> #include <krestrictedline.h> -#include <kresources/resource.h> -#include <kresources/configwidget.h> +#include <tderesources/resource.h> +#include <tderesources/configwidget.h> namespace KCal { diff --git a/kresources/blogging/API_Blog.cpp b/tderesources/blogging/API_Blog.cpp index 981390fa..981390fa 100644 --- a/kresources/blogging/API_Blog.cpp +++ b/tderesources/blogging/API_Blog.cpp diff --git a/kresources/blogging/API_Blog.h b/tderesources/blogging/API_Blog.h index 9425bd5e..9425bd5e 100644 --- a/kresources/blogging/API_Blog.h +++ b/tderesources/blogging/API_Blog.h diff --git a/kresources/blogging/API_Blogger.cpp b/tderesources/blogging/API_Blogger.cpp index 69a722e2..69a722e2 100644 --- a/kresources/blogging/API_Blogger.cpp +++ b/tderesources/blogging/API_Blogger.cpp diff --git a/kresources/blogging/API_Blogger.h b/tderesources/blogging/API_Blogger.h index d7d5f43b..d7d5f43b 100644 --- a/kresources/blogging/API_Blogger.h +++ b/tderesources/blogging/API_Blogger.h diff --git a/kresources/blogging/Makefile.am b/tderesources/blogging/Makefile.am index 508b0e75..563f46b2 100644 --- a/kresources/blogging/Makefile.am +++ b/tderesources/blogging/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kresources/lib -I../lib -I$(top_srcdir)/kresources/blogging/libkblog/ $(all_includes) +INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tderesources/lib -I../lib -I$(top_srcdir)/tderesources/blogging/libkblog/ $(all_includes) lib_LTLIBRARIES = libkcal_blogging.la kde_module_LTLIBRARIES = kcal_blogging.la @@ -18,7 +18,7 @@ kcal_blogging_la_SOURCES = kcal_resourceblogging_plugin.cpp kcal_blogging_la_LDFLAGS = $(all_libraries) -module -no-undefined $(KDE_PLUGIN) kcal_blogging_la_LIBADD = libkcal_blogging.la -kcal_servicedir = $(kde_servicesdir)/kresources/kcal +kcal_servicedir = $(kde_servicesdir)/tderesources/kcal kcal_service_DATA = blogging.desktop METASOURCES = AUTO @@ -26,4 +26,4 @@ METASOURCES = AUTO messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kres_blogging.pot -kcal_resourceblogging.lo: ../lib/kresources_groupwareprefs.h +kcal_resourceblogging.lo: ../lib/tderesources_groupwareprefs.h diff --git a/kresources/blogging/blogging.desktop b/tderesources/blogging/blogging.desktop index 7714a362..7714a362 100644 --- a/kresources/blogging/blogging.desktop +++ b/tderesources/blogging/blogging.desktop diff --git a/kresources/blogging/bloggingcalendaradaptor.cpp b/tderesources/blogging/bloggingcalendaradaptor.cpp index 2ed925a8..2ed925a8 100644 --- a/kresources/blogging/bloggingcalendaradaptor.cpp +++ b/tderesources/blogging/bloggingcalendaradaptor.cpp diff --git a/kresources/blogging/bloggingcalendaradaptor.h b/tderesources/blogging/bloggingcalendaradaptor.h index ee6d292a..ee6d292a 100644 --- a/kresources/blogging/bloggingcalendaradaptor.h +++ b/tderesources/blogging/bloggingcalendaradaptor.h diff --git a/kresources/blogging/bloggingglobals.cpp b/tderesources/blogging/bloggingglobals.cpp index 53743e9a..53743e9a 100644 --- a/kresources/blogging/bloggingglobals.cpp +++ b/tderesources/blogging/bloggingglobals.cpp diff --git a/kresources/blogging/bloggingglobals.h b/tderesources/blogging/bloggingglobals.h index 74eafdf7..74eafdf7 100644 --- a/kresources/blogging/bloggingglobals.h +++ b/tderesources/blogging/bloggingglobals.h diff --git a/kresources/blogging/kcal_resourceblogging.cpp b/tderesources/blogging/kcal_resourceblogging.cpp index 14bb24ca..6f0b1d4b 100644 --- a/kresources/blogging/kcal_resourceblogging.cpp +++ b/tderesources/blogging/kcal_resourceblogging.cpp @@ -22,7 +22,7 @@ #include "API_Blogger.h" #include "kcal_resourceblogging.h" -#include <kresources_groupwareprefs.h> +#include <tderesources_groupwareprefs.h> using namespace KCal; diff --git a/kresources/blogging/kcal_resourceblogging.h b/tderesources/blogging/kcal_resourceblogging.h index 4e850d14..4e850d14 100644 --- a/kresources/blogging/kcal_resourceblogging.h +++ b/tderesources/blogging/kcal_resourceblogging.h diff --git a/kresources/blogging/kcal_resourceblogging_plugin.cpp b/tderesources/blogging/kcal_resourceblogging_plugin.cpp index 4cc3dd8c..4cc3dd8c 100644 --- a/kresources/blogging/kcal_resourceblogging_plugin.cpp +++ b/tderesources/blogging/kcal_resourceblogging_plugin.cpp diff --git a/kresources/blogging/kcal_resourcebloggingconfig.cpp b/tderesources/blogging/kcal_resourcebloggingconfig.cpp index bd999ffe..bd999ffe 100644 --- a/kresources/blogging/kcal_resourcebloggingconfig.cpp +++ b/tderesources/blogging/kcal_resourcebloggingconfig.cpp diff --git a/kresources/blogging/kcal_resourcebloggingconfig.h b/tderesources/blogging/kcal_resourcebloggingconfig.h index b7584167..b7584167 100644 --- a/kresources/blogging/kcal_resourcebloggingconfig.h +++ b/tderesources/blogging/kcal_resourcebloggingconfig.h diff --git a/kresources/blogging/resourcebloggingsettings.ui b/tderesources/blogging/resourcebloggingsettings.ui index 7d7e0227..7d7e0227 100644 --- a/kresources/blogging/resourcebloggingsettings.ui +++ b/tderesources/blogging/resourcebloggingsettings.ui diff --git a/kresources/blogging/xmlrpcjob.cpp b/tderesources/blogging/xmlrpcjob.cpp index f2e51630..f2e51630 100644 --- a/kresources/blogging/xmlrpcjob.cpp +++ b/tderesources/blogging/xmlrpcjob.cpp diff --git a/kresources/blogging/xmlrpcjob.h b/tderesources/blogging/xmlrpcjob.h index 1efe79e1..1efe79e1 100644 --- a/kresources/blogging/xmlrpcjob.h +++ b/tderesources/blogging/xmlrpcjob.h diff --git a/kresources/caldav/CMakeLists.txt b/tderesources/caldav/CMakeLists.txt index 960f086f..b43b5461 100644 --- a/kresources/caldav/CMakeLists.txt +++ b/tderesources/caldav/CMakeLists.txt @@ -30,7 +30,7 @@ link_directories( install( FILES kcal_caldav.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kcal ) + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) ##### kcal_caldav (module) ###################### diff --git a/kresources/caldav/ConfigureChecks.cmake b/tderesources/caldav/ConfigureChecks.cmake index e98ff721..e98ff721 100644 --- a/kresources/caldav/ConfigureChecks.cmake +++ b/tderesources/caldav/ConfigureChecks.cmake diff --git a/kresources/caldav/Makefile.am b/tderesources/caldav/Makefile.am index 1bfe28dc..7749b022 100644 --- a/kresources/caldav/Makefile.am +++ b/tderesources/caldav/Makefile.am @@ -25,7 +25,7 @@ kcal_caldav_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) kcal_caldav_la_LIBADD = libkcal_caldav.la kcal_caldav_la_COMPILE_FIRST = prefsskel.h -kcal_servicedir = $(kde_servicesdir)/kresources/kcal +kcal_servicedir = $(kde_servicesdir)/tderesources/kcal kcal_service_DATA = kcal_caldav.desktop METASOURCES = AUTO diff --git a/kresources/caldav/config.cpp b/tderesources/caldav/config.cpp index 0a07aafc..0a07aafc 100644 --- a/kresources/caldav/config.cpp +++ b/tderesources/caldav/config.cpp diff --git a/kresources/caldav/config.h b/tderesources/caldav/config.h index 3e6abe9b..fe03114c 100644 --- a/kresources/caldav/config.h +++ b/tderesources/caldav/config.h @@ -20,7 +20,7 @@ #include "resource.h" #include <kdemacros.h> -#include <kresources/configwidget.h> +#include <tderesources/configwidget.h> class TQLineEdit; class TQCheckBox; diff --git a/kresources/caldav/configwidgets.cpp b/tderesources/caldav/configwidgets.cpp index ab8c7905..ab8c7905 100644 --- a/kresources/caldav/configwidgets.cpp +++ b/tderesources/caldav/configwidgets.cpp diff --git a/kresources/caldav/configwidgets.h b/tderesources/caldav/configwidgets.h index 1e524844..1e524844 100644 --- a/kresources/caldav/configwidgets.h +++ b/tderesources/caldav/configwidgets.h diff --git a/kresources/carddav/export.h b/tderesources/caldav/export.h index 2e22c557..c439f53f 100644 --- a/kresources/carddav/export.h +++ b/tderesources/caldav/export.h @@ -33,7 +33,7 @@ #ifndef KRESOURCES_TDEPIM_EXPORT_H #define KRESOURCES_TDEPIM_EXPORT_H -/** Exports a function returning kresources plugin factory, for resource class @a resourceclass, +/** Exports a function returning tderesources plugin factory, for resource class @a resourceclass, * @a resourceconfigclass config class and @a catalog catalog. */ #define EXPORT_KRESOURCES_PLUGIN( resourceclass, resourceconfigclass, catalog ) \ diff --git a/kresources/caldav/job.cpp b/tderesources/caldav/job.cpp index 93f91cd5..93f91cd5 100644 --- a/kresources/caldav/job.cpp +++ b/tderesources/caldav/job.cpp diff --git a/kresources/caldav/job.h b/tderesources/caldav/job.h index 7d312d90..7d312d90 100644 --- a/kresources/caldav/job.h +++ b/tderesources/caldav/job.h diff --git a/kresources/caldav/kcal_caldav.desktop b/tderesources/caldav/kcal_caldav.desktop index b237c04b..b237c04b 100644 --- a/kresources/caldav/kcal_caldav.desktop +++ b/tderesources/caldav/kcal_caldav.desktop diff --git a/kresources/caldav/plugin.cpp b/tderesources/caldav/plugin.cpp index 9ce6d60f..9ce6d60f 100644 --- a/kresources/caldav/plugin.cpp +++ b/tderesources/caldav/plugin.cpp diff --git a/kresources/caldav/preferences.cpp b/tderesources/caldav/preferences.cpp index 10da60e0..5286d022 100644 --- a/kresources/caldav/preferences.cpp +++ b/tderesources/caldav/preferences.cpp @@ -16,7 +16,7 @@ #include "preferences.h" -#include <kwallet.h> +#include <tdewallet.h> #include <tqstring.h> #include <tqurl.h> #include <kdebug.h> diff --git a/kresources/caldav/preferences.h b/tderesources/caldav/preferences.h index fe585406..0c4532cf 100644 --- a/kresources/caldav/preferences.h +++ b/tderesources/caldav/preferences.h @@ -19,7 +19,7 @@ #include "prefsskel.h" -#include <kwallet.h> +#include <tdewallet.h> #include <kdebug.h> class TQString; diff --git a/kresources/caldav/prefsskel.kcfg b/tderesources/caldav/prefsskel.kcfg index 7a72dd6b..5f4cdc16 100644 --- a/kresources/caldav/prefsskel.kcfg +++ b/tderesources/caldav/prefsskel.kcfg @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > - <kcfgfile name="kresources_caldavrc" /> + <kcfgfile name="tderesources_caldavrc" /> <group name="General" > <entry key="Url" type="String" > diff --git a/kresources/caldav/prefsskel.kcfgc b/tderesources/caldav/prefsskel.kcfgc index b6b3aae0..b6b3aae0 100644 --- a/kresources/caldav/prefsskel.kcfgc +++ b/tderesources/caldav/prefsskel.kcfgc diff --git a/kresources/caldav/reader.cpp b/tderesources/caldav/reader.cpp index 92501e4f..92501e4f 100644 --- a/kresources/caldav/reader.cpp +++ b/tderesources/caldav/reader.cpp diff --git a/kresources/caldav/reader.h b/tderesources/caldav/reader.h index 9bcc8c87..9bcc8c87 100644 --- a/kresources/caldav/reader.h +++ b/tderesources/caldav/reader.h diff --git a/kresources/caldav/resource.cpp b/tderesources/caldav/resource.cpp index b9285e61..b9285e61 100644 --- a/kresources/caldav/resource.cpp +++ b/tderesources/caldav/resource.cpp diff --git a/kresources/caldav/resource.h b/tderesources/caldav/resource.h index ea04ef48..ea04ef48 100644 --- a/kresources/caldav/resource.h +++ b/tderesources/caldav/resource.h diff --git a/kresources/caldav/uninstall.desktop b/tderesources/caldav/uninstall.desktop index e1e3e173..e1e3e173 100644 --- a/kresources/caldav/uninstall.desktop +++ b/tderesources/caldav/uninstall.desktop diff --git a/kresources/caldav/writer.cpp b/tderesources/caldav/writer.cpp index d9a6b2f0..d9a6b2f0 100644 --- a/kresources/caldav/writer.cpp +++ b/tderesources/caldav/writer.cpp diff --git a/kresources/caldav/writer.h b/tderesources/caldav/writer.h index 437eeed0..437eeed0 100644 --- a/kresources/caldav/writer.h +++ b/tderesources/caldav/writer.h diff --git a/kresources/carddav/CMakeLists.txt b/tderesources/carddav/CMakeLists.txt index c5d3e3ce..36e086b4 100644 --- a/kresources/carddav/CMakeLists.txt +++ b/tderesources/carddav/CMakeLists.txt @@ -30,7 +30,7 @@ link_directories( install( FILES kabc_carddav.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kabc ) + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc ) ##### kabc_carddav (module) ##################### diff --git a/kresources/carddav/ConfigureChecks.cmake b/tderesources/carddav/ConfigureChecks.cmake index 62582fe9..62582fe9 100644 --- a/kresources/carddav/ConfigureChecks.cmake +++ b/tderesources/carddav/ConfigureChecks.cmake diff --git a/kresources/carddav/Makefile.am b/tderesources/carddav/Makefile.am index a9097ff8..b82849df 100644 --- a/kresources/carddav/Makefile.am +++ b/tderesources/carddav/Makefile.am @@ -26,7 +26,7 @@ kabc_carddav_la_LDFLAGS = $(all_libraries) -module -no-undefined $(KDE_PLUGIN) kabc_carddav_la_LIBADD = libkabc_carddav.la kabc_carddav_la_COMPILE_FIRST = prefsskel.h -kabc_servicedir = $(kde_servicesdir)/kresources/kabc +kabc_servicedir = $(kde_servicesdir)/tderesources/kabc kabc_service_DATA = kabc_carddav.desktop METASOURCES = AUTO diff --git a/kresources/carddav/config.cpp b/tderesources/carddav/config.cpp index 9b01eb5d..9b01eb5d 100644 --- a/kresources/carddav/config.cpp +++ b/tderesources/carddav/config.cpp diff --git a/kresources/carddav/config.h b/tderesources/carddav/config.h index c26b2b16..7cac4094 100644 --- a/kresources/carddav/config.h +++ b/tderesources/carddav/config.h @@ -19,7 +19,7 @@ #include "resource.h" #include <kdemacros.h> -#include <kresources/configwidget.h> +#include <tderesources/configwidget.h> class TQLineEdit; class TQCheckBox; diff --git a/kresources/carddav/configwidgets.cpp b/tderesources/carddav/configwidgets.cpp index b2d505df..b2d505df 100644 --- a/kresources/carddav/configwidgets.cpp +++ b/tderesources/carddav/configwidgets.cpp diff --git a/kresources/carddav/configwidgets.h b/tderesources/carddav/configwidgets.h index 9f45579d..9f45579d 100644 --- a/kresources/carddav/configwidgets.h +++ b/tderesources/carddav/configwidgets.h diff --git a/kresources/caldav/export.h b/tderesources/carddav/export.h index 2e22c557..c439f53f 100644 --- a/kresources/caldav/export.h +++ b/tderesources/carddav/export.h @@ -33,7 +33,7 @@ #ifndef KRESOURCES_TDEPIM_EXPORT_H #define KRESOURCES_TDEPIM_EXPORT_H -/** Exports a function returning kresources plugin factory, for resource class @a resourceclass, +/** Exports a function returning tderesources plugin factory, for resource class @a resourceclass, * @a resourceconfigclass config class and @a catalog catalog. */ #define EXPORT_KRESOURCES_PLUGIN( resourceclass, resourceconfigclass, catalog ) \ diff --git a/kresources/carddav/job.cpp b/tderesources/carddav/job.cpp index 9c288650..9c288650 100644 --- a/kresources/carddav/job.cpp +++ b/tderesources/carddav/job.cpp diff --git a/kresources/carddav/job.h b/tderesources/carddav/job.h index 52a04bc7..52a04bc7 100644 --- a/kresources/carddav/job.h +++ b/tderesources/carddav/job.h diff --git a/kresources/carddav/kabc_carddav.desktop b/tderesources/carddav/kabc_carddav.desktop index 585d11b3..585d11b3 100644 --- a/kresources/carddav/kabc_carddav.desktop +++ b/tderesources/carddav/kabc_carddav.desktop diff --git a/kresources/carddav/plugin.cpp b/tderesources/carddav/plugin.cpp index d0c4724f..d0c4724f 100644 --- a/kresources/carddav/plugin.cpp +++ b/tderesources/carddav/plugin.cpp diff --git a/kresources/carddav/preferences.cpp b/tderesources/carddav/preferences.cpp index 5e46b611..1846ae92 100644 --- a/kresources/carddav/preferences.cpp +++ b/tderesources/carddav/preferences.cpp @@ -15,7 +15,7 @@ #include "preferences.h" -#include <kwallet.h> +#include <tdewallet.h> #include <tqstring.h> #include <tqurl.h> #include <kdebug.h> diff --git a/kresources/carddav/preferences.h b/tderesources/carddav/preferences.h index 89a8ac58..96a6377d 100644 --- a/kresources/carddav/preferences.h +++ b/tderesources/carddav/preferences.h @@ -18,7 +18,7 @@ #include "prefsskel.h" -#include <kwallet.h> +#include <tdewallet.h> #include <kdebug.h> class TQString; diff --git a/kresources/carddav/prefsskel.kcfg b/tderesources/carddav/prefsskel.kcfg index 9012e9ba..054a31b5 100644 --- a/kresources/carddav/prefsskel.kcfg +++ b/tderesources/carddav/prefsskel.kcfg @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > - <kcfgfile name="kresources_caldavrc" /> + <kcfgfile name="tderesources_caldavrc" /> <group name="General" > <entry key="Url" type="String" > diff --git a/kresources/carddav/prefsskel.kcfgc b/tderesources/carddav/prefsskel.kcfgc index 12ca40ce..12ca40ce 100644 --- a/kresources/carddav/prefsskel.kcfgc +++ b/tderesources/carddav/prefsskel.kcfgc diff --git a/kresources/carddav/reader.cpp b/tderesources/carddav/reader.cpp index 62645535..62645535 100644 --- a/kresources/carddav/reader.cpp +++ b/tderesources/carddav/reader.cpp diff --git a/kresources/carddav/reader.h b/tderesources/carddav/reader.h index 181d4eb6..181d4eb6 100644 --- a/kresources/carddav/reader.h +++ b/tderesources/carddav/reader.h diff --git a/kresources/carddav/resource.cpp b/tderesources/carddav/resource.cpp index dae91c32..dae91c32 100644 --- a/kresources/carddav/resource.cpp +++ b/tderesources/carddav/resource.cpp diff --git a/kresources/carddav/resource.h b/tderesources/carddav/resource.h index cf5090e5..cf5090e5 100644 --- a/kresources/carddav/resource.h +++ b/tderesources/carddav/resource.h diff --git a/kresources/carddav/uninstall.desktop b/tderesources/carddav/uninstall.desktop index e1e3e173..e1e3e173 100644 --- a/kresources/carddav/uninstall.desktop +++ b/tderesources/carddav/uninstall.desktop diff --git a/kresources/carddav/writer.cpp b/tderesources/carddav/writer.cpp index 68bf126d..68bf126d 100644 --- a/kresources/carddav/writer.cpp +++ b/tderesources/carddav/writer.cpp diff --git a/kresources/carddav/writer.h b/tderesources/carddav/writer.h index 4af3fe36..4af3fe36 100644 --- a/kresources/carddav/writer.h +++ b/tderesources/carddav/writer.h diff --git a/kresources/egroupware/CMakeLists.txt b/tderesources/egroupware/CMakeLists.txt index bc0bfd49..ac6182f1 100644 --- a/kresources/egroupware/CMakeLists.txt +++ b/tderesources/egroupware/CMakeLists.txt @@ -33,9 +33,9 @@ install( FILES ##### other data ################################ -install( FILES kabc_xmlrpc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kabc ) -install( FILES kcal_xmlrpc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kcal ) -install( FILES knotes_xmlrpc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/knotes ) +install( FILES kabc_xmlrpc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc ) +install( FILES kcal_xmlrpc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) +install( FILES knotes_xmlrpc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/knotes ) ##### egwcommon (static) ######################## diff --git a/kresources/egroupware/Makefile.am b/tderesources/egroupware/Makefile.am index a3effa7f..31a6702b 100644 --- a/kresources/egroupware/Makefile.am +++ b/tderesources/egroupware/Makefile.am @@ -7,7 +7,7 @@ INCLUDES = -I$(top_srcdir)/libical/src/libical \ -I$(top_builddir)/kaddressbook \ -I$(top_builddir)/kaddressbook/common \ -I$(top_srcdir)/kaddressbook/common \ - -I$(top_builddir)/kresources/egroupware \ + -I$(top_builddir)/tderesources/egroupware \ $(all_includes) noinst_HEADERS = kabc_resourcexmlrpcconfig.h kcal_resourcexmlrpcconfig.h \ @@ -56,13 +56,13 @@ knotes_xmlrpc_la_SOURCES = knotes_resourcexmlrpcplugin.cpp knotes_xmlrpc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) knotes_xmlrpc_la_LIBADD = libknotes_xmlrpc.la -kabc_servicedir = $(kde_servicesdir)/kresources/kabc +kabc_servicedir = $(kde_servicesdir)/tderesources/kabc kabc_service_DATA = kabc_xmlrpc.desktop -kcal_servicedir = $(kde_servicesdir)/kresources/kcal +kcal_servicedir = $(kde_servicesdir)/tderesources/kcal kcal_service_DATA = kcal_xmlrpc.desktop -knotes_servicedir = $(kde_servicesdir)/kresources/knotes +knotes_servicedir = $(kde_servicesdir)/tderesources/knotes knotes_service_DATA = knotes_xmlrpc.desktop METASOURCES = AUTO diff --git a/kresources/egroupware/access.h b/tderesources/egroupware/access.h index aab78779..aab78779 100644 --- a/kresources/egroupware/access.h +++ b/tderesources/egroupware/access.h diff --git a/kresources/egroupware/debugdialog.cpp b/tderesources/egroupware/debugdialog.cpp index 54fe0723..54fe0723 100644 --- a/kresources/egroupware/debugdialog.cpp +++ b/tderesources/egroupware/debugdialog.cpp diff --git a/kresources/egroupware/debugdialog.h b/tderesources/egroupware/debugdialog.h index bde17988..bde17988 100644 --- a/kresources/egroupware/debugdialog.h +++ b/tderesources/egroupware/debugdialog.h diff --git a/kresources/egroupware/kabc_egroupwareprefs.kcfgc b/tderesources/egroupware/kabc_egroupwareprefs.kcfgc index 959ab20b..599001bb 100644 --- a/kresources/egroupware/kabc_egroupwareprefs.kcfgc +++ b/tderesources/egroupware/kabc_egroupwareprefs.kcfgc @@ -1,5 +1,5 @@ # Code generation options for kconfig_compiler -File=kresources_kabc_egroupware.kcfg +File=tderesources_kabc_egroupware.kcfg ClassName=EGroupwarePrefs NameSpace=KABC Singleton=false diff --git a/kresources/egroupware/kabc_resourcexmlrpc.cpp b/tderesources/egroupware/kabc_resourcexmlrpc.cpp index 84e78382..84e78382 100644 --- a/kresources/egroupware/kabc_resourcexmlrpc.cpp +++ b/tderesources/egroupware/kabc_resourcexmlrpc.cpp diff --git a/kresources/egroupware/kabc_resourcexmlrpc.h b/tderesources/egroupware/kabc_resourcexmlrpc.h index d9b745aa..d9b745aa 100644 --- a/kresources/egroupware/kabc_resourcexmlrpc.h +++ b/tderesources/egroupware/kabc_resourcexmlrpc.h diff --git a/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp b/tderesources/egroupware/kabc_resourcexmlrpcconfig.cpp index ddafbd1f..ddafbd1f 100644 --- a/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp +++ b/tderesources/egroupware/kabc_resourcexmlrpcconfig.cpp diff --git a/kresources/egroupware/kabc_resourcexmlrpcconfig.h b/tderesources/egroupware/kabc_resourcexmlrpcconfig.h index fb0c9b47..0a9dc9f0 100644 --- a/kresources/egroupware/kabc_resourcexmlrpcconfig.h +++ b/tderesources/egroupware/kabc_resourcexmlrpcconfig.h @@ -21,7 +21,7 @@ #ifndef RESOURCEXMLRPCCONFIG_H #define RESOURCEXMLRPCCONFIG_H -#include <kresources/configwidget.h> +#include <tderesources/configwidget.h> #include <tdepimmacros.h> class KLineEdit; diff --git a/kresources/egroupware/kabc_resourcexmlrpcplugin.cpp b/tderesources/egroupware/kabc_resourcexmlrpcplugin.cpp index c4c0cc6c..c4c0cc6c 100644 --- a/kresources/egroupware/kabc_resourcexmlrpcplugin.cpp +++ b/tderesources/egroupware/kabc_resourcexmlrpcplugin.cpp diff --git a/kresources/egroupware/kabc_xmlrpc.desktop b/tderesources/egroupware/kabc_xmlrpc.desktop index 6eeb94f3..6eeb94f3 100644 --- a/kresources/egroupware/kabc_xmlrpc.desktop +++ b/tderesources/egroupware/kabc_xmlrpc.desktop diff --git a/kresources/egroupware/kcal_egroupwareprefs.kcfgc b/tderesources/egroupware/kcal_egroupwareprefs.kcfgc index 0ede5926..6c9f6d4d 100644 --- a/kresources/egroupware/kcal_egroupwareprefs.kcfgc +++ b/tderesources/egroupware/kcal_egroupwareprefs.kcfgc @@ -1,5 +1,5 @@ # Code generation options for kconfig_compiler -File=kresources_kcal_egroupware.kcfg +File=tderesources_kcal_egroupware.kcfg ClassName=EGroupwarePrefs NameSpace=KCal Singleton=false diff --git a/kresources/egroupware/kcal_resourcexmlrpc.cpp b/tderesources/egroupware/kcal_resourcexmlrpc.cpp index 1224a27c..c703fa2b 100644 --- a/kresources/egroupware/kcal_resourcexmlrpc.cpp +++ b/tderesources/egroupware/kcal_resourcexmlrpc.cpp @@ -31,7 +31,7 @@ #include <kabc/locknull.h> #include <kdebug.h> #include <klocale.h> -#include <kresources/configwidget.h> +#include <tderesources/configwidget.h> #include <kstandarddirs.h> #include <kstringhandler.h> #include <kurl.h> diff --git a/kresources/egroupware/kcal_resourcexmlrpc.h b/tderesources/egroupware/kcal_resourcexmlrpc.h index 5253baba..5253baba 100644 --- a/kresources/egroupware/kcal_resourcexmlrpc.h +++ b/tderesources/egroupware/kcal_resourcexmlrpc.h diff --git a/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp b/tderesources/egroupware/kcal_resourcexmlrpcconfig.cpp index 213da26e..213da26e 100644 --- a/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp +++ b/tderesources/egroupware/kcal_resourcexmlrpcconfig.cpp diff --git a/kresources/egroupware/kcal_resourcexmlrpcconfig.h b/tderesources/egroupware/kcal_resourcexmlrpcconfig.h index 1ff75ea8..2790717f 100644 --- a/kresources/egroupware/kcal_resourcexmlrpcconfig.h +++ b/tderesources/egroupware/kcal_resourcexmlrpcconfig.h @@ -21,7 +21,7 @@ #ifndef RESOURCEXMLRPCCONFIG_H #define RESOURCEXMLRPCCONFIG_H -#include <kresources/configwidget.h> +#include <tderesources/configwidget.h> #include <tdepimmacros.h> class KIntSpinBox; diff --git a/kresources/egroupware/kcal_resourcexmlrpcplugin.cpp b/tderesources/egroupware/kcal_resourcexmlrpcplugin.cpp index 021389b6..021389b6 100644 --- a/kresources/egroupware/kcal_resourcexmlrpcplugin.cpp +++ b/tderesources/egroupware/kcal_resourcexmlrpcplugin.cpp diff --git a/kresources/egroupware/kcal_xmlrpc.desktop b/tderesources/egroupware/kcal_xmlrpc.desktop index 4a6134e5..4a6134e5 100644 --- a/kresources/egroupware/kcal_xmlrpc.desktop +++ b/tderesources/egroupware/kcal_xmlrpc.desktop diff --git a/kresources/egroupware/knotes_egroupwareprefs.kcfgc b/tderesources/egroupware/knotes_egroupwareprefs.kcfgc index 1aaf0265..6c3fbdff 100644 --- a/kresources/egroupware/knotes_egroupwareprefs.kcfgc +++ b/tderesources/egroupware/knotes_egroupwareprefs.kcfgc @@ -1,5 +1,5 @@ # Code generation options for kconfig_compiler -File=kresources_knotes_egroupware.kcfg +File=tderesources_knotes_egroupware.kcfg ClassName=EGroupwarePrefs NameSpace=KNotes Singleton=false diff --git a/kresources/egroupware/knotes_resourcexmlrpc.cpp b/tderesources/egroupware/knotes_resourcexmlrpc.cpp index 1b19831b..1b19831b 100644 --- a/kresources/egroupware/knotes_resourcexmlrpc.cpp +++ b/tderesources/egroupware/knotes_resourcexmlrpc.cpp diff --git a/kresources/egroupware/knotes_resourcexmlrpc.h b/tderesources/egroupware/knotes_resourcexmlrpc.h index df8a4dd3..df8a4dd3 100644 --- a/kresources/egroupware/knotes_resourcexmlrpc.h +++ b/tderesources/egroupware/knotes_resourcexmlrpc.h diff --git a/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp b/tderesources/egroupware/knotes_resourcexmlrpcconfig.cpp index 8cf2a35c..8cf2a35c 100644 --- a/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp +++ b/tderesources/egroupware/knotes_resourcexmlrpcconfig.cpp diff --git a/kresources/egroupware/knotes_resourcexmlrpcconfig.h b/tderesources/egroupware/knotes_resourcexmlrpcconfig.h index afc5371f..e087dbe2 100644 --- a/kresources/egroupware/knotes_resourcexmlrpcconfig.h +++ b/tderesources/egroupware/knotes_resourcexmlrpcconfig.h @@ -21,7 +21,7 @@ #ifndef RESOURCEXMLRPCCONFIG_H #define RESOURCEXMLRPCCONFIG_H -#include <kresources/configwidget.h> +#include <tderesources/configwidget.h> #include <tdepimmacros.h> class KIntSpinBox; diff --git a/kresources/egroupware/knotes_resourcexmlrpcplugin.cpp b/tderesources/egroupware/knotes_resourcexmlrpcplugin.cpp index 276cb6b0..276cb6b0 100644 --- a/kresources/egroupware/knotes_resourcexmlrpcplugin.cpp +++ b/tderesources/egroupware/knotes_resourcexmlrpcplugin.cpp diff --git a/kresources/egroupware/knotes_xmlrpc.desktop b/tderesources/egroupware/knotes_xmlrpc.desktop index 93d5e471..93d5e471 100644 --- a/kresources/egroupware/knotes_xmlrpc.desktop +++ b/tderesources/egroupware/knotes_xmlrpc.desktop diff --git a/kresources/egroupware/synchronizer.cpp b/tderesources/egroupware/synchronizer.cpp index 8152828c..8152828c 100644 --- a/kresources/egroupware/synchronizer.cpp +++ b/tderesources/egroupware/synchronizer.cpp diff --git a/kresources/egroupware/synchronizer.h b/tderesources/egroupware/synchronizer.h index e9183bd2..e9183bd2 100644 --- a/kresources/egroupware/synchronizer.h +++ b/tderesources/egroupware/synchronizer.h diff --git a/kresources/egroupware/kresources_kabc_egroupware.kcfg b/tderesources/egroupware/tderesources_kabc_egroupware.kcfg index 3655109b..5ada1942 100644 --- a/kresources/egroupware/kresources_kabc_egroupware.kcfg +++ b/tderesources/egroupware/tderesources_kabc_egroupware.kcfg @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > - <kcfgfile name="kresources_kabc_egroupwarerc"/> + <kcfgfile name="tderesources_kabc_egroupwarerc"/> <group name="General"> <entry type="String" name="Url"> diff --git a/kresources/egroupware/kresources_knotes_egroupware.kcfg b/tderesources/egroupware/tderesources_kcal_egroupware.kcfg index 2fbb84a0..1eb8c773 100644 --- a/kresources/egroupware/kresources_knotes_egroupware.kcfg +++ b/tderesources/egroupware/tderesources_kcal_egroupware.kcfg @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > - <kcfgfile name="kresources_knotes_egroupwarerc"/> + <kcfgfile name="tderesources_kcal_egroupwarerc"/> <group name="General"> <entry type="String" name="Url"> diff --git a/kresources/egroupware/kresources_kcal_egroupware.kcfg b/tderesources/egroupware/tderesources_knotes_egroupware.kcfg index 91889d71..fd3cc7b8 100644 --- a/kresources/egroupware/kresources_kcal_egroupware.kcfg +++ b/tderesources/egroupware/tderesources_knotes_egroupware.kcfg @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > - <kcfgfile name="kresources_kcal_egroupwarerc"/> + <kcfgfile name="tderesources_knotes_egroupwarerc"/> <group name="General"> <entry type="String" name="Url"> diff --git a/kresources/egroupware/todostatemapper.cpp b/tderesources/egroupware/todostatemapper.cpp index 531b298f..531b298f 100644 --- a/kresources/egroupware/todostatemapper.cpp +++ b/tderesources/egroupware/todostatemapper.cpp diff --git a/kresources/egroupware/todostatemapper.h b/tderesources/egroupware/todostatemapper.h index fb82b478..fb82b478 100644 --- a/kresources/egroupware/todostatemapper.h +++ b/tderesources/egroupware/todostatemapper.h diff --git a/kresources/egroupware/xmlrpciface.cpp b/tderesources/egroupware/xmlrpciface.cpp index d43613e6..d43613e6 100644 --- a/kresources/egroupware/xmlrpciface.cpp +++ b/tderesources/egroupware/xmlrpciface.cpp diff --git a/kresources/egroupware/xmlrpciface.h b/tderesources/egroupware/xmlrpciface.h index df2f3a6d..df2f3a6d 100644 --- a/kresources/egroupware/xmlrpciface.h +++ b/tderesources/egroupware/xmlrpciface.h diff --git a/kresources/exchange/CMakeLists.txt b/tderesources/exchange/CMakeLists.txt index 98633d6b..fc2f9cc3 100644 --- a/kresources/exchange/CMakeLists.txt +++ b/tderesources/exchange/CMakeLists.txt @@ -27,7 +27,7 @@ link_directories( ##### other data ################################ -install( FILES exchange.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kcal ) +install( FILES exchange.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) ##### resourcecalendarexchange (module) ######### diff --git a/kresources/exchange/Makefile.am b/tderesources/exchange/Makefile.am index 556e3df6..a9fdf70a 100644 --- a/kresources/exchange/Makefile.am +++ b/tderesources/exchange/Makefile.am @@ -12,11 +12,11 @@ kde_module_LTLIBRARIES = resourcecalendarexchange.la resourcecalendarexchange_la_SOURCES = resourceexchange.cpp resourceexchangeconfig.cpp dateset.cpp resourcecalendarexchange_la_LDFLAGS= $(all_libraries) -module $(KDE_PLUGIN) -resourcecalendarexchange_la_LIBADD= -lkresources \ +resourcecalendarexchange_la_LIBADD= -ltderesources \ $(top_builddir)/libkcal/libkcal.la \ $(top_builddir)/libkpimexchange/libkpimexchange.la -servicedir = $(kde_servicesdir)/kresources/kcal +servicedir = $(kde_servicesdir)/tderesources/kcal service_DATA= exchange.desktop messages: rc.cpp diff --git a/kresources/exchange/dateset.cpp b/tderesources/exchange/dateset.cpp index b2622902..b2622902 100644 --- a/kresources/exchange/dateset.cpp +++ b/tderesources/exchange/dateset.cpp diff --git a/kresources/exchange/dateset.h b/tderesources/exchange/dateset.h index 693aa4a3..693aa4a3 100644 --- a/kresources/exchange/dateset.h +++ b/tderesources/exchange/dateset.h diff --git a/kresources/exchange/exchange.desktop b/tderesources/exchange/exchange.desktop index 0ee32090..0ee32090 100644 --- a/kresources/exchange/exchange.desktop +++ b/tderesources/exchange/exchange.desktop diff --git a/kresources/exchange/exchange_deprecated.desktop b/tderesources/exchange/exchange_deprecated.desktop index eba22eed..eba22eed 100644 --- a/kresources/exchange/exchange_deprecated.desktop +++ b/tderesources/exchange/exchange_deprecated.desktop diff --git a/kresources/exchange/resourceexchange.cpp b/tderesources/exchange/resourceexchange.cpp index 1f6779a8..16344d01 100644 --- a/kresources/exchange/resourceexchange.cpp +++ b/tderesources/exchange/resourceexchange.cpp @@ -36,7 +36,7 @@ #include <libkcal/calendar.h> #include <libkcal/journal.h> -#include <kresources/configwidget.h> +#include <tderesources/configwidget.h> #include <kabc/locknull.h> diff --git a/kresources/exchange/resourceexchange.h b/tderesources/exchange/resourceexchange.h index 9b414dbb..9b414dbb 100644 --- a/kresources/exchange/resourceexchange.h +++ b/tderesources/exchange/resourceexchange.h diff --git a/kresources/exchange/resourceexchangeconfig.cpp b/tderesources/exchange/resourceexchangeconfig.cpp index 36774901..36774901 100644 --- a/kresources/exchange/resourceexchangeconfig.cpp +++ b/tderesources/exchange/resourceexchangeconfig.cpp diff --git a/kresources/exchange/resourceexchangeconfig.h b/tderesources/exchange/resourceexchangeconfig.h index 42c4ce7e..c008c2ce 100644 --- a/kresources/exchange/resourceexchangeconfig.h +++ b/tderesources/exchange/resourceexchangeconfig.h @@ -29,8 +29,8 @@ #include <klineedit.h> #include <knuminput.h> -#include <kresources/resource.h> -#include <kresources/configwidget.h> +#include <tderesources/resource.h> +#include <tderesources/configwidget.h> namespace KCal { diff --git a/kresources/featureplan/CMakeLists.txt b/tderesources/featureplan/CMakeLists.txt index 7d07c761..76e279c8 100644 --- a/kresources/featureplan/CMakeLists.txt +++ b/tderesources/featureplan/CMakeLists.txt @@ -38,7 +38,7 @@ link_directories( install( FILES kcal_resourcefeatureplan.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kcal ) + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) ##### kcal_resourcefeatureplan (module) ######### diff --git a/kresources/featureplan/Makefile.am b/tderesources/featureplan/Makefile.am index dffee0bf..f37d5c6b 100644 --- a/kresources/featureplan/Makefile.am +++ b/tderesources/featureplan/Makefile.am @@ -23,17 +23,17 @@ kcal_resourcefeatureplan_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) kcal_resourcefeatureplan_la_LIBADD = libkcal_resourcefeatureplan.la kcal_resourcefeatureplan_la_COMPILE_FIRST = kde-features.h prefs.h -kcal_servicedir = $(kde_servicesdir)/kresources/kcal +kcal_servicedir = $(kde_servicesdir)/tderesources/kcal 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) -lktexteditor +dumpfeaturelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -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) -lktexteditor +benchmarkfeaturelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor benchmarkfeaturelist_LDADD = libfeatureplancommon.la $(LIB_TDECORE) benchmarkfeaturelist_SOURCES = benchmarkfeaturelist.cpp benchmarkfeaturelist_COMPILE_FIRST = kde-features.h diff --git a/kresources/featureplan/benchmarkfeaturelist.cpp b/tderesources/featureplan/benchmarkfeaturelist.cpp index f9f88c5c..f9f88c5c 100644 --- a/kresources/featureplan/benchmarkfeaturelist.cpp +++ b/tderesources/featureplan/benchmarkfeaturelist.cpp diff --git a/kresources/featureplan/dumpfeaturelist.cpp b/tderesources/featureplan/dumpfeaturelist.cpp index a007b70d..a007b70d 100644 --- a/kresources/featureplan/dumpfeaturelist.cpp +++ b/tderesources/featureplan/dumpfeaturelist.cpp diff --git a/kresources/featureplan/kcal_resourcefeatureplan.cpp b/tderesources/featureplan/kcal_resourcefeatureplan.cpp index 762bee1f..2bddc7fd 100644 --- a/kresources/featureplan/kcal_resourcefeatureplan.cpp +++ b/tderesources/featureplan/kcal_resourcefeatureplan.cpp @@ -35,7 +35,7 @@ #include <kabc/locknull.h> #include <kdebug.h> #include <klocale.h> -#include <kresources/configwidget.h> +#include <tderesources/configwidget.h> #include <kstandarddirs.h> #include <kstringhandler.h> #include <kurl.h> diff --git a/kresources/featureplan/kcal_resourcefeatureplan.desktop b/tderesources/featureplan/kcal_resourcefeatureplan.desktop index 2bca3fbe..2bca3fbe 100644 --- a/kresources/featureplan/kcal_resourcefeatureplan.desktop +++ b/tderesources/featureplan/kcal_resourcefeatureplan.desktop diff --git a/kresources/featureplan/kcal_resourcefeatureplan.h b/tderesources/featureplan/kcal_resourcefeatureplan.h index 2808aef7..2808aef7 100644 --- a/kresources/featureplan/kcal_resourcefeatureplan.h +++ b/tderesources/featureplan/kcal_resourcefeatureplan.h diff --git a/kresources/featureplan/kcal_resourcefeatureplanconfig.cpp b/tderesources/featureplan/kcal_resourcefeatureplanconfig.cpp index 55d12cbd..55d12cbd 100644 --- a/kresources/featureplan/kcal_resourcefeatureplanconfig.cpp +++ b/tderesources/featureplan/kcal_resourcefeatureplanconfig.cpp diff --git a/kresources/featureplan/kcal_resourcefeatureplanconfig.h b/tderesources/featureplan/kcal_resourcefeatureplanconfig.h index 5ee83c54..aa00123f 100644 --- a/kresources/featureplan/kcal_resourcefeatureplanconfig.h +++ b/tderesources/featureplan/kcal_resourcefeatureplanconfig.h @@ -22,7 +22,7 @@ #ifndef RESOURCEFEATUREPLANCONFIG_H #define RESOURCEFEATUREPLANCONFIG_H -#include <kresources/configwidget.h> +#include <tderesources/configwidget.h> #include <tdepimmacros.h> class KLineEdit; diff --git a/kresources/featureplan/kcal_resourcefeatureplanplugin.cpp b/tderesources/featureplan/kcal_resourcefeatureplanplugin.cpp index ae2759e4..ae2759e4 100644 --- a/kresources/featureplan/kcal_resourcefeatureplanplugin.cpp +++ b/tderesources/featureplan/kcal_resourcefeatureplanplugin.cpp diff --git a/kresources/featureplan/kde-features.dtd b/tderesources/featureplan/kde-features.dtd index 732c447d..732c447d 100644 --- a/kresources/featureplan/kde-features.dtd +++ b/tderesources/featureplan/kde-features.dtd diff --git a/kresources/featureplan/kde-features.rng b/tderesources/featureplan/kde-features.rng index 89a31dcb..89a31dcb 100644 --- a/kresources/featureplan/kde-features.rng +++ b/tderesources/featureplan/kde-features.rng diff --git a/kresources/featureplan/prefs.kcfgc b/tderesources/featureplan/prefs.kcfgc index d0e12c2d..0866d4e3 100644 --- a/kresources/featureplan/prefs.kcfgc +++ b/tderesources/featureplan/prefs.kcfgc @@ -1,5 +1,5 @@ # Code generation options for kconfig_compiler -File=kresources_kcal_featureplan.kcfg +File=tderesources_kcal_featureplan.kcfg ClassName=Prefs #NameSpace=KBB Singleton=false diff --git a/kresources/featureplan/kresources_kcal_featureplan.kcfg b/tderesources/featureplan/tderesources_kcal_featureplan.kcfg index b4a5449d..64d44ae5 100644 --- a/kresources/featureplan/kresources_kcal_featureplan.kcfg +++ b/tderesources/featureplan/tderesources_kcal_featureplan.kcfg @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > - <kcfgfile name="kresources_kcal_bugzillarc"/> + <kcfgfile name="tderesources_kcal_bugzillarc"/> <group name="General"> <entry type="String" name="Filename"> diff --git a/kresources/groupdav/CMakeLists.txt b/tderesources/groupdav/CMakeLists.txt index 1ab46c46..bc903d00 100644 --- a/kresources/groupdav/CMakeLists.txt +++ b/tderesources/groupdav/CMakeLists.txt @@ -26,10 +26,10 @@ link_directories( ##### other data ################################ -install( FILES kcal_groupdav.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kcal ) -install( FILES uninstall.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kcal RENAME kcal_opengroupware.desktop ) -install( FILES kabc_groupdav.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kabc ) -install( FILES uninstall.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kabc RENAME kabc_opengroupware.desktop) +install( FILES kcal_groupdav.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) +install( FILES uninstall.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal RENAME kcal_opengroupware.desktop ) +install( FILES kabc_groupdav.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc ) +install( FILES uninstall.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc RENAME kabc_opengroupware.desktop) ##### kcal_groupdav (module) #################### diff --git a/kresources/groupdav/Makefile.am b/tderesources/groupdav/Makefile.am index 8006e635..1e20f291 100644 --- a/kresources/groupdav/Makefile.am +++ b/tderesources/groupdav/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kresources/lib \ +INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tderesources/lib \ -I../lib $(all_includes) lib_LTLIBRARIES = libkcal_groupdav.la libkabc_groupdav.la @@ -31,22 +31,22 @@ kabc_groupdav_la_SOURCES = kabc_resourcegroupdav_plugin.cpp kabc_groupdav_la_LDFLAGS = $(all_libraries) -module -no-undefined $(KDE_PLUGIN) kabc_groupdav_la_LIBADD = libkabc_groupdav.la -kcal_servicedir = $(kde_servicesdir)/kresources/kcal +kcal_servicedir = $(kde_servicesdir)/tderesources/kcal kcal_service_DATA = kcal_groupdav.desktop -kabc_servicedir = $(kde_servicesdir)/kresources/kabc +kabc_servicedir = $(kde_servicesdir)/tderesources/kabc kabc_service_DATA = kabc_groupdav.desktop METASOURCES = AUTO install-data-local: uninstall.desktop - $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)/kresources/kabc - $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)/kresources/kcal - $(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_servicesdir)/kresources/kabc/kabc_opengroupware.desktop - $(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_servicesdir)/kresources/kcal/kcal_opengroupware.desktop + $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)/tderesources/kabc + $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)/tderesources/kcal + $(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_servicesdir)/tderesources/kabc/kabc_opengroupware.desktop + $(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_servicesdir)/tderesources/kcal/kcal_opengroupware.desktop messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kres_groupdav.pot -kabc_resourcegroupdav.lo: ../lib/kresources_groupwareprefs.h +kabc_resourcegroupdav.lo: ../lib/tderesources_groupwareprefs.h diff --git a/kresources/groupdav/groupdavaddressbookadaptor.cpp b/tderesources/groupdav/groupdavaddressbookadaptor.cpp index f8f30f65..f8f30f65 100644 --- a/kresources/groupdav/groupdavaddressbookadaptor.cpp +++ b/tderesources/groupdav/groupdavaddressbookadaptor.cpp diff --git a/kresources/groupdav/groupdavaddressbookadaptor.h b/tderesources/groupdav/groupdavaddressbookadaptor.h index 425c6371..425c6371 100644 --- a/kresources/groupdav/groupdavaddressbookadaptor.h +++ b/tderesources/groupdav/groupdavaddressbookadaptor.h diff --git a/kresources/groupdav/groupdavcalendaradaptor.cpp b/tderesources/groupdav/groupdavcalendaradaptor.cpp index 2556e3d0..2556e3d0 100644 --- a/kresources/groupdav/groupdavcalendaradaptor.cpp +++ b/tderesources/groupdav/groupdavcalendaradaptor.cpp diff --git a/kresources/groupdav/groupdavcalendaradaptor.h b/tderesources/groupdav/groupdavcalendaradaptor.h index b1a0bd36..b1a0bd36 100644 --- a/kresources/groupdav/groupdavcalendaradaptor.h +++ b/tderesources/groupdav/groupdavcalendaradaptor.h diff --git a/kresources/groupdav/groupdavglobals.cpp b/tderesources/groupdav/groupdavglobals.cpp index 5088bca9..5088bca9 100644 --- a/kresources/groupdav/groupdavglobals.cpp +++ b/tderesources/groupdav/groupdavglobals.cpp diff --git a/kresources/groupdav/groupdavglobals.h b/tderesources/groupdav/groupdavglobals.h index e7f2b06e..e7f2b06e 100644 --- a/kresources/groupdav/groupdavglobals.h +++ b/tderesources/groupdav/groupdavglobals.h diff --git a/kresources/groupdav/kabc_groupdav.desktop b/tderesources/groupdav/kabc_groupdav.desktop index c10ea97c..c10ea97c 100644 --- a/kresources/groupdav/kabc_groupdav.desktop +++ b/tderesources/groupdav/kabc_groupdav.desktop diff --git a/kresources/groupdav/kabc_resourcegroupdav.cpp b/tderesources/groupdav/kabc_resourcegroupdav.cpp index 54a02a0a..1f50e04b 100644 --- a/kresources/groupdav/kabc_resourcegroupdav.cpp +++ b/tderesources/groupdav/kabc_resourcegroupdav.cpp @@ -21,7 +21,7 @@ */ #include "groupdavaddressbookadaptor.h" -#include "kresources_groupwareprefs.h" +#include "tderesources_groupwareprefs.h" #include "kabc_resourcegroupdav.h" diff --git a/kresources/groupdav/kabc_resourcegroupdav.h b/tderesources/groupdav/kabc_resourcegroupdav.h index ca7ed96d..ca7ed96d 100644 --- a/kresources/groupdav/kabc_resourcegroupdav.h +++ b/tderesources/groupdav/kabc_resourcegroupdav.h diff --git a/kresources/groupdav/kabc_resourcegroupdav_plugin.cpp b/tderesources/groupdav/kabc_resourcegroupdav_plugin.cpp index d487889f..d487889f 100644 --- a/kresources/groupdav/kabc_resourcegroupdav_plugin.cpp +++ b/tderesources/groupdav/kabc_resourcegroupdav_plugin.cpp diff --git a/kresources/groupdav/kcal_groupdav.desktop b/tderesources/groupdav/kcal_groupdav.desktop index 288659d6..288659d6 100644 --- a/kresources/groupdav/kcal_groupdav.desktop +++ b/tderesources/groupdav/kcal_groupdav.desktop diff --git a/kresources/groupdav/kcal_resourcegroupdav.cpp b/tderesources/groupdav/kcal_resourcegroupdav.cpp index b93ba769..b93ba769 100644 --- a/kresources/groupdav/kcal_resourcegroupdav.cpp +++ b/tderesources/groupdav/kcal_resourcegroupdav.cpp diff --git a/kresources/groupdav/kcal_resourcegroupdav.h b/tderesources/groupdav/kcal_resourcegroupdav.h index dba9bd27..dba9bd27 100644 --- a/kresources/groupdav/kcal_resourcegroupdav.h +++ b/tderesources/groupdav/kcal_resourcegroupdav.h diff --git a/kresources/groupdav/kcal_resourcegroupdav_plugin.cpp b/tderesources/groupdav/kcal_resourcegroupdav_plugin.cpp index f06e5d24..f06e5d24 100644 --- a/kresources/groupdav/kcal_resourcegroupdav_plugin.cpp +++ b/tderesources/groupdav/kcal_resourcegroupdav_plugin.cpp diff --git a/kresources/groupdav/uninstall.desktop b/tderesources/groupdav/uninstall.desktop index e1e3e173..e1e3e173 100644 --- a/kresources/groupdav/uninstall.desktop +++ b/tderesources/groupdav/uninstall.desktop diff --git a/kresources/groupware/Makefile.am b/tderesources/groupware/Makefile.am index 741c1052..08c257ba 100644 --- a/kresources/groupware/Makefile.am +++ b/tderesources/groupware/Makefile.am @@ -30,10 +30,10 @@ kabc_groupware_la_SOURCES = kabc_resourcegroupware_plugin.cpp kabc_groupware_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) kabc_groupware_la_LIBADD = libkabc_groupware.la -kcal_servicedir = $(kde_servicesdir)/kresources/kcal +kcal_servicedir = $(kde_servicesdir)/tderesources/kcal kcal_service_DATA = kcal_groupware.desktop -kabc_servicedir = $(kde_servicesdir)/kresources/kabc +kabc_servicedir = $(kde_servicesdir)/tderesources/kabc kabc_service_DATA = kabc_groupware.desktop METASOURCES = AUTO diff --git a/kresources/groupware/kabc_groupware.desktop b/tderesources/groupware/kabc_groupware.desktop index dee5d9c2..dee5d9c2 100644 --- a/kresources/groupware/kabc_groupware.desktop +++ b/tderesources/groupware/kabc_groupware.desktop diff --git a/kresources/groupware/kabc_groupwareprefs.kcfgc b/tderesources/groupware/kabc_groupwareprefs.kcfgc index d19f1ae7..771ddccf 100644 --- a/kresources/groupware/kabc_groupwareprefs.kcfgc +++ b/tderesources/groupware/kabc_groupwareprefs.kcfgc @@ -1,5 +1,5 @@ ClassName=GroupwarePrefs -File=kresources_kabc_groupware.kcfg +File=tderesources_kabc_groupware.kcfg GlobalEnums=true IncludeFiles=libtdepim/kresourceprefs.h Inherits=KResourcePrefs diff --git a/kresources/groupware/kabc_resourcegroupware.cpp b/tderesources/groupware/kabc_resourcegroupware.cpp index 3c9d9792..3c9d9792 100644 --- a/kresources/groupware/kabc_resourcegroupware.cpp +++ b/tderesources/groupware/kabc_resourcegroupware.cpp diff --git a/kresources/groupware/kabc_resourcegroupware.h b/tderesources/groupware/kabc_resourcegroupware.h index 53c1d007..53c1d007 100644 --- a/kresources/groupware/kabc_resourcegroupware.h +++ b/tderesources/groupware/kabc_resourcegroupware.h diff --git a/kresources/groupware/kabc_resourcegroupware_plugin.cpp b/tderesources/groupware/kabc_resourcegroupware_plugin.cpp index c7266b18..c7266b18 100644 --- a/kresources/groupware/kabc_resourcegroupware_plugin.cpp +++ b/tderesources/groupware/kabc_resourcegroupware_plugin.cpp diff --git a/kresources/groupware/kabc_resourcegroupwareconfig.cpp b/tderesources/groupware/kabc_resourcegroupwareconfig.cpp index 956ee432..956ee432 100644 --- a/kresources/groupware/kabc_resourcegroupwareconfig.cpp +++ b/tderesources/groupware/kabc_resourcegroupwareconfig.cpp diff --git a/kresources/groupware/kabc_resourcegroupwareconfig.h b/tderesources/groupware/kabc_resourcegroupwareconfig.h index 00c5c360..bad560d1 100644 --- a/kresources/groupware/kabc_resourcegroupwareconfig.h +++ b/tderesources/groupware/kabc_resourcegroupwareconfig.h @@ -20,7 +20,7 @@ #ifndef KABC_RESOURCEGROUPWARECONFIG_H #define KABC_RESOURCEGROUPWARECONFIG_H -#include <kresources/configwidget.h> +#include <tderesources/configwidget.h> #include <tqmap.h> diff --git a/kresources/groupware/kcal_groupware.desktop b/tderesources/groupware/kcal_groupware.desktop index 42c4bc9a..42c4bc9a 100644 --- a/kresources/groupware/kcal_groupware.desktop +++ b/tderesources/groupware/kcal_groupware.desktop diff --git a/kresources/groupware/kcal_groupwareprefsbase.kcfgc b/tderesources/groupware/kcal_groupwareprefsbase.kcfgc index 15bd1e28..7e243ddc 100644 --- a/kresources/groupware/kcal_groupwareprefsbase.kcfgc +++ b/tderesources/groupware/kcal_groupwareprefsbase.kcfgc @@ -1,5 +1,5 @@ # Code generation options for kconfig_compiler -File=kresources_kcal_groupware.kcfg +File=tderesources_kcal_groupware.kcfg ClassName=GroupwarePrefsBase NameSpace=KCal Singleton=false diff --git a/kresources/groupware/kcal_resourcegroupware.cpp b/tderesources/groupware/kcal_resourcegroupware.cpp index 79658bb6..f515bd06 100644 --- a/kresources/groupware/kcal_resourcegroupware.cpp +++ b/tderesources/groupware/kcal_resourcegroupware.cpp @@ -37,7 +37,7 @@ #include <kabc/locknull.h> #include <kdebug.h> #include <klocale.h> -#include <kresources/configwidget.h> +#include <tderesources/configwidget.h> #include <kstandarddirs.h> #include <kstringhandler.h> #include <kurl.h> diff --git a/kresources/groupware/kcal_resourcegroupware.h b/tderesources/groupware/kcal_resourcegroupware.h index d3c809db..d3c809db 100644 --- a/kresources/groupware/kcal_resourcegroupware.h +++ b/tderesources/groupware/kcal_resourcegroupware.h diff --git a/kresources/groupware/kcal_resourcegroupware_plugin.cpp b/tderesources/groupware/kcal_resourcegroupware_plugin.cpp index 992a95d5..992a95d5 100644 --- a/kresources/groupware/kcal_resourcegroupware_plugin.cpp +++ b/tderesources/groupware/kcal_resourcegroupware_plugin.cpp diff --git a/kresources/groupware/kcal_resourcegroupwareconfig.cpp b/tderesources/groupware/kcal_resourcegroupwareconfig.cpp index 9a191bc3..9a191bc3 100644 --- a/kresources/groupware/kcal_resourcegroupwareconfig.cpp +++ b/tderesources/groupware/kcal_resourcegroupwareconfig.cpp diff --git a/kresources/groupware/kcal_resourcegroupwareconfig.h b/tderesources/groupware/kcal_resourcegroupwareconfig.h index 08c75e77..dd6a93af 100644 --- a/kresources/groupware/kcal_resourcegroupwareconfig.h +++ b/tderesources/groupware/kcal_resourcegroupwareconfig.h @@ -22,8 +22,8 @@ #include <kurlrequester.h> -#include <kresources/resource.h> -#include <kresources/configwidget.h> +#include <tderesources/resource.h> +#include <tderesources/configwidget.h> class TQCheckBox; class KLineEdit; diff --git a/kresources/groupware/kresources_kabc_groupware.kcfg b/tderesources/groupware/tderesources_kabc_groupware.kcfg index 33dd7aa8..9beca9c9 100644 --- a/kresources/groupware/kresources_kabc_groupware.kcfg +++ b/tderesources/groupware/tderesources_kabc_groupware.kcfg @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > - <kcfgfile name="kresources_kabc_groupwarerc" /> + <kcfgfile name="tderesources_kabc_groupwarerc" /> <group name="General" > <entry key="Url" type="String" > <label>Server URL</label> diff --git a/kresources/groupware/kresources_kcal_groupware.kcfg b/tderesources/groupware/tderesources_kcal_groupware.kcfg index d86a43b5..a84bbb5d 100644 --- a/kresources/groupware/kresources_kcal_groupware.kcfg +++ b/tderesources/groupware/tderesources_kcal_groupware.kcfg @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > - <kcfgfile name="kresources_kcal_groupwarerc" /> + <kcfgfile name="tderesources_kcal_groupwarerc" /> <group name="General" > <entry key="Url" type="String" > <label>Server URL</label> diff --git a/kresources/groupwise/CMakeLists.txt b/tderesources/groupwise/CMakeLists.txt index e2d2f424..68c829a7 100644 --- a/kresources/groupwise/CMakeLists.txt +++ b/tderesources/groupwise/CMakeLists.txt @@ -28,8 +28,8 @@ link_directories( ##### other data ################################ -install( FILES kcal_groupwise.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kcal ) -install( FILES kabc_groupwise.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kabc ) +install( FILES kcal_groupwise.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) +install( FILES kabc_groupwise.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc ) ##### kcal_groupwise (module) ################### diff --git a/kresources/groupwise/Makefile.am b/tderesources/groupwise/Makefile.am index 5056a35d..4b7eb408 100644 --- a/kresources/groupwise/Makefile.am +++ b/tderesources/groupwise/Makefile.am @@ -34,10 +34,10 @@ kabc_groupwise_la_SOURCES = kabc_resourcegroupwise_plugin.cpp kabc_groupwise_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) kabc_groupwise_la_LIBADD = libkabc_groupwise.la -kcal_servicedir = $(kde_servicesdir)/kresources/kcal +kcal_servicedir = $(kde_servicesdir)/tderesources/kcal kcal_service_DATA = kcal_groupwise.desktop -kabc_servicedir = $(kde_servicesdir)/kresources/kabc +kabc_servicedir = $(kde_servicesdir)/tderesources/kabc kabc_service_DATA = kabc_groupwise.desktop METASOURCES = AUTO diff --git a/kresources/groupwise/TODO b/tderesources/groupwise/TODO index 7acfa65d..7acfa65d 100644 --- a/kresources/groupwise/TODO +++ b/tderesources/groupwise/TODO diff --git a/kresources/groupwise/groupwisesettingswidget.cpp b/tderesources/groupwise/groupwisesettingswidget.cpp index ec1bc178..ec1bc178 100644 --- a/kresources/groupwise/groupwisesettingswidget.cpp +++ b/tderesources/groupwise/groupwisesettingswidget.cpp diff --git a/kresources/groupwise/groupwisesettingswidget.h b/tderesources/groupwise/groupwisesettingswidget.h index 9fff6aa7..9fff6aa7 100644 --- a/kresources/groupwise/groupwisesettingswidget.h +++ b/tderesources/groupwise/groupwisesettingswidget.h diff --git a/kresources/groupwise/groupwisesettingswidgetbase.ui b/tderesources/groupwise/groupwisesettingswidgetbase.ui index 49437ef4..49437ef4 100644 --- a/kresources/groupwise/groupwisesettingswidgetbase.ui +++ b/tderesources/groupwise/groupwisesettingswidgetbase.ui diff --git a/kresources/groupwise/kabc_groupwise.desktop b/tderesources/groupwise/kabc_groupwise.desktop index 695ab445..695ab445 100644 --- a/kresources/groupwise/kabc_groupwise.desktop +++ b/tderesources/groupwise/kabc_groupwise.desktop diff --git a/kresources/groupwise/kabc_groupwiseprefs.kcfgc b/tderesources/groupwise/kabc_groupwiseprefs.kcfgc index 98493547..08e997f6 100644 --- a/kresources/groupwise/kabc_groupwiseprefs.kcfgc +++ b/tderesources/groupwise/kabc_groupwiseprefs.kcfgc @@ -1,5 +1,5 @@ ClassName=GroupwisePrefs -File=kresources_kabc_groupwise.kcfg +File=tderesources_kabc_groupwise.kcfg GlobalEnums=true IncludeFiles=libtdepim/kresourceprefs.h Inherits=KResourcePrefs diff --git a/kresources/groupwise/kabc_resourcegroupwise.cpp b/tderesources/groupwise/kabc_resourcegroupwise.cpp index b3930bfb..b3930bfb 100644 --- a/kresources/groupwise/kabc_resourcegroupwise.cpp +++ b/tderesources/groupwise/kabc_resourcegroupwise.cpp diff --git a/kresources/groupwise/kabc_resourcegroupwise.h b/tderesources/groupwise/kabc_resourcegroupwise.h index 658ddd76..658ddd76 100644 --- a/kresources/groupwise/kabc_resourcegroupwise.h +++ b/tderesources/groupwise/kabc_resourcegroupwise.h diff --git a/kresources/groupwise/kabc_resourcegroupwise_plugin.cpp b/tderesources/groupwise/kabc_resourcegroupwise_plugin.cpp index 3f973bc5..3f973bc5 100644 --- a/kresources/groupwise/kabc_resourcegroupwise_plugin.cpp +++ b/tderesources/groupwise/kabc_resourcegroupwise_plugin.cpp diff --git a/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp b/tderesources/groupwise/kabc_resourcegroupwiseconfig.cpp index 483268cc..483268cc 100644 --- a/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp +++ b/tderesources/groupwise/kabc_resourcegroupwiseconfig.cpp diff --git a/kresources/groupwise/kabc_resourcegroupwiseconfig.h b/tderesources/groupwise/kabc_resourcegroupwiseconfig.h index 5b7eb1cf..a377ec68 100644 --- a/kresources/groupwise/kabc_resourcegroupwiseconfig.h +++ b/tderesources/groupwise/kabc_resourcegroupwiseconfig.h @@ -22,7 +22,7 @@ #include "soap/groupwiseserver.h" -#include <kresources/configwidget.h> +#include <tderesources/configwidget.h> #include <tdepimmacros.h> #include <tqmap.h> diff --git a/kresources/groupwise/kcal_groupwise.desktop b/tderesources/groupwise/kcal_groupwise.desktop index 3933a0ba..3933a0ba 100644 --- a/kresources/groupwise/kcal_groupwise.desktop +++ b/tderesources/groupwise/kcal_groupwise.desktop diff --git a/kresources/groupwise/kcal_groupwiseprefs.cpp b/tderesources/groupwise/kcal_groupwiseprefs.cpp index c2e9ffc0..c2e9ffc0 100644 --- a/kresources/groupwise/kcal_groupwiseprefs.cpp +++ b/tderesources/groupwise/kcal_groupwiseprefs.cpp diff --git a/kresources/groupwise/kcal_groupwiseprefs.h b/tderesources/groupwise/kcal_groupwiseprefs.h index fdc95868..fdc95868 100644 --- a/kresources/groupwise/kcal_groupwiseprefs.h +++ b/tderesources/groupwise/kcal_groupwiseprefs.h diff --git a/kresources/groupwise/kcal_groupwiseprefsbase.kcfgc b/tderesources/groupwise/kcal_groupwiseprefsbase.kcfgc index 7eac7daa..3130cde1 100644 --- a/kresources/groupwise/kcal_groupwiseprefsbase.kcfgc +++ b/tderesources/groupwise/kcal_groupwiseprefsbase.kcfgc @@ -1,5 +1,5 @@ # Code generation options for kconfig_compiler -File=kresources_kcal_groupwise.kcfg +File=tderesources_kcal_groupwise.kcfg ClassName=GroupwisePrefsBase NameSpace=KCal Singleton=false diff --git a/kresources/groupwise/kcal_resourcegroupwise.cpp b/tderesources/groupwise/kcal_resourcegroupwise.cpp index ed5fd3ae..7471b7cd 100644 --- a/kresources/groupwise/kcal_resourcegroupwise.cpp +++ b/tderesources/groupwise/kcal_resourcegroupwise.cpp @@ -39,7 +39,7 @@ #include <kabc/locknull.h> #include <kdebug.h> #include <klocale.h> -#include <kresources/configwidget.h> +#include <tderesources/configwidget.h> #include <kstandarddirs.h> #include <kstringhandler.h> #include <kurl.h> diff --git a/kresources/groupwise/kcal_resourcegroupwise.h b/tderesources/groupwise/kcal_resourcegroupwise.h index 088e624a..088e624a 100644 --- a/kresources/groupwise/kcal_resourcegroupwise.h +++ b/tderesources/groupwise/kcal_resourcegroupwise.h diff --git a/kresources/groupwise/kcal_resourcegroupwise_plugin.cpp b/tderesources/groupwise/kcal_resourcegroupwise_plugin.cpp index 1c1df762..1c1df762 100644 --- a/kresources/groupwise/kcal_resourcegroupwise_plugin.cpp +++ b/tderesources/groupwise/kcal_resourcegroupwise_plugin.cpp diff --git a/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp b/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp index b23a81a1..b23a81a1 100644 --- a/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp +++ b/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp diff --git a/kresources/groupwise/kcal_resourcegroupwiseconfig.h b/tderesources/groupwise/kcal_resourcegroupwiseconfig.h index db47a3f4..cea6ad69 100644 --- a/kresources/groupwise/kcal_resourcegroupwiseconfig.h +++ b/tderesources/groupwise/kcal_resourcegroupwiseconfig.h @@ -23,8 +23,8 @@ #include <kurlrequester.h> #include <tdepimmacros.h> -#include <kresources/resource.h> -#include <kresources/configwidget.h> +#include <tderesources/resource.h> +#include <tderesources/configwidget.h> class TQCheckBox; class KLineEdit; diff --git a/kresources/groupwise/kioslave/CMakeLists.txt b/tderesources/groupwise/kioslave/CMakeLists.txt index 23476fe0..23476fe0 100644 --- a/kresources/groupwise/kioslave/CMakeLists.txt +++ b/tderesources/groupwise/kioslave/CMakeLists.txt diff --git a/kresources/groupwise/kioslave/Makefile.am b/tderesources/groupwise/kioslave/Makefile.am index 0e3ed61a..2b2eaa07 100644 --- a/kresources/groupwise/kioslave/Makefile.am +++ b/tderesources/groupwise/kioslave/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kresources/groupwise/soap \ +INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tderesources/groupwise/soap \ -I$(top_builddir)/libtdepim $(all_includes) noinst_HEADERS = groupwise.h diff --git a/kresources/groupwise/kioslave/groupwise.cpp b/tderesources/groupwise/kioslave/groupwise.cpp index c3addd3b..c3addd3b 100644 --- a/kresources/groupwise/kioslave/groupwise.cpp +++ b/tderesources/groupwise/kioslave/groupwise.cpp diff --git a/kresources/groupwise/kioslave/groupwise.h b/tderesources/groupwise/kioslave/groupwise.h index c5f109d3..c5f109d3 100644 --- a/kresources/groupwise/kioslave/groupwise.h +++ b/tderesources/groupwise/kioslave/groupwise.h diff --git a/kresources/groupwise/kioslave/groupwise.protocol b/tderesources/groupwise/kioslave/groupwise.protocol index ec22851a..ec22851a 100644 --- a/kresources/groupwise/kioslave/groupwise.protocol +++ b/tderesources/groupwise/kioslave/groupwise.protocol diff --git a/kresources/groupwise/kioslave/groupwises.protocol b/tderesources/groupwise/kioslave/groupwises.protocol index b2b2c7b9..b2b2c7b9 100644 --- a/kresources/groupwise/kioslave/groupwises.protocol +++ b/tderesources/groupwise/kioslave/groupwises.protocol diff --git a/kresources/groupwise/soap/CMakeLists.txt b/tderesources/groupwise/soap/CMakeLists.txt index be5c8205..be5c8205 100644 --- a/kresources/groupwise/soap/CMakeLists.txt +++ b/tderesources/groupwise/soap/CMakeLists.txt diff --git a/kresources/groupwise/soap/GroupWiseBinding.nsmap b/tderesources/groupwise/soap/GroupWiseBinding.nsmap index b07dd5bb..b07dd5bb 100644 --- a/kresources/groupwise/soap/GroupWiseBinding.nsmap +++ b/tderesources/groupwise/soap/GroupWiseBinding.nsmap diff --git a/kresources/groupwise/soap/Makefile.am b/tderesources/groupwise/soap/Makefile.am index 3f3cd84c..bd05c6de 100644 --- a/kresources/groupwise/soap/Makefile.am +++ b/tderesources/groupwise/soap/Makefile.am @@ -1,11 +1,11 @@ -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kresources/groupwise $(all_includes) +INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tderesources/groupwise $(all_includes) #AM_CPPFLAGS = -DDEBUG 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) -lktexteditor +soapdebug_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor soapdebug_LDADD = libgwsoap.la -ltdecore \ $(top_builddir)/libkcal/libkcal.la \ $(top_builddir)/libtdepim/libtdepim.la diff --git a/kresources/groupwise/soap/README b/tderesources/groupwise/soap/README index 0ba49382..0ba49382 100644 --- a/kresources/groupwise/soap/README +++ b/tderesources/groupwise/soap/README diff --git a/kresources/groupwise/soap/contactconverter.cpp b/tderesources/groupwise/soap/contactconverter.cpp index 69c4b90f..69c4b90f 100644 --- a/kresources/groupwise/soap/contactconverter.cpp +++ b/tderesources/groupwise/soap/contactconverter.cpp diff --git a/kresources/groupwise/soap/contactconverter.h b/tderesources/groupwise/soap/contactconverter.h index 7dbc8c79..7dbc8c79 100644 --- a/kresources/groupwise/soap/contactconverter.h +++ b/tderesources/groupwise/soap/contactconverter.h diff --git a/kresources/groupwise/soap/events.xsd b/tderesources/groupwise/soap/events.xsd index 9d032ddc..9d032ddc 100644 --- a/kresources/groupwise/soap/events.xsd +++ b/tderesources/groupwise/soap/events.xsd diff --git a/kresources/groupwise/soap/extractxml.pl b/tderesources/groupwise/soap/extractxml.pl index ecab5086..ecab5086 100755 --- a/kresources/groupwise/soap/extractxml.pl +++ b/tderesources/groupwise/soap/extractxml.pl diff --git a/kresources/groupwise/soap/fixup_groupwise.h.pl b/tderesources/groupwise/soap/fixup_groupwise.h.pl index 93881117..93881117 100755 --- a/kresources/groupwise/soap/fixup_groupwise.h.pl +++ b/tderesources/groupwise/soap/fixup_groupwise.h.pl diff --git a/kresources/groupwise/soap/groupwise.wsdl b/tderesources/groupwise/soap/groupwise.wsdl index 55a29dc7..55a29dc7 100644 --- a/kresources/groupwise/soap/groupwise.wsdl +++ b/tderesources/groupwise/soap/groupwise.wsdl diff --git a/kresources/groupwise/soap/groupwiseserver.cpp b/tderesources/groupwise/soap/groupwiseserver.cpp index 9112fdea..9112fdea 100644 --- a/kresources/groupwise/soap/groupwiseserver.cpp +++ b/tderesources/groupwise/soap/groupwiseserver.cpp diff --git a/kresources/groupwise/soap/groupwiseserver.h b/tderesources/groupwise/soap/groupwiseserver.h index 95218be0..95218be0 100644 --- a/kresources/groupwise/soap/groupwiseserver.h +++ b/tderesources/groupwise/soap/groupwiseserver.h diff --git a/kresources/groupwise/soap/gwconverter.cpp b/tderesources/groupwise/soap/gwconverter.cpp index bda455f7..bda455f7 100644 --- a/kresources/groupwise/soap/gwconverter.cpp +++ b/tderesources/groupwise/soap/gwconverter.cpp diff --git a/kresources/groupwise/soap/gwconverter.h b/tderesources/groupwise/soap/gwconverter.h index d240ffec..d240ffec 100644 --- a/kresources/groupwise/soap/gwconverter.h +++ b/tderesources/groupwise/soap/gwconverter.h diff --git a/kresources/groupwise/soap/gwjobs.cpp b/tderesources/groupwise/soap/gwjobs.cpp index 4e4d1b28..4e4d1b28 100644 --- a/kresources/groupwise/soap/gwjobs.cpp +++ b/tderesources/groupwise/soap/gwjobs.cpp diff --git a/kresources/groupwise/soap/gwjobs.h b/tderesources/groupwise/soap/gwjobs.h index 815e6261..815e6261 100644 --- a/kresources/groupwise/soap/gwjobs.h +++ b/tderesources/groupwise/soap/gwjobs.h diff --git a/kresources/groupwise/soap/incidenceconverter.cpp b/tderesources/groupwise/soap/incidenceconverter.cpp index 79ad94a5..79ad94a5 100644 --- a/kresources/groupwise/soap/incidenceconverter.cpp +++ b/tderesources/groupwise/soap/incidenceconverter.cpp diff --git a/kresources/groupwise/soap/incidenceconverter.h b/tderesources/groupwise/soap/incidenceconverter.h index 317562fa..317562fa 100644 --- a/kresources/groupwise/soap/incidenceconverter.h +++ b/tderesources/groupwise/soap/incidenceconverter.h diff --git a/kresources/groupwise/soap/ksslsocket.cpp b/tderesources/groupwise/soap/ksslsocket.cpp index 90ccf83d..90ccf83d 100644 --- a/kresources/groupwise/soap/ksslsocket.cpp +++ b/tderesources/groupwise/soap/ksslsocket.cpp diff --git a/kresources/groupwise/soap/ksslsocket.h b/tderesources/groupwise/soap/ksslsocket.h index c19b440a..c19b440a 100644 --- a/kresources/groupwise/soap/ksslsocket.h +++ b/tderesources/groupwise/soap/ksslsocket.h diff --git a/kresources/groupwise/soap/methods.xsd b/tderesources/groupwise/soap/methods.xsd index cfc24d85..cfc24d85 100644 --- a/kresources/groupwise/soap/methods.xsd +++ b/tderesources/groupwise/soap/methods.xsd diff --git a/kresources/groupwise/soap/patches/README b/tderesources/groupwise/soap/patches/README index 17e91cb8..5bca178f 100644 --- a/kresources/groupwise/soap/patches/README +++ b/tderesources/groupwise/soap/patches/README @@ -28,5 +28,5 @@ type_typo.diff socklen.diff: Adriaan de Groot <groot@kde.org>: The attached patch is needed for me to get - kresources/groupwise/soap/stdsoap2.cpp to build -- it's the pretty usual + tderesources/groupwise/soap/stdsoap2.cpp to build -- it's the pretty usual socklen_t type mixups (that are only serious on 64-bitters). diff --git a/kresources/groupwise/soap/patches/broken_namespace.diff b/tderesources/groupwise/soap/patches/broken_namespace.diff index 46c5eee4..46c5eee4 100644 --- a/kresources/groupwise/soap/patches/broken_namespace.diff +++ b/tderesources/groupwise/soap/patches/broken_namespace.diff diff --git a/kresources/groupwise/soap/patches/socklen.diff b/tderesources/groupwise/soap/patches/socklen.diff index 74c2bbce..e6494bc9 100644 --- a/kresources/groupwise/soap/patches/socklen.diff +++ b/tderesources/groupwise/soap/patches/socklen.diff @@ -1,6 +1,6 @@ Index: soap/stdsoap2.cpp =================================================================== -RCS file: /home/kde/tdepim/kresources/groupwise/soap/stdsoap2.cpp,v +RCS file: /home/kde/tdepim/tderesources/groupwise/soap/stdsoap2.cpp,v retrieving revision 1.3 diff -u -3 -p -r1.3 stdsoap2.cpp --- soap/stdsoap2.cpp 3 Dec 2004 17:15:43 -0000 1.3 diff --git a/kresources/groupwise/soap/patches/type_typo.diff b/tderesources/groupwise/soap/patches/type_typo.diff index 6e0f4792..eea6cace 100644 --- a/kresources/groupwise/soap/patches/type_typo.diff +++ b/tderesources/groupwise/soap/patches/type_typo.diff @@ -1,6 +1,6 @@ Index: soap/soapC.cpp =================================================================== -RCS file: /home/kde/tdepim/kresources/groupwise/soap/soapC.cpp,v +RCS file: /home/kde/tdepim/tderesources/groupwise/soap/soapC.cpp,v retrieving revision 1.4.2.3 diff -u -3 -p -r1.4.2.3 soapC.cpp --- soap/soapC.cpp 25 Oct 2004 13:58:20 -0000 1.4.2.3 diff --git a/kresources/groupwise/soap/patches/utf8_entities.diff b/tderesources/groupwise/soap/patches/utf8_entities.diff index b8600a9d..656b0b94 100644 --- a/kresources/groupwise/soap/patches/utf8_entities.diff +++ b/tderesources/groupwise/soap/patches/utf8_entities.diff @@ -1,5 +1,5 @@ ---- kresources/groupwise/soap/stdsoap2.cpp -+++ kresources/groupwise/soap/stdsoap2.cpp 2004/10/15 12:42:53 +--- tderesources/groupwise/soap/stdsoap2.cpp ++++ tderesources/groupwise/soap/stdsoap2.cpp 2004/10/15 12:42:53 @@ -6470,7 +6470,11 @@ } #endif diff --git a/kresources/groupwise/soap/soapC.cpp b/tderesources/groupwise/soap/soapC.cpp index 6decf59f..6decf59f 100644 --- a/kresources/groupwise/soap/soapC.cpp +++ b/tderesources/groupwise/soap/soapC.cpp diff --git a/kresources/groupwise/soap/soapClient.cpp b/tderesources/groupwise/soap/soapClient.cpp index 53ed1d22..53ed1d22 100644 --- a/kresources/groupwise/soap/soapClient.cpp +++ b/tderesources/groupwise/soap/soapClient.cpp diff --git a/kresources/groupwise/soap/soapGroupWiseBindingProxy.h b/tderesources/groupwise/soap/soapGroupWiseBindingProxy.h index cf618459..cf618459 100644 --- a/kresources/groupwise/soap/soapGroupWiseBindingProxy.h +++ b/tderesources/groupwise/soap/soapGroupWiseBindingProxy.h diff --git a/kresources/groupwise/soap/soapH.h b/tderesources/groupwise/soap/soapH.h index aa7f1e0e..aa7f1e0e 100644 --- a/kresources/groupwise/soap/soapH.h +++ b/tderesources/groupwise/soap/soapH.h diff --git a/kresources/groupwise/soap/soapStub.h b/tderesources/groupwise/soap/soapStub.h index 5566ba0b..5566ba0b 100644 --- a/kresources/groupwise/soap/soapStub.h +++ b/tderesources/groupwise/soap/soapStub.h diff --git a/kresources/groupwise/soap/soapdebug.cpp b/tderesources/groupwise/soap/soapdebug.cpp index 415021a7..415021a7 100644 --- a/kresources/groupwise/soap/soapdebug.cpp +++ b/tderesources/groupwise/soap/soapdebug.cpp diff --git a/kresources/groupwise/soap/stdsoap2.cpp b/tderesources/groupwise/soap/stdsoap2.cpp index 834051c5..834051c5 100644 --- a/kresources/groupwise/soap/stdsoap2.cpp +++ b/tderesources/groupwise/soap/stdsoap2.cpp diff --git a/kresources/groupwise/soap/stdsoap2.h b/tderesources/groupwise/soap/stdsoap2.h index b68c2407..b68c2407 100644 --- a/kresources/groupwise/soap/stdsoap2.h +++ b/tderesources/groupwise/soap/stdsoap2.h diff --git a/kresources/groupwise/soap/stl.h b/tderesources/groupwise/soap/stl.h index 691dfa8c..691dfa8c 100644 --- a/kresources/groupwise/soap/stl.h +++ b/tderesources/groupwise/soap/stl.h diff --git a/kresources/groupwise/soap/stldeque.h b/tderesources/groupwise/soap/stldeque.h index 82419977..82419977 100644 --- a/kresources/groupwise/soap/stldeque.h +++ b/tderesources/groupwise/soap/stldeque.h diff --git a/kresources/groupwise/soap/stllist.h b/tderesources/groupwise/soap/stllist.h index 281584cc..281584cc 100644 --- a/kresources/groupwise/soap/stllist.h +++ b/tderesources/groupwise/soap/stllist.h diff --git a/kresources/groupwise/soap/stlset.h b/tderesources/groupwise/soap/stlset.h index 719c40a3..719c40a3 100644 --- a/kresources/groupwise/soap/stlset.h +++ b/tderesources/groupwise/soap/stlset.h diff --git a/kresources/groupwise/soap/stlvector.h b/tderesources/groupwise/soap/stlvector.h index 229dda50..229dda50 100644 --- a/kresources/groupwise/soap/stlvector.h +++ b/tderesources/groupwise/soap/stlvector.h diff --git a/kresources/groupwise/soap/typemap.dat b/tderesources/groupwise/soap/typemap.dat index aaeb094f..aaeb094f 100644 --- a/kresources/groupwise/soap/typemap.dat +++ b/tderesources/groupwise/soap/typemap.dat diff --git a/kresources/groupwise/soap/types.xsd b/tderesources/groupwise/soap/types.xsd index d0416f8e..d0416f8e 100644 --- a/kresources/groupwise/soap/types.xsd +++ b/tderesources/groupwise/soap/types.xsd diff --git a/kresources/groupwise/kresources_kabc_groupwise.kcfg b/tderesources/groupwise/tderesources_kabc_groupwise.kcfg index 3998bdd2..6bc3e4c3 100644 --- a/kresources/groupwise/kresources_kabc_groupwise.kcfg +++ b/tderesources/groupwise/tderesources_kabc_groupwise.kcfg @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > - <kcfgfile name="kresources_kabc_groupwiserc" /> + <kcfgfile name="tderesources_kabc_groupwiserc" /> <group name="General" > <entry key="Url" type="String" > <label>Server URL</label> diff --git a/kresources/groupwise/kresources_kcal_groupwise.kcfg b/tderesources/groupwise/tderesources_kcal_groupwise.kcfg index 9a31a555..1ec816a3 100644 --- a/kresources/groupwise/kresources_kcal_groupwise.kcfg +++ b/tderesources/groupwise/tderesources_kcal_groupwise.kcfg @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > - <kcfgfile name="kresources_kcal_groupwiserc" /> + <kcfgfile name="tderesources_kcal_groupwiserc" /> <group name="General" > <entry key="Url" type="String" > <label>Server URL</label> diff --git a/kresources/kolab/CMakeLists.txt b/tderesources/kolab/CMakeLists.txt index 01acd397..01acd397 100644 --- a/kresources/kolab/CMakeLists.txt +++ b/tderesources/kolab/CMakeLists.txt diff --git a/kresources/kolab/Makefile.am b/tderesources/kolab/Makefile.am index 0f144e05..0f144e05 100644 --- a/kresources/kolab/Makefile.am +++ b/tderesources/kolab/Makefile.am diff --git a/kresources/kolab/kabc/CMakeLists.txt b/tderesources/kolab/kabc/CMakeLists.txt index e1d3bd40..e4e3e00c 100644 --- a/kresources/kolab/kabc/CMakeLists.txt +++ b/tderesources/kolab/kabc/CMakeLists.txt @@ -27,11 +27,11 @@ link_directories( install( FILES kolab.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kabc ) + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc ) install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/../uninstall.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kabc + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc RENAME imap.desktop ) diff --git a/kresources/kolab/kabc/Makefile.am b/tderesources/kolab/kabc/Makefile.am index 2a906a45..80643fba 100644 --- a/kresources/kolab/kabc/Makefile.am +++ b/tderesources/kolab/kabc/Makefile.am @@ -1,6 +1,6 @@ METASOURCES = AUTO -INCLUDES = -I$(top_srcdir)/kresources/kolab/shared -I$(top_srcdir) $(all_includes) +INCLUDES = -I$(top_srcdir)/tderesources/kolab/shared -I$(top_srcdir) $(all_includes) # The kolab wizard links to this library too lib_LTLIBRARIES = libkabckolab.la @@ -8,8 +8,8 @@ lib_LTLIBRARIES = libkabckolab.la libkabckolab_la_SOURCES = resourcekolab.cpp contact.cpp libkabckolab_la_LDFLAGS = $(all_libraries) -no-undefined libkabckolab_la_LIBADD = \ - $(top_builddir)/kresources/kolab/shared/libresourcekolabshared.la \ - -lkresources -lkabc + $(top_builddir)/tderesources/kolab/shared/libresourcekolabshared.la \ + -ltderesources -lkabc kde_module_LTLIBRARIES = kabc_kolab.la @@ -19,7 +19,7 @@ kabc_kolab_la_SOURCES = resourcekolab_plugin.cpp kabc_kolab_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined kabc_kolab_la_LIBADD = libkabckolab.la -servicedir = $(kde_servicesdir)/kresources/kabc +servicedir = $(kde_servicesdir)/tderesources/kabc service_DATA = kolab.desktop install-data-local: $(srcdir)/../uninstall.desktop diff --git a/kresources/kolab/kabc/contact.cpp b/tderesources/kolab/kabc/contact.cpp index ff8f869b..ff8f869b 100644 --- a/kresources/kolab/kabc/contact.cpp +++ b/tderesources/kolab/kabc/contact.cpp diff --git a/kresources/kolab/kabc/contact.h b/tderesources/kolab/kabc/contact.h index 6e0de80b..6e0de80b 100644 --- a/kresources/kolab/kabc/contact.h +++ b/tderesources/kolab/kabc/contact.h diff --git a/kresources/kolab/kabc/kolab.desktop b/tderesources/kolab/kabc/kolab.desktop index e0a478c0..e0a478c0 100644 --- a/kresources/kolab/kabc/kolab.desktop +++ b/tderesources/kolab/kabc/kolab.desktop diff --git a/kresources/kolab/kabc/resourcekolab.cpp b/tderesources/kolab/kabc/resourcekolab.cpp index ce7c18c4..ce7c18c4 100644 --- a/kresources/kolab/kabc/resourcekolab.cpp +++ b/tderesources/kolab/kabc/resourcekolab.cpp diff --git a/kresources/kolab/kabc/resourcekolab.h b/tderesources/kolab/kabc/resourcekolab.h index 3a142b20..3a142b20 100644 --- a/kresources/kolab/kabc/resourcekolab.h +++ b/tderesources/kolab/kabc/resourcekolab.h diff --git a/kresources/kolab/kabc/resourcekolab_plugin.cpp b/tderesources/kolab/kabc/resourcekolab_plugin.cpp index 55ac6420..55ac6420 100644 --- a/kresources/kolab/kabc/resourcekolab_plugin.cpp +++ b/tderesources/kolab/kabc/resourcekolab_plugin.cpp diff --git a/kresources/kolab/kcal/CMakeLists.txt b/tderesources/kolab/kcal/CMakeLists.txt index 70750ed1..9f932b5e 100644 --- a/kresources/kolab/kcal/CMakeLists.txt +++ b/tderesources/kolab/kcal/CMakeLists.txt @@ -28,11 +28,11 @@ link_directories( install( FILES kolab.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kcal ) + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/../uninstall.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kcal + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal RENAME imap.desktop) diff --git a/kresources/kolab/kcal/Makefile.am b/tderesources/kolab/kcal/Makefile.am index 4b0193ba..a2502791 100644 --- a/kresources/kolab/kcal/Makefile.am +++ b/tderesources/kolab/kcal/Makefile.am @@ -1,6 +1,6 @@ METASOURCES = AUTO -INCLUDES = -I$(top_srcdir)/kresources/kolab/shared -I$(top_srcdir) \ +INCLUDES = -I$(top_srcdir)/tderesources/kolab/shared -I$(top_srcdir) \ -I$(top_builddir)/libtdepim $(all_includes) # The kolab wizard links to this library too @@ -9,8 +9,8 @@ lib_LTLIBRARIES = libkcalkolab.la libkcalkolab_la_SOURCES = incidence.cpp event.cpp task.cpp journal.cpp resourcekolab.cpp libkcalkolab_la_LDFLAGS = $(all_libraries) -no-undefined libkcalkolab_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \ - $(top_builddir)/kresources/kolab/shared/libresourcekolabshared.la \ - -lkresources + $(top_builddir)/tderesources/kolab/shared/libresourcekolabshared.la \ + -ltderesources kde_module_LTLIBRARIES = kcal_kolab.la @@ -18,7 +18,7 @@ kcal_kolab_la_SOURCES = resourcekolab_plugin.cpp kcal_kolab_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined kcal_kolab_la_LIBADD = libkcalkolab.la -servicedir = $(kde_servicesdir)/kresources/kcal +servicedir = $(kde_servicesdir)/tderesources/kcal service_DATA = kolab.desktop install-data-local: $(srcdir)/../uninstall.desktop diff --git a/kresources/kolab/kcal/event.cpp b/tderesources/kolab/kcal/event.cpp index c15c567d..c15c567d 100644 --- a/kresources/kolab/kcal/event.cpp +++ b/tderesources/kolab/kcal/event.cpp diff --git a/kresources/kolab/kcal/event.h b/tderesources/kolab/kcal/event.h index 57aa3358..57aa3358 100644 --- a/kresources/kolab/kcal/event.h +++ b/tderesources/kolab/kcal/event.h diff --git a/kresources/kolab/kcal/incidence.cpp b/tderesources/kolab/kcal/incidence.cpp index ddc31491..ddc31491 100644 --- a/kresources/kolab/kcal/incidence.cpp +++ b/tderesources/kolab/kcal/incidence.cpp diff --git a/kresources/kolab/kcal/incidence.h b/tderesources/kolab/kcal/incidence.h index 926ec1e4..926ec1e4 100644 --- a/kresources/kolab/kcal/incidence.h +++ b/tderesources/kolab/kcal/incidence.h diff --git a/kresources/kolab/kcal/journal.cpp b/tderesources/kolab/kcal/journal.cpp index acfc4e71..acfc4e71 100644 --- a/kresources/kolab/kcal/journal.cpp +++ b/tderesources/kolab/kcal/journal.cpp diff --git a/kresources/kolab/kcal/journal.h b/tderesources/kolab/kcal/journal.h index cd583c6c..cd583c6c 100644 --- a/kresources/kolab/kcal/journal.h +++ b/tderesources/kolab/kcal/journal.h diff --git a/kresources/kolab/kcal/kolab.desktop b/tderesources/kolab/kcal/kolab.desktop index 40bcacb0..40bcacb0 100644 --- a/kresources/kolab/kcal/kolab.desktop +++ b/tderesources/kolab/kcal/kolab.desktop diff --git a/kresources/kolab/kcal/resourcekolab.cpp b/tderesources/kolab/kcal/resourcekolab.cpp index 44c13fd2..44c13fd2 100644 --- a/kresources/kolab/kcal/resourcekolab.cpp +++ b/tderesources/kolab/kcal/resourcekolab.cpp diff --git a/kresources/kolab/kcal/resourcekolab.h b/tderesources/kolab/kcal/resourcekolab.h index fdf952cc..fdf952cc 100644 --- a/kresources/kolab/kcal/resourcekolab.h +++ b/tderesources/kolab/kcal/resourcekolab.h diff --git a/kresources/kolab/kcal/resourcekolab_plugin.cpp b/tderesources/kolab/kcal/resourcekolab_plugin.cpp index eb56897a..eb56897a 100644 --- a/kresources/kolab/kcal/resourcekolab_plugin.cpp +++ b/tderesources/kolab/kcal/resourcekolab_plugin.cpp diff --git a/kresources/kolab/kcal/task.cpp b/tderesources/kolab/kcal/task.cpp index fe75845d..fe75845d 100644 --- a/kresources/kolab/kcal/task.cpp +++ b/tderesources/kolab/kcal/task.cpp diff --git a/kresources/kolab/kcal/task.h b/tderesources/kolab/kcal/task.h index 38a12a70..38a12a70 100644 --- a/kresources/kolab/kcal/task.h +++ b/tderesources/kolab/kcal/task.h diff --git a/kresources/kolab/knotes/CMakeLists.txt b/tderesources/kolab/knotes/CMakeLists.txt index 273dc0cc..8e10f3e5 100644 --- a/kresources/kolab/knotes/CMakeLists.txt +++ b/tderesources/kolab/knotes/CMakeLists.txt @@ -28,11 +28,11 @@ link_directories( install( FILES kolabresource.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/kresources/knotes ) + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/knotes ) install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/../uninstall.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/kresources/knotes + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/knotes RENAME imap.desktop ) diff --git a/kresources/kolab/knotes/Makefile.am b/tderesources/kolab/knotes/Makefile.am index b95c261d..54337ce8 100644 --- a/kresources/kolab/knotes/Makefile.am +++ b/tderesources/kolab/knotes/Makefile.am @@ -1,6 +1,6 @@ METASOURCES = AUTO -INCLUDES = -I$(top_srcdir)/kresources/kolab/shared \ +INCLUDES = -I$(top_srcdir)/tderesources/kolab/shared \ -I$(top_srcdir) -I$(top_srcdir)/knotes -I$(top_builddir)/libtdepim $(all_includes) # The kolab wizard links to this library too @@ -9,10 +9,10 @@ lib_LTLIBRARIES = libknoteskolab.la libknoteskolab_la_SOURCES = resourcekolab.cpp note.cpp libknoteskolab_la_LDFLAGS = $(all_libraries) -no-undefined libknoteskolab_la_LIBADD = \ - $(top_builddir)/kresources/kolab/shared/libresourcekolabshared.la \ + $(top_builddir)/tderesources/kolab/shared/libresourcekolabshared.la \ $(top_builddir)/knotes/libknotesresources.la \ $(top_builddir)/libkcal/libkcal.la \ - -lkresources -ltdeprint + -ltderesources -ltdeprint kde_module_LTLIBRARIES = knotes_kolab.la @@ -20,7 +20,7 @@ knotes_kolab_la_SOURCES = resourcekolab_plugin.cpp knotes_kolab_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined knotes_kolab_la_LIBADD = libknoteskolab.la -servicedir = $(kde_servicesdir)/kresources/knotes +servicedir = $(kde_servicesdir)/tderesources/knotes service_DATA = kolabresource.desktop install-data-local: $(srcdir)/../uninstall.desktop diff --git a/kresources/kolab/knotes/kolabresource.desktop b/tderesources/kolab/knotes/kolabresource.desktop index 16f48e45..16f48e45 100644 --- a/kresources/kolab/knotes/kolabresource.desktop +++ b/tderesources/kolab/knotes/kolabresource.desktop diff --git a/kresources/kolab/knotes/note.cpp b/tderesources/kolab/knotes/note.cpp index 7df5b26b..7df5b26b 100644 --- a/kresources/kolab/knotes/note.cpp +++ b/tderesources/kolab/knotes/note.cpp diff --git a/kresources/kolab/knotes/note.h b/tderesources/kolab/knotes/note.h index d61a2009..d61a2009 100644 --- a/kresources/kolab/knotes/note.h +++ b/tderesources/kolab/knotes/note.h diff --git a/kresources/kolab/knotes/resourcekolab.cpp b/tderesources/kolab/knotes/resourcekolab.cpp index a28a51b2..a28a51b2 100644 --- a/kresources/kolab/knotes/resourcekolab.cpp +++ b/tderesources/kolab/knotes/resourcekolab.cpp diff --git a/kresources/kolab/knotes/resourcekolab.h b/tderesources/kolab/knotes/resourcekolab.h index fb0d191b..fb0d191b 100644 --- a/kresources/kolab/knotes/resourcekolab.h +++ b/tderesources/kolab/knotes/resourcekolab.h diff --git a/kresources/kolab/knotes/resourcekolab_plugin.cpp b/tderesources/kolab/knotes/resourcekolab_plugin.cpp index f589986c..f589986c 100644 --- a/kresources/kolab/knotes/resourcekolab_plugin.cpp +++ b/tderesources/kolab/knotes/resourcekolab_plugin.cpp diff --git a/kresources/kolab/kolab-resource.upd b/tderesources/kolab/kolab-resource.upd index d4c9b962..8f456f4a 100644 --- a/kresources/kolab/kolab-resource.upd +++ b/tderesources/kolab/kolab-resource.upd @@ -1,12 +1,12 @@ # Update the name of the resource Id=kolab-calendar-resource-rename -File=kresources/calendar/stdrc +File=tderesources/calendar/stdrc Script=upgrade-resourcetype.pl,perl Id=kolab-contact-resource-rename -File=kresources/contact/stdrc +File=tderesources/contact/stdrc Script=upgrade-resourcetype.pl,perl Id=kolab-notes-resource-rename -File=kresources/notes/stdrc +File=tderesources/notes/stdrc Script=upgrade-resourcetype.pl,perl diff --git a/kresources/kolab/shared/CMakeLists.txt b/tderesources/kolab/shared/CMakeLists.txt index e714eec5..1509deb1 100644 --- a/kresources/kolab/shared/CMakeLists.txt +++ b/tderesources/kolab/shared/CMakeLists.txt @@ -12,7 +12,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/kresources/lib + ${CMAKE_SOURCE_DIR}/tderesources/lib ${CMAKE_SOURCE_DIR}/libtdepim ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} diff --git a/kresources/kolab/shared/Makefile.am b/tderesources/kolab/shared/Makefile.am index 7ecc333a..28762033 100644 --- a/kresources/kolab/shared/Makefile.am +++ b/tderesources/kolab/shared/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kresources/lib $(all_includes) +INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tderesources/lib $(all_includes) noinst_HEADERS = resourcekolabbase.h kolabbase.h subresource.h diff --git a/kresources/kolab/shared/kmailconnection.cpp b/tderesources/kolab/shared/kmailconnection.cpp index e82102a3..e82102a3 100644 --- a/kresources/kolab/shared/kmailconnection.cpp +++ b/tderesources/kolab/shared/kmailconnection.cpp diff --git a/kresources/kolab/shared/kmailconnection.h b/tderesources/kolab/shared/kmailconnection.h index 62003b5f..62003b5f 100644 --- a/kresources/kolab/shared/kmailconnection.h +++ b/tderesources/kolab/shared/kmailconnection.h diff --git a/kresources/kolab/shared/kolabbase.cpp b/tderesources/kolab/shared/kolabbase.cpp index 167f2566..167f2566 100644 --- a/kresources/kolab/shared/kolabbase.cpp +++ b/tderesources/kolab/shared/kolabbase.cpp diff --git a/kresources/kolab/shared/kolabbase.h b/tderesources/kolab/shared/kolabbase.h index 294a7d81..294a7d81 100644 --- a/kresources/kolab/shared/kolabbase.h +++ b/tderesources/kolab/shared/kolabbase.h diff --git a/kresources/kolab/shared/resourcekolabbase.cpp b/tderesources/kolab/shared/resourcekolabbase.cpp index c6f1f425..a56538a6 100644 --- a/kresources/kolab/shared/resourcekolabbase.cpp +++ b/tderesources/kolab/shared/resourcekolabbase.cpp @@ -190,7 +190,7 @@ bool ResourceKolabBase::kmailUpdate( const TQString& resource, TQString ResourceKolabBase::configFile( const TQString& type ) const { return locateLocal( "config", - TQString( "kresources/kolab/%1rc" ).arg( type ) ); + TQString( "tderesources/kolab/%1rc" ).arg( type ) ); } bool ResourceKolabBase::connectToKMail() const diff --git a/kresources/kolab/shared/resourcekolabbase.h b/tderesources/kolab/shared/resourcekolabbase.h index f32c151f..f32c151f 100644 --- a/kresources/kolab/shared/resourcekolabbase.h +++ b/tderesources/kolab/shared/resourcekolabbase.h diff --git a/kresources/kolab/shared/subresource.cpp b/tderesources/kolab/shared/subresource.cpp index 7520d275..7520d275 100644 --- a/kresources/kolab/shared/subresource.cpp +++ b/tderesources/kolab/shared/subresource.cpp diff --git a/kresources/kolab/shared/subresource.h b/tderesources/kolab/shared/subresource.h index 79104a74..79104a74 100644 --- a/kresources/kolab/shared/subresource.h +++ b/tderesources/kolab/shared/subresource.h diff --git a/kresources/kolab/uninstall.desktop b/tderesources/kolab/uninstall.desktop index e1e3e173..e1e3e173 100644 --- a/kresources/kolab/uninstall.desktop +++ b/tderesources/kolab/uninstall.desktop diff --git a/kresources/kolab/upgrade-resourcetype.pl b/tderesources/kolab/upgrade-resourcetype.pl index 98337a88..98337a88 100644 --- a/kresources/kolab/upgrade-resourcetype.pl +++ b/tderesources/kolab/upgrade-resourcetype.pl diff --git a/kresources/lib/CMakeLists.txt b/tderesources/lib/CMakeLists.txt index a604c51b..0289f3e8 100644 --- a/kresources/lib/CMakeLists.txt +++ b/tderesources/lib/CMakeLists.txt @@ -31,7 +31,7 @@ tde_add_library( kgroupwarebase SHARED AUTOMOC groupwaredataadaptor.cpp groupwaredownloadjob.cpp calendaradaptor.cpp addressbookadaptor.cpp groupwareresourcejob.cpp groupwareuploadjob.cpp kcal_resourcegroupwarebase.cpp kabc_resourcegroupwarebase.cpp - kresources_groupwareprefs.kcfgc kcal_resourcegroupwarebaseconfig.cpp + tderesources_groupwareprefs.kcfgc kcal_resourcegroupwarebaseconfig.cpp kabc_resourcegroupwarebaseconfig.cpp kcal_cachesettingsdlg.cpp VERSION 0.0.0 LINK tdepim-shared diff --git a/kresources/lib/Makefile.am b/tderesources/lib/Makefile.am index 37d08bed..a430fd8b 100644 --- a/kresources/lib/Makefile.am +++ b/tderesources/lib/Makefile.am @@ -6,7 +6,7 @@ libkgroupwarebase_la_SOURCES = folderlister.cpp folderconfig.cpp folderlistview. groupwaredataadaptor.cpp groupwaredownloadjob.cpp \ calendaradaptor.cpp addressbookadaptor.cpp groupwareresourcejob.cpp \ groupwareuploadjob.cpp kcal_resourcegroupwarebase.cpp kabc_resourcegroupwarebase.cpp \ - kresources_groupwareprefs.kcfgc \ + tderesources_groupwareprefs.kcfgc \ kcal_resourcegroupwarebaseconfig.cpp kabc_resourcegroupwarebaseconfig.cpp \ kcal_cachesettingsdlg.cpp libkgroupwarebase_la_LDFLAGS = $(all_libraries) -no-undefined diff --git a/kresources/lib/TODO b/tderesources/lib/TODO index 1a1b4cdb..30680dfe 100644 --- a/kresources/lib/TODO +++ b/tderesources/lib/TODO @@ -1,4 +1,4 @@ -kresources/lib (general): +tderesources/lib (general): =============== -) http result code handling (404, 200, etc.) -) conflict resolution @@ -18,7 +18,7 @@ kresources/lib (general): -) Better progress bar messages -kresources/newexchange: +tderesources/newexchange: ======================= -) handling of errors returned in a valid dav response (Exchange) -) recurrences on exchange @@ -30,7 +30,7 @@ kresources/newexchange: -) Journal upload not working -kresources/groupdav: +tderesources/groupdav: ==================== -) recurrences on ogo -) uploading abook entries don't work (server doesn't implement it yet) @@ -40,6 +40,6 @@ kresources/groupdav: first item is downloaded again and replaces the other one...) -kresources/blogging: +tderesources/blogging: ==================== -) Upload of blog posts diff --git a/kresources/lib/addressbookadaptor.cpp b/tderesources/lib/addressbookadaptor.cpp index 8cc28f67..8cc28f67 100644 --- a/kresources/lib/addressbookadaptor.cpp +++ b/tderesources/lib/addressbookadaptor.cpp diff --git a/kresources/lib/addressbookadaptor.h b/tderesources/lib/addressbookadaptor.h index b029ff60..b029ff60 100644 --- a/kresources/lib/addressbookadaptor.h +++ b/tderesources/lib/addressbookadaptor.h diff --git a/kresources/lib/calendaradaptor.cpp b/tderesources/lib/calendaradaptor.cpp index f2e255f0..f2e255f0 100644 --- a/kresources/lib/calendaradaptor.cpp +++ b/tderesources/lib/calendaradaptor.cpp diff --git a/kresources/lib/calendaradaptor.h b/tderesources/lib/calendaradaptor.h index 354a2795..354a2795 100644 --- a/kresources/lib/calendaradaptor.h +++ b/tderesources/lib/calendaradaptor.h diff --git a/kresources/lib/davaddressbookadaptor.cpp b/tderesources/lib/davaddressbookadaptor.cpp index 5b4a0a52..5b4a0a52 100644 --- a/kresources/lib/davaddressbookadaptor.cpp +++ b/tderesources/lib/davaddressbookadaptor.cpp diff --git a/kresources/lib/davaddressbookadaptor.h b/tderesources/lib/davaddressbookadaptor.h index f0f6f39d..f0f6f39d 100644 --- a/kresources/lib/davaddressbookadaptor.h +++ b/tderesources/lib/davaddressbookadaptor.h diff --git a/kresources/lib/davcalendaradaptor.cpp b/tderesources/lib/davcalendaradaptor.cpp index 5d6be2da..5d6be2da 100644 --- a/kresources/lib/davcalendaradaptor.cpp +++ b/tderesources/lib/davcalendaradaptor.cpp diff --git a/kresources/lib/davcalendaradaptor.h b/tderesources/lib/davcalendaradaptor.h index 998a9cc7..998a9cc7 100644 --- a/kresources/lib/davcalendaradaptor.h +++ b/tderesources/lib/davcalendaradaptor.h diff --git a/kresources/lib/davgroupwareglobals.cpp b/tderesources/lib/davgroupwareglobals.cpp index 5d9a3720..5d9a3720 100644 --- a/kresources/lib/davgroupwareglobals.cpp +++ b/tderesources/lib/davgroupwareglobals.cpp diff --git a/kresources/lib/davgroupwareglobals.h b/tderesources/lib/davgroupwareglobals.h index 67eb2280..67eb2280 100644 --- a/kresources/lib/davgroupwareglobals.h +++ b/tderesources/lib/davgroupwareglobals.h diff --git a/kresources/lib/folderconfig.cpp b/tderesources/lib/folderconfig.cpp index 20fa6fa1..20fa6fa1 100644 --- a/kresources/lib/folderconfig.cpp +++ b/tderesources/lib/folderconfig.cpp diff --git a/kresources/lib/folderconfig.h b/tderesources/lib/folderconfig.h index 36a8d31a..36a8d31a 100644 --- a/kresources/lib/folderconfig.h +++ b/tderesources/lib/folderconfig.h diff --git a/kresources/lib/folderlister.cpp b/tderesources/lib/folderlister.cpp index eb91243b..6cb341ac 100644 --- a/kresources/lib/folderlister.cpp +++ b/tderesources/lib/folderlister.cpp @@ -23,7 +23,7 @@ #include "folderlister.h" #include "groupwaredataadaptor.h" -#include "kresources_groupwareprefs.h" +#include "tderesources_groupwareprefs.h" #include <kio/job.h> diff --git a/kresources/lib/folderlister.h b/tderesources/lib/folderlister.h index 8248ec22..a1d3f2eb 100644 --- a/kresources/lib/folderlister.h +++ b/tderesources/lib/folderlister.h @@ -23,7 +23,7 @@ #ifndef KPIM_FOLDERLISTER_H #define KPIM_FOLDERLISTER_H -// #include "kresources_groupwareprefs.h" +// #include "tderesources_groupwareprefs.h" /*#include "groupwareresourcejob.h"*/ #include <kurl.h> #include <tdepimmacros.h> diff --git a/kresources/lib/folderlistview.cpp b/tderesources/lib/folderlistview.cpp index b29e61c9..b29e61c9 100644 --- a/kresources/lib/folderlistview.cpp +++ b/tderesources/lib/folderlistview.cpp diff --git a/kresources/lib/folderlistview.h b/tderesources/lib/folderlistview.h index 32f01199..32f01199 100644 --- a/kresources/lib/folderlistview.h +++ b/tderesources/lib/folderlistview.h diff --git a/kresources/lib/folderselectdialog.cpp b/tderesources/lib/folderselectdialog.cpp index 9d0f48a5..9d0f48a5 100644 --- a/kresources/lib/folderselectdialog.cpp +++ b/tderesources/lib/folderselectdialog.cpp diff --git a/kresources/lib/folderselectdialog.h b/tderesources/lib/folderselectdialog.h index e33ac80a..e33ac80a 100644 --- a/kresources/lib/folderselectdialog.h +++ b/tderesources/lib/folderselectdialog.h diff --git a/kresources/lib/groupwaredataadaptor.cpp b/tderesources/lib/groupwaredataadaptor.cpp index 85dacdaa..85dacdaa 100644 --- a/kresources/lib/groupwaredataadaptor.cpp +++ b/tderesources/lib/groupwaredataadaptor.cpp diff --git a/kresources/lib/groupwaredataadaptor.h b/tderesources/lib/groupwaredataadaptor.h index b7bd6e33..b7bd6e33 100644 --- a/kresources/lib/groupwaredataadaptor.h +++ b/tderesources/lib/groupwaredataadaptor.h diff --git a/kresources/lib/groupwaredownloadjob.cpp b/tderesources/lib/groupwaredownloadjob.cpp index 9104da84..9104da84 100644 --- a/kresources/lib/groupwaredownloadjob.cpp +++ b/tderesources/lib/groupwaredownloadjob.cpp diff --git a/kresources/lib/groupwaredownloadjob.h b/tderesources/lib/groupwaredownloadjob.h index 6cf3bf24..6cf3bf24 100644 --- a/kresources/lib/groupwaredownloadjob.h +++ b/tderesources/lib/groupwaredownloadjob.h diff --git a/kresources/lib/groupwareresourcejob.cpp b/tderesources/lib/groupwareresourcejob.cpp index b7e4b57b..b7e4b57b 100644 --- a/kresources/lib/groupwareresourcejob.cpp +++ b/tderesources/lib/groupwareresourcejob.cpp diff --git a/kresources/lib/groupwareresourcejob.h b/tderesources/lib/groupwareresourcejob.h index f2818f2c..f2818f2c 100644 --- a/kresources/lib/groupwareresourcejob.h +++ b/tderesources/lib/groupwareresourcejob.h diff --git a/kresources/lib/groupwareuploadjob.cpp b/tderesources/lib/groupwareuploadjob.cpp index cf46571f..cf46571f 100644 --- a/kresources/lib/groupwareuploadjob.cpp +++ b/tderesources/lib/groupwareuploadjob.cpp diff --git a/kresources/lib/groupwareuploadjob.h b/tderesources/lib/groupwareuploadjob.h index b3a0ff75..b3a0ff75 100644 --- a/kresources/lib/groupwareuploadjob.h +++ b/tderesources/lib/groupwareuploadjob.h diff --git a/kresources/lib/kabc_resourcegroupwarebase.cpp b/tderesources/lib/kabc_resourcegroupwarebase.cpp index 4700dd1f..87ca28ce 100644 --- a/kresources/lib/kabc_resourcegroupwarebase.cpp +++ b/tderesources/lib/kabc_resourcegroupwarebase.cpp @@ -21,7 +21,7 @@ */ #include "kabc_resourcegroupwarebase.h" -#include "kresources_groupwareprefs.h" +#include "tderesources_groupwareprefs.h" #include "folderlister.h" #include "addressbookadaptor.h" diff --git a/kresources/lib/kabc_resourcegroupwarebase.h b/tderesources/lib/kabc_resourcegroupwarebase.h index 28ce5199..28ce5199 100644 --- a/kresources/lib/kabc_resourcegroupwarebase.h +++ b/tderesources/lib/kabc_resourcegroupwarebase.h diff --git a/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp b/tderesources/lib/kabc_resourcegroupwarebaseconfig.cpp index 6609a3b2..4e4f0527 100644 --- a/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp +++ b/tderesources/lib/kabc_resourcegroupwarebaseconfig.cpp @@ -23,7 +23,7 @@ #include "kabc_resourcegroupwarebaseconfig.h" #include "kabc_resourcegroupwarebase.h" -#include "kresources_groupwareprefs.h" +#include "tderesources_groupwareprefs.h" #include "folderconfig.h" #include <kdebug.h> diff --git a/kresources/lib/kabc_resourcegroupwarebaseconfig.h b/tderesources/lib/kabc_resourcegroupwarebaseconfig.h index 47a801ae..f505d9ce 100644 --- a/kresources/lib/kabc_resourcegroupwarebaseconfig.h +++ b/tderesources/lib/kabc_resourcegroupwarebaseconfig.h @@ -22,7 +22,7 @@ #ifndef KABC_RESOURCEGROUPWAREBASECONFIG_H #define KABC_RESOURCEGROUPWAREBASECONFIG_H -#include <kresources/configwidget.h> +#include <tderesources/configwidget.h> #include <tdepimmacros.h> class KLineEdit; diff --git a/kresources/lib/kcal_cachesettingsdlg.cpp b/tderesources/lib/kcal_cachesettingsdlg.cpp index 20b48ad9..3c2dbed1 100644 --- a/kresources/lib/kcal_cachesettingsdlg.cpp +++ b/tderesources/lib/kcal_cachesettingsdlg.cpp @@ -23,7 +23,7 @@ #include "kcal_cachesettingsdlg.h" #include "kcal_resourcegroupwarebase.h" -#include "kresources_groupwareprefs.h" +#include "tderesources_groupwareprefs.h" #include <libkcal/resourcecachedconfig.h> diff --git a/kresources/lib/kcal_cachesettingsdlg.h b/tderesources/lib/kcal_cachesettingsdlg.h index 1a6b369a..1a6b369a 100644 --- a/kresources/lib/kcal_cachesettingsdlg.h +++ b/tderesources/lib/kcal_cachesettingsdlg.h diff --git a/kresources/lib/kcal_resourcegroupwarebase.cpp b/tderesources/lib/kcal_resourcegroupwarebase.cpp index 118fc662..bd459331 100644 --- a/kresources/lib/kcal_resourcegroupwarebase.cpp +++ b/tderesources/lib/kcal_resourcegroupwarebase.cpp @@ -22,7 +22,7 @@ */ #include "kcal_resourcegroupwarebase.h" -#include "kresources_groupwareprefs.h" +#include "tderesources_groupwareprefs.h" #include "libkcal/confirmsavedialog.h" #include "folderlister.h" diff --git a/kresources/lib/kcal_resourcegroupwarebase.h b/tderesources/lib/kcal_resourcegroupwarebase.h index f6b46dbf..f6b46dbf 100644 --- a/kresources/lib/kcal_resourcegroupwarebase.h +++ b/tderesources/lib/kcal_resourcegroupwarebase.h diff --git a/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp b/tderesources/lib/kcal_resourcegroupwarebaseconfig.cpp index ed8a63f9..b654f8d0 100644 --- a/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp +++ b/tderesources/lib/kcal_resourcegroupwarebaseconfig.cpp @@ -24,7 +24,7 @@ #include "kcal_cachesettingsdlg.h" #include "kcal_resourcegroupwarebase.h" -#include "kresources_groupwareprefs.h" +#include "tderesources_groupwareprefs.h" #include "folderconfig.h" #include <libkcal/resourcecachedconfig.h> diff --git a/kresources/lib/kcal_resourcegroupwarebaseconfig.h b/tderesources/lib/kcal_resourcegroupwarebaseconfig.h index e326d0d8..ab4f841a 100644 --- a/kresources/lib/kcal_resourcegroupwarebaseconfig.h +++ b/tderesources/lib/kcal_resourcegroupwarebaseconfig.h @@ -22,7 +22,7 @@ #ifndef KCAL_RESOURCEGROUPWAREBASECONFIG_H #define KCAL_RESOURCEGROUPWAREBASECONFIG_H -#include <kresources/configwidget.h> +#include <tderesources/configwidget.h> #include <tdepimmacros.h> class KPushButton; diff --git a/kresources/lib/kresources_groupwareprefs.kcfg b/tderesources/lib/tderesources_groupwareprefs.kcfg index a56c14d9..f44a6b5f 100644 --- a/kresources/lib/kresources_groupwareprefs.kcfg +++ b/tderesources/lib/tderesources_groupwareprefs.kcfg @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > - <kcfgfile name="kresources_groupwarerc"/> + <kcfgfile name="tderesources_groupwarerc"/> <group name="General" > <entry key="Url" type="String" > <label>Server URL</label> diff --git a/kresources/lib/kresources_groupwareprefs.kcfgc b/tderesources/lib/tderesources_groupwareprefs.kcfgc index 178dc9ac..48350a09 100644 --- a/kresources/lib/kresources_groupwareprefs.kcfgc +++ b/tderesources/lib/tderesources_groupwareprefs.kcfgc @@ -1,5 +1,5 @@ ClassName=GroupwarePrefsBase -File=kresources_groupwareprefs.kcfg +File=tderesources_groupwareprefs.kcfg GlobalEnums=false IncludeFiles=libtdepim/kresourceprefs.h Inherits=KResourcePrefs diff --git a/kresources/lib/webdavhandler.cpp b/tderesources/lib/webdavhandler.cpp index fea7a0b1..fea7a0b1 100644 --- a/kresources/lib/webdavhandler.cpp +++ b/tderesources/lib/webdavhandler.cpp diff --git a/kresources/lib/webdavhandler.h b/tderesources/lib/webdavhandler.h index 0bfb33e9..0bfb33e9 100644 --- a/kresources/lib/webdavhandler.h +++ b/tderesources/lib/webdavhandler.h diff --git a/kresources/newexchange/CMakeLists.txt b/tderesources/newexchange/CMakeLists.txt index 23e1f958..8323c310 100644 --- a/kresources/newexchange/CMakeLists.txt +++ b/tderesources/newexchange/CMakeLists.txt @@ -26,8 +26,8 @@ link_directories( ##### other data ################################ -install( FILES kcal_newexchange.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kcal ) -install( FILES kabc_newexchange.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kabc ) +install( FILES kcal_newexchange.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) +install( FILES kabc_newexchange.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc ) ##### kcal_newexchange (module) ################# diff --git a/kresources/newexchange/Incidence.mapping b/tderesources/newexchange/Incidence.mapping index ef0914b5..ef0914b5 100644 --- a/kresources/newexchange/Incidence.mapping +++ b/tderesources/newexchange/Incidence.mapping diff --git a/kresources/newexchange/Makefile.am b/tderesources/newexchange/Makefile.am index b4d4a9b4..62a99b47 100644 --- a/kresources/newexchange/Makefile.am +++ b/tderesources/newexchange/Makefile.am @@ -1,5 +1,5 @@ -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kresources/lib \ - -I$(top_builddir)/kresources/lib $(all_includes) +INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tderesources/lib \ + -I$(top_builddir)/tderesources/lib $(all_includes) lib_LTLIBRARIES = libkabc_newexchange.la libkcal_newexchange.la noinst_LTLIBRARIES = libknewexchange.la @@ -33,13 +33,13 @@ kabc_newexchange_la_LDFLAGS = $(all_libraries) -module -no-undefined $(KDE_PLUGI kabc_newexchange_la_LIBADD = libkabc_newexchange.la -kcal_servicedir = $(kde_servicesdir)/kresources/kcal +kcal_servicedir = $(kde_servicesdir)/tderesources/kcal kcal_service_DATA = kcal_newexchange.desktop -kabc_servicedir = $(kde_servicesdir)/kresources/kabc +kabc_servicedir = $(kde_servicesdir)/tderesources/kabc kabc_service_DATA = kabc_newexchange.desktop METASOURCES = AUTO -kcal_resourceexchange.lo kabc_resourceexchange.lo: ../lib/kresources_groupwareprefs.h +kcal_resourceexchange.lo kabc_resourceexchange.lo: ../lib/tderesources_groupwareprefs.h diff --git a/kresources/newexchange/Person.mapping b/tderesources/newexchange/Person.mapping index d7571e77..d7571e77 100644 --- a/kresources/newexchange/Person.mapping +++ b/tderesources/newexchange/Person.mapping diff --git a/kresources/newexchange/exchangeaddressbookadaptor.cpp b/tderesources/newexchange/exchangeaddressbookadaptor.cpp index 7e8ae8bb..7e8ae8bb 100644 --- a/kresources/newexchange/exchangeaddressbookadaptor.cpp +++ b/tderesources/newexchange/exchangeaddressbookadaptor.cpp diff --git a/kresources/newexchange/exchangeaddressbookadaptor.h b/tderesources/newexchange/exchangeaddressbookadaptor.h index cbf5ac6f..cbf5ac6f 100644 --- a/kresources/newexchange/exchangeaddressbookadaptor.h +++ b/tderesources/newexchange/exchangeaddressbookadaptor.h diff --git a/kresources/newexchange/exchangecalendaradaptor.cpp b/tderesources/newexchange/exchangecalendaradaptor.cpp index 89c9b742..89c9b742 100644 --- a/kresources/newexchange/exchangecalendaradaptor.cpp +++ b/tderesources/newexchange/exchangecalendaradaptor.cpp diff --git a/kresources/newexchange/exchangecalendaradaptor.h b/tderesources/newexchange/exchangecalendaradaptor.h index 4f8d1da2..4f8d1da2 100644 --- a/kresources/newexchange/exchangecalendaradaptor.h +++ b/tderesources/newexchange/exchangecalendaradaptor.h diff --git a/kresources/newexchange/exchangeconvertercalendar.cpp b/tderesources/newexchange/exchangeconvertercalendar.cpp index bf2a66db..bf2a66db 100644 --- a/kresources/newexchange/exchangeconvertercalendar.cpp +++ b/tderesources/newexchange/exchangeconvertercalendar.cpp diff --git a/kresources/newexchange/exchangeconvertercalendar.h b/tderesources/newexchange/exchangeconvertercalendar.h index a561d0cd..a561d0cd 100644 --- a/kresources/newexchange/exchangeconvertercalendar.h +++ b/tderesources/newexchange/exchangeconvertercalendar.h diff --git a/kresources/newexchange/exchangeconvertercontact.cpp b/tderesources/newexchange/exchangeconvertercontact.cpp index e8de19cb..e8de19cb 100644 --- a/kresources/newexchange/exchangeconvertercontact.cpp +++ b/tderesources/newexchange/exchangeconvertercontact.cpp diff --git a/kresources/newexchange/exchangeconvertercontact.h b/tderesources/newexchange/exchangeconvertercontact.h index 191abccb..191abccb 100644 --- a/kresources/newexchange/exchangeconvertercontact.h +++ b/tderesources/newexchange/exchangeconvertercontact.h diff --git a/kresources/newexchange/exchangeglobals.cpp b/tderesources/newexchange/exchangeglobals.cpp index f2d90cd6..f2d90cd6 100644 --- a/kresources/newexchange/exchangeglobals.cpp +++ b/tderesources/newexchange/exchangeglobals.cpp diff --git a/kresources/newexchange/exchangeglobals.h b/tderesources/newexchange/exchangeglobals.h index 5d75bc42..5d75bc42 100644 --- a/kresources/newexchange/exchangeglobals.h +++ b/tderesources/newexchange/exchangeglobals.h diff --git a/kresources/newexchange/kabc_newexchange.desktop b/tderesources/newexchange/kabc_newexchange.desktop index c48d5f3c..c48d5f3c 100644 --- a/kresources/newexchange/kabc_newexchange.desktop +++ b/tderesources/newexchange/kabc_newexchange.desktop diff --git a/kresources/newexchange/kabc_newexchange_final.desktop b/tderesources/newexchange/kabc_newexchange_final.desktop index 19cdda43..19cdda43 100644 --- a/kresources/newexchange/kabc_newexchange_final.desktop +++ b/tderesources/newexchange/kabc_newexchange_final.desktop diff --git a/kresources/newexchange/kabc_resourceexchange.cpp b/tderesources/newexchange/kabc_resourceexchange.cpp index 8c3ca2d1..dc789ea2 100644 --- a/kresources/newexchange/kabc_resourceexchange.cpp +++ b/tderesources/newexchange/kabc_resourceexchange.cpp @@ -24,7 +24,7 @@ #include "kabc_resourceexchange.h" #include "groupwaredownloadjob.h" #include "groupwareuploadjob.h" -#include "kresources_groupwareprefs.h" +#include "tderesources_groupwareprefs.h" #include <klocale.h> diff --git a/kresources/newexchange/kabc_resourceexchange.h b/tderesources/newexchange/kabc_resourceexchange.h index 941f9179..941f9179 100644 --- a/kresources/newexchange/kabc_resourceexchange.h +++ b/tderesources/newexchange/kabc_resourceexchange.h diff --git a/kresources/newexchange/kabc_resourceexchange_plugin.cpp b/tderesources/newexchange/kabc_resourceexchange_plugin.cpp index adc0b685..adc0b685 100644 --- a/kresources/newexchange/kabc_resourceexchange_plugin.cpp +++ b/tderesources/newexchange/kabc_resourceexchange_plugin.cpp diff --git a/kresources/newexchange/kcal_newexchange.desktop b/tderesources/newexchange/kcal_newexchange.desktop index 4b5b335b..4b5b335b 100644 --- a/kresources/newexchange/kcal_newexchange.desktop +++ b/tderesources/newexchange/kcal_newexchange.desktop diff --git a/kresources/newexchange/kcal_newexchange_final.desktop b/tderesources/newexchange/kcal_newexchange_final.desktop index 01904c54..01904c54 100644 --- a/kresources/newexchange/kcal_newexchange_final.desktop +++ b/tderesources/newexchange/kcal_newexchange_final.desktop diff --git a/kresources/newexchange/kcal_resourceexchange.cpp b/tderesources/newexchange/kcal_resourceexchange.cpp index eff1fa6b..ce06fd76 100644 --- a/kresources/newexchange/kcal_resourceexchange.cpp +++ b/tderesources/newexchange/kcal_resourceexchange.cpp @@ -24,7 +24,7 @@ #include "kcal_resourceexchange.h" #include <groupwaredownloadjob.h> #include <groupwareuploadjob.h> -#include <kresources_groupwareprefs.h> +#include <tderesources_groupwareprefs.h> #include <klocale.h> using namespace KCal; diff --git a/kresources/newexchange/kcal_resourceexchange.h b/tderesources/newexchange/kcal_resourceexchange.h index 823ed9a7..823ed9a7 100644 --- a/kresources/newexchange/kcal_resourceexchange.h +++ b/tderesources/newexchange/kcal_resourceexchange.h diff --git a/kresources/newexchange/kcal_resourceexchange_plugin.cpp b/tderesources/newexchange/kcal_resourceexchange_plugin.cpp index 6130e0dc..6130e0dc 100644 --- a/kresources/newexchange/kcal_resourceexchange_plugin.cpp +++ b/tderesources/newexchange/kcal_resourceexchange_plugin.cpp diff --git a/kresources/remote/CMakeLists.txt b/tderesources/remote/CMakeLists.txt index d1a4b57b..33b10fc3 100644 --- a/kresources/remote/CMakeLists.txt +++ b/tderesources/remote/CMakeLists.txt @@ -33,7 +33,7 @@ install( FILES install( FILES remote.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kcal ) + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) ##### kcal_remote (module) ###################### diff --git a/kresources/remote/Makefile.am b/tderesources/remote/Makefile.am index a2dfe4f6..78e1cc7d 100644 --- a/kresources/remote/Makefile.am +++ b/tderesources/remote/Makefile.am @@ -17,7 +17,7 @@ kcal_remote_la_LIBADD = libkcal_resourceremote.la \ libkcalincludedir = $(includedir)/libkcal libkcalinclude_HEADERS = resourceremoteconfig.h resourceremote.h -servicedir = $(kde_servicesdir)/kresources/kcal +servicedir = $(kde_servicesdir)/tderesources/kcal service_DATA = remote.desktop METASOURCES = AUTO diff --git a/kresources/remote/remote.desktop b/tderesources/remote/remote.desktop index 4b003173..4b003173 100644 --- a/kresources/remote/remote.desktop +++ b/tderesources/remote/remote.desktop diff --git a/kresources/remote/resourceremote.cpp b/tderesources/remote/resourceremote.cpp index 3803ecbe..ed05f840 100644 --- a/kresources/remote/resourceremote.cpp +++ b/tderesources/remote/resourceremote.cpp @@ -43,7 +43,7 @@ #include <kabc/lock.h> -#include <kresources/configwidget.h> +#include <tderesources/configwidget.h> #include "resourceremoteconfig.h" diff --git a/kresources/remote/resourceremote.h b/tderesources/remote/resourceremote.h index 2c3fd5fa..2c3fd5fa 100644 --- a/kresources/remote/resourceremote.h +++ b/tderesources/remote/resourceremote.h diff --git a/kresources/remote/resourceremote_plugin.cpp b/tderesources/remote/resourceremote_plugin.cpp index 67eaa92f..67eaa92f 100644 --- a/kresources/remote/resourceremote_plugin.cpp +++ b/tderesources/remote/resourceremote_plugin.cpp diff --git a/kresources/remote/resourceremoteconfig.cpp b/tderesources/remote/resourceremoteconfig.cpp index 67d7f4b9..67d7f4b9 100644 --- a/kresources/remote/resourceremoteconfig.cpp +++ b/tderesources/remote/resourceremoteconfig.cpp diff --git a/kresources/remote/resourceremoteconfig.h b/tderesources/remote/resourceremoteconfig.h index 595a5d73..a05171ee 100644 --- a/kresources/remote/resourceremoteconfig.h +++ b/tderesources/remote/resourceremoteconfig.h @@ -27,8 +27,8 @@ #include <tqbuttongroup.h> #include <kurlrequester.h> -#include <kresources/resource.h> -#include <kresources/configwidget.h> +#include <tderesources/resource.h> +#include <tderesources/configwidget.h> #include <tdepimmacros.h> diff --git a/kresources/scalix/CMakeLists.txt b/tderesources/scalix/CMakeLists.txt index ca7fc523..ca7fc523 100644 --- a/kresources/scalix/CMakeLists.txt +++ b/tderesources/scalix/CMakeLists.txt diff --git a/kresources/scalix/Makefile.am b/tderesources/scalix/Makefile.am index 1a58c7ec..1a58c7ec 100644 --- a/kresources/scalix/Makefile.am +++ b/tderesources/scalix/Makefile.am diff --git a/kresources/scalix/README b/tderesources/scalix/README index 34a00e9a..34a00e9a 100644 --- a/kresources/scalix/README +++ b/tderesources/scalix/README diff --git a/kresources/scalix/kabc/CMakeLists.txt b/tderesources/scalix/kabc/CMakeLists.txt index c900f92b..99d42a33 100644 --- a/kresources/scalix/kabc/CMakeLists.txt +++ b/tderesources/scalix/kabc/CMakeLists.txt @@ -26,12 +26,12 @@ link_directories( install( FILES scalix.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kabc ) + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc ) install( FILES ../uninstall.desktop RENAME imap.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kabc ) + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc ) ##### kabc_scalix (module) ###################### diff --git a/kresources/scalix/kabc/Makefile.am b/tderesources/scalix/kabc/Makefile.am index a9fbf202..769c8dde 100644 --- a/kresources/scalix/kabc/Makefile.am +++ b/tderesources/scalix/kabc/Makefile.am @@ -1,6 +1,6 @@ METASOURCES = AUTO -INCLUDES = -I$(top_srcdir)/kresources/scalix/shared -I$(top_srcdir) $(all_includes) +INCLUDES = -I$(top_srcdir)/tderesources/scalix/shared -I$(top_srcdir) $(all_includes) # The scalix wizard links to this library too lib_LTLIBRARIES = libkabcscalix.la @@ -8,8 +8,8 @@ lib_LTLIBRARIES = libkabcscalix.la libkabcscalix_la_SOURCES = resourcescalix.cpp contact.cpp libkabcscalix_la_LDFLAGS = $(all_libraries) -no-undefined libkabcscalix_la_LIBADD = \ - $(top_builddir)/kresources/scalix/shared/libresourcescalixshared.la \ - -lkresources -lkabc + $(top_builddir)/tderesources/scalix/shared/libresourcescalixshared.la \ + -ltderesources -lkabc kde_module_LTLIBRARIES = kabc_scalix.la @@ -19,7 +19,7 @@ kabc_scalix_la_SOURCES = resourcescalix_plugin.cpp kabc_scalix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined kabc_scalix_la_LIBADD = libkabcscalix.la -servicedir = $(kde_servicesdir)/kresources/kabc +servicedir = $(kde_servicesdir)/tderesources/kabc service_DATA = scalix.desktop install-data-local: $(srcdir)/../uninstall.desktop diff --git a/kresources/scalix/kabc/contact.cpp b/tderesources/scalix/kabc/contact.cpp index 457a34e7..457a34e7 100644 --- a/kresources/scalix/kabc/contact.cpp +++ b/tderesources/scalix/kabc/contact.cpp diff --git a/kresources/scalix/kabc/contact.h b/tderesources/scalix/kabc/contact.h index ad095a8d..ad095a8d 100644 --- a/kresources/scalix/kabc/contact.h +++ b/tderesources/scalix/kabc/contact.h diff --git a/kresources/scalix/kabc/resourcescalix.cpp b/tderesources/scalix/kabc/resourcescalix.cpp index 42aef92d..42aef92d 100644 --- a/kresources/scalix/kabc/resourcescalix.cpp +++ b/tderesources/scalix/kabc/resourcescalix.cpp diff --git a/kresources/scalix/kabc/resourcescalix.h b/tderesources/scalix/kabc/resourcescalix.h index dbb0b93c..dbb0b93c 100644 --- a/kresources/scalix/kabc/resourcescalix.h +++ b/tderesources/scalix/kabc/resourcescalix.h diff --git a/kresources/scalix/kabc/resourcescalix_plugin.cpp b/tderesources/scalix/kabc/resourcescalix_plugin.cpp index bbf7a436..bbf7a436 100644 --- a/kresources/scalix/kabc/resourcescalix_plugin.cpp +++ b/tderesources/scalix/kabc/resourcescalix_plugin.cpp diff --git a/kresources/scalix/kabc/scalix.desktop b/tderesources/scalix/kabc/scalix.desktop index 3f483dff..3f483dff 100644 --- a/kresources/scalix/kabc/scalix.desktop +++ b/tderesources/scalix/kabc/scalix.desktop diff --git a/kresources/scalix/kcal/CMakeLists.txt b/tderesources/scalix/kcal/CMakeLists.txt index 40d56921..647ad26e 100644 --- a/kresources/scalix/kcal/CMakeLists.txt +++ b/tderesources/scalix/kcal/CMakeLists.txt @@ -26,12 +26,12 @@ link_directories( install( FILES scalix.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kcal ) + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) install( FILES ../uninstall.desktop RENAME imap.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kcal ) + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) ##### kcal_scalix (module) ###################### diff --git a/kresources/scalix/kcal/Makefile.am b/tderesources/scalix/kcal/Makefile.am index c124e48d..5ca09c64 100644 --- a/kresources/scalix/kcal/Makefile.am +++ b/tderesources/scalix/kcal/Makefile.am @@ -1,6 +1,6 @@ METASOURCES = AUTO -INCLUDES = -I$(top_srcdir)/kresources/scalix/shared -I$(top_srcdir) \ +INCLUDES = -I$(top_srcdir)/tderesources/scalix/shared -I$(top_srcdir) \ -I$(top_builddir)/libtdepim $(all_includes) # The scalix wizard links to this library too @@ -9,8 +9,8 @@ lib_LTLIBRARIES = libkcalscalix.la libkcalscalix_la_SOURCES = resourcescalix.cpp libkcalscalix_la_LDFLAGS = $(all_libraries) -no-undefined libkcalscalix_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \ - $(top_builddir)/kresources/scalix/shared/libresourcescalixshared.la \ - -lkresources + $(top_builddir)/tderesources/scalix/shared/libresourcescalixshared.la \ + -ltderesources kde_module_LTLIBRARIES = kcal_scalix.la @@ -18,7 +18,7 @@ kcal_scalix_la_SOURCES = resourcescalix_plugin.cpp kcal_scalix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined kcal_scalix_la_LIBADD = libkcalscalix.la -servicedir = $(kde_servicesdir)/kresources/kcal +servicedir = $(kde_servicesdir)/tderesources/kcal service_DATA = scalix.desktop install-data-local: $(srcdir)/../uninstall.desktop diff --git a/kresources/scalix/kcal/resourcescalix.cpp b/tderesources/scalix/kcal/resourcescalix.cpp index a757c81f..a757c81f 100644 --- a/kresources/scalix/kcal/resourcescalix.cpp +++ b/tderesources/scalix/kcal/resourcescalix.cpp diff --git a/kresources/scalix/kcal/resourcescalix.h b/tderesources/scalix/kcal/resourcescalix.h index dcd78397..dcd78397 100644 --- a/kresources/scalix/kcal/resourcescalix.h +++ b/tderesources/scalix/kcal/resourcescalix.h diff --git a/kresources/scalix/kcal/resourcescalix_plugin.cpp b/tderesources/scalix/kcal/resourcescalix_plugin.cpp index 036c2f45..036c2f45 100644 --- a/kresources/scalix/kcal/resourcescalix_plugin.cpp +++ b/tderesources/scalix/kcal/resourcescalix_plugin.cpp diff --git a/kresources/scalix/kcal/scalix.desktop b/tderesources/scalix/kcal/scalix.desktop index 06c5c818..06c5c818 100644 --- a/kresources/scalix/kcal/scalix.desktop +++ b/tderesources/scalix/kcal/scalix.desktop diff --git a/kresources/scalix/kioslave/CMakeLists.txt b/tderesources/scalix/kioslave/CMakeLists.txt index 7ba76f67..7ba76f67 100644 --- a/kresources/scalix/kioslave/CMakeLists.txt +++ b/tderesources/scalix/kioslave/CMakeLists.txt diff --git a/kresources/scalix/kioslave/Makefile.am b/tderesources/scalix/kioslave/Makefile.am index 5607fb9d..5607fb9d 100644 --- a/kresources/scalix/kioslave/Makefile.am +++ b/tderesources/scalix/kioslave/Makefile.am diff --git a/kresources/scalix/kioslave/scalix.cpp b/tderesources/scalix/kioslave/scalix.cpp index 1b4cc7b8..1b4cc7b8 100644 --- a/kresources/scalix/kioslave/scalix.cpp +++ b/tderesources/scalix/kioslave/scalix.cpp diff --git a/kresources/scalix/kioslave/scalix.h b/tderesources/scalix/kioslave/scalix.h index dc034b7b..dc034b7b 100644 --- a/kresources/scalix/kioslave/scalix.h +++ b/tderesources/scalix/kioslave/scalix.h diff --git a/kresources/scalix/kioslave/scalix.protocol b/tderesources/scalix/kioslave/scalix.protocol index a527d77d..a527d77d 100644 --- a/kresources/scalix/kioslave/scalix.protocol +++ b/tderesources/scalix/kioslave/scalix.protocol diff --git a/kresources/scalix/kioslave/scalixs.protocol b/tderesources/scalix/kioslave/scalixs.protocol index fd13db6a..fd13db6a 100644 --- a/kresources/scalix/kioslave/scalixs.protocol +++ b/tderesources/scalix/kioslave/scalixs.protocol diff --git a/kresources/scalix/knotes/CMakeLists.txt b/tderesources/scalix/knotes/CMakeLists.txt index 516690e0..2c088be7 100644 --- a/kresources/scalix/knotes/CMakeLists.txt +++ b/tderesources/scalix/knotes/CMakeLists.txt @@ -29,12 +29,12 @@ link_directories( install( FILES scalix.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/kresources/knotes ) + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/knotes ) install( FILES ../uninstall.desktop RENAME scalix.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/kresources/knotes ) + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/knotes ) ##### knotes_scalix (module) #################### diff --git a/kresources/scalix/knotes/Makefile.am b/tderesources/scalix/knotes/Makefile.am index 56d7efe3..31b1d49e 100644 --- a/kresources/scalix/knotes/Makefile.am +++ b/tderesources/scalix/knotes/Makefile.am @@ -1,6 +1,6 @@ METASOURCES = AUTO -INCLUDES = -I$(top_srcdir)/kresources/scalix/shared \ +INCLUDES = -I$(top_srcdir)/tderesources/scalix/shared \ -I$(top_srcdir) -I$(top_srcdir)/knotes -I$(top_builddir)/libtdepim $(all_includes) # The scalix wizard links to this library too @@ -9,10 +9,10 @@ lib_LTLIBRARIES = libknotesscalix.la libknotesscalix_la_SOURCES = resourcescalix.cpp libknotesscalix_la_LDFLAGS = $(all_libraries) -no-undefined libknotesscalix_la_LIBADD = \ - $(top_builddir)/kresources/scalix/shared/libresourcescalixshared.la \ + $(top_builddir)/tderesources/scalix/shared/libresourcescalixshared.la \ $(top_builddir)/knotes/libknotesresources.la \ $(top_builddir)/libkcal/libkcal.la \ - -lkresources -ltdeprint + -ltderesources -ltdeprint kde_module_LTLIBRARIES = knotes_scalix.la @@ -20,7 +20,7 @@ knotes_scalix_la_SOURCES = resourcescalix_plugin.cpp knotes_scalix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined knotes_scalix_la_LIBADD = libknotesscalix.la -servicedir = $(kde_servicesdir)/kresources/knotes +servicedir = $(kde_servicesdir)/tderesources/knotes service_DATA = scalix.desktop install-data-local: $(srcdir)/../uninstall.desktop diff --git a/kresources/scalix/knotes/resourcescalix.cpp b/tderesources/scalix/knotes/resourcescalix.cpp index 62b0daf4..62b0daf4 100644 --- a/kresources/scalix/knotes/resourcescalix.cpp +++ b/tderesources/scalix/knotes/resourcescalix.cpp diff --git a/kresources/scalix/knotes/resourcescalix.h b/tderesources/scalix/knotes/resourcescalix.h index 6a3676c1..6a3676c1 100644 --- a/kresources/scalix/knotes/resourcescalix.h +++ b/tderesources/scalix/knotes/resourcescalix.h diff --git a/kresources/scalix/knotes/resourcescalix_plugin.cpp b/tderesources/scalix/knotes/resourcescalix_plugin.cpp index 925c27b0..925c27b0 100644 --- a/kresources/scalix/knotes/resourcescalix_plugin.cpp +++ b/tderesources/scalix/knotes/resourcescalix_plugin.cpp diff --git a/kresources/scalix/knotes/scalix.desktop b/tderesources/scalix/knotes/scalix.desktop index 7669c7ae..7669c7ae 100644 --- a/kresources/scalix/knotes/scalix.desktop +++ b/tderesources/scalix/knotes/scalix.desktop diff --git a/kresources/scalix/scalixadmin/CMakeLists.txt b/tderesources/scalix/scalixadmin/CMakeLists.txt index f13d11a8..f13d11a8 100644 --- a/kresources/scalix/scalixadmin/CMakeLists.txt +++ b/tderesources/scalix/scalixadmin/CMakeLists.txt diff --git a/kresources/scalix/scalixadmin/Makefile.am b/tderesources/scalix/scalixadmin/Makefile.am index 3ec92c4f..05d29b98 100644 --- a/kresources/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) -lktexteditor +scalixadmin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor scalixadmin_LDADD = $(LIB_KABC) scalixadmin_SOURCES = main.cpp mainwindow.cpp passwordpage.cpp settings.cpp jobs.cpp \ otherusermanager.cpp otheruserview.cpp otheruserpage.cpp ldapview.cpp ldapdialog.cpp \ diff --git a/kresources/scalix/scalixadmin/delegatedialog.cpp b/tderesources/scalix/scalixadmin/delegatedialog.cpp index 661f5743..661f5743 100644 --- a/kresources/scalix/scalixadmin/delegatedialog.cpp +++ b/tderesources/scalix/scalixadmin/delegatedialog.cpp diff --git a/kresources/scalix/scalixadmin/delegatedialog.h b/tderesources/scalix/scalixadmin/delegatedialog.h index 2f258113..2f258113 100644 --- a/kresources/scalix/scalixadmin/delegatedialog.h +++ b/tderesources/scalix/scalixadmin/delegatedialog.h diff --git a/kresources/scalix/scalixadmin/delegatemanager.cpp b/tderesources/scalix/scalixadmin/delegatemanager.cpp index 686370d7..686370d7 100644 --- a/kresources/scalix/scalixadmin/delegatemanager.cpp +++ b/tderesources/scalix/scalixadmin/delegatemanager.cpp diff --git a/kresources/scalix/scalixadmin/delegatemanager.h b/tderesources/scalix/scalixadmin/delegatemanager.h index 05b0262d..05b0262d 100644 --- a/kresources/scalix/scalixadmin/delegatemanager.h +++ b/tderesources/scalix/scalixadmin/delegatemanager.h diff --git a/kresources/scalix/scalixadmin/delegatepage.cpp b/tderesources/scalix/scalixadmin/delegatepage.cpp index 169ff085..169ff085 100644 --- a/kresources/scalix/scalixadmin/delegatepage.cpp +++ b/tderesources/scalix/scalixadmin/delegatepage.cpp diff --git a/kresources/scalix/scalixadmin/delegatepage.h b/tderesources/scalix/scalixadmin/delegatepage.h index 0523effe..0523effe 100644 --- a/kresources/scalix/scalixadmin/delegatepage.h +++ b/tderesources/scalix/scalixadmin/delegatepage.h diff --git a/kresources/scalix/scalixadmin/delegateview.cpp b/tderesources/scalix/scalixadmin/delegateview.cpp index 1031f460..1031f460 100644 --- a/kresources/scalix/scalixadmin/delegateview.cpp +++ b/tderesources/scalix/scalixadmin/delegateview.cpp diff --git a/kresources/scalix/scalixadmin/delegateview.h b/tderesources/scalix/scalixadmin/delegateview.h index 5dfa379f..5dfa379f 100644 --- a/kresources/scalix/scalixadmin/delegateview.h +++ b/tderesources/scalix/scalixadmin/delegateview.h diff --git a/kresources/scalix/scalixadmin/jobs.cpp b/tderesources/scalix/scalixadmin/jobs.cpp index 49b0a8fe..49b0a8fe 100644 --- a/kresources/scalix/scalixadmin/jobs.cpp +++ b/tderesources/scalix/scalixadmin/jobs.cpp diff --git a/kresources/scalix/scalixadmin/jobs.h b/tderesources/scalix/scalixadmin/jobs.h index 0c73fb50..0c73fb50 100644 --- a/kresources/scalix/scalixadmin/jobs.h +++ b/tderesources/scalix/scalixadmin/jobs.h diff --git a/kresources/scalix/scalixadmin/ldapdialog.cpp b/tderesources/scalix/scalixadmin/ldapdialog.cpp index 6af08c4d..6af08c4d 100644 --- a/kresources/scalix/scalixadmin/ldapdialog.cpp +++ b/tderesources/scalix/scalixadmin/ldapdialog.cpp diff --git a/kresources/scalix/scalixadmin/ldapdialog.h b/tderesources/scalix/scalixadmin/ldapdialog.h index 9d822af1..9d822af1 100644 --- a/kresources/scalix/scalixadmin/ldapdialog.h +++ b/tderesources/scalix/scalixadmin/ldapdialog.h diff --git a/kresources/scalix/scalixadmin/ldapview.cpp b/tderesources/scalix/scalixadmin/ldapview.cpp index adf2fe3f..adf2fe3f 100644 --- a/kresources/scalix/scalixadmin/ldapview.cpp +++ b/tderesources/scalix/scalixadmin/ldapview.cpp diff --git a/kresources/scalix/scalixadmin/ldapview.h b/tderesources/scalix/scalixadmin/ldapview.h index 6af41aa7..6af41aa7 100644 --- a/kresources/scalix/scalixadmin/ldapview.h +++ b/tderesources/scalix/scalixadmin/ldapview.h diff --git a/kresources/scalix/scalixadmin/main.cpp b/tderesources/scalix/scalixadmin/main.cpp index 6b9192a3..6b9192a3 100644 --- a/kresources/scalix/scalixadmin/main.cpp +++ b/tderesources/scalix/scalixadmin/main.cpp diff --git a/kresources/scalix/scalixadmin/mainwindow.cpp b/tderesources/scalix/scalixadmin/mainwindow.cpp index 04e396d7..04e396d7 100644 --- a/kresources/scalix/scalixadmin/mainwindow.cpp +++ b/tderesources/scalix/scalixadmin/mainwindow.cpp diff --git a/kresources/scalix/scalixadmin/mainwindow.h b/tderesources/scalix/scalixadmin/mainwindow.h index 38c95598..38c95598 100644 --- a/kresources/scalix/scalixadmin/mainwindow.h +++ b/tderesources/scalix/scalixadmin/mainwindow.h diff --git a/kresources/scalix/scalixadmin/otherusermanager.cpp b/tderesources/scalix/scalixadmin/otherusermanager.cpp index a3c19de1..a3c19de1 100644 --- a/kresources/scalix/scalixadmin/otherusermanager.cpp +++ b/tderesources/scalix/scalixadmin/otherusermanager.cpp diff --git a/kresources/scalix/scalixadmin/otherusermanager.h b/tderesources/scalix/scalixadmin/otherusermanager.h index 26f33ee4..26f33ee4 100644 --- a/kresources/scalix/scalixadmin/otherusermanager.h +++ b/tderesources/scalix/scalixadmin/otherusermanager.h diff --git a/kresources/scalix/scalixadmin/otheruserpage.cpp b/tderesources/scalix/scalixadmin/otheruserpage.cpp index 3aac47c9..3aac47c9 100644 --- a/kresources/scalix/scalixadmin/otheruserpage.cpp +++ b/tderesources/scalix/scalixadmin/otheruserpage.cpp diff --git a/kresources/scalix/scalixadmin/otheruserpage.h b/tderesources/scalix/scalixadmin/otheruserpage.h index e8c5e269..e8c5e269 100644 --- a/kresources/scalix/scalixadmin/otheruserpage.h +++ b/tderesources/scalix/scalixadmin/otheruserpage.h diff --git a/kresources/scalix/scalixadmin/otheruserview.cpp b/tderesources/scalix/scalixadmin/otheruserview.cpp index 25a69428..25a69428 100644 --- a/kresources/scalix/scalixadmin/otheruserview.cpp +++ b/tderesources/scalix/scalixadmin/otheruserview.cpp diff --git a/kresources/scalix/scalixadmin/otheruserview.h b/tderesources/scalix/scalixadmin/otheruserview.h index b5d3ff00..b5d3ff00 100644 --- a/kresources/scalix/scalixadmin/otheruserview.h +++ b/tderesources/scalix/scalixadmin/otheruserview.h diff --git a/kresources/scalix/scalixadmin/outofofficepage.cpp b/tderesources/scalix/scalixadmin/outofofficepage.cpp index 4e34a914..4e34a914 100644 --- a/kresources/scalix/scalixadmin/outofofficepage.cpp +++ b/tderesources/scalix/scalixadmin/outofofficepage.cpp diff --git a/kresources/scalix/scalixadmin/outofofficepage.h b/tderesources/scalix/scalixadmin/outofofficepage.h index f9863fa1..f9863fa1 100644 --- a/kresources/scalix/scalixadmin/outofofficepage.h +++ b/tderesources/scalix/scalixadmin/outofofficepage.h diff --git a/kresources/scalix/scalixadmin/passwordpage.cpp b/tderesources/scalix/scalixadmin/passwordpage.cpp index 120de86f..6dd8ab10 100644 --- a/kresources/scalix/scalixadmin/passwordpage.cpp +++ b/tderesources/scalix/scalixadmin/passwordpage.cpp @@ -28,7 +28,7 @@ #include <klocale.h> #include <kmessagebox.h> #include <kstringhandler.h> -#include <kwallet.h> +#include <tdewallet.h> #include "jobs.h" #include "settings.h" diff --git a/kresources/scalix/scalixadmin/passwordpage.h b/tderesources/scalix/scalixadmin/passwordpage.h index 5255193e..5255193e 100644 --- a/kresources/scalix/scalixadmin/passwordpage.h +++ b/tderesources/scalix/scalixadmin/passwordpage.h diff --git a/kresources/scalix/scalixadmin/settings.cpp b/tderesources/scalix/scalixadmin/settings.cpp index 279491c5..279491c5 100644 --- a/kresources/scalix/scalixadmin/settings.cpp +++ b/tderesources/scalix/scalixadmin/settings.cpp diff --git a/kresources/scalix/scalixadmin/settings.h b/tderesources/scalix/scalixadmin/settings.h index 29028f3b..29028f3b 100644 --- a/kresources/scalix/scalixadmin/settings.h +++ b/tderesources/scalix/scalixadmin/settings.h diff --git a/kresources/scalix/shared/CMakeLists.txt b/tderesources/scalix/shared/CMakeLists.txt index 28ede16e..28ede16e 100644 --- a/kresources/scalix/shared/CMakeLists.txt +++ b/tderesources/scalix/shared/CMakeLists.txt diff --git a/kresources/scalix/shared/Makefile.am b/tderesources/scalix/shared/Makefile.am index 18bcbc0d..44b4dc95 100644 --- a/kresources/scalix/shared/Makefile.am +++ b/tderesources/scalix/shared/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kresources/lib $(all_includes) +INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tderesources/lib $(all_includes) noinst_HEADERS = resourcescalixbase.h scalixbase.h subresource.h diff --git a/kresources/scalix/shared/kmailconnection.cpp b/tderesources/scalix/shared/kmailconnection.cpp index 5a157048..5a157048 100644 --- a/kresources/scalix/shared/kmailconnection.cpp +++ b/tderesources/scalix/shared/kmailconnection.cpp diff --git a/kresources/scalix/shared/kmailconnection.h b/tderesources/scalix/shared/kmailconnection.h index 7fec6274..7fec6274 100644 --- a/kresources/scalix/shared/kmailconnection.h +++ b/tderesources/scalix/shared/kmailconnection.h diff --git a/kresources/scalix/shared/resourcescalixbase.cpp b/tderesources/scalix/shared/resourcescalixbase.cpp index de1aa915..1f829a79 100644 --- a/kresources/scalix/shared/resourcescalixbase.cpp +++ b/tderesources/scalix/shared/resourcescalixbase.cpp @@ -130,7 +130,7 @@ bool ResourceScalixBase::kmailUpdate( const TQString& resource, TQString ResourceScalixBase::configFile( const TQString& type ) const { return locateLocal( "config", - TQString( "kresources/scalix/%1rc" ).arg( type ) ); + TQString( "tderesources/scalix/%1rc" ).arg( type ) ); } bool ResourceScalixBase::connectToKMail() const diff --git a/kresources/scalix/shared/resourcescalixbase.h b/tderesources/scalix/shared/resourcescalixbase.h index 82c6e471..82c6e471 100644 --- a/kresources/scalix/shared/resourcescalixbase.h +++ b/tderesources/scalix/shared/resourcescalixbase.h diff --git a/kresources/scalix/shared/scalixbase.cpp b/tderesources/scalix/shared/scalixbase.cpp index d40bdb03..d40bdb03 100644 --- a/kresources/scalix/shared/scalixbase.cpp +++ b/tderesources/scalix/shared/scalixbase.cpp diff --git a/kresources/scalix/shared/scalixbase.h b/tderesources/scalix/shared/scalixbase.h index 7bff80a4..7bff80a4 100644 --- a/kresources/scalix/shared/scalixbase.h +++ b/tderesources/scalix/shared/scalixbase.h diff --git a/kresources/scalix/shared/subresource.cpp b/tderesources/scalix/shared/subresource.cpp index bd3fdd8a..bd3fdd8a 100644 --- a/kresources/scalix/shared/subresource.cpp +++ b/tderesources/scalix/shared/subresource.cpp diff --git a/kresources/scalix/shared/subresource.h b/tderesources/scalix/shared/subresource.h index 3fcb6b03..3fcb6b03 100644 --- a/kresources/scalix/shared/subresource.h +++ b/tderesources/scalix/shared/subresource.h diff --git a/kresources/scalix/uninstall.desktop b/tderesources/scalix/uninstall.desktop index e1e3e173..e1e3e173 100644 --- a/kresources/scalix/uninstall.desktop +++ b/tderesources/scalix/uninstall.desktop diff --git a/kresources/slox/CMakeLists.txt b/tderesources/slox/CMakeLists.txt index 42356978..51d974c4 100644 --- a/kresources/slox/CMakeLists.txt +++ b/tderesources/slox/CMakeLists.txt @@ -25,8 +25,8 @@ link_directories( ##### other data ################################ -install( FILES kcal_slox.desktop kcal_ox.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kcal ) -install( FILES kabc_slox.desktop kabc_ox.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kabc ) +install( FILES kcal_slox.desktop kcal_ox.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) +install( FILES kabc_slox.desktop kabc_ox.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc ) ##### kcal_slox (module) ######################## diff --git a/kresources/slox/Makefile.am b/tderesources/slox/Makefile.am index 2367ec78..7189d633 100644 --- a/kresources/slox/Makefile.am +++ b/tderesources/slox/Makefile.am @@ -34,15 +34,15 @@ kabc_slox_la_LIBADD = libkabc_slox.la EXTRA_PROGRAMS = testsloxaccounts -testsloxaccounts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +testsloxaccounts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor testsloxaccounts_LDADD = libkslox.la testsloxaccounts_SOURCES = testsloxaccounts.cpp -kcal_servicedir = $(kde_servicesdir)/kresources/kcal +kcal_servicedir = $(kde_servicesdir)/tderesources/kcal kcal_service_DATA = kcal_slox.desktop kcal_ox.desktop -kabc_servicedir = $(kde_servicesdir)/kresources/kabc +kabc_servicedir = $(kde_servicesdir)/tderesources/kabc kabc_service_DATA = kabc_slox.desktop kabc_ox.desktop METASOURCES = AUTO diff --git a/kresources/slox/kabc_ox.desktop b/tderesources/slox/kabc_ox.desktop index 39570ad2..39570ad2 100644 --- a/kresources/slox/kabc_ox.desktop +++ b/tderesources/slox/kabc_ox.desktop diff --git a/kresources/slox/kabc_slox.desktop b/tderesources/slox/kabc_slox.desktop index 6c7b0352..6c7b0352 100644 --- a/kresources/slox/kabc_slox.desktop +++ b/tderesources/slox/kabc_slox.desktop diff --git a/kresources/slox/kabcresourceslox.cpp b/tderesources/slox/kabcresourceslox.cpp index b83c0b95..e7ab6eca 100644 --- a/kresources/slox/kabcresourceslox.cpp +++ b/tderesources/slox/kabcresourceslox.cpp @@ -243,7 +243,7 @@ void ResourceSlox::slotResult( TDEIO::Job *job ) TQValueList<SloxItem>::ConstIterator it; for( it = items.begin(); it != items.end(); ++it ) { SloxItem item = *it; - TQString uid = "kresources_slox_kabc_" + item.sloxId; + TQString uid = "tderesources_slox_kabc_" + item.sloxId; if ( item.status == SloxItem::Delete ) { TQMap<TQString,Addressee>::Iterator it; it = mAddrMap.find( uid ); @@ -317,7 +317,7 @@ void ResourceSlox::slotUploadResult( TDEIO::Job *job ) // use the id provided by the server Addressee a = *search_res; mAddrMap.remove( search_res ); - a.setUid( "kresources_slox_kabc_" + item.sloxId ); + a.setUid( "tderesources_slox_kabc_" + item.sloxId ); a.setResource( this ); a.setChanged( false ); mAddrMap.replace( a.uid(), a ); @@ -494,7 +494,7 @@ void ResourceSlox::uploadContacts() } else if ( !changedAddr.isEmpty() ) { mUploadAddressee = changedAddr.first(); WebdavHandler::addSloxElement( this, doc, prop, fieldName( ObjectId ), - mUploadAddressee.uid().remove( 0, sizeof("kresources_slox_kabc_") - 1) ); + mUploadAddressee.uid().remove( 0, sizeof("tderesources_slox_kabc_") - 1) ); } else if ( !deletedAddr.isEmpty() ) { mUploadAddressee = deletedAddr.first(); isDelete = true; @@ -507,7 +507,7 @@ void ResourceSlox::uploadContacts() if ( !isDelete ) { createAddresseeFields( doc, prop, mUploadAddressee ); } else { - TQString tmp_uid = mUploadAddressee.uid().remove( 0, sizeof("kresources_slox_kabc_") - 1); // remove prefix from uid + TQString tmp_uid = mUploadAddressee.uid().remove( 0, sizeof("tderesources_slox_kabc_") - 1); // remove prefix from uid WebdavHandler::addSloxElement( this, doc, prop, fieldName( ObjectId ), tmp_uid ); WebdavHandler::addSloxElement( this, doc, prop, "method", "DELETE" ); } diff --git a/kresources/slox/kabcresourceslox.h b/tderesources/slox/kabcresourceslox.h index d5251bdc..d5251bdc 100644 --- a/kresources/slox/kabcresourceslox.h +++ b/tderesources/slox/kabcresourceslox.h diff --git a/kresources/slox/kabcresourceslox_plugin.cpp b/tderesources/slox/kabcresourceslox_plugin.cpp index cbc02f25..cbc02f25 100644 --- a/kresources/slox/kabcresourceslox_plugin.cpp +++ b/tderesources/slox/kabcresourceslox_plugin.cpp diff --git a/kresources/slox/kabcresourcesloxconfig.cpp b/tderesources/slox/kabcresourcesloxconfig.cpp index d9e32a55..d9e32a55 100644 --- a/kresources/slox/kabcresourcesloxconfig.cpp +++ b/tderesources/slox/kabcresourcesloxconfig.cpp diff --git a/kresources/slox/kabcresourcesloxconfig.h b/tderesources/slox/kabcresourcesloxconfig.h index b845321a..9cd54d83 100644 --- a/kresources/slox/kabcresourcesloxconfig.h +++ b/tderesources/slox/kabcresourcesloxconfig.h @@ -20,7 +20,7 @@ #ifndef RESOURCESLOXCONFIG_H #define RESOURCESLOXCONFIG_H -#include <kresources/configwidget.h> +#include <tderesources/configwidget.h> #include <tdepimmacros.h> class TQCheckBox; diff --git a/kresources/slox/kabcsloxprefs.kcfgc b/tderesources/slox/kabcsloxprefs.kcfgc index 5e5d8969..11e2f2c2 100644 --- a/kresources/slox/kabcsloxprefs.kcfgc +++ b/tderesources/slox/kabcsloxprefs.kcfgc @@ -1,5 +1,5 @@ # Code generation options for kconfig_compiler -File=kresources_kabc_slox.kcfg +File=tderesources_kabc_slox.kcfg ClassName=SloxPrefs NameSpace=KABC Singleton=false diff --git a/kresources/slox/kcal_ox.desktop b/tderesources/slox/kcal_ox.desktop index 6d0e5ec6..6d0e5ec6 100644 --- a/kresources/slox/kcal_ox.desktop +++ b/tderesources/slox/kcal_ox.desktop diff --git a/kresources/slox/kcal_slox.desktop b/tderesources/slox/kcal_slox.desktop index 9b9198d7..9b9198d7 100644 --- a/kresources/slox/kcal_slox.desktop +++ b/tderesources/slox/kcal_slox.desktop diff --git a/kresources/slox/kcalresourceslox.cpp b/tderesources/slox/kcalresourceslox.cpp index 98ca90ea..1311ebc5 100644 --- a/kresources/slox/kcalresourceslox.cpp +++ b/tderesources/slox/kcalresourceslox.cpp @@ -51,7 +51,7 @@ #include <kabc/locknull.h> #include <kabc/stdaddressbook.h> -#include <kresources/configwidget.h> +#include <tderesources/configwidget.h> #include "webdavhandler.h" #include "kcalsloxprefs.h" diff --git a/kresources/slox/kcalresourceslox.h b/tderesources/slox/kcalresourceslox.h index 6735b993..6735b993 100644 --- a/kresources/slox/kcalresourceslox.h +++ b/tderesources/slox/kcalresourceslox.h diff --git a/kresources/slox/kcalresourceslox_plugin.cpp b/tderesources/slox/kcalresourceslox_plugin.cpp index 8a5cf690..8a5cf690 100644 --- a/kresources/slox/kcalresourceslox_plugin.cpp +++ b/tderesources/slox/kcalresourceslox_plugin.cpp diff --git a/kresources/slox/kcalresourcesloxconfig.cpp b/tderesources/slox/kcalresourcesloxconfig.cpp index e09cf85c..e09cf85c 100644 --- a/kresources/slox/kcalresourcesloxconfig.cpp +++ b/tderesources/slox/kcalresourcesloxconfig.cpp diff --git a/kresources/slox/kcalresourcesloxconfig.h b/tderesources/slox/kcalresourcesloxconfig.h index 619854a8..e2a666c0 100644 --- a/kresources/slox/kcalresourcesloxconfig.h +++ b/tderesources/slox/kcalresourcesloxconfig.h @@ -23,8 +23,8 @@ #include <kurlrequester.h> #include <tdepimmacros.h> -#include <kresources/resource.h> -#include <kresources/configwidget.h> +#include <tderesources/resource.h> +#include <tderesources/configwidget.h> class TQCheckBox; class KLineEdit; diff --git a/kresources/slox/kcalsloxprefs.kcfgc b/tderesources/slox/kcalsloxprefs.kcfgc index 11bbd60a..3b352a21 100644 --- a/kresources/slox/kcalsloxprefs.kcfgc +++ b/tderesources/slox/kcalsloxprefs.kcfgc @@ -1,5 +1,5 @@ # Code generation options for kconfig_compiler -File=kresources_kcal_slox.kcfg +File=tderesources_kcal_slox.kcfg ClassName=SloxPrefs NameSpace=KCal Singleton=false diff --git a/kresources/slox/sloxaccounts.cpp b/tderesources/slox/sloxaccounts.cpp index aa648d1b..aa648d1b 100644 --- a/kresources/slox/sloxaccounts.cpp +++ b/tderesources/slox/sloxaccounts.cpp diff --git a/kresources/slox/sloxaccounts.h b/tderesources/slox/sloxaccounts.h index 214e3c70..214e3c70 100644 --- a/kresources/slox/sloxaccounts.h +++ b/tderesources/slox/sloxaccounts.h diff --git a/kresources/slox/sloxbase.cpp b/tderesources/slox/sloxbase.cpp index 3871a2c7..a27652c9 100644 --- a/kresources/slox/sloxbase.cpp +++ b/tderesources/slox/sloxbase.cpp @@ -20,7 +20,7 @@ #include "sloxbase.h" #include <kdebug.h> -#include <kresources/resource.h> +#include <tderesources/resource.h> static TQString mFieldNameMap[][2] = { diff --git a/kresources/slox/sloxbase.h b/tderesources/slox/sloxbase.h index 8e9309c9..8e9309c9 100644 --- a/kresources/slox/sloxbase.h +++ b/tderesources/slox/sloxbase.h diff --git a/kresources/slox/sloxfolder.cpp b/tderesources/slox/sloxfolder.cpp index fbfb9f05..fbfb9f05 100644 --- a/kresources/slox/sloxfolder.cpp +++ b/tderesources/slox/sloxfolder.cpp diff --git a/kresources/slox/sloxfolder.h b/tderesources/slox/sloxfolder.h index e722dfd4..e722dfd4 100644 --- a/kresources/slox/sloxfolder.h +++ b/tderesources/slox/sloxfolder.h diff --git a/kresources/slox/sloxfolderdialog.cpp b/tderesources/slox/sloxfolderdialog.cpp index 4d21c230..4d21c230 100644 --- a/kresources/slox/sloxfolderdialog.cpp +++ b/tderesources/slox/sloxfolderdialog.cpp diff --git a/kresources/slox/sloxfolderdialog.h b/tderesources/slox/sloxfolderdialog.h index 69b8126b..69b8126b 100644 --- a/kresources/slox/sloxfolderdialog.h +++ b/tderesources/slox/sloxfolderdialog.h diff --git a/kresources/slox/sloxfoldermanager.cpp b/tderesources/slox/sloxfoldermanager.cpp index a60cd788..a60cd788 100644 --- a/kresources/slox/sloxfoldermanager.cpp +++ b/tderesources/slox/sloxfoldermanager.cpp diff --git a/kresources/slox/sloxfoldermanager.h b/tderesources/slox/sloxfoldermanager.h index f31c212c..f31c212c 100644 --- a/kresources/slox/sloxfoldermanager.h +++ b/tderesources/slox/sloxfoldermanager.h diff --git a/kresources/slox/kresources_kabc_slox.kcfg b/tderesources/slox/tderesources_kabc_slox.kcfg index 159605ba..6e3057e6 100644 --- a/kresources/slox/kresources_kabc_slox.kcfg +++ b/tderesources/slox/tderesources_kabc_slox.kcfg @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > - <kcfgfile name="kresources_kabc_sloxrc"/> + <kcfgfile name="tderesources_kabc_sloxrc"/> <group name="General"> <entry type="String" name="Url"> diff --git a/kresources/slox/kresources_kcal_slox.kcfg b/tderesources/slox/tderesources_kcal_slox.kcfg index 9e4e6f4e..9cf35804 100644 --- a/kresources/slox/kresources_kcal_slox.kcfg +++ b/tderesources/slox/tderesources_kcal_slox.kcfg @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > - <kcfgfile name="kresources_kcal_sloxrc"/> + <kcfgfile name="tderesources_kcal_sloxrc"/> <group name="General"> <entry type="String" name="Url"> diff --git a/kresources/slox/testsloxaccounts.cpp b/tderesources/slox/testsloxaccounts.cpp index e173134c..e173134c 100644 --- a/kresources/slox/testsloxaccounts.cpp +++ b/tderesources/slox/testsloxaccounts.cpp diff --git a/kresources/slox/webdavhandler.cpp b/tderesources/slox/webdavhandler.cpp index 32d3c416..32d3c416 100644 --- a/kresources/slox/webdavhandler.cpp +++ b/tderesources/slox/webdavhandler.cpp diff --git a/kresources/slox/webdavhandler.h b/tderesources/slox/webdavhandler.h index 136be879..136be879 100644 --- a/kresources/slox/webdavhandler.h +++ b/tderesources/slox/webdavhandler.h diff --git a/kresources/tvanytime/AUTHORS b/tderesources/tvanytime/AUTHORS index 05ef12ec..05ef12ec 100644 --- a/kresources/tvanytime/AUTHORS +++ b/tderesources/tvanytime/AUTHORS diff --git a/kresources/tvanytime/COPYING b/tderesources/tvanytime/COPYING index c13faf0d..c13faf0d 100644 --- a/kresources/tvanytime/COPYING +++ b/tderesources/tvanytime/COPYING diff --git a/kresources/tvanytime/ChangeLog b/tderesources/tvanytime/ChangeLog index fc31a7a2..fc31a7a2 100644 --- a/kresources/tvanytime/ChangeLog +++ b/tderesources/tvanytime/ChangeLog diff --git a/kresources/tvanytime/DESIGN b/tderesources/tvanytime/DESIGN index 874fa7cd..874fa7cd 100644 --- a/kresources/tvanytime/DESIGN +++ b/tderesources/tvanytime/DESIGN diff --git a/kresources/tvanytime/Makefile.am b/tderesources/tvanytime/Makefile.am index 49bda135..e7c8c40d 100644 --- a/kresources/tvanytime/Makefile.am +++ b/tderesources/tvanytime/Makefile.am @@ -16,7 +16,7 @@ kcal_tvanytime_la_SOURCES = kcal_resourcetvanytime_plugin.cpp kcal_tvanytime_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) kcal_tvanytime_la_LIBADD = libkcal_tvanytime.la -kcal_servicedir = $(kde_servicesdir)/kresources/kcal +kcal_servicedir = $(kde_servicesdir)/tderesources/kcal kcal_service_DATA = kcal_tvanytime.desktop METASOURCES = AUTO diff --git a/kresources/tvanytime/README b/tderesources/tvanytime/README index 17ad628c..17ad628c 100644 --- a/kresources/tvanytime/README +++ b/tderesources/tvanytime/README diff --git a/kresources/tvanytime/TODO b/tderesources/tvanytime/TODO index bc2d8a1f..bc2d8a1f 100644 --- a/kresources/tvanytime/TODO +++ b/tderesources/tvanytime/TODO diff --git a/kresources/tvanytime/kcal_resourcetvanytime.cpp b/tderesources/tvanytime/kcal_resourcetvanytime.cpp index e447008c..9de4b0d1 100644 --- a/kresources/tvanytime/kcal_resourcetvanytime.cpp +++ b/tderesources/tvanytime/kcal_resourcetvanytime.cpp @@ -42,7 +42,7 @@ #include <karchive.h> #include <kdebug.h> #include <klocale.h> -#include <kresources/configwidget.h> +#include <tderesources/configwidget.h> #include <kstandarddirs.h> #include <kstringhandler.h> #include <ktempfile.h> diff --git a/kresources/tvanytime/kcal_resourcetvanytime.h b/tderesources/tvanytime/kcal_resourcetvanytime.h index 1c8bd9c9..1c8bd9c9 100644 --- a/kresources/tvanytime/kcal_resourcetvanytime.h +++ b/tderesources/tvanytime/kcal_resourcetvanytime.h diff --git a/kresources/tvanytime/kcal_resourcetvanytime_plugin.cpp b/tderesources/tvanytime/kcal_resourcetvanytime_plugin.cpp index 9ff0ae75..9ff0ae75 100644 --- a/kresources/tvanytime/kcal_resourcetvanytime_plugin.cpp +++ b/tderesources/tvanytime/kcal_resourcetvanytime_plugin.cpp diff --git a/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp b/tderesources/tvanytime/kcal_resourcetvanytimeconfig.cpp index f9ec2a49..f9ec2a49 100644 --- a/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp +++ b/tderesources/tvanytime/kcal_resourcetvanytimeconfig.cpp diff --git a/kresources/tvanytime/kcal_resourcetvanytimeconfig.h b/tderesources/tvanytime/kcal_resourcetvanytimeconfig.h index 404738ae..c99e86e0 100644 --- a/kresources/tvanytime/kcal_resourcetvanytimeconfig.h +++ b/tderesources/tvanytime/kcal_resourcetvanytimeconfig.h @@ -23,8 +23,8 @@ #include <kurlrequester.h> #include <tdepimmacros.h> -#include <kresources/resource.h> -#include <kresources/configwidget.h> +#include <tderesources/resource.h> +#include <tderesources/configwidget.h> class TQSpinBox; class KLineEdit; diff --git a/kresources/tvanytime/kcal_tvanytime.desktop b/tderesources/tvanytime/kcal_tvanytime.desktop index 9f6eef3c..9f6eef3c 100644 --- a/kresources/tvanytime/kcal_tvanytime.desktop +++ b/tderesources/tvanytime/kcal_tvanytime.desktop diff --git a/kresources/tvanytime/kcal_tvanytimeprefs.cpp b/tderesources/tvanytime/kcal_tvanytimeprefs.cpp index 26f3f7ef..26f3f7ef 100644 --- a/kresources/tvanytime/kcal_tvanytimeprefs.cpp +++ b/tderesources/tvanytime/kcal_tvanytimeprefs.cpp diff --git a/kresources/tvanytime/kcal_tvanytimeprefs.h b/tderesources/tvanytime/kcal_tvanytimeprefs.h index 2ab10802..2ab10802 100644 --- a/kresources/tvanytime/kcal_tvanytimeprefs.h +++ b/tderesources/tvanytime/kcal_tvanytimeprefs.h diff --git a/kresources/tvanytime/kcal_tvanytimeprefsbase.kcfgc b/tderesources/tvanytime/kcal_tvanytimeprefsbase.kcfgc index b2d850ff..6693e414 100644 --- a/kresources/tvanytime/kcal_tvanytimeprefsbase.kcfgc +++ b/tderesources/tvanytime/kcal_tvanytimeprefsbase.kcfgc @@ -1,5 +1,5 @@ # Code generation options for kconfig_compiler -File=kresources_kcal_tvanytime.kcfg +File=tderesources_kcal_tvanytime.kcfg ClassName=TVAnytimePrefsBase NameSpace=KCal Singleton=false diff --git a/kresources/tvanytime/service.cpp b/tderesources/tvanytime/service.cpp index f713f7b1..f713f7b1 100644 --- a/kresources/tvanytime/service.cpp +++ b/tderesources/tvanytime/service.cpp diff --git a/kresources/tvanytime/service.h b/tderesources/tvanytime/service.h index 78570fe1..78570fe1 100644 --- a/kresources/tvanytime/service.h +++ b/tderesources/tvanytime/service.h diff --git a/kresources/tvanytime/kresources_kcal_tvanytime.kcfg b/tderesources/tvanytime/tderesources_kcal_tvanytime.kcfg index 774cdaea..5140468d 100644 --- a/kresources/tvanytime/kresources_kcal_tvanytime.kcfg +++ b/tderesources/tvanytime/tderesources_kcal_tvanytime.kcfg @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > - <kcfgfile name="kresources_kcal_bbcschedulerc" /> + <kcfgfile name="tderesources_kcal_bbcschedulerc" /> <group name="General" > <entry key="Url" type="String" > <label>Schedule URL</label> diff --git a/kresources/tvanytime/tvanytime.tdevelop b/tderesources/tvanytime/tvanytime.tdevelop index aba23b3a..4359032f 100644 --- a/kresources/tvanytime/tvanytime.tdevelop +++ b/tderesources/tvanytime/tvanytime.tdevelop @@ -37,13 +37,13 @@ </optimized> <debug> <configargs>--enable-debug=full</configargs> - <builddir>/space/kde/svn/head/build/tdepim/kresources/tvanytime</builddir> + <builddir>/space/kde/svn/head/build/tdepim/tderesources/tvanytime</builddir> <ccompiler>kdevgccoptions</ccompiler> <cxxcompiler>kdevgppoptions</cxxcompiler> <f77compiler>kdevg77options</f77compiler> <cxxflags>-O0 -g3</cxxflags> <envvars/> - <topsourcedir>/space/kde/svn/head/src/tdepim/kresources/tvanytime</topsourcedir> + <topsourcedir>/space/kde/svn/head/src/tdepim/tderesources/tvanytime</topsourcedir> <cppflags/> <ldflags/> <ccompilerbinary/> @@ -159,7 +159,7 @@ <LICENSEFILE>COPYING</LICENSEFILE> <VERSION>0.1</VERSION> <YEAR>2005</YEAR> - <dest>/space/kde/head/src/tdepim/kresources/tvanytime</dest> + <dest>/space/kde/head/src/tdepim/tderesources/tvanytime</dest> </substmap> <kdevcppsupport> <references> diff --git a/wizards/CMakeLists.txt b/wizards/CMakeLists.txt index 7f2dd2df..c437ff6f 100644 --- a/wizards/CMakeLists.txt +++ b/wizards/CMakeLists.txt @@ -22,7 +22,7 @@ tde_import( ktnef ) tde_import( libkcal ) tde_import( libtdepim ) tde_import( knotes ) -tde_import( kresources ) +tde_import( tderesources ) if( WITH_KOLAB OR WITH_GROUPWISE OR WITH_SCALIX ) tde_import( libtdenetwork ) @@ -38,7 +38,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/libtdepim ${CMAKE_SOURCE_DIR}/certmanager/lib ${CMAKE_SOURCE_DIR}/knotes - ${CMAKE_SOURCE_DIR}/kresources/lib + ${CMAKE_SOURCE_DIR}/tderesources/lib ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) @@ -79,14 +79,14 @@ if( WITH_EGROUPWARE ) install( FILES egroupware.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) - process_kcfg( egroupwarewizard.cpp kabc_egroupwareprefs.h kresources/egroupware - kresources_kabc_egroupware.kcfg kabc_egroupwareprefs.kcfgc ) + process_kcfg( egroupwarewizard.cpp kabc_egroupwareprefs.h tderesources/egroupware + tderesources_kabc_egroupware.kcfg kabc_egroupwareprefs.kcfgc ) - process_kcfg( egroupwarewizard.cpp kcal_egroupwareprefs.h kresources/egroupware - kresources_kcal_egroupware.kcfg kcal_egroupwareprefs.kcfgc ) + process_kcfg( egroupwarewizard.cpp kcal_egroupwareprefs.h tderesources/egroupware + tderesources_kcal_egroupware.kcfg kcal_egroupwareprefs.kcfgc ) - process_kcfg( egroupwarewizard.cpp knotes_egroupwareprefs.h kresources/egroupware - kresources_knotes_egroupware.kcfg knotes_egroupwareprefs.kcfgc ) + process_kcfg( egroupwarewizard.cpp knotes_egroupwareprefs.h tderesources/egroupware + tderesources_knotes_egroupware.kcfg knotes_egroupwareprefs.kcfgc ) tde_add_library( egroupwarewizard SHARED NO_EXPORT SOURCES @@ -110,11 +110,11 @@ if( WITH_SLOX ) install( FILES slox.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) - process_kcfg( sloxwizard.cpp kabcsloxprefs.h kresources/slox - kresources_kabc_slox.kcfg kabcsloxprefs.kcfgc ) + process_kcfg( sloxwizard.cpp kabcsloxprefs.h tderesources/slox + tderesources_kabc_slox.kcfg kabcsloxprefs.kcfgc ) - process_kcfg( sloxwizard.cpp kcalsloxprefs.h kresources/slox - kresources_kcal_slox.kcfg kcalsloxprefs.kcfgc ) + process_kcfg( sloxwizard.cpp kcalsloxprefs.h tderesources/slox + tderesources_kcal_slox.kcfg kcalsloxprefs.kcfgc ) tde_add_library( sloxwizard SHARED NO_EXPORT SOURCES @@ -182,11 +182,11 @@ if( WITH_GROUPWISE ) install( FILES groupwise.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) - process_kcfg( groupwisewizard.cpp kcal_groupwiseprefsbase.h kresources/groupwise - kresources_kcal_groupwise.kcfg kcal_groupwiseprefsbase.kcfgc ) + process_kcfg( groupwisewizard.cpp kcal_groupwiseprefsbase.h tderesources/groupwise + tderesources_kcal_groupwise.kcfg kcal_groupwiseprefsbase.kcfgc ) - process_kcfg( groupwisewizard.cpp kabc_groupwiseprefs.h kresources/groupwise - kresources_kabc_groupwise.kcfg kabc_groupwiseprefs.kcfgc ) + process_kcfg( groupwisewizard.cpp kabc_groupwiseprefs.h tderesources/groupwise + tderesources_kabc_groupwise.kcfg kabc_groupwiseprefs.kcfgc ) tde_add_library( groupwisewizard SHARED AUTOMOC NO_EXPORT SOURCES diff --git a/wizards/Makefile.am b/wizards/Makefile.am index 3447f4ea..5faa267a 100644 --- a/wizards/Makefile.am +++ b/wizards/Makefile.am @@ -1,12 +1,12 @@ METASOURCES = AUTO INCLUDES = -I$(top_srcdir)/libkpimidentities -I$(top_srcdir)/libkcal \ - -I$(top_srcdir)/kresources/kolab/shared -I$(top_srcdir) \ + -I$(top_srcdir)/tderesources/kolab/shared -I$(top_srcdir) \ -I$(top_srcdir)/knotes \ -I$(top_srcdir)/certmanager/lib \ - -I$(top_builddir)/kresources/groupwise \ - -I$(top_builddir)/kresources/lib \ - -I$(top_srcdir)/kresources/lib \ + -I$(top_builddir)/tderesources/groupwise \ + -I$(top_builddir)/tderesources/lib \ + -I$(top_srcdir)/tderesources/lib \ $(all_includes) bin_PROGRAMS = groupwarewizard egroupwarewizard sloxwizard kolabwizard \ @@ -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) -lktexteditor +groupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor groupwarewizard_LDADD = libegroupwarewizard.la libsloxwizard.la $(LIB_TDEUI) \ libkolabwizard.la \ libexchangewizard.la \ @@ -28,9 +28,9 @@ groupwarewizard_SOURCES = groupwarewizard.cpp main.cpp overviewpage.cpp # Kolab libkolabwizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) -libkolabwizard_la_LIBADD = $(top_builddir)/kresources/kolab/kcal/libkcalkolab.la \ - $(top_builddir)/kresources/kolab/kabc/libkabckolab.la \ - $(top_builddir)/kresources/kolab/knotes/libknoteskolab.la \ +libkolabwizard_la_LIBADD = $(top_builddir)/tderesources/kolab/kcal/libkcalkolab.la \ + $(top_builddir)/tderesources/kolab/kabc/libkabckolab.la \ + $(top_builddir)/tderesources/kolab/knotes/libknoteskolab.la \ $(top_builddir)/libkcal/libkcal.la \ $(top_builddir)/libtdepim/libtdepim.la \ $(top_builddir)/libkpimidentities/libkpimidentities.la @@ -39,65 +39,65 @@ 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) -lktexteditor +kolabwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kolabwizard_SOURCES = kolabmain.cpp # eGroupware libegroupwarewizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) libegroupwarewizard_la_SOURCES = egroupwarewizard.cpp egroupwareconfig.kcfgc -libegroupwarewizard_la_LIBADD = $(top_builddir)/kresources/egroupware/libkabc_xmlrpc.la \ - $(top_builddir)/kresources/egroupware/libkcal_xmlrpc.la \ - $(top_builddir)/kresources/egroupware/libknotes_xmlrpc.la \ +libegroupwarewizard_la_LIBADD = $(top_builddir)/tderesources/egroupware/libkabc_xmlrpc.la \ + $(top_builddir)/tderesources/egroupware/libkcal_xmlrpc.la \ + $(top_builddir)/tderesources/egroupware/libknotes_xmlrpc.la \ $(top_builddir)/libkcal/libkcal.la \ $(top_builddir)/libtdepim/libtdepim.la \ $(LIB_TDEUI) egroupwarewizard_LDADD = libegroupwarewizard.la -egroupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +egroupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor egroupwarewizard_SOURCES = egroupwaremain.cpp # SLOX libsloxwizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) libsloxwizard_la_SOURCES = sloxwizard.cpp sloxconfig.kcfgc -libsloxwizard_la_LIBADD = $(top_builddir)/kresources/slox/libkcal_slox.la \ - $(top_builddir)/kresources/slox/libkabc_slox.la \ +libsloxwizard_la_LIBADD = $(top_builddir)/tderesources/slox/libkcal_slox.la \ + $(top_builddir)/tderesources/slox/libkabc_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) -lktexteditor +sloxwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor sloxwizard_SOURCES = sloxmain.cpp # GroupWise libgroupwisewizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) libgroupwisewizard_la_SOURCES = groupwisewizard.cpp groupwiseconfig.kcfgc \ kmailchanges.cpp -libgroupwisewizard_la_LIBADD = $(top_builddir)/kresources/groupwise/libkcal_groupwise.la \ - $(top_builddir)/kresources/groupwise/libkabc_groupwise.la \ +libgroupwisewizard_la_LIBADD = $(top_builddir)/tderesources/groupwise/libkcal_groupwise.la \ + $(top_builddir)/tderesources/groupwise/libkabc_groupwise.la \ $(top_builddir)/libtdepim/libtdepim.la \ $(top_builddir)/libkpimidentities/libkpimidentities.la -libgroupwisewizard_la_COMPILE_FIRST = $(top_builddir)/kresources/groupwise/kabc_groupwiseprefs.h \ - $(top_builddir)/kresources/groupwise/kcal_groupwiseprefsbase.h +libgroupwisewizard_la_COMPILE_FIRST = $(top_builddir)/tderesources/groupwise/kabc_groupwiseprefs.h \ + $(top_builddir)/tderesources/groupwise/kcal_groupwiseprefsbase.h groupwisewizard_LDADD = libgroupwisewizard.la -groupwisewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +groupwisewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor groupwisewizard_SOURCES = groupwisemain.cpp # Exchange libexchangewizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) libexchangewizard_la_SOURCES = exchangewizard.cpp -libexchangewizard_la_LIBADD = $(top_builddir)/kresources/newexchange/libkcal_newexchange.la \ - $(top_builddir)/kresources/newexchange/libkabc_newexchange.la \ +libexchangewizard_la_LIBADD = $(top_builddir)/tderesources/newexchange/libkcal_newexchange.la \ + $(top_builddir)/tderesources/newexchange/libkabc_newexchange.la \ $(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) -lktexteditor +exchangewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor exchangewizard_SOURCES = exchangemain.cpp # Scalix libscalixwizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) -libscalixwizard_la_LIBADD = $(top_builddir)/kresources/scalix/kcal/libkcalscalix.la \ - $(top_builddir)/kresources/scalix/kabc/libkabcscalix.la \ +libscalixwizard_la_LIBADD = $(top_builddir)/tderesources/scalix/kcal/libkcalscalix.la \ + $(top_builddir)/tderesources/scalix/kabc/libkabcscalix.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) -lktexteditor +scalixwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor scalixwizard_SOURCES = scalixmain.cpp noinst_HEADERS = egroupwarewizard.h kmailchanges.h kolabwizard.h sloxwizard.h \ @@ -117,8 +117,8 @@ kde_kcfg_DATA = egroupware.kcfg slox.kcfg kolab.kcfg groupwise.kcfg scalix.kcfg messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/tdepimwizards.pot -egroupwarewizard.lo: ../kresources/egroupware/kabc_egroupwareprefs.h ../kresources/egroupware/kcal_egroupwareprefs.h ../kresources/egroupware/knotes_egroupwareprefs.h -exchangewizard.lo: ../kresources/lib/kresources_groupwareprefs.h -sloxwizard.lo: ../kresources/slox/kabcsloxprefs.h ../kresources/slox/kcalsloxprefs.h +egroupwarewizard.lo: ../tderesources/egroupware/kabc_egroupwareprefs.h ../tderesources/egroupware/kcal_egroupwareprefs.h ../tderesources/egroupware/knotes_egroupwareprefs.h +exchangewizard.lo: ../tderesources/lib/tderesources_groupwareprefs.h +sloxwizard.lo: ../tderesources/slox/kabcsloxprefs.h ../tderesources/slox/kcalsloxprefs.h xdg_apps_DATA = groupwarewizard.desktop diff --git a/wizards/egroupwarewizard.cpp b/wizards/egroupwarewizard.cpp index d644d0e4..843a2059 100644 --- a/wizards/egroupwarewizard.cpp +++ b/wizards/egroupwarewizard.cpp @@ -21,12 +21,12 @@ #include "egroupwarewizard.h" #include "egroupwareconfig.h" -#include "kresources/egroupware/kabc_egroupwareprefs.h" -#include "kresources/egroupware/kabc_resourcexmlrpc.h" -#include "kresources/egroupware/kcal_egroupwareprefs.h" -#include "kresources/egroupware/kcal_resourcexmlrpc.h" -#include "kresources/egroupware/knotes_egroupwareprefs.h" -#include "kresources/egroupware/knotes_resourcexmlrpc.h" +#include "tderesources/egroupware/kabc_egroupwareprefs.h" +#include "tderesources/egroupware/kabc_resourcexmlrpc.h" +#include "tderesources/egroupware/kcal_egroupwareprefs.h" +#include "tderesources/egroupware/kcal_resourcexmlrpc.h" +#include "tderesources/egroupware/knotes_egroupwareprefs.h" +#include "tderesources/egroupware/knotes_resourcexmlrpc.h" #include <libkcal/resourcecalendar.h> diff --git a/wizards/exchangewizard.cpp b/wizards/exchangewizard.cpp index e243b2e2..258d0a54 100644 --- a/wizards/exchangewizard.cpp +++ b/wizards/exchangewizard.cpp @@ -20,10 +20,10 @@ #include "exchangewizard.h" -#include "kresources/newexchange/kabc_resourceexchange.h" -#include "kresources/newexchange/kcal_resourceexchange.h" +#include "tderesources/newexchange/kabc_resourceexchange.h" +#include "tderesources/newexchange/kcal_resourceexchange.h" -#include "kresources/lib/folderconfig.h" +#include "tderesources/lib/folderconfig.h" #include <libkcal/resourcecalendar.h> diff --git a/wizards/groupwisewizard.cpp b/wizards/groupwisewizard.cpp index ecd472c8..583615b3 100644 --- a/wizards/groupwisewizard.cpp +++ b/wizards/groupwisewizard.cpp @@ -23,10 +23,10 @@ #include "groupwiseconfig.h" #include "kmailchanges.h" -#include "kresources/groupwise/kabc_groupwiseprefs.h" -#include "kresources/groupwise/kabc_resourcegroupwise.h" -#include "kresources/groupwise/kcal_groupwiseprefsbase.h" -#include "kresources/groupwise/kcal_resourcegroupwise.h" +#include "tderesources/groupwise/kabc_groupwiseprefs.h" +#include "tderesources/groupwise/kabc_resourcegroupwise.h" +#include "tderesources/groupwise/kcal_groupwiseprefsbase.h" +#include "tderesources/groupwise/kcal_resourcegroupwise.h" #include <libkcal/resourcecalendar.h> #include <libemailfunctions/email.h> diff --git a/wizards/kmailchanges.cpp b/wizards/kmailchanges.cpp index abcd57d4..387e03eb 100644 --- a/wizards/kmailchanges.cpp +++ b/wizards/kmailchanges.cpp @@ -30,7 +30,7 @@ #include <identity.h> #include <kdebug.h> #include <kstringhandler.h> -#include <kwallet.h> +#include <tdewallet.h> using namespace KWallet; static const char* s_folderContentsType[] = { diff --git a/wizards/kolabwizard.cpp b/wizards/kolabwizard.cpp index a3549384..b0002a50 100644 --- a/wizards/kolabwizard.cpp +++ b/wizards/kolabwizard.cpp @@ -25,9 +25,9 @@ #include "kolabkmailchanges.h" -#include "kresources/kolab/kcal/resourcekolab.h" -#include "kresources/kolab/kabc/resourcekolab.h" -#include "kresources/kolab/knotes/resourcekolab.h" +#include "tderesources/kolab/kcal/resourcekolab.h" +#include "tderesources/kolab/kabc/resourcekolab.h" +#include "tderesources/kolab/knotes/resourcekolab.h" #include <libkcal/resourcecalendar.h> #include <kabc/resource.h> diff --git a/wizards/scalixwizard.cpp b/wizards/scalixwizard.cpp index f6acd0e5..dc8c5e03 100644 --- a/wizards/scalixwizard.cpp +++ b/wizards/scalixwizard.cpp @@ -25,8 +25,8 @@ #include "scalixkmailchanges.h" -#include "kresources/scalix/kcal/resourcescalix.h" -#include "kresources/scalix/kabc/resourcescalix.h" +#include "tderesources/scalix/kcal/resourcescalix.h" +#include "tderesources/scalix/kabc/resourcescalix.h" #include <libkcal/resourcecalendar.h> #include <kabc/resource.h> diff --git a/wizards/sloxwizard.cpp b/wizards/sloxwizard.cpp index 9cdd5538..250f76a4 100644 --- a/wizards/sloxwizard.cpp +++ b/wizards/sloxwizard.cpp @@ -21,10 +21,10 @@ #include "sloxwizard.h" #include "sloxconfig.h" -#include "kresources/slox/kabcsloxprefs.h" -#include "kresources/slox/kabcresourceslox.h" -#include "kresources/slox/kcalsloxprefs.h" -#include "kresources/slox/kcalresourceslox.h" +#include "tderesources/slox/kabcsloxprefs.h" +#include "tderesources/slox/kabcresourceslox.h" +#include "tderesources/slox/kcalsloxprefs.h" +#include "tderesources/slox/kcalresourceslox.h" #include <libkcal/resourcecalendar.h> |