Adhere to changed core serialization API

src/ConvertToImagesDatasetDialog.h

@@ -76,4 +76,4 @@ class ConvertToImagesDatasetDialog : public QDialog
     StringAction                        _numberOfPixelsAction;          /** Number of pixels action */
     ToggleAction                        _useLinkedDataAction;           /** Use linked data action */
     GroupAction                         _groupAction;                   /** Group action */
-};
+};

src/EditLayerAction.h

@@ -27,4 +27,4 @@ class EditLayerAction : public GroupsAction
 
 Q_DECLARE_METATYPE(EditLayerAction)
 
-inline const auto editLayerActionMetaTypeId = qRegisterMetaType<EditLayerAction*>("EditLayerAction");
+inline const auto editLayerActionMetaTypeId = qRegisterMetaType<EditLayerAction*>("EditLayerAction");

src/ExportToImageDialog.h

@@ -47,4 +47,4 @@ class ExportToImageDialog : public QDialog
     DecimalAction       _imageScaleFactorAction;    /** Image scale factor action */
     StringAction        _imageResolutionAction;     /** Image resolution action */
     GroupAction         _groupAction;               /** Group action */
-};
+};

src/GeneralAction.cpp

@@ -115,7 +115,7 @@ void GeneralAction::disconnectFromPublicAction(bool recursive)
     GroupAction::disconnectFromPublicAction(recursive);
 }
 
-void GeneralAction::fromVariantMap(const QVariantMap& variantMap)
+void GeneralAction::fromVariantMap(const mv::VariantMap& variantMap)
 {
     GroupAction::fromVariantMap(variantMap);
 
@@ -126,7 +126,7 @@ void GeneralAction::fromVariantMap(const QVariantMap& variantMap)
     _scaleAction.fromParentVariantMap(variantMap);
 }
 
-QVariantMap GeneralAction::toVariantMap() const
+mv::VariantMap GeneralAction::toVariantMap() const
 {
     auto variantMap = GroupAction::toVariantMap();
 
@@ -137,4 +137,4 @@ QVariantMap GeneralAction::toVariantMap() const
     _scaleAction.insertIntoVariantMap(variantMap);
 
     return variantMap;
-}
+}

src/GeneralAction.h

@@ -59,13 +59,13 @@ class GeneralAction : public GroupAction
      * Load widget action from variant map
      * @param Variant map representation of the widget action
      */
-    void fromVariantMap(const QVariantMap& variantMap) override;
+    void fromVariantMap(const mv::VariantMap& variantMap) override;
 
     /**
      * Save widget action to variant map
      * @return Variant map representation of the widget action
      */
-    QVariantMap toVariantMap() const override;
+    mv::VariantMap toVariantMap() const override;
 
 public: /** Action getters */
 
@@ -88,4 +88,4 @@ class GeneralAction : public GroupAction
 
 Q_DECLARE_METATYPE(GeneralAction)
 
-inline const auto generalActionMetaTypeId = qRegisterMetaType<GeneralAction*>("GeneralAction");
+inline const auto generalActionMetaTypeId = qRegisterMetaType<GeneralAction*>("GeneralAction");

src/ImageSettingsAction.cpp

@@ -422,7 +422,7 @@ void ImageSettingsAction::disconnectFromPublicAction(bool recursive)
     GroupAction::disconnectFromPublicAction(recursive);
 }
 
-void ImageSettingsAction::fromVariantMap(const QVariantMap& variantMap)
+void ImageSettingsAction::fromVariantMap(const mv::VariantMap& variantMap)
 {
     GroupAction::fromVariantMap(variantMap);
 
@@ -439,7 +439,7 @@ void ImageSettingsAction::fromVariantMap(const QVariantMap& variantMap)
     _constantColorAction.fromParentVariantMap(variantMap);
 }
 
-QVariantMap ImageSettingsAction::toVariantMap() const
+mv::VariantMap ImageSettingsAction::toVariantMap() const
 {
     auto variantMap = GroupAction::toVariantMap();
 
@@ -456,4 +456,4 @@ QVariantMap ImageSettingsAction::toVariantMap() const
     _constantColorAction.insertIntoVariantMap(variantMap);
 
     return variantMap;
-}
+}

src/ImageSettingsAction.h

@@ -78,13 +78,13 @@ class ImageSettingsAction : public GroupAction
      * Load widget action from variant map
      * @param Variant map representation of the widget action
      */
-    void fromVariantMap(const QVariantMap& variantMap) override;
+    void fromVariantMap(const mv::VariantMap& variantMap) override;
 
     /**
      * Save widget action to variant map
      * @return Variant map representation of the widget action
      */
-    QVariantMap toVariantMap() const override;
+    mv::VariantMap toVariantMap() const override;
 
 public: // Action getters
 
@@ -132,4 +132,4 @@ class ImageSettingsAction : public GroupAction
 
 Q_DECLARE_METATYPE(ImageSettingsAction)
 
-inline const auto imageSettingsActionMetaTypeId = qRegisterMetaType<ImageSettingsAction*>("ImageSettingsAction");
+inline const auto imageSettingsActionMetaTypeId = qRegisterMetaType<ImageSettingsAction*>("ImageSettingsAction");

src/ImageViewerPlugin.cpp

@@ -398,7 +398,7 @@ void ImageViewerPlugin::immigrateDataset(const Dataset<DatasetImpl>& dataset)
     }
 }
 
-void ImageViewerPlugin::fromVariantMap(const QVariantMap& variantMap)
+void ImageViewerPlugin::fromVariantMap(const mv::VariantMap& variantMap)
 {
     ViewPlugin::fromVariantMap(variantMap);
 
@@ -407,7 +407,7 @@ void ImageViewerPlugin::fromVariantMap(const QVariantMap& variantMap)
     _interactionToolbarAction.fromParentVariantMap(variantMap);
 }
 
-QVariantMap ImageViewerPlugin::toVariantMap() const
+mv::VariantMap ImageViewerPlugin::toVariantMap() const
 {
     auto variantMap = ViewPlugin::toVariantMap();
 
@@ -482,4 +482,4 @@ PluginTriggerActions ImageViewerPluginFactory::getPluginTriggerActions(const mv:
     }
 
 	return pluginTriggerActions;
-}
+}

src/ImageViewerPlugin.h

@@ -100,13 +100,13 @@ class ImageViewerPlugin : public ViewPlugin
      * Load widget action from variant map
      * @param Variant map representation of the widget action
      */
-    void fromVariantMap(const QVariantMap& variantMap) override;
+    void fromVariantMap(const mv::VariantMap& variantMap) override;
 
     /**
      * Save widget action to variant map
      * @return Variant map representation of the widget action
      */
-    QVariantMap toVariantMap() const override;
+    mv::VariantMap toVariantMap() const override;
 
 public: // Action getters
 
@@ -160,4 +160,4 @@ class ImageViewerPluginFactory : public ViewPluginFactory
      * @return Vector of plugin trigger actions
      */
     PluginTriggerActions getPluginTriggerActions(const mv::Datasets& datasets) const override;
-};
+};

src/ImageViewerPlugin.json

@@ -2,4 +2,4 @@
   "name" : "Image Viewer",
   "version" : "0.1.0",
   "dependencies": ["Images"]
-}
+}

src/InteractionToolbarAction.cpp

@@ -220,20 +220,20 @@ ImageViewerWidget& InteractionToolbarAction::getImageViewerWidget()
     return _imageViewerPlugin->getImageViewerWidget();
 }
 
-void InteractionToolbarAction::fromVariantMap(const QVariantMap& variantMap)
+void InteractionToolbarAction::fromVariantMap(const mv::VariantMap& variantMap)
 {
     HorizontalToolbarAction::fromVariantMap(variantMap);
 
     _interactionModeAction.fromParentVariantMap(variantMap);
     _viewSettingsAction.fromParentVariantMap(variantMap);
 }
 
-QVariantMap InteractionToolbarAction::toVariantMap() const
+mv::VariantMap InteractionToolbarAction::toVariantMap() const
 {
     auto variantMap = HorizontalToolbarAction::toVariantMap();
 
     _interactionModeAction.insertIntoVariantMap(variantMap);
     _viewSettingsAction.insertIntoVariantMap(variantMap);
 
     return variantMap;
-}
+}

src/InteractionToolbarAction.h

@@ -49,13 +49,13 @@ class InteractionToolbarAction : public HorizontalToolbarAction
      * Load widget action from variant map
      * @param Variant map representation of the widget action
      */
-    void fromVariantMap(const QVariantMap& variantMap) override;
+    void fromVariantMap(const mv::VariantMap& variantMap) override;
 
     /**
      * Save widget action to variant map
      * @return Variant map representation of the widget action
      */
-    QVariantMap toVariantMap() const override;
+    mv::VariantMap toVariantMap() const override;
 
 public: // Action getters
 
@@ -89,4 +89,4 @@ class InteractionToolbarAction : public HorizontalToolbarAction
 
 Q_DECLARE_METATYPE(InteractionToolbarAction)
 
-inline const auto interactionToolbarActionMetaTypeId = qRegisterMetaType<InteractionToolbarAction*>("InteractionToolbarAction");
+inline const auto interactionToolbarActionMetaTypeId = qRegisterMetaType<InteractionToolbarAction*>("InteractionToolbarAction");

src/Layer.cpp

@@ -1064,7 +1064,7 @@ void Layer::zoomToSelection()
     }
 }
 
-void Layer::fromVariantMap(const QVariantMap& variantMap)
+void Layer::fromVariantMap(const mv::VariantMap& variantMap)
 {
     WidgetAction::fromVariantMap(variantMap);
 
@@ -1082,7 +1082,7 @@ void Layer::fromVariantMap(const QVariantMap& variantMap)
     _subsetAction.fromParentVariantMap(variantMap);
 }
 
-QVariantMap Layer::toVariantMap() const
+mv::VariantMap Layer::toVariantMap() const
 {
     auto variantMap = WidgetAction::toVariantMap();
 
@@ -1098,4 +1098,4 @@ QVariantMap Layer::toVariantMap() const
     _subsetAction.insertIntoVariantMap(variantMap);
 
     return variantMap;
-}
+}

src/Layer.h

@@ -202,13 +202,13 @@ class Layer : public mv::gui::GroupsAction, public Renderable
      * Load widget action from variant map
      * @param Variant map representation of the widget action
      */
-    void fromVariantMap(const QVariantMap& variantMap) override;
+    void fromVariantMap(const mv::VariantMap& variantMap) override;
 
     /**
      * Save widget action to variant map
      * @return Variant map representation of the widget action
      */
-    QVariantMap toVariantMap() const override;
+    mv::VariantMap toVariantMap() const override;
 
 public: /** Action getters */
 

src/LayersFilterModel.cpp

@@ -22,4 +22,4 @@ bool LayersFilterModel::filterAcceptsRow(int row, const QModelIndex& parent) con
 bool LayersFilterModel::lessThan(const QModelIndex& lhs, const QModelIndex& rhs) const
 {
     return lhs.data().toString() < rhs.data().toString();
-}
+}

src/LayersModel.cpp

@@ -538,7 +538,7 @@ LayersModel::Layers LayersModel::getLayers() const
     return layers;
 }
 
-void LayersModel::fromVariantMap(const QVariantMap& variantMap)
+void LayersModel::fromVariantMap(const mv::VariantMap& variantMap)
 {
     Serializable::fromVariantMap(variantMap);
 
@@ -561,7 +561,7 @@ void LayersModel::fromVariantMap(const QVariantMap& variantMap)
     imageViewerPlugin->getInteractionToolbarAction().getZoomExtentsAction().trigger();
 }
 
-QVariantMap LayersModel::toVariantMap() const
+mv::VariantMap LayersModel::toVariantMap() const
 {
     auto variantMap = Serializable::toVariantMap();
 

src/LayersModel.h

@@ -344,11 +344,11 @@ class LayersModel final : public QStandardItemModel, public mv::util::Serializab
      * Load widget action from variant map
      * @param Variant map representation of the widget action
      */
-    void fromVariantMap(const QVariantMap& variantMap) override;
+    void fromVariantMap(const mv::VariantMap& variantMap) override;
 
     /**
      * Save widget action to variant map
      * @return Variant map representation of the widget action
      */
-    QVariantMap toVariantMap() const override;
+    mv::VariantMap toVariantMap() const override;
 };

src/MiscellaneousAction.h

@@ -44,4 +44,4 @@ class MiscellaneousAction : public GroupAction
 
 Q_DECLARE_METATYPE(MiscellaneousAction)
 
-inline const auto miscellaneousActionMetaTypeId = qRegisterMetaType<MiscellaneousAction*>("MiscellaneousAction");
+inline const auto miscellaneousActionMetaTypeId = qRegisterMetaType<MiscellaneousAction*>("MiscellaneousAction");

src/PositionAction.cpp

@@ -60,20 +60,20 @@ void PositionAction::disconnectFromPublicAction(bool recursive)
     GroupAction::disconnectFromPublicAction(recursive);
 }
 
-void PositionAction::fromVariantMap(const QVariantMap& variantMap)
+void PositionAction::fromVariantMap(const mv::VariantMap& variantMap)
 {
     GroupAction::fromVariantMap(variantMap);
 
     _xAction.fromParentVariantMap(variantMap);
     _yAction.fromParentVariantMap(variantMap);
 }
 
-QVariantMap PositionAction::toVariantMap() const
+mv::VariantMap PositionAction::toVariantMap() const
 {
     auto variantMap = GroupAction::toVariantMap();
 
     _xAction.insertIntoVariantMap(variantMap);
     _yAction.insertIntoVariantMap(variantMap);
 
     return variantMap;
-}
+}

src/PositionAction.h

@@ -48,13 +48,13 @@ class PositionAction : public GroupAction
      * Load widget action from variant map
      * @param Variant map representation of the widget action
      */
-    void fromVariantMap(const QVariantMap& variantMap) override;
+    void fromVariantMap(const mv::VariantMap& variantMap) override;
 
     /**
      * Save widget action to variant map
      * @return Variant map representation of the widget action
      */
-    QVariantMap toVariantMap() const override;
+    mv::VariantMap toVariantMap() const override;
 
 signals:
 
@@ -73,4 +73,4 @@ class PositionAction : public GroupAction
 
 Q_DECLARE_METATYPE(PositionAction)
 
-inline const auto positionActionMetaTypeId = qRegisterMetaType<PositionAction*>("PositionAction");
+inline const auto positionActionMetaTypeId = qRegisterMetaType<PositionAction*>("PositionAction");

src/Prop.h

@@ -180,4 +180,4 @@ class Prop
     QMap<QString, QSharedPointer<QOpenGLShaderProgram>>     _shaderPrograms;        /** OpenGL shader programs */
     QMap<QString, QSharedPointer<QOpenGLTexture>>           _textures;              /** OpenGL textures */
     QMap<QString, QSharedPointer<Shape>>                    _shapes;                /** Shapes */
-};
+};

src/QuadShape.cpp

@@ -110,4 +110,4 @@ void QuadShape::createQuad()
         _vbo.allocate(_vertexData.constData(), _vertexData.count() * sizeof(GLfloat));
         _vbo.release();
     }
-}
+}

src/QuadShape.h

@@ -63,4 +63,4 @@ class QuadShape : public Shape
 protected:
     QRectF                  _rectangle;             /** Rectangle (in world space) that defines the quad */
     QVector<GLfloat>        _vertexData;            /** Quad vertex data */
-};
+};

src/Renderable.h

@@ -109,4 +109,4 @@ class Renderable
     LayersRenderer* _renderer;      /** Pointer to the renderer in which the renderable object will reside */
     QMatrix4x4      _modelMatrix;   /** Model matrix */
     QVector<Prop*>  _props;         /** Props */
-};
+};