diff options
Diffstat (limited to 'libkcal')
42 files changed, 64 insertions, 64 deletions
diff --git a/libkcal/CMakeLists.txt b/libkcal/CMakeLists.txt index a4113e36..af759feb 100644 --- a/libkcal/CMakeLists.txt +++ b/libkcal/CMakeLists.txt @@ -99,7 +99,7 @@ tde_add_library( kcal SHARED AUTOMOC htmlexportsettings.kcfgc htmlexport.cpp calendarnull.cpp freebusyurlstore.cpp confirmsavedialog.cpp VERSION 2.0.0 - LINK versit-static emailfunctions-static ktnef-shared kmime-shared kabc-shared ${LIBICAL_LIBRARIES} + LINK versit-static emailfunctions-static ktnef-shared kmime-shared tdeabc-shared ${LIBICAL_LIBRARIES} DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/libkcal/HACKING b/libkcal/HACKING index fc431906..ffaef8ac 100644 --- a/libkcal/HACKING +++ b/libkcal/HACKING @@ -1,4 +1,4 @@ -See tdelibs/kabc/HACKING or http://korganizer.kde.org/develop/hacking.html for +See tdelibs/tdeabc/HACKING or http://korganizer.kde.org/develop/hacking.html for general coding style conventions. Additional conventions for libkcal and KOrganizer: diff --git a/libkcal/attachmenthandler.cpp b/libkcal/attachmenthandler.cpp index aff810c1..0ddb5c8d 100644 --- a/libkcal/attachmenthandler.cpp +++ b/libkcal/attachmenthandler.cpp @@ -36,11 +36,11 @@ #include <tdeapplication.h> #include <tdefiledialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kmimetype.h> #include <krun.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdeio/netaccess.h> #include <tqfile.h> diff --git a/libkcal/attendee.cpp b/libkcal/attendee.cpp index 9aa3d46f..7eca7746 100644 --- a/libkcal/attendee.cpp +++ b/libkcal/attendee.cpp @@ -22,7 +22,7 @@ #include <tqstringlist.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "attendee.h" diff --git a/libkcal/calendar.cpp b/libkcal/calendar.cpp index ad5030a1..5918a749 100644 --- a/libkcal/calendar.cpp +++ b/libkcal/calendar.cpp @@ -31,7 +31,7 @@ #include <stdlib.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "exceptions.h" #include "calfilter.h" diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp index fd7025f7..297c5104 100644 --- a/libkcal/calendarlocal.cpp +++ b/libkcal/calendarlocal.cpp @@ -26,8 +26,8 @@ #include <tqptrlist.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "vcaldrag.h" #include "vcalformat.h" diff --git a/libkcal/calendarresources.cpp b/libkcal/calendarresources.cpp index d39564e9..b7d73dec 100644 --- a/libkcal/calendarresources.cpp +++ b/libkcal/calendarresources.cpp @@ -34,7 +34,7 @@ #include <kdebug.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include "vcaldrag.h" #include "vcalformat.h" @@ -46,7 +46,7 @@ #include <tderesources/manager.h> #include <tderesources/selectdialog.h> -#include <kabc/lock.h> +#include <tdeabc/lock.h> #include "resourcecalendar.h" #include "resourcelocal.h" diff --git a/libkcal/calformat.cpp b/libkcal/calformat.cpp index 6775c9ec..d6aa2278 100644 --- a/libkcal/calformat.cpp +++ b/libkcal/calformat.cpp @@ -19,7 +19,7 @@ Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeapplication.h> diff --git a/libkcal/confirmsavedialog.cpp b/libkcal/confirmsavedialog.cpp index 6ac64e61..61716eab 100644 --- a/libkcal/confirmsavedialog.cpp +++ b/libkcal/confirmsavedialog.cpp @@ -21,7 +21,7 @@ #include "confirmsavedialog.h" #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqframe.h> diff --git a/libkcal/convertqtopia.cpp b/libkcal/convertqtopia.cpp index ef585e63..a626231f 100644 --- a/libkcal/convertqtopia.cpp +++ b/libkcal/convertqtopia.cpp @@ -26,9 +26,9 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <kstandarddirs.h> diff --git a/libkcal/dndfactory.cpp b/libkcal/dndfactory.cpp index 61818b9d..0a1d68c0 100644 --- a/libkcal/dndfactory.cpp +++ b/libkcal/dndfactory.cpp @@ -27,8 +27,8 @@ #include <kiconloader.h> #include <kdebug.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include "vcaldrag.h" #include "icaldrag.h" diff --git a/libkcal/event.cpp b/libkcal/event.cpp index b040d182..53d094d3 100644 --- a/libkcal/event.cpp +++ b/libkcal/event.cpp @@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA. */ -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> #include "event.h" diff --git a/libkcal/exceptions.cpp b/libkcal/exceptions.cpp index 99c804dd..8939248c 100644 --- a/libkcal/exceptions.cpp +++ b/libkcal/exceptions.cpp @@ -19,7 +19,7 @@ Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include "calformat.h" #include "exceptions.h" diff --git a/libkcal/htmlexport.cpp b/libkcal/htmlexport.cpp index 7938c751..2b538574 100644 --- a/libkcal/htmlexport.cpp +++ b/libkcal/htmlexport.cpp @@ -27,8 +27,8 @@ #include <tqregexp.h> #include <kcharsets.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> #include <kcalendarsystem.h> @@ -38,7 +38,7 @@ #include <libkcal/todo.h> #ifndef KORG_NOKABC - #include <kabc/stdaddressbook.h> + #include <tdeabc/stdaddressbook.h> #endif #include "htmlexport.h" #include "htmlexportsettings.h" diff --git a/libkcal/icalformat.cpp b/libkcal/icalformat.cpp index deb38a60..34a4a1a9 100644 --- a/libkcal/icalformat.cpp +++ b/libkcal/icalformat.cpp @@ -28,7 +28,7 @@ #include <tqtextstream.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> extern "C" { #include <libical/ical.h> diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp index db3177fd..599eab3f 100644 --- a/libkcal/icalformatimpl.cpp +++ b/libkcal/icalformatimpl.cpp @@ -27,7 +27,7 @@ #include <cstdlib> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kmdcodec.h> extern "C" { diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp index e509cc05..99b17e99 100644 --- a/libkcal/incidence.cpp +++ b/libkcal/incidence.cpp @@ -20,8 +20,8 @@ Boston, MA 02110-1301, USA. */ -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> #include "calformat.h" diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp index 74c896f5..da314b63 100644 --- a/libkcal/incidencebase.cpp +++ b/libkcal/incidencebase.cpp @@ -20,8 +20,8 @@ Boston, MA 02110-1301, USA. */ -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> #include "calformat.h" diff --git a/libkcal/incidenceformatter.cpp b/libkcal/incidenceformatter.cpp index 0a42e2aa..1455a24a 100644 --- a/libkcal/incidenceformatter.cpp +++ b/libkcal/incidenceformatter.cpp @@ -38,15 +38,15 @@ #include <ktnef/ktnefparser.h> #include <ktnef/ktnefmessage.h> #include <ktnef/ktnefdefs.h> -#include <kabc/phonenumber.h> -#include <kabc/vcardconverter.h> -#include <kabc/stdaddressbook.h> +#include <tdeabc/phonenumber.h> +#include <tdeabc/vcardconverter.h> +#include <tdeabc/stdaddressbook.h> #include <tdeapplication.h> -#include <kemailsettings.h> +#include <tdeemailsettings.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kcalendarsystem.h> #include <kmimetype.h> diff --git a/libkcal/period.cpp b/libkcal/period.cpp index ff944ee9..586ba3e7 100644 --- a/libkcal/period.cpp +++ b/libkcal/period.cpp @@ -20,7 +20,7 @@ */ #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "period.h" diff --git a/libkcal/person.cpp b/libkcal/person.cpp index aad80f68..d56233bb 100644 --- a/libkcal/person.cpp +++ b/libkcal/person.cpp @@ -23,7 +23,7 @@ #include "person.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <libemailfunctions/email.h> diff --git a/libkcal/qtopiaformat.cpp b/libkcal/qtopiaformat.cpp index d417f9ea..a3f3f6f0 100644 --- a/libkcal/qtopiaformat.cpp +++ b/libkcal/qtopiaformat.cpp @@ -29,7 +29,7 @@ #include <tqxml.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "calendar.h" #include "calendarlocal.h" diff --git a/libkcal/recurrence.cpp b/libkcal/recurrence.cpp index d4e47a52..1c64ea3d 100644 --- a/libkcal/recurrence.cpp +++ b/libkcal/recurrence.cpp @@ -25,8 +25,8 @@ #include <limits.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tqbitarray.h> #include "recurrence.h" diff --git a/libkcal/recurrencerule.cpp b/libkcal/recurrencerule.cpp index 946141df..9805784f 100644 --- a/libkcal/recurrencerule.cpp +++ b/libkcal/recurrencerule.cpp @@ -23,7 +23,7 @@ #include "recurrencerule.h" #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tqdatetime.h> #include <tqstringlist.h> diff --git a/libkcal/resourcecached.cpp b/libkcal/resourcecached.cpp index 13d11be0..38110431 100644 --- a/libkcal/resourcecached.cpp +++ b/libkcal/resourcecached.cpp @@ -30,7 +30,7 @@ #include <tqptrlist.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <kstandarddirs.h> diff --git a/libkcal/resourcecachedconfig.cpp b/libkcal/resourcecachedconfig.cpp index caa1fddf..ee43f711 100644 --- a/libkcal/resourcecachedconfig.cpp +++ b/libkcal/resourcecachedconfig.cpp @@ -26,7 +26,7 @@ #include <tqhbox.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "resourcecached.h" diff --git a/libkcal/resourcecalendar.cpp b/libkcal/resourcecalendar.cpp index 76f12ed1..fb51f0ab 100644 --- a/libkcal/resourcecalendar.cpp +++ b/libkcal/resourcecalendar.cpp @@ -24,7 +24,7 @@ #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "calendar.h" diff --git a/libkcal/resourcecalendar.h b/libkcal/resourcecalendar.h index c8455483..80f37f82 100644 --- a/libkcal/resourcecalendar.h +++ b/libkcal/resourcecalendar.h @@ -40,7 +40,7 @@ #include <tderesources/resource.h> #include <tderesources/manager.h> -#include <kabc/lock.h> +#include <tdeabc/lock.h> #include <tdepimmacros.h> namespace KCal { diff --git a/libkcal/resourcelocal.cpp b/libkcal/resourcelocal.cpp index dca20b9a..aee2ba98 100644 --- a/libkcal/resourcelocal.cpp +++ b/libkcal/resourcelocal.cpp @@ -28,7 +28,7 @@ #include <tqptrlist.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <kstandarddirs.h> diff --git a/libkcal/resourcelocalconfig.cpp b/libkcal/resourcelocalconfig.cpp index 92c34e29..ccba0328 100644 --- a/libkcal/resourcelocalconfig.cpp +++ b/libkcal/resourcelocalconfig.cpp @@ -25,8 +25,8 @@ #include <tqlabel.h> #include <tqlayout.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <kstandarddirs.h> diff --git a/libkcal/resourcelocaldir.cpp b/libkcal/resourcelocaldir.cpp index 730f3abd..f5145735 100644 --- a/libkcal/resourcelocaldir.cpp +++ b/libkcal/resourcelocaldir.cpp @@ -28,7 +28,7 @@ #include <tqptrlist.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <tdeconfig.h> #include <kstandarddirs.h> diff --git a/libkcal/resourcelocaldirconfig.cpp b/libkcal/resourcelocaldirconfig.cpp index df2412b3..afe9c95b 100644 --- a/libkcal/resourcelocaldirconfig.cpp +++ b/libkcal/resourcelocaldirconfig.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 "vcaldrag.h" diff --git a/libkcal/scheduler.cpp b/libkcal/scheduler.cpp index 6e3cf385..c398a77c 100644 --- a/libkcal/scheduler.cpp +++ b/libkcal/scheduler.cpp @@ -20,9 +20,9 @@ Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include "calhelper.h" diff --git a/libkcal/tests/readandwrite.cpp b/libkcal/tests/readandwrite.cpp index 53e082a3..5f6c3488 100644 --- a/libkcal/tests/readandwrite.cpp +++ b/libkcal/tests/readandwrite.cpp @@ -28,7 +28,7 @@ extern "C" { #include <tdeaboutdata.h> #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <tqfile.h> diff --git a/libkcal/tests/testcalendar.cpp b/libkcal/tests/testcalendar.cpp index 85f77d78..b5c15ac4 100644 --- a/libkcal/tests/testcalendar.cpp +++ b/libkcal/tests/testcalendar.cpp @@ -22,7 +22,7 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include "calendarlocal.h" diff --git a/libkcal/tests/testcalselectdialog.cpp b/libkcal/tests/testcalselectdialog.cpp index 2c3ae7f7..84fe89c8 100644 --- a/libkcal/tests/testcalselectdialog.cpp +++ b/libkcal/tests/testcalselectdialog.cpp @@ -22,7 +22,7 @@ using namespace KCal; #include <tdeapplication.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> int main( int argc, char **argv ) diff --git a/libkcal/tests/testfields.cpp b/libkcal/tests/testfields.cpp index 2d393aa6..05522dfe 100644 --- a/libkcal/tests/testfields.cpp +++ b/libkcal/tests/testfields.cpp @@ -22,7 +22,7 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include "calendarlocal.h" diff --git a/libkcal/tests/testincidence.cpp b/libkcal/tests/testincidence.cpp index 858ed9cc..e510cf73 100644 --- a/libkcal/tests/testincidence.cpp +++ b/libkcal/tests/testincidence.cpp @@ -22,7 +22,7 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include "icalformat.h" diff --git a/libkcal/tests/testresource.cpp b/libkcal/tests/testresource.cpp index 64ada3b0..a5f20786 100644 --- a/libkcal/tests/testresource.cpp +++ b/libkcal/tests/testresource.cpp @@ -21,7 +21,7 @@ #include <config.h> -#include <kabc/stdaddressbook.h> +#include <tdeabc/stdaddressbook.h> #include <kurl.h> #include <tdeapplication.h> #include <tdeio/netaccess.h> diff --git a/libkcal/tests/testvcalexport.cpp b/libkcal/tests/testvcalexport.cpp index d6997ef4..7cf619d0 100644 --- a/libkcal/tests/testvcalexport.cpp +++ b/libkcal/tests/testvcalexport.cpp @@ -32,7 +32,7 @@ extern "C" { #include <tdeaboutdata.h> #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <tqfile.h> diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp index 7c4a4df3..d7ba1658 100644 --- a/libkcal/todo.cpp +++ b/libkcal/todo.cpp @@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA. */ -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> #include "todo.h" diff --git a/libkcal/vcalformat.cpp b/libkcal/vcalformat.cpp index 9c7a0f1c..7733b27d 100644 --- a/libkcal/vcalformat.cpp +++ b/libkcal/vcalformat.cpp @@ -30,9 +30,9 @@ #include <tqfile.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include "vcc.h" #include "vobject.h" |