From dd8d99038909d994be861a5e772e337cf17a66bf Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 1 Jul 2024 19:18:24 +0900 Subject: [PATCH] Replace kdemacros.h with tdemacros.h Signed-off-by: Michele Calgaro --- kopete/libkopete/kopete_export.h | 2 +- kopete/libkopete/kopetecontact.h | 2 +- kopete/libkopete/kopetemessagehandler.h | 2 +- kopete/libkopete/kopetemessagehandlerchain.h | 2 +- kopete/libkopete/kopetemetacontact.h | 2 +- kopete/libkopete/kopeteonlinestatus.h | 2 +- kopete/libkopete/kopetepicture.h | 2 +- kopete/libkopete/kopeteplugin.h | 2 +- kopete/libkopete/kopetetask.h | 2 +- kopete/libkopete/kopetewalletmanager.h | 2 +- kopete/libkopete/ui/addressbookselectordialog.h | 2 +- kopete/libkopete/ui/addressbookselectorwidget.h | 2 +- kopete/libkopete/ui/metacontactselectorwidget.h | 2 +- kopete/protocols/msn/Makefile.am | 2 +- kopete/protocols/msn/dummy.cpp | 2 +- librss/global.h | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) 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 +#include #include #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 #include -#include +#include #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 -//#include +//#include #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 -#include +#include #include #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 #include -#include +#include #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 +#include #include #include 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 +#include #include #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 #include -#include +#include #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 -#include +#include 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 -#include +#include #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 +#include #include "kopete_export.h" #include 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 #include -#include +#include #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 +#include #include #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 +#include #define LIBRSS_EXPORT TDE_EXPORT