Diffstat (limited to 'noncore/settings/networksettings2/wlan') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/networksettings2/wlan/wlanedit.cpp | 2 | ||||
-rw-r--r-- | noncore/settings/networksettings2/wlan/wlanrun.cpp | 8 | ||||
-rw-r--r-- | noncore/settings/networksettings2/wlan/wlanrun.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/noncore/settings/networksettings2/wlan/wlanedit.cpp b/noncore/settings/networksettings2/wlan/wlanedit.cpp index 74174bf..73c0c7c 100644 --- a/noncore/settings/networksettings2/wlan/wlanedit.cpp +++ b/noncore/settings/networksettings2/wlan/wlanedit.cpp @@ -17,13 +17,13 @@ WLanEdit::WLanEdit( QWidget * Parent, ANetNodeInstance * TNNI ) : InterfaceInfo * II; NNI = TNNI; Dev = NNI->runtime()->device(); WE = 0; - if( ( II = NNI->connection()->assignedInterface() ) ) { + if( ( II = NNI->networkSetup()->assignedInterface() ) ) { // show data WE = new WExtensions( II->Name ); if( WE->doesHaveWirelessExtensions() ) { QString S; Station_LBL->setText( WE->station() ); diff --git a/noncore/settings/networksettings2/wlan/wlanrun.cpp b/noncore/settings/networksettings2/wlan/wlanrun.cpp index b15a560..a0c5884 100644 --- a/noncore/settings/networksettings2/wlan/wlanrun.cpp +++ b/noncore/settings/networksettings2/wlan/wlanrun.cpp @@ -8,13 +8,13 @@ State_t WLanRun::detectState( void ) { // unavailable : no card found // available : card found and assigned to us or free // up : card found and assigned to us and up - NodeCollection * NC = nodeCollection(); + NetworkSetup * NC = networkSetup(); QString S = QString( "/tmp/profile-%1.up" ).arg(NC->number()); System & Sys = NSResources->system(); InterfaceInfo * Run; QFile F( S ); @@ -67,13 +67,13 @@ State_t WLanRun::detectState( void ) { } return Unavailable; } -QString WLanRun::setMyState( NodeCollection * , Action_t , bool ) { +QString WLanRun::setMyState( NetworkSetup * , Action_t , bool ) { // we only handle activate and deactivate return QString(); } // get interface that is free or assigned to us @@ -91,16 +91,16 @@ InterfaceInfo * WLanRun::getInterface( void ) { #ifdef ARPHRD_IEEE1394 || Run->CardType == ARPHRD_IEEE1394 #endif ) ) { // this is a LAN card - if( Run->assignedConnection() == netNode()->connection() ) { + if( Run->assignedToNetworkSetup() == netNode()->networkSetup() ) { // assigned to us return Run; - } else if( Run->assignedConnection() == 0 ) { + } else if( Run->assignedToNetworkSetup() == 0 ) { // free best = Run; } } } return best; // can be 0 diff --git a/noncore/settings/networksettings2/wlan/wlanrun.h b/noncore/settings/networksettings2/wlan/wlanrun.h index fd325d4..e3e7735 100644 --- a/noncore/settings/networksettings2/wlan/wlanrun.h +++ b/noncore/settings/networksettings2/wlan/wlanrun.h @@ -21,13 +21,13 @@ public : bool handlesInterface( const InterfaceInfo & II ); State_t detectState( void ); protected : - QString setMyState( NodeCollection * , Action_t, bool ); + QString setMyState( NetworkSetup * , Action_t, bool ); private : InterfaceInfo * getInterface( void ); QRegExp Pat; WLanData * Data; |