From 9facef63c69aba1f75f9cf65070b49c3186e225a Mon Sep 17 00:00:00 2001
From: Teo Mrnjavac <teo@kde.org>
Date: Wed, 9 Sep 2015 18:53:04 +0200
Subject: [PATCH] PluginFactory in InteractiveTerminal module.

---
 .../InteractiveTerminalViewStep.cpp                   |  2 ++
 .../interactiveterminal/InteractiveTerminalViewStep.h | 11 ++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/modules/interactiveterminal/InteractiveTerminalViewStep.cpp b/src/modules/interactiveterminal/InteractiveTerminalViewStep.cpp
index 939cc8efa..c4705575c 100644
--- a/src/modules/interactiveterminal/InteractiveTerminalViewStep.cpp
+++ b/src/modules/interactiveterminal/InteractiveTerminalViewStep.cpp
@@ -22,6 +22,8 @@
 
 #include <QVariant>
 
+CALAMARES_PLUGIN_FACTORY_DEFINITION( InteractiveTerminalViewStepFactory, registerPlugin<InteractiveTerminalViewStep>(); )
+
 InteractiveTerminalViewStep::InteractiveTerminalViewStep( QObject* parent )
     : Calamares::ViewStep( parent )
     , m_widget( new InteractiveTerminalPage() )
diff --git a/src/modules/interactiveterminal/InteractiveTerminalViewStep.h b/src/modules/interactiveterminal/InteractiveTerminalViewStep.h
index 5405c3419..77f7bdf34 100644
--- a/src/modules/interactiveterminal/InteractiveTerminalViewStep.h
+++ b/src/modules/interactiveterminal/InteractiveTerminalViewStep.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 InteractiveTerminalPage;
 
 class PLUGINDLLEXPORT InteractiveTerminalViewStep : public Calamares::ViewStep
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "calamares.ViewModule/1.0" )
-
-    Q_INTERFACES( Calamares::ViewStep )
 
 public:
     explicit InteractiveTerminalViewStep( QObject* parent = nullptr );
@@ -61,4 +60,6 @@ private:
     InteractiveTerminalPage* m_widget;
 };
 
+CALAMARES_PLUGIN_FACTORY_DECLARATION( InteractiveTerminalViewStepFactory )
+
 #endif // INTERACTIVETERMINALPAGEPLUGIN_H