Cleanup and fix dspxmodel and opendspx

Author: CrSjimo

src/libs/3rdparty/opendspx

@@ -1,7 +1,7 @@
 #include "AnchorNode.h"
 
-#include <QVariant>
 #include <QJSEngine>
+#include <QVariant>
 
 #include <opendspx/anchornode.h>
 
@@ -52,7 +52,7 @@ namespace dspx {
         setXUnchecked(x_);
     }
 
-    AnchorNode::AnchorNode(Handle handle, Model *model) 
+    AnchorNode::AnchorNode(Handle handle, Model *model)
         : EntityObject(handle, model), d_ptr(new AnchorNodePrivate) {
         Q_D(AnchorNode);
         Q_ASSERT(model->strategy()->getEntityType(handle) == ModelStrategy::EI_ParamCurveAnchorNode);
@@ -98,7 +98,7 @@ namespace dspx {
 
     QDspx::AnchorNode AnchorNode::toQDspx() const {
         Q_D(const AnchorNode);
-        return QDspx::AnchorNode {
+        return {
             .interp = static_cast<QDspx::AnchorNode::Interpolation>(d->interp),
             .x = d->x,
             .y = d->y,
@@ -137,4 +137,4 @@ namespace dspx {
 
 }
 
-#include "moc_AnchorNode.cpp"
+#include "moc_AnchorNode.cpp"

src/libs/application/dspxmodel/src/AnchorNode.cpp

@@ -1,9 +1,10 @@
 #ifndef DIFFSCOPE_DSPX_MODEL_ANCHORNODE_H
 #define DIFFSCOPE_DSPX_MODEL_ANCHORNODE_H
 
-#include <dspxmodel/EntityObject.h>
 #include <qqmlintegration.h>
 
+#include <dspxmodel/EntityObject.h>
+
 namespace QDspx {
     struct AnchorNode;
 }
@@ -59,4 +60,4 @@ namespace dspx {
 
 }
 
-#endif //DIFFSCOPE_DSPX_MODEL_ANCHORNODE_H
+#endif //DIFFSCOPE_DSPX_MODEL_ANCHORNODE_H

src/libs/application/dspxmodel/src/AnchorNode.h

@@ -1,14 +1,14 @@
 #include "AnchorNodeSequence.h"
 
-#include <QJSValue>
 #include <QJSEngine>
+#include <QJSValue>
 
 #include <opendspx/anchornode.h>
 
-#include <dspxmodel/private/PointSequenceContainer_p.h>
-#include <dspxmodel/private/Model_p.h>
 #include <dspxmodel/AnchorNode.h>
 #include <dspxmodel/ModelStrategy.h>
+#include <dspxmodel/private/Model_p.h>
+#include <dspxmodel/private/PointSequenceContainer_p.h>
 #include <dspxmodel/private/PointSequenceData_p.h>
 
 namespace dspx {
@@ -104,4 +104,4 @@ namespace dspx {
 
 }
 
-#include "moc_AnchorNodeSequence.cpp"
+#include "moc_AnchorNodeSequence.cpp"

src/libs/application/dspxmodel/src/AnchorNodeSequence.cpp

@@ -62,4 +62,4 @@ namespace dspx {
 
 }
 
-#endif //DIFFSCOPE_DSPX_MODEL_ANCHORNODESEQUENCE_H
+#endif //DIFFSCOPE_DSPX_MODEL_ANCHORNODESEQUENCE_H

src/libs/application/dspxmodel/src/AnchorNodeSequence.h

@@ -2,11 +2,11 @@
 
 #include <opendspx/audioclip.h>
 
-#include <dspxmodel/private/Model_p.h>
-#include <dspxmodel/ModelStrategy.h>
 #include <dspxmodel/BusControl.h>
 #include <dspxmodel/ClipTime.h>
+#include <dspxmodel/ModelStrategy.h>
 #include <dspxmodel/Workspace.h>
+#include <dspxmodel/private/Model_p.h>
 
 namespace dspx {
 
@@ -68,4 +68,4 @@ namespace dspx {
         }
     }
 
-}
+}

src/libs/application/dspxmodel/src/AudioClip.cpp

@@ -39,7 +39,6 @@ namespace dspx {
         friend class ModelPrivate;
         explicit AudioClip(Handle handle, Model *model);
         QScopedPointer<AudioClipPrivate> d_ptr;
-
     };
 
 }

src/libs/application/dspxmodel/src/AudioClip.h

@@ -2,8 +2,8 @@
 
 #include <algorithm>
 
-#include <QVariant>
 #include <QHash>
+#include <QVariant>
 
 #include <dspxmodel/private/SpliceHelper_p.h>
 
@@ -15,7 +15,6 @@ namespace dspx {
         using QObject::QObject;
 
         ModelStrategy::Entity type{};
-
     };
 
     class BasicModelStrategyItemEntity : public BasicModelStrategyEntity {
@@ -126,7 +125,7 @@ namespace dspx {
 
     Handle BasicModelStrategy::createEntity(Entity entityType) {
         auto object = createByType(entityType, this);
-        Handle entity {reinterpret_cast<quintptr>(object)};
+        Handle entity{reinterpret_cast<quintptr>(object)};
         Q_EMIT createEntityNotified(entity, entityType);
         return entity;
     }
@@ -203,7 +202,7 @@ namespace dspx {
         }
         auto object = listContainerObject->list.takeAt(index);
         object->setParent(this);
-        Handle entity {reinterpret_cast<quintptr>(object)};
+        Handle entity{reinterpret_cast<quintptr>(object)};
         Q_EMIT takeFromListContainerNotified(entity, listContainerEntity, index);
         return entity;
     }
@@ -213,7 +212,7 @@ namespace dspx {
         if (mapContainerObject->map.contains(key)) {
             auto object = mapContainerObject->map.take(key);
             object->setParent(this);
-            Handle entity {reinterpret_cast<quintptr>(object)};
+            Handle entity{reinterpret_cast<quintptr>(object)};
             Q_EMIT takeFromMapContainerNotified(entity, mapContainerEntity, key);
             return entity;
         }
@@ -334,10 +333,10 @@ namespace dspx {
             subObject = createByType(subObjectType, object);
             object->associatedSubEntities.insert(relationship, subObject);
         }
-        Handle subEntity {reinterpret_cast<quintptr>(subObject)};
+        Handle subEntity{reinterpret_cast<quintptr>(subObject)};
         return subEntity;
     }
 
 }
 
-#include "BasicModelStrategy.moc"
+#include "BasicModelStrategy.moc"

src/libs/application/dspxmodel/src/BasicModelStrategy.cpp

@@ -28,7 +28,6 @@ namespace dspx {
         int getSizeOfDataArray(Handle dataContainerEntity) override;
         bool rotateDataArray(Handle dataContainerEntity, int leftIndex, int middleIndex, int rightIndex) override;
         Handle getAssociatedSubEntity(Handle entity, Relationship relationship) override;
-
     };
 
 }

src/libs/application/dspxmodel/src/BasicModelStrategy.h

@@ -27,4 +27,4 @@ namespace dspx {
         Control::handleProxySetEntityProperty(property, value);
     }
 
-}
+}