Major rename of NodeCollection to NetworkSetup

this commit is broken (missing symbols)

58 files changed, 393 insertions, 373 deletions

diff --git a/noncore/settings/networksettings2/activateprofile.cpp b/noncore/settings/networksettings2/activateprofile.cpp
index e4064e3..fe98fc4 100644
--- a/noncore/settings/networksettings2/activateprofile.cpp
+++ b/noncore/settings/networksettings2/activateprofile.cpp
@@ -11,3 +11,3 @@ ActivateProfile::ActivateProfile( const char * Interface ) :
     Profiles_LB->clear();
-    for( NodeCollection * NC = Possible.first();
+    for( NetworkSetup * NC = Possible.first();
          NC;
diff --git a/noncore/settings/networksettings2/activateprofile.h b/noncore/settings/networksettings2/activateprofile.h
index dedeb51..385c665 100644
--- a/noncore/settings/networksettings2/activateprofile.h
+++ b/noncore/settings/networksettings2/activateprofile.h
@@ -17,3 +17,3 @@ private :
       NetworkSettingsData NSD;
-      QList<NodeCollection> Possible;
+      QList<NetworkSetup> Possible;
 };
diff --git a/noncore/settings/networksettings2/activatevpn.cpp b/noncore/settings/networksettings2/activatevpn.cpp
index 768a031..35a881b 100644
--- a/noncore/settings/networksettings2/activatevpn.cpp
+++ b/noncore/settings/networksettings2/activatevpn.cpp
@@ -9,5 +9,5 @@ public :
 
-      MyCheckListItem( NodeCollection * N, QListView * V );
+      MyCheckListItem( NetworkSetup * N, QListView * V );
 
-      NodeCollection * NC;
+      NetworkSetup * NC;
 
@@ -15,3 +15,3 @@ public :
 
-MyCheckListItem::MyCheckListItem( NodeCollection * N, QListView * V ):
+MyCheckListItem::MyCheckListItem( NetworkSetup * N, QListView * V ):
                 QCheckListItem( V, N->name() ) {
@@ -27,4 +27,4 @@ ActivateVPN::ActivateVPN( const QString & I ) :
 
-    // find all connections that want to be triggered by this interface
-    for( QDictIterator<NodeCollection> it(NSResources->connections());
+    // find all NetworkSetups that want to be triggered by this interface
+    for( QDictIterator<NetworkSetup> it(NSResources->networkSetups());
          it.current();
diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.cpp b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.cpp
index 5c937a1..5c71a0a 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.cpp
+++ b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.cpp
@@ -7,4 +7,4 @@
 using Opietooth2::OTGateway;
-using Opietooth2::OTPANConnection;
-using Opietooth2::PANConnectionVector;
+using Opietooth2::OTPANNetworkSetup;
+using Opietooth2::PANNetworkSetupVector;
 
@@ -30,3 +30,3 @@ State_t BluetoothBNEPRun::detectState( void ) {
 
-        1. for any PAN connection that is found if that
+        1. for any PAN NetworkSetup that is found if that
            PAN is connected.
@@ -35,6 +35,6 @@ State_t BluetoothBNEPRun::detectState( void ) {
            not manage IP settings and we are called to detect
-           the state we knwo that we do not have an UP connection)
+           the state we knwo that we do not have an UP NetworkSetup)
 
-        2. if it not connected and we allow any connection we
-           are available or if that PAN connection is to a device
+        2. if it not connected and we allow any NetworkSetup we
+           are available or if that PAN NetworkSetup is to a device
            with a correct address
@@ -43,3 +43,3 @@ State_t BluetoothBNEPRun::detectState( void ) {
            we do not accept any address, we are Unavailable but
-           not DOWN.  I.e a new connection could perhaps be created
+           not DOWN.  I.e a new NetworkSetup could perhaps be created
 
@@ -55,11 +55,11 @@ State_t BluetoothBNEPRun::detectState( void ) {
 
-    // if there is a PAN connection that is UP but not
+    // if there is a PAN NetworkSetup that is UP but not
     // yet configured (no ifup) the we are available
-    return ( hasFreePANConnection() ) ?  Available : Unknown;
+    return ( hasFreePANNetworkSetup() ) ?  Available : Unknown;
 }
 
-QString BluetoothBNEPRun::setMyState( NodeCollection * NC, Action_t A, bool  ) {
+QString BluetoothBNEPRun::setMyState( NetworkSetup * NC, Action_t A, bool  ) {
 
     if( A == Activate ) {
-      if( hasFreePANConnection( 1 ) ) {
+      if( hasFreePANNetworkSetup( 1 ) ) {
         // we have now an assignedinterface
@@ -91,3 +91,3 @@ bool BluetoothBNEPRun::handlesInterface( InterfaceInfo * I ) {
 
-bool BluetoothBNEPRun::hasFreePANConnection( bool Grab ) {
+bool BluetoothBNEPRun::hasFreePANNetworkSetup( bool Grab ) {
 
@@ -97,7 +97,7 @@ bool BluetoothBNEPRun::hasFreePANConnection( bool Grab ) {
 
-    // load PAN connections
-    OTPANConnection * C;
+    // load PAN NetworkSetups
+    OTPANNetworkSetup * C;
     InterfaceInfo * Run;
     InterfaceInfo * Candidate = 0; // reuse this interface
-    PANConnectionVector Conns = OT->getPANConnections();
+    PANNetworkSetupVector Conns = OT->getPANNetworkSetups();
     System & Sys = NSResources->system();
@@ -114,3 +114,3 @@ bool BluetoothBNEPRun::hasFreePANConnection( bool Grab ) {
       } else {
-        // is this PAN connection connecting to a Peer
+        // is this PAN NetworkSetup connecting to a Peer
         // we allow ?
@@ -121,3 +121,3 @@ bool BluetoothBNEPRun::hasFreePANConnection( bool Grab ) {
           if( C->ConnectedTo == (*it) ) {
-            // this is a connection we could accept
+            // this is a NetworkSetup we could accept
             IsValid = 1;
@@ -137,3 +137,3 @@ bool BluetoothBNEPRun::hasFreePANConnection( bool Grab ) {
 
-      // is this PAN connection available to us ?
+      // is this PAN NetworkSetup available to us ?
       Run = Sys.findInterface( C->Device );
@@ -141,3 +141,3 @@ bool BluetoothBNEPRun::hasFreePANConnection( bool Grab ) {
       if( Run && Run->IsUp ) {
-        // this PAN connection is up
+        // this PAN NetworkSetup is up
         Log(("%s acceptable but unavailable\n",
@@ -156,3 +156,3 @@ bool BluetoothBNEPRun::hasFreePANConnection( bool Grab ) {
       if ( Grab ) {
-        netNode()->connection()->assignInterface( Candidate );
+        netNode()->networkSetup()->assignInterface( Candidate );
       }
diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.h b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.h
index 8551a2e..7346a8d 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.h
+++ b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.h
@@ -24,3 +24,3 @@ protected :
 
-      QString setMyState( NodeCollection * , Action_t, bool );
+      QString setMyState( NetworkSetup * , Action_t, bool );
 
@@ -28,3 +28,3 @@ private :
 
-      bool hasFreePANConnection( bool Grab = 0 );
+      bool hasFreePANNetworkSetup( bool Grab = 0 );
 
diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.cpp b/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.cpp
index 3df7f5c..cd7bb4a 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.cpp
+++ b/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.cpp
@@ -22,3 +22,3 @@ State_t BluetoothRFCOMMRun::detectState( void ) {
 
-      if( deviceNrOfConnection() >= 0 ) {
+      if( deviceNrOfNetworkSetup() >= 0 ) {
         return Available;
@@ -33,3 +33,3 @@ State_t BluetoothRFCOMMRun::detectState( void ) {
 
-QString BluetoothRFCOMMRun::setMyState( NodeCollection *, 
+QString BluetoothRFCOMMRun::setMyState( NetworkSetup *, 
                                       Action_t A, 
@@ -72,3 +72,3 @@ QString BluetoothRFCOMMRun::setMyState( NodeCollection *,
           if( OT->releaseRFCommDevice( DeviceNr ) ) {
-           return QString( "Cannot release RFCOMM connection" );
+           return QString( "Cannot release RFCOMM NetworkSetup" );
           }
@@ -133,5 +133,5 @@ RFCOMMChannel * BluetoothRFCOMMRun::getChannel( void ) {
 QString BluetoothRFCOMMRun::deviceFile( void ) {
-    if( deviceNrOfConnection() >= 0 ) {
+    if( deviceNrOfNetworkSetup() >= 0 ) {
       OTDevice * OTD = OT->getOTDevice();
-      // there is a connection
+      // there is a NetworkSetup
       return OTD->getRFCommDevicePattern().arg(DeviceNr);
@@ -141,3 +141,3 @@ QString BluetoothRFCOMMRun::deviceFile( void ) {
 
-int BluetoothRFCOMMRun::deviceNrOfConnection( void ) {
+int BluetoothRFCOMMRun::deviceNrOfNetworkSetup( void ) {
 
diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.h b/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.h
index 5a31a94..32986d3 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.h
+++ b/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.h
@@ -22,3 +22,3 @@ protected :
 
-      QString setMyState( NodeCollection * , Action_t, bool );
+      QString setMyState( NetworkSetup * , Action_t, bool );
 
@@ -26,3 +26,3 @@ private :
 
-      int deviceNrOfConnection( void );
+      int deviceNrOfNetworkSetup( void );
       RFCOMMChannel * getChannel( void );
diff --git a/noncore/settings/networksettings2/cable/cable_NN.cpp b/noncore/settings/networksettings2/cable/cable_NN.cpp
index 58237a1..3f34bb2 100644
--- a/noncore/settings/networksettings2/cable/cable_NN.cpp
+++ b/noncore/settings/networksettings2/cable/cable_NN.cpp
@@ -17,3 +17,3 @@ static const char * CableProvides[] =
  */
-CableNetNode::CableNetNode() : ANetNode(tr("Cable Connection")) {
+CableNetNode::CableNetNode() : ANetNode(tr("Cable NetworkSetup")) {
 }
diff --git a/noncore/settings/networksettings2/cable/cablerun.cpp b/noncore/settings/networksettings2/cable/cablerun.cpp
index 7a8deb9..edbeb89 100644
--- a/noncore/settings/networksettings2/cable/cablerun.cpp
+++ b/noncore/settings/networksettings2/cable/cablerun.cpp
@@ -15,3 +15,3 @@ State_t CableRun::detectState( void ) {
 
-QString CableRun::setMyState( NodeCollection *, Action_t , bool ) { 
+QString CableRun::setMyState( NetworkSetup *, Action_t , bool ) { 
       return QString();
diff --git a/noncore/settings/networksettings2/cable/cablerun.h b/noncore/settings/networksettings2/cable/cablerun.h
index 41aea01..6a457c4 100644
--- a/noncore/settings/networksettings2/cable/cablerun.h
+++ b/noncore/settings/networksettings2/cable/cablerun.h
@@ -20,3 +20,3 @@ protected :
 
-      QString setMyState( NodeCollection * , Action_t, bool );
+      QString setMyState( NetworkSetup * , Action_t, bool );
 
diff --git a/noncore/settings/networksettings2/editconnection.cpp b/noncore/settings/networksettings2/editconnection.cpp
index 717d9e9..6ab2dd6 100644
--- a/noncore/settings/networksettings2/editconnection.cpp
+++ b/noncore/settings/networksettings2/editconnection.cpp
@@ -87,6 +87,6 @@ void MyQListViewItem::paintCell( QPainter *p, const QColorGroup &cg,
 
-bool EditConnection::AutoCollapse = 1;
+bool EditNetworkSetup::AutoCollapse = 1;
 
-EditConnection::EditConnection( QWidget* parent ) :
-      EditConnectionGUI( parent, 0, TRUE ), TmpCollection() {
+EditNetworkSetup::EditNetworkSetup( QWidget* parent ) :
+      EditNetworkSetupGUI( parent, 0, TRUE ), TmpCollection() {
 
@@ -107,3 +107,3 @@ EditConnection::EditConnection( QWidget* parent ) :
 
-NodeCollection * EditConnection::getTmpCollection( void ) {
+NetworkSetup * EditNetworkSetup::getTmpCollection( void ) {
 
@@ -121,3 +121,5 @@ NodeCollection * EditConnection::getTmpCollection( void ) {
       }
+
       TmpCollection.clear();
+      TmpCollection.copyFrom( *SelectedNodes );
 
@@ -195,4 +197,4 @@ NodeCollection * EditConnection::getTmpCollection( void ) {
 
-// pass a connection NodeCollection to be edited
-void EditConnection::setConnection( NodeCollection * NC ) {
+// pass a NetworkSetup NetworkSetup to be edited
+void EditNetworkSetup::setNetworkSetup( NetworkSetup * NC ) {
       ANetNodeInstance * NNI;
@@ -245,4 +247,4 @@ void EditConnection::setConnection( NodeCollection * NC ) {
                 0, 
-                tr( "Error presentig Connection" ),
-                tr( "<p>Old connection or missing plugin \"<i>%1</i>\"</p>" ).
+                tr( "Error presentig NetworkSetup" ),
+                tr( "<p>Old NetworkSetup or missing plugin \"<i>%1</i>\"</p>" ).
                     arg(NNI->nodeClass()->name()) );
@@ -260,4 +262,4 @@ void EditConnection::setConnection( NodeCollection * NC ) {
                   0, 
-                  tr( "Error presentig Connection" ),
-                  tr( "<p>Old connection or missing plugin \"<i>%1</i>\"</p>" ).
+                  tr( "Error presentig NetworkSetup" ),
+                  tr( "<p>Old NetworkSetup or missing plugin \"<i>%1</i>\"</p>" ).
                       arg(NNI->nodeClass()->name()) );
@@ -266,4 +268,4 @@ void EditConnection::setConnection( NodeCollection * NC ) {
                   0, 
-                  tr( "Error presentig Connection" ),
-                  tr( "<p>Missing connection\"<i>%1</i>\"</p>" ).
+                  tr( "Error presentig NetworkSetup" ),
+                  tr( "<p>Missing NetworkSetup\"<i>%1</i>\"</p>" ).
                       arg(it->text(0)) );
@@ -278,3 +280,3 @@ void EditConnection::setConnection( NodeCollection * NC ) {
 // get result of editing (either new OR updated collection
-NodeCollection * EditConnection::connection( void ) {
+NetworkSetup * EditNetworkSetup::networkSetup( void ) {
 
@@ -282,3 +284,3 @@ NodeCollection * EditConnection::connection( void ) {
         // new collection 
-        SelectedNodes = new NodeCollection;
+        SelectedNodes = new NetworkSetup;
       }
@@ -307,3 +309,3 @@ NodeCollection * EditConnection::connection( void ) {
 // Build device tree -> start 
-void EditConnection::buildFullTree( void ) {
+void EditNetworkSetup::buildFullTree( void ) {
     ANetNode * NN;
@@ -321,3 +323,3 @@ void EditConnection::buildFullTree( void ) {
     // find all Nodes that are toplevel nodes -> ie provide
-    // TCP/IP Connection
+    // TCP/IP NetworkSetup
     for( QDictIterator<ANetNode> Iter(NSResources->netNodes());
@@ -344,3 +346,3 @@ void EditConnection::buildFullTree( void ) {
 // Build device tree -> help function 
-void EditConnection::buildSubTree( QListViewItem * it, ANetNode *NN ) {
+void EditNetworkSetup::buildSubTree( QListViewItem * it, ANetNode *NN ) {
     ANetNode::NetNodeList & NNL = NN->alternatives();
@@ -380,3 +382,3 @@ void EditConnection::buildSubTree( QListViewItem * it, ANetNode *NN ) {
 // Clicked ok OK button
-void EditConnection::accept( void ) {
+void EditNetworkSetup::accept( void ) {
     if( ! haveCompleteConfig( 0 ) || Name_LE->text().isEmpty() ) {
@@ -384,3 +386,3 @@ void EditConnection::accept( void ) {
           0, 
-          tr( "Closing Connection Setup" ),
+          tr( "Closing NetworkSetup Setup" ),
           tr( "Definition not complete or no name" ) );
@@ -420,3 +422,3 @@ void EditConnection::accept( void ) {
 // triggered by CB
-void EditConnection::SLOT_AutoCollapse( bool b ) {
+void EditNetworkSetup::SLOT_AutoCollapse( bool b ) {
     AutoCollapse = b;
@@ -425,3 +427,3 @@ void EditConnection::SLOT_AutoCollapse( bool b ) {
 // clicked on node in tree -> update GUI
-void EditConnection::SLOT_SelectNode( QListViewItem * it ) {
+void EditNetworkSetup::SLOT_SelectNode( QListViewItem * it ) {
     ANetNode * NN;
@@ -467,3 +469,3 @@ void EditConnection::SLOT_SelectNode( QListViewItem * it ) {
 // cliecked on TAB to go to setup
-void EditConnection::SLOT_AlterTab( const QString & S ) {
+void EditNetworkSetup::SLOT_AlterTab( const QString & S ) {
     if( S == tr( "Setup" ) && Setup_FRM->isEnabled() ) {
@@ -516,3 +518,3 @@ void EditConnection::SLOT_AlterTab( const QString & S ) {
 // update visual feedback of selection state
-void EditConnection::updateGUI( QListViewItem * it, ANetNode * NN ) {
+void EditNetworkSetup::updateGUI( QListViewItem * it, ANetNode * NN ) {
 
@@ -542,3 +544,3 @@ void EditConnection::updateGUI( QListViewItem * it, ANetNode * NN ) {
 
-void EditConnection::disableTree( QListViewItem * it, bool Mode ) {
+void EditNetworkSetup::disableTree( QListViewItem * it, bool Mode ) {
     while( it ) {
@@ -554,3 +556,3 @@ void EditConnection::disableTree( QListViewItem * it, bool Mode ) {
 // pah : ParentHasAlternatives
-void EditConnection::enablePath( QListViewItem * it, bool pha ) {
+void EditNetworkSetup::enablePath( QListViewItem * it, bool pha ) {
     while( it ) {
@@ -591,3 +593,3 @@ void EditConnection::enablePath( QListViewItem * it, bool pha ) {
 // do we have a complete configuration (all needs are provided for ?)
-bool EditConnection::haveCompleteConfig( QListViewItem * it ) {
+bool EditNetworkSetup::haveCompleteConfig( QListViewItem * it ) {
 
diff --git a/noncore/settings/networksettings2/editconnection.h b/noncore/settings/networksettings2/editconnection.h
index e8d7a2c..c2fc643 100644
--- a/noncore/settings/networksettings2/editconnection.h
+++ b/noncore/settings/networksettings2/editconnection.h
@@ -12,3 +12,3 @@ class QCloseEvent;
 
-class EditConnection : public EditConnectionGUI {
+class EditNetworkSetup : public EditNetworkSetupGUI {
 
@@ -18,7 +18,7 @@ public :
 
-      EditConnection( QWidget * P );
+      EditNetworkSetup( QWidget * P );
 
       ANetNodeInstance * netNodeInstance( void );
-      void setConnection( NodeCollection * NC );
-      NodeCollection * connection( void );
+      void setNetworkSetup( NetworkSetup * NC );
+      NetworkSetup * networkSetup( void );
 
@@ -33,3 +33,3 @@ private :
 
-      NodeCollection * getTmpCollection( void );
+      NetworkSetup * getTmpCollection( void );
       void updateGUI( QListViewItem * it, ANetNode * NN );
@@ -42,5 +42,5 @@ private :
       QPtrDict<ANetNode> * Mapping;
-      NodeCollection * SelectedNodes;
+      NetworkSetup * SelectedNodes;
       bool           TmpIsValid;
-      NodeCollection TmpCollection;
+      NetworkSetup TmpCollection;
 
diff --git a/noncore/settings/networksettings2/editconnectionGUI.ui b/noncore/settings/networksettings2/editconnectionGUI.ui
index dfb2596..5e50490 100644
--- a/noncore/settings/networksettings2/editconnectionGUI.ui
+++ b/noncore/settings/networksettings2/editconnectionGUI.ui
@@ -1,3 +1,3 @@
 <!DOCTYPE UI><UI>
-<class>EditConnectionGUI</class>
+<class>EditNetworkSetupGUI</class>
 <widget>
@@ -6,3 +6,3 @@
         <name>name</name>
-        <cstring>EditConnectionGUI</cstring>
+        <cstring>EditNetworkSetupGUI</cstring>
     </property>
@@ -119,3 +119,3 @@
                                     <name>text</name>
-                                    <string>Connection profile</string>
+                                    <string>NetworkSetup profile</string>
                                 </property>
@@ -380,3 +380,3 @@
         <signal>clicked(QListViewItem*)</signal>
-        <receiver>EditConnectionGUI</receiver>
+        <receiver>EditNetworkSetupGUI</receiver>
         <slot>SLOT_SelectNode( QListViewItem *)</slot>
@@ -386,3 +386,3 @@
         <signal>toggled(bool)</signal>
-        <receiver>EditConnectionGUI</receiver>
+        <receiver>EditNetworkSetupGUI</receiver>
         <slot>SLOT_AutoCollapse( bool)</slot>
@@ -398,3 +398,3 @@
         <signal>selected(const QString&amp;)</signal>
-        <receiver>EditConnectionGUI</receiver>
+        <receiver>EditNetworkSetupGUI</receiver>
         <slot>SLOT_AlterTab( const QString &amp; )</slot>
diff --git a/noncore/settings/networksettings2/gprs/GPRS_NN.cpp b/noncore/settings/networksettings2/gprs/GPRS_NN.cpp
index e9553a6..374cf5a 100644
--- a/noncore/settings/networksettings2/gprs/GPRS_NN.cpp
+++ b/noncore/settings/networksettings2/gprs/GPRS_NN.cpp
@@ -14,3 +14,3 @@ static const char * GPRSNeeds[] =
 static const char * GPRSProvides[] = 
-    { "connection", 
+    { "NetworkSetup", 
       0
diff --git a/noncore/settings/networksettings2/gprs/GPRS_NNI.cpp b/noncore/settings/networksettings2/gprs/GPRS_NNI.cpp
index 2f61cba..bf8cc59 100644
--- a/noncore/settings/networksettings2/gprs/GPRS_NNI.cpp
+++ b/noncore/settings/networksettings2/gprs/GPRS_NNI.cpp
@@ -124,3 +124,3 @@ short AGPRSDevice::generateFile( SystemFile & SF,
       SF << "connect \"/usr/sbin/chat -s -v -f /etc/chatscripts/" 
-         << removeSpaces( connection()->name() ) 
+         << removeSpaces( networkSetup()->name() ) 
          << "\"" 
@@ -137,3 +137,3 @@ short AGPRSDevice::generateFile( SystemFile & SF,
         SF << "logfile /tmp/" 
-           << removeSpaces( connection()->name() ) 
+           << removeSpaces( networkSetup()->name() ) 
            << oendl;
@@ -148,5 +148,5 @@ short AGPRSDevice::generateFile( SystemFile & SF,
       SF << "usepeerdns" << oendl;
-      SF << "linkname " << removeSpaces( connection()->name() ) << oendl;
+      SF << "linkname " << removeSpaces( networkSetup()->name() ) << oendl;
       SF << "nopersist" << oendl;
-      SF << "ipparam " << removeSpaces( connection()->name() ) <<oendl;
+      SF << "ipparam " << removeSpaces( networkSetup()->name() ) <<oendl;
       SF << "maxfail 1" << oendl;
@@ -194,3 +194,3 @@ short AGPRSDevice::generateFile( SystemFile & SF,
            << " # profile "
-           << removeSpaces( connection()->name() )
+           << removeSpaces( networkSetup()->name() )
            <<oendl;
@@ -202,3 +202,3 @@ short AGPRSDevice::generateFile( SystemFile & SF,
            << " # profile "
-           << removeSpaces( connection()->name() )
+           << removeSpaces( networkSetup()->name() )
            <<oendl;
@@ -213,3 +213,3 @@ bool AGPRSDevice::openFile( SystemFile & SF ) {
           QString( "/etc/ppp/peers/" ) + 
-              removeSpaces( connection()->name() )
+              removeSpaces( networkSetup()->name() )
           );
@@ -219,3 +219,3 @@ bool AGPRSDevice::openFile( SystemFile & SF ) {
           QString( "/etc/chatscripts/" ) + 
-              removeSpaces( connection()->name() )
+              removeSpaces( networkSetup()->name() )
           );
@@ -225,3 +225,3 @@ bool AGPRSDevice::openFile( SystemFile & SF ) {
           QString( "/etc/ppp/" ) + 
-              removeSpaces( connection()->name() ) + ".fixed"
+              removeSpaces( networkSetup()->name() ) + ".fixed"
           );
diff --git a/noncore/settings/networksettings2/gprs/GPRSrun.cpp b/noncore/settings/networksettings2/gprs/GPRSrun.cpp
index cccc71a..fd61f3a 100644
--- a/noncore/settings/networksettings2/gprs/GPRSrun.cpp
+++ b/noncore/settings/networksettings2/gprs/GPRSrun.cpp
@@ -13,3 +13,3 @@ State_t GPRSRun::detectState( void ) {
       // is rfcomm still active
-      NodeCollection * NC = nodeCollection();
+      NetworkSetup * NC = networkSetup();
       InterfaceInfo * I = NC->assignedInterface();
@@ -64,3 +64,3 @@ State_t GPRSRun::detectState( void ) {
 
-QString GPRSRun::setMyState( NodeCollection * NC, Action_t A , bool ) { 
+QString GPRSRun::setMyState( NetworkSetup * NC, Action_t A , bool ) { 
 
diff --git a/noncore/settings/networksettings2/gprs/GPRSrun.h b/noncore/settings/networksettings2/gprs/GPRSrun.h
index 817f8a9..c3c2015 100644
--- a/noncore/settings/networksettings2/gprs/GPRSrun.h
+++ b/noncore/settings/networksettings2/gprs/GPRSrun.h
@@ -26,3 +26,3 @@ protected :
 
-      QString setMyState( NodeCollection * , Action_t, bool );
+      QString setMyState( NetworkSetup * , Action_t, bool );
 
diff --git a/noncore/settings/networksettings2/irda/irdarun.h b/noncore/settings/networksettings2/irda/irdarun.h
index d3b714b..e5ba79a 100644
--- a/noncore/settings/networksettings2/irda/irdarun.h
+++ b/noncore/settings/networksettings2/irda/irdarun.h
@@ -22,3 +22,3 @@ protected :
 
-      QString setMyState( NodeCollection * , Action_t, bool )
+      QString setMyState( NetworkSetup * , Action_t, bool )
         { return QString(); }
diff --git a/noncore/settings/networksettings2/lancard/lancardrun.cpp b/noncore/settings/networksettings2/lancard/lancardrun.cpp
index 8157dce..8a71aa9 100644
--- a/noncore/settings/networksettings2/lancard/lancardrun.cpp
+++ b/noncore/settings/networksettings2/lancard/lancardrun.cpp
@@ -12,3 +12,3 @@ State_t LanCardRun::detectState( void ) {
 
-    NodeCollection * NC = nodeCollection();
+    NetworkSetup * NC = networkSetup();
     QString S = QString( "/tmp/profile-%1.up" ).
@@ -72,3 +72,3 @@ State_t LanCardRun::detectState( void ) {
 
-QString LanCardRun::setMyState( NodeCollection * NC, Action_t A, bool ) {
+QString LanCardRun::setMyState( NetworkSetup * NC, Action_t A, bool ) {
 
@@ -116,6 +116,6 @@ InterfaceInfo * LanCardRun::getInterface( void ) {
         // this is a LAN card
-        if( Run->assignedConnection() == netNode()->connection() ) {
+        if( Run->assignedToNetworkSetup() == netNode()->networkSetup() ) {
           // assigned to us
           return Run;
-        } else if( Run->assignedConnection() == 0 ) {
+        } else if( Run->assignedToNetworkSetup() == 0 ) {
           // free
diff --git a/noncore/settings/networksettings2/lancard/lancardrun.h b/noncore/settings/networksettings2/lancard/lancardrun.h
index 57ef3fb..dfd3d62 100644
--- a/noncore/settings/networksettings2/lancard/lancardrun.h
+++ b/noncore/settings/networksettings2/lancard/lancardrun.h
@@ -27,3 +27,3 @@ protected :
 
-      QString setMyState( NodeCollection * , Action_t, bool );
+      QString setMyState( NetworkSetup * , Action_t, bool );
 
diff --git a/noncore/settings/networksettings2/modem/modemrun.h b/noncore/settings/networksettings2/modem/modemrun.h
index eb3a193..df6b370 100644
--- a/noncore/settings/networksettings2/modem/modemrun.h
+++ b/noncore/settings/networksettings2/modem/modemrun.h
@@ -22,3 +22,3 @@ protected :
 
-      QString setMyState( NodeCollection * , Action_t, bool )
+      QString setMyState( NetworkSetup * , Action_t, bool )
         { return QString(); }
diff --git a/noncore/settings/networksettings2/network/network_NN.cpp b/noncore/settings/networksettings2/network/network_NN.cpp
index 2fa31bd..80a7fac 100644
--- a/noncore/settings/networksettings2/network/network_NN.cpp
+++ b/noncore/settings/networksettings2/network/network_NN.cpp
@@ -14,3 +14,3 @@ static const char * NetworkNeeds[] =
 static const char * NetworkProvides[] = 
-    { "connection",
+    { "NetworkSetup",
       0
diff --git a/noncore/settings/networksettings2/network/network_NNI.cpp b/noncore/settings/networksettings2/network/network_NNI.cpp
index 34dac54..c183d5e 100644
--- a/noncore/settings/networksettings2/network/network_NNI.cpp
+++ b/noncore/settings/networksettings2/network/network_NNI.cpp
@@ -119,3 +119,3 @@ short ANetwork::generateFile( SystemFile &SF,
            << "A" 
-           << connection()->number() 
+           << networkSetup()->number() 
            << NIC 
@@ -126,3 +126,3 @@ short ANetwork::generateFile( SystemFile &SF,
            << "\" > /tmp/profile-" 
-           << connection()->number() 
+           << networkSetup()->number() 
            << ".up" 
@@ -136,3 +136,3 @@ short ANetwork::generateFile( SystemFile &SF,
         SF << "  down rm -f /tmp/profile-" 
-           << connection()->number() 
+           << networkSetup()->number() 
            << ".up"
@@ -142,3 +142,3 @@ short ANetwork::generateFile( SystemFile &SF,
            << "A" 
-           << connection()->number() 
+           << networkSetup()->number() 
            << NIC 
@@ -149,3 +149,3 @@ short ANetwork::generateFile( SystemFile &SF,
            << "\" > /tmp/profile-" 
-           << connection()->number() 
+           << networkSetup()->number() 
            << ".up" 
@@ -153,3 +153,3 @@ short ANetwork::generateFile( SystemFile &SF,
         SF << "  down rm -f /tmp/profile-" 
-           << connection()->number() 
+           << networkSetup()->number() 
            << ".up" 
@@ -213,3 +213,3 @@ short ANetwork::generateFile( SystemFile &SF,
     // embed other info in it
-    rvd = connection()->getToplevel()->generateFileEmbedded( SF, DevNr );
+    rvd = networkSetup()->getToplevel()->generateFileEmbedded( SF, DevNr );
 
diff --git a/noncore/settings/networksettings2/network/networkrun.cpp b/noncore/settings/networksettings2/network/networkrun.cpp
index 74467ad..7039a36 100644
--- a/noncore/settings/networksettings2/network/networkrun.cpp
+++ b/noncore/settings/networksettings2/network/networkrun.cpp
@@ -6,5 +6,4 @@
 State_t NetworkRun::detectState( void ) { 
-    InterfaceInfo * II = nodeCollection()->assignedInterface();
+    InterfaceInfo * II = networkSetup()->assignedInterface();
 
-    Log(( "Interface %p %p : %d\n", II, nodeCollection(), (II) ? II->IsUp : 0 ));
     if( II && II->IsUp ) {
@@ -15,3 +14,3 @@ State_t NetworkRun::detectState( void ) {
     // had no interface or interface is no longer up -> release
-    nodeCollection()->assignInterface( 0 );
+    networkSetup()->assignInterface( 0 );
 
@@ -20,3 +19,3 @@ State_t NetworkRun::detectState( void ) {
 
-QString NetworkRun::setMyState( NodeCollection * NC, Action_t A, bool ) { 
+QString NetworkRun::setMyState( NetworkSetup * NC, Action_t A, bool ) { 
     // we handle UP and DOWN
@@ -42,3 +41,3 @@ QString NetworkRun::setMyState( NodeCollection * NC, Action_t A, bool ) {
                         II->Name.latin1(), 
-                        nodeCollection()->number(),
+                        networkSetup()->number(),
                         II->Name.latin1() );
diff --git a/noncore/settings/networksettings2/network/networkrun.h b/noncore/settings/networksettings2/network/networkrun.h
index 78a1694..ac186e7 100644
--- a/noncore/settings/networksettings2/network/networkrun.h
+++ b/noncore/settings/networksettings2/network/networkrun.h
@@ -18,3 +18,3 @@ protected :
 
-      QString setMyState( NodeCollection * , Action_t, bool );
+      QString setMyState( NetworkSetup * , Action_t, bool );
 };
diff --git a/noncore/settings/networksettings2/networksettings.cpp b/noncore/settings/networksettings2/networksettings.cpp
index 78b6cce..80dcb3d 100644
--- a/noncore/settings/networksettings2/networksettings.cpp
+++ b/noncore/settings/networksettings2/networksettings.cpp
@@ -66,6 +66,6 @@ NetworkSettings::NetworkSettings( QWidget *parent,
 
-    { Name2Connection_t & M = NSResources->connections();
-      NodeCollection * NC;
-      // for all connections
-      for( QDictIterator<NodeCollection> it(M);
+    { Name2NetworkSetup_t & M = NSResources->networkSetups();
+      NetworkSetup * NC;
+      // for all NetworkSetups
+      for( QDictIterator<NetworkSetup> it(M);
            it.current();
@@ -83,3 +83,3 @@ NetworkSettings::NetworkSettings( QWidget *parent,
     // if no profiles -> auto popup editing
-    if( NSResources->connections().count() == 0 ) {
+    if( NSResources->networkSetups().count() == 0 ) {
       QTimer::singleShot( 100, this, SLOT(SLOT_AddNode() ) );
@@ -138,6 +138,6 @@ void NetworkSettings::SLOT_RefreshStates( void ) {
     if( LBI ) {
-      NodeCollection * NC;
+      NetworkSetup * NC;
       NSResources->system().probeInterfaces();
       // update current selection only
-      NC = NSResources->findConnection( LBI->text() );
+      NC = NSResources->findNetworkSetup( LBI->text() );
       if( NC ) {
@@ -154,6 +154,6 @@ void NetworkSettings::SLOT_RefreshStates( void ) {
     bool is;
-    NodeCollection * NC;
+    NetworkSetup * NC;
 
     for( unsigned int i = 0; i < Profiles_LB->count() ; i ++ ) {
-      NC = NSResources->findConnection( Profiles_LB->text(i) );
+      NC = NSResources->findNetworkSetup( Profiles_LB->text(i) );
       if( NC ) {
@@ -192,3 +192,3 @@ void NetworkSettings::SLOT_DeleteNode( void ) {
           1, 0 ) == 1 ) {
-      NSResources->removeConnection( LBI->text() );
+      NSResources->removeNetworkSetup( LBI->text() );
       delete LBI;
@@ -201,6 +201,6 @@ void NetworkSettings::SLOT_EditNode( QListBoxItem * LBI ) {
 
-    EditConnection EC( this );
+    EditNetworkSetup EC( this );
 
     if( LBI ) {
-      NodeCollection * NC = NSResources->findConnection( LBI->text() );
+      NetworkSetup * NC = NSResources->findNetworkSetup( LBI->text() );
       if( ! NC ) {
@@ -209,3 +209,3 @@ void NetworkSettings::SLOT_EditNode( QListBoxItem * LBI ) {
       OldName = NC->name();
-      EC.setConnection( NC );
+      EC.setNetworkSetup( NC );
     }
@@ -220,3 +220,3 @@ void NetworkSettings::SLOT_EditNode( QListBoxItem * LBI ) {
         // toplevel item -> store
-        NodeCollection * NC = EC.connection();
+        NetworkSetup * NC = EC.networkSetup();
         if( NC->isModified() ) {
@@ -225,3 +225,3 @@ void NetworkSettings::SLOT_EditNode( QListBoxItem * LBI ) {
               // find if new name is free
-              NodeCollection * LCN = NSResources->findConnection(
+              NetworkSetup * LCN = NSResources->findNetworkSetup(
                     NC->name() );
@@ -236,4 +236,4 @@ void NetworkSettings::SLOT_EditNode( QListBoxItem * LBI ) {
               // new name -> remove item
-              NSResources->removeConnection( OldName );
-              NSResources->addConnection( NC, 0 );
+              NSResources->removeNetworkSetup( OldName );
+              NSResources->addNetworkSetup( NC, 0 );
             } // else not changed
@@ -248,4 +248,4 @@ void NetworkSettings::SLOT_EditNode( QListBoxItem * LBI ) {
             int ci = Profiles_LB->count();
-            NSResources->addConnection( NC, 0 );
-            NC->setNumber( NSResources->assignConnectionNumber() );
+            NSResources->addNetworkSetup( NC, 0 );
+            NC->setNumber( NSResources->assignNetworkSetupNumber() );
             Profiles_LB->insertItem( NC->devicePixmap(), NC->name() );
@@ -256,5 +256,5 @@ void NetworkSettings::SLOT_EditNode( QListBoxItem * LBI ) {
       } else {
-        // cancelled : reset connection 
+        // cancelled : reset NetworkSetup 
         if( LBI ) {
-          NodeCollection * NC = NSResources->findConnection( LBI->text() );
+          NetworkSetup * NC = NSResources->findNetworkSetup( LBI->text() );
           NC->reassign();
@@ -272,3 +272,3 @@ void NetworkSettings::SLOT_ShowNode( QListBoxItem * LBI ) {
 
-    NodeCollection * NC = NSResources->findConnection( LBI->text() );
+    NetworkSetup * NC = NSResources->findNetworkSetup( LBI->text() );
 
@@ -355,3 +355,3 @@ void NetworkSettings::SLOT_Disable( bool T ) {
 
-    NodeCollection * NC = NSResources->findConnection( LBI->text() );
+    NetworkSetup * NC = NSResources->findNetworkSetup( LBI->text() );
 
@@ -384,4 +384,4 @@ void NetworkSettings::SLOT_Up( void ) {
 
-    NodeCollection * NC = 
-        NSResources->findConnection( LBI->text() );
+    NetworkSetup * NC = 
+        NSResources->findNetworkSetup( LBI->text() );
 
@@ -440,4 +440,4 @@ void NetworkSettings::SLOT_Down( void ) {
 
-    NodeCollection * NC = 
-        NSResources->findConnection( LBI->text() );
+    NetworkSetup * NC = 
+        NSResources->findNetworkSetup( LBI->text() );
 
diff --git a/noncore/settings/networksettings2/networksettings2/asconnection.h b/noncore/settings/networksettings2/networksettings2/asconnection.h
index 1ed7e74..eeb0939 100644
--- a/noncore/settings/networksettings2/networksettings2/asconnection.h
+++ b/noncore/settings/networksettings2/networksettings2/asconnection.h
@@ -6,4 +6,4 @@
 // pure virtual (component oriented) interface of any
-// plugin that offers a connection
-class AsConnection : public RuntimeInfo {
+// plugin that offers a networkSetup
+class AsNetworkSetup : public RuntimeInfo {
 
@@ -11,3 +11,3 @@ public :
 
-    AsConnection( ANetNodeInstance * NNI ) :
+    AsNetworkSetup( ANetNodeInstance * NNI ) :
         RuntimeInfo( NNI ) { 
diff --git a/noncore/settings/networksettings2/networksettings2/netnode.cpp b/noncore/settings/networksettings2/networksettings2/netnode.cpp
index f00e0b3..0ab0e5b 100644
--- a/noncore/settings/networksettings2/networksettings2/netnode.cpp
+++ b/noncore/settings/networksettings2/networksettings2/netnode.cpp
@@ -127,3 +127,3 @@ void ANetNodeInstance::saveAttributes( QTextStream & TS ) {
 ANetNodeInstance * ANetNodeInstance::nextNode( void ) {
-    return connection()->findNext( this );
+    return networkSetup()->findNext( this );
 }
@@ -136,3 +136,3 @@ ANetNodeInstance * ANetNodeInstance::nextNode( void ) {
 
-NodeCollection::NodeCollection( void ) : QList<ANetNodeInstance>() {
+NetworkSetup::NetworkSetup( void ) : QList<ANetNodeInstance>() {
     IsModified = 0;
@@ -147,3 +147,3 @@ NodeCollection::NodeCollection( void ) : QList<ANetNodeInstance>() {
 
-NodeCollection::NodeCollection( QTextStream & TS, bool & Dangling ) :
+NetworkSetup::NetworkSetup( QTextStream & TS, bool & Dangling ) :
       QList<ANetNodeInstance>() {
@@ -189,3 +189,3 @@ NodeCollection::NodeCollection( QTextStream & TS, bool & Dangling ) :
           // could not find a node type -> collection invalid
-          Log(( "Node %s missing -> connection dangling\n", 
+          Log(( "Node %s missing -> NetworkSetup dangling\n", 
                       N.latin1() ));
@@ -202,6 +202,6 @@ NodeCollection::NodeCollection( QTextStream & TS, bool & Dangling ) :
 
-NodeCollection::~NodeCollection( void ) {
+NetworkSetup::~NetworkSetup( void ) {
 }
 
-const QString & NodeCollection::description( void ) {
+const QString & NetworkSetup::description( void ) {
     ANetNodeInstance * NNI = getToplevel();
@@ -210,4 +210,4 @@ const QString & NodeCollection::description( void ) {
 
-void NodeCollection::append( ANetNodeInstance * NNI ) {
-    NNI->setConnection( this );
+void NetworkSetup::append( ANetNodeInstance * NNI ) {
+    NNI->setNetworkSetup( this );
     QList<ANetNodeInstance>::append( NNI );
@@ -215,3 +215,3 @@ void NodeCollection::append( ANetNodeInstance * NNI ) {
 
-void NodeCollection::save( QTextStream & TS ) {
+void NetworkSetup::save( QTextStream & TS ) {
 
@@ -230,3 +230,3 @@ void NodeCollection::save( QTextStream & TS ) {
 
-ANetNodeInstance * NodeCollection::getToplevel( void ) {
+ANetNodeInstance * NetworkSetup::getToplevel( void ) {
     ANetNodeInstance * NNI = 0;
@@ -243,3 +243,3 @@ ANetNodeInstance * NodeCollection::getToplevel( void ) {
 
-ANetNodeInstance * NodeCollection::findByName( const QString & S ) {
+ANetNodeInstance * NetworkSetup::findByName( const QString & S ) {
     ANetNodeInstance * NNI = 0;
@@ -256,3 +256,3 @@ ANetNodeInstance * NodeCollection::findByName( const QString & S ) {
 
-ANetNodeInstance * NodeCollection::findNext( ANetNodeInstance * NNI ) {
+ANetNodeInstance * NetworkSetup::findNext( ANetNodeInstance * NNI ) {
     ANetNodeInstance * NNNI;
@@ -274,3 +274,3 @@ ANetNodeInstance * NodeCollection::findNext( ANetNodeInstance * NNI ) {
 
-int NodeCollection::compareItems( QCollection::Item I1, 
+int NetworkSetup::compareItems( QCollection::Item I1, 
                                   QCollection::Item I2 ) {
@@ -292,3 +292,3 @@ static char * State2PixmapTbl[] = {
 
-QPixmap NodeCollection::devicePixmap( void ) {
+QPixmap NetworkSetup::devicePixmap( void ) {
     QPixmap pm = NSResources->getPixmap(
@@ -310,3 +310,3 @@ QPixmap NodeCollection::devicePixmap( void ) {
 
-QPixmap NodeCollection::statePixmap( State_t S) {
+QPixmap NetworkSetup::statePixmap( State_t S) {
     return NSResources->getPixmap( State2PixmapTbl[S] );
@@ -314,3 +314,3 @@ QPixmap NodeCollection::statePixmap( State_t S) {
 
-QString NodeCollection::stateName( State_t S) {
+QString NetworkSetup::stateName( State_t S) {
     switch( S ) {
@@ -335,3 +335,3 @@ QString NodeCollection::stateName( State_t S) {
 
-void NodeCollection::reassign( void ) {
+void NetworkSetup::reassign( void ) {
     for( QListIterator<ANetNodeInstance> it(*this); 
@@ -339,3 +339,3 @@ void NodeCollection::reassign( void ) {
          ++it ) {
-      it.current()->setConnection( this );
+      it.current()->setNetworkSetup( this );
     }
@@ -343,3 +343,3 @@ void NodeCollection::reassign( void ) {
 
-const QStringList & NodeCollection::triggers() {
+const QStringList & NetworkSetup::triggers() {
     return getToplevel()->runtime()->triggers();
@@ -347,3 +347,3 @@ const QStringList & NodeCollection::triggers() {
 
-bool NodeCollection::hasDataForFile( SystemFile & S ) {
+bool NetworkSetup::hasDataForFile( SystemFile & S ) {
     return ( firstWithDataForFile( S ) != 0 );
@@ -351,3 +351,3 @@ bool NodeCollection::hasDataForFile( SystemFile & S ) {
 
-ANetNodeInstance * NodeCollection::firstWithDataForFile( SystemFile & S ) {
+ANetNodeInstance * NetworkSetup::firstWithDataForFile( SystemFile & S ) {
     for( QListIterator<ANetNodeInstance> it(*this); 
@@ -362,3 +362,3 @@ ANetNodeInstance * NodeCollection::firstWithDataForFile( SystemFile & S ) {
 
-State_t NodeCollection::state( bool Update ) {
+State_t NetworkSetup::state( bool Update ) {
     State_t NodeState;
@@ -369,3 +369,3 @@ State_t NodeCollection::state( bool Update ) {
 
-      Log(( "Connection %s state %s\n", 
+      Log(( "NetworkSetup %s state %s\n", 
                 Name.latin1(), StateName[CurrentState] ));
@@ -397,3 +397,3 @@ State_t NodeCollection::state( bool Update ) {
 
-QString NodeCollection::setState( Action_t A, bool Force ) {
+QString NetworkSetup::setState( Action_t A, bool Force ) {
 
@@ -494,2 +494,11 @@ QString NodeCollection::setState( Action_t A, bool Force ) {
 
+void NetworkSetup::copyFrom( const NetworkSetup & N ) {
+    Number = N.Number;
+    CurrentState = N.CurrentState;
+    Name = N.Name;
+    IsNew = N.IsNew;
+    Index = N.Index;
+    AssignedInterface = N.AssignedInterface;
+}
+
 //
@@ -500,3 +509,3 @@ QString NodeCollection::setState( Action_t A, bool Force ) {
 
-QString RuntimeInfo::setState( NodeCollection * NC, 
+QString RuntimeInfo::setState( NetworkSetup * NC, 
                                Action_t A, 
diff --git a/noncore/settings/networksettings2/networksettings2/netnode.h b/noncore/settings/networksettings2/networksettings2/netnode.h
index 151d546..8aebdc0 100644
--- a/noncore/settings/networksettings2/networksettings2/netnode.h
+++ b/noncore/settings/networksettings2/networksettings2/netnode.h
@@ -17,3 +17,3 @@ class AsDevice;
 class AsLine;
-class AsConnection;
+class AsNetworkSetup;
 class AsFullSetup;
@@ -25,3 +25,3 @@ class ANetNode;
 class ANetNodeInstance;
-class NodeCollection;
+class NetworkSetup;
 class QTextStream;
@@ -41,6 +41,6 @@ typedef enum State {
     Unknown = 1,
-    // if connection cannot be established e.g. because
+    // if networkSetup cannot be established e.g. because
     // the hardware is not available
     Unavailable = 2,
-    // if the connection cannot be establishec but NOT
+    // if the networkSetup cannot be establishec but NOT
     // because it is physically impossible but because
@@ -48,9 +48,9 @@ typedef enum State {
     Disabled = 3,
-    // if connection is available to is currently down
+    // if networkSetup is available to is currently down
     // i.e. the corresponding hardware is not activated
     Off = 4,
-    // if connection is available to be used (i.e. the
+    // if networkSetup is available to be used (i.e. the
     // devices if fully ready to be used
     Available = 5,
-    // if connection is being used
+    // if networkSetup is being used
     IsUp = 6
@@ -67,5 +67,5 @@ typedef enum Action {
     Deactivate = 3,
-    // bring the connection up -> to IsUp
+    // bring the networkSetup up -> to IsUp
     Up = 4,
-    // bring the connection down -> to Available
+    // bring the networkSetup down -> to Available
     Down = 5
@@ -93,3 +93,3 @@ public:
 
-    // does this Node provide a Connection
+    // does this Node provide a NetworkSetup
     bool isToplevel( void );
@@ -247,6 +247,6 @@ public:
 
-    inline void setConnection( NodeCollection * NC ) 
-      { Connection = NC; }
-    inline NodeCollection * connection( void ) 
-      { return Connection; }
+    inline void setNetworkSetup( NetworkSetup * NC ) 
+      { TheNetworkSetup = NC; }
+    inline NetworkSetup * networkSetup( void ) 
+      { return TheNetworkSetup; }
 
@@ -317,4 +317,4 @@ protected :
     ANetNode * NodeType;
-    // connection to which this node belongs to
-    NodeCollection * Connection;
+    // networkSetup to which this node belongs to
+    NetworkSetup * TheNetworkSetup;
     QString   Description;
@@ -380,3 +380,3 @@ public :
       //
-      // methods to be overloaded by connection capable
+      // methods to be overloaded by networkSetup capable
       // runtimes
@@ -477,4 +477,4 @@ public :
 
-      inline NodeCollection * nodeCollection() 
-        { return NNI->connection(); }
+      inline NetworkSetup * networkSetup() 
+        { return NNI->networkSetup(); }
 
@@ -482,3 +482,3 @@ public :
       // public API to set the state
-      virtual QString setState( NodeCollection * NC, 
+      virtual QString setState( NetworkSetup * NC, 
                                 Action_t A, 
@@ -499,3 +499,3 @@ protected :
       // set state of this node (private API)
-      virtual QString setMyState( NodeCollection * NC, 
+      virtual QString setMyState( NetworkSetup * NC, 
                                 Action_t A, 
@@ -503,3 +503,3 @@ protected :
 
-      // connection this runtime info belongs to
+      // networkSetup this runtime info belongs to
       ANetNodeInstance * NNI;
@@ -507,3 +507,3 @@ protected :
 
-class NodeCollection : public QList<ANetNodeInstance> {
+class NetworkSetup : public QList<ANetNodeInstance> {
 
@@ -511,5 +511,8 @@ public :
 
-      NodeCollection( void );
-      NodeCollection( QTextStream & TS, bool & Dangling );
-      ~NodeCollection( void );
+      NetworkSetup( void );
+      NetworkSetup( QTextStream & TS, bool & Dangling );
+      ~NetworkSetup( void );
+
+      // copy settings from NC to this 
+      void copyFrom( const NetworkSetup & NC );
 
@@ -545,11 +548,11 @@ public :
       inline void assignInterface( InterfaceInfo * NI ) {
-        if( NI == 0 ) {
-          if( AssignedInterface ) {
-            AssignedInterface->assignConnection( 0 );
-          }
-        }
-        AssignedInterface = NI;
+        // cleanup previous
         if( AssignedInterface ) {
-          AssignedInterface->assignConnection( this );
+          AssignedInterface->assignToNetworkSetup( 0 );
         }
+        if( NI ) {
+          // assign new
+          NI->assignToNetworkSetup( this );
+        }
+        AssignedInterface = NI;
       }
@@ -579,3 +582,3 @@ public :
 
-      // makes sure that all items in the connection point to 
+      // makes sure that all items in the networkSetup point to 
       // that connectoin
@@ -621,3 +624,3 @@ private :
 
-      // state of this connection
+      // state of this networkSetup
       State_t CurrentState;
diff --git a/noncore/settings/networksettings2/networksettings2/resources.cpp b/noncore/settings/networksettings2/networksettings2/resources.cpp
index b81dcaa..0e72c25 100644
--- a/noncore/settings/networksettings2/networksettings2/resources.cpp
+++ b/noncore/settings/networksettings2/networksettings2/resources.cpp
@@ -27,3 +27,3 @@ TheNSResources * _NSResources = 0;
 TheNSResources::TheNSResources( void ) : NodeTypeNameMap(),
-        ConnectionsMap(), DanglingConnectionsMap() {
+        NetworkSetupsMap(), DanglingNetworkSetupsMap() {
 
@@ -82,8 +82,8 @@ TheNSResources::TheNSResources( void ) : NodeTypeNameMap(),
          tr( "<p>Devices that can handle single bytes</p>" ) );
-    addNodeType( "connection", tr( "IP Connection" ),
-         tr( "<p>Nodes that provide working IP connections</p>" ) );
-    addNodeType( "fullsetup", tr( "Connection Profile" ),
-         tr( "<p>Fully configured connection profile</p>" ) );
-    addNodeType( "GPRS", tr( "Connection to GPRS device" ),
-         tr( "<p>Connection to a GPRS capable device</p>" ) );
+    addNodeType( "NetworkSetup", tr( "IP NetworkSetup" ),
+         tr( "<p>Nodes that provide working IP NetworkSetups</p>" ) );
+    addNodeType( "fullsetup", tr( "NetworkSetup Profile" ),
+         tr( "<p>Fully configured NetworkSetup profile</p>" ) );
+    addNodeType( "GPRS", tr( "NetworkSetup to GPRS device" ),
+         tr( "<p>NetworkSetup to a GPRS capable device</p>" ) );
 
@@ -203,4 +203,4 @@ void TheNSResources::findAvailableNetNodes( void ){
 
-// used to find unique connection number
-int TheNSResources::assignConnectionNumber( void ) {
+// used to find unique NetworkSetup number
+int TheNSResources::assignNetworkSetupNumber( void ) {
       bool found = 1;
@@ -208,3 +208,3 @@ int TheNSResources::assignConnectionNumber( void ) {
         found = 1; 
-        for( QDictIterator<NodeCollection> it(ConnectionsMap);
+        for( QDictIterator<NetworkSetup> it(NetworkSetupsMap);
              it.current();
@@ -247,10 +247,10 @@ const QString & TheNSResources::netNode2Description( const char * s ) {
 
-void TheNSResources::addConnection( NodeCollection * NC, bool Dangling ) {
+void TheNSResources::addNetworkSetup( NetworkSetup * NC, bool Dangling ) {
       ANetNodeInstance * NNI;
-      Log(( "Add Connection %s, Dangling %d\n",
+      Log(( "Add NetworkSetup %s, Dangling %d\n",
           NC->name().latin1(), Dangling ));
       if( Dangling ) {
-        DanglingConnectionsMap.insert( NC->name(), NC );
+        DanglingNetworkSetupsMap.insert( NC->name(), NC );
       } else {
-        ConnectionsMap.insert( NC->name(), NC );
+        NetworkSetupsMap.insert( NC->name(), NC );
       }
@@ -269,4 +269,4 @@ void TheNSResources::addConnection( NodeCollection * NC, bool Dangling ) {
 
-void TheNSResources::removeConnection( const QString & N ) {
-      NodeCollection * NC = findConnection( N );
+void TheNSResources::removeNetworkSetup( const QString & N ) {
+      NetworkSetup * NC = findNetworkSetup( N );
       if( ! NC )
@@ -274,3 +274,3 @@ void TheNSResources::removeConnection( const QString & N ) {
 
-      // delete netnodes in this connection
+      // delete netnodes in this NetworkSetup
       ANetNodeInstance * NNI;
@@ -279,6 +279,6 @@ void TheNSResources::removeConnection( const QString & N ) {
       }
-      if( ConnectionsMap.find( N ) ) {
-        ConnectionsMap.remove( N ); 
+      if( NetworkSetupsMap.find( N ) ) {
+        NetworkSetupsMap.remove( N ); 
       } else {
-        DanglingConnectionsMap.remove( N ); 
+        DanglingNetworkSetupsMap.remove( N ); 
       }
@@ -287,9 +287,9 @@ void TheNSResources::removeConnection( const QString & N ) {
 
-// dangling connections are filtered out
-NodeCollection * TheNSResources::findConnection( const QString & S ) {
-      return ConnectionsMap[ S ];
+// dangling NetworkSetups are filtered out
+NetworkSetup * TheNSResources::findNetworkSetup( const QString & S ) {
+      return NetworkSetupsMap[ S ];
 }
 
-NodeCollection *  TheNSResources::getConnection( int nr ) {
-      for( QDictIterator<NodeCollection> it(ConnectionsMap);
+NetworkSetup *  TheNSResources::getNetworkSetup( int nr ) {
+      for( QDictIterator<NetworkSetup> it(NetworkSetupsMap);
            it.current();
@@ -303,9 +303,9 @@ NodeCollection *  TheNSResources::getConnection( int nr ) {
 /*
-void TheNSResources::renumberConnections( void ) {
-      Name2Connection_t & M = NSResources->connections();
-      NodeCollection * NC;
+void TheNSResources::renumberNetworkSetups( void ) {
+      Name2NetworkSetup_t & M = NSResources->NetworkSetups();
+      NetworkSetup * NC;
 
-      // for all connections
-      NodeCollection::resetMaxNr();
-      for( QDictIterator<NodeCollection> it(M);
+      // for all NetworkSetups
+      NetworkSetup::resetMaxNr();
+      for( QDictIterator<NetworkSetup> it(M);
            it.current();
@@ -313,3 +313,3 @@ void TheNSResources::renumberConnections( void ) {
         NC = it.current();
-        NC->setNumber( NC->maxConnectionNumber()+1 );
+        NC->setNumber( NC->maxNetworkSetupNumber()+1 );
         NC->setModified( 1 );
diff --git a/noncore/settings/networksettings2/networksettings2/resources.h b/noncore/settings/networksettings2/networksettings2/resources.h
index 51c4250..f7393d3 100644
--- a/noncore/settings/networksettings2/networksettings2/resources.h
+++ b/noncore/settings/networksettings2/networksettings2/resources.h
@@ -42,3 +42,3 @@ typedef QDict<ANetNode>  Name2NetNode_t;
 typedef QDict<ANetNodeInstance > Name2Instance_t;
-typedef QDict<NodeCollection> Name2Connection_t;
+typedef QDict<NetworkSetup> Name2NetworkSetup_t;
 typedef QDict<SystemFile> Name2SystemFile_t;
@@ -58,3 +58,3 @@ public :
 
-    int assignConnectionNumber(void);
+    int assignNetworkSetupNumber(void);
     QPixmap getPixmap( const QString & Name );
@@ -105,10 +105,10 @@ public :
 
-    void addConnection( NodeCollection * NC, bool Dangling );
-    void removeConnection( const QString & N );
-    NodeCollection * findConnection( const QString & N );
-    NodeCollection * getConnection( int nr );
-    Name2Connection_t & connections( void )
-      { return ConnectionsMap; }
-    Name2Connection_t & danglingConnections( void )
-      { return DanglingConnectionsMap; }
+    void addNetworkSetup( NetworkSetup * NC, bool Dangling );
+    void removeNetworkSetup( const QString & N );
+    NetworkSetup * findNetworkSetup( const QString & N );
+    NetworkSetup * getNetworkSetup( int nr );
+    Name2NetworkSetup_t & networkSetups( void )
+      { return NetworkSetupsMap; }
+    Name2NetworkSetup_t & danglingNetworkSetups( void )
+      { return DanglingNetworkSetupsMap; }
 
@@ -128,7 +128,7 @@ private :
     QMap< QString, QString>   NodeTypeDescriptionMap;
-    // list of connections that are valid
-    Name2Connection_t         ConnectionsMap;
-    // list of connection configurations that are not valid
+    // list of networkSetups that are valid
+    Name2NetworkSetup_t         NetworkSetupsMap;
+    // list of networkSetup configurations that are not valid
     // e.g. because plugins are missing
-    Name2Connection_t         DanglingConnectionsMap;
+    Name2NetworkSetup_t         DanglingNetworkSetupsMap;
     System *                  TheSystem;
diff --git a/noncore/settings/networksettings2/networksettings2/system.cpp b/noncore/settings/networksettings2/networksettings2/system.cpp
index a290f08..33cc5bd 100644
--- a/noncore/settings/networksettings2/networksettings2/system.cpp
+++ b/noncore/settings/networksettings2/networksettings2/system.cpp
@@ -455,3 +455,3 @@ InterfaceInfo * System::findInterface( const QString & N ) {
       InterfaceInfo * Run;
-      // has PAN connection UP interface ?
+      // has PAN NetworkSetup UP interface ?
       for( QDictIterator<InterfaceInfo> It(ProbedInterfaces);
@@ -461,3 +461,3 @@ InterfaceInfo * System::findInterface( const QString & N ) {
         if( N == Run->Name ) {
-          // this PAN connection is up
+          // this PAN NetworkSetup is up
           return Run;
diff --git a/noncore/settings/networksettings2/networksettings2/system.h b/noncore/settings/networksettings2/networksettings2/system.h
index ebee0d5..794b868 100644
--- a/noncore/settings/networksettings2/networksettings2/system.h
+++ b/noncore/settings/networksettings2/networksettings2/system.h
@@ -15,3 +15,3 @@ using namespace Opie::Core;
 
-class NodeCollection;
+class NetworkSetup;
 class ANetNodeInstance;
@@ -68,9 +68,9 @@ public :
 
-        NodeCollection * assignedConnection()
+        NetworkSetup * assignedToNetworkSetup()
           { return Collection; }
 
-        void assignConnection( NodeCollection * NNI )
+        void assignToNetworkSetup( NetworkSetup * NNI )
           { Collection = NNI; }
 
-        NodeCollection * Collection;    // connection taking care of me
+        NetworkSetup * Collection;    // networkSetup taking care of me
         QString Name;                   // name of interface
diff --git a/noncore/settings/networksettings2/nsdata.cpp b/noncore/settings/networksettings2/nsdata.cpp
index 39031ed..b4622fc 100644
--- a/noncore/settings/networksettings2/nsdata.cpp
+++ b/noncore/settings/networksettings2/nsdata.cpp
@@ -52,3 +52,3 @@ NetworkSettingsData::NetworkSettingsData( void ) {
         if( F->open( IO_ReadOnly ) ) {
-          NodeCollection * NC;
+          NetworkSetup * NC;
           interfacename = TS.readLine();
@@ -59,3 +59,3 @@ NetworkSettingsData::NetworkSettingsData( void ) {
 
-          NC = NSResources->getConnection( profilenr );
+          NC = NSResources->getNetworkSetup( profilenr );
           if( NC ) {
@@ -101,3 +101,3 @@ void NetworkSettingsData::loadSettings( void ) {
            <EMPTYLINE>
-           [connection] 
+           [NetworkSetup] 
            Name=Name
@@ -118,7 +118,7 @@ void NetworkSettingsData::loadSettings( void ) {
 
-        if( S == "connection" ) {
-          // load connections -> collections of nodes
+        if( S == "NetworkSetup" ) {
+          // load NetworkSetups -> collections of nodes
           bool Dangling;
-          NodeCollection * NC = new NodeCollection( TS, Dangling );
-          NSResources->addConnection( NC, Dangling );
+          NetworkSetup * NC = new NetworkSetup( TS, Dangling );
+          NSResources->addNetworkSetup( NC, Dangling );
         } else {
@@ -253,10 +253,10 @@ QString NetworkSettingsData::saveSettings( void ) {
 
-    // good connections
-    { Name2Connection_t & M = NSResources->connections();
+    // good NetworkSetups
+    { Name2NetworkSetup_t & M = NSResources->networkSetups();
 
-      // for all connections
-      for( QDictIterator<NodeCollection> it(M);
+      // for all NetworkSetups
+      for( QDictIterator<NetworkSetup> it(M);
            it.current();
            ++it ) {
-        TS << "[connection]" << endl;
+        TS << "[NetworkSetup]" << endl;
         it.current()->save(TS);
@@ -265,10 +265,10 @@ QString NetworkSettingsData::saveSettings( void ) {
 
-    // save dangling connections
-    { Name2Connection_t & M = NSResources->danglingConnections();
+    // save dangling NetworkSetups
+    { Name2NetworkSetup_t & M = NSResources->danglingNetworkSetups();
 
-      // for all connections
-      for( QDictIterator<NodeCollection> it(M);
+      // for all NetworkSetups
+      for( QDictIterator<NetworkSetup> it(M);
            it.current();
            ++it ) {
-        TS << "[connection]" << endl;
+        TS << "[NetworkSetup]" << endl;
         it.current()->save(TS);
@@ -285,3 +285,3 @@ QString NetworkSettingsData::saveSettings( void ) {
 
-    for( QDictIterator<NodeCollection> it(NSResources->connections());
+    for( QDictIterator<NetworkSetup> it(NSResources->networkSetups());
          it.current();
@@ -297,4 +297,4 @@ QString NetworkSettingsData::generateSettings( void ) {
     Name2SystemFile_t & SFM = NSResources->systemFiles();
-    Name2Connection_t & M = NSResources->connections();
-    NodeCollection * NC;
+    Name2NetworkSetup_t & M = NSResources->networkSetups();
+    NetworkSetup * NC;
     ANetNodeInstance * NNI;
@@ -430,3 +430,3 @@ QString NetworkSettingsData::generateSettings( void ) {
 
-      for( QDictIterator<NodeCollection> ncit(M);
+      for( QDictIterator<NetworkSetup> ncit(M);
            ncit.current();
@@ -490,4 +490,4 @@ QString NetworkSettingsData::generateSettings( void ) {
 
-      // find connections that want to write to this file
-      for( QDictIterator<NodeCollection> ncit(M);
+      // find NetworkSetups that want to write to this file
+      for( QDictIterator<NetworkSetup> ncit(M);
            ncit.current();
@@ -507,3 +507,3 @@ QString NetworkSettingsData::generateSettings( void ) {
 
-        Log(("Generating %s for connection %s\n",
+        Log(("Generating %s for NetworkSetup %s\n",
               SF->name().latin1(), NC->name().latin1() ));
@@ -512,3 +512,3 @@ QString NetworkSettingsData::generateSettings( void ) {
 
-        // find device on which this connection works
+        // find device on which this NetworkSetup works
         CurDev = NC->device();
@@ -573,4 +573,4 @@ QString NetworkSettingsData::generateSettings( void ) {
         // generate profile specific info
-        // for all nodeconnections that work on the same device
-        for( QDictIterator<NodeCollection> ncit2(M);
+        // for all nodeNetworkSetups that work on the same device
+        for( QDictIterator<NetworkSetup> ncit2(M);
              ncit2.current();
@@ -583,3 +583,3 @@ QString NetworkSettingsData::generateSettings( void ) {
 
-          Log(("Connection %s of family %s\n", 
+          Log(("NetworkSetup %s of family %s\n", 
                 ncit2.current()->name().latin1(), 
@@ -647,11 +647,11 @@ QString NetworkSettingsData::generateSettings( void ) {
 
-QList<NodeCollection> NetworkSettingsData::collectPossible( 
+QList<NetworkSetup> NetworkSettingsData::collectPossible( 
                     const QString & Interface ) {
-    // collect connections that can work on top of this interface
-    NodeCollection * NC;
-    QList<NodeCollection> PossibleConnections;
-    Name2Connection_t & M = NSResources->connections();
+    // collect NetworkSetups that can work on top of this interface
+    NetworkSetup * NC;
+    QList<NetworkSetup> PossibleNetworkSetups;
+    Name2NetworkSetup_t & M = NSResources->networkSetups();
 
-    // for all connections
-    for( QDictIterator<NodeCollection> it(M);
+    // for all NetworkSetups
+    for( QDictIterator<NetworkSetup> it(M);
          it.current();
@@ -666,6 +666,6 @@ QList<NodeCollection> NetworkSettingsData::collectPossible(
               NC->name().latin1(), Interface.latin1() ));
-        PossibleConnections.append( NC );
+        PossibleNetworkSetups.append( NC );
       }
     }
-    return PossibleConnections;
+    return PossibleNetworkSetups;
 }
@@ -681,14 +681,14 @@ bool NetworkSettingsData::canStart( const QString & Interface ) {
     // load situation
-    NodeCollection * NC = 0;
-    QList<NodeCollection> PossibleConnections;
+    NetworkSetup * NC = 0;
+    QList<NetworkSetup> PossibleNetworkSetups;
 
-    PossibleConnections = collectPossible( Interface );
+    PossibleNetworkSetups = collectPossible( Interface );
 
     Log( ( "for %s : Possiblilies %d\n", 
-        Interface.latin1(), PossibleConnections.count() ));
-    switch( PossibleConnections.count() ) {
-      case 0 : // no connections
+        Interface.latin1(), PossibleNetworkSetups.count() ));
+    switch( PossibleNetworkSetups.count() ) {
+      case 0 : // no NetworkSetups
         break;
-      case 1 : // one connection
-        NC = PossibleConnections.first();
+      case 1 : // one NetworkSetup
+        NC = PossibleNetworkSetups.first();
         break;
@@ -738,3 +738,3 @@ bool NetworkSettingsData::isModified( void ) {
 
-    for( QDictIterator<NodeCollection> it(NSResources->connections());
+    for( QDictIterator<NetworkSetup> it(NSResources->networkSetups());
          it.current();
@@ -750,3 +750,3 @@ bool NetworkSettingsData::couldBeTriggered( const QString & Interface ) {
     // load situation
-    QList<NodeCollection> PossibleTriggered;
+    QList<NetworkSetup> PossibleTriggered;
 
@@ -760,13 +760,13 @@ bool NetworkSettingsData::couldBeTriggered( const QString & Interface ) {
 
-QList<NodeCollection> NetworkSettingsData::collectTriggered( 
+QList<NetworkSetup> NetworkSettingsData::collectTriggered( 
                       const QString & Interface ) {
 
-    // collect connections that could be triggered by this interface
-    NodeCollection * NC;
-    QList<NodeCollection> PossibleTriggered;
+    // collect NetworkSetups that could be triggered by this interface
+    NetworkSetup * NC;
+    QList<NetworkSetup> PossibleTriggered;
 
-    // for all connections
-    Name2Connection_t & M = NSResources->connections();
+    // for all NetworkSetups
+    Name2NetworkSetup_t & M = NSResources->networkSetups();
 
-    for( QDictIterator<NodeCollection> it(M);
+    for( QDictIterator<NetworkSetup> it(M);
          it.current();
diff --git a/noncore/settings/networksettings2/nsdata.h b/noncore/settings/networksettings2/nsdata.h
index 5791c1e..b9c216d 100644
--- a/noncore/settings/networksettings2/nsdata.h
+++ b/noncore/settings/networksettings2/nsdata.h
@@ -21,3 +21,3 @@ public :
 
-      QList<NodeCollection> collectPossible( const QString & Interface );
+      QList<NetworkSetup> collectPossible( const QString & Interface );
       // return TRUE if we need gui to decide
@@ -30,3 +30,3 @@ private :
 
-      QList<NodeCollection> collectTriggered( const QString &Interface );
+      QList<NetworkSetup> collectTriggered( const QString &Interface );
       bool ForceModified;
diff --git a/noncore/settings/networksettings2/opietooth2/OTDriver.cpp b/noncore/settings/networksettings2/opietooth2/OTDriver.cpp
index a7ee662..cfd0491 100644
--- a/noncore/settings/networksettings2/opietooth2/OTDriver.cpp
+++ b/noncore/settings/networksettings2/opietooth2/OTDriver.cpp
@@ -715,3 +715,3 @@ long OTDriver::getLinkQuality( const OTDeviceAddress & Addr ) {
       if (ioctl( fd(), HCIGETCONNINFO, (unsigned long) cr) < 0) {
-        odebug << "Get connection info failed" << oendl;
+        odebug << "Get NetworkSetup info failed" << oendl;
         free(cr);
@@ -733,3 +733,3 @@ long OTDriver::getLinkQuality( const OTDeviceAddress & Addr ) {
       if (hci_send_req( fd(), &rq, 100) < 0) {
-         odebug << "Get connection info failed" << oendl;
+         odebug << "Get NetworkSetup info failed" << oendl;
          return 0;
diff --git a/noncore/settings/networksettings2/opietooth2/OTDriver.h b/noncore/settings/networksettings2/opietooth2/OTDriver.h
index b54ffdf..899fab4 100644
--- a/noncore/settings/networksettings2/opietooth2/OTDriver.h
+++ b/noncore/settings/networksettings2/opietooth2/OTDriver.h
@@ -14,3 +14,3 @@
 /*
- * This class handles the connection with the BlueZ libraries, implements
+ * This class handles the networkSetup with the BlueZ libraries, implements
  * most of the bluetooth-related functions and owns the KBTDevice class
@@ -120,3 +120,3 @@ public:
        * Returns the file descriptor for the local
-       * connection to this device
+       * networkSetup to this device
        */
diff --git a/noncore/settings/networksettings2/opietooth2/OTGateway.cpp b/noncore/settings/networksettings2/opietooth2/OTGateway.cpp
index 1b61a2e..7fc8719 100644
--- a/noncore/settings/networksettings2/opietooth2/OTGateway.cpp
+++ b/noncore/settings/networksettings2/opietooth2/OTGateway.cpp
@@ -64,5 +64,5 @@ OTGateway::OTGateway( void ) : QObject( 0, "OTGateway" ),
 
-      // iterate over drivers and find active connections
+      // iterate over drivers and find active NetworkSetups
       // adding/updating peers
-      loadActiveConnections();
+      loadActiveNetworkSetups();
 
@@ -377,4 +377,4 @@ const char * OTGateway::deviceTypeToName( int cls ) {
 
-PANConnectionVector OTGateway::getPANConnections( void ) {
-        PANConnectionVector V;
+PANNetworkSetupVector OTGateway::getPANNetworkSetups( void ) {
+        PANNetworkSetupVector V;
 
@@ -394,3 +394,3 @@ PANConnectionVector OTGateway::getPANConnections( void ) {
         if (ioctl(ctl, BNEPGETCONNLIST, &req)) {
-          odebug << "Failed to get connection list" << oendl;
+          odebug << "Failed to get NetworkSetup list" << oendl;
           ::close( ctl );
@@ -403,3 +403,3 @@ PANConnectionVector OTGateway::getPANConnections( void ) {
             // we are the client
-            V.insert( V.size()-1, new OTPANConnection(
+            V.insert( V.size()-1, new OTPANNetworkSetup(
                             ci[i].device,
@@ -512,3 +512,3 @@ bool OTGateway::removeLinkKey( unsigned int Index ) {
 #define MAXCONNECTIONS 10
-void OTGateway::loadActiveConnections( void ) {
+void OTGateway::loadActiveNetworkSetups( void ) {
 
@@ -534,3 +534,3 @@ void OTGateway::loadActiveConnections( void ) {
 
-          // driver is up -> check connections
+          // driver is up -> check NetworkSetups
           cl->dev_id = AllDrivers[i]->devId();
@@ -540,3 +540,3 @@ void OTGateway::loadActiveConnections( void ) {
           if (ioctl( getSocket(), HCIGETCONNLIST, (void *) cl)) {
-            emit error( tr("Can't get connection list") );
+            emit error( tr("Can't get NetworkSetup list") );
             break;
@@ -755,3 +755,3 @@ int OTGateway::releaseRFCommDevice( int devnr ) {
         if( dr->id == devnr ) {
-          // still in connection list 
+          // still in NetworkSetup list 
           struct rfcomm_dev_req req;
diff --git a/noncore/settings/networksettings2/opietooth2/OTGateway.h b/noncore/settings/networksettings2/opietooth2/OTGateway.h
index 11c6b30..d0e42db 100644
--- a/noncore/settings/networksettings2/opietooth2/OTGateway.h
+++ b/noncore/settings/networksettings2/opietooth2/OTGateway.h
@@ -19,3 +19,3 @@ class OTPeer;
 class OTInquiry;
-class OTPANConnection;
+class OTPANNetworkSetup;
 class OTLinkKey;
@@ -23,3 +23,3 @@ class OTLinkKey;
 typedef QVector<OTPeer> PeerVector;
-typedef QVector<OTPANConnection> PANConnectionVector;
+typedef QVector<OTPANNetworkSetup> PANNetworkSetupVector;
 typedef QArray<OTLinkKey> LinkKeyArray;
@@ -45,3 +45,3 @@ public :
 
-class OTPANConnection {
+class OTPANNetworkSetup {
 
@@ -49,3 +49,3 @@ public :
 
-    OTPANConnection( const QString & Dev, const QString & CT ) {
+    OTPANNetworkSetup( const QString & Dev, const QString & CT ) {
       Device = Dev;
@@ -94,3 +94,3 @@ public :
 
-      PANConnectionVector getPANConnections();
+      PANNetworkSetupVector getPANNetworkSetups();
 
@@ -175,3 +175,3 @@ private :
 
-      void loadActiveConnections( void );
+      void loadActiveNetworkSetups( void );
       void loadKnownPeers( void );
diff --git a/noncore/settings/networksettings2/opietooth2/OTInquiry.h b/noncore/settings/networksettings2/opietooth2/OTInquiry.h
index f7bdeec..559af7a 100644
--- a/noncore/settings/networksettings2/opietooth2/OTInquiry.h
+++ b/noncore/settings/networksettings2/opietooth2/OTInquiry.h
@@ -40,3 +40,3 @@ class OTHCISocket;
  * process is finished.
- * Still no connections should be set up before
+ * Still no networkSetups should be set up before
  * the finished() signal was sent (hmm, is this always true..?)
diff --git a/noncore/settings/networksettings2/ppp/PPPDialingedit.cpp b/noncore/settings/networksettings2/ppp/PPPDialingedit.cpp
index 9264ceb..2b03c73 100644
--- a/noncore/settings/networksettings2/ppp/PPPDialingedit.cpp
+++ b/noncore/settings/networksettings2/ppp/PPPDialingedit.cpp
@@ -18,5 +18,4 @@ QString PPPDialingEdit::acceptable( void ) {
 
-bool PPPDialingEdit::commit( PPPData & D ) {
-    bool SM;
-    return SM;
+bool PPPDialingEdit::commit( PPPData & ) {
+    return true;
 }
diff --git a/noncore/settings/networksettings2/ppp/ppp_NN.cpp b/noncore/settings/networksettings2/ppp/ppp_NN.cpp
index 8c15e9c..884168c 100644
--- a/noncore/settings/networksettings2/ppp/ppp_NN.cpp
+++ b/noncore/settings/networksettings2/ppp/ppp_NN.cpp
@@ -16,3 +16,3 @@ static const char * PPPNeeds[] =
 static const char * PPPProvides[] = 
-    { "connection", 
+    { "NetworkSetup", 
       0
@@ -23,3 +23,3 @@ static const char * PPPProvides[] =
  */
-PPPNetNode::PPPNetNode() : ANetNode(tr("PPP Connection")) {
+PPPNetNode::PPPNetNode() : ANetNode(tr("PPP NetworkSetup")) {
 
diff --git a/noncore/settings/networksettings2/ppp/ppp_NNI.cpp b/noncore/settings/networksettings2/ppp/ppp_NNI.cpp
index 9e3bb64..7286d96 100644
--- a/noncore/settings/networksettings2/ppp/ppp_NNI.cpp
+++ b/noncore/settings/networksettings2/ppp/ppp_NNI.cpp
@@ -151,3 +151,3 @@ bool APPP::openFile( SystemFile & SF ) {
         SF.setPath( removeSpaces( 
-            QString( "/tmp/ppp/peers/" ) + connection()->name() ) );
+            QString( "/tmp/ppp/peers/" ) + networkSetup()->name() ) );
         return 1;
@@ -155,3 +155,3 @@ bool APPP::openFile( SystemFile & SF ) {
         SF.setPath( removeSpaces( 
-            QString( "/tmp/chatscripts/" ) + connection()->name() ) );
+            QString( "/tmp/chatscripts/" ) + networkSetup()->name() ) );
         return 1;
@@ -172,3 +172,3 @@ short APPP::generateFile( SystemFile & SF, long DevNr ) {
         SF << "# secrets for " 
-           << connection()->name().latin1() 
+           << networkSetup()->name().latin1() 
            << endl;
@@ -181,3 +181,3 @@ short APPP::generateFile( SystemFile & SF, long DevNr ) {
         rvl = 0;
-        rvd = connection()->getToplevel()->generateFileEmbedded( 
+        rvd = networkSetup()->getToplevel()->generateFileEmbedded( 
                 SF, DevNr );
@@ -189,3 +189,3 @@ short APPP::generateFile( SystemFile & SF, long DevNr ) {
         SF << "# secrets for "
-           << connection()->name().latin1() 
+           << networkSetup()->name().latin1() 
            << endl;
@@ -199,3 +199,3 @@ short APPP::generateFile( SystemFile & SF, long DevNr ) {
         rvl = 0;
-        rvd = connection()->getToplevel()->generateFileEmbedded( 
+        rvd = networkSetup()->getToplevel()->generateFileEmbedded( 
             SF, DevNr );
@@ -223,3 +223,3 @@ short APPP::generateFile( SystemFile & SF, long DevNr ) {
       rvl = 0;
-      rvd = connection()->getToplevel()->generateFileEmbedded(
+      rvd = networkSetup()->getToplevel()->generateFileEmbedded(
             SF, DevNr );
@@ -228,3 +228,3 @@ short APPP::generateFile( SystemFile & SF, long DevNr ) {
       rvl = 0;
-      rvd = connection()->getToplevel()->generateFileEmbedded(
+      rvd = networkSetup()->getToplevel()->generateFileEmbedded(
             SF, DevNr );
diff --git a/noncore/settings/networksettings2/ppp/ppprun.cpp b/noncore/settings/networksettings2/ppp/ppprun.cpp
index 8403e6d..f548483 100644
--- a/noncore/settings/networksettings2/ppp/ppprun.cpp
+++ b/noncore/settings/networksettings2/ppp/ppprun.cpp
@@ -15,3 +15,3 @@ State_t PPPRun::detectState( void ) {
 
-QString PPPRun::setMyState( NodeCollection * NC, Action_t A, bool ) { 
+QString PPPRun::setMyState( NetworkSetup * , Action_t , bool ) { 
     return QString();
@@ -36,3 +36,3 @@ bool PPPRun::isMyPPPUp( void ) {
         // this is a LAN card
-        if( Run->assignedConnection() == netNode()->connection() ) {
+        if( Run->assignedToNetworkSetup() == netNode()->networkSetup() ) {
           // assigned to us
diff --git a/noncore/settings/networksettings2/ppp/ppprun.h b/noncore/settings/networksettings2/ppp/ppprun.h
index 2990a96..9535382 100644
--- a/noncore/settings/networksettings2/ppp/ppprun.h
+++ b/noncore/settings/networksettings2/ppp/ppprun.h
@@ -25,3 +25,3 @@ protected :
 
-      QString setMyState( NodeCollection * , Action_t, bool );
+      QString setMyState( NetworkSetup * , Action_t, bool );
 
diff --git a/noncore/settings/networksettings2/profile/profile_NN.cpp b/noncore/settings/networksettings2/profile/profile_NN.cpp
index 1e6912e..007f4a5 100644
--- a/noncore/settings/networksettings2/profile/profile_NN.cpp
+++ b/noncore/settings/networksettings2/profile/profile_NN.cpp
@@ -7,3 +7,3 @@
 static const char * ProfileNeeds[] = 
-    { "connection", 
+    { "NetworkSetup", 
       0
@@ -18,3 +18,3 @@ static const char * ProfileProvides[] =
  */
-ProfileNetNode::ProfileNetNode() : ANetNode( tr("Regular connection profile")) {
+ProfileNetNode::ProfileNetNode() : ANetNode( tr("Regular NetworkSetup profile")) {
 
@@ -33,4 +33,4 @@ const QString ProfileNetNode::nodeDescription(){
       return tr("\
-<p>Define use of an IP connection.</p>\
-<p>Configure if and when this connection needs to be established</p>\
+<p>Define use of an IP NetworkSetup.</p>\
+<p>Configure if and when this NetworkSetup needs to be established</p>\
 "
diff --git a/noncore/settings/networksettings2/profile/profiledata.h b/noncore/settings/networksettings2/profile/profiledata.h
index c9577e5..2f7060d 100644
--- a/noncore/settings/networksettings2/profile/profiledata.h
+++ b/noncore/settings/networksettings2/profile/profiledata.h
@@ -11,3 +11,3 @@ public :
       bool Confirm;
-      // Do not bring this connection up
+      // Do not bring this networkSetup up
       bool Disabled;
diff --git a/noncore/settings/networksettings2/profile/profileedit.cpp b/noncore/settings/networksettings2/profile/profileedit.cpp
index 88aab15..ad943fe 100644
--- a/noncore/settings/networksettings2/profile/profileedit.cpp
+++ b/noncore/settings/networksettings2/profile/profileedit.cpp
@@ -16,5 +16,9 @@ ProfileEdit::ProfileEdit( QWidget * Parent, ANetNodeInstance * TNNI ) :
 
+      II = TNNI->networkSetup()->assignedInterface();
+      Log(( "Interface %p %p %p: %d\n", II, 
+            TNNI, TNNI->networkSetup(), (II) ? II->IsUp : 0 ));
+
       NNI = TNNI;
       Dev = NNI->runtime()->device();
-      if( ( II = NNI->connection()->assignedInterface() ) ) {
+      if( ( II = NNI->networkSetup()->assignedInterface() ) ) {
 
@@ -79,3 +83,3 @@ bool ProfileEdit::commit( ProfileData & Data ) {
 void ProfileEdit::SLOT_Refresh( void ) {
-    InterfaceInfo * II = NNI->connection()->assignedInterface();
+    InterfaceInfo * II = NNI->networkSetup()->assignedInterface();
     NSResources->system().refreshStatistics( *II );
diff --git a/noncore/settings/networksettings2/profile/profilerun.cpp b/noncore/settings/networksettings2/profile/profilerun.cpp
index acb67bd..48011ea 100644
--- a/noncore/settings/networksettings2/profile/profilerun.cpp
+++ b/noncore/settings/networksettings2/profile/profilerun.cpp
@@ -5,2 +5,6 @@
 State_t ProfileRun::detectState( void ) { 
+    InterfaceInfo * II = networkSetup()->assignedInterface();
+
+    Log(( "Interface %p %p %p: %d\n", II, 
+            netNode(), netNode()->networkSetup(), (II) ? II->IsUp : 0 ));
     if( Data->Disabled ) {
@@ -11,3 +15,3 @@ State_t ProfileRun::detectState( void ) {
 
-QString ProfileRun::setMyState( NodeCollection * NC, Action_t A, bool ) { 
+QString ProfileRun::setMyState( NetworkSetup * NC, Action_t A, bool ) { 
     odebug << "Profile " << Data->Disabled << oendl;
diff --git a/noncore/settings/networksettings2/profile/profilerun.h b/noncore/settings/networksettings2/profile/profilerun.h
index 2d48b15..9470c0f 100644
--- a/noncore/settings/networksettings2/profile/profilerun.h
+++ b/noncore/settings/networksettings2/profile/profilerun.h
@@ -25,3 +25,3 @@ protected :
 
-      QString setMyState( NodeCollection * , Action_t, bool );
+      QString setMyState( NetworkSetup * , Action_t, bool );
 
diff --git a/noncore/settings/networksettings2/usb/usb_NN.cpp b/noncore/settings/networksettings2/usb/usb_NN.cpp
index 6d90ae0..6e2597c 100644
--- a/noncore/settings/networksettings2/usb/usb_NN.cpp
+++ b/noncore/settings/networksettings2/usb/usb_NN.cpp
@@ -32,3 +32,3 @@ const QString USBNetNode::nodeDescription(){
 <p>Configure Ethernet over USB.</p>\
-<p>Use this for a computer to computer USB cable connection</p>\
+<p>Use this for a computer to computer USB cable NetworkSetup</p>\
 "
diff --git a/noncore/settings/networksettings2/usb/usbrun.cpp b/noncore/settings/networksettings2/usb/usbrun.cpp
index 763644e..4082f7f 100644
--- a/noncore/settings/networksettings2/usb/usbrun.cpp
+++ b/noncore/settings/networksettings2/usb/usbrun.cpp
@@ -12,3 +12,3 @@ State_t USBRun::detectState( void ) {
 
-    NodeCollection * NC = nodeCollection();
+    NetworkSetup * NC = networkSetup();
     QString S = QString( "/tmp/profile-%1.up" ).arg(NC->number());
@@ -63,3 +63,3 @@ State_t USBRun::detectState( void ) {
 
-QString USBRun::setMyState( NodeCollection * NC, Action_t A, bool ) {
+QString USBRun::setMyState( NetworkSetup * NC, Action_t, bool ) {
 
@@ -99,3 +99,3 @@ InterfaceInfo * USBRun::getInterface( void ) {
         // this is a USB card
-        if( Run->assignedConnection() == netNode()->connection() ) {
+        if( Run->assignedToNetworkSetup() == netNode()->networkSetup() ) {
           // assigned to us
@@ -103,3 +103,3 @@ InterfaceInfo * USBRun::getInterface( void ) {
         } else if( ! Run->IsUp &&
-                   Run->assignedConnection() == 0 ) {
+                   Run->assignedToNetworkSetup() == 0 ) {
           // free
diff --git a/noncore/settings/networksettings2/usb/usbrun.h b/noncore/settings/networksettings2/usb/usbrun.h
index 6ce4fa2..0872f3d 100644
--- a/noncore/settings/networksettings2/usb/usbrun.h
+++ b/noncore/settings/networksettings2/usb/usbrun.h
@@ -27,3 +27,3 @@ protected :
 
-      QString setMyState( NodeCollection * , Action_t, bool );
+      QString setMyState( NetworkSetup * , Action_t, bool );
 
diff --git a/noncore/settings/networksettings2/vpn/vpn_NN.cpp b/noncore/settings/networksettings2/vpn/vpn_NN.cpp
index 96e9df2..7c2e77b 100644
--- a/noncore/settings/networksettings2/vpn/vpn_NN.cpp
+++ b/noncore/settings/networksettings2/vpn/vpn_NN.cpp
@@ -10,3 +10,3 @@ static const char * VPNNeeds[] =
 static const char * VPNProvides[] = 
-    { "connection",
+    { "NetworkSetup",
       0
@@ -16,3 +16,3 @@ static const char * VPNProvides[] =
  */
-VPNNetNode::VPNNetNode() : ANetNode(tr("VPN Connection")) {
+VPNNetNode::VPNNetNode() : ANetNode(tr("VPN NetworkSetup")) {
 }
@@ -27,3 +27,3 @@ const QString VPNNetNode::nodeDescription(){
       return tr("\
-<p>Configure private IP connection.</p>\
+<p>Configure private IP NetworkSetup.</p>\
 <p>Defines Secure tunnels over non secure IP sessions</p>\
diff --git a/noncore/settings/networksettings2/vpn/vpnrun.h b/noncore/settings/networksettings2/vpn/vpnrun.h
index 9a55625..e40aa87 100644
--- a/noncore/settings/networksettings2/vpn/vpnrun.h
+++ b/noncore/settings/networksettings2/vpn/vpnrun.h
@@ -22,3 +22,3 @@ protected :
 
-      QString setMyState( NodeCollection * , Action_t, bool )
+      QString setMyState( NetworkSetup * , Action_t, bool )
         { return QString(); }
diff --git a/noncore/settings/networksettings2/wlan/wlanedit.cpp b/noncore/settings/networksettings2/wlan/wlanedit.cpp
index 74174bf..73c0c7c 100644
--- a/noncore/settings/networksettings2/wlan/wlanedit.cpp
+++ b/noncore/settings/networksettings2/wlan/wlanedit.cpp
@@ -22,3 +22,3 @@ WLanEdit::WLanEdit( QWidget * Parent, ANetNodeInstance * TNNI ) :
       WE = 0;
-      if( ( II = NNI->connection()->assignedInterface() ) ) {
+      if( ( II = NNI->networkSetup()->assignedInterface() ) ) {
         // show data
diff --git a/noncore/settings/networksettings2/wlan/wlanrun.cpp b/noncore/settings/networksettings2/wlan/wlanrun.cpp
index b15a560..a0c5884 100644
--- a/noncore/settings/networksettings2/wlan/wlanrun.cpp
+++ b/noncore/settings/networksettings2/wlan/wlanrun.cpp
@@ -13,3 +13,3 @@ State_t WLanRun::detectState( void ) {
 
-    NodeCollection * NC = nodeCollection();
+    NetworkSetup * NC = networkSetup();
     QString S = QString( "/tmp/profile-%1.up" ).arg(NC->number());
@@ -72,3 +72,3 @@ State_t WLanRun::detectState( void ) {
 
-QString WLanRun::setMyState( NodeCollection * , Action_t , bool ) {
+QString WLanRun::setMyState( NetworkSetup * , Action_t , bool ) {
 
@@ -96,6 +96,6 @@ InterfaceInfo * WLanRun::getInterface( void ) {
         // this is a LAN card
-        if( Run->assignedConnection() == netNode()->connection() ) {
+        if( Run->assignedToNetworkSetup() == netNode()->networkSetup() ) {
           // assigned to us
           return Run;
-        } else if( Run->assignedConnection() == 0 ) {
+        } else if( Run->assignedToNetworkSetup() == 0 ) {
           // free
diff --git a/noncore/settings/networksettings2/wlan/wlanrun.h b/noncore/settings/networksettings2/wlan/wlanrun.h
index fd325d4..e3e7735 100644
--- a/noncore/settings/networksettings2/wlan/wlanrun.h
+++ b/noncore/settings/networksettings2/wlan/wlanrun.h
@@ -26,3 +26,3 @@ protected :
 
-      QString setMyState( NodeCollection * , Action_t, bool );
+      QString setMyState( NetworkSetup * , Action_t, bool );