Changes now ok

this works again

8 files changed, 19 insertions, 17 deletions

diff --git a/noncore/settings/networksettings2/cable/cable_NN.cpp b/noncore/settings/networksettings2/cable/cable_NN.cpp
index 3f34bb2..4085b22 100644
--- a/noncore/settings/networksettings2/cable/cable_NN.cpp
+++ b/noncore/settings/networksettings2/cable/cable_NN.cpp
@@ -6,25 +6,25 @@
 static const char * CableNeeds[] = 
     { 0
     };
 
 static const char * CableProvides[] = 
     { "line",
       0
     };
 
 /**
  * Constructor, find all of the possible interfaces
  */
-CableNetNode::CableNetNode() : ANetNode(tr("Cable NetworkSetup")) {
+CableNetNode::CableNetNode() : ANetNode(tr("Cable connection")) {
 }
 
 /**
  * Delete any interfaces that we own.
  */
 CableNetNode::~CableNetNode(){
 }
 
 const QString CableNetNode::nodeDescription(){
       return tr("\
 <p>Sets up a wired serial or parallel.</p>\
 "
diff --git a/noncore/settings/networksettings2/gprs/GPRS_NN.cpp b/noncore/settings/networksettings2/gprs/GPRS_NN.cpp
index 374cf5a..e9553a6 100644
--- a/noncore/settings/networksettings2/gprs/GPRS_NN.cpp
+++ b/noncore/settings/networksettings2/gprs/GPRS_NN.cpp
@@ -3,25 +3,25 @@
 #include <netnode.h>
 #include "GPRS_NN.h"
 #include "GPRS_NNI.h"
 
 #include "netnodeinterface.h"
 
 static const char * GPRSNeeds[] = 
     { "GPRS",
       0
     };
 
 static const char * GPRSProvides[] = 
-    { "NetworkSetup", 
+    { "connection", 
       0
     };
 
 /**
  * Constructor, find all of the possible interfaces
  */
 GPRSNetNode::GPRSNetNode() : ANetNode(tr("GPRS capable device")) {
       NSResources->addSystemFile( 
         "pap-secrets", "/etc/ppp/pap-secrets", 0 );
 }
 
 /**
diff --git a/noncore/settings/networksettings2/network/network_NN.cpp b/noncore/settings/networksettings2/network/network_NN.cpp
index 80a7fac..2fa31bd 100644
--- a/noncore/settings/networksettings2/network/network_NN.cpp
+++ b/noncore/settings/networksettings2/network/network_NN.cpp
@@ -3,25 +3,25 @@
 #include <netnode.h>
 #include "network_NN.h"
 #include "network_NNI.h"
 
 #include "netnodeinterface.h"
 
 static const char * NetworkNeeds[] = 
     { "device", 
       0
     };
 
 static const char * NetworkProvides[] = 
-    { "NetworkSetup",
+    { "connection",
       0
     };
 
 /**
  * Constructor, find all of the possible interfaces
  */
 NetworkNetNode::NetworkNetNode() : ANetNode(tr("IP Configuration")) {
 
       NSResources->addSystemFile(
         "interfaces", "/etc/network/interfaces", 1 );
 }
 
diff --git a/noncore/settings/networksettings2/networksettings2/resources.cpp b/noncore/settings/networksettings2/networksettings2/resources.cpp
index 0e72c25..2dd91f8 100644
--- a/noncore/settings/networksettings2/networksettings2/resources.cpp
+++ b/noncore/settings/networksettings2/networksettings2/resources.cpp
@@ -172,28 +172,30 @@ void TheNSResources::findAvailableNetNodes( void ){
       { QList<ANetNode> PNN;
 
         interface->create_plugin( PNN );
 
         if( PNN.isEmpty() ) {
           Log(( "Plugin %s from %s does offer any nodes\n", 
              (*it).name().latin1(), (*it).path().latin1() ));
           delete interface;
           continue;
         }
 
         // merge this node with global node
-        for( QListIterator<ANetNode> it(PNN);
-             it.current();
-             ++it ) {
-          AllNodeTypes.insert( it.current()->name(), it.current() );
+        for( QListIterator<ANetNode> nnit(PNN);
+             nnit.current();
+             ++nnit ) {
+          Log(( "Found node type %s in plugin %s\n",
+             nnit.current()->name(), (*it).name().latin1() ));
+          AllNodeTypes.insert( nnit.current()->name(), nnit.current() );
         }
       }
 
       // load the translation 
       QTranslator *trans = new QTranslator(qApp);
       QString fn = QPEApplication::qpeDir()+
                 "/i18n/"+lang+"/"+ (*it).name() + ".qm";
 
       if( trans->load( fn ) )
           qApp->installTranslator( trans );
       else
           delete trans;
diff --git a/noncore/settings/networksettings2/ppp/ppp_NN.cpp b/noncore/settings/networksettings2/ppp/ppp_NN.cpp
index 884168c..6c1387d 100644
--- a/noncore/settings/networksettings2/ppp/ppp_NN.cpp
+++ b/noncore/settings/networksettings2/ppp/ppp_NN.cpp
@@ -5,32 +5,32 @@
 #include "ppp_NNI.h"
 
 #include "netnodeinterface.h"
 
 QStringList * PPPNetNode::ProperFiles = 0;
 
 static const char * PPPNeeds[] = 
     { "modem", 
       0
     };
 
 static const char * PPPProvides[] = 
-    { "NetworkSetup", 
+    { "connection", 
       0
     };
 
 /**
  * Constructor, find all of the possible interfaces
  */
-PPPNetNode::PPPNetNode() : ANetNode(tr("PPP NetworkSetup")) {
+PPPNetNode::PPPNetNode() : ANetNode(tr("PPP connection")) {
 
       NSResources->addSystemFile( 
         "pap-secrets", "/etc/ppp/pap-secrets", 0 );
       NSResources->addSystemFile( 
         "chap-secrets", "/etc/ppp/chap-secrets", 0 );
 }
 
 /**
  * Delete any interfaces that we own.
  */
 PPPNetNode::~PPPNetNode(){
 }
diff --git a/noncore/settings/networksettings2/profile/profile_NN.cpp b/noncore/settings/networksettings2/profile/profile_NN.cpp
index 007f4a5..1e6912e 100644
--- a/noncore/settings/networksettings2/profile/profile_NN.cpp
+++ b/noncore/settings/networksettings2/profile/profile_NN.cpp
@@ -1,47 +1,47 @@
 #include <resources.h>
 #include "profile_NN.h"
 #include "profile_NNI.h"
 
 #include "netnodeinterface.h"
 
 static const char * ProfileNeeds[] = 
-    { "NetworkSetup", 
+    { "connection", 
       0
     };
 static const char * ProfileProvides[] = 
     { "fullsetup", 
       0
     };
 
 /**
  * Constructor, find all of the possible interfaces
  */
-ProfileNetNode::ProfileNetNode() : ANetNode( tr("Regular NetworkSetup profile")) {
+ProfileNetNode::ProfileNetNode() : ANetNode( tr("Regular connection profile")) {
 
     NSResources->addSystemFile(
       "interfaces", "/etc/network/interfaces", 1 );
 
 }
 
 /**
  * Delete any interfaces that we own.
  */
 ProfileNetNode::~ProfileNetNode(){
 }
 
 const QString ProfileNetNode::nodeDescription(){
       return tr("\
-<p>Define use of an IP NetworkSetup.</p>\
-<p>Configure if and when this NetworkSetup needs to be established</p>\
+<p>Define use of an IP connection.</p>\
+<p>Configure if and when this connection needs to be established</p>\
 "
 );
 }
 
 ANetNodeInstance * ProfileNetNode::createInstance( void ) {
       return new AProfile( this );
 }
 
 const char ** ProfileNetNode::needs( void ) {
       return ProfileNeeds;
 }
 
diff --git a/noncore/settings/networksettings2/usb/usb_NN.cpp b/noncore/settings/networksettings2/usb/usb_NN.cpp
index 6e2597c..6d90ae0 100644
--- a/noncore/settings/networksettings2/usb/usb_NN.cpp
+++ b/noncore/settings/networksettings2/usb/usb_NN.cpp
@@ -21,25 +21,25 @@ USBNetNode::USBNetNode() : ANetNode(tr("USB Cable Connect")) {
       "interfaces", "/etc/network/interfaces", 1 );
 }
 
 /**
  * Delete any interfaces that we own.
  */
 USBNetNode::~USBNetNode(){
 }
 
 const QString USBNetNode::nodeDescription(){
       return tr("\
 <p>Configure Ethernet over USB.</p>\
-<p>Use this for a computer to computer USB cable NetworkSetup</p>\
+<p>Use this for a computer to computer USB cable connection</p>\
 "
 );
 }
 
 ANetNodeInstance * USBNetNode::createInstance( void ) {
       return new AUSB( this );
 }
 
 const char ** USBNetNode::needs( void ) {
       return USBNeeds;
 }
 
diff --git a/noncore/settings/networksettings2/vpn/vpn_NN.cpp b/noncore/settings/networksettings2/vpn/vpn_NN.cpp
index 7c2e77b..beb9215 100644
--- a/noncore/settings/networksettings2/vpn/vpn_NN.cpp
+++ b/noncore/settings/networksettings2/vpn/vpn_NN.cpp
@@ -1,40 +1,40 @@
 #include "vpn_NN.h"
 #include "vpn_NNI.h"
 
 #include "netnodeinterface.h"
 
 static const char * VPNNeeds[] = 
     { 0
     };
 
 static const char * VPNProvides[] = 
-    { "NetworkSetup",
+    { "connection",
       0
     };
 /**
  * Constructor, find all of the possible interfaces
  */
-VPNNetNode::VPNNetNode() : ANetNode(tr("VPN NetworkSetup")) {
+VPNNetNode::VPNNetNode() : ANetNode(tr("VPN connection")) {
 }
 
 /**
  * Delete any interfaces that we own.
  */
 VPNNetNode::~VPNNetNode(){
 }
 
 const QString VPNNetNode::nodeDescription(){
       return tr("\
-<p>Configure private IP NetworkSetup.</p>\
+<p>Configure private IP connection.</p>\
 <p>Defines Secure tunnels over non secure IP sessions</p>\
 "
 );
 }
 
 ANetNodeInstance * VPNNetNode::createInstance( void ) {
       return new AVPN( this );
 }
 
 const char ** VPNNetNode::needs( void ) {
       return VPNNeeds;
 }