Do not redefine operator macros, just fix the QT_OVERLOAD_MACRO to work with simplecpp

Author: usiems

generator/qtscript_masterinclude.h

@@ -113,30 +113,9 @@
 
 
 #if QT_VERSION >= 0x060700
-// override Q_DECLARE_STRONGLY_ORDERED_LITERAL_TYPE et al to return something the parser understands:
-#include <QtCore/qcomparehelpers.h>
-#define Q_DECLARE_STRONGLY_ORDERED_LITERAL_TYPE(TYPE, ...) \
-    friend bool operator==(const TYPE& lhs, const TYPE& rhs); \
-    friend bool operator!=(const TYPE& lhs, const TYPE& rhs); \
-    friend bool operator< (const TYPE& lhs, const TYPE& rhs); \
-    friend bool operator<=(const TYPE& lhs, const TYPE& rhs); \
-    friend bool operator> (const TYPE& lhs, const TYPE& rhs); \
-    friend bool operator>=(const TYPE& lhs, const TYPE& rhs);
-
-#define Q_DECLARE_WEAKLY_ORDERED_LITERAL_TYPE(TYPE) Q_DECLARE_STRONGLY_ORDERED_LITERAL_TYPE(TYPE)
-#define Q_DECLARE_PARTIALLY_ORDERED_LITERAL_TYPE(TYPE) Q_DECLARE_STRONGLY_ORDERED_LITERAL_TYPE(TYPE)
-
-#define Q_DECLARE_STRONGLY_ORDERED(TYPE, ...) Q_DECLARE_STRONGLY_ORDERED_LITERAL_TYPE(TYPE)
-#define Q_DECLARE_WEAKLY_ORDERED(TYPE, ...) Q_DECLARE_STRONGLY_ORDERED_LITERAL_TYPE(TYPE)
-#define Q_DECLARE_PARTIALLY_ORDERED Q_DECLARE_STRONGLY_ORDERED_LITERAL_TYPE(TYPE)
-
-#define Q_DECLARE_EQUALITY_COMPARABLE_LITERAL_TYPE(TYPE, ...) \
-  public: \
-    bool operator==(const TYPE& rhs) const; \
-    bool operator!=(const TYPE& rhs) const; \
-  private:
-
-#define Q_DECLARE_EQUALITY_COMPARABLE(TYPE, ...) Q_DECLARE_EQUALITY_COMPARABLE_LITERAL_TYPE(TYPE)
+
+// adjust macro to work with simplecpp
+#define QT_OVERLOADED_MACRO(MACRO, ...) QT_OVERLOADED_MACRO_IMP(MACRO, QT_VA_ARGS_COUNT(__VA_ARGS__))(__VA_ARGS__)
 
 #endif