From 90b156f97f07bdf0852a8c2634f47485e8339523 Mon Sep 17 00:00:00 2001
From: Teo Mrnjavac <teo@kde.org>
Date: Wed, 9 Sep 2015 18:52:24 +0200
Subject: [PATCH] PluginFactory in Keyboard module.

---
 src/modules/keyboard/KeyboardViewStep.cpp |  1 +
 src/modules/keyboard/KeyboardViewStep.h   | 11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/modules/keyboard/KeyboardViewStep.cpp b/src/modules/keyboard/KeyboardViewStep.cpp
index dbc4a312b..fa6f60c81 100644
--- a/src/modules/keyboard/KeyboardViewStep.cpp
+++ b/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 )
diff --git a/src/modules/keyboard/KeyboardViewStep.h b/src/modules/keyboard/KeyboardViewStep.h
index e83921258..476d71a3c 100644
--- a/src/modules/keyboard/KeyboardViewStep.h
+++ b/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