summaryrefslogtreecommitdiffstats
path: root/libtdepim
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2021-02-26 01:07:13 +0100
committerSlávek Banko <slavek.banko@axis.cz>2021-02-26 01:47:25 +0100
commite77087ce3d590ddede0a0590caaade9aadc78d41 (patch)
tree181af70027be1d359a9e62c50d672f5a785b9d6f /libtdepim
parent616964474240c627d9660a493a018bcb81a8dee1 (diff)
downloadtdepim-e77087ce3d590ddede0a0590caaade9aadc78d41.tar.gz
tdepim-e77087ce3d590ddede0a0590caaade9aadc78d41.zip
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>
Diffstat (limited to 'libtdepim')
-rw-r--r--libtdepim/addresseelineedit.h2
-rw-r--r--libtdepim/addresseeselector.h2
-rw-r--r--libtdepim/addresseeview.h2
-rw-r--r--libtdepim/addressesdialog.h2
-rw-r--r--libtdepim/broadcaststatus.h2
-rw-r--r--libtdepim/categoryeditdialog.h2
-rw-r--r--libtdepim/categoryselectdialog.h2
-rw-r--r--libtdepim/clicklineedit.h2
-rw-r--r--libtdepim/collectingprocess.h2
-rw-r--r--libtdepim/configmanager.h2
-rw-r--r--libtdepim/designerfields.h2
-rw-r--r--libtdepim/diffalgo.h2
-rw-r--r--libtdepim/embeddedurlpage.h2
-rw-r--r--libtdepim/htmldiffalgodisplay.h2
-rw-r--r--libtdepim/infoextension.h2
-rw-r--r--libtdepim/interfaces/AddressBookServiceIface.h2
-rw-r--r--libtdepim/interfaces/MailTransportServiceIface.h2
-rw-r--r--libtdepim/kaccount.h2
-rw-r--r--libtdepim/kaddrbook.h2
-rw-r--r--libtdepim/kcmdesignerfields.h2
-rw-r--r--libtdepim/kdateedit.h2
-rw-r--r--libtdepim/kdatepickerpopup.h2
-rw-r--r--libtdepim/kfoldertree.cpp1
-rw-r--r--libtdepim/kfoldertree.h2
-rw-r--r--libtdepim/komposer/core/prefsmodule.cpp2
-rw-r--r--libtdepim/kpimprefs.h2
-rw-r--r--libtdepim/kpimurlrequesterdlg.h2
-rw-r--r--libtdepim/kpixmapregionselectordialog.h2
-rw-r--r--libtdepim/kprefsdialog.h2
-rw-r--r--libtdepim/kregexp3.h2
-rw-r--r--libtdepim/kresourceprefs.h2
-rw-r--r--libtdepim/krsqueezedtextlabel.h2
-rw-r--r--libtdepim/kscoring.h2
-rw-r--r--libtdepim/kscoringeditor.h2
-rw-r--r--libtdepim/ksubscription.h2
-rw-r--r--libtdepim/ktimeedit.h2
-rw-r--r--libtdepim/kvcarddrag.h2
-rw-r--r--libtdepim/kwidgetlister.h2
-rw-r--r--libtdepim/kxface.h2
-rw-r--r--libtdepim/ldapclient.h2
-rw-r--r--libtdepim/linklocator.cpp1
-rw-r--r--libtdepim/linklocator.h2
-rw-r--r--libtdepim/maillistdrag.h2
-rw-r--r--libtdepim/pluginloaderbase.h2
-rw-r--r--libtdepim/progressdialog.h2
-rw-r--r--libtdepim/progressmanager.h2
-rw-r--r--libtdepim/qutf7codec.h2
-rw-r--r--libtdepim/recentaddresses.h2
-rw-r--r--libtdepim/resourceabc.h2
-rw-r--r--libtdepim/sidebarextension.h2
-rw-r--r--libtdepim/spellingfilter.h2
-rw-r--r--libtdepim/statusbarprogresswidget.h2
-rw-r--r--libtdepim/tdeabcresourcecached.h2
-rw-r--r--libtdepim/tdeconfigpropagator.h2
-rw-r--r--libtdepim/tdeconfigwizard.h2
-rw-r--r--libtdepim/tdefileio.cpp2
-rw-r--r--libtdepim/tdefileio.h2
-rw-r--r--libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp2
-rw-r--r--libtdepim/weaver.h2
59 files changed, 59 insertions, 57 deletions
diff --git a/libtdepim/addresseelineedit.h b/libtdepim/addresseelineedit.h
index 278c8e087..34439202d 100644
--- 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;
diff --git a/libtdepim/addresseeselector.h b/libtdepim/addresseeselector.h
index 2fa40f4e4..101cc6e60 100644
--- 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>
diff --git a/libtdepim/addresseeview.h b/libtdepim/addresseeview.h
index 15cc74909..6ee832688 100644
--- 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;
diff --git a/libtdepim/addressesdialog.h b/libtdepim/addressesdialog.h
index e87866c73..55b29231a 100644
--- 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 {
diff --git a/libtdepim/broadcaststatus.h b/libtdepim/broadcaststatus.h
index fc9eb607a..af8b383c5 100644
--- 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
diff --git a/libtdepim/categoryeditdialog.h b/libtdepim/categoryeditdialog.h
index 86cd8e323..67d8aa159 100644
--- 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;
diff --git a/libtdepim/categoryselectdialog.h b/libtdepim/categoryselectdialog.h
index ca501ddc3..6a4bfb406 100644
--- 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;
diff --git a/libtdepim/clicklineedit.h b/libtdepim/clicklineedit.h
index ca832b5ee..e8c181ce7 100644
--- 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 {
diff --git a/libtdepim/collectingprocess.h b/libtdepim/collectingprocess.h
index 106b59749..5aad3f07b 100644
--- 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 {
diff --git a/libtdepim/configmanager.h b/libtdepim/configmanager.h
index 87d48e4e2..b00fb7e54 100644
--- a/libtdepim/configmanager.h
+++ b/libtdepim/configmanager.h
@@ -19,7 +19,7 @@
#include <tqobject.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
class KMKernel;
diff --git a/libtdepim/designerfields.h b/libtdepim/designerfields.h
index dd05b3369..ab709621c 100644
--- 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 {
diff --git a/libtdepim/diffalgo.h b/libtdepim/diffalgo.h
index 513db7e33..a437d9d5b 100644
--- 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 {
diff --git a/libtdepim/embeddedurlpage.h b/libtdepim/embeddedurlpage.h
index 0a24b2063..bb302d9ed 100644
--- 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; }
diff --git a/libtdepim/htmldiffalgodisplay.h b/libtdepim/htmldiffalgodisplay.h
index 35d95f5c8..e38b7a604 100644
--- 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 {
diff --git a/libtdepim/infoextension.h b/libtdepim/infoextension.h
index f1d43a520..6ee5efe40 100644
--- 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;
diff --git a/libtdepim/interfaces/AddressBookServiceIface.h b/libtdepim/interfaces/AddressBookServiceIface.h
index e07ac3e76..e39b8fc7c 100644
--- 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 {
diff --git a/libtdepim/interfaces/MailTransportServiceIface.h b/libtdepim/interfaces/MailTransportServiceIface.h
index d256775a3..3a69f83b6 100644
--- 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 {
diff --git a/libtdepim/kaccount.h b/libtdepim/kaccount.h
index 06c0a7c1e..e5ec2d79f 100644
--- 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;
diff --git a/libtdepim/kaddrbook.h b/libtdepim/kaddrbook.h
index a9e2c8c57..bd44e25ae 100644
--- 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;
diff --git a/libtdepim/kcmdesignerfields.h b/libtdepim/kcmdesignerfields.h
index 8ab575416..abf3c183f 100644
--- 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;
diff --git a/libtdepim/kdateedit.h b/libtdepim/kdateedit.h
index ee5bf8d6f..3cab1fe49 100644
--- 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"
diff --git a/libtdepim/kdatepickerpopup.h b/libtdepim/kdatepickerpopup.h
index 38b947ada..ba9d551f5 100644
--- 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>
/**
diff --git a/libtdepim/kfoldertree.cpp b/libtdepim/kfoldertree.cpp
index a06af1368..58e358585 100644
--- 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>
diff --git a/libtdepim/kfoldertree.h b/libtdepim/kfoldertree.h
index d9f0a1a68..a69e80d53 100644
--- 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;
diff --git a/libtdepim/komposer/core/prefsmodule.cpp b/libtdepim/komposer/core/prefsmodule.cpp
index 3070b165d..abacd0ebb 100644
--- 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"
{
diff --git a/libtdepim/kpimprefs.h b/libtdepim/kpimprefs.h
index dd180c970..b67d24916 100644
--- 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;
diff --git a/libtdepim/kpimurlrequesterdlg.h b/libtdepim/kpimurlrequesterdlg.h
index 6a00cf4ef..8679923d8 100644
--- 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>
diff --git a/libtdepim/kpixmapregionselectordialog.h b/libtdepim/kpixmapregionselectordialog.h
index ee864391a..2f77ab890 100644
--- 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 {
diff --git a/libtdepim/kprefsdialog.h b/libtdepim/kprefsdialog.h
index 3e331b180..86c7b81f4 100644
--- 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;
diff --git a/libtdepim/kregexp3.h b/libtdepim/kregexp3.h
index ab27c4ea3..909e6bfa9 100644
--- 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.
diff --git a/libtdepim/kresourceprefs.h b/libtdepim/kresourceprefs.h
index 1954f19c1..398490a13 100644
--- 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;
diff --git a/libtdepim/krsqueezedtextlabel.h b/libtdepim/krsqueezedtextlabel.h
index cfa924f33..877c2c8fa 100644
--- 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
diff --git a/libtdepim/kscoring.h b/libtdepim/kscoring.h
index a345ba14d..d901d0bfd 100644
--- 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;
diff --git a/libtdepim/kscoringeditor.h b/libtdepim/kscoringeditor.h
index 0160a9e47..33677662a 100644
--- 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;
diff --git a/libtdepim/ksubscription.h b/libtdepim/ksubscription.h
index 0fb5209c0..27b5695cf 100644
--- 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;
diff --git a/libtdepim/ktimeedit.h b/libtdepim/ktimeedit.h
index 1bb307f85..554128b68 100644
--- 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.
diff --git a/libtdepim/kvcarddrag.h b/libtdepim/kvcarddrag.h
index 40263ac55..8ac98042d 100644
--- 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;
diff --git a/libtdepim/kwidgetlister.h b/libtdepim/kwidgetlister.h
index 449172c31..957164302 100644
--- 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;
diff --git a/libtdepim/kxface.h b/libtdepim/kxface.h
index 7d472560c..a78f411df 100644
--- 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
diff --git a/libtdepim/ldapclient.h b/libtdepim/ldapclient.h
index 41c44e110..b1d8814c8 100644
--- 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 {
diff --git a/libtdepim/linklocator.cpp b/libtdepim/linklocator.cpp
index f740c1940..1de43268f 100644
--- 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>
diff --git a/libtdepim/linklocator.h b/libtdepim/linklocator.h
index 4597d836b..3fb3330b5 100644
--- 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
diff --git a/libtdepim/maillistdrag.h b/libtdepim/maillistdrag.h
index 130ec29fb..c0a95c8a5 100644
--- 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
diff --git a/libtdepim/pluginloaderbase.h b/libtdepim/pluginloaderbase.h
index 384ccf014..6edc61bee 100644
--- 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;
diff --git a/libtdepim/progressdialog.h b/libtdepim/progressdialog.h
index b650d0ec6..051d12b3b 100644
--- 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;
diff --git a/libtdepim/progressmanager.h b/libtdepim/progressmanager.h
index 044919657..4ec175679 100644
--- 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 {
diff --git a/libtdepim/qutf7codec.h b/libtdepim/qutf7codec.h
index ef7000ff4..01e97494a 100644
--- 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
diff --git a/libtdepim/recentaddresses.h b/libtdepim/recentaddresses.h
index 774f1e061..f9f6a6ceb 100644
--- 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;
diff --git a/libtdepim/resourceabc.h b/libtdepim/resourceabc.h
index 54a2843cb..e1213e3e1 100644
--- 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
diff --git a/libtdepim/sidebarextension.h b/libtdepim/sidebarextension.h
index e084ce081..672114992 100644
--- 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;
diff --git a/libtdepim/spellingfilter.h b/libtdepim/spellingfilter.h
index 4178a888e..d0a8d8845 100644
--- 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
{
diff --git a/libtdepim/statusbarprogresswidget.h b/libtdepim/statusbarprogresswidget.h
index 87271d69d..f09c14b58 100644
--- 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;
diff --git a/libtdepim/tdeabcresourcecached.h b/libtdepim/tdeabcresourcecached.h
index b86108b40..f67abc614 100644
--- 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>
diff --git a/libtdepim/tdeconfigpropagator.h b/libtdepim/tdeconfigpropagator.h
index 32d50e9d1..94a0bff8f 100644
--- 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;
diff --git a/libtdepim/tdeconfigwizard.h b/libtdepim/tdeconfigwizard.h
index 67b76d9c6..93221a854 100644
--- 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;
diff --git a/libtdepim/tdefileio.cpp b/libtdepim/tdefileio.cpp
index 14fc458ed..ec798a722 100644
--- 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 {
diff --git a/libtdepim/tdefileio.h b/libtdepim/tdefileio.h
index e90451315..f0cd8d8d4 100644
--- 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;
diff --git a/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp b/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp
index 2801a9d3a..74d7329b1 100644
--- 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 )
diff --git a/libtdepim/weaver.h b/libtdepim/weaver.h
index 3f0d1e734..20e076f4f 100644
--- 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 {