Many changes

1 files changed, 15 insertions, 20 deletions

diff --git a/noncore/settings/networksettings2/editconnection.cpp b/noncore/settings/networksettings2/editconnection.cpp
index ce13573..4bbe502 100644
--- a/noncore/settings/networksettings2/editconnection.cpp
+++ b/noncore/settings/networksettings2/editconnection.cpp
@@ -83,80 +83,78 @@ EditConnection::EditConnection( QWidget* parent ) :
       EditConnectionGUI( parent, 0, TRUE ), TmpCollection() {
 
       Tab_TB->setTabEnabled( Setup_FRM, FALSE );
       Setup_FRM->setEnabled( FALSE );
 
       TmpIsValid = 0;
       SelectedNodes = 0;
 
       AutoCollapse_CB->setChecked( AutoCollapse );
 
       Mapping = new QPtrDict<ANetNode>;
       Mapping->setAutoDelete( FALSE );
       Nodes_LV->header()->hide();
       // popluate tree with all NetNodes 
       buildFullTree();
 }
 
 NodeCollection * EditConnection::getTmpCollection( void ) {
 
       if( TmpIsValid ) 
         // content is stil OK
         return &(TmpCollection);
 
       // reset collection -> delete all NEW NetNodes
-      { ANetNodeInstance * NNI;
-        for( QListIterator<ANetNodeInstance> it(TmpCollection);
-             it.current();
-             ++it ) {
-          if( it.current()->isNew() ) {
-            delete it.current();
-          }
+      for( QListIterator<ANetNodeInstance> it(TmpCollection);
+           it.current();
+           ++it ) {
+        if( it.current()->isNew() ) {
+          delete it.current();
         }
-        TmpCollection.clear();
       }
+      TmpCollection.clear();
 
       // update content
       QListViewItem * it = Nodes_LV->firstChild();
       ANetNode * NN;
       // start iter
       ANetNodeInstance * NNI = 
         (SelectedNodes) ? SelectedNodes->first() : 0 ;
 
       TmpCollection.setModified( 0 );
 
       while ( it ) {
         NN = (*Mapping)[it];
         if( NN == 0 ) {
           // child is controller -> has sub radio
           // check if one radio is selected
           it = it->firstChild();
           while( it ) {
             if( ((QCheckListItem *)it)->isOn() ) {
               // this radio is selected -> go deeper
               if( SelectedNodes == 0 || 
                   NNI == 0 ||
-                  NNI->netNode()->nodeName() != it->text(0) ) {
+                  NNI->nodeClass()->nodeName() != it->text(0) ) {
                 // new item not in previous collection
                 ANetNodeInstance * NNI = (*Mapping)[it]->createInstance();
                 NNI->initialize();
                 // this node type not in collection
                 TmpCollection.append( NNI );
                 // master collection changed because new item in it
                 TmpCollection.setModified( 1 );
                 // no more valid items in old list
                 NNI = 0;
               } else {
                 // already in list -> copy pointer
                 TmpCollection.append( NNI );
                 NNI = SelectedNodes->next();
               }
               it = it->firstChild();
               // do not bother to check other items
               break;
             }
             it = it->nextSibling();
           }
         } else {
           // check children
           it = it->firstChild();
         }
@@ -177,97 +175,94 @@ void EditConnection::setConnection( NodeCollection * NC ) {
 
       // show configure tabl
       Tab_TB->setCurrentPage( 1 );
 
       // valid colledction
       Tab_TB->setTabEnabled( Setup_FRM, FALSE );
       Setup_FRM->setEnabled( FALSE );
 
       // select items in collection
       QListViewItem * it = Nodes_LV->firstChild();
       bool Found;
 
       TmpIsValid = 0;
 
       while ( it ) {
         // listitem corresponds to netnode 
         NN = (*Mapping)[it];
         if( NN == 0 ) {
           // child is controller -> has sub radio
           QString Ctr = it->text(0);
           // check if one radio is selected
           it = it->firstChild();
           Found = 0;
           while( it ) {
-            if( NNI && NNI->netNode()->nodeName() == it->text(0) ) {
+            if( NNI && NNI->nodeClass()->nodeName() == it->text(0) ) {
               // this radio is part of the collection
               ((QCheckListItem *)it)->setOn( 1 );
-              updateGUI( it, NNI->netNode() );
+              updateGUI( it, NNI->nodeClass() );
               // check its children
               Found = 1;
               it = it->firstChild();
               NNI = SelectedNodes->next();
               // do not bother to check other items
               break;
             }
             it = it->nextSibling();
           }
           if( ! Found ) {
             // this means that this level is NOT present in collection
             // probably INCOMPATIBEL collection OR Missing plugin
             QMessageBox::warning(
                 0, 
                 tr( "Error presentig Connection" ),
                 tr( "<p>Old connection or missing plugin \"<i>%1</i>\"</p>" ).
                     arg(Ctr) );
             return;
           }
         } else {
           // automatic item -> check children
           it = it->firstChild();
         }
       }
 }
 
 // get result of editing (either new OR updated collection
 NodeCollection * EditConnection::connection( void ) {
 
       if( SelectedNodes == 0 ) {
         // new collection 
         SelectedNodes = new NodeCollection;
       }
 
       // clean out old entries
       SelectedNodes->clear();
 
       // transfer 
-      { ANetNodeInstance * NNI;
-
-        for( QListIterator<ANetNodeInstance> it(TmpCollection);
-             it.current();
-             ++it ) {
-          SelectedNodes->append( it.current() );
-        }
+      for( QListIterator<ANetNodeInstance> it(TmpCollection);
+           it.current();
+           ++it ) {
+        SelectedNodes->append( it.current() );
       }
 
       if( TmpCollection.isModified() )
         SelectedNodes->setModified( 1 );
 
       if( SelectedNodes->name() != Name_LE->text() ) {
         SelectedNodes->setName( Name_LE->text() );
         SelectedNodes->setModified( 1 );
       }
 
       return SelectedNodes;
 }
 
 // Build device tree -> start 
 void EditConnection::buildFullTree( void ) {
     ANetNode * NN;
 
     // toplevel item
     MyQCheckListItem * TheTop = new MyQCheckListItem( 
         Nodes_LV, 
         NSResources->netNode2Name("fullsetup"),
         QCheckListItem::Controller );
     TheTop->setOpen( TRUE );
     Description_LBL->setText( 
@@ -427,50 +422,50 @@ void EditConnection::SLOT_AlterTab( const QString & S ) {
       if( ! TmpIsValid ) {
         getTmpCollection();
 
         // clear CB and Ws
         { QWidget * W;
           int i = 0;
 
           Devices_CB->clear();
           while( ( W = Setup_WS->widget( i ) ) ) {
             Setup_WS->removeWidget( W );
             i ++;
           }
         }
 
         // update CB
         // and populate WidgetStack
         { ANetNodeInstance * NNI;
           QListIterator<ANetNodeInstance> it(TmpCollection);
           int i = 0;
           QWidget * W;
 
           for ( ; it.current(); ++it ) {
             NNI = it.current();
             Devices_CB->insertItem(
-                NSResources->getPixmap( NNI->netNode()->pixmapName() ),
-                NNI->netNode()->nodeName()
+                NSResources->getPixmap( NNI->nodeClass()->pixmapName() ),
+                NNI->nodeClass()->nodeName()
             );
 
             // add edit widget
             W = NNI->edit( Setup_WS );
             if( ! W) {
               W = new QLabel( Setup_WS, 
                               tr("No configuration required"));
             }
             Setup_WS->addWidget( W , i );
             i ++;
           }
         }
         Setup_WS->raiseWidget( 0 );
       } // still valid
     }
 }
 
 // update visual feedback of selection state
 void EditConnection::updateGUI( QListViewItem * it, ANetNode * NN ) {
 
     bool HCC = haveCompleteConfig( it );
     Tab_TB->setTabEnabled( Setup_FRM, HCC );
     Setup_FRM->setEnabled( HCC );