diff options
Diffstat (limited to 'tdenetworkmanager/src/knetworkmanager-wireless_network.cpp')
| -rw-r--r-- | tdenetworkmanager/src/knetworkmanager-wireless_network.cpp | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/tdenetworkmanager/src/knetworkmanager-wireless_network.cpp b/tdenetworkmanager/src/knetworkmanager-wireless_network.cpp index 66eded2..3b96bb2 100644 --- a/tdenetworkmanager/src/knetworkmanager-wireless_network.cpp +++ b/tdenetworkmanager/src/knetworkmanager-wireless_network.cpp @@ -22,24 +22,17 @@ * **************************************************************************/ -// NM includes -#include <NetworkManager.h> - // KNM includes #include "knetworkmanager.h" -#include "knetworkmanager-connection.h" -#include "knetworkmanager-accesspoint.h" #include "knetworkmanager-wireless_network.h" -// KDE includes +// TDE includes #include <kdebug.h> // TQt includes #include <tqhostaddress.h> #include <tqvaluelist.h> -using namespace ConnectionSettings; - class WirelessNetworkPrivate { public: @@ -55,7 +48,7 @@ class WirelessNetworkPrivate bool active; TQ_UINT32 match; - TQValueList<const AccessPoint*> aps; + TQValueList<const TDENetworkWiFiAPInfo*> aps; }; WirelessNetwork::WirelessNetwork(const WirelessNetwork& other) @@ -84,7 +77,7 @@ WirelessNetwork& WirelessNetwork::operator= (const WirelessNetwork& other) return *this; } -bool WirelessNetwork::contains (const AccessPoint * const ap) +bool WirelessNetwork::contains (const TDENetworkWiFiAPInfo * const ap) { if ( (d->match & MATCH_SSID) && getSsid() != ap->getSsidByteArray()) return false; @@ -93,7 +86,7 @@ bool WirelessNetwork::contains (const AccessPoint * const ap) return true; } -bool WirelessNetwork::addAP(const AccessPoint * const ap) +bool WirelessNetwork::addAP(const TDENetworkWiFiAPInfo * const ap) { if ( this->contains( ap ) || d->aps.isEmpty()) { @@ -124,7 +117,7 @@ TQString WirelessNetwork::getDisplaySsid() const TDENetworkWiFiAPFlags::TDENetworkWiFiAPFlags WirelessNetwork::getFlags() const { TDENetworkWiFiAPFlags::TDENetworkWiFiAPFlags flags = TDENetworkWiFiAPFlags::None; - for (TQValueList<const AccessPoint*>::Iterator it = d->aps.begin(); it != d->aps.end(); ++it) + for (TQValueList<const TDENetworkWiFiAPInfo*>::Iterator it = d->aps.begin(); it != d->aps.end(); ++it) { flags |= (*it)->getFlags(); } @@ -134,7 +127,7 @@ TDENetworkWiFiAPFlags::TDENetworkWiFiAPFlags WirelessNetwork::getFlags() const TDENetworkWiFiAPFlags::TDENetworkWiFiAPFlags WirelessNetwork::getWpaFlags() const { TDENetworkWiFiAPFlags::TDENetworkWiFiAPFlags flags = TDENetworkWiFiAPFlags::None; - for (TQValueList<const AccessPoint*>::Iterator it = d->aps.begin(); it != d->aps.end(); ++it) + for (TQValueList<const TDENetworkWiFiAPInfo*>::Iterator it = d->aps.begin(); it != d->aps.end(); ++it) { flags |= (*it)->getWpaFlags(); } @@ -144,7 +137,7 @@ TDENetworkWiFiAPFlags::TDENetworkWiFiAPFlags WirelessNetwork::getWpaFlags() cons TDENetworkWiFiAPFlags::TDENetworkWiFiAPFlags WirelessNetwork::getRsnFlags() const { TDENetworkWiFiAPFlags::TDENetworkWiFiAPFlags flags = TDENetworkWiFiAPFlags::None; - for (TQValueList<const AccessPoint*>::Iterator it = d->aps.begin(); it != d->aps.end(); ++it) + for (TQValueList<const TDENetworkWiFiAPInfo*>::Iterator it = d->aps.begin(); it != d->aps.end(); ++it) { flags |= (*it)->getRsnFlags(); } @@ -159,7 +152,7 @@ bool WirelessNetwork::isEncrypted() const TQ_UINT8 WirelessNetwork::getStrength() const { TQ_UINT8 strength = 0; - for (TQValueList<const AccessPoint*>::Iterator it = d->aps.begin(); it != d->aps.end(); ++it) + for (TQValueList<const TDENetworkWiFiAPInfo*>::Iterator it = d->aps.begin(); it != d->aps.end(); ++it) { if ((*it)->getStrength() > strength) strength = (*it)->getStrength(); |