Diffstat (limited to 'noncore/settings/networksettings2/opietooth2') (more/less context) (ignore whitespace changes)
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 @@ -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..?) |