Diffstat (limited to 'noncore/settings/networksettings2/nsdata.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/networksettings2/nsdata.cpp | 303 |
1 files changed, 126 insertions, 177 deletions
diff --git a/noncore/settings/networksettings2/nsdata.cpp b/noncore/settings/networksettings2/nsdata.cpp index 6541596..eb63e02 100644 --- a/noncore/settings/networksettings2/nsdata.cpp +++ b/noncore/settings/networksettings2/nsdata.cpp @@ -131,3 +131,3 @@ QString NetworkSettingsData::saveSettings( void ) { ErrS = qApp->translate( "NetworkSettings", - "<p>Could not save setup to %1 !</p>" ). + "<p>Could not save setup to \"%1\" !</p>" ). arg(CfgFile); @@ -151,3 +151,3 @@ QString NetworkSettingsData::saveSettings( void ) { NNI = nit.current(); - TS << '[' <<NNI->netNode()->nodeName() << ']' << endl; + TS << '[' <<NNI->nodeClass()->nodeName() << ']' << endl; NNI->saveAttributes( TS ); @@ -183,3 +183,3 @@ QString NetworkSettingsData::generateSettings( bool ForceReq ) { // regenerate system files - printf( "Generating settings from %s\n", CfgFile.latin1() ); + fprintf( stderr, "Generating settings from %s\n", CfgFile.latin1() ); @@ -191,2 +191,3 @@ QString NetworkSettingsData::generateSettings( bool ForceReq ) { AsDevice * CurDev; + ANetNode * CurDevNN; bool needToRegenerate = ForceIt; @@ -217,4 +218,4 @@ QString NetworkSettingsData::generateSettings( bool ForceReq ) { NNI = cncit.current(); - if( ( NNI->netNode()->hasDataFor( SF->name(), 1 ) || - NNI->netNode()->hasDataFor( SF->name(), 0 ) + if( ( NNI->nodeClass()->hasDataFor( SF->name() ) || + NNI->hasDataFor( SF->name() ) ) && @@ -255,7 +256,7 @@ QString NetworkSettingsData::generateSettings( bool ForceReq ) { if( ForceIt || NNI->isModified() ) { - if( ! NNI->netNode()->generateProperFilesFor( NNI ) ) { + if( ! NNI->nodeClass()->generateProperFilesFor( NNI ) ) { // problem generating S = qApp->translate( "NetworkSettings", - "<p>Cannot generate files proper to %1</p>" ). - arg(NNI->netNode()->nodeName()) ; + "<p>Cannot generate files proper to \"%1\"</p>" ). + arg(NNI->nodeClass()->nodeName()) ; return S; @@ -274,3 +275,3 @@ QString NetworkSettingsData::generateSettings( bool ForceReq ) { - printf( "Generating %s\n", SF->name().latin1() ); + fprintf( stderr, "Generating %s\n", SF->name().latin1() ); SF->open(); @@ -282,3 +283,3 @@ QString NetworkSettingsData::generateSettings( bool ForceReq ) { S = qApp->translate( "NetworkSettings", - "<p>Error in preSection for file %1</p>" ). + "<p>Error in preSection for file \"%1\"</p>" ). arg( SF->name() ); @@ -293,7 +294,6 @@ QString NetworkSettingsData::generateSettings( bool ForceReq ) { ++nnit ) { - ANetNode * NN; - NN = nnit.current()->NetNode; + CurDevNN = nnit.current()->NetNode; - // are there instances ? + // are there instances for this netnode ? NNI = 0; @@ -303,3 +303,3 @@ QString NetworkSettingsData::generateSettings( bool ForceReq ) { ++nniit ) { - if( nniit.current()->netNode() == NN ) { + if( nniit.current()->nodeClass() == CurDevNN ) { NNI = nniit.current(); @@ -310,3 +310,3 @@ QString NetworkSettingsData::generateSettings( bool ForceReq ) { if( ! NNI ) - // no instances + // no instances -> next netnode type continue; @@ -316,132 +316,10 @@ QString NetworkSettingsData::generateSettings( bool ForceReq ) { // generate start for this nodetype for all possible devices of this type - for( int i = 0; i < CurDev->count(); i ++ ) { - if( SF->preDeviceSection( NNI, i ) ) { - S = qApp->translate( "NetworkSettings", - "<p>Error in preDeviceSection for file %1 and node %2</p>" ). - arg( SF->name() ). - arg( NN->nodeName() ); - return S; - } - - if( ! NN->hasDataFor( SF->name(), 1 ) ) { - if( NN->generateDeviceDataForCommonFile( *SF, i, NNI ) ) { - S = qApp->translate( "NetworkSettings", - "<p>Error in node part for file %1 and node %2</p>" ). - arg( SF->name() ). - arg( NN->nodeName() ); - return S; - } - } - } - } else { - // just request this once - if( SF->preDeviceSection( NNI, -1 ) ) { - S = qApp->translate( "NetworkSettings", - "<p>Error in preDeviceSection for file %1 and node %2</p>" ). - arg( SF->name() ). - arg( NN->nodeName() ); - return S; - } - - if( ! NN->hasDataFor( SF->name(), 1 ) ) { - if( NN->generateDeviceDataForCommonFile( *SF, -1, NNI ) ) { - S = qApp->translate( "NetworkSettings", - "<p>Error in node part for file %1 and node %2</p>" ). - arg( SF->name() ). - arg( NN->nodeName() ); - return S; - } - } - } - - // now generate profile specific data for all - // connections working on a device of the current - // netnode type - for( QDictIterator<NodeCollection> ncit(M); - ncit.current(); - ++ncit ) { - NC = ncit.current(); - - NNI = NC->getToplevel(); - - // no output needed - if( ! NNI->netNode()->hasDataFor( SF->name(), 0 ) ) - continue; - - // get the netnode that serves as the device for this - // connection - AsDevice * Dev = NC->device(); - - if( CurDev ) { - if( CurDev != Dev ) { - // other device -> later - continue; - } - - // generate 'entry' for every combination of device and profile - // each node delegates to deeper level - for( int i = 0; i < CurDev->count(); i ++ ) { - if( SF->preNodeSection( NNI, i ) ) { - S = qApp->translate( "NetworkSettings", - "<p>Error in preNodeSection for file %1 and node %2</p>" ). - arg( SF->name() ). - arg( NNI->netNode()->nodeName() ); + for( int i = 0; i < CurDevNN->instanceCount(); i ++ ) { + S = generateSystemFileNode( *SF, CurDev, NNI, i ); + if( ! S.isEmpty() ) return S; } - - // ask all nodes in connection - - for( QListIterator<ANetNodeInstance> cncit(*NC); - cncit.current(); - ++cncit ) { - NNI = cncit.current(); - - if( NNI->netNode()->hasDataFor( SF->name(), 0 ) ) { - if( NNI->netNode()->generateDataForCommonFile(*SF,i,NNI) ) { - S = qApp->translate( "NetworkSettings", - "<p>Error in node part for file %1 and node %2</p>" ). - arg( SF->name() ). - arg( NNI->netNode()->nodeName() ); - return S; - } - } - } - - if( SF->postNodeSection( NNI, i ) ) { - S = qApp->translate( "NetworkSettings", - "<p>Error in postNodeSection for file %1 and node %2</p>" ). - arg( SF->name() ). - arg( NNI->netNode()->nodeName() ); - return S; - } - } - } else { - if( Dev ) { - // other - continue; - } - - // one entry to generate - if( SF->preNodeSection( NNI, -1 ) ) { - S = qApp->translate( "NetworkSettings", - "<p>Error in preNodeSection for file %1 and node %2</p>" ). - arg( SF->name() ). - arg( NNI->netNode()->nodeName() ); - return S; - } - - if( NNI->netNode()->generateDataForCommonFile(*SF,-1,NNI) ) { - S = qApp->translate( "NetworkSettings", - "<p>Error in node part for file %1 and node %2</p>" ). - arg( SF->name() ). - arg( NNI->netNode()->nodeName() ); - return S; - } - - if( SF->postNodeSection( NNI, -1 ) ) { - S = qApp->translate( "NetworkSettings", - "<p>Error in postNodeSection for file %1 and node %2</p>" ). - arg( SF->name() ). - arg( NNI->netNode()->nodeName() ); + S = generateSystemFileNode( *SF, 0, NNI, -1 ); + if( ! S.isEmpty() ) return S; @@ -450,39 +328,5 @@ QString NetworkSettingsData::generateSettings( bool ForceReq ) { - // generated some data - if( SF->postNodeSection( NNI, -1 ) ) { - S = qApp->translate( "NetworkSettings", - "<p>Error in postNodeSection for file %1 and node %2</p>" ). - arg( SF->name() ). - arg( NNI->netNode()->nodeName() ); - return S; - } - *SF << endl; - } - - if( CurDev ) { - // generate 'entry' for every combination of device and profile - // each node delegates to deeper level - for( int i = 0; i < CurDev->count(); i ++ ) { - if( SF->postDeviceSection( NNI, i ) ) { - S = qApp->translate( "NetworkSettings", - "<p>Error in postDeviceSection for file %1 and node %2</p>" ). - arg( SF->name() ). - arg( NNI->netNode()->nodeName() ); - return S; - } - } - } else { - if( SF->postDeviceSection( NNI, -1 ) ) { - S = qApp->translate( "NetworkSettings", - "<p>Error in postDeviceSection for file %1 and node %2</p>" ). - arg( SF->name() ). - arg( NNI->netNode()->nodeName() ); - return S; - } - } - } - if( SF->postSection() ) { S = qApp->translate( "NetworkSettings", - "<p>Error in postSection for file %1</p>" ). + "<p>Error in postSection for file \"%1\"</p>" ). arg( SF->name() ); @@ -591 +435,106 @@ bool NetworkSettingsData::regenerate( void ) { +QString NetworkSettingsData::generateSystemFileNode( + SystemFile &SF, + AsDevice * CurDev, + ANetNodeInstance * DevNNI, + long DevInstNr ) { + + QString S=""; + ANetNode * CurDevNN = DevNNI->nodeClass(); + Name2Connection_t & M = NSResources->connections(); + + if( SF.preDeviceSection( CurDevNN ) ) { + S = qApp->translate( "NetworkSettings", + "<p>Error in preDeviceSection for file \"%1\" and nodetype \"%2\"</p>" ). + arg( SF.name() ). + arg( CurDevNN->nodeName() ); + return S; + } + + if( CurDevNN->hasDataFor( SF.name() ) ) { + if( CurDevNN->generateDeviceDataForCommonFile( SF, DevInstNr ) ) { + S = qApp->translate( "NetworkSettings", + "<p>Error in node Device part for file \"%1\" and node \"%2\"</p>" ). + arg( SF.name() ). + arg( CurDevNN->nodeName() ); + return S; + } + } + + if( CurDev ) + fprintf( stderr, "Cur %s\n", CurDevNN->nodeName().latin1() ); + else + fprintf( stderr, "Cur NO\n" ); + + // now generate profile specific data for all + // connections working on a device of the current + // netnode type + for( QDictIterator<NodeCollection> ncit(M); + ncit.current(); + ++ncit ) { + NodeCollection * NC = ncit.current(); + + // currenly only those connections that work on + // the current device (or on no device if no current) + AsDevice * Dev = NC->device(); + + fprintf( stderr, "%s\n", Dev->netNode()->nodeName().latin1() ); + if( CurDev ) { + if( CurDevNN != Dev->netNode()->nodeClass() ) { + // other device type -> later + fprintf( stderr, "Other Dev type\n" ); + continue; + } + } else { + if( Dev ) { + // other + continue; + } + } + + // generate 'entry' + if( SF.preNodeSection( DevNNI, DevInstNr ) ) { + S = qApp->translate( "NetworkSettings", + "<p>Error in preNodeSection for file \"%1\" and node \"%2\"</p>" ). + arg( SF.name() ). + arg( CurDevNN->nodeName() ); + return S; + } + + // ask all nodes in connection + for( QListIterator<ANetNodeInstance> cncit(*NC); + cncit.current(); + ++cncit ) { + ANetNodeInstance * NNI = cncit.current(); + + if( NNI->hasDataFor( SF.name() ) ) { + if( NNI->generateDataForCommonFile(SF,DevInstNr) ) { + S = qApp->translate( "NetworkSettings", + "<p>Error in node part for file \"%1\" and node \"%2\"</p>" ). + arg( SF.name() ). + arg( NNI->nodeClass()->nodeName() ); + return S; + } + } + } + + if( SF.postNodeSection( DevNNI, DevInstNr ) ) { + S = qApp->translate( "NetworkSettings", + "<p>Error in postNodeSection for file \"%1\" and node \"%2\"</p>" ). + arg( SF.name() ). + arg( CurDevNN->nodeName() ); + return S; + } + SF << endl; + } + + if( SF.postDeviceSection( CurDevNN ) ) { + S = qApp->translate( "NetworkSettings", + "<p>Error in postDeviceSection for file \"%1\" and node \"%2\"</p>" ). + arg( SF.name() ). + arg( CurDevNN->nodeName() ); + return S; + } + + return S; +} |