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
@@ -16,5 +16,5 @@ static const char * CableProvides[] =
  * Constructor, find all of the possible interfaces
  */
-CableNetNode::CableNetNode() : ANetNode(tr("Cable NetworkSetup")) {
+CableNetNode::CableNetNode() : ANetNode(tr("Cable connection")) {
 }
 
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
@@ -13,5 +13,5 @@ static const char * GPRSNeeds[] =
 
 static const char * GPRSProvides[] = 
-    { "NetworkSetup", 
+    { "connection", 
       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
@@ -13,5 +13,5 @@ static const char * NetworkNeeds[] =
 
 static const char * NetworkProvides[] = 
-    { "NetworkSetup",
+    { "connection",
       0
     };
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
@@ -182,8 +182,10 @@ void TheNSResources::findAvailableNetNodes( void ){
 
         // 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() );
         }
       }
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
@@ -15,5 +15,5 @@ static const char * PPPNeeds[] =
 
 static const char * PPPProvides[] = 
-    { "NetworkSetup", 
+    { "connection", 
       0
     };
@@ -22,5 +22,5 @@ static const char * PPPProvides[] =
  * Constructor, find all of the possible interfaces
  */
-PPPNetNode::PPPNetNode() : ANetNode(tr("PPP NetworkSetup")) {
+PPPNetNode::PPPNetNode() : ANetNode(tr("PPP connection")) {
 
       NSResources->addSystemFile( 
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
@@ -6,5 +6,5 @@
 
 static const char * ProfileNeeds[] = 
-    { "NetworkSetup", 
+    { "connection", 
       0
     };
@@ -17,5 +17,5 @@ static const char * ProfileProvides[] =
  * Constructor, find all of the possible interfaces
  */
-ProfileNetNode::ProfileNetNode() : ANetNode( tr("Regular NetworkSetup profile")) {
+ProfileNetNode::ProfileNetNode() : ANetNode( tr("Regular connection profile")) {
 
     NSResources->addSystemFile(
@@ -32,6 +32,6 @@ 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>\
 "
 );
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
@@ -31,5 +31,5 @@ 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>\
 "
 );
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
@@ -9,5 +9,5 @@ static const char * VPNNeeds[] =
 
 static const char * VPNProvides[] = 
-    { "NetworkSetup",
+    { "connection",
       0
     };
@@ -15,5 +15,5 @@ static const char * VPNProvides[] =
  * Constructor, find all of the possible interfaces
  */
-VPNNetNode::VPNNetNode() : ANetNode(tr("VPN NetworkSetup")) {
+VPNNetNode::VPNNetNode() : ANetNode(tr("VPN connection")) {
 }
 
@@ -26,5 +26,5 @@ 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>\
 "