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

contextualprocess: adapt to Qt6

Browse Source
This commit is contained in:
Adriaan de Groot 2023-09-04 23:41:33 +02:00
parent 3173a8ee3c
commit e07b6c90d3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/modules/contextualprocess/ContextualProcessJob.cpp
View File

@ -15,6 +15,7 @@
#include "GlobalStorage.h" #include "GlobalStorage.h"
#include "JobQueue.h" #include "JobQueue.h"
#include "compat/Variant.h"
#include "utils/CommandList.h" #include "utils/CommandList.h"
#include "utils/Logger.h" #include "utils/Logger.h"
#include "utils/Variant.h" #include "utils/Variant.h"
@ -62,7 +63,7 @@ ContextualProcessBinding::run( const QString& value ) const
static bool static bool
fetch( QString& value, QStringList& selector, int index, const QVariant& v ) fetch( QString& value, QStringList& selector, int index, const QVariant& v )
{ {
if ( !v.canConvert( QMetaType::QVariantMap ) ) if ( !v.canConvert< QVariantMap >() )
{ {
return false; return false;
} }
@ -163,7 +164,7 @@ ContextualProcessJob::setConfigurationMap( const QVariantMap& configurationMap )
continue; continue;
} }
if ( iter.value().type() != QVariant::Map ) if ( Calamares::typeOf( iter.value() ) != Calamares::MapVariantType )
{ {
cWarning() << moduleInstanceKey() << "bad configuration values for" << variableName; cWarning() << moduleInstanceKey() << "bad configuration values for" << variableName;
continue; continue;