From 7e6c626a0b830ee956d980430c354ff3136f401c Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Wed, 9 Sep 2015 18:52:08 +0200 Subject: [PATCH] PluginFactory in Partition module. --- src/modules/partition/gui/PartitionViewStep.cpp | 2 ++ src/modules/partition/gui/PartitionViewStep.h | 15 +++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/modules/partition/gui/PartitionViewStep.cpp b/src/modules/partition/gui/PartitionViewStep.cpp index 5e9ad5255..dd699a1ab 100644 --- a/src/modules/partition/gui/PartitionViewStep.cpp +++ b/src/modules/partition/gui/PartitionViewStep.cpp @@ -508,3 +508,5 @@ PartitionViewStep::canBeResized( const QString& partitionPath ) cDebug() << "Partition" << partitionWithOs << "CANNOT BE RESIZED FOR AUTOINSTALL."; return false; } + +CALAMARES_PLUGIN_FACTORY_DEFINITION( PartitionViewStepFactory, registerPlugin(); ) diff --git a/src/modules/partition/gui/PartitionViewStep.h b/src/modules/partition/gui/PartitionViewStep.h index f1c9a6f90..62018f31c 100644 --- a/src/modules/partition/gui/PartitionViewStep.h +++ b/src/modules/partition/gui/PartitionViewStep.h @@ -20,12 +20,15 @@ #ifndef PARTITIONVIEWSTEP_H #define PARTITIONVIEWSTEP_H -#include - -#include "viewpages/ViewStep.h" -#include "PluginDllMacro.h" #include "OsproberEntry.h" +#include +#include + +#include + +#include + class ChoicePage; class EraseDiskPage; class AlongsidePage; @@ -41,8 +44,6 @@ class QStackedWidget; class PLUGINDLLEXPORT PartitionViewStep : public Calamares::ViewStep { Q_OBJECT - Q_PLUGIN_METADATA( IID "calamares.ViewModule/1.0" ) - Q_INTERFACES( Calamares::ViewStep ) public: explicit PartitionViewStep( QObject* parent = 0 ); @@ -82,4 +83,6 @@ private: ReplacePage* m_replacePage; }; +CALAMARES_PLUGIN_FACTORY_DECLARATION( PartitionViewStepFactory ) + #endif // PARTITIONVIEWSTEP_H