napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libcalamares] Use consistent type alias (Descriptor)

Browse Source
This commit is contained in:
Adriaan de Groot 2020-08-04 10:19:40 +02:00
parent ea709aab59
commit 88e5e98d29
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libcalamares/modulesystem/Module.h
View File

@ -1,7 +1,8 @@
/* === This file is part of Calamares - <https://github.com/calamares> === /* === This file is part of Calamares - <https://github.com/calamares> ===
* *
* SPDX-FileCopyrightText: 2014-2015 Teo Mrnjavac <teo@kde.org> * SPDX-FileCopyrightText: 2014-2015 Teo Mrnjavac <teo@kde.org>
* SPDX-FileCopyrightText: 2017 Adriaan de Groot <groot@kde.org> * SPDX-FileCopyrightText: 2017 Adriaan de Groot <groot@kde.org>
* SPDX-License-Identifier: GPL-3.0-or-later
* *
* 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
@ -16,9 +17,6 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with Calamares. If not, see <http://www.gnu.org/licenses/>. * along with Calamares. If not, see <http://www.gnu.org/licenses/>.
* *
* SPDX-License-Identifier: GPL-3.0-or-later
* License-Filename: LICENSE
*
*/ */
#ifndef CALAMARES_MODULE_H #ifndef CALAMARES_MODULE_H
@ -176,9 +174,9 @@ protected:
explicit Module(); explicit Module();
/// @brief For subclasses to read their part of the descriptor /// @brief For subclasses to read their part of the descriptor
virtual void initFrom( const QVariantMap& moduleDescriptor ) = 0; virtual void initFrom( const ModuleSystem::Descriptor& moduleDescriptor ) = 0;
/// @brief Generic part of descriptor reading (and instance id) /// @brief Generic part of descriptor reading (and instance id)
void initFrom( const QVariantMap& moduleDescriptor, const QString& id ); void initFrom( const ModuleSystem::Descriptor& moduleDescriptor, const QString& id );
QVariantMap m_configurationMap; QVariantMap m_configurationMap;