Browse Source

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>
pull/50/head
Slávek Banko 1 year ago
parent
commit
e77087ce3d
Signed by: SlavekB
GPG Key ID: 608F5293A04BE668
  1. 2
      akregator/src/aboutdata.h
  2. 2
      akregator/src/akregator_export.h
  3. 2
      akregator/src/librss/global.h
  4. 2
      certmanager/certmanager.cpp
  5. 2
      certmanager/certmanager.h
  6. 2
      certmanager/conf/appearanceconfigpage.cpp
  7. 2
      certmanager/conf/dirservconfigpage.cpp
  8. 2
      certmanager/conf/dirservconfigpage.h
  9. 2
      certmanager/conf/dnorderconfigpage.cpp
  10. 2
      certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h
  11. 2
      certmanager/lib/backends/qgpgme/qgpgmejob.h
  12. 2
      certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h
  13. 2
      certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h
  14. 2
      certmanager/lib/cryptplug.h
  15. 2
      certmanager/lib/cryptplugfactory.h
  16. 2
      certmanager/lib/cryptplugwrapper.h
  17. 2
      certmanager/lib/kleo/cryptobackendfactory.h
  18. 2
      certmanager/lib/kleo/dn.h
  19. 2
      certmanager/lib/kleo/enum.h
  20. 2
      certmanager/lib/kleo/hierarchicalkeylistjob.h
  21. 2
      certmanager/lib/kleo/keyfiltermanager.h
  22. 2
      certmanager/lib/kleo/multideletejob.h
  23. 2
      certmanager/lib/ui/backendconfigwidget.h
  24. 2
      certmanager/lib/ui/cryptoconfigdialog.h
  25. 2
      certmanager/lib/ui/directoryserviceswidget.h
  26. 2
      certmanager/lib/ui/dnattributeorderconfigwidget.h
  27. 2
      certmanager/lib/ui/keyapprovaldialog.h
  28. 2
      certmanager/lib/ui/keylistview.h
  29. 2
      certmanager/lib/ui/keyrequester.h
  30. 2
      certmanager/lib/ui/keyselectiondialog.h
  31. 2
      certmanager/lib/ui/progressbar.h
  32. 2
      certmanager/lib/ui/progressdialog.h
  33. 2
      kaddressbook/common/kabprefs.h
  34. 2
      kaddressbook/interfaces/configurewidget.h
  35. 2
      kaddressbook/interfaces/contacteditorwidget.h
  36. 2
      kaddressbook/interfaces/core.h
  37. 2
      kaddressbook/interfaces/extensionwidget.h
  38. 2
      kaddressbook/interfaces/xxport.h
  39. 2
      kaddressbook/kabcore.h
  40. 2
      kaddressbook/kaddressbookiface.h
  41. 2
      kaddressbook/kaddressbookview.h
  42. 2
      kaddressbook/kcmconfigs/kcmkabconfig.cpp
  43. 2
      kaddressbook/kcmconfigs/kcmkabcustomfields.cpp
  44. 2
      kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
  45. 2
      kaddressbook/viewconfigurewidget.h
  46. 2
      kaddressbook/xxportmanager.h
  47. 2
      karm/karmstorage.h
  48. 2
      kgantt/kgantt/KGantt.h
  49. 2
      kgantt/kgantt/KGanttItem.h
  50. 2
      kmail/aboutdata.h
  51. 2
      kmail/accountmanager.h
  52. 2
      kmail/app_octetstream.cpp
  53. 2
      kmail/callback.h
  54. 2
      kmail/configuredialog_p.h
  55. 2
      kmail/kmail_part.h
  56. 2
      kmail/kmcommands.h
  57. 2
      kmail/kmfoldertree.h
  58. 2
      kmail/kmkernel.h
  59. 2
      kmail/kmstartup.h
  60. 2
      kmobile/kmobileclient.h
  61. 2
      kmobile/kmobiledevice.h
  62. 2
      kmobile/kmobileview.h
  63. 2
      kmobile/tdeioslave/tdeio_mobile.cpp
  64. 2
      knode/aboutdata.h
  65. 2
      knode/knconfigpages.cpp
  66. 2
      knode/knconvert.h
  67. 2
      knode/knglobals.h
  68. 2
      knode/knmainwidget.h
  69. 2
      knotes/resourcenotes.h
  70. 2
      kode/automakefile.h
  71. 2
      kode/class.h
  72. 2
      kode/code.h
  73. 2
      kode/enum.h
  74. 2
      kode/file.h
  75. 2
      kode/function.h
  76. 2
      kode/license.h
  77. 2
      kode/membervariable.h
  78. 2
      kode/printer.h
  79. 2
      kode/statemachine.h
  80. 2
      kode/style.h
  81. 2
      kode/typedef.h
  82. 2
      kode/variable.h
  83. 2
      kontact/interfaces/core.h
  84. 2
      kontact/interfaces/plugin.h
  85. 2
      kontact/interfaces/summary.h
  86. 2
      kontact/interfaces/uniqueapphandler.h
  87. 2
      kontact/plugins/kmail/kcmkmailsummary.cpp
  88. 2
      kontact/plugins/korganizer/kcmkorgsummary.cpp
  89. 2
      kontact/plugins/newsticker/kcmkontactknt.cpp
  90. 2
      kontact/plugins/specialdates/kcmsdsummary.cpp
  91. 2
      kontact/plugins/summary/kcmkontactsummary.cpp
  92. 2
      kontact/src/kcmkontact.cpp
  93. 2
      korganizer/aboutdata.h
  94. 2
      korganizer/actionmanager.h
  95. 2
      korganizer/calendarview.h
  96. 2
      korganizer/interfaces/korganizer/baseview.h
  97. 2
      korganizer/kocore.h
  98. 2
      korganizer/koeventviewer.h
  99. 2
      korganizer/koeventviewerdialog.h
  100. 2
      korganizer/koglobals.h
  101. 2
      korganizer/kogroupwareprefspage.ui
  102. 2
      korganizer/kohelper.h
  103. 2
      korganizer/koprefs.h
  104. 2
      korganizer/koprefsdialog.cpp
  105. 2
      korganizer/korganizerifaceimpl.h
  106. 2
      korganizer/printing/calprinter.h
  107. 2
      korganizer/printing/calprintpluginbase.h
  108. 2
      korganizer/printing/cellitem.h
  109. 2
      korganizer/urihandler.h
  110. 2
      ktnef/gui/ktnefview.h
  111. 2
      ktnef/ktnef/ktnefattach.h
  112. 2
      ktnef/ktnef/ktnefmessage.h
  113. 2
      ktnef/ktnef/ktnefparser.h
  114. 2
      ktnef/ktnef/ktnefproperty.h
  115. 2
      ktnef/ktnef/ktnefpropertyset.h
  116. 2
      libemailfunctions/email.h
  117. 2
      libemailfunctions/idmapper.h
  118. 2
      libkcal/alarm.h
  119. 2
      libkcal/calendar.h
  120. 2
      libkcal/calendarlocal.h
  121. 2
      libkcal/confirmsavedialog.h
  122. 2
      libkcal/customproperties.h
  123. 2
      libkcal/event.h
  124. 2
      libkcal/icalformat.h
  125. 2
      libkcal/incidence.h
  126. 2
      libkcal/journal.h
  127. 2
      libkcal/kcalversion.h
  128. 2
      libkcal/libkcal_export.h
  129. 2
      libkcal/resourcecached.h
  130. 2
      libkcal/resourcecachedconfig.h
  131. 2
      libkcal/resourcecalendar.h
  132. 2
      libkcal/resourcelocal.h
  133. 2
      libkcal/resourcelocalconfig.h
  134. 2
      libkcal/resourcelocaldir.h
  135. 2
      libkholidays/kholidays.h
  136. 2
      libkmime/boolflags.h
  137. 2
      libkmime/kmime_charfreq.h
  138. 2
      libkmime/kmime_codecs.h
  139. 2
      libkmime/kmime_header_parsing.h
  140. 2
      libkmime/kmime_headers.h
  141. 2
      libkmime/kmime_headers_obs.h
  142. 2
      libkmime/kmime_mdn.h
  143. 2
      libkmime/kmime_newsarticle.h
  144. 2
      libkmime/kmime_util.h
  145. 2
      libkmime/kqcstringsplitter.h
  146. 2
      libkpgp/kpgp.h
  147. 2
      libkpgp/kpgpblock.h
  148. 2
      libkpgp/kpgpui.h
  149. 2
      libkpimexchange/core/exchangeaccount.h
  150. 2
      libkpimexchange/core/exchangeclient.h
  151. 2
      libkpimexchange/core/exchangedelete.h
  152. 2
      libkpimexchange/core/exchangeupload.h
  153. 2
      libkpimidentities/identity.h
  154. 2
      libkpimidentities/identitycombo.h
  155. 2
      libkpimidentities/identitymanager.h
  156. 2
      libksieve/ksieve/error.h
  157. 2
      libksieve/ksieve/parser.h
  158. 2
      libtdenetwork/gpgmepp/context.h
  159. 2
      libtdenetwork/gpgmepp/data.h
  160. 2
      libtdenetwork/gpgmepp/decryptionresult.h
  161. 2
      libtdenetwork/gpgmepp/encryptionresult.h
  162. 2
      libtdenetwork/gpgmepp/engineinfo.h
  163. 2
      libtdenetwork/gpgmepp/eventloopinteractor.h
  164. 2
      libtdenetwork/gpgmepp/importresult.h
  165. 2
      libtdenetwork/gpgmepp/interfaces/dataprovider.h
  166. 2
      libtdenetwork/gpgmepp/key.h
  167. 2
      libtdenetwork/gpgmepp/keygenerationresult.h
  168. 2
      libtdenetwork/gpgmepp/keylistresult.h
  169. 2
      libtdenetwork/gpgmepp/signingresult.h
  170. 2
      libtdenetwork/gpgmepp/verificationresult.h
  171. 2
      libtdenetwork/qgpgme/dataprovider.h
  172. 2
      libtdenetwork/qgpgme/eventloopinteractor.h
  173. 2
      libtdepim/addresseelineedit.h
  174. 2
      libtdepim/addresseeselector.h
  175. 2
      libtdepim/addresseeview.h
  176. 2
      libtdepim/addressesdialog.h
  177. 2
      libtdepim/broadcaststatus.h
  178. 2
      libtdepim/categoryeditdialog.h
  179. 2
      libtdepim/categoryselectdialog.h
  180. 2
      libtdepim/clicklineedit.h
  181. 2
      libtdepim/collectingprocess.h
  182. 2
      libtdepim/configmanager.h
  183. 2
      libtdepim/designerfields.h
  184. 2
      libtdepim/diffalgo.h
  185. 2
      libtdepim/embeddedurlpage.h
  186. 2
      libtdepim/htmldiffalgodisplay.h
  187. 2
      libtdepim/infoextension.h
  188. 2
      libtdepim/interfaces/AddressBookServiceIface.h
  189. 2
      libtdepim/interfaces/MailTransportServiceIface.h
  190. 2
      libtdepim/kaccount.h
  191. 2
      libtdepim/kaddrbook.h
  192. 2
      libtdepim/kcmdesignerfields.h
  193. 2
      libtdepim/kdateedit.h
  194. 2
      libtdepim/kdatepickerpopup.h
  195. 1
      libtdepim/kfoldertree.cpp
  196. 2
      libtdepim/kfoldertree.h
  197. 2
      libtdepim/komposer/core/prefsmodule.cpp
  198. 2
      libtdepim/kpimprefs.h
  199. 2
      libtdepim/kpimurlrequesterdlg.h
  200. 2
      libtdepim/kpixmapregionselectordialog.h
  201. 2
      libtdepim/kprefsdialog.h
  202. 2
      libtdepim/kregexp3.h
  203. 2
      libtdepim/kresourceprefs.h
  204. 2
      libtdepim/krsqueezedtextlabel.h
  205. 2
      libtdepim/kscoring.h
  206. 2
      libtdepim/kscoringeditor.h
  207. 2
      libtdepim/ksubscription.h
  208. 2
      libtdepim/ktimeedit.h
  209. 2
      libtdepim/kvcarddrag.h
  210. 2
      libtdepim/kwidgetlister.h
  211. 2
      libtdepim/kxface.h
  212. 2
      libtdepim/ldapclient.h
  213. 1
      libtdepim/linklocator.cpp
  214. 2
      libtdepim/linklocator.h
  215. 2
      libtdepim/maillistdrag.h
  216. 2
      libtdepim/pluginloaderbase.h
  217. 2
      libtdepim/progressdialog.h
  218. 2
      libtdepim/progressmanager.h
  219. 2
      libtdepim/qutf7codec.h
  220. 2
      libtdepim/recentaddresses.h
  221. 2
      libtdepim/resourceabc.h
  222. 2
      libtdepim/sidebarextension.h
  223. 2
      libtdepim/spellingfilter.h
  224. 2
      libtdepim/statusbarprogresswidget.h
  225. 2
      libtdepim/tdeabcresourcecached.h
  226. 2
      libtdepim/tdeconfigpropagator.h
  227. 2
      libtdepim/tdeconfigwizard.h
  228. 2
      libtdepim/tdefileio.cpp
  229. 2
      libtdepim/tdefileio.h
  230. 2
      libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp
  231. 2
      libtdepim/weaver.h
  232. 2
      plugins/kmail/bodypartformatter/text_calendar.cpp
  233. 2
      plugins/kmail/bodypartformatter/text_vcard.cpp
  234. 2
      tdeioslave/imap4/imap4.cpp
  235. 2
      tdeioslave/mbox/mbox.cpp
  236. 2
      tdeioslave/opengroupware/opengroupware.cpp
  237. 2
      tdeioslave/sieve/sieve.cpp
  238. 2
      tderesources/birthdays/resourcetdeabc.h
  239. 2
      tderesources/blogging/kcal_resourceblogging.h
  240. 2
      tderesources/blogging/kcal_resourcebloggingconfig.h
  241. 2
      tderesources/caldav/resource.h
  242. 2
      tderesources/carddav/resource.h
  243. 2
      tderesources/egroupware/kcal_resourcexmlrpc.h
  244. 2
      tderesources/egroupware/kcal_resourcexmlrpcconfig.h
  245. 2
      tderesources/egroupware/knotes_resourcexmlrpc.h
  246. 2
      tderesources/egroupware/knotes_resourcexmlrpcconfig.h
  247. 2
      tderesources/egroupware/tdeabc_resourcexmlrpc.h
  248. 2
      tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h
  249. 2
      tderesources/featureplan/kcal_resourcefeatureplan.h
  250. 2
      tderesources/featureplan/kcal_resourcefeatureplanconfig.h
  251. 2
      tderesources/groupdav/tdeabc_resourcegroupdav.h
  252. 2
      tderesources/groupwise/kcal_resourcegroupwise.h
  253. 2
      tderesources/groupwise/kcal_resourcegroupwiseconfig.h
  254. 2
      tderesources/groupwise/tdeabc_resourcegroupwise.h
  255. 2
      tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h
  256. 2
      tderesources/groupwise/tdeioslave/groupwise.cpp
  257. 2
      tderesources/kolab/kcal/resourcekolab.h
  258. 2
      tderesources/kolab/knotes/resourcekolab.h
  259. 1
      tderesources/kolab/tdeabc/contact.cpp
  260. 2
      tderesources/kolab/tdeabc/resourcekolab.h
  261. 2
      tderesources/lib/addressbookadaptor.h
  262. 2
      tderesources/lib/calendaradaptor.h
  263. 2
      tderesources/lib/davaddressbookadaptor.h
  264. 2
      tderesources/lib/davcalendaradaptor.h
  265. 2
      tderesources/lib/folderconfig.h
  266. 2
      tderesources/lib/folderlister.h
  267. 2
      tderesources/lib/groupwaredataadaptor.h
  268. 2
      tderesources/lib/kcal_cachesettingsdlg.h
  269. 2
      tderesources/lib/kcal_resourcegroupwarebase.h
  270. 2
      tderesources/lib/kcal_resourcegroupwarebaseconfig.h
  271. 2
      tderesources/lib/tdeabc_resourcegroupwarebase.h
  272. 2
      tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h
  273. 2
      tderesources/lib/webdavhandler.h
  274. 1
      tderesources/newexchange/exchangeconvertercontact.cpp
  275. 2
      tderesources/remote/resourceremote.h
  276. 2
      tderesources/remote/resourceremoteconfig.h
  277. 2
      tderesources/scalix/kcal/resourcescalix.h
  278. 2
      tderesources/scalix/knotes/resourcescalix.h
  279. 2
      tderesources/scalix/tdeabc/resourcescalix.h
  280. 2
      tderesources/scalix/tdeioslave/scalix.cpp
  281. 2
      tderesources/slox/kcalresourceslox.h
  282. 2
      tderesources/slox/kcalresourcesloxconfig.h
  283. 2
      tderesources/slox/sloxaccounts.h
  284. 2
      tderesources/slox/sloxbase.h
  285. 2
      tderesources/slox/sloxfolder.h
  286. 2
      tderesources/slox/sloxfoldermanager.h
  287. 1
      tderesources/slox/tdeabcresourceslox.cpp
  288. 2
      tderesources/slox/tdeabcresourceslox.h
  289. 2
      tderesources/slox/tdeabcresourcesloxconfig.h
  290. 2
      tderesources/slox/webdavhandler.h
  291. 2
      tderesources/tvanytime/kcal_resourcetvanytime.h
  292. 2
      tderesources/tvanytime/kcal_resourcetvanytimeconfig.h
  293. 2
      wizards/egroupwarewizard.h
  294. 2
      wizards/exchangewizard.h
  295. 2
      wizards/groupwisewizard.h
  296. 2
      wizards/kolabwizard.h
  297. 2
      wizards/scalixwizard.h
  298. 2
      wizards/sloxwizard.h

2
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"

2
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

2
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;

2
certmanager/certmanager.cpp

@ -96,7 +96,7 @@
// other
#include <algorithm>
#include <assert.h>
#include <tdepimmacros.h>
#include <kdemacros.h>
#include <kinputdialog.h>
namespace {

2
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>

2
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 )

2
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

2
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;

2
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>

2
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;

2
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;

2
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;

2
certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h

@ -44,7 +44,7 @@
#include <utility>
#include <tdepimmacros.h>
#include <kdemacros.h>
namespace GpgME {
class Error;
class Context;

2
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;

2
certmanager/lib/cryptplugfactory.h

@ -35,7 +35,7 @@
#include "kleo/cryptobackendfactory.h"
#include <tdepimmacros.h>
#include <kdemacros.h>
#ifndef LIBKLEOPATRA_NO_COMPAT
namespace Kleo {

2
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;

2
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>

2
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;

2
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;

2
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>

2
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;
}

2
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>

2
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;

2
certmanager/lib/ui/cryptoconfigdialog.h

@ -33,7 +33,7 @@
#define CRYPTOCONFIGDIALOG_H
#include <kdialogbase.h>
#include <tdepimmacros.h>
#include <kdemacros.h>
namespace Kleo {

2
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 {

2
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;
}

2
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>

2
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;

2
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;

2
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;

2
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 {

2
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;

2
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;

2
kaddressbook/interfaces/configurewidget.h

@ -27,7 +27,7 @@
#include <tqwidget.h>
#include <tdeconfig.h>
#include <tdepimmacros.h>
#include <kdemacros.h>
namespace TDEABC {
class AddressBook;

2
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

2
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;

2
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

2
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

2
kaddressbook/kabcore.h

@ -33,7 +33,7 @@
#include <tqwidget.h>
#include "core.h"
#include <tdepimmacros.h>
#include <kdemacros.h>
namespace TDEABC {
class AddressBook;

2
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
{

2
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"

2
kaddressbook/kcmconfigs/kcmkabconfig.cpp

@ -31,7 +31,7 @@
#include "kcmkabconfig.h"
#include <tdepimmacros.h>
#include <kdemacros.h>
extern "C"
{

2
kaddressbook/kcmconfigs/kcmkabcustomfields.cpp

@ -29,7 +29,7 @@
#include <tqregexp.h>
#include <tdepimmacros.h>
#include <kdemacros.h>
extern "C"
{

2
kaddressbook/kcmconfigs/kcmkabldapconfig.cpp

@ -32,7 +32,7 @@
#include "kcmkabldapconfig.h"
#include <tdepimmacros.h>
#include <kdemacros.h>
extern "C"
{

2
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"

2
kaddressbook/xxportmanager.h

@ -29,7 +29,7 @@
#include <kurl.h>
#include <tdepimmacros.h>
#include <kdemacros.h>
#include "xxport.h"

2
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;

2
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"

2
kgantt/kgantt/KGanttItem.h

@ -38,7 +38,7 @@
#include <tqptrlist.h>
#include <tqpainter.h>
#include <tdepimmacros.h>
#include <kdemacros.h>
#include "KGanttRelation.h"

2
kmail/aboutdata.h

@ -33,7 +33,7 @@
#define __KMAIL_ABOUTDATA_H__
#include <tdeaboutdata.h>
#include <tdepimmacros.h>
#include <kdemacros.h>
namespace KMail {

2
kmail/accountmanager.h

@ -22,7 +22,7 @@
#include <tqobject.h>
#include "kmaccount.h"
#include <tdepimmacros.h>
#include <kdemacros.h>
class TQString;
class TQStringList;

2
kmail/app_octetstream.cpp

@ -32,7 +32,7 @@
#include "interfaces/bodypartformatter.h"
#include <tdepimmacros.h>
#include <kdemacros.h>
namespace {

2
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

2
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;

2
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;

2
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>

2
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>

2
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>

2
kmail/kmstartup.h

@ -18,7 +18,7 @@
#ifndef KMSTARTUP
#define KMSTARTUP
#include <tdepimmacros.h>
#include <kdemacros.h>
extern "C" {

2
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
{

2
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>

2
kmobile/kmobileview.h

@ -9,7 +9,7 @@
#include "kmobileiface.h"
#include <tdepimmacros.h>
#include <kdemacros.h>
class TDEConfig;
class KMobileItem;

2
kmobile/tdeioslave/tdeio_mobile.cpp

@ -33,7 +33,7 @@
#include "tdeio_mobile.h"
#include <tdepimmacros.h>
#include <kdemacros.h>
using namespace TDEIO;

2
knode/aboutdata.h

@ -15,7 +15,7 @@
*/
#include <tdeaboutdata.h>
#include <tdepimmacros.h>
#include <kdemacros.h>
#ifndef KNODE_ABOUTDATA_H
#define KNODE_ABOUTDATA_H

2
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)

2
knode/knconvert.h

@ -21,7 +21,7 @@
#include <tqglobal.h>
#include <tqvaluelist.h>
#include <tdepimmacros.h>
#include <kdemacros.h>
class TQListBox;
class TQLabel;

2
knode/knglobals.h

@ -20,7 +20,7 @@
#include <tdeconfig.h>
#include "resource.h"
#include <tdepimmacros.h>
#include <kdemacros.h>
class TDEInstance;
class KNConfigManager;

2
knode/knmainwidget.h

@ -21,7 +21,7 @@
#include "resource.h"
#include <tqglobal.h>
#include <tdepimmacros.h>
#include <kdemacros.h>
class TQListViewItem;

2
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;

2
kode/automakefile.h

@ -26,7 +26,7 @@
#include <tqmap.h>
#include <tqstringlist.h>
#include <tdepimmacros.h>
#include <kdemacros.h>
namespace KODE {

2
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>

2
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

2
kode/enum.h

@ -22,7 +22,7 @@
#define KODE_ENUM_H
#include <tqstringlist.h>
#include <tdepimmacros.h>
#include <kdemacros.h>
namespace KODE {

2
kode/file.h

@ -28,7 +28,7 @@
#include <tqstring.h>
#include <tqstringlist.h>
#include <tdepimmacros.h>
#include <kdemacros.h>
namespace KODE {

2
kode/function.h

@ -26,7 +26,7 @@
#include <tqvaluelist.h>
#include <tqstring.h>
#include <tqstringlist.h>
#include <tdepimmacros.h>
#include <kdemacros.h>
namespace KODE {

2
kode/license.h

@ -22,7 +22,7 @@
#define KODE_LICENSE_H
#include <tqstring.h>
#include <tdepimmacros.h>
#include <kdemacros.h>
namespace KODE {

2
kode/membervariable.h

@ -25,7 +25,7 @@
#include <tqvaluelist.h>
#include <tqstring.h>
#include <tdepimmacros.h>
#include <kdemacros.h>
namespace KODE {

2
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>

2
kode/statemachine.h

@ -25,7 +25,7 @@
#include <tqstring.h>
#include <tqmap.h>
#include <tdepimmacros.h>
#include <kdemacros.h>
namespace KODE {

2
kode/style.h

@ -27,7 +27,7 @@
#include <tqstring.h>
#include <tqstringlist.h>
#include <tdepimmacros.h>
#include <kdemacros.h>
namespace KODE {

2
kode/typedef.h

@ -22,7 +22,7 @@
#define KODE_TYPEDEF_H
#include <tqvaluelist.h>
#include <tdepimmacros.h>
#include <kdemacros.h>
namespace KODE {

2
kode/variable.h

@ -24,7 +24,7 @@
#include <tqvaluelist.h>
#include <tqstring.h>
#include <tdepimmacros.h>
#include <kdemacros.h>
namespace KODE {

2
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>

2
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;

2
kontact/interfaces/summary.h

@ -23,7 +23,7 @@
#include <tqwidget.h>
#include <tqpixmap.h>
#include <tdepimmacros.h>
#include <kdemacros.h>
class KStatusBar;

2
kontact/interfaces/uniqueapphandler.h

@ -24,7 +24,7 @@
#include <dcopobject.h>
#include <plugin.h>
#include <tdepimmacros.h>
#include <kdemacros.h>
namespace Kontact
{

2
kontact/plugins/kmail/kcmkmailsummary.cpp

@ -37,7 +37,7 @@
#include "kcmkmailsummary.h"
#include <tdepimmacros.h>
#include <kdemacros.h>
extern "C"
{

2
kontact/plugins/korganizer/kcmkorgsummary.cpp

@ -37,7 +37,7 @@
#include "kcmkorgsummary.h"
#include <tdepimmacros.h>
#include <kdemacros.h>
extern "C"
{

2
kontact/plugins/newsticker/kcmkontactknt.cpp