summaryrefslogtreecommitdiffstats
path: root/tdecore
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2024-05-20 11:38:41 +0900
committerMichele Calgaro <[email protected]>2024-05-20 18:39:20 +0900
commit0f0c5a4d07b51eb3c08c799b37b2ef4c201fb8b2 (patch)
tree2ecaa143b9bc933936e9a977255be2e01b95bdbe /tdecore
parent75d7682354ef3a0de89afcf34247f80417e71753 (diff)
downloadtdelibs-0f0c5a4d07b51eb3c08c799b37b2ef4c201fb8b2.tar.gz
tdelibs-0f0c5a4d07b51eb3c08c799b37b2ef4c201fb8b2.zip
Replace KDE_Q_EXPORT_PLUGIN, KDE_PACKED and KDE_WEAK_SYMBOL with TDE_* equivalent
Signed-off-by: Michele Calgaro <[email protected]>
Diffstat (limited to 'tdecore')
-rw-r--r--tdecore/kdemacros.h.cmake22
-rw-r--r--tdecore/kdemacros.h.in26
2 files changed, 30 insertions, 18 deletions
diff --git a/tdecore/kdemacros.h.cmake b/tdecore/kdemacros.h.cmake
index 2b24583f5..99886334a 100644
--- a/tdecore/kdemacros.h.cmake
+++ b/tdecore/kdemacros.h.cmake
@@ -50,25 +50,29 @@
#endif
/**
- * KDE_Q_EXPORT_PLUGIN is a workaround for Qt not being able to
+ * TDE_EXPORT_PLUGIN is a workaround for Qt not being able to
* cope with symbol visibility.
*/
-#define KDE_Q_EXPORT_PLUGIN(PLUGIN) \
+#define TDE_EXPORT_PLUGIN(PLUGIN) \
TQ_EXTERN_C TDE_EXPORT const char* qt_ucm_query_verification_data(); \
TQ_EXTERN_C TDE_EXPORT TQUnknownInterface* ucm_instantiate(); \
TQ_EXPORT_PLUGIN(PLUGIN)
+#define KDE_Q_EXPORT_PLUGIN TDE_EXPORT_PLUGIN
+
/**
- * The KDE_PACKED can be used to hint the compiler that a particular
+ * The TDE_PACKED can be used to hint the compiler that a particular
* structure or class should not contain unnecessary paddings.
*/
#ifdef __GNUC__
-#define KDE_PACKED __attribute__((__packed__))
+#define TDE_PACKED __attribute__((__packed__))
#else
-#define KDE_PACKED
+#define TDE_PACKED
#endif
+#define KDE_PACKED TDE_PACKED
+
/**
* The TDE_DEPRECATED macro can be used to trigger compile-time warnings
* with newer compilers when deprecated functions are used.
@@ -205,15 +209,17 @@
RESERVE_VIRTUAL_9
/**
- * The KDE_WEAK_SYMBOL macro can be used to tell the compiler that
+ * The TDE_WEAK_SYMBOL macro can be used to tell the compiler that
* a particular function should be a weak symbol (that e.g. may be overriden
* in another library, -Bdirect will not bind this symbol directly)
*/
#ifdef __GNUC__
-#define KDE_WEAK_SYMBOL __attribute__((__weak__))
+#define TDE_WEAK_SYMBOL __attribute__((__weak__))
#else
-#define KDE_WEAK_SYMBOL
+#define TDE_WEAK_SYMBOL
#endif
+#define KDE_WEAK_SYMBOL TDE_WEAK_SYMBOL
+
#endif /* _KDE_MACROS_H_ */
diff --git a/tdecore/kdemacros.h.in b/tdecore/kdemacros.h.in
index d9c8ab598..a0d70a2fc 100644
--- a/tdecore/kdemacros.h.in
+++ b/tdecore/kdemacros.h.in
@@ -49,25 +49,29 @@
#endif
/**
- * KDE_Q_EXPORT_PLUGIN is a workaround for Qt not being able to
+ * TDE_EXPORT_PLUGIN is a workaround for Qt not being able to
* cope with symbol visibility.
*/
-#define KDE_Q_EXPORT_PLUGIN(PLUGIN) \
+#define TDE_EXPORT_PLUGIN(PLUGIN) \
TQ_EXTERN_C TDE_EXPORT const char* qt_ucm_query_verification_data(); \
TQ_EXTERN_C TDE_EXPORT TQUnknownInterface* ucm_instantiate(); \
TQ_EXPORT_PLUGIN(PLUGIN)
+#define KDE_Q_EXPORT_PLUGIN TDE_EXPORT_PLUGIN
+
/**
- * The KDE_PACKED can be used to hint the compiler that a particular
+ * The TDE_PACKED can be used to hint the compiler that a particular
* structure or class should not contain unnecessary paddings.
*/
#ifdef __GNUC__
-#define KDE_PACKED __attribute__((__packed__))
+#define TDE_PACKED __attribute__((__packed__))
#else
-#define KDE_PACKED
+#define TDE_PACKED
#endif
+#define KDE_PACKED TDE_PACKED
+
/**
* The TDE_DEPRECATED macro can be used to trigger compile-time warnings
* with newer compilers when deprecated functions are used.
@@ -101,14 +105,14 @@
* \endcode
*
* \note
- * It does not make much sense to use the TDE_DEPRECATED keyword for a Qt signal;
+ * It does not make much sense to use the TDE_DEPRECATED keyword for a TQt signal;
* this is because usually get called by the class which they belong to,
* and one'd assume that a class author doesn't use deprecated methods of his
* own class. The only exception to this are signals which are connected to
* other signals; they get invoked from moc-generated code. In any case,
* printing a warning message in either case is not useful.
* For slots, it can make sense (since slots can be invoked directly) but be
- * aware that if the slots get triggered by a signal, the will get called from
+ * aware that if the slots get triggered by a signal, it will get called from
* moc code as well and thus the warnings are useless.
*
* \par
@@ -204,15 +208,17 @@
RESERVE_VIRTUAL_9
/**
- * The KDE_WEAK_SYMBOL macro can be used to tell the compiler that
+ * The TDE_WEAK_SYMBOL macro can be used to tell the compiler that
* a particular function should be a weak symbol (that e.g. may be overriden
* in another library, -Bdirect will not bind this symbol directly)
*/
#ifdef __GNUC__
-#define KDE_WEAK_SYMBOL __attribute__((__weak__))
+#define TDE_WEAK_SYMBOL __attribute__((__weak__))
#else
-#define KDE_WEAK_SYMBOL
+#define TDE_WEAK_SYMBOL
#endif
+#define KDE_WEAK_SYMBOL TDE_WEAK_SYMBOL
+
#endif /* _KDE_MACROS_H_ */