The workaround that tdepimmacros.h do is no longer needed

and kdemacros.h can be used directly. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
4 years ago · e77087ce3d
parent 6169644742
commit e77087ce3d
298 changed files with 299 additions and 292 deletions
--- a/akregator/src/aboutdata.h
+++ b/akregator/src/aboutdata.h
@ -26,7 +26,7 @@
 #define ABOUTDATA_H
 #include <tdeaboutdata.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #define AKREGATOR_VERSION "1.2.9"
--- a/akregator/src/akregator_export.h
+++ b/akregator/src/akregator_export.h
@ -21,7 +21,7 @@
 #ifndef AKREGATOR_AKREGATOREXPORT_H
 #define AKREGATOR_AKREGATOREXPORT_H
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #define AKREGATOR_EXPORT KDE_EXPORT
--- a/akregator/src/librss/global.h
+++ b/akregator/src/librss/global.h
@ -11,7 +11,7 @@
 #ifndef LIBRSS_GLOBAL_H
 #define LIBRSS_GLOBAL_H
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 template <class>
 class TQValueList;
--- a/certmanager/certmanager.cpp
+++ b/certmanager/certmanager.cpp
@ -96,7 +96,7 @@
 // other
 #include <algorithm>
 #include <assert.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <kinputdialog.h>
 namespace {
--- a/certmanager/certmanager.h
+++ b/certmanager/certmanager.h
@ -36,7 +36,7 @@
 //#include <gpgme.h>
 #include <tdemainwindow.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <kurl.h>
 #include <tqcstring.h>
 #include <tqptrlist.h>
--- a/certmanager/conf/appearanceconfigpage.cpp
+++ b/certmanager/conf/appearanceconfigpage.cpp
@ -36,7 +36,7 @@
 #include <tdelocale.h>
 #include <kdebug.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 AppearanceConfigurationPage::AppearanceConfigurationPage( TQWidget * parent, const char * name )
    : TDECModule( parent, name )
--- a/certmanager/conf/dirservconfigpage.cpp
+++ b/certmanager/conf/dirservconfigpage.cpp
@ -47,7 +47,7 @@
 #include <tqcheckbox.h>
 #include <tqlayout.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #if 0 // disabled, since it is apparently confusing
 // For sync'ing kabldaprc
--- a/certmanager/conf/dirservconfigpage.h
+++ b/certmanager/conf/dirservconfigpage.h
@ -34,7 +34,7 @@
 #include <tdecmodule.h>
 #include <kleo/cryptoconfig.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TQCheckBox;
 class TQTimeEdit;
--- a/certmanager/conf/dnorderconfigpage.cpp
+++ b/certmanager/conf/dnorderconfigpage.cpp
@ -34,7 +34,7 @@
 #include <ui/dnattributeorderconfigwidget.h>
 #include <kleo/dn.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <tqlayout.h>
--- a/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h
@ -38,7 +38,7 @@
 #include "qgpgmejob.h"
 #include <tqcstring.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace GpgME {
  class Error;
--- a/certmanager/lib/backends/qgpgme/qgpgmejob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmejob.h
@ -43,7 +43,7 @@
 #include <tqstring.h>
 #include <vector>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace GpgME {
  class Data;
--- a/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h
@ -36,7 +36,7 @@
 #include <kleo/keygenerationjob.h>
 #include "qgpgmejob.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace GpgME {
  class Error;
--- a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h
@ -44,7 +44,7 @@
 #include <utility>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace GpgME {
  class Error;
  class Context;
--- a/certmanager/lib/cryptplug.h
+++ b/certmanager/lib/cryptplug.h
@ -25,7 +25,7 @@
 #include <gpgmepp/context.h>
 #include <gpgme.h> // need it for gpgme_protocol_t :(
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace GpgME {
  class ImportResult;
--- a/certmanager/lib/cryptplugfactory.h
+++ b/certmanager/lib/cryptplugfactory.h
@ -35,7 +35,7 @@
 #include "kleo/cryptobackendfactory.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #ifndef LIBKLEOPATRA_NO_COMPAT
 namespace Kleo {
--- a/certmanager/lib/cryptplugwrapper.h
+++ b/certmanager/lib/cryptplugwrapper.h
@ -54,7 +54,7 @@
 #include <tqpair.h>
 #include <tqstringlist.h>
 #include <tqstring.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TDEConfigBase;
--- a/certmanager/lib/kleo/cryptobackendfactory.h
+++ b/certmanager/lib/kleo/cryptobackendfactory.h
@ -36,7 +36,7 @@
 #include <tqobject.h>
 #include "cryptobackend.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <vector>
 #include <map>
--- a/certmanager/lib/kleo/dn.h
+++ b/certmanager/lib/kleo/dn.h
@ -35,7 +35,7 @@
 #include <tqstring.h>
 #include <tqvaluevector.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TQStringList;
 class TQWidget;
--- a/certmanager/lib/kleo/enum.h
+++ b/certmanager/lib/kleo/enum.h
@ -33,7 +33,7 @@
 #ifndef __KLEO_ENUM_H__
 #define __KLEO_ENUM_H__
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TQString;
 class TQStringList;
--- a/certmanager/lib/kleo/hierarchicalkeylistjob.h
+++ b/certmanager/lib/kleo/hierarchicalkeylistjob.h
@ -35,7 +35,7 @@
 #include <kleo/keylistjob.h>
 #include <kleo/cryptobackend.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <gpgmepp/keylistresult.h>
--- a/certmanager/lib/kleo/keyfiltermanager.h
+++ b/certmanager/lib/kleo/keyfiltermanager.h
@ -34,7 +34,7 @@
 #define __KLEO_KEYFILTERMANAGER_H__
 #include <tqobject.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace GpgME {
  class Key;
 }
--- a/certmanager/lib/kleo/multideletejob.h
+++ b/certmanager/lib/kleo/multideletejob.h
@ -36,7 +36,7 @@
 #include <kleo/job.h>
 #include <kleo/cryptobackend.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <tqguardedptr.h>
 #include <vector>
--- a/certmanager/lib/ui/backendconfigwidget.h
+++ b/certmanager/lib/ui/backendconfigwidget.h
@ -35,7 +35,7 @@
 #define __KLEO_UI_BACKENDCONFIGWIDGET_H__
 #include <tqwidget.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace Kleo {
  class CryptoBackendFactory;
--- a/certmanager/lib/ui/cryptoconfigdialog.h
+++ b/certmanager/lib/ui/cryptoconfigdialog.h
@ -33,7 +33,7 @@
 #define CRYPTOCONFIGDIALOG_H
 #include <kdialogbase.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace Kleo {
--- a/certmanager/lib/ui/directoryserviceswidget.h
+++ b/certmanager/lib/ui/directoryserviceswidget.h
@ -34,7 +34,7 @@
 #define DIRECTORYSERVICESWIDGET_H
 #include "directoryserviceswidgetbase.h"
 #include <kurl.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class CryptPlugWrapper;
 namespace Kleo {
--- a/certmanager/lib/ui/dnattributeorderconfigwidget.h
+++ b/certmanager/lib/ui/dnattributeorderconfigwidget.h
@ -34,7 +34,7 @@
 #define __KLEO_UI_DNATTRIBUTEORDERCONFIGWIDGET_H__
 #include <tqwidget.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace Kleo {
  class DNAttributeMapper;
 }
--- a/certmanager/lib/ui/keyapprovaldialog.h
+++ b/certmanager/lib/ui/keyapprovaldialog.h
@ -40,7 +40,7 @@
 #include <kleo/enum.h>
 #include <kdialogbase.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <kpgpkey.h> // for EncryptPref
 #include <gpgmepp/key.h>
--- a/certmanager/lib/ui/keylistview.h
+++ b/certmanager/lib/ui/keylistview.h
@ -36,7 +36,7 @@
 #include <tdelistview.h>
 #include <gpgmepp/key.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TQPainter;
 class TQColorGroup;
--- a/certmanager/lib/ui/keyrequester.h
+++ b/certmanager/lib/ui/keyrequester.h
@ -53,7 +53,7 @@
 #include <kleo/cryptobackend.h>
 #include <vector>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace Kleo {
  class KeyListView;
--- a/certmanager/lib/ui/keyselectiondialog.h
+++ b/certmanager/lib/ui/keyselectiondialog.h
@ -41,7 +41,7 @@
 #include <kleo/cryptobackend.h>
 #include <gpgmepp/key.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <vector>
 class TQVBoxLayout;
--- a/certmanager/lib/ui/progressbar.h
+++ b/certmanager/lib/ui/progressbar.h
@ -34,7 +34,7 @@
 #define __KLEO_PROGRESSBAR_H__
 #include <tqprogressbar.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TQTimer;
 namespace Kleo {
--- a/certmanager/lib/ui/progressdialog.h
+++ b/certmanager/lib/ui/progressdialog.h
@ -35,7 +35,7 @@
 #include <tqprogressdialog.h>
 #include <tqstring.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace Kleo {
  class Job;
--- a/kaddressbook/common/kabprefs.h
+++ b/kaddressbook/common/kabprefs.h
@ -25,7 +25,7 @@
 #define KABPREFS_H
 #include <tqstringlist.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include "kabprefs_base.h"
 class TDEConfig;
--- a/kaddressbook/interfaces/configurewidget.h
+++ b/kaddressbook/interfaces/configurewidget.h
@ -27,7 +27,7 @@
 #include <tqwidget.h>
 #include <tdeconfig.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace TDEABC {
 class AddressBook;
--- a/kaddressbook/interfaces/contacteditorwidget.h
+++ b/kaddressbook/interfaces/contacteditorwidget.h
@ -28,7 +28,7 @@
 #include <tdeabc/addressbook.h>
 #include <klibloader.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #define KAB_CEW_PLUGIN_VERSION 1
--- a/kaddressbook/interfaces/core.h
+++ b/kaddressbook/interfaces/core.h
@ -35,7 +35,7 @@
 #include <tdeabc/field.h>
 #include <kcommand.h>
 #include <kxmlguiclient.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace TDEABC {
 class AddressBook;
--- a/kaddressbook/interfaces/extensionwidget.h
+++ b/kaddressbook/interfaces/extensionwidget.h
@ -28,7 +28,7 @@
 #include <tdeabc/addressbook.h>
 #include <klibloader.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #define KAB_EXTENSIONWIDGET_PLUGIN_VERSION 1
--- a/kaddressbook/interfaces/xxport.h
+++ b/kaddressbook/interfaces/xxport.h
@ -30,7 +30,7 @@
 #include <tdeabc/addresseelist.h>
 #include <klibloader.h>
 #include <kxmlguiclient.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #define KAB_XXPORT_PLUGIN_VERSION 1
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@ -33,7 +33,7 @@
 #include <tqwidget.h>
 #include "core.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace TDEABC {
 class AddressBook;
--- a/kaddressbook/kaddressbookiface.h
+++ b/kaddressbook/kaddressbookiface.h
@ -27,7 +27,7 @@
 #include <dcopobject.h>
 #include <kurl.h>
 #include <tqstringlist.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class KDE_EXPORT KAddressBookIface : virtual public DCOPObject
 {
--- a/kaddressbook/kaddressbookview.h
+++ b/kaddressbook/kaddressbookview.h
@ -31,7 +31,7 @@
 #include <tdeabc/field.h>
 #include <klibloader.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include "filter.h"
 #include "viewconfigurewidget.h"
--- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
@ -31,7 +31,7 @@
 #include "kcmkabconfig.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 extern "C"
 {
--- a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp
@ -29,7 +29,7 @@
 #include <tqregexp.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 extern "C"
 {
--- a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
@ -32,7 +32,7 @@
 #include "kcmkabldapconfig.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 extern "C"
 {
--- a/kaddressbook/viewconfigurewidget.h
+++ b/kaddressbook/viewconfigurewidget.h
@ -25,7 +25,7 @@
 #define VIEWCONFIGUREWIDGET_H
 #include <kdialogbase.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <tqpixmap.h>
 #include "configurewidget.h"
--- a/kaddressbook/xxportmanager.h
+++ b/kaddressbook/xxportmanager.h
@ -29,7 +29,7 @@
 #include <kurl.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include "xxport.h"
--- a/karm/karmstorage.h
+++ b/karm/karmstorage.h
@ -34,7 +34,7 @@
 #include <calendarresources.h>
 #include <vector>
 #include "resourcecalendar.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TQDateTime;
 class Preferences;
--- a/kgantt/kgantt/KGantt.h
+++ b/kgantt/kgantt/KGantt.h
@ -38,7 +38,7 @@
 #include <tqsplitter.h> 
 #include <tdepopupmenu.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include "KGanttItem.h"
 #include "xQGanttListView.h"
--- a/kgantt/kgantt/KGanttItem.h
+++ b/kgantt/kgantt/KGanttItem.h
@ -38,7 +38,7 @@
 #include <tqptrlist.h> 
 #include <tqpainter.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include "KGanttRelation.h"
--- a/kmail/aboutdata.h
+++ b/kmail/aboutdata.h
@ -33,7 +33,7 @@
 #define __KMAIL_ABOUTDATA_H__
 #include <tdeaboutdata.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KMail {
--- a/kmail/accountmanager.h
+++ b/kmail/accountmanager.h
@ -22,7 +22,7 @@
 #include <tqobject.h>
 #include "kmaccount.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TQString;
 class TQStringList;
--- a/kmail/app_octetstream.cpp
+++ b/kmail/app_octetstream.cpp
@ -32,7 +32,7 @@
 #include "interfaces/bodypartformatter.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace {
--- a/kmail/callback.h
+++ b/kmail/callback.h
@ -38,7 +38,7 @@
 class KMMessage;
 class KMReaderWin;
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <libkcal/attendee.h> // only for an enum, we are not linking
--- a/kmail/configuredialog_p.h
+++ b/kmail/configuredialog_p.h
@ -17,7 +17,7 @@
 #include <tdelistview.h>
 #include <tdecmodule.h>
 #include <tdelocale.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TQPushButton;
 class TQLabel;
--- a/kmail/kmail_part.h
+++ b/kmail/kmail_part.h
@ -35,7 +35,7 @@
 #include <tdeparts/part.h>
 #include <tqwidget.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TDEInstance;
 class TDEAboutData;
--- a/kmail/kmcommands.h
+++ b/kmail/kmcommands.h
@ -11,7 +11,7 @@
 #include <tdeio/job.h>
 #include "kmmsgbase.h" // for KMMsgStatus
 #include <mimelib/string.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <kservice.h>
 #include <tdetempfile.h>
--- a/kmail/kmfoldertree.h
+++ b/kmail/kmfoldertree.h
@ -21,7 +21,7 @@
 #include "foldertreebase.h"
 #include <tdelocale.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <tqguardedptr.h>
 #include <tqwidget.h>
--- a/kmail/kmkernel.h
+++ b/kmail/kmkernel.h
@ -11,7 +11,7 @@
 #include <tdeconfig.h>
 #include <tdeversion.h>
 #include <tdeimproxy.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #ifdef __TDE_HAVE_TDEHWLIB
 # include <tdenetworkconnections.h>
--- a/kmail/kmstartup.h
+++ b/kmail/kmstartup.h
@ -18,7 +18,7 @@
 #ifndef KMSTARTUP
 #define KMSTARTUP
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 extern "C" {
--- a/kmobile/kmobileclient.h
+++ b/kmobile/kmobileclient.h
@ -6,7 +6,7 @@
 #define _KMOBILECLIENT_H_
 #include <dcopclient.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class KDE_EXPORT KMobileClient : public DCOPClient
 {
--- a/kmobile/kmobiledevice.h
+++ b/kmobile/kmobiledevice.h
@ -24,7 +24,7 @@
 #include <tqstringlist.h>
 #include <tqmutex.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <klibloader.h>
 #include <tdeabc/addressee.h>
--- a/kmobile/kmobileview.h
+++ b/kmobile/kmobileview.h
@ -9,7 +9,7 @@
 #include "kmobileiface.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TDEConfig;
 class KMobileItem;
--- a/kmobile/tdeioslave/tdeio_mobile.cpp
+++ b/kmobile/tdeioslave/tdeio_mobile.cpp
@ -33,7 +33,7 @@
 #include "tdeio_mobile.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 using namespace TDEIO;
--- a/knode/aboutdata.h
+++ b/knode/aboutdata.h
@ -15,7 +15,7 @@
 */
 #include <tdeaboutdata.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #ifndef KNODE_ABOUTDATA_H
 #define KNODE_ABOUTDATA_H
--- a/knode/knconfigpages.cpp
+++ b/knode/knconfigpages.cpp
@ -23,7 +23,7 @@
 #include "knconfigpages.h"
 #include "knconfigwidgets.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 //
 // common config page with tabs (code mostly taken from kmail)
--- a/knode/knconvert.h
+++ b/knode/knconvert.h
@ -21,7 +21,7 @@
 #include <tqglobal.h>
 #include <tqvaluelist.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TQListBox;
 class TQLabel;
--- a/knode/knglobals.h
+++ b/knode/knglobals.h
@ -20,7 +20,7 @@
 #include <tdeconfig.h>
 #include "resource.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TDEInstance;
 class KNConfigManager;
--- a/knode/knmainwidget.h
+++ b/knode/knmainwidget.h
@ -21,7 +21,7 @@
 #include "resource.h"
 #include <tqglobal.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TQListViewItem;
--- a/knotes/resourcenotes.h
+++ b/knotes/resourcenotes.h
@ -34,7 +34,7 @@
 #define RESOURCENOTES_H
 #include <tderesources/resource.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <libkcal/alarm.h>
 class TDEConfig;
--- a/kode/automakefile.h
+++ b/kode/automakefile.h
@ -26,7 +26,7 @@
 #include <tqmap.h>
 #include <tqstringlist.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KODE {
--- a/kode/class.h
+++ b/kode/class.h
@ -26,7 +26,7 @@
 #include "membervariable.h"
 #include "typedef.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <tqvaluelist.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
--- a/kode/code.h
+++ b/kode/code.h
@ -26,7 +26,7 @@
 #include <tqvaluelist.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KODE {
 class KDE_EXPORT Code
--- a/kode/enum.h
+++ b/kode/enum.h
@ -22,7 +22,7 @@
 #define KODE_ENUM_H
 #include <tqstringlist.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KODE {
--- a/kode/file.h
+++ b/kode/file.h
@ -28,7 +28,7 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KODE {
--- a/kode/function.h
+++ b/kode/function.h
@ -26,7 +26,7 @@
 #include <tqvaluelist.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KODE {
--- a/kode/license.h
+++ b/kode/license.h
@ -22,7 +22,7 @@
 #define KODE_LICENSE_H
 #include <tqstring.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KODE {
--- a/kode/membervariable.h
+++ b/kode/membervariable.h
@ -25,7 +25,7 @@
 #include <tqvaluelist.h>
 #include <tqstring.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KODE {
--- a/kode/printer.h
+++ b/kode/printer.h
@ -26,7 +26,7 @@
 #include "style.h"
 #include "automakefile.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <tqvaluelist.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
--- a/kode/statemachine.h
+++ b/kode/statemachine.h
@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqmap.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KODE {
--- a/kode/style.h
+++ b/kode/style.h
@ -27,7 +27,7 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KODE {
--- a/kode/typedef.h
+++ b/kode/typedef.h
@ -22,7 +22,7 @@
 #define KODE_TYPEDEF_H
 #include <tqvaluelist.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KODE {
--- a/kode/variable.h
+++ b/kode/variable.h
@ -24,7 +24,7 @@
 #include <tqvaluelist.h>
 #include <tqstring.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KODE {
--- a/kontact/interfaces/core.h
+++ b/kontact/interfaces/core.h
@ -24,7 +24,7 @@
 #define KONTACT_CORE_H
 #include <tqdatetime.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <tdeparts/mainwindow.h>
 #include <tdeparts/part.h>
--- a/kontact/interfaces/plugin.h
+++ b/kontact/interfaces/plugin.h
@ -26,7 +26,7 @@
 #include <tqobject.h>
 #include <kxmlguiclient.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <tqptrlist.h>
 class TQStringList;
--- a/kontact/interfaces/summary.h
+++ b/kontact/interfaces/summary.h
@ -23,7 +23,7 @@
 #include <tqwidget.h>
 #include <tqpixmap.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class KStatusBar;
--- a/kontact/interfaces/uniqueapphandler.h
+++ b/kontact/interfaces/uniqueapphandler.h
@ -24,7 +24,7 @@
 #include <dcopobject.h>
 #include <plugin.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace Kontact
 {
--- a/kontact/plugins/kmail/kcmkmailsummary.cpp
+++ b/kontact/plugins/kmail/kcmkmailsummary.cpp
@ -37,7 +37,7 @@
 #include "kcmkmailsummary.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 extern "C"
 {
--- a/kontact/plugins/korganizer/kcmkorgsummary.cpp
+++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp
@ -37,7 +37,7 @@
 #include "kcmkorgsummary.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 extern "C"
 {
--- a/kontact/plugins/newsticker/kcmkontactknt.cpp
+++ b/kontact/plugins/newsticker/kcmkontactknt.cpp
@ -45,7 +45,7 @@
 #include "newsfeeds.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 extern "C"
 {
--- a/kontact/plugins/specialdates/kcmsdsummary.cpp
+++ b/kontact/plugins/specialdates/kcmsdsummary.cpp
@ -39,7 +39,7 @@
 #include "kcmsdsummary.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 extern "C"
 {
--- a/kontact/plugins/summary/kcmkontactsummary.cpp
+++ b/kontact/plugins/summary/kcmkontactsummary.cpp
@ -39,7 +39,7 @@
 #include "kcmkontactsummary.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 extern "C"
 {
--- a/kontact/src/kcmkontact.cpp
+++ b/kontact/src/kcmkontact.cpp
@ -38,7 +38,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 extern "C"
 {
--- a/korganizer/aboutdata.h
+++ b/korganizer/aboutdata.h
@ -25,7 +25,7 @@
 #define KORG_ABOUTDATA_H
 #include <tdeaboutdata.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KOrg {
--- a/korganizer/actionmanager.h
+++ b/korganizer/actionmanager.h
@ -30,7 +30,7 @@
 #include <tqobject.h>
 #include <kurl.h>
 #include <korganizer/part.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include "kcalendariface.h"
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@ -31,7 +31,7 @@
 #include <tdefile.h>
 #include <korganizer/koeventviewer.h>
 #include <libkcal/scheduler.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include "koglobals.h"
 #include "interfaces/korganizer/calendarviewbase.h"
--- a/korganizer/interfaces/korganizer/baseview.h
+++ b/korganizer/interfaces/korganizer/baseview.h
@ -29,7 +29,7 @@
 #include <tdelocale.h>
 #include <kdebug.h>
 #include <tdemessagebox.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include "korganizer/incidencechangerbase.h"
 #include "printplugin.h"
--- a/korganizer/kocore.h
+++ b/korganizer/kocore.h
@ -29,7 +29,7 @@
 #include <korganizer/part.h>
 #include <korganizer/printplugin.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <ktrader.h>
 namespace KPIM { class IdentityManager; }
--- a/korganizer/koeventviewer.h
+++ b/korganizer/koeventviewer.h
@ -24,7 +24,7 @@
 #ifndef KOEVENTVIEWER_H
 #define KOEVENTVIEWER_H
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <tdeconfig.h>
 #include <tqtextbrowser.h>
--- a/korganizer/koeventviewerdialog.h
+++ b/korganizer/koeventviewerdialog.h
@ -25,7 +25,7 @@
 #define KOEVENTVIEWERDIALOG_H
 #include <kdialogbase.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include "koeventviewer.h"
 namespace KCal {
--- a/korganizer/koglobals.h
+++ b/korganizer/koglobals.h
@ -23,7 +23,7 @@
 #ifndef KORG_GLOBALS_H
 #define KORG_GLOBALS_H
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <tqwidget.h>
 class TQDate;
--- a/korganizer/kogroupwareprefspage.ui
+++ b/korganizer/kogroupwareprefspage.ui
@ -617,7 +617,7 @@ For security reasons, it is not recommended to store your password in the config
    <tabstop>retrieveSavePassword</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">tdepimmacros.h</include>
+    <include location="global" impldecl="in declaration">kdemacros.h</include>
    <include location="local" impldecl="in implementation">kogroupwareprefspage.ui.h</include>
 </includes>
 <Q_SIGNALS>
--- a/korganizer/kohelper.h
+++ b/korganizer/kohelper.h
@ -25,7 +25,7 @@
 #ifndef KOHELPER_H
 #define KOHELPER_H
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KCal {
  class Calendar;
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@ -26,7 +26,7 @@
 #include <tqdict.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include "koprefs_base.h"
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@ -77,7 +77,7 @@
 #include "ktimeedit.h"
 #include "koglobals.h"
 #include "stdcalendar.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 KOPrefsDialogMain::KOPrefsDialogMain( TQWidget *parent, const char *name )
--- a/korganizer/korganizerifaceimpl.h
+++ b/korganizer/korganizerifaceimpl.h
@ -34,7 +34,7 @@
 #include "korganizeriface.h"
 #include <tqobject.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class ActionManager;
--- a/korganizer/printing/calprinter.h
+++ b/korganizer/printing/calprinter.h
@ -31,7 +31,7 @@
 #include <kdialogbase.h>
 #include <korganizer/baseview.h>
 #include <korganizer/printplugin.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KOrg {
 class CoreHelper;
--- a/korganizer/printing/calprintpluginbase.h
+++ b/korganizer/printing/calprintpluginbase.h
@ -30,7 +30,7 @@
 #include <tqdatetime.h>
 #include <kprinter.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <libkcal/calendar.h>
 #include <libkcal/event.h>
 #include <libkcal/todo.h>
--- a/korganizer/printing/cellitem.h
+++ b/korganizer/printing/cellitem.h
@ -27,7 +27,7 @@
 #include <tqstring.h>
 #include <tqptrlist.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KOrg {
--- a/korganizer/urihandler.h
+++ b/korganizer/urihandler.h
@ -24,7 +24,7 @@
 #ifndef URIHANDLER_H
 #define URIHANDLER_H
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TQString;
 class TQWidget;
--- a/ktnef/gui/ktnefview.h
+++ b/ktnef/gui/ktnefview.h
@ -20,7 +20,7 @@
 #include <tdelistview.h>
 #include <tqptrlist.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class KTNEFAttach;
--- a/ktnef/ktnef/ktnefattach.h
+++ b/ktnef/ktnef/ktnefattach.h
@ -22,7 +22,7 @@
 #include <tqmap.h>
 #include <tqvariant.h>
 #include <ktnef/ktnefpropertyset.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class KTNEFProperty;
--- a/ktnef/ktnef/ktnefmessage.h
+++ b/ktnef/ktnef/ktnefmessage.h
@ -20,7 +20,7 @@
 #include <ktnef/ktnefpropertyset.h>
 #include <tqptrlist.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class KTNEFAttach;
--- a/ktnef/ktnef/ktnefparser.h
+++ b/ktnef/ktnef/ktnefparser.h
@ -21,7 +21,7 @@
 #include <tqptrlist.h>
 #include <tqstring.h>
 #include <tqmap.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class KTNEFAttach;
 class KTNEFMessage;
--- a/ktnef/ktnef/ktnefproperty.h
+++ b/ktnef/ktnef/ktnefproperty.h
@ -20,7 +20,7 @@
 #include <tqvariant.h>
 #include <tqstring.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class KDE_EXPORT KTNEFProperty
 {
--- a/ktnef/ktnef/ktnefpropertyset.h
+++ b/ktnef/ktnef/ktnefpropertyset.h
@ -20,7 +20,7 @@
 #include <tqmap.h>
 #include <tqvariant.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class KTNEFProperty;
--- a/libemailfunctions/email.h
+++ b/libemailfunctions/email.h
@ -24,7 +24,7 @@
 #include <tqstringlist.h>
 #include <tqcstring.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 /** @file */
--- a/libemailfunctions/idmapper.h
+++ b/libemailfunctions/idmapper.h
@ -25,7 +25,7 @@
 #include <tqmap.h>
 #include <tqvariant.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KPIM {
--- a/libkcal/alarm.h
+++ b/libkcal/alarm.h
@ -33,7 +33,7 @@
 #include "listbase.h"
 #include "libkcal_export.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KCal {
--- a/libkcal/calendar.h
+++ b/libkcal/calendar.h
@ -39,7 +39,7 @@
 #include "kcalversion.h"
 #include "person.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <tqobject.h>
 #include <tqstring.h>
--- a/libkcal/calendarlocal.h
+++ b/libkcal/calendarlocal.h
@ -24,7 +24,7 @@
 #include "calendar.h"
 #include <tqdict.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KCal {
--- a/libkcal/confirmsavedialog.h
+++ b/libkcal/confirmsavedialog.h
@ -23,7 +23,7 @@
 #include <libkcal/incidence.h>
 #include <kdialogbase.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TDEListView;
--- a/libkcal/customproperties.h
+++ b/libkcal/customproperties.h
@ -24,7 +24,7 @@
 #include <tqstring.h>
 #include <tqmap.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include "libkcal_export.h"
--- a/libkcal/event.h
+++ b/libkcal/event.h
@ -22,7 +22,7 @@
 #define KCAL_EVENT_H
 #include "incidence.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KCal {
--- a/libkcal/icalformat.h
+++ b/libkcal/icalformat.h
@ -26,7 +26,7 @@
 #include "scheduler.h"
 #include "calformat.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KCal {
--- a/libkcal/incidence.h
+++ b/libkcal/incidence.h
@ -32,7 +32,7 @@
 #include "libkcal_export.h"
 #include "incidencebase.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KCal {
--- a/libkcal/journal.h
+++ b/libkcal/journal.h
@ -23,7 +23,7 @@
 #define KCAL_JOURNAL_H
 #include "incidence.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KCal {
--- a/libkcal/kcalversion.h
+++ b/libkcal/kcalversion.h
@ -21,6 +21,8 @@
 #ifndef KCAL_KCALVERSION_H
 #define KCAL_KCALVERSION_H
 #include <tdeversion.h>
 #define LIBKCAL_IS_VERSION( a,b,c ) ( LIBKCAL_VERSION >= TDE_MAKE_VERSION(a,b,c) )
 #define LIBKCAL_VERSION TDE_MAKE_VERSION(1,3,0)
 #define LIBKCAL_VERSIONSTR "1.3"
--- a/libkcal/libkcal_export.h
+++ b/libkcal/libkcal_export.h
@ -21,7 +21,7 @@
 #ifndef KCAL_KCALEXPORT_H
 #define KCAL_KCALEXPORT_H
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #define LIBKCAL_EXPORT KDE_EXPORT
--- a/libkcal/resourcecached.h
+++ b/libkcal/resourcecached.h
@ -34,7 +34,7 @@
 #include <tqdatetime.h>
 #include <tqtimer.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KCal {
--- a/libkcal/resourcecachedconfig.h
+++ b/libkcal/resourcecachedconfig.h
@ -22,7 +22,7 @@
 #define KCAL_RESOURCECACHEDCONFIG_H
 #include <tqwidget.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TQButtonGroup;
 class TQSpinBox;
--- a/libkcal/resourcecalendar.h
+++ b/libkcal/resourcecalendar.h
@ -41,7 +41,7 @@
 #include <tderesources/resource.h>
 #include <tderesources/manager.h>
 #include <tdeabc/lock.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KCal {
--- a/libkcal/resourcelocal.h
+++ b/libkcal/resourcelocal.h
@ -27,7 +27,7 @@
 #include <kurl.h>
 #include <kdirwatch.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TDEConfig;
 #include "calendarlocal.h"
--- a/libkcal/resourcelocalconfig.h
+++ b/libkcal/resourcelocalconfig.h
@ -28,7 +28,7 @@
 #include <tderesources/resource.h>
 #include <tderesources/configwidget.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include "libkcal_export.h"
--- a/libkcal/resourcelocaldir.h
+++ b/libkcal/resourcelocaldir.h
@ -23,7 +23,7 @@
 #include <kurl.h>
 #include <kdirwatch.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include "resourcecached.h"
--- a/libkholidays/kholidays.h
+++ b/libkholidays/kholidays.h
@ -25,7 +25,7 @@
 #include <tqdatetime.h>
 #include <tqvaluelist.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 struct KHoliday {
  TQString text;
--- a/libkmime/boolflags.h
+++ b/libkmime/boolflags.h
@ -17,7 +17,7 @@
 #ifndef __KMIME_BOOLFLAGS_H__
 #define __KMIME_BOOLFLAGS_H__
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 /** This class stores boolean values in single bytes.
    It provides a similar functionality as TQBitArray
--- a/libkmime/kmime_charfreq.h
+++ b/libkmime/kmime_charfreq.h
@ -16,7 +16,7 @@
 #define __KMIME_CHARFREQ_H__
 #include <tqcstring.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #undef None
 namespace KMime {
--- a/libkmime/kmime_codecs.h
+++ b/libkmime/kmime_codecs.h
@ -40,7 +40,7 @@
 #include <tqcstring.h> // TQByteArray
 #include <kdebug.h> // for kdFatal()
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KMime {
--- a/libkmime/kmime_header_parsing.h
+++ b/libkmime/kmime_header_parsing.h
@ -38,7 +38,7 @@
 #include <time.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 template <typename K, typename V> class TQMap;
 class TQStringList;
--- a/libkmime/kmime_headers.h
+++ b/libkmime/kmime_headers.h
@ -35,7 +35,7 @@
 #include <time.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KMime {
--- a/libkmime/kmime_headers_obs.h
+++ b/libkmime/kmime_headers_obs.h
@ -20,7 +20,7 @@
 #error You cannot use this file with the new header classes!
 #endif
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 /** Represents a "Message-Id" header */
 class KDE_EXPORT MessageID : public Base {
--- a/libkmime/kmime_mdn.h
+++ b/libkmime/kmime_mdn.h
@ -35,7 +35,7 @@
 #include <tqvaluelist.h>
 #include <tqstring.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TQCString;
--- a/libkmime/kmime_newsarticle.h
+++ b/libkmime/kmime_newsarticle.h
@ -18,7 +18,7 @@
 #include "kmime_message.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KMime {
--- a/libkmime/kmime_util.h
+++ b/libkmime/kmime_util.h
@ -21,7 +21,7 @@
 #include "tqcstring.h"
 #include "tqvaluelist.h"
 #include "time.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 typedef TQValueList<TQCString> QCStringList;
--- a/libkmime/kqcstringsplitter.h
+++ b/libkmime/kqcstringsplitter.h
@ -19,7 +19,7 @@
 #include <tqcstring.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class KDE_EXPORT KTQCStringSplitter {
--- a/libkpgp/kpgp.h
+++ b/libkpgp/kpgp.h
@ -36,7 +36,7 @@
 #include <kdialogbase.h>
 #include "kpgpkey.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TQLineEdit;
 class TQCursor;
--- a/libkpgp/kpgpblock.h
+++ b/libkpgp/kpgpblock.h
@ -23,7 +23,7 @@
 #include <tqstring.h>
 #include <tqstrlist.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 //#include <tqstringlist.h>
 class TQStringList;
--- a/libkpgp/kpgpui.h
+++ b/libkpgp/kpgpui.h
@ -29,7 +29,7 @@
 #include "kpgp.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TQString;
 class TQRegExp;
--- a/libkpimexchange/core/exchangeaccount.h
+++ b/libkpimexchange/core/exchangeaccount.h
@ -26,7 +26,7 @@
 #include <tqobject.h>
 #include <tqstring.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <kurl.h>
 #include <tdeio/job.h>
--- a/libkpimexchange/core/exchangeclient.h
+++ b/libkpimexchange/core/exchangeclient.h
@ -26,7 +26,7 @@
 #include <tqhostaddress.h>
 #include <tqptrlist.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KCal { 
  class Event;
--- a/libkpimexchange/core/exchangedelete.h
+++ b/libkpimexchange/core/exchangedelete.h
@ -24,7 +24,7 @@
 #include <tqwidget.h>
 #include <tdeio/job.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <libkcal/calendar.h>
 #include <libkcal/event.h>
--- a/libkpimexchange/core/exchangeupload.h
+++ b/libkpimexchange/core/exchangeupload.h
@ -24,7 +24,7 @@
 #include <tqwidget.h>
 #include <tdeio/job.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <libkcal/calendar.h>
 #include <libkcal/event.h>
--- a/libkpimidentities/identity.h
+++ b/libkpimidentities/identity.h
@ -9,7 +9,7 @@
 #include <kleo/enum.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <tqstring.h>
 #include <tqcstring.h>
--- a/libkpimidentities/identitycombo.h
+++ b/libkpimidentities/identitycombo.h
@ -34,7 +34,7 @@
 #include <tqcombobox.h>
 #include <tqvaluelist.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TQString;
--- a/libkpimidentities/identitymanager.h
+++ b/libkpimidentities/identitymanager.h
@ -35,7 +35,7 @@
 #include <tqvaluelist.h>
 #include <dcopobject.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TDEConfigBase;
 class TDEConfig;
--- a/libksieve/ksieve/error.h
+++ b/libksieve/ksieve/error.h
@ -35,7 +35,7 @@
 #include <tqstring.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #ifdef None // X headers
 #  undef None
--- a/libksieve/ksieve/parser.h
+++ b/libksieve/ksieve/parser.h
@ -33,7 +33,7 @@
 #ifndef __KSIEVE_PARSING_H__
 #define __KSIEVE_PARSING_H__
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TQString;
--- a/libtdenetwork/gpgmepp/context.h
+++ b/libtdenetwork/gpgmepp/context.h
@ -25,7 +25,7 @@
 #include <utility>
 #include <iosfwd>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace GpgME {
--- a/libtdenetwork/gpgmepp/data.h
+++ b/libtdenetwork/gpgmepp/data.h
@ -25,7 +25,7 @@
 #include <sys/types.h> // for size_t, off_t
 #include <cstdio> // FILE
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace GpgME {
--- a/libtdenetwork/gpgmepp/decryptionresult.h
+++ b/libtdenetwork/gpgmepp/decryptionresult.h
@ -26,7 +26,7 @@
 #include <iosfwd>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace GpgME {
--- a/libtdenetwork/gpgmepp/encryptionresult.h
+++ b/libtdenetwork/gpgmepp/encryptionresult.h
@ -27,7 +27,7 @@
 #include <vector>
 #include <iosfwd>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace GpgME {
--- a/libtdenetwork/gpgmepp/engineinfo.h
+++ b/libtdenetwork/gpgmepp/engineinfo.h
@ -24,7 +24,7 @@
 #include <gpgmepp/gpgmefw.h>
 #include <gpgmepp/context.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace GpgME {
--- a/libtdenetwork/gpgmepp/eventloopinteractor.h
+++ b/libtdenetwork/gpgmepp/eventloopinteractor.h
@ -19,7 +19,7 @@
 #ifndef __GPGMEPP_EVENTLOOPINTERACTOR_H__
 #define __GPGMEPP_EVENTLOOPINTERACTOR_H__
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace GpgME {
--- a/libtdenetwork/gpgmepp/importresult.h
+++ b/libtdenetwork/gpgmepp/importresult.h
@ -25,7 +25,7 @@
 #include <gpgmepp/result.h>
 #include <vector>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace GpgME {
--- a/libtdenetwork/gpgmepp/interfaces/dataprovider.h
+++ b/libtdenetwork/gpgmepp/interfaces/dataprovider.h
@ -23,7 +23,7 @@
 #include <sys/types.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace GpgME {
--- a/libtdenetwork/gpgmepp/key.h
+++ b/libtdenetwork/gpgmepp/key.h
@ -25,7 +25,7 @@
 #include <sys/time.h>
 #include <vector>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace GpgME {
--- a/libtdenetwork/gpgmepp/keygenerationresult.h
+++ b/libtdenetwork/gpgmepp/keygenerationresult.h
@ -23,7 +23,7 @@
 #include <gpgmepp/gpgmefw.h>
 #include <gpgmepp/result.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace GpgME {
  class Error;
--- a/libtdenetwork/gpgmepp/keylistresult.h
+++ b/libtdenetwork/gpgmepp/keylistresult.h
@ -23,7 +23,7 @@
 #include <gpgmepp/gpgmefw.h>
 #include <gpgmepp/result.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace GpgME {
--- a/libtdenetwork/gpgmepp/signingresult.h
+++ b/libtdenetwork/gpgmepp/signingresult.h
@ -30,7 +30,7 @@
 #include <vector>
 #include <iosfwd>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace GpgME {
--- a/libtdenetwork/gpgmepp/verificationresult.h
+++ b/libtdenetwork/gpgmepp/verificationresult.h
@ -29,7 +29,7 @@
 #include <vector>
 #include <iosfwd>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace GpgME {
--- a/libtdenetwork/qgpgme/dataprovider.h
+++ b/libtdenetwork/qgpgme/dataprovider.h
@ -22,7 +22,7 @@
 #include <gpgmepp/interfaces/dataprovider.h>
 #include <tqcstring.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace QGpgME {
--- a/libtdenetwork/qgpgme/eventloopinteractor.h
+++ b/libtdenetwork/qgpgme/eventloopinteractor.h
@ -22,7 +22,7 @@
 #include <gpgmepp/eventloopinteractor.h>
 #include <tqobject.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace GpgME {
  class Context;
--- a/libtdepim/addresseelineedit.h
+++ b/libtdepim/addresseelineedit.h
@ -37,7 +37,7 @@
 #include "clicklineedit.h"
 #include "kmailcompletion.h"
 #include <dcopobject.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TDEConfig;
--- a/libtdepim/addresseeselector.h
+++ b/libtdepim/addresseeselector.h
@ -26,7 +26,7 @@
 #include <tdeabc/distributionlist.h>
 #include <tdeabc/resource.h>
 #include <kdialogbase.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <tqbitarray.h>
 #include <tqpixmap.h>
--- a/libtdepim/addresseeview.h
+++ b/libtdepim/addresseeview.h
@ -27,7 +27,7 @@
 #include <tdeabc/addressee.h>
 #include <ktextbrowser.h>
 #include <tdeimproxy.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace TDEIO {
 class Job;
--- a/libtdepim/addressesdialog.h
+++ b/libtdepim/addressesdialog.h
@ -31,7 +31,7 @@
 #include <tqstringlist.h>
 #include <tqptrlist.h>
 #include <tqptrdict.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KPIM {
--- a/libtdepim/broadcaststatus.h
+++ b/libtdepim/broadcaststatus.h
@ -14,7 +14,7 @@
 #include <tqobject.h>
 #include <tqmap.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #undef None
--- a/libtdepim/categoryeditdialog.h
+++ b/libtdepim/categoryeditdialog.h
@ -23,7 +23,7 @@
 #define KPIM_CATEGORYEDITDIALOG_H
 #include <kdialogbase.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class KPimPrefs;
--- a/libtdepim/categoryselectdialog.h
+++ b/libtdepim/categoryselectdialog.h
@ -23,7 +23,7 @@
 #define KPIM_CATEGORYSELECTDIALOG_H
 #include <kdialogbase.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class KPimPrefs;
 class CategorySelectDialog_base;
--- a/libtdepim/clicklineedit.h
+++ b/libtdepim/clicklineedit.h
@ -22,7 +22,7 @@
 #define CLICKLINEEDIT_H
 #include <klineedit.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KPIM {
--- a/libtdepim/collectingprocess.h
+++ b/libtdepim/collectingprocess.h
@ -34,7 +34,7 @@
 #define __KPIM_COLLECTINGPROCESS_H__
 #include <kprocess.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KPIM {
--- a/libtdepim/configmanager.h
+++ b/libtdepim/configmanager.h
@ -19,7 +19,7 @@
 #include <tqobject.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class KMKernel;
--- a/libtdepim/designerfields.h
+++ b/libtdepim/designerfields.h
@ -28,7 +28,7 @@
 #include <tqpair.h>
 #include <tqstringlist.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KPIM {
--- a/libtdepim/diffalgo.h
+++ b/libtdepim/diffalgo.h
@ -23,7 +23,7 @@
 #define DIFFALGO_H
 #include <tqvaluelist.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KPIM {
--- a/libtdepim/embeddedurlpage.h
+++ b/libtdepim/embeddedurlpage.h
@ -22,7 +22,7 @@
 #define KPIM_EMBEDDEDURLPAGE_H
 #include <tqwidget.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <kurl.h>
 namespace KParts { class ReadOnlyPart; }
--- a/libtdepim/htmldiffalgodisplay.h
+++ b/libtdepim/htmldiffalgodisplay.h
@ -25,7 +25,7 @@
 #include "diffalgo.h"
 #include <ktextbrowser.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KPIM {
--- a/libtdepim/infoextension.h
+++ b/libtdepim/infoextension.h
@ -23,7 +23,7 @@
 #define  INFOEXTENSION_H
 #include <tqobject.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TQWidget;
--- a/libtdepim/interfaces/AddressBookServiceIface.h
+++ b/libtdepim/interfaces/AddressBookServiceIface.h
@ -27,7 +27,7 @@
 #include <kurl.h>
 #include <tqstring.h>
 #include <tqcstring.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KPIM {
--- a/libtdepim/interfaces/MailTransportServiceIface.h
+++ b/libtdepim/interfaces/MailTransportServiceIface.h
@ -28,7 +28,7 @@
 #include <tqstring.h>
 #include <tqcstring.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KPim {
--- a/libtdepim/kaccount.h
+++ b/libtdepim/kaccount.h
@ -33,7 +33,7 @@
 #define __KACCOUNT
 #include <tqstring.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TDEConfig;
--- a/libtdepim/kaddrbook.h
+++ b/libtdepim/kaddrbook.h
@ -9,7 +9,7 @@
 #include <tdeversion.h>
 #include <tdeabc/addressee.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace TDEABC {
  class AddressBook;
--- a/libtdepim/kcmdesignerfields.h
+++ b/libtdepim/kcmdesignerfields.h
@ -23,7 +23,7 @@
 #define KPIM_KCMDESIGNERFIELDS_H
 #include <tdecmodule.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TDEListView;
--- a/libtdepim/kdateedit.h
+++ b/libtdepim/kdateedit.h
@ -28,7 +28,7 @@
 #include <tqdatetime.h>
 #include <tqmap.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include "kdatepickerpopup.h"
--- a/libtdepim/kdatepickerpopup.h
+++ b/libtdepim/kdatepickerpopup.h
@ -24,7 +24,7 @@
 #include <tqdatetime.h>
 #include <tqpopupmenu.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <kdatepicker.h>
 /**
--- a/libtdepim/kfoldertree.cpp
+++ b/libtdepim/kfoldertree.cpp
@ -1,4 +1,5 @@
 #include "kfoldertree.h"
 #include <tdeversion.h>
 #include <tdelocale.h>
 #include <tdeio/global.h>
 #include <kiconloader.h>
--- a/libtdepim/kfoldertree.h
+++ b/libtdepim/kfoldertree.h
@ -26,7 +26,7 @@
 #include <tqdragobject.h>
 #include <tqcolor.h>
 #include <tdelistview.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class KFolderTree;
--- a/libtdepim/komposer/core/prefsmodule.cpp
+++ b/libtdepim/komposer/core/prefsmodule.cpp
@ -31,7 +31,7 @@
 #include <tqlabel.h>
 #include <tqbuttongroup.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 extern "C"
 {
--- a/libtdepim/kpimprefs.h
+++ b/libtdepim/kpimprefs.h
@ -24,7 +24,7 @@
 #include <tqstringlist.h>
 #include <tdeconfigskeleton.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TQString;
--- a/libtdepim/kpimurlrequesterdlg.h
+++ b/libtdepim/kpimurlrequesterdlg.h
@ -20,7 +20,7 @@
 #ifndef KPIMURLREQUESTDLG_H_INCLUDED
 #define KPIMURLREQUESTDLG_H_INCLUDED
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <kurl.h>
 #include <tqstring.h>
--- a/libtdepim/kpixmapregionselectordialog.h
+++ b/libtdepim/kpixmapregionselectordialog.h
@ -25,7 +25,7 @@
 #include <kdialogbase.h>
 #include <libtdepim/kpixmapregionselectorwidget.h>
 #include <tqimage.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KPIM {
--- a/libtdepim/kprefsdialog.h
+++ b/libtdepim/kprefsdialog.h
@ -32,7 +32,7 @@
 #include <tdecmodule.h>
 #include <tdeconfigskeleton.h>
 #include <tdefile.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class KColorButton;
--- a/libtdepim/kregexp3.h
+++ b/libtdepim/kregexp3.h
@ -34,7 +34,7 @@
 #include <tqstring.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 /** @short A TQRegExp (TQt3.x) with a replace() method.
--- a/libtdepim/kresourceprefs.h
+++ b/libtdepim/kresourceprefs.h
@ -23,7 +23,7 @@
 #define KRESOURCEPREFS_H
 #include <tdeconfigskeleton.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TQString;
--- a/libtdepim/krsqueezedtextlabel.h
+++ b/libtdepim/krsqueezedtextlabel.h
@ -22,7 +22,7 @@
 #define KRSQUEEZEDTEXTLABEL_H
 #include <tqlabel.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 /**
 * @short A replacement for TQLabel that squeezes its text
--- a/libtdepim/kscoring.h
+++ b/libtdepim/kscoring.h
@ -38,7 +38,7 @@
 #include <klineedit.h>
 #include <knuminput.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TQDomNode;
 class TQDomDocument;
--- a/libtdepim/kscoringeditor.h
+++ b/libtdepim/kscoringeditor.h
@ -25,7 +25,7 @@
 #include "kwidgetlister.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class KComboBox;
 class KLineEdit;
--- a/libtdepim/ksubscription.h
+++ b/libtdepim/ksubscription.h
@ -29,7 +29,7 @@
 #include <tqcheckbox.h>
 #include <kdialogbase.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include "kfoldertree.h"
 class KSubscription;
--- a/libtdepim/ktimeedit.h
+++ b/libtdepim/ktimeedit.h
@ -32,7 +32,7 @@
 #include <tqcombobox.h>
 #include <tdeapplication.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 /**
  This is a class that provides an easy, user friendly way to edit times.
--- a/libtdepim/kvcarddrag.h
+++ b/libtdepim/kvcarddrag.h
@ -27,7 +27,7 @@
 #include <tdeabc/addressee.h>
 #include <tdeabc/vcardparser.h> // for KABC_VCARD_ENCODING_FIX define
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class KVCardDragPrivate;
--- a/libtdepim/kwidgetlister.h
+++ b/libtdepim/kwidgetlister.h
@ -34,7 +34,7 @@
 #include <tqwidget.h>
 #include <tqptrlist.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TQPushButton;
 class TQVBoxLayout;
--- a/libtdepim/kxface.h
+++ b/libtdepim/kxface.h
@ -30,7 +30,7 @@
 #include <tqobject.h>
 #include <setjmp.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 // #define WIDTH 48
 // #define HEIGHT WIDTH
--- a/libtdepim/ldapclient.h
+++ b/libtdepim/ldapclient.h
@ -35,7 +35,7 @@
 #include <tdeabc/ldif.h>
 #include <tdeconfig.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KPIM {
--- a/libtdepim/linklocator.cpp
+++ b/libtdepim/linklocator.cpp
@ -22,6 +22,7 @@
 #include "linklocator.h"
 #include "pimemoticons.h"
 #include <tdeversion.h>
 #include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kstaticdeleter.h>
--- a/libtdepim/linklocator.h
+++ b/libtdepim/linklocator.h
@ -26,7 +26,7 @@
 #include <tqstring.h>
 #include <tqmap.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 /**
 * LinkLocator assists in identifying sections of text that can
--- a/libtdepim/maillistdrag.h
+++ b/libtdepim/maillistdrag.h
@ -27,7 +27,7 @@
 #include "tqglobal.h"
 #include "time.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 /**
 * TDEPIM classes for drag and drop of mails
--- a/libtdepim/pluginloaderbase.h
+++ b/libtdepim/pluginloaderbase.h
@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqmap.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class KLibrary;
 class TQStringList;
--- a/libtdepim/progressdialog.h
+++ b/libtdepim/progressdialog.h
@ -38,7 +38,7 @@
 #include <tqlabel.h>
 #include <tqvbox.h>
 #include "overlaywidget.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TQProgressBar;
 class TQScrollView;
--- a/libtdepim/progressmanager.h
+++ b/libtdepim/progressmanager.h
@ -28,7 +28,7 @@
 #include <tqdict.h>
 #include <tqstring.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KPIM {
--- a/libtdepim/qutf7codec.h
+++ b/libtdepim/qutf7codec.h
@ -27,7 +27,7 @@
 #include "tqtextcodec.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #ifndef TQT_NO_TEXTCODEC
--- a/libtdepim/recentaddresses.h
+++ b/libtdepim/recentaddresses.h
@ -35,7 +35,7 @@
 #include <kdialogbase.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TDEConfig;
 class KEditListBox;
--- a/libtdepim/resourceabc.h
+++ b/libtdepim/resourceabc.h
@ -27,7 +27,7 @@
 #include <tdeabc/resource.h>
 #include <tqmap.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 // This is here because it can't go to tdelibs/tdeabc yet, but ultimately
 // it should probably go there (maybe redesigned to have a real object
--- a/libtdepim/sidebarextension.h
+++ b/libtdepim/sidebarextension.h
@ -22,7 +22,7 @@
 #define  SIDEBAREXTENSION_H
 #include <tqobject.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TQWidget;
--- a/libtdepim/spellingfilter.h
+++ b/libtdepim/spellingfilter.h
@ -27,7 +27,7 @@
 #include <tqstringlist.h>
 #include "linklocator.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class KDE_EXPORT SpellingFilter
 {
--- a/libtdepim/statusbarprogresswidget.h
+++ b/libtdepim/statusbarprogresswidget.h
@ -36,7 +36,7 @@
  *  tdeio_littleprogress_dlg (it looks similar)
  */
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class KMMainWidget;
 class KProgress;
--- a/libtdepim/tdeabcresourcecached.h
+++ b/libtdepim/tdeabcresourcecached.h
@ -22,7 +22,7 @@
 #define TDEABC_RESOURCECACHED_H
 #include <tdeabc/resource.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <tqdatetime.h>
 #include <tqtimer.h>
--- a/libtdepim/tdeconfigpropagator.h
+++ b/libtdepim/tdeconfigpropagator.h
@ -26,7 +26,7 @@
 #include <tqdom.h>
 #include <tqptrlist.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TDEConfigSkeleton;
 class TDEConfigSkeletonItem;
--- a/libtdepim/tdeconfigwizard.h
+++ b/libtdepim/tdeconfigwizard.h
@ -22,7 +22,7 @@
 #define TDECONFIGWIZARD_H
 #include <tdeconfigpropagator.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <kdialogbase.h>
 class TQListView;
--- a/libtdepim/tdefileio.cpp
+++ b/libtdepim/tdefileio.cpp
@ -21,7 +21,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KPIM {
--- a/libtdepim/tdefileio.h
+++ b/libtdepim/tdefileio.h
@ -11,7 +11,7 @@
 #include <tqcstring.h>
 #include <tqwidget.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TQString;
--- a/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp
+++ b/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp
@ -24,7 +24,7 @@
 #include <kmimetype.h>
 #include <tqlayout.h>
 #include <tdeapplication.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 KPartsGenericPart::KPartsGenericPart( TQWidget* parentWidget, const char* name )
    : TQWidget( parentWidget, name ), m_part( 0 )
--- a/libtdepim/weaver.h
+++ b/libtdepim/weaver.h
@ -29,7 +29,7 @@ extern "C"
 #include <tqmutex.h>
 #include <tqevent.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace KPIM {
 namespace ThreadWeaver {
--- a/plugins/kmail/bodypartformatter/text_calendar.cpp
+++ b/plugins/kmail/bodypartformatter/text_calendar.cpp
@ -80,7 +80,7 @@
 #include <tqdir.h>
 #include <tqtextstream.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <dcopclient.h>
 #include <dcopref.h>
--- a/plugins/kmail/bodypartformatter/text_vcard.cpp
+++ b/plugins/kmail/bodypartformatter/text_vcard.cpp
@ -63,7 +63,7 @@ using TDEABC::Addressee;
 #include "addresseeview.h"
 using KPIM::AddresseeView;
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace {
--- a/tdeioslave/imap4/imap4.cpp
+++ b/tdeioslave/imap4/imap4.cpp
@ -92,7 +92,7 @@ extern "C" {
 #include <kmimetype.h>
 #include <kmdcodec.h>
-#include "tdepimmacros.h"
+#include <kdemacros.h>
 #define IMAP_PROTOCOL "imap"
 #define IMAP_SSL_PROTOCOL "imaps"
--- a/tdeioslave/mbox/mbox.cpp
+++ b/tdeioslave/mbox/mbox.cpp
@ -34,7 +34,7 @@
 #include <stdlib.h>
-#include "tdepimmacros.h"
+#include <kdemacros.h>
 #include "mbox.h"
--- a/tdeioslave/opengroupware/opengroupware.cpp
+++ b/tdeioslave/opengroupware/opengroupware.cpp
@ -45,7 +45,7 @@
 #include <unistd.h>
 #include <stdlib.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace TDEABC {
--- a/tdeioslave/sieve/sieve.cpp
+++ b/tdeioslave/sieve/sieve.cpp
@ -49,7 +49,7 @@ using std::exit;
 #include <sys/stat.h>
 #include <cassert>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 static const int debugArea = 7122;
--- 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;
--- 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;
--- 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 {
--- 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 {
--- 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 {
--- 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"
--- 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;
--- 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"
--- 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;
--- 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"
--- 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;
--- 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 {
--- 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;
--- 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 {
--- 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;
--- 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>
--- 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>
--- 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>
--- 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"
--- 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>
--- 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 {
--- 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>
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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;
--- 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>
--- 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 {
--- 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 {
--- 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 {
--- 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;
--- 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;
--- 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;
--- 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
 {
--- 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>
--- 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>
--- 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 {
--- 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>
--- 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 {
--- 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 {
--- 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>
--- 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>
--- 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>
--- 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 {
--- 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;
--- 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;
--- 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;
--- 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>
--- 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>
--- 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;
--- 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 {
--- 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"
--- 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>
--- a/wizards/egroupwarewizard.h
+++ b/wizards/egroupwarewizard.h
@ -22,7 +22,7 @@
 #define EGROUPWAREWIZARD_H
 #include <tdeconfigwizard.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class KLineEdit;
 class TQCheckBox;
--- a/wizards/exchangewizard.h
+++ b/wizards/exchangewizard.h
@ -21,7 +21,7 @@
 #define EXCHANGEWIZARD_H
 #include <tdeconfigwizard.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class KLineEdit;
 class TQCheckBox;
--- a/wizards/groupwisewizard.h
+++ b/wizards/groupwisewizard.h
@ -21,7 +21,7 @@
 #define GROUPWISEWIZARD_H
 #include <tdeconfigwizard.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class KLineEdit;
 class TQCheckBox;
--- a/wizards/kolabwizard.h
+++ b/wizards/kolabwizard.h
@ -23,7 +23,7 @@
 #define KOLABWIZARD_H
 #include <tdeconfigwizard.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class KLineEdit;
 class TQCheckBox;
--- a/wizards/scalixwizard.h
+++ b/wizards/scalixwizard.h
@ -23,7 +23,7 @@
 #define SCALIXWIZARD_H
 #include <tdeconfigwizard.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class KComboBox;
 class KLineEdit;
--- a/wizards/sloxwizard.h
+++ b/wizards/sloxwizard.h
@ -21,7 +21,7 @@
 #define SLOXWIZARD_H
 #include <tdeconfigwizard.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class KLineEdit;
 class TQCheckBox;