Cleanup OO macros

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / util-pre.qh

diff --git a/qcsrc/common/util-pre.qh b/qcsrc/common/util-pre.qh
index 053261b10efac17e04a7bc79acc356751c8e23d4..e681998557388e4e4d262e8ec92402ca7f803377 100644 (file)
--- a/qcsrc/common/util-pre.qh
+++ b/qcsrc/common/util-pre.qh
@@ -37,16 +37,6 @@
     const int false = 0;
 #endif
 
-#ifndef QCC_SUPPORT_ENTITYCLASS
-    #define entityclass(name) typedef entity name
-    #define class(name)
-    #define new(class) spawn()
-#else
-    #define entityclass(name) entityclass name {}
-    #define class(name) [[class(name)]]
-    #define new(class) ((class) spawn())
-#endif
-
 // Transitional aliases
 [[deprecated("use true")]] [[alias("true")]] const bool TRUE;
 [[deprecated("use false")]] [[alias("false")]] const bool FALSE;
@@ -83,6 +73,10 @@
 
 #define IDENTITY(it) it
 
+#define UNWORDS(...) MAP(IDENTITY, __VA_ARGS__)
+
+#define APPLY(f, ...) f(__VA_ARGS__)
+
 #ifdef SVQC
     #define SV(f, ...) f(__VA_ARGS__)
 #else
@@ -95,9 +89,10 @@
     #define CL(f, ...)
 #endif
 
-#define ALL(f, ...) f(__VA_ARGS__)
+#define IF(cond, f, ...) cond(f, __VA_ARGS__)
 
-#define IF(pred, f, ...) pred(f, __VA_ARGS__)
+#define GET(name) name##get
+#define GETTER(type, name) type GET(name)() { return name; }
 
 #define BIT(n) (1 << (n))
 #ifndef BRANCHLESS_BITSET