From b93816f468f00e5bb8f359c732c8cb30ef0db91b Mon Sep 17 00:00:00 2001
From: "arnaud.clere" <arnaud.clere@minmaxmedical.com>
Date: Fri, 15 Nov 2019 14:52:58 +0100
Subject: [PATCH] renaming QMetaObject-based qbind: qzap

---
 tests/QBind/QValue.h | 6 +++---
 tests/QBind/data.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/QBind/QValue.h b/tests/QBind/QValue.h
index 08560ea66b..c6a9dca643 100644
--- a/tests/QBind/QValue.h
+++ b/tests/QBind/QValue.h
@@ -848,9 +848,9 @@ QSeq<T_> QSeq<T_>::forEach(Ts& ts,
 #include <QtCore/qmetatype.h>
 #include <QtCore/qmetaobject.h>
 
-// For QBIND_GADGET_WITH_METAOBJECT below
+// For Q_DEFINE_ZAP_WITH_METAOBJECT below
 template<class T>
-QValueStatus qbind(QValue&& v, T* t) {
+QValueStatus qzap(QValue&& v, T* t) {
     auto rw = v->mode();
     auto mo = T::staticMetaObject;
     auto r  = v.meta(qmName,QAsciiData(mo.className())).record();
@@ -921,7 +921,7 @@ QValueStatus qbind(QValue&& v, T* t) {
 }
 
 //! Default bind(QValue&&) based on static QMetaObject reflection
-#define QBIND_GADGET_WITH_METAOBJECT(Class) QValueStatus zap(QValue&& v) { return qbind<Class>(std::move(v), this); }
+#define Q_DEFINE_ZAP_WITH_METAOBJECT(Class) QValueStatus zap(QValue&& v) { return qzap<Class>(std::move(v), this); }
 
 template<typename T>
 struct QTransmogrifier<QDefaultValue<T>> {
diff --git a/tests/QBind/data.h b/tests/QBind/data.h
index 3ecc51fe0a..eb2f3df843 100644
--- a/tests/QBind/data.h
+++ b/tests/QBind/data.h
@@ -9,7 +9,7 @@ class Phone {
     Q_PROPERTY(Type    type   MEMBER _t)
     Q_PROPERTY(QString number MEMBER _n)
 public:
-    QBIND_GADGET_WITH_METAOBJECT(Phone) // making it (de)serializable and printable using reflection
+    Q_DEFINE_ZAP_WITH_METAOBJECT(Phone) // making it (de)serializable and printable using reflection
 
     enum Type : quint8 { Unknown=0, Mobile, Home, Office };
     Q_ENUM(Type)
-- 
GitLab