Many changes

1 files changed, 5 insertions, 10 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
@@ -106,3 +106,2 @@ NodeCollection * EditConnection::getTmpCollection( void ) {
       // reset collection -> delete all NEW NetNodes
-      { ANetNodeInstance * NNI;
         for( QListIterator<ANetNodeInstance> it(TmpCollection);
@@ -115,3 +114,2 @@ NodeCollection * EditConnection::getTmpCollection( void ) {
         TmpCollection.clear();
-      }
 
@@ -137,3 +135,3 @@ NodeCollection * EditConnection::getTmpCollection( void ) {
                   NNI == 0 ||
-                  NNI->netNode()->nodeName() != it->text(0) ) {
+                  NNI->nodeClass()->nodeName() != it->text(0) ) {
                 // new item not in previous collection
@@ -200,6 +198,6 @@ void EditConnection::setConnection( NodeCollection * NC ) {
           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
@@ -242,4 +240,2 @@ NodeCollection * EditConnection::connection( void ) {
       // transfer 
-      { ANetNodeInstance * NNI;
-
         for( QListIterator<ANetNodeInstance> it(TmpCollection);
@@ -249,3 +245,2 @@ NodeCollection * EditConnection::connection( void ) {
         }
-      }
 
@@ -450,4 +445,4 @@ void EditConnection::SLOT_AlterTab( const QString & S ) {
             Devices_CB->insertItem(
-                NSResources->getPixmap( NNI->netNode()->pixmapName() ),
-                NNI->netNode()->nodeName()
+                NSResources->getPixmap( NNI->nodeClass()->pixmapName() ),
+                NNI->nodeClass()->nodeName()
             );