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

[libcalamares] Introduce more descriptive type name

Browse Source
This commit is contained in:
Adriaan de Groot 2018-06-08 17:36:29 -04:00
parent 051b43bee6
commit a626e52bf3
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libcalamares/Settings.cpp
View File

@ -175,7 +175,7 @@ Settings::modulesSearchPaths() const
} }
QList<QMap<QString, QString> > Settings::InstanceDescriptionList
Settings::customModuleInstances() const Settings::customModuleInstances() const
{ {
return m_customModuleInstances; return m_customModuleInstances;

6
src/libcalamares/Settings.h
View File

@ -43,7 +43,9 @@ public:
QStringList modulesSearchPaths() const; QStringList modulesSearchPaths() const;
QList< QMap< QString, QString > > customModuleInstances() const; using InstanceDescription = QMap< QString, QString >;
using InstanceDescriptionList = QList< InstanceDescription >;
InstanceDescriptionList customModuleInstances() const;
QList< QPair< ModuleAction, QStringList > > modulesSequence() const; QList< QPair< ModuleAction, QStringList > > modulesSequence() const;
@ -60,7 +62,7 @@ private:
QStringList m_modulesSearchPaths; QStringList m_modulesSearchPaths;
QList< QMap< QString, QString > > m_customModuleInstances; InstanceDescriptionList m_customModuleInstances;
QList< QPair< ModuleAction, QStringList > > m_modulesSequence; QList< QPair< ModuleAction, QStringList > > m_modulesSequence;
QString m_brandingComponentName; QString m_brandingComponentName;

2
src/libcalamaresui/modulesystem/ModuleManager.cpp
View File

@ -159,7 +159,7 @@ ModuleManager::loadModules()
{ {
QTimer::singleShot( 0, this, [ this ]() QTimer::singleShot( 0, this, [ this ]()
{ {
QList< QMap< QString, QString > > customInstances = Settings::InstanceDescriptionList customInstances =
Settings::instance()->customModuleInstances(); Settings::instance()->customModuleInstances();
const auto modulesSequence = Settings::instance()->modulesSequence(); const auto modulesSequence = Settings::instance()->modulesSequence();