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

[libcalamares] Namespace consistently

Browse Source 
- Things in libcalamares/ subdirectories are namespaced
   according to that subdirectory (sometimes in namespace
   Calamares, sometimes CalamaresUtils). Do that in modulesystem/ too.
This commit is contained in:
Adriaan de Groot 2019-09-14 08:18:56 -04:00
parent 78de6776af
commit 666462651b
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libcalamares/Settings.cpp
View File

@ -169,14 +169,14 @@ interpretSequence( const YAML::Node& node, Settings::ModuleSequence& moduleSeque
continue;
}
QString thisActionS = sequenceVListItem.toMap().firstKey();
ModuleAction thisAction;
ModuleSystem::Action thisAction;
if ( thisActionS == "show" )
{
thisAction = ModuleAction::Show;
thisAction = ModuleSystem::Action::Show;
}
else if ( thisActionS == "exec" )
{
thisAction = ModuleAction::Exec;
thisAction = ModuleSystem::Action::Exec;
}
else
{

2
src/libcalamares/Settings.h
View File

@ -46,7 +46,7 @@ public:
using InstanceDescriptionList = QList< InstanceDescription >;
InstanceDescriptionList customModuleInstances() const;
using ModuleSequence = QList< QPair< ModuleAction, QStringList > >;
using ModuleSequence = QList< QPair< ModuleSystem::Action, QStringList > >;
ModuleSequence modulesSequence() const;
QString brandingComponentName() const;

5
src/libcalamares/modulesystem/Actions.h
View File

@ -22,13 +22,16 @@
namespace Calamares
{
namespace ModuleSystem
{
enum class ModuleAction : char
enum class Action : char
{
Show,
Exec
};
} // namespace ModuleSystem
} // namespace Calamares
#endif

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

@ -190,7 +190,7 @@ ModuleManager::loadModules()
= failedModules.isEmpty() ? Settings::instance()->modulesSequence() : Settings::ModuleSequence();
for ( const auto& modulePhase : modulesSequence )
{
ModuleAction currentAction = modulePhase.first;
ModuleSystem::Action currentAction = modulePhase.first;
foreach ( const QString& moduleEntry, modulePhase.second )
{
@ -285,7 +285,7 @@ ModuleManager::loadModules()
// At this point we most certainly have a pointer to a loaded module in
// thisModule. We now need to enqueue jobs info into an EVS.
if ( currentAction == ModuleAction::Exec )
if ( currentAction == ModuleSystem::Action::Exec )
{
ExecutionViewStep* evs
= qobject_cast< ExecutionViewStep* >( Calamares::ViewManager::instance()->viewSteps().last() );