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

[tracking] Load all the tracking bits into the configuration

Browse Source
This commit is contained in:
Adriaan de Groot 2020-05-18 17:48:51 +02:00
parent 528b98c1c4
commit 5763799ba9
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/modules/tracking/Config.cpp
View File

@ -149,6 +149,8 @@ UserTrackingConfig::setConfigurationMap( const QVariantMap& configurationMap )
Config::Config( QObject* parent ) Config::Config( QObject* parent )
: QObject( parent ) : QObject( parent )
, m_installTracking( new InstallTrackingConfig( this ) ) , m_installTracking( new InstallTrackingConfig( this ) )
, m_machineTracking( new MachineTrackingConfig( this ) )
, m_userTracking( new UserTrackingConfig( this ) )
{ {
} }
@ -169,6 +171,18 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
{ {
m_installTracking->setConfigurationMap( subconfig ); m_installTracking->setConfigurationMap( subconfig );
} }
subconfig = CalamaresUtils::getSubMap( configurationMap, "machine", success );
if ( success )
{
m_machineTracking->setConfigurationMap( subconfig );
}
subconfig = CalamaresUtils::getSubMap( configurationMap, "user", success );
if ( success )
{
m_userTracking->setConfigurationMap( subconfig );
}
} }
QString QString

2
src/modules/tracking/Config.h
View File

@ -175,6 +175,8 @@ private:
QString m_generalPolicy; QString m_generalPolicy;
InstallTrackingConfig* m_installTracking; InstallTrackingConfig* m_installTracking;
MachineTrackingConfig* m_machineTracking;
UserTrackingConfig* m_userTracking;
}; };
#endif #endif