Major rename of NodeCollection to NetworkSetup

this commit is broken (missing symbols)

5 files changed, 21 insertions, 21 deletions

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
@@ -713,7 +713,7 @@ long OTDriver::getLinkQuality( const OTDeviceAddress & Addr ) {
       cr->type = ACL_LINK;
 
       if (ioctl( fd(), HCIGETCONNINFO, (unsigned long) cr) < 0) {
-        odebug << "Get connection info failed" << oendl;
+        odebug << "Get NetworkSetup info failed" << oendl;
         free(cr);
         return 0;
       }
@@ -731,7 +731,7 @@ long OTDriver::getLinkQuality( const OTDeviceAddress & Addr ) {
       rq.rlen   = GET_LINK_QUALITY_RP_SIZE;
 
       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
@@ -12,7 +12,7 @@
 #define OTDRIVER_H
 
 /*
- * 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
  * that is a single local bluetooth device representation.
  * It is used as a Singleton pattern thru the getDefaultConnector() method.
@@ -118,7 +118,7 @@ public:
 
       /*
        * Returns the file descriptor for the local
-       * connection to this device
+       * networkSetup to this device
        */
       int fd() const 
           { return Fd; };
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
@@ -62,9 +62,9 @@ OTGateway::OTGateway( void ) : QObject( 0, "OTGateway" ),
       // load all peers we have ever seen
       loadKnownPeers();
 
-      // iterate over drivers and find active connections
+      // iterate over drivers and find active NetworkSetups
       // adding/updating peers
-      loadActiveConnections();
+      loadActiveNetworkSetups();
 
       // check every 4 seconds the state of BT
       timerEvent(0);
@@ -375,8 +375,8 @@ const char * OTGateway::deviceTypeToName( int cls ) {
     return "unknown";
 }
 
-PANConnectionVector OTGateway::getPANConnections( void ) {
-        PANConnectionVector V;
+PANNetworkSetupVector OTGateway::getPANNetworkSetups( void ) {
+        PANNetworkSetupVector V;
 
         struct bnep_connlist_req req;
         struct bnep_conninfo ci[48];
@@ -392,7 +392,7 @@ PANConnectionVector OTGateway::getPANConnections( void ) {
         req.cnum = 48;
         req.ci   = ci;
         if (ioctl(ctl, BNEPGETCONNLIST, &req)) {
-          odebug << "Failed to get connection list" << oendl;
+          odebug << "Failed to get NetworkSetup list" << oendl;
           ::close( ctl );
           return V;
         }
@@ -401,7 +401,7 @@ PANConnectionVector OTGateway::getPANConnections( void ) {
           V.resize( V.size() + 1 );
           if( ci[i].role == BNEP_SVC_PANU ) {
             // we are the client
-            V.insert( V.size()-1, new OTPANConnection(
+            V.insert( V.size()-1, new OTPANNetworkSetup(
                             ci[i].device,
                             batostr((bdaddr_t *) ci[i].dst)
                           ) );
@@ -510,7 +510,7 @@ bool OTGateway::removeLinkKey( unsigned int Index ) {
 }
 
 #define MAXCONNECTIONS 10
-void OTGateway::loadActiveConnections( void ) {
+void OTGateway::loadActiveNetworkSetups( void ) {
 
         struct hci_conn_list_req *cl;
         struct hci_conn_info *ci;
@@ -532,13 +532,13 @@ void OTGateway::loadActiveConnections( void ) {
             continue;
           }
 
-          // driver is up -> check connections
+          // driver is up -> check NetworkSetups
           cl->dev_id = AllDrivers[i]->devId();
           cl->conn_num = MAXCONNECTIONS;
           ci = cl->conn_info;
 
           if (ioctl( getSocket(), HCIGETCONNLIST, (void *) cl)) {
-            emit error( tr("Can't get connection list") );
+            emit error( tr("Can't get NetworkSetup list") );
             break;
           }
 
@@ -753,7 +753,7 @@ int OTGateway::releaseRFCommDevice( int devnr ) {
       dr = di;
       for (i = 0; i < dl->dev_num; i++, dr++) {
         if( dr->id == devnr ) {
-          // still in connection list 
+          // still in NetworkSetup list 
           struct rfcomm_dev_req req;
           int err;
 
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
@@ -17,11 +17,11 @@ class OTDriver;
 class OTDevice;
 class OTPeer;
 class OTInquiry;
-class OTPANConnection;
+class OTPANNetworkSetup;
 class OTLinkKey;
 
 typedef QVector<OTPeer> PeerVector;
-typedef QVector<OTPANConnection> PANConnectionVector;
+typedef QVector<OTPANNetworkSetup> PANNetworkSetupVector;
 typedef QArray<OTLinkKey> LinkKeyArray;
 
 class OTLinkKey {
@@ -43,11 +43,11 @@ public :
     OTDeviceAddress To;
 };
 
-class OTPANConnection {
+class OTPANNetworkSetup {
 
 public :
 
-    OTPANConnection( const QString & Dev, const QString & CT ) {
+    OTPANNetworkSetup( const QString & Dev, const QString & CT ) {
       Device = Dev;
       ConnectedTo = CT;
     }
@@ -92,7 +92,7 @@ public :
         { return AllDrivers.count() == 0 ? 0 : AllDrivers[nr]; }
       void updateDrivers();
 
-      PANConnectionVector getPANConnections();
+      PANNetworkSetupVector getPANNetworkSetups();
 
       // scan neighbourhood using device
       void scanNeighbourhood( OTDriver * D = 0 );
@@ -173,7 +173,7 @@ protected :
 
 private :
 
-      void loadActiveConnections( void );
+      void loadActiveNetworkSetups( void );
       void loadKnownPeers( void );
       void saveKnownPeers( void );
       bool isConnectedTo( int devid,
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
@@ -38,7 +38,7 @@ class OTHCISocket;
  * inquiry(). Inquiry results are signalled as soon as they arrive,
  * so the information can be displayed before the whole inquiry
  * 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..?)
  */