Diffstat (limited to 'noncore/settings/networksettings2/nsdata.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/networksettings2/nsdata.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/noncore/settings/networksettings2/nsdata.cpp b/noncore/settings/networksettings2/nsdata.cpp index 64b83f7..bb37f10 100644 --- a/noncore/settings/networksettings2/nsdata.cpp +++ b/noncore/settings/networksettings2/nsdata.cpp | |||
@@ -293,25 +293,25 @@ QString NetworkSettingsData::generateSettings( bool ForceReq ) { | |||
293 | // generate files proper to each netnodeinstance | 293 | // generate files proper to each netnodeinstance |
294 | // | 294 | // |
295 | { Name2Instance_t & NNIs = NSResources->netNodeInstances(); | 295 | { Name2Instance_t & NNIs = NSResources->netNodeInstances(); |
296 | 296 | ||
297 | for( QDictIterator<ANetNodeInstance> NNIIt(NNIs); | 297 | for( QDictIterator<ANetNodeInstance> NNIIt(NNIs); |
298 | NNIIt.current(); | 298 | NNIIt.current(); |
299 | ++NNIIt | 299 | ++NNIIt |
300 | ){ | 300 | ){ |
301 | // for all nodes find those that are modified | 301 | // for all nodes find those that are modified |
302 | NNI = NNIIt.current(); | 302 | NNI = NNIIt.current(); |
303 | 303 | ||
304 | if( ForceIt || NNI->isModified() ) { | 304 | if( ForceIt || NNI->isModified() ) { |
305 | if( ! NNI->nodeClass()->generateProperFilesFor( NNI ) ) { | 305 | if( NNI->nodeClass()->generateProperFilesFor( NNI ) ) { |
306 | // problem generating | 306 | // problem generating |
307 | S = qApp->translate( "NetworkSettings", | 307 | S = qApp->translate( "NetworkSettings", |
308 | "<p>Cannot generate files proper to \"%1\"</p>" ). | 308 | "<p>Cannot generate files proper to \"%1\"</p>" ). |
309 | arg(NNI->nodeClass()->name()) ; | 309 | arg(NNI->nodeClass()->name()) ; |
310 | return S; | 310 | return S; |
311 | } | 311 | } |
312 | } | 312 | } |
313 | } | 313 | } |
314 | } | 314 | } |
315 | 315 | ||
316 | // | 316 | // |
317 | // generate all system files | 317 | // generate all system files |
@@ -485,34 +485,34 @@ bool NetworkSettingsData::regenerate( void ) { | |||
485 | QString NetworkSettingsData::generateSystemFileNode( | 485 | QString NetworkSettingsData::generateSystemFileNode( |
486 | SystemFile &SF, | 486 | SystemFile &SF, |
487 | AsDevice * CurDev, | 487 | AsDevice * CurDev, |
488 | ANetNodeInstance * DevNNI, | 488 | ANetNodeInstance * DevNNI, |
489 | long DevInstNr ) { | 489 | long DevInstNr ) { |
490 | 490 | ||
491 | QString S=""; | 491 | QString S=""; |
492 | ANetNode * CurDevNN = DevNNI->nodeClass(); | 492 | ANetNode * CurDevNN = DevNNI->nodeClass(); |
493 | Name2Connection_t & M = NSResources->connections(); | 493 | Name2Connection_t & M = NSResources->connections(); |
494 | 494 | ||
495 | if( SF.preDeviceSection( CurDevNN ) ) { | 495 | if( SF.preDeviceSection( CurDevNN ) ) { |
496 | S = qApp->translate( "NetworkSettings", | 496 | S = qApp->translate( "NetworkSettings", |
497 | "<p>Error in preDeviceSection for file \"%1\" and nodetype \"%2\"</p>" ). | 497 | "<p>Error in \"Pre-Device Part\" for file \"%1\" and nodetype \"%2\"</p>" ). |
498 | arg( SF.name() ). | 498 | arg( SF.name() ). |
499 | arg( CurDevNN->name() ); | 499 | arg( CurDevNN->name() ); |
500 | return S; | 500 | return S; |
501 | } | 501 | } |
502 | 502 | ||
503 | if( CurDevNN->hasDataFor( SF.name() ) ) { | 503 | if( CurDevNN->hasDataFor( SF.name() ) ) { |
504 | if( CurDevNN->generateDeviceDataForCommonFile( SF, DevInstNr ) ) { | 504 | if( CurDevNN->generateDeviceDataForCommonFile( SF, DevInstNr ) ) { |
505 | S = qApp->translate( "NetworkSettings", | 505 | S = qApp->translate( "NetworkSettings", |
506 | "<p>Error in node Device part for file \"%1\" and node \"%2\"</p>" ). | 506 | "<p>Error in \"Device Part\" for file \"%1\" and node \"%2\"</p>" ). |
507 | arg( SF.name() ). | 507 | arg( SF.name() ). |
508 | arg( CurDevNN->name() ); | 508 | arg( CurDevNN->name() ); |
509 | return S; | 509 | return S; |
510 | } | 510 | } |
511 | } | 511 | } |
512 | 512 | ||
513 | // now generate profile specific data for all | 513 | // now generate profile specific data for all |
514 | // connections working on a device of the current | 514 | // connections working on a device of the current |
515 | // netnode type | 515 | // netnode type |
516 | for( QDictIterator<NodeCollection> ncit(M); | 516 | for( QDictIterator<NodeCollection> ncit(M); |
517 | ncit.current(); | 517 | ncit.current(); |
518 | ++ncit ) { | 518 | ++ncit ) { |
@@ -528,55 +528,55 @@ QString NetworkSettingsData::generateSystemFileNode( | |||
528 | continue; | 528 | continue; |
529 | } | 529 | } |
530 | } else { | 530 | } else { |
531 | if( Dev ) { | 531 | if( Dev ) { |
532 | // other | 532 | // other |
533 | continue; | 533 | continue; |
534 | } | 534 | } |
535 | } | 535 | } |
536 | 536 | ||
537 | // generate 'entry' | 537 | // generate 'entry' |
538 | if( SF.preNodeSection( DevNNI, DevInstNr ) ) { | 538 | if( SF.preNodeSection( DevNNI, DevInstNr ) ) { |
539 | S = qApp->translate( "NetworkSettings", | 539 | S = qApp->translate( "NetworkSettings", |
540 | "<p>Error in preNodeSection for file \"%1\" and node \"%2\"</p>" ). | 540 | "<p>Error in \"Pre-Node Part\" for file \"%1\" and node \"%2\"</p>" ). |
541 | arg( SF.name() ). | 541 | arg( SF.name() ). |
542 | arg( CurDevNN->name() ); | 542 | arg( CurDevNN->name() ); |
543 | return S; | 543 | return S; |
544 | } | 544 | } |
545 | 545 | ||
546 | // ask all nodes in connection | 546 | // ask all nodes in connection |
547 | for( QListIterator<ANetNodeInstance> cncit(*NC); | 547 | for( QListIterator<ANetNodeInstance> cncit(*NC); |
548 | cncit.current(); | 548 | cncit.current(); |
549 | ++cncit ) { | 549 | ++cncit ) { |
550 | ANetNodeInstance * NNI = cncit.current(); | 550 | ANetNodeInstance * NNI = cncit.current(); |
551 | 551 | ||
552 | if( NNI->hasDataFor( SF.name() ) ) { | 552 | if( NNI->hasDataFor( SF.name() ) ) { |
553 | if( NNI->generateDataForCommonFile(SF,DevInstNr) ) { | 553 | if( NNI->generateDataForCommonFile(SF,DevInstNr) ) { |
554 | S = qApp->translate( "NetworkSettings", | 554 | S = qApp->translate( "NetworkSettings", |
555 | "<p>Error in node part for file \"%1\" and node \"%2\"</p>" ). | 555 | "<p>Error in \"Node Part\" for file \"%1\" and node \"%2\"</p>" ). |
556 | arg( SF.name() ). | 556 | arg( SF.name() ). |
557 | arg( NNI->nodeClass()->name() ); | 557 | arg( NNI->nodeClass()->name() ); |
558 | return S; | 558 | return S; |
559 | } | 559 | } |
560 | } | 560 | } |
561 | } | 561 | } |
562 | 562 | ||
563 | if( SF.postNodeSection( DevNNI, DevInstNr ) ) { | 563 | if( SF.postNodeSection( DevNNI, DevInstNr ) ) { |
564 | S = qApp->translate( "NetworkSettings", | 564 | S = qApp->translate( "NetworkSettings", |
565 | "<p>Error in postNodeSection for file \"%1\" and node \"%2\"</p>" ). | 565 | "<p>Error in \"Post-Node Part\" for file \"%1\" and node \"%2\"</p>" ). |
566 | arg( SF.name() ). | 566 | arg( SF.name() ). |
567 | arg( CurDevNN->name() ); | 567 | arg( CurDevNN->name() ); |
568 | return S; | 568 | return S; |
569 | } | 569 | } |
570 | SF << endl; | 570 | SF << endl; |
571 | } | 571 | } |
572 | 572 | ||
573 | if( SF.postDeviceSection( CurDevNN ) ) { | 573 | if( SF.postDeviceSection( CurDevNN ) ) { |
574 | S = qApp->translate( "NetworkSettings", | 574 | S = qApp->translate( "NetworkSettings", |
575 | "<p>Error in postDeviceSection for file \"%1\" and node \"%2\"</p>" ). | 575 | "<p>Error in \"Post-Device Part\" for file \"%1\" and node \"%2\"</p>" ). |
576 | arg( SF.name() ). | 576 | arg( SF.name() ). |
577 | arg( CurDevNN->name() ); | 577 | arg( CurDevNN->name() ); |
578 | return S; | 578 | return S; |
579 | } | 579 | } |
580 | 580 | ||
581 | return S; | 581 | return S; |
582 | } | 582 | } |