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

[libcalamares] Chase change of API

Browse Source 
- Replace QString( x ) by x.toString() where x is an InstanceKey
This commit is contained in:
Adriaan de Groot 2019-09-15 14:36:27 -04:00
parent d6ed046495
commit 7a5ac63f92
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -140,7 +140,7 @@ ModuleManager::loadedInstanceKeys()
QStringList l; QStringList l;
for ( const auto& m : m_loadedModulesByInstanceKey.keys() ) for ( const auto& m : m_loadedModulesByInstanceKey.keys() )
{ {
l << QString( m ); l << m.toString();
} }
return l; return l;
} }
@ -205,9 +205,9 @@ ModuleManager::loadModules()
if ( !m_availableDescriptorsByModuleName.contains( instanceKey.module() ) if ( !m_availableDescriptorsByModuleName.contains( instanceKey.module() )
|| m_availableDescriptorsByModuleName.value( instanceKey.module() ).isEmpty() ) || m_availableDescriptorsByModuleName.value( instanceKey.module() ).isEmpty() )
{ {
cError() << "Module" << QString( instanceKey ) << "not found in module search paths." cError() << "Module" << instanceKey.toString() << "not found in module search paths."
<< Logger::DebugList( m_paths ); << Logger::DebugList( m_paths );
failedModules.append( QString( instanceKey ) ); failedModules.append( instanceKey.toString() );
continue; continue;
} }
@ -242,14 +242,14 @@ ModuleManager::loadModules()
Module* thisModule = m_loadedModulesByInstanceKey.value( instanceKey, nullptr ); Module* thisModule = m_loadedModulesByInstanceKey.value( instanceKey, nullptr );
if ( thisModule && !thisModule->isLoaded() ) if ( thisModule && !thisModule->isLoaded() )
{ {
cError() << "Module" << QString( instanceKey ) << "exists but not loaded."; cError() << "Module" << instanceKey.toString() << "exists but not loaded.";
failedModules.append( QString( instanceKey ) ); failedModules.append( instanceKey.toString() );
continue; continue;
} }
if ( thisModule && thisModule->isLoaded() ) if ( thisModule && thisModule->isLoaded() )
{ {
cDebug() << "Module" << QString( instanceKey ) << "already loaded."; cDebug() << "Module" << instanceKey.toString() << "already loaded.";
} }
else else
{ {
@ -259,15 +259,15 @@ ModuleManager::loadModules()
m_moduleDirectoriesByModuleName.value( instanceKey.module() ) ); m_moduleDirectoriesByModuleName.value( instanceKey.module() ) );
if ( !thisModule ) if ( !thisModule )
{ {
cError() << "Module" << QString( instanceKey ) << "cannot be created from descriptor" << configFileName; cError() << "Module" << instanceKey.toString() << "cannot be created from descriptor" << configFileName;
failedModules.append( QString( instanceKey ) ); failedModules.append( instanceKey.toString() );
continue; continue;
} }
if ( !checkDependencies( *thisModule ) ) if ( !checkDependencies( *thisModule ) )
{ {
// Error message is already printed // Error message is already printed
failedModules.append( QString( instanceKey ) ); failedModules.append( instanceKey.toString() );
continue; continue;
} }
@ -276,8 +276,8 @@ ModuleManager::loadModules()
m_loadedModulesByInstanceKey.insert( instanceKey, thisModule ); m_loadedModulesByInstanceKey.insert( instanceKey, thisModule );
if ( !thisModule->isLoaded() ) if ( !thisModule->isLoaded() )
{ {
cError() << "Module" << QString( instanceKey ) << "loading FAILED."; cError() << "Module" << instanceKey.toString() << "loading FAILED.";
failedModules.append( QString( instanceKey ) ); failedModules.append( instanceKey.toString() );
continue; continue;
} }
} }
@ -294,7 +294,7 @@ ModuleManager::loadModules()
ViewManager::instance()->addViewStep( evs ); ViewManager::instance()->addViewStep( evs );
} }
evs->appendJobModuleInstanceKey( QString( instanceKey ) ); evs->appendJobModuleInstanceKey( instanceKey.toString() );
} }
} }
} }