diff options
Diffstat (limited to 'tderesources')
131 files changed, 213 insertions, 213 deletions
diff --git a/tderesources/birthdays/resourcekabc.cpp b/tderesources/birthdays/resourcekabc.cpp index a36517eb..d6869bbe 100644 --- a/tderesources/birthdays/resourcekabc.cpp +++ b/tderesources/birthdays/resourcekabc.cpp @@ -26,14 +26,14 @@ #include <tqstring.h> #include <tqptrlist.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kurl.h> #include <tdeio/job.h> #include <kstandarddirs.h> -#include <kabc/stdaddressbook.h> -#include <kabc/locknull.h> +#include <tdeabc/stdaddressbook.h> +#include <tdeabc/locknull.h> #include "libkcal/vcaldrag.h" #include "libkcal/vcalformat.h" diff --git a/tderesources/birthdays/resourcekabc.h b/tderesources/birthdays/resourcekabc.h index 008b87e5..42bb5041 100644 --- a/tderesources/birthdays/resourcekabc.h +++ b/tderesources/birthdays/resourcekabc.h @@ -29,7 +29,7 @@ #include "libkcal/incidence.h" #include "libkcal/calendarlocal.h" -#include <kabc/addressbook.h> +#include <tdeabc/addressbook.h> #include "libkcal/resourcecalendar.h" diff --git a/tderesources/birthdays/resourcekabcconfig.cpp b/tderesources/birthdays/resourcekabcconfig.cpp index 24a79bf2..5bb45909 100644 --- a/tderesources/birthdays/resourcekabcconfig.cpp +++ b/tderesources/birthdays/resourcekabcconfig.cpp @@ -26,7 +26,7 @@ #include <kabprefs.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "resourcekabc.h" #include "resourcekabcconfig.h" diff --git a/tderesources/blogging/kcal_resourceblogging_plugin.cpp b/tderesources/blogging/kcal_resourceblogging_plugin.cpp index 4cc3dd8c..463df66e 100644 --- a/tderesources/blogging/kcal_resourceblogging_plugin.cpp +++ b/tderesources/blogging/kcal_resourceblogging_plugin.cpp @@ -22,8 +22,8 @@ #include "kcal_resourceblogging.h" #include "kcal_resourcebloggingconfig.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace KCal; diff --git a/tderesources/blogging/kcal_resourcebloggingconfig.cpp b/tderesources/blogging/kcal_resourcebloggingconfig.cpp index bd999ffe..c7e3e42f 100644 --- a/tderesources/blogging/kcal_resourcebloggingconfig.cpp +++ b/tderesources/blogging/kcal_resourcebloggingconfig.cpp @@ -20,8 +20,8 @@ #include "kcal_resourcebloggingconfig.h" -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> using namespace KCal; diff --git a/tderesources/blogging/xmlrpcjob.cpp b/tderesources/blogging/xmlrpcjob.cpp index cb377e7e..cd9a0fa4 100644 --- a/tderesources/blogging/xmlrpcjob.cpp +++ b/tderesources/blogging/xmlrpcjob.cpp @@ -30,7 +30,7 @@ #include <tqregexp.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeio/http.h> #include <kmdcodec.h> #include <tdeio/davjob.h> diff --git a/tderesources/caldav/config.cpp b/tderesources/caldav/config.cpp index 5aeb2ddf..b83660f8 100644 --- a/tderesources/caldav/config.cpp +++ b/tderesources/caldav/config.cpp @@ -21,7 +21,7 @@ #include <kcombobox.h> #include <kdebug.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include <tdelistview.h> #include <kurlrequester.h> diff --git a/tderesources/caldav/configwidgets.cpp b/tderesources/caldav/configwidgets.cpp index ab8c7905..db620741 100644 --- a/tderesources/caldav/configwidgets.cpp +++ b/tderesources/caldav/configwidgets.cpp @@ -37,7 +37,7 @@ #include <libkcal/resourcecached.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqlabel.h> diff --git a/tderesources/caldav/job.cpp b/tderesources/caldav/job.cpp index 93f91cd5..354898ae 100644 --- a/tderesources/caldav/job.cpp +++ b/tderesources/caldav/job.cpp @@ -16,7 +16,7 @@ #include "job.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqmutex.h> diff --git a/tderesources/caldav/plugin.cpp b/tderesources/caldav/plugin.cpp index c7ea06e8..479f774b 100644 --- a/tderesources/caldav/plugin.cpp +++ b/tderesources/caldav/plugin.cpp @@ -18,8 +18,8 @@ #include "config.h" #include "export.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> /*========================================================================= | NAMESPACE diff --git a/tderesources/caldav/resource.cpp b/tderesources/caldav/resource.cpp index b9285e61..e84d864d 100644 --- a/tderesources/caldav/resource.cpp +++ b/tderesources/caldav/resource.cpp @@ -25,7 +25,7 @@ #include <libkcal/calendarlocal.h> #include <libkcal/icalformat.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpassdlg.h> #include <tqdatetime.h> diff --git a/tderesources/caldav/resource.h b/tderesources/caldav/resource.h index ee580532..d65c7f90 100644 --- a/tderesources/caldav/resource.h +++ b/tderesources/caldav/resource.h @@ -24,7 +24,7 @@ #include <libkcal/resourcecached.h> #include <libtdepim/progressmanager.h> -#include <kabc/locknull.h> +#include <tdeabc/locknull.h> #include <tdepimmacros.h> #include <tdeconfig.h> diff --git a/tderesources/carddav/config.cpp b/tderesources/carddav/config.cpp index ecfff25e..a7103505 100644 --- a/tderesources/carddav/config.cpp +++ b/tderesources/carddav/config.cpp @@ -20,7 +20,7 @@ #include <kcombobox.h> #include <kdebug.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include <tdelistview.h> #include <kurlrequester.h> diff --git a/tderesources/carddav/configwidgets.cpp b/tderesources/carddav/configwidgets.cpp index b2d505df..2c22b3f1 100644 --- a/tderesources/carddav/configwidgets.cpp +++ b/tderesources/carddav/configwidgets.cpp @@ -36,7 +36,7 @@ #include <kabcresourcecached.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqlabel.h> diff --git a/tderesources/carddav/job.cpp b/tderesources/carddav/job.cpp index 9c288650..5cab5cdf 100644 --- a/tderesources/carddav/job.cpp +++ b/tderesources/carddav/job.cpp @@ -15,7 +15,7 @@ #include "job.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqmutex.h> diff --git a/tderesources/carddav/plugin.cpp b/tderesources/carddav/plugin.cpp index d0c4724f..9079ecd3 100644 --- a/tderesources/carddav/plugin.cpp +++ b/tderesources/carddav/plugin.cpp @@ -17,8 +17,8 @@ #include "config.h" #include "export.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> /*========================================================================= | NAMESPACE diff --git a/tderesources/carddav/resource.cpp b/tderesources/carddav/resource.cpp index dae91c32..ddaae59d 100644 --- a/tderesources/carddav/resource.cpp +++ b/tderesources/carddav/resource.cpp @@ -21,10 +21,10 @@ #include <tqapplication.h> #include <tqeventloop.h> -#include <kabc/addressee.h> -#include <kabc/vcardconverter.h> +#include <tdeabc/addressee.h> +#include <tdeabc/vcardconverter.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpassdlg.h> #include <tqdatetime.h> diff --git a/tderesources/carddav/resource.h b/tderesources/carddav/resource.h index 8f783ab2..2e2de628 100644 --- a/tderesources/carddav/resource.h +++ b/tderesources/carddav/resource.h @@ -23,7 +23,7 @@ #include <kabcresourcecached.h> #include <libtdepim/progressmanager.h> -#include <kabc/locknull.h> +#include <tdeabc/locknull.h> #include <tdepimmacros.h> #include <tdeconfig.h> diff --git a/tderesources/egroupware/debugdialog.cpp b/tderesources/egroupware/debugdialog.cpp index 54fe0723..70cc87f5 100644 --- a/tderesources/egroupware/debugdialog.cpp +++ b/tderesources/egroupware/debugdialog.cpp @@ -26,7 +26,7 @@ #include <kstaticdeleter.h> #include <stdlib.h> -#include <klocale.h> +#include <tdelocale.h> #include "debugdialog.h" DebugDialog* DebugDialog::mSelf = 0; diff --git a/tderesources/egroupware/kabc_resourcexmlrpc.cpp b/tderesources/egroupware/kabc_resourcexmlrpc.cpp index 39e3aac1..587ebc84 100644 --- a/tderesources/egroupware/kabc_resourcexmlrpc.cpp +++ b/tderesources/egroupware/kabc_resourcexmlrpc.cpp @@ -20,11 +20,11 @@ #include <tqapplication.h> -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> #include <kabprefs.h> #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kmdcodec.h> #include <kstandarddirs.h> #include <kstringhandler.h> diff --git a/tderesources/egroupware/kabc_resourcexmlrpcconfig.cpp b/tderesources/egroupware/kabc_resourcexmlrpcconfig.cpp index ddafbd1f..03665e75 100644 --- a/tderesources/egroupware/kabc_resourcexmlrpcconfig.cpp +++ b/tderesources/egroupware/kabc_resourcexmlrpcconfig.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include <kurlrequester.h> diff --git a/tderesources/egroupware/kabc_resourcexmlrpcplugin.cpp b/tderesources/egroupware/kabc_resourcexmlrpcplugin.cpp index c4c0cc6c..c14a8f67 100644 --- a/tderesources/egroupware/kabc_resourcexmlrpcplugin.cpp +++ b/tderesources/egroupware/kabc_resourcexmlrpcplugin.cpp @@ -21,8 +21,8 @@ #include "kabc_resourcexmlrpc.h" #include "kabc_resourcexmlrpcconfig.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace KABC; diff --git a/tderesources/egroupware/kcal_resourcexmlrpc.cpp b/tderesources/egroupware/kcal_resourcexmlrpc.cpp index c703fa2b..7c568e4e 100644 --- a/tderesources/egroupware/kcal_resourcexmlrpc.cpp +++ b/tderesources/egroupware/kcal_resourcexmlrpc.cpp @@ -28,9 +28,9 @@ #include <tqstringlist.h> #include <tqtimer.h> -#include <kabc/locknull.h> +#include <tdeabc/locknull.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tderesources/configwidget.h> #include <kstandarddirs.h> #include <kstringhandler.h> diff --git a/tderesources/egroupware/kcal_resourcexmlrpcconfig.cpp b/tderesources/egroupware/kcal_resourcexmlrpcconfig.cpp index 213da26e..12b1c76d 100644 --- a/tderesources/egroupware/kcal_resourcexmlrpcconfig.cpp +++ b/tderesources/egroupware/kcal_resourcexmlrpcconfig.cpp @@ -24,7 +24,7 @@ #include <kdebug.h> #include <kdialog.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kurlrequester.h> diff --git a/tderesources/egroupware/kcal_resourcexmlrpcplugin.cpp b/tderesources/egroupware/kcal_resourcexmlrpcplugin.cpp index 021389b6..b1d9665a 100644 --- a/tderesources/egroupware/kcal_resourcexmlrpcplugin.cpp +++ b/tderesources/egroupware/kcal_resourcexmlrpcplugin.cpp @@ -21,8 +21,8 @@ #include "kcal_resourcexmlrpc.h" #include "kcal_resourcexmlrpcconfig.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace KCal; diff --git a/tderesources/egroupware/knotes_resourcexmlrpc.cpp b/tderesources/egroupware/knotes_resourcexmlrpc.cpp index 1b19831b..15d76b23 100644 --- a/tderesources/egroupware/knotes_resourcexmlrpc.cpp +++ b/tderesources/egroupware/knotes_resourcexmlrpc.cpp @@ -23,7 +23,7 @@ #include <tqstringlist.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kstringhandler.h> #include <kurl.h> diff --git a/tderesources/egroupware/knotes_resourcexmlrpcconfig.cpp b/tderesources/egroupware/knotes_resourcexmlrpcconfig.cpp index 8cf2a35c..c7b43a36 100644 --- a/tderesources/egroupware/knotes_resourcexmlrpcconfig.cpp +++ b/tderesources/egroupware/knotes_resourcexmlrpcconfig.cpp @@ -24,7 +24,7 @@ #include <kdebug.h> #include <kdialog.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kurlrequester.h> diff --git a/tderesources/egroupware/knotes_resourcexmlrpcplugin.cpp b/tderesources/egroupware/knotes_resourcexmlrpcplugin.cpp index 276cb6b0..6d780920 100644 --- a/tderesources/egroupware/knotes_resourcexmlrpcplugin.cpp +++ b/tderesources/egroupware/knotes_resourcexmlrpcplugin.cpp @@ -21,8 +21,8 @@ #include "knotes_resourcexmlrpc.h" #include "knotes_resourcexmlrpcconfig.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace KNotes; diff --git a/tderesources/egroupware/xmlrpciface.cpp b/tderesources/egroupware/xmlrpciface.cpp index 7af9814a..06ad93e0 100644 --- a/tderesources/egroupware/xmlrpciface.cpp +++ b/tderesources/egroupware/xmlrpciface.cpp @@ -12,7 +12,7 @@ #include <kdebug.h> #include <tdeio/job.h> -#include <klocale.h> +#include <tdelocale.h> #include <kmdcodec.h> #include "debugdialog.h" diff --git a/tderesources/exchange/resourceexchange.cpp b/tderesources/exchange/resourceexchange.cpp index 6335dc64..a85c741d 100644 --- a/tderesources/exchange/resourceexchange.cpp +++ b/tderesources/exchange/resourceexchange.cpp @@ -29,8 +29,8 @@ #include <kdebug.h> #include <tdeapplication.h> #include <kstringhandler.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <libkcal/calendarlocal.h> #include <libkcal/calendar.h> @@ -38,7 +38,7 @@ #include <tderesources/configwidget.h> -#include <kabc/locknull.h> +#include <tdeabc/locknull.h> #include "dateset.h" #include "exchangeaccount.h" diff --git a/tderesources/exchange/resourceexchangeconfig.cpp b/tderesources/exchange/resourceexchangeconfig.cpp index 36774901..3b3bf14f 100644 --- a/tderesources/exchange/resourceexchangeconfig.cpp +++ b/tderesources/exchange/resourceexchangeconfig.cpp @@ -22,10 +22,10 @@ #include <tqlabel.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kstandarddirs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "exchangeaccount.h" #include "resourceexchangeconfig.h" diff --git a/tderesources/featureplan/kcal_resourcefeatureplan.cpp b/tderesources/featureplan/kcal_resourcefeatureplan.cpp index 2bddc7fd..d417c0d8 100644 --- a/tderesources/featureplan/kcal_resourcefeatureplan.cpp +++ b/tderesources/featureplan/kcal_resourcefeatureplan.cpp @@ -32,9 +32,9 @@ #include <tqstringlist.h> #include <tqtimer.h> -#include <kabc/locknull.h> +#include <tdeabc/locknull.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tderesources/configwidget.h> #include <kstandarddirs.h> #include <kstringhandler.h> diff --git a/tderesources/featureplan/kcal_resourcefeatureplan.h b/tderesources/featureplan/kcal_resourcefeatureplan.h index 08bf1f39..f6487521 100644 --- a/tderesources/featureplan/kcal_resourcefeatureplan.h +++ b/tderesources/featureplan/kcal_resourcefeatureplan.h @@ -27,7 +27,7 @@ #include <libkcal/resourcecached.h> -#include <kabc/locknull.h> +#include <tdeabc/locknull.h> #include <tdepimmacros.h> #include <tdeconfig.h> diff --git a/tderesources/featureplan/kcal_resourcefeatureplanconfig.cpp b/tderesources/featureplan/kcal_resourcefeatureplanconfig.cpp index 55d12cbd..3cedd536 100644 --- a/tderesources/featureplan/kcal_resourcefeatureplanconfig.cpp +++ b/tderesources/featureplan/kcal_resourcefeatureplanconfig.cpp @@ -26,7 +26,7 @@ #include <kdebug.h> #include <kdialog.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kurlrequester.h> diff --git a/tderesources/featureplan/kcal_resourcefeatureplanplugin.cpp b/tderesources/featureplan/kcal_resourcefeatureplanplugin.cpp index ae2759e4..6a0e7b72 100644 --- a/tderesources/featureplan/kcal_resourcefeatureplanplugin.cpp +++ b/tderesources/featureplan/kcal_resourcefeatureplanplugin.cpp @@ -22,8 +22,8 @@ #include "kcal_resourcefeatureplan.h" #include "kcal_resourcefeatureplanconfig.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace KCal; diff --git a/tderesources/groupdav/Makefile.am b/tderesources/groupdav/Makefile.am index 1e20f291..cbc9418b 100644 --- a/tderesources/groupdav/Makefile.am +++ b/tderesources/groupdav/Makefile.am @@ -42,7 +42,7 @@ METASOURCES = AUTO install-data-local: uninstall.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/tdeabc/kabc_opengroupware.desktop $(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_servicesdir)/tderesources/kcal/kcal_opengroupware.desktop messages: rc.cpp diff --git a/tderesources/groupdav/groupdavaddressbookadaptor.cpp b/tderesources/groupdav/groupdavaddressbookadaptor.cpp index 9704e5bd..f9d06179 100644 --- a/tderesources/groupdav/groupdavaddressbookadaptor.cpp +++ b/tderesources/groupdav/groupdavaddressbookadaptor.cpp @@ -26,8 +26,8 @@ #include "davgroupwareglobals.h" #include "webdavhandler.h" -#include <kabc/addressee.h> -#include <kabc/vcardconverter.h> +#include <tdeabc/addressee.h> +#include <tdeabc/vcardconverter.h> #include <kabcresourcecached.h> #include <tdeio/job.h> diff --git a/tderesources/groupdav/groupdavaddressbookadaptor.h b/tderesources/groupdav/groupdavaddressbookadaptor.h index 425c6371..7a845955 100644 --- a/tderesources/groupdav/groupdavaddressbookadaptor.h +++ b/tderesources/groupdav/groupdavaddressbookadaptor.h @@ -26,7 +26,7 @@ #include "davaddressbookadaptor.h" #include "groupdavglobals.h" #include <davgroupwareglobals.h> -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> #include <kurl.h> #include <tqdom.h> diff --git a/tderesources/groupdav/groupdavglobals.cpp b/tderesources/groupdav/groupdavglobals.cpp index 793c1b96..fdf68797 100644 --- a/tderesources/groupdav/groupdavglobals.cpp +++ b/tderesources/groupdav/groupdavglobals.cpp @@ -31,7 +31,7 @@ #include <libkcal/calendarlocal.h> #include <libkcal/icalformat.h> #include <libkcal/resourcecached.h> -#include <kabc/vcardconverter.h> +#include <tdeabc/vcardconverter.h> #include <kdebug.h> #include <tdeio/davjob.h> diff --git a/tderesources/groupdav/kabc_resourcegroupdav_plugin.cpp b/tderesources/groupdav/kabc_resourcegroupdav_plugin.cpp index d487889f..2377808a 100644 --- a/tderesources/groupdav/kabc_resourcegroupdav_plugin.cpp +++ b/tderesources/groupdav/kabc_resourcegroupdav_plugin.cpp @@ -23,8 +23,8 @@ #include "kabc_resourcegroupdav.h" #include "kabc_resourcegroupwarebaseconfig.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace KABC; diff --git a/tderesources/groupdav/kcal_resourcegroupdav_plugin.cpp b/tderesources/groupdav/kcal_resourcegroupdav_plugin.cpp index f06e5d24..276b2fd2 100644 --- a/tderesources/groupdav/kcal_resourcegroupdav_plugin.cpp +++ b/tderesources/groupdav/kcal_resourcegroupdav_plugin.cpp @@ -24,8 +24,8 @@ #include "kcal_resourcegroupdav.h" #include "kcal_resourcegroupwarebaseconfig.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace KCal; diff --git a/tderesources/groupware/kabc_resourcegroupware.cpp b/tderesources/groupware/kabc_resourcegroupware.cpp index 44cee563..e2503b83 100644 --- a/tderesources/groupware/kabc_resourcegroupware.cpp +++ b/tderesources/groupware/kabc_resourcegroupware.cpp @@ -20,11 +20,11 @@ #include <tqapplication.h> -#include <kabc/addressee.h> -#include <kabc/vcardconverter.h> +#include <tdeabc/addressee.h> +#include <tdeabc/vcardconverter.h> #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <libtdepim/groupwarejob.h> diff --git a/tderesources/groupware/kabc_resourcegroupware_plugin.cpp b/tderesources/groupware/kabc_resourcegroupware_plugin.cpp index c7266b18..12f3233b 100644 --- a/tderesources/groupware/kabc_resourcegroupware_plugin.cpp +++ b/tderesources/groupware/kabc_resourcegroupware_plugin.cpp @@ -21,8 +21,8 @@ #include "kabc_resourcegroupware.h" #include "kabc_resourcegroupwareconfig.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace KABC; diff --git a/tderesources/groupware/kabc_resourcegroupwareconfig.cpp b/tderesources/groupware/kabc_resourcegroupwareconfig.cpp index 317c82b6..35ca8596 100644 --- a/tderesources/groupware/kabc_resourcegroupwareconfig.cpp +++ b/tderesources/groupware/kabc_resourcegroupwareconfig.cpp @@ -26,7 +26,7 @@ #include <kcombobox.h> #include <kdebug.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include <tdelistview.h> #include <kurlrequester.h> diff --git a/tderesources/groupware/kcal_resourcegroupware.cpp b/tderesources/groupware/kcal_resourcegroupware.cpp index f515bd06..1bb0b2db 100644 --- a/tderesources/groupware/kcal_resourcegroupware.cpp +++ b/tderesources/groupware/kcal_resourcegroupware.cpp @@ -34,9 +34,9 @@ #include <tqstringlist.h> #include <tqtimer.h> -#include <kabc/locknull.h> +#include <tdeabc/locknull.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tderesources/configwidget.h> #include <kstandarddirs.h> #include <kstringhandler.h> diff --git a/tderesources/groupware/kcal_resourcegroupware.h b/tderesources/groupware/kcal_resourcegroupware.h index d757ad73..7fe564bc 100644 --- a/tderesources/groupware/kcal_resourcegroupware.h +++ b/tderesources/groupware/kcal_resourcegroupware.h @@ -25,7 +25,7 @@ #include <libkcal/resourcecached.h> -#include <kabc/locknull.h> +#include <tdeabc/locknull.h> #include <tdeio/job.h> #include <tdeconfig.h> diff --git a/tderesources/groupware/kcal_resourcegroupware_plugin.cpp b/tderesources/groupware/kcal_resourcegroupware_plugin.cpp index 992a95d5..dfbbd80d 100644 --- a/tderesources/groupware/kcal_resourcegroupware_plugin.cpp +++ b/tderesources/groupware/kcal_resourcegroupware_plugin.cpp @@ -22,8 +22,8 @@ #include "kcal_resourcegroupware.h" #include "kcal_resourcegroupwareconfig.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace KCal; diff --git a/tderesources/groupware/kcal_resourcegroupwareconfig.cpp b/tderesources/groupware/kcal_resourcegroupwareconfig.cpp index 9a191bc3..305118f1 100644 --- a/tderesources/groupware/kcal_resourcegroupwareconfig.cpp +++ b/tderesources/groupware/kcal_resourcegroupwareconfig.cpp @@ -24,7 +24,7 @@ #include <tqlayout.h> #include <tqcheckbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kstandarddirs.h> #include <klineedit.h> diff --git a/tderesources/groupwise/kabc_resourcegroupwise.cpp b/tderesources/groupwise/kabc_resourcegroupwise.cpp index cf5c4e95..8499aa9f 100644 --- a/tderesources/groupwise/kabc_resourcegroupwise.cpp +++ b/tderesources/groupwise/kabc_resourcegroupwise.cpp @@ -21,11 +21,11 @@ #include <tqapplication.h> #include <tqfile.h> -#include <kabc/addressee.h> -#include <kabc/vcardconverter.h> +#include <tdeabc/addressee.h> +#include <tdeabc/vcardconverter.h> #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "kabc_groupwiseprefs.h" diff --git a/tderesources/groupwise/kabc_resourcegroupwise_plugin.cpp b/tderesources/groupwise/kabc_resourcegroupwise_plugin.cpp index 3f973bc5..e71a66e5 100644 --- a/tderesources/groupwise/kabc_resourcegroupwise_plugin.cpp +++ b/tderesources/groupwise/kabc_resourcegroupwise_plugin.cpp @@ -21,8 +21,8 @@ #include "kabc_resourcegroupwise.h" #include "kabc_resourcegroupwiseconfig.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace KABC; diff --git a/tderesources/groupwise/kabc_resourcegroupwiseconfig.cpp b/tderesources/groupwise/kabc_resourcegroupwiseconfig.cpp index 0f35e5b4..1212a6bc 100644 --- a/tderesources/groupwise/kabc_resourcegroupwiseconfig.cpp +++ b/tderesources/groupwise/kabc_resourcegroupwiseconfig.cpp @@ -26,7 +26,7 @@ #include <kcombobox.h> #include <kdebug.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include <tdelistview.h> #include <kurlrequester.h> diff --git a/tderesources/groupwise/kcal_resourcegroupwise.cpp b/tderesources/groupwise/kcal_resourcegroupwise.cpp index 7471b7cd..0d385ae9 100644 --- a/tderesources/groupwise/kcal_resourcegroupwise.cpp +++ b/tderesources/groupwise/kcal_resourcegroupwise.cpp @@ -36,9 +36,9 @@ #include <tqstringlist.h> #include <tqtimer.h> -#include <kabc/locknull.h> +#include <tdeabc/locknull.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tderesources/configwidget.h> #include <kstandarddirs.h> #include <kstringhandler.h> diff --git a/tderesources/groupwise/kcal_resourcegroupwise.h b/tderesources/groupwise/kcal_resourcegroupwise.h index f4417079..e1cab875 100644 --- a/tderesources/groupwise/kcal_resourcegroupwise.h +++ b/tderesources/groupwise/kcal_resourcegroupwise.h @@ -27,7 +27,7 @@ #include <libkcal/resourcecached.h> -#include <kabc/locknull.h> +#include <tdeabc/locknull.h> #include <tdeio/job.h> #include <tdeconfig.h> #include <tdepimmacros.h> diff --git a/tderesources/groupwise/kcal_resourcegroupwise_plugin.cpp b/tderesources/groupwise/kcal_resourcegroupwise_plugin.cpp index 1c1df762..3bd7d088 100644 --- a/tderesources/groupwise/kcal_resourcegroupwise_plugin.cpp +++ b/tderesources/groupwise/kcal_resourcegroupwise_plugin.cpp @@ -21,8 +21,8 @@ #include "kcal_resourcegroupwise.h" #include "kcal_resourcegroupwiseconfig.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace KCal; diff --git a/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp b/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp index 5f0152a2..cb9f4493 100644 --- a/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp +++ b/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp @@ -24,7 +24,7 @@ #include <tqlayout.h> #include <tqcheckbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdelistview.h> #include <kdebug.h> #include <kdialogbase.h> diff --git a/tderesources/groupwise/soap/contactconverter.cpp b/tderesources/groupwise/soap/contactconverter.cpp index 69c4b90f..1ce39138 100644 --- a/tderesources/groupwise/soap/contactconverter.cpp +++ b/tderesources/groupwise/soap/contactconverter.cpp @@ -21,7 +21,7 @@ #include "contactconverter.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> ContactConverter::ContactConverter( struct soap* soap ) : GWConverter( soap ) diff --git a/tderesources/groupwise/soap/contactconverter.h b/tderesources/groupwise/soap/contactconverter.h index 7dbc8c79..2f98a328 100644 --- a/tderesources/groupwise/soap/contactconverter.h +++ b/tderesources/groupwise/soap/contactconverter.h @@ -21,7 +21,7 @@ #ifndef KABC_GW_CONTACTCONVERTER_H #define KABC_GW_CONTACTCONVERTER_H -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> #include "gwconverter.h" diff --git a/tderesources/groupwise/soap/groupwiseserver.cpp b/tderesources/groupwise/soap/groupwiseserver.cpp index 78070834..4e281077 100644 --- a/tderesources/groupwise/soap/groupwiseserver.cpp +++ b/tderesources/groupwise/soap/groupwiseserver.cpp @@ -27,16 +27,16 @@ #include <libkcal/incidence.h> #include <libtdepim/kpimprefs.h> -#include <kabc/addressee.h> -#include <kabc/addresseelist.h> +#include <tdeabc/addressee.h> +#include <tdeabc/addresseelist.h> #include <tdeio/job.h> #include <tdeio/jobclasses.h> #include <tdeio/netaccess.h> -#include <kprotocolmanager.h> -#include <ktempfile.h> +#include <tdeprotocolmanager.h> +#include <tdetempfile.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqnamespace.h> #include <tqfile.h> diff --git a/tderesources/groupwise/soap/groupwiseserver.h b/tderesources/groupwise/soap/groupwiseserver.h index e1c25c0f..71c6f6d5 100644 --- a/tderesources/groupwise/soap/groupwiseserver.h +++ b/tderesources/groupwise/soap/groupwiseserver.h @@ -32,7 +32,7 @@ #include <string> -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> #include <libkcal/freebusy.h> #include "gwjobs.h" diff --git a/tderesources/groupwise/soap/gwjobs.cpp b/tderesources/groupwise/soap/gwjobs.cpp index 343a4a20..435bb2ae 100644 --- a/tderesources/groupwise/soap/gwjobs.cpp +++ b/tderesources/groupwise/soap/gwjobs.cpp @@ -19,9 +19,9 @@ */ #include <kdebug.h> -#include <klocale.h> -#include <kabc/addressee.h> -#include <kabc/resource.h> +#include <tdelocale.h> +#include <tdeabc/addressee.h> +#include <tdeabc/resource.h> #include <libkcal/incidence.h> #include <libkcal/resourcecached.h> diff --git a/tderesources/groupwise/soap/gwjobs.h b/tderesources/groupwise/soap/gwjobs.h index bf60ecbd..e3ce4a2f 100644 --- a/tderesources/groupwise/soap/gwjobs.h +++ b/tderesources/groupwise/soap/gwjobs.h @@ -24,7 +24,7 @@ #include <string> -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> namespace KABC { class Resource; diff --git a/tderesources/groupwise/soap/incidenceconverter.cpp b/tderesources/groupwise/soap/incidenceconverter.cpp index 79ad94a5..580d84e6 100644 --- a/tderesources/groupwise/soap/incidenceconverter.cpp +++ b/tderesources/groupwise/soap/incidenceconverter.cpp @@ -18,15 +18,15 @@ Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include <kmdcodec.h> #include <libtdepim/kpimprefs.h> #include <libkcal/event.h> #include <libkcal/journal.h> #include <libkcal/recurrence.h> #include <libkcal/kcalversion.h> -#include <kabc/stdaddressbook.h> -#include <kabc/addressee.h> +#include <tdeabc/stdaddressbook.h> +#include <tdeabc/addressee.h> #include <kdebug.h> #include "incidenceconverter.h" diff --git a/tderesources/groupwise/soap/ksslsocket.cpp b/tderesources/groupwise/soap/ksslsocket.cpp index 16ddf70d..6bf74da5 100644 --- a/tderesources/groupwise/soap/ksslsocket.cpp +++ b/tderesources/groupwise/soap/ksslsocket.cpp @@ -20,7 +20,7 @@ #include <tqsocketnotifier.h> #include <dcopclient.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kssl.h> #include <ksslinfodlg.h> @@ -28,7 +28,7 @@ #include <ksslcertchain.h> #include <ksslcertificatecache.h> #include <tdeapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "ksslsocket.h" diff --git a/tderesources/groupwise/soap/soapdebug.cpp b/tderesources/groupwise/soap/soapdebug.cpp index 5ea29cbe..3c9cfc80 100644 --- a/tderesources/groupwise/soap/soapdebug.cpp +++ b/tderesources/groupwise/soap/soapdebug.cpp @@ -5,7 +5,7 @@ #include <tdecmdlineargs.h> #include <tdeconfig.h> #include <kdebug.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kabcresourcecached.h> diff --git a/tderesources/groupwise/tdeioslave/groupwise.cpp b/tderesources/groupwise/tdeioslave/groupwise.cpp index fb58643c..4eb24024 100644 --- a/tderesources/groupwise/tdeioslave/groupwise.cpp +++ b/tderesources/groupwise/tdeioslave/groupwise.cpp @@ -30,14 +30,14 @@ #include <libkcal/scheduler.h> #include <libkcal/calendarlocal.h> -#include <kabc/addressee.h> -#include <kabc/vcardconverter.h> +#include <tdeabc/addressee.h> +#include <tdeabc/vcardconverter.h> #include <kinstance.h> #include <tdeio/global.h> #include <kdebug.h> -#include <klocale.h> -#include <ktempfile.h> +#include <tdelocale.h> +#include <tdetempfile.h> #include <tdeversion.h> #include <sys/types.h> diff --git a/tderesources/kolab/kabc/contact.cpp b/tderesources/kolab/kabc/contact.cpp index dac619fe..fec56ec6 100644 --- a/tderesources/kolab/kabc/contact.cpp +++ b/tderesources/kolab/kabc/contact.cpp @@ -33,8 +33,8 @@ #include "contact.h" #include "resourcekolab.h" -#include <kabc/addressee.h> -#include <kabc/stdaddressbook.h> +#include <tdeabc/addressee.h> +#include <tdeabc/stdaddressbook.h> #include <libkcal/freebusyurlstore.h> #include <libtdepim/distributionlist.h> #include <tdeio/netaccess.h> diff --git a/tderesources/kolab/kabc/resourcekolab.cpp b/tderesources/kolab/kabc/resourcekolab.cpp index 93308b39..246c0eec 100644 --- a/tderesources/kolab/kabc/resourcekolab.cpp +++ b/tderesources/kolab/kabc/resourcekolab.cpp @@ -34,13 +34,13 @@ #include "contact.h" #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> -#include <kmessagebox.h> -#include <ktempfile.h> +#include <tdeglobal.h> +#include <tdelocale.h> +#include <tdemessagebox.h> +#include <tdetempfile.h> #include <tdeio/observer.h> #include <tdeio/uiserver_stub.h> -#include <kabc/vcardconverter.h> +#include <tdeabc/vcardconverter.h> #include <tdemainwindow.h> #include <tdeapplication.h> #include <dcopclient.h> diff --git a/tderesources/kolab/kcal/resourcekolab.cpp b/tderesources/kolab/kcal/resourcekolab.cpp index 101a9858..064ea758 100644 --- a/tderesources/kolab/kcal/resourcekolab.cpp +++ b/tderesources/kolab/kcal/resourcekolab.cpp @@ -42,11 +42,11 @@ #include <tdeapplication.h> #include <dcopclient.h> #include <libtdepim/kincidencechooser.h> -#include <kabc/locknull.h> +#include <tdeabc/locknull.h> #include <tdemainwindow.h> -#include <klocale.h> +#include <tdelocale.h> #include <kinputdialog.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kmdcodec.h> #include <tqfile.h> diff --git a/tderesources/kolab/knotes/resourcekolab.cpp b/tderesources/kolab/knotes/resourcekolab.cpp index a28a51b2..24228159 100644 --- a/tderesources/kolab/knotes/resourcekolab.cpp +++ b/tderesources/kolab/knotes/resourcekolab.cpp @@ -40,8 +40,8 @@ #include <libkcal/icalformat.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace Kolab; diff --git a/tderesources/kolab/shared/kmailconnection.cpp b/tderesources/kolab/shared/kmailconnection.cpp index d05b64a7..8011c15d 100644 --- a/tderesources/kolab/shared/kmailconnection.cpp +++ b/tderesources/kolab/shared/kmailconnection.cpp @@ -38,7 +38,7 @@ #include <dcopclient.h> #include <tdeapplication.h> #include <kdcopservicestarter.h> -#include <klocale.h> +#include <tdelocale.h> #include "kmailicalIface_stub.h" diff --git a/tderesources/kolab/shared/kolabbase.cpp b/tderesources/kolab/shared/kolabbase.cpp index 167f2566..35ca5b2b 100644 --- a/tderesources/kolab/shared/kolabbase.cpp +++ b/tderesources/kolab/shared/kolabbase.cpp @@ -33,7 +33,7 @@ #include "kolabbase.h" -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> #include <libkcal/journal.h> #include <libtdepim/kpimprefs.h> #include <libemailfunctions/email.h> diff --git a/tderesources/kolab/shared/resourcekolabbase.cpp b/tderesources/kolab/shared/resourcekolabbase.cpp index a56538a6..ce53bad3 100644 --- a/tderesources/kolab/shared/resourcekolabbase.cpp +++ b/tderesources/kolab/shared/resourcekolabbase.cpp @@ -36,12 +36,12 @@ #include <folderselectdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kinputdialog.h> #include <kurl.h> -#include <ktempfile.h> -#include <kmessagebox.h> +#include <tdetempfile.h> +#include <tdemessagebox.h> #include <tqtextstream.h> #include <kdebug.h> diff --git a/tderesources/lib/addressbookadaptor.cpp b/tderesources/lib/addressbookadaptor.cpp index 230ac350..722b2947 100644 --- a/tderesources/lib/addressbookadaptor.cpp +++ b/tderesources/lib/addressbookadaptor.cpp @@ -23,8 +23,8 @@ #include "addressbookadaptor.h" -#include <kabc/addressee.h> -#include <kabc/vcardconverter.h> +#include <tdeabc/addressee.h> +#include <tdeabc/vcardconverter.h> #include <libtdepim/kabcresourcecached.h> #include <tdeio/job.h> diff --git a/tderesources/lib/addressbookadaptor.h b/tderesources/lib/addressbookadaptor.h index b029ff60..614afc48 100644 --- a/tderesources/lib/addressbookadaptor.h +++ b/tderesources/lib/addressbookadaptor.h @@ -25,7 +25,7 @@ #include "groupwaredataadaptor.h" -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> #include <tdepimmacros.h> #include <kurl.h> diff --git a/tderesources/lib/davaddressbookadaptor.cpp b/tderesources/lib/davaddressbookadaptor.cpp index bf4a0347..2d90c7cb 100644 --- a/tderesources/lib/davaddressbookadaptor.cpp +++ b/tderesources/lib/davaddressbookadaptor.cpp @@ -26,8 +26,8 @@ // #include "davgroupwareglobals.h" // #include "webdavhandler.h" -// #include <kabc/addressee.h> -// #include <kabc/vcardconverter.h> +// #include <tdeabc/addressee.h> +// #include <tdeabc/vcardconverter.h> // #include <kabcresourcecached.h> #include <tdeio/davjob.h> diff --git a/tderesources/lib/folderconfig.cpp b/tderesources/lib/folderconfig.cpp index 81c65af4..e400c02f 100644 --- a/tderesources/lib/folderconfig.cpp +++ b/tderesources/lib/folderconfig.cpp @@ -28,7 +28,7 @@ #include "folderlistview.h" #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kdialog.h> diff --git a/tderesources/lib/folderlistview.cpp b/tderesources/lib/folderlistview.cpp index be719d95..4659bd46 100644 --- a/tderesources/lib/folderlistview.cpp +++ b/tderesources/lib/folderlistview.cpp @@ -25,7 +25,7 @@ #include "folderlister.h" #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdepopupmenu.h> #include <kdebug.h> diff --git a/tderesources/lib/groupwaredownloadjob.cpp b/tderesources/lib/groupwaredownloadjob.cpp index 63c7e988..52a01fd4 100644 --- a/tderesources/lib/groupwaredownloadjob.cpp +++ b/tderesources/lib/groupwaredownloadjob.cpp @@ -27,7 +27,7 @@ #include "groupwaredataadaptor.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <tdeio/job.h> #include <libemailfunctions/idmapper.h> diff --git a/tderesources/lib/groupwareuploadjob.cpp b/tderesources/lib/groupwareuploadjob.cpp index e896c0da..51307d83 100644 --- a/tderesources/lib/groupwareuploadjob.cpp +++ b/tderesources/lib/groupwareuploadjob.cpp @@ -35,7 +35,7 @@ #include <tqstringlist.h> #include <tqtimer.h> -#include <klocale.h> +#include <tdelocale.h> using namespace KPIM; diff --git a/tderesources/lib/kabc_resourcegroupwarebase.cpp b/tderesources/lib/kabc_resourcegroupwarebase.cpp index 87ca28ce..3ebd175e 100644 --- a/tderesources/lib/kabc_resourcegroupwarebase.cpp +++ b/tderesources/lib/kabc_resourcegroupwarebase.cpp @@ -28,9 +28,9 @@ #include "groupwaredownloadjob.h" #include "groupwareuploadjob.h" -#include <kabc/addressee.h> -#include <kabc/vcardconverter.h> -#include <klocale.h> +#include <tdeabc/addressee.h> +#include <tdeabc/vcardconverter.h> +#include <tdelocale.h> using namespace KABC; diff --git a/tderesources/lib/kabc_resourcegroupwarebaseconfig.cpp b/tderesources/lib/kabc_resourcegroupwarebaseconfig.cpp index 4e4f0527..918dfc52 100644 --- a/tderesources/lib/kabc_resourcegroupwarebaseconfig.cpp +++ b/tderesources/lib/kabc_resourcegroupwarebaseconfig.cpp @@ -28,7 +28,7 @@ #include <kdebug.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include <kurlrequester.h> diff --git a/tderesources/lib/kcal_cachesettingsdlg.cpp b/tderesources/lib/kcal_cachesettingsdlg.cpp index 3c2dbed1..01424907 100644 --- a/tderesources/lib/kcal_cachesettingsdlg.cpp +++ b/tderesources/lib/kcal_cachesettingsdlg.cpp @@ -27,7 +27,7 @@ #include <libkcal/resourcecachedconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <klineedit.h> #include <kdialog.h> diff --git a/tderesources/lib/kcal_resourcegroupwarebase.cpp b/tderesources/lib/kcal_resourcegroupwarebase.cpp index 56ffae7d..8f507fd1 100644 --- a/tderesources/lib/kcal_resourcegroupwarebase.cpp +++ b/tderesources/lib/kcal_resourcegroupwarebase.cpp @@ -32,7 +32,7 @@ #include <libkcal/icalformat.h> #include <tdeio/job.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqapplication.h> diff --git a/tderesources/lib/kcal_resourcegroupwarebase.h b/tderesources/lib/kcal_resourcegroupwarebase.h index 8a1033fb..b0c9af2e 100644 --- a/tderesources/lib/kcal_resourcegroupwarebase.h +++ b/tderesources/lib/kcal_resourcegroupwarebase.h @@ -26,7 +26,7 @@ #include <kurl.h> #include <libkcal/resourcecached.h> #include <tdepimmacros.h> -#include <kabc/locknull.h> +#include <tdeabc/locknull.h> namespace TDEIO { class Job; diff --git a/tderesources/lib/kcal_resourcegroupwarebaseconfig.cpp b/tderesources/lib/kcal_resourcegroupwarebaseconfig.cpp index b654f8d0..1ca2570a 100644 --- a/tderesources/lib/kcal_resourcegroupwarebaseconfig.cpp +++ b/tderesources/lib/kcal_resourcegroupwarebaseconfig.cpp @@ -29,7 +29,7 @@ #include <libkcal/resourcecachedconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <klineedit.h> #include <kdialog.h> diff --git a/tderesources/newexchange/exchangeaddressbookadaptor.h b/tderesources/newexchange/exchangeaddressbookadaptor.h index cbf5ac6f..fd89fa84 100644 --- a/tderesources/newexchange/exchangeaddressbookadaptor.h +++ b/tderesources/newexchange/exchangeaddressbookadaptor.h @@ -29,7 +29,7 @@ #include <folderlister.h> -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> #include <kurl.h> #include <tqdom.h> diff --git a/tderesources/newexchange/exchangecalendaradaptor.cpp b/tderesources/newexchange/exchangecalendaradaptor.cpp index a6777fb2..5b51de5e 100644 --- a/tderesources/newexchange/exchangecalendaradaptor.cpp +++ b/tderesources/newexchange/exchangecalendaradaptor.cpp @@ -25,7 +25,7 @@ #include <davgroupwareglobals.h> #include <webdavhandler.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeio/davjob.h> #include <libkcal/resourcecached.h> #include "davcalendaradaptor.h" diff --git a/tderesources/newexchange/exchangeconvertercontact.h b/tderesources/newexchange/exchangeconvertercontact.h index 191abccb..847b0767 100644 --- a/tderesources/newexchange/exchangeconvertercontact.h +++ b/tderesources/newexchange/exchangeconvertercontact.h @@ -24,7 +24,7 @@ #include <tqstring.h> #include <tqdom.h> -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> namespace KABC { diff --git a/tderesources/newexchange/kabc_resourceexchange.cpp b/tderesources/newexchange/kabc_resourceexchange.cpp index dc789ea2..bd60cd2f 100644 --- a/tderesources/newexchange/kabc_resourceexchange.cpp +++ b/tderesources/newexchange/kabc_resourceexchange.cpp @@ -26,7 +26,7 @@ #include "groupwareuploadjob.h" #include "tderesources_groupwareprefs.h" -#include <klocale.h> +#include <tdelocale.h> using namespace KABC; diff --git a/tderesources/newexchange/kcal_resourceexchange.cpp b/tderesources/newexchange/kcal_resourceexchange.cpp index ce06fd76..ad2e2220 100644 --- a/tderesources/newexchange/kcal_resourceexchange.cpp +++ b/tderesources/newexchange/kcal_resourceexchange.cpp @@ -25,7 +25,7 @@ #include <groupwaredownloadjob.h> #include <groupwareuploadjob.h> #include <tderesources_groupwareprefs.h> -#include <klocale.h> +#include <tdelocale.h> using namespace KCal; diff --git a/tderesources/remote/resourceremote.cpp b/tderesources/remote/resourceremote.cpp index 78b65065..3e97eed3 100644 --- a/tderesources/remote/resourceremote.cpp +++ b/tderesources/remote/resourceremote.cpp @@ -29,8 +29,8 @@ #include <kdebug.h> #include <kurl.h> #include <tdeio/job.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <libkcal/icalformat.h> @@ -41,7 +41,7 @@ #include <libkcal/journal.h> #include <libkcal/filestorage.h> -#include <kabc/lock.h> +#include <tdeabc/lock.h> #include <tderesources/configwidget.h> diff --git a/tderesources/remote/resourceremote_plugin.cpp b/tderesources/remote/resourceremote_plugin.cpp index 67eaa92f..9c198582 100644 --- a/tderesources/remote/resourceremote_plugin.cpp +++ b/tderesources/remote/resourceremote_plugin.cpp @@ -22,8 +22,8 @@ #include "resourceremoteconfig.h" #include "resourceremote.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace KCal; diff --git a/tderesources/remote/resourceremoteconfig.cpp b/tderesources/remote/resourceremoteconfig.cpp index 67d7f4b9..381134b0 100644 --- a/tderesources/remote/resourceremoteconfig.cpp +++ b/tderesources/remote/resourceremoteconfig.cpp @@ -24,9 +24,9 @@ #include <tqlabel.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <kdialog.h> diff --git a/tderesources/scalix/Makefile.am b/tderesources/scalix/Makefile.am index ca323048..6ba71e20 100644 --- a/tderesources/scalix/Makefile.am +++ b/tderesources/scalix/Makefile.am @@ -1,4 +1,4 @@ SUBDIRS = shared kabc kcal tdeioslave knotes scalixadmin messages: rc.cpp - $(XGETTEXT) shared/*.cpp kabc/*.cpp kcal/*.cpp knotes/*.cpp -o $(podir)/kres_scalix.pot + $(XGETTEXT) shared/*.cpp tdeabc/*.cpp kcal/*.cpp knotes/*.cpp -o $(podir)/kres_scalix.pot diff --git a/tderesources/scalix/kabc/contact.h b/tderesources/scalix/kabc/contact.h index ad095a8d..33ea1a9c 100644 --- a/tderesources/scalix/kabc/contact.h +++ b/tderesources/scalix/kabc/contact.h @@ -21,7 +21,7 @@ #ifndef SCALIX_CONTACT_H #define SCALIX_CONTACT_H -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> namespace Scalix { diff --git a/tderesources/scalix/kabc/resourcescalix.cpp b/tderesources/scalix/kabc/resourcescalix.cpp index 0629b516..d7826e17 100644 --- a/tderesources/scalix/kabc/resourcescalix.cpp +++ b/tderesources/scalix/kabc/resourcescalix.cpp @@ -34,10 +34,10 @@ #include "resourcescalix.h" #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> -#include <kmessagebox.h> -#include <ktempfile.h> +#include <tdeglobal.h> +#include <tdelocale.h> +#include <tdemessagebox.h> +#include <tdetempfile.h> #include <tdeio/observer.h> #include <tdeio/uiserver_stub.h> #include <tdemainwindow.h> diff --git a/tderesources/scalix/kcal/resourcescalix.cpp b/tderesources/scalix/kcal/resourcescalix.cpp index b75fd6c9..a58a8595 100644 --- a/tderesources/scalix/kcal/resourcescalix.cpp +++ b/tderesources/scalix/kcal/resourcescalix.cpp @@ -39,9 +39,9 @@ #include <dcopclient.h> #include <libkcal/icalformat.h> #include <libtdepim/kincidencechooser.h> -#include <kabc/locknull.h> +#include <tdeabc/locknull.h> #include <tdemainwindow.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqobject.h> #include <tqtimer.h> diff --git a/tderesources/scalix/knotes/resourcescalix.cpp b/tderesources/scalix/knotes/resourcescalix.cpp index 62b0daf4..c227d654 100644 --- a/tderesources/scalix/knotes/resourcescalix.cpp +++ b/tderesources/scalix/knotes/resourcescalix.cpp @@ -38,7 +38,7 @@ #include <libkcal/icalformat.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> using namespace Scalix; diff --git a/tderesources/scalix/scalixadmin/CMakeLists.txt b/tderesources/scalix/scalixadmin/CMakeLists.txt index f13d11a8..b2e1be91 100644 --- a/tderesources/scalix/scalixadmin/CMakeLists.txt +++ b/tderesources/scalix/scalixadmin/CMakeLists.txt @@ -28,6 +28,6 @@ tde_add_executable( scalixadmin AUTOMOC otherusermanager.cpp otheruserview.cpp otheruserpage.cpp ldapview.cpp ldapdialog.cpp delegatemanager.cpp delegateview.cpp delegatepage.cpp delegatedialog.cpp outofofficepage.cpp - LINK kabc-shared + LINK tdeabc-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/tderesources/scalix/scalixadmin/delegatedialog.cpp b/tderesources/scalix/scalixadmin/delegatedialog.cpp index 661f5743..8674ce70 100644 --- a/tderesources/scalix/scalixadmin/delegatedialog.cpp +++ b/tderesources/scalix/scalixadmin/delegatedialog.cpp @@ -24,7 +24,7 @@ #include <tqlineedit.h> #include <tqtoolbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include "jobs.h" #include "ldapdialog.h" diff --git a/tderesources/scalix/scalixadmin/delegatepage.cpp b/tderesources/scalix/scalixadmin/delegatepage.cpp index 169ff085..b4368f7d 100644 --- a/tderesources/scalix/scalixadmin/delegatepage.cpp +++ b/tderesources/scalix/scalixadmin/delegatepage.cpp @@ -22,8 +22,8 @@ #include <tqpushbutton.h> #include <kinputdialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <unistd.h> diff --git a/tderesources/scalix/scalixadmin/delegateview.cpp b/tderesources/scalix/scalixadmin/delegateview.cpp index 440fb66f..79b8cf33 100644 --- a/tderesources/scalix/scalixadmin/delegateview.cpp +++ b/tderesources/scalix/scalixadmin/delegateview.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include "delegatemanager.h" diff --git a/tderesources/scalix/scalixadmin/jobs.cpp b/tderesources/scalix/scalixadmin/jobs.cpp index e7dd9445..e07b17ca 100644 --- a/tderesources/scalix/scalixadmin/jobs.cpp +++ b/tderesources/scalix/scalixadmin/jobs.cpp @@ -19,7 +19,7 @@ */ #include <tdeio/scheduler.h> -#include <klocale.h> +#include <tdelocale.h> #include "jobs.h" diff --git a/tderesources/scalix/scalixadmin/ldapdialog.cpp b/tderesources/scalix/scalixadmin/ldapdialog.cpp index 6af08c4d..609c472b 100644 --- a/tderesources/scalix/scalixadmin/ldapdialog.cpp +++ b/tderesources/scalix/scalixadmin/ldapdialog.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include "ldapview.h" diff --git a/tderesources/scalix/scalixadmin/ldapview.cpp b/tderesources/scalix/scalixadmin/ldapview.cpp index 0cdca181..bc305998 100644 --- a/tderesources/scalix/scalixadmin/ldapview.cpp +++ b/tderesources/scalix/scalixadmin/ldapview.cpp @@ -18,9 +18,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <kabc/ldapclient.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdeabc/ldapclient.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "settings.h" diff --git a/tderesources/scalix/scalixadmin/main.cpp b/tderesources/scalix/scalixadmin/main.cpp index caaabcf4..6f162df9 100644 --- a/tderesources/scalix/scalixadmin/main.cpp +++ b/tderesources/scalix/scalixadmin/main.cpp @@ -21,7 +21,7 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include "mainwindow.h" diff --git a/tderesources/scalix/scalixadmin/mainwindow.cpp b/tderesources/scalix/scalixadmin/mainwindow.cpp index 5eb3d2a5..1759076a 100644 --- a/tderesources/scalix/scalixadmin/mainwindow.cpp +++ b/tderesources/scalix/scalixadmin/mainwindow.cpp @@ -20,10 +20,10 @@ #include <tqvbox.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kjanuswidget.h> -#include <klocale.h> +#include <tdelocale.h> #include "delegatepage.h" #include "otheruserpage.h" diff --git a/tderesources/scalix/scalixadmin/otheruserpage.cpp b/tderesources/scalix/scalixadmin/otheruserpage.cpp index 3aac47c9..3cc220ea 100644 --- a/tderesources/scalix/scalixadmin/otheruserpage.cpp +++ b/tderesources/scalix/scalixadmin/otheruserpage.cpp @@ -25,8 +25,8 @@ #include <dcopref.h> #include <kdcopservicestarter.h> #include <kinputdialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <unistd.h> diff --git a/tderesources/scalix/scalixadmin/otheruserview.cpp b/tderesources/scalix/scalixadmin/otheruserview.cpp index 06e69d41..e8aa13bc 100644 --- a/tderesources/scalix/scalixadmin/otheruserview.cpp +++ b/tderesources/scalix/scalixadmin/otheruserview.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include "otherusermanager.h" diff --git a/tderesources/scalix/scalixadmin/outofofficepage.cpp b/tderesources/scalix/scalixadmin/outofofficepage.cpp index 4e34a914..e807379a 100644 --- a/tderesources/scalix/scalixadmin/outofofficepage.cpp +++ b/tderesources/scalix/scalixadmin/outofofficepage.cpp @@ -25,8 +25,8 @@ #include <tqradiobutton.h> #include <tqtextedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "jobs.h" #include "settings.h" diff --git a/tderesources/scalix/scalixadmin/passwordpage.cpp b/tderesources/scalix/scalixadmin/passwordpage.cpp index 9bdc1377..4a13b700 100644 --- a/tderesources/scalix/scalixadmin/passwordpage.cpp +++ b/tderesources/scalix/scalixadmin/passwordpage.cpp @@ -25,8 +25,8 @@ #include <tqpushbutton.h> #include <tdeconfig.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstringhandler.h> #include <tdewallet.h> diff --git a/tderesources/scalix/shared/kmailconnection.cpp b/tderesources/scalix/shared/kmailconnection.cpp index 57f2f448..147b9822 100644 --- a/tderesources/scalix/shared/kmailconnection.cpp +++ b/tderesources/scalix/shared/kmailconnection.cpp @@ -37,7 +37,7 @@ #include <dcopclient.h> #include <tdeapplication.h> #include <kdcopservicestarter.h> -#include <klocale.h> +#include <tdelocale.h> #include "kmailicalIface_stub.h" diff --git a/tderesources/scalix/shared/resourcescalixbase.cpp b/tderesources/scalix/shared/resourcescalixbase.cpp index 1f829a79..6108230c 100644 --- a/tderesources/scalix/shared/resourcescalixbase.cpp +++ b/tderesources/scalix/shared/resourcescalixbase.cpp @@ -35,12 +35,12 @@ #include <folderselectdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kinputdialog.h> #include <kurl.h> -#include <ktempfile.h> -#include <kmessagebox.h> +#include <tdetempfile.h> +#include <tdemessagebox.h> #include <tqtextstream.h> #include <kdebug.h> diff --git a/tderesources/scalix/shared/scalixbase.cpp b/tderesources/scalix/shared/scalixbase.cpp index d40bdb03..3cdf16c0 100644 --- a/tderesources/scalix/shared/scalixbase.cpp +++ b/tderesources/scalix/shared/scalixbase.cpp @@ -32,7 +32,7 @@ #include "scalixbase.h" -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> #include <libkcal/journal.h> #include <libtdepim/kpimprefs.h> #include <kdebug.h> diff --git a/tderesources/scalix/tdeioslave/scalix.cpp b/tderesources/scalix/tdeioslave/scalix.cpp index b4f662fd..268b164b 100644 --- a/tderesources/scalix/tdeioslave/scalix.cpp +++ b/tderesources/scalix/tdeioslave/scalix.cpp @@ -26,7 +26,7 @@ #include <kdebug.h> #include <tdeversion.h> #include <tdeio/global.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepimmacros.h> diff --git a/tderesources/slox/kabcresourceslox.cpp b/tderesources/slox/kabcresourceslox.cpp index 04ce9555..426d86ad 100644 --- a/tderesources/slox/kabcresourceslox.cpp +++ b/tderesources/slox/kabcresourceslox.cpp @@ -21,10 +21,10 @@ #include <tqapplication.h> -#include <kabc/picture.h> +#include <tdeabc/picture.h> #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kmdcodec.h> #include <kstandarddirs.h> #include <kstringhandler.h> diff --git a/tderesources/slox/kabcresourceslox.h b/tderesources/slox/kabcresourceslox.h index d5251bdc..d51b06a1 100644 --- a/tderesources/slox/kabcresourceslox.h +++ b/tderesources/slox/kabcresourceslox.h @@ -25,7 +25,7 @@ #include <libtdepim/kabcresourcecached.h> #include <tdepimmacros.h> -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> #include <tqmap.h> #include <tqdom.h> diff --git a/tderesources/slox/kabcresourceslox_plugin.cpp b/tderesources/slox/kabcresourceslox_plugin.cpp index cbc02f25..0ee42517 100644 --- a/tderesources/slox/kabcresourceslox_plugin.cpp +++ b/tderesources/slox/kabcresourceslox_plugin.cpp @@ -21,8 +21,8 @@ #include "kabcresourceslox.h" #include "kabcresourcesloxconfig.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace KABC; diff --git a/tderesources/slox/kabcresourcesloxconfig.cpp b/tderesources/slox/kabcresourcesloxconfig.cpp index d9e32a55..72ba39d0 100644 --- a/tderesources/slox/kabcresourcesloxconfig.cpp +++ b/tderesources/slox/kabcresourcesloxconfig.cpp @@ -29,7 +29,7 @@ #include <kdebug.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include <kurlrequester.h> diff --git a/tderesources/slox/kcalresourceslox.cpp b/tderesources/slox/kcalresourceslox.cpp index a877622e..238b7183 100644 --- a/tderesources/slox/kcalresourceslox.cpp +++ b/tderesources/slox/kcalresourceslox.cpp @@ -32,7 +32,7 @@ #include <kurl.h> #include <tdeio/job.h> #include <tdeio/davjob.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <libtdepim/progressmanager.h> @@ -48,8 +48,8 @@ #include <libkcal/filestorage.h> #include <libkcal/confirmsavedialog.h> -#include <kabc/locknull.h> -#include <kabc/stdaddressbook.h> +#include <tdeabc/locknull.h> +#include <tdeabc/stdaddressbook.h> #include <tderesources/configwidget.h> diff --git a/tderesources/slox/kcalresourceslox_plugin.cpp b/tderesources/slox/kcalresourceslox_plugin.cpp index 8a5cf690..97e2bbeb 100644 --- a/tderesources/slox/kcalresourceslox_plugin.cpp +++ b/tderesources/slox/kcalresourceslox_plugin.cpp @@ -21,8 +21,8 @@ #include "kcalresourcesloxconfig.h" #include "kcalresourceslox.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace KCal; diff --git a/tderesources/slox/kcalresourcesloxconfig.cpp b/tderesources/slox/kcalresourcesloxconfig.cpp index e09cf85c..83246a03 100644 --- a/tderesources/slox/kcalresourcesloxconfig.cpp +++ b/tderesources/slox/kcalresourcesloxconfig.cpp @@ -24,7 +24,7 @@ #include <tqlayout.h> #include <tqcheckbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kstandarddirs.h> #include <klineedit.h> diff --git a/tderesources/slox/sloxaccounts.h b/tderesources/slox/sloxaccounts.h index 214e3c70..8bb7a1b5 100644 --- a/tderesources/slox/sloxaccounts.h +++ b/tderesources/slox/sloxaccounts.h @@ -20,7 +20,7 @@ #ifndef SLOXACCOUNTS_H #define SLOXACCOUNTS_H -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> #include <tdepimmacros.h> #include <tqobject.h> diff --git a/tderesources/slox/sloxfolder.cpp b/tderesources/slox/sloxfolder.cpp index fbfb9f05..cf75868c 100644 --- a/tderesources/slox/sloxfolder.cpp +++ b/tderesources/slox/sloxfolder.cpp @@ -17,7 +17,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include "sloxfolder.h" diff --git a/tderesources/slox/sloxfolderdialog.cpp b/tderesources/slox/sloxfolderdialog.cpp index f7d19697..716c2d40 100644 --- a/tderesources/slox/sloxfolderdialog.cpp +++ b/tderesources/slox/sloxfolderdialog.cpp @@ -20,7 +20,7 @@ #include <kiconloader.h> #include <kguiitem.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include "sloxfolderdialog.h" #include "sloxfoldermanager.h" diff --git a/tderesources/slox/sloxfoldermanager.cpp b/tderesources/slox/sloxfoldermanager.cpp index 72842055..d7284d3a 100644 --- a/tderesources/slox/sloxfoldermanager.cpp +++ b/tderesources/slox/sloxfoldermanager.cpp @@ -24,7 +24,7 @@ #include <kdebug.h> #include <tdeio/job.h> #include <tdeio/davjob.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include "sloxbase.h" diff --git a/tderesources/slox/webdavhandler.h b/tderesources/slox/webdavhandler.h index 136be879..5b835f2a 100644 --- a/tderesources/slox/webdavhandler.h +++ b/tderesources/slox/webdavhandler.h @@ -26,7 +26,7 @@ #include <tqdom.h> #include <tdepimmacros.h> -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> namespace KCal { class Incidence; diff --git a/tderesources/tvanytime/kcal_resourcetvanytime.cpp b/tderesources/tvanytime/kcal_resourcetvanytime.cpp index 9de4b0d1..3a1db8f9 100644 --- a/tderesources/tvanytime/kcal_resourcetvanytime.cpp +++ b/tderesources/tvanytime/kcal_resourcetvanytime.cpp @@ -38,14 +38,14 @@ #include <tqstringlist.h> #include <tqtimer.h> -#include <kabc/locknull.h> +#include <tdeabc/locknull.h> #include <karchive.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tderesources/configwidget.h> #include <kstandarddirs.h> #include <kstringhandler.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <ktar.h> #include <kurl.h> diff --git a/tderesources/tvanytime/kcal_resourcetvanytime.h b/tderesources/tvanytime/kcal_resourcetvanytime.h index 65e9ac11..e59f1703 100644 --- a/tderesources/tvanytime/kcal_resourcetvanytime.h +++ b/tderesources/tvanytime/kcal_resourcetvanytime.h @@ -27,7 +27,7 @@ #include <libkcal/resourcecached.h> -#include <kabc/locknull.h> +#include <tdeabc/locknull.h> #include <tdeio/job.h> #include <tdeconfig.h> #include <tdepimmacros.h> diff --git a/tderesources/tvanytime/kcal_resourcetvanytime_plugin.cpp b/tderesources/tvanytime/kcal_resourcetvanytime_plugin.cpp index 9ff0ae75..fd2942cd 100644 --- a/tderesources/tvanytime/kcal_resourcetvanytime_plugin.cpp +++ b/tderesources/tvanytime/kcal_resourcetvanytime_plugin.cpp @@ -21,8 +21,8 @@ #include "kcal_resourcetvanytime.h" #include "kcal_resourcetvanytimeconfig.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace KCal; diff --git a/tderesources/tvanytime/kcal_resourcetvanytimeconfig.cpp b/tderesources/tvanytime/kcal_resourcetvanytimeconfig.cpp index dbce86fe..8405e2f0 100644 --- a/tderesources/tvanytime/kcal_resourcetvanytimeconfig.cpp +++ b/tderesources/tvanytime/kcal_resourcetvanytimeconfig.cpp @@ -26,7 +26,7 @@ #include <tqwhatsthis.h> #include <tdeconfigskeleton.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> //#include <kdialogbase.h> //#include <kstandarddirs.h> |