- if ( attributes.value( "dependancies" ) == "" ) {
- QStringList diskspace = QStringList::split( ",",attributes.value( "installdiskspace" ) );
- if (diskspace.count() == 2)
- myWizard->setDependancies( element,
- Dependancies( attributes.value( "name" ), QStringList(),
- diskspace[0].toInt(),
- diskspace[1].toInt(),
- attributes.value( "temporarydiskspace" ).toInt() ) );
- else
- myWizard->setDependancies( element,
- Dependancies( attributes.value( "name" ), QStringList(),
- diskspace[0].toInt(),
- diskspace[0].toInt(),
- attributes.value( "temporarydiskspace" ).toInt() ) );
-
- }
- else {
- QStringList diskspace = QStringList::split(",",attributes.value( "installdiskspace" ) );
- if (diskspace.count() == 2)
- myWizard->setDependancies( element,
- Dependancies( attributes.value( "name" ),
- QStringList::split( ",", attributes.value( "dependancies" ) ),
- diskspace[0].toInt(),
- diskspace[1].toInt(),
- attributes.value( "temporarydiskspace" ).toInt() ) );
- else
- myWizard->setDependancies( element,
- Dependancies( attributes.value( "name" ),
- QStringList::split( ",", attributes.value( "dependancies" ) ),
- diskspace[0].toInt(),
- diskspace[0].toInt(),
- attributes.value( "temporarydiskspace" ).toInt() ) );
- }
- }
+ QStringList diskspace = QStringList::split(",",attributes.value( "installdiskspace" ) );
+ QString descr = QString::null;
+ if ( attributes.value( "description" ) != "" )
+ descr = attributes.value( "description" ).stripWhiteSpace();
+ bool pickUp = isBoolAttributeSet( attributes.value( "pickupenv" ) );
+ myWizard->setDependancies( element,
+ Dependancies( attributes.value( "name" ),
+ deps,
+ ( diskspace.count() > 0 ? diskspace[ 0 ].toInt() : 0 ),
+ ( diskspace.count() > 1 ? diskspace[1].toInt() : ( diskspace.count() > 0 ? diskspace[0].toInt() : 0 ) ),
+ attributes.value( "temporarydiskspace" ).toInt(),
+ install,
+ descr,
+ pickUp ) );
+ }