summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
m---------admin0
-rw-r--r--kdict/dict.h2
-rw-r--r--kopete/libkopete/kopete_export.h2
-rw-r--r--kopete/libkopete/kopetecontact.h2
-rw-r--r--kopete/libkopete/kopetemessagehandler.h2
-rw-r--r--kopete/libkopete/kopetemessagehandlerchain.h2
-rw-r--r--kopete/libkopete/kopetemetacontact.h2
-rw-r--r--kopete/libkopete/kopeteonlinestatus.h2
-rw-r--r--kopete/libkopete/kopetepicture.h2
-rw-r--r--kopete/libkopete/kopeteplugin.h2
-rw-r--r--kopete/libkopete/kopetetask.h2
-rw-r--r--kopete/libkopete/kopetewalletmanager.h2
-rw-r--r--kopete/libkopete/ui/addressbookselectordialog.h2
-rw-r--r--kopete/libkopete/ui/addressbookselectorwidget.h2
-rw-r--r--kopete/libkopete/ui/metacontactselectorwidget.h2
-rw-r--r--kopete/protocols/msn/Makefile.am2
-rw-r--r--kopete/protocols/msn/dummy.cpp2
-rw-r--r--librss/global.h2
18 files changed, 17 insertions, 17 deletions
diff --git a/admin b/admin
-Subproject 34c35e11fbc7237f94ec8ede61ef0c8c9b6c58b
+Subproject b770a18e00a82febd12c1787247533771ecbb57
diff --git a/kdict/dict.h b/kdict/dict.h
index 44111d7d..61c49d31 100644
--- a/kdict/dict.h
+++ b/kdict/dict.h
@@ -19,7 +19,7 @@
#ifndef _DICT_H_
#define _DICT_H_
-#include <ntqthread.h>
+#include <tqthread.h>
#include <tqptrlist.h>
#include <tqsocketnotifier.h>
diff --git a/kopete/libkopete/kopete_export.h b/kopete/libkopete/kopete_export.h
index 43d76676..54d7afb0 100644
--- a/kopete/libkopete/kopete_export.h
+++ b/kopete/libkopete/kopete_export.h
@@ -18,7 +18,7 @@
#ifndef KOPETE_EXPORT_H
#define KOPETE_EXPORT_H
-#include <kdemacros.h>
+#include <tdemacros.h>
#include <tdeversion.h>
#if KDE_IS_VERSION(3,3,2)
diff --git a/kopete/libkopete/kopetecontact.h b/kopete/libkopete/kopetecontact.h
index cd4ae84d..ad96fe7c 100644
--- a/kopete/libkopete/kopetecontact.h
+++ b/kopete/libkopete/kopetecontact.h
@@ -22,7 +22,7 @@
#include <tqobject.h>
#include <kurl.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
#include "kopeteglobal.h"
#include "kopete_export.h"
diff --git a/kopete/libkopete/kopetemessagehandler.h b/kopete/libkopete/kopetemessagehandler.h
index e6ecb954..93dc13f8 100644
--- a/kopete/libkopete/kopetemessagehandler.h
+++ b/kopete/libkopete/kopetemessagehandler.h
@@ -18,7 +18,7 @@
#define KOPETEMESSAGEHANDLER_H
#include <tqobject.h>
-//#include <kdemacros.h>
+//#include <tdemacros.h>
#include "kopete_export.h"
//FIXME: Message::MessageDirection could be moved into namespace Kopete
diff --git a/kopete/libkopete/kopetemessagehandlerchain.h b/kopete/libkopete/kopetemessagehandlerchain.h
index 26148285..b4e26c6e 100644
--- a/kopete/libkopete/kopetemessagehandlerchain.h
+++ b/kopete/libkopete/kopetemessagehandlerchain.h
@@ -18,7 +18,7 @@
#define KOPETEFILTERCHAIN_H
#include <tqobject.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
#include <ksharedptr.h>
#include "kopetemessage.h"
#include "kopetetask.h"
diff --git a/kopete/libkopete/kopetemetacontact.h b/kopete/libkopete/kopetemetacontact.h
index ca5b3711..6ebfe676 100644
--- a/kopete/libkopete/kopetemetacontact.h
+++ b/kopete/libkopete/kopetemetacontact.h
@@ -25,7 +25,7 @@
#include <tqptrlist.h>
#include <tqstring.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
#include "kopete_export.h"
#include "kopetenotifydataobject.h"
diff --git a/kopete/libkopete/kopeteonlinestatus.h b/kopete/libkopete/kopeteonlinestatus.h
index 6ad34c55..e0eaae4a 100644
--- a/kopete/libkopete/kopeteonlinestatus.h
+++ b/kopete/libkopete/kopeteonlinestatus.h
@@ -23,7 +23,7 @@
#include "kopete_export.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
#include <ksharedptr.h>
#include <tqobject.h>
diff --git a/kopete/libkopete/kopetepicture.h b/kopete/libkopete/kopetepicture.h
index 555787df..b0cea565 100644
--- a/kopete/libkopete/kopetepicture.h
+++ b/kopete/libkopete/kopetepicture.h
@@ -17,7 +17,7 @@
#ifndef KOPETEPICTURE_H
#define KOPETEPICTURE_H
-#include <kdemacros.h>
+#include <tdemacros.h>
#include <ksharedptr.h>
#include "kopete_export.h"
diff --git a/kopete/libkopete/kopeteplugin.h b/kopete/libkopete/kopeteplugin.h
index a7de7451..9d17e698 100644
--- a/kopete/libkopete/kopeteplugin.h
+++ b/kopete/libkopete/kopeteplugin.h
@@ -22,7 +22,7 @@
#include <kxmlguiclient.h>
#include <tqobject.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
#include "kopete_export.h"
diff --git a/kopete/libkopete/kopetetask.h b/kopete/libkopete/kopetetask.h
index 9ba9daa8..49435096 100644
--- a/kopete/libkopete/kopetetask.h
+++ b/kopete/libkopete/kopetetask.h
@@ -18,7 +18,7 @@
#define KOPETETASK_H
#include <tqobject.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
namespace Kopete
{
diff --git a/kopete/libkopete/kopetewalletmanager.h b/kopete/libkopete/kopetewalletmanager.h
index 7e91a3bb..785d0924 100644
--- a/kopete/libkopete/kopetewalletmanager.h
+++ b/kopete/libkopete/kopetewalletmanager.h
@@ -19,7 +19,7 @@
#include <tqobject.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
#include "kopete_export.h"
diff --git a/kopete/libkopete/ui/addressbookselectordialog.h b/kopete/libkopete/ui/addressbookselectordialog.h
index 3be5df72..ac6f9742 100644
--- a/kopete/libkopete/ui/addressbookselectordialog.h
+++ b/kopete/libkopete/ui/addressbookselectordialog.h
@@ -19,7 +19,7 @@
#ifndef ADDRESSBOOKSELECTORDIALOG_H
#define ADDRESSBOOKSELECTORDIALOG_H
-#include <kdemacros.h>
+#include <tdemacros.h>
#include "kopete_export.h"
#include <kdialogbase.h>
diff --git a/kopete/libkopete/ui/addressbookselectorwidget.h b/kopete/libkopete/ui/addressbookselectorwidget.h
index bd49483f..86d71b9a 100644
--- a/kopete/libkopete/ui/addressbookselectorwidget.h
+++ b/kopete/libkopete/ui/addressbookselectorwidget.h
@@ -30,7 +30,7 @@
#include <kdialogbase.h>
#include <tdeabc/addressbook.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
#include "kopete_export.h"
#include "addressbookselectorwidget_base.h"
diff --git a/kopete/libkopete/ui/metacontactselectorwidget.h b/kopete/libkopete/ui/metacontactselectorwidget.h
index c0d4fd1e..d9eabc04 100644
--- a/kopete/libkopete/ui/metacontactselectorwidget.h
+++ b/kopete/libkopete/ui/metacontactselectorwidget.h
@@ -18,7 +18,7 @@
#ifndef MetaContactSelectorWidget_H
#define MetaContactSelectorWidget_H
-#include <kdemacros.h>
+#include <tdemacros.h>
#include <tqwidget.h>
#include "kopetelistviewitem.h"
#include "kopete_export.h"
diff --git a/kopete/protocols/msn/Makefile.am b/kopete/protocols/msn/Makefile.am
index 10d05490..1ec33476 100644
--- a/kopete/protocols/msn/Makefile.am
+++ b/kopete/protocols/msn/Makefile.am
@@ -34,7 +34,7 @@ kopete_msn_la_LIBADD = libkopete_msn_shared.la
kopete_msn_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lkopete_videodevice -L../../libkopete/avdevice/
dummy.cpp: $(srcdir)/Makefile.am
- echo '#include "kdemacros.h"' > $@
+ echo '#include "tdemacros.h"' > $@
echo 'extern "C" TDE_EXPORT void *init_libkopete_msn_shared();' >> $@
echo 'extern "C" TDE_EXPORT void *init_kopete_msn() { return init_libkopete_msn_shared(); }' >> $@
diff --git a/kopete/protocols/msn/dummy.cpp b/kopete/protocols/msn/dummy.cpp
index c1273f3a..30969535 100644
--- a/kopete/protocols/msn/dummy.cpp
+++ b/kopete/protocols/msn/dummy.cpp
@@ -1,3 +1,3 @@
-#include "kdemacros.h"
+#include "tdemacros.h"
extern "C" TDE_EXPORT void *init_libkopete_msn_shared();
extern "C" TDE_EXPORT void *init_kopete_msn() { return init_libkopete_msn_shared(); }
diff --git a/librss/global.h b/librss/global.h
index 7d249f3f..c7f89b9d 100644
--- a/librss/global.h
+++ b/librss/global.h
@@ -11,7 +11,7 @@
#ifndef LIBRSS_GLOBAL_H
#define LIBRSS_GLOBAL_H
-#include <kdemacros.h>
+#include <tdemacros.h>
#define LIBRSS_EXPORT TDE_EXPORT
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-05 06:49:43 +0000