applications/calamares
3
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-02-25 03:15:44 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use PluginFactory in License module.

Browse source
This commit is contained in:
Teo Mrnjavac 2015-09-15 17:21:19 +02:00
parent 43438b633c
commit 4b57749945
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/modules/license/LicenseViewStep.cpp
View file

@ -26,6 +26,8 @@
#include <QVariantMap> #include <QVariantMap>
CALAMARES_PLUGIN_FACTORY_DEFINITION( LicenseViewStepFactory, registerPlugin<LicenseViewStep>(); )
LicenseViewStep::LicenseViewStep( QObject* parent ) LicenseViewStep::LicenseViewStep( QObject* parent )
: Calamares::ViewStep( parent ) : Calamares::ViewStep( parent )
, m_widget( new LicensePage ) , m_widget( new LicensePage )

14
src/modules/license/LicenseViewStep.h
View file

@ -1,6 +1,7 @@
/* === This file is part of Calamares - <http://github.com/calamares> === /* === This file is part of Calamares - <http://github.com/calamares> ===
* *
* Copyright 2015, Anke Boersma <demm@kaosx.us> * Copyright 2015, Anke Boersma <demm@kaosx.us>
* Copyright 2015, Teo Mrnjavac <teo@kde.org>
* *
* Calamares is free software: you can redistribute it and/or modify * Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -19,12 +20,12 @@
#ifndef LICENSEPAGEPLUGIN_H #ifndef LICENSEPAGEPLUGIN_H
#define LICENSEPAGEPLUGIN_H #define LICENSEPAGEPLUGIN_H
#include <utils/PluginFactory.h>
#include <viewpages/ViewStep.h>
#include <PluginDllMacro.h>
#include <QObject> #include <QObject>
#include <QUrl> #include <QUrl>
#include "viewpages/ViewStep.h"
#include "PluginDllMacro.h"
#include <QVariantMap> #include <QVariantMap>
class LicensePage; class LicensePage;
@ -32,9 +33,6 @@ class LicensePage;
class PLUGINDLLEXPORT LicenseViewStep : public Calamares::ViewStep class PLUGINDLLEXPORT LicenseViewStep : public Calamares::ViewStep
{ {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA( IID "calamares.ViewModule/1.0" )
Q_INTERFACES( Calamares::ViewStep )
public: public:
explicit LicenseViewStep( QObject* parent = nullptr ); explicit LicenseViewStep( QObject* parent = nullptr );
@ -61,4 +59,6 @@ private:
LicensePage* m_widget; LicensePage* m_widget;
}; };
CALAMARES_PLUGIN_FACTORY_DECLARATION( LicenseViewStepFactory )
#endif // LICENSEPAGEPLUGIN_H #endif // LICENSEPAGEPLUGIN_H