Diffstat (limited to 'noncore/settings/networksettings2/network') (more/less context) (show whitespace changes)
4 files changed, 13 insertions, 14 deletions
diff --git a/noncore/settings/networksettings2/network/network_NN.cpp b/noncore/settings/networksettings2/network/network_NN.cpp index 2fa31bd..80a7fac 100644 --- a/noncore/settings/networksettings2/network/network_NN.cpp +++ b/noncore/settings/networksettings2/network/network_NN.cpp @@ -14,3 +14,3 @@ static const char * NetworkNeeds[] = static const char * NetworkProvides[] = - { "connection", + { "NetworkSetup", 0 diff --git a/noncore/settings/networksettings2/network/network_NNI.cpp b/noncore/settings/networksettings2/network/network_NNI.cpp index 34dac54..c183d5e 100644 --- a/noncore/settings/networksettings2/network/network_NNI.cpp +++ b/noncore/settings/networksettings2/network/network_NNI.cpp @@ -119,3 +119,3 @@ short ANetwork::generateFile( SystemFile &SF, << "A" - << connection()->number() + << networkSetup()->number() << NIC @@ -126,3 +126,3 @@ short ANetwork::generateFile( SystemFile &SF, << "\" > /tmp/profile-" - << connection()->number() + << networkSetup()->number() << ".up" @@ -136,3 +136,3 @@ short ANetwork::generateFile( SystemFile &SF, SF << " down rm -f /tmp/profile-" - << connection()->number() + << networkSetup()->number() << ".up" @@ -142,3 +142,3 @@ short ANetwork::generateFile( SystemFile &SF, << "A" - << connection()->number() + << networkSetup()->number() << NIC @@ -149,3 +149,3 @@ short ANetwork::generateFile( SystemFile &SF, << "\" > /tmp/profile-" - << connection()->number() + << networkSetup()->number() << ".up" @@ -153,3 +153,3 @@ short ANetwork::generateFile( SystemFile &SF, SF << " down rm -f /tmp/profile-" - << connection()->number() + << networkSetup()->number() << ".up" @@ -213,3 +213,3 @@ short ANetwork::generateFile( SystemFile &SF, // embed other info in it - rvd = connection()->getToplevel()->generateFileEmbedded( SF, DevNr ); + rvd = networkSetup()->getToplevel()->generateFileEmbedded( SF, DevNr ); diff --git a/noncore/settings/networksettings2/network/networkrun.cpp b/noncore/settings/networksettings2/network/networkrun.cpp index 74467ad..7039a36 100644 --- a/noncore/settings/networksettings2/network/networkrun.cpp +++ b/noncore/settings/networksettings2/network/networkrun.cpp @@ -6,5 +6,4 @@ State_t NetworkRun::detectState( void ) { - InterfaceInfo * II = nodeCollection()->assignedInterface(); + InterfaceInfo * II = networkSetup()->assignedInterface(); - Log(( "Interface %p %p : %d\n", II, nodeCollection(), (II) ? II->IsUp : 0 )); if( II && II->IsUp ) { @@ -15,3 +14,3 @@ State_t NetworkRun::detectState( void ) { // had no interface or interface is no longer up -> release - nodeCollection()->assignInterface( 0 ); + networkSetup()->assignInterface( 0 ); @@ -20,3 +19,3 @@ State_t NetworkRun::detectState( void ) { -QString NetworkRun::setMyState( NodeCollection * NC, Action_t A, bool ) { +QString NetworkRun::setMyState( NetworkSetup * NC, Action_t A, bool ) { // we handle UP and DOWN @@ -42,3 +41,3 @@ QString NetworkRun::setMyState( NodeCollection * NC, Action_t A, bool ) { II->Name.latin1(), - nodeCollection()->number(), + networkSetup()->number(), II->Name.latin1() ); diff --git a/noncore/settings/networksettings2/network/networkrun.h b/noncore/settings/networksettings2/network/networkrun.h index 78a1694..ac186e7 100644 --- a/noncore/settings/networksettings2/network/networkrun.h +++ b/noncore/settings/networksettings2/network/networkrun.h @@ -18,3 +18,3 @@ protected : - QString setMyState( NodeCollection * , Action_t, bool ); + QString setMyState( NetworkSetup * , Action_t, bool ); }; |