PluginFactory in InteractiveTerminal module.

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() )

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