PluginFactory in Users module.

src/modules/users/UsersViewStep.cpp

@@ -23,6 +23,8 @@
 #include "JobQueue.h"
 #include "GlobalStorage.h"
 
+CALAMARES_PLUGIN_FACTORY_DEFINITION( UsersViewStepFactory, registerPlugin<UsersViewStep>(); )
+
 UsersViewStep::UsersViewStep( QObject* parent )
     : Calamares::ViewStep( parent )
     , m_widget( new UsersPage() )

src/modules/users/UsersViewStep.h

@@ -21,8 +21,10 @@
 
 #include <QObject>
 
-#include "viewpages/ViewStep.h"
-#include "PluginDllMacro.h"
+#include <utils/PluginFactory.h>
+#include <viewpages/ViewStep.h>
+
+#include <PluginDllMacro.h>
 
 #include <QVariant>
 
@@ -31,9 +33,6 @@ class UsersPage;
 class PLUGINDLLEXPORT UsersViewStep : public Calamares::ViewStep
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "calamares.ViewModule/1.0" )
-
-    Q_INTERFACES( Calamares::ViewStep )
 
 public:
     explicit UsersViewStep( QObject* parent = nullptr );
@@ -67,4 +66,6 @@ private:
     QStringList m_defaultGroups;
 };
 
+CALAMARES_PLUGIN_FACTORY_DECLARATION( UsersViewStepFactory )
+
 #endif // USERSPAGEPLUGIN_H