QMemoryBarrier cleanup

-rename barriertypes to waitOperation
-in QML introduce a waitFor property
-remove the Barrier suffix for the enum values
-rename BarrierType to Operation

Task-number: QTBUG-58878
Change-Id: Idc65f44b09e632509cd74286de26fea02e6b6dee
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

2 files changed, 8 insertions, 8 deletions

diff --git a/src/quick3d/quick3drender/items/quick3dmemorybarrier.cpp b/src/quick3d/quick3drender/items/quick3dmemorybarrier.cpp
index a899d36c5..0754a0cf5 100644
--- a/src/quick3d/quick3drender/items/quick3dmemorybarrier.cpp
+++ b/src/quick3d/quick3drender/items/quick3dmemorybarrier.cpp
@@ -55,16 +55,16 @@ Quick3DMemoryBarrier::~Quick3DMemoryBarrier()
 {
 }
 
-void Quick3DMemoryBarrier::setBarrierTypesInt(int barrierTypes)
+void Quick3DMemoryBarrier::setWaitFor(int barrierTypes)
 {
-    QMemoryBarrier::BarrierTypes types(QMemoryBarrier::AllBarrier);
+    QMemoryBarrier::Operations types(QMemoryBarrier::All);
     types &= barrierTypes; // Will only keep flags that are actually set
-    parentBarrier()->setBarrierTypes(types);
+    parentBarrier()->setWaitOperations(types);
 }
 
-int Quick3DMemoryBarrier::barrierTypesInt() const
+int Quick3DMemoryBarrier::waitFor() const
 {
-    return QMemoryBarrier::BarrierTypes::Int(parentBarrier()->barrierTypes());
+    return QMemoryBarrier::Operations::Int(parentBarrier()->waitOperations());
 }
 
 } // namespace Quick
diff --git a/src/quick3d/quick3drender/items/quick3dmemorybarrier_p.h b/src/quick3d/quick3drender/items/quick3dmemorybarrier_p.h
index 5e402f006..ab8f72a76 100644
--- a/src/quick3d/quick3drender/items/quick3dmemorybarrier_p.h
+++ b/src/quick3d/quick3drender/items/quick3dmemorybarrier_p.h
@@ -65,15 +65,15 @@ namespace Quick {
 class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DMemoryBarrier : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(int barrierTypes READ barrierTypesInt WRITE setBarrierTypesInt)
+    Q_PROPERTY(int waitFor READ waitFor WRITE setWaitFor)
 public:
     explicit Quick3DMemoryBarrier(QObject *parent = nullptr);
     ~Quick3DMemoryBarrier();
 
     inline QMemoryBarrier *parentBarrier() const { return qobject_cast<QMemoryBarrier*>(parent()); }
 
-    void setBarrierTypesInt(int barrierTypes);
-    int barrierTypesInt() const;
+    void setWaitFor(int waitOperations);
+    int waitFor() const;
 };
 
 } // namespace Quick