PluginFactory in Keyboard module.

src/modules/keyboard/KeyboardViewStep.cpp

@@ -23,6 +23,7 @@
 
 #include "KeyboardPage.h"
 
+CALAMARES_PLUGIN_FACTORY_DEFINITION( KeyboardViewStepFactory, registerPlugin<KeyboardViewStep>(); )
 
 KeyboardViewStep::KeyboardViewStep( QObject* parent )
     : Calamares::ViewStep( parent )

src/modules/keyboard/KeyboardViewStep.h

@@ -21,17 +21,16 @@
 
 #include <QObject>
 
-#include "viewpages/ViewStep.h"
-#include "PluginDllMacro.h"
+#include <utils/PluginFactory.h>
+#include <viewpages/ViewStep.h>
+
+#include <PluginDllMacro.h>
 
 class KeyboardPage;
 
 class PLUGINDLLEXPORT KeyboardViewStep : public Calamares::ViewStep
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "calamares.ViewModule/1.0" )
-
-    Q_INTERFACES( Calamares::ViewStep )
 
 public:
     explicit KeyboardViewStep( QObject* parent = nullptr );
@@ -69,4 +68,6 @@ private:
     QList< Calamares::job_ptr > m_jobs;
 };
 
+CALAMARES_PLUGIN_FACTORY_DECLARATION( KeyboardViewStepFactory )
+
 #endif // KEYBOARDVIEWSTEP_H