Major rename of NodeCollection to NetworkSetup

this commit is broken (missing symbols)

5 files changed, 15 insertions, 16 deletions

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
@@ -16,9 +16,8 @@ QString PPPDialingEdit::acceptable( void ) {
     return QString();
 }
 
-bool PPPDialingEdit::commit( PPPData & D ) {
-    bool SM;
-    return SM;
+bool PPPDialingEdit::commit( PPPData & ) {
+    return true;
 }
 
 void PPPDialingEdit::showData( PPPData & D ) {
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
@@ -14,14 +14,14 @@ static const char * PPPNeeds[] =
     };
 
 static const char * PPPProvides[] = 
-    { "connection", 
+    { "NetworkSetup", 
       0
     };
 
 /**
  * Constructor, find all of the possible interfaces
  */
-PPPNetNode::PPPNetNode() : ANetNode(tr("PPP Connection")) {
+PPPNetNode::PPPNetNode() : ANetNode(tr("PPP NetworkSetup")) {
 
       NSResources->addSystemFile( 
         "pap-secrets", "/etc/ppp/pap-secrets", 0 );
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
@@ -149,11 +149,11 @@ void APPP::commit( void ) {
 bool APPP::openFile( SystemFile & SF ) {
       if( SF.name() == "peers" ) {
         SF.setPath( removeSpaces( 
-            QString( "/tmp/ppp/peers/" ) + connection()->name() ) );
+            QString( "/tmp/ppp/peers/" ) + networkSetup()->name() ) );
         return 1;
       } else if ( SF.name() == "chatscripts" ) {
         SF.setPath( removeSpaces( 
-            QString( "/tmp/chatscripts/" ) + connection()->name() ) );
+            QString( "/tmp/chatscripts/" ) + networkSetup()->name() ) );
         return 1;
       }
       return 0;
@@ -170,7 +170,7 @@ short APPP::generateFile( SystemFile & SF, long DevNr ) {
 
       if( Data.Auth.Mode == 1 && Data.Auth.PCEMode == 0 ) {
         SF << "# secrets for " 
-           << connection()->name().latin1() 
+           << networkSetup()->name().latin1() 
            << endl;
         SF << Data.Auth.Client 
            << " " 
@@ -179,7 +179,7 @@ short APPP::generateFile( SystemFile & SF, long DevNr ) {
            << Data.Auth.Secret
            << endl;
         rvl = 0;
-        rvd = connection()->getToplevel()->generateFileEmbedded( 
+        rvd = networkSetup()->getToplevel()->generateFileEmbedded( 
                 SF, DevNr );
       }
     } else if( SF.name() == "chap-secrets" ) {
@@ -187,7 +187,7 @@ short APPP::generateFile( SystemFile & SF, long DevNr ) {
       if( Data.Auth.Mode == 1 && Data.Auth.PCEMode != 0 ) {
         // used for both EAP and Chap
         SF << "# secrets for "
-           << connection()->name().latin1() 
+           << networkSetup()->name().latin1() 
            << endl;
         SF << Data.Auth.Client 
            << " " 
@@ -197,7 +197,7 @@ short APPP::generateFile( SystemFile & SF, long DevNr ) {
            << endl;
 
         rvl = 0;
-        rvd = connection()->getToplevel()->generateFileEmbedded( 
+        rvd = networkSetup()->getToplevel()->generateFileEmbedded( 
             SF, DevNr );
       }
     } else if ( SF.name() == "peers" ) {
@@ -221,12 +221,12 @@ short APPP::generateFile( SystemFile & SF, long DevNr ) {
 
       // insert other data here
       rvl = 0;
-      rvd = connection()->getToplevel()->generateFileEmbedded(
+      rvd = networkSetup()->getToplevel()->generateFileEmbedded(
             SF, DevNr );
     } else if ( SF.name() == "chatscripts" ) {
       Log(("Generate PPP for %s\n", SF.name().latin1() ));
       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
@@ -13,7 +13,7 @@ State_t PPPRun::detectState( void ) {
     return Off;
 }
 
-QString PPPRun::setMyState( NodeCollection * NC, Action_t A, bool ) { 
+QString PPPRun::setMyState( NetworkSetup * , Action_t , bool ) { 
     return QString();
 }
 
@@ -34,7 +34,7 @@ bool PPPRun::isMyPPPUp( void ) {
           Run->IsPointToPoint 
         ) {
         // this is a LAN card
-        if( Run->assignedConnection() == netNode()->connection() ) {
+        if( Run->assignedToNetworkSetup() == netNode()->networkSetup() ) {
           // assigned to us
           return 1;
         } 
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
@@ -23,7 +23,7 @@ public :
 
 protected :
 
-      QString setMyState( NodeCollection * , Action_t, bool );
+      QString setMyState( NetworkSetup * , Action_t, bool );
 
 private :