diff options
Diffstat (limited to 'tderesources')
55 files changed, 55 insertions, 52 deletions
diff --git a/tderesources/birthdays/resourcetdeabc.h b/tderesources/birthdays/resourcetdeabc.h index 5ba80ca1..35271c1d 100644 --- a/tderesources/birthdays/resourcetdeabc.h +++ b/tderesources/birthdays/resourcetdeabc.h @@ -33,7 +33,7 @@ #include "libkcal/resourcecalendar.h" -#include "libtdepim/tdepimmacros.h" +#include <kdemacros.h> namespace TDEIO { class FileCopyJob; diff --git a/tderesources/blogging/kcal_resourceblogging.h b/tderesources/blogging/kcal_resourceblogging.h index 4e850d14..56d3cad2 100644 --- a/tderesources/blogging/kcal_resourceblogging.h +++ b/tderesources/blogging/kcal_resourceblogging.h @@ -22,7 +22,7 @@ #define KCAL_RESOURCEBLOGGING_H #include <kcal_resourcegroupwarebase.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KBlog { class APIBlog; diff --git a/tderesources/blogging/kcal_resourcebloggingconfig.h b/tderesources/blogging/kcal_resourcebloggingconfig.h index b7584167..d2062d76 100644 --- a/tderesources/blogging/kcal_resourcebloggingconfig.h +++ b/tderesources/blogging/kcal_resourcebloggingconfig.h @@ -20,7 +20,7 @@ #ifndef KCAL_RESOURCEBLOGGINGCONFIG_H #define KCAL_RESOURCEBLOGGINGCONFIG_H -#include <tdepimmacros.h> +#include <kdemacros.h> #include <kcal_resourcegroupwarebaseconfig.h> namespace KCal { diff --git a/tderesources/caldav/resource.h b/tderesources/caldav/resource.h index 2d0c3ec0..96f88a45 100644 --- a/tderesources/caldav/resource.h +++ b/tderesources/caldav/resource.h @@ -26,7 +26,7 @@ #include <tdeabc/locknull.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tdeconfig.h> namespace KCal { diff --git a/tderesources/carddav/resource.h b/tderesources/carddav/resource.h index caec0d07..a24b12a7 100644 --- a/tderesources/carddav/resource.h +++ b/tderesources/carddav/resource.h @@ -25,7 +25,7 @@ #include <tdeabc/locknull.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tdeconfig.h> namespace TDEABC { diff --git a/tderesources/egroupware/kcal_resourcexmlrpc.h b/tderesources/egroupware/kcal_resourcexmlrpc.h index 27199581..6b7f829b 100644 --- a/tderesources/egroupware/kcal_resourcexmlrpc.h +++ b/tderesources/egroupware/kcal_resourcexmlrpc.h @@ -29,7 +29,7 @@ #include <tdeconfig.h> #include <kurl.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include "libkcal/calendarlocal.h" #include "libkcal/incidence.h" diff --git a/tderesources/egroupware/kcal_resourcexmlrpcconfig.h b/tderesources/egroupware/kcal_resourcexmlrpcconfig.h index 2790717f..b99bca73 100644 --- a/tderesources/egroupware/kcal_resourcexmlrpcconfig.h +++ b/tderesources/egroupware/kcal_resourcexmlrpcconfig.h @@ -22,7 +22,7 @@ #define RESOURCEXMLRPCCONFIG_H #include <tderesources/configwidget.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KIntSpinBox; class KLineEdit; diff --git a/tderesources/egroupware/knotes_resourcexmlrpc.h b/tderesources/egroupware/knotes_resourcexmlrpc.h index 3550aed4..f99281e9 100644 --- a/tderesources/egroupware/knotes_resourcexmlrpc.h +++ b/tderesources/egroupware/knotes_resourcexmlrpc.h @@ -27,7 +27,7 @@ #include <tdeconfig.h> #include <kurl.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include "libkcal/calendarlocal.h" #include "libkcal/journal.h" diff --git a/tderesources/egroupware/knotes_resourcexmlrpcconfig.h b/tderesources/egroupware/knotes_resourcexmlrpcconfig.h index e087dbe2..e6b05bee 100644 --- a/tderesources/egroupware/knotes_resourcexmlrpcconfig.h +++ b/tderesources/egroupware/knotes_resourcexmlrpcconfig.h @@ -22,7 +22,7 @@ #define RESOURCEXMLRPCCONFIG_H #include <tderesources/configwidget.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KIntSpinBox; class KLineEdit; diff --git a/tderesources/egroupware/tdeabc_resourcexmlrpc.h b/tderesources/egroupware/tdeabc_resourcexmlrpc.h index 719c35c0..bed5cf21 100644 --- a/tderesources/egroupware/tdeabc_resourcexmlrpc.h +++ b/tderesources/egroupware/tdeabc_resourcexmlrpc.h @@ -22,7 +22,7 @@ #define TDEABC_RESOURCEXMLRPC_H #include <tqmap.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include "libtdepim/tdeabcresourcecached.h" diff --git a/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h b/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h index f4893c84..57773483 100644 --- a/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h +++ b/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h @@ -22,7 +22,7 @@ #define RESOURCEXMLRPCCONFIG_H #include <tderesources/configwidget.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KLineEdit; class KURLRequester; diff --git a/tderesources/featureplan/kcal_resourcefeatureplan.h b/tderesources/featureplan/kcal_resourcefeatureplan.h index 2d492897..c86d18bc 100644 --- a/tderesources/featureplan/kcal_resourcefeatureplan.h +++ b/tderesources/featureplan/kcal_resourcefeatureplan.h @@ -29,7 +29,7 @@ #include <tdeabc/locknull.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tdeconfig.h> namespace KCal { diff --git a/tderesources/featureplan/kcal_resourcefeatureplanconfig.h b/tderesources/featureplan/kcal_resourcefeatureplanconfig.h index aa00123f..917ce52e 100644 --- a/tderesources/featureplan/kcal_resourcefeatureplanconfig.h +++ b/tderesources/featureplan/kcal_resourcefeatureplanconfig.h @@ -23,7 +23,7 @@ #define RESOURCEFEATUREPLANCONFIG_H #include <tderesources/configwidget.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KLineEdit; class KURLRequester; diff --git a/tderesources/groupdav/tdeabc_resourcegroupdav.h b/tderesources/groupdav/tdeabc_resourcegroupdav.h index 36b0456c..7aa82f71 100644 --- a/tderesources/groupdav/tdeabc_resourcegroupdav.h +++ b/tderesources/groupdav/tdeabc_resourcegroupdav.h @@ -23,7 +23,7 @@ #define TDEABC_RESOURCEGROUPDAV_H #include "tdeabc_resourcegroupwarebase.h" -#include <tdepimmacros.h> +#include <kdemacros.h> namespace TDEABC { diff --git a/tderesources/groupwise/kcal_resourcegroupwise.h b/tderesources/groupwise/kcal_resourcegroupwise.h index c4b330df..5743a282 100644 --- a/tderesources/groupwise/kcal_resourcegroupwise.h +++ b/tderesources/groupwise/kcal_resourcegroupwise.h @@ -30,7 +30,7 @@ #include <tdeabc/locknull.h> #include <tdeio/job.h> #include <tdeconfig.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class ngwt__Settings; diff --git a/tderesources/groupwise/kcal_resourcegroupwiseconfig.h b/tderesources/groupwise/kcal_resourcegroupwiseconfig.h index cea6ad69..87447e0a 100644 --- a/tderesources/groupwise/kcal_resourcegroupwiseconfig.h +++ b/tderesources/groupwise/kcal_resourcegroupwiseconfig.h @@ -21,7 +21,7 @@ #define KCALRESOURCEGROUPWISECONFIG_H #include <kurlrequester.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tderesources/resource.h> #include <tderesources/configwidget.h> diff --git a/tderesources/groupwise/tdeabc_resourcegroupwise.h b/tderesources/groupwise/tdeabc_resourcegroupwise.h index fb1d075a..b57c36e8 100644 --- a/tderesources/groupwise/tdeabc_resourcegroupwise.h +++ b/tderesources/groupwise/tdeabc_resourcegroupwise.h @@ -23,7 +23,7 @@ #include "soap/groupwiseserver.h" #include <tdeabcresourcecached.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <libtdepim/progressmanager.h> diff --git a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h index df62753a..233743f8 100644 --- a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h +++ b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h @@ -23,7 +23,7 @@ #include "soap/groupwiseserver.h" #include <tderesources/configwidget.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tqmap.h> diff --git a/tderesources/groupwise/tdeioslave/groupwise.cpp b/tderesources/groupwise/tdeioslave/groupwise.cpp index 56021e68..c51fa4e4 100644 --- a/tderesources/groupwise/tdeioslave/groupwise.cpp +++ b/tderesources/groupwise/tdeioslave/groupwise.cpp @@ -44,7 +44,7 @@ #include <unistd.h> #include <stdlib.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include "groupwise.h" diff --git a/tderesources/kolab/kcal/resourcekolab.h b/tderesources/kolab/kcal/resourcekolab.h index 357c9804..8a4da37c 100644 --- a/tderesources/kolab/kcal/resourcekolab.h +++ b/tderesources/kolab/kcal/resourcekolab.h @@ -37,7 +37,7 @@ #include <tqtimer.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <libkcal/calendarlocal.h> #include <libkcal/icalformat.h> #include <libkcal/resourcecalendar.h> diff --git a/tderesources/kolab/knotes/resourcekolab.h b/tderesources/kolab/knotes/resourcekolab.h index fb0d191b..5f205b16 100644 --- a/tderesources/kolab/knotes/resourcekolab.h +++ b/tderesources/kolab/knotes/resourcekolab.h @@ -39,7 +39,7 @@ #include <libkcal/calendarlocal.h> #include "../shared/resourcekolabbase.h" #include "../shared/subresource.h" -#include <tdepimmacros.h> +#include <kdemacros.h> namespace Kolab { diff --git a/tderesources/kolab/tdeabc/contact.cpp b/tderesources/kolab/tdeabc/contact.cpp index 21583eb3..7d594735 100644 --- a/tderesources/kolab/tdeabc/contact.cpp +++ b/tderesources/kolab/tdeabc/contact.cpp @@ -33,6 +33,7 @@ #include "contact.h" #include "resourcekolab.h" +#include <tdeversion.h> #include <tdeabc/addressee.h> #include <tdeabc/stdaddressbook.h> #include <libkcal/freebusyurlstore.h> diff --git a/tderesources/kolab/tdeabc/resourcekolab.h b/tderesources/kolab/tdeabc/resourcekolab.h index a19dfbaa..9b4b4a17 100644 --- a/tderesources/kolab/tdeabc/resourcekolab.h +++ b/tderesources/kolab/tdeabc/resourcekolab.h @@ -38,7 +38,7 @@ #include "../shared/resourcekolabbase.h" #include "../shared/subresource.h" #include <kmail/kmailicalIface.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace TDEABC { diff --git a/tderesources/lib/addressbookadaptor.h b/tderesources/lib/addressbookadaptor.h index a1a43f0e..5a754bc6 100644 --- a/tderesources/lib/addressbookadaptor.h +++ b/tderesources/lib/addressbookadaptor.h @@ -26,7 +26,7 @@ #include "groupwaredataadaptor.h" #include <tdeabc/addressee.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <kurl.h> namespace TDEABC { diff --git a/tderesources/lib/calendaradaptor.h b/tderesources/lib/calendaradaptor.h index 354a2795..7a2567e3 100644 --- a/tderesources/lib/calendaradaptor.h +++ b/tderesources/lib/calendaradaptor.h @@ -27,7 +27,7 @@ #include <libkcal/incidence.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <kurl.h> namespace KPIM { diff --git a/tderesources/lib/davaddressbookadaptor.h b/tderesources/lib/davaddressbookadaptor.h index 883d1510..fcb16afa 100644 --- a/tderesources/lib/davaddressbookadaptor.h +++ b/tderesources/lib/davaddressbookadaptor.h @@ -24,7 +24,7 @@ #include "addressbookadaptor.h" #include "folderlister.h" #include <tqdom.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace TDEABC { diff --git a/tderesources/lib/davcalendaradaptor.h b/tderesources/lib/davcalendaradaptor.h index 998a9cc7..ab1c9757 100644 --- a/tderesources/lib/davcalendaradaptor.h +++ b/tderesources/lib/davcalendaradaptor.h @@ -24,7 +24,7 @@ #include "calendaradaptor.h" #include "folderlister.h" #include <tqdom.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KCal { diff --git a/tderesources/lib/folderconfig.h b/tderesources/lib/folderconfig.h index a9b4c714..e027095d 100644 --- a/tderesources/lib/folderconfig.h +++ b/tderesources/lib/folderconfig.h @@ -24,7 +24,7 @@ #define KPIM_FOLDERCONFIG_H #include <kurl.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tqwidget.h> // class TDEListView; diff --git a/tderesources/lib/folderlister.h b/tderesources/lib/folderlister.h index a1d3f2eb..ac99d516 100644 --- a/tderesources/lib/folderlister.h +++ b/tderesources/lib/folderlister.h @@ -26,7 +26,7 @@ // #include "tderesources_groupwareprefs.h" /*#include "groupwareresourcejob.h"*/ #include <kurl.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tqvaluelist.h> #include <tqstring.h> diff --git a/tderesources/lib/groupwaredataadaptor.h b/tderesources/lib/groupwaredataadaptor.h index b7bd6e33..0370aa6f 100644 --- a/tderesources/lib/groupwaredataadaptor.h +++ b/tderesources/lib/groupwaredataadaptor.h @@ -29,7 +29,7 @@ #include <tqstring.h> #include <libkcal/listbase.h> #include <tqobject.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace TDEIO { diff --git a/tderesources/lib/kcal_cachesettingsdlg.h b/tderesources/lib/kcal_cachesettingsdlg.h index 51263e26..18586455 100644 --- a/tderesources/lib/kcal_cachesettingsdlg.h +++ b/tderesources/lib/kcal_cachesettingsdlg.h @@ -23,7 +23,7 @@ #define KCAL_CACHESETTINGSDLG_H #include <kdialogbase.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KRES { diff --git a/tderesources/lib/kcal_resourcegroupwarebase.h b/tderesources/lib/kcal_resourcegroupwarebase.h index 80a1d460..f7f80435 100644 --- a/tderesources/lib/kcal_resourcegroupwarebase.h +++ b/tderesources/lib/kcal_resourcegroupwarebase.h @@ -25,7 +25,7 @@ #include <kurl.h> #include <libkcal/resourcecached.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tdeabc/locknull.h> namespace TDEIO { diff --git a/tderesources/lib/kcal_resourcegroupwarebaseconfig.h b/tderesources/lib/kcal_resourcegroupwarebaseconfig.h index 7639b562..940ba61b 100644 --- a/tderesources/lib/kcal_resourcegroupwarebaseconfig.h +++ b/tderesources/lib/kcal_resourcegroupwarebaseconfig.h @@ -23,7 +23,7 @@ #define KCAL_RESOURCEGROUPWAREBASECONFIG_H #include <tderesources/configwidget.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KPushButton; class KLineEdit; diff --git a/tderesources/lib/tdeabc_resourcegroupwarebase.h b/tderesources/lib/tdeabc_resourcegroupwarebase.h index 7835d3d2..9d122fe4 100644 --- a/tderesources/lib/tdeabc_resourcegroupwarebase.h +++ b/tderesources/lib/tdeabc_resourcegroupwarebase.h @@ -24,7 +24,7 @@ #include <kurl.h> #include <tdeabcresourcecached.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TDEConfig; diff --git a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h index 7b832623..37e98ef4 100644 --- a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h +++ b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h @@ -23,7 +23,7 @@ #define TDEABC_RESOURCEGROUPWAREBASECONFIG_H #include <tderesources/configwidget.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KLineEdit; class KURLRequester; diff --git a/tderesources/lib/webdavhandler.h b/tderesources/lib/webdavhandler.h index 0bfb33e9..a2de509d 100644 --- a/tderesources/lib/webdavhandler.h +++ b/tderesources/lib/webdavhandler.h @@ -27,7 +27,7 @@ #include <tqdom.h> #include <tqdatetime.h> #include <kurl.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KDE_EXPORT WebdavHandler { diff --git a/tderesources/newexchange/exchangeconvertercontact.cpp b/tderesources/newexchange/exchangeconvertercontact.cpp index 5551516e..c6f3599f 100644 --- a/tderesources/newexchange/exchangeconvertercontact.cpp +++ b/tderesources/newexchange/exchangeconvertercontact.cpp @@ -21,6 +21,7 @@ #include "exchangeconvertercontact.h" #include <libkcal/freebusyurlstore.h> #include <webdavhandler.h> +#include <tdeversion.h> #include <kdebug.h> diff --git a/tderesources/remote/resourceremote.h b/tderesources/remote/resourceremote.h index 84e213ae..ec7be921 100644 --- a/tderesources/remote/resourceremote.h +++ b/tderesources/remote/resourceremote.h @@ -28,7 +28,7 @@ #include <kurl.h> #include <tdeconfig.h> #include <kdirwatch.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <libtdepim/progressmanager.h> diff --git a/tderesources/remote/resourceremoteconfig.h b/tderesources/remote/resourceremoteconfig.h index a05171ee..fdf26203 100644 --- a/tderesources/remote/resourceremoteconfig.h +++ b/tderesources/remote/resourceremoteconfig.h @@ -30,7 +30,7 @@ #include <tderesources/resource.h> #include <tderesources/configwidget.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KCal { diff --git a/tderesources/scalix/kcal/resourcescalix.h b/tderesources/scalix/kcal/resourcescalix.h index b58eee85..d4e564c0 100644 --- a/tderesources/scalix/kcal/resourcescalix.h +++ b/tderesources/scalix/kcal/resourcescalix.h @@ -36,7 +36,7 @@ #include <tqtimer.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <libkcal/calendarlocal.h> #include <libkcal/icalformat.h> #include <libkcal/resourcecalendar.h> diff --git a/tderesources/scalix/knotes/resourcescalix.h b/tderesources/scalix/knotes/resourcescalix.h index 6a3676c1..ab40b707 100644 --- a/tderesources/scalix/knotes/resourcescalix.h +++ b/tderesources/scalix/knotes/resourcescalix.h @@ -38,7 +38,7 @@ #include <libkcal/calendarlocal.h> #include "../shared/resourcescalixbase.h" #include "../shared/subresource.h" -#include <tdepimmacros.h> +#include <kdemacros.h> namespace Scalix { diff --git a/tderesources/scalix/tdeabc/resourcescalix.h b/tderesources/scalix/tdeabc/resourcescalix.h index f9d4c309..f5c8ffe6 100644 --- a/tderesources/scalix/tdeabc/resourcescalix.h +++ b/tderesources/scalix/tdeabc/resourcescalix.h @@ -39,7 +39,7 @@ #include "../shared/resourcescalixbase.h" #include "../shared/subresource.h" #include <kmail/kmailicalIface.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace TDEABC { diff --git a/tderesources/scalix/tdeioslave/scalix.cpp b/tderesources/scalix/tdeioslave/scalix.cpp index 5ce8dca1..0af6c466 100644 --- a/tderesources/scalix/tdeioslave/scalix.cpp +++ b/tderesources/scalix/tdeioslave/scalix.cpp @@ -28,7 +28,7 @@ #include <tdeio/global.h> #include <tdelocale.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <stdlib.h> diff --git a/tderesources/slox/kcalresourceslox.h b/tderesources/slox/kcalresourceslox.h index 39a2757e..cfad65ed 100644 --- a/tderesources/slox/kcalresourceslox.h +++ b/tderesources/slox/kcalresourceslox.h @@ -31,7 +31,7 @@ #include <kurl.h> #include <tdeconfig.h> #include <kdirwatch.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <libkcal/incidence.h> #include <libkcal/todo.h> diff --git a/tderesources/slox/kcalresourcesloxconfig.h b/tderesources/slox/kcalresourcesloxconfig.h index e2a666c0..f5784f84 100644 --- a/tderesources/slox/kcalresourcesloxconfig.h +++ b/tderesources/slox/kcalresourcesloxconfig.h @@ -21,7 +21,7 @@ #define KCALRESOURCESLOXCONFIG_H #include <kurlrequester.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tderesources/resource.h> #include <tderesources/configwidget.h> diff --git a/tderesources/slox/sloxaccounts.h b/tderesources/slox/sloxaccounts.h index 2e9d1289..1af80586 100644 --- a/tderesources/slox/sloxaccounts.h +++ b/tderesources/slox/sloxaccounts.h @@ -21,7 +21,7 @@ #define SLOXACCOUNTS_H #include <tdeabc/addressee.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tqobject.h> namespace TDEIO { diff --git a/tderesources/slox/sloxbase.h b/tderesources/slox/sloxbase.h index 8e9309c9..dc3c9c53 100644 --- a/tderesources/slox/sloxbase.h +++ b/tderesources/slox/sloxbase.h @@ -21,7 +21,7 @@ #define SLOXUTILS_H #include <tqstring.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KRES { class Resource; diff --git a/tderesources/slox/sloxfolder.h b/tderesources/slox/sloxfolder.h index 6f6a6c93..06f08003 100644 --- a/tderesources/slox/sloxfolder.h +++ b/tderesources/slox/sloxfolder.h @@ -21,7 +21,7 @@ #define SLOXFOLDER_H #include <tqstring.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TDEListViewItem; diff --git a/tderesources/slox/sloxfoldermanager.h b/tderesources/slox/sloxfoldermanager.h index f31c212c..3907dab7 100644 --- a/tderesources/slox/sloxfoldermanager.h +++ b/tderesources/slox/sloxfoldermanager.h @@ -25,7 +25,7 @@ #include <kurl.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace TDEIO { class Job; diff --git a/tderesources/slox/tdeabcresourceslox.cpp b/tderesources/slox/tdeabcresourceslox.cpp index 248e3f39..79036abd 100644 --- a/tderesources/slox/tdeabcresourceslox.cpp +++ b/tderesources/slox/tdeabcresourceslox.cpp @@ -21,6 +21,7 @@ #include <tqapplication.h> +#include <tdeversion.h> #include <tdeabc/picture.h> #include <tdeconfig.h> #include <kdebug.h> diff --git a/tderesources/slox/tdeabcresourceslox.h b/tderesources/slox/tdeabcresourceslox.h index 35a71be2..a37f17d6 100644 --- a/tderesources/slox/tdeabcresourceslox.h +++ b/tderesources/slox/tdeabcresourceslox.h @@ -24,7 +24,7 @@ #include "webdavhandler.h" #include <libtdepim/tdeabcresourcecached.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tdeabc/addressee.h> #include <tqmap.h> diff --git a/tderesources/slox/tdeabcresourcesloxconfig.h b/tderesources/slox/tdeabcresourcesloxconfig.h index 6bbaf6ae..36e02126 100644 --- a/tderesources/slox/tdeabcresourcesloxconfig.h +++ b/tderesources/slox/tdeabcresourcesloxconfig.h @@ -21,7 +21,7 @@ #define RESOURCESLOXCONFIG_H #include <tderesources/configwidget.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TQCheckBox; class KLineEdit; diff --git a/tderesources/slox/webdavhandler.h b/tderesources/slox/webdavhandler.h index c7c93222..6d98fd52 100644 --- a/tderesources/slox/webdavhandler.h +++ b/tderesources/slox/webdavhandler.h @@ -25,7 +25,7 @@ #include <tqdatetime.h> #include <tqdom.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tdeabc/addressee.h> namespace KCal { diff --git a/tderesources/tvanytime/kcal_resourcetvanytime.h b/tderesources/tvanytime/kcal_resourcetvanytime.h index 1be0aa0e..636389be 100644 --- a/tderesources/tvanytime/kcal_resourcetvanytime.h +++ b/tderesources/tvanytime/kcal_resourcetvanytime.h @@ -30,7 +30,7 @@ #include <tdeabc/locknull.h> #include <tdeio/job.h> #include <tdeconfig.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include "service.h" diff --git a/tderesources/tvanytime/kcal_resourcetvanytimeconfig.h b/tderesources/tvanytime/kcal_resourcetvanytimeconfig.h index c99e86e0..814cc492 100644 --- a/tderesources/tvanytime/kcal_resourcetvanytimeconfig.h +++ b/tderesources/tvanytime/kcal_resourcetvanytimeconfig.h @@ -21,7 +21,7 @@ #define KCALRESOURCETVANYTIMECONFIG_H #include <kurlrequester.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tderesources/resource.h> #include <tderesources/configwidget.h> |